- wine-devel - winehq.org

[PATCH v2 2/9] win32u: Introduce UpdateDisplayDevice user driver entry point.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 1 + dlls/win32u/driver.c | 13 +++++++ dlls/win32u/sysparams.c | 75 ++++++++++++++++++++++++++++++++++++++- include/wine/gdi_driver.h | 39 +++++++++++++++++++- 4 files changed, 126 insertions(+), 2 deletions(-)

2 1

[PATCH v2 8/9] user32: Invalidate cache in update_monitor_cache when modification time matches current time.
by Jacek Caban 25 Nov '21

25 Nov '21

Also preserve last error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This fixes a pre-existing problem with current code that we start to hit in monitor tests with the next patch. My plan is to get rid of update_monitor_cache and entire monitor cache in user32. This will ultimitely solve the problem, but I don't want to make this series longer. dlls/user32/sysparams.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH v2 7/9] win32u: Implement NtUserEnumDisplayDevices.
by Jacek Caban 25 Nov '21

25 Nov '21

And use it in user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 335 +---------------------------------- dlls/win32u/dc.c | 6 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/sysparams.c | 71 ++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 33 +++- dlls/win32u/wrappers.c | 10 +- include/ntuser.h | 2 + 9 files changed, 112 insertions(+), 349 deletions(-)

1 0

[PATCH v2 6/9] winex11: Use gdi driver types for display device handler.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 18 ++++++------ dlls/winex11.drv/display.c | 24 ++++++++-------- dlls/winex11.drv/x11drv.h | 55 +++++-------------------------------- dlls/winex11.drv/xinerama.c | 20 +++++++------- dlls/winex11.drv/xrandr.c | 47 +++++++++++++++---------------- 5 files changed, 62 insertions(+), 102 deletions(-)

1 0

[PATCH v2 5/9] win32u: Implement monitor registration.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 144 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-)

1 0

[PATCH v2 4/9] win32u: Implement display adapter registration.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 4 ++- dlls/win32u/sysparams.c | 71 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 2 deletions(-)

1 0

[PATCH v2 3/9] win32u: Implement GPU registration.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 10 +- dlls/win32u/sysparams.c | 459 ++++++++++++++++++++++++++++++++++- dlls/win32u/win32u_private.h | 6 + 3 files changed, 467 insertions(+), 8 deletions(-)

1 0

[PATCH v2 1/9] win32u: Implement NtUserGetDisplayConfigBufferSizes.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/Makefile.in | 1 + dlls/win32u/font.c | 4 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 467 +++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 2 + 8 files changed, 484 insertions(+), 3 deletions(-) create mode 100644 dlls/win32u/sysparams.c

1 0

[PATCH 5/9] win32u: Implement monitor registration.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 143 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-)

2 2

[PATCH 2/9] win32u: Introduce UpdateDisplayDevice user driver entry point.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The idea is to provide a way to drivers to do the registration instead of duplicating it in each driver. The new way also allows drivers to set those without SetupAPI, which is problematic for unix libs. dlls/user32/driver.c | 1 + dlls/win32u/driver.c | 13 +++++++ dlls/win32u/sysparams.c | 75 ++++++++++++++++++++++++++++++++++++++- include/wine/gdi_driver.h | 37 +++++++++++++++++++ 4 files changed, 125 insertions(+), 1 deletion(-)

2 2

[PATCH v7 01/11] jscript: Treat prototype refs as non-existent when deleting.
by Gabriel Ivăncescu 25 Nov '21

25 Nov '21

Delete only affects own properties. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 5 +++++ dlls/jscript/tests/lang.js | 5 +++++ dlls/mshtml/tests/documentmode.js | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e64a520..df81e1a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1621,6 +1621,11 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) { + if(prop->type == PROP_PROTREF) { + *ret = TRUE; + return S_OK; + } + if(!(prop->flags & PROPF_CONFIGURABLE)) { *ret = FALSE; return S_OK; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 63aa669..f259c70 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1565,6 +1565,11 @@ ok(arr["test1"] === true, "arr[test1] !== true"); ok(arr["test2"] === true, "arr[test2] !== true"); ok(arr["test3"] === true, "arr[test3] !== true"); +ok((delete inobj.test1) === true, "delete inobj.test1 returned false"); +ok(!("test1" in inobj), "test1 is still in inobj after delete"); +ok((delete inobj.test3) === true, "delete inobj.test3 returned false"); +ok("test3" in inobj, "test3 is not in inobj after delete"); + tmp = new Object(); tmp.test = false; ok((delete tmp.test) === true, "delete returned false"); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d5f33dd..041025c 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1192,7 +1192,6 @@ sync_test("__proto__", function() { ok(obj.__proto__ === ctor.prototype, "obj.__proto__ !== ctor.prototype"); r = (delete x.__proto__); - todo_wine. ok(r, "delete x.__proto__ returned " + r); ok(Object.prototype.hasOwnProperty("__proto__"), "__proto__ is not a property of Object.prototype after delete"); r = Object.getPrototypeOf(x); -- 2.31.1

3 26

[PATCH 00/12] winecoreaudio: Move the midi out handling to the unixlib.
by Huw Davies 25 Nov '21

25 Nov '21

This series moves all of the midi out handling to the unixlib. The idea is that coremidi.c will be the unix-side, midi.c will become PE with audiounit.c being removed in the process. Huw D. M. Davies (12): winecoreaudio: Temporarily move MIDIOut_Send() to audiounit.c. winecoreaudio: Combine MIDIIn_SendMessage into MIDIIn_ReadProc. winecoreaudio: Move midi_init and midi_release to the unixlib. winecoreaudio: Move midi_out_open to the unixlib. winecoreaudio: Move midi_out_close to the unixlib. winecoreaudio: Move midi_out_data to the unixlib. winecoreaudio: Move midi_out_long_data to the unixlib. winecoreaudio: Move midi_out_prepare and midi_out_unprepare to the unixlib. winecoreaudio: Move midi_out_get_devcaps to the unixlib. winecoreaudio: Move midi_out_get_num_devs to the unixlib. winecoreaudio: Move midi_out_[gs]et_volume to the unixlib. winecoreaudio: Move midi_out_reset to the unixlib. dlls/winecoreaudio.drv/Makefile.in | 1 - dlls/winecoreaudio.drv/audiounit.c | 197 -------- dlls/winecoreaudio.drv/coreaudio.c | 3 + dlls/winecoreaudio.drv/coremidi.c | 750 +++++++++++++++++++++++++++-- dlls/winecoreaudio.drv/coremidi.h | 30 +- dlls/winecoreaudio.drv/midi.c | 583 ++-------------------- dlls/winecoreaudio.drv/unixlib.h | 40 ++ 7 files changed, 831 insertions(+), 773 deletions(-) delete mode 100644 dlls/winecoreaudio.drv/audiounit.c -- 2.23.0

1 0

[PATCH 4/9] win32u: Implement display adapter registration.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 4 ++- dlls/win32u/sysparams.c | 71 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 2 deletions(-)

2 3

[PATCH 2/2] comctl32/tests: Add an optional message to avoid test failures.
by Zhiyi Zhang 25 Nov '21

25 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/propsheet.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 04a540b07e6..82af9f02000 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -648,6 +648,7 @@ static const struct message property_sheet_seq[] = { { DM_REPOSITION, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/ { WM_WINDOWPOSCHANGING, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_WINDOWPOSCHANGING, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, + { WM_WINDOWPOSCHANGED, sent|id|optional, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_ACTIVATEAPP, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, /*{ WM_NCACTIVATE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_GETTEXT, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, -- 2.32.0

1 0

[PATCH v2 3/3] explorerframe: Implement taskbar_list_AddTab() for x11 driver.
by Zhiyi Zhang 25 Nov '21

25 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/explorerframe/taskbarlist.c | 6 +++-- dlls/explorerframe/tests/taskbarlist.c | 8 ------ dlls/winex11.drv/window.c | 36 +++++++++++++++++++++++--- dlls/winex11.drv/x11drv.h | 4 ++- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 839ae210daa..7e1f5b92c5b 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); #define WM_WINE_DELETE_TAB (WM_USER + 1) +#define WM_WINE_ADD_TAB (WM_USER + 2) struct taskbar_list { @@ -98,9 +99,10 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_HrInit(ITaskbarList4 *iface) static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList4 *iface, HWND hwnd) { - FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + TRACE("iface %p, hwnd %p\n", iface, hwnd); - return E_NOTIMPL; + SendMessageW(GetDesktopWindow(), WM_WINE_ADD_TAB, (WPARAM)hwnd, 0); + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList4 *iface, HWND hwnd) diff --git a/dlls/explorerframe/tests/taskbarlist.c b/dlls/explorerframe/tests/taskbarlist.c index 9b2de996000..5f5cc98c5b4 100644 --- a/dlls/explorerframe/tests/taskbarlist.c +++ b/dlls/explorerframe/tests/taskbarlist.c @@ -43,7 +43,6 @@ static void test_ITaskbarList(void) /* Test calling methods before calling ITaskbarList::HrInit() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); @@ -69,21 +68,17 @@ static void test_ITaskbarList(void) /* Test ITaskbarList::AddTab() */ /* Check invalid parameters */ hr = ITaskbarList_AddTab(taskbarlist, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_AddTab(taskbarlist, (HWND)0xdeadbeef); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Normal ITaskbarList::AddTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Repeat ITaskbarList::AddTab() with the same hwnd */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); @@ -101,7 +96,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::SetActiveAlt() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); @@ -128,7 +122,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::ActivateTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); @@ -156,7 +149,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::DeleteTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index dacb1293a9e..8096d756ccf 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -994,10 +994,13 @@ void update_net_wm_states( struct x11drv_win_data *data ) ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) new_state |= (1 << NET_WM_STATE_ABOVE); - if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) - new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) - new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); + if (!data->add_taskbar) + { + if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) + new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); + else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) + new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); + } if (!data->mapped) /* set the _NET_WM_STATE atom directly */ { @@ -1859,6 +1862,7 @@ static WNDPROC desktop_orig_wndproc; #define WM_WINE_NOTIFY_ACTIVITY WM_USER #define WM_WINE_DELETE_TAB (WM_USER + 1) +#define WM_WINE_ADD_TAB (WM_USER + 2) static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { @@ -1881,6 +1885,9 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, case WM_WINE_DELETE_TAB: SendMessageA( (HWND)wp, WM_X11DRV_DELETE_TAB, 0, 0 ); break; + case WM_WINE_ADD_TAB: + SendMessageA( (HWND)wp, WM_X11DRV_ADD_TAB, 0, 0 ); + break; } return desktop_orig_wndproc( hwnd, msg, wp, lp ); } @@ -2781,6 +2788,23 @@ done: return ret; } +/* Add a window to taskbar */ +static void taskbar_add_tab( HWND hwnd ) +{ + struct x11drv_win_data *data; + + TRACE("hwnd %p\n", hwnd); + + data = get_win_data( hwnd ); + if (!data) + return; + + data->add_taskbar = TRUE; + data->skip_taskbar = FALSE; + update_net_wm_states( data ); + release_win_data( data ); +} + /* Delete a window from taskbar */ static void taskbar_delete_tab( HWND hwnd ) { @@ -2793,6 +2817,7 @@ static void taskbar_delete_tab( HWND hwnd ) return; data->skip_taskbar = TRUE; + data->add_taskbar = FALSE; update_net_wm_states( data ); release_win_data( data ); } @@ -2835,6 +2860,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_DELETE_TAB: taskbar_delete_tab( hwnd ); return 0; + case WM_X11DRV_ADD_TAB: + taskbar_add_tab( hwnd ); + return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6a38fc5a20e..d678d93905d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -585,7 +585,8 @@ enum x11drv_window_messages WM_X11DRV_SET_CURSOR, WM_X11DRV_CLIP_CURSOR_NOTIFY, WM_X11DRV_CLIP_CURSOR_REQUEST, - WM_X11DRV_DELETE_TAB + WM_X11DRV_DELETE_TAB, + WM_X11DRV_ADD_TAB }; /* _NET_WM_STATE properties that we keep track of */ @@ -621,6 +622,7 @@ struct x11drv_win_data BOOL layered : 1; /* is window layered and with valid attributes? */ BOOL use_alpha : 1; /* does window use an alpha channel? */ BOOL skip_taskbar : 1; /* does window should be deleted from taskbar */ + BOOL add_taskbar : 1; /* does window should be added to taskbar regardless of style */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */ -- 2.32.0

1 0

[PATCH v2 2/3] explorerframe: Implement taskbar_list_DeleteTab() for x11 driver.
by Zhiyi Zhang 25 Nov '21

25 Nov '21

Partially fix Excel 2007 and 2010 showing an extra taskbar icon when opening multiple documents in one instance. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/explorerframe/taskbarlist.c | 7 +++++-- dlls/explorerframe/tests/taskbarlist.c | 8 -------- dlls/winex11.drv/window.c | 26 ++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 4 +++- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 6f24f359927..839ae210daa 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); +#define WM_WINE_DELETE_TAB (WM_USER + 1) + struct taskbar_list { ITaskbarList4 ITaskbarList4_iface; @@ -103,9 +105,10 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList4 *iface, HWND static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList4 *iface, HWND hwnd) { - FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + TRACE("iface %p, hwnd %p\n", iface, hwnd); - return E_NOTIMPL; + SendMessageW(GetDesktopWindow(), WM_WINE_DELETE_TAB, (WPARAM)hwnd, 0); + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_ActivateTab(ITaskbarList4 *iface, HWND hwnd) diff --git a/dlls/explorerframe/tests/taskbarlist.c b/dlls/explorerframe/tests/taskbarlist.c index ed1bc44a6ac..9b2de996000 100644 --- a/dlls/explorerframe/tests/taskbarlist.c +++ b/dlls/explorerframe/tests/taskbarlist.c @@ -55,7 +55,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Call ITaskbarList::HrInit() */ @@ -88,7 +87,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::SetActiveAlt() */ @@ -116,7 +114,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::ActivateTab() */ @@ -144,21 +141,17 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::DeleteTab() */ /* Check invalid parameters */ hr = ITaskbarList_DeleteTab(taskbarlist, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, (HWND)0xdeadbeef); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Normal ITaskbarList::DeleteTab() */ @@ -167,7 +160,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ref_count = ITaskbarList_Release(taskbarlist); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index bcb0b8044bc..dacb1293a9e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -994,9 +994,9 @@ void update_net_wm_states( struct x11drv_win_data *data ) ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) new_state |= (1 << NET_WM_STATE_ABOVE); - if (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE)) + if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) + else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); if (!data->mapped) /* set the _NET_WM_STATE atom directly */ @@ -1858,6 +1858,7 @@ BOOL CDECL X11DRV_CreateDesktopWindow( HWND hwnd ) static WNDPROC desktop_orig_wndproc; #define WM_WINE_NOTIFY_ACTIVITY WM_USER +#define WM_WINE_DELETE_TAB (WM_USER + 1) static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { @@ -1877,6 +1878,9 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, } break; } + case WM_WINE_DELETE_TAB: + SendMessageA( (HWND)wp, WM_X11DRV_DELETE_TAB, 0, 0 ); + break; } return desktop_orig_wndproc( hwnd, msg, wp, lp ); } @@ -2777,6 +2781,21 @@ done: return ret; } +/* Delete a window from taskbar */ +static void taskbar_delete_tab( HWND hwnd ) +{ + struct x11drv_win_data *data; + + TRACE("hwnd %p\n", hwnd); + + data = get_win_data( hwnd ); + if (!data) + return; + + data->skip_taskbar = TRUE; + update_net_wm_states( data ); + release_win_data( data ); +} /********************************************************************** * X11DRV_WindowMessage (X11DRV.@) @@ -2813,6 +2832,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); case WM_X11DRV_CLIP_CURSOR_REQUEST: return clip_cursor_request( hwnd, (BOOL)wp, (BOOL)lp ); + case WM_X11DRV_DELETE_TAB: + taskbar_delete_tab( hwnd ); + return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4b4ee8daaeb..6a38fc5a20e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -584,7 +584,8 @@ enum x11drv_window_messages WM_X11DRV_RESIZE_DESKTOP, WM_X11DRV_SET_CURSOR, WM_X11DRV_CLIP_CURSOR_NOTIFY, - WM_X11DRV_CLIP_CURSOR_REQUEST + WM_X11DRV_CLIP_CURSOR_REQUEST, + WM_X11DRV_DELETE_TAB }; /* _NET_WM_STATE properties that we keep track of */ @@ -619,6 +620,7 @@ struct x11drv_win_data BOOL shaped : 1; /* is window using a custom region shape? */ BOOL layered : 1; /* is window layered and with valid attributes? */ BOOL use_alpha : 1; /* does window use an alpha channel? */ + BOOL skip_taskbar : 1; /* does window should be deleted from taskbar */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */ -- 2.32.0

