wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Anton Baskanov : quartz/tests: Add tests for MPEG audio decoder sink allocator.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: f46618e386dedfae2a95f48cb97a14c86cd2565b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46618e386dedfae2a95f48c… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon May 2 19:28:22 2022 +0700 quartz/tests: Add tests for MPEG audio decoder sink allocator. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegaudio.c | 52 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index ae098dba355..1983828beb0 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -880,6 +880,56 @@ static void testfilter_init(struct testfilter *filter) strmbase_source_init(&filter->source, &filter->filter, L"source", &testsource_ops); } +static void test_sink_allocator(IMemInputPin *input) +{ + IMemAllocator *req_allocator, *ret_allocator; + ALLOCATOR_PROPERTIES props, ret_props; + HRESULT hr; + + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + + if (hr == S_OK) + { + hr = IMemAllocator_GetProperties(ret_allocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!props.cBuffers, "Got %ld buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %ld.\n", props.cbBuffer); + ok(!props.cbAlign, "Got alignment %ld.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); + + hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + IMemAllocator_Release(ret_allocator); + } + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&req_allocator); + + props.cBuffers = 1; + props.cbBuffer = 256; + props.cbAlign = 1; + props.cbPrefix = 0; + hr = IMemAllocator_SetProperties(req_allocator, &props, &ret_props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); + + IMemAllocator_Release(req_allocator); + IMemAllocator_Release(ret_allocator); +} + static void test_connect_pin(void) { IBaseFilter *filter = create_mpeg_audio_codec(); @@ -995,6 +1045,8 @@ static void test_connect_pin(void) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); + test_sink_allocator(meminput); + IMemInputPin_Release(meminput); IPin_Release(sink); IPin_Release(source);

1 0

Francois Gouget : kernel32/tests: Fix a copy/paste error in an ok() message.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 871692e259543db2b1a98cc06f9c62e862d6ed8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=871692e259543db2b1a98cc0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 2 19:41:19 2022 +0200 kernel32/tests: Fix a copy/paste error in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 378078c20d5..bd8d8c91b2f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2163,7 +2163,7 @@ static void test_MoveFileW(void) ret = MoveFileW(source, dest); ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS, - "CopyFileW: unexpected error %ld\n", GetLastError()); + "MoveFileW: unexpected error %ld\n", GetLastError()); ret = DeleteFileW(source); ok(ret, "DeleteFileW: error %ld\n", GetLastError());

1 0

Zebediah Figura : wined3d: Do not use vkCmdClearColorImage() to clear compressed images.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: ee9bcbb9f915d8a254180ebc9c1d80952d97ada2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee9bcbb9f915d8a254180ebc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 29 13:00:16 2022 -0500 wined3d: Do not use vkCmdClearColorImage() to clear compressed images. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52922 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5fd38b49132..49650f2839e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5257,9 +5257,10 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, } } -static void wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, +static bool wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, unsigned int sub_resource_idx, struct wined3d_context *context) { + struct wined3d_texture_sub_resource *sub_resource = &texture_vk->t.sub_resources[sub_resource_idx]; struct wined3d_context_vk *context_vk = wined3d_context_vk(context); const struct wined3d_format *format = texture_vk->t.resource.format; const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -5270,12 +5271,24 @@ static void wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, VkImageAspectFlags aspect_mask; VkImage vk_image; + if (texture_vk->t.resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + { + struct wined3d_bo_address addr; + + if (!wined3d_texture_prepare_location(&texture_vk->t, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) + return false; + wined3d_texture_get_bo_address(&texture_vk->t, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, sub_resource->size); + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_SYSMEM); + return true; + } + vk_image = texture_vk->image.vk_image; if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) { ERR("Failed to get command buffer.\n"); - return; + return false; } aspect_mask = vk_aspect_mask_from_format(format); @@ -5305,6 +5318,9 @@ static void wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, VK_ACCESS_TRANSFER_WRITE_BIT, vk_access_mask_from_bind_flags(texture_vk->t.resource.bind_flags), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, texture_vk->layout, vk_image, &vk_range); wined3d_context_vk_reference_texture(context_vk, texture_vk); + + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + return true; } static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_vk, @@ -5319,8 +5335,11 @@ static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_v if (sub_resource->locations & WINED3D_LOCATION_CLEARED) { - wined3d_texture_vk_clear(texture_vk, sub_resource_idx, context); - return TRUE; + if (!wined3d_texture_vk_clear(texture_vk, sub_resource_idx, context)) + return FALSE; + + if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) + return TRUE; } if (!(sub_resource->locations & wined3d_texture_sysmem_locations))

