December 2021 - Wine-Commits

Ziqing Hui : user32: Pass correct flags in CreateIconFromResource().
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: d112d746c715aef464c71ebf801cfcf67d573914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d112d746c715aef464c71ebf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Dec 9 11:20:56 2021 +0800 user32: Pass correct flags in CreateIconFromResource(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 2 +- dlls/user32/tests/cursoricon.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f107255c8c0..827db302a30 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1592,7 +1592,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, HICON WINAPI CreateIconFromResource( LPBYTE bits, UINT cbSize, BOOL bIcon, DWORD dwVersion) { - return CreateIconFromResourceEx( bits, cbSize, bIcon, dwVersion, 0,0,0); + return CreateIconFromResourceEx( bits, cbSize, bIcon, dwVersion, 0, 0, LR_DEFAULTSIZE | LR_SHARED ); } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index d73650e08f7..1bbe2591d59 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1595,10 +1595,8 @@ static void test_CreateIconFromResource(void) /* Test the icon information. */ SetLastError(0xdeadbeef); ret = GetIconInfo(handle, &icon_info); - todo_wine ok(ret, "GetIconInfo() failed.\n"); error = GetLastError(); - todo_wine ok(error == 0xdeadbeef, "Last error: %u\n", error); if (ret) @@ -1616,14 +1614,10 @@ static void test_CreateIconFromResource(void) ICONINFOEXA infoex; infoex.cbSize = sizeof(infoex); ret = pGetIconInfoExA( handle, &infoex ); - todo_wine ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); - if (ret) - { ok( infoex.wResID == 0, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); ok( infoex.szModName[0] == 0, "GetIconInfoEx wrong module %s\n", infoex.szModName ); ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); - } } /* Test creating an icon. */ @@ -1637,10 +1631,8 @@ static void test_CreateIconFromResource(void) /* Test the icon information. */ SetLastError(0xdeadbeef); ret = GetIconInfo(handle, &icon_info); - todo_wine ok(ret, "GetIconInfo() failed.\n"); error = GetLastError(); - todo_wine ok(error == 0xdeadbeef, "Last error: %u\n", error); if (ret)

1 0

