October 2021 - Wine-commits

Nikolay Sivov : mfplat: Consider MF_BYTESTREAM_ORIGIN_NAME when looking for bytestream handler.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 030008f6cc2907a140588244f767e8b4c6b121a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=030008f6cc2907a140588244… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 22 08:24:21 2021 +0300 mfplat: Consider MF_BYTESTREAM_ORIGIN_NAME when looking for bytestream handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7fd713261fc..5bd19190ed5 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5946,9 +5946,9 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA { static const char streamhandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers"; static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + WCHAR *mimeW = NULL, *urlW = NULL; IMFAttributes *attributes; const WCHAR *url_ext; - WCHAR *mimeW = NULL; HRESULT hr = E_FAIL; unsigned int i, j; UINT32 length; @@ -5959,6 +5959,11 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) { IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &mimeW, &length); + if (!url) + { + IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_ORIGIN_NAME, &urlW, &length); + url = urlW; + } IMFAttributes_Release(attributes); } @@ -5967,7 +5972,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA if (!url_ext && !mimeW) { - CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return MF_E_UNSUPPORTED_BYTESTREAM_TYPE; } @@ -5991,7 +5996,11 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA LeaveCriticalSection(&local_handlers_section); if (*handler) + { + CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return hr; + } } for (i = 0, hr = E_FAIL; i < ARRAY_SIZE(hkey_roots); ++i) @@ -6030,6 +6039,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA } CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return hr; }

1 0

Nikolay Sivov : mfplat: Use wide strings for registry paths.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 7d43ac947412c7981539a34a557d7b310e084163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d43ac947412c7981539a34a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 22 08:24:22 2021 +0300 mfplat: Use wide strings for registry paths. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5bd19190ed5..37a66798b2f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5944,7 +5944,6 @@ static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void * static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHAR *url, DWORD flags, IMFByteStreamHandler **handler) { - static const char streamhandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers"; static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; WCHAR *mimeW = NULL, *urlW = NULL; IMFAttributes *attributes; @@ -6008,7 +6007,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA const WCHAR *namesW[2] = { mimeW, url_ext }; HKEY hkey, hkey_handler; - if (RegOpenKeyA(hkey_roots[i], streamhandlerspath, &hkey)) + if (RegOpenKeyW(hkey_roots[i], L"Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers", &hkey)) continue; for (j = 0; j < ARRAY_SIZE(namesW); ++j) @@ -6045,7 +6044,6 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, IMFSchemeHandler **handler) { - static const char schemehandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\SchemeHandlers"; static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; HRESULT hr = MF_E_UNSUPPORTED_SCHEME; unsigned int i; @@ -6082,7 +6080,7 @@ static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, hr = MF_E_UNSUPPORTED_SCHEME; - if (RegOpenKeyA(hkey_roots[i], schemehandlerspath, &hkey)) + if (RegOpenKeyW(hkey_roots[i], L"Software\\Microsoft\\Windows Media Foundation\\SchemeHandlers", &hkey)) continue; if (!RegOpenKeyW(hkey, scheme, &hkey_handler))

1 0

Jefferson Carpenter : msxml3/saxreader: Handle null url in parseURL().
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: b7386cec716013e8a17abae54f1609ba2e8518c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7386cec716013e8a17abae5… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Fri Oct 22 09:56:54 2021 +0300 msxml3/saxreader: Handle null url in parseURL(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51267 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 14 +++++++------- dlls/msxml3/tests/saxreader.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index c610ffcaccb..8c202bddccd 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2728,23 +2728,23 @@ static HRESULT internal_onDataAvailable(void *obj, char *ptr, DWORD len) return internal_parseBuffer(This, ptr, len, FALSE); } -static HRESULT internal_parseURL( - saxreader* This, - const WCHAR *url, - BOOL vbInterface) +static HRESULT internal_parseURL(saxreader *reader, const WCHAR *url, BOOL vbInterface) { IMoniker *mon; bsc_t *bsc; HRESULT hr; - TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + TRACE("%p, %s.\n", reader, debugstr_w(url)); + + if (!url && reader->version < MSXML4) + return E_INVALIDARG; hr = create_moniker_from_url(url, &mon); if(FAILED(hr)) return hr; - if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, This, &bsc); - else hr = bind_url(mon, internal_onDataAvailable, This, &bsc); + if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, reader, &bsc); + else hr = bind_url(mon, internal_onDataAvailable, reader, &bsc); IMoniker_Release(mon); if(FAILED(hr)) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ad093af6a12..20c5e07443b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2325,6 +2325,22 @@ static void test_saxreader(void) WriteFile(file, testXML, sizeof(testXML)-1, &written, NULL); CloseHandle(file); + /* crashes on newer versions */ + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader30)) + { + IVBSAXXMLReader *vb_reader; + + hr = ISAXXMLReader_parseURL(reader, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = ISAXXMLReader_QueryInterface(reader, &IID_IVBSAXXMLReader, (void **)&vb_reader); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IVBSAXXMLReader_parseURL(vb_reader, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IVBSAXXMLReader_Release(vb_reader); + } + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) test_seq = content_handler_test1_alternate;

1 0

Rémi Bernon : dinput: Cleanup mouse device enumeration and creation.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 3dcb888a59aab67df6a6d6ebbd80f6be2200a620 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcb888a59aab67df6a6d6eb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 22 09:33:52 2021 +0200 dinput: Cleanup mouse device enumeration and creation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 134 ++++++++++++++++++++-------------------------------- 1 file changed, 51 insertions(+), 83 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1b91fa12189..4e353dba200 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -76,120 +76,88 @@ static inline SysMouseImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), SysMouseImpl, base); } -static void fill_mouse_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version) { - DWORD dwSize; - DIDEVICEINSTANCEW ddi; - - dwSize = lpddi->dwSize; - - TRACE("%d %p\n", dwSize, lpddi); - - memset(lpddi, 0, dwSize); - memset(&ddi, 0, sizeof(ddi)); - - ddi.dwSize = dwSize; - ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = GUID_SysMouse; - if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); - else - ddi.dwDevType = DIDEVTYPE_MOUSE | (DIDEVTYPEMOUSE_TRADITIONAL << 8); - MultiByteToWideChar(CP_ACP, 0, "Mouse", -1, ddi.tszInstanceName, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, "Wine Mouse", -1, ddi.tszProductName, MAX_PATH); - - memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); -} - -static HRESULT mousedev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ) { - if (id != 0) - return E_FAIL; - - if (dwFlags & DIEDFL_FORCEFEEDBACK) - return S_FALSE; - - if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || - (((dwDevType == DI8DEVCLASS_POINTER) || (dwDevType == DI8DEVTYPE_MOUSE)) && (version >= 0x0800))) { - TRACE("Enumerating the mouse device\n"); - - fill_mouse_dideviceinstanceW(lpddi, version); - - return S_OK; - } - - return S_FALSE; + DWORD size; + + TRACE( "type %#x, flags %#x, instance %p, version %#04x, index %d\n", type, flags, instance, version, index ); + + if (index != 0) return DIERR_GENERIC; + if (flags & DIEDFL_FORCEFEEDBACK) return DI_NOEFFECT; + if (version < 0x0800 && type != 0 && type != DIDEVTYPE_MOUSE) return DI_NOEFFECT; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_POINTER && type != DI8DEVTYPE_MOUSE) + return DI_NOEFFECT; + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW) && + instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) + return DIERR_INVALIDPARAM; + + size = instance->dwSize; + memset( instance, 0, size ); + instance->dwSize = size; + instance->guidInstance = GUID_SysMouse; + instance->guidProduct = GUID_SysMouse; + if (version >= 0x0800) instance->dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); + else instance->dwDevType = DIDEVTYPE_MOUSE | (DIDEVTYPEMOUSE_TRADITIONAL << 8); + MultiByteToWideChar( CP_ACP, 0, "Mouse", -1, instance->tszInstanceName, MAX_PATH ); + MultiByteToWideChar( CP_ACP, 0, "Wine Mouse", -1, instance->tszProductName, MAX_PATH ); + + return DI_OK; } -static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseImpl **out ) +static HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { - SysMouseImpl* newDevice; - WCHAR buffer[20]; + SysMouseImpl *impl; HKEY hkey, appkey; + WCHAR buffer[20]; HRESULT hr; + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + if (!IsEqualGUID( &GUID_SysMouse, guid )) return DIERR_DEVICENOTREG; + if (FAILED(hr = direct_input_device_alloc( sizeof(SysMouseImpl), &SysMouseWvt, &mouse_internal_vtbl, - rguid, dinput, (void **)&newDevice ))) + guid, dinput, (void **)&impl ))) return hr; - newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); - fill_mouse_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion ); - newDevice->base.caps.dwDevType = newDevice->base.instance.dwDevType; - newDevice->base.caps.dwFirmwareRevision = 100; - newDevice->base.caps.dwHardwareRevision = 100; - newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + mouse_enum_device( 0, 0, &impl->base.instance, dinput->dwVersion, 0 ); + impl->base.caps.dwDevType = impl->base.instance.dwDevType; + impl->base.caps.dwFirmwareRevision = 100; + impl->base.caps.dwHardwareRevision = 100; + impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; get_app_key(&hkey, &appkey); if (!get_config_key( hkey, appkey, L"MouseWarpOverride", buffer, sizeof(buffer) )) { - if (!wcsnicmp( buffer, L"disable", -1 )) newDevice->warp_override = WARP_DISABLE; - else if (!wcsnicmp( buffer, L"force", -1 )) newDevice->warp_override = WARP_FORCE_ON; + if (!wcsnicmp( buffer, L"disable", -1 )) impl->warp_override = WARP_DISABLE; + else if (!wcsnicmp( buffer, L"force", -1 )) impl->warp_override = WARP_FORCE_ON; } if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); - if (FAILED(hr = direct_input_device_init( &newDevice->base.IDirectInputDevice8W_iface ))) + if (FAILED(hr = direct_input_device_init( &impl->base.IDirectInputDevice8W_iface ))) { - IDirectInputDevice_Release( &newDevice->base.IDirectInputDevice8W_iface ); + IDirectInputDevice_Release( &impl->base.IDirectInputDevice8W_iface ); return hr; } if (dinput->dwVersion >= 0x0800) { - newDevice->base.use_raw_input = TRUE; - newDevice->base.raw_device.usUsagePage = 1; /* HID generic device page */ - newDevice->base.raw_device.usUsage = 2; /* HID generic mouse */ + impl->base.use_raw_input = TRUE; + impl->base.raw_device.usUsagePage = 1; /* HID generic device page */ + impl->base.raw_device.usUsage = 2; /* HID generic mouse */ } - *out = newDevice; + *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK; } -static HRESULT mousedev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) -{ - TRACE( "%p %s %p\n", dinput, debugstr_guid( rguid ), out ); - *out = NULL; - - if (IsEqualGUID(&GUID_SysMouse, rguid)) /* Wine Mouse */ - { - SysMouseImpl *This; - HRESULT hr; - - if (FAILED(hr = alloc_device( rguid, dinput, &This ))) return hr; - - TRACE( "Created a Mouse device (%p)\n", This ); - - *out = &This->base.IDirectInputDevice8W_iface; - return DI_OK; - } - - return DIERR_DEVICENOTREG; -} - const struct dinput_device mouse_device = { "Wine mouse driver", - mousedev_enum_device, - mousedev_create_device + mouse_enum_device, + mouse_create_device }; /******************************************************************************

1 0

Rémi Bernon : dinput: Cleanup keyboard device enumeration and creation.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: e85a5302770167bdd9c11be2939e80730a64b92f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e85a5302770167bdd9c11be2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 22 09:33:53 2021 +0200 dinput: Cleanup keyboard device enumeration and creation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 120 ++++++++++++++++++------------------------------- 1 file changed, 44 insertions(+), 76 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index fd8e9e8fd12..804ce8b7808 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -145,102 +145,70 @@ static DWORD get_keyboard_subtype(void) return dev_subtype; } -static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version, DWORD subtype) { - DWORD dwSize; - DIDEVICEINSTANCEW ddi; - - dwSize = lpddi->dwSize; - - TRACE("%d %p\n", dwSize, lpddi); - - memset(lpddi, 0, dwSize); - memset(&ddi, 0, sizeof(ddi)); - - ddi.dwSize = dwSize; - ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ - ddi.guidProduct = GUID_SysKeyboard; - if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); - else - ddi.dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); - MultiByteToWideChar(CP_ACP, 0, "Keyboard", -1, ddi.tszInstanceName, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, "Wine Keyboard", -1, ddi.tszProductName, MAX_PATH); - - memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); -} - -static HRESULT keyboarddev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ) { - if (id != 0) - return E_FAIL; - - if (dwFlags & DIEDFL_FORCEFEEDBACK) - return S_FALSE; - - if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || - (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { - TRACE("Enumerating the Keyboard device\n"); - - fill_keyboard_dideviceinstanceW(lpddi, version, get_keyboard_subtype()); - - return S_OK; - } + BYTE subtype = get_keyboard_subtype(); + DWORD size; + + TRACE( "type %#x, flags %#x, instance %p, version %#04x, index %d\n", type, flags, instance, version, index ); + + if (index != 0) return DIERR_GENERIC; + if (flags & DIEDFL_FORCEFEEDBACK) return DI_NOEFFECT; + if (version < 0x0800 && type != 0 && type != DIDEVTYPE_KEYBOARD) return DI_NOEFFECT; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_KEYBOARD && type != DI8DEVTYPE_KEYBOARD) + return DI_NOEFFECT; + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW) && + instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) + return DIERR_INVALIDPARAM; + + size = instance->dwSize; + memset( instance, 0, size ); + instance->dwSize = size; + instance->guidInstance = GUID_SysKeyboard; + instance->guidProduct = GUID_SysKeyboard; + if (version >= 0x0800) instance->dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); + else instance->dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); + MultiByteToWideChar( CP_ACP, 0, "Keyboard", -1, instance->tszInstanceName, MAX_PATH ); + MultiByteToWideChar( CP_ACP, 0, "Wine Keyboard", -1, instance->tszProductName, MAX_PATH ); - return S_FALSE; + return DI_OK; } -static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboardImpl **out ) +static HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { - BYTE subtype = get_keyboard_subtype(); - SysKeyboardImpl* newDevice; + SysKeyboardImpl *impl; HRESULT hr; + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + if (!IsEqualGUID( &GUID_SysKeyboard, guid )) return DIERR_DEVICENOTREG; + if (FAILED(hr = direct_input_device_alloc( sizeof(SysKeyboardImpl), &SysKeyboardWvt, &keyboard_internal_vtbl, - rguid, dinput, (void **)&newDevice ))) + guid, dinput, (void **)&impl ))) return hr; - newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); - fill_keyboard_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion, subtype ); - newDevice->base.caps.dwDevType = newDevice->base.instance.dwDevType; - newDevice->base.caps.dwFirmwareRevision = 100; - newDevice->base.caps.dwHardwareRevision = 100; + keyboard_enum_device( 0, 0, &impl->base.instance, dinput->dwVersion, 0 ); + impl->base.caps.dwDevType = impl->base.instance.dwDevType; + impl->base.caps.dwFirmwareRevision = 100; + impl->base.caps.dwHardwareRevision = 100; - if (FAILED(hr = direct_input_device_init( &newDevice->base.IDirectInputDevice8W_iface ))) + if (FAILED(hr = direct_input_device_init( &impl->base.IDirectInputDevice8W_iface ))) { - IDirectInputDevice_Release( &newDevice->base.IDirectInputDevice8W_iface ); + IDirectInputDevice_Release( &impl->base.IDirectInputDevice8W_iface ); return hr; } - *out = newDevice; + *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK; } -static HRESULT keyboarddev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) -{ - TRACE( "%p %s %p\n", dinput, debugstr_guid( rguid ), out ); - *out = NULL; - - if (IsEqualGUID(&GUID_SysKeyboard, rguid)) /* Wine Keyboard */ - { - SysKeyboardImpl *This; - HRESULT hr; - - if (FAILED(hr = alloc_device( rguid, dinput, &This ))) return hr; - - TRACE( "Created a Keyboard device (%p)\n", This ); - - *out = &This->base.IDirectInputDevice8W_iface; - return DI_OK; - } - - return DIERR_DEVICENOTREG; -} - const struct dinput_device keyboard_device = { "Wine keyboard driver", - keyboarddev_enum_device, - keyboarddev_create_device + keyboard_enum_device, + keyboard_create_device }; static HRESULT keyboard_internal_poll( IDirectInputDevice8W *iface )

