[CHARMAP]

[reactos.git] / reactos / include / psdk / richedit.h

diff --git a/reactos/include/psdk/richedit.h b/reactos/include/psdk/richedit.h
index 06f901e..b0dcd04 100644 (file)
--- a/reactos/include/psdk/richedit.h
+++ b/reactos/include/psdk/richedit.h
@@ -32,19 +32,20 @@ extern "C" {
 
 #define cchTextLimitDefault 0x7fff
 
-#if defined(__GNUC__)
-# define MSFTEDIT_CLASS (const WCHAR []){ 'R','i','c','h','E','d','i','t','5','0','W',0 }
-#elif defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(RC_INVOKED)
 # define MSFTEDIT_CLASS L"RichEdit50W"
+#elif defined(__GNUC__)
+# define MSFTEDIT_CLASS (const WCHAR []){ 'R','i','c','h','E','d','i','t','5','0','W',0 }
 #else
 static const WCHAR MSFTEDIT_CLASS[] = { 'R','i','c','h','E','d','i','t','5','0','W',0 };
 #endif
 
 #define RICHEDIT_CLASS20A      "RichEdit20A"
-#if defined(__GNUC__)
+
+#if defined(_MSC_VER) || defined(RC_INVOKED)
+# define RICHEDIT_CLASS20W  L"RichEdit20W"
+#elif defined(__GNUC__)
 # define RICHEDIT_CLASS20W (const WCHAR []){ 'R','i','c','h','E','d','i','t','2','0','W',0 }
-#elif defined(_MSC_VER)
-# define RICHEDIT_CLASS20W      L"RichEdit20W"
 #else
 static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2','0','W',0 };
 #endif
@@ -517,7 +518,7 @@ DECL_WINELIB_TYPE_AW(TEXTRANGE)
 typedef struct _editstream
 {
     DWORD_PTR          dwCookie;
-    DWORD_PTR  dwError;
+    DWORD              dwError;
     EDITSTREAMCALLBACK pfnCallback;
 } EDITSTREAM;