- Wine-Devel - list.winehq.org

libs don't compile without warnings
by Fabian Maurer April 24, 2022

April 24, 2022

Hello, The integrated libraries under libs don't compile without warnings. Is there a way to suppress those warnings, but keep the ones from normal wine files? I'd like to compile wine with Werror, and fix the warnings we have, but this makes it impossible. Regards, Fabian Maurer

4 5

[PATCH v2] ntdll: Check for several common battery and AC adapter names on Linux
by Alex Henrie April 24, 2022

April 24, 2022

These names come from ACPI, but the exact naming convention varies between hardware manufacturers. Try all of them and take the statistics from the first one that exists. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52831 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Remove the bitwise ORs that are now unnecessary because we're only looking at the first battery --- dlls/ntdll/unix/system.c | 61 +++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 65c49b6ccd1..b51f2dddd6d 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3425,10 +3425,14 @@ static ULONG mhz_from_cpuinfo(void) return cmz; } -static const char * get_sys_str(const char *path, char *s) +static const char * get_sys_str(const char *dirname, const char *basename, char *s) { - FILE *f = fopen(path, "r"); + FILE *f; const char *ret = NULL; + char path[64]; + + sprintf(path, "%s/%s", dirname, basename); + f = fopen(path, "r"); if (f) { @@ -3438,40 +3442,57 @@ static const char * get_sys_str(const char *path, char *s) return ret; } -static int get_sys_int(const char *path, int def) +static int get_sys_int(const char *dirname, const char *basename, int def) { char s[16]; - return get_sys_str(path, s) ? atoi(s) : def; + return get_sys_str(dirname, basename, s) ? atoi(s) : def; } static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) { - char s[16], path[64]; - unsigned int i = 0; + static const char* ac_names[] = + { + "AC", + "ACAD", + "ADP0", + "ADP1", + NULL + }; + static const char* bat_names[] = + { + "BAT0", + "BAT1", + NULL + }; + char s[16], dirname[64]; + const char** name; LONG64 voltage; /* microvolts */ - bs->AcOnLine = get_sys_int("/sys/class/power_supply/AC/online", 1); - - for (;;) + bs->AcOnLine = TRUE; + for (name = ac_names; name; name++) { - sprintf(path, "/sys/class/power_supply/BAT%u/status", i); - if (!get_sys_str(path, s)) break; - bs->Charging |= (strcmp(s, "Charging\n") == 0); - bs->Discharging |= (strcmp(s, "Discharging\n") == 0); - bs->BatteryPresent = TRUE; - i++; + sprintf(dirname, "/sys/class/power_supply/%s", *name); + if (!get_sys_str(dirname, "online", s)) continue; + bs->AcOnLine = atoi(s); + break; } - if (bs->BatteryPresent) + for (name = bat_names; name; name++) { - voltage = get_sys_int("/sys/class/power_supply/BAT0/voltage_now", 0); - bs->MaxCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_full", 0) * voltage / 1e9; - bs->RemainingCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_now", 0) * voltage / 1e9; - bs->Rate = -get_sys_int("/sys/class/power_supply/BAT0/current_now", 0) * voltage / 1e9; + sprintf(dirname, "/sys/class/power_supply/%s", *name); + if (!get_sys_str(dirname, "status", s)) continue; + bs->Charging = (strcmp(s, "Charging\n") == 0); + bs->Discharging = (strcmp(s, "Discharging\n") == 0); + bs->BatteryPresent = TRUE; + voltage = get_sys_int(dirname, "voltage_now", 0); + bs->MaxCapacity = get_sys_int(dirname, "charge_full", 0) * voltage / 1e9; + bs->RemainingCapacity = get_sys_int(dirname, "charge_now", 0) * voltage / 1e9; + bs->Rate = -get_sys_int(dirname, "current_now", 0) * voltage / 1e9; if (!bs->Charging && (LONG)bs->Rate < 0) bs->EstimatedTime = 3600 * bs->RemainingCapacity / -(LONG)bs->Rate; else bs->EstimatedTime = ~0u; + break; } return STATUS_SUCCESS; -- 2.36.0

5 7

[PATCH v3] ntdll: Don't define _TIME_BITS 64 for futex code.
by Piotr Caban April 24, 2022

