August 2018 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/tests: Add some ListBox tests for anchor index.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: b3e005483cc9df9cce0a9aa4de611c04dda554c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3e005483cc9df9cce0a9aa4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 15 11:22:55 2018 +0300 comctl32/tests: Add some ListBox tests for anchor index. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 9af675b..07aa5c6 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -533,19 +533,129 @@ static void test_LB_SETCURSEL(void) SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 32); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); ok(ret == 2, "LB_SETCURSEL returned %d instead of 2\n", ret); ret = GetScrollPos(hLB, SB_VERT); ok(ret == 0, "expected vscroll 0, got %d\n", ret); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(hLB, LB_SETCURSEL, 3, 0); ok(ret == 3, "LB_SETCURSEL returned %d instead of 3\n", ret); ret = GetScrollPos(hLB, SB_VERT); ok(ret == 1, "expected vscroll 1, got %d\n", ret); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + hLB = create_listbox(0, 0); + ok(hLB != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(hLB, LB_SETCURSEL, 1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + /* LBS_EXTENDEDSEL */ + hLB = create_listbox(LBS_EXTENDEDSEL, 0); + ok(hLB != NULL, "Failed to create listbox.\n"); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == -1, "LB_SETCURSEL returned %d instead of 2\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + /* LBS_MULTIPLESEL */ + hLB = create_listbox(LBS_MULTIPLESEL, 0); + ok(hLB != NULL, "Failed to create listbox.\n"); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == -1, "LB_SETCURSEL returned %d instead of 2\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + DestroyWindow(hLB); } +static void test_LB_SETSEL(void) +{ + HWND list; + int ret; + + /* LBS_EXTENDEDSEL */ + list = create_listbox(LBS_EXTENDEDSEL, 0); + ok(list != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + 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); + + /* LBS_MULTIPLESEL */ + list = create_listbox(LBS_MULTIPLESEL, 0); + ok(list != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + 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); +} + static void test_listbox_height(void) { HWND hList; @@ -2097,6 +2207,7 @@ START_TEST(listbox) test_missing_lbuttonup(); test_extents(); test_WM_MEASUREITEM(); + test_LB_SETSEL(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Nikolay Sivov : user32/tests: Add some ListBox tests for anchor index.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 5fced2810f1da53bc4300c7dfb0d5112d1d9e494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fced2810f1da53bc4300c7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 15 11:22:54 2018 +0300 user32/tests: Add some ListBox tests for anchor index. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 111 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index c6edc76..ee5211c 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -475,19 +475,129 @@ static void test_LB_SETCURSEL(void) SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 32); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); ok(ret == 2, "LB_SETCURSEL returned %d instead of 2\n", ret); ret = GetScrollPos(hLB, SB_VERT); ok(ret == 0, "expected vscroll 0, got %d\n", ret); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(hLB, LB_SETCURSEL, 3, 0); ok(ret == 3, "LB_SETCURSEL returned %d instead of 3\n", ret); ret = GetScrollPos(hLB, SB_VERT); ok(ret == 1, "expected vscroll 1, got %d\n", ret); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + hLB = create_listbox(0, 0); + ok(hLB != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(hLB, LB_SETCURSEL, 1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + /* LBS_EXTENDEDSEL */ + hLB = create_listbox(LBS_EXTENDEDSEL, 0); + ok(hLB != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == -1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + /* LBS_MULTIPLESEL */ + hLB = create_listbox(LBS_MULTIPLESEL, 0); + ok(hLB != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == -1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + DestroyWindow(hLB); } +static void test_LB_SETSEL(void) +{ + HWND list; + int ret; + + /* LBS_EXTENDEDSEL */ + list = create_listbox(LBS_EXTENDEDSEL, 0); + ok(list != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + 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); + + /* LBS_MULTIPLESEL */ + list = create_listbox(LBS_MULTIPLESEL, 0); + ok(list != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + 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); +} + static void test_listbox_height(void) { HWND hList; @@ -1960,4 +2070,5 @@ START_TEST(listbox) test_missing_lbuttonup(); test_extents(); test_WM_MEASUREITEM(); + test_LB_SETSEL(); }

1 0

Józef Kucia : winex11: Add simple fps counter for Vulkan.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: ed80907152a2e76a9878c4283899b79ab94d1971 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed80907152a2e76a9878c428… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 10:43:23 2018 +0200 winex11: Add simple fps counter for Vulkan. The fps counter is implemented in winex11 because winevulkan thunks can be bypassed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 5de8557..063281d 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -41,6 +41,7 @@ #include "wine/vulkan_driver.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +WINE_DECLARE_DEBUG_CHANNEL(fps); #ifdef SONAME_LIBVULKAN @@ -513,8 +514,34 @@ static VkResult X11DRV_vkGetSwapchainImagesKHR(VkDevice device, static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info) { + VkResult res; + TRACE("%p, %p\n", queue, present_info); - return pvkQueuePresentKHR(queue, present_info); + + res = pvkQueuePresentKHR(queue, present_info); + + if (TRACE_ON(fps)) + { + static unsigned long frames, frames_total; + static long prev_time, start_time; + DWORD time; + + time = GetTickCount(); + frames++; + frames_total++; + if (time - prev_time > 1500) + { + TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n", + queue, 1000.0 * frames / (time - prev_time), + 1000.0 * frames_total / (time - start_time)); + prev_time = time; + frames = 0; + if (!start_time) + start_time = time; + } + } + + return res; } static const struct vulkan_funcs vulkan_funcs =

1 0

Piotr Caban : msvcp90: Add time_get<char>::do_get_year implementation.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: fe90fdfebd1dee2681a8b7555220cb536e072c75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe90fdfebd1dee2681a8b755… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 12:49:05 2018 +0200 msvcp90: Add time_get<char>::do_get_year implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 656aa65..b506c9e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10216,8 +10216,24 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_year(const time_get_ch istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, ios_base *base, int *err, struct tm *t) { - FIXME("(%p %p %p %p %p) stub\n", this, ret, base, err, t); - return NULL; + int year; + + TRACE("(%p %p %p %p %p)\n", this, ret, base, err, t); + + /* The function supports only dates from [1900-2035] range */ + *err |= time_get_char__Getint(this, &s, &e, 0, 2035, &year); + if (!(*err & IOSTATE_failbit)) + { + if (year >= 1900) + year -= 1900; + if (year > 135) + *err |= IOSTATE_failbit; + else + t->tm_year = year; + } + + *ret = s; + return ret; } /* ?get_year@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */

1 0

Piotr Caban : msvcp140: Add _Last_write_time implementation.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: a9c5ab9da6a94d56516548ead274dd5bd145a78c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c5ab9da6a94d56516548ea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 12:43:34 2018 +0200 msvcp140: Add _Last_write_time implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/ios.c | 38 +++++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index f999e9a..29d0e19 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3666,7 +3666,7 @@ @ extern _LNan _LNan @ stub _LSinh @ extern _LSnan _LSnan -@ stub _Last_write_time +@ cdecl _Last_write_time(int64) @ cdecl _Link(wstr wstr) tr2_sys__Link_wchar @ cdecl _Lock_shared_ptr_spin_lock() @ cdecl _Lstat(wstr ptr) @@ -3696,7 +3696,7 @@ @ cdecl _Remove_dir(wstr) tr2_sys__Remove_dir_wchar @ cdecl _Rename(wstr wstr) tr2_sys__Rename_wchar @ stub _Resize -@ stub _Set_last_write_time +@ cdecl _Set_last_write_time(wstr int64) @ stub _Sinh @ extern _Snan _Snan @ cdecl _Stat(wstr ptr) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 64e0f2b..61acf19 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14851,7 +14851,7 @@ static __int64 get_last_write_time(HANDLE h) __int64 ret; if(!GetFileTime(h, 0, 0, &wt)) - return 0; + return -1; ret = (((__int64)wt.dwHighDateTime)<< 32) + wt.dwLowDateTime; ret -= TICKS_1601_TO_1970; @@ -14877,9 +14877,8 @@ __int64 __cdecl tr2_sys__Last_write_time(char const* path) return ret / TICKSPERSEC; } -/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z */ -/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z */ -__int64 __cdecl tr2_sys__Last_write_time_wchar(const wchar_t *path) +/* _Last_write_time */ +__int64 __cdecl _Last_write_time(const wchar_t *path) { HANDLE handle; __int64 ret; @@ -14889,11 +14888,19 @@ __int64 __cdecl tr2_sys__Last_write_time_wchar(const wchar_t *path) handle = CreateFileW(path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); if(handle == INVALID_HANDLE_VALUE) - return 0; + return -1; ret = get_last_write_time(handle); CloseHandle(handle); - return ret / TICKSPERSEC; + return ret; +} + +/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z */ +/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z */ +__int64 __cdecl tr2_sys__Last_write_time_wchar(const wchar_t *path) +{ + TRACE("(%s)\n", debugstr_w(path)); + return _Last_write_time(path) / TICKSPERSEC; } static int set_last_write_time(HANDLE h, __int64 time) @@ -14928,11 +14935,11 @@ void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) CloseHandle(handle); } -/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z */ -/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z */ -void __cdecl tr2_sys__Last_write_time_set_wchar(const wchar_t *path, __int64 time) +/* _Set_last_write_time */ +int __cdecl _Set_last_write_time(const wchar_t *path, __int64 time) { HANDLE handle; + int ret; TRACE("(%s)\n", debugstr_w(path)); @@ -14940,10 +14947,19 @@ void __cdecl tr2_sys__Last_write_time_set_wchar(const wchar_t *path, __int64 tim FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); if(handle == INVALID_HANDLE_VALUE) - return; + return 0; - set_last_write_time(handle, time * TICKSPERSEC); + ret = set_last_write_time(handle, time); CloseHandle(handle); + return ret; +} + +/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z */ +/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z */ +void __cdecl tr2_sys__Last_write_time_set_wchar(const wchar_t *path, __int64 time) +{ + TRACE("(%s)\n", debugstr_w(path)); + _Set_last_write_time(path, time * TICKSPERSEC); } /* ??_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z */

1 0

Józef Kucia : dinput/tests: Use GetModuleHandleA() instead of LoadLibraryA() (Coverity).
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 4b90a46e36448dfd9655b23938896f64c31faf2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b90a46e36448dfd9655b239… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 10:48:54 2018 +0200 dinput/tests: Use GetModuleHandleA() instead of LoadLibraryA() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 59411cb..5542680 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -448,7 +448,7 @@ static void keyboard_tests(DWORD version) START_TEST(keyboard) { - pDirectInputCreateA = (void *)GetProcAddress(LoadLibraryA("dinput.dll"), "DirectInputCreateA"); + pDirectInputCreateA = (void *)GetProcAddress(GetModuleHandleA("dinput.dll"), "DirectInputCreateA"); CoInitialize(NULL);

1 0

Daniel Lehman : oleaut32: Extend value range before getting absolute value in VarBstrFromI4.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 1d2ac5d8b6eb9bf6cf2128976c544b3d6594c0c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d2ac5d8b6eb9bf6cf212897… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jul 31 11:30:39 2018 -0700 oleaut32: Extend value range before getting absolute value in VarBstrFromI4. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 2 +- dlls/oleaut32/vartype.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 8c454e2..7daf2f0 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4556,7 +4556,7 @@ static void test_VarBstrFromI4(void) ok(hres == S_OK, "got hres 0x%08x\n", hres); if (bstr) { - todo_wine ok(memcmp(bstr, int_min, sizeof(int_min)) == 0, "string different\n"); + ok(memcmp(bstr, int_min, sizeof(int_min)) == 0, "string different\n"); SysFreeString(bstr); } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 37c4be5..232a58f 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6453,7 +6453,7 @@ HRESULT WINAPI VarBstrFromI4(LONG lIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) if (lIn < 0) { - ul64 = (ULONG)-lIn; + ul64 = -(LONG64)lIn; dwFlags |= VAR_NEGATIVE; } return VARIANT_BstrFromUInt(ul64, lcid, dwFlags, pbstrOut);

1 0

Zhiyi Zhang : iphlpapi: Report NO_ERROR when IcmpSendEcho() succeeded.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 3825be96f30a9916a81ddf63d664ec84bfe08606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3825be96f30a9916a81ddf63… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Aug 5 11:05:00 2018 +0800 iphlpapi: Report NO_ERROR when IcmpSendEcho() succeeded. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 3 +++ dlls/iphlpapi/tests/iphlpapi.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 0d80248..496ad2a 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -424,7 +424,10 @@ DWORD WINAPI IcmpSendEcho( TRACE("received an ICMP packet of type,code=%d,%d\n",icmp_header->icmp_type,icmp_header->icmp_code); if (icmp_header->icmp_type==ICMP_ECHOREPLY) { if ((icmp_header->icmp_id==id) && (icmp_header->icmp_seq==seq)) + { ier->Status=IP_SUCCESS; + SetLastError(NO_ERROR); + } } else { switch (icmp_header->icmp_type) { case ICMP_UNREACH: diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 8d71c74..609abb3 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1118,7 +1118,7 @@ todo_wine error = GetLastError(); reply = (ICMP_ECHO_REPLY *)replydata; ok(ret, "IcmpSendEcho failed unexpectedly\n"); - todo_wine ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); + ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); ok(INADDR_LOOPBACK == ntohl(reply->Address), "Address mismatch, expect:%s, got: %s\n", ntoa(INADDR_LOOPBACK), ntoa(reply->Address)); ok(reply->Status == IP_SUCCESS, "Expect status:0x%08x, got:0x%08x\n", IP_SUCCESS, reply->Status);

1 0

Zhiyi Zhang : iphlpapi: Improve parameter checking for IcmpSendEcho().
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 6ec5b57a1fc8302a2f44c15541fc9499c21cf193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ec5b57a1fc8302a2f44c155… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Aug 5 11:05:16 2018 +0800 iphlpapi: Improve parameter checking for IcmpSendEcho(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 9 +++++++-- dlls/iphlpapi/tests/iphlpapi.c | 8 -------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 496ad2a..0dc2f12 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -288,11 +288,16 @@ DWORD WINAPI IcmpSendEcho( if (IcmpHandle==INVALID_HANDLE_VALUE) { /* FIXME: in fact win98 seems to ignore the handle value !!! */ - SetLastError(ERROR_INVALID_HANDLE); + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!ReplyBuffer||!ReplySize) { + SetLastError(ERROR_INVALID_PARAMETER); return 0; } - if (ReplySize<sizeof(ICMP_ECHO_REPLY)+ICMP_MINLEN) { + if (ReplySize<sizeof(ICMP_ECHO_REPLY)) { SetLastError(IP_BUF_TOO_SMALL); return 0; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 609abb3..0d35c26 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -966,7 +966,6 @@ static void testIcmpSendEcho(void) ret = pIcmpSendEcho(INVALID_HANDLE_VALUE, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1009,20 +1008,16 @@ todo_wine error = GetLastError(); ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); - if (0) /* crashes in wine, remove IF when fixed */ - { SetLastError(0xdeadbeef); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); - } SetLastError(0xdeadbeef); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, 0, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1031,7 +1026,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1049,7 +1043,6 @@ todo_wine replysz = sizeof(ICMP_ECHO_REPLY); ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); error = GetLastError(); -todo_wine ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); @@ -1071,7 +1064,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz - 1, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error);

1 0

Jacek Caban : server: Improve named pipe read error handling.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 91852564dc7f51ac8f18be600905d4aff4b156de URL: https://source.winehq.org/git/wine.git/?a=commit;h=91852564dc7f51ac8f18be60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:48 2018 +0200 server: Improve named pipe read error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 -- server/named_pipe.c | 12 +++++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 67141f1..a2ef008 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1338,7 +1338,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) break; } status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL); - todo_wine_if(state == FILE_PIPE_DISCONNECTED_STATE && !is_server) ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); } @@ -1427,7 +1426,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) if (state == FILE_PIPE_CLOSING_STATE) expected_status = STATUS_SUCCESS; status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL); - todo_wine_if(state == FILE_PIPE_DISCONNECTED_STATE && status != STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); } diff --git a/server/named_pipe.c b/server/named_pipe.c index cb74051..425a369 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -798,8 +798,18 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct pipe_end *pipe_end = get_fd_user( fd ); - if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) + switch (pipe_end->state) { + case FILE_PIPE_CONNECTED_STATE: + break; + case FILE_PIPE_DISCONNECTED_STATE: + set_error( STATUS_PIPE_DISCONNECTED ); + return 0; + case FILE_PIPE_LISTENING_STATE: + set_error( STATUS_PIPE_LISTENING ); + return 0; + case FILE_PIPE_CLOSING_STATE: + if (!list_empty( &pipe_end->message_queue )) break; set_error( STATUS_PIPE_BROKEN ); return 0; }

1 0