[ros-diffs] [winesync] 30867: Autosyncing with Wine HEAD

Author: winesync
Date: Thu Nov 29 13:46:56 2007
New Revision: 30867

URL: http://svn.reactos.org/svn/reactos?rev=30867&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/imm32/imm.c
    trunk/reactos/dll/win32/imm32/imm32.rbuild
    trunk/reactos/dll/win32/imm32/imm32.spec

Modified: trunk/reactos/dll/win32/imm32/imm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/imm32/imm.c (original)
+++ trunk/reactos/dll/win32/imm32/imm.c Thu Nov 29 13:46:56 2007
@@ -970,7 +970,7 @@
     else
     {
         FIXME("Unhandled index 0x%x\n",dwIndex);
-    }
+    }   
 
     ImmUnlockIMCC(data->IMC.hCompStr);
 
@@ -1057,7 +1057,12 @@
  */
 HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd)
 {
-  FIXME("(%p - %p %p ): semi-stub\n", hWnd,hwndDefault, root_context);
+  static int shown = 0;
+
+  if (!shown) {
+        FIXME("(%p - %p %p ): semi-stub\n", hWnd,hwndDefault, root_context);
+	shown = 1;
+  }
 
   if (hwndDefault == NULL)
   {
@@ -1517,9 +1522,13 @@
  */
 BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC)
 {
-  FIXME("(%p, %p): stub\n", hWnd, hIMC);
-
-    return TRUE;
+  static int shown = 0;
+
+  if (!shown) {
+     FIXME("(%p, %p): stub\n", hWnd, hIMC);
+     shown = 1;
+  }
+  return TRUE;
 }
 
 /***********************************************************************
@@ -1731,9 +1740,14 @@
 BOOL WINAPI ImmSetConversionStatus(
   HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence)
 {
-  FIXME("(%p, %d, %d): stub\n",
-    hIMC, fdwConversion, fdwSentence
-  );
+  static int shown = 0;
+
+  if (!shown) {
+      FIXME("(%p, %d, %d): stub\n",
+          hIMC, fdwConversion, fdwSentence
+      );
+      shown = 1;
+  }
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
 }

Modified: trunk/reactos/dll/win32/imm32/imm32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.rbui…
==============================================================================
--- trunk/reactos/dll/win32/imm32/imm32.rbuild (original)
+++ trunk/reactos/dll/win32/imm32/imm32.rbuild Thu Nov 29 13:46:56 2007
@@ -1,13 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="imm32" type="win32dll"
baseaddress="${BASEADDRESS_IMM32}" installbase="system32"
installname="imm32.dll" allowwarnings="true">
 	<importlibrary definition="imm32.spec.def" />
 	<include base="imm32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
+	<define name="WINVER">0x600</define>
+	<define name="_WIN32_WINNT">0x600</define>
 	<library>wine</library>
 	<library>user32</library>
 	<library>gdi32</library>

Modified: trunk/reactos/dll/win32/imm32/imm32.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.spec…
==============================================================================
--- trunk/reactos/dll/win32/imm32/imm32.spec (original)
+++ trunk/reactos/dll/win32/imm32/imm32.spec Thu Nov 29 13:46:56 2007
@@ -10,7 +10,7 @@
 @ stdcall ImmDestroyIMCC(long)
 @ stub ImmDestroySoftKeyboard
 @ stdcall ImmDisableIME(long)
-@ stub ImmDisableIme
+@ stdcall ImmDisableIme(long) ImmDisableIME
 @ stub ImmEnumInputContext
 @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr)
 @ stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr)