Bug 835738 - Use GUID_PROP_INPUTSCOPE declaration from inputscope.h r=jmathies

widget/windows/nsTextStore.cpp

@@ -12,7 +12,6 @@
 #include "prlog.h"
 
 #include "nscore.h"
-#include "nsTextStore.h"
 #include "nsWindow.h"
 #ifdef MOZ_METRO
 #include "winrt/MetroWidget.h"
@@ -21,6 +20,9 @@
 #include "WinUtils.h"
 #include "mozilla/Preferences.h"
 
+#define INPUTSCOPE_INIT_GUID
+#include "nsTextStore.h"
+
 using namespace mozilla;
 using namespace mozilla::widget;
 
@@ -52,11 +54,6 @@ PRLogModuleInfo* sTextStoreLog = nullptr;
 /* InputScopeImpl                                                 */
 /******************************************************************/
 
-// InputScope property GUID
-static const GUID GUID_PROP_INPUTSCOPE =
-  { 0x1713dd5a, 0x68e7, 0x4a5b,
-    { 0x9a, 0xf6, 0x59, 0x2a, 0x59, 0x5c, 0x77, 0x8d } };
-
 class InputScopeImpl MOZ_FINAL : public ITfInputScope
 {
 public:

widget/windows/nsTextStore.h

@@ -16,7 +16,13 @@
 
 #include <msctf.h>
 #include <textstor.h>
-#include <InputScope.h>
+
+// GUID_PROP_INPUTSCOPE is declared in inputscope.h using INIT_GUID.
+// With initguid.h, we get its instance instead of extern declaration.
+#ifdef INPUTSCOPE_INIT_GUID
+#include <initguid.h>
+#endif
+#include <inputscope.h>
 
 struct ITfThreadMgr;
 struct ITfDocumentMgr;