wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Rémi Bernon : dinput: Use the base device state in the mouse device.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 50d60884b50b1ba5d1dd939984b9cbb6a9f5f2d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50d60884b50b1ba5d1dd9399… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:04 2021 +0200 dinput: Use the base device state in the mouse device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 116 +++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50d60884b50b1ba5d1dd…

1 0

Rémi Bernon : dinput: Implement GetProperty with DIPROP_FFGAIN stub.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 7402568a45c914cb16eca7f8d576146539e1efed URL: https://source.winehq.org/git/wine.git/?a=commit;h=7402568a45c914cb16eca7f8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:03 2021 +0200 dinput: Implement GetProperty with DIPROP_FFGAIN stub. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 7 +++++++ dlls/dinput8/tests/device.c | 4 ---- dlls/dinput8/tests/hid.c | 4 ---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 75ca6676bec..54645fa995e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1280,6 +1280,13 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface } return S_FALSE; } + case (DWORD_PTR)DIPROP_FFGAIN: + { + DIPROPDWORD *value = (DIPROPDWORD *)header; + if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; + value->dwData = 10000; + return DI_OK; + } case (DWORD_PTR)DIPROP_CALIBRATION: return DIERR_INVALIDPARAM; default: diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 9f331c1b84c..4492170673e 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -1315,9 +1315,7 @@ static void test_mouse_info(void) ok( prop_dword.dwData == 0, "got %#x expected %#x\n", prop_dword.dwData, 0 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_FFGAIN returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIMouse2 ); @@ -1638,9 +1636,7 @@ static void test_keyboard_info(void) ok( prop_dword.dwData == 0, "got %#x expected %#x\n", prop_dword.dwData, 0 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_FFGAIN returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIKeyboard ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 8bb463b2fd7..b23d3a6bfd8 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3992,9 +3992,7 @@ static void test_simple_joystick(void) ok( prop_dword.dwData == 0, "got %#x expected %#x\n", prop_dword.dwData, 0 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_FFGAIN returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_CALIBRATION, &prop_dword.diph ); @@ -7143,9 +7141,7 @@ static void test_force_feedback_joystick( void ) prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_FFGAIN returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph );

1 0

Rémi Bernon : dinput: Factor all GetProperty implementations together.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 3ec4ae839058512e693f5a7b657c7b143f1449da URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ec4ae839058512e693f5a7b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:02 2021 +0200 dinput: Factor all GetProperty implementations together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 128 +++++++++++++++++++++++++++++-------------- dlls/dinput/device_private.h | 2 + dlls/dinput/joystick_hid.c | 105 ++++++++++------------------------- dlls/dinput/keyboard.c | 58 ++++++-------------- dlls/dinput/mouse.c | 85 +++++++++------------------- dlls/dinput8/tests/device.c | 35 ------------ dlls/dinput8/tests/hid.c | 1 - 7 files changed, 160 insertions(+), 254 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ec4ae839058512e693f…

1 0

Rémi Bernon : dinput: Use object instance offset to access extra value caps.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: f091aeae50a1fa79b29110965ddd31d63c6a4ed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f091aeae50a1fa79b2911096… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:01 2021 +0200 dinput: Use object instance offset to access extra value caps. Value objects are always enumerated first, so offset / sizeof(LONG) can be safely used to index input_extra_caps array. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 89 +++++++++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f091aeae50a1fa79b291…

1 0

