April 2021 - Wine-Devel - list.winehq.org

[PATCH v3 1/2] user32/tests: Add tests for maximizing and restoring windows without WS_CAPTION.
by Ziqing Hui April 23, 2021

April 23, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: * Call flush_events() at end of loop. * Check return value of ShowWindow(). v3: No changes. dlls/user32/tests/win.c | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)

1 0

[PATCH v2 2/2] winex11.drv: Correct a full screen conditon.
by Ziqing Hui April 23, 2021

April 23, 2021

The if condition here came from 47c54c4ae7f235780a55ddf670503db4afc11055, which is to detect full screen window. However, according to tests in previous commit, there is possibility that a window without setting WS_CAPTION is not full screen, for example, main window of Tencent WeChat. And windows like this can also be maximized or restored. So that we can not treat WS_CAPTION as our full screen condition. This fixes maximizing Tencent WeChat by dragging it to screen edge. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Change commit message. dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v2 1/2] user32/tests: Add tests for maximizing and restoring windows without WS_CAPTION.
by Ziqing Hui April 23, 2021

April 23, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: * Call flush_events() at end of loop. * Check return value of ShowWindow(). dlls/user32/tests/win.c | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)

1 0

[PATCH] xactengine: Use nameless unions
by Alistair Leslie-Hughes April 22, 2021

April 22, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.h | 2 +- include/xact3wb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/xact3.h b/include/xact3.h index 63eec707363..9b8f480829e 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -434,7 +434,7 @@ typedef struct XACT_NOTIFICATION XACT_NOTIFICATION_VARIABLE variable; XACT_NOTIFICATION_GUI gui; XACT_NOTIFICATION_WAVE wave; - } DUMMYUNIONNAME; + }; } XACT_NOTIFICATION, *LPXACT_NOTIFICATION; typedef const XACT_NOTIFICATION *LPCXACT_NOTIFICATION; diff --git a/include/xact3wb.h b/include/xact3wb.h index 6d157a466f9..834b3e1ef54 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -121,7 +121,7 @@ typedef struct WAVEBANKENTRY DWORD Duration : 28; } DUMMYSTRUCTNAME; DWORD dwFlagsAndDuration; - } DUMMYUNIONNAME; + }; WAVEBANKMINIWAVEFORMAT Format; WAVEBANKREGION PlayRegion; -- 2.30.2

2 1

[PATCH] include: Don't pack XACT_RUNTIME_PARAMETERS structure.
by Connor McAdams April 22, 2021

April 22, 2021

Move the XACT_RUNTIME_PARAMETERS structure definition outside of the packing directive that the other structures are placed within. It isn't packed in Windows, and was included with the others by mistake. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/xact3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/xact3.h b/include/xact3.h index 63eec707363..7b836f3bbec 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -442,6 +442,8 @@ typedef void (__stdcall *XACT_NOTIFICATION_CALLBACK)( const XACT_NOTIFICATION *pNotification ); +#include <poppack.h> + typedef struct XACT_RUNTIME_PARAMETERS { DWORD lookAheadTime; @@ -457,8 +459,6 @@ typedef struct XACT_RUNTIME_PARAMETERS } XACT_RUNTIME_PARAMETERS, *LPXACT_RUNTIME_PARAMETERS; typedef const XACT_RUNTIME_PARAMETERS *LPCXACT_RUNTIME_PARAMETERS; -#include <poppack.h> - #define XACT_FLAG_CUE_STOP_RELEASE XACT_FLAG_STOP_RELEASE #define XACT_FLAG_CUE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE -- 2.25.1

2 1

[PATCH 1/4] winebus.sys: Create stub Wine HID keyboard device.
by Rémi Bernon April 22, 2021

