wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Francois Gouget : qasf/tests: Fix a couple of spelling errors in ok() messages.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 778a48edca1194e81aea1439f8c15fa4ece164ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=778a48edca1194e81aea1439… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 22 14:19:15 2020 +0100 qasf/tests: Fix a couple of spelling errors in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 6f6cb77e52..a456891a38 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1835,7 +1835,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); - ok(testdmo_output_mt_set, "Ouput type should be set.\n"); + ok(testdmo_output_mt_set, "Output type should be set.\n"); ok(compare_media_types(&testdmo_output_mt, &req_mt), "Media types didn't match.\n"); test_filter_state(control); @@ -1878,7 +1878,7 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&testsink.sink.pin.mt, &mt2), "Media types didn't match.\n"); - ok(testdmo_output_mt_set, "Ouput type should be set.\n"); + ok(testdmo_output_mt_set, "Output type should be set.\n"); ok(compare_media_types(&testdmo_output_mt, &mt2), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);

1 0

Francois Gouget : iphlpapi/tests: Fix a spelling error in an ok() message.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 8d71e3e8e7874c4d84255418ddbd58eb1c4f90e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d71e3e8e7874c4d84255418… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 22 14:19:07 2020 +0100 iphlpapi/tests: Fix a spelling error in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 77475ca4df..d5690c11ee 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2324,7 +2324,7 @@ static void test_NotifyUnicastIpAddressChange(void) ret = pCancelMibChangeNotify2(handle); ok(ret == NO_ERROR, "Unexpected ret %#x.\n", ret); - ok(!CloseHandle(handle), "CloseHandle() succeded.\n"); + ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } START_TEST(iphlpapi)

1 0

Damjan Jovanovic : shell32: Pass the executable's full path from SHELL_execute() to CreateProcess().
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 9736fe499d0887bf92652ca32ba5195e7b0b0e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9736fe499d0887bf92652ca3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Mar 22 13:46:23 2020 +0200 shell32: Pass the executable's full path from SHELL_execute() to CreateProcess(). Several older Microsoft installers, particularly those changing CDs during installation, break because they launch a child setup.exe, from a parent process also called setup.exe, which Wine finds in the wrong directory, as CreateProcess() first searches the parent executable's own directory, thus re-launching the parent itself instead of the child. Therefore CreateProcess() must be passed a full path from SHELL_execute(), so it launches the correct child. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8439 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 8 ++++++++ dlls/shell32/tests/shlexec.c | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index d3ff821135..ce0b8f6d2b 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1807,6 +1807,14 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; strcpyW(wcmd, wszApplicationName); + if (sei_tmp.lpDirectory) + { + LPCWSTR searchPath[] = { + sei_tmp.lpDirectory, + NULL + }; + PathFindOnPathW(wcmd, searchPath); + } retval = SHELL_quote_and_execute( wcmd, wszParameters, wszEmpty, wszApplicationName, NULL, &sei_tmp, sei, execfunc ); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0b3d0cb18e..b49297bb41 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2842,7 +2842,7 @@ static void test_directory(void) NULL, "test2.exe", params, tmpdir, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); - todo_wine okChildString("argvA0", path); + okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2855,7 +2855,7 @@ static void test_directory(void) NULL, "test2.exe", params, "%TMPDIR%", NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); - todo_wine okChildString("argvA0", path); + okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2872,9 +2872,9 @@ static void test_directory(void) NULL, strrchr(argv0, '\\') + 1, params, tmpdir, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); - todo_wine okChildString("argvA0", path); + okChildString("argvA0", path); okChildString("argvA3", "Exec"); - todo_wine okChildPath("longPath", path); + okChildPath("longPath", path); DeleteFileA(path); }

1 0

