December 2021 - Wine-Commits

Eric Pouech : winedbg: Don't pretend that all dbg_internal_var instances will hold DWORD_PTR.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 77f84fd4d5a356f4026ab21aaee375c187c4ae68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f84fd4d5a356f4026ab21a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 7 18:45:21 2021 +0100 winedbg: Don't pretend that all dbg_internal_var instances will hold DWORD_PTR. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 34 +++++----- programs/winedbg/be_arm64.c | 70 ++++++++++---------- programs/winedbg/be_i386.c | 102 ++++++++++++++--------------- programs/winedbg/be_x86_64.c | 148 +++++++++++++++++++++---------------------- programs/winedbg/debugger.h | 6 +- programs/winedbg/winedbg.c | 2 +- 6 files changed, 181 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77f84fd4d5a356f4026a…

1 0

Jacek Caban : win32u: Fix device instance value size in link_device.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: ef30380d4a22def174dd0af5a97094537a2e50af URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef30380d4a22def174dd0af5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 7 15:28:37 2021 +0100 win32u: Fix device instance value size in link_device. 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/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 5c65dce716d..15416a695f2 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -798,7 +798,7 @@ static void link_device( const WCHAR *instance, const WCHAR *class ) len += class_len; hkey = reg_create_key( control_key, buffer, len * sizeof(WCHAR), 0, NULL ); - set_reg_value( hkey, device_instanceW, REG_SZ, instance, instance_len * sizeof(WCHAR) ); + set_reg_value( hkey, device_instanceW, REG_SZ, instance, (instance_len + 1) * sizeof(WCHAR) ); subkey = reg_create_key( hkey, hashW, sizeof(hashW), REG_OPTION_VOLATILE, NULL ); NtClose( hkey );

1 0

Jacek Caban : user32: Set %ecx to rect param when calling monitor enum proc.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 66d2321a39f25d3ee9423c20432ce65b45cf1876 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66d2321a39f25d3ee9423c20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 7 15:28:29 2021 +0100 user32: Set %ecx to rect param when calling monitor enum proc. This was accidentally removed by 318673405c62. 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/sysparams.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 498dbacbd37..bcc9c5cbf07 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1158,7 +1158,6 @@ BOOL WINAPI GetMonitorInfoW( HMONITOR monitor, LPMONITORINFO info ) #ifdef __i386__ /* Some apps pass a non-stdcall callback to EnumDisplayMonitors, * so we need a small assembly wrapper to call it. - * MJ's Help Diagnostic expects that %ecx contains the address to the rect. */ extern BOOL enum_mon_callback_wrapper( void *proc, HMONITOR monitor, HDC hdc, RECT *rect, LPARAM lparam ); __ASM_GLOBAL_FUNC( enum_mon_callback_wrapper, @@ -1169,7 +1168,9 @@ __ASM_GLOBAL_FUNC( enum_mon_callback_wrapper, __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "subl $8,%esp\n\t" "pushl 24(%ebp)\n\t" /* lparam */ - "pushl 20(%ebp)\n\t" /* rect */ + /* MJ's Help Diagnostic expects that %ecx contains the address to the rect. */ + "movl 20(%ebp),%ecx\n\t" /* rect */ + "pushl %ecx\n\t" "pushl 16(%ebp)\n\t" /* hdc */ "pushl 12(%ebp)\n\t" /* monitor */ "movl 8(%ebp),%eax\n" /* proc */

1 0

Alexandre Julliard : wineandroid: Use full pathnames to invoke builtin apps.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 7b00a50943bf9716cb459d58a737048b1971459e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b00a50943bf9716cb459d58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 12:25:20 2021 +0100 wineandroid: Use full pathnames to invoke builtin apps. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index f9f39dc6c7b..a47a4f89290 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -131,7 +131,7 @@ public class WineActivity extends Activity if (cmdline == null) { if (new File( prefix, "drive_c/winestart.cmd" ).exists()) cmdline = "c:\\winestart.cmd"; - else cmdline = "wineconsole.exe"; + else cmdline = "c:\\windows\\system32\\wineconsole.exe"; } String winedebug = readFileString( new File( prefix, "winedebug" )); @@ -164,7 +164,7 @@ public class WineActivity extends Activity } String[] cmd = { environ.get( "WINELOADER" ), - "explorer.exe", + "c:\\windows\\system32\\explorer.exe", "/desktop=shell,,android", cmdline };

