November 2017 - Wine-devel - list.winehq.org

[PATCH 1/5] user32/tests: Don't leave a stray test window behind.
by Dmitry Timoshkov 13 Nov '17

13 Nov '17

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index feca2bee51..eace140388 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4932,6 +4932,7 @@ static void test_dialog_parent(void) ok(!IsWindowEnabled(other), "other is enabled\n"); EnableWindow(other, TRUE); + DestroyWindow(other); DestroyWindow(parent); } -- 2.15.0

1 0

[PATCH] riched20: Protect against pasting multi-line text in single-line control.
by Rafał Harabień 13 Nov '17

13 Nov '17

Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/riched20/caret.c | 4 ++++ dlls/riched20/tests/editor.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 26af743..8a99394 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -551,6 +551,10 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_DisplayItem *tp, *end_run, *run, *prev; int eol_len = 0; + /* Check if new line is allowed for this control */ + if (!(editor->styleFlags & ES_MULTILINE)) + break; + /* Find number of CR and LF in end of paragraph run */ if (*pos =='\r') { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a19ec85..d5fd8c0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -70,6 +70,10 @@ static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS20A, ES_MULTILINE, parent); } +static HWND new_richedit_with_style(HWND parent, DWORD style) { + return new_window(RICHEDIT_CLASS20A, style, parent); +} + static HWND new_richeditW(HWND parent) { return new_windowW(RICHEDIT_CLASS20W, ES_MULTILINE, parent); } @@ -5509,10 +5513,20 @@ static void test_WM_PASTE(void) /* Cut from read-only control */ SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); SendMessageA(hwndRichEdit, WM_CUT, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer,"cut\r\n"); ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + OleFlushClipboard(); /* flush is needed because of broken OleClipboard implementation */ + DestroyWindow(hwndRichEdit); + /* Paste multi-line text into single-line control */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer,"cut"); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); DestroyWindow(hwndRichEdit); } -- 2.7.4

2 1

[PATCH v2] winex11.drv: Preserve last error in x11drv_thread_data().
by Rafał Harabień 13 Nov '17

13 Nov '17

Issue was caused by TlsGetValue always resetting error to ERROR_SUCCESS. This change fixes GetCursorPos resetting last-error randomly. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/tests/input.c | 10 +++++++++- dlls/winex11.drv/x11drv.h | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f2576d..0b72835 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1928,8 +1928,16 @@ static void test_Input_mouse(void) DWORD thread_id; POINT pt, pt_org; MSG msg; + BOOL ret; - GetCursorPos(&pt_org); + SetLastError(0xdeadbeef); + ret = GetCursorPos(NULL); + ok(!ret, "GetCursorPos succeed\n"); + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_NOACCESS, "error %lu\n", GetLastError()); + + ret = GetCursorPos(&pt_org); + ok(ret, "GetCursorPos failed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 721c082..6786a08 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -345,7 +345,12 @@ extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - return TlsGetValue( thread_data_tls_index ); + /* TlsGetValue always resets last error */ + unsigned long err = GetLastError(); + struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + if (err != ERROR_SUCCESS && GetLastError() == ERROR_SUCCESS) + SetLastError(err); + return data; } /* retrieve the thread display, or NULL if not created yet */ -- 2.7.4

1 0

Re: [PATCH 1/4] winex11.drv: Preserve last error in x11drv_thread_data().
by Marvin 13 Nov '17

13 Nov '17

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=34115 Your paranoid android. === wvistau64 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w2008s64 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w7u (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w7pro64 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w8 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w864 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w1064 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === wvistau64 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w2008s64 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w7pro64 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w864 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w1064 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998

1 0

[PATCH 1/4] winex11.drv: Preserve last error in x11drv_thread_data().
by Rafał Harabień 12 Nov '17

12 Nov '17

Issue was caused by TlsGetValue always resetting error to ERROR_SUCCESS. This change fixes GetCursorPos resetting last-error randomly. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/tests/input.c | 10 +++++++++- dlls/winex11.drv/x11drv.h | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f2576d..0f0f137 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1928,8 +1928,16 @@ static void test_Input_mouse(void) DWORD thread_id; POINT pt, pt_org; MSG msg; + BOOL ret; - GetCursorPos(&pt_org); + SetLastError(0xdeadbeef); + ret = GetCursorPos(NULL); + ok(!ret, "GetCursorPos succeed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); + + ret = GetCursorPos(&pt_org); + ok(ret, "GetCursorPos failed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 721c082..6786a08 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -345,7 +345,12 @@ extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - return TlsGetValue( thread_data_tls_index ); + /* TlsGetValue always resets last error */ + unsigned long err = GetLastError(); + struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + if (err != ERROR_SUCCESS && GetLastError() == ERROR_SUCCESS) + SetLastError(err); + return data; } /* retrieve the thread display, or NULL if not created yet */ -- 2.7.4

1 3

[PATCH] ws2_32: avoid crashes on flaky/non-present network
by Marcus Meissner 12 Nov '17

12 Nov '17

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/ws2_32/tests/sock.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 179ace4c6a..cefc62326e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7657,10 +7657,12 @@ static void test_GetAddrInfoExW(void) ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); ok(result != NULL, "result == NULL\n"); - ok(!result->ai_blob, "ai_blob != NULL\n"); - ok(!result->ai_bloblen, "ai_bloblen != 0\n"); - ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); - pFreeAddrInfoExW(result); + if (result != NULL) { + ok(!result->ai_blob, "ai_blob != NULL\n"); + ok(!result->ai_bloblen, "ai_bloblen != 0\n"); + ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); + pFreeAddrInfoExW(result); + } result = (void*)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped)); -- 2.15.0