Damjan Jovanovic : shell32: Simplify SHELL_execute().
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 06f1f53c4c11c972561de91e76cd5ea6dc5c2ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=06f1f53c4c11c972561de91e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Mar 22 13:46:18 2020 +0200 shell32: Simplify SHELL_execute(). Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 28f2e36f9a..d3ff821135 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1806,26 +1806,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; - len = lstrlenW(wszApplicationName) + 3; - if (sei_tmp.lpParameters[0]) - len += 1 + lstrlenW(wszParameters); - if (len > wcmdLen) - { - wcmd = heap_alloc(len * sizeof(WCHAR)); - wcmdLen = len; - } - wcmd[0] = '\"'; - len = lstrlenW(wszApplicationName); - memcpy(wcmd+1, wszApplicationName, len * sizeof(WCHAR)); - len++; - wcmd[len++] = '\"'; - wcmd[len] = 0; - if (sei_tmp.lpParameters[0]) { - wcmd[len++] = ' '; - strcpyW(wcmd+len, wszParameters); - } - - retval = execfunc(wcmd, NULL, FALSE, &sei_tmp, sei); + strcpyW(wcmd, wszApplicationName); + retval = SHELL_quote_and_execute( wcmd, wszParameters, wszEmpty, + wszApplicationName, NULL, &sei_tmp, + sei, execfunc ); if (retval > 32) { heap_free(wszApplicationName); if (wszParameters != parametersBuffer)

1 0

Damjan Jovanovic : shell32/tests: Test shlexec argv[0], and same-named executables in a different directory.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: fe83877cb320c688130c9599838485f40580adf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe83877cb320c688130c9599… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Mar 22 13:46:15 2020 +0200 shell32/tests: Test shlexec argv[0], and same-named executables in a different directory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8439 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 6d099587d7..0b3d0cb18e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2828,6 +2828,7 @@ static void test_directory(void) NULL, "test2.exe", params, NULL, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); SetCurrentDirectoryA(curdir); @@ -2841,6 +2842,7 @@ static void test_directory(void) NULL, "test2.exe", params, tmpdir, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2853,6 +2855,7 @@ static void test_directory(void) NULL, "test2.exe", params, "%TMPDIR%", NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2861,6 +2864,18 @@ static void test_directory(void) rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, NULL, "test2.exe", params, dirpath, NULL); okShell(rc == SE_ERR_FNF, "returned %lu\n", rc); + + /* Same-named executable in different directory */ + snprintf(path, ARRAY_SIZE(path), "%s%s", tmpdir, strrchr(argv0, '\\')); + CopyFileA(argv0, path, FALSE); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, strrchr(argv0, '\\') + 1, params, tmpdir, NULL); + okShell(rc > 32, "returned %lu\n", rc); + okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); + okChildString("argvA3", "Exec"); + todo_wine okChildPath("longPath", path); + DeleteFileA(path); } START_TEST(shlexec)

1 0

Damjan Jovanovic : shell32/tests: Tmpdir shouldn't end with a backslash.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 971e7e22e069b8421fbd738798bd9fee79efe771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=971e7e22e069b8421fbd7387… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Mar 22 13:46:12 2020 +0200 shell32/tests: Tmpdir shouldn't end with a backslash. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index f6f384bbe0..6d099587d7 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2690,16 +2690,15 @@ static void init_test(void) /* Older versions (win 2k) fail tests if there is a space in the path. */ if (dllver.dwMajorVersion <= 5) - strcpy(filename, "c:\\"); + strcpy(tmpdir, "c:\\"); else - GetTempPathA(sizeof(filename), filename); + GetTempPathA(sizeof(tmpdir), tmpdir); /* In case of a failure it is necessary to show the path that was passed to * ShellExecute(). That means the paths must not be randomized so as not to * prevent the TestBot from detecting new failures. */ - strcpy(tmpdir, filename); - strcat(tmpdir, "\\wtShlexecDir"); + strcat(tmpdir, "wtShlexecDir"); GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir)); DeleteFileA( tmpdir ); rc = CreateDirectoryA( tmpdir, NULL );

1 0

