- Wine-Devel - list.winehq.org

[PATCH] dinput: Introduce new HID joystick backend.
by Rémi Bernon June 29, 2021

June 29, 2021

This adds a new joystick backend, implemented on top of HID and without any host dependencies. This will be progressively implementated, and it's not going to be usable until at least a few more patches. Because of that, and because it may also introduce regressions compared to the existing backends, it is possible to disable it entirely using the following global registry key: [HKCU\\Software\\Wine\\DirectInput\\Joysticks] "HID"="disabled" Or using the corresponding AppDefaults registry key: [HKCU\\Software\\Wine\\AppDefaults\\<app.exe>\\DirectInput\\Joysticks] "HID"="disabled" Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/Makefile.in | 3 +- dlls/dinput/dinput_main.c | 3 +- dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick_hid.c | 450 +++++++++++++++++++++++++++++++++++ dlls/dinput8/Makefile.in | 3 +- 5 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 dlls/dinput/joystick_hid.c diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index a22c8a72180..f2347927ed6 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput.dll IMPORTLIB = dinput -IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) @@ -12,6 +12,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c7b932aca44..88ee1855675 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -80,7 +80,8 @@ static const struct dinput_device *dinput_devices[] = &keyboard_device, &joystick_linuxinput_device, &joystick_linux_device, - &joystick_osx_device + &joystick_osx_device, + &joystick_hid_device, }; HINSTANCE DINPUT_instance; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 7e0f56c68df..c11b64585d9 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -67,6 +67,7 @@ struct DevicePlayer { extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; +extern const struct dinput_device joystick_hid_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c new file mode 100644 index 00000000000..53448c6dafb --- /dev/null +++ b/dlls/dinput/joystick_hid.c @@ -0,0 +1,450 @@ +/* DirectInput HID Joystick device + * + * Copyright 2021 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 <assert.h> +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" + +#include "ddk/hidsdi.h" +#include "devguid.h" +#include "dinput.h" +#include "setupapi.h" + +#include "wine/debug.h" + +#include "dinput_private.h" +#include "device_private.h" +#include "joystick_private.h" + +#include "initguid.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + +DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); + +struct hid_joystick +{ + IDirectInputDeviceImpl base; + + HANDLE device; + PHIDP_PREPARSED_DATA preparsed; +}; + +static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) +{ + return CONTAINING_RECORD( CONTAINING_RECORD( iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface ), + struct hid_joystick, base ); +} + +static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + struct hid_joystick tmp = *impl; + ULONG res; + + if (!(res = IDirectInputDevice2WImpl_Release( iface ))) + { + HidD_FreePreparsedData( tmp.preparsed ); + CloseHandle( tmp.device ); + } + + return res; +} + +static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, DIDEVCAPS *caps ) +{ + FIXME( "iface %p, caps %p stub!\n", iface, caps ); + + if (!caps) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPDIENUMDEVICEOBJECTSCALLBACKW callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, REFGUID guid, DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_GetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_SetProperty( IDirectInputDevice8W *iface, REFGUID guid, const DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_SetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Acquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Unacquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) +{ + FIXME( "iface %p, len %u, ptr %p stub!\n", iface, len, ptr ); + + if (!ptr) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, DIDEVICEOBJECTINSTANCEW *instance, + DWORD obj, DWORD how ) +{ + FIXME( "iface %p, instance %p, obj %#x, how %#x stub!\n", iface, instance, obj, how ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, REFGUID rguid, + const DIEFFECT *effect, IDirectInputEffect **out, + IUnknown *outer ) +{ + FIXME( "iface %p, rguid %s, effect %p, out %p, outer %p stub!\n", iface, debugstr_guid( rguid ), + effect, out, outer ); + + if (!out) return E_POINTER; + if (!rguid || !effect) return DI_NOEFFECT; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *ref, DWORD type ) +{ + FIXME( "iface %p, callback %p, ref %p, type %#x stub!\n", iface, callback, ref, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, REFGUID guid ) +{ + FIXME( "iface %p, info %p, guid %s stub!\n", iface, info, debugstr_guid( guid ) ); + + if (!info) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) +{ + FIXME( "iface %p, out %p stub!\n", iface, out ); + + if (!out) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SendForceFeedbackCommand( IDirectInputDevice8W *iface, DWORD flags ) +{ + FIXME( "iface %p, flags %x stub!\n", iface, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8W *iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + FIXME( "iface %p, format %p, username %s, flags %#x stub!\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SetActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, format %p, username %s, flags %#x.\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return _set_action_map( iface, format, username, flags, impl->base.data_format.wine_df ); +} + +static const IDirectInputDevice8WVtbl hid_joystick_vtbl = +{ + /*** IUnknown methods ***/ + IDirectInputDevice2WImpl_QueryInterface, + IDirectInputDevice2WImpl_AddRef, + hid_joystick_Release, + /*** IDirectInputDevice methods ***/ + hid_joystick_GetCapabilities, + hid_joystick_EnumObjects, + hid_joystick_GetProperty, + hid_joystick_SetProperty, + hid_joystick_Acquire, + hid_joystick_Unacquire, + hid_joystick_GetDeviceState, + IDirectInputDevice2WImpl_GetDeviceData, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, + hid_joystick_GetObjectInfo, + hid_joystick_GetDeviceInfo, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, + /*** IDirectInputDevice2 methods ***/ + hid_joystick_CreateEffect, + hid_joystick_EnumEffects, + hid_joystick_GetEffectInfo, + hid_joystick_GetForceFeedbackState, + hid_joystick_SendForceFeedbackCommand, + hid_joystick_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_Escape, + IDirectInputDevice2WImpl_Poll, + IDirectInputDevice2WImpl_SendDeviceData, + /*** IDirectInputDevice7 methods ***/ + IDirectInputDevice7WImpl_EnumEffectsInFile, + IDirectInputDevice7WImpl_WriteEffectToFile, + /*** IDirectInputDevice8 methods ***/ + hid_joystick_BuildActionMap, + hid_joystick_SetActionMap, + IDirectInputDevice8WImpl_GetImageInfo, +}; + +static HRESULT hid_joystick_device_open( DWORD index, WCHAR *device_path, HANDLE *device, DWORD version, + PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, + HIDP_CAPS *caps, DIDEVICEINSTANCEW *instance ) +{ + RAWINPUTDEVICELIST *list; + DWORD count, i, j; + + GetRawInputDeviceList( NULL, &count, sizeof(*list) ); + if (!(list = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*list) ))) return DIERR_OUTOFMEMORY; + GetRawInputDeviceList( list, &count, sizeof(*list) ); + + for (i = 0; i < count; ++i) if (list[i].dwType == RIM_TYPEHID) break; + for (j = 0; j < index && i < count; ++i) if (list[i].dwType == RIM_TYPEHID) ++j; + if (i == count) + { + HeapFree( GetProcessHeap(), 0, list ); + return DIERR_DEVICENOTREG; + } + + count = MAX_PATH; + GetRawInputDeviceInfoW( list[i].hDevice, RIDI_DEVICENAME, device_path, &count ); + HeapFree( GetProcessHeap(), 0, list ); + + TRACE( "Opening %s\n", debugstr_w(device_path) ); + *device = CreateFileW( device_path, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + *preparsed = NULL; + + if (*device == INVALID_HANDLE_VALUE) return DI_NOTATTACHED; + if (!HidD_GetPreparsedData( *device, preparsed )) goto failed; + if (!HidD_GetAttributes( *device, attrs )) goto failed; + if (HidP_GetCaps( *preparsed, caps ) != HIDP_STATUS_SUCCESS) goto failed; + + if (caps->UsagePage == HID_USAGE_PAGE_GAME) FIXME( "Unimplemented HID game usage page!\n" ); + if (caps->UsagePage == HID_USAGE_PAGE_SIMULATION) FIXME( "Unimplemented HID simulation usage page!\n" ); + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) goto failed; + if (caps->Usage != HID_USAGE_GENERIC_GAMEPAD && caps->Usage != HID_USAGE_GENERIC_JOYSTICK) goto failed; + + instance->guidInstance = hid_joystick_guid; + instance->guidInstance.Data3 = index; + instance->guidProduct = DInput_PIDVID_Product_GUID; + instance->guidProduct.Data1 = MAKELONG( attrs->VendorID, attrs->ProductID ); + instance->dwDevType = get_device_type( version, caps->Usage != HID_USAGE_GENERIC_GAMEPAD ) | DIDEVTYPE_HID; + instance->guidFFDriver = GUID_NULL; + instance->wUsagePage = caps->UsagePage; + instance->wUsage = caps->Usage; + + if (!HidD_GetProductString( *device, instance->tszInstanceName, MAX_PATH )) goto failed; + if (!HidD_GetProductString( *device, instance->tszProductName, MAX_PATH )) goto failed; + return DI_OK; + +failed: + CloseHandle( *device ); + *device = INVALID_HANDLE_VALUE; + HidD_FreePreparsedData( *preparsed ); + *preparsed = NULL; + return DI_NOTATTACHED; +} + +static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, + DWORD version, int index ) +{ + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + PHIDP_PREPARSED_DATA preparsed; + WCHAR device_path[MAX_PATH]; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "type %x, flags %#x, instance %p, version %04x, index %d\n", type, flags, instance, version, index ); + + hr = hid_joystick_device_open( index, device_path, &device, version, + &preparsed, &attrs, &caps, instance ); + if (hr != DI_OK) return hr; + + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return S_FALSE; + if (version < 0x0800 && type != DIDEVTYPE_JOYSTICK) + return S_FALSE; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_GAMECTRL) + return S_FALSE; + + if (device_disabled_registry( "HID" )) + return DIERR_DEVICENOTREG; + + TRACE( "Found device with usage %04x:%04x, type %x, instance %s %s, product %s %s, ffdriver %s\n", + instance->wUsagePage, instance->wUsage, instance->dwDevType, debugstr_guid( &instance->guidProduct ), + debugstr_w( instance->tszProductName ), debugstr_guid( &instance->guidInstance ), + debugstr_w( instance->tszInstanceName ), debugstr_guid( &instance->guidFFDriver ) ); + + return DI_OK; +} + +static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, REFGUID guid, IDirectInputDevice8W **out ) +{ + DIDEVICEINSTANCEW instance = {sizeof(instance)}; + DWORD index, size = sizeof(struct hid_joystick); + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + struct hid_joystick *impl = NULL; + PHIDP_PREPARSED_DATA preparsed; + DIDATAFORMAT *format = NULL; + WCHAR device_path[MAX_PATH]; + GUID tmp_guid = *guid; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + tmp_guid.Data3 = hid_joystick_guid.Data3; + if (!IsEqualGUID( &hid_joystick_guid, &tmp_guid )) return DIERR_DEVICENOTREG; + index = guid->Data3; + + hr = hid_joystick_device_open( index, device_path, &device, dinput->dwVersion, + &preparsed, &attrs, &caps, &instance ); + if (hr != DI_OK) return hr; + + hr = direct_input_device_alloc( size, &hid_joystick_vtbl, guid, dinput, (void **)&impl ); + if (FAILED(hr)) goto failed; + + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": hid_joystick.base.crit"); + impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + + impl->device = device; + impl->preparsed = preparsed; + + if (!(format = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*format) ))) goto failed; + impl->base.data_format.wine_df = format; + + TRACE( "Created %p\n", impl ); + + *out = &impl->base.IDirectInputDevice8W_iface; + return DI_OK; + +failed: + HeapFree( GetProcessHeap(), 0, format ); + HeapFree( GetProcessHeap(), 0, impl ); + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + return hr; +} + +const struct dinput_device joystick_hid_device = +{ + "Wine HID joystick driver", + hid_joystick_enum_device, + hid_joystick_create_device, +}; diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 35b3bfb75f5..71eecd770b3 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 -IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 hid EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) PARENTSRC = ../dinput @@ -13,6 +13,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ -- 2.32.0