Jacek Caban : winevulkan: Use __wine_unix_call interface for Unix lib initialization.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: a34e8c2bc36bf28b3c1b7ffeac21c95c39596418 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a34e8c2bc36bf28b3c1b7ffe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 9 03:14:01 2021 +0100 winevulkan: Use __wine_unix_call interface for Unix lib initialization. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/loader.c | 24 +++++++++++++++--------- dlls/winevulkan/loader_thunks.h | 6 ++++++ dlls/winevulkan/make_vulkan | 12 ++++++++++++ dlls/winevulkan/vulkan.c | 29 +++++++++++------------------ dlls/winevulkan/vulkan_loader.h | 13 +++++++++++++ dlls/winevulkan/vulkan_private.h | 2 ++ dlls/winevulkan/vulkan_thunks.c | 6 ++++++ 8 files changed, 66 insertions(+), 27 deletions(-) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index 52b397e4242..38809211308 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,4 +1,5 @@ MODULE = winevulkan.dll +UNIXLIB = winevulkan.so IMPORTLIB = winevulkan IMPORTS = user32 gdi32 advapi32 setupapi win32u EXTRALIBS = $(PTHREAD_LIBS) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 6c89b9ccfbe..bea60b07245 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -17,19 +17,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winternl.h" +#include "vulkan_loader.h" #include "winreg.h" #include "winuser.h" #include "initguid.h" #include "devguid.h" #include "setupapi.h" -#include "vulkan_loader.h" - WINE_DEFAULT_DEBUG_CHANNEL(vulkan); /* For now default to 4 as it felt like a reasonable version feature wise to support. @@ -41,6 +35,7 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0 DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); const struct unix_funcs *unix_funcs; +unixlib_handle_t unix_handle; static HINSTANCE hinstance; @@ -220,13 +215,24 @@ VkResult WINAPI vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supported_ver static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) { - const struct vulkan_funcs *driver; + const void *driver; driver = __wine_get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); if (!driver) + { ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); + return FALSE; + } + + if (NtQueryVirtualMemory(GetCurrentProcess(), hinstance, MemoryWineUnixFuncs, + &unix_handle, sizeof(unix_handle), NULL)) + return FALSE; - return driver && !__wine_init_unix_lib(hinstance, DLL_PROCESS_ATTACH, driver, &unix_funcs); + if (vk_unix_call(unix_init, &driver) || !driver) + return FALSE; + + unix_funcs = driver; + return TRUE; } static BOOL wine_vk_init_once(void) diff --git a/dlls/winevulkan/loader_thunks.h b/dlls/winevulkan/loader_thunks.h index f46cd9d4850..fd8877cecbe 100644 --- a/dlls/winevulkan/loader_thunks.h +++ b/dlls/winevulkan/loader_thunks.h @@ -431,4 +431,10 @@ struct unix_funcs BOOL (WINAPI *p_is_available_device_function)(VkDevice, const char *); }; +enum unix_call +{ + unix_init, + unix_count, +}; + #endif /* __WINE_VULKAN_LOADER_THUNKS_H */ diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index de391c81065..53d69964aaa 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2792,7 +2792,13 @@ class VkGenerator(object): f.write(" &{1}{0},\n".format(vk_func.name, prefix)) f.write(" &wine_vk_is_available_instance_function,\n") f.write(" &wine_vk_is_available_device_function,\n") + f.write("};\n\n") + + f.write("const unixlib_entry_t __wine_unix_call_funcs[] =\n") + f.write("{\n") + f.write(" init_vulkan,\n") f.write("};\n") + f.write("C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_count);\n") def generate_thunks_h(self, f, prefix): self._generate_copyright(f) @@ -2998,6 +3004,12 @@ class VkGenerator(object): f.write(" BOOL (WINAPI *p_is_available_device_function)(VkDevice, const char *);\n") f.write("};\n\n") + f.write("enum unix_call\n") + f.write("{\n") + f.write(" unix_init,\n") + f.write(" unix_count,\n") + f.write("};\n\n") + f.write("#endif /* __WINE_VULKAN_LOADER_THUNKS_H */\n") def generate_vulkan_h(self, f): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 6f90db9736e..e57f8efef99 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -23,19 +23,13 @@ #include "config.h" #include <time.h> -#include <stdarg.h> #include <stdlib.h> -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" +#include "vulkan_private.h" #include "winreg.h" #include "winuser.h" #include "winternl.h" -#include "vulkan_private.h" - WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t) @@ -68,7 +62,6 @@ static uint32_t wine_vk_count_struct_(void *s, VkStructureType t) } static const struct vulkan_funcs *vk_funcs; -static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); #define WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, object, native_handle) \ wine_vk_add_handle_mapping((instance), (uint64_t) (uintptr_t) (object), (uint64_t) (uintptr_t) (native_handle), &(object)->mapping) @@ -140,8 +133,7 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB wine_callback_data = *((VkDebugUtilsMessengerCallbackDataEXT *) callback_data); - object_name_infos = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, - wine_callback_data.objectCount * sizeof(*object_name_infos)); + object_name_infos = calloc(wine_callback_data.objectCount, sizeof(*object_name_infos)); for (i = 0; i < wine_callback_data.objectCount; i++) { @@ -156,7 +148,7 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB if (!object_name_infos[i].objectHandle) { WARN("handle conversion failed 0x%s\n", wine_dbgstr_longlong(callback_data->pObjects[i].objectHandle)); - RtlFreeHeap(GetProcessHeap(), 0, object_name_infos); + free(object_name_infos); return VK_FALSE; } } @@ -171,7 +163,7 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB /* applications should always return VK_FALSE */ result = object->user_callback(severity, message_types, &wine_callback_data, object->user_data); - RtlFreeHeap(GetProcessHeap(), 0, object_name_infos); + free(object_name_infos); return result; } @@ -422,13 +414,10 @@ static void wine_vk_device_free(struct VkDevice_T *device) free(device); } -NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *driver, void *ptr_out) +NTSTATUS init_vulkan(void *args) { - if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; - - vk_funcs = driver; - p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); - *(const struct unix_funcs **)ptr_out = &loader_funcs; + vk_funcs = *(const struct vulkan_funcs **)args; + *(const struct unix_funcs **)args = &loader_funcs; return STATUS_SUCCESS; } @@ -962,6 +951,10 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) { VkResult res; + static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); + if (!p_vkEnumerateInstanceVersion) + p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); + if (p_vkEnumerateInstanceVersion) { res = p_vkEnumerateInstanceVersion(version); diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index e20583cecab..e636de934fd 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -20,9 +20,16 @@ #ifndef __WINE_VULKAN_LOADER_H #define __WINE_VULKAN_LOADER_H +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/vulkan.h" #include "wine/vulkan_driver.h" +#include "wine/unixlib.h" #include "loader_thunks.h" @@ -63,5 +70,11 @@ void *wine_vk_get_phys_dev_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; extern const struct unix_funcs *unix_funcs; +extern unixlib_handle_t unix_handle DECLSPEC_HIDDEN; + +static inline NTSTATUS vk_unix_call(enum unix_call code, void *params) +{ + return __wine_unix_call(unix_handle, code, params); +} #endif /* __WINE_VULKAN_LOADER_H */ diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 6aa60f8c9ae..83a26988e8b 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -210,6 +210,8 @@ BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_is_type_wrapped(VkObjectType type) DECLSPEC_HIDDEN; uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) DECLSPEC_HIDDEN; +NTSTATUS init_vulkan(void *args) DECLSPEC_HIDDEN; + extern const struct unix_funcs loader_funcs; BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) DECLSPEC_HIDDEN; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index e0c8ea28b28..0e8d000b6da 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -9088,3 +9088,9 @@ const struct unix_funcs loader_funcs = &wine_vk_is_available_instance_function, &wine_vk_is_available_device_function, }; + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + init_vulkan, +}; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_count);

