June 2022 - Wine-Commits - list.winehq.org

Zhiyi Zhang : mfplat/tests: Fix resource leaks.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 2e0a56257a15af8dee6ebad55f180591b1c1e18c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e0a56257a15af8dee6ebad5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 29 17:53:16 2022 +0800 mfplat/tests: Fix resource leaks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53235 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 48f7a444add..deed2408a41 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6639,11 +6639,12 @@ static void test_MFCreateDXSurfaceBuffer(void) IMF2DBuffer2_Release(_2dbuffer2); IMFMediaBuffer_Release(buffer); + IDirect3DDevice9_Release(device); done: if (backbuffer) IDirect3DSurface9_Release(backbuffer); - IDirect3D9_Release(d3d); + ok(!IDirect3D9_Release(d3d), "Unexpected refcount.\n"); DestroyWindow(window); } @@ -7618,6 +7619,8 @@ static void test_sample_allocator_d3d9(void) IMFVideoSampleAllocator_Release(allocator); IMFMediaType_Release(video_type); + IDirect3DDeviceManager9_Release(d3d9_manager); + IDirect3DDevice9_Release(d3d9_device); done: IDirect3D9_Release(d3d9); @@ -7725,6 +7728,7 @@ static void test_sample_allocator_d3d11(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFMediaBuffer_Release(buffer); IMFSample_Release(sample); IMFVideoSampleAllocator_Release(allocator); @@ -7867,7 +7871,7 @@ static void test_sample_allocator_d3d11(void) static void test_sample_allocator_d3d12(void) { - IMFVideoSampleAllocator *allocator; + IMFVideoSampleAllocator *allocator = NULL; D3D12_HEAP_PROPERTIES heap_props; IMFDXGIDeviceManager *manager; D3D12_HEAP_FLAGS heap_flags; @@ -7955,11 +7959,12 @@ static void test_sample_allocator_d3d12(void) ID3D12Resource_Release(resource); IMFDXGIBuffer_Release(dxgi_buffer); + IMFMediaBuffer_Release(buffer); IMFSample_Release(sample); - IMFVideoSampleAllocator_Release(allocator); - done: + if (allocator) + IMFVideoSampleAllocator_Release(allocator); IMFDXGIDeviceManager_Release(manager); ID3D12Device_Release(device); }

1 0

Alexandre Julliard : ntdll: Add _wsplitpath_s.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 0db689edf4a2d05db05449a3ca21c0e6c088880f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0db689edf4a2d05db05449a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:06:29 2022 +0200 ntdll: Add _wsplitpath_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/wcstring.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a3832042704..9291ed63f77 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1554,6 +1554,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) @ cdecl _wcsupr(wstr) @ cdecl _wcsupr_s(wstr long) +@ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) @ cdecl _wtoi(wstr) @ cdecl -ret64 _wtoi64(wstr) @ cdecl _wtol(wstr) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index a0d7042f30c..76190c08c12 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -1299,3 +1299,79 @@ LONGLONG __cdecl _wtoi64( LPCWSTR str ) return bMinus ? -RunningTotal : RunningTotal; } + + +/****************************************************************** + * _wsplitpath_s (NTDLL.@) + */ +errno_t __cdecl _wsplitpath_s( const wchar_t *inpath, wchar_t *drive, size_t sz_drive, + wchar_t *dir, size_t sz_dir, wchar_t *fname, size_t sz_fname, + wchar_t *ext, size_t sz_ext ) +{ + const wchar_t *p, *end; + + if (!inpath || (!drive && sz_drive) || + (drive && !sz_drive) || + (!dir && sz_dir) || + (dir && !sz_dir) || + (!fname && sz_fname) || + (fname && !sz_fname) || + (!ext && sz_ext) || + (ext && !sz_ext)) + return EINVAL; + + if (inpath[0] && inpath[1] == ':') + { + if (drive) + { + if (sz_drive <= 2) goto error; + drive[0] = inpath[0]; + drive[1] = inpath[1]; + drive[2] = 0; + } + inpath += 2; + } + else if (drive) drive[0] = '\0'; + + /* look for end of directory part */ + end = NULL; + for (p = inpath; *p; p++) if (*p == '/' || *p == '\\') end = p + 1; + + if (end) /* got a directory */ + { + if (dir) + { + if (sz_dir <= end - inpath) goto error; + memcpy( dir, inpath, (end - inpath) * sizeof(wchar_t) ); + dir[end - inpath] = 0; + } + inpath = end; + } + else if (dir) dir[0] = 0; + + /* look for extension: what's after the last dot */ + end = NULL; + for (p = inpath; *p; p++) if (*p == '.') end = p; + + if (!end) end = p; /* there's no extension */ + + if (fname) + { + if (sz_fname <= end - inpath) goto error; + memcpy( fname, inpath, (end - inpath) * sizeof(wchar_t) ); + fname[end - inpath] = 0; + } + if (ext) + { + if (sz_ext <= wcslen(end)) goto error; + wcscpy( ext, end ); + } + return 0; + +error: + if (drive) drive[0] = 0; + if (dir) dir[0] = 0; + if (fname) fname[0]= 0; + if (ext) ext[0]= 0; + return ERANGE; +}

