wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Zebediah Figura : user32/tests: Add some tests for release of capture via modal dialogs.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 3af67c2c6381afcfa9fa2598181ea8f360853f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3af67c2c6381afcfa9fa2598… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 6 22:49:47 2021 -0600 user32/tests: Add some tests for release of capture via modal dialogs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c75e06528830fb882f2664d42c1d1802707bc766) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/dialog.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 2a7d71f67a2..c7f80c7b734 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2176,6 +2176,89 @@ static void test_dialog_custom_data(void) DialogBoxA(g_hinst, "CUSTOM_TEST_DIALOG", NULL, custom_test_dialog_proc); } +static INT_PTR CALLBACK capture_release_proc(HWND dialog, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_INITDIALOG) + { + HWND child = (HWND)lparam; + DWORD style; + + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + PostMessageA(dialog, WM_USER, 0, (LPARAM)child); + } + else if (message == WM_USER) + { + HWND child = (HWND)lparam; + DWORD style; + + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + EndDialog(dialog, 1); + } + return FALSE; +} + +static INT_PTR CALLBACK capture_release_modeless_proc(HWND dialog, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_INITDIALOG) + { + HWND child = (HWND)lparam; + DWORD style; + + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + PostMessageA(dialog, WM_QUIT, 0, 0); + } + return FALSE; +} + +static void test_capture_release(void) +{ + HWND window, child, dialog; + INT_PTR ret; + MSG msg; + + /* Set the capture to a child window. The main window will receive + * WM_CANCELMODE when being disabled, but the child window will retain + * capture. */ + + window = CreateWindowA("static", "parent", 0, 100, 200, 300, 400, NULL, NULL, NULL, NULL); + child = CreateWindowA("static", "child", WS_CHILD, 10, 20, 100, 100, window, NULL, NULL, NULL); + + SetCapture(child); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", NULL, capture_release_proc, (LPARAM)child); + ok(ret == 1, "got %#Ix\n", ret); + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + + SetCapture(child); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", window, capture_release_proc, (LPARAM)child); + ok(ret == 1, "got %#Ix\n", ret); + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + + SetCapture(child); + dialog = CreateDialogParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", + window, capture_release_modeless_proc, (LPARAM)child); + ok(!!dialog, "failed to create dialog\n"); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + ShowWindow(dialog, SW_SHOWNORMAL); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + while (GetMessageA(&msg, NULL, 0, 0)) + DispatchMessageA(&msg); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + + DestroyWindow(dialog); + + DestroyWindow(child); + DestroyWindow(window); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -2195,4 +2278,5 @@ START_TEST(dialog) test_SaveRestoreFocus(); test_timer_message(); test_MessageBox(); + test_capture_release(); }

1 0

Giovanni Mascellani : d2d1: Implement ellipse drawing.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: ea029623b62faac321d03d96fcd5bd3f5871649b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea029623b62faac321d03d96… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Jan 28 16:35:45 2020 +0330 d2d1: Implement ellipse drawing. Currently the ellipse is approximated with quadratic Bézier curves. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aec8701399ff0e9a0f368e0392b0aedd2841ca94) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 14 +++ dlls/d2d1/factory.c | 20 +++- dlls/d2d1/geometry.c | 275 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 306 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea029623b62faac321d0…

1 0

Akihiro Sagawa : d3dx9: Avoid closing invalid handles.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 81e772332bd3fbe9f7454a41db6a27b919d99cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e772332bd3fbe9f7454a41… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 21 22:44:00 2020 +0900 d3dx9: Avoid closing invalid handles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50373 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e27a95e92097a601baa9b0e9dd6fcc5013c863fa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 5be9083360a..39afe6740c0 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -134,8 +134,10 @@ HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) return S_OK; error: - CloseHandle(hmapping); - CloseHandle(hfile); + if (hmapping) + CloseHandle(hmapping); + if (hfile != INVALID_HANDLE_VALUE) + CloseHandle(hfile); return HRESULT_FROM_WIN32(GetLastError()); }

1 0

