December 2020 - Wine-commits

Alex Henrie : ntdll: Remove unnecessary call to strlen from get_dos_device.
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: wine Branch: master Commit: 7c61b303eb9837c738253c1d458526f2175f1fd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c61b303eb9837c738253c1d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 10 22:18:18 2020 -0700 ntdll: Remove unnecessary call to strlen from get_dos_device. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 6d6edfe8926..a4c6bf4a137 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2812,7 +2812,6 @@ static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, char **unix_na if (!new_name) break; free( unix_name ); unix_name = new_name; - unix_len = strlen(unix_name) + 1; dev = NULL; /* last try */ } free( unix_name );

1 0

Alexandre Julliard : Release 6.0-rc2.
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: wine Branch: master Commit: 3acb0b3326c4120ea0c4c6076bd03c9cfe82c744 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3acb0b3326c4120ea0c4c607… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 22:04:39 2020 +0100 Release 6.0-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 746 ++++++++++++-------------------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 155 insertions(+), 611 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3acb0b3326c4120ea0c4…

1 0

Tag wine-6.0-rc2 : Alexandre Julliard : Release 6.0-rc2
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: wine Branch: refs/tags/wine-6.0-rc2 Tag: 8beb50333b27ea4b35ea1fb08b58ccbdb29eb1c8 URL: https://source.winehq.org/git/wine.git/?a=tag;h=8beb50333b27ea4b35ea1fb08b5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 22:04:39 2020 +0100 Release 6.0-rc2

1 0

Julian Rüger : German translation for release 5.22.
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: website Branch: master Commit: 5b1206e974b8fb7044db27dde46759a2544fb851 URL: https://source.winehq.org/git/website.git/?a=commit;h=5b1206e974b8fb7044db2… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 11 14:18:17 2020 +0100 German translation for release 5.22. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020112001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2020112001.xml b/news/de/2020112001.xml new file mode 100644 index 00000000..a49e67bf --- /dev/null +++ b/news/de/2020112001.xml @@ -0,0 +1,16 @@ +<news> +<date>20. November 2020</date> +<title>Wine 5.22 freigegeben</title> +<body> + Die Entwicklungsversion 5.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>C-Laufzeitbibliotheken nach PE konvertiert.</li> + <li>Fontconfig-Cache sorgt für schnelleren Start.</li> + <li>Verbesserungen beim Abspielen von Videos.</li> + <li>Unterstützung der 3DES-Verschlüsselung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.22.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.0-rc1.
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: website Branch: master Commit: 27792e6cac50ffc945c38963138391cf0483d07a URL: https://source.winehq.org/git/website.git/?a=commit;h=27792e6cac50ffc945c38… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 11 14:23:57 2020 +0100 German translation for release 6.0-rc1. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020120401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020120401.xml b/news/de/2020120401.xml new file mode 100644 index 00000000..8ba600b6 --- /dev/null +++ b/news/de/2020120401.xml @@ -0,0 +1,17 @@ +<news> +<date>4. Dezember 2020</date> +<title>Wine 6.0-rc1 freigegeben</title> +<body> + Die Entwicklungsversion 6.0-rc1 von Wine ist jetzt verfügbar. + Dies ist der erste Release Candidate des bevorstehenden Wine 6.0. Hiermit beginnt der jährliche Code-Freeze. Wir bitten Sie, dieses Release ausführlich zu testen, um uns zu helfen Wine 6.0 so gut wie möglich zu machen. + <a href="{$root}/announce/6.0-rc1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Update der Gecko-Engine.</li> + <li>WindowsCodecs und QCap-Bibliotheken nach PE konvertiert.</li> + <li>Schnellere Font-Initialisierung beim Prozessstart.</li> + <li>Unterstützung von Named-Pipes mit leerem Namen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Jeff Smith : gdiplus/tests: Use wide-char string literals for font names.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: de0497df87db55e0262c8600e2f0164e9861db9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=de0497df87db55e0262c8600… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Dec 8 19:40:09 2020 -0600 gdiplus/tests: Use wide-char string literals for font names. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 43 +++++++++++++++++++------------------------ dlls/gdiplus/tests/graphics.c | 15 +++++---------- 2 files changed, 24 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de0497df87db55e0262c…

