April 2008 - Wine-commits - list.winehq.org

Rob Shearman : mshtml: Fix the buffer length being passed into MultiByteToWideChar in set_registry .
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: f07152d7b763aa736f9640e98f8cac91ac5bdf30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07152d7b763aa736f9640e98… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 10 12:01:52 2008 +0100 mshtml: Fix the buffer length being passed into MultiByteToWideChar in set_registry. --- dlls/mshtml/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index edb5f58..b991c49 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -113,7 +113,7 @@ static void set_registry(LPCSTR install_dir) len = MultiByteToWideChar(CP_ACP, 0, install_dir, -1, NULL, 0)-1; gecko_path = heap_alloc((len+1)*sizeof(WCHAR)+sizeof(wszWineGecko)); - MultiByteToWideChar(CP_ACP, 0, install_dir, -1, gecko_path, (len+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, install_dir, -1, gecko_path, len+1); if (len && gecko_path[len-1] != '\\') gecko_path[len++] = '\\';

1 0

Rob Shearman : mshtml: Support parsing the resource type in the res:// protocol.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: a5d47baba4073e83d8ace70233adbb05dac1a2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d47baba4073e83d8ace7023… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 10 12:01:48 2008 +0100 mshtml: Support parsing the resource type in the res:// protocol. --- dlls/mshtml/protocol.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index e338369..0b502ba 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -593,7 +593,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ResProtocol *This = PROTOCOL_THIS(iface); DWORD grfBINDF = 0, len; BINDINFO bindinfo; - LPWSTR url_dll, url_file, url, mime; + LPWSTR url_dll, url_file, url, mime, res_type = (LPWSTR)RT_HTML; HMODULE hdll; HRSRC src; HRESULT hres; @@ -636,13 +636,26 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, *url_file++ = 0; hdll = LoadLibraryExW(url_dll, NULL, LOAD_LIBRARY_AS_DATAFILE); if(!hdll) { - WARN("Could not open dll: %s\n", debugstr_w(url_dll)); - IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); - heap_free(url); - return HRESULT_FROM_WIN32(GetLastError()); + if (!(res_type = strrchrW(url_dll, '/'))) { + WARN("Could not open dll: %s\n", debugstr_w(url_dll)); + IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); + heap_free(url); + return HRESULT_FROM_WIN32(GetLastError()); + } + *res_type++ = 0; + + hdll = LoadLibraryExW(url_dll, NULL, LOAD_LIBRARY_AS_DATAFILE); + if(!hdll) { + WARN("Could not open dll: %s\n", debugstr_w(url_dll)); + IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); + heap_free(url); + return HRESULT_FROM_WIN32(GetLastError()); + } } - src = FindResourceW(hdll, url_file, (LPCWSTR)RT_HTML); + TRACE("trying to find resource type %s, name %s\n", debugstr_w(res_type), debugstr_w(url_file)); + + src = FindResourceW(hdll, url_file, res_type); if(!src) { LPWSTR endpoint = NULL; DWORD file_id = strtolW(url_file, &endpoint, 10);

1 0

Rob Shearman : shell32: Implement ParseDisplayName for EntireNetwork in the Network Places shell folder .
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 21b9a50e085f6de21476a5340c95ab2dbf0c28a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b9a50e085f6de21476a5340… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 10 12:01:38 2008 +0100 shell32: Implement ParseDisplayName for EntireNetwork in the Network Places shell folder. Add a test for this behaviour. --- dlls/shell32/pidl.c | 17 +++++++++ dlls/shell32/pidl.h | 1 + dlls/shell32/shfldr_netplaces.c | 47 ++++++++++++++++++++++--- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/shfldr_netplaces.c | 63 +++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 25602ae..cfab61f 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1570,6 +1570,23 @@ LPITEMIDLIST _ILCreateDrive(LPCWSTR lpszNew) return pidlOut; } +LPITEMIDLIST _ILCreateEntireNetwork(void) +{ + LPITEMIDLIST pidlOut; + + TRACE("\n"); + + pidlOut = _ILAlloc(PT_NETWORK, FIELD_OFFSET(PIDLDATA, u.network.szNames[sizeof("Entire Network")])); + if (pidlOut) + { + LPPIDLDATA pData = _ILGetDataPointer(pidlOut); + + pData->u.network.dummy = 0; + strcpy(pData->u.network.szNames, "Entire Network"); + } + return pidlOut; +} + /************************************************************************** * _ILGetDrive() * diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index 18935e8..18adb7d 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -255,6 +255,7 @@ LPITEMIDLIST _ILCreateNetwork (void); LPITEMIDLIST _ILCreateNetHood (void); LPITEMIDLIST _ILCreateBitBucket (void); LPITEMIDLIST _ILCreateDrive (LPCWSTR); +LPITEMIDLIST _ILCreateEntireNetwork (void); /* * helper functions (getting struct-pointer) diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 4e4a753..a4acfba 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -43,6 +43,7 @@ #include "shell32_main.h" #include "shresdef.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "debughlp.h" #include "shfldr.h" @@ -181,17 +182,53 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnParseDisplayName (IShellFolder2 * ifac HWND hwndOwner, LPBC pbcReserved, LPOLESTR lpszDisplayName, DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) { + static const WCHAR wszEntireNetwork[] = {'E','n','t','i','r','e','N','e','t','w','o','r','k'}; /* not nul-terminated */ IGenericSFImpl *This = (IGenericSFImpl *)iface; - - HRESULT hr = E_UNEXPECTED; + HRESULT hr = E_INVALIDARG; + LPCWSTR szNext = NULL; + WCHAR szElement[MAX_PATH]; + LPITEMIDLIST pidlTemp = NULL; + int len; TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", This, hwndOwner, pbcReserved, lpszDisplayName, debugstr_w (lpszDisplayName), pchEaten, ppidl, pdwAttributes); - *ppidl = 0; - if (pchEaten) - *pchEaten = 0; /* strange but like the original */ + *ppidl = NULL; + + szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); + len = strlenW(szElement); + if (len == sizeof(wszEntireNetwork)/sizeof(wszEntireNetwork[0]) && + !strncmpiW(szElement, wszEntireNetwork, sizeof(wszEntireNetwork)/sizeof(wszEntireNetwork[0]))) + { + pidlTemp = _ILCreateEntireNetwork(); + if (pidlTemp) + hr = S_OK; + else + hr = E_OUTOFMEMORY; + } + else + FIXME("not implemented for %s\n", debugstr_w(lpszDisplayName)); + + if (SUCCEEDED(hr) && pidlTemp) + { + if (szNext && *szNext) + { + hr = SHELL32_ParseNextElement(iface, hwndOwner, pbcReserved, + &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); + } + else + { + if (pdwAttributes && *pdwAttributes) + hr = SHELL32_GetItemAttributes(_IShellFolder_ (This), + pidlTemp, pdwAttributes); + } + } + + if (SUCCEEDED(hr)) + *ppidl = pidlTemp; + else + ILFree(pidlTemp); TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index 364bb3d..374f746 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -10,6 +10,7 @@ CTESTS = \ generated.c \ shelllink.c \ shellpath.c \ + shfldr_netplaces.c \ shlexec.c \ shlfileop.c \ shlfolder.c \ diff --git a/dlls/shell32/tests/shfldr_netplaces.c b/dlls/shell32/tests/shfldr_netplaces.c new file mode 100644 index 0000000..a2619f0 --- /dev/null +++ b/dlls/shell32/tests/shfldr_netplaces.c @@ -0,0 +1,63 @@ +/* + * Tests for My Network Places shell folder + * + * Copyright 2008 Robert Shearman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include "shellapi.h" +#include "shlobj.h" + +#include "wine/test.h" + +static void test_parse_for_entire_network(void) +{ + static const WCHAR entire_network_path[] = { + ':',':','{','2','0','8','D','2','C','6','0','-','3','A','E','A','-', + '1','0','6','9','-','A','2','D','7','-','0','8','0','0','2','B','3','0','3','0','9','D', + '}','\\','E','n','t','i','r','e','N','e','t','w','o','r','k',0 }; + IShellFolder *psfDesktop; + HRESULT hr; + DWORD eaten = 0xdeadbeef; + LPITEMIDLIST pidl; + DWORD attr = ~0; + DWORD expected_attr; + + hr = SHGetDesktopFolder(&psfDesktop); + ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%x\n", hr); + + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, (LPWSTR)entire_network_path, &eaten, &pidl, &attr); + ok(hr == S_OK, "IShellFolder_ParseDisplayName failed with error 0x%x\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten); + expected_attr = SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_STORAGEANCESTOR|SFGAO_HASPROPSHEET|SFGAO_CANLINK; + todo_wine + ok(attr == expected_attr, "attr should be 0x%x, not 0x%x\n", expected_attr, attr); + + ILFree(pidl); +} + + +START_TEST(shfldr_netplaces) +{ + test_parse_for_entire_network(); +}

1 0

Alexandre Julliard : user32/tests: Replace the keyboard flags bitfield by the official flag definitions.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: ac0db11459f7b1819cd5941c12e08e14c57da902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0db11459f7b1819cd5941c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 17:59:10 2008 +0200 user32/tests: Replace the keyboard flags bitfield by the official flag definitions. --- dlls/user32/tests/input.c | 41 ++++++++++------------------------------- 1 files changed, 10 insertions(+), 31 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14f32b9..0979e16 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -78,7 +78,7 @@ static const int GETVKEY[]={0, VK_MENU, VK_MENU, 'X', 'X', VK_SHIFT, VK_SHIFT, V /* matching scan codes */ static const int GETSCAN[]={0, 0x38, 0x38, 0x2D, 0x2D, 0x2A, 0x2A, 0x1D, 0x1D }; /* matching updown events */ -static const int GETUPDOWN[]={0, 0, KEYEVENTF_KEYUP, 0, KEYEVENTF_KEYUP, 0, KEYEVENTF_KEYUP, 0, KEYEVENTF_KEYUP}; +static const int GETFLAGS[]={0, 0, KEYEVENTF_KEYUP, 0, KEYEVENTF_KEYUP, 0, KEYEVENTF_KEYUP, 0, KEYEVENTF_KEYUP}; /* matching descripts */ static const char *getdesc[]={"", "+alt","-alt","+X","-X","+shift","-shift","+ctrl","-ctrl"}; @@ -98,7 +98,7 @@ typedef struct inputs[evtctr].type = INPUT_KEYBOARD; \ ((TEST_INPUT*)inputs)[evtctr].u.ki.wVk = GETVKEY[ kev]; \ ((TEST_INPUT*)inputs)[evtctr].u.ki.wScan = GETSCAN[ kev]; \ - ((TEST_INPUT*)inputs)[evtctr].u.ki.dwFlags = GETUPDOWN[ kev]; \ + ((TEST_INPUT*)inputs)[evtctr].u.ki.dwFlags = GETFLAGS[ kev]; \ ((TEST_INPUT*)inputs)[evtctr].u.ki.dwExtraInfo = 0; \ ((TEST_INPUT*)inputs)[evtctr].u.ki.time = ++timetag; \ if( kev) evtctr++; @@ -132,21 +132,6 @@ static BYTE InputKeyStateTable[256]; static BYTE AsyncKeyStateTable[256]; static BYTE TrackSysKey = 0; /* determine whether ALT key up will cause a WM_SYSKEYUP or a WM_KEYUP message */ -typedef union -{ - struct - { - unsigned long count : 16; - unsigned long code : 8; - unsigned long extended : 1; - unsigned long unused : 2; - unsigned long win_internal : 2; - unsigned long context : 1; - unsigned long previous : 1; - unsigned long transition : 1; - } lp1; - unsigned long lp2; -} KEYLP; static void init_function_pointers(void) { @@ -167,16 +152,12 @@ static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam ) { UINT message; int VKey = GETVKEY[kev]; - KEYLP keylp; - - keylp.lp2 = 0; + WORD flags; - keylp.lp1.count = 1; - keylp.lp1.code = GETSCAN[kev]; - keylp.lp1.extended = 0 ;/* FIXME (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) != 0; */ - keylp.lp1.win_internal = 0; + flags = LOBYTE(GETSCAN[kev]); + if (GETFLAGS[kev] & KEYEVENTF_EXTENDEDKEY) flags |= KF_EXTENDED; - if (GETUPDOWN[kev] & KEYEVENTF_KEYUP ) + if (GETFLAGS[kev] & KEYEVENTF_KEYUP ) { message = WM_KEYUP; if( (InputKeyStateTable[VK_MENU] & 0x80) && ( @@ -188,13 +169,11 @@ static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam ) TrackSysKey = 0; } InputKeyStateTable[VKey] &= ~0x80; - keylp.lp1.previous = 1; - keylp.lp1.transition = 1; + flags |= KF_REPEAT | KF_UP; } else { - keylp.lp1.previous = (InputKeyStateTable[VKey] & 0x80) != 0; - keylp.lp1.transition = 0; + if (InputKeyStateTable[VKey] & 0x80) flags |= KF_REPEAT; if (!(InputKeyStateTable[VKey] & 0x80)) InputKeyStateTable[VKey] ^= 0x01; InputKeyStateTable[VKey] |= 0x80; AsyncKeyStateTable[VKey] |= 0x80; @@ -207,9 +186,9 @@ static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam ) } } - keylp.lp1.context = (InputKeyStateTable[VK_MENU] & 0x80) != 0; /* 1 if alt */ + if (InputKeyStateTable[VK_MENU] & 0x80) flags |= KF_ALTDOWN; - if( plParam) *plParam = keylp.lp2; + if( plParam) *plParam = MAKELPARAM( 1, flags ); if( pwParam) *pwParam = VKey; return message; }

