July 2020 - Wine-devel - list.winehq.org

[PATCH 6/7] windowscodecs/tests: Add tests for cube maps.
by Ziqing Hui 20 Jul '20

20 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 98 ++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 27 deletions(-)

2 1

[PATCH 4/7] windowscodecs: Introduce is_compressed(). And fix some format checks.
by Ziqing Hui 20 Jul '20

20 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 37 ++++++++++++++++++++++------ dlls/windowscodecs/tests/ddsformat.c | 5 ++-- 2 files changed, 31 insertions(+), 11 deletions(-)

2 1

[PATCH 3/7] windowscodecs/tests: Add tests for DDS images with fourCC which are also uncompressed.
by Ziqing Hui 20 Jul '20

20 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 75 ++++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 9 deletions(-)

2 1

[PATCH 2/7] windowscodecs: Add more supported DXGI formats for DDS decoder. And return the actual formats for uncompressed DDS images.
by Ziqing Hui 20 Jul '20

20 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 80 ++++++++++++++++++++-------- dlls/windowscodecs/tests/ddsformat.c | 16 ++++-- 2 files changed, 70 insertions(+), 26 deletions(-)

2 1

[PATCH 1/7] windowscodecs/tests: Add more RGB images for DDS tests.
by Ziqing Hui 20 Jul '20

20 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 164 +++++++++++++++++---------- 1 file changed, 106 insertions(+), 58 deletions(-)

2 1

[PATCH 1/2] gdiplus/tests: Add metafile unknown font deserialize test.
by Shawn M. Chapla 20 Jul '20