1 0

Jeff Smith : gdiplus/tests: Use wide-char string literals for file names.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: 796550cc72ce50b9af04bbec973576dccc5e0c7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=796550cc72ce50b9af04bbec… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Dec 8 19:40:10 2020 -0600 gdiplus/tests: Use wide-char string literals for file names. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 3 +-- dlls/gdiplus/tests/image.c | 13 ++++++------- dlls/gdiplus/tests/metafile.c | 9 ++++----- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 2fcdb3a37da..0d7254f255e 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -69,7 +69,6 @@ static void _delete_testfontfile(const WCHAR *filename, int line) static void test_long_name(void) { WCHAR path[MAX_PATH]; - static const WCHAR path_longname[] = {'w','i','n','e','_','l','o','n','g','n','a','m','e','.','t','t','f',0}; GpStatus stat; GpFontCollection *fonts; INT num_families; @@ -80,7 +79,7 @@ static void test_long_name(void) stat = GdipNewPrivateFontCollection(&fonts); ok(stat == Ok, "GdipNewPrivateFontCollection failed: %d\n", stat); - create_testfontfile(path_longname, 1, path); + create_testfontfile(L"wine_longname.ttf", 1, path); stat = GdipPrivateAddFontFile(fonts, path); ok(stat == Ok, "GdipPrivateAddFontFile failed: %d\n", stat); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 93729650de8..c1f3b126a79 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -417,7 +417,6 @@ static void test_LoadingImages(void) GpStatus stat; GpBitmap *bm; GpImage *img; - static const WCHAR nonexistentW[] = {'n','o','n','e','x','i','s','t','e','n','t',0}; stat = GdipCreateBitmapFromFile(0, 0); expect(InvalidParameter, stat); @@ -428,7 +427,7 @@ static void test_LoadingImages(void) ok(bm == (GpBitmap *)0xdeadbeef, "returned %p\n", bm); bm = (GpBitmap *)0xdeadbeef; - stat = GdipCreateBitmapFromFile(nonexistentW, &bm); + stat = GdipCreateBitmapFromFile(L"nonexistent", &bm); todo_wine expect(InvalidParameter, stat); ok(!bm, "returned %p\n", bm); @@ -441,7 +440,7 @@ static void test_LoadingImages(void) ok(img == (GpImage *)0xdeadbeef, "returned %p\n", img); img = (GpImage *)0xdeadbeef; - stat = GdipLoadImageFromFile(nonexistentW, &img); + stat = GdipLoadImageFromFile(L"nonexistent", &img); todo_wine expect(OutOfMemory, stat); ok(!img, "returned %p\n", img); @@ -454,7 +453,7 @@ static void test_LoadingImages(void) ok(img == (GpImage *)0xdeadbeef, "returned %p\n", img); img = (GpImage *)0xdeadbeef; - stat = GdipLoadImageFromFileICM(nonexistentW, &img); + stat = GdipLoadImageFromFileICM(L"nonexistent", &img); todo_wine expect(OutOfMemory, stat); ok(!img, "returned %p\n", img); } @@ -469,7 +468,7 @@ static void test_SavingImages(void) REAL w, h; ImageCodecInfo *codecs; static const CHAR filenameA[] = "a.bmp"; - static const WCHAR filename[] = { 'a','.','b','m','p',0 }; + static const WCHAR filename[] = L"a.bmp"; codecs = NULL; @@ -536,8 +535,8 @@ static void test_SavingMultiPageTiff(void) UINT frame_count; static const CHAR filename1A[] = "1.tif"; static const CHAR filename2A[] = "2.tif"; - static const WCHAR filename1[] = { '1','.','t','i','f',0 }; - static const WCHAR filename2[] = { '2','.','t','i','f',0 }; + static const WCHAR filename1[] = L"1.tif"; + static const WCHAR filename2[] = L"2.tif"; static const WCHAR tiff_mimetype[] = { 'i','m','a','g','e','/','t','i','f','f',0 }; params.Count = 1; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 33fff3f98cf..eaad4acdc69 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2824,7 +2824,6 @@ static void test_fillpath(void) { static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; - static const WCHAR winetestemfW[] = {'w','i','n','e','t','e','s','t','.','e','m','f',0}; GpMetafile *metafile; GpGraphics *graphics; @@ -2870,7 +2869,7 @@ static void test_fillpath(void) check_emfplus(hemf, fill_path_records, "fill path"); /* write to disk */ - DeleteEnhMetaFile(CopyEnhMetaFileW(hemf, winetestemfW)); + DeleteEnhMetaFile(CopyEnhMetaFileW(hemf, L"winetest.emf")); DeleteEnhMetaFile(hemf); @@ -2878,15 +2877,15 @@ static void test_fillpath(void) expect(Ok, stat); /* should succeed when given path to an EMF */ - stat = GdipCreateMetafileFromWmfFile(winetestemfW, NULL, &metafile); + stat = GdipCreateMetafileFromWmfFile(L"winetest.emf", NULL, &metafile); expect(Ok, stat); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); - DeleteFileW(winetestemfW); + DeleteFileW(L"winetest.emf"); - stat = GdipCreateMetafileFromWmfFile(winetestemfW, NULL, &metafile); + stat = GdipCreateMetafileFromWmfFile(L"winetest.emf", NULL, &metafile); expect(GenericError, stat); }

