wine-commits December 2023

wine-commits@winehq.org

1 participants
418 discussions

Alexandros Frantzis : winewayland.drv: Implement ClipCursor.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: bf1cabd18fdce203176d783976b8347222ac621e URL: https://gitlab.winehq.org/wine/wine/-/commit/bf1cabd18fdce203176d783976b834… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Nov 30 11:03:11 2023 +0200 winewayland.drv: Implement ClipCursor. Use the zwp_pointer_constraints_v1 protocol to implement cursor clipping. Note that Wayland only allows us to constrain the cursor within the extents of a particular target surface. --- dlls/winewayland.drv/Makefile.in | 1 + .../pointer-constraints-unstable-v1.xml | 339 +++++++++++++++++++++ dlls/winewayland.drv/wayland.c | 10 + dlls/winewayland.drv/wayland_pointer.c | 141 +++++++++ dlls/winewayland.drv/wayland_surface.c | 2 + dlls/winewayland.drv/waylanddrv.h | 6 + dlls/winewayland.drv/waylanddrv_main.c | 1 + dlls/winewayland.drv/window.c | 6 + 8 files changed, 506 insertions(+)

1 0

Alexandros Frantzis : winewayland.drv: Remove duplicate handling of wp_viewporter global.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: cf267c60562a7730b78f48d9d351efd79c16d968 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf267c60562a7730b78f48d9d351ef… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Nov 30 10:59:18 2023 +0200 winewayland.drv: Remove duplicate handling of wp_viewporter global. --- dlls/winewayland.drv/wayland.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index f7119367543..31cd27f7a76 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -154,11 +154,6 @@ static void registry_handle_global(void *data, struct wl_registry *registry, process_wayland.wl_subcompositor = wl_registry_bind(registry, id, &wl_subcompositor_interface, 1); } - else if (strcmp(interface, "wp_viewporter") == 0) - { - process_wayland.wp_viewporter = - wl_registry_bind(registry, id, &wp_viewporter_interface, 1); - } } static void registry_handle_global_remove(void *data, struct wl_registry *registry,

1 0

Alexandros Frantzis : winewayland.drv: Handle window foreground state on keyboard focus.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 7841182172db51ad0aa0934259eae52ca58cc49e URL: https://gitlab.winehq.org/wine/wine/-/commit/7841182172db51ad0aa0934259eae5… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Dec 1 15:10:16 2023 +0200 winewayland.drv: Handle window foreground state on keyboard focus. Borrow the concept of "managed" windows from WineX11 and use it to decide whether a window should become the foreground window when receiving the Wayland keyboard focus. --- dlls/winewayland.drv/wayland_keyboard.c | 7 +++ dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/window.c | 99 +++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+) diff --git a/dlls/winewayland.drv/wayland_keyboard.c b/dlls/winewayland.drv/wayland_keyboard.c index 26cf3e8a7af..ba6a66995a6 100644 --- a/dlls/winewayland.drv/wayland_keyboard.c +++ b/dlls/winewayland.drv/wayland_keyboard.c @@ -698,6 +698,7 @@ static void keyboard_handle_enter(void *data, struct wl_keyboard *wl_keyboard, struct wl_array *keys) { struct wayland_keyboard *keyboard = &process_wayland.keyboard; + struct wayland_surface *surface; HWND hwnd; if (!wl_surface) return; @@ -713,6 +714,12 @@ static void keyboard_handle_enter(void *data, struct wl_keyboard *wl_keyboard, NtUserPostMessage(keyboard->focused_hwnd, WM_INPUTLANGCHANGEREQUEST, 0 /*FIXME*/, (LPARAM)keyboard_hkl); + + if ((surface = wayland_surface_lock_hwnd(hwnd))) + { + if (surface->window.managed) NtUserSetForegroundWindow(hwnd); + pthread_mutex_unlock(&surface->mutex); + } } static void keyboard_handle_leave(void *data, struct wl_keyboard *wl_keyboard, diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 0e781352519..08abc247e16 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -167,6 +167,7 @@ struct wayland_window_config /* The scale (i.e., normalized dpi) the window is rendering at. */ double scale; BOOL visible; + BOOL managed; }; struct wayland_client_surface diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 31ecb6542c6..93a730e8ada 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -27,6 +27,9 @@ #include <assert.h> #include <stdlib.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS + #include "waylanddrv.h" #include "wine/debug.h" @@ -47,6 +50,7 @@ struct wayland_win_data RECT window_rect; /* USER client rectangle relative to win32 parent window client area */ RECT client_rect; + BOOL managed; }; static int wayland_win_data_cmp_rb(const void *key, @@ -182,6 +186,7 @@ static void wayland_win_data_get_config(struct wayland_win_data *data, conf->state = window_state; conf->scale = NtUserGetDpiForWindow(data->hwnd) / 96.0; conf->visible = (style & WS_VISIBLE) == WS_VISIBLE; + conf->managed = data->managed; } static void wayland_win_data_update_wayland_surface(struct wayland_win_data *data) @@ -287,6 +292,99 @@ out: wl_display_flush(process_wayland.wl_display); } +static BOOL is_managed(HWND hwnd) +{ + struct wayland_win_data *data = wayland_win_data_get(hwnd); + BOOL ret = data && data->managed; + if (data) wayland_win_data_release(data); + return ret; +} + +static HWND *build_hwnd_list(void) +{ + NTSTATUS status; + HWND *list; + ULONG count = 128; + + for (;;) + { + if (!(list = malloc(count * sizeof(*list)))) return NULL; + status = NtUserBuildHwndList(0, 0, 0, 0, 0, count, list, &count); + if (!status) return list; + free(list); + if (status != STATUS_BUFFER_TOO_SMALL) return NULL; + } +} + +static BOOL has_owned_popups(HWND hwnd) +{ + HWND *list; + UINT i; + BOOL ret = FALSE; + + if (!(list = build_hwnd_list())) return FALSE; + + for (i = 0; list[i] != HWND_BOTTOM; i++) + { + if (list[i] == hwnd) break; /* popups are always above owner */ + if (NtUserGetWindowRelative(list[i], GW_OWNER) != hwnd) continue; + if ((ret = is_managed(list[i]))) break; + } + + free(list); + return ret; +} + +static inline HWND get_active_window(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo(GetCurrentThreadId(), &info) ? info.hwndActive : 0; +} + +/*********************************************************************** + * is_window_managed + * + * Check if a given window should be managed + */ +static BOOL is_window_managed(HWND hwnd, UINT swp_flags, const RECT *window_rect) +{ + DWORD style, ex_style; + + /* child windows are not managed */ + style = NtUserGetWindowLongW(hwnd, GWL_STYLE); + if ((style & (WS_CHILD|WS_POPUP)) == WS_CHILD) return FALSE; + /* activated windows are managed */ + if (!(swp_flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW))) return TRUE; + if (hwnd == get_active_window()) return TRUE; + /* windows with caption are managed */ + if ((style & WS_CAPTION) == WS_CAPTION) return TRUE; + /* windows with thick frame are managed */ + if (style & WS_THICKFRAME) return TRUE; + if (style & WS_POPUP) + { + HMONITOR hmon; + MONITORINFO mi; + + /* popup with sysmenu == caption are managed */ + if (style & WS_SYSMENU) return TRUE; + /* full-screen popup windows are managed */ + hmon = NtUserMonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); + mi.cbSize = sizeof(mi); + NtUserGetMonitorInfo(hmon, &mi); + if (window_rect->left <= mi.rcWork.left && window_rect->right >= mi.rcWork.right && + window_rect->top <= mi.rcWork.top && window_rect->bottom >= mi.rcWork.bottom) + return TRUE; + } + /* application windows are managed */ + ex_style = NtUserGetWindowLongW(hwnd, GWL_EXSTYLE); + if (ex_style & WS_EX_APPWINDOW) return TRUE; + /* windows that own popups are managed */ + if (has_owned_popups(hwnd)) return TRUE; + /* default: not managed */ + return FALSE; +} + /*********************************************************************** * WAYLAND_DestroyWindow */ @@ -369,6 +467,7 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, data->window_rect = *window_rect; data->client_rect = *client_rect; + data->managed = is_window_managed(hwnd, swp_flags, window_rect); if (surface) window_surface_add_ref(surface); if (data->window_surface) window_surface_release(data->window_surface);

1 0

Daniel Lehman : msxml3: Handle default namespace in get_namespaceURI.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 57a391b85bed02322b16f996b52ab92a778d1775 URL: https://gitlab.winehq.org/wine/wine/-/commit/57a391b85bed02322b16f996b52ab9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Nov 28 21:51:28 2023 -0800 msxml3: Handle default namespace in get_namespaceURI. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53531 --- dlls/msxml3/attribute.c | 44 +++++++++++++++++++++++++++++--------------- dlls/msxml3/tests/domdoc.c | 3 --- dlls/msxml4/tests/domdoc.c | 4 ---- dlls/msxml6/tests/domdoc.c | 12 ++---------- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 76c690e1ad0..a6cd8a12abc 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -543,10 +543,11 @@ static HRESULT WINAPI domattr_get_namespaceURI( IXMLDOMAttribute *iface, BSTR* p) { - static const WCHAR w3xmlns[] = { 'h','t','t','p',':','/','/', 'w','w','w','.','w','3','.', - 'o','r','g','/','2','0','0','0','/','x','m','l','n','s','/',0 }; domattr *This = impl_from_IXMLDOMAttribute( iface ); xmlNsPtr ns = This->node.node->ns; + BSTR nodename, pfx; + BOOL is6, isdefault; + HRESULT hr; TRACE("(%p)->(%p)\n", This, p); @@ -554,22 +555,35 @@ static HRESULT WINAPI domattr_get_namespaceURI( return E_INVALIDARG; *p = NULL; + nodename = NULL; + hr = IXMLDOMAttribute_get_nodeName(iface, &nodename); + if (FAILED(hr)) + return hr; + + pfx = NULL; + hr = IXMLDOMAttribute_get_prefix(iface, &pfx); + if (FAILED(hr)) + { + SysFreeString(nodename); + return hr; + } - if (ns) + is6 = xmldoc_version(This->node.node->doc) == MSXML6; + isdefault = !wcscmp(nodename, L"xmlns"); + if (isdefault || (pfx && !wcscmp(L"xmlns", pfx))) { - /* special case for default namespace definition */ - if (xmlStrEqual(This->node.node->name, xmlns)) - *p = bstr_from_xmlChar(xmlns); - else if (xmlStrEqual(ns->prefix, xmlns)) - { - if (xmldoc_version(This->node.node->doc) == MSXML6) - *p = SysAllocString(w3xmlns); - else - *p = SysAllocStringLen(NULL, 0); - } - else if (ns->href) - *p = bstr_from_xmlChar(ns->href); + if (is6) + *p = SysAllocString(L"http://www.w3.org/2000/xmlns/"); + else if (!ns || !isdefault) + *p = SysAllocStringLen(NULL, 0); + else + *p = SysAllocString(L"xmlns"); } + else if (ns && ns->href) + *p = bstr_from_xmlChar(ns->href); + + SysFreeString(nodename); + SysFreeString(pfx); TRACE("uri: %s\n", debugstr_w(*p)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7997106bbd0..ce2e7e655eb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13677,7 +13677,6 @@ static void test_namespaces_as_attributes(void) const char *uris[3]; const char *texts[3]; const char *xmls[3]; - BOOL todo; }; static const struct test tests[] = { { @@ -13718,7 +13717,6 @@ static void test_namespaces_as_attributes(void) { "" }, /* namespaceURI */ { "nshref" }, /* text */ { "xmlns=\"nshref\"" }, /* xml */ - TRUE, /* todo */ }, /* no properties or namespaces */ { @@ -13802,7 +13800,6 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_namespaceURI(item, &str); if (test->uris[i]) { - todo_wine_if(test->todo) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (test->prefixes[i] && !strcmp(test->prefixes[i], "xmlns")) ok(!SysStringLen(str), "got %s\n", wine_dbgstr_w(str)); diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 3c5c34f3cb7..1a3a663d359 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -166,7 +166,6 @@ static void test_namespaces_as_attributes(void) const WCHAR *uris[3]; const WCHAR *texts[3]; const WCHAR *xmls[3]; - BOOL todo; }; static const struct test tests[] = { @@ -208,7 +207,6 @@ static void test_namespaces_as_attributes(void) { L"" }, /* namespaceURI */ { L"nshref" }, /* text */ { L"xmlns=\"nshref\"" }, /* xml */ - TRUE, /* todo */ }, /* no properties or namespaces */ { @@ -289,13 +287,11 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_namespaceURI(item, &str); if (test->uris[i]) { - todo_wine_if(test->todo) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (test->prefixes[i] && !lstrcmpW(test->prefixes[i], L"xmlns")) ok(!lstrcmpW(str, L""), "got %s\n", wine_dbgstr_w(str)); else ok(!lstrcmpW(str, test->uris[i]), "got %s\n", wine_dbgstr_w(str)); - } SysFreeString(str); } else diff --git a/dlls/msxml6/tests/domdoc.c b/dlls/msxml6/tests/domdoc.c index b36b8e6510a..d451d0dd50c 100644 --- a/dlls/msxml6/tests/domdoc.c +++ b/dlls/msxml6/tests/domdoc.c @@ -59,12 +59,11 @@ struct attrtest_t { const WCHAR *uri; const WCHAR *prefix; const WCHAR *href; - BOOL todo; }; static struct attrtest_t attrtests[] = { - { L"xmlns", L"http://www.w3.org/2000/xmlns/", NULL, L"http://www.w3.org/2000/xmlns/", TRUE }, - { L"xmlns", L"nondefaulturi", NULL, L"http://www.w3.org/2000/xmlns/", TRUE }, + { L"xmlns", L"http://www.w3.org/2000/xmlns/", NULL, L"http://www.w3.org/2000/xmlns/" }, + { L"xmlns", L"nondefaulturi", NULL, L"http://www.w3.org/2000/xmlns/" }, { L"c", L"http://www.w3.org/2000/xmlns/", NULL, L"http://www.w3.org/2000/xmlns/" }, { L"c", L"nsref1", NULL, L"nsref1" }, { L"ns:c", L"nsref1", L"ns", L"nsref1" }, @@ -113,7 +112,6 @@ static void test_create_attribute(void) str = NULL; hr = IXMLDOMNode_get_namespaceURI(node, &str); ok(hr == S_OK, "%d: unexpected hr %#lx\n", i, hr); - todo_wine_if(ptr->todo) ok(!lstrcmpW(str, _bstr_(ptr->href)) || broken(!ptr->prefix && !lstrcmpW(str, L"xmlns")), /* win7 msxml6 */ "%d: got uri %s, expected %s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(ptr->href)); @@ -171,7 +169,6 @@ static void test_namespaces_as_attributes(void) const WCHAR *uris[3]; const WCHAR *texts[3]; const WCHAR *xmls[3]; - BOOL todo; }; static const struct test tests[] = { @@ -213,7 +210,6 @@ static void test_namespaces_as_attributes(void) { L"http://www.w3.org/2000/xmlns/" }, /* namespaceURI */ { L"nshref" }, /* text */ { L"xmlns=\"nshref\"" }, /* xml */ - TRUE, /* todo */ }, /* no properties or namespaces */ { @@ -273,10 +269,8 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_prefix(item, &str); if (test->prefixes[i]) { - todo_wine_if(test->todo) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(str, test->prefixes[i]), "got %s\n", wine_dbgstr_w(str)); - } SysFreeString(str); } else @@ -292,14 +286,12 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_namespaceURI(item, &str); if (test->uris[i]) { - todo_wine_if(test->todo) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (test->prefixes[i] && !lstrcmpW(test->prefixes[i], L"xmlns")) ok(!lstrcmpW(str, L"http://www.w3.org/2000/xmlns/"), "got %s\n", wine_dbgstr_w(str)); else ok(!lstrcmpW(str, test->uris[i]), "got %s\n", wine_dbgstr_w(str)); - } SysFreeString(str); } else

1 0

Alex Henrie : user.exe: Rename SetDeskWallPaper to SetDeskWallpaper.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: c6f121df19adc233f37e34ca30a2ffcc0148844f URL: https://gitlab.winehq.org/wine/wine/-/commit/c6f121df19adc233f37e34ca30a2ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 7 09:46:01 2023 -0700 user.exe: Rename SetDeskWallPaper to SetDeskWallpaper. Although 16-bit function names are not case sensitive, it's best to match the 32-bit version. --- dlls/user.exe16/user.c | 4 ++-- dlls/user.exe16/user.exe16.spec | 2 +- include/wine/winuser16.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 83554283425..ef3ccc8a9da 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1824,9 +1824,9 @@ WORD WINAPI GetFreeSystemResources16( WORD resType ) /*********************************************************************** - * SetDeskWallPaper (USER.285) + * SetDeskWallpaper (USER.285) */ -BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename ) +BOOL16 WINAPI SetDeskWallpaper16( const char *filename ) { return SetDeskWallpaper( filename ); } diff --git a/dlls/user.exe16/user.exe16.spec b/dlls/user.exe16/user.exe16.spec index ec571800e71..4798ccc2ce5 100644 --- a/dlls/user.exe16/user.exe16.spec +++ b/dlls/user.exe16/user.exe16.spec @@ -282,7 +282,7 @@ 282 pascal -ret16 SelectPalette(word word word) SelectPalette16 283 pascal -ret16 RealizePalette(word) RealizePalette16 284 pascal -ret16 GetFreeSystemResources(word) GetFreeSystemResources16 -285 pascal -ret16 SetDeskWallPaper(ptr) SetDeskWallPaper16 # BEAR285 +285 pascal -ret16 SetDeskWallpaper(str) SetDeskWallpaper16 # BEAR285 286 pascal -ret16 GetDesktopWindow() GetDesktopWindow16 287 pascal -ret16 GetLastActivePopup(word) GetLastActivePopup16 288 pascal GetMessageExtraInfo() GetMessageExtraInfo diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h index 3dc984254c9..90e80c7fdca 100644 --- a/include/wine/winuser16.h +++ b/include/wine/winuser16.h @@ -880,7 +880,7 @@ HWND16 WINAPI SetClipboardViewer16(HWND16); INT16 WINAPI SetCommBreak16(INT16); HCURSOR16 WINAPI SetCursor16(HCURSOR16); void WINAPI SetCursorPos16(INT16,INT16); -BOOL16 WINAPI SetDeskWallPaper16(LPCSTR); +BOOL16 WINAPI SetDeskWallpaper16(const char*); void WINAPI SetDlgItemInt16(HWND16,INT16,UINT16,BOOL16); void WINAPI SetDlgItemText16(HWND16,INT16,SEGPTR); VOID WINAPI SetDoubleClickTime16(UINT16);

1 0

Alex Henrie : user32: Correct capitalization of SetDeskWallpaper.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: adfaef5a866153615035e7e32a6a9d7fd9aec5ad URL: https://gitlab.winehq.org/wine/wine/-/commit/adfaef5a866153615035e7e32a6a9d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 7 09:46:01 2023 -0700 user32: Correct capitalization of SetDeskWallpaper. Spotted by Vijay Kiran Kamuju. --- dlls/user.exe16/user.c | 2 +- dlls/user32/desktop.c | 7 ++----- dlls/user32/user32.spec | 3 +-- include/winuser.h | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index e1b44d28101..83554283425 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1828,7 +1828,7 @@ WORD WINAPI GetFreeSystemResources16( WORD resType ) */ BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename ) { - return SetDeskWallPaper( filename ); + return SetDeskWallpaper( filename ); } diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index b0384b6d8c2..f73d10f87eb 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -151,16 +151,13 @@ BOOL WINAPI PaintDesktop(HDC hdc) } /*********************************************************************** - * SetDeskWallPaper (USER32.@) - * - * FIXME: is there a unicode version? + * SetDeskWallpaper (USER32.@) */ -BOOL WINAPI SetDeskWallPaper( LPCSTR filename ) +BOOL WINAPI SetDeskWallpaper( const char *filename ) { return SystemParametersInfoA( SPI_SETDESKWALLPAPER, MAX_PATH, (void *)filename, SPIF_UPDATEINIFILE ); } - /*********************************************************************** * update_wallpaper */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index ecaeb075450..042730845f1 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -671,8 +671,7 @@ @ stub SetCursorContents @ stdcall -import SetCursorPos(long long) NtUserSetCursorPos @ stdcall SetDebugErrorLevel(long) -@ stdcall SetDeskWallPaper(str) -# @ stub SetDeskWallpaper +@ stdcall SetDeskWallpaper(str) # @ stub SetDesktopBitmap @ stdcall SetDisplayAutoRotationPreferences(long) @ stdcall SetDisplayConfig(long ptr long ptr long) diff --git a/include/winuser.h b/include/winuser.h index 82824cd0afc..7c387e69f54 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4568,7 +4568,7 @@ WINUSERAPI UINT_PTR WINAPI SetCoalescableTimer(HWND,UINT_PTR,UINT,TIMERPROC,U WINUSERAPI HCURSOR WINAPI SetCursor(HCURSOR); WINUSERAPI BOOL WINAPI SetCursorPos(INT,INT); WINUSERAPI VOID WINAPI SetDebugErrorLevel(DWORD); -WINUSERAPI BOOL WINAPI SetDeskWallPaper(LPCSTR); +WINUSERAPI BOOL WINAPI SetDeskWallpaper(const char*); WINUSERAPI BOOL WINAPI SetDisplayAutoRotationPreferences(ORIENTATION_PREFERENCE); WINUSERAPI BOOL WINAPI SetDlgItemInt(HWND,INT,UINT,BOOL); WINUSERAPI BOOL WINAPI SetDlgItemTextA(HWND,INT,LPCSTR);

1 0

Fabian Maurer : net: Accept yes/no switches.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: ba4bc623ef8f0d24fd030b11cb9fc1dee8aabeeb URL: https://gitlab.winehq.org/wine/wine/-/commit/ba4bc623ef8f0d24fd030b11cb9fc1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 5 20:58:48 2023 +0100 net: Accept yes/no switches. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55859 --- po/ar.po | 22 +++++++++++++--------- po/ast.po | 22 +++++++++++++--------- po/bg.po | 22 +++++++++++++--------- po/ca.po | 22 +++++++++++++--------- po/cs.po | 22 +++++++++++++--------- po/da.po | 22 +++++++++++++--------- po/de.po | 22 +++++++++++++--------- po/el.po | 22 +++++++++++++--------- po/en.po | 22 +++++++++++++--------- po/en_US.po | 22 +++++++++++++--------- po/eo.po | 22 +++++++++++++--------- po/es.po | 22 +++++++++++++--------- po/fa.po | 22 +++++++++++++--------- po/fi.po | 22 +++++++++++++--------- po/fr.po | 22 +++++++++++++--------- po/he.po | 22 +++++++++++++--------- po/hi.po | 22 +++++++++++++--------- po/hr.po | 22 +++++++++++++--------- po/hu.po | 22 +++++++++++++--------- po/it.po | 22 +++++++++++++--------- po/ja.po | 22 +++++++++++++--------- po/ka.po | 22 +++++++++++++--------- po/ko.po | 22 +++++++++++++--------- po/lt.po | 22 +++++++++++++--------- po/ml.po | 22 +++++++++++++--------- po/nb_NO.po | 22 +++++++++++++--------- po/nl.po | 22 +++++++++++++--------- po/or.po | 22 +++++++++++++--------- po/pa.po | 22 +++++++++++++--------- po/pl.po | 22 +++++++++++++--------- po/pt_BR.po | 22 +++++++++++++--------- po/pt_PT.po | 22 +++++++++++++--------- po/rm.po | 22 +++++++++++++--------- po/ro.po | 22 +++++++++++++--------- po/ru.po | 22 +++++++++++++--------- po/si.po | 22 +++++++++++++--------- po/sk.po | 22 +++++++++++++--------- po/sl.po | 22 +++++++++++++--------- po/sr_RS(a)cyrillic.po | 22 +++++++++++++--------- po/sr_RS(a)latin.po | 22 +++++++++++++--------- po/sv.po | 22 +++++++++++++--------- po/ta.po | 22 +++++++++++++--------- po/te.po | 22 +++++++++++++--------- po/th.po | 22 +++++++++++++--------- po/tr.po | 22 +++++++++++++--------- po/uk.po | 22 +++++++++++++--------- po/wa.po | 22 +++++++++++++--------- po/wine.pot | 22 +++++++++++++--------- po/zh_CN.po | 22 +++++++++++++--------- po/zh_TW.po | 22 +++++++++++++--------- programs/net/net.c | 25 +++++++++++++++++++++++++ programs/net/net.rc | 1 + programs/net/resources.h | 1 + 53 files changed, 677 insertions(+), 450 deletions(-)

1 0

Akihiro Sagawa : dwmapi: Implement DwmGetWindowAttribute(DWMWA_EXTENDED_FRAME_BOUNDS).
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 3681a68e7804e0398b3f15f16af4ae19ef2e5dba URL: https://gitlab.winehq.org/wine/wine/-/commit/3681a68e7804e0398b3f15f16af4ae… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 30 23:00:09 2023 +0900 dwmapi: Implement DwmGetWindowAttribute(DWMWA_EXTENDED_FRAME_BOUNDS). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55968 --- dlls/dwmapi/dwmapi_main.c | 41 ++++++++++++++++++++++++++++++-- dlls/dwmapi/tests/dwmapi.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 9ec03185f36..adc02552ba7 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -196,9 +196,46 @@ BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, */ HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) { - FIXME("(%p %ld %p %ld) stub\n", hwnd, attribute, pv_attribute, size); + BOOL enabled = FALSE; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p %ld %p %ld)\n", hwnd, attribute, pv_attribute, size); + + if (DwmIsCompositionEnabled(&enabled) == S_OK && !enabled) + return E_HANDLE; + if (!IsWindow(hwnd)) + return E_HANDLE; + + switch (attribute) { + case DWMWA_EXTENDED_FRAME_BOUNDS: + { + RECT *rect = (RECT *)pv_attribute; + DPI_AWARENESS_CONTEXT context; + + if (!rect) + return E_INVALIDARG; + if (size < sizeof(*rect)) + return E_NOT_SUFFICIENT_BUFFER; + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) + return E_HANDLE; + + /* DWM frame bounds are always in physical coords */ + context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); + if (GetWindowRect(hwnd, rect)) + hr = S_OK; + else + hr = HRESULT_FROM_WIN32(GetLastError()); + + SetThreadDpiAwarenessContext(context); + break; + } + default: + FIXME("attribute %ld not implemented.\n", attribute); + hr = E_NOTIMPL; + break; + } + + return hr; } /********************************************************************** diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c index 29dbcbe74bd..a89a1fd705b 100644 --- a/dlls/dwmapi/tests/dwmapi.c +++ b/dlls/dwmapi/tests/dwmapi.c @@ -83,8 +83,66 @@ static void test_DwmGetCompositionTimingInfo(void) "Got wrong monitor refresh period %s.\n", wine_dbgstr_longlong(timing_info.qpcRefreshPeriod)); } +static void test_DWMWA_EXTENDED_FRAME_BOUNDS(void) +{ + DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); + DPI_AWARENESS_CONTEXT old_context = NULL; + BOOL enabled; + HRESULT hr; + RECT rect, window_rect, intersection; + HWND hwnd, child; + + pSetThreadDpiAwarenessContext = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), + "SetThreadDpiAwarenessContext"); + if (pSetThreadDpiAwarenessContext) + old_context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); + + hwnd = CreateWindowW(L"static", L"static", WS_OVERLAPPEDWINDOW | WS_POPUP | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL); + child = CreateWindowW(L"edit", L"edit", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, NULL, NULL, NULL); + + DwmIsCompositionEnabled(&enabled); + hr = DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &rect, sizeof(rect)); + if (!enabled) { + ok(hr == E_HANDLE, "Got hr %#lx.\n", hr); + skip("DWM is disabled.\n"); + goto cleanup; + } + + hr = DwmGetWindowAttribute(NULL, DWMWA_EXTENDED_FRAME_BOUNDS, &rect, sizeof(rect)); + ok(hr == E_HANDLE, "Got hr %#lx.\n", hr); + hr = DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &enabled, sizeof(enabled)); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Got hr %#lx.\n", hr); + hr = DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, NULL, 0); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + hr = DwmGetWindowAttribute(child, DWMWA_EXTENDED_FRAME_BOUNDS, &rect, sizeof(rect)); + ok(hr == E_HANDLE, "Got hr %#lx.\n", hr); + hr = DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &rect, sizeof(rect)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + /* Window rectangle covers extended frame */ + GetWindowRect(hwnd, &window_rect); + IntersectRect(&intersection, &window_rect, &rect); + ok(EqualRect(&intersection, &rect), "Got wrong frame %s, window %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&window_rect)); + + /* Extended frame bounds aren't adjusted for DPI */ + if (pSetThreadDpiAwarenessContext) { + RECT unaware_rect; + pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + hr = DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &unaware_rect, sizeof(unaware_rect)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(EqualRect(&rect, &unaware_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&unaware_rect)); + } + +cleanup: + if (pSetThreadDpiAwarenessContext) + pSetThreadDpiAwarenessContext(old_context); + DestroyWindow(child); + DestroyWindow(hwnd); +} + START_TEST(dwmapi) { test_DwmIsCompositionEnabled(); test_DwmGetCompositionTimingInfo(); + test_DWMWA_EXTENDED_FRAME_BOUNDS(); }

1 0

Zebediah Figura : configure: Use -mpreferred-stack-boundary=2 on i386.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 4b458775bb8c9492ac859cfd167c5f54f245dec1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b458775bb8c9492ac859cfd167c5f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 21 15:38:15 2023 -0500 configure: Use -mpreferred-stack-boundary=2 on i386. gcc currently assumes the stack alignment for i686-w64-mingw32 is 16, which is essentially wrong. It works around this in most cases by applying -mstackrealign when SSE is in use. However, this doesn't address the case of manually aligned types (i.e. DECLSPEC_ALIGN), and it also for some reason doesn't seem to apply when -mavx512f is in use, which seems to be an independent gcc bug. The correct solution on the gcc end is not to assume that the stack is 4-byte aligned. -mpreferred-stack-boundary=2 achieves exactly this, and there is motion upstream to address this by effectively making this setting the default. Since this will take time to propagate downstream, though, it seems prudent to address this bug locally by essentially applying the same fix downstream. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55007 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55899 --- configure | 34 ++++++++++++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 35 insertions(+) diff --git a/configure b/configure index 9219276d336..644d38e7288 100755 --- a/configure +++ b/configure @@ -11550,6 +11550,40 @@ printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_EXTRACFLAGS " -fno-omit-frame-pointer" +fi } + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-mpreferred-stack-boundary=2" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -mpreferred-stack-boundary=2" >&5 +printf %s "checking whether $CC supports -mpreferred-stack-boundary=2... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -mpreferred-stack-boundary=2" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void *__os_arm64x_dispatch_ret = 0; +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + as_fn_append ${wine_arch}_EXTRACFLAGS " -mpreferred-stack-boundary=2" fi } { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wl,--disable-stdcall-fixup" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wl,--disable-stdcall-fixup" >&5 diff --git a/configure.ac b/configure.ac index 26bcc3f6c21..078856efe6f 100644 --- a/configure.ac +++ b/configure.ac @@ -991,6 +991,7 @@ This is an error since --enable-archs=$wine_arch was requested.])]) case $wine_arch in i386) WINE_TRY_PE_CFLAGS([-fno-omit-frame-pointer]) + WINE_TRY_PE_CFLAGS([-mpreferred-stack-boundary=2]) WINE_TRY_PE_CFLAGS([-Wl,--disable-stdcall-fixup], [AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" -Wl,--disable-stdcall-fixup"])]) ;; x86_64) WINE_TRY_PE_CFLAGS([-Wformat-overflow])

1 0

Gabriel Ivăncescu : mshtml/tests: Fix VariantClear on uninitialized variable.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 3545c35d2988295116e907305e77f64995e40fba URL: https://gitlab.winehq.org/wine/wine/-/commit/3545c35d2988295116e907305e77f6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 6 20:16:34 2023 +0200 mshtml/tests: Fix VariantClear on uninitialized variable. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 58a1cc6cf20..de3ff54966c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3672,6 +3672,8 @@ static LONG test_attr_collection_attr(IDispatch *attr, LONG i) VARIANT val; BSTR name; + V_VT(&val) = VT_EMPTY; + hres = IDispatch_QueryInterface(attr, &IID_IHTMLDOMAttribute, (void**)&dom_attr); ok(hres == S_OK, "%ld) QueryInterface failed: %08lx\n", i, hres);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
42
Older →

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 December 2023