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

Alexandre Julliard : ntdll: Reimplement RtlAreBitsSet() to check 32 bits at a time.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 23ce5b8f10607c441eb7470e6df64f18fa4e18bd URL: https://gitlab.winehq.org/wine/wine/-/commit/23ce5b8f10607c441eb7470e6df64f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 22 17:33:04 2023 +0200 ntdll: Reimplement RtlAreBitsSet() to check 32 bits at a time. --- dlls/ntdll/rtlbitmap.c | 73 ++++++++------------------------------------------ 1 file changed, 11 insertions(+), 62 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 3c3f2182a72..17a8f8b3134 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -164,75 +164,24 @@ void WINAPI RtlClearBits( RTL_BITMAP *bitmap, ULONG start, ULONG count) /************************************************************************* * RtlAreBitsSet [NTDLL.@] - * - * Determine if part of a bitmap is set. - * - * PARAMS - * lpBits [I] Bitmap pointer - * ulStart [I] First bit to check from - * ulCount [I] Number of consecutive bits to check - * - * RETURNS - * TRUE, If ulCount bits from ulStart are set. - * FALSE, Otherwise. */ -BOOLEAN WINAPI RtlAreBitsSet(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) +BOOLEAN WINAPI RtlAreBitsSet( const RTL_BITMAP *bitmap, ULONG start, ULONG count ) { - LPBYTE lpOut; - ULONG ulRemainder; - - TRACE("(%p,%lu,%lu)\n", lpBits, ulStart, ulCount); - - if (!lpBits || !ulCount || - ulStart >= lpBits->SizeOfBitMap || - ulCount > lpBits->SizeOfBitMap - ulStart) - return FALSE; - - /* FIXME: It might be more efficient/cleaner to manipulate four bytes - * at a time. But beware of the pointer arithmetics... - */ - lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u); + ULONG end = start + count; + ULONG pos = start / 32; + ULONG end_pos = end / 32; - /* Check bits in first byte, if ulStart isn't a byte boundary */ - if (ulStart & 7) - { - if (ulCount > 7) - { - /* Check from start bit to the end of the byte */ - if ((*lpOut & - ((0xff << (ulStart & 7))) & 0xff) != ((0xff << (ulStart & 7) & 0xff))) - return FALSE; - lpOut++; - ulCount -= (8 - (ulStart & 7)); - } - else - { - /* Check from the start bit, possibly into the next byte also */ - USHORT initialWord = NTDLL_maskBits[ulCount] << (ulStart & 7); + TRACE( "(%p,%lu,%lu)\n", bitmap, start, count ); - if ((*lpOut & (initialWord & 0xff)) != (initialWord & 0xff)) - return FALSE; - if ((initialWord & 0xff00) && - ((lpOut[1] & (initialWord >> 8)) != (initialWord >> 8))) + if (!count || start >= bitmap->SizeOfBitMap || count > bitmap->SizeOfBitMap - start) return FALSE; - return TRUE; - } - } - /* Check bits in blocks of 8 bytes */ - ulRemainder = ulCount & 7; - ulCount >>= 3; - while (ulCount--) - { - if (*lpOut++ != 0xff) - return FALSE; - } + if (end_pos == pos) return (bitmap->Buffer[pos] | ~maskbits( start ) | maskbits( end )) == ~0u; - /* Check remaining bits, if any */ - if (ulRemainder && - (*lpOut & NTDLL_maskBits[ulRemainder]) != NTDLL_maskBits[ulRemainder]) - return FALSE; - return TRUE; + if ((bitmap->Buffer[pos++] | ~maskbits( start )) != ~0u) return FALSE; + while (pos < end_pos) if (bitmap->Buffer[pos++] != ~0u) return FALSE; + if (!(end & 31)) return TRUE; + return (bitmap->Buffer[pos] | maskbits( end )) == ~0u; } /*************************************************************************

1 0

