January 2020 - Wine-Devel - list.winehq.org

[PATCH 2/9] dbghelp: Fix MiniDumpWriteDump spec file entry
by André Hentschel Jan. 8, 2020

Jan. 8, 2020

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/dbghelp/dbghelp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 4c06f87d12b..6ffa82da926 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -27,7 +27,7 @@ @ stdcall MakeSureDirectoryPathExists(str) @ stdcall MapDebugInformation(long str str long) @ stdcall MiniDumpReadDumpStream(ptr long ptr ptr ptr) -@ stdcall MiniDumpWriteDump(ptr long ptr long long long long) +@ stdcall MiniDumpWriteDump(ptr long ptr long ptr ptr ptr) @ stdcall SearchTreeForFile(str str ptr) @ stdcall SearchTreeForFileW(wstr wstr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) -- 2.17.1

1 0

[PATCH 1/9] comctl32: Fix Str_SetPtr[AW] spec file entries
by André Hentschel Jan. 8, 2020

Jan. 8, 2020

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/comctl32/comctl32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 34d9e7650d3..e84eff4b8a5 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -35,9 +35,9 @@ 167 stdcall -noname AddMRUData(long ptr long) 169 stdcall -noname FindMRUData(long ptr long ptr) 233 stdcall -noname Str_GetPtrA(str str long) -234 stdcall -noname Str_SetPtrA(str str) +234 stdcall -noname Str_SetPtrA(ptr str) 235 stdcall -noname Str_GetPtrW(wstr wstr long) -236 stdcall -noname Str_SetPtrW(wstr wstr) +236 stdcall -noname Str_SetPtrW(ptr wstr) 320 stdcall -ordinal DSA_Create(long long) 321 stdcall -ordinal DSA_Destroy(ptr) 322 stdcall -ordinal DSA_GetItem(ptr long ptr) -- 2.17.1

1 0

[PATCH] setupapi/tests: Remove an unused variable.
by Thomas Faber Jan. 8, 2020

Jan. 8, 2020

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/setupapi/tests/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 68478b5d80a..a02752d2de3 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1446,7 +1446,7 @@ static void test_register_device_iface(void) 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'E','n','u','m','\\','R','o','o','t','\\', 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; - SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}, ret_iface = {sizeof(ret_iface)}; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; SP_DEVINFO_DATA device = {sizeof(device)}; HDEVINFO set, set2; BOOL ret; -- 2.16.1.windows.2

1 0

[PATCH] user32/tests: Add some more SetScrollInfo() tests.
by Nikolay Sivov Jan. 8, 2020

Jan. 8, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/scroll.c | 76 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index fbc94a6d68..9c892ed484 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -561,6 +561,8 @@ static void test_SetScrollInfo(void) ret = IsWindowEnabled(hScroll); ok(!ret, "scroll bar enabled\n"); + ret = IsWindowVisible(hScroll); + ok(!ret, "Unexpected visible state.\n"); memset(&si, 0, sizeof(si)); si.cbSize = sizeof(si); @@ -581,6 +583,8 @@ static void test_SetScrollInfo(void) SetScrollInfo(hScroll, SB_CTL, &si, TRUE); ret = IsWindowEnabled(hScroll); ok(!ret, "scroll bar enabled\n"); + ret = IsWindowVisible(hScroll); + ok(!ret, "Unexpected visible state.\n"); si.fMask = 0xf; ret = GetScrollInfo(hScroll, SB_CTL, &si); @@ -588,6 +592,8 @@ static void test_SetScrollInfo(void) EnableScrollBar(hScroll, SB_CTL, ESB_ENABLE_BOTH); ok(IsWindowEnabled(hScroll), "expected enabled scrollbar\n"); + ret = IsWindowVisible(hScroll); + ok(!ret, "Unexpected visible state.\n"); si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; si.nMax = 10; @@ -597,6 +603,76 @@ static void test_SetScrollInfo(void) SetScrollInfo(hScroll, SB_CTL, &si, TRUE); ret = IsWindowEnabled(hScroll); ok(ret, "scroll bar disabled\n"); + ret = IsWindowVisible(hScroll); + ok(!ret, "Unexpected visible state.\n"); + + /* With visible window. */ + ShowWindow(mainwnd, SW_SHOW); + + ret = IsWindowVisible(hScroll); + ok(ret, "Unexpected visible state.\n"); + + EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); + ret = IsWindowEnabled(hScroll); + ok(!ret, "Unexpected enabled state.\n"); + + /* Enabled state is changed only for visible windows, and only with redraw flag. */ + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 100; + si.nMin = 10; + si.nPos = 0; + si.nPage = 50; + SetScrollInfo(hScroll, SB_CTL, &si, FALSE); + ret = IsWindowEnabled(hScroll); + ok(!ret, "Unexpected enabled state.\n"); + + /* State changes when called with same arguments too. */ + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 100; + si.nMin = 10; + si.nPos = 0; + si.nPage = 50; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); +todo_wine + ok(ret, "Unexpected enabled state.\n"); + + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 100; + si.nMin = 10; + si.nPos = 0; + si.nPage = 100; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); + ok(!ret, "Unexpected enabled state.\n"); + + EnableScrollBar(hScroll, SB_CTL, ESB_ENABLE_BOTH); + ret = IsWindowEnabled(hScroll); + ok(ret, "Unexpected enabled state.\n"); + + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 100; + si.nMin = 10; + si.nPos = 0; + si.nPage = 100; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); +todo_wine + ok(!ret, "Unexpected enabled state.\n"); + + EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); + ret = IsWindowEnabled(hScroll); + ok(!ret, "Unexpected enabled state.\n"); + + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 41; + si.nMin = 0; + si.nPos = 0; + si.nPage = 41; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); +todo_wine + ok(ret, "Unexpected enabled state.\n"); DestroyWindow(hScroll); DestroyWindow(mainwnd); -- 2.24.1

1 0

[PATCH vkd3d v2 1/2] vkd3d: Add support for KHR_timeline_semaphore extension.
by Rémi Bernon Jan. 8, 2020

Jan. 8, 2020

