wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Damjan Jovanovic : shell32/tests: Fix test failures from ad412b11a7ea17b708994ed6609f8ed0cbfb169b.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: a3295e383116f1644cad88519c05e6c2ac7f3200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3295e383116f1644cad8851… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 4 21:31:06 2021 +0200 shell32/tests: Fix test failures from ad412b11a7ea17b708994ed6609f8ed0cbfb169b. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 66 +++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 51776f050ae..8e92a0896b5 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4479,46 +4479,38 @@ static void test_CreateViewObject_contextmenu(void) LPITEMIDLIST pidl; HRESULT hr; DWORD ret; + int i; - hr = CoCreateInstance(&CLSID_ControlPanel, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); - - hr = CoCreateInstance(&CLSID_MyComputer, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); - - hr = CoCreateInstance(&CLSID_NetworkPlaces, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); + static const CLSID *folders[] = + { + &CLSID_MyComputer, + &CLSID_MyDocuments, + &CLSID_ControlPanel, + &CLSID_NetworkPlaces, + &CLSID_Printers, + &CLSID_RecycleBin + }; - hr = CoCreateInstance(&CLSID_Printers, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); + for (i = 0; i < ARRAY_SIZE(folders); i++) + { + hr = CoCreateInstance(folders[i], NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + if (hr != S_OK) + { + win_skip("Failed to create folder %s, hr %#x.\n", wine_dbgstr_guid(folders[i]), hr); + continue; + } - hr = CoCreateInstance(&CLSID_RecycleBin, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + if (IsEqualIID(folders[i], &CLSID_MyDocuments)) + ok(hr == S_OK, "got 0x%08x\n", hr); + else if (IsEqualIID(folders[i], &CLSID_MyComputer)) + ok(hr == S_OK || broken(hr == E_NOINTERFACE /* win10 */), "got 0x%08x\n", hr); + else + ok(hr == E_NOINTERFACE || broken(FAILED(hr)), "got 0x%08x for %s\n", hr, wine_dbgstr_guid(folders[i])); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + } hr = SHGetDesktopFolder(&desktop); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Rémi Bernon : user32: Refactor and simplify GetRawInputDeviceInfoW cases.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: cda4abac9859ed42c29e8cb2746201a578431a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda4abac9859ed42c29e8cb2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 4 10:24:56 2021 +0200 user32: Refactor and simplify GetRawInputDeviceInfoW cases. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 48 +++++++++++++----------------------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 15e909ebd9c..f2d64ccc23b 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -686,8 +686,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT { RID_DEVICE_INFO info; struct device *device; - const void *to_copy; - UINT to_copy_bytes, avail_bytes; + DWORD len, data_len; TRACE("handle %p, command %#x, data %p, data_size %p.\n", handle, command, data, data_size); @@ -703,45 +702,26 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT return ~0U; } - /* each case below must set: - * *data_size: length (meaning defined by command) of data we want to copy - * avail_bytes: number of bytes available in user buffer - * to_copy_bytes: number of bytes we want to copy into user buffer - * to_copy: pointer to data we want to copy into user buffer - */ + data_len = *data_size; switch (command) { case RIDI_DEVICENAME: - /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ - avail_bytes = *data_size * sizeof(WCHAR); - *data_size = wcslen(device->detail->DevicePath) + 1; - to_copy = device->detail->DevicePath; - to_copy_bytes = *data_size * sizeof(WCHAR); + if ((len = wcslen(device->detail->DevicePath) + 1) <= data_len && data) + memcpy(data, device->detail->DevicePath, len * sizeof(WCHAR)); + *data_size = len; break; case RIDI_DEVICEINFO: - avail_bytes = *data_size; - info.cbSize = sizeof(info); - info = device->info; - to_copy_bytes = sizeof(info); - *data_size = to_copy_bytes; - to_copy = &info; + if ((len = sizeof(info)) <= data_len && data) + memcpy(data, &device->info, len); + *data_size = len; break; case RIDI_PREPARSEDDATA: - avail_bytes = *data_size; - if (device->info.dwType != RIM_TYPEHID) - { - to_copy_bytes = 0; - *data_size = 0; - to_copy = NULL; - } - else - { - to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)device->data)->dwSize; - *data_size = to_copy_bytes; - to_copy = device->data; - } + len = device->data ? ((WINE_HIDP_PREPARSED_DATA*)device->data)->dwSize : 0; + if (device->data && len <= data_len && data) + memcpy(data, device->data, len); + *data_size = len; break; default: @@ -753,14 +733,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT if (!data) return 0; - if (avail_bytes < to_copy_bytes) + if (data_len < len) { SetLastError(ERROR_INSUFFICIENT_BUFFER); return ~0U; } - memcpy(data, to_copy, to_copy_bytes); - return *data_size; }