1 0

Zhiyi Zhang : comctl32/button: Avoid drawing over content in themed group boxes.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 66cb0ab34acbca82423ccdeccb95895859b759fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=66cb0ab34acbca82423ccdec… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 9 16:13:06 2021 +0800 comctl32/button: Avoid drawing over content in themed group boxes. Fix a regression from 7c9cacd, in which a ExcludeClipRect() call was removed by mistake. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52080 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 9e0ed8a8987..063149e91a4 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2877,12 +2877,13 @@ cleanup: static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT clientRect, contentRect, imageRect, textRect, bgRect; + RECT clientRect, contentRect, labelRect, imageRect, textRect, bgRect; HRGN region, textRegion = NULL; LOGFONTW lf; HFONT font, hPrevFont = NULL; BOOL created_font = FALSE; TEXTMETRICW textMetric; + LONG style; int part; HRESULT hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); @@ -2900,22 +2901,32 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in } GetClientRect(infoPtr->hwnd, &clientRect); - contentRect = clientRect; region = set_control_clipping(hDC, &clientRect); - bgRect = contentRect; + bgRect = clientRect; GetTextMetricsW(hDC, &textMetric); bgRect.top += (textMetric.tmHeight / 2) - 1; - InflateRect(&contentRect, -7, 1); - dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &contentRect, &imageRect, &textRect); + labelRect = clientRect; + InflateRect(&labelRect, -7, 1); + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); if (dtFlags != (UINT)-1 && !show_image_only(infoPtr)) { textRegion = CreateRectRgnIndirect(&textRect); ExtSelectClipRgn(hDC, textRegion, RGN_DIFF); } - part = GetWindowLongW(infoPtr->hwnd, GWL_STYLE) & BS_PUSHLIKE ? BP_PUSHBUTTON : BP_GROUPBOX; + style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + if (style & BS_PUSHLIKE) + { + part = BP_PUSHBUTTON; + } + else + { + part = BP_GROUPBOX; + GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &contentRect); + ExcludeClipRect(hDC, contentRect.left, contentRect.top, contentRect.right, contentRect.bottom); + } if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL);

1 0