Alexandre Julliard : ntdll: Reimplement RtlAreBitsClear() to check 32 bits at a time.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 504f9d3cb8680e6c8f4a6bb44eb5bd9e197859eb URL: https://gitlab.winehq.org/wine/wine/-/commit/504f9d3cb8680e6c8f4a6bb44eb5bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 22 17:33:32 2023 +0200 ntdll: Reimplement RtlAreBitsClear() to check 32 bits at a time. --- dlls/ntdll/rtlbitmap.c | 70 ++++++++------------------------------------------ 1 file changed, 11 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 17a8f8b3134..b6225165840 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -186,72 +186,24 @@ BOOLEAN WINAPI RtlAreBitsSet( const RTL_BITMAP *bitmap, ULONG start, ULONG count /************************************************************************* * RtlAreBitsClear [NTDLL.@] - * - * Determine if part of a bitmap is clear. - * - * PARAMS - * lpBits [I] Bitmap pointer - * ulStart [I] First bit to check from - * ulCount [I] Number of consecutive bits to check - * - * RETURNS - * TRUE, If ulCount bits from ulStart are clear. - * FALSE, Otherwise. */ -BOOLEAN WINAPI RtlAreBitsClear(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) +BOOLEAN WINAPI RtlAreBitsClear( const RTL_BITMAP *bitmap, ULONG start, ULONG count ) { - LPBYTE lpOut; - ULONG ulRemainder; - - TRACE("(%p,%lu,%lu)\n", lpBits, ulStart, ulCount); - - if (!lpBits || !ulCount || - ulStart >= lpBits->SizeOfBitMap || - ulCount > lpBits->SizeOfBitMap - ulStart) - return FALSE; - - /* FIXME: It might be more efficient/cleaner to manipulate four bytes - * at a time. But beware of the pointer arithmetics... - */ - lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u); + ULONG end = start + count; + ULONG pos = start / 32; + ULONG end_pos = end / 32; - /* Check bits in first byte, if ulStart isn't a byte boundary */ - if (ulStart & 7) - { - if (ulCount > 7) - { - /* Check from start bit to the end of the byte */ - if (*lpOut & ((0xff << (ulStart & 7)) & 0xff)) - return FALSE; - lpOut++; - ulCount -= (8 - (ulStart & 7)); - } - else - { - /* Check from the start bit, possibly into the next byte also */ - USHORT initialWord = NTDLL_maskBits[ulCount] << (ulStart & 7); + TRACE( "(%p,%lu,%lu)\n", bitmap, start, count ); - if (*lpOut & (initialWord & 0xff)) - return FALSE; - if ((initialWord & 0xff00) && (lpOut[1] & (initialWord >> 8))) + if (!count || start >= bitmap->SizeOfBitMap || count > bitmap->SizeOfBitMap - start) return FALSE; - return TRUE; - } - } - /* Check bits in blocks of 8 bytes */ - ulRemainder = ulCount & 7; - ulCount >>= 3; - while (ulCount--) - { - if (*lpOut++) - return FALSE; - } + if (end_pos == pos) return !(bitmap->Buffer[pos] & maskbits( start ) & ~maskbits( end )); - /* Check remaining bits, if any */ - if (ulRemainder && *lpOut & NTDLL_maskBits[ulRemainder]) - return FALSE; - return TRUE; + if (bitmap->Buffer[pos++] & maskbits( start )) return FALSE; + while (pos < end_pos) if (bitmap->Buffer[pos++]) return FALSE; + if (!(end & 31)) return TRUE; + return !(bitmap->Buffer[pos] & ~maskbits( end )); } /*************************************************************************

1 0

