wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Connor McAdams : include: Define more provider interfaces in uiautomationcore.idl.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: a077f98ee365191f073e236b8f46c236378b51f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a077f98ee365191f073e236b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sat Nov 6 15:57:20 2021 -0400 include: Define more provider interfaces in uiautomationcore.idl. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiautomationcore.idl | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index 9ee79170e4a..170b0c76de1 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -20,6 +20,14 @@ import "oaidl.idl"; import "oleacc.idl"; +enum NavigateDirection { + NavigateDirection_Parent = 0x0000, + NavigateDirection_NextSibling = 0x0001, + NavigateDirection_PreviousSibling = 0x0002, + NavigateDirection_FirstChild = 0x0003, + NavigateDirection_LastChild = 0x0004, +}; + enum ProviderOptions { ProviderOptions_ClientSideProvider = 0x0001, ProviderOptions_ServerSideProvider = 0x0002, @@ -38,6 +46,13 @@ typedef int EVENTID; typedef int TEXTATTRIBUTEID; typedef int CONTROLTYPEID; +struct UiaRect { + double left; + double top; + double width; + double height; +}; + [ version(1.0), uuid(930299ce-9965-4dec-b0f4-a54848d4b667), @@ -92,4 +107,48 @@ library UIA [in] IRawElementProviderSimple *pIn, [out] IAccessibleEx **ppRetValOut); } + + interface IRawElementProviderFragmentRoot; + + [ + object, + uuid(f7063da8-8359-439c-9297-bbc5299a7d87), + pointer_default(unique), + oleautomation + ] + interface IRawElementProviderFragment : IUnknown + { + HRESULT Navigate( + [in] enum NavigateDirection direction, + [out, retval] IRawElementProviderFragment **pRetVal); + + HRESULT GetRuntimeId([out, retval] SAFEARRAY(int) *pRetVal); + HRESULT get_BoundingRectangle([out, retval] struct UiaRect *pRetVal); + /* + * FIXME: Current versions of Windows SDK use + * SAFEARRAY(IRawElementProviderFragmentRoot *) instead of + * SAFEARRAY(VARIANT). The new type is currently unsupported + * in widl, we should switch to it when it is. + */ + HRESULT GetEmbeddedFragmentRoots([out, retval] SAFEARRAY(VARIANT) *pRetVal); + HRESULT SetFocus(); + + [propget] HRESULT FragmentRoot([out, retval] IRawElementProviderFragmentRoot **pRetVal); + } + + [ + object, + uuid(620ce2a5-ab8f-40a9-86cb-de3c75599b58), + pointer_default(unique), + oleautomation + ] + interface IRawElementProviderFragmentRoot : IUnknown + { + HRESULT ElementProviderFromPoint( + [in] double x, + [in] double y, + [out, retval] IRawElementProviderFragment **pRetVal); + + HRESULT GetFocus([out, retval] IRawElementProviderFragment **pRetVal); + } }

1 0