1 1

[PATCH 1/2] winebus.sys: Add missing keyboard free_device callback.
by Rémi Bernon June 29, 2021

June 29, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Luckily(?) this didn't cause a crash because of the typo from PATCH 2. dlls/winebus.sys/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index a512015d478..75173e77cde 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -542,6 +542,10 @@ static void mouse_device_create(void) IoInvalidateDeviceRelations(bus_pdo, BusRelations); } +static void keyboard_free_device(DEVICE_OBJECT *device) +{ +} + static NTSTATUS keyboard_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *ret_length) { TRACE("buffer %p, length %u.\n", buffer, length); @@ -596,6 +600,7 @@ static NTSTATUS keyboard_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYT static const platform_vtbl keyboard_vtbl = { + .free_device = keyboard_free_device, .get_reportdescriptor = keyboard_get_reportdescriptor, .get_string = keyboard_get_string, .begin_report_processing = keyboard_begin_report_processing, -- 2.32.0

1 1

[PATCH] winhttp: Added stubs to function request_set_option.
by Alexander Fischer June 29, 2021

June 29, 2021

WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE and WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE, (defined in include/winhttp.h) weren't handled yet, which caused 'Amazon Games App' downloads to fail. With these stubs downloads now work. Signed-off-by: Alexander Fischer <fischeralex1993(a)gmail.com> --- dlls/winhttp/session.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index dcea874306a..e4e8f1cec56 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1041,6 +1041,14 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b SetLastError(ERROR_INVALID_PARAMETER); return FALSE; + case WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE: + FIXME("WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE\n"); + return TRUE; + + case WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE: + FIXME("WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE\n"); + return TRUE; + default: FIXME("unimplemented option %u\n", option); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); -- 2.32.0

