September 2021 - Wine-Commits

Esme Povirk : mscoree: Add a buffer for Mono's debug output.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 20dc5f378ca70f15cfe28a87e8ebda6a10eeed6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=20dc5f378ca70f15cfe28a87… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Aug 31 16:02:19 2021 -0500 mscoree: Add a buffer for Mono's debug output. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 13 --------- dlls/mscoree/mscoree_main.c | 64 +++++++++++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_private.h | 2 ++ 3 files changed, 65 insertions(+), 14 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index b3816600214..33ed2462125 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -137,8 +137,6 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof); -static void CDECL mono_print_handler_fn(const char *string, INT is_stdout); - static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) { @@ -378,17 +376,6 @@ static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof) is_mono_shutdown = TRUE; } -static void CDECL mono_print_handler_fn(const char *string, INT is_stdout) -{ - const char *p; - for (; *string; string = p) - { - if ((p = strstr(string, "\n"))) p++; - else p = string + strlen(string); - wine_dbg_printf("%.*s", (int)(p - string), string); - } -} - static HRESULT WINAPI thread_set_fn(void) { WARN("stub\n"); diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index a4567e96de2..0352b633cc9 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -50,6 +50,14 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); WINE_DECLARE_DEBUG_CHANNEL(winediag); +struct print_handler_tls +{ + int length; + char buffer[1018]; +}; + +static DWORD print_tls_index = TLS_OUT_OF_INDEXES; + typedef HRESULT (*fnCreateInstance)(REFIID riid, LPVOID *ppObj); char *WtoA(LPCWSTR wstr) @@ -214,6 +222,46 @@ HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor return ret; } +void CDECL mono_print_handler_fn(const char *string, INT is_stdout) +{ + struct print_handler_tls *tls = TlsGetValue(print_tls_index); + + if (!tls) + { + tls = HeapAlloc(GetProcessHeap(), 0, sizeof(*tls)); + tls->length = 0; + TlsSetValue(print_tls_index, tls); + } + + while (*string) + { + int remaining_buffer = sizeof(tls->buffer) - tls->length; + int length = strlen(string); + const char *newline = memchr(string, '\n', min(length, remaining_buffer)); + + if (newline) + { + length = newline - string + 1; + wine_dbg_printf("%.*s%.*s", tls->length, tls->buffer, length, string); + tls->length = 0; + string += length; + } + else if (length > remaining_buffer) + { + /* this would overflow Wine's debug buffer */ + wine_dbg_printf("%.*s%.*s\n", tls->length, tls->buffer, remaining_buffer, string); + tls->length = 0; + string += remaining_buffer; + } + else + { + memcpy(tls->buffer + tls->length, string, length); + tls->length += length; + break; + } + } +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -222,12 +270,26 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { case DLL_PROCESS_ATTACH: runtimehost_init(); - DisableThreadLibraryCalls(hinstDLL); + + print_tls_index = TlsAlloc(); + + if (print_tls_index == TLS_OUT_OF_INDEXES) + return FALSE; + + break; + case DLL_THREAD_DETACH: + if (print_tls_index != TLS_OUT_OF_INDEXES) + HeapFree(GetProcessHeap(), 0, TlsGetValue(print_tls_index)); break; case DLL_PROCESS_DETACH: expect_no_runtimes(); if (lpvReserved) break; /* process is terminating */ runtimehost_uninit(); + if (print_tls_index != TLS_OUT_OF_INDEXES) + { + HeapFree(GetProcessHeap(), 0, TlsGetValue(print_tls_index)); + TlsFree(print_tls_index); + } break; } return TRUE; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index c4692b4e656..985cdeff770 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -219,4 +219,6 @@ extern HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_pa extern void runtimehost_init(void) DECLSPEC_HIDDEN; extern void runtimehost_uninit(void) DECLSPEC_HIDDEN; +extern void CDECL mono_print_handler_fn(const char *string, INT is_stdout) DECLSPEC_HIDDEN; + #endif /* __MSCOREE_PRIVATE__ */

1 0

Zhiyi Zhang : user32/tests: Add DisplayConfigSetDeviceInfo() tests.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 2d51077a22b7d8faa9587d02a84181f58d1203aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d51077a22b7d8faa9587d02… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 1 14:37:21 2021 +0800 user32/tests: Add DisplayConfigSetDeviceInfo() tests. Test that DisplayConfigSetDeviceInfo() can be used for getting and setting display DPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 132 ++++++++++++++++++++++++++++++++++++++++---- include/wingdi.h | 51 +++++++++++++---- 2 files changed, 161 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d51077a22b7d8faa958…

1 0

Zhiyi Zhang : uxtheme/tests: Add GetThemePartSize() tests.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 069ed533b44a346b354cbe8c45be4747c3adfd61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=069ed533b44a346b354cbe8c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 1 14:37:29 2021 +0800 uxtheme/tests: Add GetThemePartSize() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 272 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 258 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=069ed533b44a346b354c…

1 0

Zhiyi Zhang : uxtheme: Implement OpenThemeDataForDpi().
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 615a90e2192231ac6d37b3d336b4abfc996d96f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=615a90e2192231ac6d37b3d3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 1 14:37:38 2021 +0800 uxtheme: Implement OpenThemeDataForDpi(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/msstyles.c | 4 +++- dlls/uxtheme/msstyles.h | 3 ++- dlls/uxtheme/system.c | 31 +++++++++++++++++++++++++------ dlls/uxtheme/tests/system.c | 31 +++++++++++++++++++++++++++++++ dlls/uxtheme/uxtheme.spec | 1 + include/uxtheme.h | 1 + 6 files changed, 63 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 6f74d2d3d7d..99eda64233c 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -971,8 +971,9 @@ static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics) * pszAppName Application name, for theme styles specific * to a particular application * pszClassList List of requested classes, semicolon delimited + * dpi DPI for theme parts */ -PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList) +PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, UINT dpi) { PTHEME_CLASS cls = NULL; WCHAR szClassName[MAX_THEME_CLASS_NAME]; @@ -1004,6 +1005,7 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList) TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); cls->tf = tfActiveTheme; cls->tf->dwRefCount++; + cls->dpi = dpi; } return cls; } diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 0b7e1ab35cc..1cb27b93ab3 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -53,6 +53,7 @@ typedef struct _THEME_CLASS { struct _THEME_FILE* tf; WCHAR szAppName[MAX_THEME_APP_NAME]; WCHAR szClassName[MAX_THEME_CLASS_NAME]; + UINT dpi; PTHEME_PARTSTATE partstate; struct _THEME_CLASS *overrides; @@ -87,7 +88,7 @@ typedef struct _UXINI_FILE *PUXINI_FILE; HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf) DECLSPEC_HIDDEN; void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) DECLSPEC_HIDDEN; HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics) DECLSPEC_HIDDEN; -PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList) DECLSPEC_HIDDEN; +PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, UINT dpi) DECLSPEC_HIDDEN; HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) DECLSPEC_HIDDEN; BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId) DECLSPEC_HIDDEN; BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPEC_HIDDEN; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index afae1e23f2b..ca0dd228b2c 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -617,10 +617,7 @@ static LPWSTR UXTHEME_GetWindowProperty(HWND hwnd, ATOM aProp, LPWSTR pszBuffer, return NULL; } -/*********************************************************************** - * OpenThemeDataEx (UXTHEME.61) - */ -HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) +static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT dpi) { WCHAR szAppBuff[256]; WCHAR szClassBuff[256]; @@ -647,11 +644,11 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) pszUseClassList = pszClassList; if (pszUseClassList) - hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList); + hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList, dpi); /* Fall back to default class if the specified subclass is not found */ if (!hTheme) - hTheme = MSSTYLES_OpenThemeClass(NULL, pszUseClassList); + hTheme = MSSTYLES_OpenThemeClass(NULL, pszUseClassList, dpi); } if(IsWindow(hwnd)) SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme); @@ -661,6 +658,28 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) return hTheme; } +/*********************************************************************** + * OpenThemeDataEx (UXTHEME.61) + */ +HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) +{ + UINT dpi; + + dpi = GetDpiForWindow(hwnd); + if (!dpi) + dpi = 96; + + return open_theme_data(hwnd, pszClassList, flags, dpi); +} + +/*********************************************************************** + * OpenThemeDataForDpi (UXTHEME.@) + */ +HTHEME WINAPI OpenThemeDataForDpi(HWND hwnd, LPCWSTR class_list, UINT dpi) +{ + return open_theme_data(hwnd, class_list, 0, dpi); +} + /*********************************************************************** * OpenThemeData (UXTHEME.@) */ diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index b3b1afde14e..584a71a82b4 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -34,6 +34,7 @@ #include "wine/test.h" static HTHEME (WINAPI * pOpenThemeDataEx)(HWND, LPCWSTR, DWORD); +static HTHEME (WINAPI *pOpenThemeDataForDpi)(HWND, LPCWSTR, UINT); static HPAINTBUFFER (WINAPI *pBeginBufferedPaint)(HDC, const RECT *, BP_BUFFERFORMAT, BP_PAINTPARAMS *, HDC *); static HRESULT (WINAPI *pBufferedPaintClear)(HPAINTBUFFER, const RECT *); static HRESULT (WINAPI *pEndBufferedPaint)(HPAINTBUFFER, BOOL); @@ -79,6 +80,7 @@ static void init_funcs(void) GET_PROC(uxtheme, GetBufferedPaintTargetDC) GET_PROC(uxtheme, GetBufferedPaintTargetRect) GET_PROC(uxtheme, OpenThemeDataEx) + GET_PROC(uxtheme, OpenThemeDataForDpi) GET_PROC(user32, DisplayConfigGetDeviceInfo) GET_PROC(user32, DisplayConfigSetDeviceInfo) @@ -642,6 +644,34 @@ static void test_OpenThemeDataEx(void) DestroyWindow(hWnd); } +static void test_OpenThemeDataForDpi(void) +{ + BOOL is_theme_active; + HTHEME htheme; + + if (!pOpenThemeDataForDpi) + { + win_skip("OpenThemeDataForDpi is unavailable.\n"); + return; + } + + is_theme_active = IsThemeActive(); + SetLastError(0xdeadbeef); + htheme = OpenThemeDataForDpi(NULL, WC_BUTTONW, 96); + if (is_theme_active) + { + ok(!!htheme, "Got a NULL handle.\n"); + ok(GetLastError() == NO_ERROR, "Expected error %u, got %u.\n", NO_ERROR, GetLastError()); + CloseThemeData(htheme); + } + else + { + ok(!htheme, "Got a non-NULL handle.\n"); + ok(GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected error %u, got %u.\n", + E_PROP_ID_UNSUPPORTED, GetLastError()); + } +} + static void test_GetCurrentThemeName(void) { BOOL bThemeActive; @@ -1084,6 +1114,7 @@ START_TEST(system) test_SetWindowTheme(); test_OpenThemeData(); test_OpenThemeDataEx(); + test_OpenThemeDataForDpi(); test_GetCurrentThemeName(); test_GetThemePartSize(); test_CloseThemeData(); diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 22b1fc4ac3c..140388245f2 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -106,6 +106,7 @@ @ stdcall IsThemeDialogTextureEnabled(ptr) @ stdcall IsThemePartDefined(ptr long long) @ stdcall OpenThemeData(ptr wstr) +@ stdcall OpenThemeDataForDpi(ptr wstr long) @ stdcall SetThemeAppProperties(long) @ stdcall SetWindowTheme(ptr wstr wstr) @ stdcall SetWindowThemeAttribute(ptr long ptr long) diff --git a/include/uxtheme.h b/include/uxtheme.h index 449dc6f6d40..384c3655b41 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -213,6 +213,7 @@ BOOL WINAPI IsThemeDialogTextureEnabled(HWND); BOOL WINAPI IsThemePartDefined(HTHEME,int,int); HTHEME WINAPI OpenThemeData(HWND,LPCWSTR); HTHEME WINAPI OpenThemeDataEx(HWND,LPCWSTR,DWORD); +HTHEME WINAPI OpenThemeDataForDpi(HWND,LPCWSTR,UINT); void WINAPI SetThemeAppProperties(DWORD); HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR); HRESULT WINAPI SetWindowThemeAttribute(HWND,enum WINDOWTHEMEATTRIBUTETYPE,PVOID,DWORD);

