December 2018 - Wine-Devel - list.winehq.org

[PATCH v2] user32: Dont reset focus if current dialog is a child.
by Alistair Leslie-Hughes Dec. 14, 2018

Dec. 14, 2018

Regression of 44f89322ba8825a8e4851aaaf7de89910701ca75 The standard File Open Dialog, creates an empty WS_EX_CONTROLPARENT child dialog which shouldn't receive focus. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46215 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/dialog.c | 5 +++- dlls/user32/tests/dialog.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 0b33a57..72e6eee 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -692,7 +692,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, SetFocus( focus ); } else - SetFocus( hwnd ); + { + if (!(template.style & WS_CHILD)) + SetFocus( hwnd ); + } } } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 631f3d3..ff6052f 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -907,6 +907,55 @@ static INT_PTR CALLBACK focusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, return FALSE; } +static INT_PTR CALLBACK EmptyProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) { + case WM_INITDIALOG: + return TRUE; + } + return FALSE; +} + +HWND hChildDlg = NULL; +static INT_PTR CALLBACK focusChildDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, + LPARAM lParam) +{ + switch (uiMsg) + { + case WM_INITDIALOG: + { + RECT rectHwnd; + struct { + DLGTEMPLATE tmplate; + WORD menu,class,title; + } temp; + + SetFocus( GetDlgItem(hwnd, 200) ); + + GetClientRect(hwnd,&rectHwnd); + temp.tmplate.style = WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE | DS_CONTROL | DS_3DLOOK; + temp.tmplate.dwExtendedStyle = 0; + temp.tmplate.cdit = 0; + temp.tmplate.x = 0; + temp.tmplate.y = 0; + temp.tmplate.cx = 0; + temp.tmplate.cy = 0; + temp.menu = temp.class = temp.title = 0; + + hChildDlg = CreateDialogIndirectParamA(g_hinst, &temp.tmplate, + hwnd, (DLGPROC)EmptyProcUserTemplate, 0); + ok(hChildDlg != 0, "Failed to create test dialog.\n"); + + return FALSE; + } + case WM_CLOSE: + DestroyWindow(hChildDlg); + return TRUE; + } + + return FALSE; +} + /* Helper for InitialFocusTest */ static const char * GetHwndString(HWND hw) { @@ -1093,6 +1142,29 @@ static void test_focus(void) DestroyWindow(hDlg); } + + /* Test 6: + * Select textbox's text on creation when WM_INITDIALOG creates a child dialog. */ + { + HWND hDlg; + HRSRC hResource; + HANDLE hTemplate; + DLGTEMPLATE* pTemplate; + HWND edit; + + hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG_3", (LPCSTR)RT_DIALOG); + hTemplate = LoadResource(g_hinst, hResource); + pTemplate = LockResource(hTemplate); + + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusChildDlgWinProc, 0); + ok(hDlg != 0, "Failed to create test dialog.\n"); + edit = GetDlgItem(hDlg, 200); + + ok(GetFocus() == edit, "Focus not set to edit, focus=%p, dialog=%p, edit=%p\n", + GetFocus(), hDlg, edit); + + DestroyWindow(hDlg); + } } static void test_GetDlgItemText(void) -- 1.9.1

2 1

[PATCH] winebus.sys: Re-add missing Xbox controller PIDs.
by Kai Krakow Dec. 14, 2018

Dec. 14, 2018

These were introduced in commit 1333206 and have gone missing in one of the previous cleanup commits. Fixes: ccb06c6 ("winebus: Don't override real VID/PID for controllers.") Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/winebus.sys/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index cee0ae60734..299cec5034d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -53,9 +53,11 @@ static const WORD PID_XBOX_CONTROLLERS[] = { 0x028f, /* Xbox360 Wireless Controller */ 0x02d1, /* Xbox One Controller */ 0x02dd, /* Xbox One Controller (Covert Forces/Firmware 2015) */ + 0x02e0, /* Xbox One X Controller */ 0x02e3, /* Xbox One Elite Controller */ 0x02e6, /* Wireless XBox Controller Dongle */ 0x02ea, /* Xbox One S Controller */ + 0x02fd, /* Xbox One S Controller (Firmware 2017) */ 0x0719, /* Xbox 360 Wireless Adapter */ }; -- 2.19.2

1 0

[PATCH] user32: Dont reset focus if current dialog is a child.
by Alistair Leslie-Hughes Dec. 14, 2018

Dec. 14, 2018

Regression of 44f89322ba8825a8e4851aaaf7de89910701ca75 The standard File Open Dialog, creates an empty WS_EX_CONTROLPARENT child dialog which shouldn't receive focus. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46215 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/dialog.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 0b33a57..72e6eee 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -692,7 +692,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, SetFocus( focus ); } else - SetFocus( hwnd ); + { + if (!(template.style & WS_CHILD)) + SetFocus( hwnd ); + } } } -- 1.9.1

3 2

[PATCH] shcore: Fix path string leak for file streams (Valgrind)
by Nikolay Sivov Dec. 14, 2018

Dec. 14, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index a544f27006..ac625fb746 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -839,6 +839,7 @@ static ULONG WINAPI filestream_Release(IStream *iface) if (!refcount) { CloseHandle(stream->u.file.handle); + heap_free(stream->u.file.path); heap_free(stream); } -- 2.19.2

1 0

[PATCH] kernelbase/tests: Fix some leaks (Valgrind)
by Nikolay Sivov Dec. 14, 2018

Dec. 14, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/tests/path.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 7b24f00178..7644c312b7 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -323,6 +323,7 @@ static void test_PathAllocCanonicalize(void) path_maxW[PATHCCH_MAX_CCH - 1] = '\0'; hr = pPathAllocCanonicalize(path_maxW, PATHCCH_ALLOW_LONG_PATHS, &path_outW); ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + LocalFree(path_outW); /* Check if flags added after Windows 10 1709 are supported */ MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, path_inW, ARRAY_SIZE(path_inW)); @@ -449,12 +450,14 @@ static void test_PathAllocCombine(void) ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); ok(!lstrcmpA(resultA, "\\a"), "expect \\a, got %s\n", resultA); + LocalFree(resultW); MultiByteToWideChar(CP_ACP, 0, "\\b", -1, path2W, ARRAY_SIZE(path2W)); hr = pPathAllocCombine(NULL, path2W, 0, &resultW); ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); ok(!lstrcmpA(resultA, "\\b"), "expect \\b, got %s\n", resultA); + LocalFree(resultW); hr = pPathAllocCombine(path1W, path2W, 0, NULL); ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); -- 2.19.2