Nikolay Sivov : ole32/propstorage: Handle VT_I8/VT_UI8 when serializing properties.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: d822a9c15d23982d54345dbc1330d31d87496234 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d822a9c15d23982d54345dbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 00:07:05 2020 +0300 ole32/propstorage: Handle VT_I8/VT_UI8 when serializing properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c455053486e717b6518ec292444f0284ae442a2b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/stg_prop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8421353155b..fb3a5525918 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1884,6 +1884,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, HRESULT hr; LARGE_INTEGER seek; PROPERTYIDOFFSET propIdOffset; + ULARGE_INTEGER ularge; ULONG count; DWORD dwType, bytesWritten; @@ -1945,6 +1946,13 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count; break; } + case VT_I8: + case VT_UI8: + { + StorageUtl_WriteULargeInteger(&ularge, 0, &var->u.uhVal); + hr = IStream_Write(This->stm, &ularge, sizeof(ularge), &bytesWritten); + break; + } case VT_LPSTR: { DWORD len, dwTemp;

1 0

Dmitry Timoshkov : usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 70bbc9566431ad520fa48de4ce7e1fc8688f0095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70bbc9566431ad520fa48de4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 21 18:57:00 2020 +0800 usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts. Use same check as ScriptShapeOpenType() does, fixes painting of non-latin characters in Wordpad using MS Sans Serif font. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 24e09ac5823083bfd2e283e8b19e96a60d745e6e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/usp10/usp10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f0978680a91..9f3847b657c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3606,10 +3606,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!hdc || !psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - fuOptions &= ETO_CLIPPED + ETO_OPAQUE; + fuOptions &= ETO_CLIPPED | ETO_OPAQUE; fuOptions |= ETO_IGNORELANGUAGE; - if (!psa->fNoGlyphIndex) /* Have Glyphs? */ - fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ + if (!psa->fNoGlyphIndex && *psc && ((ScriptCache *)*psc)->sfnt) + fuOptions |= ETO_GLYPH_INDEX; /* We do actually have glyph indices */ if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx)))) return E_OUTOFMEMORY;

1 0

Alexandre Abgrall : msxml3: Fix value of 'fetched' in IEnumVARIANT::Next() for IXMLDOMSelection.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 29d66a981dba54f0212fe27d0fb5ee40a987e476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d66a981dba54f0212fe27d… Author: Alexandre Abgrall <aabgrall98(a)gmail.com> Date: Sun Sep 13 14:18:17 2020 +0200 msxml3: Fix value of 'fetched' in IEnumVARIANT::Next() for IXMLDOMSelection. It must be the number of elements returned in 'var', as specified here: https://docs.microsoft.com/en-us/windows/win32/api/oaidl/nf-oaidl-ienumvari… Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40430 Signed-off-by: Alexandre Abgrall <aabgrall98(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 72f42516b2f324ef9b8f2427c514d9ea152a23b4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/selection.c | 2 +- dlls/msxml3/tests/domdoc.c | 104 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 90 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 31be4d8f101..3698d036d42 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -519,7 +519,7 @@ static HRESULT WINAPI enumvariant_Next( ret_count++; } - if (fetched) (*fetched)++; + if (fetched) *fetched = ret_count; /* we need to advance one step more for some reason */ if (ret_count) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 843343aa00b..6e2f03ad630 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9900,9 +9900,9 @@ static void test_selection(void) IXMLDOMNode *node; IDispatch *disp; VARIANT_BOOL b; + VARIANT v[3]; HRESULT hr; DISPID did; - VARIANT v; BSTR name; ULONG ret; LONG len; @@ -10072,33 +10072,32 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); /* no-op if zero count */ - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 0, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 0, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_I2, "got var type %d\n", V_VT(&v)); + ok(V_VT(&v[0]) == VT_I2, "got var type %d\n", V_VT(&v[0])); /* positive count, null array pointer */ hr = IEnumVARIANT_Next(enum1, 1, NULL, NULL); EXPECT_HR(hr, E_INVALIDARG); - ret = 1; hr = IEnumVARIANT_Next(enum1, 1, NULL, &ret); EXPECT_HR(hr, E_INVALIDARG); ok(ret == 0, "got %d\n", ret); - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 1, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, _bstr_("a")), "got node name %s\n", wine_dbgstr_w(name)); SysFreeString(name); IXMLDOMNode_Release(node); - VariantClear(&v); + VariantClear(&v[0]); /* list cursor is updated */ hr = IXMLDOMSelection_nextNode(selection, &node); @@ -10109,18 +10108,18 @@ static void test_selection(void) IXMLDOMNode_Release(node); SysFreeString(name); - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 1, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, _bstr_("b")), "got node name %s\n", wine_dbgstr_w(name)); SysFreeString(name); IXMLDOMNode_Release(node); - VariantClear(&v); + VariantClear(&v[0]); IEnumVARIANT_Release(enum1); hr = IXMLDOMSelection_nextNode(selection, &node); @@ -10131,6 +10130,81 @@ static void test_selection(void) IXMLDOMNode_Release(node); SysFreeString(name); + /* getting multiple elements */ + enum1 = NULL; + hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum1); + EXPECT_HR(hr, S_OK); + ok(enum1 != NULL, "got %p\n", enum1); + + V_VT(&v[1]) = VT_EMPTY; + V_VT(&v[0]) = VT_EMPTY; + hr = IEnumVARIANT_Next(enum1, 2, v, &ret); + EXPECT_HR(hr, S_OK); + ok(ret == 2, "got %d, expected 2\n", ret); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + ok(V_VT(&v[1]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[1])); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"a"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + ok(!lstrcmpW(name, L"b"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + VariantClear(&v[1]); + VariantClear(&v[0]); + + /* IEnumVARIANT_Next makes the IXMLDOMSelection cursor advance one step more */ + hr = IXMLDOMSelection_nextNode(selection, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"d"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + /* The IEnumVARIANT cursor is still at position '2', */ + /* therefore attempting to fetch 4 elements yields 'c' and 'd' */ + V_VT(&v[2]) = VT_NULL; + V_VT(&v[1]) = VT_EMPTY; + V_VT(&v[0]) = VT_EMPTY; + hr = IEnumVARIANT_Next(enum1, 4, v, &ret); + EXPECT_HR(hr, S_FALSE); + ok(ret == 2, "got %d, expected 2\n", ret); + + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"c"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + ok(V_VT(&v[1]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[1])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"d"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + ok(V_VT(&v[2]) == VT_EMPTY, "got var type %d, expected %d (VT_EMPTY)\n", V_VT(&v[2]), VT_EMPTY); + + VariantClear(&v[1]); + VariantClear(&v[0]); + + IEnumVARIANT_Release(enum1); + IXMLDOMSelection_Release(selection); IXMLDOMNodeList_Release(list); IXMLDOMDocument_Release(doc);

