September 2021 - Wine-commits

Paul Gofman : kernelbase: Mind OS version in the PE header when reporting OS version.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 03c297b1c1cab7da244d2fc05aaab47c7d0e63d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c297b1c1cab7da244d2fc0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 30 15:52:45 2021 +0300 kernelbase: Mind OS version in the PE header when reporting OS version. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 175 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/version.c | 34 +++++++- 2 files changed, 205 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03c297b1c1cab7da244d…

1 0

Zebediah Figura : server: Remove the async from the queue in async_set_result().
by Alexandre Julliard 01 Sep '21

01 Sep '21

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

Zebediah Figura : server: Do not call async_terminate() when restarting an already terminated async.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: be0701540788d0c5a9b9297bec1b6a45953a722f URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0701540788d0c5a9b9297b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 31 19:23:48 2021 -0500 server: Do not call async_terminate() when restarting an already terminated async. At best this is a no-op. At worst this will emit an extra APC_ASYNC_IO where the termination (e.g. cancellation) should already have emitted one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/server/async.c b/server/async.c index b290005f9a0..086e5eb2870 100644 --- a/server/async.c +++ b/server/async.c @@ -387,13 +387,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (status == STATUS_PENDING) /* restart it */ { - status = async->status; - async->status = STATUS_PENDING; - - if (status != STATUS_ALERTED) /* it was terminated in the meantime */ - async_terminate( async, status ); - else + if (async->status == STATUS_ALERTED) + { + async->status = STATUS_PENDING; async_reselect( async ); + } } else {

1 0

Zebediah Figura : server: Use async->iosb->status instead of async->status in async_satisfied().
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 8e7a5ec81724917687b9f200e03f56545c8ee2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e7a5ec81724917687b9f200… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 31 19:23:49 2021 -0500 server: Use async->iosb->status instead of async->status in async_satisfied(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 086e5eb2870..7890122969f 100644 --- a/server/async.c +++ b/server/async.c @@ -112,13 +112,16 @@ static void async_satisfied( struct object *obj, struct wait_queue_entry *entry struct async *async = (struct async *)obj; assert( obj->ops == &async_ops ); + /* we only return an async handle for asyncs created via create_request_async() */ + assert( async->iosb ); + if (async->direct_result) { async_set_result( &async->obj, async->iosb->status, async->iosb->result ); async->direct_result = 0; } - set_wait_status( entry, async->status ); + set_wait_status( entry, async->iosb->status ); /* close wait handle here to avoid extra server round trip */ if (async->wait_handle) @@ -398,6 +401,7 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->timeout) remove_timeout_user( async->timeout ); async->timeout = NULL; async->status = status; + if (async->iosb) async->iosb->status = status; if (async->data.apc) {

1 0

Zebediah Figura : server: Use a separate field to track whether the async has been alerted.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: da838c2ae53396be6ba415e3868e1667ff2bbc66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da838c2ae53396be6ba415e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 31 19:23:50 2021 -0500 server: Use a separate field to track whether the async has been alerted. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 7890122969f..47225af11c9 100644 --- a/server/async.c +++ b/server/async.c @@ -52,6 +52,7 @@ struct async unsigned int signaled :1; unsigned int pending :1; /* request successfully queued, but pending */ unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */ + unsigned int alerted :1; /* fd is signaled, but we are waiting for client-side I/O */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ unsigned int comp_flags; /* completion flags */ @@ -161,6 +162,8 @@ 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 (status == STATUS_ALERTED) + async->alerted = 1; /* if no APC could be queued (e.g. the process is terminated), * thread_queue_apc() may trigger async_set_result(), which may drop the @@ -246,6 +249,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->pending = 1; async->wait_handle = 0; async->direct_result = 0; + async->alerted = 0; async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; async->completion_callback = NULL; @@ -390,9 +394,10 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (status == STATUS_PENDING) /* restart it */ { - if (async->status == STATUS_ALERTED) + if (async->alerted) { async->status = STATUS_PENDING; + async->alerted = 0; async_reselect( async ); } }

1 0

Zebediah Figura : server: Use a simple boolean to track whether the async has been terminated.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 6cb5f660795044637f5caf7fb9a3c262123f8751 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb5f660795044637f5caf7f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 31 19:23:51 2021 -0500 server: Use a simple boolean to track whether the async has been terminated. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/server/async.c b/server/async.c index 47225af11c9..1c3082083ed 100644 --- a/server/async.c +++ b/server/async.c @@ -42,7 +42,6 @@ struct async struct list process_entry; /* entry in process list */ struct async_queue *queue; /* queue containing this async */ struct fd *fd; /* fd associated with an unqueued async */ - unsigned int status; /* current status */ struct timeout_user *timeout; unsigned int timeout_status; /* status to report upon timeout */ struct event *event; @@ -53,6 +52,7 @@ struct async unsigned int pending :1; /* request successfully queued, but pending */ unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */ unsigned int alerted :1; /* fd is signaled, but we are waiting for client-side I/O */ + unsigned int terminated :1; /* async has been terminated */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ unsigned int comp_flags; /* completion flags */ @@ -158,9 +158,9 @@ void async_terminate( struct async *async, unsigned int status ) { assert( status != STATUS_PENDING ); - if (async->status != STATUS_PENDING) return; /* already terminated */ + if (async->terminated) return; - async->status = status; + async->terminated = 1; if (async->iosb && async->iosb->status == STATUS_PENDING) async->iosb->status = status; if (status == STATUS_ALERTED) async->alerted = 1; @@ -240,7 +240,6 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->thread = (struct thread *)grab_object( thread ); async->event = event; - async->status = STATUS_PENDING; async->data = *data; async->timeout = NULL; async->queue = NULL; @@ -250,6 +249,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->wait_handle = 0; async->direct_result = 0; async->alerted = 0; + async->terminated = 0; async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; async->completion_callback = NULL; @@ -273,7 +273,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da void set_async_pending( struct async *async, int signal ) { - if (async->status == STATUS_PENDING) + if (!async->terminated) { async->pending = 1; if (signal && !async->signaled) @@ -390,13 +390,13 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (obj->ops != &async_ops) return; /* in case the client messed up the APC results */ - assert( async->status != STATUS_PENDING ); /* it must have been woken up if we get a result */ + assert( async->terminated ); /* it must have been woken up if we get a result */ if (status == STATUS_PENDING) /* restart it */ { if (async->alerted) { - async->status = STATUS_PENDING; + async->terminated = 0; async->alerted = 0; async_reselect( async ); } @@ -405,7 +405,7 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota { if (async->timeout) remove_timeout_user( async->timeout ); async->timeout = NULL; - async->status = status; + async->terminated = 1; if (async->iosb) async->iosb->status = status; if (async->data.apc) @@ -457,7 +457,7 @@ int async_waiting( struct async_queue *queue ) if (!(ptr = list_head( &queue->queue ))) return 0; async = LIST_ENTRY( ptr, struct async, queue_entry ); - return async->status == STATUS_PENDING; + return !async->terminated; } static int cancel_async( struct process *process, struct object *obj, struct thread *thread, client_ptr_t iosb ) @@ -468,7 +468,7 @@ static int cancel_async( struct process *process, struct object *obj, struct thr restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { - if (async->status != STATUS_PENDING) continue; + if (async->terminated) continue; if ((!obj || (get_fd_user( async->fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) @@ -578,7 +578,7 @@ struct async *find_pending_async( struct async_queue *queue ) { struct async *async; LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) - if (async->status == STATUS_PENDING) return (struct async *)grab_object( async ); + if (!async->terminated) return (struct async *)grab_object( async ); return NULL; }

1 0

Esme Povirk : mscoree: Add a buffer for Mono's debug output.
by Alexandre Julliard 01 Sep '21

01 Sep '21

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 01 Sep '21

01 Sep '21

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 01 Sep '21

01 Sep '21

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 01 Sep '21

01 Sep '21

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