September 2021 - Wine-commits

Rémi Bernon : dinput8/tests: Add tests for the internal HID preparsed data structures.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: c0ea122c0c86e5487c40f0389039afe06c141844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ea122c0c86e5487c40f038… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:29:49 2021 +0200 dinput8/tests: Add tests for the internal HID preparsed data structures. Correct DInput implementation will require it to iterate on the internal HID structures, instead of using the higher-level value / button caps abstraction. This will make Wine DInput incompatible with native HID stack, unless the internal structure match. These tests exhibit native internal structures, which are close to what Wine uses, so it should not be too complicated to restore compatibility. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 470 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 470 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0ea122c0c86e5487c40…

1 0

Rémi Bernon : dinput: Don't disable HID joysticks by default.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: df0e491cb1c9791f0edeee8694930c8e84c6fbc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df0e491cb1c9791f0edeee86… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:29:50 2021 +0200 dinput: Don't disable HID joysticks by default. Although not completely correct it should be usable already, and running the tests would require setting the registry key before and cleaning it up after otherwise. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 9 +++------ dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick.c | 44 +++++++++++++++++++++++++++++------------- dlls/dinput/joystick_hid.c | 3 +-- dlls/dinput/joystick_private.h | 1 + dlls/dinput/mouse.c | 11 +++++++---- 6 files changed, 44 insertions(+), 26 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 25084f82a9c..e04d40e5a7c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -305,14 +305,11 @@ BOOL get_app_key(HKEY *defkey, HKEY *appkey) /****************************************************************************** * Get a config key from either the app-specific or the default config */ -DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, - char *buffer, DWORD size ) +DWORD get_config_key( HKEY defkey, HKEY appkey, const WCHAR *name, WCHAR *buffer, DWORD size ) { - if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) - return 0; + if (appkey && !RegQueryValueExW( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0; - if (defkey && !RegQueryValueExA( defkey, name, 0, NULL, (LPBYTE)buffer, &size )) - return 0; + if (defkey && !RegQueryValueExW( defkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0; return ERROR_FILE_NOT_FOUND; } diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 0e72ee77bf1..90eab627c26 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -97,7 +97,7 @@ extern HRESULT direct_input_device_alloc( SIZE_T size, const IDirectInputDevice8 extern const IDirectInputDevice8AVtbl dinput_device_a_vtbl DECLSPEC_HIDDEN; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; -extern DWORD get_config_key(HKEY, HKEY, const char*, char*, DWORD) DECLSPEC_HIDDEN; +extern DWORD get_config_key( HKEY, HKEY, const WCHAR *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; /* Routines to do DataFormat / WineFormat conversions */ extern void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 60153d0d0f3..d4f5b819471 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -273,10 +273,18 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) BOOL device_disabled_registry(const char* name, BOOL disable) { - static const char disabled_str[] = "disabled"; - static const char enabled_str[] = "enabled"; - static const char joystick_key[] = "Joysticks"; - char buffer[MAX_PATH]; + DIDEVICEINSTANCEW instance; + + MultiByteToWideChar( CP_ACP, 0, name, -1, instance.tszInstanceName, MAX_PATH ); + return device_instance_is_disabled( &instance, disable ); +} + +BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL disable ) +{ + static const WCHAR disabled_str[] = {'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', 0}; + static const WCHAR enabled_str[] = {'e', 'n', 'a', 'b', 'l', 'e', 'd', 0}; + static const WCHAR joystick_key[] = {'J', 'o', 'y', 's', 't', 'i', 'c', 'k', 's', 0}; + WCHAR buffer[MAX_PATH]; HKEY hkey, appkey, temp; get_app_key(&hkey, &appkey); @@ -284,28 +292,29 @@ BOOL device_disabled_registry(const char* name, BOOL disable) /* Joystick settings are in the 'joysticks' subkey */ if (appkey) { - if (RegOpenKeyA(appkey, joystick_key, &temp)) temp = 0; + if (RegOpenKeyW( appkey, joystick_key, &temp )) temp = 0; RegCloseKey(appkey); appkey = temp; } + if (hkey) { - if (RegOpenKeyA(hkey, joystick_key, &temp)) temp = 0; + if (RegOpenKeyW( hkey, joystick_key, &temp )) temp = 0; RegCloseKey(hkey); hkey = temp; } /* Look for the "controllername"="disabled" key */ - if (!get_config_key(hkey, appkey, name, buffer, sizeof(buffer))) + if (!get_config_key( hkey, appkey, instance->tszInstanceName, buffer, sizeof(buffer) )) { - if (!disable && !strcmp(disabled_str, buffer)) + if (!disable && !strcmpW( disabled_str, buffer )) { - TRACE("Disabling joystick '%s' based on registry key.\n", name); + TRACE( "Disabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); disable = TRUE; } - else if (disable && !strcmp(enabled_str, buffer)) + else if (disable && !strcmpW( enabled_str, buffer )) { - TRACE("Enabling joystick '%s' based on registry key.\n", name); + TRACE( "Enabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); disable = FALSE; } } @@ -854,6 +863,15 @@ DWORD joystick_map_pov(const POINTL *p) return p->y < 0 ? 0 : !p->y ? -1 : 18000; } +static DWORD get_config_key_a( HKEY defkey, HKEY appkey, const char *name, char *buffer, DWORD size ) +{ + if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0; + + if (defkey && !RegQueryValueExA( defkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0; + + return ERROR_FILE_NOT_FOUND; +} + /* * Setup the dinput options. */ @@ -870,7 +888,7 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ /* get options */ - if (!get_config_key(hkey, appkey, "DefaultDeadZone", buffer, sizeof(buffer))) + if (!get_config_key_a( hkey, appkey, "DefaultDeadZone", buffer, sizeof(buffer) )) { This->deadzone = atoi(buffer); TRACE("setting default deadzone to: \"%s\" %d\n", buffer, This->deadzone); @@ -879,7 +897,7 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ This->axis_map = HeapAlloc(GetProcessHeap(), 0, This->device_axis_count * sizeof(int)); if (!This->axis_map) return DIERR_OUTOFMEMORY; - if (!get_config_key(hkey, appkey, This->name, buffer, sizeof(buffer))) + if (!get_config_key_a( hkey, appkey, This->name, buffer, sizeof(buffer) )) { static const char *axis_names[] = {"X", "Y", "Z", "Rx", "Ry", "Rz", "Slider1", "Slider2", diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3c69c74b4fc..3ef6f0db9cc 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1043,8 +1043,7 @@ static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTAN if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_GAMECTRL) return S_FALSE; - if (device_disabled_registry( "HID", TRUE )) - return DIERR_DEVICENOTREG; + if (device_instance_is_disabled( instance, FALSE )) return DIERR_DEVICENOTREG; TRACE( "found device %s, usage %04x:%04x, product %s, instance %s, name %s\n", debugstr_w(device_path), instance->wUsagePage, instance->wUsage, debugstr_guid( &instance->guidProduct ), diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 9cc30605234..4fe51d17067 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -58,6 +58,7 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ DWORD joystick_map_pov(const POINTL *p) DECLSPEC_HIDDEN; BOOL device_disabled_registry(const char* name, BOOL disable) DECLSPEC_HIDDEN; +BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL disable ) DECLSPEC_HIDDEN; ULONG WINAPI JoystickWGenericImpl_Release(LPDIRECTINPUTDEVICE8W iface); diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 145a792f396..9f696cb414a 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -140,10 +140,13 @@ static HRESULT mousedev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEIN static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseImpl **out ) { + static const WCHAR mouse_wrap_override_w[] = {'M','o','u','s','e','W','a','r','p','O','v','e','r','r','i','d','e',0}; + static const WCHAR disable_w[] = {'d','i','s','a','b','l','e',0}; + static const WCHAR force_w[] = {'f','o','r','c','e',0}; SysMouseImpl* newDevice; LPDIDATAFORMAT df = NULL; unsigned i; - char buffer[20]; + WCHAR buffer[20]; HKEY hkey, appkey; HRESULT hr; @@ -155,11 +158,11 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; get_app_key(&hkey, &appkey); - if (!get_config_key(hkey, appkey, "MouseWarpOverride", buffer, sizeof(buffer))) + if (!get_config_key(hkey, appkey, mouse_wrap_override_w, buffer, sizeof(buffer))) { - if (!_strnicmp(buffer, "disable", -1)) + if (!strncmpiW(buffer, disable_w, -1)) newDevice->warp_override = WARP_DISABLE; - else if (!_strnicmp(buffer, "force", -1)) + else if (!strncmpiW(buffer, force_w, -1)) newDevice->warp_override = WARP_FORCE_ON; } if (appkey) RegCloseKey(appkey);

1 0

Rémi Bernon : dinput8/tests: Add a new HID joystick test based on the HID driver.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 7da8ad6dacfaef04b7ca2d1ddc457e77b67e5d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da8ad6dacfaef04b7ca2d1d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:29:51 2021 +0200 dinput8/tests: Add a new HID joystick test based on the HID driver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 227 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 227 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7da8ad6dacfaef04b7ca…

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_GetDeviceInfo tests.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 52377b3dec4eef0f1f5b515d4c1ded17657d1498 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52377b3dec4eef0f1f5b515d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:29:52 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_GetDeviceInfo tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 1dc42909c7f..c2221c475d8 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3389,6 +3389,43 @@ static void test_simple_joystick(void) hr = IDirectInput8_CreateDevice( di, &expect_guid_product, &device, NULL ); ok( hr == DI_OK, "IDirectInput8_CreateDevice returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceInfo( device, NULL ); + ok( hr == E_POINTER, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + devinst.dwSize = sizeof(DIDEVICEINSTANCEW) + 1; + hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + + devinst.dwSize = sizeof(DIDEVICEINSTANCE_DX3W); + hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); + ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + todo_wine + check_member_guid( devinst, expect_devinst, guidInstance ); + check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine + check_member( devinst, expect_devinst, "%#x", dwDevType ); + todo_wine + check_member_wstr( devinst, expect_devinst, tszInstanceName ); + todo_wine + check_member_wstr( devinst, expect_devinst, tszProductName ); + + memset( &devinst, 0, sizeof(devinst) ); + devinst.dwSize = sizeof(DIDEVICEINSTANCEW); + hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); + ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + check_member( devinst, expect_devinst, "%d", dwSize ); + todo_wine + check_member_guid( devinst, expect_devinst, guidInstance ); + check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine + check_member( devinst, expect_devinst, "%#x", dwDevType ); + todo_wine + check_member_wstr( devinst, expect_devinst, tszInstanceName ); + todo_wine + check_member_wstr( devinst, expect_devinst, tszProductName ); + check_member_guid( devinst, expect_devinst, guidFFDriver ); + check_member( devinst, expect_devinst, "%04x", wUsagePage ); + check_member( devinst, expect_devinst, "%04x", wUsage ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref );

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_GetCapabilities tests.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 8325c5331ecddfeb3913fda43db94d64b137509b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8325c5331ecddfeb3913fda4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:29:53 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_GetCapabilities tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index c2221c475d8..69e85830be5 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3330,6 +3330,15 @@ static void test_simple_joystick(void) { .InputReportByteLength = 4, }; + static const DIDEVCAPS expect_caps = + { + .dwSize = sizeof(DIDEVCAPS), + .dwFlags = DIDC_ATTACHED | DIDC_EMULATED, + .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, + .dwAxes = 2, + .dwPOVs = 1, + .dwButtons = 2, + }; const DIDEVICEINSTANCEW expect_devinst = { @@ -3347,6 +3356,7 @@ static void test_simple_joystick(void) WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; DIDEVICEINSTANCEW devinst = {0}; IDirectInputDevice8W *device; + DIDEVCAPS caps = {0}; IDirectInput8W *di; HRESULT hr; ULONG ref; @@ -3426,6 +3436,27 @@ static void test_simple_joystick(void) check_member( devinst, expect_devinst, "%04x", wUsagePage ); check_member( devinst, expect_devinst, "%04x", wUsage ); + hr = IDirectInputDevice8_GetCapabilities( device, NULL ); + ok( hr == E_POINTER, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); + hr = IDirectInputDevice8_GetCapabilities( device, &caps ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); + caps.dwSize = sizeof(DIDEVCAPS); + hr = IDirectInputDevice8_GetCapabilities( device, &caps ); + ok( hr == DI_OK, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); + check_member( caps, expect_caps, "%d", dwSize ); + check_member( caps, expect_caps, "%#x", dwFlags ); + todo_wine + check_member( caps, expect_caps, "%#x", dwDevType ); + check_member( caps, expect_caps, "%d", dwAxes ); + check_member( caps, expect_caps, "%d", dwButtons ); + check_member( caps, expect_caps, "%d", dwPOVs ); + check_member( caps, expect_caps, "%d", dwFFSamplePeriod ); + check_member( caps, expect_caps, "%d", dwFFMinTimeResolution ); + check_member( caps, expect_caps, "%d", dwFirmwareRevision ); + check_member( caps, expect_caps, "%d", dwHardwareRevision ); + check_member( caps, expect_caps, "%d", dwFFDriverVersion ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref );

1 0

Alexandre Julliard : urlmon/tests: Use robots.txt on winehq.org to avoid a redirection.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 0a2831a71d3fbfd4c6b0d953f599a73fb467e5b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a2831a71d3fbfd4c6b0d953… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 15 09:52:25 2021 +0200 urlmon/tests: Use robots.txt on winehq.org to avoid a redirection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 69ec00476ff..2f2667cea2d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2870,7 +2870,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = "its:test.chm::/blank.html"; break; case HTTPS_TEST: - url_a = (flags & BINDTEST_INVALID_CN) ? "https://" WINEHQ_IP "/favicon.ico" : "https://test.winehq.org/tests/hello.html"; + url_a = (flags & BINDTEST_INVALID_CN) ? "https://" WINEHQ_IP "/robots.txt" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: url_a = "ftp://ftp.winehq.org/welcome%2emsg";

1 0

Alexandre Julliard : shell32: Allow specifying the child folder CLSID in SHELL32_BindToChild().
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 336c37d5f7c9b4f5bbb3d1ca64a504cd2f364f6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=336c37d5f7c9b4f5bbb3d1ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 15 09:53:56 2021 +0200 shell32: Allow specifying the child folder CLSID in SHELL32_BindToChild(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/shfldr.h | 2 +- dlls/shell32/shfldr_desktop.c | 2 +- dlls/shell32/shfldr_fs.c | 3 +-- dlls/shell32/shfldr_mycomp.c | 2 +- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shlfolder.c | 6 +++--- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 6fc21f980d5..2cd97f2838f 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -471,7 +471,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnBindToObject(IShellFolder2 *iface, LPCI TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid(riid), ppvOut); - return SHELL32_BindToChild(This->pidlRoot, NULL, pidl, riid, ppvOut); + return SHELL32_BindToChild(This->pidlRoot, &CLSID_ShellFSFolder, NULL, pidl, riid, ppvOut); } /************************************************************************** diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index 1c10cc2c81d..e6456e1392f 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -50,7 +50,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *folder, LPCITEMIDLIST pidl, DW HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPWSTR szOut, DWORD dwOutLen) DECLSPEC_HIDDEN; -HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, +HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, const CLSID *clsidChild, LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut) DECLSPEC_HIDDEN; HRESULT SHELL32_CompareIDs(IShellFolder2 *iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 1f1a1c95b7b..33140784f22 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -370,7 +370,7 @@ static HRESULT WINAPI ISF_Desktop_fnBindToObject (IShellFolder2 * iface, TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); - return SHELL32_BindToChild( This->pidlRoot, This->sPathTarget, pidl, riid, ppvOut ); + return SHELL32_BindToChild( This->pidlRoot, &CLSID_ShellFSFolder, This->sPathTarget, pidl, riid, ppvOut ); } /************************************************************************** diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 902910e55bb..812a022c806 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -425,8 +425,7 @@ IShellFolder_fnBindToObject (IShellFolder2 * iface, LPCITEMIDLIST pidl, TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbc, shdebugstr_guid (riid), ppvOut); - return SHELL32_BindToChild (This->pidlRoot, This->sPathTarget, pidl, riid, - ppvOut); + return SHELL32_BindToChild (This->pidlRoot, This->pclsid, This->sPathTarget, pidl, riid, ppvOut); } /************************************************************************** diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 91f81a22741..56d08cc87e9 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -379,7 +379,7 @@ static HRESULT WINAPI ISF_MyComputer_fnBindToObject (IShellFolder2 *iface, TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); - return SHELL32_BindToChild (This->pidlRoot, NULL, pidl, riid, ppvOut); + return SHELL32_BindToChild (This->pidlRoot, &CLSID_ShellFSFolder, NULL, pidl, riid, ppvOut); } /************************************************************************** diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index e74336544f3..be99b7f5875 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -264,7 +264,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnBindToObject (IShellFolder2 * iface, TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); - return SHELL32_BindToChild (This->pidlRoot, NULL, pidl, riid, ppvOut); + return SHELL32_BindToChild (This->pidlRoot, &CLSID_ShellFSFolder, NULL, pidl, riid, ppvOut); } /************************************************************************** diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index f288b7f7ab1..e84733d2676 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -260,7 +260,7 @@ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, * This function makes special assumptions on the shell namespace, which * means you probably can't use it for your IShellFolder implementation. */ -HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, +HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, const CLSID *clsidChild, LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut) { GUID const *clsid; @@ -285,10 +285,10 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } else { /* file system folder */ - CLSID clsidFolder = CLSID_ShellFSFolder; + CLSID clsidFolder = *clsidChild; static const WCHAR wszCLSID[] = {'C','L','S','I','D',0}; WCHAR wszCLSIDValue[CHARS_IN_GUID], wszFolderPath[MAX_PATH], *pwszPathTail = wszFolderPath; - + /* see if folder CLSID should be overridden by desktop.ini file */ if (pathRoot) { lstrcpynW(wszFolderPath, pathRoot, MAX_PATH);

1 0

Zebediah Figura : tests: Test casts to float.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: vkd3d Branch: master Commit: 9d1f9746b78f8307718bc1ae7050f38542f73b62 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9d1f9746b78f8307718bc1a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:11:32 2021 -0500 tests: Test casts to float. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/cast-to-float.shader_test | 29 +++++++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 05d9f00..d707a26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,7 @@ vkd3d_shader_runners = \ tests/shader_runner_d3d12 vkd3d_shader_tests = \ + tests/cast-to-float.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ @@ -266,6 +267,7 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ + tests/cast-to-float.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/cast-to-float.shader_test b/tests/cast-to-float.shader_test new file mode 100644 index 0000000..75822e5 --- /dev/null +++ b/tests/cast-to-float.shader_test @@ -0,0 +1,29 @@ +[pixel shader] + +float4 main(uniform int i, uniform uint u, uniform bool b, uniform half h) : sv_target +{ + return float4(((float)i) + 1.5, ((float)u) - 2.5, ((float)b) / 2, h); +} + +[test] +uniform 0 int -1 +uniform 1 uint 3 +uniform 2 int -2 +uniform 3 float 0.5 +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) + +[pixel shader] + +float4 main() : sv_target +{ + int i = -1; + uint u = 3; + bool b = true; + half h = 0.5; + return float4(((float)i) + 1.5, ((float)u) - 2.5, ((float)b) / 2, h); +} + +[test] +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 2221c0f..d5c0380 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -242,11 +242,38 @@ static void parse_test_directive(struct shader_context *context, const char *lin } memcpy(context->uniforms + offset, &v, sizeof(v)); } + else if (match_string(line, "float", &line)) + { + float f; + + if (sscanf(line, "%f", &f) < 1) + goto err; + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &f, sizeof(f)); + } + else if (match_string(line, "int", &line)) + { + int i; + + if (sscanf(line, "%i", &i) < 1) + goto err; + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &i, sizeof(i)); + } else if (match_string(line, "uint", &line)) { unsigned int u; - sscanf(line, "%u", &u); + if (sscanf(line, "%u", &u) < 1) + goto err; if (offset + 1 > context->uniform_count) { context->uniform_count = offset + 1;

1 0

Zebediah Figura : tests: Test casts to half.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: vkd3d Branch: master Commit: 6fb5d2c11cc50487571917decd37e8b40a5bb767 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6fb5d2c11cc50487571917d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:11:33 2021 -0500 tests: Test casts to half. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/cast-to-half.shader_test | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Makefile.am b/Makefile.am index d707a26..a1b6eb3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,6 +55,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/cast-to-float.shader_test \ + tests/cast-to-half.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ @@ -268,6 +269,7 @@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/cast-to-float.shader_test \ + tests/cast-to-half.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/cast-to-half.shader_test b/tests/cast-to-half.shader_test new file mode 100644 index 0000000..6db5412 --- /dev/null +++ b/tests/cast-to-half.shader_test @@ -0,0 +1,29 @@ +[pixel shader] + +float4 main(uniform int i, uniform uint u, uniform bool b, uniform float f) : sv_target +{ + return float4(((half)i) + 1.5, ((half)u) - 2.5, ((half)b) / 2, f); +} + +[test] +uniform 0 int -1 +uniform 1 uint 3 +uniform 2 int -2 +uniform 3 float 0.5 +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) + +[pixel shader] + +float4 main() : sv_target +{ + int i = -1; + uint u = 3; + bool b = true; + float f = 0.5; + return float4(((half)i) + 1.5, ((half)u) - 2.5, ((half)b) / 2, f); +} + +[test] +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5)

1 0

Zebediah Figura : tests: Test casts to int.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: vkd3d Branch: master Commit: d9eee8f24a150233604e9146fa7ec5533352ac96 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d9eee8f24a150233604e914… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:11:34 2021 -0500 tests: Test casts to int. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/cast-to-int.shader_test | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/Makefile.am b/Makefile.am index a1b6eb3..da57a68 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ + tests/cast-to-int.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ @@ -270,6 +271,7 @@ SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ + tests/cast-to-int.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/cast-to-int.shader_test b/tests/cast-to-int.shader_test new file mode 100644 index 0000000..c7d1e23 --- /dev/null +++ b/tests/cast-to-int.shader_test @@ -0,0 +1,41 @@ +[pixel shader] + +float4 main(uniform float f, uniform uint u, uniform bool b, uniform half h) : sv_target +{ + float4 ret; + + ret.x = ((float)(int)f) - 1.5; + ret.y = ((float)(int)u) + 2.5; + ret.z = ((float)(int)b) / 2; + ret.w = ((float)(int)h) + 3.5; + return ret; +} + +[test] +uniform 0 float 2.6 +uniform 1 int -2 +uniform 2 int -2 +uniform 3 float -3.6 +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) + +[pixel shader] + +float4 main() : sv_target +{ + float f = 2.6; + uint u = 0xfffffffe; + bool b = true; + half h = -3.6; + float4 ret; + + ret.x = ((float)(int)f) - 1.5; + ret.y = ((float)(int)u) + 2.5; + ret.z = ((float)(int)b) / 2; + ret.w = ((float)(int)h) + 3.5; + return ret; +} + +[test] +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5)

1 0