Issue 17312: problems with IME keyboard windows messages for foreign character sets - pasteboard server class intercepting certain windows messages without invoking TranslateMessage

Source/win32/GNUmakefile.preamble

@@ -28,13 +28,13 @@
 #
 
 # Additional flags to pass to the preprocessor
-ADDITIONAL_CPPFLAGS += -Wall $(CONFIG_SYSTEM_DEFS)
+ADDITIONAL_CPPFLAGS += -Wall $(CONFIG_SYSTEM_DEFS) -DIN_APP_PASTEBOARD_SERVER
 
 # Additional flags to pass to the Objective-C compiler
-ADDITIONAL_OBJCFLAGS = -DWINVER=0x0500 
+ADDITIONAL_OBJCFLAGS = -DWINVER=0x0500 -DIN_APP_PASTEBOARD_SERVER
 
 # Additional flags to pass to the C compiler
-ADDITIONAL_CFLAGS = -DWINVER=0x0500
+ADDITIONAL_CFLAGS = -DWINVER=0x0500 -DIN_APP_PASTEBOARD_SERVER
 
 # Additional include directories the compiler should search
 ADDITIONAL_INCLUDE_DIRS += -I../../Headers \

Tools/win32pbs.m

@@ -28,7 +28,9 @@
 */
 
 /* Access Windows 2000 (and later) API.  Required for HWND_MESSAGE.  */
+#if !defined(WINVER)
 #define WINVER 0x500
+#endif
 
 #include <Foundation/Foundation.h>
 #include <Foundation/NSUserDefaults.h>
@@ -359,10 +361,17 @@ LRESULT CALLBACK MainWndPbsProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar
                   watcher: (id<RunLoopEvents>)self
                   forMode: mode];
 #else 
+  // Disable runloop watching if compiling for in-app standalone use...
+#if defined(IN_APP_PASTEBOARD_SERVER)
+#warning disabling runloop watcher for gpbs
+#else
+#warning enabling runloop watcher for gpbs
   [currentRunLoop addEvent: (void*)0
-                  type: ET_WINMSG
-                  watcher: (id<RunLoopEvents>)self
-                  forMode: mode];
+                      type: ET_WINMSG
+                   watcher: (id<RunLoopEvents>)self
+                   forMode: mode];
+
+#endif
 #endif
 }