1 0

Rémi Bernon : user32: Remove unnecessary MOUSE / KEYBOARD special cases.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: 82211cd478fdf5ab2bf97704b7fd6a32545ad65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=82211cd478fdf5ab2bf97704… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 4 10:24:55 2021 +0200 user32: Remove unnecessary MOUSE / KEYBOARD special cases. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 39 ++++----------------------------------- dlls/user32/tests/input.c | 3 +-- 2 files changed, 5 insertions(+), 37 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 9a72a9a323e..15e909ebd9c 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -684,10 +684,6 @@ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT */ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT *data_size) { - /* FIXME: Most of this is made up. */ - static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; - static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; - RID_DEVICE_INFO info; struct device *device; const void *to_copy; @@ -718,41 +714,15 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT case RIDI_DEVICENAME: /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ avail_bytes = *data_size * sizeof(WCHAR); - if (handle == WINE_MOUSE_HANDLE) - { - *data_size = ARRAY_SIZE(L"\\\\?\\WINE_MOUSE"); - to_copy = L"\\\\?\\WINE_MOUSE"; - } - else if (handle == WINE_KEYBOARD_HANDLE) - { - *data_size = ARRAY_SIZE(L"\\\\?\\WINE_KEYBOARD"); - to_copy = L"\\\\?\\WINE_KEYBOARD"; - } - else - { - *data_size = wcslen(device->detail->DevicePath) + 1; - to_copy = device->detail->DevicePath; - } + *data_size = wcslen(device->detail->DevicePath) + 1; + to_copy = device->detail->DevicePath; to_copy_bytes = *data_size * sizeof(WCHAR); break; case RIDI_DEVICEINFO: avail_bytes = *data_size; info.cbSize = sizeof(info); - if (handle == WINE_MOUSE_HANDLE) - { - info.dwType = RIM_TYPEMOUSE; - info.u.mouse = mouse_info; - } - else if (handle == WINE_KEYBOARD_HANDLE) - { - info.dwType = RIM_TYPEKEYBOARD; - info.u.keyboard = keyboard_info; - } - else - { - info = device->info; - } + info = device->info; to_copy_bytes = sizeof(info); *data_size = to_copy_bytes; to_copy = &info; @@ -760,8 +730,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT case RIDI_PREPARSEDDATA: avail_bytes = *data_size; - if (handle == WINE_MOUSE_HANDLE || handle == WINE_KEYBOARD_HANDLE || - device->info.dwType != RIM_TYPEHID) + if (device->info.dwType != RIM_TYPEHID) { to_copy_bytes = 0; *data_size = 0; diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 4ce2c5643cd..b45adeb3cae 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1923,8 +1923,7 @@ static void test_GetRawInputDeviceList(void) * understand that; so use the \\?\ prefix instead */ name[1] = '\\'; file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - todo_wine_if(info.dwType == RIM_TYPEMOUSE || info.dwType == RIM_TYPEKEYBOARD) - ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); sz = 0; ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_PREPARSEDDATA, NULL, &sz);

1 0