1 0

Alexandre Julliard : ntdll: Add _i64toa_s.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 911810c51af3b6c6edeb102907cec561f12ddb7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=911810c51af3b6c6edeb1029… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:06:15 2022 +0200 ntdll: Add _i64toa_s. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 3 +++ dlls/ntdll/string.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d592b7adbb4..a3832042704 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1503,14 +1503,17 @@ @ stub _fltused @ cdecl -arch=i386 -ret64 _ftol() @ cdecl _i64toa(int64 ptr long) +@ cdecl _i64toa_s(int64 ptr long long) @ cdecl _i64tow(int64 ptr long) @ cdecl _i64tow_s(int64 ptr long long) @ cdecl _itoa(long ptr long) +@ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) @ cdecl _itow_s(long ptr long long) @ cdecl _lfind(ptr ptr ptr long ptr) @ stdcall -arch=x86_64,arm64 _local_unwind(ptr ptr) @ cdecl _ltoa(long ptr long) +@ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) @ cdecl _ltow_s(long ptr long long) @ cdecl _memccpy(ptr ptr long long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 797152a81e1..5a971a4a0b2 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1258,6 +1258,80 @@ errno_t __cdecl _ultoa_s( __msvcrt_ulong value, char *str, size_t size, int radi } +/********************************************************************* + * _i64toa_s (NTDLL.@) + */ +errno_t __cdecl _i64toa_s( __int64 value, char *str, size_t size, int radix ) +{ + unsigned __int64 val; + BOOL is_negative; + char buffer[65], *pos; + + if (!str || !size) return EINVAL; + if (radix < 2 || radix > 36) + { + str[0] = 0; + return EINVAL; + } + + if (value < 0 && radix == 10) + { + is_negative = TRUE; + val = -value; + } + else + { + is_negative = FALSE; + val = value; + } + + pos = buffer + 64; + *pos = 0; + + do + { + unsigned int digit = val % radix; + val /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (val != 0); + + if (is_negative) *--pos = '-'; + + if (buffer - pos + 65 > size) + { + str[0] = 0; + return ERANGE; + } + memcpy( str, pos, buffer - pos + 65 ); + return 0; +} + + +/********************************************************************* + * _ltoa_s (NTDLL.@) + */ +errno_t __cdecl _ltoa_s( __msvcrt_long value, char *str, size_t size, int radix ) +{ + if (value < 0 && radix == 10) return _i64toa_s( value, str, size, radix ); + return _ui64toa_s( (__msvcrt_ulong)value, str, size, radix ); +} + + +/********************************************************************* + * _itoa_s (NTDLL.@) + */ +errno_t __cdecl _itoa_s( int value, char *str, size_t size, int radix ) +{ + if (value < 0 && radix == 10) return _i64toa_s( value, str, size, radix ); + return _ui64toa_s( (unsigned int)value, str, size, radix ); +} + + /********************************************************************* * _atoi64 (NTDLL.@) *

1 0

Zhiyi Zhang : evr/tests: Fix resource leaks.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 0519f53ca06264cab66f8b1889ba35f6cb2cf7cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0519f53ca06264cab66f8b18… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 29 17:47:20 2022 +0800 evr/tests: Fix resource leaks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53201 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/evr/tests/evr.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index fa9ad2a0b35..37bb55739d3 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1061,10 +1061,11 @@ static void test_surface_sample(void) ok(flags == 0x123, "Unexpected flags %#lx.\n", flags); IMFSample_Release(sample); - -done: if (backbuffer) IDirect3DSurface9_Release(backbuffer); + ok(!IDirect3DDevice9_Release(device), "Unexpected refcount.\n"); + +done: DestroyWindow(window); } @@ -1455,6 +1456,7 @@ static void test_default_presenter(void) hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IDirect3DDeviceManager9_Release(dm); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1484,6 +1486,7 @@ static void test_default_presenter(void) hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(hwnd2 == hwnd, "Unexpected window %p.\n", hwnd2); + IMFVideoDisplayControl_Release(display_control); /* Rate support. */ hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFRateSupport, (void **)&rate_support); @@ -1511,7 +1514,7 @@ static void test_default_presenter(void) IMFRateSupport_Release(rate_support); - IMFVideoPresenter_Release(presenter); + ok(!IMFVideoPresenter_Release(presenter), "Unexpected refcount.\n"); DestroyWindow(hwnd); } @@ -1697,7 +1700,10 @@ static void test_MFCreateVideoSampleAllocator(void) if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); - goto done; + IMFMediaType_Release(video_type); + IMFMediaType_Release(media_type); + DestroyWindow(window); + return; } hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); @@ -1735,14 +1741,13 @@ static void test_MFCreateVideoSampleAllocator(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFMediaBuffer_Release(buffer); IMFSample_Release(sample); - IMFVideoSampleAllocator_Release(allocator); - + IMFMediaType_Release(video_type); IMFMediaType_Release(media_type); IDirect3DDeviceManager9_Release(manager); IDirect3DDevice9_Release(device); -done: DestroyWindow(window); } @@ -2067,6 +2072,7 @@ static void test_presenter_native_video_size(void) hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFTopologyServiceLookupClient_Release(lookup_client); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -2141,6 +2147,7 @@ static void test_presenter_native_video_size(void) ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %lu x %lu.\n", ratio.cx, ratio.cy); + IMFTopologyServiceLookupClient_Release(lookup_client); IMFMediaType_Release(video_type); IMFVideoDisplayControl_Release(display_control); IMFVideoPresenter_Release(presenter); @@ -2259,7 +2266,8 @@ static void test_presenter_video_window(void) hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, hdevice); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - IMFVideoDisplayControl_Release(display_control); + IDirect3DDeviceManager9_Release(dm); + ok(!IMFVideoDisplayControl_Release(display_control), "Unexpected refcount.\n"); DestroyWindow(window); } @@ -2420,6 +2428,7 @@ static void test_presenter_media_type(void) hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, &host.IMFTopologyServiceLookup_iface); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFTopologyServiceLookupClient_Release(lookup_client); hr = IMFVideoDisplayControl_SetVideoWindow(display_control, window); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -2431,6 +2440,7 @@ static void test_presenter_media_type(void) hr = IMFTransform_SetInputType(mixer, 0, input_type, 0); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFMediaType_Release(input_type); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -2463,6 +2473,8 @@ static void test_presenter_media_type(void) IMFVideoDisplayControl_Release(display_control); IMFVideoPresenter_Release(presenter); IMFTransform_Release(mixer); + IDirect3DDeviceManager9_Release(manager); + IDirect3DDevice9_Release(device); done: DestroyWindow(window); @@ -2949,6 +2961,7 @@ static void test_mixer_samples(void) ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); IMFDesiredSample_Clear(desired); + IMFDesiredSample_Release(desired); hr = IMFTransform_ProcessInput(mixer, 0, NULL, 0); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); @@ -3045,8 +3058,8 @@ static void test_mixer_samples(void) IMFVideoProcessor_Release(processor); IMFTransform_Release(mixer); - IDirect3DDevice9_Release(device); IDirect3DDeviceManager9_Release(manager); + ok(!IDirect3DDevice9_Release(device), "Unexpected refcount.\n"); done: DestroyWindow(window); @@ -3120,9 +3133,11 @@ static void test_mixer_render(void) hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFVideoProcessor_Release(processor); hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoMixerControl, (void **)&mixer_control); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFVideoMixerControl_Release(mixer_control); /* Configure device and media types. */ hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); @@ -3197,8 +3212,8 @@ static void test_mixer_render(void) IDirect3DSurface9_Release(surface); IMFTransform_Release(mixer); - IDirect3DDevice9_Release(device); IDirect3DDeviceManager9_Release(manager); + ok(!IDirect3DDevice9_Release(device), "Unexpected refcount.\n"); done: DestroyWindow(window);