Alexandre Julliard : ntdll: Reimplement RtlNumberOfSetBits() to check 32 bits at a time.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 2371906a25635c2ff7c439b5a4ca89390c79fa56 URL: https://gitlab.winehq.org/wine/wine/-/commit/2371906a25635c2ff7c439b5a4ca89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 22 17:34:11 2023 +0200 ntdll: Reimplement RtlNumberOfSetBits() to check 32 bits at a time. --- dlls/ntdll/rtlbitmap.c | 60 ++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 43 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index b6225165840..4bf028fbe36 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -37,14 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); -/* Bits set from LSB to MSB; used as mask for runs < 8 bits */ -static const BYTE NTDLL_maskBits[8] = { 0, 1, 3, 7, 15, 31, 63, 127 }; - -/* Number of set bits for each value of a nibble; used for counting */ -static const BYTE NTDLL_nibbleBitCount[16] = { - 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 -}; - /* First set bit in a nibble; used for determining least significant bit */ static const BYTE NTDLL_leastSignificant[16] = { 0, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 @@ -60,6 +52,17 @@ static inline ULONG maskbits( ULONG idx ) return ~0u << (idx & 31); } +static ULONG popcount( ULONG val ) +{ +#if defined(__MINGW32__) + return __builtin_popcount( val ); +#else + val -= val >> 1 & 0x55555555; + val = (val & 0x33333333) + (val >> 2 & 0x33333333); + return ((val + (val >> 4)) & 0x0f0f0f0f) * 0x01010101 >> 24; +#endif +} + /************************************************************************* * RtlInitializeBitMap [NTDLL.@] * @@ -352,45 +355,16 @@ ULONG WINAPI RtlFindClearBitsAndSet(PRTL_BITMAP lpBits, ULONG ulCount, ULONG ulH /************************************************************************* * RtlNumberOfSetBits [NTDLL.@] - * - * Find the number of set bits in a bitmap. - * - * PARAMS - * lpBits [I] Bitmap pointer - * - * RETURNS - * The number of set bits. */ -ULONG WINAPI RtlNumberOfSetBits(PCRTL_BITMAP lpBits) +ULONG WINAPI RtlNumberOfSetBits( const RTL_BITMAP *bitmap ) { - ULONG ulSet = 0; + ULONG i, ret = 0; - TRACE("(%p)\n", lpBits); - - if (lpBits) - { - LPBYTE lpOut = (BYTE *)lpBits->Buffer; - ULONG ulCount, ulRemainder; - BYTE bMasked; - - ulCount = lpBits->SizeOfBitMap >> 3; - ulRemainder = lpBits->SizeOfBitMap & 0x7; - - while (ulCount--) - { - ulSet += NTDLL_nibbleBitCount[*lpOut >> 4]; - ulSet += NTDLL_nibbleBitCount[*lpOut & 0xf]; - lpOut++; - } + for (i = 0; i < bitmap->SizeOfBitMap / 32; i++) ret += popcount( bitmap->Buffer[i] ); + if (bitmap->SizeOfBitMap & 31) ret += popcount( bitmap->Buffer[i] & ~maskbits( bitmap->SizeOfBitMap )); - if (ulRemainder) - { - bMasked = *lpOut & NTDLL_maskBits[ulRemainder]; - ulSet += NTDLL_nibbleBitCount[bMasked >> 4]; - ulSet += NTDLL_nibbleBitCount[bMasked & 0xf]; - } - } - return ulSet; + TRACE( "%p -> %lu\n", bitmap, ret ); + return ret; } /*************************************************************************

1 0

Alex Henrie : kernel32/tests: Check that lpSectionBase != NULL before dereferencing.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: bd7459579d1fa448912151fd2d51564eb6b8716d URL: https://gitlab.winehq.org/wine/wine/-/commit/bd7459579d1fa448912151fd2d5156… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 12 22:58:06 2023 -0600 kernel32/tests: Check that lpSectionBase != NULL before dereferencing. If lpSectionBase is null then the tests will still crash, but at least we'll know why. --- dlls/kernel32/tests/actctx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index da351e70466..3d547e01b19 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1454,8 +1454,8 @@ static void test_find_activatable_class(HANDLE handle, const WCHAR *classid, enu ok_(__FILE__, line)(data.lpData != NULL, "got lpData %p\n", data.lpData); header = (struct strsection_header *)data.lpSectionBase; - ok_(__FILE__, line)(header->magic == 0x64487353, "got wrong magic 0x%08lx\n", header->magic); ok_(__FILE__, line)(data.lpSectionBase != NULL, "got lpSectionBase %p\n", data.lpSectionBase); + ok_(__FILE__, line)(header->magic == 0x64487353, "got wrong magic 0x%08lx\n", header->magic); ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "got ulSectionTotalLength %lu\n", data.ulSectionTotalLength); ok_(__FILE__, line)(data.lpSectionGlobalData == (BYTE *)header + header->global_offset, "got lpSectionGlobalData %p\n", data.lpSectionGlobalData); @@ -1706,10 +1706,10 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU } header = (struct guidsection_header*)data.lpSectionBase; + ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.lpSectionGlobalData == ((BYTE*)header + header->names_offset), "data.lpSectionGlobalData == NULL\n"); ok_(__FILE__, line)(data.ulSectionGlobalDataLength == header->names_len, "data.ulSectionGlobalDataLength=%lu\n", data.ulSectionGlobalDataLength); - ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%lu\n", data.ulSectionTotalLength); ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); @@ -1914,9 +1914,9 @@ static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const } header = (struct strsection_header*)data.lpSectionBase; + ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.lpSectionGlobalData == (BYTE*)header + header->global_offset, "data.lpSectionGlobalData == NULL\n"); ok_(__FILE__, line)(data.ulSectionGlobalDataLength == header->global_len, "data.ulSectionGlobalDataLength=%lu\n", data.ulSectionGlobalDataLength); - ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%lu\n", data.ulSectionTotalLength); ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n",

