wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Alexandre Julliard : kernelbase: Reimplement LOCALE_*DISPLAYNAME in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: f0db567f673b43794253fe0475f8298ad31698c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0db567f673b43794253fe04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:29:57 2022 +0200 kernelbase: Reimplement LOCALE_*DISPLAYNAME in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2faec8136b9..2e512240b2b 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -903,7 +903,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( val, type, buffer, len ); case LOCALE_SLOCALIZEDDISPLAYNAME: - return -1; + /* FIXME: localization */ + return locale_return_string( locale->sengdisplayname, type, buffer, len ); case LOCALE_SABBREVLANGNAME: return locale_return_string( locale->sabbrevlangname, type, buffer, len ); @@ -1161,10 +1162,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SENGLISHDISPLAYNAME: - return -1; + return locale_return_string( locale->sengdisplayname, type, buffer, len ); case LOCALE_SNATIVEDISPLAYNAME: - return -1; + return locale_return_string( locale->snativedisplayname, type, buffer, len ); case LOCALE_INEGATIVEPERCENT: return -1;

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*CTRYNAME in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 2c70ed249ab393f8cb1e522bbd6cf299afe82906 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c70ed249ab393f8cb1e522b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:27:45 2022 +0200 kernelbase: Reimplement LOCALE_*CTRYNAME in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 13 +++++++------ dlls/msvcrt/locale.c | 3 --- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 0caf790384c..2faec8136b9 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -915,13 +915,14 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SLOCALIZEDCOUNTRYNAME: - return -1; + /* FIXME: localization */ + return locale_return_string( locale->sengcountry, type, buffer, len ); case LOCALE_SABBREVCTRYNAME: - return -1; + return locale_return_string( locale->sabbrevctryname, type, buffer, len ); case LOCALE_SNATIVECTRYNAME: - return -1; + return locale_return_string( locale->snativectryname, type, buffer, len ); case LOCALE_IDEFAULTLANGUAGE: return locale_return_number( locale->idefaultlanguage, type, buffer, len ); @@ -1097,7 +1098,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->siso639langname, type, buffer, len ); case LOCALE_SISO3166CTRYNAME: - return -1; + return locale_return_string( locale->siso3166ctryname, type, buffer, len ); case LOCALE_IGEOID: return -1; @@ -1129,7 +1130,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->siso639langname2, type, buffer, len ); case LOCALE_SISO3166CTRYNAME2: - return -1; + return locale_return_string( locale->siso3166ctryname2, type, buffer, len ); case LOCALE_SNAN: return -1; @@ -1205,7 +1206,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->senglanguage, type, buffer, len ); case LOCALE_SENGCOUNTRY: - return -1; + return locale_return_string( locale->sengcountry, type, buffer, len ); case LOCALE_STIMEFORMAT: return -1; diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e800e7142c8..037660d0a91 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -363,9 +363,6 @@ LCID locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *sname) search.allow_sname = TRUE; } - if(!_stricmp(search.search_country, "China")) - strcpy(search.search_country, "People's Republic of China"); - EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, (LONG_PTR)&search);

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*LANGNAME in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 85a39a977347e037bcd910efd388faa6f04d870a URL: https://source.winehq.org/git/wine.git/?a=commit;h=85a39a977347e037bcd910ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:26:34 2022 +0200 kernelbase: Reimplement LOCALE_*LANGNAME in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 13 +++++++------ dlls/msvcrt/locale.c | 9 +++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 7cb16e5b387..0caf790384c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -906,10 +906,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SABBREVLANGNAME: - return -1; + return locale_return_string( locale->sabbrevlangname, type, buffer, len ); case LOCALE_SNATIVELANGNAME: - return -1; + return locale_return_string( locale->snativelangname, type, buffer, len ); case LOCALE_ICOUNTRY: return -1; @@ -1094,7 +1094,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SISO639LANGNAME: - return -1; + return locale_return_string( locale->siso639langname, type, buffer, len ); case LOCALE_SISO3166CTRYNAME: return -1; @@ -1126,7 +1126,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SISO639LANGNAME2: - return -1; + return locale_return_string( locale->siso639langname2, type, buffer, len ); case LOCALE_SISO3166CTRYNAME2: return -1; @@ -1150,7 +1150,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SLOCALIZEDLANGUAGENAME: - return -1; + /* FIXME: localization */ + return locale_return_string( locale->senglanguage, type, buffer, len ); case LOCALE_IREADINGLAYOUT: return -1; @@ -1201,7 +1202,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SENGLANGUAGE: - return -1; + return locale_return_string( locale->senglanguage, type, buffer, len ); case LOCALE_SENGCOUNTRY: return -1; diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 924671e7047..e800e7142c8 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -525,8 +525,13 @@ static BOOL update_threadlocinfo_category(LCID lcid, unsigned short cp, if(!locinfo->lc_category[category].locale) { int len = 0; - len += GetLocaleInfoA(lcid, LOCALE_SENGLANGUAGE - |LOCALE_NOUSEROVERRIDE, buf, 256); + if (lcid == MAKELANGID( LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK )) + { + /* locale.nls contains "Norwegian Nynorsk" instead for LOCALE_SENGLANGUAGE */ + strcpy( buf, "Norwegian-Nynorsk" ); + len = strlen( buf ) + 1; + } + else len += GetLocaleInfoA(lcid, LOCALE_SENGLANGUAGE|LOCALE_NOUSEROVERRIDE, buf, 256); buf[len-1] = '_'; len += GetLocaleInfoA(lcid, LOCALE_SENGCOUNTRY |LOCALE_NOUSEROVERRIDE, &buf[len], 256-len);

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_ILANGUAGE/IDEFAULTLANGUAGE in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 956c88db183402caf5f1bc4c45af5e667eef41e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=956c88db183402caf5f1bc4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:15:30 2022 +0200 kernelbase: Reimplement LOCALE_ILANGUAGE/IDEFAULTLANGUAGE in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 8b137cdf90a..7cb16e5b387 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -850,16 +850,57 @@ static int locale_return_string( DWORD pos, LCTYPE type, WCHAR *buffer, int len } +static int locale_return_number( UINT val, LCTYPE type, WCHAR *buffer, int len ) +{ + int ret; + WCHAR tmp[80]; + + if (!(type & LOCALE_RETURN_NUMBER)) + { + switch (LOWORD(type)) + { + case LOCALE_ILANGUAGE: + case LOCALE_IDEFAULTLANGUAGE: + ret = swprintf( tmp, ARRAY_SIZE(tmp), L"%04x", val ) + 1; + break; + case LOCALE_IDEFAULTEBCDICCODEPAGE: + ret = swprintf( tmp, ARRAY_SIZE(tmp), L"%03u", val ) + 1; + break; + default: + ret = swprintf( tmp, ARRAY_SIZE(tmp), L"%u", val ) + 1; + break; + } + } + else ret = sizeof(UINT) / sizeof(WCHAR); + + if (!len) return ret; + if (ret > len) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + + if (type & LOCALE_RETURN_NUMBER) memcpy( buffer, &val, sizeof(val) ); + else wcscpy( buffer, tmp ); + + return ret; +} + + /* get locale information from the locale.nls file */ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE type, WCHAR *buffer, int len ) { + UINT val; + if (locale != user_locale) type |= LOCALE_NOUSEROVERRIDE; switch (LOWORD(type)) { case LOCALE_ILANGUAGE: - return -1; + /* return default language for neutral locales */ + val = locale->inotneutral ? locale->ilanguage : locale->idefaultlanguage; + return locale_return_number( val, type, buffer, len ); case LOCALE_SLOCALIZEDDISPLAYNAME: return -1; @@ -883,7 +924,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_IDEFAULTLANGUAGE: - return -1; + return locale_return_number( locale->idefaultlanguage, type, buffer, len ); case LOCALE_IDEFAULTCOUNTRY: return -1;

1 0

Alexandre Julliard : kernelbase: Reimplement LCIDToLocaleName() using the locale.nls data.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 412e79181fc15aec030a584ca484a6b6fedee868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=412e79181fc15aec030a584c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:21:15 2022 +0200 kernelbase: Reimplement LCIDToLocaleName() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 8 ++++++++ dlls/kernelbase/locale.c | 16 ++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d30a771c2c2..9475df22cbe 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2790,6 +2790,14 @@ static void test_LocaleNameToLCID(void) ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(L"zh-hans"), ret); ok(!lstrcmpW(L"zh-CN", buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(L"zh-hans"), wine_dbgstr_w(buffer)); + + /* de-DE_phoneb */ + lcid = pLocaleNameToLCID(L"de-DE_phoneb", 0); + ok(lcid == MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), SORT_GERMAN_PHONE_BOOK), + "%s: got wrong lcid 0x%04lx\n", wine_dbgstr_w(L"zh-hans"), lcid); + ret = pLCIDToLocaleName(lcid, buffer, ARRAY_SIZE(buffer), 0); + ok(!lstrcmpW(L"de-DE_phoneb", buffer), "got wrong locale name %s\n", + wine_dbgstr_w(buffer)); } if (pRtlLocaleNameToLcid) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 39d7fe1ccd9..8b137cdf90a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5180,9 +5180,9 @@ LANGID WINAPI DECLSPEC_HOTPATCH GetSystemDefaultLangID(void) /*********************************************************************** * GetSystemDefaultLocaleName (kernelbase.@) */ -INT WINAPI DECLSPEC_HOTPATCH GetSystemDefaultLocaleName( LPWSTR name, INT len ) +INT WINAPI DECLSPEC_HOTPATCH GetSystemDefaultLocaleName( LPWSTR name, INT count ) { - return LCIDToLocaleName( GetSystemDefaultLCID(), name, len, 0 ); + return get_locale_info( system_locale, system_lcid, LOCALE_SNAME, name, count ); } @@ -5329,7 +5329,7 @@ LANGID WINAPI DECLSPEC_HOTPATCH GetUserDefaultLangID(void) */ INT WINAPI DECLSPEC_HOTPATCH GetUserDefaultLocaleName( LPWSTR name, INT len ) { - return LCIDToLocaleName( GetUserDefaultLCID(), name, len, 0 ); + return get_locale_info( user_locale, user_lcid, LOCALE_SNAME, name, len ); } @@ -5692,10 +5692,14 @@ DWORD WINAPI DECLSPEC_HOTPATCH IsValidNLSVersion( NLS_FUNCTION func, const WCHAR */ INT WINAPI DECLSPEC_HOTPATCH LCIDToLocaleName( LCID lcid, WCHAR *name, INT count, DWORD flags ) { - static int once; - if (flags && !once++) FIXME( "unsupported flags %lx\n", flags ); + const NLS_LOCALE_DATA *locale = get_locale_by_id( &lcid, flags ); - return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count ); + if (!locale) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + return get_locale_info( locale, lcid, LOCALE_SNAME, name, count ); }

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_SPARENT in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 0f7cd3d685b2b81a3d6802c0b32080bfa5dc4b90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f7cd3d685b2b81a3d6802c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:13:04 2022 +0200 kernelbase: Reimplement LOCALE_SPARENT in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 258893cada6..39d7fe1ccd9 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1103,7 +1103,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SPARENT: - return -1; + return locale_return_string( locale->sparent, type, buffer, len ); case LOCALE_SCONSOLEFALLBACKNAME: return -1; @@ -5017,17 +5017,6 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoEx( const WCHAR *name, LCTYPE info, WC lcid = LocaleNameToLCID( name, 0 ); if (!lcid) return 0; - - /* special handling for neutral locale names */ - if (name && lstrlenW( name ) == 2) - { - switch (LOWORD( info )) - { - case LOCALE_SPARENT: - if (len) buffer[0] = 0; - return 1; - } - } return GetLocaleInfoW( lcid, info, buffer, len ); }

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_SNAME in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: d370618a5a505cbaf8cb5b1c441d3335aa8b2c1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d370618a5a505cbaf8cb5b1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:09:51 2022 +0200 kernelbase: Reimplement LOCALE_SNAME in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 435 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 423 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d370618a5a505cbaf8cb…