April 22, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Not completely sure if there was a reason for it not to be there while there's a mouse device, but I want to cleanup user32 rawinput code, and get rid of the hardcoded devices if possible. This will make the keyboard device available too. dlls/winebus.sys/main.c | 70 ++++++++++++++++++++++++++++++++++++ dlls/winehid.sys/winehid.inf | 1 + 2 files changed, 71 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index acd166758e7..99f834d2f40 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -97,6 +97,7 @@ static const struct product_desc XBOX_CONTROLLERS[] = { static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *mouse_obj; +static DEVICE_OBJECT *keyboard_obj; /* The root-enumerated device stack. */ DEVICE_OBJECT *bus_pdo; @@ -540,6 +541,74 @@ static void mouse_device_create(void) IoInvalidateDeviceRelations(bus_pdo, BusRelations); } +static NTSTATUS keyboard_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *ret_length) +{ + TRACE("buffer %p, length %u.\n", buffer, length); + + *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); + if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL)) + return STATUS_BUFFER_TOO_SMALL; + + memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); + memcpy(buffer + sizeof(REPORT_HEADER), REPORT_TAIL, sizeof(REPORT_TAIL)); + buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; + buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_KEYBOARD; + + return STATUS_SUCCESS; +} + +static NTSTATUS keyboard_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) +{ + static const WCHAR nameW[] = {'W','i','n','e',' ','H','I','D',' ','k','e','y','b','o','a','r','d',0}; + if (index != HID_STRING_ID_IPRODUCT) + return STATUS_NOT_IMPLEMENTED; + if (length < ARRAY_SIZE(nameW)) + return STATUS_BUFFER_TOO_SMALL; + strcpyW(buffer, nameW); + return STATUS_SUCCESS; +} + +static NTSTATUS keyboard_begin_report_processing(DEVICE_OBJECT *device) +{ + return STATUS_SUCCESS; +} + +static NTSTATUS keyboard_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS keyboard_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS keyboard_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static const platform_vtbl keyboard_vtbl = +{ + .get_reportdescriptor = keyboard_get_reportdescriptor, + .get_string = keyboard_get_string, + .begin_report_processing = keyboard_begin_report_processing, + .set_output_report = keyboard_set_output_report, + .get_feature_report = keyboard_get_feature_report, + .set_feature_report = keyboard_set_feature_report, +}; + +static void keyboard_device_create(void) +{ + static const WCHAR busidW[] = {'W','I','N','E','K','E','Y','B','O','A','R','D',0}; + + keyboard_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &keyboard_vtbl, 0); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); +} + static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { static const WCHAR SDL_enabledW[] = {'E','n','a','b','l','e',' ','S','D','L',0}; @@ -554,6 +623,7 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) break; case IRP_MN_START_DEVICE: mouse_device_create(); + keyboard_device_create(); if (check_bus_option(&SDL_enabled, 1)) { diff --git a/dlls/winehid.sys/winehid.inf b/dlls/winehid.sys/winehid.inf index 566448e4a51..f9ed4091217 100644 --- a/dlls/winehid.sys/winehid.inf +++ b/dlls/winehid.sys/winehid.inf @@ -12,6 +12,7 @@ Wine IOHID device=device_section,IOHID Wine libevent device=device_section,LNXEV Wine SDL HID device=device_section,SDLJOY Wine mouse device=device_section,WINEMOUSE +Wine keyboard device=device_section,WINEKEYBOARD [device_section.Services] AddService = winehid,0x2,svc_section -- 2.31.0

3 5

[PATCH v6] ieframe: Implement IWebBrowser2::get_LocationName().
by Gijs Vermeulen April 22, 2021

April 22, 2021

From: Andrey Turkin <andrey.turkin(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12457 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 15 +++++++++++++++ dlls/ieframe/webbrowser.c | 21 +++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index ab0345b79b5..864a8baf27f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -263,6 +263,19 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const WCHAR *exur } } +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) +static void _test_LocationName(unsigned line, IWebBrowser2 *wb, const WCHAR *exname) +{ + BSTR name = (void*)0xdeadbeef; + HRESULT hres; + + hres = IWebBrowser2_get_LocationName(wb, &name); + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); + ok_(__FILE__,line) (!lstrcmpW(name, exname) || broken(is_http && !lstrcmpW(name, current_url)) /* Win10 2004 */, + "expected %s, got %s\n", wine_dbgstr_w(exname), wine_dbgstr_w(name)); + SysFreeString(name); +} + #define test_ready_state(a,b) _test_ready_state(__LINE__,a,b) static void _test_ready_state(unsigned line, READYSTATE exstate, VARIANT_BOOL expect_busy) { @@ -2800,11 +2813,13 @@ static void test_ConnectionPoint(IWebBrowser2 *unk, BOOL init) static void test_Navigate2(IWebBrowser2 *webbrowser, const WCHAR *nav_url) { + const WCHAR *title = L"WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; VARIANT url; BOOL is_file; HRESULT hres; test_LocationURL(webbrowser, is_first_load ? L"" : current_url); + test_LocationName(webbrowser, is_first_load ? L"" : (is_http ? title : current_url)); test_ready_state(is_first_load ? READYSTATE_UNINITIALIZED : READYSTATE_COMPLETE, VARIANT_FALSE); is_http = !memcmp(nav_url, "http:", 5); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 87b74b8e01f..26ce666b4ba 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -539,8 +539,25 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationName); - return E_NOTIMPL; + IHTMLDocument2 *doc; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, LocationName); + + if(This->doc_host.document && + SUCCEEDED(IUnknown_QueryInterface(This->doc_host.document, &IID_IHTMLDocument2, (void **)&doc))) { + hres = IHTMLDocument2_get_title(doc, LocationName); + if(hres == S_OK && !SysStringLen(*LocationName)) { + SysFreeString(*LocationName); + hres = get_location_url(&This->doc_host, LocationName); + } + IHTMLDocument2_Release(doc); + } else { + *LocationName = SysAllocString(L""); + hres = S_FALSE; + } + + return hres; } static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL) -- 2.31.1

