March 2022 - Wine-commits - list.winehq.org

Rémi Bernon : windows.gaming.input: Add an internal WineGameControllerProvider runtimeclass.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: afaf061edeb93ea98dff73121a791455e4567f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afaf061edeb93ea98dff7312… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 4 10:05:07 2022 +0100 windows.gaming.input: Add an internal WineGameControllerProvider runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/Makefile.in | 4 ++- dlls/windows.gaming.input/provider.idl | 55 ++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index d7f93283bec..24b5fb226b2 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -8,4 +8,6 @@ C_SRCS = \ manager.c \ vector.c -IDL_SRCS = classes.idl +IDL_SRCS = \ + classes.idl \ + provider.idl diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl new file mode 100644 index 00000000000..dc67a94acaa --- /dev/null +++ b/dlls/windows.gaming.input/provider.idl @@ -0,0 +1,55 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep header + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.gaming.input.idl"; +import "windows.gaming.input.custom.idl"; + +namespace Windows.Gaming.Input.Custom { + interface IWineGameControllerProvider; + runtimeclass WineGameControllerProvider; + + [ + exclusiveto(Windows.Gaming.Input.Custom.WineGameControllerProvider), + uuid(8967b6ef-a4de-4b9a-984a-9f920b4d1b26) + ] + interface IWineGameControllerProvider : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerProvider + { + } + + [ + marshaling_behavior(agile), + threading(both) + ] + runtimeclass WineGameControllerProvider + { + [default] interface Windows.Gaming.Input.Custom.IWineGameControllerProvider; + interface Windows.Gaming.Input.Custom.IGameControllerProvider; + } +}

1 0