1 0

[PATCH] inetcomm: Fix a leak on DeleteProp() (Valgrind)
by Nikolay Sivov Dec. 14, 2018

Dec. 14, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/inetcomm/mimeole.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index cb9ebcc382..a2854be196 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -819,16 +819,21 @@ static void empty_param_list(struct list *list) } } +static void free_header(header_t *header) +{ + list_remove(&header->entry); + PropVariantClear(&header->value); + empty_param_list(&header->params); + heap_free(header); +} + static void empty_header_list(struct list *list) { header_t *header, *cursor2; LIST_FOR_EACH_ENTRY_SAFE(header, cursor2, list, header_t, entry) { - list_remove(&header->entry); - PropVariantClear(&header->value); - empty_param_list(&header->params); - HeapFree(GetProcessHeap(), 0, header); + free_header(header); } } @@ -1232,8 +1237,7 @@ static HRESULT WINAPI MimeBody_DeleteProp( if(found) { - list_remove(&cursor->entry); - HeapFree(GetProcessHeap(), 0, cursor); + free_header(cursor); return S_OK; } } -- 2.19.2

1 0

[PATCH] dwrite/tests: Fix some leaks (Valgrind)
by Nikolay Sivov Dec. 14, 2018

Dec. 14, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f752afd08e..aa1562ee32 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1778,6 +1778,7 @@ static void test_CreateFontFace(void) UINT32 count; WCHAR *path; HRESULT hr; + ULONG ref; factory = create_factory(); @@ -1864,6 +1865,8 @@ static void test_CreateFontFace(void) IDWriteFont_Release(font); IDWriteFontFamily_Release(family); IDWriteFontCollection_Release(collection); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u.\n", ref); /* IDWriteFactory::CreateFontFace() */ path = create_testfontfile(test_fontfile); @@ -1929,7 +1932,8 @@ todo_wine } IDWriteFontFile_Release(file); - IDWriteFactory_Release(factory); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u.\n", ref); DELETE_FONTFILE(path); } @@ -4873,6 +4877,7 @@ static void test_IsMonospacedFont(void) ULONG ref; factory = create_factory(); + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4920,7 +4925,8 @@ static void test_IsMonospacedFont(void) else skip("Courier New font not found.\n"); - ref = IDWriteFontCollection_Release(collection); + IDWriteFontCollection_Release(collection); + ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); } -- 2.19.2

1 0

[PATCH 1/4] usp10/tests: Test width returned with ScriptGetGlyphABCWidth().
by Nikolay Sivov Dec. 13, 2018

