wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Francois Gouget : kernelbase: Fix an ASCII / ANSI mixup in a comment.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: d10fe185ffa8576466229a69c0068e01dd402f5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d10fe185ffa8576466229a69… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:15:18 2021 +0200 kernelbase: Fix an ASCII / ANSI mixup in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index a8f0643e8bf..5f777e0f752 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -1651,7 +1651,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO if (status && status != STATUS_BUFFER_OVERFLOW) goto done; /* we need to fetch the contents for a string type even if not requested, - * because we need to compute the length of the ASCII string. */ + * because we need to compute the length of the ANSI string. */ if (data || is_string(info->Type)) { /* retry with a dynamically allocated buffer */ @@ -2106,7 +2106,7 @@ LSTATUS WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_c buffer, total_size, &total_size ); /* we need to fetch the contents for a string type even if not requested, - * because we need to compute the length of the ASCII string. */ + * because we need to compute the length of the ANSI string. */ /* retry with a dynamically allocated buffer */ while (status == STATUS_BUFFER_OVERFLOW)

1 0

Francois Gouget : kernel32/tests: Remove the macros from the GetTimeFormatEx() tests.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 2ee13997864d3a9c8ae7fcda288b9c2a1f6a489e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ee13997864d3a9c8ae7fcda… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 24 10:14:57 2021 +0200 kernel32/tests: Remove the macros from the GetTimeFormatEx() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 247 +++++++++++++++++++++---------------------- 1 file changed, 123 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2ee13997864d3a9c8ae7…

1 0

