wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Alexandre Julliard : include: Avoid redefining base types in ntdef.h.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: d442b41ec655b1f073f45ff165a717e4c99f5a62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d442b41ec655b1f073f45ff1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 10 21:42:59 2020 +0100 include: Avoid redefining base types in ntdef.h. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49106 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntdef.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ntdef.h b/include/ntdef.h index 069e86575b8..68ced669baa 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -50,6 +50,7 @@ typedef enum _WAIT_TYPE { #define NT_WARNING(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0x80000000) #define NT_ERROR(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0xc0000000) +#ifndef BASETYPES #define BASETYPES typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; @@ -58,6 +59,7 @@ typedef unsigned long ULONG, *PULONG; #else typedef unsigned int ULONG, *PULONG; #endif +#endif typedef struct _RTL_BALANCED_NODE {

1 0

Henri Verbeet : wined3d: Do not request VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT for unmappable buffers.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: 675adf01635634834c12392063061a2596e664d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=675adf01635634834c123920… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 10 17:08:14 2020 +0330 wined3d: Do not request VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT for unmappable buffers. In particular, some implementations may not support the combination of VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT and VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT for all buffer types, or at all. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 11974467984..088697a57d5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1391,11 +1391,13 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + memory_type = 0; if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) - memory_type |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) + memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { @@ -1472,9 +1474,11 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) { + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); struct wined3d_resource *resource = &buffer->resource; + struct wined3d_bo_address src, dst; const struct wined3d_range *range; - struct wined3d_bo_address dst; + struct wined3d_bo_vk *dst_bo; unsigned int i = range_count; uint32_t flags; void *map_ptr; @@ -1488,6 +1492,24 @@ static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struc flags = WINED3D_MAP_WRITE; if (!ranges->offset && ranges->size == resource->size) flags |= WINED3D_MAP_DISCARD; + + dst_bo = &wined3d_buffer_vk(buffer)->bo; + if (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(flags & WINED3D_MAP_DISCARD) + && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id)) + { + src.buffer_object = 0; + while (range_count--) + { + range = &ranges[range_count]; + + src.addr = (uint8_t *)data + range->offset - data_offset; + dst.addr = (void *)(uintptr_t)range->offset; + wined3d_context_copy_bo_address(context, &dst, &src, range->size); + } + + return; + } + if (!(map_ptr = wined3d_context_map_bo_address(context, &dst, resource->size, flags))) { FIXME("Failed to map buffer.\n");

1 0

Henri Verbeet : wined3d: Request VK_MEMORY_PROPERTY_HOST_CACHED_BIT for WINED3D_RESOURCE_ACCESS_MAP_R buffers.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: ff0aa5a8da870cca49d1d39b01cb20ba8517e062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff0aa5a8da870cca49d1d39b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 10 17:08:13 2020 +0330 wined3d: Request VK_MEMORY_PROPERTY_HOST_CACHED_BIT for WINED3D_RESOURCE_ACCESS_MAP_R buffers. Unsurprisingly, reading for uncached memory may be very slow. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index dc32d97530a..11974467984 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1394,6 +1394,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) + memory_type |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) {

1 0

Henri Verbeet : wined3d: Do not request VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT for dynamic buffers.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: ddd55cadb8a45464a4a096f557ae89b702caa934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd55cadb8a45464a4a096f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 10 17:08:12 2020 +0330 wined3d: Do not request VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT for dynamic buffers. We don't typically need these to be in VRAM, and VRAM may not be mappable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6ff6a5b6cd0..dc32d97530a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1390,8 +1390,11 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT - | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + + memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n");

1 0

Alexandre Julliard : configure: Force -static-libgcc when using libunwind.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: 167f188d71c75d88e3b74600b3bda4688e70f984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=167f188d71c75d88e3b74600… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 10 10:34:17 2020 +0100 configure: Force -static-libgcc when using libunwind. libunwind defines the same symbols as libgcc_s but may not be compatible. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49312 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 2 ++ 2 files changed, 3 insertions(+) diff --git a/configure b/configure index c04b4106a86..c6d2bab49f5 100755 --- a/configure +++ b/configure @@ -14892,6 +14892,7 @@ $as_echo "$wine_cv_have_unw_step" >&6; } if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" then save_libs=$LIBS + UNWIND_LIBS="-static-libgcc $UNWIND_LIBS" LIBS="$UNWIND_LIBS $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_step in libunwind" >&5 $as_echo_n "checking for unw_step in libunwind... " >&6; } diff --git a/configure.ac b/configure.ac index 020fd19256f..85ba522a951 100644 --- a/configure.ac +++ b/configure.ac @@ -1685,6 +1685,8 @@ then if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" then save_libs=$LIBS + dnl Force static libgcc, libunwind breaks libgcc_s unwinding + UNWIND_LIBS="-static-libgcc $UNWIND_LIBS" LIBS="$UNWIND_LIBS $LIBS" AC_CACHE_CHECK([for unw_step in libunwind],wine_cv_have_libunwind_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY

1 0

Michael Stefaniuc : ntoskrnl/tests: Use wide-char string literals in locale.c.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: 35c880efdfc5f1bac2ea86075e868bc2141726fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=35c880efdfc5f1bac2ea8607… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 9 23:00:08 2020 +0100 ntoskrnl/tests: Use wide-char string literals in locale.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 38 ++++++++++---------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 +-- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index dfc742eec3b..5617342d803 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -50,13 +50,6 @@ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) return 0; } -static const WCHAR device_name[] = {'\\','D','e','v','i','c','e', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; -static const WCHAR upper_name[] = {'\\','D','e','v','i','c','e', - '\\','W','i','n','e','T','e','s','t','U','p','p','e','r',0}; -static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; - static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *lower_device, *upper_device; @@ -183,14 +176,8 @@ static void test_init_funcs(void) ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); } -static const WCHAR driver2_path[] = { - '\\','R','e','g','i','s','t','r','y', - '\\','M','a','c','h','i','n','e', - '\\','S','y','s','t','e','m', - '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', - '\\','S','e','r','v','i','c','e','s', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 -}; +static const WCHAR driver2_path[] = + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\WineTestDriver2"; static IMAGE_INFO test_image_info; static int test_load_image_notify_count; @@ -1163,8 +1150,6 @@ static void test_ob_reference(const WCHAR *test_path) SIZE_T len; NTSTATUS status; - static const WCHAR tmpW[] = {'.','t','m','p',0}; - pObGetObjectType = get_proc_address("ObGetObjectType"); if (!pObGetObjectType) win_skip("ObGetObjectType not found\n"); @@ -1174,9 +1159,9 @@ static void test_ob_reference(const WCHAR *test_path) ok(!status, "ZwCreateEvent failed: %#x\n", status); len = wcslen(test_path); - tmp_path = ExAllocatePool(PagedPool, len * sizeof(WCHAR) + sizeof(tmpW)); + tmp_path = ExAllocatePool(PagedPool, len * sizeof(WCHAR) + sizeof(L".tmp")); memcpy(tmp_path, test_path, len * sizeof(WCHAR)); - memcpy(tmp_path + len, tmpW, sizeof(tmpW)); + memcpy(tmp_path + len, L".tmp", sizeof(L".tmp")); RtlInitUnicodeString(&pathU, tmp_path); attr.ObjectName = &pathU; @@ -2487,7 +2472,7 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) DbgPrint("unloading driver\n"); - RtlInitUnicodeString(&linkW, driver_link); + RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); IoDeleteSymbolicLink(&linkW); IoDeleteDevice(upper_device); @@ -2496,9 +2481,6 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) { - static const WCHAR IoDriverObjectTypeW[] = {'I','o','D','r','i','v','e','r','O','b','j','e','c','t','T','y','p','e',0}; - static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; UNICODE_STRING nameW, linkW; NTSTATUS status; void *obj; @@ -2517,10 +2499,10 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_QUERY_INFORMATION] = driver_QueryInformation; driver->MajorFunction[IRP_MJ_CLOSE] = driver_Close; - RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); + RtlInitUnicodeString(&nameW, L"IoDriverObjectType"); pIoDriverObjectType = MmGetSystemRoutineAddress(&nameW); - RtlInitUnicodeString(&nameW, driver_nameW); + RtlInitUnicodeString(&nameW, L"\\Driver\\WineTestDriver"); if ((status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj))) return status; if (obj != driver) @@ -2530,8 +2512,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) } ObDereferenceObject(obj); - RtlInitUnicodeString(&nameW, device_name); - RtlInitUnicodeString(&linkW, driver_link); + RtlInitUnicodeString(&nameW, L"\\Device\\WineTestDriver"); + RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device))) @@ -2542,7 +2524,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) if (!status) { - RtlInitUnicodeString(&nameW, upper_name); + RtlInitUnicodeString(&nameW, L"\\Device\\WineTestUpper"); status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c2285aef6fc..2a7ebaa9599 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -156,7 +156,6 @@ static ULONG64 modified_value; static void main_test(void) { - static const WCHAR dokW[] = {'d','o','k',0}; WCHAR temppathW[MAX_PATH], pathW[MAX_PATH]; struct test_input *test_input; DWORD len, written, read; @@ -168,7 +167,7 @@ static void main_test(void) /* Create a temporary file that the driver will write ok/trace output to. */ GetTempPathW(MAX_PATH, temppathW); - GetTempFileNameW(temppathW, dokW, 0, pathW); + GetTempFileNameW(temppathW, L"dok", 0, pathW); pRtlDosPathNameToNtPathName_U( pathW, &pathU, NULL, NULL ); len = pathU.Length + sizeof(WCHAR);

