- Wine-Commits - list.winehq.org

Alexandre Julliard : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 3aca5994584b3e91bc2abc138dde8422d0d15f24 URL: https://gitlab.winehq.org/wine/wine/-/commit/3aca5994584b3e91bc2abc138dde84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 17:49:46 2023 +0100 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 107 ++++++++++++++++++------ tools/config.sub | 236 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 239 insertions(+), 104 deletions(-)

1 0

Santino Mazza : mlang/tests: Test GetStrCodePages with different codepages character.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: b413d4974af3985507619503e78c3af68cfbdf6d URL: https://gitlab.winehq.org/wine/wine/-/commit/b413d4974af3985507619503e78c3a… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Wed Nov 15 13:46:56 2023 -0300 mlang/tests: Test GetStrCodePages with different codepages character. --- dlls/mlang/tests/mlang.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index da0b87ed729..8e55b07b021 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1163,7 +1163,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) DWORD dwCodePages, dwManyCodePages; DWORD dwCmpCodePages; UINT CodePage; - static const WCHAR str[] = { 'd', 0x0436, 0xff90 }; + static const WCHAR str[] = { 'd', 0x0436, 0xff90, 0x0160 }; LONG processed; HRESULT ret; @@ -1220,6 +1220,19 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); ok(processed == 1, "expected 1, got %ld\n", processed); + /* Latin 2 */ + dwCmpCodePages = FS_LATIN1 | FS_LATIN2 | FS_TURKISH | FS_BALTIC; + ret = IMLangFontLink_GetCharCodePages(iMLFL, 0x0160, &dwCodePages); + ok(ret == S_OK, "IMLangFontLink_GetCharCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[3], 1, 0, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 1, got %ld\n", processed); + /* Cyrillic */ dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG; ret = IMLangFontLink_GetCharCodePages(iMLFL, 0x0436, &dwCodePages); @@ -1262,6 +1275,14 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); ok(processed == 3, "expected 3, got %ld\n", processed); + dwCmpCodePages = FS_JISJAPAN; + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 4, 0, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + todo_wine ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + todo_wine ok(processed == 3, "expected 3, got %ld\n", processed); + dwCodePages = 0xffff; processed = -1; ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed);

1 0

Santino Mazza : mlang: Fix GetStrCodePages for characters with different codepages.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 4ad1474678d440080fe659e5c21d3ecf90b18a2f URL: https://gitlab.winehq.org/wine/wine/-/commit/4ad1474678d440080fe659e5c21d3e… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Wed Nov 15 13:59:17 2023 -0300 mlang: Fix GetStrCodePages for characters with different codepages. --- dlls/mlang/mlang.c | 7 ++++++- dlls/mlang/tests/mlang.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index add0dd0a104..6b0f2922a77 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3340,7 +3340,12 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface, if (ret != S_OK) return E_FAIL; if (!cps) cps = cp; - else cps &= cp; + else if ((cps & cp) != 0) cps &= cp; + else + { + i--; + break; + } /* FIXME: not tested */ if (priority_cp & cps) break; diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 8e55b07b021..3240d945245 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1280,8 +1280,8 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) processed = 0; ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 4, 0, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); - todo_wine ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); - todo_wine ok(processed == 3, "expected 3, got %ld\n", processed); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 3, "expected 3, got %ld\n", processed); dwCodePages = 0xffff; processed = -1;

1 0