20 Jul '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/Makefile.in | 3 +- dlls/gdiplus/tests/metafile.c | 118 ++++++++++++++++++++++++++ dlls/gdiplus/tests/resource.rc | 3 + dlls/gdiplus/tests/wine_testfont0.sfd | 69 +++++++++++++++ dlls/gdiplus/tests/wine_testfont0.ttf | Bin 0 -> 1688 bytes 5 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 dlls/gdiplus/tests/wine_testfont0.sfd create mode 100644 dlls/gdiplus/tests/wine_testfont0.ttf diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index a245a48b6d..ef3f26d908 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -18,4 +18,5 @@ C_SRCS = \ RC_SRCS = resource.rc FONT_SRCS = \ - wine_longname.sfd + wine_longname.sfd \ + wine_testfont0.sfd diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 371a3c21b4..9fa60098e6 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3057,6 +3057,123 @@ static void test_drawdriverstring(void) GdipDisposeImage((GpImage*)metafile); } +static const emfplus_record unknownfontdecode_records[] = { + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypeFont << 8, 0, 1 }, + { EmfPlusRecordTypeDrawDriverString, 0x8000, 0, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_unknownfontdecode(void) +{ + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const PointF pos = {10.0,30.0}; + static const INT testfont0_resnum = 2; + + BOOL rval; + DWORD written, ressize; + GpBitmap *bitmap; + GpBrush *brush; + GpFont *font; + GpFontCollection *fonts; + GpFontFamily *family; + GpGraphics *graphics; + GpMetafile *metafile; + GpStatus stat; + HANDLE file; + HDC hdc; + HRSRC res; + INT fontscount; + WCHAR path[MAX_PATH]; + void *buf; + + /* Create a custom font from a resource. */ + GetTempPathW(MAX_PATH, path); + lstrcatW(path, L"wine_testfont0.ttf"); + + file = CreateFileW(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", + wine_dbgstr_w(path), GetLastError()); + + res = FindResourceA(GetModuleHandleA(NULL), MAKEINTRESOURCEA(testfont0_resnum), + (LPCSTR)RT_RCDATA); + ok(res != 0, "couldn't find resource\n"); + + buf = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + ressize = SizeofResource(GetModuleHandleA(NULL), res); + + WriteFile(file, buf, ressize, &written, NULL); + expect(ressize, written); + + CloseHandle(file); + + stat = GdipNewPrivateFontCollection(&fonts); + expect(Ok, stat); + + stat = GdipPrivateAddFontFile(fonts, path); + expect(Ok, stat); + + stat = GdipGetFontCollectionFamilyCount(fonts, &fontscount); + expect(Ok, stat); + expect(1, fontscount); + + stat = GdipGetFontCollectionFamilyList(fonts, fontscount, &family, &fontscount); + expect(Ok, stat); + + stat = GdipCreateFont(family, 16.0, FontStyleRegular, UnitPixel, &font); + expect(Ok, stat); + + /* Start metafile recording. */ + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, + L"winetest", &metafile); + expect(Ok, stat); + DeleteDC(hdc); + hdc = NULL; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + /* Write something with the custom font so that it is encoded. */ + stat = GdipDrawDriverString(graphics, L"Test", 4, font, brush, &pos, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL); + expect(Ok, stat); + + /* Delete the custom font so that it is not present during playback. */ + GdipDeleteFont(font); + GdipDeletePrivateFontCollection(&fonts); + rval = DeleteFileW(path); + expect(TRUE, rval); + + GdipDeleteGraphics(graphics); + graphics = NULL; + + check_metafile(metafile, unknownfontdecode_records, "unknownfontdecode metafile", dst_points, + &frame, UnitPixel); + sync_metafile(&metafile, "unknownfontdecode.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, unknownfontdecode_records, "unknownfontdecode playback", + dst_points, &frame, UnitPixel); + + GdipDeleteGraphics(graphics); + GdipDeleteBrush(brush); + GdipDisposeImage((GpImage*)bitmap); + GdipDisposeImage((GpImage*)metafile); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3107,6 +3224,7 @@ START_TEST(metafile) test_fillpath(); test_restoredc(); test_drawdriverstring(); + test_unknownfontdecode(); GdiplusShutdown(gdiplusToken); } diff --git a/dlls/gdiplus/tests/resource.rc b/dlls/gdiplus/tests/resource.rc index d7d915ce00..2db8d6359e 100644 --- a/dlls/gdiplus/tests/resource.rc +++ b/dlls/gdiplus/tests/resource.rc @@ -20,3 +20,6 @@ /* @makedep: wine_longname.ttf */ 1 RCDATA wine_longname.ttf + +/* @makedep: wine_testfont0.ttf */ +2 RCDATA wine_testfont0.ttf diff --git a/dlls/gdiplus/tests/wine_testfont0.sfd b/dlls/gdiplus/tests/wine_testfont0.sfd new file mode 100644 index 0000000000..ba99b9f99b --- /dev/null +++ b/dlls/gdiplus/tests/wine_testfont0.sfd @@ -0,0 +1,69 @@ +SplineFontDB: 3.2 +FontName: winegdiptestfont0 +FullName: Wine GDI+ Test Font 0 +FamilyName: winegdiptestfont +Weight: Regular +Copyright: Copyright (c) 2020, Shawn M. Chapla +UComments: "2020-7-15: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -100 +UnderlineWidth: 50 +Ascent: 800 +Descent: 200 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 445 409452897 2998051] +StyleMap: 0x0000 +FSType: 0 +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1594833132 +ModificationTime: 1594833348 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 90 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 0 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: uni0000 +Encoding: 0 0 0 +Width: 2977 +VWidth: 0 +Flags: HWO +LayerCount: 2 +Fore +SplineSet +247 690 m 5 + 748 690 l 5 + 748 72 l 5 + 247 72 l 5 + 247 690 l 5 +EndSplineSet +Validated: 1 +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdiplus/tests/wine_testfont0.ttf b/dlls/gdiplus/tests/wine_testfont0.ttf new file mode 100644 index 0000000000000000000000000000000000000000..227c2251432e6abd1442a5569904032a078103bc GIT binary patch literal 1688 zcmds2PiPZa82`PQN!k*v1{FQ@@J5BLt&NlTr?uuFwoU7ytkABC7dx9yGJ$k5B+<5_ z;K_riD5wW7MZ}XJHn6Y@%kD|)S(a)y8#9)!Jgr5?2?YWMeM#wc14ufFzs(a)Av)x-Z$^P zKmcgRdFYtP<;F*^O+5C2_*qIjh6jgo*o2MbClvqV*sjb^XWWN?aLG^Pr)(c<^?T(1 zA|1+~u1lEOETC_p-YD8Ne`SS{5kF48wOF1ly!m5jg!=8|eb=!kx7^q~OuR(e=TZ=R zow&<bO26Hms?TiwS1^`%M1D=VlDE-^pXuL0zIDo;@iC13)H5ceXHPj7etq0d{dGXQ z?pJE{x$)k=nZJ|z6x3cxzn#BqoLrZEiG;pL37+oxuN<z=2Vv54No$aAg{Gt&^a&&< z61NqrEd`Mj{4n%DqBnh%rwC*RnO6-Xaa&wPjNTWu-^pJJSMdyKL2C`Mw!rR-=}2K{ zlHZ3zmn(fZ5mXY?)HIb4tjr`WhZU-x2h<T&nkC0wpaTXZSA&0w2ft4^ht(2`_{ZR? zvSt^Qp&Ef-2*2YwILGMXdFx{bOm4eNyTvZHAT=+rE8A!>@FFuGkNuNv=o%sBbtR4| zaib+J-ewzY-;2!dq?!C-cXFF4+7=fUv|H~ArpD_au#A!5r14vAFq7u8c=<k|HQwD+ zO>M{hW}mlVB*FsgaV5eU*E<o`d4}2|Y+#cpMmUD`VlKjQBza4D3Ji75a-<Loo`-UT zHSTmS!aDES-3S}#5(gq2gB0f?9LHAi00XGN$1JKSp$HdsM(ji$JGf?G1+<fRj5-_B z(a)Q6owD<nOY#AkjR7^wKO)l$)|%g+1`nXxj~PC4e<)1Dkn$pP2)%QTv14i66VOcMFb z<)Fs7z#2TRm(a)auvakAvsom#z6(a)hGu^|6F9C)+*f{rq8eli)%mWSQJ?DK^eqhbW=7S z1($4B7+yB*)7Xn1^pZYo5jm#IRjNftW>S{ym&aI&93DK}Eyr1mRBEZ@>AgL(a)J!*gW zhOAgM8gP^~R(a)s75P@$^NLOR%&LXrkfwN|Ql(z4Pi%d#l>S`S&*=Ut>IdJ9*6;f7ax r1E?2T%PFtKBs5nxd|T8h4aXY(ju?b0j*^A)V1DxI{h!L{(|7oPiZ$vM literal 0 HcmV?d00001 -- 2.27.0