1 0

Michael Stefaniuc : wmvcore/tests: Use wide-char string literals in locale.c.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: 21f95c9deba2ba04340a9e2de9cf1d02074cce2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=21f95c9deba2ba04340a9e2d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 9 23:00:07 2020 +0100 wmvcore/tests: Use wide-char string literals in locale.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 2b5a4555a35..fac9948d60e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -321,36 +321,31 @@ static void test_WMCreateWriterPriv(void) static void test_urlextension(void) { HRESULT hr; - const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; - const WCHAR mkvfile[] = {'t','e','s','t','.','m','k','v',0}; - const WCHAR urlfile[] = {'a','b','c','d',':','/','/','t','e','s','t','/','t','e','s','t','.','w','m','v',0}; - const WCHAR testurl[] = {'h','t','t','p',':','/','/','t','e','s','t','/','t','.','a','s','f','?','a','l','t','=','t','.','m','k','v',0}; hr = WMCheckURLExtension(NULL); ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(mkvfile); + hr = WMCheckURLExtension(L"test.mkv"); ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(mp3file); + hr = WMCheckURLExtension(L"test.mp3"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(urlfile); + hr = WMCheckURLExtension(L"abcd://test/test.wmv"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(testurl); + hr = WMCheckURLExtension(L"http://test/t.asf?alt=t.mkv"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); } static void test_iscontentprotected(void) { HRESULT hr; - const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; BOOL drm; hr = WMIsContentProtected(NULL, NULL); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); hr = WMIsContentProtected(NULL, &drm); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); - hr = WMIsContentProtected(mp3file, NULL); + hr = WMIsContentProtected(L"test.mp3", NULL); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); - hr = WMIsContentProtected(mp3file, &drm); + hr = WMIsContentProtected(L"test.mp3", &drm); ok(hr == S_FALSE, "WMIsContentProtected failed 0x%08x\n", hr); ok(drm == FALSE, "got %0dx\n", drm); }

