October 2020 - Wine-devel - list.winehq.org

[PATCH 2/5] riched20: Use a run helper in the delete text function.
by Huw Davies 27 Oct '20

27 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index d92b93ac2f0..6a8f1e1cd71 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -405,8 +405,8 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, } if (pThisCur->nOffset == run->len) { - pThisCur->pRun = ME_FindItemFwd(pThisCur->pRun, diRunOrParagraphOrEnd); - assert(pThisCur->pRun->type == diRun); + pThisCur->pRun = run_get_di( run_next( &pThisCur->pRun->member.run ) ); + assert( pThisCur->pRun ); pThisCur->nOffset = 0; } } -- 2.23.0

1 0

[PATCH 1/5] riched20: Use row and para helpers in the extend selection function.
by Huw Davies 27 Oct '20

27 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 58 +++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 834f9fd3afe..d92b93ac2f0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1044,37 +1044,53 @@ static void ME_ExtendAnchorSelection(ME_TextEditor *editor) { /* Extend the left side of selection */ editor->pCursors[1] = tmp_cursor; - if (editor->nSelectionType == stWord) + switch (editor->nSelectionType) + { + case stWord: ME_MoveCursorWords(editor, &editor->pCursors[1], -1); - else + break; + + case stLine: { - ME_DisplayItem *pItem; - ME_DIType searchType = ((editor->nSelectionType == stLine) ? - diStartRowOrParagraph:diParagraph); - pItem = ME_FindItemBack(editor->pCursors[1].pRun, searchType); - editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[1].pPara = ME_GetParagraph(editor->pCursors[1].pRun); + ME_Row *row = row_from_cursor( editor->pCursors + 1 ); + row_first_cursor( row, editor->pCursors + 1 ); + break; + } + + case stParagraph: + editor->pCursors[1].pRun = run_get_di( para_first_run( &editor->pCursors[1].pPara->member.para ) ); editor->pCursors[1].nOffset = 0; + break; + + default: + break; } } else if (curOfs >= anchorEndOfs) { /* Extend the right side of selection */ editor->pCursors[0] = tmp_cursor; - if (editor->nSelectionType == stWord) - ME_MoveCursorWords(editor, &editor->pCursors[0], +1); - else + switch (editor->nSelectionType) { - ME_DisplayItem *pItem; - ME_DIType searchType = ((editor->nSelectionType == stLine) ? - diStartRowOrParagraphOrEnd:diParagraphOrEnd); - pItem = ME_FindItemFwd(editor->pCursors[0].pRun, searchType); - if (pItem->type == diTextEnd) - editor->pCursors[0].pRun = ME_FindItemBack(pItem, diRun); - else - editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); - editor->pCursors[0].nOffset = 0; + case stWord: + ME_MoveCursorWords( editor, &editor->pCursors[0], +1 ); + break; + + case stLine: + { + ME_Row *row = row_from_cursor( editor->pCursors ); + row_end_cursor( row, editor->pCursors, TRUE ); + break; + } + + case stParagraph: + editor->pCursors[0].pRun = run_get_di( para_end_run( &editor->pCursors[0].pPara->member.para ) ); + editor->pCursors[0].pPara = para_get_di( editor->pCursors[0].pRun->member.run.para ); + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + break; + + default: + break; } } } -- 2.23.0

1 0

[PATCH 2/2] user32: Use current width or height if a mode specifies zero width or height for ChangeDisplaySettingsExW().
by Zhiyi Zhang 27 Oct '20

27 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix failures to change display modes like in https://test.winehq.org/data/93107c08f5aa7f37ad7ece9cd7ca248dba3030ce/linux… dlls/user32/sysparams.c | 16 ++++++++++++++++ dlls/user32/tests/monitor.c | 16 +++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index d4640e0068e..1381f387e03 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3182,6 +3182,22 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND return DISP_CHANGE_BADMODE; } + if (!is_detached_mode(devmode) && (!devmode->dmPelsWidth || !devmode->dmPelsHeight)) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + if (!EnumDisplaySettingsExW(devname, ENUM_CURRENT_SETTINGS, &dm, 0)) + { + ERR("Current mode not found!\n"); + return DISP_CHANGE_BADMODE; + } + + if (!devmode->dmPelsWidth) + devmode->dmPelsWidth = dm.dmPelsWidth; + if (!devmode->dmPelsHeight) + devmode->dmPelsHeight = dm.dmPelsHeight; + } + ret = USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); if (ret != DISP_CHANGE_SUCCESSFUL) ERR("Changing %s display settings returned %d.\n", wine_dbgstr_w(devname), ret); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index d7d9086672d..009fc0d626e 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -602,8 +602,7 @@ static void test_ChangeDisplaySettingsEx(void) } /* Test changing to a mode with depth set but with zero width and height */ - /* This test is only ran for non-primary adapters for now as it may detach the adapters on Wine */ - for (device = 1; device < device_count; ++device) + for (device = 0; device < device_count; ++device) { for (test = 0; test < ARRAY_SIZE(depths); ++test) { @@ -689,10 +688,8 @@ static void test_ChangeDisplaySettingsEx(void) dd.cb = sizeof(dd); res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); - todo_wine ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", - devices[device].name); - if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - continue; + ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", + devices[device].name); memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -715,13 +712,6 @@ static void test_ChangeDisplaySettingsEx(void) /* Detach all non-primary adapters to avoid position conflicts */ for (device = 1; device < device_count; ++device) { - dd.cb = sizeof(dd); - res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); - ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); - /* Already detached by previous tests */ - if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - continue; - old_count = GetSystemMetrics(SM_CMONITORS); memset(&dm, 0, sizeof(dm)); -- 2.27.0

2 1

[PATCH 1/2] user32/tests: Test changing to a valid depth but zero width and height display mode.
by Zhiyi Zhang 27 Oct '20

