wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Chip Davis : build: Make the output a little less verbose when V=0.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: vkd3d Branch: master Commit: 09bf24d910dc4acbc122463cc7a00b966dac9d69 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=09bf24d910dc4acbc122463… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Aug 10 16:01:30 2018 -0500 build: Make the output a little less verbose when V=0. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 770b6e0..f696284 100644 --- a/Makefile.am +++ b/Makefile.am @@ -151,16 +151,16 @@ EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL $(VKD3D_V_WIDL)$(WIDL) -h -o $@.tmp $< - $(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@ - $(RM) $@.tmp + $(AM_V_at)$(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@ + $(AM_V_at)$(RM) $@.tmp else - echo "widl is required to generate $<" + @echo "widl is required to generate $<" endif EXTRA_DIST += $(vkd3d_demos_shaders) libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in - sed -e 's![@]prefix[@]!$(prefix)!g' \ + $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ -e 's![@]includedir[@]!$(includedir)!g' \ -e 's![@]libdir[@]!$(libdir)!g' \ @@ -168,7 +168,7 @@ libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in $< > $@ libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in - sed -e 's![@]prefix[@]!$(prefix)!g' \ + $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ -e 's![@]includedir[@]!$(includedir)!g' \ -e 's![@]libdir[@]!$(libdir)!g' \ @@ -176,7 +176,7 @@ libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in $< > $@ libs/vkd3d_version.c: dummy-vkd3d-version - version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "vkd3d-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char vkd3d_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) + $(AM_V_GEN)version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "vkd3d-$(PACKAGE_VERSION)") | $(SED) -n -e '$$s/$.*$/const char vkd3d_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) .SILENT: libs/vkd3d_version.c CLEANFILES += libs/vkd3d_version.c

1 0

Chip Davis : build: Make the sed(1) command more portable.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: vkd3d Branch: master Commit: 923ec78c019bbf6b12b5afc96332c1d01f2f189b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=923ec78c019bbf6b12b5afc… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Aug 10 16:01:29 2018 -0500 build: Make the sed(1) command more portable. BSD sed(1) requires an argument after -i giving the suffix to put on the backup it makes. Also, the regular expression given doesn't seem to work for me. This command should work everywhere. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 14f2d51..770b6e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -150,8 +150,9 @@ vkd3d_v_widl_1 = EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL - $(VKD3D_V_WIDL)$(WIDL) -o $@ $< - sed -e '/#include <$rpc.h\|rpcndr.h$>/d' -i $@ + $(VKD3D_V_WIDL)$(WIDL) -h -o $@.tmp $< + $(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@ + $(RM) $@.tmp else echo "widl is required to generate $<" endif

1 0

Kai Krakow : winebus.sys: Do not print HID report read errors.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: d744f367d263a131feee96e103fb8220e8400b53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d744f367d263a131feee96e1… Author: Kai Krakow <kai(a)kaishome.de> Date: Wed Aug 15 20:29:05 2018 +0200 winebus.sys: Do not print HID report read errors. Device reports may come in faster than our consumers could possibly read them, this is especially true for multi-axis events: When you move a stick across its range, it will always generate at least two events, one for the x axis, and one for the y axis. This is not really an error situation, so let's just discard the error message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43125 Signed-off-by: Kai Krakow <kai(a)kaishome.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index deb2c86..ce68e4a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -641,9 +641,6 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) ext->buffer_size = length; } - if (!ext->last_report_read) - ERR_(hid_report)("Device reports coming in too fast, last report not read yet!\n"); - memcpy(ext->last_report, report, length); ext->last_report_size = length; ext->last_report_read = FALSE;

1 0

Michael Stefaniuc : msvcrt: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: af4821ca81ebb45c6557909e8f5b5b7ac14b8093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af4821ca81ebb45c6557909e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 26 00:05:52 2018 +0200 msvcrt: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/ctype.c | 2 +- dlls/msvcrt/errno.c | 2 +- dlls/msvcrt/except.c | 3 +-- dlls/msvcrt/exit.c | 3 +-- dlls/msvcrt/file.c | 20 ++++++++++---------- dlls/msvcrt/locale.c | 12 ++++++------ dlls/msvcrt/printf.h | 4 ++-- dlls/msvcrt/process.c | 2 +- dlls/msvcrt/scheduler.c | 8 ++++---- dlls/msvcrt/wcs.c | 2 +- 11 files changed, 29 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af4821ca81ebb45c6557…

1 0

Michael Stefaniuc : netstat: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 27c88fc4a60bf62de83c2224fbf152eb01636bdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=27c88fc4a60bf62de83c2224… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 10 12:27:51 2018 +0200 netstat: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/netstat/netstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 8fe5900..afa211d 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -144,7 +144,7 @@ static WCHAR *NETSTAT_load_message(UINT id) { static WCHAR msg[2048]; static const WCHAR failedW[] = {'F','a','i','l','e','d','!','\0'}; - if (!LoadStringW(GetModuleHandleW(NULL), id, msg, sizeof(msg)/sizeof(WCHAR))) { + if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); strcpyW(msg, failedW); }

1 0

Fabian Maurer : kernel32: Add stub for SetProcessMitigationPolicy.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 41c0219e05a98843af0fae1d5197637566a7e7f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41c0219e05a98843af0fae1d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Aug 15 20:30:59 2018 +0200 kernel32: Add stub for SetProcessMitigationPolicy. This is needed by x64 chromium sandbox for >= win8. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45643 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnt.h | 20 ++++++++++++++++++++ 6 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index ebbe55f..616fa63 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -44,7 +44,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext @ stdcall SetThreadIdealProcessorEx(long ptr ptr) kernel32.SetThreadIdealProcessorEx diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index db94c2e5..8de6c5b 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -49,7 +49,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3060896..c53276c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1428,6 +1428,7 @@ @ stdcall SetProcessAffinityMask(long long) @ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDEPPolicy(long) +@ stdcall SetProcessMitigationPolicy(long ptr long) # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) @ stdcall SetProcessShutdownParameters(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5aa245c..1a303c5 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4389,3 +4389,13 @@ BOOL WINAPI BaseFlushAppcompatCache(void) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * SetProcessMitigationPolicy (KERNEL32.@) + */ +BOOL WINAPI SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY policy, void *buffer, SIZE_T length) +{ + FIXME("(%d, %p, %lu): stub\n", policy, buffer, length); + + return TRUE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index cae825d..5865ee7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1456,7 +1456,7 @@ # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity # @ stub SetProcessInformation -# @ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters diff --git a/include/winnt.h b/include/winnt.h index 7f822c4..c9248a4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6273,6 +6273,26 @@ typedef enum _RTL_UMS_SCHEDULER_REASON typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); +typedef enum _PROCESS_MITIGATION_POLICY +{ + ProcessDEPPolicy, + ProcessASLRPolicy, + ProcessDynamicCodePolicy, + ProcessStrictHandleCheckPolicy, + ProcessSystemCallDisablePolicy, + ProcessMitigationOptionsMask, + ProcessExtensionPointDisablePolicy, + ProcessControlFlowGuardPolicy, + ProcessSignaturePolicy, + ProcessFontDisablePolicy, + ProcessImageLoadPolicy, + ProcessSystemCallFilterPolicy, + ProcessPayloadRestrictionPolicy, + ProcessChildProcessPolicy, + ProcessSideChannelIsolationPolicy, + MaxProcessMitigationPolicy +} PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; + #ifdef __cplusplus } #endif

1 0

Andrew Eikum : dinput: Fix mac build.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 565c2dcf2aef1a555ff1025f230b4708df24d311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=565c2dcf2aef1a555ff1025f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 15 10:08:46 2018 -0500 dinput: Fix mac build. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 282b6c2..2b2aade 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -988,16 +988,19 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS { char name[MAX_PATH]; char friendly[32]; + IOHIDDeviceRef device; TRACE("dwDevType %u dwFlags 0x%08x version 0x%04x id %d\n", dwDevType, dwFlags, version, id); if (id >= find_joystick_devices()) return E_FAIL; + device = get_device_ref(id); + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { + if (dwFlags & DIEDFL_FORCEFEEDBACK) { - IOHIDDeviceRef device = get_device_ref(id); if(!device) return S_FALSE; if(get_ff(device, NULL) != S_OK)

1 0

Hua Meng : msvcp120: Add tests for _Concurrent_vector_Internal_compact.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 27365695edbadee6572c67b537c1fc52afeb41fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=27365695edbadee6572c67b5… Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Wed Aug 15 21:59:42 2018 +0800 msvcp120: Add tests for _Concurrent_vector_Internal_compact. Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 852ab99..2e63555 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -3104,6 +3104,29 @@ static void test_vector_base_v4(void) } for(; i<ARRAY_SIZE(b.blocks); i++) ok(!b.blocks[i], "b.blocks[%d] != NULL\n", i); + SET_EXPECT(concurrent_vector_int_alloc); + call_func4(p_vector_base_v4__Internal_reserve, + &v2, 17, sizeof(int), 32); + CHECK_CALLED(concurrent_vector_int_alloc); + data = call_func5(p_vector_base_v4__Internal_compact, + &v2, sizeof(int), &b, concurrent_vector_int_destroy, + concurrent_vector_int_copy); + ok(v2.first_block == 4, "v2.first_block got %ld expected 4\n", (long)v2.first_block); + ok(v2.early_size == 9, "v2.early_size got %ld expected 9\n", (long)v2.early_size); + ok(b.first_block == 4, "b.first_block got %ld expected 2\n", (long)b.first_block); + ok(v2.segment != v2.storage, "v2.segment got %p expected %p\n", v2.segment, v2.storage); + for(i = 4; i < 32; i++) + ok(v2.segment[i] == 0, "v2.segment[%d] got %p\n", + i, v2.segment[i]); + for(i=0; i<4; i++) + ok(!b.blocks[i], "b.blocks[%d] != NULL\n", i); + for(; i < 5; i++) { + ok(b.blocks[i] != NULL, "b.blocks[%d] got NULL\n", i); + free(b.blocks[i]); + vector_alloc_count--; + } + for(; i<ARRAY_SIZE(b.blocks); i++) + ok(!b.blocks[i], "b.blocks[%d] != NULL\n", i); SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy);

1 0

Nikolay Sivov : comctl32/listbox: Update anchor index on LB_SETSEL.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 4ee79efd86f6107f42ff12b92476cba1698b53ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ee79efd86f6107f42ff12b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 15 11:22:57 2018 +0300 comctl32/listbox: Update anchor index on LB_SETSEL. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 5 ++++- dlls/comctl32/tests/listbox.c | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index e033975..b3491bb 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2758,7 +2758,10 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, return descr->items[wParam].selected; case LB_SETSEL: - return LISTBOX_SetSelection( descr, lParam, wParam, FALSE ); + ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE ); + if (ret != LB_ERR && wParam) + descr->anchor_item = lParam; + return ret; case LB_SETCURSEL: if (IS_MULTISELECT(descr)) return LB_ERR; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 07aa5c6..c9d13a8 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -611,19 +611,16 @@ static void test_LB_SETSEL(void) ret = SendMessageA(list, LB_SETSEL, TRUE, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 0, "Unexpected anchor index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 1, "Unexpected anchor index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 1, "Unexpected anchor index %d.\n", ret); DestroyWindow(list); @@ -638,19 +635,16 @@ todo_wine ret = SendMessageA(list, LB_SETSEL, TRUE, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 0, "Unexpected anchor index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 1, "Unexpected anchor index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 1, "Unexpected anchor index %d.\n", ret); DestroyWindow(list);

1 0

Nikolay Sivov : user32/listbox: Update anchor index on LB_SETSEL.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 201dc289d033e9e332580b10e8e87667baa911ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=201dc289d033e9e332580b10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 15 11:22:56 2018 +0300 user32/listbox: Update anchor index on LB_SETSEL. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 5 ++++- dlls/user32/tests/listbox.c | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index af8ee40..991ab87 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2853,7 +2853,10 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return descr->items[wParam].selected; case LB_SETSEL: - return LISTBOX_SetSelection( descr, lParam, wParam, FALSE ); + ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE ); + if (ret != LB_ERR && wParam) + descr->anchor_item = lParam; + return ret; case LB_SETCURSEL: if (IS_MULTISELECT(descr)) return LB_ERR; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index ee5211c..dfa8de7 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -553,19 +553,16 @@ static void test_LB_SETSEL(void) ret = SendMessageA(list, LB_SETSEL, TRUE, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 0, "Unexpected anchor index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 1, "Unexpected anchor index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 1, "Unexpected anchor index %d.\n", ret); DestroyWindow(list); @@ -580,19 +577,16 @@ todo_wine ret = SendMessageA(list, LB_SETSEL, TRUE, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 0, "Unexpected anchor index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 1, "Unexpected anchor index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); -todo_wine ok(ret == 1, "Unexpected anchor index %d.\n", ret); DestroyWindow(list);

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
62
Older →

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 August 2018