1 0

[PATCH v2 1/3] explorerframe/tests: Add ITaskbarList tests.
by Zhiyi Zhang 25 Nov '21

25 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 219399~219401. Use messages rather than direct functions calls into graphics driver. dlls/explorerframe/tests/Makefile.in | 3 +- dlls/explorerframe/tests/taskbarlist.c | 185 +++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 dlls/explorerframe/tests/taskbarlist.c diff --git a/dlls/explorerframe/tests/Makefile.in b/dlls/explorerframe/tests/Makefile.in index b0b88657788..ede5443bcd1 100644 --- a/dlls/explorerframe/tests/Makefile.in +++ b/dlls/explorerframe/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = explorerframe.dll IMPORTS = uuid shell32 ole32 user32 C_SRCS = \ - nstc.c + nstc.c \ + taskbarlist.c diff --git a/dlls/explorerframe/tests/taskbarlist.c b/dlls/explorerframe/tests/taskbarlist.c new file mode 100644 index 00000000000..ed1bc44a6ac --- /dev/null +++ b/dlls/explorerframe/tests/taskbarlist.c @@ -0,0 +1,185 @@ +/* + * Unit tests for ITaskbarList interface + * + * Copyright 2021 Zhiyi Zhang 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 + */ + +#define COBJMACROS +#include <shobjidl.h> +#include <wine/test.h> + +static void test_ITaskbarList(void) +{ + ITaskbarList *taskbarlist; + ULONG ref_count; + HRESULT hr; + HWND hwnd; + + hwnd = CreateWindowA(WC_STATICA, "test", WS_POPUP | WS_VISIBLE, 0, 0, 50, 50, 0, 0, 0, NULL); + ok(hwnd != NULL, "Failed to create a test window, error %u.\n", GetLastError()); + + hr = CoCreateInstance((const CLSID *)&CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, + (const IID *)&IID_ITaskbarList, (void **)&taskbarlist); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref_count = ITaskbarList_AddRef(taskbarlist); + ok(ref_count == 2, "Got unexpected reference count %u.\n", ref_count); + ref_count = ITaskbarList_Release(taskbarlist); + ok(ref_count == 1, "Got unexpected reference count %u.\n", ref_count); + + /* Test calling methods before calling ITaskbarList::HrInit() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Call ITaskbarList::HrInit() */ + hr = ITaskbarList_HrInit(taskbarlist); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::HrInit() */ + /* Call ITaskbarList::HrInit() again */ + hr = ITaskbarList_HrInit(taskbarlist); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::AddTab() */ + /* Check invalid parameters */ + hr = ITaskbarList_AddTab(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_AddTab(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::AddTab() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Repeat ITaskbarList::AddTab() with the same hwnd */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::SetActiveAlt() */ + /* Check invalid parameters */ + hr = ITaskbarList_SetActiveAlt(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_SetActiveAlt(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::SetActiveAlt() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Repeat ITaskbarList::SetActiveAlt() with the same hwnd */ + hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::ActivateTab() */ + /* Check invalid parameters */ + hr = ITaskbarList_ActivateTab(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_ActivateTab(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::ActivateTab() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Repeat ITaskbarList::ActivateTab() with the same hwnd */ + hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::DeleteTab() */ + /* Check invalid parameters */ + hr = ITaskbarList_DeleteTab(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::DeleteTab() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref_count = ITaskbarList_Release(taskbarlist); + ok(ref_count == 0, "Got unexpected reference count %u.\n", ref_count); + DestroyWindow(hwnd); +} + +START_TEST(taskbarlist) +{ + CoInitialize(NULL); + + test_ITaskbarList(); + + CoUninitialize(); +} -- 2.32.0

1 0

[PATCH 1/2] include: Add ISharedPropertyGroupManager interface.
by Jactry Zeng 25 Nov '21