27 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 119 ++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 0ce27455a66..d7d9086672d 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -323,6 +323,7 @@ static void test_ChangeDisplaySettingsEx(void) { static const DWORD registry_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + static const DWORD depths[] = {8, 16, 32}; DPI_AWARENESS_CONTEXT context = NULL; UINT primary, device, test, mode; UINT device_size, device_count; @@ -600,9 +601,127 @@ static void test_ChangeDisplaySettingsEx(void) ok(count == old_count, "Expect monitor count %d, got %d\n", old_count, count); } + /* Test changing to a mode with depth set but with zero width and height */ + /* This test is only ran for non-primary adapters for now as it may detach the adapters on Wine */ + for (device = 1; device < device_count; ++device) + { + for (test = 0; test < ARRAY_SIZE(depths); ++test) + { + /* Find the native resolution */ + memset(&dm, 0, sizeof(dm)); + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm2, 0); ++mode) + { + if (dm2.dmBitsPerPel == depths[test] + && dm2.dmPelsWidth > dm.dmPelsWidth && dm2.dmPelsHeight > dm.dmPelsHeight) + dm = dm2; + } + if (dm.dmBitsPerPel != depths[test]) + { + skip("Depth %u is unsupported for %s.\n", depths[test], devices[device].name); + continue; + } + + /* Find the second resolution */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm2, 0); ++mode) + { + if (dm2.dmBitsPerPel == depths[test] + && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + if (dm2.dmBitsPerPel != depths[test] + || dm2.dmPelsWidth == dm.dmPelsWidth || dm2.dmPelsHeight == dm.dmPelsHeight) + { + skip("Failed to find the second mode for %s.\n", devices[device].name); + continue; + } + + /* Find the third resolution */ + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm3, 0); ++mode) + { + if (dm3.dmBitsPerPel == depths[test] + && dm3.dmPelsWidth != dm.dmPelsWidth && dm3.dmPelsHeight != dm.dmPelsHeight + && dm3.dmPelsWidth != dm2.dmPelsWidth && dm3.dmPelsHeight != dm2.dmPelsHeight) + break; + } + if (dm3.dmBitsPerPel != depths[test] + || dm3.dmPelsWidth == dm.dmPelsWidth || dm3.dmPelsHeight == dm.dmPelsHeight + || dm3.dmPelsWidth == dm2.dmPelsWidth || dm3.dmPelsHeight == dm2.dmPelsHeight) + { + skip("Failed to find the third mode for %s.\n", devices[device].name); + continue; + } + + /* Change the current mode to the third mode first */ + res = ChangeDisplaySettingsExA(devices[device].name, &dm3, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL + || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", devices[device].name, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change display mode for %s.\n", devices[device].name); + continue; + } + flush_events(); + expect_dm(dm3, devices[device].name, test); + + /* Change the registry mode to the second mode */ + res = ChangeDisplaySettingsExA(devices[device].name, &dm2, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL + || broken(res == DISP_CHANGE_BADFLAGS), /* Win10 32bit */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", devices[device].name, res); + + /* Change to a mode with depth set but with zero width and height */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmBitsPerPel = depths[test]; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + devices[device].name, res); + flush_events(); + + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); + todo_wine ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", + devices[device].name); + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "Device %s EnumDisplaySettingsA failed, error %#x.\n", devices[device].name, GetLastError()); + todo_wine_if(depths[test] != 32) + ok(dm.dmBitsPerPel == depths[test], "Device %s expect dmBitsPerPel %u, got %u.\n", + devices[device].name, depths[test], dm.dmBitsPerPel); + /* 2008 resets to the resolution in the registry. Newer versions of Windows doesn't + * change the current resolution */ + ok(dm.dmPelsWidth == dm3.dmPelsWidth || broken(dm.dmPelsWidth == dm2.dmPelsWidth), + "Device %s expect dmPelsWidth %u, got %u.\n", + devices[device].name, dm3.dmPelsWidth, dm.dmPelsWidth); + ok(dm.dmPelsHeight == dm3.dmPelsHeight || broken(dm.dmPelsHeight == dm2.dmPelsHeight), + "Device %s expect dmPelsHeight %u, got %u.\n", + devices[device].name, dm3.dmPelsHeight, dm.dmPelsHeight); + } + } + /* Detach all non-primary adapters to avoid position conflicts */ for (device = 1; device < device_count; ++device) { + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); + /* Already detached by previous tests */ + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + old_count = GetSystemMetrics(SM_CMONITORS); memset(&dm, 0, sizeof(dm)); -- 2.27.0

1 0

[PATCH] qmgr/tests: Fix issues with handling of transient errors
by Aaron Hill 26 Oct '20

26 Oct '20

