From 0c99121b2e69311325219174074ab669acf8ac9c Mon Sep 17 00:00:00 2001
From: The Wine Synchronizer <winesync@svn.reactos.org>
Date: Thu, 29 Nov 2007 10:46:56 +0000
Subject: [PATCH] Autosyncing with Wine HEAD

svn path=/trunk/; revision=30867
---
 reactos/dll/win32/imm32/imm.c        | 28 +++++++++++++++++++++-------
 reactos/dll/win32/imm32/imm32.rbuild |  9 ++++-----
 reactos/dll/win32/imm32/imm32.spec   |  2 +-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/reactos/dll/win32/imm32/imm.c b/reactos/dll/win32/imm32/imm.c
index 00161d62f10..4f5f6589336 100644
--- a/reactos/dll/win32/imm32/imm.c
+++ b/reactos/dll/win32/imm32/imm.c
@@ -970,7 +970,7 @@ LONG WINAPI ImmGetCompositionStringW(
     else
     {
         FIXME("Unhandled index 0x%x\n",dwIndex);
-    }
+    }   
 
     ImmUnlockIMCC(data->IMC.hCompStr);
 
@@ -1057,7 +1057,12 @@ BOOL WINAPI ImmGetConversionStatus(
  */
 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 ImmRegisterWordW(
  */
 BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC)
 {
-  FIXME("(%p, %p): stub\n", hWnd, hIMC);
+  static int shown = 0;
 
-    return TRUE;
+  if (!shown) {
+     FIXME("(%p, %p): stub\n", hWnd, hIMC);
+     shown = 1;
+  }
+  return TRUE;
 }
 
 /***********************************************************************
@@ -1731,9 +1740,14 @@ BOOL WINAPI ImmSetCompositionWindow(
 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;
 }
diff --git a/reactos/dll/win32/imm32/imm32.rbuild b/reactos/dll/win32/imm32/imm32.rbuild
index 4018cde39e0..35c59bb8374 100644
--- a/reactos/dll/win32/imm32/imm32.rbuild
+++ b/reactos/dll/win32/imm32/imm32.rbuild
@@ -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>
diff --git a/reactos/dll/win32/imm32/imm32.spec b/reactos/dll/win32/imm32/imm32.spec
index 5c10a5ff693..ee2ca0af2b9 100644
--- a/reactos/dll/win32/imm32/imm32.spec
+++ b/reactos/dll/win32/imm32/imm32.spec
@@ -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)