1 0

Alexandre Julliard : ntdll: Add _splitpath_s.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 5d2f0688cfdd782962f7104a87b925890b68dd48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2f0688cfdd782962f7104a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:06:44 2022 +0200 ntdll: Add _splitpath_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/string.c | 81 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9291ed63f77..ffc3cb00fcd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1524,6 +1524,7 @@ @ varargs _snwprintf_s(ptr long long wstr) @ varargs _swprintf(ptr wstr) NTDLL_swprintf @ cdecl _splitpath(str ptr ptr ptr ptr) +@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) @ cdecl _strcmpi(str str) _stricmp @ cdecl _stricmp(str str) @ cdecl _strlwr(str) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 5a971a4a0b2..2e3bbc043e5 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1852,37 +1852,37 @@ int WINAPIV sscanf( const char *str, const char *format, ... ) } -/********************************************************************* - * _splitpath (NTDLL.@) - * - * Split a path into its component pieces. - * - * PARAMS - * inpath [I] Path to split - * drv [O] Destination for drive component (e.g. "A:"). Must be at least 3 characters. - * dir [O] Destination for directory component. Should be at least MAX_PATH characters. - * fname [O] Destination for File name component. Should be at least MAX_PATH characters. - * ext [O] Destination for file extension component. Should be at least MAX_PATH characters. - * - * RETURNS - * Nothing. +/****************************************************************** + * _splitpath_s (NTDLL.@) */ -void __cdecl _splitpath(const char* inpath, char * drv, char * dir, - char* fname, char * ext ) +errno_t __cdecl _splitpath_s( const char *inpath, char *drive, size_t sz_drive, + char *dir, size_t sz_dir, char *fname, size_t sz_fname, + char *ext, size_t sz_ext ) { const char *p, *end; + if (!inpath || (!drive && sz_drive) || + (drive && !sz_drive) || + (!dir && sz_dir) || + (dir && !sz_dir) || + (!fname && sz_fname) || + (fname && !sz_fname) || + (!ext && sz_ext) || + (ext && !sz_ext)) + return EINVAL; + if (inpath[0] && inpath[1] == ':') { - if (drv) + if (drive) { - drv[0] = inpath[0]; - drv[1] = inpath[1]; - drv[2] = 0; + if (sz_drive <= 2) goto error; + drive[0] = inpath[0]; + drive[1] = inpath[1]; + drive[2] = 0; } inpath += 2; } - else if (drv) drv[0] = 0; + else if (drive) drive[0] = '\0'; /* look for end of directory part */ end = NULL; @@ -1892,6 +1892,7 @@ void __cdecl _splitpath(const char* inpath, char * drv, char * dir, { if (dir) { + if (sz_dir <= end - inpath) goto error; memcpy( dir, inpath, end - inpath ); dir[end - inpath] = 0; } @@ -1907,8 +1908,44 @@ void __cdecl _splitpath(const char* inpath, char * drv, char * dir, if (fname) { + if (sz_fname <= end - inpath) goto error; memcpy( fname, inpath, end - inpath ); fname[end - inpath] = 0; } - if (ext) strcpy( ext, end ); + if (ext) + { + if (sz_ext <= strlen(end)) goto error; + strcpy( ext, end ); + } + return 0; + +error: + if (drive) drive[0] = 0; + if (dir) dir[0] = 0; + if (fname) fname[0]= 0; + if (ext) ext[0]= 0; + return ERANGE; +} + + +/********************************************************************* + * _splitpath (NTDLL.@) + * + * Split a path into its component pieces. + * + * PARAMS + * inpath [I] Path to split + * drv [O] Destination for drive component (e.g. "A:"). Must be at least 3 characters. + * dir [O] Destination for directory component. Should be at least MAX_PATH characters. + * fname [O] Destination for File name component. Should be at least MAX_PATH characters. + * ext [O] Destination for file extension component. Should be at least MAX_PATH characters. + * + * RETURNS + * Nothing. + */ +void __cdecl _splitpath(const char* inpath, char * drv, char * dir, + char* fname, char * ext ) +{ + _splitpath_s( inpath, drv, drv ? _MAX_DRIVE : 0, dir, dir ? _MAX_DIR : 0, + fname, fname ? _MAX_FNAME : 0, ext, ext ? _MAX_EXT : 0 ); }

1 0

Alexandre Julliard : ntdll: Add _makepath_s.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: ca9f3576471a46942f768dc07f69fa2c9d9acb89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca9f3576471a46942f768dc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:07:13 2022 +0200 ntdll: Add _makepath_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/string.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cc78f4539f3..a4494f79452 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1516,6 +1516,7 @@ @ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) @ cdecl _ltow_s(long ptr long long) +@ cdecl _makepath_s(ptr long str str str str) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) @ varargs _snprintf(ptr long str) NTDLL__snprintf diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 2e3bbc043e5..a48496b65c6 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1949,3 +1949,80 @@ void __cdecl _splitpath(const char* inpath, char * drv, char * dir, _splitpath_s( inpath, drv, drv ? _MAX_DRIVE : 0, dir, dir ? _MAX_DIR : 0, fname, fname ? _MAX_FNAME : 0, ext, ext ? _MAX_EXT : 0 ); } + + +/********************************************************************* + * _makepath_s (NTDLL.@) + */ +errno_t __cdecl _makepath_s( char *path, size_t size, const char *drive, + const char *directory, const char *filename, + const char *extension ) +{ + char *p = path; + + if (!path || !size) return EINVAL; + + if (drive && drive[0]) + { + if (size <= 2) goto range; + *p++ = drive[0]; + *p++ = ':'; + size -= 2; + } + + if (directory && directory[0]) + { + unsigned int len = strlen(directory); + unsigned int needs_separator = directory[len - 1] != '/' && directory[len - 1] != '\\'; + unsigned int copylen = min(size - 1, len); + + if (size < 2) goto range; + memmove(p, directory, copylen); + if (size <= len) goto range; + p += copylen; + size -= copylen; + if (needs_separator) + { + if (size < 2) goto range; + *p++ = '\\'; + size -= 1; + } + } + + if (filename && filename[0]) + { + unsigned int len = strlen(filename); + unsigned int copylen = min(size - 1, len); + + if (size < 2) goto range; + memmove(p, filename, copylen); + if (size <= len) goto range; + p += len; + size -= len; + } + + if (extension && extension[0]) + { + unsigned int len = strlen(extension); + unsigned int needs_period = extension[0] != '.'; + unsigned int copylen; + + if (size < 2) goto range; + if (needs_period) + { + *p++ = '.'; + size -= 1; + } + copylen = min(size - 1, len); + memcpy(p, extension, copylen); + if (size <= len) goto range; + p += copylen; + } + + *p = 0; + return 0; + +range: + path[0] = 0; + return ERANGE; +}

1 0

Zhiyi Zhang : evr: Release buffer after adding it to sample.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 86034654a8323ae38ecbd1ac6e5424ca7de4f1eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=86034654a8323ae38ecbd1ac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 29 17:46:18 2022 +0800 evr: Release buffer after adding it to sample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53201 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/evr/sample.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index f03292704b5..6a1bbf564f5 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -1747,7 +1747,10 @@ HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sam } if (buffer) + { IMFSample_AddBuffer(object->sample, buffer); + IMFMediaBuffer_Release(buffer); + } video_sample_create_tracking_thread();

