March 2022 - Wine-Devel - list.winehq.org

[tools] testbot/cgi: Add Page::SetError().
by Francois Gouget March 29, 2022

March 29, 2022

This provides a proper API to set the page error, particularly for non-child classes. Use it in CollectionBlock. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 8 ++++++-- testbot/lib/ObjectModel/CGI/Page.pm | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 053b22545..58ece69f3 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -617,8 +617,12 @@ sub OnItemAction($$$) if ($Action eq "Delete") { my $ErrMessage = $self->{Collection}->DeleteItem($Item); - $self->{EnclosingPage}->{ErrMessage} = $ErrMessage; - return ! defined($ErrMessage); + if (defined $ErrMessage) + { + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } + return 1; } $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index f7e3c93b8..a79155950 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -309,6 +309,14 @@ sub GetErrMessage($) return $self->{ErrMessage}; } +sub SetError($$$) +{ + my ($self, $ErrField, $ErrMessage) = @_; + + $self->{ErrField} = $ErrField; + $self->{ErrMessage} = $ErrMessage; +} + sub GenerateErrorDiv($) { my ($self) = @_; -- 2.30.2

1 0

[tools] testbot/cgi: Document and tweak the action error handling.
by Francois Gouget March 29, 2022

March 29, 2022

Fix OnAction() so it returns an error when OnItemAction() fails to apply an action to a selected item. OnItemAction() should not return success on unknown item actions. Also the action is a user-supplied parameter so a proper error message shoulf be displayed when it is invalid instead of having OnAction() and OnItemAction() just die. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 16 ++++++++++++---- testbot/lib/ObjectModel/CGI/FormPage.pm | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 6f5c4d5fa..58bf927ca 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -603,6 +603,10 @@ This method is called to apply $Action to each selected item. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. In case an error occurs while performing the action on +any of the selected items, the enclosing page's error message is set and +false is returned. + =back =cut @@ -617,7 +621,8 @@ sub OnItemAction($$$) return ! defined($ErrMessage); } - return 1; + $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); + return 0; } @@ -668,6 +673,9 @@ Implements the "Add" and per-item actions. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. Otherwise the enclosing page's error message is set +and false is returned. + =back =cut @@ -692,15 +700,15 @@ sub OnAction($$) exit($self->{EnclosingPage}->Redirect($Target)); } - my $Ok = 1; foreach my $Key (@{$self->{Collection}->GetKeys()}) { - if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key)) && $Ok) + if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key))) { my $Item = $self->{Collection}->GetItem($Key); - $Ok = $self->CallOnItemAction($Item, $Action); + return 0 if (!$self->CallOnItemAction($Item, $Action)); } } + return 1; } 1; diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 83b078b24..0f4c5cd0e 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -596,6 +596,9 @@ actions. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. Otherwise sets the page's error message and returns +false. + =back =cut @@ -603,7 +606,8 @@ sub OnAction($$) { my ($self, $Action) = @_; - die "No action defined for $Action"; + $self->{EnclosingPage}->SetError(undef, "No action defined for $Action"); + return 0; } 1; -- 2.30.2

1 0

[tools] testbot/cgi: Simplify the default CollectionBlock::GetAction() implementation.
by Francois Gouget March 29, 2022

March 29, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 58bf927ca..053b22545 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -654,13 +654,9 @@ sub GetActions($) { my ($self) = @_; - my @Actions; - if ($self->CallGetDetailsPage()) - { - $Actions[0] = "Add " . $self->{Collection}->GetItemName(); - } - - return \@Actions; + return $self->CallGetDetailsPage() ? + ["Add ". $self->{Collection}->GetItemName()] : + []; } =pod -- 2.30.2

1 0

[tools] testbot/cgi: Fix handling of '0' in text fields.
by Francois Gouget March 29, 2022

March 29, 2022

