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

Zhiyi Zhang : joy.cpl: Enable visual styles.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 9ec0f8a3d5e85c79fd1cb88a661c1b4c2396b079 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec0f8a3d5e85c79fd1cb88a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 13 17:41:10 2022 +0800 joy.cpl: Enable visual styles. joy.cpl uses manifest at ID 124. According to tests, manifest at ID 124 is not loaded automatically by rundll32.exe or Control_RunDLL(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.manifest | 16 ++++++++++++++++ dlls/joy.cpl/joy.rc | 3 +++ dlls/joy.cpl/main.c | 17 +++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/dlls/joy.cpl/joy.manifest b/dlls/joy.cpl/joy.manifest new file mode 100644 index 00000000000..877860e3d68 --- /dev/null +++ b/dlls/joy.cpl/joy.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Joy" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index 77f121c5b1c..c1d8380af37 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -77,6 +77,9 @@ FONT 8, "Ms Shell Dlg" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: joy.manifest */ +124 RT_MANIFEST joy.manifest + /* @makedep: joy.ico */ ICO_MAIN ICON "joy.ico" diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3ecef2d9aa8..c1f41fb0e56 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -992,10 +992,24 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data) { INITCOMMONCONTROLSEX icex; PROPSHEETPAGEW psp[NUM_PROPERTY_PAGES]; + BOOL activated = FALSE; PROPSHEETHEADERW psh; + ULONG_PTR cookie; + ACTCTXW actctx; + HANDLE context; DWORD id = 0; OleInitialize(NULL); + /* Activate context */ + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.hModule = hcpl; + actctx.lpResourceName = MAKEINTRESOURCEW(124); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + context = CreateActCtxW(&actctx); + if (context != INVALID_HANDLE_VALUE) + activated = ActivateActCtx(context, &cookie); + /* Initialize common controls */ icex.dwSize = sizeof(INITCOMMONCONTROLSEX); icex.dwICC = ICC_LISTVIEW_CLASSES | ICC_BAR_CLASSES; @@ -1039,6 +1053,9 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data) /* display the dialog */ PropertySheetW(&psh); + if (activated) + DeactivateActCtx(0, cookie); + ReleaseActCtx(context); OleUninitialize(); }

1 0

Gabriel Ivăncescu : mshtml: Implement enumerator for HTMLRectCollection.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 6c98c657079e5a7170c89e8687a3af4247cbdc11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c98c657079e5a7170c89e86… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 13 17:34:54 2022 +0300 mshtml: Implement enumerator for HTMLRectCollection. 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/htmlelem.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 27 +++++++++ 2 files changed, 177 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 47c18279689..9ed22495058 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -781,6 +781,139 @@ typedef struct { nsIDOMClientRectList *rect_list; } HTMLRectCollection; +typedef struct { + IEnumVARIANT IEnumVARIANT_iface; + + LONG ref; + + ULONG iter; + HTMLRectCollection *col; +} HTMLRectCollectionEnum; + +static inline HTMLRectCollectionEnum *HTMLRectCollectionEnum_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, HTMLRectCollectionEnum, IEnumVARIANT_iface); +} + +static HRESULT WINAPI HTMLRectCollectionEnum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLRectCollectionEnum_AddRef(IEnumVARIANT *iface) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLRectCollectionEnum_Release(IEnumVARIANT *iface) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) { + IHTMLRectCollection_Release(&This->col->IHTMLRectCollection_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLRectCollectionEnum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + VARIANT index; + HRESULT hres; + ULONG num, i; + UINT32 len; + + TRACE("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched); + + nsIDOMClientRectList_GetLength(This->col->rect_list, &len); + num = min(len - This->iter, celt); + V_VT(&index) = VT_I4; + + for(i = 0; i < num; i++) { + V_I4(&index) = This->iter + i; + hres = IHTMLRectCollection_item(&This->col->IHTMLRectCollection_iface, &index, &rgVar[i]); + if(FAILED(hres)) { + while(i--) + VariantClear(&rgVar[i]); + return hres; + } + } + + This->iter += num; + if(pCeltFetched) + *pCeltFetched = num; + return num == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI HTMLRectCollectionEnum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + UINT32 len; + + TRACE("(%p)->(%lu)\n", This, celt); + + nsIDOMClientRectList_GetLength(This->col->rect_list, &len); + if(This->iter + celt > len) { + This->iter = len; + return S_FALSE; + } + + This->iter += celt; + return S_OK; +} + +static HRESULT WINAPI HTMLRectCollectionEnum_Reset(IEnumVARIANT *iface) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + + TRACE("(%p)->()\n", This); + + This->iter = 0; + return S_OK; +} + +static HRESULT WINAPI HTMLRectCollectionEnum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl HTMLRectCollectionEnumVtbl = { + HTMLRectCollectionEnum_QueryInterface, + HTMLRectCollectionEnum_AddRef, + HTMLRectCollectionEnum_Release, + HTMLRectCollectionEnum_Next, + HTMLRectCollectionEnum_Skip, + HTMLRectCollectionEnum_Reset, + HTMLRectCollectionEnum_Clone +}; + static inline HTMLRectCollection *impl_from_IHTMLRectCollection(IHTMLRectCollection *iface) { return CONTAINING_RECORD(iface, HTMLRectCollection, IHTMLRectCollection_iface); @@ -883,8 +1016,23 @@ static HRESULT WINAPI HTMLRectCollection_get_length(IHTMLRectCollection *iface, static HRESULT WINAPI HTMLRectCollection_get__newEnum(IHTMLRectCollection *iface, IUnknown **p) { HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLRectCollectionEnum *ret; + + TRACE("(%p)->(%p)\n", This, p); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumVARIANT_iface.lpVtbl = &HTMLRectCollectionEnumVtbl; + ret->ref = 1; + ret->iter = 0; + + HTMLRectCollection_AddRef(&This->IHTMLRectCollection_iface); + ret->col = This; + + *p = (IUnknown*)&ret->IEnumVARIANT_iface; + return S_OK; } static HRESULT WINAPI HTMLRectCollection_item(IHTMLRectCollection *iface, VARIANT *index, VARIANT *result) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 73b983174d5..00c15773f96 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5229,8 +5229,11 @@ static void test_elem_bounding_client_rect(IUnknown *unk) { IHTMLRectCollection *rects; IHTMLRect *rect, *rect2; + IEnumVARIANT *enum_var; IHTMLElement2 *elem2; + IUnknown *enum_unk; VARIANT v, index; + ULONG fetched; LONG l; HRESULT hres; @@ -5285,6 +5288,30 @@ static void test_elem_bounding_client_rect(IUnknown *unk) test_disp((IUnknown*)V_DISPATCH(&v), &IID_IHTMLRect, NULL, L"[object]"); VariantClear(&v); + hres = IHTMLRectCollection_get__newEnum(rects, &enum_unk); + ok(hres == S_OK, "_newEnum failed: %08lx\n", hres); + + hres = IUnknown_QueryInterface(enum_unk, &IID_IEnumVARIANT, (void**)&enum_var); + IUnknown_Release(enum_unk); + ok(hres == S_OK, "Could not get IEnumVARIANT iface: %08lx\n", hres); + + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok(hres == S_OK, "Next failed: %08lx\n", hres); + ok(fetched == 1, "fetched = %lu\n", fetched); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) == NULL\n"); + test_disp((IUnknown*)V_DISPATCH(&v), &IID_IHTMLRect, NULL, L"[object]"); + VariantClear(&v); + + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok(hres == S_FALSE, "Next failed: %08lx\n", hres); + ok(fetched == 0, "fetched = %lu\n", fetched); + IEnumVARIANT_Release(enum_var); + IHTMLRectCollection_Release(rects); IHTMLElement2_Release(elem2); }

1 0

Nikolay Sivov : ddrawex/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 5a0f48364184f0a0b110d16c9e6086480921c664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a0f48364184f0a0b110d16c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 08:53:29 2022 +0300 ddrawex/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/tests/Makefile.in | 1 - dlls/ddrawex/tests/ddrawex.c | 21 ++++---- dlls/ddrawex/tests/surface.c | 106 ++++++++++++++++++++--------------------- 3 files changed, 63 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a0f48364184f0a0b110…

1 0

Nikolay Sivov : ddrawex/tests: Simplify refcount helper.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 0666950b38a5b4f3dec7d04bb74e303343c7efc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0666950b38a5b4f3dec7d04b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 08:53:30 2022 +0300 ddrawex/tests: Simplify refcount helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/tests/ddrawex.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index 1cff73776fd..59268444ea2 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -37,10 +37,11 @@ static IDirectDraw *createDDraw(void) return SUCCEEDED(hr) ? dd : NULL; } -static ULONG get_ref(IUnknown *o) +static ULONG get_refcount(void *iface) { - IUnknown_AddRef(o); - return IUnknown_Release(o); + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); } static void RefCountTest(void) @@ -52,11 +53,11 @@ static void RefCountTest(void) HRESULT hr; ULONG ref; - ref = get_ref((IUnknown *) dd1); + ref = get_refcount(dd1); ok(ref == 1, "Unexpected refcount %lu.\n", ref); IDirectDraw_AddRef(dd1); - ref = get_ref((IUnknown *) dd1); + ref = get_refcount(dd1); if (ref == 1) { win_skip("Refcounting is broken\n"); @@ -65,15 +66,15 @@ static void RefCountTest(void) } ok(ref == 2, "Unexpected refcount %lu.\n", ref); IDirectDraw_Release(dd1); - ref = get_ref((IUnknown *) dd1); + ref = get_refcount(dd1); ok(ref == 1, "Unexpected refcount %lu.\n", ref); IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw2, (void **) &dd2); - ref = get_ref((IUnknown *) dd2); + ref = get_refcount(dd2); ok(ref == 2, "Unexpected refcount %lu.\n", ref); IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw3, (void **) &dd3); - ref = get_ref((IUnknown *) dd3); + ref = get_refcount(dd3); ok(ref == 3, "Unexpected refcount %lu.\n", ref); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **) &dd4); @@ -85,14 +86,14 @@ static void RefCountTest(void) IDirectDraw3_Release(dd3); return; } - ref = get_ref((IUnknown *) dd4); + ref = get_refcount(dd4); ok(ref == 4, "Unexpected refcount %lu.\n", ref); IDirectDraw_Release(dd1); IDirectDraw2_Release(dd2); IDirectDraw3_Release(dd3); - ref = get_ref((IUnknown *) dd4); + ref = get_refcount(dd4); ok(ref == 1, "Unexpected refcount %lu.\n", ref); IDirectDraw4_Release(dd4);

