wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Jacek Caban : winevulkan: Move fill_luid_property and its callers to loader.c.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 2d3309d85491d14d6632cc5818e8a7270d75be9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d3309d85491d14d6632cc58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 14 17:58:34 2021 +0200 winevulkan: Move fill_luid_property and its callers to loader.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan.c | 95 ----------------------------------------- 2 files changed, 109 insertions(+), 95 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 199349b98c2..0966e2d9468 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -23,6 +23,9 @@ #include "winbase.h" #include "winreg.h" #include "winuser.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "vulkan_private.h" @@ -33,10 +36,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); */ #define WINE_VULKAN_ICD_VERSION 4 +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); + static HINSTANCE hinstance; static void *wine_vk_get_global_proc_addr(const char *name); +#define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t) +static void *wine_vk_find_struct_(void *s, VkStructureType t) +{ + VkBaseOutStructure *header; + + for (header = s; header; header = header->pNext) + { + if (header->sType == t) + return header; + } + + return NULL; +} + VkResult WINAPI wine_vkEnumerateInstanceLayerProperties(uint32_t *count, VkLayerProperties *properties) { TRACE("%p, %p\n", count, properties); @@ -186,6 +206,95 @@ VkResult WINAPI wine_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supporte return VK_SUCCESS; } +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + +/* Wait until graphics driver is loaded by explorer */ +static void wait_graphics_driver_ready(void) +{ + static BOOL ready = FALSE; + + if (!ready) + { + SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); + ready = TRUE; + } +} + +static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) +{ + static const WCHAR pci[] = {'P','C','I',0}; + VkPhysicalDeviceIDProperties *id; + SP_DEVINFO_DATA device_data; + DWORD type, device_idx = 0; + HDEVINFO devinfo; + HANDLE mutex; + GUID uuid; + LUID luid; + + if (!(id = wine_vk_find_struct(properties2, PHYSICAL_DEVICE_ID_PROPERTIES))) + return; + + wait_graphics_driver_ready(); + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pci, NULL, 0); + device_data.cbSize = sizeof(device_data); + while (SetupDiEnumDeviceInfo(devinfo, device_idx++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_GPU_VULKAN_UUID, + &type, (BYTE *)&uuid, sizeof(uuid), NULL, 0)) + continue; + + if (!IsEqualGUID(&uuid, id->deviceUUID)) + continue; + + if (SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof(luid), NULL, 0)) + { + memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); + id->deviceLUIDValid = VK_TRUE; + id->deviceNodeMask = 1; + break; + } + } + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + + TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08x:%08x deviceNodeMask:%#x.\n", + properties2->properties.deviceName, id->deviceLUIDValid, luid.HighPart, luid.LowPart, + id->deviceNodeMask); +} + +void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties2) +{ + TRACE("%p, %p\n", phys_dev, properties2); + + thunk_vkGetPhysicalDeviceProperties2(phys_dev, properties2); + fill_luid_property(properties2); +} + +void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties2) +{ + TRACE("%p, %p\n", phys_dev, properties2); + + thunk_vkGetPhysicalDeviceProperties2KHR(phys_dev, properties2); + fill_luid_property(properties2); +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8f65da35f52..fbcbe4721a3 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -26,17 +26,11 @@ #include "winbase.h" #include "winreg.h" #include "winuser.h" -#include "initguid.h" -#include "devguid.h" -#include "setupapi.h" #include "vulkan_private.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); -DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); - #define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t) static void *wine_vk_find_struct_(void *s, VkStructureType t) { @@ -1525,95 +1519,6 @@ VkResult WINAPI wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDe return res; } -static HANDLE get_display_device_init_mutex(void) -{ - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; - HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); - - WaitForSingleObject(mutex, INFINITE); - return mutex; -} - -static void release_display_device_init_mutex(HANDLE mutex) -{ - ReleaseMutex(mutex); - CloseHandle(mutex); -} - -/* Wait until graphics driver is loaded by explorer */ -static void wait_graphics_driver_ready(void) -{ - static BOOL ready = FALSE; - - if (!ready) - { - SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); - ready = TRUE; - } -} - -static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) -{ - static const WCHAR pci[] = {'P','C','I',0}; - VkPhysicalDeviceIDProperties *id; - SP_DEVINFO_DATA device_data; - DWORD type, device_idx = 0; - HDEVINFO devinfo; - HANDLE mutex; - GUID uuid; - LUID luid; - - if (!(id = wine_vk_find_struct(properties2, PHYSICAL_DEVICE_ID_PROPERTIES))) - return; - - wait_graphics_driver_ready(); - mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pci, NULL, 0); - device_data.cbSize = sizeof(device_data); - while (SetupDiEnumDeviceInfo(devinfo, device_idx++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_GPU_VULKAN_UUID, - &type, (BYTE *)&uuid, sizeof(uuid), NULL, 0)) - continue; - - if (!IsEqualGUID(&uuid, id->deviceUUID)) - continue; - - if (SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, - (BYTE *)&luid, sizeof(luid), NULL, 0)) - { - memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); - id->deviceLUIDValid = VK_TRUE; - id->deviceNodeMask = 1; - break; - } - } - SetupDiDestroyDeviceInfoList(devinfo); - release_display_device_init_mutex(mutex); - - TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08x:%08x deviceNodeMask:%#x.\n", - properties2->properties.deviceName, id->deviceLUIDValid, luid.HighPart, luid.LowPart, - id->deviceNodeMask); -} - -void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, - VkPhysicalDeviceProperties2 *properties2) -{ - TRACE("%p, %p\n", phys_dev, properties2); - - thunk_vkGetPhysicalDeviceProperties2(phys_dev, properties2); - fill_luid_property(properties2); -} - -void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, - VkPhysicalDeviceProperties2 *properties2) -{ - TRACE("%p, %p\n", phys_dev, properties2); - - thunk_vkGetPhysicalDeviceProperties2KHR(phys_dev, properties2); - fill_luid_property(properties2); -} - void WINAPI wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice phys_dev, const VkPhysicalDeviceExternalSemaphoreInfo *semaphore_info, VkExternalSemaphoreProperties *properties) {