'0' should be set as the field's initial value even though it evaluates to false. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 0f4c5cd0e..b85ccb297 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -300,7 +300,7 @@ sub GenerateField($$$) print "50' rows='", int(($MaxLength + 49) / 50); } print "'>"; - if ($Value) + if (defined $Value) { print $self->CGI->escapeHTML($Value), "'"; } @@ -313,7 +313,7 @@ sub GenerateField($$$) $Size=45 if ($Size > 45); print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='$Size'"; - if ($Value && $InputType ne "password") + if (defined $Value && $InputType ne "password") { print " value='", $self->CGI->escapeHTML($Value), "'"; } -- 2.30.2

1 0

[PATCH v2] crypt32: CryptAcquireCertificatePrivateKey() should reset last error code on success.
by Dmitry Timoshkov March 29, 2022

March 29, 2022

One of Chrome crypto plugins depends on this. v2: Rebased. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 1 + dlls/crypt32/tests/cert.c | 59 ++++++++++++++------------------------- 2 files changed, 22 insertions(+), 38 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 33811dfadc1..81ebb59d27c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1006,6 +1006,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, HeapFree(GetProcessHeap(), 0, info); if (cert_in_store) CertFreeCertificateContext(cert_in_store); + if (ret) SetLastError(0); return ret; } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 608d2c8c1b7..3f164e6d606 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3906,55 +3906,42 @@ static void testAcquireCertPrivateKey(void) CERT_KEY_CONTEXT keyContext; /* Don't cache provider */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, NULL, NULL); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); /* Use the key prov info's caching (there shouldn't be any) */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); /* Cache it (and check that it's cached) */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_CACHE_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret || - broken(!ret), /* win95 */ - "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); /* Remove the cached provider */ CryptReleaseContext(keyContext.hCryptProv, 0); @@ -3965,21 +3952,17 @@ static void testAcquireCertPrivateKey(void) CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); /* Now use the key prov info's caching */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret || - broken(!ret), /* win95 */ - "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); CryptDestroyKey(key); -- 2.35.1

1 0

[PATCH v2 3/3] fonts: Add Segoe UI Symbol font replacement.
by Dmitry Timoshkov March 29, 2022

March 29, 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. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/Makefile.in | 1 + fonts/seguisym.sfd | 99 +++++++++++++++++++++++++++++++++++++++++++++ fonts/seguisym.ttf | Bin 0 -> 1688 bytes 3 files changed, 100 insertions(+) create mode 100644 fonts/seguisym.sfd create mode 100644 fonts/seguisym.ttf 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

1 0

[PATCH v2 2/3] dwrite: Add Segoe UI Symbol fallback range for the Geometric Shapes unicode block.
by Dmitry Timoshkov March 29, 2022

March 29, 2022