Dmitry Timoshkov : shell32: Implement IFolderView2::Items(&IID_IShellItemArray).
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 03d616b4eb8939b89712304ef34cbc6286665485 URL: https://gitlab.winehq.org/wine/wine/-/commit/03d616b4eb8939b89712304ef34cbc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 6 13:40:36 2022 +0300 shell32: Implement IFolderView2::Items(&IID_IShellItemArray). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shlview.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 71f60c2db89..bb1119355ab 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2774,8 +2774,49 @@ static HRESULT WINAPI FolderView_ItemCount(IFolderView2 *iface, UINT flags, int static HRESULT WINAPI FolderView_Items(IFolderView2 *iface, UINT flags, REFIID riid, void **ppv) { IShellViewImpl *This = impl_from_IFolderView2(iface); - FIXME("(%p)->(%u %s %p), stub\n", This, flags, debugstr_guid(riid), ppv); - return E_NOTIMPL; + int count, i; + ITEMIDLIST **pidl; + LVITEMW item; + HRESULT hr; + + if (!IsEqualIID(riid, &IID_IShellItemArray)) + { + FIXME("%s is not supported\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + if (flags != SVGIO_ALLVIEW) + FIXME("some flags unsupported, %x\n", flags & ~SVGIO_ALLVIEW); + + count = SendMessageW(This->hWndList, LVM_GETITEMCOUNT, 0, 0); + if (!count) + { + FIXME("Folder is empty\n"); + return E_FAIL; + } + + pidl = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*pidl)); + if (!pidl) return E_OUTOFMEMORY; + + for (i = 0; i < count; i++) + { + item.mask = LVIF_PARAM; + item.iItem = i; + if (!SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM)&item)) + { + FIXME("LVM_GETITEMW(%d) failed\n" ,i); + HeapFree(GetProcessHeap(), 0, pidl); + return E_FAIL; + } + + pidl[i] = (ITEMIDLIST *)item.lParam; + } + + hr = SHCreateShellItemArray(NULL, This->pSFParent, count, (LPCITEMIDLIST *)pidl, (IShellItemArray **)ppv); + + HeapFree(GetProcessHeap(), 0, pidl); + + return hr; } static HRESULT WINAPI FolderView_GetSelectionMarkedItem(IFolderView2 *iface, int *item)

1 0

Nell Hardcastle : winebus.sys: Identify DualSense Edge as a DualSense controller.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 33a3726a051c2de1ca86717a325487bae92db1fa URL: https://gitlab.winehq.org/wine/wine/-/commit/33a3726a051c2de1ca86717a325487… Author: Nell Hardcastle <nell(a)dev-nell.com> Date: Sun Nov 19 09:25:22 2023 -0800 winebus.sys: Identify DualSense Edge as a DualSense controller. The DualSense Edge implements extra features (haptics and adaptive triggers) in the same way as the DualSense. --- dlls/winebus.sys/unixlib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 74b4992f07b..82eab3717ca 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -72,7 +72,9 @@ BOOL is_dualshock4_gamepad(WORD vid, WORD pid) BOOL is_dualsense_gamepad(WORD vid, WORD pid) { - if (vid == 0x054c && pid == 0x0ce6) return TRUE; + if (vid != 0x054c) return FALSE; + if (pid == 0x0ce6) return TRUE; /* DualSense */ + if (pid == 0x0df2) return TRUE; /* DualSense Edge */ return FALSE; }

1 0

Nell Hardcastle : mmdevapi: Override product strings for DualSense Edge.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 92dcc916fd747d197996e40a129aa852f8120352 URL: https://gitlab.winehq.org/wine/wine/-/commit/92dcc916fd747d197996e40a129aa8… Author: Nell Hardcastle <nell(a)dev-nell.com> Date: Sun Nov 19 09:26:38 2023 -0800 mmdevapi: Override product strings for DualSense Edge. Enables audio device features for the DualSense Edge. --- dlls/mmdevapi/devenum.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 10037a7affe..246625286b8 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -294,6 +294,7 @@ static const struct product_name_overrides product_name_overrides[] = { /* Sony controllers */ { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, + { .id = L"VID_054C&PID_0DF2", .product = L"Wireless Controller" }, }; static const WCHAR *find_product_name_override(const WCHAR *device_id)

1 0

Dmitry Timoshkov : shell32: Improve FolderView2::GetViewModeAndIconSize() stub.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: a8e1ab6422f6028a260fafde40ddfdc24f334a61 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8e1ab6422f6028a260fafde40ddfd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 4 11:11:04 2022 +0300 shell32: Improve FolderView2::GetViewModeAndIconSize() stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shlview.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index d6b917496c2..83fb206af52 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3038,8 +3038,13 @@ static HRESULT WINAPI FolderView2_GetViewModeAndIconSize(IFolderView2 *iface, FO int *size) { IShellViewImpl *This = impl_from_IFolderView2(iface); + FIXME("(%p)->(%p %p), stub\n", This, mode, size); - return E_NOTIMPL; + + *size = 16; /* FIXME */ + *mode = This->FolderSettings.ViewMode; + + return S_OK; } static HRESULT WINAPI FolderView2_SetGroupSubsetCount(IFolderView2 *iface, UINT visible_rows)