April 24, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/unix/futex.c | 84 ++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/sync.c | 42 +---------------- dlls/ntdll/unix/unix_private.h | 6 +++ 4 files changed, 92 insertions(+), 41 deletions(-) create mode 100644 dlls/ntdll/unix/futex.c

1 0

[PATCH v4 0/4] Partial IShellItemImageFactory implementation (#52673)
by Jinoh Kang April 24, 2022

April 24, 2022

Jinoh Kang (4): include: Add definition for IShellItemImageFactory. shell32/tests: Add tests for IShellItemImageFactory. shell32: Add stub for IShellItemImageFactory. shell32: Partially implement IShellItemImageFactory (icon only, no thumbnail). dlls/shell32/shellitem.c | 253 +++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 46 ++++++ include/shobjidl.idl | 30 ++++ 3 files changed, 329 insertions(+) -- 2.34.1

4 13

[PATCH v4 2/2] fonts: Add Segoe UI Symbol font replacement.
by Dmitry Timoshkov April 24, 2022

April 24, 2022

Segoe UI Symbol font is used by many WPF .Net applications. This patch adds the font with just single glyph 0x25d4 (which is part of the Geometric Shapes unicode block), created by modifying glyph 'one in the circle' from the OpenSymbol font. v4: Rebased. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/tests/layout.c | 3 -- fonts/Makefile.in | 1 + fonts/seguisym.sfd | 99 +++++++++++++++++++++++++++++++++++++ fonts/seguisym.ttf | Bin 0 -> 1688 bytes 4 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 fonts/seguisym.sfd create mode 100644 fonts/seguisym.ttf diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 43b6efa107b..d9542ea2558 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4805,19 +4805,16 @@ static void test_system_fallback(void) g_source = tests[i].text; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &length, &font, &scale); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr != S_OK) continue; ok(length == 1, "Unexpected length %u\n", length); ok(scale == 1.0f, "got %f\n", scale); get_font_name(font, name, ARRAY_SIZE(name)); - todo_wine ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); IDWriteFont_Release(font); diff --git a/fonts/Makefile.in b/fonts/Makefile.in index b8021851987..afce01fdb8d 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -4,6 +4,7 @@ FONT_SRCS = \ fixedsys_jp.sfd \ marlett.sfd \ ms_sans_serif.sfd \ + seguisym.sfd \ small_fonts.sfd \ small_fonts_jp.sfd \ symbol.sfd \ diff --git a/fonts/seguisym.sfd b/fonts/seguisym.sfd new file mode 100644 index 00000000000..476969b3fc1 --- /dev/null +++ b/fonts/seguisym.sfd @@ -0,0 +1,99 @@ +SplineFontDB: 3.0 +FontName: WineSegoeUISymbol +FullName: Segoe UI Symbol +FamilyName: Segoe UI Symbol +Weight: Regular +Copyright: Copyright (C) 2022 Dmitry Timoshkov +UComments: "#pragma makedep install" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -119 +UnderlineWidth: 119 +Ascent: 1638 +Descent: 410 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +XUID: [1021 135 1692684408 1110823] +FSType: 0 +OS2Version: 2 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +PfmFamily: 17 +TTFWeight: 400 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 2 11 5 2 4 2 4 2 2 3 +OS2TypoAscent: 1491 +OS2TypoAOffset: 0 +OS2TypoDescent: -431 +OS2TypoDOffset: 0 +OS2TypoLinegap: 269 +OS2WinAscent: 2210 +OS2WinAOffset: 0 +OS2WinDescent: 514 +OS2WinDOffset: 0 +HheadAscent: 2210 +HheadAOffset: 0 +HheadDescent: -514 +HheadDOffset: 0 +OS2SubXSize: 1434 +OS2SubYSize: 1331 +OS2SubXOff: 0 +OS2SubYOff: 283 +OS2SupXSize: 1434 +OS2SupYSize: 1331 +OS2SupXOff: 0 +OS2SupYOff: 977 +OS2StrikeYSize: 102 +OS2StrikeYPos: 530 +OS2FamilyClass: 2053 +OS2Vendor: 'Wine' +OS2CodePages: 00000001.40000000 +OS2UnicodeRanges: 8000006f.1200fbef.0064c000.00000002 +DEI: 91125 +Encoding: Custom +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 38 14 +Grid +-2048 741 m 0 + 4096 741 l 0 +918 2662 m 0 + 918 -1434 l 0 +EndSplineSet +BeginChars: 256 1 + +StartChar: uni25D4 +Encoding: 255 9684 0 +Width: 1764 +Flags: WO +LayerCount: 2 +Fore +SplineSet +882.5 731 m 24,0,-1 + 882 1372 l 0,1,2 + 586.611 1347.2 586.611 1347.2 426 1184 c 0,3,4 + 240 995 240 995 240 730 c 0,5,6 + 240 459.078 240 459.078 426 276 c 0,7,8 + 617 88 617 88 882 88 c 0,9,10 + 1142.95 88 1142.95 88 1334 276 c 0,11,12 + 1534.8 473.599 1534.8 473.599 1522 730 c 0,13,-1 + 882.5 731 l 24,0,-1 +140 730 m 0,14,15 + 140 1036 140 1036 358 1254 c 0,16,17 + 574 1470 574 1470 882 1470 c 0,18,19 + 1188 1470 1188 1470 1404 1254 c 0,20,21 + 1620 1035 1620 1035 1620 730 c 0,22,23 + 1620 421 1620 421 1404 208 c 0,24,25 + 1189 -10 1189 -10 882 -10 c 0,26,27 + 573 -10 573 -10 358 208 c 0,28,29 + 140 420 140 420 140 730 c 0,14,15 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/fonts/seguisym.ttf b/fonts/seguisym.ttf new file mode 100644 index 0000000000000000000000000000000000000000..9dc577f45388d30d2049fb18bb1d8493c9e897c0 GIT binary patch literal 1688 zcmds1U1(cn7=FI<m(1BF8Dm4N`b8UELE5v^+DZvhY>4(kr){zc12t{aBrM4Z$?3Mp zz<R%nUFsCX>D`9dASh!xuVgZYij~D|mjkbc2=j-jr#|1wsj~=zw|<BBd!P5`d*AoG z-wy<U0jxpCbJ=X}8A{YxC&-5mEQ~qcd#@CzdV%uGOSM7+v5{9PUm`uZbkvi`m<d3? zn|7mAXf-xB83~q0Ia;c=R~FxvPtiU^`BJ%9SbkAEyH0$aG+Cx%@K(a)t|#@bDJxLos& z?>>jGD1S^jUUioWI0fd`<CO2J6^=LXG!D(a)IIAvKc)QYh;=1tmf0NUY(+wwZMriYn- zhIU8&iK4^f6H_n6(m!EmlnUTP>VvhvcxLlwD`$R6ISNf_Ik+Zz<`1877?*P{h@{}w zFanK%`@=PAr3iF07!8~>>xMW5)@GhI$7#H`&-JgdqV0;B+D=n5_-XnY;O(a)e2KVbPY zwNN`$sTVPm+DL7f-}ujqf#?}6h(4pN{UIS(Sw;z}Lefb>_C27Xu-Y^w)qx=xkmLqG z%Bc<RQ84$$LQjSZewt3?Dx0Fe4;APCKZ3K2M}u#fzpJSpYs+Syos3{~U0^KTi5R%) ztXt;wbVt_+v92q%snnf_C4NtL*utC6cp{ldB@@YvCjDXYx?eW)x6fvbD?!|o;i((I zee8I`h**jE-aSb<HK`}#Q<F)#cTXZ7v6AwUhxMla-8<*cUlcopdGU*Z+oyY7F(I68 zw|mvU;$Obn)2?Z+-Sh4z{xANIA6>ZcIgg>!>vpgCU;3B7?e#W-Z5zb<TYHU%c!&D? zDG=ky>0^z5crL^`9>A>-8;FUC5SxgLl(a)MD<h&R;<Gj=dTmej|BccL0%4TE?q#5$h9 zhau*@;f?S6n~)+CVhaz7W0-}D2HI$%f)dK`AhD0y5poAM$sx+1M!QF^Hl-YKjq6(U zKSF*Km~|WNW~Eg2<i6Pv>DZ1VGqsA>Y|C7w=C;a5TskeF$Q&+bi9F^wFECyWi_}$V zE|%P)%+JY%c5Tt6Vm|O+rLDlsm(a)k%As|A8A{p+ko(a)g^gxcn)6zn|wNm`mcGiZr#he z%~DZ1qqdxu|H%7a>paK`n(Rg;s7taA8~cNL6q3NfVzX6o>(aLOkJ`3P%^^D1x$I6V z)sSuNP)}1(T7GV;AzLrS=Ce4)GayLYhe1(56Ix`oUU44FOax}ZHz;`3wmaXE{sj6$ B2nYZG literal 0 HcmV?d00001 -- 2.35.1

3 3

[PATCH] uxtheme: Fix double free on registry key handle.
by Nikolay Sivov April 24, 2022

April 24, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52704 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/uxtheme/system.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 908451f0fe8..05b86e40b1a 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -127,7 +127,6 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, } } - RegCloseKey(hKey); return dwRet; } -- 2.35.1