1 0

Jeff Smith : gdiplus/tests: Use wide-char string literal for mimetype.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: ebc2d2a39ae9e99984a35d022168a252d1018738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc2d2a39ae9e99984a35d02… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Dec 8 19:40:11 2020 -0600 gdiplus/tests: Use wide-char string literal for mimetype. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index c1f3b126a79..2175c1748e0 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -537,7 +537,6 @@ static void test_SavingMultiPageTiff(void) static const CHAR filename2A[] = "2.tif"; static const WCHAR filename1[] = L"1.tif"; static const WCHAR filename2[] = L"2.tif"; - static const WCHAR tiff_mimetype[] = { 'i','m','a','g','e','/','t','i','f','f',0 }; params.Count = 1; params.Parameter[0].Guid = EncoderSaveFlag; @@ -549,7 +548,7 @@ static void test_SavingMultiPageTiff(void) expect(Ok, stat); stat = GdipCreateBitmapFromScan0(2 * WIDTH, 2 * HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm2); expect(Ok, stat); - result = get_encoder_clsid(tiff_mimetype, &format, &tiff_clsid); + result = get_encoder_clsid(L"image/tiff", &format, &tiff_clsid); ok(result, "getting TIFF encoding clsid failed"); if (!bm1 || !bm2 || !result)

1 0

