- Wine-Devel - list.winehq.org

[PATCH 1/2] localspl: Add ARM print environments.
by Esme Povirk Oct. 19, 2021

Oct. 19, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51815 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- This supersedes 217514. I took some liberties with the ARM environments. I haven't found an actual Windows machine with a 32-bit ARM print environment, but MS_RPRN implies that "Windows ARM" is a valid environment name. My Windows 10 machine does have a "Windows ARM64" environment but it only has driver version 4 in the registry, not 3. dlls/localspl/provider.c | 8 +++++++- dlls/winspool.drv/info.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index c17983e3037..d7c1464ef2c 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -245,10 +245,16 @@ static const printenv_t env_x86 = {x86_envnameW, L"w32x86", 3, static const printenv_t env_x64 = {L"Windows x64", L"x64", 3, L"\\Version-3", L"\\3"}; +static const printenv_t env_arm = {L"Windows ARM", L"arm", 3, + L"\\Version-3", L"\\3"}; + +static const printenv_t env_arm64 = {L"Windows ARM64", L"arm64", 3, + L"\\Version-3", L"\\3"}; + static const printenv_t env_win40 = {L"Windows 4.0", L"win40", 0, L"\\Version-0", L"\\0"}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_arm, &env_arm64, &env_win40}; static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W), diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index edfdab218c4..74617537a6b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -232,9 +232,13 @@ static const WCHAR WinNT_CV_PrinterPortsW[] = { 'S','o','f','t','w','a','r','e', static WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR envname_x64W[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; +static const WCHAR envname_armW[] = {'W','i','n','d','o','w','s',' ','A','R','M',0}; +static const WCHAR envname_arm64W[] = {'W','i','n','d','o','w','s',' ','A','R','M','6','4',0}; static const WCHAR subdir_win40W[] = {'w','i','n','4','0',0}; static const WCHAR subdir_x64W[] = {'x','6','4',0}; static const WCHAR subdir_x86W[] = {'w','3','2','x','8','6',0}; +static const WCHAR subdir_armW[] = {'a','r','m',0}; +static const WCHAR subdir_arm64W[] = {'a','r','m','6','4',0}; static const WCHAR Version0_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; static const WCHAR Version0_SubdirW[] = {'\\','0',0}; static const WCHAR Version3_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; @@ -310,9 +314,11 @@ static const DWORD pi_sizeof[] = {0, sizeof(PRINTER_INFO_1W), sizeof(PRINTER_INF static const printenv_t env_x64 = {envname_x64W, subdir_x64W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_x86 = {envname_x86W, subdir_x86W, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_arm = {envname_armW, subdir_armW, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_arm64 = {envname_arm64W, subdir_arm64W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_win40 = {envname_win40W, subdir_win40W, 0, Version0_RegPathW, Version0_SubdirW}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_arm, &env_arm64, &env_win40}; /****************************************************************** * validate the user-supplied printing-environment [internal] -- 2.30.2

2 3

[PATCH 1/6] dinput: Use object instance offset to access extra value caps.
by Rémi Bernon Oct. 19, 2021

Oct. 19, 2021