2 1

[PATCH] dwrite/tests: Avoid "misleading indentation" warnings
by Fabian Maurer April 24, 2022

April 24, 2022

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/dwrite/tests/layout.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 43b6efa107b..c3445550650 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4805,19 +4805,19 @@ static void test_system_fallback(void) g_source = tests[i].text; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &length, &font, &scale); - todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr != S_OK) continue; ok(length == 1, "Unexpected length %u\n", length); ok(scale == 1.0f, "got %f\n", scale); get_font_name(font, name, ARRAY_SIZE(name)); - todo_wine + todo_wine ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine + todo_wine ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); IDWriteFont_Release(font); -- 2.36.0

2 1

[PATCH v3] ntdll: In NtQueryInformationToken for TokenLogonSid set the proper attribute
by Fabian Maurer April 23, 2022

April 23, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52845 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2: Add tests, adjust groups v3: Add braces --- dlls/advapi32/tests/security.c | 3 +++ dlls/ntdll/unix/security.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 135a45f7727..cc5e66b7e44 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1898,6 +1898,9 @@ static void test_token_attr(void) /* S-1-5-5-0-XXXXXX */ ret = IsWellKnownSid(Groups->Groups[0].Sid, WinLogonIdsSid); ok(ret, "Unknown SID\n"); + + ok(Groups->Groups[0].Attributes == (SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED | SE_GROUP_LOGON_ID), + "Got %x\n", Groups->Groups[0].Attributes); } } diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 2955355353e..6a5059fd3da 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -480,7 +480,7 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c { groups->GroupCount = 1; groups->Groups[0].Sid = sid; - groups->Groups[0].Attributes = 0; + groups->Groups[0].Attributes = (SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED | SE_GROUP_LOGON_ID); } } SERVER_END_REQ; -- 2.36.0