Zebediah Figura : include: Fix the definition of USBD_STATUS_CANCELED.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: b50e79414e1444212d56dcc612aad0fb0e429b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b50e79414e1444212d56dcc6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 21 22:59:11 2020 -0500 include: Fix the definition of USBD_STATUS_CANCELED. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/usb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/usb.h b/include/ddk/usb.h index 0cda6a4e43..0e4c83055b 100644 --- a/include/ddk/usb.h +++ b/include/ddk/usb.h @@ -87,7 +87,6 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_ERROR ((USBD_STATUS)0x80000000) #define USBD_STATUS_HALTED ((USBD_STATUS)0xC0000000) -#define USBD_STATUS_CANCELED ((USBD_STATUS)0x00010000) #define USBD_STATUS_CANCELING ((USBD_STATUS)0x00020000) #define USBD_STATUS_CRC ((USBD_STATUS)0xC0000001) #define USBD_STATUS_BTSTUFF ((USBD_STATUS)0xC0000002) @@ -131,6 +130,7 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_TIMEOUT ((USBD_STATUS)0xC0006000) #define USBD_STATUS_DEVICE_GONE ((USBD_STATUS)0xC0007000) #define USBD_STATUS_STATUS_NOT_MAPPED ((USBD_STATUS)0xC0008000) +#define USBD_STATUS_CANCELED ((USBD_STATUS)0xC0010000) #define USBD_STATUS_ISO_NOT_ACCESSED_BY_HW ((USBD_STATUS)0xC0020000) #define USBD_STATUS_ISO_TD_ERROR ((USBD_STATUS)0xC0030000) #define USBD_STATUS_ISO_NA_LATE_USBPORT ((USBD_STATUS)0xC0040000)

1 0

Zebediah Figura : quartz/tests: Disable some tests that fail intermittently.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 1f201f1165787f4505be129e4db316c4e69761b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f201f1165787f4505be129e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 21 16:35:21 2020 -0500 quartz/tests: Disable some tests that fail intermittently. The value of these tests is not worth having to repeatedly relax timings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 58 ++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f8b80dd23b..ba8271f829 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3152,9 +3152,10 @@ static void test_filter_state(void) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3228,9 +3229,10 @@ static void test_filter_state(void) hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3242,9 +3244,10 @@ static void test_filter_state(void) hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3257,9 +3260,10 @@ static void test_filter_state(void) hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3996,13 +4000,15 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1234 * 10000) < 40 * 10000, - "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(time - 1234 * 10000) < 40 * 10000, + "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1234 * 10000) < 40 * 10000, - "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(current)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(current - 1234 * 10000) < 40 * 10000, + "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 9000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); /* This remains true even if NoFlush is specified. */ @@ -4017,13 +4023,15 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(time - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(current - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); hr = IMediaControl_Pause(control); @@ -4035,13 +4043,15 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(time - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(current - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); hr = IMediaControl_Stop(control);

1 0

Zebediah Figura : quartz/tests: Fix test failures when we can't create a 3D device.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: e417befc153e77a575f0092e46a06fd8288078ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e417befc153e77a575f0092e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 21 16:35:20 2020 -0500 quartz/tests: Fix test failures when we can't create a 3D device. It turns out my prior assumption was incorrect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 1194fd8d17..3e9fccedf1 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2376,11 +2376,14 @@ static IDirect3DDevice9 *create_device(HWND window) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - /* We can expect this to succeed, or we couldn't have created the VMR. */ hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - ok(hr == D3D_OK, "Failed to create a 3D device, hr %#x.\n", hr); IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create a 3D device, hr %#x.\n", hr); + return NULL; + } return device; } @@ -2418,7 +2421,8 @@ static void test_allocate_surface_helper(void) AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); - device = create_device(window); + if (!(device = create_device(window))) + goto out; hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); if (hr == E_NOINTERFACE) @@ -2784,7 +2788,8 @@ static void test_renderless_formats(void) AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); - device = create_device(window); + if (!(device = create_device(window))) + goto out; hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); if (hr == E_NOINTERFACE)

1 0

Zebediah Figura : qasf/tests: Fix a test failure with Windows 2003.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: a336ae8fbbf19780485c12b3383ac6083c8ca9b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a336ae8fbbf19780485c12b3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 21 16:35:19 2020 -0500 qasf/tests: Fix a test failure with Windows 2003. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 50546ec2a8..6f6cb77e52 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1707,7 +1707,7 @@ static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputP todo_wine ok(testsink2->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink2->got_eos); hr = IMemInputPin_Receive(input, sample); - todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_FALSE /* 2003 */ || hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); got_Flush = 0; ok(!testsink->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush);

1 0

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 March 2020