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

Zebediah Figura : winegstreamer: Use WG_MAJOR_TYPE_UNKNOWN to mark a stream that should not be forced into a certain format.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 90dc7f5b944192da4b7e2f4a3d5e687fe0c9cdd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90dc7f5b944192da4b7e2f4a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 8 12:11:06 2022 -0500 winegstreamer: Use WG_MAJOR_TYPE_UNKNOWN to mark a stream that should not be forced into a certain format. Instead of checking the enabled state. The reasoning here is that we would like to keep the stream enabled—that is, buffer samples instead of discarding them—even when the client is not yet reading samples from it, so that we can avoid wasting CPU power in decoding. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_format.c | 2 +- dlls/winegstreamer/wg_parser.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index b4455a6e6d0..84163f1e5d7 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -495,7 +495,7 @@ GstCaps *wg_format_to_caps(const struct wg_format *format) switch (format->major_type) { case WG_MAJOR_TYPE_UNKNOWN: - return NULL; + return gst_caps_new_any(); case WG_MAJOR_TYPE_WMA: return wg_format_to_caps_wma(format); case WG_MAJOR_TYPE_H264: diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e7a60ec158a..9b3a5ca796d 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -254,6 +254,7 @@ static NTSTATUS wg_parser_stream_disable(void *args) pthread_mutex_lock(&parser->mutex); stream->enabled = false; + stream->current_format.major_type = WG_MAJOR_TYPE_UNKNOWN; pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&stream->event_empty_cond); return S_OK; @@ -601,12 +602,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_caps(query, &filter); pthread_mutex_lock(&parser->mutex); - - if (stream->enabled) - caps = wg_format_to_caps(&stream->current_format); - else - caps = gst_caps_new_any(); - + caps = wg_format_to_caps(&stream->current_format); pthread_mutex_unlock(&parser->mutex); if (!caps) @@ -636,7 +632,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) pthread_mutex_lock(&parser->mutex); - if (!stream->enabled) + if (stream->current_format.major_type == WG_MAJOR_TYPE_UNKNOWN) { pthread_mutex_unlock(&parser->mutex); gst_query_set_accept_caps_result(query, TRUE); @@ -689,6 +685,7 @@ static struct wg_parser_stream *create_stream(struct wg_parser *parser) gst_segment_init(&stream->segment, GST_FORMAT_UNDEFINED); stream->parser = parser; + stream->current_format.major_type = WG_MAJOR_TYPE_UNKNOWN; pthread_cond_init(&stream->event_cond, NULL); pthread_cond_init(&stream->event_empty_cond, NULL);

1 0

Zebediah Figura : winegstreamer: Explicitly disable streams in start_pipeline().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 6f1b3cf975965e1383e5f5c802cebdc0f4956c2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f1b3cf975965e1383e5f5c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 8 12:11:07 2022 -0500 winegstreamer: Explicitly disable streams in start_pipeline(). Allow the initial state of a stream to be enabled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index c9f95a8a451..f07b83f413e 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -363,6 +363,10 @@ static void start_pipeline(struct media_source *source, struct source_async_comm IMFMediaType_Release(current_mt); IMFMediaTypeHandler_Release(mth); } + else + { + wg_parser_stream_disable(stream->wg_stream); + } if (position->vt != VT_EMPTY) stream->eos = FALSE; @@ -419,10 +423,7 @@ static void stop_pipeline(struct media_source *source) { struct media_stream *stream = source->streams[i]; if (stream->state != STREAM_INACTIVE) - { IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamStopped, &GUID_NULL, S_OK, NULL); - wg_parser_stream_disable(stream->wg_stream); - } } IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceStopped, &GUID_NULL, S_OK, NULL);

1 0