As discussed on wine-devel with just Geometric Shapes unicode block. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/analyzer.c | 8 ++++++++ dlls/dwrite/tests/layout.c | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7ffcfa8070c..0087c126322 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -220,6 +220,13 @@ static const DWRITE_UNICODE_RANGE cjk_ranges[] = { 0x4e00, 0x9fff }, /* CJK Unified Ideographs */ }; +static const WCHAR *SegoeUI_Symbol_families[] = { L"Segoe UI Symbol" }; + +static const DWRITE_UNICODE_RANGE SegoeUI_Symbol_ranges[] = +{ + { 0x25a0, 0x25ff }, /* Geometric Shapes */ +}; + struct fallback_mapping { DWRITE_UNICODE_RANGE *ranges; UINT32 ranges_count; @@ -236,6 +243,7 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { (WCHAR **)families, ARRAY_SIZE(families) } MAPPING_RANGE(cjk_ranges, cjk_families), + MAPPING_RANGE(SegoeUI_Symbol_ranges, SegoeUI_Symbol_families), #undef MAPPING_RANGE }; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 42274a95611..420d236fe22 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6602,19 +6602,18 @@ todo_wine { hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, families[i], DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); -todo_wine_if(families[i] == NULL) ok(hr == S_OK, "%u: %s - got %#x\n", i, wine_dbgstr_w(families[i]), hr); if (hr != S_OK) continue; ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); get_font_name(font, name, ARRAY_SIZE(name)); -todo_wine +todo_wine_if(families[i] != NULL) ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); ok(hr == S_OK, "got %#x\n", hr); -todo_wine +todo_wine_if(families[i] != NULL) ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); IDWriteFont_Release(font); -- 2.35.1

1 0

[PATCH v2 1/3] dwrite/tests: Add some tests for Segoe UI font family.
by Dmitry Timoshkov March 29, 2022

March 29, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/tests/layout.c | 139 +++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77c6ff2034..42274a95611 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6487,6 +6487,144 @@ if (SUCCEEDED(hr)) IDWriteFactory_Release(factory); } +#define get_font_name(a, b, c) get_font_name_(a, b, c, __LINE__) +static void get_font_name_(IDWriteFont *font, WCHAR *name, UINT32 size, int line) +{ + HRESULT hr; + IDWriteFontFamily *family; + IDWriteLocalizedStrings *names; + UINT32 index; + BOOL exists; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + ok_(__FILE__, line)(index != UINT_MAX && exists, "name was not found\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_SegoeUI(void) +{ + static const WCHAR *families[] = { L"Tahoma", L"Segoe UI", NULL }; + static const WCHAR text[] = { 0x25d4, 0 }; + HRESULT hr; + IDWriteFactory2 *factory; + IDWriteFontCollection *collection; + IDWriteFontFamily *family; + IDWriteFont *font; + IDWriteFontFallback *fallback; + UINT32 index, count, i, mappedlength; + WCHAR name[256]; + BOOL exists, found; + FLOAT scale; + + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory2, (IUnknown **)&factory); + if (hr != S_OK) + { + win_skip("IDWriteFactory2 is not supported\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontCollection_FindFamilyName(collection, L"Segoe UI", &index, &exists); + ok(hr == S_OK, "got %#x\n", hr); + if (!exists) + { + skip("Segoe UI is not installed\n"); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); + return; + } + ok(index != UINT_MAX && exists, "Segoe UI was not found\n"); + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); + ok(hr == S_OK, "got %#x\n", hr); + + count = IDWriteFontFamily_GetFontCount(family); + trace("family Segoe UI has %u fonts\n", count); + + found = FALSE; + + for (i = 0; i < count; i++) + { + hr = IDWriteFontFamily_GetFont(family, i, &font); + ok(hr == S_OK, "got %#x\n", hr); + + get_font_name(font, name, ARRAY_SIZE(name)); + if (!wcscmp(name, L"Segoe UI Symbol")) + found = TRUE; + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); + ok(!exists, "%u: %s has character 0x25d4\n", i, wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + } + + ok(!found, "Segoe UI Symbol should not be part of Segoe UI family\n"); + + IDWriteFontFamily_Release(family); + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "got %#x\n", hr); + + g_source = text; + + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, L"Segoe UI", DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got %#x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); +todo_wine + ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + + for (i = 0; i < ARRAY_SIZE(families); i++) + { + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, families[i], DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine_if(families[i] == NULL) + ok(hr == S_OK, "%u: %s - got %#x\n", i, wine_dbgstr_w(families[i]), hr); + if (hr != S_OK) continue; + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); +todo_wine + ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -6542,6 +6680,7 @@ START_TEST(layout) test_text_format_axes(); test_layout_range_length(); test_HitTestTextRange(); + test_SegoeUI(); IDWriteFactory_Release(factory); } -- 2.35.1

1 0

[PATCH] wined3d: Avoid calling _strnicmp() with limit -1.
by Dmitry Timoshkov March 29, 2022

March 29, 2022