2 1

[PATCH 5/5] nsi: Implement NsiEnumerateObjectsAllParameterEx().
by Huw Davies June 29, 2021

June 29, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d3292af9ee3..981fcdba954 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -25,10 +25,16 @@ #include "iptypes.h" #include "netiodef.h" #include "wine/nsi.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static inline HANDLE get_nsi_device( void ) +{ + return CreateFileW( L"\\\\.\\Nsi", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); +} + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) @@ -46,7 +52,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ struct nsi_enumerate_all_ex params; DWORD err; - FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, + TRACE( "%d %d %p %d %p %d %p %d %p %d %p %d %p\n", unk, unk2, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); params.unknown[0] = 0; @@ -72,7 +78,52 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ) { - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD out_size, received, err = ERROR_SUCCESS; + HANDLE device = get_nsi_device(); + struct nsiproxy_enumerate_all in; + BYTE *out, *ptr; + + if (device == INVALID_HANDLE_VALUE) return GetLastError(); + + out_size = sizeof(DWORD) + + (params->key_size + params->rw_size + params->dynamic_size + params->static_size) * params->count; + + out = heap_alloc( out_size ); + if (!out) + { + CloseHandle( device ); + return ERROR_OUTOFMEMORY; + } + + in.module = *params->module; + in.first_arg = params->first_arg; + in.second_arg = params->second_arg; + in.table = params->table; + in.key_size = params->key_size; + in.rw_size = params->rw_size; + in.dynamic_size = params->dynamic_size; + in.static_size = params->static_size; + in.count = params->count; + + if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_ENUMERATE_ALL, &in, sizeof(in), out, out_size, &received, NULL )) + err = GetLastError(); + if (err == ERROR_SUCCESS || err == ERROR_MORE_DATA) + { + params->count = *(DWORD *)out; + ptr = out + sizeof(DWORD); + if (params->key_size) memcpy( params->key_data, ptr, params->key_size * params->count ); + ptr += params->key_size * in.count; + if (params->rw_size) memcpy( params->rw_data, ptr, params->rw_size * params->count ); + ptr += params->rw_size * in.count; + if (params->dynamic_size) memcpy( params->dynamic_data, ptr, params->dynamic_size * params->count ); + ptr += params->dynamic_size * in.count; + if (params->static_size) memcpy( params->static_data, ptr, params->static_size * params->count ); + } + + heap_free( out ); + CloseHandle( device ); + + return err; } void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) -- 2.23.0