1 0

Jacek Caban : winevulkan: Remove native_vkGetInstanceProcAddrWINE.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 1cc6b4921a21de5a3ccb8a4443a8ceac8a23187f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cc6b4921a21de5a3ccb8a44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 14 17:58:21 2021 +0200 winevulkan: Remove native_vkGetInstanceProcAddrWINE. It was needed for use cases like DXVK winelib builds. It was never really adopted and it's problematic for PE builds. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan.c | 14 -------------- dlls/winevulkan/winevulkan.spec | 1 - 3 files changed, 16 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f090095a89b..fcb5c4610f2 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2684,7 +2684,6 @@ class VkGenerator(object): f.write("@ stdcall -private vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr\n") f.write("@ stdcall -private vk_icdGetPhysicalDeviceProcAddr(ptr str) wine_vk_icdGetPhysicalDeviceProcAddr\n") f.write("@ stdcall -private vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion\n") - f.write("@ cdecl -norelay native_vkGetInstanceProcAddrWINE(ptr str)\n") # Export symbols for all Vulkan Core functions. for func in self.registry.funcs.values(): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 45beea97240..8f65da35f52 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1972,17 +1972,3 @@ VkResult WINAPI wine_vkDebugMarkerSetObjectNameEXT(VkDevice device, const VkDebu return thunk_vkDebugMarkerSetObjectNameEXT(device, &wine_name_info); } - -/* - * Wrapper around driver vkGetInstanceProcAddr implementation. - * Allows winelib applications to access Vulkan functions with Wine - * additions and native ABI. - */ -void *native_vkGetInstanceProcAddrWINE(VkInstance instance, const char *name) -{ - wine_vk_init_once(); - if (!vk_funcs) - return NULL; - - return vk_funcs->p_vkGetInstanceProcAddr(instance, name); -} diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index b9644ac41bb..cad282b1978 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -11,7 +11,6 @@ @ stdcall -private vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr @ stdcall -private vk_icdGetPhysicalDeviceProcAddr(ptr str) wine_vk_icdGetPhysicalDeviceProcAddr @ stdcall -private vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion -@ cdecl -norelay native_vkGetInstanceProcAddrWINE(ptr str) @ stdcall -private wine_vkAcquireNextImage2KHR(ptr ptr ptr) @ stdcall -private wine_vkAcquireNextImageKHR(ptr int64 int64 int64 int64 ptr) @ stdcall -private wine_vkAllocateCommandBuffers(ptr ptr ptr)