Jacek Caban : winevulkan: Use KeUserModeCallback for debug callbacks.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: bfc3a28670cc9b6d79868df7c4bd65dc981a36d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfc3a28670cc9b6d79868df7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 9 03:15:49 2021 +0100 winevulkan: Use KeUserModeCallback for debug callbacks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 2 +- dlls/winevulkan/loader.c | 19 ++++++++++++++++- dlls/winevulkan/vulkan.c | 46 +++++++++++++++++++++++++++++------------ dlls/winevulkan/vulkan_loader.h | 26 +++++++++++++++++++++++ include/ntuser.h | 3 +++ 5 files changed, 81 insertions(+), 15 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index e489bcda17a..78bc1fddfc2 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -214,7 +214,7 @@ static void dpiaware_init(void) } -static const void *kernel_callback_table[] = +static const void *kernel_callback_table[NtUserCallCount] = { User32CallEnumDisplayMonitor, }; diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index bea60b07245..534e6646c3a 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -19,7 +19,7 @@ #include "vulkan_loader.h" #include "winreg.h" -#include "winuser.h" +#include "ntuser.h" #include "initguid.h" #include "devguid.h" #include "setupapi.h" @@ -373,8 +373,21 @@ void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, fill_luid_property(properties2); } +static BOOL WINAPI call_vulkan_debug_report_callback( struct wine_vk_debug_report_params *params, ULONG size ) +{ + return params->user_callback(params->flags, params->object_type, params->object_handle, params->location, + params->code, params->layer_prefix, params->message, params->user_data); +} + +static BOOL WINAPI call_vulkan_debug_utils_callback( struct wine_vk_debug_utils_params *params, ULONG size ) +{ + return params->user_callback(params->severity, params->message_types, &params->data, params->user_data); +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { + void **kernel_callback_table; + TRACE("%p, %u, %p\n", hinst, reason, reserved); switch (reason) @@ -382,6 +395,10 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) case DLL_PROCESS_ATTACH: hinstance = hinst; DisableThreadLibraryCalls(hinst); + + kernel_callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; + kernel_callback_table[NtUserCallVulkanDebugReportCallback] = call_vulkan_debug_report_callback; + kernel_callback_table[NtUserCallVulkanDebugUtilsCallback] = call_vulkan_debug_utils_callback; break; } return TRUE; diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index e57f8efef99..84146d4287b 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -27,8 +27,7 @@ #include "vulkan_private.h" #include "winreg.h" -#include "winuser.h" -#include "winternl.h" +#include "ntuser.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); @@ -115,9 +114,11 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB const VkDebugUtilsMessengerCallbackDataEXT_host *callback_data, void *user_data) { - struct VkDebugUtilsMessengerCallbackDataEXT wine_callback_data; + struct wine_vk_debug_utils_params params; VkDebugUtilsObjectNameInfoEXT *object_name_infos; struct wine_debug_utils_messenger *object; + void *ret_ptr; + ULONG ret_len; VkBool32 result; unsigned int i; @@ -131,11 +132,16 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB return VK_FALSE; } - wine_callback_data = *((VkDebugUtilsMessengerCallbackDataEXT *) callback_data); + /* FIXME: we should pack all referenced structs instead of passing pointers */ + params.user_callback = object->user_callback; + params.user_data = object->user_data; + params.severity = severity; + params.message_types = message_types; + params.data = *((VkDebugUtilsMessengerCallbackDataEXT *) callback_data); - object_name_infos = calloc(wine_callback_data.objectCount, sizeof(*object_name_infos)); + object_name_infos = calloc(params.data.objectCount, sizeof(*object_name_infos)); - for (i = 0; i < wine_callback_data.objectCount; i++) + for (i = 0; i < params.data.objectCount; i++) { object_name_infos[i].sType = callback_data->pObjects[i].sType; object_name_infos[i].pNext = callback_data->pObjects[i].pNext; @@ -158,10 +164,11 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB } } - wine_callback_data.pObjects = object_name_infos; + params.data.pObjects = object_name_infos; /* applications should always return VK_FALSE */ - result = object->user_callback(severity, message_types, &wine_callback_data, object->user_data); + result = KeUserModeCallback( NtUserCallVulkanDebugUtilsCallback, &params, sizeof(params), + &ret_ptr, &ret_len ); free(object_name_infos); @@ -171,7 +178,10 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB static VkBool32 debug_report_callback_conversion(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT object_type, uint64_t object_handle, size_t location, int32_t code, const char *layer_prefix, const char *message, void *user_data) { + struct wine_vk_debug_report_params params; struct wine_debug_report_callback *object; + void *ret_ptr; + ULONG ret_len; TRACE("%#x, %#x, 0x%s, 0x%s, %d, %p, %p, %p\n", flags, object_type, wine_dbgstr_longlong(object_handle), wine_dbgstr_longlong(location), code, layer_prefix, message, user_data); @@ -184,12 +194,22 @@ static VkBool32 debug_report_callback_conversion(VkDebugReportFlagsEXT flags, Vk return VK_FALSE; } - object_handle = wine_vk_get_wrapper(object->instance, object_handle); - if (!object_handle) - object_type = VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT; + /* FIXME: we should pack all referenced structs instead of passing pointers */ + params.user_callback = object->user_callback; + params.user_data = object->user_data; + params.flags = flags; + params.object_type = object_type; + params.location = location; + params.code = code; + params.layer_prefix = layer_prefix; + params.message = message; - return object->user_callback( - flags, object_type, object_handle, location, code, layer_prefix, message, object->user_data); + params.object_handle = wine_vk_get_wrapper(object->instance, object_handle); + if (!params.object_handle) + params.object_type = VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT; + + return KeUserModeCallback( NtUserCallVulkanDebugReportCallback, &params, sizeof(params), + &ret_ptr, &ret_len ); } static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index e636de934fd..b589ba3ba6b 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -69,6 +69,32 @@ void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_phys_dev_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; +/* debug callbacks params */ + +struct wine_vk_debug_utils_params +{ + PFN_vkDebugUtilsMessengerCallbackEXT user_callback; + void *user_data; + + VkDebugUtilsMessageSeverityFlagBitsEXT severity; + VkDebugUtilsMessageTypeFlagsEXT message_types; + VkDebugUtilsMessengerCallbackDataEXT data; +}; + +struct wine_vk_debug_report_params +{ + PFN_vkDebugReportCallbackEXT user_callback; + void *user_data; + + VkDebugReportFlagsEXT flags; + VkDebugReportObjectTypeEXT object_type; + uint64_t object_handle; + size_t location; + int32_t code; + const char *layer_prefix; + const char *message; +}; + extern const struct unix_funcs *unix_funcs; extern unixlib_handle_t unix_handle DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 9583b78acf2..25505e701b8 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -27,6 +27,9 @@ enum { NtUserCallEnumDisplayMonitor, + NtUserCallVulkanDebugReportCallback, + NtUserCallVulkanDebugUtilsCallback, + NtUserCallCount }; /* NtUserCallEnumDisplayMonitor params */

1 0