1 0

Eric Pouech : shell32: Always allocate a whole ITEMIDLIST structure.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: e62dd2a5b62a6a75d9bcaec29e80b31eb257c41d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e62dd2a5b62a6a75d9bcaec2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 10:13:26 2022 +0100 shell32: Always allocate a whole ITEMIDLIST structure. Partially allocating a structure generates -Warray-bounds warnings with GCC11. In this specific case, given the rounding in memory allocators, would even not increase the effective allocated size. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 4c66a14c700..f9c91a79132 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1574,7 +1574,7 @@ LPITEMIDLIST _ILCreateDesktop(void) LPITEMIDLIST ret; TRACE("()\n"); - ret = SHAlloc(2); + ret = SHAlloc(sizeof(*ret)); if (ret) ret->mkid.cb = 0; return ret;

1 0

Zhiyi Zhang : uxtheme: Remove a redundant condition check.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: f9923d6bb9b800dbf9a3bec93b7aa7cbebd92e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9923d6bb9b800dbf9a3bec9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 24 17:06:14 2022 +0800 uxtheme: Remove a redundant condition check. The sizingtype check is redundant because it can only be ST_TRUESIZE, ST_STRETCH or ST_TILE and the check is already in the not ST_TRUESIZE branch. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 111 ++++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index d503fad3fea..3ddb9b3bf4d 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -710,6 +710,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, RECT *pRect, const DTBGOPTS *pOptions) { + int destCenterWidth, srcCenterWidth, destCenterHeight, srcCenterHeight; HRESULT hr = S_OK; HBITMAP bmpSrc; HGDIOBJ oldSrc; @@ -825,68 +826,66 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, goto draw_error; } - if ((sizingtype == ST_STRETCH) || (sizingtype == ST_TILE)) { - int destCenterWidth = dstSize.x - (sm.cxLeftWidth + sm.cxRightWidth); - int srcCenterWidth = srcSize.x - (sm.cxLeftWidth + sm.cxRightWidth); - int destCenterHeight = dstSize.y - (sm.cyTopHeight + sm.cyBottomHeight); - int srcCenterHeight = srcSize.y - (sm.cyTopHeight + sm.cyBottomHeight); - - if(destCenterWidth > 0) { - /* Center top */ - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, 0, - destCenterWidth, sm.cyTopHeight, - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top, - srcCenterWidth, sm.cyTopHeight, - sizingtype, transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } - /* Center bottom */ - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight, - destCenterWidth, sm.cyBottomHeight, - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight, - srcCenterWidth, sm.cyBottomHeight, - sizingtype, transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } + destCenterWidth = dstSize.x - (sm.cxLeftWidth + sm.cxRightWidth); + srcCenterWidth = srcSize.x - (sm.cxLeftWidth + sm.cxRightWidth); + destCenterHeight = dstSize.y - (sm.cyTopHeight + sm.cyBottomHeight); + srcCenterHeight = srcSize.y - (sm.cyTopHeight + sm.cyBottomHeight); + + if(destCenterWidth > 0) { + /* Center top */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, 0, + destCenterWidth, sm.cyTopHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top, + srcCenterWidth, sm.cyTopHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; } - if(destCenterHeight > 0) { - /* Left center */ - if(!UXTHEME_SizedBlt (hdcDst, 0, sm.cyTopHeight, - sm.cxLeftWidth, destCenterHeight, - hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight, - sm.cxLeftWidth, srcCenterHeight, - sizingtype, - transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } - /* Right center */ - if(!UXTHEME_SizedBlt (hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight, - sm.cxRightWidth, destCenterHeight, - hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight, - sm.cxRightWidth, srcCenterHeight, + /* Center bottom */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight, + destCenterWidth, sm.cyBottomHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight, + srcCenterWidth, sm.cyBottomHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + if(destCenterHeight > 0) { + /* Left center */ + if(!UXTHEME_SizedBlt (hdcDst, 0, sm.cyTopHeight, + sm.cxLeftWidth, destCenterHeight, + hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight, + sm.cxLeftWidth, srcCenterHeight, + sizingtype, + transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Right center */ + if(!UXTHEME_SizedBlt (hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight, + sm.cxRightWidth, destCenterHeight, + hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight, + sm.cxRightWidth, srcCenterHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + if(destCenterHeight > 0 && destCenterWidth > 0) { + BOOL borderonly = FALSE; + GetThemeBool(hTheme, iPartId, iStateId, TMT_BORDERONLY, &borderonly); + if(!borderonly) { + /* Center */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, sm.cyTopHeight, + destCenterWidth, destCenterHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight, + srcCenterWidth, srcCenterHeight, sizingtype, transparent, transparentcolor)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto draw_error; } } - if(destCenterHeight > 0 && destCenterWidth > 0) { - BOOL borderonly = FALSE; - GetThemeBool(hTheme, iPartId, iStateId, TMT_BORDERONLY, &borderonly); - if(!borderonly) { - /* Center */ - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, sm.cyTopHeight, - destCenterWidth, destCenterHeight, - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight, - srcCenterWidth, srcCenterHeight, - sizingtype, transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } - } - } } draw_error:

1 0

Zhiyi Zhang : uxtheme: Return correct WM_ERASEBKGND result from custom dialog procedures.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: d987c277c12bc17a77c9d79b92024d449f9a85f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d987c277c12bc17a77c9d79b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 24 17:06:07 2022 +0800 uxtheme: Return correct WM_ERASEBKGND result from custom dialog procedures. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/dialog.c | 3 ++- dlls/uxtheme/tests/system.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 706d170936e..13943d753bb 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -129,9 +129,10 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO case WM_ERASEBKGND: { dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 0); lr = LOWORD(CallWindowProcW(dlgproc, hwnd, msg, wp, lp)); if (lr) - return lr; + return GetWindowLongPtrW(hwnd, DWLP_MSGRESULT); brush = get_dialog_background_brush(hwnd, TRUE); if (!brush) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 1308d54264b..1f04ac879ec 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1889,8 +1889,7 @@ static void test_EnableThemeDialogTexture(void) /* Test that the dialog procedure should take precedence over DefDlgProc() for WM_ERASEBKGND */ handle_WM_ERASEBKGND = TRUE; lr = SendMessageW(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); - todo_wine - ok(lr == 0, "Expected 0, got %#lx.\n", lr); + ok(lr == 0, "Expected 0, got %#Ix.\n", lr); handle_WM_ERASEBKGND = FALSE; /* Test that dialog doesn't have theme handle opened for itself */

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 March 2022