1 0

Zebediah Figura : ntoskrnl/tests: Add some tests for HID devices.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: e3460ceb625f82535ec9f66e4c628cb88f1eddea URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3460ceb625f82535ec9f66e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 09:40:00 2021 -0500 ntoskrnl/tests: Add some tests for HID devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 + dlls/ntoskrnl.exe/tests/driver.h | 2 + dlls/ntoskrnl.exe/tests/driver_hid.c | 276 ++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver_hid.spec | 1 + dlls/ntoskrnl.exe/tests/driver_pnp.c | 1 - dlls/ntoskrnl.exe/tests/ntoskrnl.c | 268 +++++++++++++++++++++++++------ dlls/ntoskrnl.exe/tests/utils.h | 18 +++ 7 files changed, 516 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3460ceb625f82535ec9…

1 0

Zebediah Figura : hidclass.sys: Zero-initialize the HID_DEVICE_ATTRIBUTES structure.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 8c87a2618eca349c59779690a9f09a7bc1f782a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c87a2618eca349c59779690… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 09:39:59 2021 -0500 hidclass.sys: Zero-initialize the HID_DEVICE_ATTRIBUTES structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5a4ebf8b42b..f7985d298d8 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -75,7 +75,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) DEVICE_OBJECT *device = NULL; NTSTATUS status; minidriver *minidriver; - HID_DEVICE_ATTRIBUTES attr; + HID_DEVICE_ATTRIBUTES attr = {0}; BASE_DEVICE_EXTENSION *ext = NULL; HID_DESCRIPTOR descriptor; BYTE *reportDescriptor;

1 0

Zebediah Figura : ntoskrnl: Forbid unloading a driver with running root PnP devices.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 364df14842bc1267b2de16bdc1eece9d34d910e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364df14842bc1267b2de16bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 09:39:58 2021 -0500 ntoskrnl: Forbid unloading a driver with running root PnP devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bb9f4bf5259..0580231d8e3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3842,6 +3842,7 @@ error: NTSTATUS WINAPI ZwUnloadDriver( const UNICODE_STRING *service_name ) { struct wine_rb_entry *entry; + struct wine_driver *driver; UNICODE_STRING drv_name; TRACE( "(%s)\n", debugstr_us(service_name) ); @@ -3856,6 +3857,13 @@ NTSTATUS WINAPI ZwUnloadDriver( const UNICODE_STRING *service_name ) ERR( "failed to locate driver %s\n", debugstr_us(service_name) ); return STATUS_OBJECT_NAME_NOT_FOUND; } + driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); + + if (!list_empty( &driver->root_pnp_devices )) + { + ERR( "cannot unload driver %s which still has running PnP devices\n", debugstr_us(service_name) ); + return STATUS_UNSUCCESSFUL; + } unload_driver( entry, NULL );

1 0

Zebediah Figura : ntoskrnl: Remove the device from the root device list in IRP_MN_REMOVE_DEVICE.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 5bf72a75e3b5bad6b5e744164ec78833eed09090 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bf72a75e3b5bad6b5e74416… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 09:39:57 2021 -0500 ntoskrnl: Remove the device from the root device list in IRP_MN_REMOVE_DEVICE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 0d9d816e3c0..095344b1073 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -955,10 +955,13 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) break; case IRP_MN_START_DEVICE: case IRP_MN_SURPRISE_REMOVAL: - case IRP_MN_REMOVE_DEVICE: /* Nothing to do. */ irp->IoStatus.u.Status = STATUS_SUCCESS; break; + case IRP_MN_REMOVE_DEVICE: + list_remove( &root_device->entry ); + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; case IRP_MN_QUERY_CAPABILITIES: irp->IoStatus.u.Status = STATUS_SUCCESS; break;

1 0