1 0

Hans Leidekker : mshtml: Added IHTMLCSSStyleDeclaration::backgroundSize property implementation.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 2d72328f5d76d67aea1f1858852c15c1ef2f4503 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d72328f5d76d67aea1f1858… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 29 14:53:35 2022 +0200 mshtml: Added IHTMLCSSStyleDeclaration::backgroundSize property implementation. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 11a66369c39..44ac21c5f97 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -181,6 +181,11 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_A_BACKGROUNDREPEAT, 0, background_repeat_values }, + { + L"background-size", + DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDSIZE, + DISPID_A_IE9_BACKGROUNDSIZE, + }, { L"border", DISPID_IHTMLCSSSTYLEDECLARATION_BORDER, @@ -7628,15 +7633,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundOrigin(IHTMLCSSStyle static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundSize(IHTMLCSSStyleDeclaration *iface, BSTR v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_BACKGROUND_SIZE, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundSize(IHTMLCSSStyleDeclaration *iface, BSTR *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_BACKGROUND_SIZE, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_boxShadow(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 25f87c802b2..e14c1274360 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -55,6 +55,7 @@ typedef enum { STYLEID_BACKGROUND_POSITION_X, STYLEID_BACKGROUND_POSITION_Y, STYLEID_BACKGROUND_REPEAT, + STYLEID_BACKGROUND_SIZE, STYLEID_BORDER, STYLEID_BORDER_BOTTOM, STYLEID_BORDER_BOTTOM_COLOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index bc9afda7617..4b72d144354 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -793,6 +793,22 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) ok(!lstrcmpW(str, L"border-box"), "backgroundClip = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = (BSTR)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration_get_backgroundSize(css_style, &str); + ok(hres == S_OK, "get_backgroundSize failed: %08lx\n", hres); + ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"100% 100%"); + hres = IHTMLCSSStyleDeclaration_put_backgroundSize(css_style, str); + ok(hres == S_OK, "put_backgroundSize failed: %08lx\n", hres); + SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration_get_backgroundSize(css_style, &str); + ok(hres == S_OK, "get_backgroundSize failed: %08lx\n", hres); + ok(!lstrcmpW(str, L"100% 100%"), "backgroundSize = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); ok(hres == S_OK, "get_opacity failed: %08lx\n", hres); test_var_bstr(&v, NULL);

1 0

Jacek Caban : win32u: Copy implementation of AdjustWindowRectEx from user32.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 033cad432e1d93a0ddf5a5b71a989f31441f588c URL: https://source.winehq.org/git/wine.git/?a=commit;h=033cad432e1d93a0ddf5a5b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 20:43:19 2022 +0200 win32u: Copy implementation of AdjustWindowRectEx from user32. It will be useful for drivers as well. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 1 - dlls/win32u/defwnd.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 1 - dlls/win32u/window.c | 4 +--- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index fa849e9cf2d..b282056d8c8 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -159,7 +159,6 @@ static void CDECL free_win_ptr( WND *win ) static const struct user_callbacks user_funcs = { - AdjustWindowRectEx, CopyImage, EndMenu, ImmProcessKey, diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 0080d4f7cc6..7455a91980c 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -31,6 +31,44 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +/*********************************************************************** + * AdjustWindowRectEx (win32u.so) + */ +BOOL WINAPI AdjustWindowRectEx( RECT *rect, DWORD style, BOOL menu, DWORD ex_style ) +{ + NONCLIENTMETRICSW ncm; + int adjust = 0; + + ncm.cbSize = sizeof(ncm); + NtUserSystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + + if ((ex_style & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == WS_EX_STATICEDGE) + adjust = 1; /* for the outer frame always present */ + else if ((ex_style & WS_EX_DLGMODALFRAME) || (style & (WS_THICKFRAME|WS_DLGFRAME))) + adjust = 2; /* outer */ + + if (style & WS_THICKFRAME) + adjust += ncm.iBorderWidth + ncm.iPaddedBorderWidth; /* The resize border */ + + if ((style & (WS_BORDER|WS_DLGFRAME)) || (ex_style & WS_EX_DLGMODALFRAME)) + adjust++; /* The other border */ + + InflateRect( rect, adjust, adjust ); + + if ((style & WS_CAPTION) == WS_CAPTION) + { + if (ex_style & WS_EX_TOOLWINDOW) + rect->top -= ncm.iSmCaptionHeight + 1; + else + rect->top -= ncm.iCaptionHeight + 1; + } + if (menu) rect->top -= ncm.iMenuHeight + 1; + + if (ex_style & WS_EX_CLIENTEDGE) + InflateRect( rect, get_system_metrics(SM_CXEDGE), get_system_metrics(SM_CYEDGE) ); + return TRUE; +} + static BOOL set_window_text( HWND hwnd, const void *text, BOOL ansi ) { static const WCHAR emptyW[] = { 0 }; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index c870037f7b3..6e25e0ec0db 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -32,7 +32,6 @@ struct hardware_msg_data; struct user_callbacks { - BOOL (WINAPI *pAdjustWindowRectEx)( RECT *, DWORD, BOOL, DWORD ); HANDLE (WINAPI *pCopyImage)( HANDLE, UINT, INT, INT, UINT ); BOOL (WINAPI *pEndMenu)(void); BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index edafc522d14..9231f98539e 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3683,9 +3683,7 @@ static MINMAXINFO get_min_max_info( HWND hwnd ) adjusted_style = style; get_client_rect( NtUserGetAncestor( hwnd, GA_PARENT ), &rc ); - if (user_callbacks) - user_callbacks->pAdjustWindowRectEx( &rc, adjusted_style, - (style & WS_POPUP) && get_menu( hwnd ), exstyle); + AdjustWindowRectEx( &rc, adjusted_style, (style & WS_POPUP) && get_menu( hwnd ), exstyle ); xinc = -rc.left; yinc = -rc.top;

1 0

Jacek Caban : win32u: Move NtUserSetSystemMenu implementation from user32.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: d2d715b2016f3f10f0918938594b4ed6a4dbb068 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d715b2016f3f10f0918938… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 02:06:31 2022 +0200 win32u: Move NtUserSetSystemMenu implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 18 ------------------ dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 23 +++++++++++++++-------- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ 9 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 2e9121598fa..64e5d35ba39 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3925,24 +3925,6 @@ HMENU WINAPI CreateMenu(void) } -/******************************************************************* - * SetSystemMenu (USER32.@) - */ -BOOL WINAPI SetSystemMenu( HWND hwnd, HMENU hMenu ) -{ - WND *wndPtr = WIN_GetPtr( hwnd ); - - if (wndPtr && wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) - { - if (wndPtr->hSysMenu) NtUserDestroyMenu( wndPtr->hSysMenu ); - wndPtr->hSysMenu = MENU_GetSysMenu( hwnd, hMenu ); - WIN_ReleasePtr( wndPtr ); - return TRUE; - } - return FALSE; -} - - /********************************************************************** * GetMenu (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8bccdab69c6..1ae27b2482f 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -707,7 +707,7 @@ @ stdcall SetSysColors(long ptr ptr) NtUserSetSysColors @ stdcall SetSysColorsTemp(ptr ptr long) @ stdcall SetSystemCursor(long long) -@ stdcall SetSystemMenu(long long) +@ stdcall SetSystemMenu(long long) NtUserSetSystemMenu @ stdcall SetSystemTimer(long long long ptr) @ stdcall SetTaskmanWindow (long) @ stdcall SetThreadDesktop(long) NtUserSetThreadDesktop diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 358177d33d2..fa849e9cf2d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -164,7 +164,6 @@ static const struct user_callbacks user_funcs = EndMenu, ImmProcessKey, ImmTranslateMessage, - SetSystemMenu, free_win_ptr, MENU_GetSysMenu, MENU_IsMenuActive, diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 6cc63800201..f6790690188 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1212,6 +1212,7 @@ static struct unix_funcs unix_funcs = NtUserSetMenu, NtUserSetParent, NtUserSetSysColors, + NtUserSetSystemMenu, NtUserSetWindowLong, NtUserSetWindowLongPtr, NtUserSetWindowPos, diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 0da21675e68..a6aeae045e2 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -465,14 +465,6 @@ BOOL WINAPI NtUserDestroyMenu( HMENU handle ) return TRUE; } -/******************************************************************* - * NtUserSetSystemMenu (win32u.@) - */ -BOOL WINAPI NtUserSetSystemMenu( HWND hwnd, HMENU menu ) -{ - return user_callbacks && user_callbacks->pSetSystemMenu( hwnd, menu ); -} - /******************************************************************* * set_window_menu * @@ -1072,6 +1064,21 @@ HMENU WINAPI NtUserGetSystemMenu( HWND hwnd, BOOL revert ) return revert ? 0 : retvalue; } +/********************************************************************** + * NtUserSetSystemMenu (win32u.@) + */ +BOOL WINAPI NtUserSetSystemMenu( HWND hwnd, HMENU menu ) +{ + WND *win = get_win_ptr( hwnd ); + + if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE; + + if (win->hSysMenu) NtUserDestroyMenu( win->hSysMenu ); + win->hSysMenu = user_callbacks ? user_callbacks->get_sys_menu( hwnd, menu ) : NULL; + release_win_ptr( win ); + return TRUE; +} + /********************************************************************** * NtUserSetMenuDefaultItem (win32u.@) */ diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index acc3fdf6290..c870037f7b3 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -37,7 +37,6 @@ struct user_callbacks BOOL (WINAPI *pEndMenu)(void); BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); - BOOL (WINAPI *pSetSystemMenu)( HWND hwnd, HMENU menu ); void (CDECL *free_win_ptr)( struct tagWND *win ); HMENU (CDECL *get_sys_menu)( HWND hwnd, HMENU popup ); HWND (CDECL *is_menu_active)(void); diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index d94324b1290..d6a51c1d3b9 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1229,7 +1229,7 @@ @ stub NtUserSetShellWindowEx @ stdcall NtUserSetSysColors(long ptr ptr) @ stub NtUserSetSystemCursor -@ stub NtUserSetSystemMenu +@ stdcall NtUserSetSystemMenu(long long) @ stdcall -syscall NtUserSetSystemTimer(long long long) @ stub NtUserSetTargetForResourceBrokering @ stdcall -syscall NtUserSetThreadDesktop(long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c40d2cb2a6f..ea6d67750b4 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -282,6 +282,7 @@ struct unix_funcs BOOL (WINAPI *pNtUserSetMenu)( HWND hwnd, HMENU menu ); HWND (WINAPI *pNtUserSetParent)( HWND hwnd, HWND parent ); BOOL (WINAPI *pNtUserSetSysColors)( INT count, const INT *colors, const COLORREF *values ); + BOOL (WINAPI *pNtUserSetSystemMenu)( HWND hwnd, HMENU menu ); LONG (WINAPI *pNtUserSetWindowLong)( HWND hwnd, INT offset, LONG newval, BOOL ansi ); LONG_PTR (WINAPI *pNtUserSetWindowLongPtr)( HWND hwnd, INT offset, LONG_PTR newval, BOOL ansi ); BOOL (WINAPI *pNtUserSetWindowPos)( HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index e3e0781bdde..6219b0fa49c 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1185,6 +1185,12 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va return unix_funcs->pNtUserSetSysColors( count, colors, values ); } +BOOL WINAPI NtUserSetSystemMenu( HWND hwnd, HMENU menu ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserSetSystemMenu( hwnd, menu ); +} + LONG WINAPI NtUserSetWindowLong( HWND hwnd, INT offset, LONG newval, BOOL ansi ) { if (!unix_funcs) return 0;

1 0

Jacek Caban : win32u: Move NtUserGetSystemMenu implementation from user32.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 4604c4554007165e84d4dc44db215975923e2ba2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4604c4554007165e84d4dc44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 00:54:36 2022 +0200 win32u: Move NtUserGetSystemMenu implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 1 + dlls/user32/defwnd.c | 6 +++--- dlls/user32/mdi.c | 4 ++-- dlls/user32/menu.c | 45 ++------------------------------------------ dlls/user32/nonclient.c | 8 ++++---- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 + dlls/win32u/class.c | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 2 ++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 15 files changed, 70 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4604c4554007165e84d4…

1 0

Jacek Caban : win32u: Move NtUserDeleteMenu implementation from user32.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 189da79a18bcb7baabcd50de36bf2a6ba818b79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=189da79a18bcb7baabcd50de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 00:42:16 2022 +0200 win32u: Move NtUserDeleteMenu implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 6 +++--- dlls/user32/menu.c | 26 +++----------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/menu.c | 19 +++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 9 files changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b856f054247..1b06143d4cf 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -945,11 +945,11 @@ static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild ) } /* close */ - DeleteMenu(menu, SC_CLOSE, MF_BYCOMMAND); + NtUserDeleteMenu( menu, SC_CLOSE, MF_BYCOMMAND ); /* restore */ - DeleteMenu(menu, SC_RESTORE, MF_BYCOMMAND); + NtUserDeleteMenu( menu, SC_RESTORE, MF_BYCOMMAND ); /* minimize */ - DeleteMenu(menu, SC_MINIMIZE, MF_BYCOMMAND); + NtUserDeleteMenu( menu, SC_MINIMIZE, MF_BYCOMMAND ); DrawMenuBar(frame); diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 669d838bf61..761718182b5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -410,7 +410,7 @@ static HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) if (hPopupMenu) { if (GetClassLongW(hWnd, GCL_STYLE) & CS_NOCLOSE) - DeleteMenu(hPopupMenu, SC_CLOSE, MF_BYCOMMAND); + NtUserDeleteMenu( hPopupMenu, SC_CLOSE, MF_BYCOMMAND ); InsertMenuW( hMenu, -1, MF_SYSMENU | MF_POPUP | MF_BYPOSITION, (UINT_PTR)hPopupMenu, NULL ); @@ -3540,7 +3540,7 @@ BOOL WINAPI ChangeMenuA( HMENU hMenu, UINT pos, LPCSTR data, TRACE("menu=%p pos=%d data=%p id=%08x flags=%08x\n", hMenu, pos, data, id, flags ); if (flags & MF_APPEND) return AppendMenuA( hMenu, flags & ~MF_APPEND, id, data ); - if (flags & MF_DELETE) return DeleteMenu(hMenu, pos, flags & ~MF_DELETE); + if (flags & MF_DELETE) return NtUserDeleteMenu( hMenu, pos, flags & ~MF_DELETE ); if (flags & MF_CHANGE) return ModifyMenuA(hMenu, pos, flags & ~MF_CHANGE, id, data ); if (flags & MF_REMOVE) return NtUserRemoveMenu( hMenu, @@ -3560,7 +3560,7 @@ BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data, TRACE("menu=%p pos=%d data=%p id=%08x flags=%08x\n", hMenu, pos, data, id, flags ); if (flags & MF_APPEND) return AppendMenuW( hMenu, flags & ~MF_APPEND, id, data ); - if (flags & MF_DELETE) return DeleteMenu(hMenu, pos, flags & ~MF_DELETE); + if (flags & MF_DELETE) return NtUserDeleteMenu( hMenu, pos, flags & ~MF_DELETE ); if (flags & MF_CHANGE) return ModifyMenuW(hMenu, pos, flags & ~MF_CHANGE, id, data ); if (flags & MF_REMOVE) return NtUserRemoveMenu( hMenu, @@ -3825,26 +3825,6 @@ BOOL WINAPI AppendMenuW( HMENU hMenu, UINT flags, } -/********************************************************************** - * DeleteMenu (USER32.@) - */ -BOOL WINAPI DeleteMenu( HMENU hMenu, UINT id, UINT flags ) -{ - POPUPMENU *menu; - UINT pos; - - if (!(menu = find_menu_item(hMenu, id, flags, &pos))) - return FALSE; - - if (menu->items[pos].fType & MF_POPUP) - NtUserDestroyMenu( menu->items[pos].hSubMenu ); - - NtUserRemoveMenu( menu->obj.handle, pos, flags | MF_BYPOSITION ); - release_menu_ptr(menu); - return TRUE; -} - - /******************************************************************* * ModifyMenuW (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 26f2d1caf45..0697bcfa841 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -153,7 +153,7 @@ @ stdcall DefWindowProcA(long long long long) @ stdcall DefWindowProcW(long long long long) @ stdcall DeferWindowPos(long long long long long long long long) -@ stdcall DeleteMenu(long long long) +@ stdcall DeleteMenu(long long long) NtUserDeleteMenu @ stdcall DeregisterShellHookWindow (long) @ stdcall DestroyAcceleratorTable(long) NtUserDestroyAcceleratorTable @ stdcall DestroyCaret() diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index d41aba956f2..67abac37037 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -976,6 +976,25 @@ BOOL WINAPI NtUserRemoveMenu( HMENU handle, UINT id, UINT flags ) return TRUE; } +/********************************************************************** + * NtUserDeleteMenu (win32u.@) + */ +BOOL WINAPI NtUserDeleteMenu( HMENU handle, UINT id, UINT flags ) +{ + POPUPMENU *menu; + UINT pos; + + if (!(menu = find_menu_item( handle, id, flags, &pos ))) + return FALSE; + + if (menu->items[pos].fType & MF_POPUP) + NtUserDestroyMenu( menu->items[pos].hSubMenu ); + + NtUserRemoveMenu( menu->obj.handle, pos, flags | MF_BYPOSITION ); + release_menu_ptr( menu ); + return TRUE; +} + /********************************************************************** * NtUserSetMenuContextHelpId (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index f585e90bd4a..488056ef439 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -114,6 +114,7 @@ static void * const syscalls[] = NtUserCreateAcceleratorTable, NtUserCreateDesktopEx, NtUserCreateWindowStation, + NtUserDeleteMenu, NtUserDestroyAcceleratorTable, NtUserFindExistingCursorIcon, NtUserFindWindowEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 483b3d52289..43db8421bb8 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -824,7 +824,7 @@ @ stdcall NtUserDeferWindowPosAndBand(long long long long long long long long long long) @ stub NtUserDelegateCapturePointers @ stub NtUserDelegateInput -@ stub NtUserDeleteMenu +@ stdcall -syscall NtUserDeleteMenu(long long long) @ stub NtUserDeleteWindowGroup @ stdcall -syscall NtUserDestroyAcceleratorTable(long) @ stub NtUserDestroyActivationGroup diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 776a7e671f6..27ba163408b 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -101,6 +101,7 @@ SYSCALL_ENTRY( NtUserCreateAcceleratorTable ) \ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ + SYSCALL_ENTRY( NtUserDeleteMenu ) \ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserFindExistingCursorIcon ) \ SYSCALL_ENTRY( NtUserFindWindowEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1f287c7631c..d90c4ec2f99 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -669,6 +669,15 @@ NTSTATUS WINAPI wow64_NtUserCheckMenuItem( UINT *args ) return NtUserCheckMenuItem( handle, id, flags ); } +NTSTATUS WINAPI wow64_NtUserDeleteMenu( UINT *args ) +{ + HMENU menu = get_handle( &args ); + UINT id = get_ulong( &args ); + UINT flags = get_ulong( &args ); + + return NtUserDeleteMenu( menu, id, flags ); +} + NTSTATUS WINAPI wow64_NtUserGetMenuItemRect( UINT *args ) { HWND hwnd = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 1876b32c84b..dfa9f53a187 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -487,6 +487,7 @@ HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK m ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 ); HDWP WINAPI NtUserDeferWindowPosAndBand( HDWP hdwp, HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags, UINT unk1, UINT unk2 ); +BOOL WINAPI NtUserDeleteMenu( HMENU menu, UINT id, UINT flags ); BOOL WINAPI NtUserDestroyAcceleratorTable( HACCEL handle ); BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg ); BOOL WINAPI NtUserDestroyMenu( HMENU menu );

1 0

Jacek Caban : win32u: Move NtUserTranslateAccelerator from user32.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: dc0d16f192fa245dea07384b8290d7b64ac1970a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc0d16f192fa245dea07384b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Apr 10 16:14:50 2022 +0200 win32u: Move NtUserTranslateAccelerator from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 204 +------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 279 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + 7 files changed, 291 insertions(+), 204 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc0d16f192fa245dea07…

1 0

Jacek Caban : win32u: Move GetMenuItemCount implementation from user32.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: bad82953dbe5c0a8a61f81ca5313d7f32a004977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bad82953dbe5c0a8a61f81ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 16:28:06 2022 +0200 win32u: Move GetMenuItemCount implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 12 ++---------- dlls/win32u/menu.c | 14 ++++++++++++++ dlls/win32u/sysparams.c | 3 +++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 6 ++++++ 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index e81fc086918..9f51fa555f8 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3696,17 +3696,9 @@ UINT WINAPI GetMenuState( HMENU menu, UINT item, UINT flags ) /********************************************************************** * GetMenuItemCount (USER32.@) */ -INT WINAPI GetMenuItemCount( HMENU hMenu ) +INT WINAPI GetMenuItemCount( HMENU menu ) { - POPUPMENU *menu = grab_menu_ptr(hMenu); - INT count; - - if (!menu) return -1; - count = menu->nItems; - release_menu_ptr(menu); - - TRACE("(%p) returning %d\n", hMenu, count); - return count; + return NtUserGetMenuItemCount( menu ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 0f918a4762d..8544cca47b4 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -864,6 +864,20 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT return ret; } +/* see GetMenuItemCount */ +INT get_menu_item_count( HMENU handle ) +{ + POPUPMENU *menu; + INT count; + + if (!(menu = grab_menu_ptr( handle ))) return -1; + count = menu->nItems; + release_menu_ptr(menu); + + TRACE( "(%p) returning %d\n", handle, count ); + return count; +} + /********************************************************************** * NtUserRemoveMenu (win32u.@) */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3cf03d68399..114016954aa 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4718,6 +4718,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_GetIconParam: return get_icon_param( UlongToHandle(arg) ); + case NtUserCallOneParam_GetMenuItemCount: + return get_menu_item_count( UlongToHandle(arg) ); + case NtUserCallOneParam_GetSysColor: return get_sys_color( arg ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index caf77590559..537eec38a34 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -377,6 +377,7 @@ extern HMENU create_menu( BOOL is_popup ) DECLSPEC_HIDDEN; extern BOOL draw_menu_bar( HWND hwnd ) DECLSPEC_HIDDEN; extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL get_menu_info( HMENU handle, MENUINFO *info ) DECLSPEC_HIDDEN; +extern INT get_menu_item_count( HMENU handle ) DECLSPEC_HIDDEN; extern BOOL set_window_menu( HWND hwnd, HMENU handle ) DECLSPEC_HIDDEN; /* message.c */ diff --git a/include/ntuser.h b/include/ntuser.h index 75c16e412c0..1876b32c84b 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -704,6 +704,7 @@ enum NtUserCallOneParam_GetClipCursor, NtUserCallOneParam_GetCursorPos, NtUserCallOneParam_GetIconParam, + NtUserCallOneParam_GetMenuItemCount, NtUserCallOneParam_GetPrimaryMonitorRect, NtUserCallOneParam_GetSysColor, NtUserCallOneParam_GetSysColorBrush, @@ -773,6 +774,11 @@ static inline UINT_PTR NtUserGetIconParam( HICON icon ) return NtUserCallOneParam( HandleToUlong(icon), NtUserCallOneParam_GetIconParam ); } +static inline UINT_PTR NtUserGetMenuItemCount( HMENU menu ) +{ + return NtUserCallOneParam( HandleToUlong(menu), NtUserCallOneParam_GetMenuItemCount ); +} + static inline RECT NtUserGetPrimaryMonitorRect(void) { RECT primary;

1 0

← Newer
1
...
81
82
83
84
85
86
87
...
91
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 May 2022