Jeff Smith : gdiplus/tests: Use wide-char string literal for metafile description.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: cf405026cd3763654900807eba756053bbe93d9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf405026cd3763654900807e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Dec 8 19:40:12 2020 -0600 gdiplus/tests: Use wide-char string literal for metafile description. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index eaad4acdc69..3ce7a16d61a 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -31,6 +31,8 @@ static BOOL save_metafiles; static BOOL load_metafiles; +static const WCHAR description[] = L"winetest"; + typedef struct emfplus_record { DWORD record_type; @@ -378,7 +380,6 @@ static void test_empty(void) MetafileHeader header; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; UINT limit_dpi; hdc = CreateCompatibleDC(0); @@ -626,7 +627,6 @@ static void test_getdc(void) static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; static const GpPointF dst_points_half[3] = {{0.0,0.0},{50.0,0.0},{0.0,50.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; HBRUSH hbrush, holdbrush; GpBitmap *bitmap; ARGB color; @@ -784,7 +784,6 @@ static void test_emfonly(void) MetafileHeader header; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; HBRUSH hbrush, holdbrush; GpBitmap *bitmap; ARGB color; @@ -1081,7 +1080,6 @@ static void test_fillrect(void) static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; static const GpPointF dst_points_half[3] = {{0.0,0.0},{50.0,0.0},{0.0,50.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpBitmap *bitmap; ARGB color; GpBrush *brush; @@ -1194,7 +1192,6 @@ static void test_clear(void) HENHMETAFILE hemf; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{10.0,10.0},{20.0,10.0},{10.0,20.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpBitmap *bitmap; ARGB color; @@ -1266,7 +1263,6 @@ static void test_nullframerect(void) { GpMetafile *metafile; GpGraphics *graphics; HDC hdc, metafile_dc; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpBrush *brush; HBRUSH hbrush, holdbrush; GpRectF bounds; @@ -1459,7 +1455,6 @@ static void test_pagetransform(void) HDC hdc; static const GpRectF frame = {0.0, 0.0, 5.0, 5.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpBitmap *bitmap; ARGB color; GpBrush *brush; @@ -1664,7 +1659,6 @@ static void test_worldtransform(void) HDC hdc; static const GpRectF frame = {0.0, 0.0, 5.0, 5.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpBitmap *bitmap; ARGB color; GpBrush *brush; @@ -1921,7 +1915,6 @@ static void test_converttoemfplus(void) GpStatus (WINAPI *pGdipConvertToEmfPlus)( const GpGraphics *graphics, GpMetafile *metafile, BOOL *succ, EmfType emfType, const WCHAR *description, GpMetafile **outmetafile); static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpStatus stat; GpMetafile *metafile, *metafile2 = NULL, *emhmeta; GpGraphics *graphics; @@ -2001,7 +1994,6 @@ static void test_frameunit(void) GpGraphics *graphics; HDC hdc; static const GpRectF frame = {0.0, 0.0, 5.0, 5.0}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpUnit unit; REAL dpix, dpiy; GpRectF bounds; @@ -2097,7 +2089,6 @@ static void test_containers(void) HDC hdc; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GraphicsContainer state1, state2; GpRectF srcrect, dstrect; REAL dpix, dpiy; @@ -2293,7 +2284,6 @@ static void test_clipping(void) HDC hdc; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GraphicsState state; hdc = CreateCompatibleDC(0); @@ -2434,7 +2424,6 @@ static void test_gditransform(void) MetafileHeader header; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{40.0,0.0},{0.0,40.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; HBRUSH hbrush, holdbrush; GpBitmap *bitmap; ARGB color; @@ -2561,7 +2550,6 @@ static const emfplus_record draw_image_metafile_records[] = { static void test_drawimage(void) { - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpPointF dst_points[3] = {{10.0,10.0},{85.0,15.0},{10.0,80.0}}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; const ColorMatrix double_red = {{ @@ -2679,7 +2667,6 @@ static const emfplus_record properties_records[] = { static void test_properties(void) { - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; GpMetafile *metafile; @@ -2757,7 +2744,6 @@ static const emfplus_record draw_path_records[] = { static void test_drawpath(void) { - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; GpMetafile *metafile; @@ -2822,7 +2808,6 @@ static const emfplus_record fill_path_records[] = { static void test_fillpath(void) { - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; GpMetafile *metafile;

1 0

Jeff Smith : gdiplus/tests: Use wide-char string literals for test strings.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: 8eff23cc067f2b0549ffb5674c91415932511d35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eff23cc067f2b0549ffb567… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Dec 8 20:31:14 2020 -0600 gdiplus/tests: Use wide-char string literals for test strings. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 2 +- dlls/gdiplus/tests/graphics.c | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 0d7254f255e..32cd1ff2c4f 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -946,7 +946,7 @@ todo_wine static void test_font_transform(void) { - static const WCHAR string[] = { 'A',0 }; + static const WCHAR string[] = L"A"; GpStatus status; HDC hdc; LOGFONTA lf; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 9a09abcfc8b..2b1628f4e9c 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2279,7 +2279,7 @@ static void test_GdipDrawString(void) GpBrush *brush; LOGFONTA logfont; HDC hdc = GetDC( hwnd ); - static const WCHAR string[] = {'T','e','s','t',0}; + static const WCHAR string[] = L"Test"; static const PointF positions[4] = {{0,0}, {1,1}, {2,2}, {3,3}}; GpMatrix *matrix; @@ -3195,8 +3195,8 @@ static void test_string_functions(void) GpBrush *brush; ARGB color = 0xff000000; HDC hdc = GetDC( hwnd ); - const WCHAR teststring[] = {'M','M',' ','M','\n','M',0}; - const WCHAR teststring2[] = {'j',0}; + const WCHAR teststring[] = L"MM M\nM"; + const WCHAR teststring2[] = L"j"; REAL char_width, char_height; INT codepointsfitted, linesfilled; GpStringFormat *format; @@ -3743,7 +3743,7 @@ static void test_GdipMeasureString(void) { 200.0, 600.0, 1.0, UnitPixel }, { 200.0, 600.0, 2.0, UnitPixel }, }; - static const WCHAR string[] = { '1','2','3','4','5','6','7',0 }; + static const WCHAR string[] = L"1234567"; GpStatus status; GpGraphics *graphics; GpFontFamily *family; @@ -4257,7 +4257,7 @@ static void test_pen_thickness(void) */ static void test_font_height_scaling(void) { - static const WCHAR string[] = { '1','2','3','4','5','6','7',0 }; + static const WCHAR string[] = L"1234567"; HDC hdc; GpStringFormat *format; CharacterRange range = { 0, 7 }; @@ -4357,7 +4357,6 @@ static void test_font_height_scaling(void) /* UnitPixel = 2, UnitPoint = 3, UnitInch = 4, UnitDocument = 5, UnitMillimeter = 6 */ for (gfx_unit = 2; gfx_unit <= 6; gfx_unit++) { - static const WCHAR doubleW[2] = { 'W','W' }; RectF bounds_1, bounds_2; REAL margin, margin_y, font_height; int match; @@ -4397,12 +4396,12 @@ todo_wine /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_1); - status = GdipMeasureString(graphics, doubleW, 1, font, &rect, format, &bounds_1, NULL, NULL); + status = GdipMeasureString(graphics, L"W", 1, font, &rect, format, &bounds_1, NULL, NULL); expect(Ok, status); /* bounds.width of 2 identical glyphs: [margin]+[width]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_2); - status = GdipMeasureString(graphics, doubleW, 2, font, &rect, format, &bounds_2, NULL, NULL); + status = GdipMeasureString(graphics, L"WW", 2, font, &rect, format, &bounds_2, NULL, NULL); expect(Ok, status); /* margin = [bounds.width of 1] - [bounds.width of 2] / 2*/ @@ -4444,8 +4443,8 @@ cleanup: static void test_measure_string(void) { - static const WCHAR string[] = { 'A','0','1',0 }; - static const WCHAR string2[] = { 'M',' ','M','M',0 }; + static const WCHAR string[] = L"A01"; + static const WCHAR string2[] = L"M MM"; HDC hdc; GpStringFormat *format, *format_no_wrap; CharacterRange range; @@ -4915,7 +4914,6 @@ todo_wine static void test_measured_extra_space(void) { - static const WCHAR string[2] = { 'W','W' }; GpStringFormat *format; HDC hdc; GpGraphics *graphics; @@ -4959,12 +4957,12 @@ static void test_measured_extra_space(void) /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_1); - status = GdipMeasureString(graphics, string, 1, font, &rect, format, &bounds_1, NULL, NULL); + status = GdipMeasureString(graphics, L"W", 1, font, &rect, format, &bounds_1, NULL, NULL); expect(Ok, status); /* bounds.width of 2 identical glyphs: [margin]+[width]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_2); - status = GdipMeasureString(graphics, string, 2, font, &rect, format, &bounds_2, NULL, NULL); + status = GdipMeasureString(graphics, L"WW", 2, font, &rect, format, &bounds_2, NULL, NULL); expect(Ok, status); /* margin = [bounds.width of 1] - [bounds.width of 2] / 2*/

1 0