25 Nov '21

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/comsvcs.idl | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/comsvcs.idl b/include/comsvcs.idl index d64af1f5a85..902c78b05c8 100644 --- a/include/comsvcs.idl +++ b/include/comsvcs.idl @@ -37,6 +37,8 @@ typedef DWORD_PTR TRANSID; ] library COMSVCSLib { + importlib("stdole2.tlb"); + [ object, hidden, @@ -96,4 +98,65 @@ library COMSVCSLib { [default] interface IDispenserManager; }; + + [ + object, + hidden, + local, + uuid(2a005c01-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedProperty : IDispatch + { + [id(DISPID_VALUE), propget] HRESULT Value([out, retval] VARIANT *value); + [id(DISPID_VALUE), propput] HRESULT Value([in] VARIANT value); + } + + [ + object, + hidden, + local, + uuid(2a005c07-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroup : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyByPosition([in] int index, [out] VARIANT_BOOL *exists, [out, retval] ISharedProperty **property); + [id(0x00000002), propget] + HRESULT PropertyByPosition([in] int index, [out, retval] ISharedProperty **property); + [id(0x00000003)] + HRESULT CreateProperty([in] BSTR name, [out] VARIANT_BOOL *exists, [out, retval] ISharedProperty **property); + [id(0x00000004), propget] + HRESULT Property([in] BSTR name, [out, retval] ISharedProperty **property); + } + + [ + object, + hidden, + local, + uuid(2a005c0d-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroupManager : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyGroup([in] BSTR name, [in, out] LONG *isolation, [in, out] LONG *release, + [out] VARIANT_BOOL *exists, [out, retval] ISharedPropertyGroup **group); + [id(0x00000002), propget] + HRESULT Group([in] BSTR name, [out, retval] ISharedPropertyGroup **group); + [id(DISPID_NEWENUM), propget] + HRESULT _NewEnum([out, retval] IUnknown **retval); + } + + [ + uuid(2a005c11-a5de-11cf-9e66-00aa00a3f464), + progid("MTxSpm.SharedPropertyGroupManager.1"), + vi_progid("MTxSpm.SharedPropertyGroupManager"), + threading(both) + ] + coclass SharedPropertyGroupManager + { + [default] interface ISharedPropertyGroupManager; + } } -- 2.33.0

1 1

[PATCH 9/9] winex11: Use UpdateDisplayDevices driver entry point for registering devices.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 537 ++------------------------------- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 2 +- 5 files changed, 32 insertions(+), 512 deletions(-)

1 0

[PATCH 8/9] user32: Invalidate cache in update_monitor_cache when modification time matches current time.
by Jacek Caban 25 Nov '21

25 Nov '21

Also preserve the last error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This fixes a pre-existing problem with current code that we start to hit in monitor tests with the next patch. My plan is to get rid of update_monitor_cache and entire monitor cache in user32. This will ultimitely solve the problem, but I don't want to make this series longer. dlls/user32/sysparams.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH 7/9] win32u: Implement NtUserEnumDisplayDevices.
by Jacek Caban 25 Nov '21

25 Nov '21

And use it in user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 335 +---------------------------------- dlls/win32u/dc.c | 6 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/sysparams.c | 71 ++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 33 +++- dlls/win32u/wrappers.c | 10 +- include/ntuser.h | 2 + 9 files changed, 112 insertions(+), 349 deletions(-)

1 0

[PATCH 6/9] winex11: Use gdi driver types for display device handler.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 18 ++++++------ dlls/winex11.drv/display.c | 24 ++++++++-------- dlls/winex11.drv/x11drv.h | 55 +++++-------------------------------- dlls/winex11.drv/xinerama.c | 20 +++++++------- dlls/winex11.drv/xrandr.c | 47 +++++++++++++++---------------- 5 files changed, 62 insertions(+), 102 deletions(-)

1 0

[PATCH 3/9] win32u: Implement GPU registration.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 10 +- dlls/win32u/sysparams.c | 459 ++++++++++++++++++++++++++++++++++- dlls/win32u/win32u_private.h | 6 + 3 files changed, 467 insertions(+), 8 deletions(-)

1 0

[PATCH 1/9] win32u: Implement NtUserGetDisplayConfigBufferSizes.
by Jacek Caban 25 Nov '21

25 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This ports device cache from user32. dlls/win32u/Makefile.in | 1 + dlls/win32u/font.c | 4 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 466 +++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 2 + 8 files changed, 483 insertions(+), 3 deletions(-) create mode 100644 dlls/win32u/sysparams.c

1 0

[PATCH] server: Allow using \Device\NamedPipe file as RootDirectory for creating named pipes.
by Jinoh Kang 24 Nov '21

24 Nov '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/om.c | 30 ++++++++++++++++++++++++++++++ server/named_pipe.c | 9 ++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 77eb58a23b5..1b6d9d2d2d1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -197,6 +197,35 @@ static void test_namespace_pipe(void) pNtClose(pipe); } +static void test_pipe_device_file_as_root(void) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + LARGE_INTEGER timeout; + HANDLE pipe, root, h; + + pRtlInitUnicodeString(&str, L"\\Device\\NamedPipe"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtOpenFile(&root, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); + ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded got %08x\n", status); + + pRtlInitUnicodeString(&str, L"test2\\pipe"); + InitializeObjectAttributes(&attr, &str, 0, root, NULL); + status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout); + ok(status == STATUS_SUCCESS, "Failed to create NamedPipe(%08x)\n", status); + + h = CreateFileA("\\\\.\\pipe\\test2\\pipe", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + ok(h != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%u)\n", GetLastError()); + + pNtClose(h); + pNtClose(pipe); + pNtClose(root); +} + #define check_create_open_dir(parent, name, status) check_create_open_dir_(__LINE__, parent, name, status) static void check_create_open_dir_( int line, HANDLE parent, const WCHAR *name, NTSTATUS expect ) { @@ -2434,6 +2463,7 @@ START_TEST(om) test_case_sensitive(); test_namespace_pipe(); + test_pipe_device_file_as_root(); test_name_collisions(); test_name_limits(); test_directory(); diff --git a/server/named_pipe.c b/server/named_pipe.c index 1bbf7f17a3a..22971c4752f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1278,13 +1278,20 @@ static struct pipe_end *create_pipe_client( struct named_pipe *pipe, data_size_t static int named_pipe_link_name( struct object *obj, struct object_name *name, struct object *parent ) { - struct named_pipe_device *dev = (struct named_pipe_device *)parent; + struct named_pipe_device *dev; + + if (parent->ops == &named_pipe_device_file_ops) + { + parent = &((struct named_pipe_device_file *)parent)->device->obj; + } if (parent->ops != &named_pipe_device_ops) { set_error( STATUS_OBJECT_NAME_INVALID ); return 0; } + + dev = (struct named_pipe_device *)parent; namespace_add( dev->pipes, name ); name->parent = grab_object( parent ); return 1; -- 2.31.1

2 1

[PATCH] dmloader: Drop ifdef'ed out dead code
by Michael Stefaniuc 24 Nov '21

24 Nov '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/loader.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index b90584b09a0..00170f42937 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -538,13 +538,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac return DMUS_E_LOADER_FAILEDOPEN; } - /* *sigh*... some ms objects have lousy implementation of ParseDescriptor that clears input descriptor :( */ -#ifdef NOW_WE_ARE_FREE - /* parse descriptor: we actually use input descriptor; fields that aren't available from stream remain, - otherwise real info is set */ - IDirectMusicObject_ParseDescriptor (pObject, pStream, pDesc); -#endif - /* hmph... due to some trouble I had with certain tests, we store current position and then set it back */ DM_STRUCT_INIT(&Desc); if (FAILED(IDirectMusicObject_ParseDescriptor (pObject, pStream, &Desc))) { IStream_Release(pStream); -- 2.31.1

1 0

RE: TestBot job 102673 results: [PATCH 1/2] msxml3/tests: Add test saving XML with non-english characters.
by Daniel Lehman 24 Nov '21

24 Nov '21

> === debiant2 (64 bit WoW report) === > > msxml3: > Unhandled exception: page fault on read access to 0x00000000ffffffff in 64-bit code (0x0000000001488308). existing crash: https://test.winehq.org/data/28c35689d2d9193cbf7ce5f523fecbaf377ae273/linux… https://test.winehq.org/data/28c35689d2d9193cbf7ce5f523fecbaf377ae273/linux… https://test.winehq.org/data/28c35689d2d9193cbf7ce5f523fecbaf377ae273/linux…

1 0

[PATCH] mscms: Fix uninitialized variable warning.
by Daniel Lehman 24 Nov '21

24 Nov '21

1 0

[PATCH 2/2] msxml3: Make utf-8 the default encoding.
by Daniel Lehman 24 Nov '21

24 Nov '21

1 0

[PATCH 1/2] msxml3/tests: Add test saving XML with non-english characters.
by Daniel Lehman 24 Nov '21

24 Nov '21

1 0

[PATCH 1/6] wined3d: Respect the BO buffer offset in wined3d_context_gl_copy_bo_address().
by Zebediah Figura 24 Nov '21

24 Nov '21

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index b327b7bba8e..3c57bcbe249 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2828,7 +2828,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src_bo->id)); GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst_bo->id)); GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, - (GLintptr)src->addr, (GLintptr)dst->addr, size)); + src_bo->b.buffer_offset + (GLintptr)src->addr, + dst_bo->b.buffer_offset + (GLintptr)dst->addr, size)); checkGLcall("direct buffer copy"); wined3d_context_gl_reference_bo(context_gl, src_bo); @@ -2850,7 +2851,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, else if (!dst_bo && src_bo) { wined3d_context_gl_bind_bo(context_gl, src_bo->binding, src_bo->id); - GL_EXTCALL(glGetBufferSubData(src_bo->binding, (GLintptr)src->addr, size, dst->addr)); + GL_EXTCALL(glGetBufferSubData(src_bo->binding, src_bo->b.buffer_offset + (GLintptr)src->addr, size, dst->addr)); checkGLcall("buffer download"); wined3d_context_gl_reference_bo(context_gl, src_bo); @@ -2858,7 +2859,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, else if (dst_bo && !src_bo) { wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); - GL_EXTCALL(glBufferSubData(dst_bo->binding, (GLintptr)dst->addr, size, src->addr)); + GL_EXTCALL(glBufferSubData(dst_bo->binding, dst_bo->b.buffer_offset + (GLintptr)dst->addr, size, src->addr)); checkGLcall("buffer upload"); wined3d_context_gl_reference_bo(context_gl, dst_bo); -- 2.33.0

4 13

[PATCH] server: Implement the \??\GLOBALROOT symbolic link.
by Jinoh Kang 24 Nov '21

24 Nov '21

\??\GLOBALROOT is a well-known NT symbolic link that allows applications to access the NT object manager's root namespace via Win32 APIs. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/om.c | 59 +++++++++++++++++++++++++++++++++++++++++++ server/directory.c | 3 +++ server/object.h | 2 ++ server/symlink.c | 13 ++++++++++ 4 files changed, 77 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 77eb58a23b5..250984ebdda 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2388,6 +2388,64 @@ static void test_get_next_thread(void) CloseHandle(thread); } +static void test_globalroot(void) +{ + NTSTATUS status; + IO_STATUS_BLOCK iosb; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + HANDLE h; + WCHAR buffer[256]; + ULONG len, full_len, i; + static const struct { const WCHAR *name, *target; } symlinks[] = { + { L"\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\??\\GLOBALROOT\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\DosDevices", L"\\??" }, + { L"\\??\\GLOBALROOT\\BaseNamedObjects\\Global", NULL }, + }; + + for (i = 0; i < ARRAY_SIZE(symlinks); i++) + { + pRtlInitUnicodeString(&str, symlinks[i].name); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); + ok(status == STATUS_SUCCESS, "NtOpenSymbolicLinkObject failed %08x\n", status); + + str.Buffer = buffer; + str.MaximumLength = sizeof(buffer); + len = 0xdeadbeef; + memset( buffer, 0xaa, sizeof(buffer) ); + status = pNtQuerySymbolicLinkObject( h, &str, &len); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + full_len = str.Length + sizeof(WCHAR); + ok( len == full_len, "bad length %u (expected %u)\n", len, full_len ); + ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); + + if (symlinks[i].target) + { + ok( compare_unicode_string( &str, symlinks[i].target ), + "symlink %s: target expected %s, got %s\n", + debugstr_w( symlinks[i].name ), + debugstr_w( symlinks[i].target ), + debugstr_w( str.Buffer ) ); + } + + pNtClose(h); + } + + pRtlInitUnicodeString(&str, L"\\??\\GLOBALROOT\\Device\\Null"); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + status = pNtOpenFile(&h, GENERIC_READ | GENERIC_WRITE, &attr, &iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + ok(status == STATUS_SUCCESS, + "expected STATUS_SUCCESS, got %08x\n", status); + + test_object_type(h, L"File"); + + pNtClose(h); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2446,4 +2504,5 @@ START_TEST(om) test_duplicate_object(); test_object_types(); test_get_next_thread(); + test_globalroot(); } diff --git a/server/directory.c b/server/directory.c index 70a34d3f1bb..2cd61be0838 100644 --- a/server/directory.c +++ b/server/directory.c @@ -378,6 +378,7 @@ void init_directories( struct fd *intl_fd ) /* symlinks */ static const WCHAR link_dosdevW[] = {'D','o','s','D','e','v','i','c','e','s'}; + static const WCHAR link_globalrootW[] = {'G','L','O','B','A','L','R','O','O','T'}; static const WCHAR link_globalW[] = {'G','l','o','b','a','l'}; static const WCHAR link_nulW[] = {'N','U','L'}; static const WCHAR link_pipeW[] = {'P','I','P','E'}; @@ -392,6 +393,7 @@ void init_directories( struct fd *intl_fd ) static const WCHAR link_consoleW[] = {'\\','D','e','v','i','c','e','\\','C','o','n','D','r','v', '\\','C','o','n','s','o','l','e'}; static const struct unicode_str link_dosdev_str = {link_dosdevW, sizeof(link_dosdevW)}; + static const struct unicode_str link_globalroot_str = {link_globalrootW, sizeof(link_globalrootW)}; static const struct unicode_str link_global_str = {link_globalW, sizeof(link_globalW)}; static const struct unicode_str link_nul_str = {link_nulW, sizeof(link_nulW)}; static const struct unicode_str link_pipe_str = {link_pipeW, sizeof(link_pipeW)}; @@ -470,6 +472,7 @@ void init_directories( struct fd *intl_fd ) /* symlinks */ release_object( create_obj_symlink( &root_directory->obj, &link_dosdev_str, OBJ_PERMANENT, &dir_global->obj, NULL )); + release_object( create_root_symlink( &dir_global->obj, &link_globalroot_str, OBJ_PERMANENT, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_global_str, OBJ_PERMANENT, &dir_global->obj, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_nul_str, OBJ_PERMANENT, null_device, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_pipe_str, OBJ_PERMANENT, named_pipe_device, NULL )); diff --git a/server/object.h b/server/object.h index 97d6c0e91f8..f156f1d2f13 100644 --- a/server/object.h +++ b/server/object.h @@ -279,6 +279,8 @@ extern void init_directories( struct fd *intl_fd ); /* symbolic link functions */ +extern struct object *create_root_symlink( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); extern struct object *create_obj_symlink( struct object *root, const struct unicode_str *name, unsigned int attr, struct object *target, const struct security_descriptor *sd ); diff --git a/server/symlink.c b/server/symlink.c index fa97d9155fa..27d48e2f994 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -110,6 +110,8 @@ static struct object *symlink_lookup_name( struct object *obj, struct unicode_st if (!name->len && (attr & OBJ_OPENLINK)) return NULL; if (obj == root) return NULL; + if (!symlink->len) return get_root_directory(); + target_str.str = symlink->target; target_str.len = symlink->len; if ((target = lookup_named_object( NULL, &target_str, attr, &name_left ))) @@ -131,6 +133,17 @@ static void symlink_destroy( struct object *obj ) free( symlink->target ); } +struct object *create_root_symlink( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) +{ + struct symlink *symlink; + + if (!(symlink = create_named_object( root, &symlink_ops, name, attr, sd ))) return NULL; + symlink->target = NULL; + symlink->len = 0; + return &symlink->obj; +} + struct object *create_symlink( struct object *root, const struct unicode_str *name, unsigned int attr, const struct unicode_str *target, const struct security_descriptor *sd ) -- 2.31.1

1 0

[PATCH 11/11] winecoreaudio: Avoid 64-bit ptr truncation.
by Huw Davies 24 Nov '21

24 Nov '21

This makes winecoreaudio consistent with the other midi drivers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/midi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 64fc3618f61..32826cb658c 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -958,9 +958,9 @@ static DWORD WINAPI MIDIIn_MessageThread(LPVOID p) /************************************************************************** * modMessage */ -DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("%d %08x %08x %08x %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { case DRVM_INIT: @@ -999,9 +999,9 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw /************************************************************************** * midMessage */ -DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("%d %08x %08x %08x %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { case DRVM_INIT: case DRVM_EXIT: -- 2.23.0

2 1

[PATCH 10/11] winecoreaudio: Remove system includes.
by Huw Davies 24 Nov '21

24 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 32 ------------------------------- 1 file changed, 32 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 413e22d18ba..b4cf325c9d2 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -15,42 +15,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define NONAMELESSUNION #define COBJMACROS -#include "config.h" - -#define LoadResource __carbon_LoadResource -#define CompareString __carbon_CompareString -#define GetCurrentThread __carbon_GetCurrentThread -#define GetCurrentProcess __carbon_GetCurrentProcess #include <stdarg.h> -#include <errno.h> -#include <limits.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/ioctl.h> -#include <fcntl.h> -#include <fenv.h> -#include <unistd.h> - -#include <libkern/OSAtomic.h> -#include <CoreAudio/CoreAudio.h> -#include <AudioToolbox/AudioFormat.h> -#include <AudioToolbox/AudioConverter.h> -#include <AudioUnit/AudioUnit.h> - -#undef LoadResource -#undef CompareString -#undef GetCurrentThread -#undef GetCurrentProcess -#undef _CDECL - #include "windef.h" #include "winbase.h" #include "winnls.h" -- 2.23.0

2 1

[PATCH 09/11] winecoreaudio: Store the device id as a DWORD.
by Huw Davies 24 Nov '21

24 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 047979df4f3..413e22d18ba 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -129,7 +129,7 @@ struct ACImpl { HANDLE event; float *vols; - AudioDeviceID adevid; + DWORD dev_id; HANDLE timer; AudioSession *session; @@ -406,7 +406,7 @@ end: return params.result; } -static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) +static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) { HKEY devices_key; UINT i = 0; @@ -470,13 +470,13 @@ static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; - AudioDeviceID adevid; + DWORD dev_id; EDataFlow dataflow; HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); - if(!get_deviceid_by_guid(guid, &adevid, &dataflow)) + if(!get_deviceid_by_guid(guid, &dev_id, &dataflow)) return AUDCLNT_E_DEVICE_INVALIDATED; if(dataflow != eRender && dataflow != eCapture) @@ -504,7 +504,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->parent = dev; IMMDevice_AddRef(This->parent); - This->adevid = adevid; + This->dev_id = dev_id; *out = (IAudioClient *)&This->IAudioClient3_iface; IAudioClient3_AddRef(&This->IAudioClient3_iface); @@ -765,7 +765,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - params.dev_id = This->adevid; + params.dev_id = This->dev_id; params.flow = This->dataflow; params.share = mode; params.duration = duration; @@ -882,7 +882,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx); if(pwfx) dump_fmt(pwfx); - params.dev_id = This->adevid; + params.dev_id = This->dev_id; params.flow = This->dataflow; params.share = mode; params.fmt_in = pwfx; @@ -915,7 +915,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; - params.dev_id = This->adevid; + params.dev_id = This->dev_id; params.flow = This->dataflow; params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); if(!params.fmt) -- 2.23.0