Zebediah Figura : winegstreamer: Explicitly disable streams in parser_init_stream().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: ed2c300d02acefa2aedd4333ff4a982137c1d4fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed2c300d02acefa2aedd4333… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 8 12:11:08 2022 -0500 winegstreamer: Explicitly disable streams in parser_init_stream(). Allow the initial state of a stream to be enabled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index f38a0c16215..7b82f3efbc9 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -961,6 +961,24 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) filter->streaming = true; + for (i = 0; i < filter->source_count; ++i) + { + struct parser_source *source = filter->sources[i]; + struct wg_format format; + bool ret; + + if (source->pin.pin.peer) + { + ret = amt_to_wg_format(&source->pin.pin.mt, &format); + assert(ret); + wg_parser_stream_enable(source->wg_stream, &format); + } + else + { + wg_parser_stream_disable(source->wg_stream); + } + } + /* DirectShow retains the old seek positions, but resets to them every time * it transitions from stopped -> paused. */ @@ -1529,8 +1547,6 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); unsigned int buffer_size = 16384; ALLOCATOR_PROPERTIES ret_props; - struct wg_format format; - bool ret; if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_VideoInfo)) { @@ -1545,10 +1561,6 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, buffer_size = format->nAvgBytesPerSec; } - ret = amt_to_wg_format(&pin->pin.pin.mt, &format); - assert(ret); - wg_parser_stream_enable(pin->wg_stream, &format); - /* We do need to drop any buffers that might have been sent with the old * caps, but this will be handled in parser_init_stream(). */ @@ -1558,13 +1570,6 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, return IMemAllocator_SetProperties(allocator, props, &ret_props); } -static void source_disconnect(struct strmbase_source *iface) -{ - struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); - - wg_parser_stream_disable(pin->wg_stream); -} - static void free_source_pin(struct parser_source *pin) { if (pin->pin.pin.peer) @@ -1590,7 +1595,6 @@ static const struct strmbase_source_ops source_ops = .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnDecideBufferSize = GSTOutPin_DecideBufferSize, - .source_disconnect = source_disconnect, }; static struct parser_source *create_pin(struct parser *filter, @@ -1629,9 +1633,6 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) if (!This->sink_connected) return S_OK; - /* Disconnecting source pins triggers a call to wg_parser_stream_disable(). - * The stream pointers are no longer valid after wg_parser_disconnect(), so - * make sure we disable the streams first. */ for (i = 0; i < This->source_count; ++i) { if (This->sources[i])

1 0

Zebediah Figura : winegstreamer: Enable wg_parser streams on creation.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: ce9a42e8bda50fd5eb91c8dee78f310881d2c7e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9a42e8bda50fd5eb91c8de… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 8 12:11:09 2022 -0500 winegstreamer: Enable wg_parser streams on creation. This patch is motivated by Obduction, which creates a Media Foundation source and leaves it open arbitrarily long before actually reading samples from it. Without this patch, we unnecessarily waste CPU, and may reduce graphical performance by taking CPU time that would otherwise be used on performance-critical threads. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 9b3a5ca796d..48b88a4b11c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1293,6 +1293,13 @@ static NTSTATUS wg_parser_connect(void *args) pthread_cond_wait(&parser->init_cond, &parser->mutex); } } + + /* Now that we're fully initialized, enable the stream so that further + * samples get queued instead of being discarded. We don't actually need + * the samples (in particular, the frontend should seek before + * attempting to read anything), but we don't want to waste CPU time + * trying to decode them. */ + stream->enabled = true; } pthread_mutex_unlock(&parser->mutex);

1 0

Zhiyi Zhang : include: Avoid a C++ keyword for RegisterUserApiHook().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: be8acff719ef4f0698a1ca845b35c0d430f92fd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8acff719ef4f0698a1ca84… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Apr 9 12:14:46 2022 +0800 include: Avoid a C++ keyword for RegisterUserApiHook(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52787 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 10 +++++----- include/winuser.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 6dc8c571c0c..e6db8590934 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -502,16 +502,16 @@ BOOL WINAPI IsWinEventHookInstalled(DWORD dwEvent) } /* Undocumented RegisterUserApiHook() */ -BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old) +BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new_hook, struct user_api_hook *old_hook) { - if (!new) + if (!new_hook) return FALSE; USER_Lock(); - hooked_user_api = *new; + hooked_user_api = *new_hook; user_api = &hooked_user_api; - if (old) - *old = original_user_api; + if (old_hook) + *old_hook = original_user_api; USER_Unlock(); return TRUE; } diff --git a/include/winuser.h b/include/winuser.h index bb585efd16d..4f79face860 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4444,7 +4444,7 @@ struct user_api_hook LRESULT (WINAPI *pScrollBarWndProc)(HWND, UINT, WPARAM, LPARAM, BOOL); }; -WINUSERAPI BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old); +WINUSERAPI BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new_hook, struct user_api_hook *old_hook); WINUSERAPI void WINAPI UnregisterUserApiHook(void); #endif

1 0

Eric Pouech : rpcrt4: Don't cast ptrdiff_t to ULONG in traces, use %I instead.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: ed5ade575b9035b610d1f1857c0ad5fcb1a33000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed5ade575b9035b610d1f185… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 11 09:43:27 2022 +0200 rpcrt4: Don't cast ptrdiff_t to ULONG in traces, use %I instead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d0d2e19342c..d54e6ce7d0a 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -121,9 +121,9 @@ static inline void align_pointer_offset_clear( unsigned char **ptr, unsigned cha } #define STD_OVERFLOW_CHECK(_Msg) do { \ - TRACE("buffer=%ld/%ld\n", (ULONG)(_Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer), _Msg->BufferLength); \ + TRACE("buffer=%Id/%ld\n", _Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer, _Msg->BufferLength); \ if (_Msg->Buffer > (unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength) \ - ERR("buffer overflow %ld bytes\n", (ULONG)(_Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength))); \ + ERR("buffer overflow %Id bytes\n", _Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength)); \ } while (0) #define NDR_POINTER_ID_BASE 0x20000 @@ -3629,7 +3629,7 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; - TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->PointerBufferMark - pStubMsg->Buffer)); + TRACE("difference = 0x%Ix\n", pStubMsg->PointerBufferMark - pStubMsg->Buffer); pointer_buffer_mark_set = TRUE; /* restore the original buffer length */ @@ -3715,7 +3715,7 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = pStubMsg->Buffer; - TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->PointerBufferMark - saved_buffer)); + TRACE("difference = 0x%Ix\n", pStubMsg->PointerBufferMark - saved_buffer); pointer_buffer_mark_set = TRUE; /* restore the original buffer */ @@ -4186,7 +4186,7 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; - TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer)); + TRACE("difference = 0x%Ix\n", pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer); pointer_buffer_mark_set = TRUE; /* restore fields */ @@ -4242,7 +4242,7 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, NdrComplexArrayMemorySize(pStubMsg, pFormat); pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded; - TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->Buffer - saved_buffer)); + TRACE("difference = 0x%Ix\n", pStubMsg->Buffer - saved_buffer); if (!pStubMsg->PointerBufferMark) { /* save it for use by embedded pointer code later */