1 0

[PATCH 4/5] nsiproxy: Introduce IOCTL_NSIPROXY_WINE_ENUMERATE_ALL.
by Huw Davies June 29, 2021

June 29, 2021

This differs from native, which passes struct nsi_enumerate_all_ex directly and relies on the kernel being able to access the user-space addresses. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 3 +- dlls/nsiproxy.sys/device.c | 54 ++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 38 ++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 21 +++++++++++ include/wine/nsi.h | 20 +++++++++++ 5 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 dlls/nsiproxy.sys/nsi.c create mode 100644 dlls/nsiproxy.sys/nsiproxy_private.h diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index d1913671f49..f382689d463 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -3,4 +3,5 @@ IMPORTS = ntoskrnl EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ - device.c + device.c \ + nsi.c diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index ecd584bd1cb..4ce5ddd6d83 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -28,10 +28,60 @@ #include "winternl.h" #include "winioctl.h" #include "ddk/wdm.h" +#include "ifdef.h" +#include "netiodef.h" +#include "wine/nsi.h" #include "wine/debug.h" +#include "nsiproxy_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static void nsiproxy_enumerate_all( IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_enumerate_all *in = (struct nsiproxy_enumerate_all *)irp->AssociatedIrp.SystemBuffer; + DWORD in_len = irpsp->Parameters.DeviceIoControl.InputBufferLength; + void *out = irp->AssociatedIrp.SystemBuffer; + DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + struct nsi_enumerate_all_ex enum_all; + + if (in_len != sizeof(*in)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + if (out_len < sizeof(DWORD) + (in->key_size + in->rw_size + in->dynamic_size + in->static_size) * in->count) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + enum_all.unknown[0] = 0; + enum_all.unknown[1] = 0; + enum_all.first_arg = in->first_arg; + enum_all.second_arg = in->second_arg; + enum_all.module = &in->module; + enum_all.table = in->table; + enum_all.key_data = (BYTE *)out + sizeof(DWORD); + enum_all.key_size = in->key_size; + enum_all.rw_data = (BYTE *)enum_all.key_data + in->key_size * in->count; + enum_all.rw_size = in->rw_size; + enum_all.dynamic_data = (BYTE *)enum_all.rw_data + in->rw_size * in->count; + enum_all.dynamic_size = in->dynamic_size; + enum_all.static_data = (BYTE *)enum_all.dynamic_data + in->dynamic_size * in->count; + enum_all.static_size = in->static_size; + enum_all.count = in->count; + + irp->IoStatus.u.Status = nsi_enumerate_all_ex( &enum_all ); + if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_MORE_ENTRIES) + { + irp->IoStatus.Information = out_len; + *(DWORD *)out = enum_all.count; + } + else irp->IoStatus.Information = 0; +} + static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -43,6 +93,10 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) switch (irpsp->Parameters.DeviceIoControl.IoControlCode) { + case IOCTL_NSIPROXY_WINE_ENUMERATE_ALL: + nsiproxy_enumerate_all( irp ); + break; + default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c new file mode 100644 index 00000000000..7ff36c093ba --- /dev/null +++ b/dlls/nsiproxy.sys/nsi.c @@ -0,0 +1,38 @@ +/* + * nsiproxy.sys + * + * Copyright 2021 Huw Davies + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "ifdef.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "nsiproxy_private.h" + +NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) +{ + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h new file mode 100644 index 00000000000..19b520d17cc --- /dev/null +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -0,0 +1,21 @@ +/* + * nsiproxy.sys + * + * Copyright 2021 Huw Davies + * + * 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 + */ + +NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 31ece41d22f..799485fc284 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -19,6 +19,8 @@ #ifndef __WINE_NSI_H #define __WINE_NSI_H +#include "winioctl.h" + /* Undocumented NSI NDIS tables */ #define NSI_NDIS_IFINFO_TABLE 0 #define NSI_NDIS_INDEX_LUID_TABLE 2 @@ -92,6 +94,24 @@ struct nsi_ndis_ifinfo_static DWORD phys_medium_type; }; +/* Wine specific ioctl interface */ + +#define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) + +/* input for IOCTL_NSIPROXY_WINE_ENUMERATE_ALL */ +struct nsiproxy_enumerate_all +{ + NPI_MODULEID module; + DWORD first_arg; + DWORD second_arg; + DWORD table; + DWORD key_size; + DWORD rw_size; + DWORD dynamic_size; + DWORD static_size; + DWORD count; +}; + /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0 -- 2.23.0

