wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Alexandre Julliard : winex11: Flush the display after creating X windows.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 731d77f762776a7e5f6a62390c4281ff74f7feeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=731d77f762776a7e5f6a62390… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 20:24:27 2008 +0200 winex11: Flush the display after creating X windows. --- dlls/winex11.drv/window.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6edfbc5..4d5da02 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -610,6 +610,7 @@ static Window create_icon_window( Display *display, struct x11drv_win_data *data InputOutput, visual, CWEventMask | CWBitGravity | CWBackingStore | CWColormap, &attr ); XSaveContext( display, data->icon_window, winContext, (char *)data->hwnd ); + XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); TRACE( "created %lx\n", data->icon_window ); @@ -1097,6 +1098,9 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat if (GetWindowRgn( data->hwnd, hrgn ) != ERROR) sync_window_region( display, data, hrgn ); DeleteObject( hrgn ); } + wine_tsx11_lock(); + XFlush( display ); /* make sure the window exists before we start painting to it */ + wine_tsx11_unlock(); return data->whole_window; }

1 0

Alexandre Julliard : winex11: Added an error handler to catch bad atoms in clipboard selections.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 704ac5a51ef54de92851638d0860c697fa39d7ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=704ac5a51ef54de92851638d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 20:09:40 2008 +0200 winex11: Added an error handler to catch bad atoms in clipboard selections. --- dlls/winex11.drv/clipboard.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index cdf54c1..af5ff9d 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1728,6 +1728,11 @@ static BOOL X11DRV_CLIPBOARD_QueryTargets(Display *display, Window w, Atom selec } +static int is_atom_error( Display *display, XErrorEvent *event, void *arg ) +{ + return (event->error_code == BadAtom); +} + /************************************************************************** * X11DRV_CLIPBOARD_InsertSelectionProperties * @@ -1759,7 +1764,7 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p lpFormat = X11DRV_CLIPBOARD_LookupProperty(lpFormat, properties[i]); } } - else + else if (properties[i]) { /* add it to the list of atoms that we don't know about yet */ if (!atoms) atoms = HeapAlloc( GetProcessHeap(), 0, @@ -1774,13 +1779,13 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p char **names = HeapAlloc( GetProcessHeap(), 0, nb_atoms * sizeof(*names) ); if (names) { - wine_tsx11_lock(); - /* FIXME: we're at the mercy of the app sending the event here. - * Currently if they send a bogus atom, we will crash. - * We should handle BadAtom errors gracefully in this call. - */ - XGetAtomNames( display, atoms, nb_atoms, names ); - wine_tsx11_unlock(); + X11DRV_expect_error( display, is_atom_error, NULL ); + if (!XGetAtomNames( display, atoms, nb_atoms, names )) nb_atoms = 0; + if (X11DRV_check_error()) + { + WARN( "got some bad atoms, ignoring\n" ); + nb_atoms = 0; + } for (i = 0; i < nb_atoms; i++) { WINE_CLIPFORMAT *lpFormat;

1 0

Steven Edwards : include/setupapi: Remove extra semicolons.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 10629e233d2cf29dea2df0a4a28ba3bb1522865a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10629e233d2cf29dea2df0a4a… Author: Steven Edwards <winehacker(a)gmail.com> Date: Wed Apr 9 14:37:26 2008 -0400 include/setupapi: Remove extra semicolons. --- include/setupapi.h | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index fd20126..047b7bd 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -447,8 +447,8 @@ typedef struct _SP_TROUBLESHOOTER_PARAMS_W WCHAR HtmlTroubleShooter[MAX_PATH]; } SP_TROUBLESHOOTER_PARAMS_W, *PSP_TROUBLESHOOTER_PARAMS_W; -DECL_WINELIB_SETUPAPI_TYPE_AW(SP_TROUBLESHOOTER_PARAMS); -DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_TROUBLESHOOTER_PARAMS); +DECL_WINELIB_SETUPAPI_TYPE_AW(SP_TROUBLESHOOTER_PARAMS) +DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_TROUBLESHOOTER_PARAMS) typedef struct _SP_POWERMESSAGEWAKE_PARAMS_A { @@ -462,8 +462,8 @@ typedef struct _SP_POWERMESSAGEWAKE_PARAMS_W WCHAR PowerMessageWake[LINE_LEN * 2]; } SP_POWERMESSAGEWAKE_PARAMS_W, *PSP_POWERMESSAGEWAKE_PARAMS_W; -DECL_WINELIB_SETUPAPI_TYPE_AW(SP_POWERMESSAGEWAKE_PARAMS); -DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_POWERMESSAGEWAKE_PARAMS); +DECL_WINELIB_SETUPAPI_TYPE_AW(SP_POWERMESSAGEWAKE_PARAMS) +DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_POWERMESSAGEWAKE_PARAMS) typedef struct _SP_DRVINFO_DATA_V1_A { @@ -485,8 +485,8 @@ typedef struct _SP_DRVINFO_DATA_V1_W WCHAR ProviderName[LINE_LEN]; } SP_DRVINFO_DATA_V1_W, *PSP_DRVINFO_DATA_V1_W; -DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DRVINFO_DATA_V1); -DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DRVINFO_DATA_V1); +DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DRVINFO_DATA_V1) +DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DRVINFO_DATA_V1) typedef struct _SP_DRVINFO_DATA_V2_A { @@ -512,16 +512,16 @@ typedef struct _SP_DRVINFO_DATA_V2_W DWORDLONG DriverVersion; } SP_DRVINFO_DATA_V2_W, *PSP_DRVINFO_DATA_V2_W; -DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DRVINFO_DATA_V2); -DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DRVINFO_DATA_V2); +DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DRVINFO_DATA_V2) +DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DRVINFO_DATA_V2) typedef SP_DRVINFO_DATA_V2_A SP_DRVINFO_DATA_A; typedef PSP_DRVINFO_DATA_V2_A PSP_DRVINFO_DATA_A; typedef SP_DRVINFO_DATA_V2_W SP_DRVINFO_DATA_W; typedef PSP_DRVINFO_DATA_V2_W PSP_DRVINFO_DATA_W; -DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DRVINFO_DATA); -DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DRVINFO_DATA); +DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DRVINFO_DATA) +DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DRVINFO_DATA) typedef struct _SP_DRVINFO_DETAIL_DATA_A { @@ -549,8 +549,8 @@ typedef struct _SP_DRVINFO_DETAIL_DATA_W WCHAR HardwareID[ANYSIZE_ARRAY]; } SP_DRVINFO_DETAIL_DATA_W, *PSP_DRVINFO_DETAIL_DATA_W; -DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DRVINFO_DETAIL_DATA); -DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DRVINFO_DETAIL_DATA); +DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DRVINFO_DETAIL_DATA) +DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DRVINFO_DETAIL_DATA) typedef struct _SP_DRVINSTALL_PARAMS { @@ -848,7 +848,7 @@ typedef struct _FILEPATHS_SIGNERINFO_W PCWSTR CatalogFile; } FILEPATHS_SIGNERINFO_W, *PFILEPATHS_SIGNERINFO_W; -DECL_WINELIB_SETUPAPI_TYPE_AW(FILEPATHS_SIGNERINFO); +DECL_WINELIB_SETUPAPI_TYPE_AW(FILEPATHS_SIGNERINFO) typedef struct _SOURCE_MEDIA_A { @@ -870,7 +870,7 @@ typedef struct _SOURCE_MEDIA_W DWORD Flags; } SOURCE_MEDIA_W, *PSOURCE_MEDIA_W; -DECL_WINELIB_SETUPAPI_TYPE_AW(SOURCE_MEDIA); +DECL_WINELIB_SETUPAPI_TYPE_AW(SOURCE_MEDIA) typedef struct _SP_ORIGINAL_FILE_INFO_A {

1 0

Steven Edwards : server: Remove unneeded semicolon.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 77aa978d9e2e53cabcd077c5264a09600e7d04c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77aa978d9e2e53cabcd077c52… Author: Steven Edwards <winehacker(a)gmail.com> Date: Wed Apr 9 13:49:13 2008 -0400 server: Remove unneeded semicolon. --- server/mach.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/mach.c b/server/mach.c index 4e643ce..345fb27 100644 --- a/server/mach.c +++ b/server/mach.c @@ -54,7 +54,7 @@ __ASM_GLOBAL_FUNC( pthread_kill_syscall, "int $0x80\n\t" "jae 1f\n\t" "negl %eax\n" - "1:\tret" ); + "1:\tret" ) #else static inline int pthread_kill_syscall( mach_port_t, int ) {