1 0

Alex Henrie : ntdll: Increment offset by len in build_clr_surrogate_section.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 7af7ff872b3b1f3ab82a2b666cae2bd3d9401006 URL: https://gitlab.winehq.org/wine/wine/-/commit/7af7ff872b3b1f3ab82a2b666cae2b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Apr 20 09:03:47 2023 -0600 ntdll: Increment offset by len in build_clr_surrogate_section. Instead of multiplying it by 2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54808 Co-authored-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/actctx.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/ntdll/actctx.c | 2 +- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 3d547e01b19..2225215be8a 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -147,6 +147,11 @@ static const char manifest3[] = " name=\"testsurrogate\"" " runtimeVersion=\"v2.0.50727\"" " />" +" <clrSurrogate " +" clsid=\"{96666666-8888-7777-6666-555555555556}\"" +" name=\"testsurrogate\"" +" runtimeVersion=\"v2.0.50728\"" +" />" " <clrClass " " clsid=\"{22345678-1234-5678-1234-111122223333}\"" " name=\"clrclass\"" @@ -1592,6 +1597,29 @@ struct clrclass_data { DWORD res2[2]; }; +static void validate_guid_index(const ACTCTX_SECTION_KEYED_DATA *data, int line) +{ +#define GUIDSECTION_MAGIC 0x64487347 /* dHsG */ + struct guidsection_header *header; + struct guid_index *index; + unsigned int i; + + header = (struct guidsection_header *)data->lpSectionBase; + + ok_(__FILE__, line)(header->magic == GUIDSECTION_MAGIC, "Unexpected magic %#lx.\n", header->magic); + ok_(__FILE__, line)(header->size == sizeof(*header), "Unexpected size %ld.\n", header->size); + ok_(__FILE__, line)(header->index_offset >= sizeof(*header), "Unexpected index offset %lu.\n", header->index_offset); + + index = (struct guid_index *)((BYTE *)data->lpSectionBase + header->index_offset); + for (i = 0; i < header->count; ++i) + { + ok_(__FILE__, line)(index[i].data_len <= data->ulSectionTotalLength, "Unexpected data length.\n"); + ok_(__FILE__, line)(index[i].data_offset <= data->ulSectionTotalLength - index[i].data_len, + "Unexpected data offset %ld, section total length %lu, data length %lu.\n", + index[i].data_offset, data->ulSectionTotalLength, index[i].data_len); + } +} + static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GUID *tlid, const WCHAR *progid, ULONG exid, int line) { struct comclassredirect_data *comclass, *comclass2; @@ -1715,6 +1743,7 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n", data.ulAssemblyRosterIndex, exid); + validate_guid_index(&data, line); /* generated guid for this class works as key guid in search */ memset(&data2, 0xfe, sizeof(data2)); @@ -1801,6 +1830,8 @@ static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n", data.ulAssemblyRosterIndex, exid); + + validate_guid_index(&data, line); } struct clrsurrogate_data @@ -1815,7 +1846,7 @@ struct clrsurrogate_data }; static void test_find_surrogate(HANDLE handle, const GUID *clsid, const WCHAR *name, const WCHAR *version, - ULONG exid, int line) + ULONG exid, int line) { struct clrsurrogate_data *surrogate; ACTCTX_SECTION_KEYED_DATA data; @@ -1871,6 +1902,8 @@ static void test_find_surrogate(HANDLE handle, const GUID *clsid, const WCHAR *n ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%lu, expected %lu\n", data.ulAssemblyRosterIndex, exid); + + validate_guid_index(&data, line); } static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const char *progid, ULONG exid, int line) @@ -1911,6 +1944,8 @@ static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const comclass = (struct comclassredirect_data*)data2.lpData; ok_(__FILE__, line)(IsEqualGUID(guid, &comclass->alias), "got wrong alias referenced from progid %s, %s\n", progid, wine_dbgstr_guid(guid)); ok_(__FILE__, line)(IsEqualGUID(clsid, &comclass->clsid), "got wrong class referenced from progid %s, %s\n", progid, wine_dbgstr_guid(clsid)); + + validate_guid_index(&data2, line); } header = (struct strsection_header*)data.lpSectionBase; @@ -2076,6 +2111,7 @@ static void test_typelib_section(void) section = (struct guidsection_header*)data.lpSectionBase; ok(section->count == 4, "got %ld\n", section->count); ok(section->size == sizeof(*section), "got %ld\n", section->size); + validate_guid_index(&data, __LINE__); /* For both GUIDs same section is returned */ ok(data.lpSectionBase == data2.lpSectionBase, "got %p, %p\n", data.lpSectionBase, data2.lpSectionBase); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 08a4893a85d..54167a2db67 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4828,7 +4828,7 @@ static NTSTATUS build_clr_surrogate_section(ACTIVATION_CONTEXT* actctx, struct g ptrW[data->version_len/sizeof(WCHAR)] = 0; } - data_offset += index->data_offset; + data_offset += index->data_len; index++; } }