1 0

Alexandre Julliard : winex11: Replace the keyboard flags bitfield by the official flag definitions.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 8445841dcd4666315136b7818cd99aec4f27e2e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8445841dcd4666315136b7818… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 17:59:06 2008 +0200 winex11: Replace the keyboard flags bitfield by the official flag definitions. --- dlls/winex11.drv/keyboard.c | 79 ++++++++++++++----------------------------- 1 files changed, 26 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 587ff2a..882b98c 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -53,27 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(keyboard); WINE_DECLARE_DEBUG_CHANNEL(key); -typedef union -{ - struct - { -#ifndef BITFIELDS_BIGENDIAN - unsigned long count : 16; -#endif - unsigned long code : 8; - unsigned long extended : 1; - unsigned long unused : 2; - unsigned long win_internal : 2; - unsigned long context : 1; - unsigned long previous : 1; - unsigned long transition : 1; -#ifdef BITFIELDS_BIGENDIAN - unsigned long count : 16; -#endif - } lp1; - unsigned long lp2; -} KEYLP; - /* key state table bits: 0x80 -> key is pressed 0x40 -> key got pressed since last time @@ -1143,44 +1122,42 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) /*********************************************************************** * X11DRV_send_keyboard_input */ -void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time, +void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD time, DWORD dwExtraInfo, UINT injected_flags ) { UINT message; - KEYLP keylp; KBDLLHOOKSTRUCT hook; - WORD wVkStripped, wVkL, wVkR, vk_hook = wVk; + WORD flags, wVkStripped, wVkL, wVkR, vk_hook = wVk; wVk = LOBYTE(wVk); + flags = LOBYTE(wScan); - keylp.lp2 = 0; - keylp.lp1.count = 1; - keylp.lp1.code = wScan; - keylp.lp1.extended = (dwFlags & KEYEVENTF_EXTENDEDKEY) != 0; - keylp.lp1.win_internal = 0; /* this has something to do with dialogs, - * don't remember where I read it - AK */ - /* it's '1' under windows, when a dialog box appears - * and you press one of the underlined keys - DF*/ + if (event_flags & KEYEVENTF_EXTENDEDKEY) flags |= KF_EXTENDED; + /* FIXME: set KF_DLGMODE and KF_MENUMODE when needed */ /* strip left/right for menu, control, shift */ switch (wVk) { - case VK_MENU: case VK_LMENU: case VK_RMENU: - wVk = keylp.lp1.extended ? VK_RMENU : VK_LMENU; + case VK_MENU: + case VK_LMENU: + case VK_RMENU: + wVk = (event_flags & KEYEVENTF_EXTENDEDKEY) ? VK_RMENU : VK_LMENU; wVkStripped = VK_MENU; wVkL = VK_LMENU; wVkR = VK_RMENU; break; - - case VK_CONTROL: case VK_LCONTROL: case VK_RCONTROL: - wVk = keylp.lp1.extended ? VK_RCONTROL : VK_LCONTROL; + case VK_CONTROL: + case VK_LCONTROL: + case VK_RCONTROL: + wVk = (event_flags & KEYEVENTF_EXTENDEDKEY) ? VK_RCONTROL : VK_LCONTROL; wVkStripped = VK_CONTROL; wVkL = VK_LCONTROL; wVkR = VK_RCONTROL; break; - - case VK_SHIFT: case VK_LSHIFT: case VK_RSHIFT: - wVk = keylp.lp1.extended ? VK_RSHIFT : VK_LSHIFT; + case VK_SHIFT: + case VK_LSHIFT: + case VK_RSHIFT: + wVk = (event_flags & KEYEVENTF_EXTENDEDKEY) ? VK_RSHIFT : VK_LSHIFT; wVkStripped = VK_SHIFT; wVkL = VK_LSHIFT; wVkR = VK_RSHIFT; @@ -1189,8 +1166,7 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time wVkStripped = wVkL = wVkR = wVk; } - /* note that there is a test for all this */ - if (dwFlags & KEYEVENTF_KEYUP ) + if (event_flags & KEYEVENTF_KEYUP) { message = WM_KEYUP; if ((key_state_table[VK_MENU] & 0x80) && @@ -1202,14 +1178,10 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time message = WM_SYSKEYUP; TrackSysKey = 0; } - keylp.lp1.previous = 1; - keylp.lp1.transition = 1; + flags |= KF_REPEAT | KF_UP; } else { - keylp.lp1.previous = (key_state_table[wVk] & 0x80) != 0; - keylp.lp1.transition = 0; - message = WM_KEYDOWN; if ((key_state_table[VK_MENU] & 0x80 || wVkStripped == VK_MENU) && !(key_state_table[VK_CONTROL] & 0x80 || wVkStripped == VK_CONTROL)) @@ -1217,20 +1189,21 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time message = WM_SYSKEYDOWN; TrackSysKey = wVkStripped; } + if (key_state_table[wVk] & 0x80) flags |= KF_REPEAT; } TRACE_(key)(" wParam=%04x, lParam=%08lx, InputKeyState=%x\n", - wVk, keylp.lp2, key_state_table[wVk] ); + wVk, MAKELPARAM( 1, flags ), key_state_table[wVk] ); /* Hook gets whatever key was sent. */ hook.vkCode = vk_hook; hook.scanCode = wScan; - hook.flags = (keylp.lp2 >> 24) | injected_flags; + hook.flags = (flags >> 8) | injected_flags; hook.time = time; hook.dwExtraInfo = dwExtraInfo; if (HOOK_CallHooks( WH_KEYBOARD_LL, HC_ACTION, message, (LPARAM)&hook, TRUE )) return; - if (dwFlags & KEYEVENTF_KEYUP ) + if (event_flags & KEYEVENTF_KEYUP) { key_state_table[wVk] &= ~0x80; key_state_table[wVkStripped] = key_state_table[wVkL] | key_state_table[wVkR]; @@ -1242,9 +1215,9 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time key_state_table[wVkStripped] = key_state_table[wVkL] | key_state_table[wVkR]; } - keylp.lp1.context = (key_state_table[VK_MENU] & 0x80) != 0; /* 1 if alt */ + if (key_state_table[VK_MENU] & 0x80) flags |= KF_ALTDOWN; - if (wVkStripped == VK_SHIFT) keylp.lp1.extended = 0; + if (wVkStripped == VK_SHIFT) flags &= ~KF_EXTENDED; SERVER_START_REQ( send_hardware_message ) { @@ -1252,7 +1225,7 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time req->win = 0; req->msg = message; req->wparam = wVk; - req->lparam = keylp.lp2; + req->lparam = MAKELPARAM( 1 /* repeat count */, flags ); req->x = cursor_pos.x; req->y = cursor_pos.y; req->time = time;

1 0

Alexandre Julliard : user32: Moved the menu activation hack on managed windows to the X11 driver.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: eb857aebebb138d9fc3e711b9f2943fab5c1ef79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb857aebebb138d9fc3e711b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 16:41:26 2008 +0200 user32: Moved the menu activation hack on managed windows to the X11 driver. --- dlls/user32/menu.c | 8 +------- dlls/winex11.drv/winpos.c | 9 +++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 2efc415..7a14d87 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3365,13 +3365,7 @@ void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar) MENU_SelectItem( hwnd, hTrackMenu, uItem, TRUE, 0 ); - if (wParam & HTSYSMENU && wChar != ' ') - { - /* prevent sysmenu activation for managed windows on Alt down/up */ - if (GetPropA( hwnd, "__wine_x11_managed" )) - wFlags |= TF_ENDMENU; /* schedule end of menu tracking */ - } - else + if (!(wParam & HTSYSMENU) || wChar == ' ') { if( uItem == NO_SELECTED_ITEM ) MENU_MoveSelection( hwnd, hTrackMenu, ITEM_NEXT ); diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index f5b27f0..b12ded1 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -752,6 +752,15 @@ LRESULT X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) } break; + case SC_KEYMENU: + /* prevent a simple ALT press+release from activating the system menu, + * as that can get confusing on managed windows */ + if ((WCHAR)lparam) return -1; /* got an explicit char */ + if (GetMenu( hwnd )) return -1; /* window has a real menu */ + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_SYSMENU)) return -1; /* no system menu */ + TRACE( "ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam ); + return 0; + default: return -1; }

1 0

Alexandre Julliard : user32: Forward all WM_SYSCOMMAND messages to the driver, not only moves and resizes.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: fa677c7f72319a61ae47d9d308629d86eeb4cf7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa677c7f72319a61ae47d9d30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 15:43:24 2008 +0200 user32: Forward all WM_SYSCOMMAND messages to the driver, not only moves and resizes. --- dlls/user32/driver.c | 14 ++++++------ dlls/user32/nonclient.c | 3 ++ dlls/user32/user_private.h | 2 +- dlls/user32/winpos.c | 2 - dlls/winex11.drv/winex11.drv.spec | 2 +- dlls/winex11.drv/winpos.c | 41 ++++++++++++++++++++---------------- 6 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 1251ee4..bdca8f9 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -120,7 +120,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(SetWindowIcon); GET_USER_FUNC(SetWindowStyle); GET_USER_FUNC(SetWindowText); - GET_USER_FUNC(SysCommandSizeMove); + GET_USER_FUNC(SysCommand); GET_USER_FUNC(WindowMessage); #undef GET_USER_FUNC } @@ -400,9 +400,9 @@ static void nulldrv_SetWindowText( HWND hwnd, LPCWSTR text ) { } -static BOOL nulldrv_SysCommandSizeMove( HWND hwnd, WPARAM wparam ) +static LRESULT nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) { - return FALSE; + return -1; } static LRESULT nulldrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) @@ -466,7 +466,7 @@ static const USER_DRIVER null_driver = nulldrv_SetWindowIcon, nulldrv_SetWindowStyle, nulldrv_SetWindowText, - nulldrv_SysCommandSizeMove, + nulldrv_SysCommand, nulldrv_WindowMessage }; @@ -726,9 +726,9 @@ static void loaderdrv_SetWindowText( HWND hwnd, LPCWSTR text ) load_driver()->pSetWindowText( hwnd, text ); } -static BOOL loaderdrv_SysCommandSizeMove( HWND hwnd, WPARAM wparam ) +static LRESULT loaderdrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) { - return load_driver()->pSysCommandSizeMove( hwnd, wparam ); + return load_driver()->pSysCommand( hwnd, wparam, lparam ); } static LRESULT loaderdrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) @@ -792,6 +792,6 @@ static const USER_DRIVER lazy_load_driver = loaderdrv_SetWindowIcon, loaderdrv_SetWindowStyle, loaderdrv_SetWindowText, - loaderdrv_SysCommandSizeMove, + loaderdrv_SysCommand, loaderdrv_WindowMessage }; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index a5f5064..729a901 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1533,6 +1533,9 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) if (HOOK_CallHooks( WH_CBT, HCBT_SYSCOMMAND, wParam, lParam, TRUE )) return 0; + if (!USER_Driver->pSysCommand( hwnd, wParam, lParam )) + return 0; + switch (wParam & 0xfff0) { case SC_SIZE: diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index adf4ca4..9ffdb21 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -156,7 +156,7 @@ typedef struct tagUSER_DRIVER { void (*pSetWindowIcon)(HWND,UINT,HICON); void (*pSetWindowStyle)(HWND,DWORD); void (*pSetWindowText)(HWND,LPCWSTR); - BOOL (*pSysCommandSizeMove)(HWND,WPARAM); + LRESULT (*pSysCommand)(HWND,WPARAM,LPARAM); LRESULT (*pWindowMessage)(HWND,UINT,WPARAM,LPARAM); } USER_DRIVER; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5d346ee..6914ec0 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2381,8 +2381,6 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) TRACE("hwnd %p command %04lx, hittest %d, pos %d,%d\n", hwnd, syscommand, hittest, pt.x, pt.y); - if (USER_Driver->pSysCommandSizeMove( hwnd, wParam )) return; - if (syscommand == SC_MOVE) { if (!hittest) hittest = start_size_move( hwnd, wParam, &capturePoint, style ); diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 4ad3f3d..959721d 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -112,7 +112,7 @@ @ cdecl SetWindowRgn(long long long) X11DRV_SetWindowRgn @ cdecl SetWindowStyle(ptr long) X11DRV_SetWindowStyle @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText -@ cdecl SysCommandSizeMove(long long) X11DRV_SysCommandSizeMove +@ cdecl SysCommand(long long) X11DRV_SysCommand @ cdecl WindowMessage(long long long long) X11DRV_WindowMessage # WinTab32 diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 81fb93d..f5b27f0 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -712,13 +712,12 @@ static BOOL is_netwm_supported( Display *display, Atom atom ) /*********************************************************************** - * SysCommandSizeMove (X11DRV.@) + * SysCommand (X11DRV.@) * - * Perform SC_MOVE and SC_SIZE commands. + * Perform WM_SYSCOMMAND handling. */ -BOOL X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wparam ) +LRESULT X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) { - WPARAM syscommand = wparam & 0xfff0; WPARAM hittest = wparam & 0x0f; DWORD dwPoint; int x, y, dir; @@ -726,24 +725,18 @@ BOOL X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wparam ) Display *display = thread_display(); struct x11drv_win_data *data; - if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; - if (!data->whole_window || !data->managed) return FALSE; + if (!(data = X11DRV_get_win_data( hwnd ))) return -1; + if (!data->whole_window || !data->managed || !data->mapped) return -1; - if (!is_netwm_supported( display, x11drv_atom(_NET_WM_MOVERESIZE) )) - { - TRACE( "_NET_WM_MOVERESIZE not supported\n" ); - return FALSE; - } - - if (syscommand == SC_MOVE) + switch (wparam & 0xfff0) { + case SC_MOVE: if (!hittest) dir = _NET_WM_MOVERESIZE_MOVE_KEYBOARD; else dir = _NET_WM_MOVERESIZE_MOVE; - } - else - { + break; + case SC_SIZE: /* windows without WS_THICKFRAME are not resizable through the window manager */ - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_THICKFRAME)) return FALSE; + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_THICKFRAME)) return -1; switch (hittest) { @@ -757,6 +750,18 @@ BOOL X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wparam ) case WMSZ_BOTTOMRIGHT: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT; break; default: dir = _NET_WM_MOVERESIZE_SIZE_KEYBOARD; break; } + break; + + default: + return -1; + } + + if (IsZoomed(hwnd)) return -1; + + if (!is_netwm_supported( display, x11drv_atom(_NET_WM_MOVERESIZE) )) + { + TRACE( "_NET_WM_MOVERESIZE not supported\n" ); + return -1; } dwPoint = GetMessagePos(); @@ -784,5 +789,5 @@ BOOL X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wparam ) XUngrabPointer( display, CurrentTime ); XSendEvent(display, root_window, False, SubstructureNotifyMask, &xev); wine_tsx11_unlock(); - return TRUE; + return 0; }

1 0

Alexandre Julliard : comctl32: Get rid of the hack to remove size grips on managed windows.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 9bcdc46e9d70a6303ad70c793c96673def38214a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcdc46e9d70a6303ad70c793… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 14:47:44 2008 +0200 comctl32: Get rid of the hack to remove size grips on managed windows. --- dlls/comctl32/status.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index e704635..464e650 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -984,12 +984,6 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) dwStyle = GetWindowLongW (hwnd, GWL_STYLE); /* native seems to clear WS_BORDER, too */ dwStyle &= ~WS_BORDER; - - /* statusbars on managed windows should not have SIZEGRIP style */ - if ((dwStyle & SBARS_SIZEGRIP) && lpCreate->hwndParent && - GetPropA( lpCreate->hwndParent, "__wine_x11_managed" )) - dwStyle &= ~SBARS_SIZEGRIP; - SetWindowLongW (hwnd, GWL_STYLE, dwStyle); if ((hdc = GetDC (hwnd))) {

1 0

Alexandre Julliard : winex11: Make sure to flush painting operations before moving a window.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 70ef99e5e115078d7d3ece8b04aabb94f701e167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ef99e5e115078d7d3ece8b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 14:47:19 2008 +0200 winex11: Make sure to flush painting operations before moving a window. --- dlls/winex11.drv/window.c | 9 +-------- dlls/winex11.drv/winpos.c | 9 ++++++++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index cc4ff7d..ac70c85 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -549,6 +549,7 @@ static void sync_gl_drawable(Display *display, struct x11drv_win_data *data) data->pixmap = pix; data->gl_drawable = glxp; + XFlush( display ); wine_tsx11_unlock(); SetPropA(data->hwnd, gl_drawable_prop, (HANDLE)data->gl_drawable); @@ -1020,14 +1021,6 @@ void X11DRV_sync_client_position( Display *display, struct x11drv_win_data *data } if (data->gl_drawable && (mask & (CWWidth|CWHeight))) sync_gl_drawable( display, data ); - - /* make sure the changes get to the server before we start painting */ - if (data->client_window || data->gl_drawable) - { - wine_tsx11_lock(); - XFlush(display); - wine_tsx11_unlock(); - } } diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 2ae0aba..81fb93d 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -235,7 +235,6 @@ static void map_window( Display *display, struct x11drv_win_data *data, DWORD ne X11DRV_sync_window_style( display, data ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); - XFlush( display ); wine_tsx11_unlock(); } else set_xembed_flags( display, data, XEMBED_MAPPED ); @@ -471,6 +470,10 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, move_window_bits( data, &valid_rects[1], &valid_rects[0], &old_client_rect ); } + wine_tsx11_lock(); + XFlush( gdi_display ); /* make sure painting is done before we move the window */ + wine_tsx11_unlock(); + X11DRV_sync_client_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); if (!data->whole_window) return; @@ -519,6 +522,10 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, update_net_wm_states( display, data ); } } + + wine_tsx11_lock(); + XFlush( display ); /* make sure changes are done before we start painting again */ + wine_tsx11_unlock(); }