Rémi Bernon : windows.gaming.input: Start a thread to monitor HID device addition and removal.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: d6be529ce8c44a9680259585f626340cb8d72033 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6be529ce8c44a9680259585… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 4 10:05:08 2022 +0100 windows.gaming.input: Start a thread to monitor HID device addition and removal. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/Makefile.in | 3 +- dlls/windows.gaming.input/main.c | 145 ++++++++++++++++++++++++++++++++++ dlls/windows.gaming.input/private.h | 3 + dlls/windows.gaming.input/provider.c | 37 +++++++++ 4 files changed, 187 insertions(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index 24b5fb226b2..87cf0b8e386 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -1,11 +1,12 @@ MODULE = windows.gaming.input.dll -IMPORTS = combase uuid +IMPORTS = combase uuid user32 setupapi hid C_SRCS = \ controller.c \ gamepad.c \ main.c \ manager.c \ + provider.c \ vector.c IDL_SRCS = \ diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index c050d1d5113..0fc23cea5bf 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -23,6 +23,13 @@ #define COBJMACROS #include "windef.h" #include "winbase.h" +#include "winreg.h" +#include "winuser.h" + +#include "dbt.h" +#include "ddk/hidclass.h" +#include "ddk/hidsdi.h" +#include "setupapi.h" #include "initguid.h" #include "private.h" @@ -31,6 +38,127 @@ WINE_DEFAULT_DEBUG_CHANNEL(input); +static HINSTANCE windows_gaming_input; + +DEFINE_GUID( GUID_DEVINTERFACE_WINEXINPUT,0x6c53d5fd,0x6480,0x440f,0xb6,0x18,0x47,0x67,0x50,0xc5,0xe1,0xa6 ); + +static LRESULT CALLBACK devnotify_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + DEV_BROADCAST_DEVICEINTERFACE_W *iface; + + TRACE( "hwnd %p, msg %#x, wparam %#Ix, lparam %#Ix\n", hwnd, msg, wparam, lparam ); + + if (msg == WM_DEVICECHANGE) + { + switch (wparam) + { + case DBT_DEVICEARRIVAL: + iface = (DEV_BROADCAST_DEVICEINTERFACE_W *)lparam; + provider_create( iface->dbcc_name ); + break; + case DBT_DEVICEREMOVECOMPLETE: + iface = (DEV_BROADCAST_DEVICEINTERFACE_W *)lparam; + provider_remove( iface->dbcc_name ); + break; + default: break; + } + } + + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +static void initialize_providers( void ) +{ + char buffer[offsetof( SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath[MAX_PATH] )]; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (void *)buffer; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + GUID guid = GUID_DEVINTERFACE_WINEXINPUT; + HDEVINFO set; + DWORD i = 0; + + set = SetupDiGetClassDevsW( NULL, NULL, NULL, DIGCF_ALLCLASSES | DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + + while (SetupDiEnumDeviceInterfaces( set, NULL, &guid, i++, &iface )) + { + detail->cbSize = sizeof(*detail); + if (!SetupDiGetDeviceInterfaceDetailW( set, &iface, detail, sizeof(buffer), NULL, NULL )) continue; + provider_create( detail->DevicePath ); + } + + HidD_GetHidGuid( &guid ); + + while (SetupDiEnumDeviceInterfaces( set, NULL, &guid, i++, &iface )) + { + detail->cbSize = sizeof(*detail); + if (!SetupDiGetDeviceInterfaceDetailW( set, &iface, detail, sizeof(buffer), NULL, NULL )) continue; + provider_create( detail->DevicePath ); + } + + SetupDiDestroyDeviceInfoList( set ); +} + +static DWORD WINAPI monitor_thread_proc( void *param ) +{ + DEV_BROADCAST_DEVICEINTERFACE_W filter = + { + .dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE_W), + .dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE, + }; + WNDCLASSEXW wndclass = + { + .cbSize = sizeof(WNDCLASSEXW), + .lpszClassName = L"__wine_gaming_input_devnotify", + .lpfnWndProc = devnotify_wndproc, + }; + HANDLE start_event = param; + HDEVNOTIFY devnotify; + HMODULE module; + HWND hwnd; + MSG msg; + + GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (void *)windows_gaming_input, &module ); + RegisterClassExW( &wndclass ); + hwnd = CreateWindowExW( 0, wndclass.lpszClassName, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL ); + devnotify = RegisterDeviceNotificationW( hwnd, &filter, DEVICE_NOTIFY_ALL_INTERFACE_CLASSES ); + initialize_providers(); + SetEvent( start_event ); + + do + { + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + } while (!MsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, QS_ALLINPUT, MWMO_ALERTABLE )); + + UnregisterDeviceNotification( devnotify ); + DestroyWindow( hwnd ); + UnregisterClassW( wndclass.lpszClassName, NULL ); + + FreeLibraryAndExitThread( module, 0 ); + return 0; +} + +static BOOL WINAPI start_monitor_thread( INIT_ONCE *once, void *param, void **context ) +{ + HANDLE thread, start_event; + + start_event = CreateEventA( NULL, FALSE, FALSE, NULL ); + if (!start_event) ERR( "Failed to create start event, error %lu\n", GetLastError() ); + + thread = CreateThread( NULL, 0, monitor_thread_proc, start_event, 0, NULL ); + if (!thread) ERR( "Failed to create monitor thread, error %lu\n", GetLastError() ); + else + { + WaitForSingleObject( start_event, INFINITE ); + CloseHandle( thread ); + } + + CloseHandle( start_event ); + return !!thread; +} + HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) { FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); @@ -39,10 +167,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory **factory ) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; const WCHAR *buffer = WindowsGetStringRawBuffer( class_str, NULL ); TRACE( "class %s, factory %p.\n", debugstr_w(buffer), factory ); + InitOnceExecuteOnce( &init_once, start_monitor_thread, NULL, NULL ); + *factory = NULL; if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RawGameController )) @@ -55,3 +186,17 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** if (*factory) return S_OK; return REGDB_E_CLASSNOTREG; } + +BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) +{ + TRACE( "instance %p, reason %lu, reserved %p.\n", instance, reason, reserved ); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( instance ); + windows_gaming_input = instance; + break; + } + return TRUE; +} diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index c6dd1105896..87a3f677d8c 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -41,6 +41,9 @@ extern IActivationFactory *manager_factory; extern HRESULT vector_create( REFIID iid, REFIID view_iid, void **out ); +extern void provider_create( const WCHAR *device_path ); +extern void provider_remove( const WCHAR *device_path ); + #define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ static inline impl_type *impl_from_##iface_type( iface_type *iface ) \ { \ diff --git a/dlls/windows.gaming.input/provider.c b/dlls/windows.gaming.input/provider.c new file mode 100644 index 00000000000..710349eb75f --- /dev/null +++ b/dlls/windows.gaming.input/provider.c @@ -0,0 +1,37 @@ +/* WinRT Windows.Gaming.Input implementation + * + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" + +#include "initguid.h" +#include "provider.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(input); + +void provider_create( const WCHAR *device_path ) +{ + FIXME( "device_path %s stub!\n", debugstr_w( device_path ) ); +} + +void provider_remove( const WCHAR *device_path ) +{ + FIXME( "device_path %s stub!\n", debugstr_w( device_path ) ); +}

1 0

Rémi Bernon : dinput: Use a custom GUID to open a device from a device path.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 8b288980b2c8605fce1cba5426fd6c8404e898ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b288980b2c8605fce1cba54… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 4 10:05:09 2022 +0100 dinput: Use a custom GUID to open a device from a device path. So that we can access all the controller devices conveniently through DInput without having to reimplement the whole HID client, or having to enumerate the devices every time a new device needs to be open, and being able to workaround the limitations of the device the XInput controllers are usually exposing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 4f1c8444e43..c97588d8a07 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -50,6 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); DEFINE_GUID( GUID_DEVINTERFACE_WINEXINPUT,0x6c53d5fd,0x6480,0x440f,0xb6,0x18,0x47,0x67,0x50,0xc5,0xe1,0xa6 ); DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); +DEFINE_GUID( device_path_guid, 0x00000000, 0x0000, 0x0000, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf8 ); DEFINE_DEVPROPKEY( DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2 ); struct pid_control_report @@ -2041,7 +2042,12 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) instance.guidInstance = *guid; else - return DIERR_DEVICENOTREG; + { + instance.guidInstance.Data1 = device_path_guid.Data1; + instance.guidInstance.Data2 = device_path_guid.Data2; + instance.guidInstance.Data3 = device_path_guid.Data3; + if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) return DIERR_DEVICENOTREG; + } hr = dinput_device_alloc( sizeof(struct hid_joystick), &hid_joystick_vtbl, guid, dinput, (void **)&impl ); if (FAILED(hr)) return hr; @@ -2050,8 +2056,16 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi impl->base.read_event = CreateEventW( NULL, TRUE, FALSE, NULL ); impl->internal_ref = 1; - hr = hid_joystick_device_open( -1, &instance, impl->device_path, &impl->device, &impl->preparsed, - &attrs, &impl->caps, dinput->dwVersion ); + if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) + hr = hid_joystick_device_open( -1, &instance, impl->device_path, &impl->device, &impl->preparsed, + &attrs, &impl->caps, dinput->dwVersion ); + else + { + wcscpy( impl->device_path, *(const WCHAR **)guid ); + if (!hid_joystick_device_try_open( 0, impl->device_path, &impl->device, &impl->preparsed, &attrs, + &impl->caps, &instance, dinput->dwVersion )) + hr = DIERR_DEVICENOTREG; + } if (hr != DI_OK) goto failed; impl->base.instance = instance;