2 3

[PATCH resend 1/2] comctl32: Don't redraw the Combo Box when dropped down if it has an editbox.
by Gabriel Ivăncescu 19 Jul '20

19 Jul '20

Some applications subclass the combo box and handle WM_ERASEBKGND themselves, without using WS_CLIPCHILDREN. This causes them to erase over the editbox child. There's no reason to redraw it in this case since the editbox is supposed to cover it, anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22260 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 765fc63..c3de4f1 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1007,7 +1007,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) SWP_NOACTIVATE | SWP_SHOWWINDOW ); - if( !(lphc->wState & CBF_NOREDRAW) ) + if( !(lphc->wState & (CBF_NOREDRAW | CBF_EDIT)) ) RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); -- 2.21.0

3 6

[PATCH 4/4] winetest: Check GetTokenInformation() return value.
by Serge Gautherie 19 Jul '20

19 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- programs/winetest/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 1731850..df1b371 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -232,8 +232,12 @@ static int running_as_admin (void) } /* Get the group info from the token */ - groups_size = 0; - GetTokenInformation(token, TokenGroups, NULL, 0, &groups_size); + if (GetTokenInformation(token, TokenGroups, NULL, 0, &groups_size) || + GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + FreeSid(administrators); + return -1; + } groups = heap_alloc(groups_size); if (groups == NULL) { -- 2.10.0.windows.1

1 0

[PATCH 3/4] wineboot: Check GetTokenInformation() return value.
by Serge Gautherie 19 Jul '20

19 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- programs/wineboot/wineboot.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 21be0f5..1d8253e 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1327,7 +1327,12 @@ static void update_user_profile(void) return; size = sizeof(token_buf); - GetTokenInformation(token, TokenUser, token_buf, size, &size); + if (!GetTokenInformation(token, TokenUser, token_buf, size, &size)) + { + CloseHandle(token); + return; + } + CloseHandle(token); ConvertSidToStringSidW(((TOKEN_USER *)token_buf)->User.Sid, &sid); -- 2.10.0.windows.1

1 0

[PATCH 2/4] userenv: Check GetTokenInformation() return value.
by Serge Gautherie 19 Jul '20

19 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/userenv/userenv_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 045bac0..e53e0fe 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -433,8 +433,11 @@ BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, return FALSE; } - len = 0; - GetTokenInformation( hToken, TokenUser, NULL, 0, &len ); + if (GetTokenInformation( hToken, TokenUser, NULL, 0, &len )) + { + SetLastError( ERROR_SUCCESS ); + return FALSE; + } if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; if (!(t = HeapAlloc( GetProcessHeap(), 0, len ))) return FALSE; if (!GetTokenInformation( hToken, TokenUser, t, len, &len )) goto done; -- 2.10.0.windows.1

1 0