January 2022 - Wine-Commits

Eric Pouech : po: Fixed typos in French translation.
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: 996f1282455d923399f6b1b96587ab9477253855 URL: https://source.winehq.org/git/wine.git/?a=commit;h=996f1282455d923399f6b1b9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jan 4 16:12:50 2022 +0100 po: Fixed typos in French translation. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/po/fr.po b/po/fr.po index 261ec742166..eb34ca3ac83 100644 --- a/po/fr.po +++ b/po/fr.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: 2022-01-03 13:08+0100\n" +"PO-Revision-Date: 2022-01-04 15:28+0100\n" "Last-Translator: Eric Pouech <eric.pouech(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" @@ -520,7 +520,7 @@ msgstr "Cacher les détails" #: dlls/comctl32/comctl32.rc:63 msgid "See details" -msgstr "Void les détails" +msgstr "Voir les détails" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -1617,7 +1617,7 @@ msgstr "Mise à jour de Windows" #: dlls/crypt32/crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "Paire nom/value d'enrôlement" +msgstr "Paire nom/valeur d'enrôlement" #: dlls/crypt32/crypt32.rc:90 msgid "OS Version" @@ -3809,7 +3809,7 @@ msgstr "Indice hors limites" #: dlls/jscript/jscript.rc:31 msgid "Out of stack space" -msgstr "Dépassement de capacité de pile :" +msgstr "Dépassement de capacité de pile" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -6621,7 +6621,7 @@ msgstr "Fichier de table de conversion de caractères trop petit.\n" #: dlls/kernel32/winerror.mc:3293 msgid "Null context handle.\n" -msgstr "Descripteur de contexte null.\n" +msgstr "Descripteur de contexte nul.\n" #: dlls/kernel32/winerror.mc:3298 msgid "Context handle damaged.\n" @@ -6637,7 +6637,7 @@ msgstr "Impossible d'obtenir le descripteur d'appel.\n" #: dlls/kernel32/winerror.mc:3313 msgid "Null reference pointer.\n" -msgstr "Pointeur de référence null.\n" +msgstr "Pointeur de référence nul.\n" #: dlls/kernel32/winerror.mc:3318 msgid "Enumeration value out of range.\n" @@ -7542,7 +7542,7 @@ msgstr "Le récepteur n'a pas été finalisé.\n" #: dlls/mferror/mferror.mc:732 msgid "Clock was stopped\n" -msgstr "L'horloge a été arrếtée\n" +msgstr "L'horloge a été arrêtée\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7892,7 +7892,7 @@ msgstr "Le récepteur n'a pas reçu les en-têtes attendues.\n" #: dlls/mferror/mferror.mc:627 msgid "Optional node is invalid.\n" -msgstr "Le noeud optionnel n'est pas valide.\n" +msgstr "Le nœud optionnel n'est pas valide.\n" #: dlls/mferror/mferror.mc:634 msgid "Cannot find decryptor.\n" @@ -7904,7 +7904,7 @@ msgstr "Le Codec n'a pas été trouvé.\n" #: dlls/mferror/mferror.mc:648 msgid "Cannot connect topology nodes.\n" -msgstr "Impossible de connecter les noeuds de la topologie.\n" +msgstr "Impossible de connecter les nœuds de la topologie.\n" #: dlls/mferror/mferror.mc:655 msgid "Topology request is not supported.\n" @@ -8305,7 +8305,7 @@ msgstr "Suppression des composants ODBC" #: dlls/msi/msi.rc:135 msgid "Removing system registry values" -msgstr "Suppression des valeurs dans le regitre système" +msgstr "Suppression des valeurs dans le registre système" #: dlls/msi/msi.rc:136 msgid "Removing shortcuts" @@ -8527,7 +8527,7 @@ msgid "" msgstr "" "L'installeur a rencontré une erreur inattendue en installant ce paquet. Ceci " "peut provenir d'un problème avec ce paquet. Le code d'erreur est [1]. {{Les " -"arguements sont : [2], [3], [4]}}" +"arguments sont : [2], [3], [4]}}" #: dlls/msi/msi.rc:77 msgid "{{Disk full: }}" @@ -8535,7 +8535,7 @@ msgstr "{{Disque plein: }}" #: dlls/msi/msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "Action [Tempts] : [1]. [2]" +msgstr "Action [Temps] : [1]. [2]" #: dlls/msi/msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" @@ -12939,7 +12939,7 @@ msgid "" "No wave device that can play files in the current format is installed. Use " "the Drivers option to install the wave device." msgstr "" -"Aucun périphérique audio capable de jouer des fichiers dans le formaten " +"Aucun périphérique audio capable de jouer des fichiers dans le format en " "cours n'est présent. Utiliser l'option pour installer des périphériques " "audio." @@ -15658,7 +15658,7 @@ msgstr "reg : L'opération s'est terminée avec succès\n" #: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" -msgstr "reg : L'operation sur le registre a été annulée\n" +msgstr "reg : L'opération sur le registre a été annulée\n" #: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" @@ -17941,7 +17941,7 @@ msgstr "Visionneuse de fichiers Metafile réguliers" #: programs/view/view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "Métafichiers (*.wmf, *.emf)" +msgstr "Méta-fichiers (*.wmf, *.emf)" #: programs/wineboot/wineboot.rc:31 msgid "Waiting for Program" @@ -18101,7 +18101,7 @@ msgstr "&native (Windows)" #: programs/winecfg/winecfg.rc:210 msgid "Buil&tin then Native" -msgstr "I&ntégrée puis Native." +msgstr "I&ntégrée puis Native" #: programs/winecfg/winecfg.rc:211 msgid "Nati&ve then Builtin"