When a BITS job is being transferred, it may enter into the state BG_JOB_STATE_TRANSIENT_ERROR (for example, if the hostname fails to resolve). Currently, entering this state causes qmgr job tests to fail, even though it may occur due to temporary network issues out of our control. If a job enters BG_JOB_STATE_TRANSIENT_ERROR before the timeout has elapsed, attempt to resume the job using IBackgroundCopyJob_Resume. If the job is still in BG_JOB_STATE_TRANSIENT_ERROR, query BITS for detailed error information, and print it out. Additionally, ensure that we are able to transfer files on Windows 10 with a metered connection. By default, BITS will not attempt to transfer a job on a metered connection, instead failing with BG_JOB_STATE_TRANSIENT_ERROR. On newer versions of Windows, we can use IBackgroundCopyJob5 to set the transfer policy, forcing the job to run even on a metered connection. This allows qmgr job tests to pass on the testbot Windows 10 VMs, which have metered connections enabled in order to disable Windows Update. Setting the job transfer policy requires using APIs from BITS 5.0. Add the minimal amount of the interface needed for the test. With this patch, the qmgr job tests now pass on all testbot VMs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50048 Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> --- dlls/qmgr/qmgr_local.idl | 1 + dlls/qmgr/tests/job.c | 117 +++++++++++++++++++++++++++++++++++++-- include/Makefile.in | 1 + include/bits5_0.idl | 36 ++++++++++++ 4 files changed, 151 insertions(+), 4 deletions(-) create mode 100644 include/bits5_0.idl diff --git a/dlls/qmgr/qmgr_local.idl b/dlls/qmgr/qmgr_local.idl index 110d479ab92..48439fc5dac 100644 --- a/dlls/qmgr/qmgr_local.idl +++ b/dlls/qmgr/qmgr_local.idl @@ -25,3 +25,4 @@ #include "bits2_0.idl" #include "bits2_5.idl" #include "bits3_0.idl" +#include "bits5_0.idl" diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 53b724eadbf..68d15acaf0a 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -27,6 +27,7 @@ #include "initguid.h" #include "bits2_0.h" #include "bits2_5.h" +#include "bits5_0.h" /* Globals used by many tests */ static WCHAR test_remotePathA[MAX_PATH]; @@ -75,6 +76,8 @@ static void init_paths(void) static BOOL setup(void) { HRESULT hres; + IBackgroundCopyJob5* test_job_5; + BITS_JOB_PROPERTY_VALUE prop_val; test_manager = NULL; test_job = NULL; @@ -95,6 +98,25 @@ static BOOL setup(void) return FALSE; } + /* The Wine TestBot Windows 10 VMs disable Windows Update by putting + the network connection in metered mode (see https://wiki.winehq.org/Wine_TestBot_VMs#Windows_configuration) + + Unfortunately, this will make BITS jobs fail, since the default transfer policy + on Windows 10 prevents BITs job from running over a metered network + + To allow these tests in this file to run on the testbot, we + set the BITS_JOB_PROPERTY_ID_COST_FLAGS property to BITS_COST_STATE_TRANSFER_ALWAYS, + ensuring that BITS will still try to run the job on a metered network */ + prop_val.Dword = BITS_COST_STATE_TRANSFER_ALWAYS; + hres = IBackgroundCopyJob_QueryInterface(test_job, &IID_IBackgroundCopyJob5, (void **)&test_job_5); + /* BackgroundCopyJob5 was added in Windows 8, so this may not exist. The metered connection + workaround is only applied on Windows 10, so it's fine if this fails. */ + if (SUCCEEDED(hres)) { + hres = IBackgroundCopyJob5_SetProperty(test_job_5, BITS_JOB_PROPERTY_ID_COST_FLAGS, prop_val); + ok(hres == S_OK, "Failed to set the cost flags: %08x\n", hres); + IBackgroundCopyJob5_Release(test_job_5); + } + return TRUE; } @@ -333,6 +355,43 @@ static void compareFiles(WCHAR *n1, WCHAR *n2) ok(memcmp(b1, b2, s1) == 0, "Files differ in contents\n"); } +/* Handles a timeout in the BG_JOB_STATE_ERROR or BG_JOB_STATE_TRANSIENT_ERROR state */ +static void handle_job_err(void) +{ + HRESULT hres; + IBackgroundCopyError *err; + BG_ERROR_CONTEXT errContext; + HRESULT errCode; + LPWSTR contextDesc; + LPWSTR errDesc; + + hres = IBackgroundCopyJob_GetError(test_job, &err); + if (SUCCEEDED(hres)) { + hres = IBackgroundCopyError_GetError(err, &errContext, &errCode); + if (SUCCEEDED(hres)) { + ok(0, "Got context: %d code: %d\n", errContext, errCode); + } else { + ok(0, "Failed to get error info: 0x%08x\n", hres); + } + + hres = IBackgroundCopyError_GetErrorContextDescription(err, MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), &contextDesc); + if (SUCCEEDED(hres)) { + ok(0, "Got context desc: %s\n", wine_dbgstr_w(contextDesc)); + } else { + ok(0, "Failed to get context desc: 0x%08x\n", hres); + } + + hres = IBackgroundCopyError_GetErrorDescription(err, MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), &errDesc); + if (SUCCEEDED(hres)) { + ok(0, "Got error desc: %s\n", wine_dbgstr_w(errDesc)); + } else { + ok(0, "Failed to get error desc: 0x%08x\n", hres); + } + } else { + ok(0, "Failed to get error: 0x%08x\n", hres); + } +} + /* Test a complete transfer for local files */ static void test_CompleteLocal(void) { @@ -362,13 +421,23 @@ static void test_CompleteLocal(void) hres = IBackgroundCopyJob_GetState(test_job, &state); ok(hres == S_OK, "IBackgroundCopyJob_GetState\n"); ok(state == BG_JOB_STATE_QUEUED || state == BG_JOB_STATE_CONNECTING - || state == BG_JOB_STATE_TRANSFERRING || state == BG_JOB_STATE_TRANSFERRED, + || state == BG_JOB_STATE_TRANSFERRING || state == BG_JOB_STATE_TRANSFERRED + || state == BG_JOB_STATE_TRANSIENT_ERROR, "Bad state: %d\n", state); + + if (state == BG_JOB_STATE_TRANSIENT_ERROR) { + hres = IBackgroundCopyJob_Resume(test_job); + ok(hres == S_OK, "IBackgroundCopyJob_Resume\n"); + } + if (state == BG_JOB_STATE_TRANSFERRED) break; Sleep(1000); } + if (state == BG_JOB_STATE_ERROR || state == BG_JOB_STATE_TRANSIENT_ERROR) + handle_job_err(); + ok(i < timeout_sec, "BITS jobs timed out\n"); hres = IBackgroundCopyJob_Complete(test_job); ok(hres == S_OK, "IBackgroundCopyJob_Complete\n"); @@ -430,13 +499,24 @@ static void test_CompleteLocalURL(void) hres = IBackgroundCopyJob_GetState(test_job, &state); ok(hres == S_OK, "IBackgroundCopyJob_GetState\n"); ok(state == BG_JOB_STATE_QUEUED || state == BG_JOB_STATE_CONNECTING - || state == BG_JOB_STATE_TRANSFERRING || state == BG_JOB_STATE_TRANSFERRED, + || state == BG_JOB_STATE_TRANSFERRING || state == BG_JOB_STATE_TRANSFERRED + || state == BG_JOB_STATE_TRANSIENT_ERROR, "Bad state: %d\n", state); + + if (state == BG_JOB_STATE_TRANSIENT_ERROR) { + hres = IBackgroundCopyJob_Resume(test_job); + ok(hres == S_OK, "IBackgroundCopyJob_Resume\n"); + } + if (state == BG_JOB_STATE_TRANSFERRED) break; Sleep(1000); } + if (state == BG_JOB_STATE_ERROR || state == BG_JOB_STATE_TRANSIENT_ERROR) + handle_job_err(); + + ok(i < timeout_sec, "BITS jobs timed out\n"); hres = IBackgroundCopyJob_Complete(test_job); ok(hres == S_OK, "IBackgroundCopyJob_Complete\n"); @@ -572,11 +652,22 @@ static void test_HttpOptions(void) ok(state == BG_JOB_STATE_QUEUED || state == BG_JOB_STATE_CONNECTING || state == BG_JOB_STATE_TRANSFERRING || - state == BG_JOB_STATE_TRANSFERRED, "unexpected state: %u\n", state); + state == BG_JOB_STATE_TRANSFERRED || + state == BG_JOB_STATE_TRANSIENT_ERROR, "unexpected state: %u\n", state); + + if (state == BG_JOB_STATE_TRANSIENT_ERROR) { + hr = IBackgroundCopyJob_Resume(test_job); + ok(hr == S_OK, "IBackgroundCopyJob_Resume\n"); + } if (state == BG_JOB_STATE_TRANSFERRED) break; Sleep(1000); } + + if (state == BG_JOB_STATE_ERROR || state == BG_JOB_STATE_TRANSIENT_ERROR) + handle_job_err(); + + ok(i < timeout, "BITS job timed out\n"); if (i < timeout) { @@ -651,10 +742,28 @@ START_TEST(job) }; const test_t *test; int i; + HRESULT hres; init_paths(); - CoInitialize(NULL); + /* CoInitializeEx and CoInitializeSecurity with RPC_C_IMP_LEVEL_IMPERSONATE + * are required to set the job transfer policy + * See https://docs.microsoft.com/en-us/windows/win32/bits/how-to-block-a-bits-job… + */ + hres = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + if (FAILED(hres)) { + ok(0, "CoInitializeEx faied: %0x\n", hres); + return; + } + + hres = CoInitializeSecurity(NULL, -1, NULL, NULL, + RPC_C_AUTHN_LEVEL_CONNECT, + RPC_C_IMP_LEVEL_IMPERSONATE, + NULL, EOAC_NONE, 0); + if (FAILED(hres)) { + ok(0, "CoInitializeSecurity failed: %0x\n", hres); + return; + } if (FAILED(test_create_manager())) { diff --git a/include/Makefile.in b/include/Makefile.in index 23306689cab..b2c8ba7f987 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -50,6 +50,7 @@ SOURCES = \ bits2_0.idl \ bits2_5.idl \ bits3_0.idl \ + bits5_0.idl \ bitsmsg.h \ bluetoothapis.h \ bthsdpdef.h \ diff --git a/include/bits5_0.idl b/include/bits5_0.idl new file mode 100644 index 00000000000..30b4e4bbe37 --- /dev/null +++ b/include/bits5_0.idl @@ -0,0 +1,36 @@ +#ifndef DO_NO_IMPORTS +import "bits.idl"; +import "bits2_0.idl"; +import "bits3_0.idl"; +#endif + +cpp_quote("#define BITS_COST_STATE_TRANSFER_ALWAYS 0x800000ff") + +[ + uuid(e847030c-bbba-4657-af6d-484aa42bf1fe), + odl +] +interface IBackgroundCopyJob5: IBackgroundCopyJob4 +{ + typedef enum { + BITS_JOB_PROPERTY_ID_COST_FLAGS = 1, + BITS_JOB_PROPERTY_NOTIFICATION_CLSID = 2, + BITS_JOB_PROPERTY_DYNAMIC_CONTENT = 3, + BITS_JOB_PROPERTY_HIGH_PERFORMANCE = 4, + BITS_JOB_PROPERTY_MAX_DOWNLOAD_SIZE = 5, + BITS_JOB_PROPERTY_USE_STORED_CREDENTIALS = 7, + BITS_JOB_PROPERTY_MINIMUM_NOTIFICATION_INTERVAL_MS = 9, + BITS_JOB_PROPERTY_ON_DEMAND_MODE = 10, + } BITS_JOB_PROPERTY_ID; + + typedef union _BITS_JOB_PROPERTY_VALUE { + DWORD Dword; + GUID ClsID; + BOOL Enable; + UINT64 Uint64; + BG_AUTH_TARGET Target; + } BITS_JOB_PROPERTY_VALUE; + + HRESULT SetProperty(BITS_JOB_PROPERTY_ID id, BITS_JOB_PROPERTY_VALUE value); + HRESULT GetProperty(BITS_JOB_PROPERTY_ID id, [out, ref] BITS_JOB_PROPERTY_VALUE *value); +} -- 2.29.1

