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

[PATCH v2] comctl32: Handle NULL text in COMBOEX_NotifyEndEdit().
by Haoyang Chen June 2, 2021

June 2, 2021

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/comctl32/comboex.c | 4 ++ dlls/comctl32/tests/combo.c | 87 ++++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 0f7e46949e4..1642270c47f 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -223,6 +223,10 @@ static INT COMBOEX_NotifyEndEdit (const COMBOEX_INFO *infoPtr, NMCBEENDEDITW *ne { /* Change the Text item from Unicode to ANSI if necessary for NOTIFY */ if (infoPtr->NtfUnicode) { + if (!wstr) { + neew->szText[0] = 0; + return COMBOEX_Notify (infoPtr, CBEN_ENDEDITW, &neew->hdr); + } lstrcpynW(neew->szText, wstr, CBEMAXSTRLEN); return COMBOEX_Notify (infoPtr, CBEN_ENDEDITW, &neew->hdr); } else { diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 69cc7680827..611a66392d3 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -47,6 +47,7 @@ static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND hComboExParentWnd, hMainWnd; static HINSTANCE hMainHinst; static const char ComboExTestClass[] = "ComboExTestClass"; +static const WCHAR ComboExTestClassW[] = L"ComboExTestClass1"; static HBRUSH brush_red; @@ -148,11 +149,19 @@ static HWND subclass_editbox(HWND hwndComboEx) return hwnd; } +static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); static void test_comboex(void) { HWND myHwnd = 0; LONG res; COMBOBOXEXITEMA cbexItem; + HWND hwndMainWindow = 0; + HWND hCombo, hEdit, hList; + COMBOBOXINFO cbInfo; + UINT x, y, item_height; + LRESULT result; + RECT rect; + WNDCLASSW wc; static const char *first_item = "First Item", *second_item = "Second Item", *third_item = "Third Item", @@ -249,6 +258,82 @@ static void test_comboex(void) /* Cleanup */ heap_free(textBuffer); DestroyWindow(myHwnd); + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleW(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = ComboExTestClassW; + wc.lpfnWndProc = ComboExTestWndProc; + RegisterClassW(&wc); + + hwndMainWindow = CreateWindowExW(0, ComboExTestClassW, L"ComboEx test", WS_OVERLAPPEDWINDOW|WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); + ok(hwndMainWindow!= NULL, "failed to create parent window\n"); + + myHwnd = CreateWindowExA(0, WC_COMBOBOXEXA, NULL, WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN, + 0, 0, 300, 300, hwndMainWindow, NULL, hMainHinst, NULL); + ok(myHwnd!= NULL, "failed to comboex window\n"); + + res = addItem(myHwnd, -1, NULL); + ok(res == 0, "Adding NULL text item failed (%d)\n", res); + + hCombo = (HWND)SendMessageW(myHwnd, CBEM_GETCOMBOCONTROL, 0, 0); + hEdit = (HWND)SendMessageW(myHwnd, CBEM_GETEDITCONTROL, 0, 0); + + get_combobox_info(hCombo, &cbInfo); + hList = cbInfo.hwndList; + + item_height = SendMessageA(hCombo, CB_GETITEMHEIGHT, 0, 0); + ok(GetClientRect(hList, &rect), "Failed to get list's client rect.\n"); + + x = cbInfo.rcButton.left + (cbInfo.rcButton.right-cbInfo.rcButton.left)/2; + y = cbInfo.rcButton.top + (cbInfo.rcButton.bottom-cbInfo.rcButton.top)/2; + result = SendMessageA(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(result, "WM_LBUTTONUP was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + result = SendMessageA(hCombo, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + ok(result, "WM_LBUTTONUP was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + x = rect.left + (rect.right-rect.left)/2; + y = rect.top + item_height/2; + result = SendMessageA(hList, WM_MOUSEMOVE, 0, MAKELPARAM(x, y)); + ok(!result, "WM_MOUSEMOVE was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + result = SendMessageA(hList, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(!result, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + result = SendMessageA(hList, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + ok(!result, "WM_LBUTTONUP was not processed. LastError=%d\n", + GetLastError()); + todo_wine ok(GetFocus() == hEdit || + broken(GetFocus() == hCombo), /* win98 */ + "Focus not on ComboBoxEx's Edit Control, instead on %p\n", + GetFocus()); + + DestroyWindow(myHwnd); + DestroyWindow(hwndMainWindow); + UnregisterClassW(ComboExTestClassW, GetModuleHandleW(NULL)); } static void test_comboex_WM_LBUTTONDOWN(void) @@ -1525,13 +1610,13 @@ START_TEST(combo) init_msg_sequences(sequences, NUM_MSG_SEQUENCES); /* ComboBoxEx32 tests. */ + test_comboex_CBEN_GETDISPINFO(); test_comboex(); test_comboex_WM_LBUTTONDOWN(); test_comboex_CB_GETLBTEXT(); test_comboex_WM_WINDOWPOSCHANGING(); test_comboex_subclass(); test_comboex_get_set_item(); - test_comboex_CBEN_GETDISPINFO(); if (!load_v6_module(&ctx_cookie, &hCtx)) { -- 2.20.1

1 0

[PATCH 1/4] msctf: Maintain context reference in ranges.
by Nikolay Sivov June 2, 2021

June 2, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msctf/range.c | 19 +++++++++++++------ dlls/msctf/tests/inputprocessor.c | 26 +++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index c4eee2501fb..85922791bad 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -42,7 +42,7 @@ typedef struct tagRange { LONG refCount; ITextStoreACP *pITextStoreACP; - ITfContext *pITfContext; + ITfContext *context; DWORD lockType; TfGravity gravityStart, gravityEnd; @@ -58,6 +58,7 @@ static inline Range *impl_from_ITfRange(ITfRange *iface) static void Range_Destructor(Range *This) { TRACE("destroying %p\n", This); + ITfContext_Release(This->context); HeapFree(GetProcessHeap(),0,This); } @@ -282,13 +283,18 @@ static HRESULT WINAPI Range_Clone(ITfRange *iface, ITfRange **ppClone) return E_NOTIMPL; } -static HRESULT WINAPI Range_GetContext(ITfRange *iface, ITfContext **ppContext) +static HRESULT WINAPI Range_GetContext(ITfRange *iface, ITfContext **context) { Range *This = impl_from_ITfRange(iface); - TRACE("(%p)\n",This); - if (!ppContext) + + TRACE("(%p, %p)\n", This, context); + + if (!context) return E_INVALIDARG; - *ppContext = This->pITfContext; + + *context = This->context; + ITfContext_AddRef(*context); + return S_OK; } @@ -334,7 +340,8 @@ HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD l This->ITfRange_iface.lpVtbl = &Range_RangeVtbl; This->refCount = 1; - This->pITfContext = context; + This->context = context; + ITfContext_AddRef(This->context); This->pITextStoreACP = textstore; This->lockType = lockType; This->anchorStart = anchorStart; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 55a6ab6c34c..fd03059e545 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -228,6 +228,8 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, REFIID riid, IUnknown *punk, DWORD dwMask) { ITextStoreACPServices *services; + ITfRangeACP *range; + ITfContext *context; HRESULT hr; if (winetest_debug > 1) trace("ITextStoreACP::AdviseSink(iid %s, mask %#x)\n", @@ -243,6 +245,18 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, hr = ITextStoreACPSink_QueryInterface(ACPSink, &IID_ITextStoreACPServices, (void**)&services); ok(hr == S_OK, "got 0x%08x\n", hr); + + range = NULL; + hr = ITextStoreACPServices_CreateRange(services, 0, 1, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (range) + { + hr = ITfRangeACP_GetContext(range, &context); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ITfContext_Release(context); + ITfRangeACP_Release(range); + } + ITextStoreACPServices_Release(services); return S_OK; @@ -2084,10 +2098,11 @@ static void test_InsertAtSelection(TfEditCookie ec, ITfContext *cxt) static HRESULT WINAPI EditSession_DoEditSession(ITfEditSession *iface, TfEditCookie ec) { - ITfContext *cxt; + ITfContext *cxt, *context2; ITfDocumentMgr *dm; ITfRange *range; TF_SELECTION selection; + IUnknown *unk; ULONG fetched; HRESULT hr; @@ -2109,6 +2124,15 @@ TfEditCookie ec) ok(SUCCEEDED(hr),"Unexpected return code %x\n",hr); ok(range != NULL,"Range set to NULL\n"); + hr = ITfRange_GetContext(range, &context2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(context2 == cxt, "Unexpected context pointer.\n"); + ITfContext_Release(context2); + + hr = ITfRange_QueryInterface(range, &IID_ITfRangeACP, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ITfRange_Release(range); hr = ITfContext_GetEnd(cxt,ec,NULL); -- 2.30.2

1 3

[PATCH] dsound: Notify DSBPN_OFFSETSTOP earlier.
by Hiroki Awata June 2, 2021

June 2, 2021

Some games may not receive the DSBPN_OFFSETSTOP event and get stuck if CloseHandle is called immediately after IDirectSoundBuffer::Stop. To solve this problem, DSBPN_OFFSETSTOP is notified early in the STATE_STOPPING state instead of STATE_STOPPED. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41292 Signed-off-by: Hiroki Awata <castaneai(a)by.black> --- dlls/dsound/buffer.c | 3 +++ dlls/dsound/mixer.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index fafa6fc6015..7e2773b14d4 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -318,7 +318,10 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(IDirectSoundBuffer8 *iface) AcquireSRWLockExclusive(&This->lock); if (This->state == STATE_PLAYING) + { This->state = STATE_STOPPING; + DSOUND_CheckEvent(This, 0, 0); + } else if (This->state == STATE_STARTING) { This->state = STATE_STOPPED; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index a6402b09eff..3eb682ef7b8 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -213,8 +213,8 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len if(dsb->nrofnotifies == 0) return; - if(dsb->state == STATE_STOPPED){ - TRACE("Stopped...\n"); + if(dsb->state == STATE_STOPPING){ + TRACE("Stopping...\n"); /* DSBPN_OFFSETSTOP notifies are always at the start of the sorted array */ for(left = 0; left < dsb->nrofnotifies; ++left){ if(dsb->notifies[left].dwOffset != DSBPN_OFFSETSTOP) @@ -225,6 +225,10 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len } return; } + if(dsb->state == STATE_STOPPED){ + TRACE("Stopped...\n"); + return; + } for(first = 0; first < dsb->nrofnotifies && dsb->notifies[first].dwOffset == DSBPN_OFFSETSTOP; ++first) ; -- 2.27.0

2 1

[PATCH] mfmediaengine: Enable source type enumeration.
by Nikolay Sivov June 2, 2021

June 2, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 510b1c5885f..e4263febe5e 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1161,6 +1161,8 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFTopologyNode_Release(video_src); } + IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, TRUE); + if (SUCCEEDED(hr)) hr = IMFMediaSession_SetTopology(engine->session, MFSESSION_SETTOPOLOGY_IMMEDIATE, topology); } -- 2.30.2

1 0

[PATCH] comctl32: Handle NULL text in COMBOEX_NotifyEndEdit().
by Haoyang Chen June 2, 2021

June 2, 2021

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/comctl32/comboex.c | 4 ++++ dlls/comctl32/tests/combo.c | 28 +++++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 0f7e46949e4..1642270c47f 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -223,6 +223,10 @@ static INT COMBOEX_NotifyEndEdit (const COMBOEX_INFO *infoPtr, NMCBEENDEDITW *ne { /* Change the Text item from Unicode to ANSI if necessary for NOTIFY */ if (infoPtr->NtfUnicode) { + if (!wstr) { + neew->szText[0] = 0; + return COMBOEX_Notify (infoPtr, CBEN_ENDEDITW, &neew->hdr); + } lstrcpynW(neew->szText, wstr, CBEMAXSTRLEN); return COMBOEX_Notify (infoPtr, CBEN_ENDEDITW, &neew->hdr); } else { diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 69cc7680827..363fc2d98bf 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -46,7 +46,7 @@ static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND hComboExParentWnd, hMainWnd; static HINSTANCE hMainHinst; -static const char ComboExTestClass[] = "ComboExTestClass"; +static const WCHAR ComboExTestClass[] = L"ComboExTestClass"; static HBRUSH brush_red; @@ -67,7 +67,7 @@ static void get_combobox_info(HWND hwnd, COMBOBOXINFO *info) } static HWND createComboEx(DWORD style) { - return CreateWindowExA(0, WC_COMBOBOXEXA, NULL, style, 0, 0, 300, 300, + return CreateWindowExW(0, WC_COMBOBOXEXW, NULL, style, 0, 0, 300, 300, hComboExParentWnd, NULL, hMainHinst, NULL); } @@ -263,7 +263,7 @@ static void test_comboex_WM_LBUTTONDOWN(void) WCHAR buffer[3]; static const UINT choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; - hComboEx = CreateWindowExA(0, WC_COMBOBOXEXA, NULL, + hComboEx = CreateWindowExW(0, WC_COMBOBOXEXW, NULL, WS_VISIBLE|WS_CHILD|CBS_DROPDOWN, 0, 0, 200, 150, hComboExParentWnd, NULL, hMainHinst, NULL); @@ -281,8 +281,10 @@ static void test_comboex_WM_LBUTTONDOWN(void) "Failed to add item %d\n", i); } - hCombo = (HWND)SendMessageA(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); - hEdit = (HWND)SendMessageA(hComboEx, CBEM_GETEDITCONTROL, 0, 0); + addItem(hComboEx, 4, NULL); + + hCombo = (HWND)SendMessageW(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); + hEdit = (HWND)SendMessageW(hComboEx, CBEM_GETEDITCONTROL, 0, 0); get_combobox_info(hCombo, &cbInfo); hList = cbInfo.hwndList; @@ -552,7 +554,7 @@ static void init_functions(void) static BOOL init(void) { - WNDCLASSA wc; + WNDCLASSW wc; wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; @@ -564,18 +566,18 @@ static BOOL init(void) wc.lpszMenuName = NULL; wc.lpszClassName = ComboExTestClass; wc.lpfnWndProc = ComboExTestWndProc; - RegisterClassA(&wc); + RegisterClassW(&wc); brush_red = CreateSolidBrush(RGB(255, 0, 0)); - hMainWnd = CreateWindowA(WC_STATICA, "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); + hMainWnd = CreateWindowW(WC_STATICW, L"Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); - hComboExParentWnd = CreateWindowExA(0, ComboExTestClass, "ComboEx test", WS_OVERLAPPEDWINDOW|WS_VISIBLE, - CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); + hComboExParentWnd = CreateWindowExW(0, ComboExTestClass, L"ComboEx test", WS_OVERLAPPEDWINDOW|WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleW(NULL), 0); ok(hComboExParentWnd != NULL, "failed to create parent window\n"); - hMainHinst = GetModuleHandleA(NULL); + hMainHinst = GetModuleHandleW(NULL); return hComboExParentWnd != NULL; } @@ -584,14 +586,14 @@ static void cleanup(void) { MSG msg; - PostMessageA(hComboExParentWnd, WM_CLOSE, 0, 0); + PostMessageW(hComboExParentWnd, WM_CLOSE, 0, 0); while (GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg); DispatchMessageA(&msg); } DestroyWindow(hComboExParentWnd); - UnregisterClassA(ComboExTestClass, GetModuleHandleA(NULL)); + UnregisterClassW(ComboExTestClass, GetModuleHandleA(NULL)); DestroyWindow(hMainWnd); DeleteObject(brush_red); -- 2.20.1

3 3

user32:clipboard winex11.drv (KDE) interference
by Francois Gouget June 2, 2021

June 2, 2021

I have been investigating the ole32:clipboard, user32:clipboard and user32:edit failures because they seemed to have a common outside cause, namely the Radeon Windows driver. But user32:clipboard also sometimes has similar failures in Wine on my box. So I will start with these. Here is one exemple happening in test_synthesized(): clipboard.c:817: 0024: CloseClipboard() = 1 # the test closed the clipboard 00a4:trace:clipboard:acquire_selection win e000010 00a4:trace:clipboard:X11DRV_SelectionRequest got request on e000010 for selection "CLIPBOARD" target "TARGETS" win bc00001 prop "SELECTION_DATA" # 00a4 is the winex11.drv thread for the clipboard manager # here it got an X11 message ... 00a4:trace:clipboard:OpenClipboard 00010040 == clipboard_hwnd 00a4:trace:clipboard:GetClipboardData CF_TEXT sending WM_RENDERFORMAT to 0005004A 0024:trace:clipboard:CountClipboardFormats returning 4 0024:trace:clipboard:IsClipboardFormatAvailable CF_TEXT -> 1 0024:trace:clipboard:IsClipboardFormatAvailable CF_LOCALE -> 1 0024:trace:clipboard:IsClipboardFormatAvailable CF_OEMTEXT -> 1 0024:trace:clipboard:IsClipboardFormatAvailable CF_UNICODETEXT -> 1 # back to the main test thread 0024:trace:clipboard:OpenClipboard 00000000 clipboard.c:832: 0024: OpenClipboard(00000000) = 0 (open=00010040 own=0005004A) clipboard.c:833: Test failed: 0: gle 5 # the test's OpenClipboard() call fails because winex11.drv has not # released the clipboard yet. ... 00a4:trace:clipboard:GetClipboardData CF_TEXT error c0000034 00a4:trace:clipboard:GetClipboardData CF_UNICODETEXT error c0000034 00a4:trace:clipboard:CloseClipboard Why did winex11.drv get a query for the clipboard content? Based on other X11 requests I blame KDE's clipboard manager: 00a4:trace:clipboard:X11DRV_SelectionRequest got request on e000010 for selection "CLIPBOARD" target "TARGETS" win 2000013 prop "_QT_SELECTION" So this explains why it happens on my box and not in the TestBot's VM since they run fvwm and have no clipboard manager. What should we do about that? -- Francois Gouget <fgouget(a)codeweavers.com>

3 7

[PATCH v6 3/6] winex11.drv: Store monitor information in the wineserver for EnumDisplayMonitors().
by Zhiyi Zhang June 1, 2021

June 1, 2021

Fix a regression that Office 2016/365 has a 640x480 main window. Office 2016/365 hooks NtOpenKeyEx() and prevents access to SetupAPI device properties. After querying monitor information from SetupAPI failed, EnumDisplayMonitors() reports a fallback monitor of size 640x480. As to why store the monitor information in the wineserver, it seems that EnumDisplayMonitors() reports monitors connected to current user logon session. For instance, EnumDisplayMonitors() always report one monitor when called by services. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 82 +++++++++++++++++++++++ dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/display.c | 74 ++++++++++++++++++-- server/Makefile.in | 1 + server/display.c | 130 ++++++++++++++++++++++++++++++++++++ server/protocol.def | 39 +++++++++++ server/trace.c | 38 +++++++++++ server/user.h | 13 +++- 8 files changed, 371 insertions(+), 7 deletions(-) create mode 100644 server/display.c diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 1c943767927..40c26cba1c0 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -46,6 +46,7 @@ #include "win.h" #include "user_private.h" #include "wine/gdi_driver.h" +#include "wine/server.h" #include "wine/asm.h" #include "wine/debug.h" @@ -3974,9 +3975,35 @@ fail: BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) { UINT index = (UINT_PTR)handle - 1; + NTSTATUS status; TRACE("(%p, %p)\n", handle, info); + SERVER_START_REQ( get_monitor_info ) + { + req->handle = wine_server_user_handle( handle ); + if (info->cbSize == sizeof(MONITORINFOEXW)) + wine_server_set_reply( req, ((MONITORINFOEXW *)info)->szDevice, + sizeof(((MONITORINFOEXW *)info)->szDevice) - sizeof(WCHAR) ); + if (!(status = wine_server_call( req ))) + { + SetRect( &info->rcMonitor, reply->monitor_rect.left, reply->monitor_rect.top, + reply->monitor_rect.right, reply->monitor_rect.bottom ); + SetRect( &info->rcWork, reply->work_rect.left, reply->work_rect.top, + reply->work_rect.right, reply->work_rect.bottom ); + if (!info->rcMonitor.left && !info->rcMonitor.top && info->rcMonitor.right && info->rcMonitor.bottom) + info->dwFlags = MONITORINFOF_PRIMARY; + else + info->dwFlags = 0; + if (info->cbSize == sizeof(MONITORINFOEXW)) + ((MONITORINFOEXW *)info)->szDevice[wine_server_reply_size( req ) / sizeof(WCHAR)] = 0; + } + } + SERVER_END_REQ; + + if (!status) + return TRUE; + /* Fallback to report one monitor */ if (handle == NULLDRV_DEFAULT_HMONITOR) { @@ -3990,7 +4017,10 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) } if (!update_monitor_cache()) + { + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); return FALSE; + } EnterCriticalSection( &monitors_section ); if (index < monitor_count) @@ -4111,11 +4141,63 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { + struct enum_monitor_entry entries[4], *entry_ptr; + unsigned int status, count, entry_count; RECT monitor_rect; + HMONITOR monitor; DWORD i = 0; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + entry_count = ARRAY_SIZE(entries); + entry_ptr = entries; + while (TRUE) + { + SERVER_START_REQ(enum_monitors) + { + wine_server_set_reply( req, entry_ptr, entry_count * sizeof(*entry_ptr) ); + status = wine_server_call( req ); + count = reply->count; + } + SERVER_END_REQ; + + if (!status) + { + for (i = 0; i < count; ++i) + { + monitor = wine_server_ptr_handle( entry_ptr[i].handle ); + monitor_rect.top = entry_ptr[i].monitor_rect.top; + monitor_rect.left = entry_ptr[i].monitor_rect.left; + monitor_rect.right = entry_ptr[i].monitor_rect.right; + monitor_rect.bottom = entry_ptr[i].monitor_rect.bottom; + if (!proc( monitor, hdc, &monitor_rect, lp )) + { + if (entry_ptr != entries) + heap_free( entry_ptr ); + return FALSE; + } + } + + if (count) + { + if (entry_ptr != entries) + heap_free( entry_ptr ); + return TRUE; + } + } + + if (entry_ptr != entries) + heap_free( entry_ptr ); + + if (count <= entry_count) + break; + + entry_count = count; + entry_ptr = heap_calloc( entry_count, sizeof(*entry_ptr) ); + if (!entry_ptr) + break; + } + if (update_monitor_cache()) { while (TRUE) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ab03837f5e6..b73ea8cfc90 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2004,7 +2004,6 @@ static BOOL CALLBACK test_handle_proc(HMONITOR full_monitor, HDC hdc, LPRECT rec monitor = (HMONITOR)((ULONG_PTR)full_monitor | ((ULONG_PTR)~0u << 16)); SetLastError(0xdeadbeef); ret = GetMonitorInfoW(monitor, &monitor_info); - todo_wine_if(((ULONG_PTR)full_monitor >> 16) == 0) ok(ret, "GetMonitorInfoW failed, error %#x.\n", GetLastError()); monitor = (HMONITOR)((ULONG_PTR)full_monitor & 0xffff); diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..a70b5c811dc 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -34,6 +34,8 @@ #define WIN32_NO_STATUS #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/server.h" #include "wine/unicode.h" #include "x11drv.h" @@ -47,7 +49,6 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1 DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; @@ -625,10 +626,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; - /* RcWork */ - if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, - (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) - goto done; /* Adapter name */ length = sprintfW(bufferW, adapter_name_fmtW, video_index + 1); if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, @@ -697,6 +694,62 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } +/* Wine server monitor list management */ + +struct server_monitor_info +{ + unsigned int entry_count; + unsigned int entry_capacity; + struct update_monitor_entry *entries; +}; + +static BOOL server_add_monitor_info(struct server_monitor_info *info, + const struct x11drv_monitor *monitor, int adapter_index) +{ + struct update_monitor_entry *entry, *new_entries; + unsigned int length; + + if (info->entry_count <= info->entry_capacity) + info->entry_capacity = info->entry_capacity ? info->entry_capacity * 2 : 2; + + if (info->entries) + new_entries = heap_realloc(info->entries, info->entry_capacity * sizeof(*new_entries)); + else + new_entries = heap_calloc(info->entry_capacity, sizeof(*new_entries)); + + if (!new_entries) + return FALSE; + + info->entries = new_entries; + entry = &info->entries[info->entry_count++]; + entry->monitor_rect.top = monitor->rc_monitor.top; + entry->monitor_rect.left = monitor->rc_monitor.left; + entry->monitor_rect.right = monitor->rc_monitor.right; + entry->monitor_rect.bottom = monitor->rc_monitor.bottom; + entry->work_rect.top = monitor->rc_work.top; + entry->work_rect.left = monitor->rc_work.left; + entry->work_rect.right = monitor->rc_work.right; + entry->work_rect.bottom = monitor->rc_work.bottom; + length = sprintfW(entry->adapter_name, adapter_name_fmtW, adapter_index + 1); + entry->adapter_name_len = length * sizeof(WCHAR); + return TRUE; +} + +static void server_submit_monitor_info(const struct server_monitor_info *info) +{ + unsigned int status; + + SERVER_START_REQ(update_monitors) + { + wine_server_add_data(req, info->entries, info->entry_count * sizeof(*info->entries)); + status = wine_server_call(req); + } + SERVER_END_REQ; + + if (status) + ERR("Failed to update the monitor list in the wine server, status %#x\n", status); +} + void X11DRV_DisplayDevices_Init(BOOL force) { HANDLE mutex; @@ -707,6 +760,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) INT gpu_count, adapter_count, monitor_count; INT gpu, adapter, monitor; HDEVINFO gpu_devinfo = NULL, monitor_devinfo = NULL; + struct server_monitor_info info = {0}; HKEY video_hkey = NULL; INT video_index = 0; DWORD disposition = 0; @@ -766,6 +820,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) TRACE("monitor: %#x %s\n", monitor, wine_dbgstr_w(monitors[monitor].name)); if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid, output_id++)) goto done; + + /* EnumDisplayMonitors() doesn't enumerate mirrored replicas and inactive monitors */ + if (monitor != 0 || !(monitors[monitor].state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + + if (!server_add_monitor_info(&info, &monitors[monitor], video_index)) + goto done; } handler->free_monitors(monitors); @@ -777,7 +838,10 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } + server_submit_monitor_info(&info); + done: + heap_free(info.entries); cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); diff --git a/server/Makefile.in b/server/Makefile.in index 4264e3db108..b1aa85862c1 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ debugger.c \ device.c \ directory.c \ + display.c \ event.c \ fd.c \ file.c \ diff --git a/server/display.c b/server/display.c new file mode 100644 index 00000000000..aaaf4da126f --- /dev/null +++ b/server/display.c @@ -0,0 +1,130 @@ +/* + * Server-side display device management + * + * Copyright (C) 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 + */ +#include "config.h" + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" + +#include "request.h" +#include "user.h" + +static struct list monitor_list = LIST_INIT(monitor_list); +static unsigned int monitor_count; + +/* retrieve a pointer to a monitor from its handle */ +static struct monitor *get_monitor( user_handle_t handle ) +{ + struct monitor *monitor; + + if (!(monitor = get_user_object( handle, USER_MONITOR ))) + set_win32_error( ERROR_INVALID_MONITOR_HANDLE ); + return monitor; +} + +/* create a monitor */ +static void create_monitor( const struct update_monitor_entry *entry ) +{ + struct monitor *monitor; + + if (!(monitor = mem_alloc( sizeof(*monitor) ))) + return; + + if (!(monitor->adapter_name = memdup( entry->adapter_name, entry->adapter_name_len ))) + goto failed; + monitor->adapter_name_len = entry->adapter_name_len; + + if (!(monitor->handle = alloc_user_handle( monitor, USER_MONITOR ))) + goto failed; + + monitor->monitor_rect = entry->monitor_rect; + monitor->work_rect = entry->work_rect; + list_add_tail( &monitor_list, &monitor->entry ); + ++monitor_count; + return; + +failed: + if (monitor->adapter_name) + free( monitor->adapter_name ); + free( monitor ); +} + +/* modify the list of monitors */ +DECL_HANDLER(update_monitors) +{ + const struct update_monitor_entry *entries; + struct monitor *monitor, *monitor2; + unsigned int entry_count, i; + + LIST_FOR_EACH_ENTRY_SAFE(monitor, monitor2, &monitor_list, struct monitor, entry) + { + list_remove( &monitor->entry ); + free_user_handle( monitor->handle ); + free( monitor->adapter_name ); + free( monitor ); + } + monitor_count = 0; + + entries = get_req_data(); + entry_count = get_req_data_size() / sizeof(*entries); + for (i = 0; i < entry_count; ++i) + create_monitor( &entries[i] ); +} + +/* get information about a monitor */ +DECL_HANDLER(get_monitor_info) +{ + struct monitor *monitor; + + if (!(monitor = get_monitor( req->handle ))) + return; + + reply->monitor_rect = monitor->monitor_rect; + reply->work_rect = monitor->work_rect; + set_reply_data( monitor->adapter_name, min(monitor->adapter_name_len, get_reply_max_size()) ); +} + +/* enumerate monitors */ +DECL_HANDLER(enum_monitors) +{ + struct enum_monitor_entry *entries; + unsigned int size, i = 0; + struct monitor *monitor; + + reply->count = monitor_count; + size = reply->count * sizeof(*entries); + if (size > get_reply_max_size()) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + if (!(entries = set_reply_data_size( size ))) + return; + + LIST_FOR_EACH_ENTRY(monitor, &monitor_list, struct monitor, entry) + { + entries[i].handle = monitor->handle; + entries[i].monitor_rect = monitor->monitor_rect; + ++i; + } +} diff --git a/server/protocol.def b/server/protocol.def index 8a68c9a5eb7..47948fb3588 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2734,6 +2734,45 @@ enum coords_relative #define SET_USER_OBJECT_GET_FULL_NAME 2 +struct update_monitor_entry +{ + rectangle_t monitor_rect; /* monitor rectangle */ + rectangle_t work_rect; /* monitor work area rectangle */ + WCHAR adapter_name[32]; /* adapter name */ + data_size_t adapter_name_len; /* adapter name length in bytes */ +}; + +struct enum_monitor_entry +{ + user_handle_t handle; /* handle to the monitor */ + rectangle_t monitor_rect; /* monitor rectangle */ +}; + + +/* Modify the list of monitors */ +(a)REQ(update_monitors) + VARARG(monitors,update_monitor_entry); /* A list of monitors to be created */ +(a)END + + +/* Get information about a monitor */ +(a)REQ(get_monitor_info) + user_handle_t handle; /* handle to the monitor */ +(a)REPLY + rectangle_t monitor_rect; /* monitor rectangle */ + rectangle_t work_rect; /* monitor work area rectangle */ + VARARG(adapter,unicode_str); /* adapter name */ +(a)END + + +/* Enumerate monitors */ +(a)REQ(enum_monitors) +(a)REPLY + unsigned int count; /* total count of monitors */ + VARARG(monitors,enum_monitor_entry); /* A list of monitors enumerated */ +(a)END + + /* Register a hotkey */ @REQ(register_hotkey) user_handle_t window; /* handle to the window */ diff --git a/server/trace.c b/server/trace.c index 8bfc9e56cc5..e613f88d144 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1401,6 +1401,44 @@ static void dump_varargs_poll_socket_output( const char *prefix, data_size_t siz fputc( '}', stderr ); } +static void dump_varargs_update_monitor_entry( const char *prefix, data_size_t size ) +{ + const struct update_monitor_entry *entry; + + fprintf( stderr, "%s{", prefix ); + while (size >= sizeof(*entry)) + { + entry = cur_data; + dump_rectangle( "{monitor_rect=", &entry->monitor_rect ); + dump_rectangle( ",work_rect=", &entry->work_rect ); + fprintf( stderr, ",adapter_name=L\"" ); + dump_strW( entry->adapter_name, entry->adapter_name_len, stderr, "\"\"" ); + fprintf( stderr, "\"}" ); + size -= sizeof(*entry); + remove_data( sizeof(*entry) ); + if (size) fputc( ',', stderr ); + } + fputc( '}', stderr ); +} + +static void dump_varargs_enum_monitor_entry( const char *prefix, data_size_t size ) +{ + const struct enum_monitor_entry *entry; + + fprintf( stderr, "%s{", prefix ); + while (size >= sizeof(*entry)) + { + entry = cur_data; + fprintf( stderr, "{handle=%08x", entry->handle ); + dump_rectangle( ",monitor_rect=", &entry->monitor_rect ); + fputc( '}', stderr ); + size -= sizeof(*entry); + remove_data( sizeof(*entry) ); + if (size) fputc( ',', stderr ); + } + fputc( '}', stderr ); +} + typedef void (*dump_func)( const void *req ); /* Everything below this line is generated automatically by tools/make_requests */ diff --git a/server/user.h b/server/user.h index 80f7e91f12c..a9807f1402d 100644 --- a/server/user.h +++ b/server/user.h @@ -36,7 +36,8 @@ enum user_object { USER_WINDOW = 1, USER_HOOK, - USER_CLIENT /* arbitrary client handle */ + USER_CLIENT, /* arbitrary client handle */ + USER_MONITOR }; #define DESKTOP_ATOM ((atom_t)32769) @@ -79,6 +80,16 @@ struct desktop unsigned char keystate[256]; /* asynchronous key state */ }; +struct monitor +{ + user_handle_t handle; /* monitor handle */ + struct list entry; /* entry in global monitor list */ + rectangle_t monitor_rect; /* monitor rectangle */ + rectangle_t work_rect; /* monitor work area rectangle */ + WCHAR *adapter_name; /* adapter name */ + data_size_t adapter_name_len; /* adapter name length */ +}; + /* user handles functions */ extern user_handle_t alloc_user_handle( void *ptr, enum user_object type ); -- 2.30.2

2 1

[PATCH v5 3/6] winex11.drv: Store monitor information in the wineserver for EnumDisplayMonitors().
by Zhiyi Zhang June 1, 2021

June 1, 2021

Fix a regression that Office 2016/365 has a 640x480 main window. Office 2016/365 hooks NtOpenKeyEx() and prevents access to SetupAPI device properties. After querying monitor information from SetupAPI failed, EnumDisplayMonitors() reports a fallback monitor of size 640x480. As to why store the monitor information in the wineserver, it seems that EnumDisplayMonitors() reports monitors connected to current user logon session. For instance, EnumDisplayMonitors() always report one monitor when called by services. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 82 +++++++++++++++++++++++ dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/display.c | 74 ++++++++++++++++++-- server/Makefile.in | 1 + server/display.c | 130 ++++++++++++++++++++++++++++++++++++ server/protocol.def | 39 +++++++++++ server/trace.c | 38 +++++++++++ server/user.h | 13 +++- 8 files changed, 371 insertions(+), 7 deletions(-) create mode 100644 server/display.c diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 1c943767927..846d5b9cc36 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -46,6 +46,7 @@ #include "win.h" #include "user_private.h" #include "wine/gdi_driver.h" +#include "wine/server.h" #include "wine/asm.h" #include "wine/debug.h" @@ -3974,9 +3975,35 @@ fail: BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) { UINT index = (UINT_PTR)handle - 1; + NTSTATUS status; TRACE("(%p, %p)\n", handle, info); + SERVER_START_REQ( get_monitor_info ) + { + req->handle = wine_server_user_handle( handle ); + if (info->cbSize >= sizeof(MONITORINFOEXW)) + wine_server_set_reply( req, ((MONITORINFOEXW *)info)->szDevice, + sizeof(((MONITORINFOEXW *)info)->szDevice) - sizeof(WCHAR) ); + if (!(status = wine_server_call( req ))) + { + SetRect( &info->rcMonitor, reply->monitor_rect.left, reply->monitor_rect.top, + reply->monitor_rect.right, reply->monitor_rect.bottom ); + SetRect( &info->rcWork, reply->work_rect.left, reply->work_rect.top, + reply->work_rect.right, reply->work_rect.bottom ); + if (!info->rcMonitor.left && !info->rcMonitor.top && info->rcMonitor.right && info->rcMonitor.bottom) + info->dwFlags = MONITORINFOF_PRIMARY; + else + info->dwFlags = 0; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + ((MONITORINFOEXW *)info)->szDevice[wine_server_reply_size( req ) / sizeof(WCHAR)] = 0; + } + } + SERVER_END_REQ; + + if (!status) + return TRUE; + /* Fallback to report one monitor */ if (handle == NULLDRV_DEFAULT_HMONITOR) { @@ -3990,7 +4017,10 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) } if (!update_monitor_cache()) + { + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); return FALSE; + } EnterCriticalSection( &monitors_section ); if (index < monitor_count) @@ -4111,11 +4141,63 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { + struct enum_monitor_entry entries[4], *entry_ptr; + unsigned int status, count, entry_count; RECT monitor_rect; + HMONITOR monitor; DWORD i = 0; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + entry_count = ARRAY_SIZE(entries); + entry_ptr = entries; + while (TRUE) + { + SERVER_START_REQ(enum_monitors) + { + wine_server_set_reply( req, entry_ptr, entry_count * sizeof(*entry_ptr) ); + status = wine_server_call( req ); + count = reply->count; + } + SERVER_END_REQ; + + if (!status) + { + for (i = 0; i < count; ++i) + { + monitor = wine_server_ptr_handle( entry_ptr[i].handle ); + monitor_rect.top = entry_ptr[i].monitor_rect.top; + monitor_rect.left = entry_ptr[i].monitor_rect.left; + monitor_rect.right = entry_ptr[i].monitor_rect.right; + monitor_rect.bottom = entry_ptr[i].monitor_rect.bottom; + if (!proc( monitor, hdc, &monitor_rect, lp )) + { + if (entry_ptr != entries) + heap_free( entry_ptr ); + return FALSE; + } + } + + if (count) + { + if (entry_ptr != entries) + heap_free( entry_ptr ); + return TRUE; + } + } + + if (entry_ptr != entries) + heap_free( entry_ptr ); + + if (count <= entry_count) + break; + + entry_count = count; + entry_ptr = heap_calloc( entry_count, sizeof(*entry_ptr) ); + if (!entry_ptr) + break; + } + if (update_monitor_cache()) { while (TRUE) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ab03837f5e6..b73ea8cfc90 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2004,7 +2004,6 @@ static BOOL CALLBACK test_handle_proc(HMONITOR full_monitor, HDC hdc, LPRECT rec monitor = (HMONITOR)((ULONG_PTR)full_monitor | ((ULONG_PTR)~0u << 16)); SetLastError(0xdeadbeef); ret = GetMonitorInfoW(monitor, &monitor_info); - todo_wine_if(((ULONG_PTR)full_monitor >> 16) == 0) ok(ret, "GetMonitorInfoW failed, error %#x.\n", GetLastError()); monitor = (HMONITOR)((ULONG_PTR)full_monitor & 0xffff); diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..a70b5c811dc 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -34,6 +34,8 @@ #define WIN32_NO_STATUS #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/server.h" #include "wine/unicode.h" #include "x11drv.h" @@ -47,7 +49,6 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1 DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; @@ -625,10 +626,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; - /* RcWork */ - if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, - (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) - goto done; /* Adapter name */ length = sprintfW(bufferW, adapter_name_fmtW, video_index + 1); if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, @@ -697,6 +694,62 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } +/* Wine server monitor list management */ + +struct server_monitor_info +{ + unsigned int entry_count; + unsigned int entry_capacity; + struct update_monitor_entry *entries; +}; + +static BOOL server_add_monitor_info(struct server_monitor_info *info, + const struct x11drv_monitor *monitor, int adapter_index) +{ + struct update_monitor_entry *entry, *new_entries; + unsigned int length; + + if (info->entry_count <= info->entry_capacity) + info->entry_capacity = info->entry_capacity ? info->entry_capacity * 2 : 2; + + if (info->entries) + new_entries = heap_realloc(info->entries, info->entry_capacity * sizeof(*new_entries)); + else + new_entries = heap_calloc(info->entry_capacity, sizeof(*new_entries)); + + if (!new_entries) + return FALSE; + + info->entries = new_entries; + entry = &info->entries[info->entry_count++]; + entry->monitor_rect.top = monitor->rc_monitor.top; + entry->monitor_rect.left = monitor->rc_monitor.left; + entry->monitor_rect.right = monitor->rc_monitor.right; + entry->monitor_rect.bottom = monitor->rc_monitor.bottom; + entry->work_rect.top = monitor->rc_work.top; + entry->work_rect.left = monitor->rc_work.left; + entry->work_rect.right = monitor->rc_work.right; + entry->work_rect.bottom = monitor->rc_work.bottom; + length = sprintfW(entry->adapter_name, adapter_name_fmtW, adapter_index + 1); + entry->adapter_name_len = length * sizeof(WCHAR); + return TRUE; +} + +static void server_submit_monitor_info(const struct server_monitor_info *info) +{ + unsigned int status; + + SERVER_START_REQ(update_monitors) + { + wine_server_add_data(req, info->entries, info->entry_count * sizeof(*info->entries)); + status = wine_server_call(req); + } + SERVER_END_REQ; + + if (status) + ERR("Failed to update the monitor list in the wine server, status %#x\n", status); +} + void X11DRV_DisplayDevices_Init(BOOL force) { HANDLE mutex; @@ -707,6 +760,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) INT gpu_count, adapter_count, monitor_count; INT gpu, adapter, monitor; HDEVINFO gpu_devinfo = NULL, monitor_devinfo = NULL; + struct server_monitor_info info = {0}; HKEY video_hkey = NULL; INT video_index = 0; DWORD disposition = 0; @@ -766,6 +820,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) TRACE("monitor: %#x %s\n", monitor, wine_dbgstr_w(monitors[monitor].name)); if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid, output_id++)) goto done; + + /* EnumDisplayMonitors() doesn't enumerate mirrored replicas and inactive monitors */ + if (monitor != 0 || !(monitors[monitor].state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + + if (!server_add_monitor_info(&info, &monitors[monitor], video_index)) + goto done; } handler->free_monitors(monitors); @@ -777,7 +838,10 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } + server_submit_monitor_info(&info); + done: + heap_free(info.entries); cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); diff --git a/server/Makefile.in b/server/Makefile.in index 4264e3db108..b1aa85862c1 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ debugger.c \ device.c \ directory.c \ + display.c \ event.c \ fd.c \ file.c \ diff --git a/server/display.c b/server/display.c new file mode 100644 index 00000000000..aaaf4da126f --- /dev/null +++ b/server/display.c @@ -0,0 +1,130 @@ +/* + * Server-side display device management + * + * Copyright (C) 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 + */ +#include "config.h" + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" + +#include "request.h" +#include "user.h" + +static struct list monitor_list = LIST_INIT(monitor_list); +static unsigned int monitor_count; + +/* retrieve a pointer to a monitor from its handle */ +static struct monitor *get_monitor( user_handle_t handle ) +{ + struct monitor *monitor; + + if (!(monitor = get_user_object( handle, USER_MONITOR ))) + set_win32_error( ERROR_INVALID_MONITOR_HANDLE ); + return monitor; +} + +/* create a monitor */ +static void create_monitor( const struct update_monitor_entry *entry ) +{ + struct monitor *monitor; + + if (!(monitor = mem_alloc( sizeof(*monitor) ))) + return; + + if (!(monitor->adapter_name = memdup( entry->adapter_name, entry->adapter_name_len ))) + goto failed; + monitor->adapter_name_len = entry->adapter_name_len; + + if (!(monitor->handle = alloc_user_handle( monitor, USER_MONITOR ))) + goto failed; + + monitor->monitor_rect = entry->monitor_rect; + monitor->work_rect = entry->work_rect; + list_add_tail( &monitor_list, &monitor->entry ); + ++monitor_count; + return; + +failed: + if (monitor->adapter_name) + free( monitor->adapter_name ); + free( monitor ); +} + +/* modify the list of monitors */ +DECL_HANDLER(update_monitors) +{ + const struct update_monitor_entry *entries; + struct monitor *monitor, *monitor2; + unsigned int entry_count, i; + + LIST_FOR_EACH_ENTRY_SAFE(monitor, monitor2, &monitor_list, struct monitor, entry) + { + list_remove( &monitor->entry ); + free_user_handle( monitor->handle ); + free( monitor->adapter_name ); + free( monitor ); + } + monitor_count = 0; + + entries = get_req_data(); + entry_count = get_req_data_size() / sizeof(*entries); + for (i = 0; i < entry_count; ++i) + create_monitor( &entries[i] ); +} + +/* get information about a monitor */ +DECL_HANDLER(get_monitor_info) +{ + struct monitor *monitor; + + if (!(monitor = get_monitor( req->handle ))) + return; + + reply->monitor_rect = monitor->monitor_rect; + reply->work_rect = monitor->work_rect; + set_reply_data( monitor->adapter_name, min(monitor->adapter_name_len, get_reply_max_size()) ); +} + +/* enumerate monitors */ +DECL_HANDLER(enum_monitors) +{ + struct enum_monitor_entry *entries; + unsigned int size, i = 0; + struct monitor *monitor; + + reply->count = monitor_count; + size = reply->count * sizeof(*entries); + if (size > get_reply_max_size()) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + if (!(entries = set_reply_data_size( size ))) + return; + + LIST_FOR_EACH_ENTRY(monitor, &monitor_list, struct monitor, entry) + { + entries[i].handle = monitor->handle; + entries[i].monitor_rect = monitor->monitor_rect; + ++i; + } +} diff --git a/server/protocol.def b/server/protocol.def index 8a68c9a5eb7..47948fb3588 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2734,6 +2734,45 @@ enum coords_relative #define SET_USER_OBJECT_GET_FULL_NAME 2 +struct update_monitor_entry +{ + rectangle_t monitor_rect; /* monitor rectangle */ + rectangle_t work_rect; /* monitor work area rectangle */ + WCHAR adapter_name[32]; /* adapter name */ + data_size_t adapter_name_len; /* adapter name length in bytes */ +}; + +struct enum_monitor_entry +{ + user_handle_t handle; /* handle to the monitor */ + rectangle_t monitor_rect; /* monitor rectangle */ +}; + + +/* Modify the list of monitors */ +(a)REQ(update_monitors) + VARARG(monitors,update_monitor_entry); /* A list of monitors to be created */ +(a)END + + +/* Get information about a monitor */ +(a)REQ(get_monitor_info) + user_handle_t handle; /* handle to the monitor */ +(a)REPLY + rectangle_t monitor_rect; /* monitor rectangle */ + rectangle_t work_rect; /* monitor work area rectangle */ + VARARG(adapter,unicode_str); /* adapter name */ +(a)END + + +/* Enumerate monitors */ +(a)REQ(enum_monitors) +(a)REPLY + unsigned int count; /* total count of monitors */ + VARARG(monitors,enum_monitor_entry); /* A list of monitors enumerated */ +(a)END + + /* Register a hotkey */ @REQ(register_hotkey) user_handle_t window; /* handle to the window */ diff --git a/server/trace.c b/server/trace.c index 8bfc9e56cc5..e613f88d144 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1401,6 +1401,44 @@ static void dump_varargs_poll_socket_output( const char *prefix, data_size_t siz fputc( '}', stderr ); } +static void dump_varargs_update_monitor_entry( const char *prefix, data_size_t size ) +{ + const struct update_monitor_entry *entry; + + fprintf( stderr, "%s{", prefix ); + while (size >= sizeof(*entry)) + { + entry = cur_data; + dump_rectangle( "{monitor_rect=", &entry->monitor_rect ); + dump_rectangle( ",work_rect=", &entry->work_rect ); + fprintf( stderr, ",adapter_name=L\"" ); + dump_strW( entry->adapter_name, entry->adapter_name_len, stderr, "\"\"" ); + fprintf( stderr, "\"}" ); + size -= sizeof(*entry); + remove_data( sizeof(*entry) ); + if (size) fputc( ',', stderr ); + } + fputc( '}', stderr ); +} + +static void dump_varargs_enum_monitor_entry( const char *prefix, data_size_t size ) +{ + const struct enum_monitor_entry *entry; + + fprintf( stderr, "%s{", prefix ); + while (size >= sizeof(*entry)) + { + entry = cur_data; + fprintf( stderr, "{handle=%08x", entry->handle ); + dump_rectangle( ",monitor_rect=", &entry->monitor_rect ); + fputc( '}', stderr ); + size -= sizeof(*entry); + remove_data( sizeof(*entry) ); + if (size) fputc( ',', stderr ); + } + fputc( '}', stderr ); +} + typedef void (*dump_func)( const void *req ); /* Everything below this line is generated automatically by tools/make_requests */ diff --git a/server/user.h b/server/user.h index 80f7e91f12c..a9807f1402d 100644 --- a/server/user.h +++ b/server/user.h @@ -36,7 +36,8 @@ enum user_object { USER_WINDOW = 1, USER_HOOK, - USER_CLIENT /* arbitrary client handle */ + USER_CLIENT, /* arbitrary client handle */ + USER_MONITOR }; #define DESKTOP_ATOM ((atom_t)32769) @@ -79,6 +80,16 @@ struct desktop unsigned char keystate[256]; /* asynchronous key state */ }; +struct monitor +{ + user_handle_t handle; /* monitor handle */ + struct list entry; /* entry in global monitor list */ + rectangle_t monitor_rect; /* monitor rectangle */ + rectangle_t work_rect; /* monitor work area rectangle */ + WCHAR *adapter_name; /* adapter name */ + data_size_t adapter_name_len; /* adapter name length */ +}; + /* user handles functions */ extern user_handle_t alloc_user_handle( void *ptr, enum user_object type ); -- 2.30.2

2 1

[PATCH v6 6/6] user32: Remove code that queries monitor information from SetupAPI device properties.
by Zhiyi Zhang June 1, 2021

June 1, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 155 ++-------------------------------------- 1 file changed, 4 insertions(+), 151 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 40c26cba1c0..763a647bf0d 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -102,8 +102,6 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1 /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); #define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) @@ -134,19 +132,6 @@ static CRITICAL_SECTION display_section = { &display_critsect_debug, -1, 0, 0, 0 static BOOL enum_display_device( WCHAR *device, DWORD index, struct display_device *info ); -/* Cached monitor information */ -static MONITORINFOEXW *monitors; -static UINT monitor_count; -static FILETIME last_query_monitors_time; -static CRITICAL_SECTION monitors_section; -static CRITICAL_SECTION_DEBUG monitors_critsect_debug = -{ - 0, 0, &monitors_section, - { &monitors_critsect_debug.ProcessLocksList, &monitors_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": monitors_section") } -}; -static CRITICAL_SECTION monitors_section = { &monitors_critsect_debug, -1 , 0, 0, 0, 0 }; - static HDC display_dc; static CRITICAL_SECTION display_dc_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -3881,100 +3866,8 @@ fail: return ret; } -/* Return FALSE on failure and TRUE on success */ -static BOOL update_monitor_cache(void) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo = INVALID_HANDLE_VALUE; - MONITORINFOEXW *monitor_array; - FILETIME filetime = {0}; - DWORD device_count = 0; - HANDLE mutex = NULL; - DWORD state_flags; - BOOL ret = FALSE; - BOOL is_replica; - DWORD i = 0, j; - DWORD type; - - /* Update monitor cache from SetupAPI if it's outdated */ - if (!video_key && RegOpenKeyW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", &video_key )) - return FALSE; - if (RegQueryInfoKeyW( video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime )) - return FALSE; - if (CompareFileTime( &filetime, &last_query_monitors_time ) < 1) - return TRUE; - - mutex = get_display_device_init_mutex(); - EnterCriticalSection( &monitors_section ); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, L"DISPLAY", NULL, DIGCF_PRESENT ); - - while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) - { - /* Inactive monitors don't get enumerated */ - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&state_flags, sizeof(DWORD), NULL, 0 )) - goto fail; - if (state_flags & DISPLAY_DEVICE_ACTIVE) - device_count++; - } - - if (device_count && monitor_count < device_count) - { - monitor_array = heap_alloc( device_count * sizeof(*monitor_array) ); - if (!monitor_array) - goto fail; - heap_free( monitors ); - monitors = monitor_array; - } - - for (i = 0, monitor_count = 0; SetupDiEnumDeviceInfo( devinfo, i, &device_data ); i++) - { - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&state_flags, sizeof(DWORD), NULL, 0 )) - goto fail; - if (!(state_flags & DISPLAY_DEVICE_ACTIVE)) - continue; - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) - goto fail; - - /* Replicas in mirroring monitor sets don't get enumerated */ - is_replica = FALSE; - for (j = 0; j < monitor_count; j++) - { - if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor)) - { - is_replica = TRUE; - break; - } - } - if (is_replica) - continue; - - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, - (BYTE *)&monitors[monitor_count].rcWork, sizeof(RECT), NULL, 0 )) - goto fail; - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, - (BYTE *)monitors[monitor_count].szDevice, CCHDEVICENAME * sizeof(WCHAR), NULL, 0)) - goto fail; - monitors[monitor_count].dwFlags = - !wcscmp( L"\\\\.\\DISPLAY1", monitors[monitor_count].szDevice ) ? MONITORINFOF_PRIMARY : 0; - - monitor_count++; - } - - last_query_monitors_time = filetime; - ret = TRUE; -fail: - SetupDiDestroyDeviceInfoList( devinfo ); - LeaveCriticalSection( &monitors_section ); - release_display_device_init_mutex( mutex ); - return ret; -} - BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) { - UINT index = (UINT_PTR)handle - 1; NTSTATUS status; TRACE("(%p, %p)\n", handle, info); @@ -4016,29 +3909,8 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) return TRUE; } - if (!update_monitor_cache()) - { - SetLastError( ERROR_INVALID_MONITOR_HANDLE ); - return FALSE; - } - - EnterCriticalSection( &monitors_section ); - if (index < monitor_count) - { - info->rcMonitor = monitors[index].rcMonitor; - info->rcWork = monitors[index].rcWork; - info->dwFlags = monitors[index].dwFlags; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[index].szDevice ); - LeaveCriticalSection( &monitors_section ); - return TRUE; - } - else - { - LeaveCriticalSection( &monitors_section ); - SetLastError( ERROR_INVALID_MONITOR_HANDLE ); - return FALSE; - } + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); + return FALSE; } /*********************************************************************** @@ -4198,27 +4070,8 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro break; } - if (update_monitor_cache()) - { - while (TRUE) - { - EnterCriticalSection( &monitors_section ); - if (i >= monitor_count) - { - LeaveCriticalSection( &monitors_section ); - return TRUE; - } - monitor_rect = monitors[i].rcMonitor; - LeaveCriticalSection( &monitors_section ); - - if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitor_rect, lp )) - return FALSE; - - ++i; - } - } - - /* Fallback to report one monitor if using SetupAPI failed */ + /* Fallback to report one monitor if wineserver calls failed */ + ERR("Failed to enumerate monitors, reporting a 640x480 monitor.\n"); SetRect( &monitor_rect, 0, 0, 640, 480 ); if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &monitor_rect, lp )) return FALSE; -- 2.30.2

1 0

[PATCH v6 5/6] winex11.drv: Query virtual screen and primary screen rectangles from user32.
by Zhiyi Zhang June 1, 2021

June 1, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 114 +++++++++---------------------------- 1 file changed, 27 insertions(+), 87 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a70b5c811dc..8d5d6755cbb 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -48,7 +48,6 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1 /* Wine specific properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; @@ -114,20 +113,6 @@ static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; -/* Cached screen information, protected by screen_section */ -static HKEY video_key; -static RECT virtual_screen_rect; -static RECT primary_monitor_rect; -static FILETIME last_query_screen_time; -static CRITICAL_SECTION screen_section; -static CRITICAL_SECTION_DEBUG screen_critsect_debug = -{ - 0, 0, &screen_section, - {&screen_critsect_debug.ProcessLocksList, &screen_critsect_debug.ProcessLocksList}, - 0, 0, {(DWORD_PTR)(__FILE__ ": screen_section")} -}; -static CRITICAL_SECTION screen_section = {&screen_critsect_debug, -1, 0, 0, 0, 0}; - HANDLE get_display_device_init_mutex(void) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; @@ -143,62 +128,6 @@ void release_display_device_init_mutex(HANDLE mutex) CloseHandle(mutex); } -/* Update screen rectangle cache from SetupAPI if it's outdated, return FALSE on failure and TRUE on success */ -static BOOL update_screen_cache(void) -{ - RECT virtual_rect = {0}, primary_rect = {0}, monitor_rect; - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo = INVALID_HANDLE_VALUE; - FILETIME filetime = {0}; - HANDLE mutex = NULL; - DWORD i = 0; - INT result; - DWORD type; - BOOL ret = FALSE; - - EnterCriticalSection(&screen_section); - if ((!video_key && RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) - || RegQueryInfoKeyW(video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime)) - { - LeaveCriticalSection(&screen_section); - return FALSE; - } - result = CompareFileTime(&filetime, &last_query_screen_time); - LeaveCriticalSection(&screen_section); - if (result < 1) - return TRUE; - - mutex = get_display_device_init_mutex(); - - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, DIGCF_PRESENT); - if (devinfo == INVALID_HANDLE_VALUE) - goto fail; - - while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) - goto fail; - - UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); - if (i == 1) - primary_rect = monitor_rect; - } - - EnterCriticalSection(&screen_section); - virtual_screen_rect = virtual_rect; - primary_monitor_rect = primary_rect; - last_query_screen_time = filetime; - LeaveCriticalSection(&screen_section); - ret = TRUE; -fail: - SetupDiDestroyDeviceInfoList(devinfo); - release_display_device_init_mutex(mutex); - if (!ret) - WARN("Update screen cache failed!\n"); - return ret; -} - POINT virtual_screen_to_root(INT x, INT y) { RECT virtual = get_virtual_screen_rect(); @@ -219,26 +148,41 @@ POINT root_to_virtual_screen(INT x, INT y) return pt; } +static BOOL CALLBACK get_virtual_screen_proc(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp) +{ + RECT *virtual_rect = (RECT *)lp; + + UnionRect(virtual_rect, virtual_rect, rect); + return TRUE; +} + +static BOOL CALLBACK get_primary_monitor_proc(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp) +{ + RECT *primary_rect = (RECT *)lp; + + if (!rect->top && !rect->left && rect->right && rect->bottom) + { + *primary_rect = *rect; + return FALSE; + } + + return TRUE; +} + RECT get_virtual_screen_rect(void) { - RECT virtual; + RECT rect = {0}; - update_screen_cache(); - EnterCriticalSection(&screen_section); - virtual = virtual_screen_rect; - LeaveCriticalSection(&screen_section); - return virtual; + EnumDisplayMonitors(0, NULL, get_virtual_screen_proc, (LPARAM)&rect); + return rect; } RECT get_primary_monitor_rect(void) { - RECT primary; + RECT rect = {0}; - update_screen_cache(); - EnterCriticalSection(&screen_section); - primary = primary_monitor_rect; - LeaveCriticalSection(&screen_section); - return primary; + EnumDisplayMonitors(0, NULL, get_primary_monitor_proc, (LPARAM)&rect); + return rect; } /* Get the primary monitor rect from the host system */ @@ -622,10 +566,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) goto done; - /* RcMonitor */ - if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, - (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) - goto done; /* Adapter name */ length = sprintfW(bufferW, adapter_name_fmtW, video_index + 1); if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, -- 2.30.2

1 0