September 2018 - Wine-Devel

Re: [PATCH v3 1/6] shell32/autocomplete: Use the same font for the AutoComplete listbox as the edit control

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Sept. 27, 2018

Re: [PATCH 2/2] services/tests: Retrieve monitor information when executed as service.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=42597 Your paranoid android. === wxppro (32 bit Windows report) === services.exe: service.c:410: Test failed: service.c:372: service: Unexpected szDevice received: \\.\DISPLAY1 === w2003std (32 bit Windows report) === services.exe: service.c:410: Test failed: service: Unexpected szDevice received: \\.\DISPLAY1

Sept. 27, 2018

[PATCH 2/2] services/tests: Retrieve monitor information when executed as service.

by Bernhard Übelacker

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43187 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- This patch is not merged with the previous one because there is no todo_wine for service_ok. --- programs/services/tests/service.c | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 728d515f85..ae056ee812 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -127,6 +127,41 @@ static void test_create_window(void) service_ok(r, "DestroyWindow failed: %08x\n", GetLastError()); } +static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) +{ + BOOL r; + MONITORINFOEXA mi; + + mi.cbSize = sizeof(mi); + + r = GetMonitorInfoA(hmon, (MONITORINFO*)&mi); + service_ok(r, "GetMonitorInfo failed.\n"); + + service_ok(mi.rcMonitor.left == 0 && mi.rcMonitor.top == 0 && mi.rcMonitor.right >= 640 && mi.rcMonitor.bottom >= 480, + "Unexepected monitor rcMonitor values: {%d,%d,%d,%d}\n", + mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); + + service_ok(mi.rcWork.left == 0 && mi.rcWork.top == 0 && mi.rcWork.right >= 640 && mi.rcWork.bottom >= 480, + "Unexepected monitor rcWork values: {%d,%d,%d,%d}\n", + mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); + + service_ok(!strcmp(mi.szDevice, "WinDisc") || !strcmp(mi.szDevice, "\\.\DISPLAY1"), + "Unexpected szDevice received: %s\n", mi.szDevice); + + service_ok(mi.dwFlags & MONITORINFOF_PRIMARY, "Unexpected secondary monitor info.\n"); + + return TRUE; +} + +/* query informations monitor information, even in non-interactive services */ +static void test_monitors(void) +{ + BOOL r; + + r = EnumDisplayMonitors(0, 0, monitor_enum_proc, 0); + service_ok(r, "EnumDisplayMonitors failed.\n"); +} + static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_data, void *context) { SERVICE_STATUS status; @@ -151,6 +186,7 @@ static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_da case 128: test_winstation(); test_create_window(); + test_monitors(); service_event("CUSTOM"); return 0xdeadbeef; default: -- 2.19.0

Sept. 27, 2018

[PATCH 1/2] user32: Let nulldrv return some dummy monitor information.

by Bernhard Übelacker

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43187 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/user32/driver.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 561a126bd6..03296d518c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -354,7 +354,12 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + proc(NULL, hdc, &r, lp); + return TRUE; } static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) @@ -364,7 +369,17 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + const WCHAR device[] = {'W','i','n','D','i','s','c',0}; + + TRACE("(%p, %p)\n", handle, info); + + info->rcMonitor = r; + info->rcWork = r; + info->dwFlags = MONITORINFOF_PRIMARY; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, device ); + return TRUE; } static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) -- 2.19.0

Sept. 27, 2018

Re: [PATCH v5 4/4] msftedit: Add tests for interfaces.

by Huw Davies