Connor McAdams : include: Update existing provider definitions in uiautomationcore.idl.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 273d3255d59ec1a117fcfed3dec5adeeeb2d6529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=273d3255d59ec1a117fcfed3… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sat Nov 6 15:57:19 2021 -0400 include: Update existing provider definitions in uiautomationcore.idl. Update definitions to match newer Windows SDK headers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiautomationcore.idl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index 3ae6dac4b3f..9ee79170e4a 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -26,7 +26,10 @@ enum ProviderOptions { ProviderOptions_NonClientAreaProvider = 0x0004, ProviderOptions_OverrideProvider = 0x0008, ProviderOptions_ProviderOwnsSetFocus = 0x0010, - ProviderOptions_UseComThreading = 0x0020 + ProviderOptions_UseComThreading = 0x0020, + ProviderOptions_RefuseNonClientSupport = 0x0040, + ProviderOptions_HasNativeIAccessible = 0x0080, + ProviderOptions_UseClientCoordinates = 0x0100, }; typedef int PROPERTYID; @@ -48,7 +51,8 @@ library UIA [ object, uuid(d6dd68d1-86fd-4332-8666-9abedea2d24c), - pointer_default(unique) + pointer_default(unique), + oleautomation ] interface IRawElementProviderSimple : IUnknown {

1 0

Jinoh Kang : gdi32: Calculate effective number of scan lines and truncate bitmap bits for EMR_SETDIBITSTODEVICE.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 9301a9e1f89f7b049362b5143f52845bbf9cb341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9301a9e1f89f7b049362b514… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:35 2021 +0900 gdi32: Calculate effective number of scan lines and truncate bitmap bits for EMR_SETDIBITSTODEVICE. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/emfdc.c | 20 ++++++++++++++++++++ dlls/gdi32/tests/metafile.c | 7 ------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 093f2d83737..d0b9033722c 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1815,6 +1815,7 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt EMRSETDIBITSTODEVICE *emr; BOOL ret; UINT bmi_size, img_size, payload_size, emr_size; + UINT src_height, stride; BITMAPINFOHEADER bih; BITMAPINFO *bi; @@ -1822,6 +1823,25 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt if (!emf_parse_user_bitmapinfo( &bih, &info->bmiHeader, usage, TRUE, &bmi_size, &img_size )) return 0; + if (bih.biHeight >= 0) + { + src_height = (UINT)bih.biHeight; + if (src_height > y_src + height) src_height = y_src + height; + + if (src_height < startscan) lines = 0; + else if (lines > src_height - startscan) lines = src_height - startscan; + + if (!lines) return 0; + + if (bih.biCompression == BI_RGB || bih.biCompression == BI_BITFIELDS) + { + /* truncate image and check for overflows */ + stride = get_dib_stride( bih.biWidth, bih.biBitCount ); + img_size = lines * stride; + if (img_size / stride != lines) return 0; + } + } + /* check for overflows */ payload_size = bmi_size + img_size; if (payload_size < bmi_size) return 0; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 25c851e7384..2df38674c2f 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -7764,13 +7764,6 @@ static void test_emf_SetDIBitsToDevice(void) { winetest_push_context("Test %d", test_idx); - if (tests[test_idx].height != bitmap_height && !strcmp(winetest_platform, "wine")) - { - skip("Wine does not adjust cLines appropriately\n"); - winetest_pop_context(); - continue; - } - memset(&bmi, 0, sizeof(bmi)); if (tests[test_idx].infomode < 2) {

1 0

Jinoh Kang : gdi32: Allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: da126e19e3f033b2f3f79e1821ce8dc6e9d44b47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da126e19e3f033b2f3f79e18… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:34 2021 +0900 gdi32: Allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC. User-facing APIs should accept biSizeImage == 0, and fix it up accordingly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51834 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/emfdc.c | 210 ++++++++++++++++++++++++++++++++++++++++---- dlls/gdi32/tests/metafile.c | 14 --- 2 files changed, 194 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da126e19e3f033b2f3f7…

1 0

Jinoh Kang : gdi32: Fix bounding box calculation for EMR_STRETCHDIBITS.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 03e9b882a29c971e18f2f7024d0e4ce316c4e80c URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e9b882a29c971e18f2f702… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:33 2021 +0900 gdi32: Fix bounding box calculation for EMR_STRETCHDIBITS. rclBounds should denote a closed interval for each axis. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/emfdc.c | 4 ++-- dlls/gdi32/tests/metafile.c | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 981849a9e86..203350d937d 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1639,8 +1639,8 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, emr->rclBounds.left = x_dst; emr->rclBounds.top = y_dst; - emr->rclBounds.right = x_dst + width_dst; - emr->rclBounds.bottom = y_dst + height_dst; + emr->rclBounds.right = x_dst + width_dst - 1; + emr->rclBounds.bottom = y_dst + height_dst - 1; /* save the record we just created */ ret = emfdc_record( dc_attr->emf, &emr->emr ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 261e438d670..0987df95f2d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -6376,12 +6376,6 @@ static void test_emf_StretchDIBits(void) {32, 4, 4, BI_BITFIELDS, 1, EMF_STRETCHDIBITS_32BIT_4X4_SIZED, sizeof(EMF_STRETCHDIBITS_32BIT_4X4_SIZED), 0, 3, {{0x00, 0x00, 0xff}, {0xe0, 0xff, 0x00}, {0xff, 0x00, 0x00}}}, }; - if (!strcmp(winetest_platform, "wine")) - { - skip("Wine sets EMRSTRETCHDIBITS::rclBounds incorrectly\n"); - return; - } - hdc = GetDC(0); for (test_idx = 0; test_idx < ARRAY_SIZE(tests); ++test_idx)

1 0

Jinoh Kang : gdi32/tests: Add tests for recording SetDIBitsToDevice in EMFs.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 3f7df2a5f61f730c65887b124cc411c481ed3f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f7df2a5f61f730c65887b12… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:32 2021 +0900 gdi32/tests: Add tests for recording SetDIBitsToDevice in EMFs. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 1398 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1398 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f7df2a5f61f730c6588…

1 0

Jinoh Kang : gdi32/tests: Add tests for recording StretchDIBits in EMFs.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 53617db97ade28b76ccaef952d55c1cd93982084 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53617db97ade28b76ccaef95… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:31 2021 +0900 gdi32/tests: Add tests for recording StretchDIBits in EMFs. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 1432 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1432 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53617db97ade28b76cca…

1 0

Jinoh Kang : win32u: Remove EMFDRV_StretchDIBits and EMFDRV_SetDIBitsToDevice.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 26d4aa8f73656f25ba845368553dcf178de8306b URL: https://source.winehq.org/git/wine.git/?a=commit;h=26d4aa8f73656f25ba845368… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:30 2021 +0900 win32u: Remove EMFDRV_StretchDIBits and EMFDRV_SetDIBitsToDevice. Bound rect updates shall ideally be done via a generic mechanism, not by EMFDRV. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/emfdrv.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/win32u/emfdrv.c b/dlls/win32u/emfdrv.c index e05f11d7b9a..59a6ee69328 100644 --- a/dlls/win32u/emfdrv.c +++ b/dlls/win32u/emfdrv.c @@ -402,24 +402,6 @@ static BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD r return TRUE; } -static INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT x_dst, INT y_dst, INT width_dst, - INT height_dst, INT x_src, INT y_src, INT width_src, - INT height_src, const void *bits, BITMAPINFO *info, - UINT wUsage, DWORD dwRop ) -{ - /* FIXME: Update bound rect */ - return height_src; -} - -static INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, - DWORD height, INT x_src, INT y_src, UINT startscan, - UINT lines, const void *bits, BITMAPINFO *info, - UINT usage ) -{ - /* FIXME: Update bound rect */ - return lines; -} - static HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) { return 0; @@ -528,7 +510,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor*/ NULL, /* pSetDCPenColor*/ - EMFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ + NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ EMFDRV_SetPixel, /* pSetPixel */ @@ -536,7 +518,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pStartDoc */ NULL, /* pStartPage */ NULL, /* pStretchBlt */ - EMFDRV_StretchDIBits, /* pStretchDIBits */ + NULL, /* pStretchDIBits */ EMFDRV_StrokeAndFillPath, /* pStrokeAndFillPath */ EMFDRV_StrokePath, /* pStrokePath */ NULL, /* pUnrealizePalette */

1 0

Paul Gofman : msiexec: Append .msi extension to file name if file is not found.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: fd5d942a733bf35b7c6b6644d2aed571c185baba URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd5d942a733bf35b7c6b6644… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 5 19:53:40 2021 +0300 msiexec: Append .msi extension to file name if file is not found. Fixes Stellaris failing to install launcher at start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 18 ++++++++++++++++++ programs/msiexec/msiexec.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index eedfcac486d..b42cc90a955 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -64,6 +64,8 @@ static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) static void test_msidatabase(void) { MSIHANDLE hdb = 0, hdb2 = 0; + WCHAR path[MAX_PATH]; + DWORD len; UINT res; DeleteFileW(msifileW); @@ -162,6 +164,22 @@ static void test_msidatabase(void) res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + res = GetCurrentDirectoryW(ARRAY_SIZE(path), path); + ok ( res, "Got zero res.\n" ); + lstrcatW( path, L"\\"); + lstrcatW( path, msifileW); + len = lstrlenW(path); + path[len - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + + lstrcpyW( path, msifileW ); + path[lstrlenW(path) - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + res = DeleteFileA( msifile2 ); ok( res == TRUE, "Failed to delete database\n" ); diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index e25cc2659e6..e9e74f5c19e 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -588,6 +588,31 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg return ret; } +static WCHAR *get_path_with_extension(const WCHAR *package_name) +{ + static const WCHAR ext[] = L".msi"; + unsigned int p; + WCHAR *path; + + if (!(path = heap_alloc(lstrlenW(package_name) * sizeof(WCHAR) + sizeof(ext)))) + { + WINE_ERR("No memory.\n"); + return NULL; + } + + lstrcpyW(path, package_name); + p = lstrlenW(path); + while (p && path[p] != '.' && path[p] != L'\\' && path[p] != '/') + --p; + if (path[p] == '.') + { + heap_free(path); + return NULL; + } + lstrcatW(path, ext); + return path; +} + int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { int i; @@ -626,6 +651,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine DWORD ReturnCode; int argc; LPWSTR *argvW = NULL; + WCHAR *path; InitCommonControls(); @@ -1040,14 +1066,28 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine if(IsProductCode(PackageName)) ReturnCode = MsiConfigureProductExW(PackageName, 0, INSTALLSTATE_DEFAULT, Properties); else - ReturnCode = MsiInstallProductW(PackageName, Properties); + { + if ((ReturnCode = MsiInstallProductW(PackageName, Properties)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiInstallProductW(path, Properties); + heap_free(path); + } + } } else if(FunctionRepair) { if(IsProductCode(PackageName)) WINE_FIXME("Product code treatment not implemented yet\n"); else - ReturnCode = MsiReinstallProductW(PackageName, RepairMode); + { + if ((ReturnCode = MsiReinstallProductW(PackageName, RepairMode)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiReinstallProductW(path, RepairMode); + heap_free(path); + } + } } else if(FunctionAdvertise) {

1 0

Nikolay Sivov : mfplay: Fix leaks on error paths (Coverity).
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: b676f14865e2765729e238ceb8e54e96e63f1da0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b676f14865e2765729e238ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 11:43:07 2021 +0300 mfplay: Fix leaks on error paths (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 12ea653b97d..5abee9d7de8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1024,6 +1024,15 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, IUnknown *object; HRESULT hr; + if (sync && !ret) + return E_POINTER; + + if (!sync && !player->callback) + { + WARN("Asynchronous item creation is not supported without user callback.\n"); + return MF_E_INVALIDREQUEST; + } + if (FAILED(hr = create_media_item(&player->IMFPMediaPlayer_iface, user_data, &item))) return hr; @@ -1035,9 +1044,6 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, if (sync) { - if (!ret) - return E_POINTER; - *ret = NULL; if (SUCCEEDED(hr = IMFSourceResolver_CreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, @@ -1054,17 +1060,9 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, } IMFPMediaItem_Release(&item->IMFPMediaItem_iface); - - return hr; } else { - if (!player->callback) - { - WARN("Asynchronous item creation is not supported without user callback.\n"); - return MF_E_INVALIDREQUEST; - } - if (ret) *ret = NULL; hr = IMFSourceResolver_BeginCreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE,

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021