Rémi Bernon : user32: Set last error codes on GetRawInputDeviceInfoW failure.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: 6a0eb7a5f2929f96f986803bcc58600e0bfcf774 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a0eb7a5f2929f96f986803b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 4 10:24:54 2021 +0200 user32: Set last error codes on GetRawInputDeviceInfoW failure. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 16 ++++++++++++++-- dlls/user32/tests/input.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 1e66b394cb5..9a72a9a323e 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -696,8 +696,16 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT TRACE("handle %p, command %#x, data %p, data_size %p.\n", handle, command, data, data_size); - if (!data_size) return ~0U; - if (!(device = find_device_from_handle(handle))) return ~0U; + if (!data_size) + { + SetLastError(ERROR_NOACCESS); + return ~0U; + } + if (!(device = find_device_from_handle(handle))) + { + SetLastError(ERROR_INVALID_HANDLE); + return ~0U; + } /* each case below must set: * *data_size: length (meaning defined by command) of data we want to copy @@ -769,6 +777,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT default: FIXME("command %#x not supported\n", command); + SetLastError(ERROR_INVALID_PARAMETER); return ~0U; } @@ -776,7 +785,10 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT return 0; if (avail_bytes < to_copy_bytes) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); return ~0U; + } memcpy(data, to_copy, to_copy_bytes); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 382e124e1f4..4ce2c5643cd 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1834,6 +1834,43 @@ static void test_GetRawInputDeviceList(void) ret = pGetRawInputDeviceList(devices, &devcount, sizeof(devices[0])); ok(ret > 0, "expected non-zero\n"); + if (devcount) + { + RID_DEVICE_INFO info; + UINT size; + + SetLastError( 0xdeadbeef ); + ret = pGetRawInputDeviceInfoW( UlongToHandle( 0xdeadbeef ), RIDI_DEVICEINFO, NULL, NULL ); + ok( ret == ~0U, "GetRawInputDeviceInfoW returned %#x, expected ~0.\n", ret ); + ok( GetLastError() == ERROR_NOACCESS, "GetRawInputDeviceInfoW last error %#x, expected 0xdeadbeef.\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + size = 0xdeadbeef; + ret = pGetRawInputDeviceInfoW( UlongToHandle( 0xdeadbeef ), RIDI_DEVICEINFO, NULL, &size ); + ok( ret == ~0U, "GetRawInputDeviceInfoW returned %#x, expected ~0.\n", ret ); + ok( size == 0xdeadbeef, "GetRawInputDeviceInfoW returned size %#x, expected 0.\n", size ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "GetRawInputDeviceInfoW last error %#x, expected 0xdeadbeef.\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + size = 0xdeadbeef; + ret = pGetRawInputDeviceInfoW( devices[0].hDevice, 0xdeadbeef, NULL, &size ); + ok( ret == ~0U, "GetRawInputDeviceInfoW returned %#x, expected ~0.\n", ret ); + ok( size == 0xdeadbeef, "GetRawInputDeviceInfoW returned size %#x, expected 0.\n", size ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputDeviceInfoW last error %#x, expected 0xdeadbeef.\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pGetRawInputDeviceInfoW( devices[0].hDevice, RIDI_DEVICEINFO, &info, NULL ); + ok( ret == ~0U, "GetRawInputDeviceInfoW returned %#x, expected ~0.\n", ret ); + ok( GetLastError() == ERROR_NOACCESS, "GetRawInputDeviceInfoW last error %#x, expected 0xdeadbeef.\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + size = 0; + ret = pGetRawInputDeviceInfoW( devices[0].hDevice, RIDI_DEVICEINFO, &info, &size ); + ok( ret == ~0U, "GetRawInputDeviceInfoW returned %#x, expected ~0.\n", ret ); + ok( size == sizeof(info), "GetRawInputDeviceInfoW returned size %#x, expected %#x.\n", size, sizeof(info) ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetRawInputDeviceInfoW last error %#x, expected 0xdeadbeef.\n", GetLastError() ); + } + for(i = 0; i < devcount; ++i) { WCHAR name[128];

1 0

Rémi Bernon : user32: Free rawinput device preparsed data for mouse and keyboard.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: 964bf9687baa29da081d3eb6e18f7cdfa1c9ded7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964bf9687baa29da081d3eb6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 4 10:24:53 2021 +0200 user32: Free rawinput device preparsed data for mouse and keyboard. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 6172c500839..1e66b394cb5 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -226,6 +226,8 @@ static void find_devices(void) device->info.dwType = RIM_TYPEMOUSE; device->info.u.mouse = mouse_info; + HidD_FreePreparsedData(device->data); + device->data = NULL; } SetupDiDestroyDeviceInfoList(set); @@ -241,6 +243,8 @@ static void find_devices(void) device->info.dwType = RIM_TYPEKEYBOARD; device->info.u.keyboard = keyboard_info; + HidD_FreePreparsedData(device->data); + device->data = NULL; } SetupDiDestroyDeviceInfoList(set);

1 0

Rémi Bernon : user32: Always refresh rawinput device list when requested.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: c2c78a2fe0ac13e4fca7ab4c17977b65e358485c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2c78a2fe0ac13e4fca7ab4c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 4 10:24:52 2021 +0200 user32: Always refresh rawinput device list when requested. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 5c009624fe6..6172c500839 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -166,8 +166,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) static void find_devices(void) { - static ULONGLONG last_check; - SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; HIDD_ATTRIBUTES attr; @@ -176,10 +174,6 @@ static void find_devices(void) HDEVINFO set; DWORD idx; - if (GetTickCount64() - last_check < 2000) - return; - last_check = GetTickCount64(); - HidD_GetHidGuid(&hid_guid); EnterCriticalSection(&rawinput_devices_cs);

1 0

Arkadiusz Hiler : msvcrt/tests: Add CREATE_SUSPENDED test for _beginthreadex().
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: d3ba02f35c08a879be5aeaf59fd010209098a073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3ba02f35c08a879be5aeaf5… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue May 4 14:49:36 2021 +0300 msvcrt/tests: Add CREATE_SUSPENDED test for _beginthreadex(). Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/misc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index e262983e7e6..b38915596df 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -587,6 +587,19 @@ static void test_thread_handle_close(void) ok(ret, "ret = %d\n", ret); } +static void test_thread_suspended(void) +{ + HANDLE hThread; + DWORD ret; + + hThread = (HANDLE)_beginthreadex(NULL, 0, test_thread_func_ex, NULL, CREATE_SUSPENDED, NULL); + ok(hThread != NULL, "_beginthreadex failed (%d)\n", errno); + ret = ResumeThread(hThread); + ok(ret == 1, "suspend count = %d\n", ret); + ret = WaitForSingleObject(hThread, 200); + ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret); +} + static int __cdecl _lfind_s_comp(void *ctx, const void *l, const void *r) { *(int *)ctx = 0xdeadc0de; @@ -684,5 +697,6 @@ START_TEST(misc) test_qsort_s(); test_math_functions(); test_thread_handle_close(); + test_thread_suspended(); test__lfind_s(); }

1 0

Arkadiusz Hiler : msvcrt: Remove return after _endthread().
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: a4af8bb0506e679bcf215af6905784f917881c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4af8bb0506e679bcf215af6… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue May 4 14:49:35 2021 +0300 msvcrt: Remove return after _endthread(). Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/thread.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 650afdc08af..c2fc863dd33 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -103,7 +103,6 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) local_trampoline.start_address(local_trampoline.arglist); _endthread(); - return 0; } /*********************************************************************

1 0

Nikolay Sivov : mfplat: Trace I8 propvariant values.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: f4aae6255b26899cbf443c18391eec5e5808c63c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4aae6255b26899cbf443c18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 4 13:22:03 2021 +0300 mfplat: Trace I8 propvariant values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 8c968fe6fba..117907bb1a9 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -132,6 +132,8 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) return wine_dbg_sprintf("%p {VT_UI4: %d}", v, v->ulVal); case VT_UI8: return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart)); + case VT_I8: + return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(v->hVal.QuadPart)); case VT_R8: return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->dblVal); case VT_CLSID:

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: 64041e3e03660e6ed4f33410172678c32b8838a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64041e3e03660e6ed4f33410… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue May 4 17:04:00 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/nl.po b/po/nl.po index 74dd20a4afe..6347c615a8f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-21 09:20+0200\n" +"PO-Revision-Date: 2021-05-04 16:50+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -571,7 +571,7 @@ msgstr "Opslaan als..." #: dlls/comdlg32/comdlg32.rc:193 dlls/comdlg32/comdlg32.rc:146 msgid "Save As" -msgstr "&Opslaan als" +msgstr "Opslaan als" #: dlls/comdlg32/comdlg32.rc:202 dlls/comdlg32/comdlg32.rc:211 #: dlls/comdlg32/comdlg32.rc:358 dlls/comdlg32/comdlg32.rc:55 @@ -3985,10 +3985,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kan onschrijfbare eigenschap '|' niet veranderen" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[object]' is geen datum object" +msgstr "'this' is geen Map object" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -14799,10 +14797,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:180 -#, fuzzy -#| msgid "reg: Unable to find the specified registry key\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: Kan de gegeven registersleutel niet vinden\n" +msgstr "reg: Kan de gegeven registersleutel niet openen of aanmaken\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
77
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 May 2021