On Wed, Sep 26, 2018 at 06:50:56PM +0800, Jactry Zeng wrote: > +static void test_Interfaces(void) > +{ > + IRichEditOle *reole = NULL, *reole1 = NULL; > + ITextDocument *txtdoc = NULL; > + ITextDocument2Old *txtdoc2old = NULL; > + ITextDocument2 *txtdoc2 = NULL; > + ITextSelection *txtsel = NULL, *txtsel2; > + IUnknown *punk; > + HRESULT hres; > + LRESULT res; > + HWND hwnd; > + ULONG refcount; > + > + hwnd = new_window(MSFTEDIT_CLASS, ES_MULTILINE, NULL); > + if (!hwnd) > + { > + skip("Couldn't create window.\n"); > + return; > + } > + > + res = SendMessageA(hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&reole); > + ok(res, "SendMessage\n"); > + ok(reole != NULL, "EM_GETOLEINTERFACE\n"); > + EXPECT_REF(reole, 2); > + > + res = SendMessageA(hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&reole1); > + ok(res == 1, "SendMessage\n"); > + ok(reole1 == reole, "Should not return a new IRichEditOle interface.\n"); > + EXPECT_REF(reole, 3); > + > + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument, (void **)&txtdoc); > + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); > + ok(txtdoc != NULL, "IRichEditOle_QueryInterface\n"); > + > + hres = ITextDocument_GetSelection(txtdoc, NULL); > + ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%08x.\n", hres); > + > + EXPECT_REF(txtdoc, 4); > + > + hres = ITextDocument_GetSelection(txtdoc, &txtsel); > + ok(hres == S_OK, "ITextDocument_GetSelection failed 0x%08x.\n", hres); > + > + EXPECT_REF(txtdoc, 4); > + EXPECT_REF(txtsel, 2); > + > + hres = ITextDocument_GetSelection(txtdoc, &txtsel2); > + ok(hres == S_OK, "ITextDocument_GetSelection failed: 0x%08x.\n", hres); > + ok(txtsel2 == txtsel, "got %p, %p\n", txtsel, txtsel2); > + > + EXPECT_REF(txtdoc, 4); > + EXPECT_REF(txtsel, 3); > + > + ITextSelection_Release(txtsel2); > + > + punk = NULL; > + hres = ITextSelection_QueryInterface(txtsel, &IID_ITextSelection, (void **)&punk); > + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); > + ok(punk != NULL, "ITextSelection_QueryInterface\n"); > + IUnknown_Release(punk); > + > + punk = NULL; > + hres = ITextSelection_QueryInterface(txtsel, &IID_ITextRange, (void **)&punk); > + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); > + ok(punk != NULL, "ITextSelection_QueryInterface\n"); > + IUnknown_Release(punk); > + > + punk = NULL; > + hres = ITextSelection_QueryInterface(txtsel, &IID_IDispatch, (void **)&punk); > + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); > + ok(punk != NULL, "ITextSelection_QueryInterface\n"); > + IUnknown_Release(punk); > + > + punk = NULL; > + hres = IRichEditOle_QueryInterface(reole, &IID_IOleClientSite, (void **)&punk); > + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); > + > + punk = NULL; > + hres = IRichEditOle_QueryInterface(reole, &IID_IOleWindow, (void **)&punk); > + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); > + > + punk = NULL; > + hres = IRichEditOle_QueryInterface(reole, &IID_IOleInPlaceSite, (void **)&punk); > + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); > + > + /* ITextDocument2 is implemented on msftedit after win8 for superseding ITextDocument2Old */ > + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2, (void **)&txtdoc2); > + ok(hres == S_OK || > + hres == E_NOINTERFACE /* before win8 */, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); > + if (hres != E_NOINTERFACE) > + { > + ok(txtdoc2 != NULL, "IRichEditOle_QueryInterface\n"); > + ok((ITextDocument *)txtdoc2 == txtdoc, "Interface pointer isn't equal.\n"); > + EXPECT_REF(txtdoc2, 5); > + EXPECT_REF(reole, 5); > + > + hres = ITextDocument2_QueryInterface(txtdoc2, &IID_ITextDocument2Old, (void **)&txtdoc2old); > + ok(hres == S_OK, "ITextDocument2_QueryInterface failed: 0x%08x.\n", hres); > + EXPECT_REF(txtdoc2, 5); > + EXPECT_REF(reole, 5); > + EXPECT_REF(txtdoc2old, 1); > + ITextDocument2Old_Release(txtdoc2old); > + ITextDocument2_Release(txtdoc2); > + > + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2Old, (void **)&txtdoc2old); > + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); > + ok(txtdoc2old != NULL, "IRichEditOle_QueryInterface\n"); > + ok((ITextDocument *)txtdoc2old != txtdoc, "Interface pointer is equal.\n"); > + EXPECT_REF(txtdoc2old, 1); > + EXPECT_REF(reole, 4); > + ITextDocument2Old_Release(txtdoc2old); Not sure what you're trying to show in this block of 7 lines. Move the txtdoc2old != txtdoc test to the previous block of 7 lines and get rid of this block. Huw.

Sept. 27, 2018

Re: [PATCH v5 2/4] riched20: Add stub for ITextDocument2Old interface.

by Huw Davies

On Wed, Sep 26, 2018 at 06:50:31PM +0800, Jactry Zeng wrote: > Superseded patch 151800. > > ChangLog: > v4: Add tests of type info. > v5: Better tests of type info. Could you merge this patch with patch [3/4]; they belong together.

Sept. 27, 2018

Re: [PATCH v5 1/4] include: Add ITextDocument2Old and ITextDocument2 interface.

by Huw Davies

On Thu, Sep 27, 2018 at 04:24:50PM +0800, Jactry Zeng wrote: > Hi Alex, > Alex Henrie <alexhenrie24(a)gmail.com> 于2018年9月27日周四下午4:14写道： > > > > On Wed, Sep 26, 2018 at 4:50 AM Jactry Zeng <jzeng(a)codeweavers.com> wrote: > > > + uuid(01C25500-4268-11D1-883A-3C8B00C10000) > > > > Please make this lowercase to match the other UUIDs in the file. > > > This was written in this way on purpose. I just want to make it looks > different to the origin one I saw. > If this is unnecessary I'm willing to make it lowercase. Yes, please make this lowercase. Huw.

Sept. 27, 2018

Re: [PATCH 5/7] kernel32: Reimplement RemoveDirectory() by setting a delete disposition.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=42588 Your paranoid android. === w8 (32 bit Windows report) === ntdll: file.c:460: Test failed: mismatched file size for L"WindowsUpdate.log"

Sept. 27, 2018

Re: [PATCH 3/7] ntdll/tests: Add more file disposition tests.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=42586 Your paranoid android. === w8 (32 bit Windows report) === ntdll: file.c:460: Test failed: mismatched file size for L"WindowsUpdate.log"

Sept. 27, 2018

Re: [PATCH v3] riched20: Avoid using GCC's typeof extension

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Sept. 27, 2018