It's considered invalid by native ucrtbase (installed with winetricks). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_sm4.c | 2 +- dlls/wined3d/wined3d_main.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6282883ed04..a296e34bc9f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3736,7 +3736,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { if (e[i].stream_idx == stream_idx - && !_strnicmp(e[i].semantic_name, semantic_name, -1) + && !stricmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx) return &e[i]; } diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 868d9b3cc64..266b54d1d15 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1319,7 +1319,7 @@ static void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, struct wined3d_shader_signature_element *e = &output_signature->elements[i]; if (priv->shader_version.type == WINED3D_SHADER_TYPE_PIXEL - && _strnicmp(e->semantic_name, "SV_TARGET", -1)) + && stricmp(e->semantic_name, "SV_TARGET")) continue; if (e->register_idx >= ARRAY_SIZE(priv->output_map)) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 4f50e8aeb7d..35973e210b0 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -329,17 +329,17 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } if (!get_config_key(hkey, appkey, env, "shader_backend", buffer, size)) { - if (!_strnicmp(buffer, "glsl", -1)) + if (!stricmp(buffer, "glsl")) { ERR_(winediag)("Using the GLSL shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_GLSL; } - else if (!_strnicmp(buffer, "arb", -1)) + else if (!stricmp(buffer, "arb")) { ERR_(winediag)("Using the ARB shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; } - else if (!_strnicmp(buffer, "none", -1)) + else if (!stricmp(buffer, "none")) { ERR_(winediag)("Disabling shader backends.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE; -- 2.35.1

3 2

[PATCH 1/4] kernel32: Fix indentation of Global* functions.
by Rémi Bernon March 29, 2022