Ziqing Hui : user32/tests: Call Destroy{icon, cursor}() before GetIconInfo().
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 3b26e293bc45817b91979a17da4dddfbaf193056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b26e293bc45817b91979a17… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Dec 9 11:20:55 2021 +0800 user32/tests: Call Destroy{icon, cursor}() before GetIconInfo(). For icons/cursors created by CreateIconFromResource(), GetIconInfo() still succeed after they were destroyed, which indicates that these icons/cursors are shared. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index a4bdc4f13cf..d73650e08f7 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1589,12 +1589,16 @@ static void test_CreateIconFromResource(void) SetLastError(0xdeadbeef); handle = CreateIconFromResource((PBYTE) hotspot, CRSR_RES_SIZE, FALSE, 0x00030000); ok(handle != NULL, "Create cursor failed.\n"); + ret = DestroyCursor(handle); + ok(ret, "Destroy cursor failed, error %u.\n", GetLastError()); /* Test the icon information. */ SetLastError(0xdeadbeef); ret = GetIconInfo(handle, &icon_info); + todo_wine ok(ret, "GetIconInfo() failed.\n"); error = GetLastError(); + todo_wine ok(error == 0xdeadbeef, "Last error: %u\n", error); if (ret) @@ -1612,30 +1616,31 @@ static void test_CreateIconFromResource(void) ICONINFOEXA infoex; infoex.cbSize = sizeof(infoex); ret = pGetIconInfoExA( handle, &infoex ); + todo_wine ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); + if (ret) + { ok( infoex.wResID == 0, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); ok( infoex.szModName[0] == 0, "GetIconInfoEx wrong module %s\n", infoex.szModName ); ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); + } } - /* Clean up. */ - SetLastError(0xdeadbeef); - ret = DestroyCursor(handle); - ok(ret, "DestroyCursor() failed.\n"); - error = GetLastError(); - ok(error == 0xdeadbeef, "Last error: %u\n", error); - /* Test creating an icon. */ SetLastError(0xdeadbeef); handle = CreateIconFromResource((PBYTE) icon_header, ICON_RES_SIZE, TRUE, 0x00030000); ok(handle != NULL, "Create icon failed.\n"); + ret = DestroyIcon(handle); + ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); /* Test the icon information. */ SetLastError(0xdeadbeef); ret = GetIconInfo(handle, &icon_info); + todo_wine ok(ret, "GetIconInfo() failed.\n"); error = GetLastError(); + todo_wine ok(error == 0xdeadbeef, "Last error: %u\n", error); if (ret) @@ -1648,13 +1653,6 @@ static void test_CreateIconFromResource(void) ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); } - /* Clean up. */ - SetLastError(0xdeadbeef); - ret = DestroyCursor(handle); - ok(ret, "DestroyCursor() failed.\n"); - error = GetLastError(); - ok(error == 0xdeadbeef, "Last error: %u\n", error); - /* Rejection of NULL pointer crashes at least on WNT4WSSP6, W2KPROSP4, WXPPROSP3 * * handle = CreateIconFromResource(NULL, ICON_RES_SIZE, TRUE, 0x00030000); @@ -1667,12 +1665,16 @@ static void test_CreateIconFromResource(void) empty_anicursor.frames[0].data.icon_info.idEntries[0].yHotspot = 3; handle = CreateIconFromResource((PBYTE) &empty_anicursor, sizeof(empty_anicursor), FALSE, 0x00030000); ok(handle != NULL, "Create cursor failed.\n"); + ret = DestroyCursor(handle); + ok(ret, "Destroy cursor failed, error %u.\n", GetLastError()); /* Test the animated cursor's information. */ SetLastError(0xdeadbeef); ret = GetIconInfo(handle, &icon_info); + todo_wine ok(ret, "GetIconInfo() failed.\n"); error = GetLastError(); + todo_wine ok(error == 0xdeadbeef, "Last error: %u\n", error); if (ret) @@ -1685,13 +1687,6 @@ static void test_CreateIconFromResource(void) ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); } - /* Clean up. */ - SetLastError(0xdeadbeef); - ret = DestroyCursor(handle); - ok(ret, "DestroyCursor() failed.\n"); - error = GetLastError(); - ok(error == 0xdeadbeef, "Last error: %u\n", error); - /* Test creating and destroying a non-shared icon. */ handle = CreateIconFromResourceEx((BYTE *)icon_header, ICON_RES_SIZE, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE);

1 0