1 0

Jeff Smith : gdiplus/tests: Use wide-char string literals for test strings.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: 8eff23cc067f2b0549ffb5674c91415932511d35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eff23cc067f2b0549ffb567… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Dec 8 20:31:14 2020 -0600 gdiplus/tests: Use wide-char string literals for test strings. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 2 +- dlls/gdiplus/tests/graphics.c | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 0d7254f255e..32cd1ff2c4f 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -946,7 +946,7 @@ todo_wine static void test_font_transform(void) { - static const WCHAR string[] = { 'A',0 }; + static const WCHAR string[] = L"A"; GpStatus status; HDC hdc; LOGFONTA lf; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 9a09abcfc8b..2b1628f4e9c 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2279,7 +2279,7 @@ static void test_GdipDrawString(void) GpBrush *brush; LOGFONTA logfont; HDC hdc = GetDC( hwnd ); - static const WCHAR string[] = {'T','e','s','t',0}; + static const WCHAR string[] = L"Test"; static const PointF positions[4] = {{0,0}, {1,1}, {2,2}, {3,3}}; GpMatrix *matrix; @@ -3195,8 +3195,8 @@ static void test_string_functions(void) GpBrush *brush; ARGB color = 0xff000000; HDC hdc = GetDC( hwnd ); - const WCHAR teststring[] = {'M','M',' ','M','\n','M',0}; - const WCHAR teststring2[] = {'j',0}; + const WCHAR teststring[] = L"MM M\nM"; + const WCHAR teststring2[] = L"j"; REAL char_width, char_height; INT codepointsfitted, linesfilled; GpStringFormat *format; @@ -3743,7 +3743,7 @@ static void test_GdipMeasureString(void) { 200.0, 600.0, 1.0, UnitPixel }, { 200.0, 600.0, 2.0, UnitPixel }, }; - static const WCHAR string[] = { '1','2','3','4','5','6','7',0 }; + static const WCHAR string[] = L"1234567"; GpStatus status; GpGraphics *graphics; GpFontFamily *family; @@ -4257,7 +4257,7 @@ static void test_pen_thickness(void) */ static void test_font_height_scaling(void) { - static const WCHAR string[] = { '1','2','3','4','5','6','7',0 }; + static const WCHAR string[] = L"1234567"; HDC hdc; GpStringFormat *format; CharacterRange range = { 0, 7 }; @@ -4357,7 +4357,6 @@ static void test_font_height_scaling(void) /* UnitPixel = 2, UnitPoint = 3, UnitInch = 4, UnitDocument = 5, UnitMillimeter = 6 */ for (gfx_unit = 2; gfx_unit <= 6; gfx_unit++) { - static const WCHAR doubleW[2] = { 'W','W' }; RectF bounds_1, bounds_2; REAL margin, margin_y, font_height; int match; @@ -4397,12 +4396,12 @@ todo_wine /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_1); - status = GdipMeasureString(graphics, doubleW, 1, font, &rect, format, &bounds_1, NULL, NULL); + status = GdipMeasureString(graphics, L"W", 1, font, &rect, format, &bounds_1, NULL, NULL); expect(Ok, status); /* bounds.width of 2 identical glyphs: [margin]+[width]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_2); - status = GdipMeasureString(graphics, doubleW, 2, font, &rect, format, &bounds_2, NULL, NULL); + status = GdipMeasureString(graphics, L"WW", 2, font, &rect, format, &bounds_2, NULL, NULL); expect(Ok, status); /* margin = [bounds.width of 1] - [bounds.width of 2] / 2*/ @@ -4444,8 +4443,8 @@ cleanup: static void test_measure_string(void) { - static const WCHAR string[] = { 'A','0','1',0 }; - static const WCHAR string2[] = { 'M',' ','M','M',0 }; + static const WCHAR string[] = L"A01"; + static const WCHAR string2[] = L"M MM"; HDC hdc; GpStringFormat *format, *format_no_wrap; CharacterRange range; @@ -4915,7 +4914,6 @@ todo_wine static void test_measured_extra_space(void) { - static const WCHAR string[2] = { 'W','W' }; GpStringFormat *format; HDC hdc; GpGraphics *graphics; @@ -4959,12 +4957,12 @@ static void test_measured_extra_space(void) /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_1); - status = GdipMeasureString(graphics, string, 1, font, &rect, format, &bounds_1, NULL, NULL); + status = GdipMeasureString(graphics, L"W", 1, font, &rect, format, &bounds_1, NULL, NULL); expect(Ok, status); /* bounds.width of 2 identical glyphs: [margin]+[width]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_2); - status = GdipMeasureString(graphics, string, 2, font, &rect, format, &bounds_2, NULL, NULL); + status = GdipMeasureString(graphics, L"WW", 2, font, &rect, format, &bounds_2, NULL, NULL); expect(Ok, status); /* margin = [bounds.width of 1] - [bounds.width of 2] / 2*/

1 0

Jeff Smith : gdiplus/tests: Use wide-char string literal for metafile description.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: cf405026cd3763654900807eba756053bbe93d9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf405026cd3763654900807e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Dec 8 19:40:12 2020 -0600 gdiplus/tests: Use wide-char string literal for metafile description. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index eaad4acdc69..3ce7a16d61a 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -31,6 +31,8 @@ static BOOL save_metafiles; static BOOL load_metafiles; +static const WCHAR description[] = L"winetest"; + typedef struct emfplus_record { DWORD record_type; @@ -378,7 +380,6 @@ static void test_empty(void) MetafileHeader header; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; UINT limit_dpi; hdc = CreateCompatibleDC(0); @@ -626,7 +627,6 @@ static void test_getdc(void) static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; static const GpPointF dst_points_half[3] = {{0.0,0.0},{50.0,0.0},{0.0,50.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; HBRUSH hbrush, holdbrush; GpBitmap *bitmap; ARGB color; @@ -784,7 +784,6 @@ static void test_emfonly(void) MetafileHeader header; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; HBRUSH hbrush, holdbrush; GpBitmap *bitmap; ARGB color; @@ -1081,7 +1080,6 @@ static void test_fillrect(void) static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; static const GpPointF dst_points_half[3] = {{0.0,0.0},{50.0,0.0},{0.0,50.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpBitmap *bitmap; ARGB color; GpBrush *brush; @@ -1194,7 +1192,6 @@ static void test_clear(void) HENHMETAFILE hemf; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{10.0,10.0},{20.0,10.0},{10.0,20.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpBitmap *bitmap; ARGB color; @@ -1266,7 +1263,6 @@ static void test_nullframerect(void) { GpMetafile *metafile; GpGraphics *graphics; HDC hdc, metafile_dc; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpBrush *brush; HBRUSH hbrush, holdbrush; GpRectF bounds; @@ -1459,7 +1455,6 @@ static void test_pagetransform(void) HDC hdc; static const GpRectF frame = {0.0, 0.0, 5.0, 5.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpBitmap *bitmap; ARGB color; GpBrush *brush; @@ -1664,7 +1659,6 @@ static void test_worldtransform(void) HDC hdc; static const GpRectF frame = {0.0, 0.0, 5.0, 5.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpBitmap *bitmap; ARGB color; GpBrush *brush; @@ -1921,7 +1915,6 @@ static void test_converttoemfplus(void) GpStatus (WINAPI *pGdipConvertToEmfPlus)( const GpGraphics *graphics, GpMetafile *metafile, BOOL *succ, EmfType emfType, const WCHAR *description, GpMetafile **outmetafile); static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpStatus stat; GpMetafile *metafile, *metafile2 = NULL, *emhmeta; GpGraphics *graphics; @@ -2001,7 +1994,6 @@ static void test_frameunit(void) GpGraphics *graphics; HDC hdc; static const GpRectF frame = {0.0, 0.0, 5.0, 5.0}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GpUnit unit; REAL dpix, dpiy; GpRectF bounds; @@ -2097,7 +2089,6 @@ static void test_containers(void) HDC hdc; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GraphicsContainer state1, state2; GpRectF srcrect, dstrect; REAL dpix, dpiy; @@ -2293,7 +2284,6 @@ static void test_clipping(void) HDC hdc; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GraphicsState state; hdc = CreateCompatibleDC(0); @@ -2434,7 +2424,6 @@ static void test_gditransform(void) MetafileHeader header; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{40.0,0.0},{0.0,40.0}}; - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; HBRUSH hbrush, holdbrush; GpBitmap *bitmap; ARGB color; @@ -2561,7 +2550,6 @@ static const emfplus_record draw_image_metafile_records[] = { static void test_drawimage(void) { - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpPointF dst_points[3] = {{10.0,10.0},{85.0,15.0},{10.0,80.0}}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; const ColorMatrix double_red = {{ @@ -2679,7 +2667,6 @@ static const emfplus_record properties_records[] = { static void test_properties(void) { - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; GpMetafile *metafile; @@ -2757,7 +2744,6 @@ static const emfplus_record draw_path_records[] = { static void test_drawpath(void) { - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; GpMetafile *metafile; @@ -2822,7 +2808,6 @@ static const emfplus_record fill_path_records[] = { static void test_fillpath(void) { - static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; GpMetafile *metafile;

1 0

Jeff Smith : gdiplus/tests: Use wide-char string literal for mimetype.
by Alexandre Julliard 10 Dec '20

10 Dec '20

Module: wine Branch: master Commit: ebc2d2a39ae9e99984a35d022168a252d1018738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc2d2a39ae9e99984a35d02… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Dec 8 19:40:11 2020 -0600 gdiplus/tests: Use wide-char string literal for mimetype. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index c1f3b126a79..2175c1748e0 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -537,7 +537,6 @@ static void test_SavingMultiPageTiff(void) static const CHAR filename2A[] = "2.tif"; static const WCHAR filename1[] = L"1.tif"; static const WCHAR filename2[] = L"2.tif"; - static const WCHAR tiff_mimetype[] = { 'i','m','a','g','e','/','t','i','f','f',0 }; params.Count = 1; params.Parameter[0].Guid = EncoderSaveFlag; @@ -549,7 +548,7 @@ static void test_SavingMultiPageTiff(void) expect(Ok, stat); stat = GdipCreateBitmapFromScan0(2 * WIDTH, 2 * HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm2); expect(Ok, stat); - result = get_encoder_clsid(tiff_mimetype, &format, &tiff_clsid); + result = get_encoder_clsid(L"image/tiff", &format, &tiff_clsid); ok(result, "getting TIFF encoding clsid failed"); if (!bm1 || !bm2 || !result)

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
42
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 December 2020