1 0

Rémi Bernon : user32: Return TRUE from ShowWindow(SW_SHOW) if already visible.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 7b8cf3ad4ef35595cc1f67202ccf5368f5d8a6a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b8cf3ad4ef35595cc1f6720… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 11 11:52:01 2020 +0200 user32: Return TRUE from ShowWindow(SW_SHOW) if already visible. Instead of calling SendMessage, similarly to the SW_HIDE case. Based on a patch by Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39731 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d50c310da96565dec98977e96a2d887097a6c1cf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 22 ++++++++++++++++++++-- dlls/user32/winpos.c | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 935e4379e97..7607059d090 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5059,7 +5059,7 @@ static void test_WM_DEVICECHANGE(HWND hwnd) } } -static DWORD CALLBACK show_window_thread(LPVOID arg) +static DWORD CALLBACK hide_window_thread( LPVOID arg ) { HWND hwnd = arg; @@ -5069,6 +5069,16 @@ static DWORD CALLBACK show_window_thread(LPVOID arg) return 0; } +static DWORD CALLBACK show_window_thread( LPVOID arg ) +{ + HWND hwnd = arg; + + /* function will not return if ShowWindow(SW_SHOW) calls SendMessage() */ + ok( ShowWindow( hwnd, SW_SHOW ), "ShowWindow(SW_SHOW) expected TRUE\n" ); /* actually it's 24... */ + + return 0; +} + /* Helper function to easier test SetWindowPos messages */ #define test_msg_setpos( expected_list, flags, todo ) \ test_msg_setpos_( (expected_list), (flags), (todo), __FILE__, __LINE__) @@ -5130,7 +5140,7 @@ static void test_messages(void) ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); /* test ShowWindow(SW_HIDE) on a hidden window - multi-threaded */ - hthread = CreateThread(NULL, 0, show_window_thread, hwnd, 0, &tid); + hthread = CreateThread( NULL, 0, hide_window_thread, hwnd, 0, &tid ); ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(hthread); @@ -5141,6 +5151,14 @@ static void test_messages(void) flush_events(); ok_sequence(WmShowOverlappedSeq, "ShowWindow(SW_SHOW):overlapped", TRUE); + /* test ShowWindow(SW_SHOW) on a visible window - multi-threaded */ + hthread = CreateThread( NULL, 0, show_window_thread, hwnd, 0, &tid ); + ok( hthread != NULL, "CreateThread failed, error %d\n", GetLastError() ); + ok( WaitForSingleObject( hthread, INFINITE ) == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + CloseHandle( hthread ); + flush_events(); + ok_sequence( WmEmptySeq, "ShowWindow(SW_SHOW):overlapped", FALSE ); + ShowWindow(hwnd, SW_HIDE); flush_events(); ok_sequence(WmHideOverlappedSeq, "ShowWindow(SW_HIDE):overlapped", FALSE); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index f759bd10f94..968f519478c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1231,6 +1231,9 @@ BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) return FALSE; + if ((cmd == SW_SHOW) && (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) + return TRUE; + return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); }