1 0

Michael Stefaniuc : quartz: Remove redudant NULL checks before CoTaskMemFree().
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 466c97008c197fa4304a219f12c6c55cc9697cec URL: https://gitlab.winehq.org/wine/wine/-/commit/466c97008c197fa4304a219f12c6c5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 8 19:30:35 2023 +0100 quartz: Remove redudant NULL checks before CoTaskMemFree(). --- dlls/quartz/tests/mpegsplit.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index f002d0228e2..73d021b6297 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -2004,9 +2004,7 @@ static void test_streamselect(IAMStreamSelect *sel) todo_wine ok(name && !wcscmp(name, L"Stream(E0)"), "Got name %ls.\n", name ? name : L"(null)"); todo_wine ok(object == unk_video, "Got object %p, expected %p.\n", object, unk_video); ok(unk == NULL, "Got unknown %p.\n", unk); - - if (name) - CoTaskMemFree(name); + CoTaskMemFree(name); if (mt) DeleteMediaType(mt); if (object) @@ -2023,9 +2021,7 @@ static void test_streamselect(IAMStreamSelect *sel) todo_wine ok(name && !wcscmp(name, L"Stream(C0)"), "Got name %ls.\n", name ? name : L"(null)"); todo_wine ok(object == unk_audio, "Got object %p, expected %p.\n", object, unk_audio); ok(unk == NULL, "Got unknown %p.\n", unk); - - if (name) - CoTaskMemFree(name); + CoTaskMemFree(name); if (mt) DeleteMediaType(mt); if (object)

1 0

Nell Hardcastle : hidclass.sys: Add DualSense Edge to device_strings.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 12f50afe9a1bce267ca0d154e53d71a837929419 URL: https://gitlab.winehq.org/wine/wine/-/commit/12f50afe9a1bce267ca0d154e53d71… Author: Nell Hardcastle <nell(a)dev-nell.com> Date: Sun Nov 19 09:27:41 2023 -0800 hidclass.sys: Add DualSense Edge to device_strings. --- dlls/hidclass.sys/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index d673a8c2e88..8fde1fe10a5 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -403,6 +403,7 @@ static const struct device_strings device_strings[] = { .id = L"VID_054C&PID_09CC", .product = L"Wireless Controller" }, { .id = L"VID_054C&PID_0BA0", .product = L"Wireless Controller" }, { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, + { .id = L"VID_054C&PID_0DF2", .product = L"Wireless Controller" }, }; static const WCHAR *find_device_string( const WCHAR *device_id, ULONG index )

1 0