1 0

[PATCH] gdi32: change negative values in OS2 struct to 0
by Marcus Meissner 12 Nov '17

12 Nov '17

fixes gdiplus:font testcase with Goha-Tibeb Zemen font. Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/gdi32/freetype.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..0e85f98169 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7928,8 +7928,26 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmAscent = SCALE_Y(pOS2->sTypoAscender); font->potm->otmDescent = SCALE_Y(pOS2->sTypoDescender); font->potm->otmLineGap = SCALE_Y(pOS2->sTypoLineGap); - font->potm->otmsCapEmHeight = SCALE_Y(pOS2->sCapHeight); - font->potm->otmsXHeight = SCALE_Y(pOS2->sxHeight); + /* There is one font which has 0x8000 in it, which would be -32768 and not map + * to an unsigned integer */ + if (pOS2->sCapHeight < 0) + { + font->potm->otmsCapEmHeight = 0; + WARN("%s sCapHeight=%d\n",debugstr_w(font->name), pOS2->sCapHeight); + } + else + { + font->potm->otmsCapEmHeight = SCALE_Y(pOS2->sCapHeight); + } + if (pOS2->sxHeight < 0) + { + font->potm->otmsXHeight = 0; + WARN("%s sxHeight=%d\n",debugstr_w(font->name), pOS2->sxHeight); + } + else + { + font->potm->otmsXHeight = SCALE_Y(pOS2->sxHeight); + } font->potm->otmrcFontBox.left = SCALE_X(ft_face->bbox.xMin); font->potm->otmrcFontBox.right = SCALE_X(ft_face->bbox.xMax); font->potm->otmrcFontBox.top = SCALE_Y(ft_face->bbox.yMax); -- 2.15.0

2 1

[PATCH] V3 msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 12 Nov '17

12 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..9b4298c89f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x80) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0xc00000) + { + case 0xc00000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x800000: flags |= MSVCRT__RC_DOWN; break; + case 0x400000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x1000000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x80; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0xc00000; break; + case MSVCRT__RC_DOWN: fpword |= 0x800000; break; + case MSVCRT__RC_UP: fpword |= 0x200000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x1000000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] V2 msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 12 Nov '17

12 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..9b4298c89f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0xc00000) + { + case 0xc00000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x800000: flags |= MSVCRT__RC_DOWN; break; + case 0x400000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x1000000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0xc00000; break; + case MSVCRT__RC_DOWN: fpword |= 0x800000; break; + case MSVCRT__RC_UP: fpword |= 0x200000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x1000000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH 1/2] user32/tests: Test manually setting WS_VSCROLL on combobox listbox
by Fabian Maurer 11 Nov '17

11 Nov '17

A test to narrow down the problem from Bug 43465 wrong. Proves my hack I attached there wrong. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/combo.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 03fc412e41..0519ace51c 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -806,11 +806,54 @@ static void test_listbox_size(DWORD style) } } +void test_WS_VSCROLL(void) +{ + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + HWND hCombo, hList; + COMBOBOXINFO info; + DWORD style; + BOOL ret; + int i; + + pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo) + { + win_skip("GetComboBoxInfo is not available\n"); + return; + } + info.cbSize = sizeof(info); + hCombo = build_combo(CBS_DROPDOWNLIST); + + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &info); + ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + hList = info.hwndList; + + for(i = 0; i < 3; i++) + { + char buffer[2]; + sprintf(buffer, "%d", i); + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM)buffer); + } + + style = GetWindowLongA(info.hwndList, GWL_STYLE); + SetWindowLongA(hList, GWL_STYLE, style | WS_VSCROLL); + + SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE, 0); + SendMessageA(hCombo, CB_SHOWDROPDOWN, FALSE, 0); + + style = GetWindowLongA(hList, GWL_STYLE); + ok((style & WS_VSCROLL) != 0, "Style does not include WS_VSCROLL\n"); + + DestroyWindow(hCombo); +} + START_TEST(combo) { hMainWnd = CreateWindowA("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); + test_WS_VSCROLL(); test_setfont(CBS_DROPDOWN); test_setfont(CBS_DROPDOWNLIST); test_setitemheight(CBS_DROPDOWN); -- 2.15.0

1 1