Jacek Caban : ntdll: Temporarily allow KeUserModeCallback calls from client stack.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 1facdbbdcb871a5bcd727702a6a9910de8d038a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1facdbbdcb871a5bcd727702… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 9 03:15:04 2021 +0100 ntdll: Temporarily allow KeUserModeCallback calls from client stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 8 ++++++++ dlls/ntdll/unix/signal_arm64.c | 8 ++++++++ dlls/ntdll/unix/signal_i386.c | 8 ++++++++ dlls/ntdll/unix/signal_x86_64.c | 8 ++++++++ include/wine/unixlib.h | 2 ++ 5 files changed, 34 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index ebc08984adf..2b25fb11caa 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -700,6 +700,14 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void { struct user_callback_frame callback_frame = { { 0 }, ret_ptr, ret_len }; + /* if we have no syscall frame, call the callback directly */ + if ((char *)&callback_frame < (char *)ntdll_get_thread_data()->kernel_stack || + (char *)&callback_frame > (char *)arm_thread_data()->syscall_frame) + { + NTSTATUS (WINAPI *func)(const void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + return func( args, len ); + } + if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&callback_frame) return STATUS_STACK_OVERFLOW; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index f2612412366..3f62927e482 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -738,6 +738,14 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void { struct user_callback_frame callback_frame = { {{ 0 }}, ret_ptr, ret_len }; + /* if we have no syscall frame, call the callback directly */ + if ((char *)&callback_frame < (char *)ntdll_get_thread_data()->kernel_stack || + (char *)&callback_frame > (char *)arm64_thread_data()->syscall_frame) + { + NTSTATUS (WINAPI *func)(const void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + return func( args, len ); + } + if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&callback_frame) return STATUS_STACK_OVERFLOW; diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index bf3abc1a587..6bb5649e2b5 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1569,6 +1569,14 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void { struct user_callback_frame callback_frame = { { 0 }, ret_ptr, ret_len }; + /* if we have no syscall frame, call the callback directly */ + if ((char *)&callback_frame < (char *)ntdll_get_thread_data()->kernel_stack || + (char *)&callback_frame > (char *)x86_thread_data()->syscall_frame) + { + NTSTATUS (WINAPI *func)(const void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + return func( args, len ); + } + if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&callback_frame) return STATUS_STACK_OVERFLOW; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d32e38875a4..46dfa0c94c1 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2293,6 +2293,14 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void { struct user_callback_frame callback_frame = { { 0 }, ret_ptr, ret_len }; + /* if we have no syscall frame, call the callback directly */ + if ((char *)&callback_frame < (char *)ntdll_get_thread_data()->kernel_stack || + (char *)&callback_frame > (char *)amd64_thread_data()->syscall_frame) + { + NTSTATUS (WINAPI *func)(const void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + return func( args, len ); + } + if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&callback_frame) return STATUS_STACK_OVERFLOW; diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 942eb3cfd9c..a7cfb8f6cab 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -80,6 +80,8 @@ extern void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); } \ } while (0); +NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ); + /* wide char string functions */ static inline size_t ntdll_wcslen( const WCHAR *str )

1 0

Jinoh Kang : server: Fix querying debug port with restricted DACL.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 3e2f44300300eb80f1ac1208aac8bc59e5e6131d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e2f44300300eb80f1ac1208… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Dec 8 00:29:02 2021 +0900 server: Fix querying debug port with restricted DACL. Today, Wine uses NtQueryInformationProcess/ProcessDebugPort to detect whether the current process is being debugged. If it is, the process issues a breakpoint to yield control to the debugger. Some debuggers (e.g. latest CDB) appear to create debug handles with restricted DACL, which causes querying debug port to fail with STATUS_ACCESS_DENIED. This results in the debuggee erroneously skipping the initial breakpoint. Fix this by not requiring DEBUG_ALL_ACCESS when opening the debug port object. Instead, use MAXIMUM_ALLOWED for the access mask. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52184 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 4 ---- server/process.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 9d446c0f872..5bcccd8a322 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -3518,20 +3518,16 @@ static void test_debuggee_dbgport(int argc, char **argv) status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugPort, &debug_port, sizeof(debug_port), NULL ); - todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) ok( !status, "NtQueryInformationProcess ProcessDebugPort failed, status %#x.\n", status ); - todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) ok( debug_port == ~(DWORD_PTR)0, "Expected port %#lx, got %#lx.\n", ~(DWORD_PTR)0, debug_port ); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL ); - todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) ok( !status, "NtQueryInformationProcess ProcessDebugFlags failed, status %#x.\n", status ); expect_status = access ? STATUS_SUCCESS : STATUS_ACCESS_DENIED; status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugObjectHandle, &handle, sizeof(handle), NULL ); - todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) ok( status == expect_status, "NtQueryInformationProcess ProcessDebugObjectHandle expected status %#x, actual %#x.\n", expect_status, status ); if (SUCCEEDED( status )) NtClose( handle ); diff --git a/server/process.c b/server/process.c index 6d794ba5ead..81c94a3c81d 100644 --- a/server/process.c +++ b/server/process.c @@ -1528,7 +1528,7 @@ DECL_HANDLER(get_process_debug_info) reply->debug_children = process->debug_children; if (!process->debug_obj) set_error( STATUS_PORT_NOT_SET ); - else reply->debug = alloc_handle( current->process, process->debug_obj, DEBUG_ALL_ACCESS, 0 ); + else reply->debug = alloc_handle( current->process, process->debug_obj, MAXIMUM_ALLOWED, 0 ); release_object( process ); }