1 0

Damjan Jovanovic : ntdll: Implement fill_battery_state() on FreeBSD.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 36af18a4f13b5e9ffbf8be71ea0aaad7321cefb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36af18a4f13b5e9ffbf8be71… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Dec 4 13:23:51 2021 +0200 ntdll: Implement fill_battery_state() on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 941c69190fb..d1a40e47bbf 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3516,6 +3516,51 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) return STATUS_SUCCESS; } +#elif defined(__FreeBSD__) + +#include <dev/acpica/acpiio.h> + +static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) +{ + size_t len; + int state = 0; + int rate_mW = 0; + int time_mins = -1; + int life_percent = 0; + + bs->BatteryPresent = TRUE; + len = sizeof(state); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.state", &state, &len, NULL, 0); + len = sizeof(rate_mW); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.rate", &rate_mW, &len, NULL, 0); + len = sizeof(time_mins); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.time", &time_mins, &len, NULL, 0); + len = sizeof(life_percent); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.life", &life_percent, &len, NULL, 0); + + if (bs->BatteryPresent) + { + bs->AcOnLine = (time_mins == -1); + bs->Charging = state & ACPI_BATT_STAT_CHARGING; + bs->Discharging = state & ACPI_BATT_STAT_DISCHARG; + + bs->Rate = (rate_mW >= 0 ? -rate_mW : 0); + if (time_mins >= 0 && life_percent > 0) + { + bs->EstimatedTime = 60 * time_mins; + bs->RemainingCapacity = bs->EstimatedTime * rate_mW / 3600; + bs->MaxCapacity = bs->RemainingCapacity * 100 / life_percent; + } + else + { + bs->EstimatedTime = ~0u; + bs->RemainingCapacity = life_percent; + bs->MaxCapacity = 100; + } + } + return STATUS_SUCCESS; +} + #else static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs )

1 0

Eric Pouech : winedbg: Remove methods for fetching/storing integers in CPU backends.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: e656c29e59db26f0a29c370e8b99956cd42ce058 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e656c29e59db26f0a29c370e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 7 18:45:45 2021 +0100 winedbg: Remove methods for fetching/storing integers in CPU backends. All integer code assume CPU of debuggee encode integers: - little endian - 2 complement for signed integers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 30 ------------------------------ programs/winedbg/be_arm64.c | 30 ------------------------------ programs/winedbg/be_cpu.h | 4 ---- programs/winedbg/be_i386.c | 30 ------------------------------ programs/winedbg/be_x86_64.c | 30 ------------------------------ programs/winedbg/debugger.h | 3 +++ programs/winedbg/memory.c | 40 ++++++++++++++++++++++++++++++++++------ programs/winedbg/types.c | 15 +++++++-------- 8 files changed, 44 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e656c29e59db26f0a29c…

1 0

Eric Pouech : winedbg: Make savable variables size a DWORD.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 396880ac81a7bb8c8aa7ea3fdd6ea54f30180160 URL: https://source.winehq.org/git/wine.git/?a=commit;h=396880ac81a7bb8c8aa7ea3f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 7 18:45:27 2021 +0100 winedbg: Make savable variables size a DWORD. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 506a7d1797b..837384c21a8 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -254,7 +254,7 @@ extern HANDLE dbg_houtput; struct dbg_internal_var { - DWORD_PTR val; + DWORD val; const char* name; void* pval; ULONG typeid; /* always internal type */

1 0