March 29, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- My intent is to cleanup these functions to then re-implement them using a static handle table, shared between kernelbase and kernel32 through KernelBaseGetGlobalData(), as native does it (although we don't need the global data structure to be necessarily compatible). The idea, is ultimately to have these functions a bit more robust, less dependent on exception handlers and heap pointers validation, and less dependent on the heap implementation itself. Native doesn't seem to be actually catching exceptions and it's possible to get crashes with bad pointer values. dlls/kernel32/heap.c | 163 +++++++++++++++++++++---------------------- 1 file changed, 81 insertions(+), 82 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 8e767d03211..7e366eb991e 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -231,11 +231,10 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem) * Handle: Success * NULL: Failure */ -HGLOBAL WINAPI GlobalHandle( - LPCVOID pmem /* [in] Pointer to global memory block */ -) { +HGLOBAL WINAPI GlobalHandle( LPCVOID pmem ) +{ HGLOBAL handle; - PGLOBAL32_INTERN maybe_intern; + PGLOBAL32_INTERN maybe_intern; LPCVOID test; if (!pmem) @@ -244,7 +243,7 @@ HGLOBAL WINAPI GlobalHandle( return 0; } - RtlLockHeap(GetProcessHeap()); + RtlLockHeap( GetProcessHeap() ); __TRY { handle = 0; @@ -252,22 +251,25 @@ HGLOBAL WINAPI GlobalHandle( /* note that if pmem is a pointer to a block allocated by */ /* GlobalAlloc with GMEM_MOVEABLE then magic test in HeapValidate */ /* will fail. */ - if (ISPOINTER(pmem)) { - if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, pmem )) { - handle = (HGLOBAL)pmem; /* valid fixed block */ + if (ISPOINTER( pmem )) + { + if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, pmem )) + { + handle = (HGLOBAL)pmem; /* valid fixed block */ break; } - handle = POINTER_TO_HANDLE(pmem); - } else - handle = (HGLOBAL)pmem; + handle = POINTER_TO_HANDLE( pmem ); + } + else handle = (HGLOBAL)pmem; /* Now test handle either passed in or retrieved from pointer */ maybe_intern = HANDLE_TO_INTERN( handle ); - if (maybe_intern->Magic == MAGIC_GLOBAL_USED) { + if (maybe_intern->Magic == MAGIC_GLOBAL_USED) + { test = maybe_intern->Pointer; if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, (const char *)test - HGLOBAL_STORAGE ) && /* obj(-handle) valid arena? */ - HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, maybe_intern )) /* intern valid arena? */ - break; /* valid moveable block */ + HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, maybe_intern )) /* intern valid arena? */ + break; /* valid moveable block */ } handle = 0; SetLastError( ERROR_INVALID_HANDLE ); @@ -278,12 +280,11 @@ HGLOBAL WINAPI GlobalHandle( handle = 0; } __ENDTRY - RtlUnlockHeap(GetProcessHeap()); + RtlUnlockHeap( GetProcessHeap() ); return handle; } - /*********************************************************************** * GlobalReAlloc (KERNEL32.@) * @@ -317,50 +318,49 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL hmem, SIZE_T size, UINT flags ) */ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) { - SIZE_T retval; - PGLOBAL32_INTERN pintern; + SIZE_T retval; + PGLOBAL32_INTERN pintern; - if (!((ULONG_PTR)hmem >> 16)) - { - SetLastError(ERROR_INVALID_HANDLE); - return 0; - } + if (!((ULONG_PTR)hmem >> 16)) + { + SetLastError( ERROR_INVALID_HANDLE ); + return 0; + } - if(ISPOINTER(hmem)) - { - retval=HeapSize(GetProcessHeap(), 0, hmem); + if (ISPOINTER( hmem )) + { + retval = HeapSize( GetProcessHeap(), 0, hmem ); + if (retval == ~(SIZE_T)0) /* It might be a GMEM_MOVEABLE data pointer */ + { + retval = HeapSize( GetProcessHeap(), 0, (char *)hmem - HGLOBAL_STORAGE ); + if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; + } + } + else + { + RtlLockHeap( GetProcessHeap() ); + pintern = HANDLE_TO_INTERN( hmem ); - if (retval == ~(SIZE_T)0) /* It might be a GMEM_MOVEABLE data pointer */ - { - retval = HeapSize(GetProcessHeap(), 0, (char*)hmem - HGLOBAL_STORAGE); - if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; - } - } - else - { - RtlLockHeap(GetProcessHeap()); - pintern=HANDLE_TO_INTERN(hmem); - - if(pintern->Magic==MAGIC_GLOBAL_USED) - { - if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */ - retval = 0; - else - { - retval = HeapSize(GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); - if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; - } - } - else - { - WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); - SetLastError(ERROR_INVALID_HANDLE); - retval=0; - } - RtlUnlockHeap(GetProcessHeap()); - } - if (retval == ~(SIZE_T)0) retval = 0; - return retval; + if (pintern->Magic == MAGIC_GLOBAL_USED) + { + if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */ + retval = 0; + else + { + retval = HeapSize( GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); + if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; + } + } + else + { + WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic ); + SetLastError( ERROR_INVALID_HANDLE ); + retval = 0; + } + RtlUnlockHeap( GetProcessHeap() ); + } + if (retval == ~(SIZE_T)0) retval = 0; + return retval; } @@ -415,32 +415,31 @@ VOID WINAPI GlobalUnfix(HGLOBAL hmem) */ UINT WINAPI GlobalFlags(HGLOBAL hmem) { - DWORD retval; - PGLOBAL32_INTERN pintern; + DWORD retval; + PGLOBAL32_INTERN pintern; - if(ISPOINTER(hmem)) - { - retval=0; - } - else - { - RtlLockHeap(GetProcessHeap()); - pintern=HANDLE_TO_INTERN(hmem); - if(pintern->Magic==MAGIC_GLOBAL_USED) - { - retval=pintern->LockCount + (pintern->Flags<<8); - if(pintern->Pointer==0) - retval|= GMEM_DISCARDED; - } - else - { - WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); - SetLastError(ERROR_INVALID_HANDLE); - retval = GMEM_INVALID_HANDLE; - } - RtlUnlockHeap(GetProcessHeap()); - } - return retval; + if (ISPOINTER( hmem )) + { + retval = 0; + } + else + { + RtlLockHeap( GetProcessHeap() ); + pintern = HANDLE_TO_INTERN( hmem ); + if (pintern->Magic == MAGIC_GLOBAL_USED) + { + retval = pintern->LockCount + (pintern->Flags << 8); + if (pintern->Pointer == 0) retval |= GMEM_DISCARDED; + } + else + { + WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic ); + SetLastError( ERROR_INVALID_HANDLE ); + retval = GMEM_INVALID_HANDLE; + } + RtlUnlockHeap( GetProcessHeap() ); + } + return retval; } -- 2.35.1

1 3