1 0

Kusanagi Kouichi : winex11: Connect to XIM server dynamically.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 185157cb6eb25bc5e75e9a260b593e98153d2255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=185157cb6eb25bc5e75e9a260… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Apr 4 20:44:36 2008 +0900 winex11: Connect to XIM server dynamically. --- dlls/winex11.drv/window.c | 9 ++--- dlls/winex11.drv/x11drv.h | 14 ++++---- dlls/winex11.drv/x11drv_main.c | 2 +- dlls/winex11.drv/xim.c | 63 ++++++++++++++++++++++++++++++++++++---- 4 files changed, 69 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4d5da02..cc4ff7d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1040,7 +1040,6 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat { int cx, cy, mask; XSetWindowAttributes attr; - XIM xim; WCHAR text[1024]; HRGN hrgn; @@ -1080,9 +1079,6 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat return 0; } - xim = x11drv_thread_data()->xim; - if (xim) data->xic = X11DRV_CreateIC( xim, display, data->whole_window ); - set_initial_wm_hints( display, data ); X11DRV_set_wm_hints( display, data ); @@ -1404,9 +1400,12 @@ Window X11DRV_get_client_window( HWND hwnd ) XIC X11DRV_get_ic( HWND hwnd ) { struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + XIM xim; if (!data) return 0; - return data->xic; + if (data->xic) return data->xic; + if (!(xim = x11drv_thread_data()->xim)) return 0; + return X11DRV_CreateIC( xim, data ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d6b2b20..939872f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -273,13 +273,6 @@ extern void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev); extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev); extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap); -/* XIM support */ -extern BOOL X11DRV_InitXIM( const char *input_style ); -extern XIC X11DRV_CreateIC(XIM xim, Display *display, Window win); -extern XIM X11DRV_SetupXIM(Display *display); -extern void X11DRV_XIMLookupChars( const char *str, DWORD count ); -extern void X11DRV_ForceXIMReset(HWND hwnd); - /* IME support */ extern void IME_RegisterClasses(HINSTANCE hImeInst); extern void IME_UnregisterClasses(HINSTANCE hImeInst); @@ -772,6 +765,13 @@ LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name, extern void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem); +/* XIM support */ +extern BOOL X11DRV_InitXIM( const char *input_style ); +extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data); +extern void X11DRV_SetupXIM(void); +extern void X11DRV_XIMLookupChars( const char *str, DWORD count ); +extern void X11DRV_ForceXIMReset(HWND hwnd); + /* FIXME: private functions imported from user32 */ extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ); extern void WIN_invalidate_dce( HWND hwnd, const RECT *rect ); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 1c221bc..b9378c8 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -653,7 +653,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) set_queue_display_fd( data->display ); TlsSetValue( thread_data_tls_index, data ); - if (use_xim) data->xim = X11DRV_SetupXIM( data->display ); + if (use_xim) X11DRV_SetupXIM(); X11DRV_SetCursor( NULL ); return data; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index f389db7..d4df9f7 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -358,15 +358,31 @@ BOOL X11DRV_InitXIM( const char *input_style ) } +static void X11DRV_OpenIM(Display *display, XPointer p, XPointer data); + +static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + TRACE("xim = %p, p = %p\n", xim, p); + thread_data->xim = NULL; + ximStyle = 0; + wine_tsx11_lock(); + XRegisterIMInstantiateCallback( thread_data->display, NULL, NULL, NULL, X11DRV_OpenIM, NULL ); + wine_tsx11_unlock(); +} + /*********************************************************************** * X11DRV Ime creation */ -XIM X11DRV_SetupXIM( Display *display ) +static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); XIMStyle ximStyleCallback, ximStyleNone; XIMStyles *ximStyles = NULL; INT i; XIM xim; + XIMCallback destroy; wine_tsx11_lock(); @@ -374,9 +390,18 @@ XIM X11DRV_SetupXIM( Display *display ) if (xim == NULL) { WARN("Could not open input method.\n"); - goto err; + wine_tsx11_unlock(); + return; } + destroy.client_data = NULL; + destroy.callback = X11DRV_DestroyIM; + if (XSetIMValues(xim, XNDestroyCallback, &destroy, NULL)) + { + WARN("Could not set destroy callback.\n"); + } + + TRACE("xim = %p\n", xim); TRACE("X display of IM = %p\n", XDisplayOfIM(xim)); TRACE("Using %s locale of Input Method\n", XLocaleOfIM(xim)); @@ -384,6 +409,9 @@ XIM X11DRV_SetupXIM( Display *display ) if (ximStyles == 0) { WARN("Could not find supported input style.\n"); + XCloseIM(xim); + wine_tsx11_unlock(); + return; } else { @@ -443,29 +471,45 @@ XIM X11DRV_SetupXIM( Display *display ) } + thread_data->xim = xim; + XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, NULL); wine_tsx11_unlock(); IME_XIMPresent(TRUE); IME_UpdateAssociation(NULL); +} - return xim; -err: +void X11DRV_SetupXIM(void) +{ + wine_tsx11_lock(); + XRegisterIMInstantiateCallback(thread_display(), NULL, NULL, NULL, X11DRV_OpenIM, NULL); wine_tsx11_unlock(); - return NULL; } +static BOOL X11DRV_DestroyIC(XIC xic, XPointer p, XPointer data) +{ + struct x11drv_win_data *win_data = (struct x11drv_win_data *)p; + TRACE("xic = %p, win = %lx\n", xic, win_data->whole_window); + win_data->xic = NULL; + return TRUE; +} -XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) + +XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) { XPoint spot = {0}; XVaNestedList preedit = NULL; XVaNestedList status = NULL; XIC xic; + XICCallback destroy = {(XPointer)data, X11DRV_DestroyIC}; XIMCallback P_StartCB; XIMCallback P_DoneCB; XIMCallback P_DrawCB; XIMCallback P_CaretCB; LANGID langid = PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())); + Window win = data->whole_window; + + TRACE("xim = %p\n", xim); wine_tsx11_lock(); @@ -478,8 +522,10 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) XNInputStyle, XIMPreeditNothing | XIMStatusNothing, XNClientWindow, win, XNFocusWindow, win, + XNDestroyCallback, &destroy, NULL); wine_tsx11_unlock(); + data->xic = xic; return xic; } @@ -531,6 +577,7 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) XNStatusAttributes, status, XNClientWindow, win, XNFocusWindow, win, + XNDestroyCallback, &destroy, NULL); } else if (preedit != NULL) @@ -540,6 +587,7 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) XNPreeditAttributes, preedit, XNClientWindow, win, XNFocusWindow, win, + XNDestroyCallback, &destroy, NULL); } else if (status != NULL) @@ -549,6 +597,7 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) XNStatusAttributes, status, XNClientWindow, win, XNFocusWindow, win, + XNDestroyCallback, &destroy, NULL); } else @@ -557,10 +606,12 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) XNInputStyle, ximStyle, XNClientWindow, win, XNFocusWindow, win, + XNDestroyCallback, &destroy, NULL); } TRACE("xic = %p\n", xic); + data->xic = xic; if (preedit != NULL) XFree(preedit);

1 0