1 0

Brendan Shanks : ntdll: Use +threadname channel for thread rename exceptions.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 8a61b7c2ebfe1f083f82065973067fd2341fdbf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a61b7c2ebfe1f083f820659… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Dec 6 22:13:19 2021 -0800 ntdll: Use +threadname channel for thread rename exceptions. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/signal_arm.c | 7 ++++++- dlls/ntdll/signal_arm64.c | 7 ++++++- dlls/ntdll/signal_i386.c | 7 ++++++- dlls/ntdll/signal_x86_64.c | 8 ++++++-- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index c4cf557edaf..d0229d934ce 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -36,6 +36,7 @@ #include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(threadname); typedef struct _SCOPE_TABLE { @@ -476,7 +477,11 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) { - WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + if ((DWORD)rec->ExceptionInformation[2] == -1) + WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) ); + else + WARN_(threadname)( "Thread ID %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], + debugstr_a((char *)rec->ExceptionInformation[1]) ); } else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) { diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index fba0da48a16..959c3ea50dc 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -38,6 +38,7 @@ #include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(threadname); typedef struct _SCOPE_TABLE { @@ -508,7 +509,11 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) { - WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + if ((DWORD)rec->ExceptionInformation[2] == -1) + WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) ); + else + WARN_(threadname)( "Thread ID %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], + debugstr_a((char *)rec->ExceptionInformation[1]) ); } else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) { diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 14971032ce6..f4c935ecc94 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -35,6 +35,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(threadname); struct x86_thread_data { @@ -194,7 +195,11 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) { - WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + if ((DWORD)rec->ExceptionInformation[2] == -1) + WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) ); + else + WARN_(threadname)( "Thread ID %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], + debugstr_a((char *)rec->ExceptionInformation[1]) ); } else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) { diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index fef163ac629..9957d0c3dfa 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(unwind); WINE_DECLARE_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(threadname); typedef struct _SCOPE_TABLE { @@ -525,8 +526,11 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) { - WARN_(seh)( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], - debugstr_a((char *)rec->ExceptionInformation[1]) ); + if ((DWORD)rec->ExceptionInformation[2] == -1) + WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) ); + else + WARN_(threadname)( "Thread ID %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], + debugstr_a((char *)rec->ExceptionInformation[1]) ); } else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) {