2 1

[PATCH 1/5] include: Add definition for IShellItemImageFactory.
by Jinoh Kang April 23, 2022

April 23, 2022

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: no changes include/shobjidl.idl | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index c1a36ab5e93..11b84c0d4f7 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -471,6 +471,36 @@ interface IShellItem2 : IShellItem [out] BOOL *pf); } +/***************************************************************************** + * IShellItemImageFactory interface + */ +[ + object, + uuid(BCC18B79-BA16-442F-80C4-8A59C30C463B), + pointer_default(unique) +] +interface IShellItemImageFactory : IUnknown +{ + [v1_enum] enum _SIIGBF { + SIIGBF_RESIZETOFIT = 0x00000000, + SIIGBF_BIGGERSIZEOK = 0x00000001, + SIIGBF_MEMORYONLY = 0x00000002, + SIIGBF_ICONONLY = 0x00000004, + SIIGBF_THUMBNAILONLY = 0x00000008, + SIIGBF_INCACHEONLY = 0x00000010, + SIIGBF_CROPTOSQUARE = 0x00000020, + SIIGBF_WIDETHUMBNAILS = 0x00000040, + SIIGBF_ICONBACKGROUND = 0x00000080, + SIIGBF_SCALEUP = 0x00000100, + }; + typedef DWORD SIIGBF; + + HRESULT GetImage( + [in] SIZE size, + [in] SIIGBF flags, + [out] HBITMAP *phbm); +} + typedef [v1_enum] enum tagNWMF { NWMF_UNLOADING = 0x00000001, NWMF_USERINITED = 0x00000002, -- 2.34.1

3 9

Wine staging 7.7 release
by Alistair Leslie-Hughes April 23, 2022

April 23, 2022

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.7 (560 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0