3 2

[PATCH] mmdevapi: Return success from SAORS_GetAvailableDynamicObjectCount().
by Paul Gofman April 22, 2021

April 22, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- For Forza Horizon 4. dlls/mmdevapi/spatialaudio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index 597c2d29933..12ddd5e790a 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -303,7 +303,9 @@ static HRESULT WINAPI SAORS_GetAvailableDynamicObjectCount( { SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); FIXME("(%p)->(%p)\n", This, count); - return E_NOTIMPL; + + *count = 0; + return S_OK; } static HRESULT WINAPI SAORS_GetService(ISpatialAudioObjectRenderStream *iface, -- 2.30.2

3 2

[PATCH] winegcc: Use -idirafter for system include paths.
by Jacek Caban April 22, 2021

April 22, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50996 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH v5] ieframe: Implement IWebBrowser2::get_LocationName().
by Gijs Vermeulen April 22, 2021

April 22, 2021

From: Andrey Turkin <andrey.turkin(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12457 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 15 +++++++++++++++ dlls/ieframe/webbrowser.c | 19 +++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index ab0345b79b5..864a8baf27f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -263,6 +263,19 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const WCHAR *exur } } +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) +static void _test_LocationName(unsigned line, IWebBrowser2 *wb, const WCHAR *exname) +{ + BSTR name = (void*)0xdeadbeef; + HRESULT hres; + + hres = IWebBrowser2_get_LocationName(wb, &name); + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); + ok_(__FILE__,line) (!lstrcmpW(name, exname) || broken(is_http && !lstrcmpW(name, current_url)) /* Win10 2004 */, + "expected %s, got %s\n", wine_dbgstr_w(exname), wine_dbgstr_w(name)); + SysFreeString(name); +} + #define test_ready_state(a,b) _test_ready_state(__LINE__,a,b) static void _test_ready_state(unsigned line, READYSTATE exstate, VARIANT_BOOL expect_busy) { @@ -2800,11 +2813,13 @@ static void test_ConnectionPoint(IWebBrowser2 *unk, BOOL init) static void test_Navigate2(IWebBrowser2 *webbrowser, const WCHAR *nav_url) { + const WCHAR *title = L"WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; VARIANT url; BOOL is_file; HRESULT hres; test_LocationURL(webbrowser, is_first_load ? L"" : current_url); + test_LocationName(webbrowser, is_first_load ? L"" : (is_http ? title : current_url)); test_ready_state(is_first_load ? READYSTATE_UNINITIALIZED : READYSTATE_COMPLETE, VARIANT_FALSE); is_http = !memcmp(nav_url, "http:", 5); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 87b74b8e01f..86f7cc43088 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -539,8 +539,23 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationName); - return E_NOTIMPL; + IHTMLDocument2 *doc; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, LocationName); + + if(This->doc_host.document && + SUCCEEDED(IUnknown_QueryInterface(This->doc_host.document, &IID_IHTMLDocument2, (void **)&doc))) { + hres = IHTMLDocument2_get_title(doc, LocationName); + if(hres == S_OK && !SysStringLen(*LocationName)) + hres = get_location_url(&This->doc_host, LocationName); + IHTMLDocument2_Release(doc); + } else { + *LocationName = SysAllocString(L""); + hres = S_FALSE; + } + + return hres; } static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL) -- 2.31.1

3 2