1 0

Brendan Shanks : ntdll: Use +threadname channel for SetThreadDescription().
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: ee0fd30e58677654fb4339180c0b31360fd31a4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee0fd30e58677654fb433918… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jun 17 14:25:56 2022 -0700 ntdll: Use +threadname channel for SetThreadDescription(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/thread.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index ad47a5fce74..ca1d1293d10 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -70,6 +70,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); WINE_DECLARE_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(threadname); static int nb_threads = 1; @@ -2232,11 +2233,19 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadNameInformation: { const THREAD_NAME_INFORMATION *info = data; + THREAD_BASIC_INFORMATION tbi; if (length != sizeof(*info)) return STATUS_INFO_LENGTH_MISMATCH; if (!info) return STATUS_ACCESS_VIOLATION; if (info->ThreadName.Length && !info->ThreadName.Buffer) return STATUS_ACCESS_VIOLATION; + if (handle == GetCurrentThread()) + WARN_(threadname)( "Thread renamed to %s\n", debugstr_us(&info->ThreadName) ); + else if (!NtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL )) + WARN_(threadname)( "Thread ID %04x renamed to %s\n", HandleToULong( tbi.ClientId.UniqueThread ), debugstr_us(&info->ThreadName) ); + else + WARN_(threadname)( "Thread handle %p renamed to %s\n", handle, debugstr_us(&info->ThreadName) ); + SERVER_START_REQ( set_thread_info ) { req->handle = wine_server_obj_handle( handle );

1 0

Ziqing Hui : d2d1/tests: Test value size checking for custom properties.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 34a701f29eee4cb0e353e6a5a38787ec6774f9d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a701f29eee4cb0e353e6a5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 22 18:50:01 2022 +0800 d2d1/tests: Test value size checking for custom properties. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3d517983e69..78f255c1f99 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10690,7 +10690,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_set_integer(IUnknown *iface, const { struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); - if (!data || data_size != sizeof(effect_impl->integer)) + if (!data) return E_INVALIDARG; effect_impl->integer = *((UINT *)data); @@ -10703,7 +10703,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_integer(const IUnknown *iface, { struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); - if (!data || data_size != sizeof(effect_impl->integer)) + if (!data) return E_INVALIDARG; *((UINT *)data) = effect_impl->integer; @@ -10718,7 +10718,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, { struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); - if (!data || data_size != sizeof(effect_impl->effect_context)) + if (!data) return E_INVALIDARG; *((ID2D1EffectContext **)data) = effect_impl->effect_context; @@ -11247,6 +11247,12 @@ static void test_effect_properties(BOOL d3d11) ok(index == 1, "Got unexpected index %u.\n", index); effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, + L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValueByName(effect, + L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValueByName(effect, L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -11254,6 +11260,10 @@ static void test_effect_properties(BOOL d3d11) "Got unexpected effect context %p.\n", effect_context); effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(effect_context != NULL && effect_context != (ID2D1EffectContext *)0xdeadbeef, @@ -11263,16 +11273,28 @@ static void test_effect_properties(BOOL d3d11) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); integer = 0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(integer == 10, "Got unexpected integer %u.", integer); integer = 0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(integer == 10, "Got unexpected integer %u.", integer); integer = 20; + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); integer = 0xdeadbeef;

1 0