1 0

Alistair Leslie-Hughes : widl: Suppress a coverity warning.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 1aa6a900e83e410602c49e085cb95d13935b74f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1aa6a900e83e410602c49e085cb95d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 3 18:14:53 2023 +1000 widl: Suppress a coverity warning. Knowning that frame->code will be set when the exception handler is called. Suppress this coverity issue. --- tools/widl/proxy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index a80aa5d77fe..3d55cd73ee7 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -298,6 +298,7 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, if (has_ret) { indent++; proxy_free_variables( type_function_get_args(func->declspec.type), "" ); + print_proxy( "/* coverity[uninit_use_in_call:SUPPRESS] */\n" ); print_proxy( "_RetVal = NdrProxyErrorHandler(RpcExceptionCode());\n" ); indent--; }

1 0

Paul Gofman : ntdll: Mind LFH pending blocks in RtlDestroyHeap().
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 74e0c4ce6b8216610f28df6db9bc38014ac871c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/74e0c4ce6b8216610f28df6db9bc38… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 20 17:58:51 2023 -0600 ntdll: Mind LFH pending blocks in RtlDestroyHeap(). --- dlls/ntdll/heap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 7547ac50f61..d8dab867ff5 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -326,6 +326,8 @@ C_ASSERT( offsetof(struct heap, subheap) <= REGION_ALIGN - 1 ); static struct heap *process_heap; /* main process heap */ +static NTSTATUS heap_free_block_lfh( struct heap *heap, ULONG flags, struct block *block ); + /* check if memory range a contains memory range b */ static inline BOOL contains( const void *a, SIZE_T a_size, const void *b, SIZE_T b_size ) { @@ -1640,7 +1642,10 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE handle ) { heap->pending_free = NULL; for (tmp = pending; *tmp && tmp != pending + MAX_FREE_PENDING; ++tmp) + { + if (!heap_free_block_lfh( heap, heap->flags, *tmp )) continue; heap_free_block( heap, heap->flags, *tmp ); + } RtlFreeHeap( handle, 0, pending ); }

1 0

