February 2022 - Wine-Commits

Nikolay Sivov : mfplay: Use resolver functionality for content type resolution.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 0a39066a85db6222843b6365d5f154b29dac3600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a39066a85db6222843b6365… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:21:29 2022 +0300 mfplay: Use resolver functionality for content type resolution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index d7ec7085def..01438060dbd 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1047,8 +1047,8 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, { *ret = NULL; - if (SUCCEEDED(hr = IMFSourceResolver_CreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, - player->propstore, &obj_type, &object))) + if (SUCCEEDED(hr = IMFSourceResolver_CreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE + | MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE, player->propstore, &obj_type, &object))) { hr = media_item_set_source(item, object); IUnknown_Release(object); @@ -1066,8 +1066,9 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, { if (ret) *ret = NULL; - hr = IMFSourceResolver_BeginCreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, - player->propstore, NULL, &player->resolver_callback, (IUnknown *)&item->IMFPMediaItem_iface); + hr = IMFSourceResolver_BeginCreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE + | MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE, player->propstore, NULL, + &player->resolver_callback, (IUnknown *)&item->IMFPMediaItem_iface); IMFPMediaItem_Release(&item->IMFPMediaItem_iface); } @@ -1123,8 +1124,8 @@ static HRESULT media_player_create_item_from_object(struct media_player *player, if (sync) { if (stream) - hr = IMFSourceResolver_CreateObjectFromByteStream(player->resolver, stream, NULL, - MF_RESOLUTION_MEDIASOURCE, player->propstore, &obj_type, &object); + hr = IMFSourceResolver_CreateObjectFromByteStream(player->resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE + | MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE, player->propstore, &obj_type, &object); else IUnknown_AddRef(object); @@ -1145,8 +1146,9 @@ static HRESULT media_player_create_item_from_object(struct media_player *player, { if (stream) { - hr = IMFSourceResolver_BeginCreateObjectFromByteStream(player->resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, - player->propstore, NULL, &player->resolver_callback, (IUnknown *)&item->IMFPMediaItem_iface); + hr = IMFSourceResolver_BeginCreateObjectFromByteStream(player->resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE + | MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE, player->propstore, NULL, + &player->resolver_callback, (IUnknown *)&item->IMFPMediaItem_iface); } else {

1 0

Nikolay Sivov : mfplat: Remove duplicated includes.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: c058e562fc7000113aeb060e0082baddae8f4c13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c058e562fc7000113aeb060e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:21:26 2022 +0300 mfplat: Remove duplicated includes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 -- dlls/mfplat/main.c | 1 - dlls/mfplat/mediatype.c | 2 -- dlls/mfplat/queue.c | 6 ------ dlls/mfplat/sample.c | 1 - 5 files changed, 12 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index f161bb29d80..e9990f85853 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -26,8 +26,6 @@ #include "d3d9.h" #include "evr.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(mfplat); #define ALIGN_SIZE(size, alignment) (((size) + (alignment)) & ~((alignment))) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e79f59d41dd..7e2527fc024 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -36,7 +36,6 @@ #include "d3d11.h" #include "uuids.h" -#include "wine/debug.h" #include "wine/list.h" #include "mfplat_private.h" diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 41dbda572d5..41758390289 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -25,8 +25,6 @@ #include "ks.h" #include "ksmedia.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(mfplat); DEFINE_MEDIATYPE_GUID(MFVideoFormat_IMC1, MAKEFOURCC('I','M','C','1')); diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 8279929b46e..42bceb5811d 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -16,13 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - #define COBJMACROS -#define NONAMELESSUNION - -#include "wine/debug.h" -#include "wine/list.h" #include "mfplat_private.h" #include "rtworkq.h" diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 04c68c87199..099db498f2d 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -25,7 +25,6 @@ #include "initguid.h" #include "dxva2api.h" -#include "wine/debug.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat);

1 0

Eric Pouech : gphoto2.ds: Enable compilation with long types.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 1bd306c89fe96f09b2bfdfbd4aa7089254394293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bd306c89fe96f09b2bfdfbd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:43:19 2022 +0100 gphoto2.ds: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/Makefile.in | 1 - dlls/gphoto2.ds/capability.c | 6 +++--- dlls/gphoto2.ds/gphoto2_main.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index c1f6978947f..bff1ac48133 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = gphoto2.ds UNIXLIB = gphoto2.so IMPORTS = $(JPEG_PE_LIBS) comctl32 user32 gdi32 advapi32 diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c index f2d250c7418..dbbf2a04855 100644 --- a/dlls/gphoto2.ds/capability.c +++ b/dlls/gphoto2.ds/capability.c @@ -187,7 +187,7 @@ static TW_BOOL GPHOTO2_OneValueSet32 (pTW_CAPABILITY pCapability, TW_UINT32 valu { pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); - TRACE("-> %d\n", value); + TRACE("-> %ld\n", value); if (pCapability->hContainer) { @@ -250,7 +250,7 @@ static TW_BOOL GPHOTO2_EnumGet16 (pTW_CAPABILITY pCapability, int *nrofvalues, T *nrofvalues = pVal->NumItems; *values = HeapAlloc( GetProcessHeap(), 0, sizeof(TW_UINT16)*pVal->NumItems); memcpy (*values, pVal->ItemList, sizeof(TW_UINT16)*(*nrofvalues)); - FIXME("Current Index %d, Default Index %d\n", pVal->CurrentIndex, pVal->DefaultIndex); + FIXME("Current Index %ld, Default Index %ld\n", pVal->CurrentIndex, pVal->DefaultIndex); GlobalUnlock (pCapability->hContainer); return TRUE; } @@ -302,7 +302,7 @@ static TW_UINT16 GPHOTO2_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 act if (!GPHOTO2_OneValueGet32 (pCapability, &xfermechtemp)) return TWCC_LOWMEMORY; activeDS.capXferMech = xfermechtemp; - TRACE("xfermech is %d\n", xfermechtemp); + TRACE("xfermech is %ld\n", xfermechtemp); return TWCC_SUCCESS; } else if (pCapability->ConType == TWON_ENUMERATION) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 5689ad94190..68c628b4d89 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -481,7 +481,7 @@ unixlib_handle_t gphoto2_handle = 0; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { @@ -943,7 +943,7 @@ DS_Entry ( pTW_IDENTITY pOrigin, { TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ - TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); + TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); switch (DG) {

1 0

Eric Pouech : fontsub: Enable compilation with long types.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: e181c196fdf6de61294f92f2bdfdc1d9a663b468 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e181c196fdf6de61294f92f2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:43 2022 +0100 fontsub: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fontsub/Makefile.in | 1 - dlls/fontsub/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/fontsub/Makefile.in b/dlls/fontsub/Makefile.in index 1c4a4c47481..338af096ccb 100644 --- a/dlls/fontsub/Makefile.in +++ b/dlls/fontsub/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fontsub.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c index 17bc0c7cc70..1f99c86d953 100644 --- a/dlls/fontsub/main.c +++ b/dlls/fontsub/main.c @@ -31,7 +31,7 @@ ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, u const unsigned short *keep_list, const unsigned short keep_len, CFP_ALLOCPROC allocproc, CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved) { - FIXME("(%p %u %p %p %p %#x %u %u %u %u %u %p %u %p %p %p %p): stub\n", src, src_len, dest, dest_len, + FIXME("(%p %lu %p %p %p %#x %u %u %u %u %u %p %u %p %p %p %p): stub\n", src, src_len, dest, dest_len, written, flags, face_index, format, lang, platform, encoding, keep_list, keep_len, allocproc, reallocproc, freeproc, reserved);

1 0

Eric Pouech : hlink: Enable compilation with long types.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 34a94ea3bd9bf6162a95bcbfb0811dd35d8e74fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a94ea3bd9bf6162a95bcbf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:43:37 2022 +0100 hlink: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/Makefile.in | 1 - dlls/hlink/browse_ctx.c | 18 +++++++++--------- dlls/hlink/extserv.c | 8 ++++---- dlls/hlink/hlink_main.c | 30 +++++++++++++++--------------- dlls/hlink/link.c | 38 +++++++++++++++++++------------------- 5 files changed, 47 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34a94ea3bd9bf6162a95…

1 0

Eric Pouech : hhctrl.ocx: Enable compilation with long types.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: de6f347bd09f5b2819853f9c9452171ccad306dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=de6f347bd09f5b2819853f9c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:43:31 2022 +0100 hhctrl.ocx: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/Makefile.in | 1 - dlls/hhctrl.ocx/chm.c | 38 +++++++++++++++++++------------------- dlls/hhctrl.ocx/help.c | 8 ++++---- dlls/hhctrl.ocx/hhctrl.c | 6 +++--- dlls/hhctrl.ocx/search.c | 6 +++--- dlls/hhctrl.ocx/webbrowser.c | 6 +++--- 6 files changed, 32 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de6f347bd09f5b281985…

1 0

Nikolay Sivov : mfplat: Implement MFAverageTimePerFrameToFrameRate().
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 381c2a9ae151f676a009e89b4b101679fd90b9ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=381c2a9ae151f676a009e89b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:21:32 2022 +0300 mfplat: Implement MFAverageTimePerFrameToFrameRate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 68 ++++++++++++++++++++++++++++++++++++++++++---- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 48 ++++++++++++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 113 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 41758390289..b77db17189f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3215,15 +3215,15 @@ HRESULT WINAPI MFConvertColorInfoToDXVA(DWORD *dxva_info, const MFVIDEOFORMAT *f struct frame_rate { - UINT64 rate; - UINT64 frame_time; + UINT64 key; + UINT64 value; }; static int __cdecl frame_rate_compare(const void *a, const void *b) { - const UINT64 *rate = a; + const UINT64 *key = a; const struct frame_rate *known_rate = b; - return *rate == known_rate->rate ? 0 : ( *rate < known_rate->rate ? 1 : -1 ); + return *key == known_rate->key ? 0 : ( *key < known_rate->key ? 1 : -1 ); } /*********************************************************************** @@ -3252,7 +3252,7 @@ HRESULT WINAPI MFFrameRateToAverageTimePerFrame(UINT32 numerator, UINT32 denomin if ((entry = bsearch(&rate, known_rates, ARRAY_SIZE(known_rates), sizeof(*known_rates), frame_rate_compare))) { - *avgframetime = entry->frame_time; + *avgframetime = entry->value; } else *avgframetime = numerator ? denominator * (UINT64)10000000 / numerator : 0; @@ -3260,6 +3260,64 @@ HRESULT WINAPI MFFrameRateToAverageTimePerFrame(UINT32 numerator, UINT32 denomin return S_OK; } +static unsigned int get_gcd(unsigned int a, unsigned int b) +{ + unsigned int m; + + while (b) + { + m = a % b; + a = b; + b = m; + } + + return a; +} + +/*********************************************************************** + * MFAverageTimePerFrameToFrameRate (mfplat.@) + */ +HRESULT WINAPI MFAverageTimePerFrameToFrameRate(UINT64 avgtime, UINT32 *numerator, UINT32 *denominator) +{ + static const struct frame_rate known_rates[] = + { +#define KNOWN_RATE(ft,n,d) { ft, ((UINT64)n << 32) | d } + KNOWN_RATE(417188, 24000, 1001), + KNOWN_RATE(416667, 24, 1), + KNOWN_RATE(400000, 25, 1), + KNOWN_RATE(333667, 30000, 1001), + KNOWN_RATE(333333, 30, 1), + KNOWN_RATE(200000, 50, 1), + KNOWN_RATE(166833, 60000, 1001), + KNOWN_RATE(166667, 60, 1), +#undef KNOWN_RATE + }; + const struct frame_rate *entry; + unsigned int gcd; + + TRACE("%s, %p, %p.\n", wine_dbgstr_longlong(avgtime), numerator, denominator); + + if ((entry = bsearch(&avgtime, known_rates, ARRAY_SIZE(known_rates), sizeof(*known_rates), + frame_rate_compare))) + { + *numerator = entry->value >> 32; + *denominator = entry->value; + } + else if (avgtime) + { + if (avgtime > 100000000) avgtime = 100000000; + gcd = get_gcd(10000000, avgtime); + *numerator = 10000000 / gcd; + *denominator = avgtime / gcd; + } + else + { + *numerator = *denominator = 0; + } + + return S_OK; +} + /*********************************************************************** * MFMapDXGIFormatToDX9Format (mfplat.@) */ diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 5d177732fa8..31c80f596c2 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -20,7 +20,7 @@ @ stdcall MFAllocateWorkQueue(ptr) @ stdcall MFAllocateWorkQueueEx(long ptr) rtworkq.RtwqAllocateWorkQueue @ stub MFAppendCollection -@ stub MFAverageTimePerFrameToFrameRate +@ stdcall MFAverageTimePerFrameToFrameRate(int64 ptr ptr) @ stdcall MFBeginCreateFile(long long long wstr ptr ptr ptr) @ stub MFBeginGetHostByName @ stdcall MFBeginRegisterWorkQueueWithMMCSS(long wstr long ptr ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f89a5202d80..c70d8a9ca81 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6399,6 +6399,53 @@ static void test_MFFrameRateToAverageTimePerFrame(void) } } +static void test_MFAverageTimePerFrameToFrameRate(void) +{ + static const struct frame_rate_test + { + unsigned int numerator; + unsigned int denominator; + UINT64 avgtime; + } frame_rate_tests[] = + { + { 60000, 1001, 166833 }, + { 30000, 1001, 333667 }, + { 24000, 1001, 417188 }, + { 60, 1, 166667 }, + { 30, 1, 333333 }, + { 50, 1, 200000 }, + { 25, 1, 400000 }, + { 24, 1, 416667 }, + + { 1000000, 25641, 256410 }, + { 10000000, 83333, 83333 }, + { 1, 10, 100000000 }, + { 1, 10, 100000001 }, + { 1, 10, 200000000 }, + { 1, 1, 10000000 }, + { 1, 2, 20000000 }, + { 5, 1, 2000000 }, + { 10, 1, 1000000 }, + }; + unsigned int i, numerator, denominator; + HRESULT hr; + + numerator = denominator = 1; + hr = MFAverageTimePerFrameToFrameRate(0, &numerator, &denominator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!numerator && !denominator, "Unexpected output %u/%u.\n", numerator, denominator); + + for (i = 0; i < ARRAY_SIZE(frame_rate_tests); ++i) + { + numerator = denominator = 12345; + hr = MFAverageTimePerFrameToFrameRate(frame_rate_tests[i].avgtime, &numerator, &denominator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(numerator == frame_rate_tests[i].numerator && denominator == frame_rate_tests[i].denominator, + "%u: unexpected %u/%u, expected %u/%u.\n", i, numerator, denominator, frame_rate_tests[i].numerator, + frame_rate_tests[i].denominator); + } +} + static void test_MFMapDXGIFormatToDX9Format(void) { static const struct format_pair @@ -7874,6 +7921,7 @@ START_TEST(mfplat) test_MFCreateDXSurfaceBuffer(); test_MFCreateTrackedSample(); test_MFFrameRateToAverageTimePerFrame(); + test_MFAverageTimePerFrameToFrameRate(); test_MFMapDXGIFormatToDX9Format(); test_d3d11_surface_buffer(); test_d3d12_surface_buffer(); diff --git a/include/mfapi.h b/include/mfapi.h index 105613693c9..b4e4d095bb4 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -500,6 +500,7 @@ HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *cont HRESULT WINAPI MFAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); +HRESULT WINAPI MFAverageTimePerFrameToFrameRate(UINT64 avgtime, UINT32 *numerator, UINT32 *denominator); HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMODE open_mode, MF_FILE_FLAGS flags, const WCHAR *path, IMFAsyncCallback *callback, IUnknown *state, IUnknown **cancel_cookie); HRESULT WINAPI MFBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *usage_class, DWORD taskid,

1 0

Zhiyi Zhang : comctl32/tests: Fix occasional test failures on TestBot w7u_2qxl.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: b13c4127a910b846975e13af5556718f95ef345a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b13c4127a910b846975e13af… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:55:38 2022 +0800 comctl32/tests: Fix occasional test failures on TestBot w7u_2qxl. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index dc9648c1bf0..5daca6aff93 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -531,7 +531,8 @@ static const struct message wm_themechanged_paint_erase_seq[] = { {WM_THEMECHANGED, sent | wparam | lparam}, {WM_PAINT, sent | wparam | lparam}, - {WM_ERASEBKGND, sent | defwinproc}, + /* TestBot w7u_2qxl VM occasionally doesn't send WM_ERASEBKGND, hence the 'optional' */ + {WM_ERASEBKGND, sent | defwinproc | optional}, {0}, };

1 0

Zhiyi Zhang : comctl32/tab: Always draw parent background when themed.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: e7011c9d65ebf561f8cdf21ff200ed730af201fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7011c9d65ebf561f8cdf21f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:56:43 2022 +0800 comctl32/tab: Always draw parent background when themed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tab.c | 5 +++++ dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 8e34f8b97b3..1275381489a 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2315,9 +2315,14 @@ static void TAB_DrawBorder(const TAB_INFO *infoPtr, HDC hdc) TRACE("border=(%s)\n", wine_dbgstr_rect(&rect)); if (theme) + { + DrawThemeParentBackground(infoPtr->hwnd, hdc, &rect); DrawThemeBackground (theme, hdc, TABP_PANE, 0, &rect, NULL); + } else + { DrawEdge(hdc, &rect, EDGE_RAISED, BF_SOFT|BF_RECT); + } } /****************************************************************************** diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5daca6aff93..069d1200c82 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -881,7 +881,7 @@ static void test_themed_background(void) {WC_STATICA, SS_ETCHEDHORZ, wm_ctlcolorstatic_seq, TRUE}, {STATUSCLASSNAMEA, 0, empty_seq}, {"SysLink", 0, wm_ctlcolorstatic_seq}, - {WC_TABCONTROLA, 0, drawthemeparentbackground_seq, TRUE}, + {WC_TABCONTROLA, 0, drawthemeparentbackground_seq}, {TOOLBARCLASSNAMEA, 0, empty_seq, TRUE}, {TOOLTIPS_CLASSA, 0, empty_seq}, {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq},

1 0

Nikolay Sivov : mfreadwrite/reader: Use resolver functionality for content type resolution.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 305a315a2588cc1f386d1bf6749ec940de55ced4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=305a315a2588cc1f386d1bf6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:21:31 2022 +0300 mfreadwrite/reader: Use resolver functionality for content type resolution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 97 +---------------------------------------- dlls/mfreadwrite/tests/mfplat.c | 5 +-- 2 files changed, 3 insertions(+), 99 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 8ba00e86ff6..6d35a59f3a8 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2390,94 +2390,6 @@ failed: return hr; } -static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) -{ - static const unsigned char asfmagic[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11,0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; - static const unsigned char wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; - static const unsigned char wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; - static const unsigned char isommagic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'i', 's', 'o', 'm',0x00,0x00,0x00,0x00}; - static const unsigned char mp4_magic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'M', 'S', 'N', 'V',0x00,0x00,0x00,0x00}; - static const unsigned char mp42magic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'm', 'p', '4', '2',0x00,0x00,0x00,0x00}; - static const unsigned char mp4vmagic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'M', '4', 'V', ' ',0x00,0x00,0x00,0x00}; - static const unsigned char mp4mask[] = {0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00}; - static const struct stream_content_url_hint - { - const unsigned char *magic; - const WCHAR *url; - const unsigned char *mask; - } - url_hints[] = - { - { asfmagic, L".asf" }, - { wavmagic, L".wav", wavmask }, - { isommagic, L".mp4", mp4mask }, - { mp42magic, L".mp4", mp4mask }, - { mp4_magic, L".mp4", mp4mask }, - { mp4vmagic, L".m4v", mp4mask }, - }; - unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)]; - IMFAttributes *attributes; - DWORD length = 0, caps = 0; - unsigned int i, j; - QWORD position; - HRESULT hr; - - *url = NULL; - - if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) - { - UINT32 string_length = 0; - IMFAttributes_GetStringLength(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &string_length); - IMFAttributes_Release(attributes); - - if (string_length) - return S_OK; - } - - if (FAILED(hr = IMFByteStream_GetCapabilities(stream, &caps))) - return hr; - - if (!(caps & MFBYTESTREAM_IS_SEEKABLE)) - return S_OK; - - if (FAILED(hr = IMFByteStream_GetCurrentPosition(stream, &position))) - return hr; - - hr = IMFByteStream_Read(stream, buffer, sizeof(buffer), &length); - IMFByteStream_SetCurrentPosition(stream, position); - if (FAILED(hr)) - return hr; - - if (length < sizeof(buffer)) - return S_OK; - - for (i = 0; i < ARRAY_SIZE(url_hints); ++i) - { - memcpy(pattern, buffer, sizeof(buffer)); - if (url_hints[i].mask) - { - unsigned int *mask = (unsigned int *)url_hints[i].mask; - unsigned int *data = (unsigned int *)pattern; - - for (j = 0; j < sizeof(buffer) / sizeof(unsigned int); ++j) - data[j] &= mask[j]; - - } - if (!memcmp(pattern, url_hints[i].magic, sizeof(pattern))) - { - *url = url_hints[i].url; - break; - } - } - - if (*url) - TRACE("Stream type guessed as %s from %s.\n", debugstr_w(*url), debugstr_an((char *)buffer, length)); - else - WARN("Unrecognized content type %s.\n", debugstr_an((char *)buffer, length)); - - return S_OK; -} - static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttributes *attributes, REFIID riid, void **out) { @@ -2485,13 +2397,8 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib IMFSourceResolver *resolver; MF_OBJECT_TYPE obj_type; IMFMediaSource *source; - const WCHAR *url; HRESULT hr; - /* If stream does not have content type set, try to guess from starting byte sequence. */ - if (FAILED(hr = bytestream_get_url_hint(stream, &url))) - return hr; - if (FAILED(hr = MFCreateSourceResolver(&resolver))) return hr; @@ -2499,8 +2406,8 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_MEDIASOURCE_CONFIG, &IID_IPropertyStore, (void **)&props); - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, url, MF_RESOLUTION_MEDIASOURCE, props, - &obj_type, (IUnknown **)&source); + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE + | MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE, props, &obj_type, (IUnknown **)&source); IMFSourceResolver_Release(resolver); if (props) IPropertyStore_Release(props); diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 7e724344168..f484925b28a 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -877,13 +877,10 @@ skip_read_sample: refcount = get_refcount(attributes); hr = MFCreateSourceReaderFromByteStream(stream, attributes, &reader); -todo_wine { ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); ok(get_refcount(attributes) > refcount, "Unexpected refcount.\n"); -} IMFAttributes_Release(attributes); - if (hr == S_OK) - IMFSourceReader_Release(reader); + IMFSourceReader_Release(reader); IMFByteStream_Release(stream); }

1 0