Marc-Aurel Zent : ntdll: Use IOPowerSources API to fill battery info on macOS.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: f715f400dc44c58035f6cbcb410a4b30d8cce58d URL: https://gitlab.winehq.org/wine/wine/-/commit/f715f400dc44c58035f6cbcb410a4b… Author: Marc-Aurel Zent <marc_aurel(a)me.com> Date: Sat Feb 25 01:29:15 2023 +0100 ntdll: Use IOPowerSources API to fill battery info on macOS. --- dlls/ntdll/unix/system.c | 107 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 73 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 501b6997a6d..a6f1382a5fa 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -57,8 +57,7 @@ #ifdef __APPLE__ # include <CoreFoundation/CoreFoundation.h> # include <IOKit/IOKitLib.h> -# include <IOKit/pwr_mgt/IOPM.h> -# include <IOKit/pwr_mgt/IOPMLib.h> +# include <IOKit/ps/IOPSKeys.h> # include <IOKit/ps/IOPowerSources.h> # include <mach/mach.h> # include <mach/machine.h> @@ -3580,66 +3579,106 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) { - CFArrayRef batteries; - CFDictionaryRef battery; - CFNumberRef prop; - uint32_t value, voltage; - CFTimeInterval remain; + CFTypeRef blob = IOPSCopyPowerSourcesInfo(); + CFArrayRef sources = IOPSCopyPowerSourcesList( blob ); + CFIndex count, i; + CFDictionaryRef source = NULL; + CFTypeRef prop; + Boolean is_charging, is_internal, is_present; + int32_t value, voltage; - if (IOPMCopyBatteryInfo( 0, &batteries ) != kIOReturnSuccess) + if (!sources) + { + if (blob) CFRelease( blob ); return STATUS_ACCESS_DENIED; + } + + count = CFArrayGetCount( sources ); + + for (i = 0; i < count; i++) + { + source = IOPSGetPowerSourceDescription( blob, CFArrayGetValueAtIndex( sources, i ) ); + + if (!source) + continue; + + prop = CFDictionaryGetValue( source, CFSTR(kIOPSTransportTypeKey) ); + is_internal = !CFStringCompare( prop, CFSTR(kIOPSInternalType), 0 ); + + prop = CFDictionaryGetValue( source, CFSTR(kIOPSIsPresentKey) ); + is_present = CFBooleanGetValue( prop ); + + if (is_internal && is_present) + break; + } - if (CFArrayGetCount( batteries ) == 0) + CFRelease( blob ); + + if (!source) { - /* Just assume we're on AC with no battery. */ + /* Just assume we're on AC with no internal power source. */ bs->AcOnLine = TRUE; + CFRelease( sources ); return STATUS_SUCCESS; } - /* Just use the first battery. */ - battery = CFArrayGetValueAtIndex( batteries, 0 ); - prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryFlagsKey) ); - CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->BatteryPresent = TRUE; - if (value & kIOBatteryInstalled) - bs->BatteryPresent = TRUE; - else - /* Since we are executing code, we must have AC power. */ - bs->AcOnLine = TRUE; - if (value & kIOBatteryChargerConnect) + prop = CFDictionaryGetValue( source, CFSTR(kIOPSIsChargingKey) ); + is_charging = CFBooleanGetValue( prop ); + + prop = CFDictionaryGetValue( source, CFSTR(kIOPSPowerSourceStateKey) ); + + if (!CFStringCompare( prop, CFSTR(kIOPSACPowerValue), 0 )) { bs->AcOnLine = TRUE; - if (value & kIOBatteryCharge) + if (is_charging) bs->Charging = TRUE; } else bs->Discharging = TRUE; /* We'll need the voltage to be able to interpret the other values. */ - prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryVoltageKey) ); - CFNumberGetValue( prop, kCFNumberSInt32Type, &voltage ); + prop = CFDictionaryGetValue( source, CFSTR(kIOPSVoltageKey) ); + if (prop) + CFNumberGetValue( prop, kCFNumberIntType, &voltage ); + else + /* kIOPSVoltageKey is optional and might not be populated. + * Assume 11.4 V then, which is a common value for Apple laptops. */ + voltage = 11400; - prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCapacityKey) ); - CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + prop = CFDictionaryGetValue( source, CFSTR(kIOPSMaxCapacityKey) ); + CFNumberGetValue( prop, kCFNumberIntType, &value ); bs->MaxCapacity = value * voltage; /* Apple uses "estimated time < 10:00" and "22%" for these, but we'll follow * Windows for now (5% and 33%). */ bs->DefaultAlert1 = bs->MaxCapacity / 20; bs->DefaultAlert2 = bs->MaxCapacity / 3; - prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCurrentChargeKey) ); - CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + prop = CFDictionaryGetValue( source, CFSTR(kIOPSCurrentCapacityKey) ); + CFNumberGetValue( prop, kCFNumberIntType, &value ); bs->RemainingCapacity = value * voltage; - prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryAmperageKey) ); - CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); - bs->Rate = value * voltage; + prop = CFDictionaryGetValue( source, CFSTR(kIOPSCurrentKey) ); + if (prop) + CFNumberGetValue( prop, kCFNumberIntType, &value ); + else + /* kIOPSCurrentKey is optional and might not be populated. */ + value = 0; + + bs->Rate = value * voltage / 1000; - remain = IOPSGetTimeRemainingEstimate(); - if (remain != kIOPSTimeRemainingUnknown && remain != kIOPSTimeRemainingUnlimited) - bs->EstimatedTime = (ULONG)remain; + prop = CFDictionaryGetValue( source, CFSTR(kIOPSTimeToEmptyKey) ); + if (prop) + { + CFNumberGetValue( prop, kCFNumberIntType, &value ); + if (value > 0) + /* A value of -1 indicates "Still Calculating the Time", + * otherwise estimated minutes left on the battery. */ + bs->EstimatedTime = value * 60; + } - CFRelease( batteries ); + CFRelease( sources ); return STATUS_SUCCESS; }

1 0