Davide Beatrici : winealsa: Implement functions to lock and unlock sessions.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: bebe0f7ee0c5b404fc625377e2b033962d893c6c URL: https://gitlab.winehq.org/wine/wine/-/commit/bebe0f7ee0c5b404fc625377e2b033… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Apr 21 23:11:12 2023 +0200 winealsa: Implement functions to lock and unlock sessions. --- dlls/winealsa.drv/mmdevdrv.c | 86 ++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c46ae41f48b..049abd53f41 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -81,6 +81,16 @@ static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); +static void sessions_lock(void) +{ + EnterCriticalSection(&g_sessions_lock); +} + +static void sessions_unlock(void) +{ + LeaveCriticalSection(&g_sessions_lock); +} + static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); @@ -480,9 +490,9 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IMMDevice_Release(This->parent); IUnknown_Release(This->marshal); if(This->session){ - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); list_remove(&This->entry); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); } HeapFree(GetProcessHeap(), 0, This->vols); if (This->stream) @@ -666,10 +676,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(This->stream){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_ALREADY_INITIALIZED; } @@ -688,7 +698,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ALSA_CALL(create_stream, &params); if(FAILED(params.result)){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return params.result; } @@ -718,7 +728,7 @@ exit: set_stream_volumes(This); } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return params.result; } @@ -876,10 +886,10 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(!This->stream){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_NOT_INITIALIZED; } @@ -892,7 +902,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return params.result; } @@ -964,23 +974,23 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(!This->stream){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_NOT_INITIALIZED; } if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); @@ -995,7 +1005,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return E_OUTOFMEMORY; } }else @@ -1006,7 +1016,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return E_OUTOFMEMORY; } }else @@ -1017,7 +1027,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return E_OUTOFMEMORY; } }else @@ -1027,11 +1037,11 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, } if(*ppv){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); FIXME("stub %s\n", debugstr_guid(riid)); return E_NOINTERFACE; @@ -1545,9 +1555,9 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) TRACE("(%p) Refcount now %lu\n", This, ref); if(!ref){ if(This->client){ - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); This->client->session_wrapper = NULL; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); AudioClient_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); @@ -1567,11 +1577,11 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, if(!state) return NULL_PTR_ERR; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(list_empty(&This->session->clients)){ *state = AudioSessionStateExpired; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1580,12 +1590,12 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, ALSA_CALL(is_started, &params); if(params.result == S_OK){ *state = AudioSessionStateActive; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); *state = AudioSessionStateInactive; @@ -1799,14 +1809,14 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->master_vol = level; LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1839,13 +1849,13 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->mute = mute; LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1940,12 +1950,12 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); This->vols[index] = level; set_stream_volumes(This); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1984,13 +1994,13 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; set_stream_volumes(This); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -2009,12 +2019,12 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -2102,14 +2112,14 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->channel_vols[index] = level; LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -2156,7 +2166,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; @@ -2164,7 +2174,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; }

1 0

Davide Beatrici : winecoreaudio: Implement functions to lock and unlock sessions.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 4aeef7e6132474d418dcddabcc5c21df2ecb71b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4aeef7e6132474d418dcddabcc5c21… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Apr 21 23:11:32 2023 +0200 winecoreaudio: Implement functions to lock and unlock sessions. --- dlls/winecoreaudio.drv/mmdevdrv.c | 66 ++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 21c2528cab1..0ec1fc63c60 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -75,6 +75,16 @@ static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); +static void sessions_lock(void) +{ + EnterCriticalSection(&g_sessions_lock); +} + +static void sessions_unlock(void) +{ + LeaveCriticalSection(&g_sessions_lock); +} + static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); @@ -452,9 +462,9 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) UNIX_CALL(release_stream, &params); This->stream = 0; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); list_remove(&This->entry); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); } HeapFree(GetProcessHeap(), 0, This->vols); IMMDevice_Release(This->parent); @@ -641,10 +651,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(This->stream){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_ALREADY_INITIALIZED; } @@ -661,7 +671,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, UNIX_CALL(create_stream, &params); if(FAILED(params.result)){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return params.result; } @@ -692,7 +702,7 @@ end: set_stream_volumes(This, -1); } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return params.result; } @@ -934,7 +944,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ @@ -998,7 +1008,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, } end: - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return hr; } @@ -1492,7 +1502,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); ULONG ref; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %lu\n", This, ref); @@ -1504,7 +1514,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) HeapFree(GetProcessHeap(), 0, This); } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return ref; } @@ -1520,11 +1530,11 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, if(!state) return NULL_PTR_ERR; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(list_empty(&This->session->clients)){ *state = AudioSessionStateExpired; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1533,12 +1543,12 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, UNIX_CALL(is_started, &params); if(params.result == S_OK){ *state = AudioSessionStateActive; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); *state = AudioSessionStateInactive; @@ -1750,14 +1760,14 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->master_vol = level; LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client, -1); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1790,14 +1800,14 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->mute = mute; LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client, -1); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1890,14 +1900,14 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(index >= This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); set_stream_volumes(This, index); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1934,14 +1944,14 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; set_stream_volumes(This, -1); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1960,12 +1970,12 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -2051,7 +2061,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->channel_vols[index] = level; @@ -2059,7 +2069,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client, index); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -2104,7 +2114,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; @@ -2112,7 +2122,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client, -1); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; }

1 0