1 0

Gabriel Ivăncescu : jscript: Defer lookup to the actual locals for function statements.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 2bdce91e8f63088b3ab0eef678e03fb59853f30c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bdce91e8f63088b3ab0eef6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 13 17:34:52 2022 +0300 jscript: Defer lookup to the actual locals for function statements. Functions declared as function statements have an associated local_ref and can be changed from within themselves by using their name (by literally changing the local variable), while function expressions can not. 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/jscript/engine.c | 6 ++++-- dlls/mshtml/tests/es5.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c483f2adb0a..73b9d868e0c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -587,7 +587,8 @@ static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_ scope->obj = to_disp(scope->jsobj); } - if (scope == frame->base_scope && func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5) + if (scope == frame->base_scope && func->name && func->local_ref == INVALID_LOCAL_REF && + ctx->version >= SCRIPTLANGUAGEVERSION_ES5) jsdisp_propput_name(scope->jsobj, func->name, jsval_obj(jsdisp_addref(frame->function_instance))); index = scope->scope_index; @@ -716,7 +717,8 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re } /* ECMA-262 5.1 Edition 13 */ - if(func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && !wcscmp(identifier, func->name)) { + if(func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && + func->local_ref == INVALID_LOCAL_REF && !wcscmp(identifier, func->name)) { TRACE("returning a function from scope chain\n"); ret->type = EXPRVAL_JSVAL; ret->u.val = jsval_obj(jsdisp_addref(scope->frame->function_instance)); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e8ee7133dfd..43a6ce77350 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1691,6 +1691,34 @@ sync_test("functions scope", function() { func_outer(o); func(); ok(ret === o, "ret != o"); + + func_outer = function g() { + var g2 = g; + g = 10; + ok(g !== 10, "g was redefined to 10"); + g = function() {}; + ok(g === g2, "g !== g2: " + g); + } + func_outer(); + + function h() { + h = 1; + ok(h === 1, "h was not redefined: " + h); + } + h(); + ok(h === 1, "h = " + h); + + function h2() { return function() { h2 = 2; }; } + h2()(); + ok(h2 === 2, "h2 = " + h2); + + (function e() { + var f = e; + ok(typeof(f) === "function", "f = " + f); + (function () { e = 1; })(); + e = 2; + ok(f === e, "f != e"); + })(); }); sync_test("console", function() {

1 0

Jacek Caban : win32u: Introduce inline helpers for NtUserCallTwoParam calls.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: dae11519da7791bb0fe824111a65848816a31875 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae11519da7791bb0fe82411… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:07:48 2022 +0200 win32u: Introduce inline helpers for NtUserCallTwoParam calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 4 ++-- dlls/user32/hook.c | 2 +- dlls/user32/message.c | 2 +- dlls/user32/sysparams.c | 6 ++--- dlls/user32/winproc.c | 2 +- dlls/win32u/sysparams.c | 20 ++++++++++++----- include/ntuser.h | 60 +++++++++++++++++++++++++++++++++++++------------ 7 files changed, 68 insertions(+), 28 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index b94d5958ce0..75b81b0ea05 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -300,7 +300,7 @@ static HICON store_icon_32( HICON16 icon16, HICON icon ) { memcpy( &ret, (char *)(ptr + 1) + and_size + xor_size, sizeof(ret) ); memcpy( (char *)(ptr + 1) + and_size + xor_size, &icon, sizeof(icon) ); - NtUserCallTwoParam( HandleToUlong(icon), icon16, NtUserSetIconParam ); + NtUserSetIconParam( icon, icon16 ); } release_icon_ptr( icon16, ptr ); } @@ -342,7 +342,7 @@ HICON get_icon_32( HICON16 icon16 ) DeleteObject( iinfo.hbmMask ); DeleteObject( iinfo.hbmColor ); memcpy( (char *)(ptr + 1) + xor_size + and_size, &ret, sizeof(ret) ); - NtUserCallTwoParam( HandleToUlong(ret), icon16, NtUserSetIconParam ); + NtUserSetIconParam( ret, icon16 ); } } release_icon_ptr( icon16, ptr ); diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index e6db8590934..76033f0dee1 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -379,7 +379,7 @@ HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid */ BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc ) { - return NtUserCallTwoParam( id, (UINT_PTR)proc, NtUserUnhookWindowsHook ); + return NtUserUnhookWindowsHook( id, proc ); } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 72f5c084432..d2ab94dbf37 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -694,7 +694,7 @@ BOOL WINAPI SendMessageCallbackW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa */ BOOL WINAPI ReplyMessage( LRESULT result ) { - return NtUserCallTwoParam( result, 0, NtUserReplyMessage ); + return NtUserReplyMessage( result, NULL ); } diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4bfdde4bfcb..c2b570b6119 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -453,7 +453,7 @@ INT WINAPI GetSystemMetrics( INT index ) */ INT WINAPI GetSystemMetricsForDpi( INT index, UINT dpi ) { - return NtUserCallTwoParam( index, dpi, NtUserGetSystemMetricsForDpi ); + return NtUserGetSystemMetricsForDpi( index, dpi ); } @@ -994,7 +994,7 @@ BOOL WINAPI PhysicalToLogicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) */ HMONITOR WINAPI MonitorFromRect( const RECT *rect, DWORD flags ) { - return UlongToHandle( NtUserCallTwoParam( (LONG_PTR)rect, flags, NtUserMonitorFromRect )); + return NtUserMonitorFromRect( rect, flags ); } /*********************************************************************** @@ -1045,7 +1045,7 @@ BOOL WINAPI GetMonitorInfoA( HMONITOR monitor, LPMONITORINFO info ) */ BOOL WINAPI GetMonitorInfoW( HMONITOR monitor, LPMONITORINFO info ) { - return NtUserCallTwoParam( HandleToUlong(monitor), (ULONG_PTR)info, NtUserGetMonitorInfo ); + return NtUserGetMonitorInfo( monitor, info ); } #ifdef __i386__ diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 9ac57b5239a..7b9b2000c06 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1268,7 +1268,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) msg.lParam = params->lparam; dispatch_win_proc_params( params ); - NtUserCallTwoParam( result, (UINT_PTR)&msg, NtUserReplyMessage ); + NtUserReplyMessage( result, &msg ); if (buffer != stack_buffer && buffer != params + 1) HeapFree( GetProcessHeap(), 0, buffer ); } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 0a4fa4f524d..a760a2ca3a4 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4762,23 +4762,31 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code { switch(code) { - case NtUserGetMonitorInfo: + case NtUserCallTwoParam_GetMonitorInfo: return get_monitor_info( UlongToHandle(arg1), (MONITORINFO *)arg2 ); - case NtUserGetSystemMetricsForDpi: + + case NtUserCallTwoParam_GetSystemMetricsForDpi: return get_system_metrics_for_dpi( arg1, arg2 ); - case NtUserMonitorFromRect: + + case NtUserCallTwoParam_MonitorFromRect: return HandleToUlong( monitor_from_rect( (const RECT *)arg1, arg2, get_thread_dpi() )); - case NtUserReplyMessage: + + case NtUserCallTwoParam_ReplyMessage: return reply_message_result( arg1, (MSG *)arg2 ); - case NtUserSetIconParam: + + case NtUserCallTwoParam_SetIconParam: return set_icon_param( UlongToHandle(arg1), arg2 ); - case NtUserUnhookWindowsHook: + + case NtUserCallTwoParam_UnhookWindowsHook: return unhook_windows_hook( arg1, (HOOKPROC)arg2 ); + /* temporary exports */ case NtUserAllocWinProc: return (UINT_PTR)alloc_winproc( (WNDPROC)arg1, arg2 ); + case NtUserGetHandlePtr: return (UINT_PTR)get_user_handle_ptr( UlongToHandle(arg1), arg2 ); + default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 5cf25aca64f..8d94fc133da 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -131,20 +131,6 @@ struct win_hook_params #define NTUSER_DPI_PER_MONITOR_AWARE_V2 0x00000022 #define NTUSER_DPI_PER_UNAWARE_GDISCALED 0x40006010 -/* NtUserCallTwoParam codes, not compatible with Windows */ -enum -{ - NtUserGetMonitorInfo, - NtUserGetSystemMetricsForDpi, - NtUserMonitorFromRect, - NtUserReplyMessage, - NtUserSetIconParam, - NtUserUnhookWindowsHook, - /* temporary exports */ - NtUserAllocWinProc, - NtUserGetHandlePtr, -}; - /* NtUserCallHwnd codes, not compatible with Windows */ enum { @@ -778,4 +764,50 @@ static inline UINT NtUserRealizePalette( HDC hdc ) return NtUserCallOneParam( HandleToUlong(hdc), NtUserCallOneParam_RealizePalette ); } +/* NtUserCallTwoParam codes, not compatible with Windows */ +enum +{ + NtUserCallTwoParam_GetMonitorInfo, + NtUserCallTwoParam_GetSystemMetricsForDpi, + NtUserCallTwoParam_MonitorFromRect, + NtUserCallTwoParam_ReplyMessage, + NtUserCallTwoParam_SetIconParam, + NtUserCallTwoParam_UnhookWindowsHook, + /* temporary exports */ + NtUserAllocWinProc, + NtUserGetHandlePtr, +}; + +static inline BOOL NtUserGetMonitorInfo( HMONITOR monitor, MONITORINFO *info ) +{ + return NtUserCallTwoParam( HandleToUlong(monitor), (ULONG_PTR)info, + NtUserCallTwoParam_GetMonitorInfo ); +} + +static inline INT NtUserGetSystemMetricsForDpi( INT index, UINT dpi ) +{ + return NtUserCallTwoParam( index, dpi, NtUserCallTwoParam_GetSystemMetricsForDpi ); +} + +static inline HMONITOR NtUserMonitorFromRect( const RECT *rect, DWORD flags ) +{ + ULONG ret = NtUserCallTwoParam( (LONG_PTR)rect, flags, NtUserCallTwoParam_MonitorFromRect ); + return UlongToHandle( ret ); +} + +static inline BOOL NtUserReplyMessage( LRESULT result, MSG *msg ) +{ + return NtUserCallTwoParam( result, (UINT_PTR)msg, NtUserCallTwoParam_ReplyMessage ); +} + +static inline UINT_PTR NtUserSetIconParam( HICON icon, ULONG_PTR param ) +{ + return NtUserCallTwoParam( HandleToUlong(icon), param, NtUserCallTwoParam_SetIconParam ); +} + +static inline BOOL NtUserUnhookWindowsHook( INT id, HOOKPROC proc ) +{ + return NtUserCallTwoParam( id, (UINT_PTR)proc, NtUserCallTwoParam_UnhookWindowsHook ); +} + #endif /* _NTUSER_ */