Francois Gouget : kernel32/tests: Remove the macros from the GetDateFormatA() tests.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: f0ec42c8797cbd4e5e5f43862fccf077eef73d77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0ec42c8797cbd4e5e5f4386… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 24 10:14:25 2021 +0200 kernel32/tests: Remove the macros from the GetDateFormatA() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 132 +++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 79 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e309dbe0cfd..13396ef1e78 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -818,62 +818,57 @@ static void test_GetDateFormatA(void) SYSTEMTIME curtime; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); LCID lcid_ru = MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_NEUTRAL), SORT_DEFAULT); - char buffer[BUFFER_SIZE], input[BUFFER_SIZE], Expected[BUFFER_SIZE]; + char buffer[BUFFER_SIZE], Expected[BUFFER_SIZE]; char short_day[10], month[10], genitive_month[10]; - memset(&curtime, 2, sizeof(SYSTEMTIME)); /* Invalid time */ - STRINGSA("ddd',' MMM dd yy",""); SetLastError(0xdeadbeef); - ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Invalid time */ + memset(&curtime, 2, sizeof(SYSTEMTIME)); + strcpy(buffer, "pristine"); + ret = GetDateFormatA(lcid, 0, &curtime, "ddd',' MMM dd yy", buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); + + /* Simple case */ curtime.wYear = 2002; curtime.wMonth = 5; curtime.wDay = 4; curtime.wDayOfWeek = 3; - STRINGSA("ddd',' MMM dd yy","Sat, May 04 02"); /* Simple case */ - ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetDateFormatA(lcid, 0, &curtime, "ddd',' MMM dd yy", buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "Sat, May 04 02"); /* Same as above but with LOCALE_NOUSEROVERRIDE */ - STRINGSA("ddd',' MMM dd yy",""); /* Simple case */ + strcpy(buffer, "pristine"); + ret = GetDateFormatA(lcid, NUO, &curtime, "ddd',' MMM dd yy", buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_FLAGS); SetLastError(0xdeadbeef); - ret = GetDateFormatA(lcid, NUO, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - EXPECT_EQA; - STRINGSA("ddd',' MMM dd yy","Sat, May 04 02"); /* Format containing "'" */ - ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Format containing "'" */ + ret = GetDateFormatA(lcid, 0, &curtime, "ddd',' MMM dd yy", buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "Sat, May 04 02"); - curtime.wHour = 36; /* Invalid */ - STRINGSA("ddd',' MMM dd ''''yy","Sat, May 04 '02"); /* Invalid time */ - ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Invalid time */ + curtime.wHour = 36; + ret = GetDateFormatA(lcid, 0, &curtime, "ddd',' MMM dd ''''yy", buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "Sat, May 04 '02"); - STRINGSA("ddd',' MMM dd ''''yy",""); /* Get size only */ - ret = GetDateFormatA(lcid, 0, &curtime, input, NULL, 0); - ok(ret == 16, "Expected ret == 16, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + /* Get size only */ + ret = GetDateFormatA(lcid, 0, &curtime, "ddd',' MMM dd ''''yy", NULL, 0); + expect_str(ret, NULL, "Sat, May 04 '02"); - STRINGSA("ddd',' MMM dd ''''yy",""); /* Buffer too small */ + /* Buffer too small */ + strcpy(buffer, "pristine"); + ret = GetDateFormatA(lcid, 0, &curtime, "ddd", buffer, 2); + /* there is no guarantee on the buffer content, see GetTimeFormatA() */ + expect_err(ret, NULL, ERROR_INSUFFICIENT_BUFFER); SetLastError(0xdeadbeef); - ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, 2); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - STRINGSA("ddd',' MMM dd ''''yy","5/4/2002"); /* Default to DATE_SHORTDATE */ + /* Default to DATE_SHORTDATE */ ret = GetDateFormatA(lcid, NUO, &curtime, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - if (strncmp(buffer, Expected, strlen(Expected)) && strncmp(buffer, "5/4/02", strlen(Expected)) != 0) - ok (0, "Expected '%s' or '5/4/02', got '%s'\n", Expected, buffer); + expect_str(ret, buffer, "5/4/2002"); - SetLastError(0xdeadbeef); buffer[0] = '\0'; /* DATE_LONGDATE */ + /* DATE_LONGDATE */ ret = GetDateFormatA(lcid, NUO|DATE_LONGDATE, &curtime, NULL, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); ok(strcmp(buffer, "Saturday, May 04, 2002") == 0 || @@ -882,21 +877,16 @@ static void test_GetDateFormatA(void) /* test for expected DATE_YEARMONTH behavior with null format */ /* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */ - STRINGSA("ddd',' MMM dd ''''yy", ""); /* DATE_YEARMONTH */ + strcpy(buffer, "pristine"); + ret = GetDateFormatA(lcid, NUO|DATE_YEARMONTH, &curtime, "ddd',' MMM dd ''''yy", buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_FLAGS); SetLastError(0xdeadbeef); - ret = GetDateFormatA(lcid, NUO|DATE_YEARMONTH, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - EXPECT_EQA; /* Test that using invalid DATE_* flags results in the correct error */ /* and return values */ - STRINGSA("m/d/y", ""); /* Invalid flags */ + ret = GetDateFormatA(lcid, DATE_YEARMONTH|DATE_SHORTDATE|DATE_LONGDATE, &curtime, "m/d/y", buffer, ARRAY_SIZE(buffer)); + expect_err(ret, NULL, ERROR_INVALID_FLAGS); SetLastError(0xdeadbeef); - ret = GetDateFormatA(lcid, DATE_YEARMONTH|DATE_SHORTDATE|DATE_LONGDATE, &curtime, input, - buffer, ARRAY_SIZE(buffer)); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); ret = GetDateFormatA(lcid_ru, 0, &curtime, "ddMMMM", buffer, ARRAY_SIZE(buffer)); if (!ret) @@ -916,54 +906,38 @@ static void test_GetDateFormatA(void) ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); strcpy(short_day, buffer); - STRINGSA("dd MMMMddd dd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "dd MMMMddd dd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "04 %s%s 04", genitive_month, short_day); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("MMMMddd dd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "MMMMddd dd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "%s%s 04", month, short_day); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("MMMMddd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "MMMMddd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "%s%s", month, short_day); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("MMMMdd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "MMMMdd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "%s04", genitive_month); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("MMMMdd ddd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "MMMMdd ddd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "%s04 %s", genitive_month, short_day); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("dd dddMMMM", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "dd dddMMMM", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "04 %s%s", short_day, month); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("dd dddMMMM ddd MMMMdd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "dd dddMMMM ddd MMMMdd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "04 %s%s %s %s04", short_day, month, short_day, genitive_month); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); /* with literal part */ - STRINGSA("ddd',' MMMM dd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "ddd',' MMMM dd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "%s, %s 04", short_day, genitive_month); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); } static void test_GetDateFormatEx(void)

1 0

Francois Gouget : kernel32/tests: Remove the macros from the GetNumberFormatA() tests.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 01309cc02020a235b9fa5fe7ccd7f4eefd30ae15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01309cc02020a235b9fa5fe7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 24 10:14:14 2021 +0200 kernel32/tests: Remove the macros from the GetNumberFormatA() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 207 ++++++++++++++++++------------------------- 1 file changed, 87 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01309cc02020a235b9fa…

1 0

Francois Gouget : kernel32/tests: Remove the macros from the GetCurrencyFormatA() tests.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: b8f1435a5302223cc37d0a4af10b412fc96fa51b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f1435a5302223cc37d0a4a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 24 10:13:47 2021 +0200 kernel32/tests: Remove the macros from the GetCurrencyFormatA() tests. Also simplify testing all the NegativeOrder values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 305 ++++++++++++++++--------------------------- 1 file changed, 110 insertions(+), 195 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b8f1435a5302223cc37d…

1 0

Zhiyi Zhang : uxtheme: Support more HiDPI properties.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 877d12f87913e58ceb3a437c127a423c0a26ad66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=877d12f87913e58ceb3a437c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 24 14:35:49 2021 +0800 uxtheme: Support more HiDPI properties. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 46 +++++++++++++++++++++++++++++++++++++--------- dlls/uxtheme/stylemap.c | 6 ++++++ include/tmschema.h | 6 ++++++ include/vssym32.h | 6 ++++++ 4 files changed, 55 insertions(+), 9 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 5b90f6b1fdc..521f9eb32a9 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -144,6 +144,24 @@ HRESULT WINAPI DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, return DrawThemeBackgroundEx(hTheme, hdc, iPartId, iStateId, pRect, &opts); } +/* Map integer 1..7 to TMT_MINDPI1..TMT_MINDPI7 */ +static int mindpi_index_to_property(int index) +{ + return index <= 5 ? TMT_MINDPI1 + index - 1 : TMT_MINDPI6 + index - 6; +} + +/* Map integer 1..7 to TMT_MINSIZE1..TMT_MINSIZE7 */ +static int minsize_index_to_property(int index) +{ + return index <= 5 ? TMT_MINSIZE1 + index - 1 : TMT_MINSIZE6 + index - 6; +} + +/* Map integer 1..7 to TMT_IMAGEFILE1..TMT_IMAGEFILE7 */ +static int imagefile_index_to_property(int index) +{ + return index <= 5 ? TMT_IMAGEFILE1 + index - 1 : TMT_IMAGEFILE6 + index - 6; +} + /*********************************************************************** * UXTHEME_SelectImage * @@ -171,16 +189,20 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, if(imageselecttype == IST_DPI) { int reqdpi = 0; int screendpi = GetDeviceCaps(hdc, LOGPIXELSX); - for(i=4; i>=0; i--) { + for (i = 7; i >= 1; i--) + { reqdpi = 0; - if(SUCCEEDED(GetThemeInt(hTheme, iPartId, iStateId, i + TMT_MINDPI1, &reqdpi))) { + if (SUCCEEDED(GetThemeInt(hTheme, iPartId, iStateId, mindpi_index_to_property(i), + &reqdpi))) + { if(reqdpi != 0 && screendpi >= reqdpi) { - TRACE("Using %d DPI, image %d\n", reqdpi, i + TMT_IMAGEFILE1); + TRACE("Using %d DPI, image %d\n", reqdpi, imagefile_index_to_property(i)); if (imageDpi) *imageDpi = reqdpi; - return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, i + TMT_IMAGEFILE1); + return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, + imagefile_index_to_property(i)); } } } @@ -190,11 +212,16 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, else if(imageselecttype == IST_SIZE) { POINT size = {pRect->right-pRect->left, pRect->bottom-pRect->top}; POINT reqsize; - for(i=4; i>=0; i--) { - PTHEME_PROPERTY fileProp = - MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, i + TMT_IMAGEFILE1); + for (i = 7; i >= 1; i--) + { + PTHEME_PROPERTY fileProp; + + fileProp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, + imagefile_index_to_property(i)); if (!fileProp) continue; - if(FAILED(GetThemePosition(hTheme, iPartId, iStateId, i + TMT_MINSIZE1, &reqsize))) { + if (FAILED(GetThemePosition(hTheme, iPartId, iStateId, minsize_index_to_property(i), + &reqsize))) + { /* fall back to size of Nth image */ WCHAR szPath[MAX_PATH]; int imagelayout = IL_HORIZONTAL; @@ -221,7 +248,8 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, } } if(reqsize.x <= size.x && reqsize.y <= size.y) { - TRACE("Using image size %dx%d, image %d\n", reqsize.x, reqsize.y, i + TMT_IMAGEFILE1); + TRACE("Using image size %dx%d, image %d\n", reqsize.x, reqsize.y, + imagefile_index_to_property(i)); return fileProp; } } diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 463c236df30..4fe254c1e7a 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -187,6 +187,8 @@ static const MSSTYLES_PROPERTY_MAP mapProperty[] = { {TMT_INT, TMT_MINDPI3, L"MINDPI3"}, {TMT_INT, TMT_MINDPI4, L"MINDPI4"}, {TMT_INT, TMT_MINDPI5, L"MINDPI5"}, + {TMT_INT, TMT_MINDPI6, L"MINDPI6"}, + {TMT_INT, TMT_MINDPI7, L"MINDPI7"}, {TMT_FONT, TMT_GLYPHFONT, L"GLYPHFONT"}, {TMT_FILENAME, TMT_IMAGEFILE, L"IMAGEFILE"}, {TMT_FILENAME, TMT_IMAGEFILE1, L"IMAGEFILE1"}, @@ -194,6 +196,8 @@ static const MSSTYLES_PROPERTY_MAP mapProperty[] = { {TMT_FILENAME, TMT_IMAGEFILE3, L"IMAGEFILE3"}, {TMT_FILENAME, TMT_IMAGEFILE4, L"IMAGEFILE4"}, {TMT_FILENAME, TMT_IMAGEFILE5, L"IMAGEFILE5"}, + {TMT_FILENAME, TMT_IMAGEFILE6, L"IMAGEFILE6"}, + {TMT_FILENAME, TMT_IMAGEFILE7, L"IMAGEFILE7"}, {TMT_FILENAME, TMT_STOCKIMAGEFILE, L"STOCKIMAGEFILE"}, {TMT_FILENAME, TMT_GLYPHIMAGEFILE, L"GLYPHIMAGEFILE"}, {TMT_STRING, TMT_TEXT, L"TEXT"}, @@ -206,6 +210,8 @@ static const MSSTYLES_PROPERTY_MAP mapProperty[] = { {TMT_POSITION, TMT_MINSIZE4, L"MINSIZE4"}, {TMT_POSITION, TMT_MINSIZE5, L"MINSIZE5"}, {TMT_POSITION, TMT_NORMALSIZE, L"NORMALSIZE"}, + {TMT_POSITION, TMT_MINSIZE6, L"MINSIZE6"}, + {TMT_POSITION, TMT_MINSIZE7, L"MINSIZE7"}, {TMT_MARGINS, TMT_SIZINGMARGINS, L"SIZINGMARGINS"}, {TMT_MARGINS, TMT_CONTENTMARGINS, L"CONTENTMARGINS"}, {TMT_MARGINS, TMT_CAPTIONMARGINS, L"CAPTIONMARGINS"}, diff --git a/include/tmschema.h b/include/tmschema.h index 2d2eccce11e..47eb146ebdc 100644 --- a/include/tmschema.h +++ b/include/tmschema.h @@ -322,6 +322,8 @@ BEGIN_TM_PROPS() TM_PROP(2422, TMT, MINDPI3, INT) TM_PROP(2423, TMT, MINDPI4, INT) TM_PROP(2424, TMT, MINDPI5, INT) + TM_PROP(2433, TMT, MINDPI6, INT) + TM_PROP(2434, TMT, MINDPI7, INT) /* Font rendering properties */ TM_PROP(2601, TMT, GLYPHFONT, FONT) @@ -335,6 +337,8 @@ BEGIN_TM_PROPS() TM_PROP(3006, TMT, IMAGEFILE5, FILENAME) TM_PROP(3007, TMT, STOCKIMAGEFILE, FILENAME) TM_PROP(3008, TMT, GLYPHIMAGEFILE, FILENAME) + TM_PROP(3009, TMT, IMAGEFILE6, FILENAME) + TM_PROP(3010, TMT, IMAGEFILE7, FILENAME) /* String rendering properties */ TM_PROP(3201, TMT, TEXT, STRING) @@ -349,6 +353,8 @@ BEGIN_TM_PROPS() TM_PROP(3407, TMT, MINSIZE4, POSITION) TM_PROP(3408, TMT, MINSIZE5, POSITION) TM_PROP(3409, TMT, NORMALSIZE, POSITION) + TM_PROP(3410, TMT, MINSIZE6, POSITION) + TM_PROP(3411, TMT, MINSIZE7, POSITION) /* Margin rendering properties */ TM_PROP(3601, TMT, SIZINGMARGINS, MARGINS) diff --git a/include/vssym32.h b/include/vssym32.h index 4e7c2f791d8..8685fb7f7f0 100644 --- a/include/vssym32.h +++ b/include/vssym32.h @@ -301,6 +301,8 @@ enum GLYPHFONTSIZINGTYPE { #define TMT_OPACITY 2430 #define TMT_COLORIZATIONCOLOR 2431 #define TMT_COLORIZATIONOPACITY 2432 +#define TMT_MINDPI6 2433 +#define TMT_MINDPI7 2434 #define TMT_GLYPHFONT 2601 #define TMT_IMAGEFILE 3001 #define TMT_IMAGEFILE1 3002 @@ -309,6 +311,8 @@ enum GLYPHFONTSIZINGTYPE { #define TMT_IMAGEFILE4 3005 #define TMT_IMAGEFILE5 3006 #define TMT_GLYPHIMAGEFILE 3008 +#define TMT_IMAGEFILE6 3009 +#define TMT_IMAGEFILE7 3010 #define TMT_TEXT 3201 #define TMT_CLASSICVALUE 3202 #define TMT_OFFSET 3401 @@ -320,6 +324,8 @@ enum GLYPHFONTSIZINGTYPE { #define TMT_MINSIZE4 3407 #define TMT_MINSIZE5 3408 #define TMT_NORMALSIZE 3409 +#define TMT_MINSIZE6 3410 +#define TMT_MINSIZE7 3411 #define TMT_SIZINGMARGINS 3601 #define TMT_CONTENTMARGINS 3602 #define TMT_CAPTIONMARGINS 3603

1 0

Zhiyi Zhang : uxtheme: Support TrueSizeStretchMark property.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 4b2777db4badd882b630f4d9aa2ce00c3c05d726 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b2777db4badd882b630f4d9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 24 14:35:26 2021 +0800 uxtheme: Support TrueSizeStretchMark property. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 866200f7fa8..5b90f6b1fdc 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -579,7 +579,7 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, { case TS_DRAW: { - int sizingType = ST_STRETCH, scalingType = TSST_NONE; + int sizingType = ST_STRETCH, scalingType = TSST_NONE, stretchMark = 0; POINT srcSize; srcSize.x = rcSrc.right - rcSrc.left; @@ -589,10 +589,13 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, if (sizingType == ST_TRUESIZE) { GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_TRUESIZESCALINGTYPE, &scalingType); + GetThemeInt(hTheme, iPartId, iStateId, TMT_TRUESIZESTRETCHMARK, &stretchMark); if (scalingType == TSST_DPI) { + /* Scale to DPI only if the destination DPI exceeds the source DPI by + * stretchMark percent */ dstDpi = GetDeviceCaps(hdc, LOGPIXELSY); - if (dstDpi && dstDpi != imageDpi) + if (dstDpi && dstDpi != imageDpi && MulDiv(100, dstDpi, imageDpi) >= stretchMark + 100) { srcSize.x = MulDiv(srcSize.x, dstDpi, imageDpi); srcSize.y = MulDiv(srcSize.y, dstDpi, imageDpi); @@ -620,19 +623,11 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, if (sizingType == ST_TRUESIZE) { - int truesizestretchmark = 100; - - /* Whatever TrueSizeStretchMark does - it does not seem to - * be what's outlined below. It appears as if native - * uxtheme always stretches if dest is smaller than source - * (ie as if TrueSizeStretchMark==100 with the code below) */ -#if 0 - /* Only stretch when target exceeds source by truesizestretchmark percent */ - GetThemeInt(hTheme, iPartId, iStateId, TMT_TRUESIZESTRETCHMARK, &truesizestretchmark); -#endif - if (scalingType == TSST_SIZE || dstSize.x < 0 || dstSize.y < 0 - || (MulDiv(srcSize.x, 100, dstSize.x) > truesizestretchmark - && MulDiv(srcSize.y, 100, dstSize.y) > truesizestretchmark)) + if ((dstSize.x < 0 || dstSize.y < 0) + || (dstSize.x < srcSize.x && dstSize.y < srcSize.y) + || (scalingType == TSST_SIZE + && MulDiv(100, dstSize.x, srcSize.x) >= stretchMark + 100 + && MulDiv(100, dstSize.y, srcSize.y) >= stretchMark + 100)) { *psz = dstSize; }

1 0

Zhiyi Zhang : uxtheme: Support TrueSizeScalingType property.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 0d96bf1f382e814ee845e20f495be7516a9aed53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d96bf1f382e814ee845e20f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 24 14:35:15 2021 +0800 uxtheme: Support TrueSizeScalingType property. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 88 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 424e08c4183..866200f7fa8 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -149,7 +149,8 @@ HRESULT WINAPI DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, * * Select the image to use */ -static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, BOOL glyph) +static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + const RECT *pRect, BOOL glyph, int *imageDpi) { PTHEME_PROPERTY tp; int imageselecttype = IST_NONE; @@ -160,6 +161,9 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, else image = TMT_IMAGEFILE; + if (imageDpi) + *imageDpi = 96; + if((tp=MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, image))) return tp; GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_IMAGESELECTTYPE, &imageselecttype); @@ -172,6 +176,10 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, if(SUCCEEDED(GetThemeInt(hTheme, iPartId, iStateId, i + TMT_MINDPI1, &reqdpi))) { if(reqdpi != 0 && screendpi >= reqdpi) { TRACE("Using %d DPI, image %d\n", reqdpi, i + TMT_IMAGEFILE1); + + if (imageDpi) + *imageDpi = reqdpi; + return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, i + TMT_IMAGEFILE1); } } @@ -228,15 +236,18 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, * * Load image for part/state */ -static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, BOOL glyph, - HBITMAP *hBmp, RECT *bmpRect, BOOL* hasImageAlpha) +static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + const RECT *pRect, BOOL glyph, HBITMAP *hBmp, RECT *bmpRect, + BOOL *hasImageAlpha, int *imageDpi) { int imagelayout = IL_HORIZONTAL; int imagecount = 1; int imagenum; BITMAP bmp; WCHAR szPath[MAX_PATH]; - PTHEME_PROPERTY tp = UXTHEME_SelectImage(hTheme, hdc, iPartId, iStateId, pRect, glyph); + PTHEME_PROPERTY tp; + + tp = UXTHEME_SelectImage(hTheme, hdc, iPartId, iStateId, pRect, glyph, imageDpi); if(!tp) { FIXME("Couldn't determine image for part/state %d/%d, invalid theme?\n", iPartId, iStateId); return E_PROP_ID_UNSUPPORTED; @@ -484,8 +495,8 @@ static HRESULT UXTHEME_DrawImageGlyph(HTHEME hTheme, HDC hdc, int iPartId, POINT topleft; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, TRUE, - &bmpSrc, &rcSrc, &hasAlpha); + hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, TRUE, &bmpSrc, &rcSrc, &hasAlpha, + NULL); if(FAILED(hr)) return hr; hdcSrc = CreateCompatibleDC(hdc); if(!hdcSrc) { @@ -554,30 +565,50 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, int iStateId, RECT *prc, THEMESIZE eSize, POINT *psz) { + int imageDpi, dstDpi; HRESULT hr = S_OK; HBITMAP bmpSrc; RECT rcSrc; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, prc, FALSE, - &bmpSrc, &rcSrc, &hasAlpha); + hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, prc, FALSE, &bmpSrc, &rcSrc, &hasAlpha, + &imageDpi); if (FAILED(hr)) return hr; switch (eSize) { case TS_DRAW: + { + int sizingType = ST_STRETCH, scalingType = TSST_NONE; + POINT srcSize; + + srcSize.x = rcSrc.right - rcSrc.left; + srcSize.y = rcSrc.bottom - rcSrc.top; + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_SIZINGTYPE, &sizingType); + if (sizingType == ST_TRUESIZE) + { + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_TRUESIZESCALINGTYPE, &scalingType); + if (scalingType == TSST_DPI) + { + dstDpi = GetDeviceCaps(hdc, LOGPIXELSY); + if (dstDpi && dstDpi != imageDpi) + { + srcSize.x = MulDiv(srcSize.x, dstDpi, imageDpi); + srcSize.y = MulDiv(srcSize.y, dstDpi, imageDpi); + } + } + } + *psz = srcSize; + if (prc != NULL) { POINT dstSize; - POINT srcSize; - int sizingtype = ST_STRETCH; BOOL uniformsizing = FALSE; dstSize.x = prc->right - prc->left; dstSize.y = prc->bottom - prc->top; - srcSize.x = rcSrc.right-rcSrc.left; - srcSize.y = rcSrc.bottom-rcSrc.top; - + GetThemeBool(hTheme, iPartId, iStateId, TMT_UNIFORMSIZING, &uniformsizing); if(uniformsizing) { /* Scale height and width equally */ @@ -586,9 +617,9 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, else dstSize.x = MulDiv (srcSize.x, dstSize.y, srcSize.y); } - - GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_SIZINGTYPE, &sizingtype); - if(sizingtype == ST_TRUESIZE) { + + if (sizingType == ST_TRUESIZE) + { int truesizestretchmark = 100; /* Whatever TrueSizeStretchMark does - it does not seem to @@ -599,13 +630,11 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, /* Only stretch when target exceeds source by truesizestretchmark percent */ GetThemeInt(hTheme, iPartId, iStateId, TMT_TRUESIZESTRETCHMARK, &truesizestretchmark); #endif - if(dstSize.x < 0 || dstSize.y < 0 || - (MulDiv(srcSize.x, 100, dstSize.x) > truesizestretchmark && - MulDiv(srcSize.y, 100, dstSize.y) > truesizestretchmark)) { - memcpy (psz, &dstSize, sizeof (SIZE)); - } - else { - memcpy (psz, &srcSize, sizeof (SIZE)); + if (scalingType == TSST_SIZE || dstSize.x < 0 || dstSize.y < 0 + || (MulDiv(srcSize.x, 100, dstSize.x) > truesizestretchmark + && MulDiv(srcSize.y, 100, dstSize.y) > truesizestretchmark)) + { + *psz = dstSize; } } else @@ -613,9 +642,10 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, psz->x = abs(dstSize.x); psz->y = abs(dstSize.y); } - break; } - /* else fall through */ + + break; + } case TS_MIN: /* FIXME: couldn't figure how native uxtheme computes min size */ case TS_TRUE: @@ -649,8 +679,8 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, COLORREF transparentcolor = 0; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, FALSE, - &bmpSrc, &rcSrc, &hasAlpha); + hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, FALSE, &bmpSrc, &rcSrc, &hasAlpha, + NULL); if(FAILED(hr)) return hr; hdcSrc = CreateCompatibleDC(hdc); if(!hdcSrc) { @@ -2078,8 +2108,8 @@ BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME hTheme, int iPartId, if (bgtype != BT_IMAGEFILE) return FALSE; - if(FAILED (UXTHEME_LoadImage (hTheme, 0, iPartId, iStateId, &rect, FALSE, - &bmpSrc, &rcSrc, &hasAlpha))) + if (FAILED(UXTHEME_LoadImage(hTheme, 0, iPartId, iStateId, &rect, FALSE, &bmpSrc, &rcSrc, + &hasAlpha, NULL))) return FALSE; get_transparency (hTheme, iPartId, iStateId, hasAlpha, &transparent,

1 0

Zhiyi Zhang : uxtheme: Remove useless calculation.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 399ebdf893723dbe795dff2231de680fb57cd0cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=399ebdf893723dbe795dff22… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 24 14:35:07 2021 +0800 uxtheme: Remove useless calculation. rcDst is not used after it is used for getting destination rectangle width and height. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index b8196b09966..424e08c4183 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -568,16 +568,13 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, case TS_DRAW: if (prc != NULL) { - RECT rcDst; POINT dstSize; POINT srcSize; int sizingtype = ST_STRETCH; BOOL uniformsizing = FALSE; - rcDst = *prc; - - dstSize.x = rcDst.right-rcDst.left; - dstSize.y = rcDst.bottom-rcDst.top; + dstSize.x = prc->right - prc->left; + dstSize.y = prc->bottom - prc->top; srcSize.x = rcSrc.right-rcSrc.left; srcSize.y = rcSrc.bottom-rcSrc.top; @@ -585,35 +582,15 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, if(uniformsizing) { /* Scale height and width equally */ if (dstSize.x*srcSize.y < dstSize.y*srcSize.x) - { dstSize.y = MulDiv (srcSize.y, dstSize.x, srcSize.x); - rcDst.bottom = rcDst.top + dstSize.y; - } else - { dstSize.x = MulDiv (srcSize.x, dstSize.y, srcSize.y); - rcDst.right = rcDst.left + dstSize.x; - } } GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_SIZINGTYPE, &sizingtype); if(sizingtype == ST_TRUESIZE) { int truesizestretchmark = 100; - - if(dstSize.x < 0 || dstSize.y < 0) { - BOOL mirrorimage = TRUE; - GetThemeBool(hTheme, iPartId, iStateId, TMT_MIRRORIMAGE, &mirrorimage); - if(mirrorimage) { - if(dstSize.x < 0) { - rcDst.left += dstSize.x; - rcDst.right += dstSize.x; - } - if(dstSize.y < 0) { - rcDst.top += dstSize.y; - rcDst.bottom += dstSize.y; - } - } - } + /* Whatever TrueSizeStretchMark does - it does not seem to * be what's outlined below. It appears as if native * uxtheme always stretches if dest is smaller than source

1 0

Daniel Lehman : kernelbase: Don't add a backslash to the second path if not needed.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: f33bf35d9a395a17e83b4bf512c5434368a8218e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f33bf35d9a395a17e83b4bf5… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 23 11:06:12 2021 +0800 kernelbase: Don't add a backslash to the second path if not needed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 7 ++++--- dlls/kernelbase/tests/path.c | 18 +++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 9387705e963..a9105341fad 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -401,7 +401,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl { SIZE_T combined_length, length2; WCHAR *combined_path; - BOOL from_path2 = FALSE; + BOOL add_backslash = FALSE; HRESULT hr; TRACE("%s %s %#x %p\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags, out); @@ -419,7 +419,8 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl { path1 = path2; path2 = NULL; - from_path2 = TRUE; + add_backslash = (is_drive_spec(path1) && !path1[2]) + || (is_prefixed_disk(path1) && !path1[6]); } length2 = path2 ? lstrlenW(path2) : 0; @@ -435,7 +436,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl lstrcpyW(combined_path, path1); PathCchStripPrefix(combined_path, combined_length); - if (from_path2) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); + if (add_backslash) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); if (path2 && path2[0]) { diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index f8712679eae..af511f500f3 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -426,7 +426,6 @@ struct combine_test const CHAR *path1; const CHAR *path2; const CHAR *result; - BOOL todo; }; static const struct combine_test combine_tests[] = @@ -474,21 +473,21 @@ static const struct combine_test combine_tests[] = /* Second path is fully qualified */ {"X:\\", "C:", "C:\\"}, {"X:\\", "C:\\", "C:\\"}, - {"X:\\", "C:\\a", "C:\\a", TRUE}, + {"X:\\", "C:\\a", "C:\\a"}, {"X:\\", "\\\\", "\\\\"}, - {"X:\\", "\\\\a", "\\\\a", TRUE}, + {"X:\\", "\\\\a", "\\\\a"}, {"X:\\", "\\\\?\\C:", "C:\\"}, {"X:\\", "\\\\?\\C:\\", "C:\\"}, - {"X:\\", "\\\\?\\C:\\a", "C:\\a", TRUE}, - {"X:\\", "\\\\?\\UNC", "\\\\?\\UNC", TRUE}, + {"X:\\", "\\\\?\\C:\\a", "C:\\a"}, + {"X:\\", "\\\\?\\UNC", "\\\\?\\UNC"}, {"X:\\", "\\\\?\\UNC\\", "\\\\"}, - {"X:\\", "\\\\?\\UNC\\a", "\\\\a", TRUE}, + {"X:\\", "\\\\?\\UNC\\a", "\\\\a"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", - "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", TRUE}, + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", - "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", TRUE}, + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a"}, /* Canonicalization */ {"C:\\a", ".\\b", "C:\\a\\b"}, @@ -547,7 +546,6 @@ static void test_PathAllocCombine(void) if (SUCCEEDED(hr)) { WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); - todo_wine_if(t->todo) ok(!lstrcmpA(resultA, t->result), "combine %s %s expect result %s, got %s\n", t->path1, t->path2, t->result, resultA); LocalFree(resultW); @@ -611,7 +609,6 @@ static void test_PathCchCombine(void) hr = pPathCchCombine(output, ARRAY_SIZE(output), p1, p2); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); } @@ -680,7 +677,6 @@ static void test_PathCchCombineEx(void) hr = pPathCchCombineEx(output, MAX_PATH, p1, p2, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021