1 0

Nikolay Sivov : comctl32/tests: Add a basic test for ImageList_WriteEx().
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: dd96366b47bce281d76a1e32ae7ba253aa0103c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd96366b47bce281d76a1e32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 4 17:30:02 2022 +0300 comctl32/tests: Add a basic test for ImageList_WriteEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 25 +++++++++++++++++++++++++ include/commctrl.h | 4 ++++ 2 files changed, 29 insertions(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index ed9b1cc97f2..66a70982e6f 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -88,6 +88,7 @@ static HIMAGELIST (WINAPI *pImageList_Read)(IStream *); static BOOL (WINAPI *pImageList_Copy)(HIMAGELIST, int, HIMAGELIST, int, UINT); static HIMAGELIST (WINAPI *pImageList_LoadImageW)(HINSTANCE, LPCWSTR, int, int, COLORREF, UINT, UINT); static BOOL (WINAPI *pImageList_Draw)(HIMAGELIST,INT,HDC,INT,INT,UINT); +static HRESULT (WINAPI *pImageList_WriteEx)(HIMAGELIST himl, DWORD flags, IStream *stream); static HINSTANCE hinst; @@ -2574,6 +2575,28 @@ static void test_IImageList_GetIconSize(void) IImageList_Release(imgl); } +static void test_ImageList_WriteEx(void) +{ + HIMAGELIST himl; + IStream *stream; + HRESULT hr; + + himl = pImageList_Create(24, 24, ILC_COLOR24, 1, 1); + ok(himl != 0, "Failed to create an imagelist.\n"); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pImageList_WriteEx(himl, ILP_NORMAL, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pImageList_WriteEx(himl, ILP_DOWNLEVEL, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IStream_Release(stream); + pImageList_Destroy(himl); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -2601,6 +2624,7 @@ static void init_functions(void) X(ImageList_Merge); X(ImageList_GetImageInfo); X(ImageList_Write); + X(ImageList_WriteEx); X(ImageList_Read); X(ImageList_Copy); X(ImageList_LoadImageW); @@ -2669,6 +2693,7 @@ START_TEST(imagelist) test_IImageList_SetBkColor(); test_IImageList_GetImageCount(); test_IImageList_GetIconSize(); + test_ImageList_WriteEx(); CoUninitialize(); diff --git a/include/commctrl.h b/include/commctrl.h index c6d9dd32928..164de374604 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -602,6 +602,10 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT); #ifdef __IStream_INTERFACE_DEFINED__ HIMAGELIST WINAPI ImageList_Read(LPSTREAM); BOOL WINAPI ImageList_Write(HIMAGELIST,IStream*); + +#define ILP_NORMAL 0 +#define ILP_DOWNLEVEL 1 + HRESULT WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); #endif

1 0

Jinoh Kang : server: Reselect only after dequeueing async request.
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: 9ef5c9c0090f17df5bfd794485019fb8bf9a7e25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef5c9c0090f17df5bfd7944… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jan 4 05:42:08 2022 +0900 server: Reselect only after dequeueing async request. Otherwise, async_waiting() returns 0, leading the socket object to believe that the previous async request has not yet been acknowledged. This results in I/O hang for subsequent reads (until shutdown). Also, async_destroy() calls async_reselect() only after removing the async request from the queue. Make async_set_result() consistent with this behaviour. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52332 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ---- server/async.c | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d3d58fc946f..5cf015eecc6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11487,16 +11487,12 @@ static void test_simultaneous_async_recv(void) DWORD size; ret = WaitForSingleObject(events[i], 1000); - todo_wine_if(i > 0) ok(!ret, "wait timed out\n"); size = 0; ret = GetOverlappedResult((HANDLE)client, &overlappeds[i], &size, FALSE); - todo_wine_if(i > 0) ok(ret, "got error %u\n", GetLastError()); - todo_wine_if(i > 0) ok(size == stride, "got size %u\n", size); - todo_wine_if(i > 0) ok(!memcmp(expect, actual, stride), "expected %s, got %s\n", debugstr_an(expect, stride), debugstr_an(actual, stride)); } diff --git a/server/async.c b/server/async.c index 1a564ff1a69..7aef28355f0 100644 --- a/server/async.c +++ b/server/async.c @@ -509,12 +509,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota async->completion_callback( async->completion_callback_private ); async->completion_callback = NULL; - async_reselect( async ); - if (async->queue) { - async->fd = NULL; list_remove( &async->queue_entry ); + async_reselect( async ); + async->fd = NULL; async->queue = NULL; release_object( async ); }

1 0

Jinoh Kang : ws2_32/tests: Add a test for simultaneous WSARecv().
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: 62e0afda1eed839241e6716e61f4433828477403 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62e0afda1eed839241e6716e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jan 4 05:41:18 2022 +0900 ws2_32/tests: Add a test for simultaneous WSARecv(). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d4585c2b1dc..d3d58fc946f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11451,6 +11451,61 @@ static void test_nonblocking_async_recv(void) CloseHandle(overlapped.hEvent); } +static void test_simultaneous_async_recv(void) +{ + SOCKET client, server; + OVERLAPPED overlappeds[2] = {{0}}; + HANDLE events[2]; + WSABUF wsabufs[2]; + DWORD flags[2] = {0}; + size_t num_io = 2, stride = 16, i; + char resbuf[32] = ""; + static const char msgstr[32] = "-- Lorem ipsum dolor sit amet -"; + int ret; + + for (i = 0; i < num_io; i++) events[i] = CreateEventW(NULL, TRUE, FALSE, NULL); + + tcp_socketpair(&client, &server); + + for (i = 0; i < num_io; i++) + { + wsabufs[i].buf = resbuf + i * stride; + wsabufs[i].len = stride; + overlappeds[i].hEvent = events[i]; + ret = WSARecv(client, &wsabufs[i], 1, NULL, &flags[i], &overlappeds[i], NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + } + + ret = send(server, msgstr, sizeof(msgstr), 0); + ok(ret == sizeof(msgstr), "got %d\n", ret); + + for (i = 0; i < num_io; i++) + { + const void *expect = msgstr + i * stride; + const void *actual = resbuf + i * stride; + DWORD size; + + ret = WaitForSingleObject(events[i], 1000); + todo_wine_if(i > 0) + ok(!ret, "wait timed out\n"); + + size = 0; + ret = GetOverlappedResult((HANDLE)client, &overlappeds[i], &size, FALSE); + todo_wine_if(i > 0) + ok(ret, "got error %u\n", GetLastError()); + todo_wine_if(i > 0) + ok(size == stride, "got size %u\n", size); + todo_wine_if(i > 0) + ok(!memcmp(expect, actual, stride), "expected %s, got %s\n", debugstr_an(expect, stride), debugstr_an(actual, stride)); + } + + closesocket(client); + closesocket(server); + + for (i = 0; i < num_io; i++) CloseHandle(events[i]); +} + static void test_empty_recv(void) { OVERLAPPED overlapped = {0}; @@ -12009,6 +12064,7 @@ START_TEST( sock ) test_connecting_socket(); test_WSAGetOverlappedResult(); test_nonblocking_async_recv(); + test_simultaneous_async_recv(); test_empty_recv(); test_timeout();

1 0

Huw Davies : winspool: Don't try to match a printer to a server handle.
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: 4fcd040d903fc62c1e53b5eeb6091869b925a8f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fcd040d903fc62c1e53b5ee… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 4 11:09:44 2022 +0000 winspool: Don't try to match a printer to a server handle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51853 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ac8f0994a1c..971eb654e6a 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1002,10 +1002,9 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault if(handle == nb_printer_handles) handle = i; } - else + else if (!queue && name && printer_handles[i]->name && !wcscmp( name, printer_handles[i]->name )) { - if(!queue && (name) && !wcscmp( name, printer_handles[i]->name )) - queue = printer_handles[i]->queue; + queue = printer_handles[i]->queue; } }

1 0

Rémi Bernon : dinput: Return HID class guid in DIPROP_GUIDANDPATH property.
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: 85148f9ee006f338b8d434662069bf01d00980fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=85148f9ee006f338b8d43466… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 4 10:41:10 2022 +0100 dinput: Return HID class guid in DIPROP_GUIDANDPATH property. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 1 + dlls/dinput/tests/joystick8.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 874eca6646e..2e3efd2ee8a 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -819,6 +819,7 @@ static HRESULT hid_joystick_get_property( IDirectInputDevice8W *iface, DWORD pro case (DWORD_PTR)DIPROP_GUIDANDPATH: { DIPROPGUIDANDPATH *value = (DIPROPGUIDANDPATH *)header; + value->guidClass = GUID_DEVCLASS_HIDCLASS; lstrcpynW( value->wszPath, impl->device_path, MAX_PATH ); return DI_OK; } diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 4f9ba401673..d06b56cbf8c 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -889,7 +889,6 @@ static void test_simple_joystick( DWORD version ) hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); ok( hr == DI_OK, "GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); - todo_wine ok( IsEqualGUID( &prop_guid_path.guidClass, &GUID_DEVCLASS_HIDCLASS ), "got guid %s\n", debugstr_guid( &prop_guid_path.guidClass ) ); todo_wine

1 0

Rémi Bernon : dinput: Allow 0xff as a DIDFT_ANYINSTANCE alias with old dinput version.
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: 5499ba3929c507731104a8a02ecf04b9a70613d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5499ba3929c507731104a8a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 4 10:41:09 2022 +0100 dinput: Allow 0xff as a DIDFT_ANYINSTANCE alias with old dinput version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52267 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 6 ++++-- dlls/dinput/tests/joystick8.c | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 834b87f5fe0..a4c85351648 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -240,11 +240,13 @@ LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD } static BOOL match_device_object( DIDATAFORMAT *device_format, DIDATAFORMAT *user_format, - const DIDATAFORMAT *format, const DIOBJECTDATAFORMAT *match_obj ) + const DIDATAFORMAT *format, const DIOBJECTDATAFORMAT *match_obj, DWORD version ) { DWORD i, device_instance, instance = DIDFT_GETINSTANCE( match_obj->dwType ); DIOBJECTDATAFORMAT *device_obj, *user_obj; + if (version < 0x0700 && instance == 0xff) instance = 0xffff; + for (i = 0; i < device_format->dwNumObjs; i++) { user_obj = user_format->rgodf + i; @@ -292,7 +294,7 @@ static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const { match_obj = format->rgodf + i; - if (!match_device_object( device_format, user_format, format, match_obj )) + if (!match_device_object( device_format, user_format, format, match_obj, impl->dinput->dwVersion )) { WARN( "object %s not found\n", debugstr_diobjectdataformat( match_obj ) ); if (!(match_obj->dwType & DIDFT_OPTIONAL)) goto failed; diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 6b02e02d036..4f9ba401673 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1513,7 +1513,6 @@ static void test_simple_joystick( DWORD version ) ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr ); objdataformat[1].dwType = DIDFT_AXIS | DIDFT_MAKEINSTANCE( 0xff ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); - todo_wine_if( version < 0x0700 ) ok( hr == (version < 0x0700 ? DI_OK : DIERR_INVALIDPARAM), "SetDataFormat returned: %#x\n", hr ); objdataformat[1].dwType = DIDFT_AXIS | DIDFT_MAKEINSTANCE( 1 );

1 0

Rémi Bernon : dinput/tests: Test simple joystick with older dinput versions.
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: bef9b8a2bffcbd55ca31aa2458def0d815558152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bef9b8a2bffcbd55ca31aa24… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 4 10:41:07 2022 +0100 dinput/tests: Test simple joystick with older dinput versions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 453 ++++++++++++++++++++++++++++++------------ 1 file changed, 323 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bef9b8a2bffcbd55ca31…

1 0

Alex Henrie : kernel32/tests: Drop path test workarounds for Windows <= 2000.
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: c43ce509d2847562bb26e20068bf994df6385165 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c43ce509d2847562bb26e200… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 4 00:24:32 2022 -0700 kernel32/tests: Drop path test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 82 +++++++++++----------------------------------- 1 file changed, 20 insertions(+), 62 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 2955be0da9c..db376eef24a 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -350,8 +350,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) "GetTempPathA returned a path that did not end in '\\'\n"); lstrcpyA(tmpstr,"aaaaaaaa"); len1=GetTempPathA(len,tmpstr); - ok(len1==len+1 || broken(len1 == len), /* WinME */ - "GetTempPathA should return string length %d instead of %d\n",len+1,len1); + ok(len1==len+1,"GetTempPathA should return string length %d instead of %d\n",len+1,len1); /* Test GetTmpFileNameA */ ok((id=GetTempFileNameA(tmppath,"path",0,newdir)),"GetTempFileNameA failed\n"); @@ -364,25 +363,20 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); id=GetTempFileNameA(tmppath,NULL,0,newdir); -/* Windows 95, 98 return 0==id, while Windows 2000, XP return 0!=id */ - if (id) - { - sprintf(tmpstr,"%.4x.tmp",id & 0xffff); - sprintf(tmpstr1,"%x.tmp",id & 0xffff); - ok(lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr)==0 || - lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0, - "GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n", - newdir,tmpstr,tmpstr1,id); - ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); - } + sprintf(tmpstr,"%.4x.tmp",id & 0xffff); + sprintf(tmpstr1,"%x.tmp",id & 0xffff); + ok(lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr)==0 || + lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0, + "GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n", + newdir,tmpstr,tmpstr1,id); + ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); for(unique=0;unique<3;unique++) { /* Nonexistent path */ sprintf(invalid_dir, "%s\\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); SetLastError(0xdeadbeef); ok(!GetTempFileNameA(invalid_dir,"tfn",unique,newdir),"GetTempFileNameA should have failed\n"); - ok(GetLastError()==ERROR_DIRECTORY || broken(GetLastError()==ERROR_PATH_NOT_FOUND)/*win98*/, - "got %d, expected ERROR_DIRECTORY\n", GetLastError()); + ok(GetLastError()==ERROR_DIRECTORY,"got %u, expected ERROR_DIRECTORY\n", GetLastError()); /* Check return value for unique !=0 */ if(unique) { @@ -489,12 +483,12 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) SetLastError( 0xdeadbeef ); strcpy( buffer, "foo" ); len = GetCurrentDirectoryA( 65536, buffer ); - ok( (len != 0 && len < MAX_PATH) || broken(!len), /* nt4 */ "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + ok( (len != 0 && len < MAX_PATH), "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); SetLastError( 0xdeadbeef ); strcpy( buffer, "foo" ); len = GetCurrentDirectoryA( 2 * 65536, buffer ); - ok( (len != 0 && len < MAX_PATH) || broken(!len), /* nt4 */ "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + ok( (len != 0 && len < MAX_PATH), "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); HeapFree( GetProcessHeap(), 0, buffer ); @@ -1004,11 +998,6 @@ static void test_GetTempPathW(char* tmp_dir) lstrcpyW(buf, fooW); len = GetTempPathW(MAX_PATH, buf); - if (len == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("GetTempPathW is not available\n"); - return; - } ok(lstrcmpiW(buf, tmp_dirW) == 0, "GetTempPathW returned an incorrect temporary path\n"); ok(len == lstrlenW(buf), "returned length should be equal to the length of string\n"); @@ -1185,12 +1174,6 @@ static void test_GetLongPathNameA(void) SetLastError(0xdeadbeef); length = GetLongPathNameA(temppath2, NULL, 0); - if (length == 0 && GetLastError() == ERROR_BAD_NET_NAME) - { - win_skip("UNC syntax tests don't work on Win98/WinMe\n"); - DeleteFileA(tempfile); - return; - } ok(length == explength, "Wrong length %d, expected %d\n", length, explength); length = GetLongPathNameA(temppath2, NULL, MAX_PATH); @@ -1275,11 +1258,6 @@ static void test_GetLongPathNameW(void) SetLastError(0xdeadbeef); length = GetLongPathNameW(NULL,NULL,0); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("GetLongPathNameW is not implemented\n"); - return; - } ok(0==length,"GetLongPathNameW returned %d but expected 0\n",length); ok(GetLastError()==ERROR_INVALID_PARAMETER,"GetLastError returned %d but expected ERROR_INVALID_PARAMETER\n",GetLastError()); @@ -1371,13 +1349,7 @@ static void test_GetShortPathNameW(void) HANDLE file; int ret; - SetLastError(0xdeadbeef); GetTempPathW( MAX_PATH, tmppath ); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } lstrcpyW( path, tmppath ); lstrcatW( path, test_path ); @@ -1462,11 +1434,8 @@ static void test_GetSystemDirectory(void) SetLastError(0xdeadbeef); res = GetSystemDirectoryA(NULL, total-1); - /* 95+NT: total (includes the terminating Zero) - 98+ME: 0 with ERROR_INVALID_PARAMETER */ - ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '%d' or: '0' with " - "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), total); + ok( res == total, "returned %u with %u (expected '%u')\n", + res, GetLastError(), total ); if (total > MAX_PATH) return; @@ -1521,11 +1490,8 @@ static void test_GetWindowsDirectory(void) SetLastError(0xdeadbeef); res = GetWindowsDirectoryA(NULL, total-1); - /* 95+NT: total (includes the terminating Zero) - 98+ME: 0 with ERROR_INVALID_PARAMETER */ - ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '%d' or: '0' with " - "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), total); + ok( res == total, "returned %u with %u (expected '%u')\n", + res, GetLastError(), total ); if (total > MAX_PATH) return; @@ -1912,11 +1878,11 @@ static void test_SearchPathW(void) HANDLE handle; DWORD ret; -if (0) -{ - /* NULL filename, crashes on nt4 */ - SearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); -} + /* NULL filename */ + ret = SearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); + ok(ret == 0, "Expected failure, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %#x\n", GetLastError()); GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); @@ -2105,14 +2071,6 @@ static void test_GetFullPathNameW(void) {emptyW, MAX_PATH, output, &filepart, 1}, }; - SetLastError(0xdeadbeef); - ret = GetFullPathNameW(NULL, 0, NULL, NULL); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("GetFullPathNameW is not available\n"); - return; - } - for (i = 0; i < ARRAY_SIZE(invalid_parameters); i++) { SetLastError(0xdeadbeef);

1 0

Rémi Bernon : dinput: Return DIERR_UNSUPPORTED for properties with old dinput version.
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: c69c9b55d773b6d2c8d232292521166df8a91c92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c69c9b55d773b6d2c8d23229… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 4 10:41:08 2022 +0100 dinput: Return DIERR_UNSUPPORTED for properties with old dinput version. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 13 +++++++++++++ dlls/dinput/tests/joystick8.c | 16 +--------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 1dc3c311f2b..834b87f5fe0 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -907,6 +907,19 @@ static HRESULT enum_object_filter_init( struct dinput_device *impl, DIPROPHEADER static HRESULT check_property( struct dinput_device *impl, const GUID *guid, const DIPROPHEADER *header, BOOL set ) { + switch (LOWORD( guid )) + { + case (DWORD_PTR)DIPROP_VIDPID: + case (DWORD_PTR)DIPROP_TYPENAME: + case (DWORD_PTR)DIPROP_USERNAME: + case (DWORD_PTR)DIPROP_KEYNAME: + case (DWORD_PTR)DIPROP_LOGICALRANGE: + case (DWORD_PTR)DIPROP_PHYSICALRANGE: + case (DWORD_PTR)DIPROP_APPDATA: + if (impl->dinput->dwVersion < 0x0800) return DIERR_UNSUPPORTED; + break; + } + switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_INSTANCENAME: diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 0ff76da6463..6b02e02d036 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -870,7 +870,6 @@ static void test_simple_joystick( DWORD version ) hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, NULL ); ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_string.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), "GetProperty DIPROP_VIDPID returned %#x\n", hr ); prop_dword.diph.dwHeaderSize = sizeof(DIPROPHEADER) - 1; @@ -880,7 +879,6 @@ static void test_simple_joystick( DWORD version ) prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), "GetProperty DIPROP_VIDPID returned %#x\n", hr ); if (hr == DI_OK) @@ -925,7 +923,6 @@ static void test_simple_joystick( DWORD version ) ok( !wcscmp( prop_string.wsz, expect_vidpid_str ), "got type %s\n", debugstr_w(prop_string.wsz) ); } hr = IDirectInputDevice8_GetProperty( device, DIPROP_USERNAME, &prop_string.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_NOEFFECT), "GetProperty DIPROP_USERNAME returned %#x\n", hr ); if (hr == DI_NOEFFECT) @@ -972,7 +969,6 @@ static void test_simple_joystick( DWORD version ) hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_RANGE returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); @@ -1003,7 +999,6 @@ static void test_simple_joystick( DWORD version ) prop_string.diph.dwHow = DIPH_BYUSAGE; prop_string.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); if (hr == DI_OK) @@ -1042,7 +1037,6 @@ static void test_simple_joystick( DWORD version ) ok( prop_range.lMin == 0, "got %d expected %d\n", prop_range.lMin, 0 ); ok( prop_range.lMax == 65535, "got %d expected %d\n", prop_range.lMax, 65535 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), "GetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); if (hr == DI_OK) @@ -1051,7 +1045,6 @@ static void test_simple_joystick( DWORD version ) ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); } hr = IDirectInputDevice8_GetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), "GetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); if (hr == DI_OK) @@ -1624,11 +1617,9 @@ static void test_simple_joystick( DWORD version ) hr = IDirectInputDevice8_SetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DI_OK, "SetProperty DIPROP_RANGE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), "SetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), "SetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); @@ -1683,7 +1674,6 @@ static void test_simple_joystick( DWORD version ) hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, NULL ); ok( hr == DIERR_INVALIDPARAM, "SetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_string.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), "SetProperty DIPROP_VIDPID returned %#x\n", hr ); @@ -1691,7 +1681,6 @@ static void test_simple_joystick( DWORD version ) prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), "SetProperty DIPROP_VIDPID returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); @@ -1714,11 +1703,9 @@ static void test_simple_joystick( DWORD version ) debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_TYPENAME, &prop_string.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), "SetProperty DIPROP_TYPENAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_USERNAME, &prop_string.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), "SetProperty DIPROP_USERNAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); @@ -1738,7 +1725,7 @@ static void test_simple_joystick( DWORD version ) prop_pointer.diph.dwHow = DIPH_BYUSAGE; prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - todo_wine + todo_wine_if( version >= 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), "SetProperty DIPROP_APPDATA returned %#x\n", hr ); @@ -1893,7 +1880,6 @@ static void test_simple_joystick( DWORD version ) prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_pointer.uData = 0xfeedcafe; hr = IDirectInputDevice8_SetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - todo_wine_if( version < 0x0800 ) ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), "SetProperty DIPROP_APPDATA returned %#x\n", hr );

1 0