Hugh McMaster : reg/tests: Compare 'query'test output with expected output.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 5983247c3a5a7b5b64498a2cdff0eadf5edc47b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5983247c3a5a7b5b64498a2c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 14 22:47:41 2021 +1000 reg/tests: Compare 'query'test output with expected output. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 4 -- programs/reg/tests/export.c | 2 - programs/reg/tests/query.c | 120 ++++++++++++++++++++++++++++++++++++++++-- programs/reg/tests/reg_test.h | 5 ++ 4 files changed, 120 insertions(+), 11 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 2c5a8f34ce2..30e5fe55667 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -18,10 +18,6 @@ #include "reg_test.h" -#define TODO_REG_TYPE (0x0001u) -#define TODO_REG_SIZE (0x0002u) -#define TODO_REG_DATA (0x0004u) - BOOL run_reg_exe_(const char *file, unsigned line, const char *cmd, DWORD *rc) { STARTUPINFOA si = {sizeof(STARTUPINFOA)}; diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 5296ebb1e06..4e5ac4c71d9 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -18,8 +18,6 @@ #include "reg_test.h" -#define TODO_REG_COMPARE (0x0008u) - #define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) static BOOL compare_export_(const char *file, unsigned line, const char *filename, const char *expected, DWORD todo) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index d397f36fc09..af0cc3848a4 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -19,10 +19,111 @@ #include "reg_test.h" +static void read_from_pipe(HANDLE child_proc_stdout, BYTE *buf, DWORD buf_size) +{ + DWORD read, len = 0; + BOOL ret; + + while (1) + { + ret = ReadFile(child_proc_stdout, buf + len, buf_size - len, &read, NULL); + if (!ret || !read) break; + + len += read; + } + + buf[len] = 0; +} + +#define read_reg_output(c,b,s,r) read_reg_output_(__FILE__,__LINE__,c,b,s,r) +static BOOL read_reg_output_(const char *file, unsigned line, const char *cmd, + BYTE *buf, DWORD buf_size, DWORD *rc) +{ + SECURITY_ATTRIBUTES sa; + HANDLE pipe_stdout_rd, pipe_stdout_wr; + STARTUPINFOA si = {0}; + PROCESS_INFORMATION pi; + char cmdline[256]; + BOOL bret; + DWORD ret; + + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + + if (!CreatePipe(&pipe_stdout_rd, &pipe_stdout_wr, &sa, 0)) + return FALSE; + + if (!SetHandleInformation(pipe_stdout_rd, HANDLE_FLAG_INHERIT, 0)) + return FALSE; + + si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = INVALID_HANDLE_VALUE; + si.hStdOutput = pipe_stdout_wr; + si.hStdError = INVALID_HANDLE_VALUE; + + strcpy(cmdline, cmd); + if (!CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) + return FALSE; + + CloseHandle(pipe_stdout_wr); + + read_from_pipe(pipe_stdout_rd, buf, buf_size); + + ret = WaitForSingleObject(pi.hProcess, 10000); + if (ret == WAIT_TIMEOUT) + TerminateProcess(pi.hProcess, 1); + + bret = GetExitCodeProcess(pi.hProcess, rc); + lok(bret, "GetExitCodeProcess failed: %d\n", GetLastError()); + + CloseHandle(pipe_stdout_rd); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + return bret; +} + +#define compare_query(b,e,todo) compare_query_(__FILE__,__LINE__,b,e,todo) +static void compare_query_(const char *file, unsigned line, const BYTE *buf, + const char *expected, DWORD todo) +{ + todo_wine_if (todo & TODO_REG_COMPARE) + lok(!strcmp((char *)buf, expected), "query output does not match expected output\n"); +} + +/* Unit tests */ + static void test_query(void) { + const char *test1 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n" + " Test2 REG_DWORD 0x123\r\n\r\n"; + + const char *test2 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n\r\n"; + + const char *test3 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n" + " Test2 REG_DWORD 0x123\r\n" + " Wine REG_SZ First instance\r\n\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey\r\n"; + + const char *test4 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey\r\n" + " Test3 REG_SZ Some string data\r\n" + " Test4 REG_DWORD 0xabc\r\n\r\n"; + + const char *test5 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey\r\n" + " Test4 REG_DWORD 0xabc\r\n\r\n"; + DWORD r, dword = 0x123; HKEY key, subkey; + BYTE buf[512]; delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -59,15 +160,17 @@ static void test_query(void) run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE, &r); + read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test1, 0); run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1", &r); + read_reg_output("reg query HKCU\\" KEY_BASE " /v Test1", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test2, 0); run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test2", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -75,19 +178,26 @@ static void test_query(void) add_value(key, "Wine", REG_SZ, "First instance", 15); /* Create a test subkey */ - add_key(key, "Subkey", &subkey); + add_key(key, "subkey", &subkey); + + read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test3, TODO_REG_COMPARE); + add_value(subkey, "Test3", REG_SZ, "Some string data", 16); dword = 0xabc; add_value(subkey, "Test4", REG_DWORD, &dword, sizeof(dword)); - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r); + read_reg_output("reg query HKCU\\" KEY_BASE "\\subkey", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test4, 0); run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test3", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test4", &r); + read_reg_output("reg query HKCU\\" KEY_BASE "\\subkey /v Test4", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test5, 0); add_value(subkey, "Wine", REG_SZ, "Second instance", 16); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 14afa02930c..6718e91096f 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -30,6 +30,11 @@ #define REG_EXIT_SUCCESS 0 #define REG_EXIT_FAILURE 1 +#define TODO_REG_TYPE (0x0001u) +#define TODO_REG_SIZE (0x0002u) +#define TODO_REG_DATA (0x0004u) +#define TODO_REG_COMPARE (0x0008u) + /* add.c */ #define run_reg_exe(c,r) run_reg_exe_(__FILE__,__LINE__,c,r) BOOL run_reg_exe_(const char *file, unsigned line, const char *cmd, DWORD *rc);