1 0

Zhiyi Zhang : winecfg: Use OpenThemeDataForDpi() to create a theme handle not associated to a window.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 53a0d57aff628c73e8da2dbaba0d3c59b0424987 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53a0d57aff628c73e8da2dba… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 1 14:38:03 2021 +0800 winecfg: Use OpenThemeDataForDpi() to create a theme handle not associated to a window. If a window is not passed to OpenThemeData(), OpenThemeData() assumes the DPI is 96 according to tests. And GetThemePartSize() should select theme parts according to the DPI stored in theme handles rather than using GDI device contexts. Thus, OpenThemeDataForDpi() should be used in place of OpenThemeData() when DPI is not 96 and theme handles shouldn't be associated with a window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index e204a911516..b3a3eeed3ba 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1090,7 +1090,7 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) HTHEME theme; RECT buttonrect; - theme = OpenThemeData(NULL, WC_BUTTONW); + theme = OpenThemeDataForDpi(NULL, WC_BUTTONW, GetDpiForWindow(hDlg)); if (theme) { MARGINS margins;

1 0

Zhiyi Zhang : uxtheme: Get DPI from theme class.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: f8bc5d762708cc588ed55414eca55918e6679857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8bc5d762708cc588ed55414… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 1 14:38:10 2021 +0800 uxtheme: Get DPI from theme class. Fix Command Link glyphs not scaled according to DPI because a NULL device context handle was passed to GetThemePartSize() and GetThemePartSize() was using a device context to get DPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 36 ++++++++++++++++++------------------ dlls/uxtheme/msstyles.c | 10 ++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/tests/system.c | 1 - 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 4394f4943b7..a03217b65cf 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -172,7 +172,7 @@ static int imagefile_index_to_property(int index) * * Select the image to use */ -static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, +static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStateId, const RECT *pRect, BOOL glyph, int *imageDpi) { PTHEME_PROPERTY tp; @@ -193,14 +193,15 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, if(imageselecttype == IST_DPI) { int reqdpi = 0; - int screendpi = GetDeviceCaps(hdc, LOGPIXELSX); + int dpi = MSSTYLES_GetThemeDPI(hTheme); for (i = 7; i >= 1; i--) { reqdpi = 0; if (SUCCEEDED(GetThemeInt(hTheme, iPartId, iStateId, mindpi_index_to_property(i), &reqdpi))) { - if(reqdpi != 0 && screendpi >= reqdpi) { + if (reqdpi != 0 && dpi >= reqdpi) + { TRACE("Using %d DPI, image %d\n", reqdpi, imagefile_index_to_property(i)); if (imageDpi) @@ -269,9 +270,9 @@ 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, int *imageDpi) +static HRESULT UXTHEME_LoadImage(HTHEME hTheme, int iPartId, int iStateId, const RECT *pRect, + BOOL glyph, HBITMAP *hBmp, RECT *bmpRect, BOOL *hasImageAlpha, + int *imageDpi) { int imagelayout = IL_HORIZONTAL; int imagecount = 1; @@ -280,7 +281,7 @@ static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iState WCHAR szPath[MAX_PATH]; PTHEME_PROPERTY tp; - tp = UXTHEME_SelectImage(hTheme, hdc, iPartId, iStateId, pRect, glyph, imageDpi); + tp = UXTHEME_SelectImage(hTheme, 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; @@ -528,7 +529,7 @@ 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, iPartId, iStateId, pRect, TRUE, &bmpSrc, &rcSrc, &hasAlpha, NULL); if(FAILED(hr)) return hr; hdcSrc = CreateCompatibleDC(hdc); @@ -594,9 +595,8 @@ static HRESULT UXTHEME_DrawGlyph(HTHEME hTheme, HDC hdc, int iPartId, * * Used by GetThemePartSize and UXTHEME_DrawImageBackground */ -static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, - int iStateId, RECT *prc, THEMESIZE eSize, - POINT *psz) +static HRESULT get_image_part_size(HTHEME hTheme, int iPartId, int iStateId, RECT *prc, + THEMESIZE eSize, POINT *psz) { int imageDpi, dstDpi; HRESULT hr = S_OK; @@ -604,7 +604,7 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, RECT rcSrc; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, prc, FALSE, &bmpSrc, &rcSrc, &hasAlpha, + hr = UXTHEME_LoadImage(hTheme, iPartId, iStateId, prc, FALSE, &bmpSrc, &rcSrc, &hasAlpha, &imageDpi); if (FAILED(hr)) return hr; @@ -627,8 +627,8 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, { /* Scale to DPI only if the destination DPI exceeds the source DPI by * stretchMark percent */ - dstDpi = GetDeviceCaps(hdc, LOGPIXELSY); - if (dstDpi && dstDpi != imageDpi && MulDiv(100, dstDpi, imageDpi) >= stretchMark + 100) + dstDpi = MSSTYLES_GetThemeDPI(hTheme); + if (dstDpi != imageDpi && MulDiv(100, dstDpi, imageDpi) >= stretchMark + 100) { srcSize.x = MulDiv(srcSize.x, dstDpi, imageDpi); srcSize.y = MulDiv(srcSize.y, dstDpi, imageDpi); @@ -707,7 +707,7 @@ 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, iPartId, iStateId, pRect, FALSE, &bmpSrc, &rcSrc, &hasAlpha, NULL); if(FAILED(hr)) return hr; hdcSrc = CreateCompatibleDC(hdc); @@ -731,7 +731,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, if(sizingtype == ST_TRUESIZE) { int valign = VA_CENTER, halign = HA_CENTER; - get_image_part_size (hTheme, hdc, iPartId, iStateId, pRect, TS_DRAW, &drawSize); + get_image_part_size(hTheme, iPartId, iStateId, pRect, TS_DRAW, &drawSize); GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_VALIGN, &valign); GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_HALIGN, &halign); @@ -2072,7 +2072,7 @@ HRESULT WINAPI GetThemePartSize(HTHEME hTheme, HDC hdc, int iPartId, if (bgtype == BT_NONE) /* do nothing */; else if(bgtype == BT_IMAGEFILE) - hr = get_image_part_size (hTheme, hdc, iPartId, iStateId, prc, eSize, &size); + hr = get_image_part_size(hTheme, iPartId, iStateId, prc, eSize, &size); else if(bgtype == BT_BORDERFILL) hr = get_border_background_size (hTheme, iPartId, iStateId, eSize, &size); else { @@ -2183,7 +2183,7 @@ 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, + if (FAILED(UXTHEME_LoadImage(hTheme, iPartId, iStateId, &rect, FALSE, &bmpSrc, &rcSrc, &hasAlpha, NULL))) return FALSE; diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 99eda64233c..efabd06f7c0 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -247,6 +247,16 @@ PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) return UXINI_LoadINI(tf->hTheme, L"themes_ini"); } +/*********************************************************************** + * MSSTYLES_GetThemeDPI + * + * Retrieves the DPI from a theme handle when it was opened + */ +UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) +{ + return tc->dpi; +} + /*********************************************************************** * MSSTYLES_GetActiveThemeIni * diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 1cb27b93ab3..12292cefae4 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -94,6 +94,7 @@ BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwI BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPEC_HIDDEN; BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; +UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) DECLSPEC_HIDDEN; PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 584a71a82b4..f9bf371e6bf 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1030,7 +1030,6 @@ static void test_GetThemePartSize(void) ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); hr = GetThemePartSize(htheme, NULL, BP_CHECKBOX, CBS_CHECKEDNORMAL, NULL, TS_DRAW, &size2); ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine ok(size2.cx == size.cx && size2.cy == size.cy, "Expected size %dx%d, got %dx%d.\n", size.cx, size.cy, size2.cx, size2.cy); ReleaseDC(hwnd, hdc);

1 0

Francois Gouget : advapi32/tests: Fix some Perflib subkey tests.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: ab6edd0932c5f43abf9a6df1b55c67ab423a6353 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6edd0932c5f43abf9a6df1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 1 08:52:19 2021 +0200 advapi32/tests: Fix some Perflib subkey tests. Some languages don't have a subkey (e.g. German), and for others the subkey is the full language id rather than the primary language id (e.g. Portuguese). Furthermore there should be a CurrentLanguage key with localized values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 64 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 5ed220095bb..b6f906fd689 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3929,10 +3929,11 @@ static void test_perflib_key(void) HKEY perflib_key, key, key2; OBJECT_ATTRIBUTES attr; UNICODE_STRING string; - char lang_name[4]; + char lang_name[5]; + const char *knames[2] = {"009", "CurrentLanguage"}; char *buffer; DWORD size; - LONG ret; + LONG ret, l; ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion\\Perflib", 0, KEY_READ, &perflib_key); @@ -4027,21 +4028,70 @@ static void test_perflib_key(void) else ok(!ret, "got %#x\n", ret); - /* multilingual support was not really completely thought through */ + for (l = 0; l < ARRAY_SIZE(knames); l++) + { + winetest_push_context("%d", l); + todo_wine_if(l == 1) { + ret = RegOpenKeyExA(perflib_key, knames[l], 0, KEY_READ, &key); + ok(!ret, "got %u\n", ret); + if (is_special_key(key)) + { + size = buffer_size; + ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); + ok(!ret, "got %u\n", ret); + if (!ret) + { + char *str; + int c = 0; + for (str = buffer; *str; str += strlen(str) + 1) + c++; + /* Note that the two keys may not have the same number of + * entries if they are in different languages. + */ + ok(c >= 2 && (c % 2) == 0, "%d is not a valid number of entries in %s\n", c, knames[l]); + trace("%s has %d entries\n", knames[l], c); + } + } + else + { + /* Windows 7 does not always return a special key for 009 + * when running without elevated privileges. + */ + ok(broken(l == 0), "expected a special handle, got %p\n", key); + } + + ret = RegCloseKey(key); + ok(!ret, "got %u\n", ret); + } + winetest_pop_context(); + } - sprintf(lang_name, "%03x", primary_lang); - if (primary_lang != LANG_ENGLISH) + /* multilingual support was not really completely thought through */ + switch (primary_lang) + { + case LANG_PORTUGUESE: + case LANG_CHINESE: + sprintf(lang_name, "%04x", GetUserDefaultLangID()); + break; + default: + sprintf(lang_name, "%03x", primary_lang); + break; + } + if (primary_lang != LANG_ENGLISH && + !RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key)) { - ret = RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key); - todo_wine ok(!ret, "got %u\n", ret); ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + size = buffer_size; ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret); ret = RegCloseKey(key); todo_wine ok(!ret, "got %u\n", ret); } + /* else some languages don't have their own key. The keys are not really + * usable anyway so assume it does not really matter. + */ ret = RegCloseKey(perflib_key); ok(!ret, "got %u\n", ret);

1 0

Gabriel Ivăncescu : user32: Don't save maximized pos of top-level wnds covering whole work rect.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 54eea6f072a8fed65bef713dfbc492bac285568b URL: https://source.winehq.org/git/wine.git/?a=commit;h=54eea6f072a8fed65bef713d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 1 08:30:51 2021 +0100 user32: Don't save maximized pos of top-level wnds covering whole work rect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51672 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 54 ++++++++++++++++++++++++++++++++++++++----------- dlls/user32/winpos.c | 50 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54eea6f072a8fed65bef…

1 0

Zebediah Figura : server: Remove the async from the queue in async_set_result().
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: e4a2bca47b0b248f820354b154e43d200d03d15d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4a2bca47b0b248f820354b1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 31 19:23:47 2021 -0500 server: Remove the async from the queue in async_set_result(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/server/async.c b/server/async.c index 442d98d8c7a..b290005f9a0 100644 --- a/server/async.c +++ b/server/async.c @@ -159,6 +159,11 @@ void async_terminate( struct async *async, unsigned int status ) async->status = status; if (async->iosb && async->iosb->status == STATUS_PENDING) async->iosb->status = status; + /* if no APC could be queued (e.g. the process is terminated), + * thread_queue_apc() may trigger async_set_result(), which may drop the + * last reference to the async, so grab a temporary reference here */ + grab_object( async ); + if (!async->direct_result) { apc_call_t data; @@ -172,7 +177,8 @@ void async_terminate( struct async *async, unsigned int status ) } async_reselect( async ); - if (async->queue) release_object( async ); /* so that it gets destroyed when the async is done */ + + release_object( async ); } /* callback for timeout on an async request */ @@ -191,7 +197,6 @@ void free_async_queue( struct async_queue *queue ) LIST_FOR_EACH_ENTRY_SAFE( async, next, &queue->queue, struct async, queue_entry ) { - grab_object( &async->obj ); if (!async->completion) async->completion = fd_get_completion( async->fd, &async->comp_key ); async->fd = NULL; async_terminate( async, STATUS_HANDLES_CLOSED ); @@ -384,7 +389,6 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota { status = async->status; async->status = STATUS_PENDING; - grab_object( async ); if (status != STATUS_ALERTED) /* it was terminated in the meantime */ async_terminate( async, status ); @@ -425,6 +429,16 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->completion_callback) async->completion_callback( async->completion_callback_private ); async->completion_callback = NULL; + + async_reselect( async ); + + if (async->queue) + { + async->fd = NULL; + list_remove( &async->queue_entry ); + async->queue = NULL; + release_object( async ); + } } }

1 0

Francois Gouget : testbot/WineRunTask: Extract the tests to a WineTest.exe subdirectory.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: tools Branch: master Commit: cabd5ab6f4f57b422dcfdfc9da8799d578be3e2f URL: https://source.winehq.org/git/tools.git/?a=commit;h=cabd5ab6f4f57b422dcfdfc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 31 14:35:14 2021 +0200 testbot/WineRunTask: Extract the tests to a WineTest.exe subdirectory. This simplifies shielding all the test executables from anti-virus tools like Microsoft Defender by excluding the directory WineTest is in. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index db274b4..ac9091d 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -478,7 +478,7 @@ elsif ($Step->Type eq "suite") $Info .= $VM->Details; } # Escape the arguments for cmd's command interpreter - $Script .= "-q -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; + $Script .= "-q -d tests -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; $Script .= "$FileName -q -s $RptFileName\r\n" if (!$Mission->{nosubmit}); } Debug(Elapsed($Start), " Sending the script: [$Script]\n");

1 0