Dec. 13, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 62 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 8c4b125bae..e907c8c40a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3403,26 +3403,76 @@ static void test_ScriptGetGlyphABCWidth(HDC hdc) { HRESULT hr; SCRIPT_CACHE sc = NULL; - ABC abc; + HFONT hfont, prev_hfont; + TEXTMETRICA tm; + ABC abc, abc2; + LOGFONTA lf; + WORD glyph; + INT width; + DWORD ret; - hr = ScriptGetGlyphABCWidth(NULL, NULL, 'a', NULL); + glyph = 0; + ret = GetGlyphIndicesA(hdc, "a", 1, &glyph, 0); + ok(ret == 1, "Failed to get glyph index.\n"); + ok(glyph != 0, "Unexpected glyph index.\n"); + + hr = ScriptGetGlyphABCWidth(NULL, NULL, glyph, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); - hr = ScriptGetGlyphABCWidth(NULL, &sc, 'a', NULL); + hr = ScriptGetGlyphABCWidth(NULL, &sc, glyph, NULL); ok(broken(hr == E_PENDING) || hr == E_INVALIDARG, /* WIN7 */ "expected E_INVALIDARG, got 0x%08x\n", hr); - hr = ScriptGetGlyphABCWidth(NULL, &sc, 'a', &abc); + hr = ScriptGetGlyphABCWidth(NULL, &sc, glyph, &abc); ok(hr == E_PENDING, "expected E_PENDING, got 0x%08x\n", hr); if (0) { /* crashes on WinXP */ - hr = ScriptGetGlyphABCWidth(hdc, &sc, 'a', NULL); + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); } - hr = ScriptGetGlyphABCWidth(hdc, &sc, 'a', &abc); + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, &abc); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(abc.abcB != 0, "Unexpected width.\n"); + + ret = GetCharABCWidthsI(hdc, glyph, 1, NULL, &abc2); + ok(ret, "Failed to get char width.\n"); + ok(!memcmp(&abc, &abc2, sizeof(abc)), "Unexpected width.\n"); + + ScriptFreeCache(&sc); + + /* Bitmap font */ + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "System"); + lf.lfHeight = 20; + + hfont = CreateFontIndirectA(&lf); + prev_hfont = SelectObject(hdc, hfont); + + ret = GetTextMetricsA(hdc, &tm); + ok(ret, "Failed to get text metrics.\n"); + ok(!(tm.tmPitchAndFamily & TMPF_TRUETYPE), "Unexpected TrueType font.\n"); + ok(tm.tmPitchAndFamily & TMPF_FIXED_PITCH, "Unexpected fixed pitch font.\n"); + + glyph = 0; + ret = GetGlyphIndicesA(hdc, "i", 1, &glyph, 0); + ok(ret == 1, "Failed to get glyph index.\n"); + ok(glyph != 0, "Unexpected glyph index.\n"); + + sc = NULL; + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, &abc); + ok(hr == S_OK, "Failed to get glyph width, hr %#x.\n", hr); + ok(abc.abcB != 0, "Unexpected width.\n"); + + ret = GetCharWidthI(hdc, glyph, 1, NULL, &width); + ok(ret, "Failed to get char width.\n"); + abc2.abcA = abc2.abcC = 0; + abc2.abcB = width; + ok(!memcmp(&abc, &abc2, sizeof(abc)), "Unexpected width.\n"); + + SelectObject(hdc, prev_hfont); + DeleteObject(hfont); ScriptFreeCache(&sc); } -- 2.19.2

1 3

[PATCH v2] Add .editorconfig file
by Eberhard Beilharz Dec. 13, 2018

Dec. 13, 2018

This allows editors and IDEs to automatically adjust settings to the coding style prefered by Wine (cf. https://editorconfig.org/) Signed-off-by: Eberhard Beilharz <eb1(a)sil.org> --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..71dc8633f8 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +# Defaults +[*] +indent_style = space +indent_size = 4 +tab_width = 4 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false +max_line_length = 100 -- 2.19.2

2 3

Feature Proposal: Implementing an interface to the object manager via shared memory
by Derek Lesho Dec. 13, 2018

Dec. 13, 2018

Currently, two apps/drivers that I know of, Battleye (BEDaisy.sys) and EasyAnticheat (EasyAntiCheat.sys) utilize the object manager. Right now, we can only emulate this by setting the object pointers to handle values, and interpreting the pointers as such when app passes it to another function. The problem is, not all object pointers are opaque, and some apps (EAC) try to read the contents of the structure even when they documented as being opaque. To get around this, we could try filling in dummy data on a case-per-case basis, but this solution may not hold up on rapidly changing software like anti-cheat software. My proposal is that we utilize shared memory, written to by the object manager in wineserver, and mapped as read only in all of the winedevice processes to implement the kernel's object manager interface. Wineserver would update data in the object structures as necessary, and when an driver calls something like ObReferenceObjectByHandle, we would request a pointer to the simulated structure. I haven't worked out all of the kinks on how practical this would be, and am only getting started with my implementation, but I'm curious what you guys think of this idea. I know shared memory is generally not supposed to be used, but I can't think of anything else that would retain the accuracy.

2 1