1 0

Rémi Bernon : dinput: Factor all IDirectInputDevice8W vtables together.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: b242273482616a3f98fb2cf0ce7a648bf4caf16c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b242273482616a3f98fb2cf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 22 09:33:54 2021 +0200 dinput: Factor all IDirectInputDevice8W vtables together. And remove "internal" suffix from internal functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 189 +++++++++++++++++++++++++------------------ dlls/dinput/device_private.h | 80 +----------------- dlls/dinput/joystick_hid.c | 108 ++++++++----------------- dlls/dinput/keyboard.c | 73 +++++------------ dlls/dinput/mouse.c | 73 +++++------------ 5 files changed, 181 insertions(+), 342 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b242273482616a3f98fb…

1 0

Alexandre Julliard : aclui: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 13e707b4074cbdf3c1b1ca75af8bb7a758bbdf8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e707b4074cbdf3c1b1ca75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:11 2021 +0200 aclui: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/aclui_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 8fd3db4d58c..ace58127674 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -65,14 +65,14 @@ static HINSTANCE aclui_instance; static WCHAR *WINAPIV load_formatstr(UINT resource, ...) { - __ms_va_list valist; + va_list valist; WCHAR *str; DWORD ret; - __ms_va_start(valist, resource); + va_start(valist, resource); ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE, aclui_instance, resource, 0, (WCHAR*)&str, 0, &valist); - __ms_va_end(valist); + va_end(valist); return ret ? str : NULL; }