3 2

[PATCH 1/3] ntdll: Don't check "info" for NULL in NtQuerySystemInformation(SystemModuleInformation).
by Zebediah Figura 26 Oct '20

26 Oct '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/unix/system.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 6ff277c2d0c..7ac084a9899 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2333,30 +2333,27 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, "\\SystemRoot\\system32\\drivers\\mountmgr.sys" }; - if (!info) ret = STATUS_ACCESS_VIOLATION; - else - { - ULONG i; - SYSTEM_MODULE_INFORMATION *smi = info; + ULONG i; + SYSTEM_MODULE_INFORMATION *smi = info; - len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] ); - if (len <= size) + len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] ); + if (len <= size) + { + memset( smi, 0, len ); + for (i = 0; i < ARRAY_SIZE(fake_modules); i++) { - memset( smi, 0, len ); - for (i = 0; i < ARRAY_SIZE(fake_modules); i++) - { - SYSTEM_MODULE *sm = &smi->Modules[i]; - sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; - sm->ImageSize = 0x200000; - sm->LoadOrderIndex = i; - sm->LoadCount = 1; - strcpy( (char *)sm->Name, fake_modules[i] ); - sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1; - } - smi->ModulesCount = i; + SYSTEM_MODULE *sm = &smi->Modules[i]; + sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; + sm->ImageSize = 0x200000; + sm->LoadOrderIndex = i; + sm->LoadCount = 1; + strcpy( (char *)sm->Name, fake_modules[i] ); + sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1; } - else ret = STATUS_INFO_LENGTH_MISMATCH; + smi->ModulesCount = i; } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; } -- 2.28.0

1 2

[PATCH] wmp: Use wide-char string literals.
by Michael Stefaniuc 26 Oct '20