Gabriel Ivăncescu : mshtml: Ignore named and extra arguments when invoking builtin functions.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 0e7d1a601cdff94f13dde8099ba532062fcca725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e7d1a601cdff94f13dde809… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 7 21:10:02 2021 +0200 mshtml: Ignore named and extra arguments when invoking builtin functions. Native just ignores the named and extra arguments completely. 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/dispex.c | 14 ++-- dlls/mshtml/tests/documentmode.js | 2 +- dlls/mshtml/tests/script.c | 136 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 9f56a561e0d..b7bc75104ad 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -738,12 +738,17 @@ static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS static HRESULT typeinfo_invoke(DispatchEx *This, func_info_t *func, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei) { - DISPPARAMS params = {dp->rgvarg+dp->cNamedArgs, NULL, dp->cArgs-dp->cNamedArgs, 0}; + DISPPARAMS params = {dp->rgvarg, NULL, dp->cArgs, 0}; ITypeInfo *ti; IUnknown *unk; UINT argerr=0; HRESULT hres; + if(params.cArgs > func->argc) { + params.rgvarg += params.cArgs - func->argc; + params.cArgs = func->argc; + } + hres = get_typeinfo(func->tid, &ti); if(FAILED(hres)) { ERR("Could not get type info: %08x\n", hres); @@ -1170,12 +1175,7 @@ static HRESULT invoke_builtin_function(DispatchEx *This, func_info_t *func, DISP IUnknown *iface; HRESULT hres; - if(dp->cNamedArgs) { - FIXME("Named arguments not supported\n"); - return E_NOTIMPL; - } - - if(dp->cArgs > func->argc || dp->cArgs + func->default_value_cnt < func->argc) { + if(dp->cArgs + func->default_value_cnt < func->argc) { FIXME("Invalid argument count (expected %u, got %u)\n", func->argc, dp->cArgs); return E_INVALIDARG; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 6555e8ba489..af057f2cb3d 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1113,7 +1113,7 @@ sync_test("elem_attr", function() { r = elem.getAttribute("htmlFor"); ok(r === "for3", "htmlFor attr = " + r); - elem.setAttribute("testattr", "test"); + elem.setAttribute("testattr", "test", 0, "extra arg", 0xdeadbeef); test_exposed("class", v < 8); test_exposed("className", true); test_exposed("for", v < 9); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index a57468afc65..e95cea4307c 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2170,6 +2170,141 @@ static void test_default_arg_conv(IHTMLWindow2 *window) IDispatchEx_Release(dispex); } +static void test_named_args(IHTMLWindow2 *window) +{ + DISPID named_args[] = { 0, 2, 1, 1337, 0xdeadbeef, DISPID_THIS }; + IHTMLDocument2 *doc; + IDispatchEx *dispex; + IHTMLElement *elem; + VARIANT args[4]; + DISPPARAMS dp; + HRESULT hres; + VARIANT var; + DISPID id; + BSTR bstr; + + hres = IHTMLWindow2_get_document(window, &doc); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + + bstr = SysAllocString(L"div"); + hres = IHTMLDocument2_createElement(doc, bstr, &elem); + IHTMLDocument2_Release(doc); + SysFreeString(bstr); + ok(hres == S_OK, "createElement failed: %08x\n", hres); + + hres = IHTMLElement_QueryInterface(elem, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + bstr = SysAllocString(L"setAttribute"); + hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); + SysFreeString(bstr); + + dp.cArgs = 2; + dp.cNamedArgs = 3; + dp.rgvarg = args; + dp.rgdispidNamedArgs = named_args; + V_VT(&args[0]) = VT_BSTR; + V_BSTR(&args[0]) = SysAllocString(L"testattr"); + V_VT(&args[1]) = VT_I4; + V_I4(&args[1]) = 0; + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "InvokeEx returned: %08x\n", hres); + + hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[0]), 0, &var); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_NULL, "V_VT(var)=%d\n", V_VT(&var)); + + bstr = SysAllocString(L"0"); + hres = IHTMLElement_getAttribute(elem, bstr, 0, &var); + SysFreeString(bstr); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"testattr"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); + VariantClear(&var); + + dp.cArgs = 3; + V_VT(&args[2]) = VT_BSTR; + V_BSTR(&args[2]) = SysAllocString(L"testval"); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + VariantClear(&args[2]); + ok(hres == DISP_E_TYPEMISMATCH, "InvokeEx returned: %08x\n", hres); + + V_VT(&args[2]) = VT_I4; + V_I4(&args[2]) = 0; + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_TYPEMISMATCH, "InvokeEx returned: %08x\n", hres); + + args[2] = args[0]; + V_VT(&args[1]) = VT_BSTR; + V_BSTR(&args[1]) = SysAllocString(L"testval"); + V_VT(&args[0]) = VT_I4; + V_I4(&args[0]) = 0; + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + VariantClear(&args[1]); + + hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[2]), 0, &var); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"testval"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); + VariantClear(&var); + + dp.cArgs = 2; + dp.cNamedArgs = 1; + args[1] = args[2]; + V_VT(&args[0]) = VT_BSTR; + V_BSTR(&args[0]) = SysAllocString(L"newValue"); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + VariantClear(&args[0]); + + hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[1]), 0, &var); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"newValue"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); + VariantClear(&var); + + dp.cArgs = 4; + dp.cNamedArgs = ARRAY_SIZE(named_args); + args[3] = args[1]; + V_VT(&args[2]) = VT_BSTR; + V_BSTR(&args[2]) = SysAllocString(L"foobar"); + V_VT(&args[1]) = VT_I4; + V_I4(&args[1]) = 1; + V_VT(&args[0]) = VT_BSTR; + V_BSTR(&args[0]) = SysAllocString(L"extra"); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + VariantClear(&args[2]); + VariantClear(&args[0]); + + hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[3]), 0, &var); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"foobar"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); + VariantClear(&var); + + dp.cNamedArgs = 1; + named_args[0] = DISPID_THIS; + V_VT(&args[0]) = VT_DISPATCH; + V_DISPATCH(&args[0]) = (IDispatch*)&funcDisp; + V_VT(&args[2]) = VT_BSTR; + V_BSTR(&args[2]) = SysAllocString(L"withThis"); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + VariantClear(&args[2]); + + hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[3]), 0, &var); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"withThis"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); + VariantClear(&args[3]); + VariantClear(&var); + + IHTMLElement_Release(elem); + IDispatchEx_Release(dispex); +} + static void test_ui(void) { IActiveScriptSiteUIControl *ui_control; @@ -2381,6 +2516,7 @@ static void test_script_run(void) test_arg_conv(window); test_default_arg_conv(window); + test_named_args(window); IHTMLWindow2_Release(window); tmp = SysAllocString(L"test");

1 0

Jacek Caban : win32u: Move 55aa brush implementation from user32.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: a48127034ddc230b7375703f7827f049478e83e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a48127034ddc230b7375703f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 7 15:29:06 2021 +0100 win32u: Move 55aa brush implementation from user32. And don't expose __wine_make_gdi_object_system. 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/sysparams.c | 17 +---------------- dlls/win32u/gdiobj.c | 11 +---------- dlls/win32u/ntgdi_private.h | 1 + dlls/win32u/sysparams.c | 33 +++++++++++++++++++++++++++------ dlls/win32u/win32u.spec | 1 - dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ include/ntuser.h | 3 +++ include/wine/gdi_driver.h | 1 - 9 files changed, 33 insertions(+), 41 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index bcc9c5cbf07..a21b5035048 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -523,22 +523,7 @@ HPEN SYSCOLOR_GetPen( INT index ) */ HBRUSH SYSCOLOR_Get55AABrush(void) { - static const WORD pattern[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; - static HBRUSH brush_55aa; - - if (!brush_55aa) - { - HBITMAP bitmap = CreateBitmap( 8, 8, 1, 1, pattern ); - HBRUSH brush = CreatePatternBrush( bitmap ); - DeleteObject( bitmap ); - __wine_make_gdi_object_system( brush, TRUE ); - if (InterlockedCompareExchangePointer( (void **)&brush_55aa, brush, 0 )) - { - __wine_make_gdi_object_system( brush, FALSE ); - DeleteObject( brush ); - } - } - return brush_55aa; + return UlongToHandle( NtUserCallOneParam( COLOR_55AA_BRUSH, NtUserGetSysColorBrush )); } /*********************************************************************** diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index a771f10d20b..002c7539498 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -452,15 +452,7 @@ static const struct DefaultFontInfo default_fonts[] = }, }; - -/************************************************************************* - * __wine_make_gdi_object_system (win32u.@) - * - * USER has to tell GDI that its system brushes and pens are non-deletable. - * For a description of the GDI object magics and their flags, - * see "Undocumented Windows" (wrong about the OBJECT_NOSYSTEM flag, though). - */ -void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set) +void make_gdi_object_system( HGDIOBJ handle, BOOL set) { GDI_HANDLE_ENTRY *entry; @@ -1191,7 +1183,6 @@ static struct unix_funcs unix_funcs = __wine_get_icm_profile, __wine_get_vulkan_driver, __wine_get_wgl_driver, - __wine_make_gdi_object_system, __wine_set_display_driver, __wine_set_visible_region, }; diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index b42ff024b59..bfeb4557da7 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -374,6 +374,7 @@ extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern HGDIOBJ get_stock_object( INT obj ) DECLSPEC_HIDDEN; extern DWORD get_gdi_object_type( HGDIOBJ obj ) DECLSPEC_HIDDEN; +extern void make_gdi_object_system( HGDIOBJ handle, BOOL set ) DECLSPEC_HIDDEN; /* mapping.c */ extern BOOL dp_to_lp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 9d600d10fe8..94c7a58fc0e 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2357,12 +2357,12 @@ static BOOL set_rgb_entry( union sysparam_all_entry *entry, UINT int_param, void entry->hdr.loaded = TRUE; if ((brush = InterlockedExchangePointer( (void **)&entry->rgb.brush, 0 ))) { - __wine_make_gdi_object_system( brush, FALSE ); + make_gdi_object_system( brush, FALSE ); NtGdiDeleteObjectApp( brush ); } if ((pen = InterlockedExchangePointer( (void **)&entry->rgb.pen, 0 ))) { - __wine_make_gdi_object_system( pen, FALSE ); + make_gdi_object_system( pen, FALSE ); NtGdiDeleteObjectApp( pen ); } return TRUE; @@ -4279,17 +4279,38 @@ static COLORREF get_sys_color( int index ) return ret; } +static HBRUSH get_55aa_brush(void) +{ + static const WORD pattern[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; + static HBRUSH brush_55aa; + + if (!brush_55aa) + { + HBITMAP bitmap = NtGdiCreateBitmap( 8, 8, 1, 1, pattern ); + HBRUSH brush = NtGdiCreatePatternBrushInternal( bitmap, FALSE, FALSE ); + NtGdiDeleteObjectApp( bitmap ); + make_gdi_object_system( brush, TRUE ); + if (InterlockedCompareExchangePointer( (void **)&brush_55aa, brush, 0 )) + { + make_gdi_object_system( brush, FALSE ); + NtGdiDeleteObjectApp( brush ); + } + } + return brush_55aa; +} + static HBRUSH get_sys_color_brush( unsigned int index ) { + if (index == COLOR_55AA_BRUSH) return get_55aa_brush(); if (index >= ARRAY_SIZE( system_colors )) return 0; if (!system_colors[index].brush) { HBRUSH brush = NtGdiCreateSolidBrush( get_sys_color( index ), NULL ); - __wine_make_gdi_object_system( brush, TRUE ); + make_gdi_object_system( brush, TRUE ); if (InterlockedCompareExchangePointer( (void **)&system_colors[index].brush, brush, 0 )) { - __wine_make_gdi_object_system( brush, FALSE ); + make_gdi_object_system( brush, FALSE ); NtGdiDeleteObjectApp( brush ); } } @@ -4303,10 +4324,10 @@ static HPEN get_sys_color_pen( unsigned int index ) if (!system_colors[index].pen) { HPEN pen = NtGdiCreatePen( PS_SOLID, 1, get_sys_color( index ), NULL ); - __wine_make_gdi_object_system( pen, TRUE ); + make_gdi_object_system( pen, TRUE ); if (InterlockedCompareExchangePointer( (void **)&system_colors[index].pen, pen, 0 )) { - __wine_make_gdi_object_system( pen, FALSE ); + make_gdi_object_system( pen, FALSE ); NtGdiDeleteObjectApp( pen ); } } diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index cb06e06d2a9..786d764a095 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1324,7 +1324,6 @@ @ stdcall GetDCHook(long ptr) @ stdcall SetDCHook(long ptr long) @ stdcall SetHookFlags(long long) -@ cdecl __wine_make_gdi_object_system(long long) @ cdecl __wine_set_visible_region(long long ptr ptr ptr) # Graphics drivers diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 46893760356..098baef51a5 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -235,7 +235,6 @@ struct unix_funcs BOOL (CDECL *get_icm_profile)( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ); const struct vulkan_funcs * (CDECL *get_vulkan_driver)( HDC hdc, UINT version ); struct opengl_funcs * (CDECL *get_wgl_driver)( HDC hdc, UINT version ); - void (CDECL *make_gdi_object_system)( HGDIOBJ handle, BOOL set ); void (CDECL *set_display_driver)( struct user_driver_funcs *funcs, UINT version ); void (CDECL *set_visible_region)( HDC hdc, HRGN hrgn, const RECT *vis_rect, const RECT *device_rect, struct window_surface *surface ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 3402c09f023..bf84846a002 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -877,12 +877,6 @@ BOOL CDECL __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCH return unix_funcs->get_icm_profile( hdc, allow_default, size, filename ); } -void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ) -{ - if (!unix_funcs) return; - return unix_funcs->make_gdi_object_system( handle, set ); -} - void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, const RECT *device_rect, struct window_surface *surface ) { diff --git a/include/ntuser.h b/include/ntuser.h index 4cb090c4a31..9583b78acf2 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -66,6 +66,9 @@ enum NtUserMirrorRgn, }; +/* color index used to retrieve system 55aa brush */ +#define COLOR_55AA_BRUSH 0x100 + /* this is the structure stored in TEB->Win32ClientInfo */ /* no attempt is made to keep the layout compatible with the Windows one */ struct user_thread_info diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index f76170f5a16..f0263857883 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -342,7 +342,6 @@ WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*); WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); -extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, const RECT *device_rect, struct window_surface *surface ); extern void CDECL __wine_set_display_driver( struct user_driver_funcs *funcs, UINT version );

1 0

Jacek Caban : win32u: Use NtUserCallTwoParam for MirrorRgn implementation.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 2aba4c58391bb9e1c6318efd371073d570907a6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aba4c58391bb9e1c6318efd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 7 15:28:46 2021 +0100 win32u: Use NtUserCallTwoParam for MirrorRgn implementation. 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/gdi32/objects.c | 10 +++++++++- dlls/win32u/gdiobj.c | 1 - dlls/win32u/ntgdi_private.h | 1 + dlls/win32u/region.c | 4 ++-- dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u.spec | 1 - dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ include/ntuser.h | 1 + 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 04b91cfd60f..42d2c202e98 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -24,7 +24,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "gdi_private.h" -#include "winuser.h" +#include "ntuser.h" #include "winreg.h" #include "winnls.h" #include "initguid.h" @@ -707,6 +707,14 @@ HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count, INT mode ) return CreatePolyPolygonRgn( points, &count, 1, mode ); } +/*********************************************************************** + * MirrorRgn (GDI32.@) + */ +BOOL WINAPI MirrorRgn( HWND hwnd, HRGN hrgn ) +{ + return NtUserCallTwoParam( HandleToUlong(hwnd), HandleToUlong(hrgn), NtUserMirrorRgn ); +} + /*********************************************************************** * CreateColorSpaceA (GDI32.@) */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index b6bd5b60626..a771f10d20b 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1183,7 +1183,6 @@ static struct unix_funcs unix_funcs = NtUserVkKeyScanEx, GetDCHook, - MirrorRgn, SetDCHook, SetDIBits, SetHookFlags, diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index 13c365c075d..b42ff024b59 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -409,6 +409,7 @@ extern HPEN create_pen( INT style, INT width, COLORREF color ) DECLSPEC_HIDDEN; /* region.c */ extern BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) DECLSPEC_HIDDEN; extern INT mirror_region( HRGN dst, HRGN src, INT width ) DECLSPEC_HIDDEN; +extern BOOL mirror_window_region( HWND hwnd, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y ) DECLSPEC_HIDDEN; extern HRGN create_polypolygon_region( const POINT *pts, const INT *count, INT nbpolygons, INT mode, const RECT *clip_rect ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/region.c b/dlls/win32u/region.c index e3e840a1554..86554f21e1c 100644 --- a/dlls/win32u/region.c +++ b/dlls/win32u/region.c @@ -1375,9 +1375,9 @@ INT mirror_region( HRGN dst, HRGN src, INT width ) } /*********************************************************************** - * MirrorRgn (GDI32.@) + * mirror_window_region */ -BOOL WINAPI MirrorRgn( HWND hwnd, HRGN hrgn ) +BOOL mirror_window_region( HWND hwnd, HRGN hrgn ) { RECT rect; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 15416a695f2..9d600d10fe8 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4422,6 +4422,8 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return get_monitor_info( UlongToHandle(arg1), (MONITORINFO *)arg2 ); case NtUserGetSystemMetricsForDpi: return get_system_metrics_for_dpi( arg1, arg2 ); + case NtUserMirrorRgn: + return mirror_window_region( UlongToHandle(arg1), UlongToHandle(arg2) ); default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 17fdb7f4959..cb06e06d2a9 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1337,7 +1337,6 @@ @ cdecl __wine_get_vulkan_driver(long long) # gdi32 -@ stdcall MirrorRgn(long long) @ stdcall SetDIBits(long long long long ptr ptr long) @ cdecl __wine_get_brush_bitmap_info(long ptr ptr ptr) @ cdecl __wine_get_icm_profile(long long ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 7e867d4f736..46893760356 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -225,7 +225,6 @@ struct unix_funcs /* Wine-specific functions */ DWORD_PTR (WINAPI *pGetDCHook)( HDC hdc, DCHOOKPROC *proc ); - BOOL (WINAPI *pMirrorRgn)( HWND hwnd, HRGN hrgn ); BOOL (WINAPI *pSetDCHook)( HDC hdc, DCHOOKPROC proc, DWORD_PTR data ); INT (WINAPI *pSetDIBits)( HDC hdc, HBITMAP hbitmap, UINT startscan, UINT lines, const void *bits, const BITMAPINFO *info, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 9bdd3ec3634..3402c09f023 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -857,12 +857,6 @@ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC proc, DWORD_PTR data ) return unix_funcs->pSetDCHook( hdc, proc, data ); } -BOOL WINAPI MirrorRgn( HWND hwnd, HRGN hrgn ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pMirrorRgn( hwnd, hrgn ); -} - INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, UINT lines, const void *bits, const BITMAPINFO *info, UINT coloruse ) diff --git a/include/ntuser.h b/include/ntuser.h index 7a465824d7c..4cb090c4a31 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -63,6 +63,7 @@ enum { NtUserGetMonitorInfo, NtUserGetSystemMetricsForDpi, + NtUserMirrorRgn, }; /* this is the structure stored in TEB->Win32ClientInfo */

1 0