1 0

Alexandre Julliard : xaudio: Use the bundled FAudio and build with msvcrt.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: d8be85863fedf6982944d06ebd1ce5904cb3d4e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8be85863fedf6982944d06e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:48:26 2021 +0200 xaudio: Use the bundled FAudio and build with msvcrt. Based on a patch by Rémi Bernon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 173 -------------------------------------- configure.ac | 55 ------------ dlls/x3daudio1_0/Makefile.in | 6 +- dlls/x3daudio1_1/Makefile.in | 6 +- dlls/x3daudio1_2/Makefile.in | 6 +- dlls/x3daudio1_3/Makefile.in | 6 +- dlls/x3daudio1_4/Makefile.in | 6 +- dlls/x3daudio1_5/Makefile.in | 6 +- dlls/x3daudio1_6/Makefile.in | 6 +- dlls/x3daudio1_7/Makefile.in | 6 +- dlls/xactengine2_0/Makefile.in | 7 +- dlls/xactengine2_4/Makefile.in | 7 +- dlls/xactengine2_7/Makefile.in | 7 +- dlls/xactengine2_9/Makefile.in | 7 +- dlls/xactengine3_0/Makefile.in | 7 +- dlls/xactengine3_1/Makefile.in | 7 +- dlls/xactengine3_2/Makefile.in | 7 +- dlls/xactengine3_3/Makefile.in | 7 +- dlls/xactengine3_4/Makefile.in | 7 +- dlls/xactengine3_5/Makefile.in | 7 +- dlls/xactengine3_6/Makefile.in | 7 +- dlls/xactengine3_7/Makefile.in | 7 +- dlls/xactengine3_7/xact_dll.c | 14 ++- dlls/xapofx1_1/Makefile.in | 7 +- dlls/xapofx1_2/Makefile.in | 7 +- dlls/xapofx1_3/Makefile.in | 7 +- dlls/xapofx1_4/Makefile.in | 7 +- dlls/xapofx1_5/Makefile.in | 7 +- dlls/xaudio2_0/Makefile.in | 7 +- dlls/xaudio2_1/Makefile.in | 7 +- dlls/xaudio2_2/Makefile.in | 7 +- dlls/xaudio2_3/Makefile.in | 7 +- dlls/xaudio2_4/Makefile.in | 7 +- dlls/xaudio2_5/Makefile.in | 7 +- dlls/xaudio2_6/Makefile.in | 7 +- dlls/xaudio2_7/Makefile.in | 7 +- dlls/xaudio2_7/compat.c | 42 --------- dlls/xaudio2_7/x3daudio.c | 7 -- dlls/xaudio2_7/xapo.c | 13 --- dlls/xaudio2_7/xapofx.c | 2 - dlls/xaudio2_7/xaudio_allocator.c | 2 - dlls/xaudio2_7/xaudio_dll.c | 79 +---------------- dlls/xaudio2_7/xaudio_private.h | 6 -- dlls/xaudio2_8/Makefile.in | 7 +- dlls/xaudio2_9/Makefile.in | 7 +- include/config.h.in | 19 ----- 46 files changed, 80 insertions(+), 569 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8be85863fedf6982944…