This also updates the Vulkan-Headers required version to 1.1.126, which is the first released SDK version that includes the extension. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- README | 2 +- configure.ac | 2 +- libs/vkd3d/device.c | 23 +++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 3 +++ libs/vkd3d/vulkan_procs.h | 3 +++ 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/README b/README index 3c70ede8..16535f43 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ similar, but not identical, to Direct3D 12. Building vkd3d ============== -Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.1.113). +Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.1.126). Vkd3d generates some of its headers from IDL files. If you are using the release tarballs, then these headers are pre-generated and are included. If diff --git a/configure.ac b/configure.ac index 355aaabf..7ff32073 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,7 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) -VKD3D_CHECK_VULKAN_HEADER_VERSION([113], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.113 is required.])]) +VKD3D_CHECK_VULKAN_HEADER_VERSION([126], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.126 is required.])]) AC_CHECK_DECL([SpvCapabilityDemoteToHelperInvocationEXT],, [AC_MSG_ERROR([SPIR-V headers are too old.])], [ #ifdef HAVE_SPIRV_UNIFIED1_SPIRV_H diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 757d4ac8..28d4975a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -127,6 +127,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(KHR_IMAGE_FORMAT_LIST, KHR_image_format_list), VK_EXTENSION(KHR_MAINTENANCE3, KHR_maintenance3), VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor), + VK_EXTENSION(KHR_TIMELINE_SEMAPHORE, KHR_timeline_semaphore), /* EXT extensions */ VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering), VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), @@ -664,6 +665,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; + VkPhysicalDeviceTimelineSemaphorePropertiesKHR timeline_semaphore_properties; VkPhysicalDeviceProperties2KHR properties2; @@ -675,6 +677,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT texel_buffer_alignment_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + VkPhysicalDeviceTimelineSemaphoreFeaturesKHR timeline_semaphore_features; VkPhysicalDeviceFeatures2 features2; }; @@ -693,8 +696,10 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; VkPhysicalDeviceMaintenance3Properties *maintenance3_properties; VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb_properties; + VkPhysicalDeviceTimelineSemaphorePropertiesKHR *timeline_semaphore_properties; VkPhysicalDevice physical_device = device->vk_physical_device; VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb_features; + VkPhysicalDeviceTimelineSemaphoreFeaturesKHR *timeline_semaphore_features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; memset(info, 0, sizeof(*info)); @@ -710,6 +715,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vertex_divisor_properties = &info->vertex_divisor_properties; xfb_features = &info->xfb_features; xfb_properties = &info->xfb_properties; + timeline_semaphore_properties = &info->timeline_semaphore_properties; + timeline_semaphore_features = &info->timeline_semaphore_features; info->features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; @@ -727,6 +734,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vk_prepend_struct(&info->features2, xfb_features); vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; vk_prepend_struct(&info->features2, vertex_divisor_features); + timeline_semaphore_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR; + vk_prepend_struct(&info->features2, timeline_semaphore_features); if (vulkan_info->KHR_get_physical_device_properties2) VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &info->features2)); @@ -745,6 +754,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vk_prepend_struct(&info->properties2, xfb_properties); vertex_divisor_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; vk_prepend_struct(&info->properties2, vertex_divisor_properties); + timeline_semaphore_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR; + vk_prepend_struct(&info->properties2, timeline_semaphore_properties); if (vulkan_info->KHR_get_physical_device_properties2) VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &info->properties2)); @@ -817,6 +828,7 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic const VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT *buffer_alignment; const VkPhysicalDeviceMaintenance3Properties *maintenance3; const VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb; + const VkPhysicalDeviceTimelineSemaphorePropertiesKHR *timeline_semaphore; TRACE("Device limits:\n"); TRACE(" maxImageDimension1D: %u.\n", limits->maxImageDimension1D); @@ -1021,6 +1033,10 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic divisor_properties = &info->vertex_divisor_properties; TRACE(" VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT:\n"); TRACE(" maxVertexAttribDivisor: %u.\n", divisor_properties->maxVertexAttribDivisor); + + timeline_semaphore = &info->timeline_semaphore_properties; + TRACE(" VkPhysicalDeviceTimelineSemaphorePropertiesKHR:\n"); + TRACE(" maxTimelineSemaphoreValueDifference: %"PRIu64".\n", timeline_semaphore->maxTimelineSemaphoreValueDifference); } static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_device_info *info) @@ -1033,6 +1049,7 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; const VkPhysicalDeviceFeatures *features = &info->features2.features; const VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb; + const VkPhysicalDeviceTimelineSemaphoreFeaturesKHR *timeline_semaphore; TRACE("Device features:\n"); TRACE(" robustBufferAccess: %#x.\n", features->robustBufferAccess); @@ -1165,6 +1182,10 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev divisor_features->vertexAttributeInstanceRateDivisor); TRACE(" vertexAttributeInstanceRateZeroDivisor: %#x.\n", divisor_features->vertexAttributeInstanceRateZeroDivisor); + + timeline_semaphore = &info->timeline_semaphore_features; + TRACE(" VkPhysicalDeviceTimelineSemaphoreFeaturesKHR:\n"); + TRACE(" timelineSemaphore: %#x.\n", timeline_semaphore->timelineSemaphore); } static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, @@ -1294,6 +1315,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->transform_feedback_queries = physical_device_info->xfb_properties.transformFeedbackQueries; vulkan_info->max_vertex_attrib_divisor = max(physical_device_info->vertex_divisor_properties.maxVertexAttribDivisor, 1); + vulkan_info->max_timeline_semaphore_value_difference = max(physical_device_info->timeline_semaphore_properties.maxTimelineSemaphoreValueDifference, 1); + device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; device->feature_options.OutputMergerLogicOp = features->logicOp; /* SPV_KHR_16bit_storage */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0c031d20..84abcb8d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -100,6 +100,7 @@ struct vkd3d_vulkan_info bool KHR_image_format_list; bool KHR_maintenance3; bool KHR_push_descriptor; + bool KHR_timeline_semaphore; /* EXT device extensions */ bool EXT_conditional_rendering; bool EXT_debug_marker; @@ -116,6 +117,8 @@ struct vkd3d_vulkan_info bool vertex_attrib_zero_divisor; unsigned int max_vertex_attrib_divisor; + uint64_t max_timeline_semaphore_value_difference; + VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index ec29eb45..d080278a 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -206,6 +206,9 @@ VK_DEVICE_EXT_PFN(vkCmdBindTransformFeedbackBuffersEXT) VK_DEVICE_EXT_PFN(vkCmdEndQueryIndexedEXT) VK_DEVICE_EXT_PFN(vkCmdEndTransformFeedbackEXT) +/* VK_KHR_timeline_semaphore */ +VK_DEVICE_EXT_PFN(vkSignalSemaphoreKHR) + #undef VK_INSTANCE_PFN #undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN -- 2.24.1

2 2

[PATCH] oleaut32/tests: Remove some workarounds for functions that are assumed to be available.
by Nikolay Sivov Jan. 8, 2020

Jan. 8, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- These exports are already used directly in existing tests. dlls/oleaut32/tests/safearray.c | 140 +++++++++++++------------------ dlls/oleaut32/tests/usrmarshal.c | 15 ++-- dlls/oleaut32/tests/varformat.c | 38 ++++----- 3 files changed, 81 insertions(+), 112 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 9cc3793bc7..af64211036 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -46,11 +46,9 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pSafeArrayAllocDescriptorEx)(VARTYPE,UINT,SAFEARRAY**); -static HRESULT (WINAPI *pSafeArrayCopyData)(SAFEARRAY*,SAFEARRAY*); static HRESULT (WINAPI *pSafeArrayGetVartype)(SAFEARRAY*,VARTYPE*); static HRESULT (WINAPI *pSafeArrayGetRecordInfo)(SAFEARRAY*,IRecordInfo**); static SAFEARRAY* (WINAPI *pSafeArrayCreateEx)(VARTYPE,UINT,SAFEARRAYBOUND*,LPVOID); -static SAFEARRAY* (WINAPI *pSafeArrayCreateVector)(VARTYPE,LONG,ULONG); #define GETPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func) @@ -616,13 +614,11 @@ static void test_safearray(void) ok(broken(vt == VT_UNKNOWN) || vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); } - if (pSafeArrayCopyData) { - hres = pSafeArrayCopyData(a, c); - ok(hres == S_OK, "failed to copy safearray data of vt %d with hres %x\n", vttypes[i].vt, hres); + hres = SafeArrayCopyData(a, c); + ok(hres == S_OK, "failed to copy safearray data of vt %d with hres %x\n", vttypes[i].vt, hres); - hres = SafeArrayDestroyData(c); - ok(hres == S_OK,"SADD of copy of array with vt %d failed with hres %x\n", vttypes[i].vt, hres); - } + hres = SafeArrayDestroyData(c); + ok(hres == S_OK,"SADD of copy of array with vt %d failed with hres %x\n", vttypes[i].vt, hres); hres = SafeArrayDestroy(c); ok(hres == S_OK,"SAD failed with hres %x\n", hres); @@ -939,12 +935,7 @@ static void test_VectorCreateLockDestroy(void) VARTYPE vt; int element; - if (!pSafeArrayCreateVector) - { - win_skip("SafeArrayCreateVector not supported\n"); - return; - } - sa = pSafeArrayCreateVector(VT_UI1, 0, 0); + sa = SafeArrayCreateVector(VT_UI1, 0, 0); ok(sa != NULL, "SACV with 0 elements failed.\n"); hres = SafeArrayDestroy(sa); @@ -957,7 +948,7 @@ static void test_VectorCreateLockDestroy(void) { DWORD dwLen = SAFEARRAY_GetVTSize(vt); - sa = pSafeArrayCreateVector(vt, 0, element); + sa = SafeArrayCreateVector(vt, 0, element); if (dwLen) ok(sa != NULL, "VARTYPE %d (@%d elements) failed\n", vt, element); @@ -1040,10 +1031,10 @@ test_LockUnlock_Vector: ok(hres == S_OK, "got 0x%08x\n", hres); } - if (bVector == FALSE && pSafeArrayCreateVector) + if (bVector == FALSE) { /* Test again with a vector */ - sa = pSafeArrayCreateVector(VT_UI1, 0, 100); + sa = SafeArrayCreateVector(VT_UI1, 0, 100); bVector = TRUE; goto test_LockUnlock_Vector; } @@ -1376,12 +1367,6 @@ static void test_SafeArrayCopyData(void) HRESULT hres; int dimension, size = 1, i; - if (!pSafeArrayCopyData) - { - win_skip("SafeArrayCopyData not supported\n"); - return; - } - for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++) { sab[dimension].lLbound = dimension * 2 + 2; @@ -1406,7 +1391,7 @@ static void test_SafeArrayCopyData(void) data[dimension] = dimension; } - hres = pSafeArrayCopyData(sa, sacopy); + hres = SafeArrayCopyData(sa, sacopy); ok(hres == S_OK, "copy data failed hres 0x%x\n", hres); if (hres == S_OK) { @@ -1414,33 +1399,33 @@ static void test_SafeArrayCopyData(void) } /* Failure cases */ - hres = pSafeArrayCopyData(NULL, sacopy); + hres = SafeArrayCopyData(NULL, sacopy); ok(hres == E_INVALIDARG, "Null copy source hres 0x%x\n", hres); - hres = pSafeArrayCopyData(sa, NULL); + hres = SafeArrayCopyData(sa, NULL); ok(hres == E_INVALIDARG, "Null copy hres 0x%x\n", hres); sacopy->rgsabound[0].cElements += 1; - hres = pSafeArrayCopyData(sa, sacopy); + hres = SafeArrayCopyData(sa, sacopy); ok(hres == E_INVALIDARG, "Bigger copy first dimension hres 0x%x\n", hres); sacopy->rgsabound[0].cElements -= 2; - hres = pSafeArrayCopyData(sa, sacopy); + hres = SafeArrayCopyData(sa, sacopy); ok(hres == E_INVALIDARG, "Smaller copy first dimension hres 0x%x\n", hres); sacopy->rgsabound[0].cElements += 1; sacopy->rgsabound[3].cElements += 1; - hres = pSafeArrayCopyData(sa, sacopy); + hres = SafeArrayCopyData(sa, sacopy); ok(hres == E_INVALIDARG, "Bigger copy last dimension hres 0x%x\n", hres); sacopy->rgsabound[3].cElements -= 2; - hres = pSafeArrayCopyData(sa, sacopy); + hres = SafeArrayCopyData(sa, sacopy); ok(hres == E_INVALIDARG, "Smaller copy last dimension hres 0x%x\n", hres); sacopy->rgsabound[3].cElements += 1; hres = SafeArrayDestroy(sacopy); ok(hres == S_OK, "got 0x%08x\n", hres); sacopy = NULL; - hres = pSafeArrayCopyData(sa, sacopy); + hres = SafeArrayCopyData(sa, sacopy); ok(hres == E_INVALIDARG, "->Null copy hres 0x%x\n", hres); hres = SafeArrayCopy(sa, &sacopy); @@ -1828,32 +1813,30 @@ static void test_SafeArrayChangeTypeEx(void) /* VT_VECTOR|VT_UI1 -> VT_BSTR */ hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); - if (pSafeArrayCreateVector) - { - sa = pSafeArrayCreateVector(VT_UI1, 0, strlen(szHello)+1); - ok(sa != NULL, "CreateVector() failed.\n"); - if (!sa) - return; - memcpy(sa->pvData, szHello, strlen(szHello)+1); - V_VT(&v) = VT_VECTOR|VT_UI1; - V_ARRAY(&v) = sa; - VariantInit(&v2); + sa = SafeArrayCreateVector(VT_UI1, 0, strlen(szHello)+1); + ok(sa != NULL, "CreateVector() failed.\n"); + if (!sa) + return; - hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_BSTR); - ok(hres == DISP_E_BADVARTYPE, "CTE VT_VECTOR|VT_UI1 returned %x\n", hres); + memcpy(sa->pvData, szHello, strlen(szHello)+1); + V_VT(&v) = VT_VECTOR|VT_UI1; + V_ARRAY(&v) = sa; + VariantInit(&v2); - /* (vector)VT_ARRAY|VT_UI1 -> VT_BSTR (In place) */ - V_VT(&v) = VT_ARRAY|VT_UI1; - hres = VariantChangeTypeEx(&v, &v, 0, 0, VT_BSTR); - ok(hres == S_OK, "CTE VT_ARRAY|VT_UI1 -> VT_BSTR failed with %x\n", hres); - if (hres == S_OK) - { - ok(V_VT(&v) == VT_BSTR, "CTE VT_ARRAY|VT_UI1 -> VT_BSTR did not return VT_BSTR, but %d.\n",V_VT(&v)); - ok(strcmp((char*)V_BSTR(&v),szHello) == 0,"Expected string '%s', got '%s'\n", szHello, - (char*)V_BSTR(&v)); - VariantClear(&v); - } + hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_BSTR); + ok(hres == DISP_E_BADVARTYPE, "CTE VT_VECTOR|VT_UI1 returned %x\n", hres); + + /* (vector)VT_ARRAY|VT_UI1 -> VT_BSTR (In place) */ + V_VT(&v) = VT_ARRAY|VT_UI1; + hres = VariantChangeTypeEx(&v, &v, 0, 0, VT_BSTR); + ok(hres == S_OK, "CTE VT_ARRAY|VT_UI1 -> VT_BSTR failed with %x\n", hres); + if (hres == S_OK) + { + ok(V_VT(&v) == VT_BSTR, "CTE VT_ARRAY|VT_UI1 -> VT_BSTR did not return VT_BSTR, but %d.\n",V_VT(&v)); + ok(strcmp((char*)V_BSTR(&v),szHello) == 0,"Expected string '%s', got '%s'\n", szHello, + (char*)V_BSTR(&v)); + VariantClear(&v); } /* To/from BSTR only works with arrays of VT_UI1 */ @@ -1889,33 +1872,30 @@ static void test_SafeArrayChangeTypeEx(void) /* Can't change an array of one type into array of another type , even * if the other type is the same size */ - if (pSafeArrayCreateVector) - { - sa = pSafeArrayCreateVector(VT_UI1, 0, 1); - ok(sa != NULL, "CreateVector() failed.\n"); - if (!sa) - return; + sa = SafeArrayCreateVector(VT_UI1, 0, 1); + ok(sa != NULL, "CreateVector() failed.\n"); + if (!sa) + return; - V_VT(&v) = VT_ARRAY|VT_UI1; - V_ARRAY(&v) = sa; - hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_ARRAY|VT_I1); - ok(hres == DISP_E_TYPEMISMATCH, "CTE VT_ARRAY|VT_UI1->VT_ARRAY|VT_I1 returned %x\n", hres); + V_VT(&v) = VT_ARRAY|VT_UI1; + V_ARRAY(&v) = sa; + hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_ARRAY|VT_I1); + ok(hres == DISP_E_TYPEMISMATCH, "CTE VT_ARRAY|VT_UI1->VT_ARRAY|VT_I1 returned %x\n", hres); - /* But can change to the same array type */ - hres = SafeArrayDestroy(sa); - ok(hres == S_OK, "got 0x%08x\n", hres); - sa = pSafeArrayCreateVector(VT_UI1, 0, 1); - ok(sa != NULL, "CreateVector() failed.\n"); - if (!sa) - return; - V_VT(&v) = VT_ARRAY|VT_UI1; - V_ARRAY(&v) = sa; - hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_ARRAY|VT_UI1); - ok(hres == S_OK, "CTE VT_ARRAY|VT_UI1->VT_ARRAY|VT_UI1 returned %x\n", hres); - hres = SafeArrayDestroy(sa); - ok(hres == S_OK, "got 0x%08x\n", hres); - VariantClear(&v2); - } + /* But can change to the same array type */ + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + sa = SafeArrayCreateVector(VT_UI1, 0, 1); + ok(sa != NULL, "CreateVector() failed.\n"); + if (!sa) + return; + V_VT(&v) = VT_ARRAY|VT_UI1; + V_ARRAY(&v) = sa; + hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_ARRAY|VT_UI1); + ok(hres == S_OK, "CTE VT_ARRAY|VT_UI1->VT_ARRAY|VT_UI1 returned %x\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + VariantClear(&v2); /* NULL/EMPTY */ MKARRAY(0,1,VT_UI1); @@ -2090,10 +2070,8 @@ START_TEST(safearray) has_i8 = GetProcAddress(hOleaut32, "VarI8FromI1") != NULL; GETPTR(SafeArrayAllocDescriptorEx); - GETPTR(SafeArrayCopyData); GETPTR(SafeArrayGetVartype); GETPTR(SafeArrayCreateEx); - GETPTR(SafeArrayCreateVector); GETPTR(SafeArrayGetRecordInfo); check_for_VT_INT_PTR(); diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 97c05024e5..4fc26f33c6 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -36,9 +36,7 @@ # define V_U2(A) (*(A)) #endif -static HRESULT (WINAPI *pSafeArrayGetIID)(SAFEARRAY*,GUID*); static HRESULT (WINAPI *pSafeArrayGetVartype)(SAFEARRAY*,VARTYPE*); -static HRESULT (WINAPI *pVarBstrCmp)(BSTR,BSTR,LCID,ULONG); static inline SF_TYPE get_union_type(SAFEARRAY *psa) { @@ -133,7 +131,7 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) return; } - if (!pSafeArrayGetVartype || !pSafeArrayGetIID) + if (!pSafeArrayGetVartype) return; if(FAILED(pSafeArrayGetVartype(lpsa, &vt))) @@ -165,7 +163,7 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) if(sftype == SF_HAVEIID) { GUID guid; - pSafeArrayGetIID(lpsa, &guid); + SafeArrayGetIID(lpsa, &guid); ok(IsEqualGUID(&guid, wiresa), "guid mismatch\n"); wiresa += sizeof(GUID); } @@ -474,8 +472,7 @@ static void test_marshal_LPSAFEARRAY(void) ok(hr == S_OK, "Failed to get bstr element at hres 0x%x\n", hr); if (hr == S_OK) { - if (pVarBstrCmp) - ok(pVarBstrCmp(values[i], gotvalue, 0, 0) == VARCMP_EQ, "String %d does not match\n", i); + ok(VarBstrCmp(values[i], gotvalue, 0, 0) == VARCMP_EQ, "String %d does not match\n", i); SysFreeString(gotvalue); } } @@ -1613,13 +1610,11 @@ START_TEST(usrmarshal) { HANDLE hOleaut32 = GetModuleHandleA("oleaut32.dll"); #define GETPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func) - GETPTR(SafeArrayGetIID); GETPTR(SafeArrayGetVartype); - GETPTR(VarBstrCmp); #undef GETPTR - if (!pSafeArrayGetIID || !pSafeArrayGetVartype) - win_skip("SafeArrayGetIID and/or SafeArrayGetVartype is not available, some tests will be skipped\n"); + if (!pSafeArrayGetVartype) + win_skip("SafeArrayGetVartype is not available, some tests will be skipped\n"); CoInitialize(NULL); diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index d713894870..394b97991e 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -39,7 +39,6 @@ static HMODULE hOleaut32; -static HRESULT (WINAPI *pVarBstrCmp)(BSTR,BSTR,LCID,ULONG); static HRESULT (WINAPI *pVarFormatNumber)(LPVARIANT,int,int,int,int,ULONG,BSTR*); static HRESULT (WINAPI *pVarFormat)(LPVARIANT,LPOLESTR,int,int,ULONG,BSTR*); static HRESULT (WINAPI *pVarWeekdayName)(int,int,int,ULONG,BSTR*); @@ -523,30 +522,27 @@ static void test_VarWeekdayName(void) "Null pointer: expected E_INVALIDARG, got 0x%08x\n", hres); /* Check all combinations */ - pVarBstrCmp = (void*)GetProcAddress(hOleaut32, "VarBstrCmp"); - if (pVarBstrCmp) - for (iWeekday = 1; iWeekday <= 7; ++iWeekday) + for (iWeekday = 1; iWeekday <= 7; ++iWeekday) + { + for (fAbbrev = 0; fAbbrev <= 1; ++fAbbrev) { - for (fAbbrev = 0; fAbbrev <= 1; ++fAbbrev) + /* 0 = Default, 1 = Sunday, 2 = Monday, .. */ + for (iFirstDay = 0; iFirstDay <= 7; ++iFirstDay) { - /* 0 = Default, 1 = Sunday, 2 = Monday, .. */ - for (iFirstDay = 0; iFirstDay <= 7; ++iFirstDay) - { - VARWDN_O(iWeekday, fAbbrev, iFirstDay, 0); - if (iFirstDay == 0) - firstDay = defaultFirstDay; - else - /* Translate from 0=Sunday to 0=Monday in the modulo 7 space */ - firstDay = iFirstDay - 2; - day = (7 + iWeekday - 1 + firstDay) % 7; - ok(VARCMP_EQ == pVarBstrCmp(out, dayNames[day][fAbbrev], - LOCALE_USER_DEFAULT, 0), - "VarWeekdayName(%d,%d,%d): got wrong dayname: '%s'\n", - iWeekday, fAbbrev, iFirstDay, buff); - SysFreeString(out); - } + VARWDN_O(iWeekday, fAbbrev, iFirstDay, 0); + if (iFirstDay == 0) + firstDay = defaultFirstDay; + else + /* Translate from 0=Sunday to 0=Monday in the modulo 7 space */ + firstDay = iFirstDay - 2; + day = (7 + iWeekday - 1 + firstDay) % 7; + ok(VARCMP_EQ == VarBstrCmp(out, dayNames[day][fAbbrev], LOCALE_USER_DEFAULT, 0), + "VarWeekdayName(%d,%d,%d): got wrong dayname: '%s'\n", + iWeekday, fAbbrev, iFirstDay, buff); + SysFreeString(out); } } + } /* Cleanup */ for (day = 0; day <= 6; ++day) -- 2.24.1

1 0

[PATCH] gdi32/tests: Remove workarounds for SetLayout().
by Nikolay Sivov Jan. 8, 2020

Jan. 8, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- It's already linked to directly in dib.c. dlls/gdi32/tests/bitmap.c | 39 +++++++++++++------------------------ dlls/gdi32/tests/dc.c | 40 ++++++++++++++++---------------------- dlls/gdi32/tests/mapping.c | 18 ++++++++--------- 3 files changed, 39 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 8f0f6601b3..fe3482671b 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -40,7 +40,6 @@ static NTSTATUS (WINAPI *pD3DKMTCreateDCFromMemory)( D3DKMT_CREATEDCFROMMEMORY * static NTSTATUS (WINAPI *pD3DKMTDestroyDCFromMemory)( const D3DKMT_DESTROYDCFROMMEMORY *desc ); static BOOL (WINAPI *pGdiAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); static BOOL (WINAPI *pGdiGradientFill)(HDC,TRIVERTEX*,ULONG,void*,ULONG,ULONG); -static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static inline int get_bitmap_stride( int width, int bpp ) { @@ -4216,15 +4215,9 @@ static void test_GetSetDIBits_rtl(void) int ret; DWORD bits_1[8 * 8], bits_2[8 * 8]; - if(!pSetLayout) - { - win_skip("Don't have SetLayout\n"); - return; - } - hdc = GetDC( NULL ); hdc_mem = CreateCompatibleDC( hdc ); - pSetLayout( hdc_mem, LAYOUT_LTR ); + SetLayout( hdc_mem, LAYOUT_LTR ); bitmap = CreateCompatibleBitmap( hdc, 8, 8 ); orig_bitmap = SelectObject( hdc_mem, bitmap ); @@ -4244,7 +4237,7 @@ static void test_GetSetDIBits_rtl(void) ok(ret == 8, "got %d\n", ret); ok(bits_1[56] == 0xff0000, "got %08x\n", bits_1[56]); /* check we have a red pixel */ - pSetLayout( hdc_mem, LAYOUT_RTL ); + SetLayout( hdc_mem, LAYOUT_RTL ); ret = GetDIBits( hdc_mem, bitmap, 0, 8, bits_2, &info, DIB_RGB_COLORS ); ok(ret == 8, "got %d\n", ret); @@ -4254,7 +4247,7 @@ static void test_GetSetDIBits_rtl(void) /* Now to show that SetDIBits also ignores the mode, we perform a SetDIBits followed by a GetDIBits and show that the bits remain unchanged. */ - pSetLayout( hdc_mem, LAYOUT_LTR ); + SetLayout( hdc_mem, LAYOUT_LTR ); ret = SetDIBits( hdc_mem, bitmap, 0, 8, bits_1, &info, DIB_RGB_COLORS ); ok(ret == 8, "got %d\n", ret); @@ -4262,7 +4255,7 @@ static void test_GetSetDIBits_rtl(void) ok(ret == 8, "got %d\n", ret); ok(!memcmp( bits_1, bits_2, sizeof(bits_1) ), "bits differ\n"); - pSetLayout( hdc_mem, LAYOUT_RTL ); + SetLayout( hdc_mem, LAYOUT_RTL ); ret = SetDIBits( hdc_mem, bitmap, 0, 8, bits_1, &info, DIB_RGB_COLORS ); ok(ret == 8, "got %d\n", ret); @@ -5165,19 +5158,16 @@ static void test_SetDIBitsToDevice(void) memset( dib_bits, 0xaa, 64 * 4 ); SetMapMode( hdc, MM_TEXT ); - if (pSetLayout) - { - pSetLayout( hdc, LAYOUT_RTL ); - ret = SetDIBitsToDevice( hdc, 1, 2, 3, 2, 1, 2, 1, 5, data, info, DIB_RGB_COLORS ); - ok( ret == 3, "got %d\n", ret ); - for (i = 0; i < 64; i++) - if (i == 36 || i == 37 || i == 38 || i == 44 || i == 45 || i == 46) - ok( dib_bits[i] == data[i - 27], "%d: got %08x\n", i, dib_bits[i] ); - else - ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); - memset( dib_bits, 0xaa, 64 * 4 ); - pSetLayout( hdc, LAYOUT_LTR ); - } + SetLayout( hdc, LAYOUT_RTL ); + ret = SetDIBitsToDevice( hdc, 1, 2, 3, 2, 1, 2, 1, 5, data, info, DIB_RGB_COLORS ); + ok( ret == 3, "got %d\n", ret ); + for (i = 0; i < 64; i++) + if (i == 36 || i == 37 || i == 38 || i == 44 || i == 45 || i == 46) + ok( dib_bits[i] == data[i - 27], "%d: got %08x\n", i, dib_bits[i] ); + else + ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); + memset( dib_bits, 0xaa, 64 * 4 ); + SetLayout( hdc, LAYOUT_LTR ); /* t-d -> b-u */ info->bmiHeader.biHeight = -8; @@ -5954,7 +5944,6 @@ START_TEST(bitmap) pD3DKMTDestroyDCFromMemory = (void *)GetProcAddress( hdll, "D3DKMTDestroyDCFromMemory" ); pGdiAlphaBlend = (void *)GetProcAddress( hdll, "GdiAlphaBlend" ); pGdiGradientFill = (void *)GetProcAddress( hdll, "GdiGradientFill" ); - pSetLayout = (void *)GetProcAddress( hdll, "SetLayout" ); test_createdibitmap(); test_dibsections(); diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 4f53e433b4..c8a903e56b 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -38,8 +38,6 @@ #define LAYOUT_LTR 0 #endif -static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); - static void test_dc_values(void) { HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -1002,27 +1000,24 @@ static void test_boundsrect(void) SetRect(&expect, 40, 70, 100, 130); ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); - if (pSetLayout) - { - pSetLayout( hdc, LAYOUT_RTL ); - ret = GetBoundsRect(hdc, &rect, 0); - ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); - SetRect(&expect, 159, 70, 99, 130); - ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); - SetRect(&set_rect, 50, 25, 30, 35); - ret = SetBoundsRect(hdc, &set_rect, DCB_SET); - ok(ret == (DCB_SET | DCB_DISABLE), "SetBoundsRect returned %x\n", ret); - ret = GetBoundsRect(hdc, &rect, 0); - ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); - SetRect(&expect, 50, 25, 30, 35); - ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); + SetLayout( hdc, LAYOUT_RTL ); + ret = GetBoundsRect(hdc, &rect, 0); + ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); + SetRect(&expect, 159, 70, 99, 130); + ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); + SetRect(&set_rect, 50, 25, 30, 35); + ret = SetBoundsRect(hdc, &set_rect, DCB_SET); + ok(ret == (DCB_SET | DCB_DISABLE), "SetBoundsRect returned %x\n", ret); + ret = GetBoundsRect(hdc, &rect, 0); + ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); + SetRect(&expect, 50, 25, 30, 35); + ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); - pSetLayout( hdc, LAYOUT_LTR ); - ret = GetBoundsRect(hdc, &rect, 0); - ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); - SetRect(&expect, 149, 25, 169, 35); - ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); - } + SetLayout( hdc, LAYOUT_LTR ); + ret = GetBoundsRect(hdc, &rect, 0); + ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); + SetRect(&expect, 149, 25, 169, 35); + ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); /* empty rect resets, except on nt4 */ SetRect(&expect, 20, 20, 10, 10); @@ -1642,7 +1637,6 @@ static void test_clip_box(void) START_TEST(dc) { - pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); test_dc_values(); test_savedc(); test_savedc_2(); diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 6635a72c18..ea6b7ac2cc 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -28,7 +28,6 @@ #include "winuser.h" #include "winerror.h" -static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); static INT (WINAPI *pGetRandomRgn)(HDC hDC, HRGN hRgn, INT iCode); static BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); @@ -247,9 +246,9 @@ static void test_dc_layout(void) HDC hdc; HRGN hrgn; - if (!pGetLayout || !pSetLayout) + if (!pGetLayout) { - win_skip( "Don't have SetLayout\n" ); + win_skip( "Don't have GetLayout\n" ); return; } @@ -271,7 +270,7 @@ static void test_dc_layout(void) expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); - pSetLayout( hdc, LAYOUT_RTL ); + SetLayout( hdc, LAYOUT_RTL ); if (!pGetLayout( hdc )) { win_skip( "SetLayout not supported\n" ); @@ -310,7 +309,7 @@ static void test_dc_layout(void) GetClipRgn( hdc, hrgn ); GetRgnBox( hrgn, &ret_rc ); ok( EqualRect( &rc, &ret_rc ), "wrong clip box %s\n", wine_dbgstr_rect( &ret_rc )); - pSetLayout( hdc, LAYOUT_LTR ); + SetLayout( hdc, LAYOUT_LTR ); SetRect( &rc, 80, 10, 90, 20 ); GetClipRgn( hdc, hrgn ); GetRgnBox( hrgn, &ret_rc ); @@ -318,7 +317,7 @@ static void test_dc_layout(void) GetClipBox( hdc, &ret_rc ); ok( EqualRect( &rc, &ret_rc ), "wrong clip box %s\n", wine_dbgstr_rect( &ret_rc )); IntersectClipRect( hdc, 80, 10, 85, 20 ); - pSetLayout( hdc, LAYOUT_RTL ); + SetLayout( hdc, LAYOUT_RTL ); SetRect( &rc, 15, 10, 20, 20 ); GetClipRgn( hdc, hrgn ); GetRgnBox( hrgn, &ret_rc ); @@ -326,9 +325,9 @@ static void test_dc_layout(void) GetClipBox( hdc, &ret_rc ); ok( EqualRect( &rc, &ret_rc ), "wrong clip box %s\n", wine_dbgstr_rect( &ret_rc )); SetRectRgn( hrgn, 60, 10, 80, 20 ); - pSetLayout( hdc, LAYOUT_LTR ); + SetLayout( hdc, LAYOUT_LTR ); ExtSelectClipRgn( hdc, hrgn, RGN_OR ); - pSetLayout( hdc, LAYOUT_RTL ); + SetLayout( hdc, LAYOUT_RTL ); SetRect( &rc, 15, 10, 40, 20 ); GetClipRgn( hdc, hrgn ); GetRgnBox( hrgn, &ret_rc ); @@ -370,7 +369,7 @@ static void test_dc_layout(void) SetMapMode(hdc, MM_TEXT); ret = GetMapMode( hdc ); ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); - pSetLayout( hdc, LAYOUT_LTR ); + SetLayout( hdc, LAYOUT_LTR ); ret = GetMapMode( hdc ); ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); SetMapMode(hdc, MM_TEXT); @@ -715,7 +714,6 @@ START_TEST(mapping) { HMODULE mod = GetModuleHandleA("gdi32.dll"); pGetLayout = (void *)GetProcAddress( mod, "GetLayout" ); - pSetLayout = (void *)GetProcAddress( mod, "SetLayout" ); pGetRandomRgn = (void *)GetProcAddress( mod, "GetRandomRgn" ); pGetTransform = (void *)GetProcAddress( mod, "GetTransform" ); pSetVirtualResolution = (void *)GetProcAddress( mod, "SetVirtualResolution" ); -- 2.24.1

1 0

[PATCH] gdi32/tests: Remove some workarounds in font tests.
by Nikolay Sivov Jan. 8, 2020

Jan. 8, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- All of these functions are already linked directly, in the same file. dlls/gdi32/tests/font.c | 91 +++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 57 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ccae09edc1..ea1bb960df 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -42,15 +42,10 @@ static inline BOOL match_off_by_n(int a, int b, unsigned int n) static LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height); static DWORD (WINAPI *pGdiGetCodePage)(HDC hdc); -static BOOL (WINAPI *pGetCharABCWidthsI)(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPABC abc); -static BOOL (WINAPI *pGetCharABCWidthsA)(HDC hdc, UINT first, UINT last, LPABC abc); -static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsFloatW)(HDC hdc, UINT first, UINT last, LPABCFLOAT abc); -static BOOL (WINAPI *pGetCharWidth32A)(HDC hdc, UINT first, UINT last, LPINT buffer); static BOOL (WINAPI *pGetCharWidth32W)(HDC hdc, UINT first, UINT last, LPINT buffer); static BOOL (WINAPI *pGetCharWidthInfo)(HDC hdc, void *); static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); -static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); static BOOL (WINAPI *pGetTextExtentExPointI)(HDC hdc, const WORD *indices, INT count, INT max_ext, LPINT nfit, LPINT dxs, LPSIZE size ); @@ -89,15 +84,10 @@ static void init(void) pGdiGetCharDimensions = (void *)GetProcAddress(hgdi32, "GdiGetCharDimensions"); pGdiGetCodePage = (void *) GetProcAddress(hgdi32,"GdiGetCodePage"); - pGetCharABCWidthsI = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsI"); - pGetCharABCWidthsA = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsA"); - pGetCharABCWidthsW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsW"); pGetCharABCWidthsFloatW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsFloatW"); - pGetCharWidth32A = (void *)GetProcAddress(hgdi32, "GetCharWidth32A"); pGetCharWidth32W = (void *)GetProcAddress(hgdi32, "GetCharWidth32W"); pGetCharWidthInfo = (void *)GetProcAddress(hgdi32, "GetCharWidthInfo"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); - pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); pGetTextExtentExPointI = (void *)GetProcAddress(hgdi32, "GetTextExtentExPointI"); pGdiRealizationInfo = (void *)GetProcAddress(hgdi32, "GdiRealizationInfo"); @@ -1137,13 +1127,13 @@ static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, con ABCFLOAT abcf[1]; BOOL ret = FALSE; - ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); + ret = GetCharABCWidthsI(hdc, 0, 1, glyphs, abc); ok(ret, "%s: GetCharABCWidthsI should have succeeded\n", description); ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); - ret = pGetCharABCWidthsW(hdc, 'i', 'i', abc); + ret = GetCharABCWidthsW(hdc, 'i', 'i', abc); ok(ret, "%s: GetCharABCWidthsW should have succeeded\n", description); ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); @@ -1209,9 +1199,9 @@ static void test_GetCharABCWidths(void) }; UINT i; - if (!pGetCharABCWidthsA || !pGetCharABCWidthsW || !pGetCharABCWidthsFloatW || !pGetCharABCWidthsI) + if (!pGetCharABCWidthsFloatW) { - win_skip("GetCharABCWidthsA/W/I not available on this platform\n"); + win_skip("GetCharABCWidthsFloatW is not available on this platform\n"); return; } @@ -1226,22 +1216,22 @@ static void test_GetCharABCWidths(void) nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); - ret = pGetCharABCWidthsI(NULL, 0, 1, glyphs, abc); + ret = GetCharABCWidthsI(NULL, 0, 1, glyphs, abc); ok(!ret, "GetCharABCWidthsI should have failed\n"); - ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, NULL); + ret = GetCharABCWidthsI(hdc, 0, 1, glyphs, NULL); ok(!ret, "GetCharABCWidthsI should have failed\n"); - ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); + ret = GetCharABCWidthsI(hdc, 0, 1, glyphs, abc); ok(ret, "GetCharABCWidthsI should have succeeded\n"); - ret = pGetCharABCWidthsW(NULL, 'a', 'a', abc); + ret = GetCharABCWidthsW(NULL, 'a', 'a', abc); ok(!ret, "GetCharABCWidthsW should have failed\n"); - ret = pGetCharABCWidthsW(hdc, 'a', 'a', NULL); + ret = GetCharABCWidthsW(hdc, 'a', 'a', NULL); ok(!ret, "GetCharABCWidthsW should have failed\n"); - ret = pGetCharABCWidthsW(hdc, 'a', 'a', abc); + ret = GetCharABCWidthsW(hdc, 'a', 'a', abc); ok(!ret, "GetCharABCWidthsW should have failed\n"); ret = pGetCharABCWidthsFloatW(NULL, 'a', 'a', abcf); @@ -1274,16 +1264,15 @@ static void test_GetCharABCWidths(void) memset(a, 0, sizeof a); memset(w, 0, sizeof w); hfont = SelectObject(hdc, hfont); - ok(pGetCharABCWidthsA(hdc, c[i].a, c[i].a + 1, a) && - pGetCharABCWidthsW(hdc, c[i].w, c[i].w + 1, w) && - memcmp(a, w, sizeof a) == 0, - "GetCharABCWidthsA and GetCharABCWidthsW should return same widths. charset = %u\n", c[i].cs); + ok(GetCharABCWidthsA(hdc, c[i].a, c[i].a + 1, a) && GetCharABCWidthsW(hdc, c[i].w, c[i].w + 1, w) + && !memcmp(a, w, sizeof(a)), + "GetCharABCWidthsA and GetCharABCWidthsW should return same widths. charset = %u\n", c[i].cs); memset(a, 0xbb, sizeof a); - ret = pGetCharABCWidthsA(hdc, code, code, a); + ret = GetCharABCWidthsA(hdc, code, code, a); ok(ret, "GetCharABCWidthsA should have succeeded\n"); memset(full, 0xcc, sizeof full); - ret = pGetCharABCWidthsA(hdc, 0x00, code, full); + ret = GetCharABCWidthsA(hdc, 0x00, code, full); ok(ret, "GetCharABCWidthsA should have succeeded\n"); ok(memcmp(&a[0], &full[code], sizeof(ABC)) == 0, "GetCharABCWidthsA info should match. codepage = %u\n", c[i].cs); @@ -1291,13 +1280,13 @@ static void test_GetCharABCWidths(void) for (j = 0; j < ARRAY_SIZE(range); ++j) { memset(full, 0xdd, sizeof full); - ret = pGetCharABCWidthsA(hdc, range[j].first, range[j].last, full); + ret = GetCharABCWidthsA(hdc, range[j].first, range[j].last, full); ok(ret == c[i].r[j], "GetCharABCWidthsA %x - %x should have %s\n", range[j].first, range[j].last, c[i].r[j] ? "succeeded" : "failed"); if (ret) { UINT last = range[j].last - range[j].first; - ret = pGetCharABCWidthsA(hdc, range[j].last, range[j].last, a); + ret = GetCharABCWidthsA(hdc, range[j].last, range[j].last, a); ok(ret && memcmp(&full[last], &a[0], sizeof(ABC)) == 0, "GetCharABCWidthsA %x should match. codepage = %u\n", range[j].last, c[i].cs); @@ -1318,12 +1307,12 @@ static void test_GetCharABCWidths(void) ret = pGetCharABCWidthsFloatW(hdc, ' ', ' ', abcf); ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); ok(abcf[0].abcfB == 1.0, "got %f\n", abcf[0].abcfB); - ret = pGetCharABCWidthsW(hdc, ' ', ' ', abcw); + ret = GetCharABCWidthsW(hdc, ' ', ' ', abcw); ok(ret, "GetCharABCWidthsW should have succeeded\n"); ok(abcw[0].abcB == 1, "got %u\n", abcw[0].abcB); /* 1) prepare unrotated font metrics */ - ret = pGetCharABCWidthsW(hdc, 'a', 'a', abcw); + ret = GetCharABCWidthsW(hdc, 'a', 'a', abcw); ok(ret, "GetCharABCWidthsW should have succeeded\n"); DeleteObject(SelectObject(hdc, hfont)); @@ -1331,7 +1320,7 @@ static void test_GetCharABCWidths(void) lf.lfEscapement = lf.lfOrientation = 900; hfont = CreateFontIndirectA(&lf); hfont = SelectObject(hdc, hfont); - ret = pGetCharABCWidthsW(hdc, 'a', 'a', abc); + ret = GetCharABCWidthsW(hdc, 'a', 'a', abc); ok(ret, "GetCharABCWidthsW should have succeeded\n"); /* 3) compare ABC results */ @@ -1409,9 +1398,9 @@ static void test_GetCharABCWidths(void) nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); - ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); + ret = GetCharABCWidthsI(hdc, 0, 1, glyphs, abc); ok(ret, "GetCharABCWidthsI should have succeeded\n"); - ret = pGetCharABCWidthsW(hdc, 'i', 'i', abcw); + ret = GetCharABCWidthsW(hdc, 'i', 'i', abcw); ok(ret, "GetCharABCWidthsW should have succeeded\n"); ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); @@ -2423,8 +2412,8 @@ static void test_SetTextJustification(void) testJustification(hdc, testText, &clientArea); - if (!pGetGlyphIndicesA || !pGetTextExtentExPointI) goto done; - pGetGlyphIndicesA( hdc, "A ", 2, indices, 0 ); + if (!pGetTextExtentExPointI) goto done; + GetGlyphIndicesA( hdc, "A ", 2, indices, 0 ); SetTextJustification(hdc, 0, 0); GetTextExtentPoint32A(hdc, " ", 1, &expect); @@ -2576,7 +2565,7 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count for (i = 0; i < count; i++) ansi_buf[i] = (BYTE)(i + 128); SetLastError(0xdeadbeef); - ret = pGetGlyphIndicesA(hdc, ansi_buf, count, idx, 0); + ret = GetGlyphIndicesA(hdc, ansi_buf, count, idx, 0); ok(ret == count, "GetGlyphIndicesA expected %d got %d, error %u\n", count, ret, GetLastError()); } @@ -2604,7 +2593,7 @@ static void test_font_charset(void) }; int i; - if (!pGetGlyphIndicesA || !pGetGlyphIndicesW) + if (!pGetGlyphIndicesW) { win_skip("Skipping the font charset test on a Win9x platform\n"); return; @@ -3231,9 +3220,6 @@ static void test_negative_width(HDC hdc, const LOGFONTA *lf) LOGFONTA lf2 = *lf; WORD idx; - if(!pGetGlyphIndicesA) - return; - /* negative widths are handled just as positive ones */ lf2.lfWidth = -lf->lfWidth; @@ -3244,7 +3230,7 @@ static void test_negative_width(HDC hdc, const LOGFONTA *lf) hfont_prev = SelectObject(hdc, hfont); - ret = pGetGlyphIndicesA(hdc, "x", 1, &idx, GGI_MARK_NONEXISTING_GLYPHS); + ret = GetGlyphIndicesA(hdc, "x", 1, &idx, GGI_MARK_NONEXISTING_GLYPHS); if (ret == GDI_ERROR || idx == 0xffff) { SelectObject(hdc, hfont_prev); @@ -4049,10 +4035,6 @@ static void test_GetTextMetrics(void) HDC hdc; INT enumed; - /* Report only once */ - if(!pGetGlyphIndicesA) - win_skip("GetGlyphIndicesA is unavailable, negative width will not be checked\n"); - hdc = GetDC(0); memset(&lf, 0, sizeof(lf)); @@ -6560,9 +6542,9 @@ static void test_GetCharWidth32(void) INT bufferW; HWND hwnd; - if (!pGetCharWidth32A || !pGetCharWidth32W) + if (!pGetCharWidth32W) { - win_skip("GetCharWidth32A/W not available on this platform\n"); + win_skip("GetCharWidth32W not available on this platform\n"); return; } @@ -6576,7 +6558,7 @@ static void test_GetCharWidth32(void) ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); - ret = pGetCharWidth32A(hdc, 'a', 'a', &bufferA); + ret = GetCharWidth32A(hdc, 'a', 'a', &bufferA); ok(ret, "GetCharWidth32A should have succeeded\n"); ok (bufferA == bufferW, "Widths should be the same\n"); ok (bufferA > 0," Width should be greater than zero\n"); @@ -6669,11 +6651,6 @@ static void test_fake_bold_font(void) int i; DWORD r; - if (!pGetCharWidth32A || !pGetCharABCWidthsA) { - win_skip("GetCharWidth32A/GetCharABCWidthA is not available on this platform\n"); - return; - } - /* Test outline font */ memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Wingdings"); @@ -6691,7 +6668,7 @@ static void test_fake_bold_font(void) ret = GetTextMetricsA(hdc, &data[i].tm); ok(ret, "got %d\n", ret); - ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &data[i].abc); + ret = GetCharABCWidthsA(hdc, 0x76, 0x76, &data[i].abc); ok(ret, "got %d\n", ret); data[i].w = data[i].abc.abcA + data[i].abc.abcB + data[i].abc.abcC; r = GetGlyphOutlineA(hdc, 0x76, GGO_METRICS, &data[i].gm, 0, NULL, &x2_mat); @@ -6742,7 +6719,7 @@ static void test_fake_bold_font(void) ret = GetTextMetricsA(hdc, &data[i].tm); ok(ret, "got %d\n", ret); - ret = pGetCharWidth32A(hdc, 0x76, 0x76, &data[i].w); + ret = GetCharWidth32A(hdc, 0x76, 0x76, &data[i].w); ok(ret, "got %d\n", ret); SelectObject(hdc, hfont_old); @@ -6804,7 +6781,7 @@ static void test_bitmap_font_glyph_index(void) CHARSETINFO ci; BYTE chr = '\xA9'; - if (!pGetGlyphIndicesW || !pGetGlyphIndicesA) { + if (!pGetGlyphIndicesW) { win_skip("GetGlyphIndices is unavailable\n"); return; } @@ -6889,7 +6866,7 @@ static void test_bitmap_font_glyph_index(void) ret = ExtTextOutA(hdc, 100, 0, 0, NULL, (LPCSTR)&chr, 1, NULL); break; case 1: - ret = pGetGlyphIndicesA(hdc, (LPCSTR)&chr, 1, &code, 0); + ret = GetGlyphIndicesA(hdc, (LPCSTR)&chr, 1, &code, 0); ok(ret, "GetGlyphIndices failed\n"); ok(code == chr, "expected %02x, got %02x (%s:%d)\n", chr, code, lf.lfFaceName, tm.tmCharSet); ret = ExtTextOutA(hdc, 100, 0, ETO_GLYPH_INDEX, NULL, (LPCSTR)&code, 1, NULL); -- 2.24.1

1 0

[PATCH 1/2] shell32/tests: Use ILIsEqual() directly.
by Nikolay Sivov Jan. 8, 2020

Jan. 8, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/tests/shelllink.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 2c2ee94c17..7828f0edf2 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -38,7 +38,6 @@ # define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */ #endif -static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static HRESULT (WINAPI *pSHGetFolderLocation)(HWND,INT,HANDLE,DWORD,PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); @@ -234,12 +233,12 @@ static void test_get_set(void) tmp_pidl=NULL; r = IShellLinkA_GetIDList(sl, &tmp_pidl); ok(r == S_OK, "GetIDList failed (0x%08x)\n", r); - ok(tmp_pidl && pILIsEqual(pidl, tmp_pidl), + ok(tmp_pidl && ILIsEqual(pidl, tmp_pidl), "GetIDList returned an incorrect pidl\n"); r = IShellLinkA_GetIDList(sl, &second_pidl); ok(r == S_OK, "GetIDList failed (0x%08x)\n", r); - ok(second_pidl && pILIsEqual(pidl, second_pidl), + ok(second_pidl && ILIsEqual(pidl, second_pidl), "GetIDList returned an incorrect pidl\n"); ok(second_pidl != tmp_pidl, "pidls are the same\n"); @@ -583,7 +582,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) r = IShellLinkA_GetIDList(sl, &pidl); lok(r == S_OK, "GetIDList failed (0x%08x)\n", r); todo_wine_if ((todo & 0x8) != 0) - lok(pILIsEqual(pidl, desc->pidl), "GetIDList returned an incorrect pidl\n"); + lok(ILIsEqual(pidl, desc->pidl), "GetIDList returned an incorrect pidl\n"); } if (desc->showcmd) { @@ -1453,7 +1452,6 @@ START_TEST(shelllink) HMODULE hmod = GetModuleHandleA("shell32.dll"); HMODULE huser32 = GetModuleHandleA("user32.dll"); - pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21); pSHILCreateFromPath = (void *)GetProcAddress(hmod, (LPSTR)28); pSHGetFolderLocation = (void *)GetProcAddress(hmod, "SHGetFolderLocation"); pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA"); -- 2.24.1

1 1

[PATCH] user32/tests: Fix some test failures on Windows 10.
by Zebediah Figura Jan. 8, 2020

Jan. 8, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 46784cec43f..4e9de6c8bf4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -192,7 +192,8 @@ static BOOL ignore_message( UINT message ) message == WM_TIMER || message == WM_SYSTIMER || message == WM_TIMECHANGE || - message == WM_DEVICECHANGE); + message == WM_DEVICECHANGE || + message == 0x0060 /* undocumented, used by Win10 1709+ */); } static BOOL CALLBACK EnumChildProc( HWND hwndChild, LPARAM lParam) @@ -1117,7 +1118,7 @@ static void wine_AdjustWindowRectExForDpi( RECT *rect, LONG style, BOOL menu, LO int adjust = 0; ncm.cbSize = sizeof(ncm); - pSystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); + pSystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0, dpi ); if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == WS_EX_STATICEDGE) adjust = 1; /* for the outer frame always present */ @@ -2541,6 +2542,8 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ok( rect.left == 90 && rect.top == 90 && rect.right == 110 && rect.bottom == 110, "invalid client rect %s\n", wine_dbgstr_rect(&rect)); + flush_events( TRUE ); /* needed by Win10 1709+ */ + ret = SetWindowPos(hwnd, 0, 200, 200, 0, 0, SWP_NOZORDER|SWP_FRAMECHANGED); ok(ret, "Got %d\n", ret); GetWindowRect( hwnd, &rect ); @@ -3180,8 +3183,10 @@ static void test_SetActiveWindow(HWND hwnd) ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); + SetLastError(0xdeadbeef); ret = SetActiveWindow(0); - ok(ret == hwnd, "SetActiveWindow returned %p instead of %p\n", ret, hwnd); + ok(ret == hwnd || broken(!ret) /* Win10 1809 */, "expected %p, got %p\n", hwnd, ret); + if (!ret) ok(GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError()); if (!GetActiveWindow()) /* doesn't always work on vista */ { check_wnd_state(0, 0, 0, 0); @@ -3238,8 +3243,10 @@ static void test_SetActiveWindow(HWND hwnd) ret = SetActiveWindow(hwnd2); ok(ret == hwnd, "expected %p, got %p\n", hwnd, ret); check_wnd_state(hwnd, hwnd, hwnd, 0); + SetLastError(0xdeadbeef); ret = SetActiveWindow(0); - ok(ret == hwnd, "expected %p, got %p\n", hwnd, ret); + ok(ret == hwnd || broken(!ret) /* Win10 1809 */, "expected %p, got %p\n", hwnd, ret); + if (!ret) ok(GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError()); if (!GetActiveWindow()) { ret = SetActiveWindow(hwnd2); @@ -3294,8 +3301,10 @@ static void test_SetForegroundWindow(HWND hwnd) ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); + SetLastError(0xdeadbeef); hwnd2 = SetActiveWindow(0); - ok(hwnd2 == hwnd, "SetActiveWindow(0) returned %p instead of %p\n", hwnd2, hwnd); + ok(hwnd2 == hwnd || broken(!hwnd2) /* Win10 1809 */, "expected %p, got %p\n", hwnd, hwnd2); + if (!hwnd2) ok(GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError()); if (GetActiveWindow() == hwnd) /* doesn't always work on vista */ check_wnd_state(hwnd, hwnd, hwnd, 0); else @@ -3963,13 +3972,12 @@ static void test_mouse_input(HWND hwnd) ret = wait_for_message( &msg ); ok(ret, "no message available\n"); -todo_wine - ok(msg.hwnd == child && msg.message == WM_NCMOUSEMOVE, "hwnd %p/%p message %04x\n", - msg.hwnd, child, msg.message); - - if (msg.message == WM_NCMOUSEMOVE) + if (msg.message == WM_NCMOUSEMOVE) /* not sent by Win10 1709+ */ + { + ok(msg.hwnd == child, "expected %p, got %p\n", child, msg.hwnd); ret = wait_for_message( &msg ); - ok(ret, "no message available\n"); + ok(ret, "no message available\n"); + } ok(msg.hwnd == child && msg.message == WM_NCLBUTTONDOWN, "hwnd %p/%p message %04x\n", msg.hwnd, child, msg.message); ok(msg.wParam == HTSYSMENU, "wparam %ld\n", msg.wParam); -- 2.24.1

2 1