May 2022 - Wine-Commits - list.winehq.org

Ziqing Hui : d2d1: Add stubs for ID2D1EffectContext.
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: 740bfd850132e2796558ff8fdc2c20268b5e878f URL: https://source.winehq.org/git/wine.git/?a=commit;h=740bfd850132e2796558ff8f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 10 12:48:38 2022 +0800 d2d1: Add stubs for ID2D1EffectContext. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 31 ++++- dlls/d2d1/device.c | 18 +-- dlls/d2d1/effect.c | 289 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 319 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=740bfd850132e2796558…

1 0

Jacek Caban : win32u: Move default WM_WINDOWPOSCHANGING implementation from user32.
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: b9a40c4b26407659d89c67388fe14fed60dc3e17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a40c4b26407659d89c6738… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 21:26:52 2022 +0200 win32u: Move default WM_WINDOWPOSCHANGING implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 3 --- dlls/user32/win.h | 1 - dlls/user32/winpos.c | 25 ------------------------- dlls/win32u/defwnd.c | 22 ++++++++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 +- 6 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 74dfa609bbd..c4263edac93 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -180,9 +180,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); break; - case WM_WINDOWPOSCHANGING: - return WINPOS_HandleWindowPosChanging( hwnd, (WINDOWPOS *)lParam ); - case WM_WINDOWPOSCHANGED: DEFWND_HandleWindowPosChanged( hwnd, (const WINDOWPOS *)lParam ); break; diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 0c5bb2be5a8..c9ac3b8e977 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -60,7 +60,6 @@ static inline void WIN_ReleasePtr( WND *ptr ) extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN; -extern LONG WINPOS_HandleWindowPosChanging(HWND hwnd, WINDOWPOS *winpos) DECLSPEC_HIDDEN; extern HWND WINPOS_WindowFromPoint( HWND hwndScope, POINT pt, INT *hittest ) DECLSPEC_HIDDEN; extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index cdcd03484cd..a5bc7d9ce17 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -653,31 +653,6 @@ void WINPOS_ActivateOtherWindow(HWND hwnd) } -/*********************************************************************** - * WINPOS_HandleWindowPosChanging - * - * Default handling for a WM_WINDOWPOSCHANGING. Called from DefWindowProc(). - */ -LONG WINPOS_HandleWindowPosChanging( HWND hwnd, WINDOWPOS *winpos ) -{ - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); - - if (winpos->flags & SWP_NOSIZE) return 0; - if ((style & WS_THICKFRAME) || ((style & (WS_POPUP | WS_CHILD)) == 0)) - { - MINMAXINFO info = NtUserGetMinMaxInfo( hwnd ); - winpos->cx = min( winpos->cx, info.ptMaxTrackSize.x ); - winpos->cy = min( winpos->cy, info.ptMaxTrackSize.y ); - if (!(style & WS_MINIMIZE)) - { - winpos->cx = max( winpos->cx, info.ptMinTrackSize.x ); - winpos->cy = max( winpos->cy, info.ptMinTrackSize.y ); - } - } - return 0; -} - - /*********************************************************************** * BeginDeferWindowPos (USER32.@) */ diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index ec9a1685325..67472246960 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -195,6 +195,25 @@ static HICON set_window_icon( HWND hwnd, WPARAM type, HICON icon ) return ret; } +static LONG handle_window_pos_changing( HWND hwnd, WINDOWPOS *winpos ) +{ + LONG style = get_window_long( hwnd, GWL_STYLE ); + + if (winpos->flags & SWP_NOSIZE) return 0; + if ((style & WS_THICKFRAME) || ((style & (WS_POPUP | WS_CHILD)) == 0)) + { + MINMAXINFO info = get_min_max_info( hwnd ); + winpos->cx = min( winpos->cx, info.ptMaxTrackSize.x ); + winpos->cy = min( winpos->cy, info.ptMaxTrackSize.y ); + if (!(style & WS_MINIMIZE)) + { + winpos->cx = max( winpos->cx, info.ptMinTrackSize.x ); + winpos->cy = max( winpos->cy, info.ptMinTrackSize.y ); + } + } + return 0; +} + static LRESULT handle_sys_command( HWND hwnd, WPARAM wparam, LPARAM lparam ) { if (!is_window_enabled( hwnd )) return 0; @@ -255,6 +274,9 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, break; } + case WM_WINDOWPOSCHANGING: + return handle_window_pos_changing( hwnd, (WINDOWPOS *)lparam ); + case WM_PAINTICON: case WM_PAINT: { diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 63eca06ecd6..e459e6df6bd 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -434,6 +434,7 @@ extern HWND get_parent( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern DPI_AWARENESS_CONTEXT get_window_dpi_awareness_context( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL get_window_placement( HWND hwnd, WINDOWPLACEMENT *placement ) DECLSPEC_HIDDEN; +extern MINMAXINFO get_min_max_info( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND get_window_relative( HWND hwnd, UINT rel ) DECLSPEC_HIDDEN; extern DWORD get_window_thread( HWND hwnd, DWORD *process ) DECLSPEC_HIDDEN; extern HWND is_current_process_window( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 94cdd7f7280..31512c03e15 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3657,7 +3657,7 @@ static void send_parent_notify( HWND hwnd, UINT msg ) * * Get the minimized and maximized information for a window. */ -static MINMAXINFO get_min_max_info( HWND hwnd ) +MINMAXINFO get_min_max_info( HWND hwnd ) { LONG style = get_window_long( hwnd, GWL_STYLE ); LONG exstyle = get_window_long( hwnd, GWL_EXSTYLE );

1 0

Gabriel Ivăncescu : mshtml/tests: Fix Number toLocaleString test on updated Win 8.1.
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: 83651996dbe146d09481409b564045d09194b805 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83651996dbe146d09481409b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 12 12:56:03 2022 +0200 mshtml/tests: Fix Number toLocaleString test on updated Win 8.1. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52969 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/es5.js | 21 ++++++++++++++------- dlls/mshtml/tests/winetest.js | 5 +++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 8238e5d26f9..0f9df4cb8ea 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -150,10 +150,14 @@ sync_test("Number toLocaleString", function() { ]; if(external.isEnglish) { - for(var i = 0; i < tests.length; i++) { - r = Number.prototype.toLocaleString.call(tests[i][0]); - ok(r === tests[i][1], "[" + i + "] got " + r); - } + /* Some recent Win8.1 updates have old jscript behavior */ + if(Number.prototype.toLocaleString.call(0.0) === "0.00") + win_skip("skipping tests due to old behavior"); + else + for(var i = 0; i < tests.length; i++) { + r = Number.prototype.toLocaleString.call(tests[i][0]); + ok(r === tests[i][1], "[" + i + "] got " + r); + } } try { @@ -161,21 +165,24 @@ sync_test("Number toLocaleString", function() { ok(false, "expected exception calling it on string"); }catch(ex) { var n = ex.number >>> 0; - ok(n === JS_E_WRONG_THIS, "called on string threw " + n); + ok(n === JS_E_WRONG_THIS || broken(n === JS_E_NUMBER_EXPECTED) /* newer Win8.1 */, + "called on string threw " + n); } try { Number.prototype.toLocaleString.call(undefined); ok(false, "expected exception calling it on undefined"); }catch(ex) { var n = ex.number >>> 0; - ok(n === JS_E_WRONG_THIS, "called on undefined threw " + n); + ok(n === JS_E_WRONG_THIS || broken(n === JS_E_NUMBER_EXPECTED) /* newer Win8.1 */, + "called on undefined threw " + n); } try { Number.prototype.toLocaleString.call(external.nullDisp); ok(false, "expected exception calling it on nullDisp"); }catch(ex) { var n = ex.number >>> 0; - ok(n === JS_E_WRONG_THIS, "called on nullDisp threw " + n); + ok(n === JS_E_WRONG_THIS || broken(n === JS_E_NUMBER_EXPECTED) /* newer Win8.1 */, + "called on nullDisp threw " + n); } }); diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index ca7f2aab4c2..bdebb2fa173 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -54,6 +54,11 @@ function win_skip(m) { external.win_skip(m); } +function broken(e) +{ + return external.broken(e); +} + function reportSuccess() { external.reportSuccess(); }

1 0

Ziqing Hui : d2d1: Implement LoadVertexShader().
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: e9845d4fda0dacdd3f09874fd55105cdde9e8376 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9845d4fda0dacdd3f09874f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 10 12:48:40 2022 +0800 d2d1: Implement LoadVertexShader(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 10 ++++++++++ dlls/d2d1/effect.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index cb9ee6d5b80..b7e1a12b3b8 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -568,12 +568,22 @@ struct d2d_device void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +struct d2d_shader +{ + const GUID *id; + IUnknown *shader; +}; + struct d2d_effect_context { ID2D1EffectContext ID2D1EffectContext_iface; LONG refcount; struct d2d_device_context *device_context; + + struct d2d_shader *shaders; + size_t shaders_size; + size_t shader_count; }; void d2d_effect_context_init(struct d2d_effect_context *effect_context, diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 90e07c0810b..b87ae6bb77d 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -37,6 +37,15 @@ static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1Effec static void d2d_effect_context_cleanup(struct d2d_effect_context *effect_context) { + unsigned int i; + + for (i = 0; i < effect_context->shader_count; ++i) + { + if (effect_context->shaders[i].shader) + IUnknown_Release(effect_context->shaders[i].shader); + } + heap_free(effect_context->shaders); + ID2D1DeviceContext_Release(&effect_context->device_context->ID2D1DeviceContext_iface); } @@ -178,10 +187,37 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectC static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1EffectContext *iface, REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) { - FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ID3D11VertexShader *vertex_shader; + struct d2d_shader *shader; + HRESULT hr; + + TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", iface, debugstr_guid(shader_id), buffer, buffer_size); - return E_NOTIMPL; + if (FAILED(hr = ID3D11Device1_CreateVertexShader(effect_context->device_context->d3d_device, + buffer, buffer_size, NULL, &vertex_shader))) + { + WARN("Failed to create vertex shader, hr %#lx.\n", hr); + return hr; + } + + if (!d2d_array_reserve((void **)&effect_context->shaders, &effect_context->shaders_size, + effect_context->shader_count + 1, sizeof(*effect_context->shaders))) + { + ERR("Failed to resize shaders array.\n"); + ID3D11VertexShader_Release(vertex_shader); + return E_OUTOFMEMORY; + } + memset(effect_context->shaders + effect_context->shader_count, 0, + sizeof(*effect_context->shaders) * (effect_context->shaders_size - effect_context->shader_count)); + + effect_context->shader_count++; + shader = &effect_context->shaders[effect_context->shader_count - 1]; + shader->id = shader_id; + shader->shader = (IUnknown *)vertex_shader; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface,

1 0

Ziqing Hui : d2d1: Implement ID2D1EffectContext_GetDpi().
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: ed4cc8ed81db02f37c208cf2019fc2d7b6fbb064 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed4cc8ed81db02f37c208cf2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 10 12:48:39 2022 +0800 d2d1: Implement ID2D1EffectContext_GetDpi(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 714e8a92fd5..90e07c0810b 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -86,7 +86,11 @@ static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *if static void STDMETHODCALLTYPE d2d_effect_context_GetDpi(ID2D1EffectContext *iface, float *dpi_x, float *dpi_y) { - FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + + TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); + + ID2D1DeviceContext_GetDpi(&effect_context->device_context->ID2D1DeviceContext_iface, dpi_x, dpi_y); } static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectContext *iface,

1 0

Zebediah Figura : wined3d: Trace bind flags in wined3d_texture_init().
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: b646682a3da1d3e02a3224d5be85c92e61308141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b646682a3da1d3e02a3224d5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 10 15:02:57 2022 -0500 wined3d: Trace bind flags in wined3d_texture_init(). 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 49650f2839e..35688fcd0d9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3805,10 +3805,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc HRESULT hr; TRACE("texture %p, resource_type %s, format %s, multisample_type %#x, multisample_quality %#x, " - "usage %s, access %s, width %u, height %u, depth %u, layer_count %u, level_count %u, " + "usage %s, bind_flags %s, access %s, width %u, height %u, depth %u, layer_count %u, level_count %u, " "flags %#x, device %p, parent %p, parent_ops %p, sub_resources %p, texture_ops %p.\n", - texture, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format), - desc->multisample_type, desc->multisample_quality, debug_d3dusage(desc->usage), + texture, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format), desc->multisample_type, + desc->multisample_quality, debug_d3dusage(desc->usage), wined3d_debug_bind_flags(desc->bind_flags), wined3d_debug_resource_access(desc->access), desc->width, desc->height, desc->depth, layer_count, level_count, flags, device, parent, parent_ops, sub_resources, texture_ops);

1 0

Nikolay Sivov : mfplat: Allow NULL size pointer in IMFAttributes::GetAllocatedBlob().
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: e3f226fde01d96c5e7799884ed4da5324adceca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3f226fde01d96c5e7799884… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 12 09:13:29 2022 +0300 mfplat: Allow NULL size pointer in IMFAttributes::GetAllocatedBlob(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 3 ++- dlls/mfplat/tests/mfplat.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 08195bca448..24d39d81b62 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2743,7 +2743,8 @@ HRESULT attributes_GetAllocatedBlob(struct attributes *attributes, REFGUID key, if (SUCCEEDED(hr)) { *buf = attrval.caub.pElems; - *size = attrval.caub.cElems; + if (size) + *size = attrval.caub.cElems; } return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8f18fcb293d..3f7ab161b59 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1749,6 +1749,11 @@ static void test_attributes(void) ok(!memcmp(blob_buf, blob, size), "Unexpected blob.\n"); CoTaskMemFree(blob_buf); + hr = IMFAttributes_GetAllocatedBlob(attributes, &DUMMY_GUID1, &blob_buf, NULL); + ok(hr == S_OK, "Failed to get allocated blob, hr %#lx.\n", hr); + ok(!memcmp(blob_buf, blob, size), "Unexpected blob.\n"); + CoTaskMemFree(blob_buf); + hr = IMFAttributes_GetAllocatedBlob(attributes, &DUMMY_GUID2, &blob_buf, &size); ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr);

1 0

Jacek Caban : win32u: Move more default window commands from user32.
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: 135e3176b64eb0ea139f40adb7f5b1c3e89e3577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=135e3176b64eb0ea139f40ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 20:48:07 2022 +0200 win32u: Move more default window commands from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 43 ------------------------------------------- dlls/win32u/defwnd.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index fdb100c9556..af2b32614bc 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -266,46 +266,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa DEFWND_Print(hwnd, (HDC)wParam, lParam); return 0; - case WM_SYNCPAINT: - NtUserRedrawWindow ( hwnd, NULL, 0, RDW_ERASENOW | RDW_ERASE | RDW_ALLCHILDREN ); - return 0; - - case WM_SETREDRAW: - if (wParam) WIN_SetStyle( hwnd, WS_VISIBLE, 0 ); - else - { - NtUserRedrawWindow( hwnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE ); - WIN_SetStyle( hwnd, 0, WS_VISIBLE ); - } - return 0; - - case WM_CLOSE: - NtUserDestroyWindow( hwnd ); - return 0; - - case WM_MOUSEACTIVATE: - if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) - { - LONG ret = SendMessageW( GetParent(hwnd), WM_MOUSEACTIVATE, wParam, lParam ); - if (ret) return ret; - } - - /* Caption clicks are handled by NC_HandleNCLButtonDown() */ - return ( HIWORD(lParam) == WM_LBUTTONDOWN && LOWORD(lParam) == HTCAPTION ? MA_NOACTIVATE : MA_ACTIVATE ); - - case WM_ACTIVATE: - /* The default action in Windows is to set the keyboard focus to - * the window, if it's being activated and not minimized */ - if (LOWORD(wParam) != WA_INACTIVE) { - if (!IsIconic(hwnd)) NtUserSetFocus( hwnd ); - } - break; - - case WM_MOUSEWHEEL: - if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) - return SendMessageW( GetParent(hwnd), WM_MOUSEWHEEL, wParam, lParam ); - break; - case WM_ERASEBKGND: case WM_ICONERASEBKGND: { @@ -325,9 +285,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return 1; } - case WM_GETDLGCODE: - return 0; - case WM_CTLCOLORMSGBOX: case WM_CTLCOLOREDIT: case WM_CTLCOLORLISTBOX: diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index c345a6ab188..72d9aa40164 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -270,6 +270,49 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, break; } + case WM_SYNCPAINT: + NtUserRedrawWindow ( hwnd, NULL, 0, RDW_ERASENOW | RDW_ERASE | RDW_ALLCHILDREN ); + return 0; + + case WM_SETREDRAW: + if (wparam) set_window_style( hwnd, WS_VISIBLE, 0 ); + else + { + NtUserRedrawWindow( hwnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE ); + set_window_style( hwnd, 0, WS_VISIBLE ); + } + return 0; + + case WM_CLOSE: + NtUserDestroyWindow( hwnd ); + return 0; + + case WM_MOUSEACTIVATE: + if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) + { + result = send_message( get_parent(hwnd), WM_MOUSEACTIVATE, wparam, lparam ); + if (result) break; + } + + /* Caption clicks are handled by NC_HandleNCLButtonDown() */ + result = HIWORD(lparam) == WM_LBUTTONDOWN && LOWORD(lparam) == HTCAPTION ? + MA_NOACTIVATE : MA_ACTIVATE; + break; + + case WM_ACTIVATE: + /* The default action in Windows is to set the keyboard focus to + * the window, if it's being activated and not minimized */ + if (LOWORD(wparam) != WA_INACTIVE && !is_iconic( hwnd )) NtUserSetFocus( hwnd ); + break; + + case WM_MOUSEWHEEL: + if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) + result = send_message( get_parent( hwnd ), WM_MOUSEWHEEL, wparam, lparam ); + break; + + case WM_GETDLGCODE: + break; + case WM_SETTEXT: result = set_window_text( hwnd, (void *)lparam, ansi ); break;

1 0

Jacek Caban : win32u: Move default WM_GETICON implementation from user32.
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: 1f296397cafbbd5bcf59f01bdf739ccc4a3658ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f296397cafbbd5bcf59f01b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 20:14:50 2022 +0200 win32u: Move default WM_GETICON implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 30 +++--------------------------- dlls/win32u/defwnd.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 047822d00d6..67cb77a3121 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -262,9 +262,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCACTIVATE: return NC_HandleNCActivate( hwnd, wParam, lParam ); - case WM_NCDESTROY: - return NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); - case WM_PRINT: DEFWND_Print(hwnd, (HDC)wParam, lParam); return 0; @@ -524,30 +521,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return res; } - case WM_GETICON: - { - HICON ret; - WND *wndPtr = WIN_GetPtr( hwnd ); - - switch(wParam) - { - case ICON_SMALL: - ret = wndPtr->hIconSmall; - break; - case ICON_BIG: - ret = wndPtr->hIcon; - break; - case ICON_SMALL2: - ret = wndPtr->hIconSmall ? wndPtr->hIconSmall : wndPtr->hIconSmall2; - break; - default: - ret = 0; - break; - } - WIN_ReleasePtr( wndPtr ); - return (LRESULT)ret; - } - case WM_HELP: SendMessageW( GetParent(hwnd), msg, wParam, lParam ); break; @@ -614,6 +587,9 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; } + default: + return NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); + } return 0; diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 1fa80928c65..3aa5a8286b3 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -112,6 +112,33 @@ static BOOL set_window_text( HWND hwnd, const void *text, BOOL ansi ) return TRUE; } +static HICON get_window_icon( HWND hwnd, WPARAM type ) +{ + HICON ret; + WND *win; + + if (!(win = get_win_ptr( hwnd ))) return 0; + + switch(type) + { + case ICON_SMALL: + ret = win->hIconSmall; + break; + case ICON_BIG: + ret = win->hIcon; + break; + case ICON_SMALL2: + ret = win->hIconSmall ? win->hIconSmall : win->hIconSmall2; + break; + default: + ret = 0; + break; + } + + release_win_ptr( win ); + return ret; +} + static HICON set_window_icon( HWND hwnd, WPARAM type, HICON icon ) { HICON ret = 0; @@ -227,6 +254,10 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, result = (LRESULT)set_window_icon( hwnd, wparam, (HICON)lparam ); break; + case WM_GETICON: + result = (LRESULT)get_window_icon( hwnd, wparam ); + break; + case WM_SYSCOMMAND: result = handle_sys_command( hwnd, wparam, lparam ); break;

1 0

Rémi Bernon : ntdll: Split RtlSizeHeap to a separate heap_size helper.
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: 1c873e87194ebb7b0870726beb9b1127f8d84684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c873e87194ebb7b0870726b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 28 01:33:23 2022 +0200 ntdll: Split RtlSizeHeap to a separate heap_size helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 71 +++++++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2d03cd59729..51567d0552b 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1958,58 +1958,47 @@ BOOLEAN WINAPI RtlUnlockHeap( HANDLE heap ) } -/*********************************************************************** - * RtlSizeHeap (NTDLL.@) - * - * Get the actual size of a memory block allocated from a Heap. - * - * PARAMS - * heap [I] Heap that block was allocated from - * flags [I] HEAP_ flags from "winnt.h" - * ptr [I] Block to get the size of - * - * RETURNS - * Success: The size of the block. - * Failure: -1, heap or ptr are invalid. - * - * NOTES - * The size may be bigger than what was passed to RtlAllocateHeap(). - */ -SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr ) +static NTSTATUS heap_size( HEAP *heap, const void *ptr, SIZE_T *size ) { - SIZE_T ret; - const ARENA_INUSE *pArena; + const ARENA_INUSE *block; SUBHEAP *subheap; - HEAP *heapPtr = HEAP_GetPtr( heap ); - - if (!heapPtr) - { - RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_HANDLE ); - return ~(SIZE_T)0; - } - - heap_lock( heapPtr, flags ); - pArena = (const ARENA_INUSE *)ptr - 1; - if (!validate_block_pointer( heapPtr, &subheap, pArena )) - { - RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); - ret = ~(SIZE_T)0; - } - else if (!subheap) + block = (const ARENA_INUSE *)ptr - 1; + if (!validate_block_pointer( heap, &subheap, block )) return STATUS_INVALID_PARAMETER; + if (!subheap) { const ARENA_LARGE *large_arena = (const ARENA_LARGE *)ptr - 1; - ret = large_arena->data_size; + *size = large_arena->data_size; } else { - ret = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; + *size = (block->size & ARENA_SIZE_MASK) - block->unused_bytes; } - heap_unlock( heapPtr, flags ); + return STATUS_SUCCESS; +} - TRACE("(%p,%08x,%p): returning %08lx\n", heap, flags, ptr, ret ); - return ret; +/*********************************************************************** + * RtlSizeHeap (NTDLL.@) + */ +SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr ) +{ + SIZE_T size = ~(SIZE_T)0; + NTSTATUS status; + HEAP *heapPtr; + + if (!(heapPtr = HEAP_GetPtr( heap ))) + status = STATUS_INVALID_PARAMETER; + else + { + heap_lock( heapPtr, flags ); + status = heap_size( heapPtr, ptr, &size ); + heap_unlock( heapPtr, flags ); + } + + TRACE( "heap %p, flags %#x, ptr %p, return %#Ix, status %#x.\n", heap, flags, ptr, size, status ); + heap_set_status( heapPtr, flags, status ); + return size; }

1 0