[CHARMAP]

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

diff --git a/reactos/include/psdk/richedit.h b/reactos/include/psdk/richedit.h
index 02ebdc2..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
@@ -622,7 +623,7 @@ typedef enum tagKHYPH
 typedef struct hyphresult
 {
     KHYPH      khyph;
-    long       ichHyph;
+    LONG       ichHyph;
     WCHAR      chHyph;
 } HYPHRESULT;
 
@@ -630,7 +631,7 @@ typedef struct tagHyphenateInfo
 {
     SHORT      cbSize;
     SHORT      dxHyphenateZone;
-    void       (WINAPI* pfnHyphenate)(WCHAR*, LANGID, long, HYPHRESULT*);
+    void       (WINAPI* pfnHyphenate)(WCHAR*, LANGID, LONG, HYPHRESULT*);
 } HYPHENATEINFO;
 
 typedef struct _msgfilter {
@@ -712,7 +713,7 @@ typedef struct _imecomptext {
     DWORD      flags;
 } IMECOMPTEXT;
 
-void WINAPI HyphenateProc(WCHAR*, LANGID, long, HYPHRESULT*);
+void WINAPI HyphenateProc(WCHAR*, LANGID, LONG, HYPHRESULT*);
 
 #define SF_TEXT                      0x00000001
 #define SF_RTF               0x00000002