2 1

[PATCH 08/11] winecoreaudio: Make the coreaudio_stream structure private to the unixlib.
by Huw Davies 24 Nov '21

24 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 23 +++++++++++++++++++++++ dlls/winecoreaudio.drv/unixlib.h | 23 +---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 5569869de6e..fd32a2a99ac 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -72,6 +72,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); +struct coreaudio_stream +{ + OSSpinLock lock; + AudioComponentInstance unit; + AudioConverterRef converter; + AudioStreamBasicDescription dev_desc; /* audio unit format, not necessarily the same as fmt */ + AudioDeviceID dev_id; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + + BOOL playing; + UINT32 period_ms, period_frames; + UINT32 bufsize_frames, resamp_bufsize_frames; + UINT32 lcl_offs_frames, held_frames, wri_offs_frames, tmp_buffer_frames; + UINT32 cap_bufsize_frames, cap_offs_frames, cap_held_frames; + UINT32 wrap_bufsize_frames; + UINT64 written_frames; + INT32 getbuf_last; + WAVEFORMATEX *fmt; + BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; + SIZE_T local_buffer_size, tmp_buffer_size; +}; + static HRESULT osstatus_to_hresult(OSStatus sc) { switch(sc){ diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index df00d27c27a..6f51c7877fa 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -18,28 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -struct coreaudio_stream /* To be made private */ -{ - OSSpinLock lock; - AudioComponentInstance unit; - AudioConverterRef converter; - AudioStreamBasicDescription dev_desc; /* audio unit format, not necessarily the same as fmt */ - AudioDeviceID dev_id; - EDataFlow flow; - AUDCLNT_SHAREMODE share; - - BOOL playing; - UINT32 period_ms, period_frames; - UINT32 bufsize_frames, resamp_bufsize_frames; - UINT32 lcl_offs_frames, held_frames, wri_offs_frames, tmp_buffer_frames; - UINT32 cap_bufsize_frames, cap_offs_frames, cap_held_frames; - UINT32 wrap_bufsize_frames; - UINT64 written_frames; - INT32 getbuf_last; - WAVEFORMATEX *fmt; - BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; - SIZE_T local_buffer_size, tmp_buffer_size; -}; +struct coreaudio_stream; struct endpoint { -- 2.23.0

2 1

[PATCH 07/11] winecoreaudio: Move set_volumes to the unixlib.
by Huw Davies 24 Nov '21

24 Nov '21

The session setvol helper has been removed to reduce the number of helper functions as the loop over the session's clients isn't very complicated. Session mute is handled by setting the master volume to zero. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 31 +++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 103 ++++++++++------------------- dlls/winecoreaudio.drv/unixlib.h | 10 +++ 3 files changed, 77 insertions(+), 67 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 9636975607c..5569869de6e 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1554,6 +1554,36 @@ static NTSTATUS is_started(void *args) return STATUS_SUCCESS; } +static NTSTATUS set_volumes(void *args) +{ + struct set_volumes_params *params = args; + struct coreaudio_stream *stream = params->stream; + Float32 level = 1.0, tmp; + OSStatus sc; + UINT32 i; + + if(params->channel >= stream->fmt->nChannels || params->channel < -1){ + ERR("Incorrect channel %d\n", params->channel); + return STATUS_SUCCESS; + } + + if(params->channel == -1){ + for(i = 0; i < stream->fmt->nChannels; ++i){ + tmp = params->master_volume * params->volumes[i] * params->session_volumes[i]; + level = tmp < level ? tmp : level; + } + }else + level = params->master_volume * params->volumes[params->channel] * + params->session_volumes[params->channel]; + + sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, + kAudioUnitScope_Global, 0, level, 0); + if(sc != noErr) + WARN("Couldn't set volume: %x\n", (int)sc); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1575,4 +1605,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_position, get_frequency, is_started, + set_volumes, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 07260c16ff0..047979df4f3 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -176,7 +176,6 @@ static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); -static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index); static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { @@ -337,6 +336,19 @@ static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) RegCloseKey(key); } +static void set_stream_volumes(ACImpl *This, int channel) +{ + struct set_volumes_params params; + + params.stream = This->stream; + params.master_volume = This->session->mute ? 0.0f : This->session->master_vol; + params.volumes = This->vols; + params.session_volumes = This->session->channel_vols; + params.channel = channel; + + UNIX_CALL(set_volumes, &params); +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) { @@ -782,8 +794,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, params.stream, -1); - end: if(FAILED(params.result)){ if(params.stream){ @@ -792,8 +802,10 @@ end: } HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; - }else + }else{ This->stream = params.stream; + set_stream_volumes(This, -1); + } LeaveCriticalSection(&g_sessions_lock); @@ -1818,52 +1830,6 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = AudioSessionControl_SetDuckingPreference }; -/* index == -1 means set all channels, otherwise sets only the given channel */ -static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index) -{ - Float32 level; - OSStatus sc; - - if(This->session->mute) - level = 0.; - else{ - if(index == (UINT32)-1){ - UINT32 i; - level = 1.; - for(i = 0; i < stream->fmt->nChannels; ++i){ - Float32 tmp; - tmp = This->session->master_vol * - This->session->channel_vols[i] * This->vols[i]; - level = tmp < level ? tmp : level; - } - }else - level = This->session->master_vol * - This->session->channel_vols[index] * This->vols[index]; - } - - sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, - kAudioUnitScope_Global, 0, level, 0); - if(sc != noErr) - WARN("Couldn't set volume: %x\n", (int)sc); - - return S_OK; -} - -static HRESULT ca_session_setvol(AudioSession *session, UINT32 index) -{ - HRESULT ret = S_OK; - ACImpl *client; - - LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry){ - HRESULT hr; - hr = ca_setvol(client, client->stream, index); - if(FAILED(hr)) - ret = hr; - } - - return ret; -} - static HRESULT WINAPI SimpleAudioVolume_QueryInterface( ISimpleAudioVolume *iface, REFIID riid, void **ppv) { @@ -1902,7 +1868,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; - HRESULT ret; + ACImpl *client; TRACE("(%p)->(%f, %s)\n", session, level, wine_dbgstr_guid(context)); @@ -1916,11 +1882,12 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( session->master_vol = level; - ret = ca_session_setvol(session, -1); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, -1); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI SimpleAudioVolume_GetMasterVolume( @@ -1944,6 +1911,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%u, %s)\n", session, mute, debugstr_guid(context)); @@ -1954,7 +1922,8 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, session->mute = mute; - ca_session_setvol(session, -1); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, -1); LeaveCriticalSection(&g_sessions_lock); @@ -2040,7 +2009,6 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( IAudioStreamVolume *iface, UINT32 index, float level) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - HRESULT ret; TRACE("(%p)->(%d, %f)\n", This, index, level); @@ -2055,11 +2023,11 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); - ret = ca_setvol(This, This->stream, index); + set_stream_volumes(This, index); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( @@ -2085,7 +2053,6 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( { ACImpl *This = impl_from_IAudioStreamVolume(iface); UINT32 i; - HRESULT ret; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -2100,11 +2067,11 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; - ret = ca_setvol(This, This->stream, -1); + set_stream_volumes(This, -1); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( @@ -2198,7 +2165,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - HRESULT ret; + ACImpl *client; TRACE("(%p)->(%d, %f, %s)\n", session, index, level, wine_dbgstr_guid(context)); @@ -2217,11 +2184,12 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( session->channel_vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); - ret = ca_session_setvol(session, index); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, index); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI ChannelAudioVolume_GetChannelVolume( @@ -2249,8 +2217,8 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - int i; - HRESULT ret; + ACImpl *client; + UINT32 i; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, wine_dbgstr_guid(context)); @@ -2269,11 +2237,12 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; - ret = ca_session_setvol(session, -1); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, -1); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI ChannelAudioVolume_GetAllVolumes( diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index aac2df15f47..df00d27c27a 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -194,6 +194,15 @@ struct is_started_params HRESULT result; }; +struct set_volumes_params +{ + struct coreaudio_stream *stream; + float master_volume; + const float *volumes; + const float *session_volumes; + int channel; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -215,6 +224,7 @@ enum unix_funcs unix_get_position, unix_get_frequency, unix_is_started, + unix_set_volumes, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 06/11] winecoreaudio: Move is_started to the unixlib.
by Huw Davies 24 Nov '21

24 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 14 ++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 8 ++++---- dlls/winecoreaudio.drv/unixlib.h | 7 +++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f59723d48f6..9636975607c 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1541,6 +1541,19 @@ static NTSTATUS get_frequency(void *args) return STATUS_SUCCESS; } +static NTSTATUS is_started(void *args) +{ + struct is_started_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(stream->playing) + params->result = S_OK; + else + params->result = S_FALSE; + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1561,4 +1574,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_next_packet_size, get_position, get_frequency, + is_started, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f79d808d8ed..07260c16ff0 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1628,6 +1628,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, AudioSessionState *state) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); + struct is_started_params params; ACImpl *client; TRACE("(%p)->(%p)\n", This, state); @@ -1644,14 +1645,13 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - OSSpinLockLock(&client->stream->lock); - if(client->stream->playing){ + params.stream = client->stream; + UNIX_CALL(is_started, &params); + if(params.result == S_OK){ *state = AudioSessionStateActive; - OSSpinLockUnlock(&client->stream->lock); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - OSSpinLockUnlock(&client->stream->lock); } LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 5dcefe2eb05..aac2df15f47 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -188,6 +188,12 @@ struct get_frequency_params UINT64 *freq; }; +struct is_started_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -208,6 +214,7 @@ enum unix_funcs unix_get_next_packet_size, unix_get_position, unix_get_frequency, + unix_is_started, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 05/11] winecoreaudio: Move get_frequency to the unixlib.
by Huw Davies 24 Nov '21