1 0

[PATCH 3/5] loader: Add tag ids to ensure nsiproxy.sys starts before ndis.sys.
by Huw Davies June 29, 2021

June 29, 2021

This will be needed as ndis.sys depends on iphlpapi which will in turn depend on nsi. Note that this isn't quite how the tags are supposed to work. The tags should be ordered according to the load group's order list. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- loader/wine.inf.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index defaba008e2..426fe8b1595 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3775,6 +3775,7 @@ ErrorControl=1 LoadOrderGroup="System Bus Extender" [NDISService] +AddReg=NDISServiceKeys Description="NDIS service" DisplayName="NDIS" ServiceBinary="%12%\ndis.sys" @@ -3783,7 +3784,11 @@ StartType=2 ErrorControl=1 LoadOrderGroup="System Bus Extender" +[NDISServiceKeys] +HKR,,"Tag",0x10001,2 + [NsiProxyService] +AddReg=NsiProxyServiceKeys Description="NSI proxy service" DisplayName="NSI Proxy" ServiceBinary="%12%\nsiproxy.sys" @@ -3792,6 +3797,9 @@ StartType=2 ErrorControl=1 LoadOrderGroup="System Bus Extender" +[NsiProxyServiceKeys] +HKR,,"Tag",0x10001,1 + [RpcSsService] Description="RPC service" DisplayName="Remote Procedure Call (RPC)" -- 2.23.0