1 0

Biswapriyo Nath : ntdll: Add RtlDefaultNpAcl stub.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: b95ab15e28e75c1a641cf81fc20cf3887cfdd9f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b95ab15e28e75c1a641cf81f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Nov 28 00:01:40 2020 +0530 ntdll: Add RtlDefaultNpAcl stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49900 Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2d0fefbc49e202fa7f8ae21eb435b5fd91ceb8aa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index fe36235bdad..7c018f3192a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -567,7 +567,7 @@ @ stdcall RtlDecodeSystemPointer(ptr) RtlDecodePointer @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) @ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) -@ stub RtlDefaultNpAcl +@ stdcall RtlDefaultNpAcl(ptr) @ stub RtlDelete @ stdcall RtlDeleteAce(ptr long) @ stdcall RtlDeleteAtomFromAtomTable(ptr long) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 464104d6de8..173253e3e04 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1922,3 +1922,14 @@ BOOL WINAPI RtlConvertToAutoInheritSecurityObject( return FALSE; } + +/****************************************************************************** + * RtlDefaultNpAcl (NTDLL.@) + */ +NTSTATUS WINAPI RtlDefaultNpAcl(PACL *pAcl) +{ + FIXME("%p - stub\n", pAcl); + + *pAcl = NULL; + return STATUS_SUCCESS; +}

1 0

Esme Povirk : mscoree: Use builtin XNA implementation by default.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: b2283ddcbb233175c6f45996d285ebffe2a3a804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2283ddcbb233175c6f45996… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Aug 11 22:15:46 2020 -0500 mscoree: Use builtin XNA implementation by default. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32877 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f87171c6013603decfc64f405bb039b5c1f1add4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/metahost.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 4c1e4e97c1e..9acaf2e6991 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1480,6 +1480,10 @@ static DWORD get_basename_search_flags(const char *basename, MonoAssemblyName *a return reg_entry.flags; } + if (strcmp(basename, "Microsoft.Xna.Framework.*") == 0) + /* XNA redist is broken in Wine Mono, use FNA instead. */ + return 0; + return ASSEMBLY_SEARCH_UNDEFINED; }

1 0

Robert Wilhelm : vbscript: Remove overzealous check in parse_hex_literal.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 414de099edcc0a3d62afe227babc870c567518fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=414de099edcc0a3d62afe227… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Nov 27 17:33:21 2020 +0100 vbscript: Remove overzealous check in parse_hex_literal. is_identifier_char also triggers on logical operators like "or". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50179 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9821da55469bed316dbe2e6b54273da742ad3450) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/lex.c | 2 +- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index a03c34ffe26..4af58be0756 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -315,7 +315,7 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) while((d = hex_to_int(*++ctx->ptr)) != -1) l = l*16 + d; - if(begin + 9 /* max digits+1 */ < ctx->ptr || (*ctx->ptr != '&' && is_identifier_char(*ctx->ptr))) { + if(begin + 9 /* max digits+1 */ < ctx->ptr) { FIXME("invalid literal\n"); return 0; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2c5385f3a8f..b248c6d964d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -60,6 +60,7 @@ Call ok(&hfffe = -2, "&hfffe <> -2") Call ok(&hffff& = 65535, "&hffff& <> -1") Call ok(&hfffe& = 65534, "&hfffe& <> -2") Call ok(&hffffffff& = -1, "&hffffffff& <> -1") +Call ok((&h01or&h02)=3,"&h01or&h02 <> 3") W = 5 Call ok(W = 5, "W = " & W & " expected " & 5)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021