24 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 15 +++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 11 +++++------ dlls/winecoreaudio.drv/unixlib.h | 8 ++++++++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index d7390c5a677..f59723d48f6 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1527,6 +1527,20 @@ static NTSTATUS get_position(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_frequency(void *args) +{ + struct get_frequency_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *params->freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; + else + *params->freq = stream->fmt->nSamplesPerSec; + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1546,4 +1560,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_current_padding, get_next_packet_size, get_position, + get_frequency, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index ebfc0543af8..f79d808d8ed 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1458,15 +1458,14 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); + struct get_frequency_params params; TRACE("(%p)->(%p)\n", This, freq); - if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)This->stream->fmt->nSamplesPerSec * This->stream->fmt->nBlockAlign; - else - *freq = This->stream->fmt->nSamplesPerSec; - - return S_OK; + params.stream = This->stream; + params.freq = freq; + UNIX_CALL(get_frequency, &params); + return params.result; } static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e9edaf82973..5dcefe2eb05 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -181,6 +181,13 @@ struct get_position_params UINT64 *qpctime; }; +struct get_frequency_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT64 *freq; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -200,6 +207,7 @@ enum unix_funcs unix_get_current_padding, unix_get_next_packet_size, unix_get_position, + unix_get_frequency, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 04/11] winecoreaudio: Move get_position to the unixlib.
by Huw Davies 24 Nov '21

24 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 25 +++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 32 ++++++------------------------ dlls/winecoreaudio.drv/unixlib.h | 9 +++++++++ 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 0ed4fcb02fe..d7390c5a677 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1503,6 +1503,30 @@ static NTSTATUS get_next_packet_size(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_position(void *args) +{ + struct get_position_params *params = args; + struct coreaudio_stream *stream = params->stream; + LARGE_INTEGER stamp, freq; + + OSSpinLockLock(&stream->lock); + + *params->pos = stream->written_frames - stream->held_frames; + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *params->pos *= stream->fmt->nBlockAlign; + + if(params->qpctime){ + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + OSSpinLockUnlock(&stream->lock); + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1521,4 +1545,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_latency, get_current_padding, get_next_packet_size, + get_position, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index b0208ce0a44..ebfc0543af8 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1469,42 +1469,22 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) return S_OK; } -static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, - UINT64 *pos, UINT64 *qpctime) -{ - *pos = This->stream->written_frames - This->stream->held_frames; - - if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) - *pos *= This->stream->fmt->nBlockAlign; - - if(qpctime){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - return S_OK; -} - static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); - HRESULT hr; + struct get_position_params params; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); if(!pos) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - hr = AudioClock_GetPosition_nolock(This, pos, qpctime); - - OSSpinLockUnlock(&This->stream->lock); - - return hr; + params.stream = This->stream; + params.pos = pos; + params.qpctime = qpctime; + UNIX_CALL(get_position, &params); + return params.result; } static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 32eb57a866a..e9edaf82973 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -173,6 +173,14 @@ struct get_next_packet_size_params UINT32 *frames; }; +struct get_position_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT64 *pos; + UINT64 *qpctime; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -191,6 +199,7 @@ enum unix_funcs unix_get_latency, unix_get_current_padding, unix_get_next_packet_size, + unix_get_position, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 03/11] winecoreaudio: Move get_next_packet_size to the unixlib.
by Huw Davies 24 Nov '21

24 Nov '21