1 0

Hugh McMaster : reg/tests: Give 'query' tests some structure.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 5bc2af7b1cf2e4e56311dad77acd8f67b3b7a13f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bc2af7b1cf2e4e56311dad7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 14 22:47:40 2021 +1000 reg/tests: Give 'query' tests some structure. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 57 +++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 3ae79d05524..d397f36fc09 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -21,14 +21,8 @@ static void test_query(void) { - DWORD r; + DWORD r, dword = 0x123; HKEY key, subkey; - const char hello[] = "Hello"; - const char world[] = "World"; - const char empty1[] = "Empty1"; - const char empty2[] = "Empty2"; - const DWORD dword1 = 0x123; - const DWORD dword2 = 0xabc; delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -47,8 +41,8 @@ static void test_query(void) /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, &key); - add_value(key, "Test", REG_SZ, hello, sizeof(hello)); - add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1)); + add_value(key, "Test1", REG_SZ, "Hello, World", 13); + add_value(key, "Test2", REG_DWORD, &dword, sizeof(dword)); run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -56,65 +50,62 @@ static void test_query(void) run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /v Wine", &r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1 /v Test2", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /ve", &r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1 /ve", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg query HKCU\\" KEY_BASE, &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), "got exit code %d, expected 0\n", r); - add_value(key, NULL, REG_SZ, empty1, sizeof(empty1)); - - run_reg_exe("reg query HKCU\\" KEY_BASE, &r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test", &r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test2", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + add_value(key, "Wine", REG_SZ, "First instance", 15); /* Create a test subkey */ add_key(key, "Subkey", &subkey); - add_value(subkey, "Test", REG_SZ, world, sizeof(world)); - add_value(subkey, "Wine", REG_DWORD, &dword2, sizeof(dword2)); - add_value(subkey, NULL, REG_SZ, empty2, sizeof(empty2)); - - close_key(subkey); + add_value(subkey, "Test3", REG_SZ, "Some string data", 16); + dword = 0xabc; + add_value(subkey, "Test4", REG_DWORD, &dword, sizeof(dword)); run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test", &r); + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test3", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Wine", &r); + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test4", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + add_value(subkey, "Wine", REG_SZ, "Second instance", 16); /* Test recursion */ run_reg_exe("reg query HKCU\\" KEY_BASE " /s", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /s", &r); - ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, - "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine /s", &r); ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, "got exit code %d, expected 0\n", r); + add_value(key, NULL, REG_SZ, "Empty", 6); + add_value(subkey, NULL, REG_SZ, "Empty", 6); + close_key(subkey); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /ve /s", &r); ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg/tests: Reorder failing 'query' tests.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 3d772fe408970f6a1aad02321f21706408dd92e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d772fe408970f6a1aad0232… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 14 22:47:39 2021 +1000 reg/tests: Reorder failing 'query' tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index e2b438f8c92..3ae79d05524 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -47,24 +47,33 @@ static void test_query(void) /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, &key); + add_value(key, "Test", REG_SZ, hello, sizeof(hello)); + add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1)); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /v Wine", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), "got exit code %d, expected 0\n", r); - add_value(key, "Test", REG_SZ, hello, sizeof(hello)); - add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1)); add_value(key, NULL, REG_SZ, empty1, sizeof(empty1)); run_reg_exe("reg query HKCU\\" KEY_BASE, &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -74,12 +83,6 @@ static void test_query(void) run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /v Wine", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /ve", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - /* Create a test subkey */ add_key(key, "Subkey", &subkey); add_value(subkey, "Test", REG_SZ, world, sizeof(world)); @@ -116,9 +119,6 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - /* Clean-up, then query */ delete_key(key, "subkey"); close_key(key);

1 0

Dmitry Timoshkov : crypt32/tests: Remove Win9x checks.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 3038c0cd1af549847aa32549f305eb0e5612d8dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3038c0cd1af549847aa32549… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 14 13:15:02 2021 +0300 crypt32/tests: Remove Win9x checks. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/msg.c | 75 +++++++++--------------------------------------- 1 file changed, 14 insertions(+), 61 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 45b923204ba..39cb74b751b 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -29,7 +29,6 @@ #include "wine/test.h" -static BOOL have_nt = TRUE; static BOOL old_crypt32 = FALSE; static char oid_rsa_md5[] = szOID_RSA_MD5; @@ -403,27 +402,20 @@ static void test_data_msg_update(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, CMSG_DATA, NULL, NULL, NULL); - if (have_nt) - { - /* Doesn't appear to be able to update CMSG-DATA with non-final updates. - * On Win9x, this sometimes succeeds, sometimes fails with - * GetLastError() == 0, so it's not worth checking there. - */ - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - ok(!ret && - (GetLastError() == E_INVALIDARG || - broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ - "Expected E_INVALIDARG, got %x\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - ok(!ret && - (GetLastError() == E_INVALIDARG || - broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ - "Expected E_INVALIDARG, got %x\n", GetLastError()); - } - else - skip("not updating CMSG_DATA with a non-final update\n"); + + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + ok(!ret && + (GetLastError() == E_INVALIDARG || + broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ + "Expected E_INVALIDARG, got %x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + ok(!ret && + (GetLastError() == E_INVALIDARG || + broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ + "Expected E_INVALIDARG, got %x\n", GetLastError()); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); @@ -1047,8 +1039,6 @@ static void test_hash_msg(void) static const CHAR cspNameA[] = { 'W','i','n','e','C','r','y','p','t','T','e', 'm','p',0 }; -static const WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e', - 'm','p',0 }; static BYTE serialNum[] = { 1 }; static BYTE encodedCommonName[] = { 0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03, 0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00 }; @@ -3576,39 +3566,6 @@ static void test_msg_control(void) CryptMsgClose(msg); } -/* win9x has much less parameter checks and will crash on many tests - * this code is from test_signed_msg_update() - */ -static BOOL detect_nt(void) -{ - BOOL ret; - CMSG_SIGNER_ENCODE_INFO signer = { sizeof(signer), 0 }; - CERT_INFO certInfo = { 0 }; - - certInfo.SerialNumber.cbData = sizeof(serialNum); - certInfo.SerialNumber.pbData = serialNum; - certInfo.Issuer.cbData = sizeof(encodedCommonName); - certInfo.Issuer.pbData = encodedCommonName; - signer.pCertInfo = &certInfo; - signer.HashAlgorithm.pszObjId = oid_rsa_md5; - - ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, - PROV_RSA_FULL, CRYPT_NEWKEYSET); - if (!ret && GetLastError() == NTE_EXISTS) { - ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, - PROV_RSA_FULL, 0); - } - - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) return FALSE; - - /* cleanup */ - CryptReleaseContext(signer.hCryptProv, 0); - CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, PROV_RSA_FULL, - CRYPT_DELETEKEYSET); - - return TRUE; -} - static void test_msg_get_and_verify_signer(void) { BOOL ret; @@ -3737,10 +3694,6 @@ static void test_msg_get_and_verify_signer(void) START_TEST(msg) { - have_nt = detect_nt(); - if (!have_nt) - win_skip("Win9x crashes on some parameter checks\n"); - /* I_CertUpdateStore can be used for verification if crypt32 is new enough */ if (!GetProcAddress(GetModuleHandleA("crypt32.dll"), "I_CertUpdateStore")) {

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021