February 2022 - Wine-commits

Rémi Bernon : dinput: Use consistent parameter names and types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 1591021f538e19c01615c242eacf30b8ccc6eea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1591021f538e19c01615c242… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:37 2022 +0100 dinput: Use consistent parameter names and types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 57 ++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index b9d44f140c8..e840d218ed0 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -137,7 +137,7 @@ static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface ) LeaveCriticalSection( &impl->crit ); } -static HRESULT dinput_create( REFIID riid, LPVOID *ppDI, struct dinput **out ) +static HRESULT dinput_create( REFIID iid, void **out, struct dinput **out_impl ) { struct dinput *impl = calloc( 1, sizeof(struct dinput) ); HRESULT hr; @@ -150,48 +150,46 @@ static HRESULT dinput_create( REFIID riid, LPVOID *ppDI, struct dinput **out ) impl->IDirectInput8W_iface.lpVtbl = &dinput8_vtbl; impl->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; - hr = IDirectInput_QueryInterface( &impl->IDirectInput7A_iface, riid, ppDI ); + hr = IDirectInput_QueryInterface( &impl->IDirectInput7A_iface, iid, out ); if (FAILED(hr)) { free( impl ); return hr; } - if (out) *out = impl; + if (out_impl) *out_impl = impl; return DI_OK; } /****************************************************************************** * DirectInputCreateEx (DINPUT.@) */ -HRESULT WINAPI DirectInputCreateEx( - HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, - LPUNKNOWN punkOuter) +HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { struct dinput *impl; HRESULT hr; - TRACE("(%p,%04x,%s,%p,%p)\n", hinst, dwVersion, debugstr_guid(riid), ppDI, punkOuter); + TRACE( "hinst %p, version %#x, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); - if (IsEqualGUID( &IID_IDirectInputA, riid ) || - IsEqualGUID( &IID_IDirectInput2A, riid ) || - IsEqualGUID( &IID_IDirectInput7A, riid ) || - IsEqualGUID( &IID_IDirectInputW, riid ) || - IsEqualGUID( &IID_IDirectInput2W, riid ) || - IsEqualGUID( &IID_IDirectInput7W, riid )) + if (IsEqualGUID( &IID_IDirectInputA, iid ) || + IsEqualGUID( &IID_IDirectInput2A, iid ) || + IsEqualGUID( &IID_IDirectInput7A, iid ) || + IsEqualGUID( &IID_IDirectInputW, iid ) || + IsEqualGUID( &IID_IDirectInput2W, iid ) || + IsEqualGUID( &IID_IDirectInput7W, iid )) { - hr = dinput_create( riid, ppDI, &impl ); + hr = dinput_create( iid, out, &impl ); if (FAILED(hr)) return hr; } else return DIERR_NOINTERFACE; - hr = IDirectInput_Initialize( &impl->IDirectInput7A_iface, hinst, dwVersion ); + hr = IDirectInput_Initialize( &impl->IDirectInput7A_iface, hinst, version ); if (FAILED(hr)) { IDirectInput_Release( &impl->IDirectInput7A_iface ); - *ppDI = NULL; + *out = NULL; return hr; } @@ -201,17 +199,14 @@ HRESULT WINAPI DirectInputCreateEx( /****************************************************************************** * DirectInput8Create (DINPUT8.@) */ -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, - DWORD version, REFIID iid, void **out, IUnknown *outer) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { struct dinput *impl; HRESULT hr; - TRACE("hinst %p, version %#x, iid %s, out %p, outer %p.\n", - hinst, version, debugstr_guid(iid), out, outer); + TRACE( "hinst %p, version %#x, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); - if (!out) - return E_POINTER; + if (!out) return E_POINTER; if (!IsEqualGUID(&IID_IDirectInput8A, iid) && !IsEqualGUID(&IID_IDirectInput8W, iid) && @@ -258,27 +253,27 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, /****************************************************************************** * DirectInputCreateA (DINPUT.@) */ -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA( HINSTANCE hinst, DWORD version, IDirectInputA **out, IUnknown *outer ) { - return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7A, (LPVOID *)ppDI, punkOuter); + return DirectInputCreateEx( hinst, version, &IID_IDirectInput7A, (void **)out, outer ); } /****************************************************************************** * DirectInputCreateW (DINPUT.@) */ -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW( HINSTANCE hinst, DWORD version, IDirectInputW **out, IUnknown *outer ) { - return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); + return DirectInputCreateEx( hinst, version, &IID_IDirectInput7W, (void **)out, outer ); } -static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) +static DWORD diactionformat_priorityW( DIACTIONFORMATW *action_format, DWORD genre ) { int i; DWORD priorityFlags = 0; /* If there's at least one action for the device it's priority 1 */ - for(i=0; i < lpdiaf->dwNumActions; i++) - if ((lpdiaf->rgoAction[i].dwSemantic & genre) == genre) + for (i = 0; i < action_format->dwNumActions; i++) + if ((action_format->rgoAction[i].dwSemantic & genre) == genre) priorityFlags |= DIEDBS_MAPPEDPRI1; return priorityFlags; @@ -1454,8 +1449,10 @@ void check_dinput_events(void) MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); } -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved) +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) { + TRACE( "inst %p, reason %u, reserved %p.\n", inst, reason, reserved ); + switch(reason) { case DLL_PROCESS_ATTACH:

1 0

Rémi Bernon : dinput: Canonicalize DirectInput(8) instance creation.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: be6d33824a1905fba02d2343ab3e8f57ede5ccc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be6d33824a1905fba02d2343… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:38 2022 +0100 dinput: Canonicalize DirectInput(8) instance creation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 95 +++++++++++++++++----------------------------- dlls/dinput/tests/dinput.c | 8 ---- 2 files changed, 35 insertions(+), 68 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e840d218ed0..53179f10194 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -137,27 +137,23 @@ static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface ) LeaveCriticalSection( &impl->crit ); } -static HRESULT dinput_create( REFIID iid, void **out, struct dinput **out_impl ) +static HRESULT dinput_create( IUnknown **out ) { - struct dinput *impl = calloc( 1, sizeof(struct dinput) ); - HRESULT hr; - - if (!impl) return E_OUTOFMEMORY; + struct dinput *impl; + if (!(impl = calloc( 1, sizeof(struct dinput) ))) return E_OUTOFMEMORY; impl->IDirectInput7A_iface.lpVtbl = &dinput7_a_vtbl; impl->IDirectInput7W_iface.lpVtbl = &dinput7_vtbl; impl->IDirectInput8A_iface.lpVtbl = &dinput8_a_vtbl; impl->IDirectInput8W_iface.lpVtbl = &dinput8_vtbl; impl->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; + impl->ref = 1; - hr = IDirectInput_QueryInterface( &impl->IDirectInput7A_iface, iid, out ); - if (FAILED(hr)) - { - free( impl ); - return hr; - } - - if (out_impl) *out_impl = impl; +#if DIRECTINPUT_VERSION == 0x0700 + *out = (IUnknown *)&impl->IDirectInput7W_iface; +#else + *out = (IUnknown *)&impl->IDirectInput8W_iface; +#endif return DI_OK; } @@ -166,29 +162,27 @@ static HRESULT dinput_create( REFIID iid, void **out, struct dinput **out_impl ) */ HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { - struct dinput *impl; + IUnknown *unknown; HRESULT hr; TRACE( "hinst %p, version %#x, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); - if (IsEqualGUID( &IID_IDirectInputA, iid ) || - IsEqualGUID( &IID_IDirectInput2A, iid ) || - IsEqualGUID( &IID_IDirectInput7A, iid ) || - IsEqualGUID( &IID_IDirectInputW, iid ) || - IsEqualGUID( &IID_IDirectInput2W, iid ) || - IsEqualGUID( &IID_IDirectInput7W, iid )) - { - hr = dinput_create( iid, out, &impl ); - if (FAILED(hr)) - return hr; - } - else + if (!IsEqualGUID( &IID_IDirectInputA, iid ) && + !IsEqualGUID( &IID_IDirectInputW, iid ) && + !IsEqualGUID( &IID_IDirectInput2A, iid ) && + !IsEqualGUID( &IID_IDirectInput2W, iid ) && + !IsEqualGUID( &IID_IDirectInput7A, iid ) && + !IsEqualGUID( &IID_IDirectInput7W, iid )) return DIERR_NOINTERFACE; - hr = IDirectInput_Initialize( &impl->IDirectInput7A_iface, hinst, version ); - if (FAILED(hr)) + if (FAILED(hr = dinput_create( &unknown ))) return hr; + hr = IUnknown_QueryInterface( unknown, iid, out ); + IUnknown_Release( unknown ); + if (FAILED(hr)) return hr; + + if (outer || FAILED(hr = IDirectInput7_Initialize( (IDirectInput7W *)unknown, hinst, version ))) { - IDirectInput_Release( &impl->IDirectInput7A_iface ); + IUnknown_Release( unknown ); *out = NULL; return hr; } @@ -201,52 +195,33 @@ HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, */ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { - struct dinput *impl; + IUnknown *unknown; HRESULT hr; TRACE( "hinst %p, version %#x, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); if (!out) return E_POINTER; - if (!IsEqualGUID(&IID_IDirectInput8A, iid) && - !IsEqualGUID(&IID_IDirectInput8W, iid) && - !IsEqualGUID(&IID_IUnknown, iid)) + if (!IsEqualGUID( &IID_IDirectInput8A, iid ) && + !IsEqualGUID( &IID_IDirectInput8W, iid ) && + !IsEqualGUID( &IID_IUnknown, iid )) { *out = NULL; return DIERR_NOINTERFACE; } - hr = dinput_create( iid, out, &impl ); + if (FAILED(hr = dinput_create( &unknown ))) return hr; + hr = IUnknown_QueryInterface( unknown, iid, out ); + IUnknown_Release( unknown ); + if (FAILED(hr)) return hr; - if (FAILED(hr)) + if (outer || FAILED(hr = IDirectInput8_Initialize( (IDirectInput8W *)unknown, hinst, version ))) { - ERR("Failed to create DirectInput, hr %#x.\n", hr); + IUnknown_Release( (IUnknown *)unknown ); + *out = NULL; return hr; } - /* When aggregation is used, the application needs to manually call Initialize(). */ - if (!outer && IsEqualGUID(&IID_IDirectInput8A, iid)) - { - hr = IDirectInput8_Initialize( &impl->IDirectInput8A_iface, hinst, version ); - if (FAILED(hr)) - { - IDirectInput8_Release( &impl->IDirectInput8A_iface ); - *out = NULL; - return hr; - } - } - - if (!outer && IsEqualGUID(&IID_IDirectInput8W, iid)) - { - hr = IDirectInput8_Initialize( &impl->IDirectInput8W_iface, hinst, version ); - if (FAILED(hr)) - { - IDirectInput8_Release( &impl->IDirectInput8W_iface ); - *out = NULL; - return hr; - } - } - return S_OK; } @@ -1118,7 +1093,7 @@ static HRESULT WINAPI class_factory_CreateInstance( IClassFactory *iface, IUnkno if (outer) return CLASS_E_NOAGGREGATION; - if (FAILED(hr = dinput_create( &IID_IUnknown, (void **)&unknown, NULL ))) return hr; + if (FAILED(hr = dinput_create( &unknown ))) return hr; hr = IUnknown_QueryInterface( unknown, iid, out ); IUnknown_Release( unknown ); diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 0b3ce276e52..ae5e43945eb 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -249,11 +249,8 @@ static void test_DirectInputCreate( DWORD version ) unknown = (void *)0xdeadbeef; hr = DirectInputCreateW( hInstance, version, (IDirectInputW **)&unknown, &outer ); - todo_wine_if(version == 0x800) ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); - todo_wine_if(version <= 0x700) ok( unknown == NULL, "got IUnknown %p\n", unknown ); - if (unknown) IUnknown_Release( unknown ); for (i = 0; i < ARRAY_SIZE(create_tests); i++) { @@ -324,11 +321,8 @@ static void test_DirectInputCreateEx( DWORD version ) unknown = (void *)0xdeadbeef; hr = pDirectInputCreateEx( hInstance, version, &IID_IDirectInputW, (void **)&unknown, &outer ); - todo_wine_if(version == 0x800) ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); - todo_wine_if(version <= 0x700) ok( unknown == NULL, "got IUnknown %p\n", unknown ); - if (unknown) IUnknown_Release( unknown ); for (i = 0; i < ARRAY_SIZE(create_tests); i++) { @@ -418,9 +412,7 @@ static void test_DirectInput8Create( DWORD version ) unknown = (void *)0xdeadbeef; hr = DirectInput8Create( hInstance, version, &IID_IDirectInput8W, (void **)&unknown, &outer ); ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); - todo_wine ok( unknown == NULL, "got IUnknown %p\n", unknown ); - if (unknown) IUnknown_Release( unknown ); for (i = 0; i < ARRAY_SIZE(create_tests); i++) {

1 0

Rémi Bernon : dinput: Fix printf warnings with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 9f472f00d88a813adc13d7a8f5de091accafcb52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f472f00d88a813adc13d7a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:39 2022 +0100 dinput: Fix printf warnings with long types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 2 +- dlls/dinput/device.c | 53 +++++++++++------------ dlls/dinput/dinput_main.c | 54 +++++++++++------------ dlls/dinput/joystick_hid.c | 106 ++++++++++++++++++++++----------------------- dlls/dinput/keyboard.c | 12 ++--- dlls/dinput/mouse.c | 12 ++--- dlls/dinput8/Makefile.in | 2 +- 7 files changed, 120 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f472f00d88a813adc13…

1 0

Rémi Bernon : dinput/tests: Fix printf warnings with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 19a5881b0b9b29b084a986bfc334513b4dad84cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=19a5881b0b9b29b084a986bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:40 2022 +0100 dinput/tests: Fix printf warnings with long types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/device.c | 126 ++-- dlls/dinput/tests/device8.c | 604 +++++++++---------- dlls/dinput/tests/dinput.c | 210 +++---- dlls/dinput/tests/driver_hid.c | 122 ++-- dlls/dinput/tests/driver_hid.h | 6 +- dlls/dinput/tests/force_feedback.c | 1120 ++++++++++++++++++------------------ dlls/dinput/tests/hid.c | 886 ++++++++++++++-------------- dlls/dinput/tests/hotplug.c | 82 +-- dlls/dinput/tests/joystick.c | 272 ++++----- dlls/dinput/tests/joystick8.c | 1032 ++++++++++++++++----------------- dlls/dinput/tests/keyboard.c | 110 ++-- dlls/dinput/tests/mouse.c | 80 +-- 13 files changed, 2325 insertions(+), 2326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19a5881b0b9b29b084a9…

1 0

Hans Leidekker : msi/tests: Correctly free usersid.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 1bab386adffce4cd5589cec43b407d53230ef1cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bab386adffce4cd5589cec4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 8 11:18:07 2022 +0100 msi/tests: Correctly free usersid. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 7de4fb7c52c..224637eb286 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3022,7 +3022,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static void test_publish_product(void) @@ -3259,7 +3259,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static void test_publish_features(void) @@ -3384,7 +3384,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static LPSTR reg_get_val_str(HKEY hkey, LPCSTR name)

1 0

Hans Leidekker : winhttp/tests: Remove unused include.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: ce76fc6f68c192d60eedfbcd43960db7bca0191d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce76fc6f68c192d60eedfbcd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 8 11:20:52 2022 +0100 winhttp/tests: Remove unused include. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 053f8315fec..21af2761323 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -32,7 +32,6 @@ #include <httprequestid.h> #include "wine/test.h" -#include "wine/heap.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);

1 0

Hans Leidekker : winhttp/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 3c695e3ce9a8b7f19bc085adce5c66b299040d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c695e3ce9a8b7f19bc085ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 8 11:20:53 2022 +0100 winhttp/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/Makefile.in | 1 - dlls/winhttp/tests/notification.c | 422 ++++---- dlls/winhttp/tests/url.c | 190 ++-- dlls/winhttp/tests/winhttp.c | 1902 ++++++++++++++++++------------------- 4 files changed, 1246 insertions(+), 1269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c695e3ce9a8b7f19bc0…

1 0

Hans Leidekker : winhttp: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 120244aefe4987d71d389fefe7121ed0db3e300e URL: https://source.winehq.org/git/wine.git/?a=commit;h=120244aefe4987d71d389fef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 8 11:20:54 2022 +0100 winhttp: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/Makefile.in | 1 - dlls/winhttp/handle.c | 10 ++--- dlls/winhttp/net.c | 39 +++++++++-------- dlls/winhttp/request.c | 106 +++++++++++++++++++++++------------------------ dlls/winhttp/session.c | 76 ++++++++++++++++----------------- dlls/winhttp/url.c | 8 ++-- 6 files changed, 119 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=120244aefe4987d71d38…

1 0

Stefan Dösinger : ddraw/tests: Skip a crashy test on WARP.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: d41ca1818cfd8ad223f4e9c06c704848b8b83a86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d41ca1818cfd8ad223f4e9c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 7 20:00:44 2022 +0300 ddraw/tests: Skip a crashy test on WARP. ddraw1 doesn't draw, so presumably not affected. Can't find any crashes in the testbot history http://test.winehq.org/data/4364ff8d5c0387edd6fae142affe8e844b291518/win81_… http://test.winehq.org/data/d03984709d87d6eaa0e2e7746f0db5d8fdf81b5a/win150… I haven't found any examples of ddraw7 crashing in this test. Doesn't mean there aren't any. Let's wait and see. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 20 ++++++++++++++------ dlls/ddraw/tests/ddraw4.c | 11 ++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 625776c652c..1285fa1b682 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1076,6 +1076,17 @@ static void test_coop_level_d3d_state(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + + if (ddraw_is_warp(ddraw)) + { + /* ddraw2 crashes in EndScene, and if it doesn't crash it fails with + * DDERR_SURFACELOST on WARP. */ + win_skip("Skipping test that crashes WARP occasionally.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create a 3D device, skipping test.\n"); @@ -1159,12 +1170,9 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); - ok(hr == DD_OK || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); - if (hr == DD_OK) - { - color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); - } + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); destroy_material(background); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9b8acb674e3..399ef157497 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1301,6 +1301,14 @@ static void test_coop_level_d3d_state(void) hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirect3D3_Release(d3d); + + if (ddraw_is_warp(ddraw)) + { + /* ddraw4 occasionally crashes in GetRenderTarget. */ + win_skip("Skipping test that crashes WARP occasionally.\n"); + goto done; + } + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(rt); @@ -1324,6 +1332,7 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice3_GetRenderTarget(device, &surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); + IDirectDrawSurface4_Release(surface); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); @@ -1349,8 +1358,8 @@ static void test_coop_level_d3d_state(void) || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), "Got unexpected color 0x%08x.\n", color); +done: destroy_viewport(device, viewport); - IDirectDrawSurface4_Release(surface); IDirectDrawSurface4_Release(rt); IDirect3DDevice3_Release(device); IDirectDraw4_Release(ddraw);

1 0

Stefan Dösinger : ddraw/tests: Disable color keying in ddraw1 test_texture_load.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: cbd14598d55d98a9e6f878b9ee74a72613641462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd14598d55d98a9e6f878b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 6 20:07:47 2022 +0300 ddraw/tests: Disable color keying in ddraw1 test_texture_load. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c5afeff2343..11168d4a74d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11872,6 +11872,8 @@ static void test_texture_load(void) emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 4); emit_texture_load(&ptr, dst_texture_handle, src_texture_handle); emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, dst_texture_handle); + /* WARP randomly applies color keying without having a key set. */ + emit_set_rs(&ptr, D3DRENDERSTATE_COLORKEYENABLE, FALSE); emit_tquad(&ptr, 0); emit_end(&ptr); inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData - sizeof(tquad);

1 0