1 0

[PATCH 2/5] nsiproxy: Create the nsi device.
by Huw Davies June 29, 2021

June 29, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 6 ++ dlls/nsiproxy.sys/device.c | 87 +++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy.sys.spec | 1 + loader/wine.inf.in | 13 +++++ 4 files changed, 107 insertions(+) create mode 100644 dlls/nsiproxy.sys/Makefile.in create mode 100644 dlls/nsiproxy.sys/device.c create mode 100644 dlls/nsiproxy.sys/nsiproxy.sys.spec diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in new file mode 100644 index 00000000000..d1913671f49 --- /dev/null +++ b/dlls/nsiproxy.sys/Makefile.in @@ -0,0 +1,6 @@ +MODULE = nsiproxy.sys +IMPORTS = ntoskrnl +EXTRADLLFLAGS = -Wl,--subsystem,native + +C_SRCS = \ + device.c diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c new file mode 100644 index 00000000000..ecd584bd1cb --- /dev/null +++ b/dlls/nsiproxy.sys/device.c @@ -0,0 +1,87 @@ +/* + * nsiproxy.sys + * + * Copyright 2021 Huw Davies + * + * 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 <stdarg.h> + +#define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + TRACE( "ioctl %x insize %u outsize %u\n", + irpsp->Parameters.DeviceIoControl.IoControlCode, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + switch (irpsp->Parameters.DeviceIoControl.IoControlCode) + { + default: + FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + break; + } + + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + +static int add_device( DRIVER_OBJECT *driver ) +{ + static const WCHAR name_str[] = {'\\','D','e','v','i','c','e','\\','N','s','i',0}; + static const WCHAR link_str[] = {'\\','?','?','\\','N','s','i',0}; + UNICODE_STRING name, link; + DEVICE_OBJECT *device; + NTSTATUS status; + + RtlInitUnicodeString( &name, name_str ); + RtlInitUnicodeString( &link, link_str ); + + if (!(status = IoCreateDevice( driver, 0, &name, FILE_DEVICE_NETWORK, FILE_DEVICE_SECURE_OPEN, FALSE, &device ))) + status = IoCreateSymbolicLink( &link, &name ); + if (status) + { + FIXME( "failed to create device error %x\n", status ); + return 0; + } + + return 1; +} + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); + + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = nsi_ioctl; + + add_device( driver ); + + return STATUS_SUCCESS; +} diff --git a/dlls/nsiproxy.sys/nsiproxy.sys.spec b/dlls/nsiproxy.sys/nsiproxy.sys.spec new file mode 100644 index 00000000000..590a204a2b0 --- /dev/null +++ b/dlls/nsiproxy.sys/nsiproxy.sys.spec @@ -0,0 +1 @@ +# no exported functions diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 437c723a5e2..defaba008e2 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -165,6 +165,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -184,6 +185,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -203,6 +205,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.ntarm64.Services] AddService=BITS,0,BITSService @@ -222,6 +225,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService AddService=NDIS,0x800,NDISService +AddService=nsiproxy,0x800,NsiProxyService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -3779,6 +3783,15 @@ StartType=2 ErrorControl=1 LoadOrderGroup="System Bus Extender" +[NsiProxyService] +Description="NSI proxy service" +DisplayName="NSI Proxy" +ServiceBinary="%12%\nsiproxy.sys" +ServiceType=1 +StartType=2 +ErrorControl=1 +LoadOrderGroup="System Bus Extender" + [RpcSsService] Description="RPC service" DisplayName="Remote Procedure Call (RPC)" -- 2.23.0

1 0

[PATCH 1/5] nsi: Add a stub implementation of NsiGetParameterEx().
by Huw Davies June 29, 2021

June 29, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 20 ++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 37 +++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 16 ++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 4e55721475b..d3292af9ee3 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -115,7 +115,27 @@ DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, DWORD param_type, void *data, DWORD data_size, DWORD data_offset ) { + struct nsi_get_parameter_ex params; + FIXME( "%d %p %d %p %d %d %p %d %d: stub\n", unk, module, table, key, key_size, param_type, data, data_size, data_offset ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.unknown2 = 0; + params.key = key; + params.key_size = key_size; + params.param_type = param_type; + params.data = data; + params.data_size = data_size; + params.data_offset = data_offset; + return NsiGetParameterEx( &params ); +} + +DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 376d25438aa..ba326572fb8 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -13,7 +13,7 @@ @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity @ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) -@ stub NsiGetParameterEx +@ stdcall NsiGetParameterEx(ptr) @ stub NsiRegisterChangeNotification @ stub NsiRegisterChangeNotificationEx @ stub NsiRequestChangeNotification diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 7c2c57b9548..51b149e9f65 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -41,6 +41,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; struct nsi_get_all_parameters_ex get_all_params; + struct nsi_get_parameter_ex get_param; struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -129,6 +130,42 @@ todo_wine FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); ok( !err, "got %d\n", err ); ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + + memset( &get_param, 0, sizeof(get_param) ); + get_param.first_arg = 1; + get_param.module = &NPI_MS_NDIS_MODULEID; + get_param.table = NSI_NDIS_IFINFO_TABLE; + get_param.key = luid_tbl + i; + get_param.key_size = sizeof(*luid_tbl); + + get_param.param_type = NSI_PARAM_TYPE_RW; + get_param.data = &get_rw.alias; + get_param.data_size = sizeof(get_rw.alias); + get_param.data_offset = FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias); + err = NsiGetParameterEx( &get_param ); + ok( !err, "got %d\n", err ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + + get_param.param_type = NSI_PARAM_TYPE_STATIC; + get_param.data = &get_stat.if_index; + get_param.data_size = sizeof(get_stat.if_index); + get_param.data_offset = FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index); + err = NsiGetParameterEx( &get_param ); + ok( !err, "got %d\n", err ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + + get_param.param_type = NSI_PARAM_TYPE_STATIC; + get_param.data = &get_stat.if_guid; + get_param.data_size = sizeof(get_stat.if_guid); + get_param.data_offset = FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid); + err = NsiGetParameterEx( &get_param ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); winetest_pop_context(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 81d221324e9..31ece41d22f 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -133,6 +133,21 @@ struct nsi_get_all_parameters_ex DWORD static_size; }; +struct nsi_get_parameter_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD unknown2; + const void *key; + DWORD key_size; + DWORD_PTR param_type; + void *data; + DWORD data_size; + DWORD data_offset; +}; + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); @@ -148,5 +163,6 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ); DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); +DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ); #endif /* __WINE_NSI_H */ -- 2.23.0