1 0

Jacek Caban : win32u: Introduce inline helpers for NtUserCallHwnd calls.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 31dbce9675b6f2b25a4af5d4102fc36213838137 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31dbce9675b6f2b25a4af5d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:08:02 2022 +0200 win32u: Introduce inline helpers for NtUserCallHwnd calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 20 ++++++------- dlls/user32/winpos.c | 2 +- dlls/win32u/window.c | 30 ++++++++++++------- include/ntuser.h | 81 ++++++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 97 insertions(+), 36 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 24aeaaeadfd..5223c776d5f 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -906,7 +906,7 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) */ BOOL WINAPI IsWindowEnabled( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserIsWindowEnabled ); + return NtUserIsWindowEnabled( hwnd ); } /*********************************************************************** @@ -914,7 +914,7 @@ BOOL WINAPI IsWindowEnabled( HWND hwnd ) */ BOOL WINAPI IsWindowUnicode( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserIsWindowUnicode ); + return NtUserIsWindowUnicode( hwnd ); } @@ -923,7 +923,7 @@ BOOL WINAPI IsWindowUnicode( HWND hwnd ) */ DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext( HWND hwnd ) { - return (DPI_AWARENESS_CONTEXT)NtUserCallHwnd( hwnd, NtUserGetWindowDpiAwarenessContext ); + return NtUserGetWindowDpiAwarenessContext( hwnd ); } @@ -932,7 +932,7 @@ DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext( HWND hwnd ) */ UINT WINAPI GetDpiForWindow( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserGetDpiForWindow ); + return NtUserGetDpiForWindow( hwnd ); } @@ -1215,7 +1215,7 @@ INT WINAPI GetWindowTextLengthA( HWND hwnd ) /* when window belongs to other process, don't send a message */ GetCPInfo( CP_ACP, &info ); - return NtUserCallHwnd( hwnd, NtUserGetWindowTextLength ) * info.MaxCharSize; + return NtUserGetWindowTextLength( hwnd ) * info.MaxCharSize; } /******************************************************************* @@ -1226,7 +1226,7 @@ INT WINAPI GetWindowTextLengthW( HWND hwnd ) if (WIN_IsCurrentProcess( hwnd )) return SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ); /* when window belongs to other process, don't send a message */ - return NtUserCallHwnd( hwnd, NtUserGetWindowTextLength ); + return NtUserGetWindowTextLength( hwnd ); } @@ -1235,7 +1235,7 @@ INT WINAPI GetWindowTextLengthW( HWND hwnd ) */ BOOL WINAPI IsWindow( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserIsWindow ); + return NtUserIsWindow( hwnd ); } @@ -1253,7 +1253,7 @@ DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process ) */ HWND WINAPI GetParent( HWND hwnd ) { - return UlongToHandle( NtUserCallHwnd( hwnd, NtUserGetParent )); + return NtUserGetParent( hwnd ); } @@ -1271,7 +1271,7 @@ BOOL WINAPI IsChild( HWND parent, HWND child ) */ BOOL WINAPI IsWindowVisible( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserIsWindowVisible ); + return NtUserIsWindowVisible( hwnd ); } @@ -1564,7 +1564,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) */ DWORD WINAPI GetWindowContextHelpId( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserGetWindowContextHelpId ); + return NtUserGetWindowContextHelpId( hwnd ); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 3f7a38a75c9..04a3ddb5e21 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -895,7 +895,7 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) */ UINT WINAPI ArrangeIconicWindows( HWND parent ) { - return NtUserCallHwnd( parent, NtUserArrangeIconicWindows ); + return NtUserArrangeIconicWindows( parent ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index b2913b267c4..b7a6ebb7090 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4976,26 +4976,36 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { switch (code) { - case NtUserArrangeIconicWindows: + case NtUserCallHwnd_ArrangeIconicWindows: return arrange_iconic_windows( hwnd ); - case NtUserGetDpiForWindow: + + case NtUserCallHwnd_GetDpiForWindow: return get_dpi_for_window( hwnd ); - case NtUserGetParent: + + case NtUserCallHwnd_GetParent: return HandleToUlong( get_parent( hwnd )); - case NtUserGetWindowContextHelpId: + + case NtUserCallHwnd_GetWindowContextHelpId: return get_window_context_help_id( hwnd ); - case NtUserGetWindowDpiAwarenessContext: + + case NtUserCallHwnd_GetWindowDpiAwarenessContext: return (ULONG_PTR)get_window_dpi_awareness_context( hwnd ); - case NtUserGetWindowTextLength: + + case NtUserCallHwnd_GetWindowTextLength: return get_server_window_text( hwnd, NULL, 0 ); - case NtUserIsWindow: + + case NtUserCallHwnd_IsWindow: return is_window( hwnd ); - case NtUserIsWindowEnabled: + + case NtUserCallHwnd_IsWindowEnabled: return is_window_enabled( hwnd ); - case NtUserIsWindowUnicode: + + case NtUserCallHwnd_IsWindowUnicode: return is_window_unicode( hwnd ); - case NtUserIsWindowVisible: + + case NtUserCallHwnd_IsWindowVisible: return is_window_visible( hwnd ); + default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 8d94fc133da..df89c63b405 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -131,21 +131,6 @@ struct win_hook_params #define NTUSER_DPI_PER_MONITOR_AWARE_V2 0x00000022 #define NTUSER_DPI_PER_UNAWARE_GDISCALED 0x40006010 -/* NtUserCallHwnd codes, not compatible with Windows */ -enum -{ - NtUserArrangeIconicWindows, - NtUserGetDpiForWindow, - NtUserGetParent, - NtUserGetWindowContextHelpId, - NtUserGetWindowDpiAwarenessContext, - NtUserGetWindowTextLength, - NtUserIsWindow, - NtUserIsWindowEnabled, - NtUserIsWindowUnicode, - NtUserIsWindowVisible, -}; - /* NtUserCallHwndParam codes, not compatible with Windows */ enum { @@ -810,4 +795,70 @@ static inline BOOL NtUserUnhookWindowsHook( INT id, HOOKPROC proc ) return NtUserCallTwoParam( id, (UINT_PTR)proc, NtUserCallTwoParam_UnhookWindowsHook ); } +/* NtUserCallHwnd codes, not compatible with Windows */ +enum +{ + NtUserCallHwnd_ArrangeIconicWindows, + NtUserCallHwnd_GetDpiForWindow, + NtUserCallHwnd_GetParent, + NtUserCallHwnd_GetWindowContextHelpId, + NtUserCallHwnd_GetWindowDpiAwarenessContext, + NtUserCallHwnd_GetWindowTextLength, + NtUserCallHwnd_IsWindow, + NtUserCallHwnd_IsWindowEnabled, + NtUserCallHwnd_IsWindowUnicode, + NtUserCallHwnd_IsWindowVisible, +}; + +static inline UINT NtUserArrangeIconicWindows( HWND parent ) +{ + return NtUserCallHwnd( parent, NtUserCallHwnd_ArrangeIconicWindows ); +} + +static inline DWORD NtUserGetWindowContextHelpId( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_GetWindowContextHelpId ); +} + +static inline UINT NtUserGetDpiForWindow( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_GetDpiForWindow ); +} + +static inline HWND NtUserGetParent( HWND hwnd ) +{ + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserCallHwnd_GetParent )); +} + +static inline DPI_AWARENESS_CONTEXT NtUserGetWindowDpiAwarenessContext( HWND hwnd ) +{ + return (DPI_AWARENESS_CONTEXT)NtUserCallHwnd( hwnd, + NtUserCallHwnd_GetWindowDpiAwarenessContext ); +} + +static inline INT NtUserGetWindowTextLength( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_GetWindowTextLength ); +} + +static inline BOOL NtUserIsWindow( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_IsWindow ); +} + +static inline BOOL NtUserIsWindowEnabled( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_IsWindowEnabled ); +} + +static inline BOOL NtUserIsWindowUnicode( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_IsWindowUnicode ); +} + +static inline BOOL NtUserIsWindowVisible( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_IsWindowVisible ); +} + #endif /* _NTUSER_ */

1 0

Jacek Caban : winex11: Remove no longer needed helpers.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 523a6eba0250e734a30b9310ab694e2a2af6d6ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=523a6eba0250e734a30b9310… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:08:36 2022 +0200 winex11: Remove no longer needed helpers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 10 +++++----- dlls/winex11.drv/display.c | 18 ++++-------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/mouse.c | 6 +++--- dlls/winex11.drv/window.c | 6 +++--- dlls/winex11.drv/x11drv.h | 4 +--- 6 files changed, 17 insertions(+), 29 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 0ac538d06ed..a89824772d0 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -118,7 +118,7 @@ static BOOL X11DRV_desktop_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_ RECT primary_rect; DEVMODEW *modes; - primary_rect = get_primary_monitor_rect(); + primary_rect = NtUserGetPrimaryMonitorRect(); screen_width = primary_rect.right - primary_rect.left; screen_height = primary_rect.bottom - primary_rect.top; @@ -166,7 +166,7 @@ static void X11DRV_desktop_free_modes( DEVMODEW *modes ) static BOOL X11DRV_desktop_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) { - RECT primary_rect = get_primary_monitor_rect(); + RECT primary_rect = NtUserGetPrimaryMonitorRect(); mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; @@ -374,7 +374,7 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) BOOL is_desktop_fullscreen(void) { - RECT primary_rect = get_primary_monitor_rect(); + RECT primary_rect = NtUserGetPrimaryMonitorRect(); return (primary_rect.right - primary_rect.left == max_width && primary_rect.bottom - primary_rect.top == max_height); } @@ -421,8 +421,8 @@ void X11DRV_resize_desktop( BOOL send_display_change ) HWND hwnd = GetDesktopWindow(); INT width, height; - virtual_rect = get_virtual_screen_rect(); - primary_rect = get_primary_monitor_rect(); + virtual_rect = NtUserGetVirtualScreenRect(); + primary_rect = NtUserGetPrimaryMonitorRect(); width = primary_rect.right; height = primary_rect.bottom; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 77b3d9e303c..87287854044 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -44,7 +44,7 @@ void release_display_device_init_mutex(HANDLE mutex) POINT virtual_screen_to_root(INT x, INT y) { - RECT virtual = get_virtual_screen_rect(); + RECT virtual = NtUserGetVirtualScreenRect(); POINT pt; pt.x = x - virtual.left; @@ -54,7 +54,7 @@ POINT virtual_screen_to_root(INT x, INT y) POINT root_to_virtual_screen(INT x, INT y) { - RECT virtual = get_virtual_screen_rect(); + RECT virtual = NtUserGetVirtualScreenRect(); POINT pt; pt.x = x + virtual.left; @@ -62,16 +62,6 @@ POINT root_to_virtual_screen(INT x, INT y) return pt; } -RECT get_virtual_screen_rect(void) -{ - return NtUserGetVirtualScreenRect(); -} - -RECT get_primary_monitor_rect(void) -{ - return NtUserGetPrimaryMonitorRect(); -} - /* Get the primary monitor rect from the host system */ RECT get_host_primary_monitor_rect(void) { @@ -214,9 +204,9 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) HWND foreground; UINT mask = 0; - old_virtual_rect = get_virtual_screen_rect(); + old_virtual_rect = NtUserGetVirtualScreenRect(); X11DRV_DisplayDevices_Init(TRUE); - new_virtual_rect = get_virtual_screen_rect(); + new_virtual_rect = NtUserGetVirtualScreenRect(); /* Calculate XReconfigureWMWindow() mask */ if (old_virtual_rect.left != new_virtual_rect.left) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 6f24e1bf370..8f4bb9fd7e9 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -91,7 +91,7 @@ static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output physDev->depth = default_visual.depth; physDev->color_shifts = &X11DRV_PALETTE_default_shifts; - physDev->dc_rect = get_virtual_screen_rect(); + physDev->dc_rect = NtUserGetVirtualScreenRect(); OffsetRect( &physDev->dc_rect, -physDev->dc_rect.left, -physDev->dc_rect.top ); push_dc_driver( pdev, &physDev->dev, &x11drv_funcs.dc_funcs ); if (xrender_funcs && !xrender_funcs->pCreateDC( pdev, device, output, initData )) return FALSE; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 895928c4a31..65e04d6cab5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -562,7 +562,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) if (!GetMonitorInfoW( monitor, &monitor_info )) return FALSE; if (!grab_fullscreen) { - RECT virtual_rect = get_virtual_screen_rect(); + RECT virtual_rect = NtUserGetVirtualScreenRect(); if (!EqualRect( &monitor_info.rcMonitor, &virtual_rect )) return FALSE; if (is_virtual_desktop()) return FALSE; } @@ -1540,7 +1540,7 @@ BOOL X11DRV_GetCursorPos(LPPOINT pos) */ BOOL X11DRV_ClipCursor( LPCRECT clip ) { - RECT virtual_rect = get_virtual_screen_rect(); + RECT virtual_rect = NtUserGetVirtualScreenRect(); if (!clip) clip = &virtual_rect; @@ -1853,7 +1853,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) } if (event->deviceid != thread_data->xi2_current_slave) return FALSE; - virtual_rect = get_virtual_screen_rect(); + virtual_rect = NtUserGetVirtualScreenRect(); if (x->max <= x->min) x_scale = 1; else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b3202847bb7..1803a546dad 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1836,7 +1836,7 @@ BOOL X11DRV_CreateDesktopWindow( HWND hwnd ) if (!width && !height) /* not initialized yet */ { - RECT rect = get_virtual_screen_rect(); + RECT rect = NtUserGetVirtualScreenRect(); SERVER_START_REQ( set_window_pos ) { @@ -2205,7 +2205,7 @@ void X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) escape.code = X11DRV_SET_DRAWABLE; escape.drawable = root_window; escape.mode = IncludeInferiors; - escape.dc_rect = get_virtual_screen_rect(); + escape.dc_rect = NtUserGetVirtualScreenRect(); OffsetRect( &escape.dc_rect, -2 * escape.dc_rect.left, -2 * escape.dc_rect.top ); NtGdiExtEscape( hdc, NULL, 0, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } @@ -2320,7 +2320,7 @@ done: static inline BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rect ) { - *surface_rect = get_virtual_screen_rect(); + *surface_rect = NtUserGetVirtualScreenRect(); if (!IntersectRect( surface_rect, surface_rect, visible_rect )) return FALSE; OffsetRect( surface_rect, -visible_rect->left, -visible_rect->top ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2112980aab5..83da0a88bd7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -699,8 +699,6 @@ extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, i extern BOOL is_window_rect_full_screen( const RECT *rect ) DECLSPEC_HIDDEN; extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; -extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; -extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_work_area( const RECT *monitor_rect ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; @@ -833,7 +831,7 @@ extern void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) DECLSPEC_HIDDEN; static inline BOOL is_window_rect_mapped( const RECT *rect ) { - RECT virtual_rect = get_virtual_screen_rect(); + RECT virtual_rect = NtUserGetVirtualScreenRect(); return (rect->left < virtual_rect.right && rect->top < virtual_rect.bottom && max( rect->right, rect->left + 1 ) > virtual_rect.left &&

1 0

Jacek Caban : user32: Get rid of __wine_set_pixel_format.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 0953de5cab03d4582ae4e5c900cec7bf7223a46d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0953de5cab03d4582ae4e5c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:09:19 2022 +0200 user32: Get rid of __wine_set_pixel_format. Use NtUserSetWindowPixelFormat in drivers instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 3 +-- dlls/user32/user32.spec | 8 -------- dlls/user32/win.c | 9 --------- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 4 ++-- include/wine/wgl_driver.h | 1 - 7 files changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index ebfd3c9161e..09531731f8d 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -645,8 +645,7 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n"; -print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n"; -print HEADER "extern BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format );\n\n"; +print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4bd42fea425..af63ae007a1 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -831,11 +831,3 @@ @ varargs wsprintfW(wstr wstr) @ stdcall wvsprintfA(ptr str ptr) @ stdcall wvsprintfW(ptr wstr ptr) - -################################################################ -# Wine internal extensions -# -# All functions must be prefixed with '__wine_' (for internal functions) -# or 'wine_' (for user-visible functions) to avoid namespace conflicts. -# -@ cdecl __wine_set_pixel_format(long long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index de0dc2f2fb7..f5c22bfbadc 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1698,15 +1698,6 @@ BOOL WINAPI SwitchDesktop( HDESK hDesktop) } -/*********************************************************************** - * __wine_set_pixel_format - */ -BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ) -{ - return NtUserSetWindowPixelFormat( hwnd, format ); -} - - /***************************************************************************** * UpdateLayeredWindowIndirect (USER32.@) */ diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 3d18f99fb1a..9f20e51b8da 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -245,7 +245,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) release_gl_drawable( gl ); if (prev && prev != format && !allow_change) return FALSE; - if (__wine_set_pixel_format( hwnd, format )) return TRUE; + if (NtUserSetWindowPixelFormat( hwnd, format )) return TRUE; destroy_gl_drawable( hwnd ); return FALSE; } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ca7c45aa966..d61d0a6ea66 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1600,7 +1600,7 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); - if (ret && gl_surface_mode == GL_SURFACE_BEHIND) __wine_set_pixel_format(hwnd, fmt); + if (ret && gl_surface_mode == GL_SURFACE_BEHIND) NtUserSetWindowPixelFormat(hwnd, fmt); return ret; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 422f52a521a..ba38549e0e4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1398,7 +1398,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BO XFlush( gdi_display ); release_gl_drawable( gl ); - __wine_set_pixel_format( hwnd, pixel_format_index( format )); + NtUserSetWindowPixelFormat( hwnd, pixel_format_index( format )); return TRUE; } @@ -1508,7 +1508,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) else { destroy_gl_drawable( hwnd ); - __wine_set_pixel_format( hwnd, 0 ); + NtUserSetWindowPixelFormat( hwnd, 0 ); } release_gl_drawable( old ); } diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index f077a3d0f09..36b1f384ddf 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -3406,6 +3406,5 @@ struct opengl_funcs USE_GL_FUNC(glViewport) extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); -extern BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ); #endif /* __WINE_WGL_DRIVER_H */

1 0

Alexandre Julliard : kernelbase: Move codepage initialization to ntdll.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: e81327358a26b160740b3421a4c7f300b4d2f06f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e81327358a26b160740b3421… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 13 15:13:16 2022 +0200 kernelbase: Move codepage initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 28 +++++++--------------------- dlls/ntdll/locale.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 25d6d76c0c4..42dcfff50e0 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -285,7 +285,6 @@ struct norm_table static NLSTABLEINFO nls_info; static UINT unix_cp = CP_UTF8; -static UINT mac_cp = 10000; static LCID system_lcid; static LCID user_lcid; static HKEY intl_key; @@ -1752,7 +1751,7 @@ static void update_locale_registry(void) */ void init_locale( HMODULE module ) { - UINT ansi_cp = 0, oem_cp = 0; + USHORT utf8[2] = { 0, CP_UTF8 }; USHORT *ansi_ptr, *oem_ptr; void *sort_ptr; WCHAR bufferW[LOCALE_NAME_MAX_LENGTH]; @@ -1781,26 +1780,13 @@ void init_locale( HMODULE module ) if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) unix_cp = wcstoul( bufferW, NULL, 10 ); - GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&ansi_cp, sizeof(ansi_cp)/sizeof(WCHAR) ); - GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_IDEFAULTMACCODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&mac_cp, sizeof(mac_cp)/sizeof(WCHAR) ); - GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR) ); - NtGetNlsSectionPtr( 9, 0, NULL, &sort_ptr, &size ); NtGetNlsSectionPtr( 12, NormalizationC, NULL, (void **)&norm_info, &size ); init_sortkeys( sort_ptr ); - if (!ansi_cp || NtGetNlsSectionPtr( 11, ansi_cp, NULL, (void **)&ansi_ptr, &size )) - NtGetNlsSectionPtr( 11, 1252, NULL, (void **)&ansi_ptr, &size ); - if (!oem_cp || NtGetNlsSectionPtr( 11, oem_cp, 0, (void **)&oem_ptr, &size )) - NtGetNlsSectionPtr( 11, 437, NULL, (void **)&oem_ptr, &size ); - NtCurrentTeb()->Peb->AnsiCodePageData = ansi_ptr; - NtCurrentTeb()->Peb->OemCodePageData = oem_ptr; - NtCurrentTeb()->Peb->UnicodeCaseTableData = sort.casemap; + ansi_ptr = NtCurrentTeb()->Peb->AnsiCodePageData ? NtCurrentTeb()->Peb->AnsiCodePageData : utf8; + oem_ptr = NtCurrentTeb()->Peb->OemCodePageData ? NtCurrentTeb()->Peb->OemCodePageData : utf8; RtlInitNlsTables( ansi_ptr, oem_ptr, sort.casemap, &nls_info ); - RtlResetRtlTranslations( &nls_info ); RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Nls", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &nls_key, NULL ); @@ -1840,11 +1826,11 @@ void init_locale( HMODULE module ) if (!RegCreateKeyExW( nls_key, L"Codepage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) { - count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", ansi_cp ); + count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", GetACP() ); RegSetValueExW( hkey, L"ACP", 0, REG_SZ, (BYTE *)bufferW, (count + 1) * sizeof(WCHAR) ); - count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", oem_cp ); + count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", GetOEMCP() ); RegSetValueExW( hkey, L"OEMCP", 0, REG_SZ, (BYTE *)bufferW, (count + 1) * sizeof(WCHAR) ); - count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", mac_cp ); + count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", system_locale->idefaultmaccodepage ); RegSetValueExW( hkey, L"MACCP", 0, REG_SZ, (BYTE *)bufferW, (count + 1) * sizeof(WCHAR) ); RegCloseKey( hkey ); } @@ -1989,7 +1975,7 @@ static const CPTABLEINFO *get_codepage_table( UINT codepage ) case CP_OEMCP: return &nls_info.OemTableInfo; case CP_MACCP: - codepage = mac_cp; + codepage = system_locale->idefaultmaccodepage; break; case CP_THREAD_ACP: codepage = get_lcid_codepage( NtCurrentTeb()->CurrentLocale, 0 ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 597910e5639..3c96a742e4e 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -153,10 +153,14 @@ static const NLS_LOCALE_DATA *get_locale_data( UINT idx ) void locale_init(void) { + USHORT utf8[2] = { 0, CP_UTF8 }; WCHAR locale[LOCALE_NAME_MAX_LENGTH]; UNICODE_STRING name, value; LARGE_INTEGER unused; + SIZE_T size; LCID system_lcid, user_lcid = 0; + UINT ansi_cp = 1252, oem_cp = 437; + void *ansi_ptr = utf8, *oem_ptr = utf8, *case_ptr; NTSTATUS status; struct { @@ -189,10 +193,38 @@ void locale_init(void) const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale ); if (entry) user_lcid = get_locale_data( entry->idx )->idefaultlanguage; } - if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); if (!user_lcid) user_lcid = system_lcid; NtSetDefaultUILanguage( user_lcid ); NtSetDefaultLocale( TRUE, user_lcid ); + + if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) + { + system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + ansi_cp = oem_cp = CP_UTF8; + } + else + { + const NLS_LOCALE_LCID_INDEX *entry = find_lcid_entry( system_lcid ); + ansi_cp = get_locale_data( entry->idx )->idefaultansicodepage; + oem_cp = get_locale_data( entry->idx )->idefaultcodepage; + } + + NtGetNlsSectionPtr( 10, 0, NULL, &case_ptr, &size ); + NtCurrentTeb()->Peb->UnicodeCaseTableData = case_ptr; + if (ansi_cp != CP_UTF8) + { + NtGetNlsSectionPtr( 11, ansi_cp, NULL, &ansi_ptr, &size ); + NtCurrentTeb()->Peb->AnsiCodePageData = ansi_ptr; + } + if (oem_cp != CP_UTF8) + { + NtGetNlsSectionPtr( 11, oem_cp, NULL, &oem_ptr, &size ); + NtCurrentTeb()->Peb->OemCodePageData = oem_ptr; + } + RtlInitNlsTables( ansi_ptr, oem_ptr, case_ptr, &nls_info ); + NlsAnsiCodePage = nls_info.AnsiTableInfo.CodePage; + NlsMbCodePageTag = nls_info.AnsiTableInfo.DBCSCodePage; + NlsMbOemCodePageTag = nls_info.OemTableInfo.DBCSCodePage; }

1 0