Value objects are always enumerated first, so offset / sizeof(LONG) can be safely used to index input_extra_caps array. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 89 ++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a6715463690..9c1f75ec9ee 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -73,6 +73,11 @@ static inline const char *debugstr_hid_collection_node( struct hid_collection_no struct extra_caps { + LONG bit_size; + LONG logical_min; + LONG logical_max; + LONG range_min; + LONG range_max; LONG deadzone; LONG saturation; }; @@ -659,19 +664,18 @@ static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) static BOOL get_property_prop_range( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPRANGE *value = data; - value->lMin = caps->physical_min; - value->lMax = caps->physical_max; + value->lMin = extra->range_min; + value->lMax = extra->range_max; return DIENUM_STOP; } static BOOL get_property_prop_deadzone( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *deadzone = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); deadzone->dwData = extra->deadzone; return DIENUM_STOP; } @@ -679,10 +683,8 @@ static BOOL get_property_prop_deadzone( struct hid_joystick *impl, struct hid_va static BOOL get_property_prop_saturation( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *saturation = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); saturation->dwData = extra->saturation; return DIENUM_STOP; } @@ -781,22 +783,23 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con static BOOL set_property_prop_range( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPRANGE *value = data; LONG tmp; - caps->physical_min = value->lMin; - caps->physical_max = value->lMax; + extra->range_min = value->lMin; + extra->range_max = value->lMax; if (instance->dwType & DIDFT_AXIS) { - if (!caps->physical_min) tmp = caps->physical_max / 2; - else tmp = round( (caps->physical_min + caps->physical_max) / 2.0 ); + if (!extra->range_min) tmp = extra->range_max / 2; + else tmp = round( (extra->range_min + extra->range_max) / 2.0 ); *(LONG *)(impl->base.device_state + instance->dwOfs) = tmp; } else if (instance->dwType & DIDFT_POV) { - tmp = caps->logical_max - caps->logical_min; - if (tmp > 0) caps->physical_max -= value->lMax / (tmp + 1); + tmp = extra->logical_max - extra->logical_min; + if (tmp > 0) extra->range_max -= value->lMax / (tmp + 1); *(LONG *)(impl->base.device_state + instance->dwOfs) = -1; } return DIENUM_CONTINUE; @@ -805,10 +808,8 @@ static BOOL set_property_prop_range( struct hid_joystick *impl, struct hid_value static BOOL set_property_prop_deadzone( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *deadzone = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); extra->deadzone = deadzone->dwData; return DIENUM_CONTINUE; } @@ -816,10 +817,8 @@ static BOOL set_property_prop_deadzone( struct hid_joystick *impl, struct hid_va static BOOL set_property_prop_saturation( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *saturation = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); extra->saturation = saturation->dwData; return DIENUM_CONTINUE; } @@ -1357,29 +1356,34 @@ static BOOL check_device_state_button( struct hid_joystick *impl, struct hid_val return DIENUM_CONTINUE; } -static LONG sign_extend( ULONG value, struct hid_value_caps *caps ) +static LONG sign_extend( ULONG value, struct extra_caps *caps ) { UINT sign = 1 << (caps->bit_size - 1); if (sign <= 1 || caps->logical_min >= 0) return value; return value - ((value & sign) << 1); } -static LONG scale_value( ULONG value, struct hid_value_caps *caps, LONG min, LONG max ) +static LONG scale_value( ULONG value, struct extra_caps *caps ) { - LONG tmp = sign_extend( value, caps ); - if (caps->logical_min > tmp || caps->logical_max < tmp) return -1; /* invalid / null value */ - return min + MulDiv( tmp - caps->logical_min, max - min, caps->logical_max - caps->logical_min ); + LONG tmp = sign_extend( value, caps ), log_min, log_max, phy_min, phy_max; + log_min = caps->logical_min; + log_max = caps->logical_max; + phy_min = caps->range_min; + phy_max = caps->range_max; + + if (log_min > tmp || log_max < tmp) return -1; /* invalid / null value */ + return phy_min + MulDiv( tmp - log_min, phy_max - phy_min, log_max - log_min ); } -static LONG scale_axis_value( ULONG value, struct hid_value_caps *caps, struct extra_caps *extra ) +static LONG scale_axis_value( ULONG value, struct extra_caps *caps ) { LONG tmp = sign_extend( value, caps ), log_ctr, log_min, log_max, phy_ctr, phy_min, phy_max; ULONG bit_max = (1 << caps->bit_size) - 1; log_min = caps->logical_min; log_max = caps->logical_max; - phy_min = caps->physical_min; - phy_max = caps->physical_max; + phy_min = caps->range_min; + phy_max = caps->range_max; /* xinput HID gamepad have bogus logical value range, let's use the bit range instead */ if (log_min == 0 && log_max == -1) log_max = bit_max; @@ -1391,14 +1395,14 @@ static LONG scale_axis_value( ULONG value, struct hid_value_caps *caps, struct e tmp -= log_ctr; if (tmp <= 0) { - log_max = MulDiv( log_min - log_ctr, extra->deadzone, 10000 ); - log_min = MulDiv( log_min - log_ctr, extra->saturation, 10000 ); + log_max = MulDiv( log_min - log_ctr, caps->deadzone, 10000 ); + log_min = MulDiv( log_min - log_ctr, caps->saturation, 10000 ); phy_max = phy_ctr; } else { - log_min = MulDiv( log_max - log_ctr, extra->deadzone, 10000 ); - log_max = MulDiv( log_max - log_ctr, extra->saturation, 10000 ); + log_min = MulDiv( log_max - log_ctr, caps->deadzone, 10000 ); + log_max = MulDiv( log_max - log_ctr, caps->saturation, 10000 ); phy_min = phy_ctr; } @@ -1410,24 +1414,22 @@ static LONG scale_axis_value( ULONG value, struct hid_value_caps *caps, struct e static BOOL read_device_state_value( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); IDirectInputDevice8W *iface = &impl->base.IDirectInputDevice8W_iface; ULONG logical_value, report_len = impl->caps.InputReportByteLength; struct parse_device_state_params *params = data; char *report_buf = impl->input_report_buf; - struct extra_caps *extra; LONG old_value, value; NTSTATUS status; if (instance->wReportId != impl->base.device_state_report_id) return DIENUM_CONTINUE; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); status = HidP_GetUsageValue( HidP_Input, instance->wUsagePage, 0, instance->wUsage, &logical_value, impl->preparsed, report_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_GetUsageValue %04x:%04x returned %#x\n", instance->wUsagePage, instance->wUsage, status ); - if (instance->dwType & DIDFT_AXIS) value = scale_axis_value( logical_value, caps, extra ); - else value = scale_value( logical_value, caps, caps->physical_min, caps->physical_max ); + if (instance->dwType & DIDFT_AXIS) value = scale_axis_value( logical_value, extra ); + else value = scale_value( logical_value, extra ); old_value = *(LONG *)(params->old_state + instance->dwOfs); *(LONG *)(impl->base.device_state + instance->dwOfs) = value; @@ -1807,6 +1809,18 @@ static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTAN return DI_OK; } +static BOOL init_extra_caps( struct hid_joystick *impl, struct hid_value_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); + extra->bit_size = caps->bit_size; + extra->logical_min = caps->logical_min; + extra->logical_max = caps->logical_max; + extra->range_min = caps->physical_min; + extra->range_max = caps->physical_max; + return DIENUM_CONTINUE; +} + static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { @@ -2124,6 +2138,7 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID size = preparsed->input_caps_count * sizeof(struct extra_caps); if (!(extra = calloc( 1, size ))) goto failed; impl->input_extra_caps = extra; + enum_objects( impl, &filter, DIDFT_AXIS | DIDFT_POV, init_extra_caps, NULL ); size = impl->caps.InputReportByteLength; if (!(buffer = malloc( size ))) goto failed; -- 2.33.0

1 5

[PATCH] ws2_32/tests: Correct name of IPV6_V6ONLY socket option in messages
by Alex Henrie Oct. 19, 2021

Oct. 19, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 63f8149f160..02713a7c625 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5650,7 +5650,7 @@ static void test_ipv6only(void) enabled = 2; ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); ret = bind(v6, (struct sockaddr*)&sin6, sizeof(sin6)); @@ -5662,26 +5662,26 @@ static void test_ipv6only(void) todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 0; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(!ret, "setsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "setsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "expected 0, got %d\n", enabled); } enabled = 1; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(!ret, "setsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "setsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); /* bind on IPv4 socket should succeed - IPV6_V6ONLY is enabled by default */ ret = bind(v4, (struct sockaddr*)&sin4, sizeof(sin4)); @@ -5690,26 +5690,26 @@ todo_wine { todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 0; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(ret, "setsockopt(IPV6_ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); + ok(ret, "setsockopt(IPV6_V6ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); todo_wine { enabled = 0; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 1; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(ret, "setsockopt(IPV6_ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); + ok(ret, "setsockopt(IPV6_V6ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); closesocket(v4); closesocket(v6); @@ -5728,7 +5728,7 @@ todo_wine { enabled = 2; ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "expected 0, got %d\n", enabled); /* @@ -5749,7 +5749,7 @@ todo_wine { enabled = 2; len = sizeof(enabled); getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "IPV6_V6ONLY is enabled after bind\n"); v4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); -- 2.33.1

2 1

[PATCH] comctl32/combo: Invalidate child edit control after painting themed background.
by Zhiyi Zhang Oct. 19, 2021

Oct. 19, 2021

Fix the edit control in a themed combo control not displaying text when clicking the combo control dropdown button. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/combo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 074f54f0937..4208ff8b9c9 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -789,6 +789,8 @@ static LRESULT COMBO_ThemedPaint(HTHEME theme, HEADCOMBO *lphc, HDC hdc) if ((lphc->dwStyle & CBS_DROPDOWNLIST) == CBS_DROPDOWNLIST) CBPaintText(lphc, hdc); + else + InvalidateRect(lphc->hWndEdit, NULL, TRUE); return 0; } -- 2.32.0

1 0

[PATCH 3/3] winemac.drv: Set hkey to NULL after RegCloseKey() in macdrv_init_gpu().
by Zhiyi Zhang Oct. 19, 2021

Oct. 19, 2021

Although it's unlikely, RegCloseKey() may close an already closed key if the following SetupDiGetDeviceRegistryPropertyW() failed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b32c553d411..4a3b1ff39cb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1601,6 +1601,7 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) goto done; RegCloseKey(hkey); + hkey = NULL; /* Retrieve driver value for adapters */ if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), -- 2.32.0

1 0

[PATCH 2/3] winex11.drv: Set hkey to NULL after RegCloseKey() in X11DRV_InitGpu().
by Zhiyi Zhang Oct. 19, 2021

Oct. 19, 2021

Although it's unlikely, RegCloseKey() may close an already closed key if the following SetupDiGetDeviceRegistryPropertyW() failed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index bf32e82cb3e..57091522078 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -567,6 +567,7 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g goto done; RegCloseKey(hkey); + hkey = NULL; /* Retrieve driver value for adapters */ if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), -- 2.32.0

1 0

[PATCH 1/3] winemac.drv: Add GPU hardware information values to the registry.
by Zhiyi Zhang Oct. 19, 2021

Oct. 19, 2021

Based on a patch by Dmitry Timoshkov. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 277a19155d8..b32c553d411 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1510,6 +1510,11 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int gpu_index, WCHAR *guid_string, WCHAR *driver, LUID *gpu_luid) { + static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; + static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; + static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; + static const WCHAR ramdacW[] = {'I','n','t','e','r','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; @@ -1578,13 +1583,23 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + size = (lstrlenW(nameW) + 1) * sizeof(WCHAR); /* Write DriverDesc value */ - if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)nameW, (lstrlenW(nameW) + 1) * sizeof(WCHAR))) + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)nameW, size)) goto done; /* Write DriverDateData value, using current time as driver date, needed by Evoland */ GetSystemTimeAsFileTime(&filetime); if (RegSetValueExW(hkey, driver_date_dataW, 0, REG_BINARY, (BYTE *)&filetime, sizeof(filetime))) goto done; + /* The following hardware information value type may be REG_BINARY or REG_SZ */ + if (RegSetValueExW(hkey, adapter_stringW, 0, REG_BINARY, (const BYTE *)nameW, size)) + goto done; + if (RegSetValueExW(hkey, bios_stringW, 0, REG_BINARY, (const BYTE *)nameW, size)) + goto done; + if (RegSetValueExW(hkey, chip_typeW, 0, REG_BINARY, (const BYTE *)nameW, size)) + goto done; + if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) + goto done; RegCloseKey(hkey); /* Retrieve driver value for adapters */ -- 2.32.0

1 0

[PATCH 1/2] oleaut32: Allow the registration of 64bit typelibs from a 32bit context.
by Bernhard Kölbl Oct. 18, 2021

Oct. 18, 2021

Windows allows the registration of 64bit typelibs from 32bit programs even on a pure Win32 install. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51864 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/oleaut32/tests/typelib.c | 175 ++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 4 - 2 files changed, 175 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 825851c948e..bf38e71a259 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -6848,6 +6848,180 @@ static void test_register_typelib(BOOL system_registration) DeleteFileW(filename); } +static void test_RegisterTypeLib64(void) +{ + ITypeInfo *unknown, *tinfo; + ICreateTypeLib2 *createtl; + ICreateTypeInfo *createti, *createti_co; + ITypeLib *stdole, *typeLib; + FUNCDESC funcdesc, funcdesc2; + ELEMDESC elemdesc[5], elemdesc2[5]; + HREFTYPE hreftype; + HRESULT hr; + char filename[MAX_PATH]; + WCHAR filenameW[MAX_PATH]; + + static const WCHAR wszStdOle2[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; + + static OLECHAR typelibW[] = { 'W','i','n','e','T','e','s','t','T','y','p','e','L','i','b',0}; + static OLECHAR helpfileW[] = { 'C',':','\\','b','o','g','u','s','.','h','l','p',0 }; + static OLECHAR dllfileW[] = { 'C',':','\\','b','o','g','u','s','.','d','l','l',0 }; + static OLECHAR interface1W[] = { 'I','T','e','s','t','W','i','n','e','6', '4', 0}; + static OLECHAR coclassW[] = {'W','i','n','e','T','e','s','t','C','o','c','l','a','s','s',0 }; + static OLECHAR func1W[] = { 'f','u','n','c','1',0 }; + static OLECHAR func2W[] = { 'f','u','n','c','2',0 }; + static OLECHAR param1W[] = { 'p','a','r','a','m','1',0 }; + static OLECHAR param2W[] = { 'p','a','r','a','m','2',0 }; + static OLECHAR *names1[] = { func1W, param1W, param2W }; + static OLECHAR *names2[] = { func2W, param1W }; + static const GUID tlcustguid = { 0x512d2fec,0xcaf6,0x4c33,{0xbc,0x38,0x84,0x2f,0x2e,0x37,0x0d,0x7b} }; + static const GUID coclassguid = { 0x317cd4dd,0x0ce0,0x4525,{0x8d,0x33,0x68,0x14,0x4c,0x53,0x60,0xe9} }; + static const GUID interfaceguid = { 0x35cc5cea,0x11cc,0x4bca,{0x89,0x8c,0xf8,0x92,0x8e,0xb8,0xda,0x24} }; + + const SYSKIND sys = SYS_WIN64; + + hr = LoadTypeLib(wszStdOle2, &stdole); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IDispatch, &unknown); + ok(hr == S_OK, "got %08x\n", hr); + + GetTempFileNameA(".", "tlb", 0, filename); + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, MAX_PATH); + + hr = CreateTypeLib2(sys, filenameW, &createtl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetName(createtl, typelibW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetHelpFileName(createtl, helpfileW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetHelpStringDll(createtl, dllfileW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetGuid(createtl, &tlcustguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetVersion(createtl, 1, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti_co); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_LayOut(createti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(createti, &interfaceguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetVersion(createti, 1, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(createti, unknown, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(createti, 0, hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + elemdesc[0].tdesc.vt = VT_UINT; + U(elemdesc[0]).idldesc.dwReserved = 0; + U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN; + + elemdesc[1].tdesc.vt = VT_DECIMAL; + U(elemdesc[1]).idldesc.dwReserved = 0; + U(elemdesc[1]).idldesc.wIDLFlags = IDLFLAG_FIN; + + memset(&funcdesc, 0, sizeof(FUNCDESC)); + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + funcdesc.cParams = 2; + funcdesc.memid = 0x1; + funcdesc.elemdescFunc.tdesc.vt = VT_HRESULT; + funcdesc.lprgelemdescParam = elemdesc; + + hr = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); + ok(hr == S_OK, "got %08x\n", hr); + + elemdesc2[0].tdesc.vt = VT_UINT; + U(elemdesc2[0]).idldesc.dwReserved = 0; + U(elemdesc2[0]).idldesc.wIDLFlags = IDLFLAG_FIN | IDLFLAG_FOUT; + + memset(&funcdesc2, 0, sizeof(FUNCDESC)); + funcdesc2.funckind = FUNC_PUREVIRTUAL; + funcdesc2.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + funcdesc2.cParams = 1; + funcdesc2.memid = 0x2; + funcdesc2.elemdescFunc.tdesc.vt = VT_HRESULT; + funcdesc2.lprgelemdescParam = elemdesc2; + + hr = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncHelpContext(createti, 0, 0xabcdefab); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncHelpContext(createti, 1, 0xabcdefab); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, names1, 3); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(createti, 1, names2, 2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetTypeFlags(createti, TYPEFLAG_FOLEAUTOMATION | TYPEFLAG_FNONEXTENSIBLE | TYPEFLAG_FDUAL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&tinfo); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, 0, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(createti_co, &coclassguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(createti_co, tinfo, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(createti_co, 0, hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetImplTypeFlags(createti_co, 0, IMPLTYPEFLAG_FDEFAULT); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_Release(createti_co); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeInfo_Release(createti); + + hr = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeLib2_Release(createtl); + + trace("TypeLib to load: %ls\n", filenameW); + hr = LoadTypeLib(filenameW, &typeLib); + ok(hr == S_OK, "LoadTypeLib returned: %08x\n", hr); + + if(typeLib) + { + hr = RegisterTypeLib(typeLib, filenameW, NULL); + ok(hr == S_OK, "RegisterTypeLib returned: %08x\n", hr); + + ITypeLib_Release(typeLib); + } + + DeleteFileW(filenameW); +} + static void test_LoadTypeLib(void) { ITypeLib *tl; @@ -8351,6 +8525,7 @@ START_TEST(typelib) test_register_typelib(TRUE); test_register_typelib(FALSE); + test_RegisterTypeLib64(); test_create_typelibs(); test_LoadTypeLib(); test_TypeInfo2_GetContainingTypeLib(); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 70f15679811..ef546379174 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -629,10 +629,6 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W if (FAILED(ITypeLib_GetLibAttr(ptlib, &attr))) return E_FAIL; -#ifndef _WIN64 - if (attr->syskind == SYS_WIN64) return TYPE_E_BADMODULEKIND; -#endif - get_typelib_key( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, keyName ); res = S_OK; -- 2.33.0

2 3

wine-6.0.2-rc2 Available
by Michael Stefaniuc Oct. 18, 2021

Oct. 18, 2021

Hello guys, I have pushed wine-6.0.2-rc2 (5bc17ff92e6c2e922ff9bf0b356e3941acfb7f81) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ Changes to -rc1: - Pulled in 3 patches for MacOSX: - "Default to building with GnuTLS support on macOS, if present" (added to Release notes too) - "winecfg: Disable virtual desktop when using macdrv" + dependency patch - 2 test only patches: Rebuilding the fonts in gdi32/tests and gdiplus/tests bye michael

1 0

[PATCH] wineps: Avoid using typeof().
by Huw Davies Oct. 18, 2021

Oct. 18, 2021

Based on a patch by Alex Henrie. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineps.drv/download.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index dc77cf11703..3e720bf195b 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -65,7 +65,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str { USHORT count, i; BYTE *strings; - struct + struct name_record { USHORT platform_id; USHORT encoding_id; @@ -78,7 +78,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str GetFontData(dev->hdc, MS_MAKE_TAG('n','a','m','e'), 0, name, size); count = GET_BE_WORD(name + 2); strings = name + GET_BE_WORD(name + 4); - name_record = (typeof(name_record))(name + 6); + name_record = (struct name_record *)(name + 6); for(i = 0; i < count; i++, name_record++) { name_record->platform_id = GET_BE_WORD(&name_record->platform_id); @@ -687,7 +687,6 @@ void get_glyph_name(HDC hdc, WORD index, char *name) DWORD minMemType1; DWORD maxMemType1; } *post_header; - BYTE *post = NULL; DWORD size; /* set a fallback name that is just 'g<index>' */ @@ -697,13 +696,11 @@ void get_glyph_name(HDC hdc, WORD index, char *name) size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, NULL, 0); if(size < sizeof(*post_header) || size == GDI_ERROR) return; - post = HeapAlloc(GetProcessHeap(), 0, size); - if(!post) - return; - size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, post, size); + post_header = HeapAlloc(GetProcessHeap(), 0, size); + if(!post_header) return; + size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, post_header, size); if(size < sizeof(*post_header) || size == GDI_ERROR) goto cleanup; - post_header = (typeof(post_header))(post); /* note: only interested in the format for obtaining glyph names */ post_header->format = GET_BE_DWORD(&post_header->format); @@ -717,7 +714,7 @@ void get_glyph_name(HDC hdc, WORD index, char *name) } else if(post_header->format == MAKELONG(0, 2)) { - BYTE *post2header = post + sizeof(*post_header); + void *post2header = post_header + 1; int glyphNameIndex; size -= sizeof(*post_header); @@ -739,7 +736,7 @@ void get_glyph_name(HDC hdc, WORD index, char *name) HIWORD(post_header->format), LOWORD(post_header->format)); cleanup: - HeapFree(GetProcessHeap(), 0, post); + HeapFree(GetProcessHeap(), 0, post_header); } /**************************************************************************** -- 2.23.0

2 1