1 0

Rémi Bernon : windows.gaming.input: Instantiate the WineGameControllerProvider runtimeclass.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: e171b58aae3bc42295fd49092c9ebb1ecda4c6c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e171b58aae3bc42295fd4909… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 4 10:05:10 2022 +0100 windows.gaming.input: Instantiate the WineGameControllerProvider runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/Makefile.in | 2 +- dlls/windows.gaming.input/main.c | 2 +- dlls/windows.gaming.input/manager.c | 10 ++ dlls/windows.gaming.input/private.h | 4 + dlls/windows.gaming.input/provider.c | 222 +++++++++++++++++++++++++++++++++- 5 files changed, 236 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e171b58aae3bc42295fd…

1 0

Paul Gofman : ws2_32: Base inet_addr() implementation on musl.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 18230d23c599f1f5f9dd419dccc11c49117cc3b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18230d23c599f1f5f9dd419d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 3 13:32:26 2022 +0300 ws2_32: Base inet_addr() implementation on musl. The imported algorithm is modified to match the tests. Fixes a regression introduced by commit 671cf16f773e5dafc7edbf7766aed9e52e4e7b56. Windows inet_addr() behaves basically the same as Unix inet_addr() which is different from inet_pton(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 52 ++++++++++++++++++++-- dlls/ws2_32/tests/protocol.c | 103 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 141 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 0f56b1604d8..6e7e8eee18a 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -1834,17 +1834,61 @@ int WINAPI WSAAddressToStringW( struct sockaddr *addr, DWORD addr_len, return 0; } - /*********************************************************************** * inet_addr (ws2_32.11) */ u_long WINAPI inet_addr( const char *str ) { + unsigned long a[4] = { 0 }; + const char *s = str; + unsigned char *d; + unsigned int i; u_long addr; + char *z; + + TRACE( "str %s.\n", debugstr_a(str) ); + + if (!s) + { + SetLastError( WSAEFAULT ); + return INADDR_NONE; + } + + d = (unsigned char *)&addr; + + if (s[0] == ' ' && !s[1]) return 0; - if (inet_pton( AF_INET, str, &addr ) == 1) - return addr; - return INADDR_NONE; + for (i = 0; i < 4; ++i) + { + a[i] = strtoul( s, &z, 0 ); + if (z == s || !isdigit( *s )) return INADDR_NONE; + if (!*z || isspace(*z)) break; + if (*z != '.') return INADDR_NONE; + s = z + 1; + } + + if (i == 4) return INADDR_NONE; + + switch (i) + { + case 0: + a[1] = a[0] & 0xffffff; + a[0] >>= 24; + /* fallthrough */ + case 1: + a[2] = a[1] & 0xffff; + a[1] >>= 16; + /* fallthrough */ + case 2: + a[3] = a[2] & 0xff; + a[2] >>= 8; + } + for (i = 0; i < 4; ++i) + { + if (a[i] > 255) return INADDR_NONE; + d[i] = a[i]; + } + return addr; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 374fa01789d..9b3dec39dad 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -674,6 +674,98 @@ static void test_inet_ntoa(void) CloseHandle(thread); } +static void test_inet_addr(void) +{ + static const struct + { + const char *input; + u_long addr; + } + tests[] = + { + {"1.2.3.4", 0x04030201}, + {"1 2 3 4", 0x01000000}, + {"1.2.3. 4", 0xffffffff}, + {"1.2.3 .4", 0x03000201}, + {"1.2.3 \xfe\xff", 0x03000201}, + {"3.4.5.6.7", 0xffffffff}, + {"3.4.5.6. 7", 0xffffffff}, + {"3.4.5.6 7", 0x06050403}, + {" 3.4.5.6", 0xffffffff}, + {"\t3.4.5.6", 0xffffffff}, + {"3.4.5.6 ", 0x06050403}, + {"3.4.5.6 ", 0x06050403}, + {"3. 4.5.6", 0xffffffff}, + {"3 .4.5.6", 0x03000000}, + {"1.2.3", 0x03000201}, + {".1.2.3", 0xffffffff}, + {"0.0.0.0", 0x00000000}, + {"", 0xffffffff}, + {" 0", 0xffffffff}, + {"0xa1a2b3b4 ", 0xb4b3a2a1}, + {".", 0xffffffff}, + {" ", 0x00000000}, + {"\t", 0xffffffff}, + {" ", 0xffffffff}, + {"127.127.127.255", 0xff7f7f7f}, + {"127.127.127.255:123", 0xffffffff}, + {"127.127.127.256", 0xffffffff}, + {"a", 0xffffffff}, + {"1.2.3.0xaA", 0xaa030201}, + {"1.1.1.0x", 0xffffffff}, + {"1.2.3.010", 0x08030201}, + {"1.2.3.00", 0x00030201}, + {"1.2.3.0a", 0xffffffff}, + {"1.1.1.0o10", 0xffffffff}, + {"1.1.1.0b10", 0xffffffff}, + {"1.1.1.-2", 0xffffffff}, + {"1", 0x01000000}, + {"1.2", 0x02000001}, + {"1.2.3", 0x03000201}, + {"203569230", 0x4e38220c}, + {"[0.1.2.3]", 0xffffffff}, + {"0x00010203", 0x03020100}, + {"0x2134", 0x34210000}, + {"1234BEEF", 0xffffffff}, + {"017700000001", 0x0100007f}, + {"0777", 0xff010000}, + {"2607:f0d0:1002:51::4", 0xffffffff}, + {"::177.32.45.20", 0xffffffff}, + {"::1/128", 0xffffffff}, + {"::1", 0xffffffff}, + {":1", 0xffffffff}, + }; + u_long addr, expected; + unsigned int i; + char str[32]; + + WSASetLastError(0xdeadbeef); + addr = inet_addr(NULL); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(addr == 0xffffffff, "got addr %#08x\n", addr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context( "Address %s, i %u", debugstr_a(tests[i].input), i ); + WSASetLastError(0xdeadbeef); + addr = inet_addr(tests[i].input); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + ok(addr == tests[i].addr, "got addr %#08x\n", addr); + winetest_pop_context(); + } + + strcpy(str, "1.2.3"); + str[6] = 0; + for (i = 1; i < 256; ++i) + { + if (isdigit(i)) + continue; + str[5] = i; + expected = isspace(i) ? 0x03000201 : 0xffffffff; + addr = inet_addr(str); + ok(addr == expected, "got addr %#08x, expected %#08x, i %u\n", addr, expected, i); + } +} + static void test_inet_pton(void) { static const struct @@ -942,11 +1034,6 @@ static void test_inet_pton(void) ok(ret == -1, "got %d\n", ret); ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); - WSASetLastError(0xdeadbeef); - ret = inet_addr(NULL); - ok(ret == INADDR_NONE, "got %#x\n", ret); - ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); - for (i = 0; i < ARRAY_SIZE(ipv4_tests); ++i) { WCHAR inputW[32]; @@ -969,11 +1056,6 @@ static void test_inet_pton(void) ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "got error %u\n", WSAGetLastError()); ok(addr == ipv4_tests[i].addr, "got addr %#08x\n", addr); - WSASetLastError(0xdeadbeef); - addr = inet_addr(ipv4_tests[i].input); - ok(addr == ipv4_tests[i].ret ? ipv4_tests[i].addr : INADDR_NONE, "got addr %#08x\n", addr); - ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); - winetest_pop_context(); } @@ -2871,6 +2953,7 @@ START_TEST( protocol ) test_WSALookupService(); test_inet_ntoa(); + test_inet_addr(); test_inet_pton(); test_addr_to_print(); test_WSAAddressToString();