Piotr Caban : gdi32: Store palette in EMR_EOF record.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: f45baaa11e74a967fecebc6efbcbbbcf2821da01 URL: https://gitlab.winehq.org/wine/wine/-/commit/f45baaa11e74a967fecebc6efbcbbb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 22:16:16 2023 +0200 gdi32: Store palette in EMR_EOF record. --- dlls/gdi32/emfdc.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index cc8e78a3cb5..42330a22861 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -41,6 +41,9 @@ struct emf HBRUSH dc_brush; HPEN dc_pen; BOOL path; + DWORD palette_size; + DWORD palette_used; + PALETTEENTRY *palette; }; #define HANDLE_LIST_INC 20 @@ -394,6 +397,40 @@ static void emfdc_delete_object( HDC hdc, HGDIOBJ obj ) emf->cur_handles--; } +static BOOL emfdc_add_palette_entry( struct emf *emf, PALETTEENTRY *entry ) +{ + int i; + + for (i = 0; i < emf->palette_used; i++) + { + if (emf->palette[i].peRed == entry->peRed && + emf->palette[i].peGreen == entry->peGreen && + emf->palette[i].peBlue == entry->peBlue) return TRUE; + } + + if (emf->palette_size == emf->palette_used) + { + if (!emf->palette_size) + { + emf->palette = HeapAlloc( GetProcessHeap(), 0, + 8 * sizeof(*emf->palette) ); + if (!emf->palette) return FALSE; + emf->palette_size = 8; + } + else + { + void *new_palette = HeapReAlloc( GetProcessHeap(), 0, emf->palette, + 2 * emf->palette_size * sizeof(*emf->palette) ); + if (!new_palette) return FALSE; + emf->palette = new_palette; + emf->palette_size *= 2; + } + } + + emf->palette[emf->palette_used++] = *entry; + return TRUE; +} + static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) { DWORD index = 0; @@ -663,7 +700,10 @@ static DWORD emfdc_create_palette( struct emf *emf, HPALETTE hPal ) return 0; for (i = 0; i < hdr->lgpl.palNumEntries; i++) + { hdr->lgpl.palPalEntry[i].peFlags = 0; + emfdc_add_palette_entry( emf, hdr->lgpl.palPalEntry + i ); + } hdr->emr.iType = EMR_CREATEPALETTE; hdr->emr.nSize = offsetof( EMRCREATEPALETTE, lgpl.palPalEntry[hdr->lgpl.palNumEntries] ); @@ -2344,6 +2384,7 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr ) struct emf *emf = get_dc_emf( dc_attr ); UINT index; + HeapFree( GetProcessHeap(), 0, emf->palette ); HeapFree( GetProcessHeap(), 0, emf->emh ); for (index = 0; index < emf->handles_size; index++) if (emf->handles[index]) @@ -2465,6 +2506,9 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, emf->dc_brush = 0; emf->dc_pen = 0; emf->path = FALSE; + emf->palette_size = 0; + emf->palette_used = 0; + emf->palette = NULL; emf->emh->iType = EMR_HEADER; emf->emh->nSize = size; @@ -2533,10 +2577,11 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, */ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc ) { + UINT size, palette_size; HENHMETAFILE hmf; struct emf *emf; DC_ATTR *dc_attr; - EMREOF emr; + EMREOF *emr; HANDLE mapping = 0; TRACE("(%p)\n", hdc ); @@ -2544,18 +2589,26 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc ) if (!(dc_attr = get_dc_attr( hdc )) || !get_dc_emf( dc_attr )) return 0; emf = get_dc_emf( dc_attr ); + palette_size = emf->palette_used * sizeof(*emf->palette); + size = sizeof(*emr) + palette_size; + if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return 0; + if (dc_attr->save_level) RestoreDC( hdc, 1 ); if (emf->dc_brush) DeleteObject( emf->dc_brush ); if (emf->dc_pen) DeleteObject( emf->dc_pen ); - emr.emr.iType = EMR_EOF; - emr.emr.nSize = sizeof(emr); - emr.nPalEntries = 0; - emr.offPalEntries = FIELD_OFFSET(EMREOF, nSizeLast); - emr.nSizeLast = emr.emr.nSize; - emfdc_record( emf, &emr.emr ); + + emr->emr.iType = EMR_EOF; + emr->emr.nSize = size; + emr->nPalEntries = emf->palette_used; + emr->offPalEntries = FIELD_OFFSET(EMREOF, nSizeLast); + memcpy( (BYTE *)emr + emr->offPalEntries, emf->palette, palette_size ); + /* Set nSizeLast */ + ((DWORD *)((BYTE *)emr + size))[-1] = size; + emfdc_record( emf, &emr->emr ); + HeapFree( GetProcessHeap(), 0, emr ); emf->emh->rclBounds = dc_attr->emf_bounds;

1 0