Esme Povirk : localspl: Choose print environment based on architecture.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 6e14766ad517cd8387c649d9958f376fbcdc808c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e14766ad517cd8387c649d9… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Oct 18 11:31:13 2021 -0500 localspl: Choose print environment based on architecture. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51815 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 14 +++++++++++++- dlls/winspool.drv/info.c | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index d7c1464ef2c..aded4ed44c4 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -256,6 +256,18 @@ static const printenv_t env_win40 = {L"Windows 4.0", L"win40", 0, static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_arm, &env_arm64, &env_win40}; +#ifdef __i386__ +#define env_arch env_x86 +#elif defined __x86_64__ +#define env_arch env_x64 +#elif defined __arm__ +#define env_arch env_arm +#elif defined __aarch64__ +#define env_arch env_arm64 +#else +#error not defined for this cpu +#endif + static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W), sizeof(DRIVER_INFO_3W), sizeof(DRIVER_INFO_4W), @@ -922,7 +934,7 @@ static const printenv_t * validate_envW(LPCWSTR env) } else { - result = (GetVersion() & 0x80000000) ? &env_win40 : &env_x86; + result = (GetVersion() & 0x80000000) ? &env_win40 : &env_arch; } TRACE("=> using %p: %s\n", result, debugstr_w(result ? result->envname : NULL)); diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 74617537a6b..660a5afe74d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -320,6 +320,18 @@ static const printenv_t env_win40 = {envname_win40W, subdir_win40W, 0, Version0_ static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_arm, &env_arm64, &env_win40}; +#ifdef __i386__ +#define env_arch env_x86 +#elif defined __x86_64__ +#define env_arch env_x64 +#elif defined __arm__ +#define env_arch env_arm +#elif defined __aarch64__ +#define env_arch env_arm64 +#else +#error not defined for this cpu +#endif + /****************************************************************** * validate the user-supplied printing-environment [internal] * @@ -361,7 +373,7 @@ static const printenv_t * validate_envW(LPCWSTR env) } else { - result = (GetVersion() & 0x80000000) ? &env_win40 : &env_x86; + result = (GetVersion() & 0x80000000) ? &env_win40 : &env_arch; } TRACE("using %p: %s\n", result, debugstr_w(result ? result->envname : NULL));

1 0