1 0

[PATCH v2 1/4] d3dx10/tests: Test texture returned by D3DX10CreateTextureFromMemory on failure.
by Ziqing Hui June 29, 2021

June 29, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: This is a new patch in this patch set. dlls/d3dx10_43/tests/d3dx10.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

2 1

Rearchitecting the d3dx DLLs
by Matteo Bruni June 29, 2021

June 29, 2021

I think we're past the point where we need to figure out what we want to do with the d3dx* DLLs, particularly regarding how to avoid duplication of common functionality between d3dx9, d3dx10 and d3dx11. This is something that's been on my mind for a very long time but it's generally been a topic where people either care strongly or not at all, so I kept pushing back the discussion over and over again. Now I'm finally asking the former category to comment. The latter can stop reading now :P TL;DR: jump to the second-to-last paragraph. Let's start with a quick summary of what those DLLs are. They are basically a loose collection of utility APIs that might often come in handy when writing 3d applications. To give a broad idea, these APIs can be roughly categorized into math, mesh, shader, texture functions. A d3dxn is somewhat related to the corresponding d3dn version: for example d3dx9's D3DXCreateTextureFromFileA() creates a IDirect3DTexture9 object and fills it with data from an on-disk image file. Many other APIs (e.g. the math functions) are abstract enough to be independent from any d3d version. A particularly important detail with these DLLs is what MS decided to do with versioning: each new release of the DirectX SDK (when those were still a thing) usually had a new version of the d3dx DLLs as entirely separate files. There might have been additions or changes compared to a previous version but applications wouldn't see any of that unless they intentionally switched to linking with the new DLL. For example, the last released DirectX SDK (SDK version 43) contains d3dx9_43.dll, d3dx10_43.dll, d3dx11_43.dll, in addition to ALL the DLLs from the previous SDKs (which for d3dx9 means going back up to d3dx9_24.dll). There are interesting side effects of this choice. It allowed MS to make incompatible changes (e.g. see the ID3DXEffect vtbl). It also means that applications can end up depending on quirks specific to a particular d3dxn_xx.dll version. It's also not uncommon to see applications that load and possibly use multiple d3dx DLLs inside the same process. In general, it's lots of fun... Now let's go through the current state of those DLLs in Wine. The d3dx9 DLLs are in a pretty good state as far as API coverage goes (with a few notable exceptions, e.g. shader compiler). The implementation is in d3dx9_36/ and all the other _xx variants use the PARENTSRC mechanism to build entirely separate DLLs, mimicking native. Originally we forwarded everything to d3dx9_36 but that broke some applications, particularly from the demo scene. d3dx10 still forwards most of the math functions to d3dx9_36. The rest is largely unimplemented. d3dx11 is all but unimplemented. Fortunately, MS dropped most of the APIs along the way, especially when moving from d3dx10 to d3dx11. Unfortunately, that doesn't help a ton. For example, there is enough stuff in the texture API alone that could (and should) be shared and the API itself is different enough that it can't be done by simply forwarding some public function from d3dxn to d3dx(n-1) or such. Having >= 3 similar but separate implementations of image filtering over various d3dx DLLs that all do the same thing seems not that attractive. And then let's not forget the other "axis" i.e. the _xx suffixed versioning which can make things extra convoluted. If you're still here, congratulations! Now for the proposal i.e. how to move forward. There are a few options I can think of: 1 - Allow to have multiple paths in PARENTSRC, rework the d3dx9 code to make it possible to reuse helpers in d3dx10 and d3dx11 2 - Introduce a new PE DLL where the shared code would reside, keep the PARENTSRC mechanism to handle the _xx versioning 3 - Introduce a new unix lib for the shared code, keep the PARENTSRC mechanism for the _xx versioning part 4 - Just duplicate everything, durr Reasons to favor one option over the rest? Other ideas I have missed? Personally I prefer option 2. The only downside that I see is that it would introduce a Wine-specific DLL, which is something that we normally want to avoid. There are many advantages though: compared to 1 (and the status quo) we'd reduce Wine compilation time and the overall size of the d3dx DLLs; we'd also avoid loading extra d3dx* DLLs as required by the forwards. In respect to option 3, we wouldn't introduce unnecessary (sys)call overhead, which we really don't want to have for stuff like D3DXVec4Transform(). Looking forward to any type of comment.

4 6