1 0

Aric Stewart : imm32: Implement ImmUnregisterWord using loaded IME.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 5ce9649f5a8b0be7655d14f73a100eb9dea31925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce9649f5a8b0be7655d14f73… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 9 09:42:29 2008 -0500 imm32: Implement ImmUnregisterWord using loaded IME. --- dlls/imm32/imm.c | 54 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 44 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 4ffb481..000052c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1805,11 +1805,28 @@ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID) BOOL WINAPI ImmUnregisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister) { - FIXME("(%p, %s, %d, %s): stub\n", - hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszUnregister) - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_a(lpszReading), dwStyle, + debugstr_a(lpszUnregister)); + if (immHkl->hIME && immHkl->pImeUnregisterWord) + { + if (!is_kbd_ime_unicode(immHkl)) + return immHkl->pImeUnregisterWord((LPCWSTR)lpszReading,dwStyle, + (LPCWSTR)lpszUnregister); + else + { + LPWSTR lpszwReading = strdupAtoW(lpszReading); + LPWSTR lpszwUnregister = strdupAtoW(lpszUnregister); + BOOL rc; + + rc = immHkl->pImeUnregisterWord(lpszwReading,dwStyle,lpszwUnregister); + HeapFree(GetProcessHeap(),0,lpszwReading); + HeapFree(GetProcessHeap(),0,lpszwUnregister); + return rc; + } + } + else + return FALSE; } /*********************************************************************** @@ -1818,11 +1835,28 @@ BOOL WINAPI ImmUnregisterWordA( BOOL WINAPI ImmUnregisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister) { - FIXME("(%p, %s, %d, %s): stub\n", - hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister) - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_w(lpszReading), dwStyle, + debugstr_w(lpszUnregister)); + if (immHkl->hIME && immHkl->pImeUnregisterWord) + { + if (is_kbd_ime_unicode(immHkl)) + return immHkl->pImeUnregisterWord(lpszReading,dwStyle,lpszUnregister); + else + { + LPSTR lpszaReading = strdupWtoA(lpszReading); + LPSTR lpszaUnregister = strdupWtoA(lpszUnregister); + BOOL rc; + + rc = immHkl->pImeUnregisterWord((LPCWSTR)lpszaReading,dwStyle, + (LPCWSTR)lpszaUnregister); + HeapFree(GetProcessHeap(),0,lpszaReading); + HeapFree(GetProcessHeap(),0,lpszaUnregister); + return rc; + } + } + else + return FALSE; } /***********************************************************************

1 0

Aric Stewart : imm32: Implement ImmRegisterWord using loaded IME.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 25cb21de442e0c7c3b42db99191106a6792275e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25cb21de442e0c7c3b42db991… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 9 09:42:15 2008 -0500 imm32: Implement ImmRegisterWord using loaded IME. --- dlls/imm32/imm.c | 54 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 44 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 831f3d2..4ffb481 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1486,11 +1486,28 @@ BOOL WINAPI ImmNotifyIME( BOOL WINAPI ImmRegisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister) { - FIXME("(%p, %s, %d, %s): stub\n", - hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister) - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_a(lpszReading), dwStyle, + debugstr_a(lpszRegister)); + if (immHkl->hIME && immHkl->pImeRegisterWord) + { + if (!is_kbd_ime_unicode(immHkl)) + return immHkl->pImeRegisterWord((LPCWSTR)lpszReading,dwStyle, + (LPCWSTR)lpszRegister); + else + { + LPWSTR lpszwReading = strdupAtoW(lpszReading); + LPWSTR lpszwRegister = strdupAtoW(lpszRegister); + BOOL rc; + + rc = immHkl->pImeRegisterWord(lpszwReading,dwStyle,lpszwRegister); + HeapFree(GetProcessHeap(),0,lpszwReading); + HeapFree(GetProcessHeap(),0,lpszwRegister); + return rc; + } + } + else + return FALSE; } /*********************************************************************** @@ -1499,11 +1516,28 @@ BOOL WINAPI ImmRegisterWordA( BOOL WINAPI ImmRegisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister) { - FIXME("(%p, %s, %d, %s): stub\n", - hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister) - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_w(lpszReading), dwStyle, + debugstr_w(lpszRegister)); + if (immHkl->hIME && immHkl->pImeRegisterWord) + { + if (is_kbd_ime_unicode(immHkl)) + return immHkl->pImeRegisterWord(lpszReading,dwStyle,lpszRegister); + else + { + LPSTR lpszaReading = strdupWtoA(lpszReading); + LPSTR lpszaRegister = strdupWtoA(lpszRegister); + BOOL rc; + + rc = immHkl->pImeRegisterWord((LPCWSTR)lpszaReading,dwStyle, + (LPCWSTR)lpszaRegister); + HeapFree(GetProcessHeap(),0,lpszaReading); + HeapFree(GetProcessHeap(),0,lpszaRegister); + return rc; + } + } + else + return FALSE; } /***********************************************************************

1 0

Aric Stewart : imm32: Implement ImmGetRegisterWordStyle using loaded IME.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: fb12a3ec7ac74dd80e00f4c4ed10a16ef475f69e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb12a3ec7ac74dd80e00f4c4e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 9 09:42:00 2008 -0500 imm32: Implement ImmGetRegisterWordStyle using loaded IME. --- dlls/imm32/imm.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 7f17b6f..831f3d2 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1294,9 +1294,26 @@ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) UINT WINAPI ImmGetRegisterWordStyleA( HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf) { - FIXME("(%p, %d, %p): stub\n", hKL, nItem, lpStyleBuf); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %d, %p):\n", hKL, nItem, lpStyleBuf); + if (immHkl->hIME && immHkl->pImeGetRegisterWordStyle) + { + if (!is_kbd_ime_unicode(immHkl)) + return immHkl->pImeGetRegisterWordStyle(nItem,(LPSTYLEBUFW)lpStyleBuf); + else + { + STYLEBUFW sbw; + UINT rc; + + rc = immHkl->pImeGetRegisterWordStyle(nItem,&sbw); + WideCharToMultiByte(CP_ACP, 0, sbw.szDescription, -1, + lpStyleBuf->szDescription, 32, NULL, NULL); + lpStyleBuf->dwStyle = sbw.dwStyle; + return rc; + } + } + else + return 0; } /*********************************************************************** @@ -1305,9 +1322,26 @@ UINT WINAPI ImmGetRegisterWordStyleA( UINT WINAPI ImmGetRegisterWordStyleW( HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf) { - FIXME("(%p, %d, %p): stub\n", hKL, nItem, lpStyleBuf); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %d, %p):\n", hKL, nItem, lpStyleBuf); + if (immHkl->hIME && immHkl->pImeGetRegisterWordStyle) + { + if (is_kbd_ime_unicode(immHkl)) + return immHkl->pImeGetRegisterWordStyle(nItem,lpStyleBuf); + else + { + STYLEBUFA sba; + UINT rc; + + rc = immHkl->pImeGetRegisterWordStyle(nItem,(LPSTYLEBUFW)&sba); + MultiByteToWideChar(CP_ACP, 0, sba.szDescription, -1, + lpStyleBuf->szDescription, 32); + lpStyleBuf->dwStyle = sba.dwStyle; + return rc; + } + } + else + return 0; } /***********************************************************************

1 0

Aric Stewart : imm32: Semi-stub implement ImmGetConversionList using loaded IME.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: f9414028cae05fdbd6abae02a57290b7ced81dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9414028cae05fdbd6abae02a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 9 09:41:43 2008 -0500 imm32: Semi-stub implement ImmGetConversionList using loaded IME. --- dlls/imm32/imm.c | 42 ++++++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 7bbb489..7f17b6f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1027,11 +1027,22 @@ DWORD WINAPI ImmGetConversionListA( LPCSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - FIXME("(%p, %p, %s, %p, %d, %d): stub\n", - hKL, hIMC, debugstr_a(pSrc), lpDst, dwBufLen, uFlag - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %p, %s, %p, %d, %d):\n", hKL, hIMC, debugstr_a(pSrc), lpDst, + dwBufLen, uFlag); + if (immHkl->hIME && immHkl->pImeConversionList) + { + if (!is_kbd_ime_unicode(immHkl)) + return immHkl->pImeConversionList(hIMC,(LPCWSTR)pSrc,lpDst,dwBufLen,uFlag); + else + { + FIXME("A procedure called with W ime back end\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } + } + else + return 0; } /*********************************************************************** @@ -1042,11 +1053,22 @@ DWORD WINAPI ImmGetConversionListW( LPCWSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - FIXME("(%p, %p, %s, %p, %d, %d): stub\n", - hKL, hIMC, debugstr_w(pSrc), lpDst, dwBufLen, uFlag - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %p, %s, %p, %d, %d):\n", hKL, hIMC, debugstr_w(pSrc), lpDst, + dwBufLen, uFlag); + if (immHkl->hIME && immHkl->pImeConversionList) + { + if (is_kbd_ime_unicode(immHkl)) + return immHkl->pImeConversionList(hIMC,pSrc,lpDst,dwBufLen,uFlag); + else + { + FIXME("W procedure called with A ime back end\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } + } + else + return 0; } /***********************************************************************

1 0

Aric Stewart : imm32: Semi-stub implement ImmEscape using loaded IME.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 35e148594e49db6a3f71158cc98c97ecbad28748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e148594e49db6a3f71158cc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 9 09:41:30 2008 -0500 imm32: Semi-stub implement ImmEscape using loaded IME. --- dlls/imm32/imm.c | 42 ++++++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 7510187..7bbb489 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -629,11 +629,22 @@ LRESULT WINAPI ImmEscapeA( HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) { - FIXME("(%p, %p, %d, %p): stub\n", - hKL, hIMC, uEscape, lpData - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %p, %d, %p):\n", hKL, hIMC, uEscape, lpData); + + if (immHkl->hIME && immHkl->pImeEscape) + { + if (!is_kbd_ime_unicode(immHkl)) + return immHkl->pImeEscape(hIMC,uEscape,lpData); + else + { + FIXME("A procedure called with W ime back end\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } + } + else + return 0; } /*********************************************************************** @@ -643,11 +654,22 @@ LRESULT WINAPI ImmEscapeW( HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) { - FIXME("(%p, %p, %d, %p): stub\n", - hKL, hIMC, uEscape, lpData - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %p, %d, %p):\n", hKL, hIMC, uEscape, lpData); + + if (immHkl->hIME && immHkl->pImeEscape) + { + if (is_kbd_ime_unicode(immHkl)) + return immHkl->pImeEscape(hIMC,uEscape,lpData); + else + { + FIXME("W procedure called with A ime back end\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } + } + else + return 0; } /***********************************************************************

1 0

Aric Stewart : imm32: Semi-stub implement ImmEnumRegisterWord using loaded IME.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 5818a0e7873e60cdcc2224afb2f3b3693df7938a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5818a0e7873e60cdcc2224afb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 9 09:41:15 2008 -0500 imm32: Semi-stub implement ImmEnumRegisterWord using loaded IME. --- dlls/imm32/imm.c | 48 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 1ffe559..7510187 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -576,13 +576,23 @@ UINT WINAPI ImmEnumRegisterWordA( LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister, LPVOID lpData) { - FIXME("(%p, %p, %s, %d, %s, %p): stub\n", - hKL, lpfnEnumProc, - debugstr_a(lpszReading), dwStyle, - debugstr_a(lpszRegister), lpData - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %p, %s, %d, %s, %p):\n", hKL, lpfnEnumProc, + debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister), lpData); + if (immHkl->hIME && immHkl->pImeEnumRegisterWord) + { + if (!is_kbd_ime_unicode(immHkl)) + return immHkl->pImeEnumRegisterWord((REGISTERWORDENUMPROCW)lpfnEnumProc, + (LPCWSTR)lpszReading, dwStyle, (LPCWSTR)lpszRegister, lpData); + else + { + FIXME("A procedure called with W ime back end\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } + } + else + return 0; } /*********************************************************************** @@ -593,13 +603,23 @@ UINT WINAPI ImmEnumRegisterWordW( LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister, LPVOID lpData) { - FIXME("(%p, %p, %s, %d, %s, %p): stub\n", - hKL, lpfnEnumProc, - debugstr_w(lpszReading), dwStyle, - debugstr_w(lpszRegister), lpData - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %p, %s, %d, %s, %p):\n", hKL, lpfnEnumProc, + debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister), lpData); + if (immHkl->hIME && immHkl->pImeEnumRegisterWord) + { + if (is_kbd_ime_unicode(immHkl)) + return immHkl->pImeEnumRegisterWord(lpfnEnumProc, lpszReading, dwStyle, + lpszRegister, lpData); + else + { + FIXME("W procedure called with A ime back end\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } + } + else + return 0; } /***********************************************************************

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008