The capture_resample syscall can now be removed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 27 ++++++++++++++++++++++----- dlls/winecoreaudio.drv/mmdevdrv.c | 22 +++++----------------- dlls/winecoreaudio.drv/unixlib.h | 10 ++++++++-- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index d723291bb24..0ed4fcb02fe 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1068,9 +1068,8 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe return noErr; } -static NTSTATUS capture_resample(void *args) +static void capture_resample(struct coreaudio_stream *stream) { - struct coreaudio_stream *stream = args; UINT32 resamp_period_frames = muldiv(stream->period_frames, stream->dev_desc.mSampleRate, stream->fmt->nSamplesPerSec); OSStatus sc; @@ -1115,7 +1114,6 @@ static NTSTATUS capture_resample(void *args) }else stream->held_frames += wanted_frames; } - return STATUS_SUCCESS; } static NTSTATUS get_buffer_size(void *args) @@ -1485,6 +1483,26 @@ static NTSTATUS release_capture_buffer(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_next_packet_size(void *args) +{ + struct get_next_packet_size_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + capture_resample(stream); + + if(stream->held_frames >= stream->period_frames) + *params->frames = stream->period_frames; + else + *params->frames = 0; + + OSSpinLockUnlock(&stream->lock); + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1502,6 +1520,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, - - capture_resample /* temporary */ + get_next_packet_size, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index cc37bebdc77..b0208ce0a44 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -683,11 +683,6 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static void capture_resample(ACImpl *This) -{ - UNIX_CALL(capture_resample, This->stream); -} - static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, @@ -1401,24 +1396,17 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( IAudioCaptureClient *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + struct get_next_packet_size_params params; TRACE("(%p)->(%p)\n", This, frames); if(!frames) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - capture_resample(This); - - if(This->stream->held_frames >= This->stream->period_frames) - *frames = This->stream->period_frames; - else - *frames = 0; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + UNIX_CALL(get_next_packet_size, &params); + return params.result; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 9bb636fd625..32eb57a866a 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -166,6 +166,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct get_next_packet_size_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT32 *frames; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -183,8 +190,7 @@ enum unix_funcs unix_get_buffer_size, unix_get_latency, unix_get_current_padding, - - unix_capture_resample /* temporary */ + unix_get_next_packet_size, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 02/11] winecoreaudio: Release the correct stream on init failure.
by Huw Davies 24 Nov '21

24 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index aa051cb3d61..cc37bebdc77 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -764,6 +764,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.duration = duration; params.period = period; params.fmt = fmt; + params.stream = NULL; UNIX_CALL(create_stream, &params); if(FAILED(params.result)) goto end; @@ -791,7 +792,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, end: if(FAILED(params.result)){ if(params.stream){ - release_params.stream = This->stream; + release_params.stream = params.stream; UNIX_CALL(release_stream, &release_params); } HeapFree(GetProcessHeap(), 0, This->vols); -- 2.23.0

2 1

[PATCH 01/11] winecoreaudio: Release the critical section in the no interface case.
by Huw Davies 24 Nov '21

24 Nov '21

This fixes an error introduced in 8e90b2569c4 which was incorrectly fixed in b5b77ed6aca. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 717e64b2283..aa051cb3d61 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1114,7 +1114,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(*ppv) hr = S_OK; else{ FIXME("stub %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + hr = E_NOINTERFACE; } end: -- 2.23.0

2 1

[PATCH 1/2] wined3d: Acquire sampler references for command lists by inspecting CS packets.
by Jan Sikorski 24 Nov '21

24 Nov '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- This is meant to be followed by more patches that manage references to all the other objects that need to be kept alive for command lists. That includes: all the ones handled similarly to samplers (i.e. the ones that we put into dedicated arrays); wined3d_resources, which are currently acquired on every draw/dispatch call; and views on these resources, which are not handled at all at this point. Apart from simplifying the code to some degree, it will fix the size problem of wined3d_resources arrays, which can get pretty large when the application is doing many repeated draw/dispatch calls. --- dlls/wined3d/cs.c | 71 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9bdd2c8ed98..9c7ec1edbf8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -103,6 +103,8 @@ ULONG CDECL wined3d_command_list_incref(struct wined3d_command_list *list) return refcount; } +static void wined3d_decref_packet_stream_objects(const uint8_t *data, size_t data_size); + ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) { ULONG refcount = InterlockedDecrement(&list->refcount); @@ -133,6 +135,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) for (i = 0; i < list->sampler_count; ++i) wined3d_sampler_decref(list->samplers[i]); + wined3d_decref_packet_stream_objects(list->data, list->data_size); + wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); wined3d_mutex_unlock(); @@ -3627,6 +3631,62 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) heap_free(cs); } +static void wined3d_decref_packet_stream_objects(const uint8_t *data, size_t data_size) +{ + size_t start = 0; + unsigned int i; + + while (start < data_size) + { + const struct wined3d_cs_packet *packet = (const struct wined3d_cs_packet *)&data[start]; + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *cs_set + = (struct wined3d_cs_set_samplers *)packet->data; + for (i = 0; i < cs_set->count; ++i) + { + if (cs_set->samplers[i]) + wined3d_sampler_decref(cs_set->samplers[i]); + } + break; + } + default: + break; + } + + start += offsetof(struct wined3d_cs_packet, data[packet->size]); + } +} + +static void wined3d_incref_packet_objects(struct wined3d_cs_packet *packet) +{ + enum wined3d_cs_op opcode; + unsigned int i; + + opcode = *(const enum wined3d_cs_op *)packet->data; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *cs_set + = (struct wined3d_cs_set_samplers *)packet->data; + for (i = 0; i < cs_set->count; ++i) + { + if (cs_set->samplers[i]) + wined3d_sampler_incref(cs_set->samplers[i]); + } + break; + } + default: + break; + } +} + struct wined3d_deferred_context { struct wined3d_device_context c; @@ -3689,16 +3749,19 @@ static void *wined3d_deferred_context_require_space(struct wined3d_device_contex packet = (struct wined3d_cs_packet *)((BYTE *)deferred->data + deferred->data_size); TRACE("size was %zu, adding %zu\n", (size_t)deferred->data_size, packet_size); - deferred->data_size += packet_size; packet->size = packet_size - header_size; return &packet->data; } static void wined3d_deferred_context_submit(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { - assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + struct wined3d_cs_packet *packet; - /* Nothing to do. */ + assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + packet = (struct wined3d_cs_packet *)((BYTE *)deferred->data + deferred->data_size); + deferred->data_size += packet->size + offsetof(struct wined3d_cs_packet, data[0]); + wined3d_incref_packet_objects(packet); } static void wined3d_deferred_context_finish(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) @@ -4023,6 +4086,8 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_sampler_decref(deferred->samplers[i]); heap_free(deferred->samplers); + wined3d_decref_packet_stream_objects(deferred->data, deferred->data_size); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); -- 2.32.0

2 2

[PATCH 1/2] ntdll: Fix context arch flag cleanup for AMD64 in context_from_server().
by Paul Gofman 24 Nov '21

24 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- In particular, fixes a semi-random crash in ntdll exception test (test_extended_context) I am now reproducing locally. The thread is created suspended while the main thread sets context to it. (to_flags & CONTEXT_AMD64_XSTATE) is always TRUE. dlls/ntdll/unix/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 38a03bd4b60..00261edb593 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -755,7 +755,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; @@ -830,7 +830,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; -- 2.33.1

2 2

[PATCH 1/4] dinput8/tests: Add some GetForceFeedbackState / GetEffectStatus tests.
by Rémi Bernon 24 Nov '21

24 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 436 ++++++++++++++++++++++++++++++++++----- 1 file changed, 381 insertions(+), 55 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 0c63ed835e8..f3d35e57ce1 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3291,7 +3291,8 @@ static void cleanup_registry_keys(void) RegCloseKey( root_key ); } -static BOOL dinput_driver_start( const BYTE *desc_buf, ULONG desc_len, const HIDP_CAPS *caps ) +static BOOL dinput_driver_start( const BYTE *desc_buf, ULONG desc_len, const HIDP_CAPS *caps, + struct hid_expect *expect, ULONG expect_size ) { static const HID_DEVICE_ATTRIBUTES attributes = { @@ -3318,7 +3319,7 @@ static BOOL dinput_driver_start( const BYTE *desc_buf, ULONG desc_len, const HID ok( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Caps", 0, REG_BINARY, (void *)caps, sizeof(*caps) ); ok( !status, "RegSetValueExW returned %#x\n", status ); - status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, NULL, 0 ); + status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, (void *)expect, expect_size ); ok( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#x\n", status ); @@ -4022,7 +4023,7 @@ static void test_simple_joystick(void) SetCurrentDirectoryW( tempdir ); cleanup_registry_keys(); - if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps )) goto done; + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; if (FAILED(hr = create_dinput_device( DIRECTINPUT_VERSION, &devinst, &device ))) goto done; hr = IDirectInputDevice8_Initialize( device, instance, 0x0700, &GUID_NULL ); @@ -5511,7 +5512,7 @@ static BOOL test_device_types( DWORD version ) cleanup_registry_keys(); if (!dinput_driver_start( device_desc[i].report_desc_buf, device_desc[i].report_desc_len, - &device_desc[i].hid_caps )) + &device_desc[i].hid_caps, NULL, 0 )) { success = FALSE; goto done; @@ -7950,7 +7951,7 @@ static void test_force_feedback_joystick( DWORD version ) SetCurrentDirectoryW( tempdir ); cleanup_registry_keys(); - if (!dinput_driver_start( report_descriptor, sizeof(report_descriptor), &hid_caps )) goto done; + if (!dinput_driver_start( report_descriptor, sizeof(report_descriptor), &hid_caps, NULL, 0 )) goto done; if (FAILED(hr = create_dinput_device( version, &devinst, &device ))) goto done; hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); @@ -8222,13 +8223,15 @@ static void test_device_managed_effect(void) PHYSICAL_MINIMUM(1, 0), PHYSICAL_MAXIMUM(1, 1), REPORT_SIZE(1, 1), - REPORT_COUNT(1, 1), + REPORT_COUNT(1, 8), INPUT(1, Data|Var|Abs), USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MINIMUM(1, 1), LOGICAL_MAXIMUM(1, 0x7f), - LOGICAL_MINIMUM(1, 0x00), - REPORT_SIZE(1, 7), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), REPORT_COUNT(1, 1), INPUT(1, Data|Var|Abs), END_COLLECTION, @@ -8256,9 +8259,9 @@ static void test_device_managed_effect(void) REPORT_ID(1, 2), USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), - LOGICAL_MINIMUM(1, 0), + LOGICAL_MINIMUM(1, 1), LOGICAL_MAXIMUM(1, 0x7f), - PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MINIMUM(1, 1), PHYSICAL_MAXIMUM(1, 0x7f), REPORT_SIZE(1, 8), REPORT_COUNT(1, 1), @@ -8293,9 +8296,9 @@ static void test_device_managed_effect(void) REPORT_ID(1, 3), USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), - LOGICAL_MINIMUM(1, 0), + LOGICAL_MINIMUM(1, 1), LOGICAL_MAXIMUM(1, 0x7f), - PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MINIMUM(1, 1), PHYSICAL_MAXIMUM(1, 0x7f), REPORT_SIZE(1, 8), REPORT_COUNT(1, 1), @@ -8378,7 +8381,7 @@ static void test_device_managed_effect(void) USAGE(1, PID_USAGE_SET_CONDITION_REPORT), COLLECTION(1, Logical), - REPORT_ID(1, 7), + REPORT_ID(1, 4), USAGE(1, PID_USAGE_TYPE_SPECIFIC_BLOCK_OFFSET), COLLECTION(1, Logical), @@ -8435,9 +8438,56 @@ static void test_device_managed_effect(void) OUTPUT(1, Data|Var|Abs), END_COLLECTION, + USAGE(1, PID_USAGE_BLOCK_FREE_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, 5), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + + USAGE(1, PID_USAGE_POOL_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, 1), + + USAGE(1, PID_USAGE_RAM_POOL_SIZE), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(4, 0xffff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(4, 0xffff), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_SIMULTANEOUS_EFFECTS_MAX), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_DEVICE_MANAGED_POOL), + USAGE(1, PID_USAGE_SHARED_PARAMETER_BLOCKS), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + FEATURE(1, Data|Var|Abs), + END_COLLECTION, + USAGE(1, PID_USAGE_CREATE_NEW_EFFECT_REPORT), COLLECTION(1, Logical), - REPORT_ID(1, 9), + REPORT_ID(1, 2), USAGE(1, PID_USAGE_EFFECT_TYPE), COLLECTION(1, NamedArray), @@ -8456,7 +8506,7 @@ static void test_device_managed_effect(void) USAGE(1, PID_USAGE_BLOCK_LOAD_REPORT), COLLECTION(1, Logical), - REPORT_ID(1, 10), + REPORT_ID(1, 3), USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), LOGICAL_MINIMUM(1, 1), @@ -8480,33 +8530,14 @@ static void test_device_managed_effect(void) REPORT_COUNT(1, 1), FEATURE(1, Data|Ary|Abs), END_COLLECTION, - END_COLLECTION, - USAGE(1, PID_USAGE_BLOCK_FREE_REPORT), - COLLECTION(1, Logical), - REPORT_ID(1, 11), - - USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), - LOGICAL_MINIMUM(1, 1), - LOGICAL_MAXIMUM(1, 0x7f), - PHYSICAL_MINIMUM(1, 1), - PHYSICAL_MAXIMUM(1, 0x7f), - REPORT_SIZE(1, 8), - REPORT_COUNT(1, 1), - OUTPUT(1, Data|Var|Abs), - END_COLLECTION, - - USAGE(1, PID_USAGE_POOL_REPORT), - COLLECTION(1, Logical), - REPORT_ID(1, 12), - - USAGE(1, PID_USAGE_DEVICE_MANAGED_POOL), + USAGE(1, PID_USAGE_RAM_POOL_AVAILABLE), LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), + LOGICAL_MAXIMUM(4, 0xffff), PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(1, 1), + PHYSICAL_MAXIMUM(4, 0xffff), REPORT_SIZE(1, 1), - REPORT_COUNT(1, 8), + REPORT_COUNT(1, 16), FEATURE(1, Data|Var|Abs), END_COLLECTION, END_COLLECTION, @@ -8519,6 +8550,7 @@ static void test_device_managed_effect(void) }; struct hid_expect expect_reset[] = { + /* device reset */ { .code = IOCTL_HID_WRITE_REPORT, .report_id = 1, @@ -8531,39 +8563,55 @@ static void test_device_managed_effect(void) /* create new effect */ { .code = IOCTL_HID_SET_FEATURE, - .report_id = 9, + .report_id = 2, .report_len = 2, - .report_buf = {9,0x03}, + .report_buf = {2,0x03}, }, /* block load */ { .code = IOCTL_HID_GET_FEATURE, - .report_id = 10, - .report_len = 3, - .report_buf = {10,0x01,0x01}, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, }, /* set condition */ { .code = IOCTL_HID_WRITE_REPORT, - .report_id = 7, + .report_id = 4, .report_len = 8, - .report_buf = {0x07,0x00,0xf9,0x19,0xd9,0xff,0xff,0x99}, + .report_buf = {4,0x00,0xf9,0x19,0xd9,0xff,0xff,0x99}, }, /* set condition */ { .code = IOCTL_HID_WRITE_REPORT, - .report_id = 7, + .report_id = 4, .report_len = 8, - .report_buf = {0x07,0x00,0x4c,0x3f,0xcc,0x4c,0x33,0x19}, + .report_buf = {4,0x00,0x4c,0x3f,0xcc,0x4c,0x33,0x19}, }, /* update effect */ { .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 11, - .report_buf = {0x03,0x01,0x03,0x08,0x01,0x00,0x06,0x00,0x01,0x55,0x00}, + .report_buf = {3,0x01,0x03,0x08,0x01,0x00,0x06,0x00,0x01,0x55,0x00}, }, }; + struct hid_expect expect_start = + { + /* effect control */ + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {2,0x01,0x01,0x01}, + }; + struct hid_expect expect_stop = + { + /* effect control */ + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {2,0x01,0x03,0x00}, + }; struct hid_expect expect_destroy[] = { /* effect operation */ @@ -8571,14 +8619,84 @@ static void test_device_managed_effect(void) .code = IOCTL_HID_WRITE_REPORT, .report_id = 2, .report_len = 4, - .report_buf = {0x02,0x01,0x03,0x00}, + .report_buf = {2,0x01,0x03,0x00}, }, /* block free */ { .code = IOCTL_HID_WRITE_REPORT, - .report_id = 11, + .report_id = 5, .report_len = 2, - .report_buf = {11,0x01}, + .report_buf = {5,0x01}, + }, + }; + struct hid_expect device_state_input[] = + { + /* effect state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {2,0xff,0x00,0xff}, + }, + /* device state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 1, + .report_len = 5, + .report_buf = {1,0x12,0x34,0x56,0xff}, + }, + }; + struct hid_expect device_state_input_1[] = + { + /* effect state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {2,0x00,0x01,0x00}, + }, + /* device state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 1, + .report_len = 5, + .report_buf = {1,0x65,0x43,0x21,0x00}, + }, + }; + struct hid_expect device_state_input_2[] = + { + /* effect state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {2,0x03,0x00,0x00}, + }, + /* device state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 1, + .report_len = 5, + .report_buf = {1,0x12,0x34,0x56,0xff}, + }, + }; + struct hid_expect expect_pool[] = + { + /* device pool */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 1, + .report_len = 5, + .report_buf = {1,0x10,0x00,0x01,0x03}, + .todo = TRUE, + }, + /* device pool */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 1, + .report_len = 5, + .report_buf = {1,0x10,0x00,0x01,0x03}, + .todo = TRUE, }, }; static const DWORD expect_axes[3] = @@ -8666,10 +8784,10 @@ static void test_device_managed_effect(void) WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; IDirectInputDevice8W *device; IDirectInputEffect *effect; - HANDLE file; + HANDLE file, event; + ULONG res, ref; DWORD flags; HRESULT hr; - ULONG ref; HWND hwnd; GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); @@ -8677,7 +8795,8 @@ static void test_device_managed_effect(void) SetCurrentDirectoryW( tempdir ); cleanup_registry_keys(); - if (!dinput_driver_start( report_descriptor, sizeof(report_descriptor), &hid_caps )) goto done; + if (!dinput_driver_start( report_descriptor, sizeof(report_descriptor), &hid_caps, + expect_pool, sizeof(expect_pool) )) goto done; if (FAILED(hr = create_dinput_device( DIRECTINPUT_VERSION, &devinst, &device ))) goto done; hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); @@ -8690,6 +8809,10 @@ static void test_device_managed_effect(void) hwnd = CreateWindowW( L"static", L"dinput", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL ); + event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( event != NULL, "CreateEventW failed, last error %u\n", GetLastError() ); + hr = IDirectInputDevice8_SetEventNotification( device, event ); + ok( hr == DI_OK, "SetEventNotification returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); @@ -8698,33 +8821,235 @@ static void test_device_managed_effect(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetForceFeedbackState returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "SendForceFeedbackCommand returned %#x\n", hr ); set_hid_expect( file, expect_reset, sizeof(expect_reset) ); hr = IDirectInputDevice8_Acquire( device ); ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); + wait_hid_expect( file, 100 ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == 0, "got DIPROP_FFLOAD %#x\n", prop_dword.dwData ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_STOPPED|DIGFFS_EMPTY; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == 0, "got DIPROP_FFLOAD %#x\n", prop_dword.dwData ); + set_hid_expect( file, NULL, 0 ); + + send_hid_input( file, device_state_input, sizeof(struct hid_expect) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#x\n", res ); + send_hid_input( file, device_state_input, sizeof(device_state_input) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_PAUSED|DIGFFS_EMPTY|DIGFFS_ACTUATORSON|DIGFFS_POWERON|DIGFFS_SAFETYSWITCHON|DIGFFS_USERFFSWITCHON; + todo_wine + ok( res == flags, "got state %#x\n", res ); set_hid_expect( file, NULL, 0 ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_Spring, NULL, &effect, NULL ); ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + hr = IDirectInputEffect_GetEffectStatus( effect, NULL ); + ok( hr == E_POINTER, "GetEffectStatus returned %#x\n", hr ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == 0, "got status %#x\n", res ); + flags = DIEP_ALLPARAMS; hr = IDirectInputEffect_SetParameters( effect, &expect_desc, flags | DIEP_NODOWNLOAD ); ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + set_hid_expect( file, expect_reset, sizeof(struct hid_expect) ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetEffectStatus returned %#x\n", hr ); + + set_hid_expect( file, expect_reset, sizeof(expect_reset) ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); + wait_hid_expect( file, 100 ); + + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == 0, "got status %#x\n", res ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_STOPPED|DIGFFS_EMPTY; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + set_hid_expect( file, expect_create, sizeof(expect_create) ); hr = IDirectInputEffect_Download( effect ); ok( hr == DI_OK, "Download returned %#x\n", hr ); set_hid_expect( file, NULL, 0 ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == 0, "got status %#x\n", res ); + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_STOPPED; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == 0, "got DIPROP_FFLOAD %#x\n", prop_dword.dwData ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, &expect_start, sizeof(expect_start) ); + hr = IDirectInputEffect_Start( effect, 1, DIES_NODOWNLOAD ); + ok( hr == DI_OK, "Start returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == DIEGES_PLAYING, "got status %#x\n", res ); + + send_hid_input( file, device_state_input_1, sizeof(device_state_input_1) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == DIEGES_PLAYING, "got status %#x\n", res ); + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_ACTUATORSOFF|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + + send_hid_input( file, device_state_input_2, sizeof(device_state_input_2) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == DIEGES_PLAYING, "got status %#x\n", res ); + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, &expect_stop, sizeof(expect_stop) ); + hr = IDirectInputEffect_Stop( effect ); + ok( hr == DI_OK, "Stop returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == 0, "got status %#x\n", res ); + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + set_hid_expect( file, expect_destroy, sizeof(expect_destroy) ); hr = IDirectInputEffect_Unload( effect ); ok( hr == DI_OK, "Unload returned %#x\n", hr ); set_hid_expect( file, NULL, 0 ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == 0, "got status %#x\n", res ); + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_EMPTY|DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); - set_hid_expect( file, expect_reset, sizeof(expect_reset) ); + set_hid_expect( file, expect_reset, sizeof(struct hid_expect) ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); @@ -8733,6 +9058,7 @@ static void test_device_managed_effect(void) ok( ref == 0, "Release returned %d\n", ref ); DestroyWindow( hwnd ); + CloseHandle( event ); CloseHandle( file ); done: -- 2.33.1

1 3

[PATCH v2 1/2] ntdll: Fix context arch flag cleanup for AMD64 in context_from_server().
by Paul Gofman 24 Nov '21

24 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- In particular, fixes a semi-random crash in ntdll exception test (test_extended_context) I am now reproducing locally. The thread is created suspended while the main thread sets context to it. (to_flags & CONTEXT_AMD64_XSTATE) is always TRUE. dlls/ntdll/unix/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 38a03bd4b60..00261edb593 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -755,7 +755,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; @@ -830,7 +830,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; -- 2.33.1

1 1

[PATCH 1/3] wined3d: Remove poll list.
by Jan Sikorski 24 Nov '21

24 Nov '21

Poll with callbacks from application threads instead. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/cs.c | 73 ++------- dlls/wined3d/query.c | 284 ++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 6 +- 3 files changed, 212 insertions(+), 151 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9bdd2c8ed98..fff79a6b021 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2388,44 +2388,26 @@ void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object wined3d_cs_emit_callback(cs, callback, object); } -static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) +void wined3d_cs_run_priority_callback(struct wined3d_cs *cs, void (*callback)(void *object), void *object) { - const struct wined3d_cs_query_issue *op = data; - struct wined3d_query *query = op->query; - BOOL poll; + struct wined3d_cs_callback *op; - poll = query->query_ops->query_issue(query, op->flags); + op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op->opcode = WINED3D_CS_OP_CALLBACK; + op->callback = callback; + op->object = object; - if (!cs->thread) - return; + wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_MAP); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); +} - if (poll && list_empty(&query->poll_list_entry)) - { - if (query->buffer_object) - InterlockedIncrement(&query->counter_retrieved); - else - list_add_tail(&cs->query_poll_list, &query->poll_list_entry); - return; - } +static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_query_issue *op = data; + struct wined3d_query *query = op->query; - /* This can happen if occlusion queries are restarted. This discards the - * old result, since polling it could result in a GL error. */ - if ((op->flags & WINED3DISSUE_BEGIN) && !poll && !list_empty(&query->poll_list_entry)) - { - list_remove(&query->poll_list_entry); - list_init(&query->poll_list_entry); - InterlockedIncrement(&query->counter_retrieved); - return; - } + query->query_ops->query_issue(query, op->flags); - /* This can happen when an occlusion query is ended without being started, - * in which case we don't want to poll, but still have to counter-balance - * the increment of the main counter. - * - * This can also happen if an event query is re-issued before the first - * fence was reached. In this case the query is already in the list and - * the poll function will check the new fence. We have to counter-balance - * the discarded increment. */ if (op->flags & WINED3DISSUE_END) InterlockedIncrement(&query->counter_retrieved); } @@ -3424,21 +3406,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_samplers, }; -static void poll_queries(struct wined3d_cs *cs) -{ - struct wined3d_query *query, *cursor; - - LIST_FOR_EACH_ENTRY_SAFE(query, cursor, &cs->query_poll_list, struct wined3d_query, poll_list_entry) - { - if (!query->query_ops->query_poll(query, 0)) - continue; - - list_remove(&query->poll_list_entry); - list_init(&query->poll_list_entry); - InterlockedIncrement(&query->counter_retrieved); - } -} - static void wined3d_cs_wait_event(struct wined3d_cs *cs) { InterlockedExchange(&cs->waiting_for_event, TRUE); @@ -3478,7 +3445,6 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) struct wined3d_cs *cs = ctx; enum wined3d_cs_op opcode; HMODULE wined3d_module; - unsigned int poll = 0; LONG tail; TRACE("Started.\n"); @@ -3487,25 +3453,16 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) * thread freeing "cs" before the FreeLibraryAndExitThread() call. */ wined3d_module = cs->wined3d_module; - list_init(&cs->query_poll_list); cs->thread_id = GetCurrentThreadId(); for (;;) { - if (++poll == WINED3D_CS_QUERY_POLL_INTERVAL) - { - wined3d_cs_command_lock(cs); - poll_queries(cs); - wined3d_cs_command_unlock(cs); - poll = 0; - } - queue = &cs->queue[WINED3D_CS_QUEUE_MAP]; if (wined3d_cs_queue_is_empty(cs, queue)) { queue = &cs->queue[WINED3D_CS_QUEUE_DEFAULT]; if (wined3d_cs_queue_is_empty(cs, queue)) { - if (++spin_count >= WINED3D_CS_SPIN_COUNT && list_empty(&cs->query_poll_list)) + if (++spin_count >= WINED3D_CS_SPIN_COUNT) wined3d_cs_wait_event(cs); continue; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1b38eb5e311..193f62cd265 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -472,23 +472,18 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, return WINED3DERR_INVALIDCALL; } - if (query->device->cs->thread) - { - if (query->counter_main != query->counter_retrieved - || (query->buffer_object && !wined3d_query_buffer_is_valid(query))) - { - if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) - query->device->cs->c.ops->flush(&query->device->cs->c); - return S_FALSE; - } - if (query->buffer_object) - query->data = query->map_ptr; - } - else if (!query->query_ops->query_poll(query, flags)) + if (query->counter_main != query->counter_retrieved + || (query->buffer_object && !wined3d_query_buffer_is_valid(query)) + || !query->query_ops->query_poll(query, flags)) { + if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) + query->device->cs->c.ops->flush(&query->device->cs->c); return S_FALSE; } + if (query->buffer_object) + query->data = query->map_ptr; + if (data) memcpy(data, query->data, min(data_size, query->data_size)); @@ -511,20 +506,33 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) return WINED3D_OK; } -static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD flags) +struct wined3d_poll_callback_data { - struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); + struct wined3d_query *query; + DWORD flags; + BOOL result; +}; + +static void wined3d_occlusion_query_ops_poll_cs(void *object) +{ + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; + struct wined3d_occlusion_query *oq; + DWORD flags = data->flags; GLuint available; TRACE("query %p, flags %#x.\n", query, flags); + oq = wined3d_occlusion_query_from_query(query); + if (!(context_gl = wined3d_context_gl_reacquire(oq->context_gl))) { FIXME("%p Wrong thread, returning 1.\n", query); oq->samples = 1; - return TRUE; + data->result = TRUE; + return; } gl_info = context_gl->gl_info; @@ -540,40 +548,76 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD checkGLcall("poll occlusion query"); context_release(&context_gl->c); - return available; + data->result = available; } -static BOOL wined3d_event_query_ops_poll(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD flags) { - struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_occlusion_query_ops_poll_cs, &data); + + return data.result; +} + +static void wined3d_event_query_ops_poll_cs(void *object) +{ + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; + struct wined3d_event_query *event_query; enum wined3d_fence_result ret; + DWORD flags = data->flags; TRACE("query %p, flags %#x.\n", query, flags); + event_query = wined3d_event_query_from_query(query); + ret = wined3d_fence_test(&event_query->fence, query->device, flags); switch (ret) { case WINED3D_FENCE_OK: case WINED3D_FENCE_NOT_STARTED: - return event_query->signalled = TRUE; + data->result = event_query->signalled = TRUE; + break; case WINED3D_FENCE_WAITING: - return event_query->signalled = FALSE; + data->result = event_query->signalled = FALSE; + break; case WINED3D_FENCE_WRONG_THREAD: FIXME("(%p) Wrong thread, reporting GPU idle.\n", query); - return event_query->signalled = TRUE; + data->result = event_query->signalled = TRUE; + break; case WINED3D_FENCE_ERROR: ERR("The GL event query failed.\n"); - return event_query->signalled = TRUE; + data->result = event_query->signalled = TRUE; + break; default: ERR("Unexpected wined3d_event_query_test result %#x.\n", ret); - return event_query->signalled = TRUE; + data->result = event_query->signalled = TRUE; + break; } } +static BOOL wined3d_event_query_ops_poll(struct wined3d_query *query, DWORD flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_event_query_ops_poll_cs, &data); + + return data.result; +} + void * CDECL wined3d_query_get_parent(const struct wined3d_query *query) { TRACE("query %p.\n", query); @@ -588,7 +632,7 @@ enum wined3d_query_type CDECL wined3d_query_get_type(const struct wined3d_query return query->type; } -static BOOL wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); @@ -597,24 +641,20 @@ static BOOL wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD fla struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); wined3d_fence_issue(&event_query->fence, query->device); - return TRUE; } else if (flags & WINED3DISSUE_BEGIN) { /* Started implicitly at query creation. */ ERR("Event query issued with START flag - what to do?\n"); } - - return FALSE; } -static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -668,7 +708,6 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD wined3d_query_buffer_queue_result(context_gl, query, oq->id); context_release(&context_gl->c); - poll = TRUE; } else { @@ -677,25 +716,29 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD } oq->started = FALSE; } - - return poll; } -static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD flags) +static void wined3d_timestamp_query_ops_poll_cs(void *object) { - struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); - const struct wined3d_gl_info *gl_info; + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; struct wined3d_context_gl *context_gl; + const struct wined3d_gl_info *gl_info; + struct wined3d_timestamp_query *tq; + DWORD flags = data->flags; GLuint64 timestamp; GLuint available; TRACE("query %p, flags %#x.\n", query, flags); + tq = wined3d_timestamp_query_from_query(query); + if (!(context_gl = wined3d_context_gl_reacquire(tq->context_gl))) { FIXME("%p Wrong thread, returning 1.\n", query); tq->timestamp = 1; - return TRUE; + data->result = TRUE; + return; } gl_info = context_gl->gl_info; @@ -712,11 +755,23 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD } context_release(&context_gl->c); + data->result = available; +} + +static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; - return available; + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_timestamp_query_ops_poll_cs, &data); + + return data.result; } -static BOOL wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); const struct wined3d_gl_info *gl_info; @@ -738,11 +793,7 @@ static BOOL wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD GL_EXTCALL(glQueryCounter(tq->id, GL_TIMESTAMP)); checkGLcall("glQueryCounter()"); context_release(&context_gl->c); - - return TRUE; } - - return FALSE; } static BOOL wined3d_timestamp_disjoint_query_ops_poll(struct wined3d_query *query, DWORD flags) @@ -752,27 +803,31 @@ static BOOL wined3d_timestamp_disjoint_query_ops_poll(struct wined3d_query *quer return TRUE; } -static BOOL wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); - - return FALSE; } -static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DWORD flags) +static void wined3d_so_statistics_query_ops_poll_cs(void *object) { - struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); GLuint written_available, generated_available; - const struct wined3d_gl_info *gl_info; + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; + struct wined3d_so_statistics_query *pq; struct wined3d_context_gl *context_gl; + const struct wined3d_gl_info *gl_info; + DWORD flags = data->flags; TRACE("query %p, flags %#x.\n", query, flags); + pq = wined3d_so_statistics_query_from_query(query); + if (!(context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { FIXME("%p Wrong thread, returning 0 primitives.\n", query); memset(&pq->statistics, 0, sizeof(pq->statistics)); - return TRUE; + data->result = TRUE; + return; } gl_info = context_gl->gl_info; @@ -794,7 +849,20 @@ static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DW checkGLcall("poll SO statistics query"); context_release(&context_gl->c); - return written_available && generated_available; + data->result = written_available && generated_available; +} + +static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DWORD flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_so_statistics_query_ops_poll_cs, &data); + + return data.result; } static void wined3d_so_statistics_query_end(struct wined3d_so_statistics_query *query, @@ -815,13 +883,12 @@ static void wined3d_so_statistics_query_end(struct wined3d_so_statistics_query * checkGLcall("end query"); } -static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -878,7 +945,6 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D wined3d_so_statistics_query_end(pq, context_gl); context_release(&context_gl->c); - poll = TRUE; } else { @@ -887,25 +953,29 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D } pq->started = FALSE; } - - return poll; } -static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD flags) +static void wined3d_pipeline_query_ops_poll_cs(void *object) { - struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); + struct wined3d_pipeline_statistics_query *pq; + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; + DWORD flags = data->flags; GLuint available; int i; TRACE("query %p, flags %#x.\n", query, flags); + pq = wined3d_pipeline_statistics_query_from_query(query); + if (!(context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { FIXME("%p Wrong thread.\n", query); memset(&pq->statistics, 0, sizeof(pq->statistics)); - return TRUE; + data->result = TRUE; + return; } gl_info = context_gl->gl_info; @@ -933,7 +1003,20 @@ static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD f checkGLcall("poll pipeline statistics query"); context_release(&context_gl->c); - return available; + data->result = available; +} + +static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_pipeline_query_ops_poll_cs, &data); + + return data.result; } static void wined3d_pipeline_statistics_query_end(struct wined3d_pipeline_statistics_query *query, @@ -955,13 +1038,12 @@ static void wined3d_pipeline_statistics_query_end(struct wined3d_pipeline_statis checkGLcall("end query"); } -static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -1014,7 +1096,6 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { wined3d_pipeline_statistics_query_end(pq, context_gl); context_release(&context_gl->c); - poll = TRUE; } else { @@ -1023,8 +1104,6 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD } pq->started = FALSE; } - - return poll; } static void wined3d_event_query_ops_destroy(struct wined3d_query *query) @@ -1612,10 +1691,15 @@ void wined3d_query_vk_suspend(struct wined3d_query_vk *query_vk, struct wined3d_ query_vk->flags &= ~WINED3D_QUERY_VK_FLAG_ACTIVE; } -static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) +static void wined3d_query_vk_poll_cs(void *object) { - struct wined3d_query_vk *query_vk = wined3d_query_vk(query); + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; struct wined3d_context_vk *context_vk; + struct wined3d_query_vk *query_vk; + uint32_t flags = data->flags; + + query_vk = wined3d_query_vk(query); context_vk = wined3d_context_vk(context_acquire(query->device, NULL, 0)); @@ -1642,20 +1726,33 @@ static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) query_vk->pool_idx.pool_vk = NULL; context_release(&context_vk->c); - return TRUE; + data->result = TRUE; + return; unavailable: context_release(&context_vk->c); - return FALSE; + data->result = FALSE; } -static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) +static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_query_vk_poll_cs, &data); + + return data.result; +} + +static void wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) { struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); struct wined3d_query_vk *query_vk = wined3d_query_vk(query); struct wined3d_context_vk *context_vk; VkCommandBuffer vk_command_buffer; - bool poll = false; TRACE("query %p, flags %#x.\n", query, flags); @@ -1680,7 +1777,7 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) { ERR("Failed to allocate new query.\n"); - return false; + return; } /* A query needs to either begin and end inside a single render pass, @@ -1730,12 +1827,9 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) } list_remove(&query_vk->entry); query_vk->flags = 0; - poll = true; context_release(&context_vk->c); } - - return poll; } static void wined3d_query_vk_destroy(struct wined3d_query *query) @@ -1761,12 +1855,16 @@ static const struct wined3d_query_ops wined3d_query_vk_ops = .query_destroy = wined3d_query_vk_destroy, }; -static BOOL wined3d_query_event_vk_poll(struct wined3d_query *query, uint32_t flags) +static void wined3d_query_event_vk_poll_cs(void *object) { - struct wined3d_query_vk *query_vk = wined3d_query_vk(query); + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; struct wined3d_context_vk *context_vk; + struct wined3d_query_vk *query_vk; + uint32_t flags = data->flags; BOOL *signalled; + query_vk = wined3d_query_vk(query); context_vk = wined3d_context_vk(context_acquire(query->device, NULL, 0)); signalled = (BOOL *)query->data; @@ -1775,7 +1873,8 @@ static BOOL wined3d_query_event_vk_poll(struct wined3d_query *query, uint32_t fl if (query_vk->command_buffer_id == context_vk->current_command_buffer.id) { context_release(&context_vk->c); - return *signalled = FALSE; + data->result = *signalled = FALSE; + return; } if (query_vk->command_buffer_id > context_vk->completed_command_buffer_id) @@ -1784,10 +1883,23 @@ static BOOL wined3d_query_event_vk_poll(struct wined3d_query *query, uint32_t fl context_release(&context_vk->c); - return *signalled; + data->result = *signalled; +} + +static BOOL wined3d_query_event_vk_poll(struct wined3d_query *query, uint32_t flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_query_event_vk_poll_cs, &data); + + return data.result; } -static BOOL wined3d_query_event_vk_issue(struct wined3d_query *query, uint32_t flags) +static void wined3d_query_event_vk_issue(struct wined3d_query *query, uint32_t flags) { struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); struct wined3d_query_vk *query_vk = wined3d_query_vk(query); @@ -1808,11 +1920,7 @@ static BOOL wined3d_query_event_vk_issue(struct wined3d_query *query, uint32_t f if (!context_vk->current_command_buffer.vk_command_buffer) --query_vk->command_buffer_id; context_release(&context_vk->c); - - return TRUE; } - - return FALSE; } static const struct wined3d_query_ops wined3d_query_event_vk_ops = @@ -1822,7 +1930,7 @@ static const struct wined3d_query_ops wined3d_query_event_vk_ops = .query_destroy = wined3d_query_vk_destroy, }; -static BOOL wined3d_query_timestamp_vk_issue(struct wined3d_query *query, uint32_t flags) +static void wined3d_query_timestamp_vk_issue(struct wined3d_query *query, uint32_t flags) { struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); struct wined3d_query_vk *query_vk = wined3d_query_vk(query); @@ -1846,18 +1954,14 @@ static BOOL wined3d_query_timestamp_vk_issue(struct wined3d_query *query, uint32 if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) { ERR("Failed to allocate new query.\n"); - return FALSE; + return; } VK_CALL(vkCmdWriteTimestamp(command_buffer, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, query_vk->pool_idx.pool_vk->vk_query_pool, query_vk->pool_idx.idx)); wined3d_context_vk_reference_query(context_vk, query_vk); context_release(&context_vk->c); - - return TRUE; } - - return FALSE; } static const struct wined3d_query_ops wined3d_query_timestamp_vk_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79b02c2448d..6b885036260 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1952,7 +1952,7 @@ enum wined3d_query_state struct wined3d_query_ops { BOOL (*query_poll)(struct wined3d_query *query, DWORD flags); - BOOL (*query_issue)(struct wined3d_query *query, DWORD flags); + void (*query_issue)(struct wined3d_query *query, DWORD flags); void (*query_destroy)(struct wined3d_query *query); }; @@ -4823,7 +4823,6 @@ enum wined3d_push_constants WINED3D_PUSH_CONSTANTS_PS_B, }; -#define WINED3D_CS_QUERY_POLL_INTERVAL 10u #define WINED3D_CS_QUEUE_SIZE 0x100000u #define WINED3D_CS_SPIN_COUNT 10000000u @@ -4879,7 +4878,6 @@ struct wined3d_cs struct wined3d_cs_queue queue[WINED3D_CS_QUEUE_COUNT]; size_t data_size, start, end; void *data; - struct list query_poll_list; BOOL queries_flushed; HANDLE event; @@ -4920,6 +4918,8 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; +void wined3d_cs_run_priority_callback(struct wined3d_cs *cs, void (*callback)(void *object), + void *object) DECLSPEC_HIDDEN; static inline void wined3d_cs_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) { -- 2.32.0

2 8

[PATCH] ddraw/tests: Pass the correct size to VirtualQuery().
by Zebediah Figura 24 Nov '21

24 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 65cd271d2a6..b8a7f909c89 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14122,14 +14122,14 @@ done: DestroyWindow(window); } -static void check_vtbl_protection_(int line, const void *vtbl, SIZE_T size) +static void check_vtbl_protection_(int line, const void *vtbl) { MEMORY_BASIC_INFORMATION info; - SIZE_T ret = VirtualQuery(vtbl, &info, size); + SIZE_T ret = VirtualQuery(vtbl, &info, sizeof(info)); ok_(__FILE__, line)(ret == sizeof(info), "Failed to query memory.\n"); ok_(__FILE__, line)(info.Protect & (PAGE_READWRITE | PAGE_WRITECOPY), "Got protection %#x.\n", info.Protect); } -#define check_vtbl_protection(a) check_vtbl_protection_(__LINE__, a, sizeof(*(a))) +#define check_vtbl_protection(a) check_vtbl_protection_(__LINE__, a) static void test_vtbl_protection(void) { -- 2.33.0

2 1

[PATCH] kernelbase: Add stub for PrefetchVirtualMemory().
by Paul Gofman 24 Nov '21

24 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- .../api-ms-win-core-memory-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 6 ++++++ include/winnt.h | 6 ++++++ 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index 3d5dea93aa5..9c1edb2e761 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -11,7 +11,7 @@ @ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx @ stub MapViewOfFileFromApp @ stdcall OpenFileMappingW(long long wstr) kernel32.OpenFileMappingW -@ stub PrefetchVirtualMemory +@ stdcall PrefetchVirtualMemory(ptr ptr ptr long) kernel32.PrefetchVirtualMemory @ stdcall QueryMemoryResourceNotification(ptr ptr) kernel32.QueryMemoryResourceNotification @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index cb305f228ab..735c6ee8b54 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -16,7 +16,7 @@ @ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx @ stub MapViewOfFileFromApp @ stdcall OpenFileMappingW(long long wstr) kernel32.OpenFileMappingW -@ stub PrefetchVirtualMemory +@ stdcall PrefetchVirtualMemory(ptr ptr ptr long) kernel32.PrefetchVirtualMemory @ stdcall QueryMemoryResourceNotification(ptr ptr) kernel32.QueryMemoryResourceNotification @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stub RegisterBadMemoryNotification diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9667f82a5da..fbaf9443934 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1157,6 +1157,7 @@ @ stdcall PowerClearRequest(long long) @ stdcall PowerCreateRequest(ptr) @ stdcall PowerSetRequest(long long) +@ stdcall -import PrefetchVirtualMemory(ptr ptr ptr long) @ stdcall PrepareTape(ptr long long) @ stub PrivCopyFileExW @ stub PrivMoveFileIdentityW diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 55208889c35..be40e425783 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1164,7 +1164,7 @@ @ stdcall PerfStopProvider(long) # @ stub PoolPerAppKeyStateInternal @ stdcall PostQueuedCompletionStatus(long long ptr ptr) -# @ stub PrefetchVirtualMemory +@ stdcall PrefetchVirtualMemory(ptr ptr ptr long) @ stub PrivCopyFileExW @ stdcall PrivilegeCheck(ptr ptr ptr) @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 847005e8abe..5b0778ff2b3 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -342,6 +342,12 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocFromApp( void *addr, SIZE_T size, return ret; } +BOOL WINAPI PrefetchVirtualMemory( HANDLE process, ULONG_PTR count, WIN32_MEMORY_RANGE_ENTRY *addresses, ULONG flags ) +{ + FIXME( "process %p, count %p, addresses %p, flags %#x stub.\n", process, (void *)count, addresses, flags ); + + return TRUE; +} /*********************************************************************** * VirtualFree (kernelbase.@) diff --git a/include/winnt.h b/include/winnt.h index d418355a888..3cc7aaf599f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -776,6 +776,12 @@ typedef struct DECLSPEC_ALIGN(8) MEM_EXTENDED_PARAMETER { } DUMMYUNIONNAME; } MEM_EXTENDED_PARAMETER, *PMEM_EXTENDED_PARAMETER; +typedef struct _WIN32_MEMORY_RANGE_ENTRY +{ + PVOID VirtualAddress; + SIZE_T NumberOfBytes; +} WIN32_MEMORY_RANGE_ENTRY, *PWIN32_MEMORY_RANGE_ENTRY; + #define PAGE_NOACCESS 0x01 #define PAGE_READONLY 0x02 #define PAGE_READWRITE 0x04 -- 2.33.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel