July 2023 - Wine-commits - list.winehq.org

Victor Chiletto : msvcrt: Fix memory leak in create_locinfo.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 46596db7ed6a154dc1af98fc266ce2c47723fbaa URL: https://gitlab.winehq.org/wine/wine/-/commit/46596db7ed6a154dc1af98fc266ce2… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Fri Jul 21 19:20:21 2023 -0300 msvcrt: Fix memory leak in create_locinfo. --- dlls/msvcrt/locale.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b14aa73af05..a24c0c16a48 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1959,6 +1959,9 @@ static pthreadlocinfo create_locinfo(int category, InterlockedIncrement(&locinfo->lc_time_curr->refcount); } + for (i = 0; i < LC_MAX; i++) + free(locale_sname[i]); + return locinfo; fail:

1 0

Victor Chiletto : msvcrt: Remove uses of wcsncpy from locale_to_sname.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: fd2ddf8f2a90da51635de7a7653209783f10032d URL: https://gitlab.winehq.org/wine/wine/-/commit/fd2ddf8f2a90da51635de7a7653209… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Fri Jul 21 19:51:11 2023 -0300 msvcrt: Remove uses of wcsncpy from locale_to_sname. --- dlls/msvcrt/locale.c | 20 +++++++++++--------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index a24c0c16a48..82083d66106 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -329,8 +329,10 @@ find_best_locale_proc( WCHAR *name, DWORD locale_flags, LPARAM lParam ) return CONTINUE_LOOKING; } -/* Internal: Find the sname for a locale specification */ -BOOL locale_to_sname(const char *locale, unsigned short *codepage, BOOL *sname_match, WCHAR *sname, int sname_size) +/* Internal: Find the sname for a locale specification. + * sname must be at least LOCALE_NAME_MAX_LENGTH characters long + */ +BOOL locale_to_sname(const char *locale, unsigned short *codepage, BOOL *sname_match, WCHAR *sname) { thread_data_t *data = msvcrt_get_thread_data(); const char *cp, *region; @@ -342,7 +344,7 @@ BOOL locale_to_sname(const char *locale, unsigned short *codepage, BOOL *sname_m *codepage = data->cached_cp; if (sname_match) *sname_match = data->cached_sname_match; - wcsncpy(sname, data->cached_sname, sname_size); + wcscpy(sname, data->cached_sname); return TRUE; } @@ -350,7 +352,7 @@ BOOL locale_to_sname(const char *locale, unsigned short *codepage, BOOL *sname_m region = strchr(locale, '_'); if(!locale[0] || (cp == locale && !region)) { - GetUserDefaultLocaleName(sname, sname_size); + GetUserDefaultLocaleName(sname, LOCALE_NAME_MAX_LENGTH); } else { char search_language_buf[MAX_ELEM_LEN] = { 0 }, search_country_buf[MAX_ELEM_LEN] = { 0 }; locale_search_t search; @@ -388,7 +390,7 @@ BOOL locale_to_sname(const char *locale, unsigned short *codepage, BOOL *sname_m if (search.allow_sname && IsValidLocaleName(search.search_language)) { search.match_flags = FOUND_SNAME; - wcsncpy(sname, search.search_language, sname_size); + wcscpy(sname, search.search_language); } else { @@ -404,7 +406,7 @@ BOOL locale_to_sname(const char *locale, unsigned short *codepage, BOOL *sname_m if (search.search_country[0] && !(search.match_flags & FOUND_COUNTRY)) return FALSE; - wcsncpy(sname, search.found_lang_sname, sname_size); + wcscpy(sname, search.found_lang_sname); } is_sname = !remapped && (search.match_flags & FOUND_SNAME) != 0; @@ -1333,9 +1335,9 @@ static pthreadlocinfo create_locinfo(int category, if(p) { memcpy(buf, locale, p-locale); buf[p-locale] = '\0'; - locale_found = locale_to_sname(buf, &cp[i], &sname_match, wbuf, LOCALE_NAME_MAX_LENGTH); + locale_found = locale_to_sname(buf, &cp[i], &sname_match, wbuf); } else { - locale_found = locale_to_sname(locale, &cp[i], &sname_match, wbuf, LOCALE_NAME_MAX_LENGTH); + locale_found = locale_to_sname(locale, &cp[i], &sname_match, wbuf); } if(!locale_found || !(locale_sname[i] = wcsdup(wbuf))) @@ -1352,7 +1354,7 @@ static pthreadlocinfo create_locinfo(int category, locale = p+1; } } else { - BOOL locale_found = locale_to_sname(locale, &cp[0], &sname_match, wbuf, LOCALE_NAME_MAX_LENGTH); + BOOL locale_found = locale_to_sname(locale, &cp[0], &sname_match, wbuf); if(!locale_found) return NULL; diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 8598bceb029..c8390288d4a 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -254,7 +254,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) if(lcid == -1) { WCHAR wbuf[LOCALE_NAME_MAX_LENGTH]; sprintf(bufA, ".%d", newcp); - mbcinfo->mblcid = locale_to_sname(bufA, NULL, NULL, wbuf, LOCALE_NAME_MAX_LENGTH) ? LocaleNameToLCID(wbuf, LOCALE_ALLOW_NEUTRAL_NAMES) : -1; + mbcinfo->mblcid = locale_to_sname(bufA, NULL, NULL, wbuf) ? LocaleNameToLCID(wbuf, LOCALE_ALLOW_NEUTRAL_NAMES) : -1; } else { mbcinfo->mblcid = lcid; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 155db86bf02..9f253d45579 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -186,7 +186,7 @@ typedef struct __thread_data thread_data_t; extern thread_data_t *CDECL msvcrt_get_thread_data(void) DECLSPEC_HIDDEN; -BOOL locale_to_sname(const char*, unsigned short*, BOOL*, WCHAR*, int) DECLSPEC_HIDDEN; +BOOL locale_to_sname(const char*, unsigned short*, BOOL*, WCHAR*) DECLSPEC_HIDDEN; extern _locale_t MSVCRT_locale DECLSPEC_HIDDEN; extern __lc_time_data cloc_time_data DECLSPEC_HIDDEN; extern unsigned int MSVCRT___lc_codepage;

1 0

Rémi Bernon : dinput: Unacquire only DISCL_FOREGROUND devices on foreground changes.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 4151acb4e8f04240c2dfceb8830ba7c34f5bf251 URL: https://gitlab.winehq.org/wine/wine/-/commit/4151acb4e8f04240c2dfceb8830ba7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jul 26 10:22:33 2023 +0200 dinput: Unacquire only DISCL_FOREGROUND devices on foreground changes. Fixes broken input in Final Fantasy XIII after main window focus loss. --- dlls/dinput/dinput_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e0406db62b1..e14b023c4cc 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -142,7 +142,7 @@ static LRESULT CALLBACK input_thread_ll_hook_proc( int code, WPARAM wparam, LPAR return skip ? 1 : CallNextHookEx( 0, code, wparam, lparam ); } -static void dinput_unacquire_window_devices( HWND window ) +static void handle_foreground_lost( HWND window ) { struct dinput_device *impl, *next; @@ -150,7 +150,7 @@ static void dinput_unacquire_window_devices( HWND window ) LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_device_list, struct dinput_device, entry ) { - if (window != impl->win) continue; + if (!(impl->dwCoopLevel & DISCL_FOREGROUND) || window != impl->win) continue; TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); } @@ -325,7 +325,7 @@ static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR input_thread_update_device_list( state ); break; case NOTIFY_FOREGROUND_LOST: - dinput_unacquire_window_devices( (HWND)lparam ); + handle_foreground_lost( (HWND)lparam ); break; }

1 0

Francois Gouget : ntdll/tests: Fix the NtSetInformationFile() test on Windows 10 <= 1709.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 2f57803114cfb5cf8549d938e1e15a33d48c71e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f57803114cfb5cf8549d938e1e15a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 25 19:18:06 2023 +0200 ntdll/tests: Fix the NtSetInformationFile() test on Windows 10 <= 1709. It does not support FileDispositionInformationEx and returns various error codes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55331 --- dlls/ntdll/tests/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ee47f36f44e..4d3a3fc0395 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3138,7 +3138,9 @@ static void test_file_disposition_information(void) ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdie.Flags = FILE_DISPOSITION_DELETE | FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE; res = pNtSetInformationFile( handle, &io, &fdie, sizeof fdie, FileDispositionInformationEx ); - ok( res == STATUS_SUCCESS || broken(res == STATUS_INVALID_INFO_CLASS), + ok( res == STATUS_SUCCESS + || broken(res == STATUS_INVALID_INFO_CLASS) /* win10 1507 & 32-bit 1607 */ + || broken(res == STATUS_NOT_SUPPORTED), /* win10 1709 & 64-bit 1607 */ "unexpected FileDispositionInformationEx result (expected STATUS_SUCCESS or SSTATUS_INVALID_INFO_CLASS, got %lx)\n", res ); CloseHandle( handle ); if ( res == STATUS_SUCCESS )

1 0

Francois Gouget : winex11.drv: Add a trailing linefeed to a WARN() message.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: c7e6f208d621045f012c5e3f334f9dcc26b9a87f URL: https://gitlab.winehq.org/wine/wine/-/commit/c7e6f208d621045f012c5e3f334f9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 23 11:49:24 2023 +0200 winex11.drv: Add a trailing linefeed to a WARN() message. --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 9ada6a63d59..ed3728773af 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1526,7 +1526,7 @@ Window get_dummy_parent(void) dummy_parent = XCreateWindow( gdi_display, root_window, -1, -1, 1, 1, 0, default_visual.depth, InputOutput, default_visual.visual, CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); - WARN("Xshape support is not compiled in. Applications under XWayland may have poor performance."); + WARN("Xshape support is not compiled in. Applications under XWayland may have poor performance.\n"); #endif XMapWindow( gdi_display, dummy_parent ); }

1 0

Conor McCarthy : vkd3d: Handle the case where a descriptor is null and is concurrently written non-null.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: vkd3d Branch: master Commit: 3d49b59a68687cf32ee489c22d133c9f758a37c6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3d49b59a68687cf32ee489c22d133… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 25 15:14:36 2023 +1000 vkd3d: Handle the case where a descriptor is null and is concurrently written non-null. If view is null and the comparison (view == src->s.u.object) is false, vkd3d_view_decref will be called on null. --- libs/vkd3d/vkd3d_private.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3be12be7..a5eed59a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -882,8 +882,9 @@ static inline void *d3d12_desc_get_object_ref(const volatile struct d3d12_desc * { do { - view = src->s.u.object; - } while (view && !vkd3d_view_incref(view)); + if (!(view = src->s.u.object)) + return NULL; + } while (!vkd3d_view_incref(view)); /* Check if the object is still in src to handle the case where it was * already freed and reused elsewhere when the refcount was incremented. */

1 0

Rémi Bernon : winegstreamer: Use a fixed size type for wg_sample data pointer.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 0c9e8e655bc121d06f1b55f2f2423d916b67c514 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c9e8e655bc121d06f1b55f2f2423d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 24 14:39:14 2023 +0200 winegstreamer: Use a fixed size type for wg_sample data pointer. --- dlls/winegstreamer/unix_private.h | 5 +++++ dlls/winegstreamer/unixlib.h | 2 +- dlls/winegstreamer/wg_allocator.c | 6 +++--- dlls/winegstreamer/wg_sample.c | 6 +++--- dlls/winegstreamer/wg_transform.c | 8 ++++---- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index 527822cf15b..db6bf3ebb2e 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -59,6 +59,11 @@ extern NTSTATUS wg_transform_flush(void *args) DECLSPEC_HIDDEN; /* wg_allocator.c */ +static inline BYTE *wg_sample_data(struct wg_sample *sample) +{ + return (BYTE *)(UINT_PTR)sample->data; +} + /* wg_allocator_release_sample can be used to release any sample that was requested. */ typedef struct wg_sample *(*wg_allocator_request_sample_cb)(gsize size, void *context); extern GstAllocator *wg_allocator_create(void) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 39391b44735..66c363b5b6e 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -182,7 +182,7 @@ struct wg_sample UINT32 flags; UINT32 max_size; UINT32 size; - BYTE *data; + UINT64 data; /* pointer to user memory */ }; struct wg_parser_buffer diff --git a/dlls/winegstreamer/wg_allocator.c b/dlls/winegstreamer/wg_allocator.c index 629546b237c..5cc2a6fcf12 100644 --- a/dlls/winegstreamer/wg_allocator.c +++ b/dlls/winegstreamer/wg_allocator.c @@ -96,7 +96,7 @@ static void release_memory_sample(WgAllocator *allocator, WgMemory *memory, bool if (memory->written && !discard_data) { GST_WARNING("Copying %#zx bytes from sample %p, back to memory %p", memory->written, sample, memory); - memcpy(get_unix_memory_data(memory), memory->sample->data, memory->written); + memcpy(get_unix_memory_data(memory), wg_sample_data(memory->sample), memory->written); } memory->sample = NULL; @@ -120,7 +120,7 @@ static gpointer wg_allocator_map(GstMemory *gst_memory, GstMapInfo *info, gsize else { InterlockedIncrement(&memory->sample->refcount); - info->data = memory->sample->data; + info->data = wg_sample_data(memory->sample); } if (info->flags & GST_MAP_WRITE) memory->written = max(memory->written, maxsize); @@ -143,7 +143,7 @@ static void wg_allocator_unmap(GstMemory *gst_memory, GstMapInfo *info) pthread_mutex_lock(&allocator->mutex); - if (memory->sample && info->data == memory->sample->data) + if (memory->sample && info->data == wg_sample_data(memory->sample)) { InterlockedDecrement(&memory->sample->refcount); pthread_cond_signal(&allocator->release_cond); diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index 4f786e4febc..4b02252174b 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -104,7 +104,7 @@ HRESULT wg_sample_create_mf(IMFSample *mf_sample, struct wg_sample **out) goto fail; IMFSample_AddRef((sample->u.mf.sample = mf_sample)); - sample->wg_sample.data = buffer; + sample->wg_sample.data = (UINT_PTR)buffer; sample->wg_sample.size = current_length; sample->wg_sample.max_size = max_length; sample->ops = &mf_sample_ops; @@ -159,7 +159,7 @@ HRESULT wg_sample_create_quartz(IMediaSample *media_sample, struct wg_sample **o return E_OUTOFMEMORY; IMediaSample_AddRef((sample->u.quartz.sample = media_sample)); - sample->wg_sample.data = buffer; + sample->wg_sample.data = (UINT_PTR)buffer; sample->wg_sample.size = current_length; sample->wg_sample.max_size = max_length; sample->ops = &quartz_sample_ops; @@ -207,7 +207,7 @@ HRESULT wg_sample_create_dmo(IMediaBuffer *media_buffer, struct wg_sample **out) goto fail; IMediaBuffer_AddRef((sample->u.dmo.buffer = media_buffer)); - sample->wg_sample.data = buffer; + sample->wg_sample.data = (UINT_PTR)buffer; sample->wg_sample.size = length; sample->wg_sample.max_size = max_length; sample->ops = &dmo_sample_ops; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index fc05d8159fb..775fed7a46c 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -577,7 +577,7 @@ NTSTATUS wg_transform_push_data(void *args) return STATUS_SUCCESS; } - if (!(buffer = gst_buffer_new_wrapped_full(GST_MEMORY_FLAG_READONLY, sample->data, sample->max_size, + if (!(buffer = gst_buffer_new_wrapped_full(GST_MEMORY_FLAG_READONLY, wg_sample_data(sample), sample->max_size, 0, sample->size, sample, wg_sample_free_notify))) { GST_ERROR("Failed to allocate input buffer"); @@ -627,7 +627,7 @@ static NTSTATUS copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_ return STATUS_BUFFER_TOO_SMALL; } - if (!(dst_buffer = gst_buffer_new_wrapped_full(0, sample->data, sample->max_size, + if (!(dst_buffer = gst_buffer_new_wrapped_full(0, wg_sample_data(sample), sample->max_size, 0, sample->max_size, 0, NULL))) { GST_ERROR("Failed to wrap wg_sample into GstBuffer"); @@ -673,7 +673,7 @@ static NTSTATUS copy_buffer(GstBuffer *buffer, GstCaps *caps, struct wg_sample * sample->size = sample->max_size; } - memcpy(sample->data, info.data, sample->size); + memcpy(wg_sample_data(sample), info.data, sample->size); gst_buffer_unmap(buffer, &info); if (sample->flags & WG_SAMPLE_FLAG_INCOMPLETE) @@ -697,7 +697,7 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi sample->size = 0; return STATUS_UNSUCCESSFUL; } - needs_copy = info.data != sample->data; + needs_copy = info.data != wg_sample_data(sample); total_size = sample->size = info.size; gst_buffer_unmap(buffer, &info);

1 0

Paul Gofman : ntdll: Match Windows used block filling.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: c77642ec52080a9385362c417505b6d15826a5f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c77642ec52080a9385362c417505b6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 21 19:24:45 2023 -0600 ntdll: Match Windows used block filling. Test rewritten by Rémi Bernon. --- dlls/kernel32/tests/heap.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/heap.c | 6 ++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 59a82c0c579..24ce6b792da 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -3270,6 +3270,35 @@ static void test_heap_checks( DWORD flags ) ret = HeapFree( GetProcessHeap(), 0, p ); ok( ret, "HeapFree failed\n" ); + if (flags & HEAP_FREE_CHECKING_ENABLED) + { + UINT *p32, tmp = 0; + + size = 4 + 3; + p = pHeapAlloc( GetProcessHeap(), 0, size ); + ok( !!p, "HeapAlloc failed\n" ); + p32 = (UINT *)p; + + ok( p32[0] == 0xbaadf00d, "got %#x\n", p32[0] ); + memcpy( &tmp, p + size - 3, 3 ); + ok( tmp != 0xadf00d, "got %#x\n", tmp ); + memset( p, 0xcc, size ); + + size += 2 * 4; + p = pHeapReAlloc( GetProcessHeap(), 0, p, size ); + ok( !!p, "HeapReAlloc failed\n" ); + p32 = (UINT *)p; + + ok( p32[0] == 0xcccccccc, "got %#x\n", p32[0] ); + ok( p32[1] << 8 == 0xcccccc00, "got %#x\n", p32[1] ); + ok( p32[2] == 0xbaadf00d, "got %#x\n", p32[2] ); + memcpy( &tmp, p + size - 3, 3 ); + ok( tmp != 0xadf00d, "got %#x\n", tmp ); + + ret = pHeapFree( GetProcessHeap(), 0, p ); + ok( ret, "failed.\n" ); + } + p = HeapAlloc( GetProcessHeap(), 0, 37 ); ok( p != NULL, "HeapAlloc failed\n" ); memset( p, 0xcc, 37 ); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index aca8e7181a8..5ce7f8fad2f 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -139,7 +139,7 @@ C_ASSERT( sizeof(ARENA_LARGE) == 4 * BLOCK_ALIGN ); #define BLOCK_TYPE_FREE 'F' #define BLOCK_TYPE_LARGE 'L' -#define BLOCK_FILL_USED 0x55 +#define BLOCK_FILL_USED 0xbaadf00d #define BLOCK_FILL_TAIL 0xab #define BLOCK_FILL_FREE 0xfeeefeee @@ -513,6 +513,7 @@ static inline void mark_block_tail( struct block *block, DWORD flags ) static inline void initialize_block( struct block *block, SIZE_T old_size, SIZE_T size, DWORD flags ) { char *data = (char *)(block + 1); + SIZE_T i; if (size <= old_size) return; @@ -524,7 +525,8 @@ static inline void initialize_block( struct block *block, SIZE_T old_size, SIZE_ else if (flags & HEAP_FREE_CHECKING_ENABLED) { valgrind_make_writable( data + old_size, size - old_size ); - memset( data + old_size, BLOCK_FILL_USED, size - old_size ); + i = ROUND_SIZE( old_size, sizeof(DWORD) - 1 ) / sizeof(DWORD); + for (; i < size / sizeof(DWORD); ++i) ((DWORD *)data)[i] = BLOCK_FILL_USED; } }

1 0

Jeff Smith : windowscodecs: PROPVARIANT fields should use CoTaskMem allocation.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 36e5836e5d77bf763e4e5e7b9a770b238e7763fc URL: https://gitlab.winehq.org/wine/wine/-/commit/36e5836e5d77bf763e4e5e7b9a770b… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 23 01:50:43 2023 -0500 windowscodecs: PROPVARIANT fields should use CoTaskMem allocation. --- dlls/windowscodecs/gifformat.c | 87 +++++++++++++++++------------------- dlls/windowscodecs/metadatahandler.c | 46 +++++++++---------- dlls/windowscodecs/pngformat.c | 20 ++++----- 3 files changed, 72 insertions(+), 81 deletions(-)

1 0

Jeff Smith : windowscodecs: Handle PNG histogram (hIST) chunk type.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 57f692aef5cec9065390901a6bc8b0d5b57637eb URL: https://gitlab.winehq.org/wine/wine/-/commit/57f692aef5cec9065390901a6bc8b0… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Jul 20 13:22:10 2023 -0500 windowscodecs: Handle PNG histogram (hIST) chunk type. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/pngformat.c | 68 +++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 25 ++++++++++ dlls/windowscodecs/tests/metadata.c | 59 +++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 8 ++++ 6 files changed, 162 insertions(+) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index d69e5dc4a6d..5065c8f2ca4 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -65,6 +65,7 @@ static const classinfo wic_classes[] = { {&CLSID_WICIfdMetadataReader, IfdMetadataReader_CreateInstance}, {&CLSID_WICPngChrmMetadataReader, PngChrmReader_CreateInstance}, {&CLSID_WICPngGamaMetadataReader, PngGamaReader_CreateInstance}, + {&CLSID_WICPngHistMetadataReader, PngHistReader_CreateInstance}, {&CLSID_WICPngTextMetadataReader, PngTextReader_CreateInstance}, {&CLSID_WICLSDMetadataReader, LSDReader_CreateInstance}, {&CLSID_WICIMDMetadataReader, IMDReader_CreateInstance}, diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 0141f5033ee..4c1e1f8463c 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -31,6 +31,11 @@ #include "wine/debug.h" +static inline USHORT read_ushort_be(BYTE* data) +{ + return data[0] << 8 | data[1]; +} + static inline ULONG read_ulong_be(BYTE* data) { return data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]; @@ -243,6 +248,69 @@ HRESULT PngChrmReader_CreateInstance(REFIID iid, void** ppv) return MetadataReader_Create(&ChrmReader_Vtbl, iid, ppv); } +static HRESULT LoadHistMetadata(IStream *stream, const GUID *preferred_vendor, + DWORD persist_options, MetadataItem **items, DWORD *item_count) +{ + HRESULT hr; + BYTE type[4]; + BYTE *data; + ULONG data_size, element_count, i; + LPWSTR name; + MetadataItem *result; + USHORT *elements; + + hr = read_png_chunk(stream, type, &data, &data_size); + if (FAILED(hr)) return hr; + + element_count = data_size / 2; + elements = CoTaskMemAlloc(element_count * sizeof(USHORT)); + if (!elements) + { + HeapFree(GetProcessHeap(), 0, data); + return E_OUTOFMEMORY; + } + for (i = 0; i < element_count; i++) + elements[i] = read_ushort_be(data + i * 2); + + HeapFree(GetProcessHeap(), 0, data); + + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MetadataItem)); + SHStrDupW(L"Frequencies", &name); + if (!result || !name) { + HeapFree(GetProcessHeap(), 0, result); + CoTaskMemFree(name); + CoTaskMemFree(elements); + return E_OUTOFMEMORY; + } + + PropVariantInit(&result[0].schema); + PropVariantInit(&result[0].id); + PropVariantInit(&result[0].value); + + result[0].id.vt = VT_LPWSTR; + result[0].id.pwszVal = name; + + result[0].value.vt = VT_UI2|VT_VECTOR; + result[0].value.caui.cElems = element_count; + result[0].value.caui.pElems = elements; + + *items = result; + *item_count = 1; + + return S_OK; +} + +static const MetadataHandlerVtbl HistReader_Vtbl = { + 0, + &CLSID_WICPngHistMetadataReader, + LoadHistMetadata +}; + +HRESULT PngHistReader_CreateInstance(REFIID iid, void** ppv) +{ + return MetadataReader_Create(&HistReader_Vtbl, iid, ppv); +} + HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) { HRESULT hr; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 5aa8b618afa..113fac21603 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1620,6 +1620,21 @@ static const struct reader_containers pngchrm_containers[] = { { NULL } /* list terminator */ }; +static const BYTE hIST[] = "hIST"; + +static const struct metadata_pattern pnghist_metadata_pattern[] = { + { 4, 4, hIST, mask_all, 4 }, + { 0 } +}; + +static const struct reader_containers pnghist_containers[] = { + { + &GUID_ContainerFormatPng, + pnghist_metadata_pattern + }, + { NULL } /* list terminator */ +}; + static const struct metadata_pattern lsd_metadata_patterns[] = { { 0, 6, gif87a_magic, mask_all, 0 }, { 0, 6, gif89a_magic, mask_all, 0 }, @@ -1735,6 +1750,16 @@ static struct regsvr_metadatareader const metadatareader_list[] = { 0, 0, 0, pnggama_containers }, + { &CLSID_WICPngHistMetadataReader, + "The Wine Project", + "Chunk hIST Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatChunkhIST, + 0, 0, 0, + pnghist_containers + }, { &CLSID_WICPngTextMetadataReader, "The Wine Project", "Chunk tEXt Reader", diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 1d3f909350c..a50edbb2412 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -158,6 +158,17 @@ static const char metadata_cHRM[] = { 0xff,0xff,0xff,0xff /* chunk CRC */ }; +static const char metadata_hIST[] = { + 0,0,0,40, /* chunk length */ + 'h','I','S','T', /* chunk type */ + 0,1, 0,2, 0,3, 0,4, + 0,5, 0,6, 0,7, 0,8, + 0,9, 0,10, 0,11, 0,12, + 0,13, 0,14, 0,15, 0,16, + 0,17, 0,18, 0,19, 0,20, + 0xff,0xff,0xff,0xff +}; + static const char pngimage[285] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, @@ -555,6 +566,53 @@ static void test_metadata_cHRM(void) IWICMetadataReader_Release(reader); } +static void test_metadata_hIST(void) +{ + HRESULT hr; + IWICMetadataReader *reader; + PROPVARIANT schema, id, value; + UINT count, i; + GUID format; + static const WCHAR Frequencies[] = L"Frequencies"; + + PropVariantInit(&schema); + PropVariantInit(&id); + PropVariantInit(&value); + + hr = CoCreateInstance(&CLSID_WICPngHistMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void**)&reader); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%lx\n", hr); + if (FAILED(hr)) return; + + load_stream((IUnknown*)reader, metadata_hIST, sizeof(metadata_hIST), WICPersistOptionDefault); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%lx\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatChunkhIST), "unexpected format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount failed, hr=%lx\n", hr); + ok(count == 1, "unexpected count %i\n", count); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, &schema, &id, &value); + ok(hr == S_OK, "GetValue failed, hr=%lx\n", hr); + + ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); + PropVariantClear(&schema); + + ok(id.vt == VT_LPWSTR, "unexpected vt: %i\n", id.vt); + ok(!lstrcmpW(U(id).pwszVal, Frequencies), "unexpected value: %s\n", wine_dbgstr_w(U(id).pwszVal)); + PropVariantClear(&id); + + ok(value.vt == (VT_UI2|VT_VECTOR), "unexpected vt: %i\n", value.vt); + ok(20 == U(value).caui.cElems, "expected cElems %d, got %ld\n", 20, U(value).caub.cElems); + for (i = 0; i < U(value).caui.cElems; i++) + ok(i+1 == U(value).caui.pElems[i], "%u: expected value %u, got %u\n", i, i+1, U(value).caui.pElems[i]); + PropVariantClear(&value); + + IWICMetadataReader_Release(reader); +} + static inline USHORT ushort_bswap(USHORT s) { return (s >> 8) | (s << 8); @@ -3213,6 +3271,7 @@ START_TEST(metadata) test_metadata_tEXt(); test_metadata_gAMA(); test_metadata_cHRM(); + test_metadata_hIST(); test_metadata_IFD(); test_metadata_Exif(); test_create_reader(); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 9530325358c..3dcb20786f2 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -219,6 +219,7 @@ extern HRESULT UnknownMetadataReader_CreateInstance(REFIID iid, void** ppv); extern HRESULT IfdMetadataReader_CreateInstance(REFIID iid, void **ppv); extern HRESULT PngChrmReader_CreateInstance(REFIID iid, void** ppv); extern HRESULT PngGamaReader_CreateInstance(REFIID iid, void** ppv); +extern HRESULT PngHistReader_CreateInstance(REFIID iid, void** ppv); extern HRESULT PngTextReader_CreateInstance(REFIID iid, void** ppv); extern HRESULT LSDReader_CreateInstance(REFIID iid, void **ppv); extern HRESULT IMDReader_CreateInstance(REFIID iid, void **ppv); diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index ca467226dff..e60111ed19c 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -174,10 +174,18 @@ coclass WICPngChrmMetadataReader { interface IWICMetadataReader; } ] coclass WICPngGamaMetadataReader { interface IWICMetadataReader; } +[ + helpstring("WIC Png hIST Metadata Reader"), + threading(both), + uuid(877a0bb7-a313-4491-87b5-2e6d0594f520) +] +coclass WICPngHistMetadataReader { interface IWICMetadataReader; } + [ helpstring("WIC Png tEXt Metadata Reader"), threading(both), uuid(4b59afcc-b8c3-408a-b670-89e5fab6fda7) + ] coclass WICPngTextMetadataReader { interface IWICMetadataReader; }

1 0