1 0

Eric Pouech : ntdll/tests: Simplify printf for 64 bit integers.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: cec5fea60d2711c68060d179653eea585d8094f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cec5fea60d2711c68060d179… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 11 09:43:40 2022 +0200 ntdll/tests: Simplify printf for 64 bit integers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/large_int.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index 013a91708b9..9635cac24ad 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -349,9 +349,8 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t } /* if */ } /* if */ ok(memcmp(unicode_string.Buffer, expected_unicode_string.Buffer, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): RtlInt64ToUnicodeString(0x%lx%08lx, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", - test_num, (DWORD)(largeint2str->value >>32), (DWORD)largeint2str->value, largeint2str->base, - ansi_str.Buffer, expected_ansi_str.Buffer); + "(test %d): RtlInt64ToUnicodeString(0x%I64x, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", + test_num, largeint2str->value, largeint2str->base, ansi_str.Buffer, expected_ansi_str.Buffer); ok(unicode_string.Length == expected_unicode_string.Length, "(test %d): RtlInt64ToUnicodeString(0x%s, %d, [out]) string has Length %d, expected: %d\n", test_num, wine_dbgstr_longlong(largeint2str->value), largeint2str->base,

1 0

Eric Pouech : wininet/tests: Simplify printf for 64 bit integers.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 17795f0796f2342918ff6efc145c9134e13a4874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17795f0796f2342918ff6efc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 11 09:43:51 2022 +0200 wininet/tests: Simplify printf for 64 bit integers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 98d1b74ca85..80b3160820b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6173,7 +6173,7 @@ static void test_large_content(int port) ok(GetLastError() == ERROR_HTTP_INVALID_HEADER, "expected ERROR_HTTP_INVALID_HEADER, got %lx\n", GetLastError()); ok(sizelen == sizeof(DWORD64), "sizelen %lu\n", sizelen); - ok(len64 == ~0, "len64 %lx%08lx\n", (DWORD)(len64 >> 32), (DWORD)len64); + ok(len64 == ~0, "len64 %I64x\n", len64); close_request(&req);

1 0

Eric Pouech : winedbg: Simplify printf for 64 bit integers.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 42f5ff44bd770ed213c8b4c5284ea20787080605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42f5ff44bd770ed213c8b4c5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 11 09:43:55 2022 +0200 winedbg: Simplify printf for 64 bit integers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 3118637cb5e..8321e8b028d 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -452,8 +452,7 @@ char* memory_offset_to_string(char *str, DWORD64 offset, unsigned mode) if (mode == 32) sprintf(str, "0x%08x", (unsigned int) offset); else - sprintf(str, "0x%08x%08x", (unsigned int)(offset >> 32), - (unsigned int)offset); + sprintf(str, "%#016I64x", offset); return str; }

1 0

Esme Povirk : gdiplus: Accept newer version in OpenType header.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 7d118a25c047580968a80d66c3061a47211b2380 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d118a25c047580968a80d66… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Apr 9 14:18:38 2022 -0500 gdiplus: Accept newer version in OpenType header. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6529f94bc1f..57849733a9c 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -106,7 +106,7 @@ typedef struct #define GET_BE_DWORD(x) (x) #else #define GET_BE_WORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x)) -#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x))); +#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x))) #endif #define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ @@ -1150,14 +1150,16 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection *collection, GDIPCON #define NAME_ID_FULL_FONT_NAME 4 typedef struct { - USHORT major_version; - USHORT minor_version; + ULONG version; USHORT tables_no; USHORT search_range; USHORT entry_selector; USHORT range_shift; } tt_header; +#define TT_HEADER_VERSION_1 0x00010000 +#define TT_HEADER_VERSION_CFF 0x4f54544f + typedef struct { char tag[4]; /* table name */ ULONG check_sum; /* Check sum */ @@ -1402,7 +1404,8 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) header = (const tt_header*)mem; count = GET_BE_WORD(header->tables_no); - if (GET_BE_WORD(header->major_version) != 1 || GET_BE_WORD(header->minor_version) != 0) + if (GET_BE_DWORD(header->version) != TT_HEADER_VERSION_1 && + GET_BE_DWORD(header->version) != TT_HEADER_VERSION_CFF) return NULL; pos = sizeof(*header);

1 0