1 0

Zhiyi Zhang : comctl32/button: Support image list margin for buttons with BS_CENTER or BS_VCENTER.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: feb0b73a3c7281dee923cdcfb5ebf4ae954cdc7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb0b73a3c7281dee923cdcf… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 9 16:13:13 2021 +0800 comctl32/button: Support image list margin for buttons with BS_CENTER or BS_VCENTER. WinSCP uses image list margin to adjust image position on a button when theming is on. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52076 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 063149e91a4..72c1a17402c 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1156,7 +1156,10 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe switch (style & BS_CENTER) { case BS_CENTER: - innerRect->left = outerRect->left + (outerRect->right - outerRect->left - width) / 2; + /* The left and right margins are added to the inner rectangle to get a new rectangle. Then + * the new rectangle is adjusted to be in the horizontal center */ + innerRect->left = outerRect->left + (outerRect->right - outerRect->left - width + + margin->left - margin->right) / 2; innerRect->right = innerRect->left + width; break; case BS_RIGHT: @@ -1182,7 +1185,10 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe break; case BS_VCENTER: default: - innerRect->top = outerRect->top + (outerRect->bottom - outerRect->top - height) / 2; + /* The top and bottom margins are added to the inner rectangle to get a new rectangle. Then + * the new rectangle is adjusted to be in the vertical center */ + innerRect->top = outerRect->top + (outerRect->bottom - outerRect->top - height + + margin->top - margin->bottom) / 2; innerRect->bottom = innerRect->top + height; break; }

1 0

