Author: fireball Date: Sun Apr 16 21:04:45 2006 New Revision: 21613
URL: http://svn.reactos.ru/svn/reactos?rev=21613&view=rev Log: Sync to Wine-0_9_8: Mike McCormack mike@codeweavers.com - imm32: Remove FIXME messages from some implemented functions.
Modified: trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=21... ============================================================================== --- trunk/reactos/dll/win32/imm32/imm.c (original) +++ trunk/reactos/dll/win32/imm32/imm.c Sun Apr 16 21:04:45 2006 @@ -260,6 +260,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) { FIXME("(%p, %p, %ld): stub\n", hWnd, hIMC, dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }
@@ -577,12 +578,10 @@ HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) { - LONG rc = 0; - InputContextData *data = (InputContextData*)hIMC; - - TRACE("(%p, 0x%lx, %p, %ld)\n", - hIMC, dwIndex, lpBuf, dwBufLen - ); + LONG rc = 0; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("(%p, 0x%lx, %p, %ld)\n", hIMC, dwIndex, lpBuf, dwBufLen);
if (!data) return FALSE; @@ -671,7 +670,7 @@ */ HIMC WINAPI ImmGetContext(HWND hWnd) { - FIXME("(%p): stub\n", hWnd); + TRACE("%p\n", hWnd);
if (!root_context) return NULL; @@ -935,7 +934,6 @@ { OSVERSIONINFOA version; FIXME("(%p): stub\n", hWnd); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); GetVersionExA( &version ); switch(version.dwPlatformId) { @@ -1047,7 +1045,8 @@ HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { BOOL rc = FALSE; - FIXME("(%p, %ld, %ld, %ld): stub\n", + + TRACE("(%p, %ld, %ld, %ld)\n", hIMC, dwAction, dwIndex, dwValue);
if (!root_context) @@ -1377,7 +1376,7 @@ ShowWindow(hwndDefault,SW_HIDE); }
- FIXME("STUB\n"); + /* FIXME: this is a partial stub */
if (reshow) ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); @@ -1405,7 +1404,8 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { InputContextData *data = (InputContextData*)hIMC; - FIXME("Semi-Stub\n"); + + TRACE("%p %d\n", hIMC, fOpen);
if (hIMC == (HIMC)FROM_IME) {
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=21... ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Sun Apr 16 21:04:45 2006 @@ -44,7 +44,7 @@ reactos/dll/win32/crypt32 # Synced to Wine-0_9_5 reactos/dll/win32/dbghelp # reactos/dll/win32/icmp # Synced to Wine-0_9_5 -reactos/dll/win32/imm32 # Synced to Wine-0_9_5 +reactos/dll/win32/imm32 # Synced to Wine-0_9_10 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. reactos/dll/win32/mapi32 # Synced to Wine-0_9_5