February 2022 - Wine-Commits

Nikolay Sivov : mfplat: Better handle source resolution when content type is not specified for the stream.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 3a8bdf8bdc211ae8e8d38500d7a88fad1aef0d7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a8bdf8bdc211ae8e8d38500… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:21:28 2022 +0300 mfplat: Better handle source resolution when content type is not specified for the stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 190 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 154 insertions(+), 36 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7a1f10dac24..72dd0915447 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -6159,40 +6159,15 @@ static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void * return hr; } -static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHAR *url, DWORD flags, - IMFByteStreamHandler **handler) +static HRESULT resolver_create_bytestream_handler(IMFByteStream *stream, DWORD flags, const WCHAR *mime, + const WCHAR *extension, IMFByteStreamHandler **handler) { static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; - WCHAR *mimeW = NULL, *urlW = NULL; - IMFAttributes *attributes; - const WCHAR *url_ext; HRESULT hr = E_FAIL; unsigned int i, j; - UINT32 length; *handler = NULL; - /* MIME type */ - if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) - { - IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &mimeW, &length); - if (!url) - { - IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_ORIGIN_NAME, &urlW, &length); - url = urlW; - } - IMFAttributes_Release(attributes); - } - - /* Extension */ - url_ext = url ? wcsrchr(url, '.') : NULL; - - if (!url_ext && !mimeW) - { - CoTaskMemFree(urlW); - return MF_E_UNSUPPORTED_BYTESTREAM_TYPE; - } - if (!(flags & MF_RESOLUTION_DISABLE_LOCAL_PLUGINS)) { struct local_handler *local_handler; @@ -6201,8 +6176,8 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA LIST_FOR_EACH_ENTRY(local_handler, &local_bytestream_handlers, struct local_handler, entry) { - if ((mimeW && !lstrcmpiW(mimeW, local_handler->u.bytestream.mime)) - || (url_ext && !lstrcmpiW(url_ext, local_handler->u.bytestream.extension))) + if ((mime && !lstrcmpiW(mime, local_handler->u.bytestream.mime)) + || (extension && !lstrcmpiW(extension, local_handler->u.bytestream.extension))) { if (SUCCEEDED(hr = IMFActivate_ActivateObject(local_handler->activate, &IID_IMFByteStreamHandler, (void **)handler))) @@ -6213,16 +6188,12 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA LeaveCriticalSection(&local_handlers_section); if (*handler) - { - CoTaskMemFree(mimeW); - CoTaskMemFree(urlW); return hr; - } } for (i = 0, hr = E_FAIL; i < ARRAY_SIZE(hkey_roots); ++i) { - const WCHAR *namesW[2] = { mimeW, url_ext }; + const WCHAR *namesW[2] = { mime, extension }; HKEY hkey, hkey_handler; if (RegOpenKeyW(hkey_roots[i], L"Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers", &hkey)) @@ -6249,14 +6220,161 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA break; } + return hr; +} + +static HRESULT resolver_get_bytestream_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 MF_E_UNSUPPORTED_BYTESTREAM_TYPE; + + 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("Content 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 resolver_create_gstreamer_handler(IMFByteStreamHandler **handler) +{ + static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}}; + return CoCreateInstance(&CLSID_GStreamerByteStreamHandler, NULL, CLSCTX_INPROC_SERVER, &IID_IMFByteStreamHandler, (void **)handler); +} + +static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHAR *url, DWORD flags, + IMFByteStreamHandler **handler) +{ + WCHAR *mimeW = NULL, *urlW = NULL; + IMFAttributes *attributes; + const WCHAR *url_ext; + HRESULT hr = E_FAIL; + UINT32 length; + + *handler = NULL; + + /* MIME type */ + if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) { - static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}}; - hr = CoCreateInstance(&CLSID_GStreamerByteStreamHandler, NULL, CLSCTX_INPROC_SERVER, &IID_IMFByteStreamHandler, (void **)handler); + IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &mimeW, &length); + if (!url) + { + IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_ORIGIN_NAME, &urlW, &length); + url = urlW; + } + IMFAttributes_Release(attributes); + } + + /* Extension */ + url_ext = url ? wcsrchr(url, '.') : NULL; + + /* If content type was provided by the caller, it's tried first. Otherwise an attempt to deduce + content type from the content itself is made. + + TODO: wine specific fallback to predefined handler could be replaced by normally registering + this handler for all possible types. + */ + + if (url_ext || mimeW) + { + hr = resolver_create_bytestream_handler(stream, flags, mimeW, url_ext, handler); + + if (FAILED(hr)) + hr = resolver_create_gstreamer_handler(handler); } CoTaskMemFree(mimeW); CoTaskMemFree(urlW); + + if (SUCCEEDED(hr)) + return hr; + + if (!(flags & MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE)) + return MF_E_UNSUPPORTED_BYTESTREAM_TYPE; + + if (FAILED(hr = resolver_get_bytestream_url_hint(stream, &url_ext))) + return hr; + + hr = resolver_create_bytestream_handler(stream, flags, NULL, url_ext, handler); + + if (FAILED(hr)) + hr = resolver_create_gstreamer_handler(handler); + return hr; }

1 0

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

Feb. 10, 2022

Module: wine Branch: master Commit: 54f851bb83a145cda7db7b41aa3d356dae41c72f URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f851bb83a145cda7db7b41… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:43:43 2022 +0100 hnetcfg: 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/hnetcfg/Makefile.in | 1 - dlls/hnetcfg/apps.c | 16 ++++++------ dlls/hnetcfg/hnetcfg.c | 2 +- dlls/hnetcfg/manager.c | 8 +++--- dlls/hnetcfg/policy.c | 22 ++++++++-------- dlls/hnetcfg/port.c | 66 ++++++++++++++++++++++++------------------------ dlls/hnetcfg/profile.c | 6 ++--- dlls/hnetcfg/service.c | 12 ++++----- 8 files changed, 66 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54f851bb83a145cda7db…

1 0

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

Feb. 10, 2022

Module: wine Branch: master Commit: 02722b12e3419189da11bc06ce4304609b005c77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02722b12e3419189da11bc06… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:49 2022 +0100 fusion: 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/fusion/Makefile.in | 1 - dlls/fusion/asmcache.c | 22 +++++++++++----------- dlls/fusion/asmenum.c | 8 ++++---- dlls/fusion/asmname.c | 16 ++++++++-------- dlls/fusion/fusion.c | 2 +- 5 files changed, 24 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02722b12e3419189da11…

1 0

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

Feb. 10, 2022

Module: wine Branch: master Commit: e443ee51f75621464e8ca8d03e0b49aaa017da62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e443ee51f75621464e8ca8d0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:55 2022 +0100 gameux: 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/gameux/Makefile.in | 1 - dlls/gameux/gameexplorer.c | 14 +++++++------- dlls/gameux/gamestatistics.c | 16 ++++++++-------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index 1edc4213a6e..b541ae9470b 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = gameux.dll IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 shlwapi diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 5fdacacf4b2..a356a693ee3 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -161,7 +161,7 @@ HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, if(SUCCEEDED(hr)) lstrcpyW(*lpRegistryPath, sRegistryPath); - TRACE("result: 0x%x, path: %s\n", hr, debugstr_w(*lpRegistryPath)); + TRACE("result: 0x%lx, path: %s\n", hr, debugstr_w(*lpRegistryPath)); return hr; } /******************************************************************************* @@ -247,7 +247,7 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) } HeapFree(GetProcessHeap(), 0, lpRegistryKey); - TRACE("returning 0x%x\n", hr); + TRACE("returning 0x%lx\n", hr); return hr; } /******************************************************************************* @@ -536,7 +536,7 @@ static HRESULT GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, CloseHandle(thread); if(ret != WAIT_OBJECT_0) { - ERR("Wait failed (%#x).\n", ret); + ERR("Wait failed (%#lx).\n", ret); hr = E_FAIL; goto done; } @@ -549,7 +549,7 @@ static HRESULT GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, done: GAMEUX_uninitGameData(&GameData); - TRACE("returning 0x%08x\n", hr); + TRACE("returning 0x%08lx\n", hr); return hr; } /******************************************************************************* @@ -685,7 +685,7 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { } HeapFree(GetProcessHeap(), 0, lpRegistryPath); - TRACE("returning 0x%x\n", hr); + TRACE("returning 0x%lx\n", hr); return hr; } /******************************************************************************* @@ -818,7 +818,7 @@ static ULONG WINAPI GameExplorerImpl_AddRef(IGameExplorer *iface) ref = InterlockedIncrement(&This->ref); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); return ref; } @@ -828,7 +828,7 @@ static ULONG WINAPI GameExplorerImpl_Release(IGameExplorer *iface) LONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if(ref == 0) { diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 1696ee1e76a..6d62b67e36f 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -293,7 +293,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) SysFreeString(bstrCategory); SysFreeString(bstrStatistics); SysFreeString(V_BSTR(&vStatsFilePath)); - TRACE("ret=0x%x\n", hr); + TRACE("ret=0x%lx\n", hr); return hr; } /******************************************************************************* @@ -384,7 +384,7 @@ static HRESULT GAMEUX_getAppIdFromGDFPath( HeapFree(GetProcessHeap(), 0, lpRegistryPath); - TRACE("found app id: %s, return: %#x\n", debugstr_w(lpApplicationId), hr); + TRACE("found app id: %s, return: %#lx\n", debugstr_w(lpApplicationId), hr); return hr; } /******************************************************************* @@ -606,7 +606,7 @@ static HRESULT GAMEUX_loadGameStatistics(struct GAMEUX_STATS *pStats, if (FAILED(hr)) return hr; hr = GAMEUX_loadStatisticsFromFile(pStats); - TRACE("ldstats finished, res: %#x\n", hr); + TRACE("ldstats finished, res: %#lx\n", hr); if(hr == S_OK) { *pOpenResult = GAMESTATS_OPEN_OPENED; @@ -621,7 +621,7 @@ static HRESULT GAMEUX_loadGameStatistics(struct GAMEUX_STATS *pStats, else hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - TRACE("openResult=%#x ret=%#x\n", *pOpenResult, hr); + TRACE("openResult=%#x ret=%#lx\n", *pOpenResult, hr); return hr; } /******************************************************************* @@ -672,7 +672,7 @@ static ULONG WINAPI GameStatisticsImpl_AddRef(IGameStatistics *iface) ref = InterlockedIncrement(&This->ref); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); return ref; } @@ -682,7 +682,7 @@ static ULONG WINAPI GameStatisticsImpl_Release(IGameStatistics *iface) LONG ref; ref = InterlockedDecrement( &This->ref ); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if ( ref == 0 ) { @@ -1028,7 +1028,7 @@ static ULONG WINAPI GameStatisticsMgrImpl_AddRef(IGameStatisticsMgr *iface) ref = InterlockedIncrement(&This->ref); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); return ref; } @@ -1038,7 +1038,7 @@ static ULONG WINAPI GameStatisticsMgrImpl_Release(IGameStatisticsMgr *iface) LONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if ( ref == 0 ) {

1 0

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

Feb. 10, 2022

Module: wine Branch: master Commit: e7857fb5209508647b06989ba0a42ef4dfb6ce43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7857fb5209508647b06989b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:43:07 2022 +0100 gdi.exe16: 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/gdi.exe16/Makefile.in | 1 - dlls/gdi.exe16/gdi.c | 10 +++++----- dlls/gdi.exe16/printdrv.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in index 25a39a42cf0..21850e2e660 100644 --- a/dlls/gdi.exe16/Makefile.in +++ b/dlls/gdi.exe16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = gdi.exe16 IMPORTS = user32 advapi32 gdi32 win32u diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 9afa4532fde..b4bcd1c2228 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -548,7 +548,7 @@ static struct window_surface *create_surface( const BITMAPINFO *info ) surface->bits = (char *)info + surface->info_size; memcpy( &surface->info, info, surface->info_size ); - TRACE( "created %p %ux%u for info %p bits %p\n", + TRACE( "created %p %lux%lu for info %p bits %p\n", surface, surface->header.rect.right, surface->header.rect.bottom, info, surface->bits ); return &surface->header; } @@ -2138,7 +2138,7 @@ void WINAPI PlayMetaFileRecord16( HDC16 hdc, HANDLETABLE16 *ht, METARECORD *mr, */ BOOL16 WINAPI SetDCHook16( HDC16 hdc16, FARPROC16 hookProc, DWORD dwHookData ) { - FIXME( "%04x %p %x: not supported\n", hdc16, hookProc, dwHookData ); + FIXME( "%04x %p %lx: not supported\n", hdc16, hookProc, dwHookData ); return FALSE; } @@ -2204,7 +2204,7 @@ UINT16 WINAPI GetBoundsRect16( HDC16 hdc, LPRECT16 rect, UINT16 flags) */ WORD WINAPI EngineEnumerateFont16(LPSTR fontname, FARPROC16 proc, DWORD data ) { - FIXME("(%s,%p,%x),stub\n",fontname,proc,data); + FIXME("(%s,%p,%lx),stub\n",fontname,proc,data); return 0; } @@ -2251,7 +2251,7 @@ WORD WINAPI EngineRealizeFont16(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform */ WORD WINAPI EngineRealizeFontExt16(LONG l1, LONG l2, LONG l3, LONG l4) { - FIXME("(%08x,%08x,%08x,%08x),stub\n",l1,l2,l3,l4); + FIXME("(%08lx,%08lx,%08lx,%08lx),stub\n",l1,l2,l3,l4); return 0; } @@ -3668,7 +3668,7 @@ BOOL16 WINAPI SetLayout16( HDC16 hdc, DWORD layout ) */ BOOL16 WINAPI SetSolidBrush16(HBRUSH16 hBrush, COLORREF newColor ) { - FIXME( "%04x %08x no longer supported\n", hBrush, newColor ); + FIXME( "%04x %08lx no longer supported\n", hBrush, newColor ); return FALSE; } diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index b0e1e316008..b7c09b31821 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -355,7 +355,7 @@ INT16 WINAPI EndSpoolPage16(HPJOB16 hJob) */ DWORD WINAPI GetSpoolJob16(int nOption, LONG param) { - TRACE("In GetSpoolJob param 0x%x noption %d\n",param, nOption); + TRACE("In GetSpoolJob param 0x%lx noption %d\n",param, nOption); return 0; } @@ -509,7 +509,7 @@ DWORD WINAPI DrvSetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile, TRACE("profile %s\n",lpProfile); else TRACE("profile %p\n",lpProfile); - TRACE("lpType %08x\n",lpType); + TRACE("lpType %08lx\n",lpType); if ((!lpPrinter) || (!lpProfile) || (PtrToUlong(lpProfile) == INT_PD_DEFAULT_MODEL) || (HIWORD(lpProfile) &&

1 0

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

Feb. 10, 2022

Module: wine Branch: master Commit: 2891f987ac9e69b7e8455fefd446dc318e2468ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=2891f987ac9e69b7e8455fef… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:31 2022 +0100 fltlib: 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/fltlib/Makefile.in | 1 - dlls/fltlib/fltlib.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/fltlib/Makefile.in b/dlls/fltlib/Makefile.in index f7281c69c9d..d969421644a 100644 --- a/dlls/fltlib/Makefile.in +++ b/dlls/fltlib/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fltlib.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c index 5af6bbb13c9..a6cf060b3d1 100644 --- a/dlls/fltlib/fltlib.c +++ b/dlls/fltlib/fltlib.c @@ -33,7 +33,7 @@ HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOption LPSECURITY_ATTRIBUTES lpSecurityAttributes, HANDLE *hPort) { - FIXME("(%s, %d, %p, %d, %p, %p) stub\n", debugstr_w(lpPortName), dwOptions, + FIXME("(%s, %ld, %p, %ld, %p, %p) stub\n", debugstr_w(lpPortName), dwOptions, lpContext, dwSizeOfContext, lpSecurityAttributes, hPort); *hPort = INVALID_HANDLE_VALUE; @@ -46,7 +46,7 @@ HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOption HRESULT WINAPI FilterFindFirst(DWORD class, LPVOID buffer, DWORD size, LPDWORD bytes_returned, LPHANDLE handle) { - FIXME("(%u, %p, %u, %p, %p) stub\n", class, buffer, size, bytes_returned, handle); + FIXME("(%lu, %p, %lu, %p, %p) stub\n", class, buffer, size, bytes_returned, handle); return HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS); }

1 0

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

Feb. 10, 2022

Module: wine Branch: master Commit: a75048b4ac8113a456095914b1bb4f359d3c4c99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a75048b4ac8113a456095914… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:37 2022 +0100 fntcache: 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/fntcache/Makefile.in | 1 - dlls/fntcache/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/fntcache/Makefile.in b/dlls/fntcache/Makefile.in index d87c7c2d4ea..dbc72506fe3 100644 --- a/dlls/fntcache/Makefile.in +++ b/dlls/fntcache/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fntcache.dll IMPORTS = advapi32 diff --git a/dlls/fntcache/main.c b/dlls/fntcache/main.c index 0f8508652f2..baa06916068 100644 --- a/dlls/fntcache/main.c +++ b/dlls/fntcache/main.c @@ -50,7 +50,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, void *event_d SetEvent( stop_event ); return NO_ERROR; default: - FIXME( "got service ctrl %x\n", ctrl ); + FIXME( "got service ctrl %lx\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR;

1 0

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

Feb. 10, 2022

Module: wine Branch: master Commit: 551f97c707f4ad404eeb8363c9acd03054f9e335 URL: https://source.winehq.org/git/wine.git/?a=commit;h=551f97c707f4ad404eeb8363… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:43:25 2022 +0100 hal: 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/hal/Makefile.in | 1 - dlls/hal/hal.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index aa3f1ff023a..63211a18d7d 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hal.dll IMPORTLIB = hal IMPORTS = ntoskrnl diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 55a8891b6fa..e339f21ab6c 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -161,20 +161,20 @@ void WINAPI WRITE_PORT_UCHAR(UCHAR *port, UCHAR value) void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { - FIXME("(%p %d) stub!\n", port, value); + FIXME("(%p %ld) stub!\n", port, value); } #endif /* __i386__ || __arm__ || __arm64__ */ ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) { - FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); + FIXME("(%u %lu %lu %p %lu) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); /* Claim that there is no such bus */ return 0; } ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length) { - FIXME("(%u %u %u %p %u %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); + FIXME("(%u %lu %lu %p %lu %lu) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); /* Claim that there is no such bus */ return 0; } @@ -182,7 +182,7 @@ ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, U BOOLEAN WINAPI HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, PULONG AddressSpace, PPHYSICAL_ADDRESS TranslatedAddress) { - FIXME("(%d %d %s %p %p) stub!\n", InterfaceType, BusNumber, + FIXME("(%d %ld %s %p %p) stub!\n", InterfaceType, BusNumber, wine_dbgstr_longlong(BusAddress.QuadPart), AddressSpace, TranslatedAddress); return FALSE; }

1 0

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

Feb. 10, 2022

Module: wine Branch: master Commit: 68d2b338dad95ac2b8c8641c9bba6096b7c62e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68d2b338dad95ac2b8c8641c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:21:27 2022 +0300 mfplat: Implement MFCreateTempFile(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 3 ++- dlls/mfplat/main.c | 66 +++++++++++++++++++++++++++++++++++++++---------- dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 2 ++ 4 files changed, 58 insertions(+), 15 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 79af7650de6..f4ef8e5649c 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,7 +1,8 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 mfuuid propsys rtworkq +IMPORTS = advapi32 ole32 mfuuid propsys rtworkq kernelbase +DELAYIMPORTS = bcrypt EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7e2527fc024..7a1f10dac24 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -52,6 +52,9 @@ #include "initguid.h" #include "mfd3d12.h" +#include "bcrypt.h" +#include "pathcch.h" + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); struct local_handler @@ -4576,11 +4579,8 @@ static const IMFGetServiceVtbl bytestream_file_getservice_vtbl = bytestream_file_getservice_GetService, }; -/*********************************************************************** - * MFCreateFile (mfplat.@) - */ -HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, - LPCWSTR url, IMFByteStream **bytestream) +static HRESULT create_file_bytestream(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, + const WCHAR *path, BOOL is_tempfile, IMFByteStream **bytestream) { DWORD capabilities = MFBYTESTREAM_IS_SEEKABLE | MFBYTESTREAM_DOES_NOT_USE_NETWORK; DWORD filecreation_disposition = 0, fileaccessmode = 0, fileattributes = 0; @@ -4590,8 +4590,6 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open HANDLE file; HRESULT hr; - TRACE("%d, %d, %#x, %s, %p.\n", accessmode, openmode, flags, debugstr_w(url), bytestream); - switch (accessmode) { case MF_ACCESSMODE_READ: @@ -4630,12 +4628,12 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open if (flags & MF_FILEFLAGS_NOBUFFERING) fileattributes |= FILE_FLAG_NO_BUFFERING; + if (is_tempfile) + fileattributes |= FILE_FLAG_DELETE_ON_CLOSE; /* Open HANDLE to file */ - file = CreateFileW(url, fileaccessmode, filesharemode, NULL, - filecreation_disposition, fileattributes, 0); - - if(file == INVALID_HANDLE_VALUE) + file = CreateFileW(path, fileaccessmode, filesharemode, NULL, filecreation_disposition, fileattributes, 0); + if (file == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); if (!(object = calloc(1, sizeof(*object)))) @@ -4660,19 +4658,61 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open object->capabilities = capabilities; object->hfile = file; - if (GetFileTime(file, NULL, NULL, &writetime)) + if (!is_tempfile && GetFileTime(file, NULL, NULL, &writetime)) { IMFAttributes_SetBlob(&object->attributes.IMFAttributes_iface, &MF_BYTESTREAM_LAST_MODIFIED_TIME, (const UINT8 *)&writetime, sizeof(writetime)); } - IMFAttributes_SetString(&object->attributes.IMFAttributes_iface, &MF_BYTESTREAM_ORIGIN_NAME, url); + IMFAttributes_SetString(&object->attributes.IMFAttributes_iface, &MF_BYTESTREAM_ORIGIN_NAME, path); *bytestream = &object->IMFByteStream_iface; return S_OK; } +/*********************************************************************** + * MFCreateFile (mfplat.@) + */ +HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, + const WCHAR *path, IMFByteStream **bytestream) +{ + TRACE("%d, %d, %#x, %s, %p.\n", accessmode, openmode, flags, debugstr_w(path), bytestream); + + return create_file_bytestream(accessmode, openmode, flags, path, FALSE, bytestream); +} + +/*********************************************************************** + * MFCreateTempFile (mfplat.@) + */ +HRESULT WINAPI MFCreateTempFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, + IMFByteStream **bytestream) +{ + WCHAR name[24], tmppath[MAX_PATH], *path; + ULONG64 rnd; + size_t len; + HRESULT hr; + + TRACE("%d, %d, %#x, %p.\n", accessmode, openmode, flags, bytestream); + + BCryptGenRandom(NULL, (UCHAR *)&rnd, sizeof(rnd), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + swprintf(name, ARRAY_SIZE(name), L"MFP%llX.TMP", rnd); + GetTempPathW(ARRAY_SIZE(tmppath), tmppath); + + len = wcslen(tmppath) + wcslen(name) + 2; + if (!(path = malloc(len * sizeof(*path)))) + return E_OUTOFMEMORY; + + wcscpy(path, tmppath); + PathCchAppend(path, len, name); + + hr = create_file_bytestream(accessmode, openmode, flags, path, TRUE, bytestream); + + free(path); + + return hr; +} + struct bytestream_wrapper { IMFByteStreamCacheControl IMFByteStreamCacheControl_iface; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 57f4e3c0d6c..5d177732fa8 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -71,7 +71,7 @@ @ stdcall MFCreateStreamDescriptor(long long ptr ptr) @ stdcall MFCreateSystemTimeSource(ptr) @ stub MFCreateSystemUnderlyingClock -@ stub MFCreateTempFile +@ stdcall MFCreateTempFile(long long long ptr) @ stdcall MFCreateTrackedSample(ptr) @ stdcall MFCreateTransformActivate(ptr) @ stub MFCreateURLFromPath diff --git a/include/mfapi.h b/include/mfapi.h index d4493501624..105613693c9 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -533,6 +533,8 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size); HRESULT WINAPI MFCreateSample(IMFSample **sample); +HRESULT WINAPI MFCreateTempFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, + IMFByteStream **bytestream); HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMediaType **media_type); HRESULT WINAPI MFCreateVideoSampleAllocatorEx(REFIID riid, void **allocator); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer);

1 0

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

Feb. 10, 2022

Module: wine Branch: master Commit: 0b98026e2d0fb99aa551b0a171525eee9a6aa502 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b98026e2d0fb99aa551b0a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:21:30 2022 +0300 mfmediaengine: 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/mfmediaengine/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index fb8b4b8e9ae..5bfb35efbac 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1435,7 +1435,7 @@ static HRESULT media_engine_set_source(struct media_engine *engine, IMFByteStrea if (url || bytestream) { - flags = MF_RESOLUTION_MEDIASOURCE; + flags = MF_RESOLUTION_MEDIASOURCE | MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE; if (engine->flags & MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS) flags |= MF_RESOLUTION_DISABLE_LOCAL_PLUGINS;

1 0