1 0

Zebediah Figura : d3d12: Explicitly use Wine d3d12 and Vulkan headers.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 8c3c7d822d55371de5e9d026a5c5f4b8328d3d2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c3c7d822d55371de5e9d026… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 19:50:08 2022 -0600 d3d12: Explicitly use Wine d3d12 and Vulkan headers. Avoid depending on our modified copy of vkd3d.h to include Wine headers; this will not work with system vkd3d.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 1c2cea6a6f3..40e3165ee80 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -18,9 +18,15 @@ */ #define COBJMACROS +#define VKD3D_NO_VULKAN_H +#define VKD3D_NO_WIN32_TYPES -#include <vkd3d.h> +#include "windef.h" #include "dxgi1_6.h" +#include "d3d12.h" +#include "wine/vulkan.h" + +#include <vkd3d.h> #include "initguid.h" #include "wine/wined3d.h"

1 0

Zebediah Figura : dxgi: Explicitly use Wine d3d12 and Vulkan headers.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 8859022a87ddb90a1d807405be86f004af3f4329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8859022a87ddb90a1d807405… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 19:50:09 2022 -0600 dxgi: Explicitly use Wine d3d12 and Vulkan headers. Avoid depending on our modified copy of vkd3d.h to include Wine headers; this will not work with system vkd3d.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index aaf4fe101de..98b020217e4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -18,6 +18,10 @@ */ #include "dxgi_private.h" + +#define VKD3D_NO_VULKAN_H +#define VKD3D_NO_WIN32_TYPES +#include "wine/vulkan.h" #include <vkd3d.h> WINE_DEFAULT_DEBUG_CHANNEL(dxgi);

