Alexandre Julliard : riched32: Use the standard DEFINE_GUID macro to define GUIDs.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 49b3837504258b7e2da295f30858a599a489c016
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=49b3837504258b7e2da295f3...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Jun  9 21:10:01 2006 +0200

riched32: Use the standard DEFINE_GUID macro to define GUIDs.

---

 dlls/riched20/richole.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 53ba711..497c0fc 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -36,23 +36,24 @@ #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
-typedef struct IRichEditOleImpl {
-    const IRichEditOleVtbl *lpVtbl;
-    LONG ref;
-
-    ME_TextEditor *editor;
-} IRichEditOleImpl;
-
 /* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/
 
 /* FIXME: the next 6 lines should be in textserv.h */
+#include "initguid.h"
 #define TEXTSERV_GUID(name, l, w1, w2, b1, b2) \
-  GUID name = { l, w1, w2, {b1, b2, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5}}
+    DEFINE_GUID(name, l, w1, w2, b1, b2, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5)
 
 TEXTSERV_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d);
 TEXTSERV_GUID(IID_ITextHost, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e);
 TEXTSERV_GUID(IID_ITextHost2, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e);
 
+typedef struct IRichEditOleImpl {
+    const IRichEditOleVtbl *lpVtbl;
+    LONG ref;
+
+    ME_TextEditor *editor;
+} IRichEditOleImpl;
+
 static HRESULT WINAPI
 IRichEditOle_fnQueryInterface(IRichEditOle *me, REFIID riid, LPVOID *ppvObj)
 {