Esme Povirk : localspl: Add ARM print environments.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 0d05b01ce46fe0e3eb7fa667decac8e849735784 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d05b01ce46fe0e3eb7fa667… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Oct 18 11:31:12 2021 -0500 localspl: Add ARM print environments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51815 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 8 +++++++- dlls/winspool.drv/info.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index c17983e3037..d7c1464ef2c 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -245,10 +245,16 @@ static const printenv_t env_x86 = {x86_envnameW, L"w32x86", 3, static const printenv_t env_x64 = {L"Windows x64", L"x64", 3, L"\\Version-3", L"\\3"}; +static const printenv_t env_arm = {L"Windows ARM", L"arm", 3, + L"\\Version-3", L"\\3"}; + +static const printenv_t env_arm64 = {L"Windows ARM64", L"arm64", 3, + L"\\Version-3", L"\\3"}; + static const printenv_t env_win40 = {L"Windows 4.0", L"win40", 0, L"\\Version-0", L"\\0"}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_arm, &env_arm64, &env_win40}; static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W), diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index edfdab218c4..74617537a6b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -232,9 +232,13 @@ static const WCHAR WinNT_CV_PrinterPortsW[] = { 'S','o','f','t','w','a','r','e', static WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR envname_x64W[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; +static const WCHAR envname_armW[] = {'W','i','n','d','o','w','s',' ','A','R','M',0}; +static const WCHAR envname_arm64W[] = {'W','i','n','d','o','w','s',' ','A','R','M','6','4',0}; static const WCHAR subdir_win40W[] = {'w','i','n','4','0',0}; static const WCHAR subdir_x64W[] = {'x','6','4',0}; static const WCHAR subdir_x86W[] = {'w','3','2','x','8','6',0}; +static const WCHAR subdir_armW[] = {'a','r','m',0}; +static const WCHAR subdir_arm64W[] = {'a','r','m','6','4',0}; static const WCHAR Version0_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; static const WCHAR Version0_SubdirW[] = {'\\','0',0}; static const WCHAR Version3_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; @@ -310,9 +314,11 @@ static const DWORD pi_sizeof[] = {0, sizeof(PRINTER_INFO_1W), sizeof(PRINTER_INF static const printenv_t env_x64 = {envname_x64W, subdir_x64W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_x86 = {envname_x86W, subdir_x86W, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_arm = {envname_armW, subdir_armW, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_arm64 = {envname_arm64W, subdir_arm64W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_win40 = {envname_win40W, subdir_win40W, 0, Version0_RegPathW, Version0_SubdirW}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_arm, &env_arm64, &env_win40}; /****************************************************************** * validate the user-supplied printing-environment [internal]

1 0

Florian Eder : robocopy: Add stub.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 530c1839603bd3caa1b9d17fe458b5bd341ccfc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=530c1839603bd3caa1b9d17f… Author: Florian Eder <others.meder(a)gmail.com> Date: Sat Oct 16 11:13:40 2021 +0000 robocopy: Add stub. Signed-off-by: Florian Eder <others.meder(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/robocopy/Makefile.in | 8 ++++++++ programs/robocopy/main.c | 30 ++++++++++++++++++++++++++++++ programs/robocopy/robocopy.rc | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 75 insertions(+) diff --git a/configure b/configure index 131d0e9798f..4a7a4ccd76f 100755 --- a/configure +++ b/configure @@ -1847,6 +1847,7 @@ enable_regedit enable_regini enable_regsvcs enable_regsvr32 +enable_robocopy enable_rpcss enable_rundll32 enable_sc @@ -20920,6 +20921,7 @@ wine_fn_config_makefile programs/regedit/tests enable_tests wine_fn_config_makefile programs/regini enable_regini wine_fn_config_makefile programs/regsvcs enable_regsvcs wine_fn_config_makefile programs/regsvr32 enable_regsvr32 +wine_fn_config_makefile programs/robocopy enable_robocopy wine_fn_config_makefile programs/rpcss enable_rpcss wine_fn_config_makefile programs/rundll.exe16 enable_win16 wine_fn_config_makefile programs/rundll32 enable_rundll32 diff --git a/configure.ac b/configure.ac index 76e69bb41ec..ba20ac1e3b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3862,6 +3862,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests) WINE_CONFIG_MAKEFILE(programs/regini) WINE_CONFIG_MAKEFILE(programs/regsvcs) WINE_CONFIG_MAKEFILE(programs/regsvr32) +WINE_CONFIG_MAKEFILE(programs/robocopy) WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) diff --git a/programs/robocopy/Makefile.in b/programs/robocopy/Makefile.in new file mode 100644 index 00000000000..f5d9dff6e4d --- /dev/null +++ b/programs/robocopy/Makefile.in @@ -0,0 +1,8 @@ +MODULE = robocopy.exe + +EXTRADLLFLAGS = -mconsole -municode + +C_SRCS = \ + main.c + +RC_SRCS = robocopy.rc diff --git a/programs/robocopy/main.c b/programs/robocopy/main.c new file mode 100644 index 00000000000..5e2ca5c0f01 --- /dev/null +++ b/programs/robocopy/main.c @@ -0,0 +1,30 @@ +/* + * Copyright 2021 Florian Eder + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(robocopy); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + FIXME("robocopy stub\n"); + return 16; +} diff --git a/programs/robocopy/robocopy.rc b/programs/robocopy/robocopy.rc new file mode 100644 index 00000000000..ffd5f770b1b --- /dev/null +++ b/programs/robocopy/robocopy.rc @@ -0,0 +1,34 @@ +/* + * Copyright 2021 Florian Eder + * + * 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 <windef.h> + +#pragma makedep po + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Robocopy" +#define WINE_FILENAME_STR "robocopy.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 5,1,10,1027 +#define WINE_FILEVERSION_STR "5.1.10.1027" + +#define WINE_PRODUCTVERSION 5,1,10,1027 +#define WINE_PRODUCTVERSION_STR "5.1.10.1027" + +#include "wine/wine_common_ver.rc"

1 0

Piotr Caban : imm32: Only call ImmSetActiveContext for focused window in ImmAssociateContext.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: f84d88d44ae377f91d8586937cd365db29558e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f84d88d44ae377f91d858693… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 16 21:21:18 2021 +0200 imm32: Only call ImmSetActiveContext for focused window in ImmAssociateContext. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 2 +- dlls/imm32/tests/imm32.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 1230c2e2b95..fa2399487a4 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -771,7 +771,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) else SetPropW(hWnd, szwWineIMCProperty, hIMC); - if (GetActiveWindow() == hWnd) + if (GetFocus() == hWnd) { ImmSetActiveContext(hWnd, old, FALSE); ImmSetActiveContext(hWnd, hIMC, TRUE); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 1d2ae6dd0a1..cb49478e390 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -207,7 +207,7 @@ static void msg_spy_cleanup(void) { static const char wndcls[] = "winetest_imm32_wndcls"; static enum { PHASE_UNKNOWN, FIRST_WINDOW, SECOND_WINDOW, CREATE_CANCEL, NCCREATE_CANCEL, IME_DISABLED } test_phase; -static HWND hwnd; +static HWND hwnd, child; static HWND get_ime_window(void); @@ -326,6 +326,10 @@ static BOOL init(void) { if (!hwnd) return FALSE; + child = CreateWindowA("edit", "edit", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, 0, 0, 0); + if (!child) + return FALSE; + ShowWindow(hwnd, SW_SHOWNORMAL); UpdateWindow(hwnd); @@ -726,9 +730,21 @@ static void test_ImmAssociateContextEx(void) SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); DestroyWindow(focus); CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); + + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SetFocus(child); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + rc = pImmAssociateContextEx(hwnd, newimc, 0); + ok(rc, "ImmAssociateContextEx failed\n"); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); SetFocus(hwnd); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); rc = pImmAssociateContextEx(hwnd, NULL, IACE_DEFAULT); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); ok(rc, "ImmAssociateContextEx failed\n"); SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, FALSE);

1 0

Piotr Caban : user32: Set IMM active context on focus change.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 374ad339048e73269d9590ed3438e959179fee09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=374ad339048e73269d9590ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 16 21:21:13 2021 +0200 user32: Set IMM active context on focus change. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 11 +++++++++-- dlls/user32/focus.c | 13 ++++++++++++- dlls/user32/misc.c | 30 ++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 3 +++ 4 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 9e0e59d384d..1d2ae6dd0a1 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -720,12 +720,12 @@ static void test_ImmAssociateContextEx(void) ok(focus != NULL, "CreateWindow failed\n"); SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); SetFocus(focus); - todo_wine CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); rc = pImmAssociateContextEx(hwnd, imc, 0); ok(rc, "ImmAssociateContextEx failed\n"); SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); DestroyWindow(focus); - todo_wine CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); SetFocus(hwnd); rc = pImmAssociateContextEx(hwnd, NULL, IACE_DEFAULT); @@ -2239,6 +2239,13 @@ static void test_com_initialization(void) test_apttype(APTTYPE_MTA); DestroyWindow(wnd); test_apttype(-1); + + wnd = CreateWindowA("static", "static", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, 0); + ok(wnd != NULL, "CreateWindow failed\n"); + ShowWindow(wnd, SW_SHOW); + test_apttype(APTTYPE_MAINSTA); + DestroyWindow(wnd); + test_apttype(-1); } static DWORD WINAPI disable_ime_thread(void *arg) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 4c18238a98b..34cc3880cc9 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -27,6 +27,7 @@ #include "wingdi.h" #include "winuser.h" #include "win.h" +#include "imm.h" #include "user_private.h" #include "wine/server.h" #include "wine/debug.h" @@ -41,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); */ static HWND set_focus_window( HWND hwnd ) { - HWND previous = 0; + HWND previous = 0, ime_default; BOOL ret; SERVER_START_REQ( set_focus_window ) @@ -57,11 +58,21 @@ static HWND set_focus_window( HWND hwnd ) if (previous) { SendMessageW( previous, WM_KILLFOCUS, (WPARAM)hwnd, 0 ); + + ime_default = ImmGetDefaultIMEWnd( previous ); + if (ime_default) + SendMessageW( ime_default, WM_IME_INTERNAL, IME_INTERNAL_DEACTIVATE, (LPARAM)previous ); + if (hwnd != GetFocus()) return previous; /* changed by the message */ } if (IsWindow(hwnd)) { USER_Driver->pSetFocus(hwnd); + + ime_default = ImmGetDefaultIMEWnd( hwnd ); + if (ime_default) + SendMessageW( ime_default, WM_IME_INTERNAL, IME_INTERNAL_ACTIVATE, (LPARAM)hwnd ); + SendMessageW( hwnd, WM_SETFOCUS, (WPARAM)previous, 0 ); } return previous; diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index e12a1af5571..9051e30f0f8 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -28,12 +28,15 @@ #include "winbase.h" #include "wingdi.h" #include "controls.h" +#include "imm.h" #include "user_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); +BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); + #define IMM_INIT_MAGIC 0x19650412 static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; @@ -570,6 +573,27 @@ static BOOL is_ime_ui_msg( UINT msg ) } } +static LRESULT ime_internal_msg( WPARAM wParam, LPARAM lParam) +{ + HWND hwnd = (HWND)lParam; + HIMC himc; + + switch(wParam) + { + case IME_INTERNAL_ACTIVATE: + case IME_INTERNAL_DEACTIVATE: + himc = ImmGetContext(hwnd); + ImmSetActiveContext(hwnd, himc, wParam == IME_INTERNAL_ACTIVATE); + ImmReleaseContext(hwnd, himc); + break; + default: + FIXME("wParam = %lx\n", wParam); + break; + } + + return 0; +} + LRESULT WINAPI ImeWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { HWND uiwnd; @@ -577,6 +601,9 @@ LRESULT WINAPI ImeWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) if (msg==WM_CREATE) return TRUE; + if (msg==WM_IME_INTERNAL) + return ime_internal_msg(wParam, lParam); + if (imm_get_ui_window && is_ime_ui_msg(msg)) { if ((uiwnd = imm_get_ui_window(GetKeyboardLayout(0)))) @@ -594,6 +621,9 @@ LRESULT WINAPI ImeWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) if (msg==WM_CREATE) return TRUE; + if (msg==WM_IME_INTERNAL) + return ime_internal_msg(wParam, lParam); + if (imm_get_ui_window && is_ime_ui_msg(msg)) { if ((uiwnd = imm_get_ui_window(GetKeyboardLayout(0)))) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a30b9ce8734..2b0a09d4931 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -208,6 +208,9 @@ C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) extern INT global_key_state_counter DECLSPEC_HIDDEN; extern BOOL (WINAPI *imm_register_window)(HWND) DECLSPEC_HIDDEN; extern void (WINAPI *imm_unregister_window)(HWND) DECLSPEC_HIDDEN; +#define WM_IME_INTERNAL 0x287 +#define IME_INTERNAL_ACTIVATE 0x17 +#define IME_INTERNAL_DEACTIVATE 0x18 struct user_key_state_info {

1 0

Piotr Caban : imm32: Delay import ole32.dll.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: a3c6e5c843b54222a2a442390cdd8a18ad02c913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3c6e5c843b54222a2a44239… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 18:42:59 2021 +0200 imm32: Delay import ole32.dll. Fixes kernel32 debugger test failure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index ad10fc2fa45..214b2b753d4 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in @@ -1,6 +1,7 @@ MODULE = imm32.dll IMPORTLIB = imm32 -IMPORTS = user32 gdi32 advapi32 ole32 +IMPORTS = user32 gdi32 advapi32 +DELAYIMPORTS = ole32 C_SRCS = \ imm.c

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 October 2021