1 0

Alexandre Julliard : winebuild: Add a more generic way to create directories and sections in fake dlls.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 2f0401c783bb426bc520fcaae18fb2e17fb3318e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f0401c783bb426bc520fcaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 12:47:59 2021 +0200 winebuild: Add a more generic way to create directories and sections in fake dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 214 +++++++++++++++++++++++++---------------------- 1 file changed, 114 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f0401c783bb426bc520…

1 0

Alexandre Julliard : winebuild: Wrap 16-bit fake dlls in a PE module.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 5a8f7d1f745d3fb8fd48d577103ac5068d3c1746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a8f7d1f745d3fb8fd48d577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 12:50:13 2021 +0200 winebuild: Wrap 16-bit fake dlls in a PE module. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51564 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 3 +- tools/winebuild/spec16.c | 13 +++++---- tools/winebuild/spec32.c | 75 +++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 80 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 45e21f8c462..1a9be3c7ae7 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -727,8 +727,7 @@ int main(int argc, char **argv) if (fake_module) { - if (spec->type == SPEC_WIN16) output_fake_module16( spec ); - else output_fake_module( spec ); + output_fake_module( spec ); break; } if (!is_pe()) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index e82f5f81d9a..8d4f96ea323 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -829,7 +829,8 @@ void output_fake_module16( DLLSPEC *spec ) const unsigned int lfanew = (0x40 + sizeof(fakedll_signature) + 15) & ~15; const unsigned int segtab = lfanew + 0x40; - unsigned int i, rsrctab, restab, namelen, modtab, imptab, enttab, cbenttab, codeseg, dataseg, rsrcdata; + unsigned int i, rsrctab, restab, namelen, modtab, imptab, enttab, cbenttab, codeseg, dataseg, rsrcdata, rsrc_size = 0; + void *rsrc_ptr = NULL; init_output_buffer(); @@ -843,6 +844,10 @@ void output_fake_module16( DLLSPEC *spec ) restab += output_buffer_pos; free( output_buffer ); init_output_buffer(); + output_bin_res16_data( spec ); + rsrc_ptr = output_buffer; + rsrc_size = output_buffer_pos; + init_output_buffer(); } namelen = strlen( spec->dll_name ); @@ -874,7 +879,7 @@ void output_fake_module16( DLLSPEC *spec ) put_dword( 0 ); put_word( 0 ); /* e_oemid */ put_word( 0 ); /* e_oeminfo */ - put_dword( 0 ); /* e_res2 */ + put_dword( rsrcdata + rsrc_size ); /* e_res2 */ put_dword( 0 ); put_dword( 0 ); put_dword( 0 ); @@ -953,7 +958,5 @@ void output_fake_module16( DLLSPEC *spec ) put_data( data_segment, sizeof(data_segment) ); /* resource data */ - output_bin_res16_data( spec ); - - flush_output_buffer(); + put_data( rsrc_ptr, rsrc_size ); } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 7a28777fb77..513778ad10c 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -790,13 +790,21 @@ struct dir_data unsigned int size; }; +struct exp_data +{ + unsigned int rva; + const char *name; +}; + static struct { unsigned int section_align; unsigned int file_align; unsigned int sec_count; + unsigned int exp_count; struct dir_data dir[16]; struct sec_data sec[8]; + struct exp_data exp[8]; } pe; static void set_dir( unsigned int idx, unsigned int rva, unsigned int size ) @@ -805,6 +813,13 @@ static void set_dir( unsigned int idx, unsigned int rva, unsigned int size ) pe.dir[idx].size = size; } +static void add_export( unsigned int rva, const char *name ) +{ + pe.exp[pe.exp_count].rva = rva; + pe.exp[pe.exp_count].name = name; + pe.exp_count++; +} + static unsigned int current_rva(void) { if (!pe.sec_count) return pe.section_align; @@ -864,16 +879,68 @@ void output_fake_module( DLLSPEC *spec ) else put_data( exe_code_section, sizeof(exe_code_section) ); flush_output_to_section( ".text", -1, 0x60000020 /* CNT_CODE|MEM_EXECUTE|MEM_READ */ ); + if (spec->type == SPEC_WIN16) + { + add_export( current_rva(), "__wine_spec_dos_header" ); + + /* .rodata section */ + output_fake_module16( spec ); + if (spec->main_module) + { + add_export( current_rva() + output_buffer_pos, "__wine_spec_main_module" ); + put_data( spec->main_module, strlen(spec->main_module) + 1 ); + } + flush_output_to_section( ".rodata", -1, 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + } + + if (pe.exp_count) + { + /* .edata section */ + unsigned int exp_rva = current_rva() + 40; /* sizeof(IMAGE_EXPORT_DIRECTORY) */ + unsigned int pos, str_rva = exp_rva + 10 * pe.exp_count; + + put_dword( 0 ); /* Characteristics */ + put_dword( hash_filename(spec->file_name) ); /* TimeDateStamp */ + put_word( 0 ); /* MajorVersion */ + put_word( 0 ); /* MinorVersion */ + put_dword( str_rva ); /* Name */ + put_dword( 1 ); /* Base */ + put_dword( pe.exp_count ); /* NumberOfFunctions */ + put_dword( pe.exp_count ); /* NumberOfNames */ + put_dword( exp_rva ); /* AddressOfFunctions */ + put_dword( exp_rva + 4 * pe.exp_count ); /* AddressOfNames */ + put_dword( exp_rva + 8 * pe.exp_count ); /* AddressOfNameOrdinals */ + + /* functions */ + for (i = 0; i < pe.exp_count; i++) put_dword( pe.exp[i].rva ); + /* names */ + for (i = 0, pos = str_rva + strlen(spec->file_name) + 1; i < pe.exp_count; i++) + { + put_dword( pos ); + pos += strlen( pe.exp[i].name ) + 1; + } + /* ordinals */ + for (i = 0; i < pe.exp_count; i++) put_word( i ); + /* strings */ + put_data( spec->file_name, strlen(spec->file_name) + 1 ); + for (i = 0; i < pe.exp_count; i++) put_data( pe.exp[i].name, strlen(pe.exp[i].name) + 1 ); + flush_output_to_section( ".edata", 0 /* IMAGE_DIRECTORY_ENTRY_EXPORT */, + 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + } + /* .reloc section */ put_dword( 0 ); /* VirtualAddress */ put_dword( 0 ); /* Size */ flush_output_to_section( ".reloc", 5 /* IMAGE_DIRECTORY_ENTRY_BASERELOC */, 0x42000040 /* CNT_INITIALIZED_DATA|MEM_DISCARDABLE|MEM_READ */ ); - /* .rsrc section */ - output_bin_resources( spec, current_rva() ); - flush_output_to_section( ".rsrc", 2 /* IMAGE_DIRECTORY_ENTRY_RESOURCE */, - 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + if (spec->type == SPEC_WIN32) + { + /* .rsrc section */ + output_bin_resources( spec, current_rva() ); + flush_output_to_section( ".rsrc", 2 /* IMAGE_DIRECTORY_ENTRY_RESOURCE */, + 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + } put_word( 0x5a4d ); /* e_magic */ put_word( 0x40 ); /* e_cblp */

1 0