1 0

Zebediah Figura : configure: Try to detect MinGW libvkd3d using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 2c5084e05fa5b28c6f869e74d295cf612dcd4540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c5084e05fa5b28c6f869e74… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 19:50:10 2022 -0600 configure: Try to detect MinGW libvkd3d using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 21 ++++++ 2 files changed, 226 insertions(+) diff --git a/configure b/configure index 20bcb96a2a6..3df610cbf11 100755 --- a/configure +++ b/configure @@ -12812,6 +12812,211 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libxslt ${notice_platform}MinGW development files not found; using bundled version." fi + if ${VKD3D_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + VKD3D_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libvkd3d libvkd3d-shader 2>/dev/null` +fi +fi +if ${VKD3D_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + VKD3D_PE_LIBS=`$MINGW_PKG_CONFIG --libs libvkd3d libvkd3d-shader 2>/dev/null` +fi +fi +VKD3D_PE_LIBS=${VKD3D_PE_LIBS:-"-lvkd3d -lvkd3d-shader"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $VKD3D_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW vkd3d.h" >&5 +printf %s "checking for MinGW vkd3d.h... " >&6; } +if test ${ac_cv_mingw_header_vkd3d_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <vkd3d.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_vkd3d_h=yes +else $as_nop + ac_cv_mingw_header_vkd3d_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_vkd3d_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_vkd3d_h" >&6; } +if test "x$ac_cv_mingw_header_vkd3d_h" = xyes +then : + +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW vkd3d_shader.h" >&5 +printf %s "checking for MinGW vkd3d_shader.h... " >&6; } +if test ${ac_cv_mingw_header_vkd3d_shader_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <vkd3d_shader.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_vkd3d_shader_h=yes +else $as_nop + ac_cv_mingw_header_vkd3d_shader_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_vkd3d_shader_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_vkd3d_shader_h" >&6; } +if test "x$ac_cv_mingw_header_vkd3d_shader_h" = xyes +then : + +fi + if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" + then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_serialize_versioned_root_signature in MinGW -lvkd3d" >&5 +printf %s "checking for vkd3d_serialize_versioned_root_signature in MinGW -lvkd3d... " >&6; } +if test ${ac_cv_mingw_lib_vkd3d+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lvkd3d $VKD3D_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char vkd3d_serialize_versioned_root_signature (); +int +main (void) +{ +return vkd3d_serialize_versioned_root_signature (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_vkd3d=yes +else $as_nop + ac_cv_mingw_lib_vkd3d=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_vkd3d" >&5 +printf "%s\n" "$ac_cv_mingw_lib_vkd3d" >&6; } +if test "x$ac_cv_mingw_lib_vkd3d" = xyes +then : + : +else $as_nop + : +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_shader_compile in MinGW -lvkd3d-shader" >&5 +printf %s "checking for vkd3d_shader_compile in MinGW -lvkd3d-shader... " >&6; } +if test ${ac_cv_mingw_lib_vkd3d_shader+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lvkd3d-shader $VKD3D_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char vkd3d_shader_compile (); +int +main (void) +{ +return vkd3d_shader_compile (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_vkd3d_shader=yes +else $as_nop + ac_cv_mingw_lib_vkd3d_shader=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_vkd3d_shader" >&5 +printf "%s\n" "$ac_cv_mingw_lib_vkd3d_shader" >&6; } +if test "x$ac_cv_mingw_lib_vkd3d_shader" = xyes +then : + : +else $as_nop + : +fi + if test "$ac_cv_mingw_lib_vkd3d" = "no" -o "$ac_cv_mingw_lib_vkd3d_shader" = "no" + then + VKD3D_PE_CFLAGS="" + VKD3D_PE_LIBS="" + fi + else + VKD3D_PE_CFLAGS="" + VKD3D_PE_LIBS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$VKD3D_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libvkd3d ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index a1f7a7d5e2c..ab3490b21cd 100644 --- a/configure.ac +++ b/configure.ac @@ -1084,6 +1084,27 @@ then WINE_NOTICE([libxslt ${notice_platform}MinGW development files not found; using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(VKD3D,[libvkd3d libvkd3d-shader],[-lvkd3d -lvkd3d-shader], + [WINE_CHECK_MINGW_HEADER(vkd3d.h) + WINE_CHECK_MINGW_HEADER(vkd3d_shader.h) + if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" + then + WINE_CHECK_MINGW_LIB(vkd3d,vkd3d_serialize_versioned_root_signature,[:],[:],[$VKD3D_PE_LIBS]) + WINE_CHECK_MINGW_LIB(vkd3d-shader,vkd3d_shader_compile,[:],[:],[$VKD3D_PE_LIBS]) + if test "$ac_cv_mingw_lib_vkd3d" = "no" -o "$ac_cv_mingw_lib_vkd3d_shader" = "no" + then + VKD3D_PE_CFLAGS="" + VKD3D_PE_LIBS="" + fi + else + VKD3D_PE_CFLAGS="" + VKD3D_PE_LIBS="" + fi]) + if test "x$VKD3D_PE_LIBS" = "x" + then + WINE_NOTICE([libvkd3d ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Santino Mazza : bcrypt: Add support for PUBLICKEY blob types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: b3073dc14a967fcc7fac38de4a347b46e6e6de82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3073dc14a967fcc7fac38de… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Fri Mar 4 08:45:17 2022 +0100 bcrypt: Add support for PUBLICKEY blob types. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 28 ++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 16 ++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9fb9b6adf87..0fb78ce39a5 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1775,6 +1775,34 @@ NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HAN return STATUS_NOT_IMPLEMENTED; } + if (!wcscmp( type, BCRYPT_PUBLIC_KEY_BLOB )) + { + BCRYPT_KEY_BLOB *key_blob = (BCRYPT_KEY_BLOB *)input; + + if (input_len < sizeof(*key_blob)) return STATUS_INVALID_PARAMETER; + + switch (key_blob->Magic) + { + case BCRYPT_ECDH_PUBLIC_P256_MAGIC: + case BCRYPT_ECDSA_PUBLIC_P256_MAGIC: + case BCRYPT_ECDSA_PUBLIC_P384_MAGIC: + type = BCRYPT_ECCPUBLIC_BLOB; + break; + + case BCRYPT_RSAPUBLIC_MAGIC: + type = BCRYPT_RSAPUBLIC_BLOB; + break; + + case BCRYPT_DSA_PUBLIC_MAGIC: + type = BCRYPT_DSA_PUBLIC_BLOB; + break; + + default: + FIXME( "unsupported key magic %#lx\n", key_blob->Magic ); + return STATUS_NOT_SUPPORTED; + } + } + return key_import_pair( alg, type, ret_key, input, input_len ); } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1588b72c3fd..5fb29a0e0ff 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1845,6 +1845,10 @@ static void test_ECDSA(void) ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; ecckey->cbKey = 32; + status = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, buffer, size, 0); + ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + BCryptDestroyKey(key); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); @@ -2015,6 +2019,10 @@ static void test_RSA(void) ok(schemes, "schemes not set\n"); ok(size == sizeof(schemes), "got %lu\n", size); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); + BCryptDestroyKey(key); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); @@ -2341,6 +2349,10 @@ static void test_ECDH(void) ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); ok(size == sizeof(*ecckey) + ecckey->cbKey * 2, "got %lu\n", size); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &pubkey, buf, size, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + BCryptDestroyKey(pubkey); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &pubkey, buf, size, 0); ok(status == STATUS_SUCCESS, "got %#lx\n", status); HeapFree(GetProcessHeap(), 0, buf); @@ -2842,6 +2854,10 @@ static void test_DSA(void) ret = BCryptGetProperty(alg, L"PaddingSchemes", (UCHAR *)&schemes, sizeof(schemes), &size, 0); ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, dsaPublicBlob, sizeof(dsaPublicBlob), 0); + ok(!ret, "got %#lx\n", ret); + BCryptDestroyKey(key); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_DSA_PUBLIC_BLOB, &key, dsaPublicBlob, sizeof(dsaPublicBlob), 0); ok(!ret, "got %#lx\n", ret);

1 0

Eric Pouech : mfplat/tests: Use correct integral type.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: de243ad2188ed9ff21185f32fce13357bc98588a URL: https://source.winehq.org/git/wine.git/?a=commit;h=de243ad2188ed9ff21185f32… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 10:55:44 2022 +0300 mfplat/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 91c9d971a3b..14d05d7c1be 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1154,8 +1154,9 @@ static void test_media_type(void) IMFMediaType *mediatype, *mediatype2; IMFVideoMediaType *video_type; IUnknown *unk, *unk2; - DWORD count, flags; BOOL compressed; + DWORD flags; + UINT count; HRESULT hr; GUID guid; @@ -1956,10 +1957,11 @@ static void test_MFCreateMFByteStreamOnStream(void) IMFByteStream *bytestream2; IStream *stream; IMFAttributes *attributes = NULL; - DWORD caps, written, count; + DWORD caps, written; IUnknown *unknown; ULONG ref, size; HRESULT hr; + UINT count; if(!pMFCreateMFByteStreamOnStream) { @@ -2061,10 +2063,11 @@ static void test_file_stream(void) IMFAttributes *attributes = NULL; MF_ATTRIBUTE_TYPE item_type; WCHAR pathW[MAX_PATH]; - DWORD caps, count; WCHAR *filename; HRESULT hr; WCHAR *str; + DWORD caps; + UINT count; BOOL eos; filename = load_resource(L"test.mp4"); @@ -4234,6 +4237,7 @@ image_size_tests[] = static void test_MFCalculateImageSize(void) { + DWORD plane_size; unsigned int i; UINT32 size; HRESULT hr; @@ -4258,11 +4262,11 @@ static void test_MFCalculateImageSize(void) if (pMFGetPlaneSize) { - unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; + unsigned int expected = ptr->plane_size ? ptr->plane_size : ptr->size; - hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); + hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &plane_size); ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); - ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); + ok(plane_size == expected, "%u: unexpected plane size %u, expected %u.\n", i, plane_size, expected); } } } @@ -4270,7 +4274,7 @@ static void test_MFCalculateImageSize(void) static void test_MFGetPlaneSize(void) { unsigned int i; - UINT32 size; + DWORD size; HRESULT hr; if (!pMFGetPlaneSize) @@ -5685,12 +5689,13 @@ static void test_MFCreate2DMediaBuffer(void) { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, { 4, 1, D3DFMT_A8R8G8B8, 16, 64 }, }; - unsigned int max_length, length, length2; + DWORD max_length, length, length2; BYTE *buffer_start, *data, *data2; - int i, j, k, pitch, pitch2, stride; + LONG pitch, pitch2, stride; IMF2DBuffer2 *_2dbuffer2; IMF2DBuffer *_2dbuffer; IMFMediaBuffer *buffer; + int i, j, k; HRESULT hr; BOOL ret; @@ -5986,7 +5991,7 @@ static void test_MFCreateMediaBufferFromMediaType(void) { 2, 0, 0, 4, 16, 52 }, }; IMFMediaBuffer *buffer; - UINT32 length; + DWORD length; HRESULT hr; IMFMediaType *media_type; unsigned int i; @@ -7094,11 +7099,11 @@ static void test_sample_allocator_sysmem(void) IMFVideoSampleAllocatorCallback *allocator_cb; IMFVideoSampleAllocatorEx *allocatorex; IMFVideoSampleAllocator *allocator; - unsigned int buffer_count; IMFSample *sample, *sample2; IMFAttributes *attributes; IMFMediaBuffer *buffer; LONG refcount, count; + DWORD buffer_count; IUnknown *unk; HRESULT hr;

1 0