26 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmp/oleobj.c | 6 ++--- dlls/wmp/player.c | 29 ++++++++++-------------- dlls/wmp/tests/media.c | 49 ++++++++++++++++------------------------- dlls/wmp/tests/oleobj.c | 8 +++---- 4 files changed, 36 insertions(+), 56 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index cbbd965c38b..04a9f204639 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -95,13 +95,11 @@ static ATOM wmp_class; static BOOL WINAPI register_wmp_class(INIT_ONCE *once, void *param, void **context) { - /* It seems that native uses ATL for this. We use a fake name to make tests happy. */ - static const WCHAR atl_wmpW[] = {'A','T','L',':','W','M','P',0}; - static WNDCLASSEXW wndclass = { sizeof(wndclass), CS_DBLCLKS, wmp_wnd_proc, 0, 0, NULL, NULL, NULL, NULL, NULL, - atl_wmpW, NULL + /* It seems that native uses ATL for this. We use a fake name to make tests happy. */ + L"ATL:WMP", NULL }; wndclass.hInstance = wmp_instance; diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index f9df561d2be..1da81b17a26 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -28,8 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); static ATOM player_msg_class; static INIT_ONCE class_init_once; static UINT WM_WMPEVENT; -static const WCHAR WMPmessageW[] = {'_', 'W', 'M', 'P', 'M','e','s','s','a','g','e',0}; -static const WCHAR emptyW[] = {0}; static void update_state(WindowsMediaPlayer *wmp, LONG type, LONG state) { @@ -142,7 +140,7 @@ static HRESULT WINAPI WMPPlayer4_get_URL(IWMPPlayer4 *iface, BSTR *url) TRACE("(%p)->(%p)\n", This, url); if (!This->media) - return return_bstr(emptyW, url); + return return_bstr(L"", url); return return_bstr(This->media->url, url); } @@ -258,7 +256,6 @@ static HRESULT WINAPI WMPPlayer4_get_playlistCollection(IWMPPlayer4 *iface, IWMP static HRESULT WINAPI WMPPlayer4_get_versionInfo(IWMPPlayer4 *iface, BSTR *version) { - static const WCHAR versionW[] = {'1','2','.','0','.','7','6','0','1','.','1','6','9','8','2',0}; WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); TRACE("(%p)->(%p)\n", This, version); @@ -266,7 +263,7 @@ static HRESULT WINAPI WMPPlayer4_get_versionInfo(IWMPPlayer4 *iface, BSTR *versi if (!version) return E_POINTER; - return return_bstr(versionW, version); + return return_bstr(L"12.0.7601.16982", version); } static HRESULT WINAPI WMPPlayer4_launchURL(IWMPPlayer4 *iface, BSTR url) @@ -1447,11 +1444,10 @@ static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMembe static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrItem), pIsAvailable); if (!This->filter_graph) { *pIsAvailable = VARIANT_FALSE; - } else if (wcscmp(currentPosition, bstrItem) == 0) { + } else if (wcscmp(L"currentPosition", bstrItem) == 0) { DWORD capabilities; IMediaSeeking_GetCapabilities(This->media_seeking, &capabilities); *pIsAvailable = (capabilities & AM_SEEKING_CanSeekAbsolute) ? @@ -2202,12 +2198,12 @@ static BOOL WINAPI register_player_msg_class(INIT_ONCE *once, void *param, void static WNDCLASSEXW wndclass = { sizeof(wndclass), CS_DBLCLKS, player_wnd_proc, 0, 0, NULL, NULL, NULL, NULL, NULL, - WMPmessageW, NULL + L"_WMPMessage", NULL }; wndclass.hInstance = wmp_instance; player_msg_class = RegisterClassExW(&wndclass); - WM_WMPEVENT= RegisterWindowMessageW(WMPmessageW); + WM_WMPEVENT= RegisterWindowMessageW(L"_WMPMessage"); return TRUE; } @@ -2220,7 +2216,6 @@ BOOL init_player(WindowsMediaPlayer *wmp) { IWMPPlaylist *playlist; BSTR name; - static const WCHAR nameW[] = {'P','l','a','y','l','i','s','t','1',0}; InitOnceExecuteOnce(&class_init_once, register_player_msg_class, NULL, NULL); wmp->msg_window = CreateWindowW( MAKEINTRESOURCEW(player_msg_class), NULL, 0, 0, @@ -2240,7 +2235,7 @@ BOOL init_player(WindowsMediaPlayer *wmp) wmp->IWMPControls_iface.lpVtbl = &WMPControlsVtbl; wmp->IWMPNetwork_iface.lpVtbl = &WMPNetworkVtbl; - name = SysAllocString(nameW); + name = SysAllocString(L"Playlist1"); if (SUCCEEDED(create_playlist(name, NULL, 0, &playlist))) wmp->playlist = unsafe_impl_from_IWMPPlaylist(playlist); else @@ -2285,7 +2280,7 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) IUri *uri; BSTR path; HRESULT hr; - WCHAR *name_dup, slashW[] = {'/',0}; + WCHAR *name_dup; media = heap_alloc_zero(sizeof(*media)); if (!media) @@ -2317,7 +2312,7 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) /* GetPath() will return "/" for invalid uri's * only strip extension when uri is valid */ - if (wcscmp(path, slashW) != 0) + if (wcscmp(path, L"/") != 0) PathRemoveExtensionW(name_dup); PathStripPathW(name_dup); @@ -2328,8 +2323,8 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) } else { - media->url = heap_strdupW(emptyW); - media->name = heap_strdupW(emptyW); + media->url = heap_strdupW(L""); + media->name = heap_strdupW(L""); } media->duration = duration; @@ -2353,8 +2348,8 @@ HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlayli return E_OUTOFMEMORY; playlist->IWMPPlaylist_iface.lpVtbl = &WMPPlaylistVtbl; - playlist->url = url ? heap_strdupW(url) : heap_strdupW(emptyW); - playlist->name = name ? heap_strdupW(name) : heap_strdupW(emptyW); + playlist->url = heap_strdupW(url ? url : L""); + playlist->name = heap_strdupW(name ? name : L""); playlist->ref = 1; playlist->count = count; diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 65038364ede..fa6cb6490f1 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -67,8 +67,8 @@ static HANDLE playing_event; static HANDLE completed_event; static DWORD main_thread_id; -static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; -static const WCHAR mp3file1s[] = {'t','e','s','t','1','s','.','m','p','3',0}; +static const WCHAR mp3file[] = L"test.mp3"; +static const WCHAR mp3file1s[] = L"test1s.mp3"; static inline WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -308,7 +308,6 @@ static BOOL test_wmp(void) VARIANT_BOOL vbool; LONG progress; IWMPMedia *media; - static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; BSTR bstrcurrentPosition; hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); @@ -344,7 +343,7 @@ static BOOL test_wmp(void) ok(hres == S_OK, "get_controls failed: %08x\n", hres); ok(controls != NULL, "controls = NULL\n"); - bstrcurrentPosition = SysAllocString(currentPosition); + bstrcurrentPosition = SysAllocString(L"currentPosition"); hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); ok(vbool == VARIANT_FALSE, "unexpected value\n"); @@ -487,16 +486,6 @@ playback_skip: static void test_media_item(void) { - static const WCHAR slashW[] = {'\\',0}; - static const WCHAR testW[] = {'t','e','s','t',0}; - static const WCHAR fooW[] = {'f','o','o',':','/','/',0}; - static const WCHAR fileW[] = {'f','i','l','e',':','/','/','/',0}; - static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; - static const WCHAR httpsW[] = {'h','t','t','p','s',':','/','/',0}; - static const WCHAR invalidurlW[] = {'i','n','v','a','l','i','d','_','u','r','l',0}; - static const WCHAR invalidurlmp3W[] = {'i','n','v','a','l','i','d','_','u','r','l','.','m','p','3',0}; - static const WCHAR winehqurlW[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', - '/','t','e','s','t','s','/','t','e','s','t','.','m','p','3',0}; static WCHAR pathW[MAX_PATH]; static WCHAR currentdirW[MAX_PATH]; struct { @@ -504,17 +493,17 @@ static void test_media_item(void) const WCHAR *filename; const WCHAR *expected; } tests[] = { - { NULL, invalidurlmp3W, invalidurlW }, - { currentdirW, mp3file, testW }, - { currentdirW, invalidurlmp3W, invalidurlW }, - { httpW, winehqurlW, testW }, - { httpW, invalidurlmp3W, invalidurlmp3W }, - { httpsW, winehqurlW, testW }, - { httpsW, invalidurlmp3W, invalidurlmp3W }, - { fileW, mp3file, testW }, - { fileW, invalidurlmp3W, invalidurlW }, - { fooW, mp3file, mp3file }, - { fooW, invalidurlmp3W, invalidurlmp3W } + { NULL, L"invalid_url.mp3", L"invalid_url" }, + { currentdirW, mp3file, L"test" }, + { currentdirW, L"invalid_url.mp3", L"invalid_url" }, + { L"http://", L"test.winehq.org/tests/test.mp3", L"test" }, + { L"http://", L"invalid_url.mp3", L"invalid_url.mp3" }, + { L"https://", L"test.winehq.org/tests/test.mp3", L"test" }, + { L"https://", L"invalid_url.mp3", L"invalid_url.mp3" }, + { L"file:///", mp3file, L"test" }, + { L"file:///", L"invalid_url.mp3", L"invalid_url" }, + { L"foo://", mp3file, mp3file }, + { L"foo://", L"invalid_url.mp3", L"invalid_url.mp3" } }; IWMPMedia *media, *media2; IWMPPlayer4 *player; @@ -570,13 +559,13 @@ static void test_media_item(void) SysFreeString(str); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); - ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"test"), "Expected %s, got %s\n", wine_dbgstr_w(L"test"), wine_dbgstr_w(str)); SysFreeString(str); hr = IWMPMedia_put_name(media, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); - ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"test"), "Expected %s, got %s\n", wine_dbgstr_w(L"test"), wine_dbgstr_w(str)); SysFreeString(str); hr = IWMPPlayer4_put_currentMedia(player, media); @@ -588,12 +577,12 @@ static void test_media_item(void) ok(media2 != NULL, "Unexpected media instance.\n"); hr = IWMPMedia_get_name(media2, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); - ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"test"), "Expected %s, got %s\n", wine_dbgstr_w(L"test"), wine_dbgstr_w(str)); SysFreeString(str); IWMPMedia_Release(media2); GetCurrentDirectoryW(ARRAY_SIZE(currentdirW), currentdirW); - lstrcatW(currentdirW, slashW); + lstrcatW(currentdirW, L"\\"); for (i=0; i<ARRAY_SIZE(tests); i++) { @@ -671,7 +660,7 @@ static void test_playlist(void) HRESULT hr; BSTR str, str2; LONG count; - static const WCHAR nameW[] = {'P','l','a','y','l','i','s','t','1',0}; + static const WCHAR nameW[] = L"Playlist1"; hr = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IWMPPlayer4, (void **)&player); if (hr == REGDB_E_CLASSNOTREG) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index aaeb2aa82d9..80f078e62f5 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -70,7 +70,7 @@ DEFINE_EXPECT(GetWindowContext); DEFINE_EXPECT(ShowObject); DEFINE_EXPECT(OnShowWindow_FALSE); -static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; +static const WCHAR mp3file[] = L"test.mp3"; static inline WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -1372,19 +1372,17 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam static void create_container_window(void) { - static const WCHAR wmp_testW[] = - {'W','M','P','T','e','s','t',0}; static WNDCLASSEXW wndclass = { sizeof(WNDCLASSEXW), 0, wnd_proc, 0, 0, NULL, NULL, NULL, NULL, NULL, - wmp_testW, + L"WMPTest", NULL }; RegisterClassExW(&wndclass); - container_hwnd = CreateWindowW(wmp_testW, wmp_testW, + container_hwnd = CreateWindowW(L"WMPTest", L"WMPTest", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 515, 530, NULL, NULL, NULL, NULL); ShowWindow(container_hwnd, SW_SHOW); -- 2.26.2

1 0

[PATCH 2/2] vbscript: Support properties with parameters.
by Robert Wilhelm 26 Oct '20

26 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/parser.y | 6 ++--- dlls/vbscript/tests/lang.vbs | 21 +++++++++++++++++ dlls/vbscript/vbdisp.c | 45 ++++++++++++++++++++++++++---------- 3 files changed, 57 insertions(+), 15 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 942e76459c2..d1af9a8c84b 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -452,11 +452,11 @@ ClassBody | PropertyDecl StSep ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } PropertyDecl - : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY + : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 570bb7fbcb3..d9fcf4c6598 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1757,6 +1757,27 @@ class TestPropSyntax end property end class +Class TestPropParam + Public oDict + Public Property Let Key(oldKey, newKey) + oDict =oldKey & newKey + End Property + Public Property Let three(uno,due,tre) + oDict =uno & due & tre + End Property + Public Property Let ten(a,b,c,d,e,f,g,h,i,j) + oDict =a & b & c & d & e & f & g & h & i & j + End Property +End Class + +Set x = new TestPropParam +x.key("old") = "new" +call ok(x.oDict = "oldnew","x.oDict = " & x.oDict & " expected oldnew") +x.three(1,2) = 3 +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +x.ten(1,2,3,4,5,6,7,8,9) = 0 +call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") + set x = new TestPropSyntax set x.prop = new TestPropSyntax set x.prop.prop = new TestPropSyntax diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 5f493d420bd..75b7badc5c7 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -78,7 +78,7 @@ HRESULT vbdisp_get_id(vbdisp_t *This, BSTR name, vbdisp_invoke_type_t invoke_typ return DISP_E_UNKNOWNNAME; } -static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD flags, VARIANT *v, BOOL *is_owned) +static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD flags, VARIANT *v, BOOL *is_owned, INT *index) { unsigned i; @@ -88,9 +88,11 @@ static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD fla } if(i == dp->cNamedArgs) { WARN("no value to set\n"); + *index=-1; return DISP_E_PARAMNOTOPTIONAL; } + *index = i; *v = dp->rgvarg[i]; if(V_VT(v) == (VT_VARIANT|VT_BYREF)) *v = *V_VARIANTREF(v); @@ -134,8 +136,9 @@ static HRESULT invoke_variant_prop(script_ctx_t *ctx, VARIANT *v, WORD flags, DI case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { VARIANT put_val; BOOL own_val; + INT index; - hres = get_propput_arg(ctx, dp, flags, &put_val, &own_val); + hres = get_propput_arg(ctx, dp, flags, &put_val, &own_val, &index); if(FAILED(hres)) return hres; @@ -197,28 +200,46 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { DISPPARAMS dp = {NULL, NULL, 1, 0}; BOOL needs_release; - VARIANT put_val; + VARIANT buf[6]; HRESULT hres; - - if(arg_cnt(params)) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + INT index,i,j; + + dp.cArgs = arg_cnt(params) + 1; + if(dp.cArgs > ARRAY_SIZE(buf)) { + dp.rgvarg = heap_alloc(dp.cArgs*sizeof(VARIANT)); + if(!dp.rgvarg) + return E_OUTOFMEMORY; + }else { + dp.rgvarg = buf; } - hres = get_propput_arg(This->desc->ctx, params, flags, &put_val, &needs_release); - if(FAILED(hres)) + hres = get_propput_arg(This->desc->ctx, params, flags, dp.rgvarg, &needs_release, &index); + if(FAILED(hres)) { + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; + } - dp.rgvarg = &put_val; - func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + func = This->desc->funcs[id].entries[V_VT(dp.rgvarg) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; if(!func) { FIXME("no letter/setter\n"); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return DISP_E_MEMBERNOTFOUND; } + for( i=1,j=0; i<dp.cArgs;i++,j++) { + if (j==index) { + j++; + } + dp.rgvarg[i]=params->rgvarg[j]; + } + hres = exec_script(This->desc->ctx, extern_caller, func, This, &dp, NULL); if(needs_release) - VariantClear(&put_val); + VariantClear(dp.rgvarg); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; } default: -- 2.26.2

1 0

[PATCH v3 1/5] winegstreamer: Insert videoconvert into decoded-video streams.
by Derek Lesho 26 Oct '20

26 Oct '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 124 ++++++++++++++++++++++++++---- 1 file changed, 110 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5f3c43a0204..cbee412030d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -384,6 +384,43 @@ static const IMFMediaStreamVtbl media_stream_vtbl = media_stream_RequestSample }; +/* Setup a chain of elements which should hopefully allow transformations to any IMFMediaType + the user throws at us through gstreamer's caps negotiation. */ +static HRESULT media_stream_connect_to_sink(struct media_stream *stream) +{ + GstCaps *source_caps = gst_pad_query_caps(stream->their_src, NULL); + const gchar *stream_type; + + if (!source_caps) + return E_FAIL; + + stream_type = gst_structure_get_name(gst_caps_get_structure(source_caps, 0)); + gst_caps_unref(source_caps); + + if (!strcmp(stream_type, "video/x-raw")) + { + GstElement *videoconvert = gst_element_factory_make("videoconvert", NULL); + + gst_bin_add(GST_BIN(stream->parent_source->container), videoconvert); + + stream->my_sink = gst_element_get_static_pad(videoconvert, "sink"); + + if (!gst_element_link(videoconvert, stream->appsink)) + return E_FAIL; + + gst_element_sync_state_with_parent(videoconvert); + } + else + { + stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink"); + } + + if (gst_pad_link(stream->their_src, stream->my_sink) != GST_PAD_LINK_OK) + return E_FAIL; + + return S_OK; +} + static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD stream_id, struct media_stream **out_stream) { struct media_stream *object = heap_alloc_zero(sizeof(*object)); @@ -414,8 +451,8 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD g_object_set(object->appsink, "sync", FALSE, NULL); g_object_set(object->appsink, "max-buffers", 5, NULL); - object->my_sink = gst_element_get_static_pad(object->appsink, "sink"); - gst_pad_link(object->their_src, object->my_sink); + if (FAILED(hr = media_stream_connect_to_sink(object))) + goto fail; gst_element_sync_state_with_parent(object->appsink); @@ -435,28 +472,87 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); IMFMediaTypeHandler *type_handler; + IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; + DWORD type_count = 0; + const gchar *major_type; + unsigned int i; HRESULT hr; - stream_type = mf_media_type_from_caps(current_caps); - gst_caps_unref(current_caps); - if (!stream_type) - return E_FAIL; + major_type = gst_structure_get_name(gst_caps_get_structure(current_caps, 0)); + + if (!strcmp(major_type, "video/x-raw")) + { + /* These are the most common native output types of decoders: https://docs.microsoft.com/en-us/windows/win32/medfound/mft-decoder-expose-… */ + static const GUID * video_types[] = + { + &MFVideoFormat_NV12, + &MFVideoFormat_YV12, + &MFVideoFormat_YUY2, + &MFVideoFormat_IYUV, + &MFVideoFormat_I420, + }; - hr = MFCreateStreamDescriptor(stream->stream_id, 1, &stream_type, &stream->descriptor); + IMFMediaType *base_type = mf_media_type_from_caps(current_caps); + GUID base_subtype; - IMFMediaType_Release(stream_type); + IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); - if (FAILED(hr)) - return hr; + stream_types = heap_alloc( sizeof(IMFMediaType *) * ARRAY_SIZE(video_types) + 1); - if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) - return hr; + stream_types[0] = base_type; + type_count = 1; - hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_type); + for (i = 0; i < ARRAY_SIZE(video_types); i++) + { + IMFMediaType *new_type; - IMFMediaTypeHandler_Release(type_handler); + if (IsEqualGUID(&base_subtype, video_types[i])) + continue; + if (FAILED(hr = MFCreateMediaType(&new_type))) + goto done; + stream_types[type_count++] = new_type; + + if (FAILED(hr = IMFMediaType_CopyAllItems(base_type, (IMFAttributes *) new_type))) + goto done; + if (FAILED(hr = IMFMediaType_SetGUID(new_type, &MF_MT_SUBTYPE, video_types[i]))) + goto done; + } + } + else + { + stream_type = mf_media_type_from_caps(current_caps); + if (stream_type) + { + stream_types = &stream_type; + type_count = 1; + } + } + + if (!type_count) + { + ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); + return E_FAIL; + } + + if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor))) + goto done; + + if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) + goto done; + + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + goto done; + +done: + gst_caps_unref(current_caps); + if (type_handler) + IMFMediaTypeHandler_Release(type_handler); + for (i = 0; i < type_count; i++) + IMFMediaType_Release(stream_types[i]); + if (stream_types != &stream_type) + heap_free(stream_types); return hr; } -- 2.28.0

5 18

[PATCH v6 4/5] winegstreamer: Implement IMFMediaSource::Start.
by Derek Lesho 26 Oct '20

26 Oct '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v6: Remove unused variable declarations. --- dlls/mfplat/tests/mfplat.c | 8 +- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 306 +++++++++++++++++++++++++++++- dlls/winegstreamer/mfplat.c | 130 +++++++++++++ 4 files changed, 437 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 81d09694dae..ceabbd09d0d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -603,10 +603,7 @@ todo_wine var.vt = VT_EMPTY; hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); -todo_wine ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); - if (FAILED(hr)) - goto skip_source_tests; get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); @@ -624,10 +621,13 @@ todo_wine hr = IMFMediaStream_RequestSample(video_stream, NULL); if (i == sample_count) break; +todo_wine ok(hr == S_OK, "Failed to request sample %u, hr %#x.\n", i + 1, hr); if (hr != S_OK) break; } + if (FAILED(hr)) + goto skip_source_tests; for (i = 0; i < sample_count; ++i) { @@ -665,11 +665,11 @@ todo_wine hr = IMFMediaStream_RequestSample(video_stream, NULL); ok(hr == MF_E_END_OF_STREAM, "Unexpected hr %#x.\n", hr); - IMFMediaStream_Release(video_stream); get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); skip_source_tests: + IMFMediaStream_Release(video_stream); IMFMediaTypeHandler_Release(handler); IMFPresentationDescriptor_Release(descriptor); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 60b38a48f5a..07556802a51 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -57,6 +57,7 @@ extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) DECLSPEC_HIDDEN; +GstCaps *caps_from_mf_media_type(IMFMediaType *type) DECLSPEC_HIDDEN; HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 9b2c2174318..ac71f7cf92c 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -55,14 +55,38 @@ struct media_stream { STREAM_INACTIVE, STREAM_SHUTDOWN, + STREAM_RUNNING, } state; DWORD stream_id; }; +enum source_async_op +{ + SOURCE_ASYNC_START, +}; + +struct source_async_command +{ + IUnknown IUnknown_iface; + LONG refcount; + enum source_async_op op; + union + { + struct + { + IMFPresentationDescriptor *descriptor; + GUID format; + PROPVARIANT position; + } start; + } u; +}; + struct media_source { IMFMediaSource IMFMediaSource_iface; + IMFAsyncCallback async_commands_callback; LONG ref; + DWORD async_commands_queue; IMFMediaEventQueue *event_queue; IMFByteStream *byte_stream; struct media_stream **streams; @@ -76,6 +100,7 @@ struct media_source { SOURCE_OPENING, SOURCE_STOPPED, + SOURCE_RUNNING, SOURCE_SHUTDOWN, } state; HANDLE no_more_pads_event; @@ -91,7 +116,259 @@ static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *ifac return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface); } -static GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 ofs, guint len, +static inline struct media_source *impl_from_async_commands_callback_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct media_source, async_commands_callback); +} + +static inline struct source_async_command *impl_from_async_command_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct source_async_command, IUnknown_iface); +} + +static HRESULT WINAPI source_async_command_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI source_async_command_AddRef(IUnknown *iface) +{ + struct source_async_command *command = impl_from_async_command_IUnknown(iface); + return InterlockedIncrement(&command->refcount); +} + +static ULONG WINAPI source_async_command_Release(IUnknown *iface) +{ + struct source_async_command *command = impl_from_async_command_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&command->refcount); + + if (!refcount) + { + if (command->op == SOURCE_ASYNC_START) + PropVariantClear(&command->u.start.position); + heap_free(command); + } + + return refcount; +} + +static const IUnknownVtbl source_async_command_vtbl = +{ + source_async_command_QueryInterface, + source_async_command_AddRef, + source_async_command_Release, +}; + +static HRESULT source_create_async_op(enum source_async_op op, struct source_async_command **ret) +{ + struct source_async_command *command; + + if (!(command = heap_alloc_zero(sizeof(*command)))) + return E_OUTOFMEMORY; + + command->IUnknown_iface.lpVtbl = &source_async_command_vtbl; + command->op = op; + + *ret = command; + + return S_OK; +} + +static HRESULT WINAPI callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI callback_GetParameters(IMFAsyncCallback *iface, + DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI source_async_commands_callback_AddRef(IMFAsyncCallback *iface) +{ + struct media_source *source = impl_from_async_commands_callback_IMFAsyncCallback(iface); + return IMFMediaSource_AddRef(&source->IMFMediaSource_iface); +} + +static ULONG WINAPI source_async_commands_callback_Release(IMFAsyncCallback *iface) +{ + struct media_source *source = impl_from_async_commands_callback_IMFAsyncCallback(iface); + return IMFMediaSource_Release(&source->IMFMediaSource_iface); +} + +static IMFStreamDescriptor *stream_descriptor_from_id(IMFPresentationDescriptor *pres_desc, DWORD id, BOOL *selected) +{ + ULONG sd_count; + IMFStreamDescriptor *ret; + unsigned int i; + + if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorCount(pres_desc, &sd_count))) + return NULL; + + for (i = 0; i < sd_count; i++) + { + DWORD stream_id; + + if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(pres_desc, i, selected, &ret))) + return NULL; + + if (SUCCEEDED(IMFStreamDescriptor_GetStreamIdentifier(ret, &stream_id)) && stream_id == id) + return ret; + + IMFStreamDescriptor_Release(ret); + } + return NULL; +} + +static void start_pipeline(struct media_source *source, struct source_async_command *command) +{ + PROPVARIANT *position = &command->u.start.position; + BOOL seek_message = source->state != SOURCE_STOPPED && position->vt != VT_EMPTY; + GstStateChangeReturn ret; + unsigned int i; + + gst_element_set_state(source->container, GST_STATE_PAUSED); + ret = gst_element_get_state(source->container, NULL, NULL, -1); + assert(ret == GST_STATE_CHANGE_SUCCESS); + + /* seek to beginning on stop->play */ + if (source->state == SOURCE_STOPPED && position->vt == VT_EMPTY) + { + position->vt = VT_I8; + position->u.hVal.QuadPart = 0; + } + + for (i = 0; i < source->stream_count; i++) + { + struct media_stream *stream; + IMFStreamDescriptor *sd; + IMFMediaTypeHandler *mth; + IMFMediaType *current_mt; + GstCaps *current_caps; + GstCaps *prev_caps; + DWORD stream_id; + BOOL was_active; + BOOL selected; + + stream = source->streams[i]; + + IMFStreamDescriptor_GetStreamIdentifier(stream->descriptor, &stream_id); + + sd = stream_descriptor_from_id(command->u.start.descriptor, stream_id, &selected); + IMFStreamDescriptor_Release(sd); + + was_active = stream->state != STREAM_INACTIVE; + + stream->state = selected ? STREAM_RUNNING : STREAM_INACTIVE; + + if (selected) + { + IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &mth); + IMFMediaTypeHandler_GetCurrentMediaType(mth, &current_mt); + current_caps = caps_from_mf_media_type(current_mt); + g_object_get(stream->appsink, "caps", &prev_caps, NULL); + if (!gst_caps_is_equal(prev_caps, current_caps)) + { + GstEvent *reconfigure_event = gst_event_new_reconfigure(); + g_object_set(stream->appsink, "caps", current_caps, NULL); + gst_pad_push_event(gst_element_get_static_pad(stream->appsink, "sink"), reconfigure_event); + } + + gst_caps_unref(current_caps); + gst_caps_unref(prev_caps); + IMFMediaType_Release(current_mt); + IMFMediaTypeHandler_Release(mth); + } + + g_object_set(stream->appsink, "drop", !selected, NULL); + + if (position->vt != VT_EMPTY) + { + GstEvent *seek_event = gst_event_new_seek(1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, + GST_SEEK_TYPE_SET, position->u.hVal.QuadPart / 100, GST_SEEK_TYPE_NONE, 0); + + gst_pad_push_event(stream->my_sink, seek_event); + } + + if (selected) + { + TRACE("Stream %u (%p) selected\n", i, stream); + IMFMediaEventQueue_QueueEventParamUnk(source->event_queue, + was_active ? MEUpdatedStream : MENewStream, &GUID_NULL, + S_OK, (IUnknown*) &stream->IMFMediaStream_iface); + + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, + seek_message ? MEStreamSeeked : MEStreamStarted, &GUID_NULL, S_OK, position); + } + } + + IMFMediaEventQueue_QueueEventParamVar(source->event_queue, + seek_message ? MESourceSeeked : MESourceStarted, + &GUID_NULL, S_OK, position); + + source->state = SOURCE_RUNNING; + + gst_element_set_state(source->container, GST_STATE_PLAYING); +} + +static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct media_source *source = impl_from_async_commands_callback_IMFAsyncCallback(iface); + struct source_async_command *command; + IUnknown *state; + HRESULT hr; + + if (source->state == SOURCE_SHUTDOWN) + return S_OK; + + if (FAILED(hr = IMFAsyncResult_GetState(result, &state))) + return hr; + + command = impl_from_async_command_IUnknown(state); + switch (command->op) + { + case SOURCE_ASYNC_START: + start_pipeline(source, command); + break; + } + + IUnknown_Release(state); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl source_async_commands_callback_vtbl = +{ + callback_QueryInterface, + source_async_commands_callback_AddRef, + source_async_commands_callback_Release, + callback_GetParameters, + source_async_commands_Invoke, +}; + +GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) { struct media_source *source = gst_pad_get_element_private(pad); @@ -683,16 +960,30 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource * } static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, - const GUID *time_format, const PROPVARIANT *start_position) + const GUID *time_format, const PROPVARIANT *position) { struct media_source *source = impl_from_IMFMediaSource(iface); + struct source_async_command *command; + HRESULT hr; - FIXME("(%p)->(%p, %p, %p): stub\n", source, descriptor, time_format, start_position); + TRACE("(%p)->(%p, %p, %p)\n", source, descriptor, time_format, position); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + if (!(IsEqualIID(time_format, &GUID_NULL))) + return MF_E_UNSUPPORTED_TIME_FORMAT; + + if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_START, &command))) + { + command->u.start.descriptor = descriptor; + command->u.start.format = *time_format; + PropVariantCopy(&command->u.start.position, position); + + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, &command->IUnknown_iface); + } + + return hr; } static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) @@ -773,6 +1064,9 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) if (source->no_more_pads_event) CloseHandle(source->no_more_pads_event); + if (source->async_commands_queue) + MFUnlockWorkQueue(source->async_commands_queue); + return S_OK; } @@ -853,6 +1147,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ return E_OUTOFMEMORY; object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; + object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1; object->byte_stream = bytestream; IMFByteStream_AddRef(bytestream); @@ -861,6 +1156,9 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto fail; + if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue))) + goto fail; + object->container = gst_bin_new(NULL); object->bus = gst_bus_new(); gst_bus_set_sync_handler(object->bus, mf_src_bus_watch_wrapper, object, NULL); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 2e8b0978648..46bbb2ac2b1 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -601,3 +601,133 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) return media_type; } + +GstCaps *caps_from_mf_media_type(IMFMediaType *type) +{ + GUID major_type; + GUID subtype; + GstCaps *output = NULL; + + if (FAILED(IMFMediaType_GetMajorType(type, &major_type))) + return NULL; + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return NULL; + + if (IsEqualGUID(&major_type, &MFMediaType_Video)) + { + UINT64 frame_rate = 0, frame_size = 0; + DWORD width, height; + GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN; + GUID subtype_base; + GstVideoInfo info; + unsigned int i; + + if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size))) + return NULL; + width = frame_size >> 32; + height = frame_size; + + output = gst_caps_new_empty_simple("video/x-raw"); + + for (i = 0; i < ARRAY_SIZE(uncompressed_video_formats); i++) + { + if (IsEqualGUID(uncompressed_video_formats[i].subtype, &subtype)) + { + format = uncompressed_video_formats[i].format; + break; + } + } + + subtype_base = subtype; + subtype_base.Data1 = 0; + if (format == GST_VIDEO_FORMAT_UNKNOWN && IsEqualGUID(&MFVideoFormat_Base, &subtype_base)) + format = gst_video_format_from_fourcc(subtype.Data1); + + if (format == GST_VIDEO_FORMAT_UNKNOWN) + { + FIXME("Unrecognized format %s\n", debugstr_guid(&subtype)); + return NULL; + } + + gst_video_info_set_format(&info, format, width, height); + output = gst_video_info_to_caps(&info); + + if (frame_size) + { + gst_caps_set_simple(output, "width", G_TYPE_INT, width, NULL); + gst_caps_set_simple(output, "height", G_TYPE_INT, height, NULL); + } + if (SUCCEEDED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_RATE, &frame_rate))) + { + /* Darksiders: Warmastered Edition uses a MF_MT_FRAME_RATE of 0, + and gstreamer won't accept an undefined number as the framerate. */ + if (!(DWORD32)frame_rate) + frame_rate = 1; + gst_caps_set_simple(output, "framerate", GST_TYPE_FRACTION, frame_rate >> 32, (DWORD32) frame_rate, NULL); + } + return output; + } + else if (IsEqualGUID(&major_type, &MFMediaType_Audio)) + { + DWORD rate, channels, channel_mask, bitrate; + + if (IsEqualGUID(&subtype, &MFAudioFormat_Float)) + { + output = gst_caps_new_empty_simple("audio/x-raw"); + + gst_caps_set_simple(output, "format", G_TYPE_STRING, "F32LE", NULL); + gst_caps_set_simple(output, "layout", G_TYPE_STRING, "interleaved", NULL); + } + else if (IsEqualGUID(&subtype, &MFAudioFormat_PCM)) + { + DWORD bits_per_sample; + + if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &bits_per_sample))) + { + char format[6]; + char type; + + type = bits_per_sample > 8 ? 'S' : 'U'; + + output = gst_caps_new_empty_simple("audio/x-raw"); + + sprintf(format, "%c%u%s", type, bits_per_sample, bits_per_sample > 8 ? "LE" : ""); + + gst_caps_set_simple(output, "format", G_TYPE_STRING, format, NULL); + } + else + { + ERR("Bits per sample not set.\n"); + return NULL; + } + } + else + { + FIXME("Unrecognized subtype %s\n", debugstr_guid(&subtype)); + return NULL; + } + + if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate))) + { + gst_caps_set_simple(output, "rate", G_TYPE_INT, rate, NULL); + } + if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels))) + { + gst_caps_set_simple(output, "channels", G_TYPE_INT, channels, NULL); + } + if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, &channel_mask))) + { + gst_caps_set_simple(output, "channel-mask", GST_TYPE_BITMASK, (guint64) channel_mask, NULL); + } + + if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AVG_BITRATE, &bitrate))) + { + gst_caps_set_simple(output, "bitrate", G_TYPE_INT, bitrate, NULL); + } + + return output; + } + + FIXME("Unrecognized major type %s\n", debugstr_guid(&major_type)); + return NULL; +} -- 2.28.0

3 2