Zhiyi Zhang : comctl32/button: Remove useless calculation when drawing themed group boxes.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 743045b279bfe8f82de5cd883e666961feb78b07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=743045b279bfe8f82de5cd88… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 9 16:12:59 2021 +0800 comctl32/button: Remove useless calculation when drawing themed group boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index d537629fa35..9e0ed8a8987 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2922,9 +2922,6 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (dtFlags != (UINT)-1) { - contentRect.left--; - contentRect.right++; - contentRect.bottom++; if (textRegion) { SelectClipRgn(hDC, textRegion);

1 0

Jinoh Kang : ntdll/tests: Add tests for DebugPort* info query with security checks.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: ee4d38c3b1daced5c956e651edf57026118e17de URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee4d38c3b1daced5c956e651… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Dec 8 00:27:50 2021 +0900 ntdll/tests: Add tests for DebugPort* info query with security checks. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 170 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index b16fa4da22f..9d446c0f872 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -46,6 +46,8 @@ static NTSTATUS (WINAPI * pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void static NTSTATUS (WINAPI * pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); static NTSTATUS (WINAPI * pNtSetInformationDebugObject)(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); static NTSTATUS (WINAPI * pDbgUiConvertStateChangeStructure)(DBGUI_WAIT_STATE_CHANGE*,DEBUG_EVENT*); +static HANDLE (WINAPI * pDbgUiGetThreadDebugObject)(void); +static void (WINAPI * pDbgUiSetThreadDebugObject)(HANDLE); static BOOL is_wow64; @@ -99,6 +101,8 @@ static void InitFunctionPtrs(void) NTDLL_GET_PROC(NtSetInformationDebugObject); NTDLL_GET_PROC(NtGetCurrentProcessorNumber); NTDLL_GET_PROC(DbgUiConvertStateChangeStructure); + NTDLL_GET_PROC(DbgUiGetThreadDebugObject); + NTDLL_GET_PROC(DbgUiSetThreadDebugObject); pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -2027,6 +2031,127 @@ static void test_query_process_debug_port(int argc, char **argv) ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); } +static void subtest_query_process_debug_port_custom_dacl(int argc, char **argv, ACCESS_MASK access, PSID sid) +{ + HANDLE old_debug_obj, debug_obj; + OBJECT_ATTRIBUTES attr; + SECURITY_DESCRIPTOR sd; + union { + ACL acl; + DWORD buffer[(sizeof(ACL) + + (offsetof(ACCESS_ALLOWED_ACE, SidStart) + SECURITY_MAX_SID_SIZE) + + sizeof(DWORD) - 1) / sizeof(DWORD)]; + } acl; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si; + DEBUG_EVENT ev; + NTSTATUS status; + BOOL ret; + + InitializeAcl(&acl.acl, sizeof(acl), ACL_REVISION); + AddAccessAllowedAce(&acl.acl, ACL_REVISION, access, sid); + InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION); + SetSecurityDescriptorDacl(&sd, TRUE, &acl.acl, FALSE); + + InitializeObjectAttributes(&attr, NULL, 0, NULL, &sd); + status = NtCreateDebugObject(&debug_obj, MAXIMUM_ALLOWED, &attr, DEBUG_KILL_ON_CLOSE); + ok(SUCCEEDED(status), "Failed to create debug object: %#010x\n", status); + if (!SUCCEEDED(status)) return; + + old_debug_obj = pDbgUiGetThreadDebugObject(); + pDbgUiSetThreadDebugObject(debug_obj); + + sprintf(cmdline, "%s %s %s %u", argv[0], argv[1], "debuggee:dbgport", access); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, + DEBUG_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + if (!ret) goto close_debug_obj; + + do + { + ret = WaitForDebugEvent(&ev, INFINITE); + ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + + ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); + ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + } while (ev.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); + + wait_child_process(pi.hProcess); + ret = CloseHandle(pi.hThread); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + +close_debug_obj: + pDbgUiSetThreadDebugObject(old_debug_obj); + NtClose(debug_obj); +} + +static TOKEN_OWNER *get_current_owner(void) +{ + TOKEN_OWNER *owner; + ULONG length = 0; + HANDLE token; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &token); + ok(ret, "Failed to get process token: %u\n", GetLastError()); + + ret = GetTokenInformation(token, TokenOwner, NULL, 0, &length); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "GetTokenInformation failed: %u\n", GetLastError()); + ok(length != 0, "Failed to get token owner information length: %u\n", GetLastError()); + + owner = HeapAlloc(GetProcessHeap(), 0, length); + ret = GetTokenInformation(token, TokenOwner, owner, length, &length); + ok(ret, "Failed to get token owner information: %u)\n", GetLastError()); + + CloseHandle(token); + return owner; +} + +static void test_query_process_debug_port_custom_dacl(int argc, char **argv) +{ + static const ACCESS_MASK all_access_masks[] = { + GENERIC_ALL, + DEBUG_ALL_ACCESS, + STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE, + }; + TOKEN_OWNER *owner; + int i; + + if (!pDbgUiSetThreadDebugObject) + { + skip("DbgUiGetThreadDebugObject not found\n"); + return; + } + + if (!pDbgUiGetThreadDebugObject) + { + skip("DbgUiSetThreadDebugObject not found\n"); + return; + } + + owner = get_current_owner(); + + for (i = 0; i < ARRAY_SIZE(all_access_masks); i++) + { + ACCESS_MASK access = all_access_masks[i]; + + winetest_push_context("debug object access %08x", access); + subtest_query_process_debug_port_custom_dacl(argc, argv, access, owner->Owner); + winetest_pop_context(); + } + + HeapFree(GetProcessHeap(), 0, owner); +} + static void test_query_process_priority(void) { PROCESS_PRIORITY_CLASS priority[2]; @@ -3374,6 +3499,45 @@ static void test_process_instrumentation_callback(void) "Got unexpected status %#x.\n", status ); } +static void test_debuggee_dbgport(int argc, char **argv) +{ + NTSTATUS status, expect_status; + DWORD_PTR debug_port = 0xdeadbeef; + DWORD debug_flags = 0xdeadbeef; + HANDLE handle; + ACCESS_MASK access; + + if (argc < 2) + { + ok(0, "insufficient arguments for child process\n"); + return; + } + + access = strtoul(argv[1], NULL, 0); + winetest_push_context("debug object access %08x", access); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugPort, + &debug_port, sizeof(debug_port), NULL ); + todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) + ok( !status, "NtQueryInformationProcess ProcessDebugPort failed, status %#x.\n", status ); + todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) + ok( debug_port == ~(DWORD_PTR)0, "Expected port %#lx, got %#lx.\n", ~(DWORD_PTR)0, debug_port ); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugFlags, + &debug_flags, sizeof(debug_flags), NULL ); + todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) + ok( !status, "NtQueryInformationProcess ProcessDebugFlags failed, status %#x.\n", status ); + + expect_status = access ? STATUS_SUCCESS : STATUS_ACCESS_DENIED; + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugObjectHandle, + &handle, sizeof(handle), NULL ); + todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) + ok( status == expect_status, "NtQueryInformationProcess ProcessDebugObjectHandle expected status %#x, actual %#x.\n", expect_status, status ); + if (SUCCEEDED( status )) NtClose( handle ); + + winetest_pop_context(); +} + START_TEST(info) { char **argv; @@ -3382,7 +3546,11 @@ START_TEST(info) InitFunctionPtrs(); argc = winetest_get_mainargs(&argv); - if (argc >= 3) return; /* Child */ + if (argc >= 3) + { + if (strcmp(argv[2], "debuggee:dbgport") == 0) test_debuggee_dbgport(argc - 2, argv + 2); + return; /* Child */ + } /* NtQuerySystemInformation */ test_query_basic(); @@ -3416,6 +3584,7 @@ START_TEST(info) test_query_process_vm(); test_query_process_times(); test_query_process_debug_port(argc, argv); + test_query_process_debug_port_custom_dacl(argc, argv); test_query_process_priority(); test_query_process_handlecount(); test_query_process_wow64();

1 0