July 2020 - Wine-commits - list.winehq.org

Serge Gautherie : mlang: Fix scripts values in fnIMLangFontLink2_GetScriptFontInfo().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 2dc0758b5d0fe4ef49b7d0635299e5cb9e0360df URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dc0758b5d0fe4ef49b7d063… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Jul 15 17:07:10 2020 +0200 mlang: Fix scripts values in fnIMLangFontLink2_GetScriptFontInfo(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1b1aed370e..e3582cca2d 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3565,7 +3565,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, { if (j >= *puiFonts) break; - pScriptFont[j].scripts = 1 << mlang_data[i].sid; + pScriptFont[j].scripts = (SCRIPT_IDS)1 << mlang_data[i].sid; if (dwFlags == SCRIPTCONTF_FIXED_FONT) { MultiByteToWideChar(CP_ACP, 0, mlang_data[i].fixed_font, -1,

1 0

Alexandre Julliard : ntdll: Avoid buffer underflow in find_dos_device().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 14994715e9337821aeac39c0f43b704bdc7ba200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14994715e9337821aeac39c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 09:14:43 2020 +0200 ntdll: Avoid buffer underflow in find_dos_device(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index b202864e66..08b58ba828 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1924,7 +1924,6 @@ static int find_dos_device( const char *path ) { if ((info[drive].dev == st.st_dev) && (info[drive].ino == st.st_ino)) { - if (len == 1) len = 0; /* preserve root slash in returned path */ TRACE( "%s -> drive %c:, root=%s, name=%s\n", debugstr_a(path), 'A' + drive, debugstr_a(buffer), debugstr_a(path + len)); free( buffer ); @@ -1933,8 +1932,8 @@ static int find_dos_device( const char *path ) } } if (len <= 1) break; /* reached root */ - while (path[len - 1] != '/') len--; - while (path[len - 1] == '/') len--; + while (len > 1 && path[len - 1] != '/') len--; + while (len > 1 && path[len - 1] == '/') len--; buffer[len] = 0; } free( buffer ); @@ -1952,7 +1951,6 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni int letter; if ((status = server_get_unix_name( handle, &unix_name ))) return status; - letter = find_dos_device( unix_name ); free( unix_name );

1 0

Alexandre Julliard : kernelbase: Use FSCTL_GET_OBJECT_ID to compare file identities.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: d1f83537e7f064f0f77ead043617bc213c8c0053 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1f83537e7f064f0f77ead04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 09:14:56 2020 +0200 kernelbase: Use FSCTL_GET_OBJECT_ID to compare file identities. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 9d082f1a64..d9b3440869 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -473,12 +473,12 @@ DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) */ static BOOL is_same_file( HANDLE h1, HANDLE h2 ) { - FILE_ID_INFORMATION id1, id2; + FILE_OBJECTID_BUFFER id1, id2; IO_STATUS_BLOCK io; - return !NtQueryInformationFile( h1, &io, &id1, sizeof(id1), FileIdInformation ) && - !NtQueryInformationFile( h2, &io, &id2, sizeof(id2), FileIdInformation ) && - !memcmp( &id1, &id2, sizeof(FILE_ID_INFORMATION) ); + return (!NtFsControlFile( h1, 0, NULL, NULL, &io, FSCTL_GET_OBJECT_ID, NULL, 0, &id1, sizeof(id1) ) && + !NtFsControlFile( h2, 0, NULL, NULL, &io, FSCTL_GET_OBJECT_ID, NULL, 0, &id2, sizeof(id2) ) && + !memcmp( &id1.ObjectId, &id2.ObjectId, sizeof(id1.ObjectId) )); }

1 0

Alexandre Julliard : ntdll: Use syscall thunks for semaphore functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: bc2164e07487edccc32bff06691d14ab017a3f47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc2164e07487edccc32bff06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:14:26 2020 +0200 ntdll: Use syscall thunks for semaphore functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 16 ++++++++-------- dlls/ntdll/sync.c | 38 -------------------------------------- dlls/ntdll/unix/loader.c | 4 ---- dlls/ntdll/unixlib.h | 9 +-------- 4 files changed, 9 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc2164e07487edccc32b…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for event functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: f4c403d1f2100934c24241b0ed8f4e19cb0ff4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4c403d1f2100934c24241b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:25:43 2020 +0200 ntdll: Use syscall thunks for event functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 28 +++++++++---------- dlls/ntdll/sync.c | 72 ------------------------------------------------ dlls/ntdll/unix/loader.c | 7 ----- dlls/ntdll/unixlib.h | 12 +------- 4 files changed, 15 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4c403d1f2100934c242…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for mutex functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 3f51cb630497621042c0479d8a604d74a837ba3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f51cb630497621042c0479d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:26:27 2020 +0200 ntdll: Use syscall thunks for mutex functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 16 ++++++++-------- dlls/ntdll/sync.c | 42 ------------------------------------------ dlls/ntdll/unix/loader.c | 4 ---- dlls/ntdll/unixlib.h | 9 +-------- 4 files changed, 9 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f51cb630497621042c0…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for job functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 66e6d87ab86c393f189aa8d409b62b3e028ed17e URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e6d87ab86c393f189aa8d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:27:34 2020 +0200 ntdll: Use syscall thunks for job functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 28 ++++++++++---------- dlls/ntdll/sync.c | 68 ------------------------------------------------ dlls/ntdll/unix/loader.c | 7 ----- dlls/ntdll/unixlib.h | 13 +-------- 4 files changed, 15 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=66e6d87ab86c393f189a…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for timer functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: aa08e1541510357f3c3865cc959cc1d60a1b86cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa08e1541510357f3c3865cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:29:25 2020 +0200 ntdll: Use syscall thunks for timer functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 20 ++++++++++---------- dlls/ntdll/sync.c | 48 ------------------------------------------------ dlls/ntdll/unix/loader.c | 5 ----- dlls/ntdll/unixlib.h | 12 +----------- 4 files changed, 11 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa08e1541510357f3c38…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for wait functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 9f8acda1677e90a5f429ef8db739adce700629ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f8acda1677e90a5f429ef8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:30:34 2020 +0200 ntdll: Use syscall thunks for wait functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 20 +++++++++---------- dlls/ntdll/sync.c | 50 ------------------------------------------------ dlls/ntdll/unix/loader.c | 5 ----- dlls/ntdll/unixlib.h | 11 +---------- 4 files changed, 11 insertions(+), 75 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 405fac61e8..0183a10cab 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -191,7 +191,7 @@ @ stdcall -arch=win32,arm64 NtCurrentTeb() # @ stub NtDebugActiveProcess # @ stub NtDebugContinue -@ stdcall NtDelayExecution(long ptr) +@ stdcall -syscall NtDelayExecution(long ptr) @ stdcall NtDeleteAtom(long) # @ stub NtDeleteBootEntry @ stdcall NtDeleteFile(ptr) @@ -401,7 +401,7 @@ @ stdcall NtSetValueKey(long ptr long long ptr long) @ stdcall NtSetVolumeInformationFile(long ptr ptr long long) @ stdcall NtShutdownSystem(long) -@ stdcall NtSignalAndWaitForSingleObject(long long long ptr) +@ stdcall -syscall NtSignalAndWaitForSingleObject(long long long ptr) @ stub NtStartProfile @ stub NtStopProfile @ stdcall NtSuspendProcess(long) @@ -423,16 +423,16 @@ @ stub NtW32Call # @ stub NtWaitForDebugEvent @ stdcall NtWaitForKeyedEvent(long ptr long ptr) -@ stdcall NtWaitForMultipleObjects(long ptr long long ptr) +@ stdcall -syscall NtWaitForMultipleObjects(long ptr long long ptr) @ stub NtWaitForProcessMutant -@ stdcall NtWaitForSingleObject(long long ptr) +@ stdcall -syscall NtWaitForSingleObject(long long ptr) @ stub NtWaitHighEventPair @ stub NtWaitLowEventPair @ stdcall NtWriteFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall NtWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) @ stub NtWriteRequestData @ stdcall NtWriteVirtualMemory(long ptr ptr long ptr) -@ stdcall NtYieldExecution() +@ stdcall -syscall NtYieldExecution() @ stub PfxFindPrefix @ stub PfxInitialize @ stub PfxInsertPrefix @@ -1176,7 +1176,7 @@ # @ stub ZwCreateWaitablePort # @ stub ZwDebugActiveProcess # @ stub ZwDebugContinue -@ stdcall -private ZwDelayExecution(long ptr) NtDelayExecution +@ stdcall -private -syscall ZwDelayExecution(long ptr) NtDelayExecution @ stdcall -private ZwDeleteAtom(long) NtDeleteAtom # @ stub ZwDeleteBootEntry @ stdcall -private ZwDeleteFile(ptr) NtDeleteFile @@ -1385,7 +1385,7 @@ @ stdcall -private ZwSetValueKey(long ptr long long ptr long) NtSetValueKey @ stdcall -private ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile @ stdcall -private ZwShutdownSystem(long) NtShutdownSystem -@ stdcall -private ZwSignalAndWaitForSingleObject(long long long ptr) NtSignalAndWaitForSingleObject +@ stdcall -private -syscall ZwSignalAndWaitForSingleObject(long long long ptr) NtSignalAndWaitForSingleObject @ stub ZwStartProfile @ stub ZwStopProfile @ stdcall -private ZwSuspendProcess(long) NtSuspendProcess @@ -1407,16 +1407,16 @@ @ stub ZwW32Call # @ stub ZwWaitForDebugEvent @ stdcall -private ZwWaitForKeyedEvent(long ptr long ptr) NtWaitForKeyedEvent -@ stdcall -private ZwWaitForMultipleObjects(long ptr long long ptr) NtWaitForMultipleObjects +@ stdcall -private -syscall ZwWaitForMultipleObjects(long ptr long long ptr) NtWaitForMultipleObjects @ stub ZwWaitForProcessMutant -@ stdcall -private ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject +@ stdcall -private -syscall ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject @ stub ZwWaitHighEventPair @ stub ZwWaitLowEventPair @ stdcall -private ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) NtWriteFileGather @ stub ZwWriteRequestData @ stdcall -private ZwWriteVirtualMemory(long ptr ptr long ptr) NtWriteVirtualMemory -@ stdcall -private ZwYieldExecution() NtYieldExecution +@ stdcall -private -syscall ZwYieldExecution() NtYieldExecution @ cdecl -private -arch=i386 _CIcos() @ cdecl -private -arch=i386 _CIlog() @ cdecl -private -arch=i386 _CIpow() diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 6eb328f025..a6666e042e 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -167,56 +167,6 @@ NTSTATUS WINAPI NtSetTimerResolution(IN ULONG resolution, -/* wait operations */ - -/****************************************************************** - * NtWaitForMultipleObjects (NTDLL.@) - */ -NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, - BOOLEAN wait_any, BOOLEAN alertable, - const LARGE_INTEGER *timeout ) -{ - return unix_funcs->NtWaitForMultipleObjects( count, handles, wait_any, alertable, timeout ); -} - - -/****************************************************************** - * NtWaitForSingleObject (NTDLL.@) - */ -NTSTATUS WINAPI NtWaitForSingleObject(HANDLE handle, BOOLEAN alertable, const LARGE_INTEGER *timeout ) -{ - return unix_funcs->NtWaitForSingleObject( handle, alertable, timeout ); -} - - -/****************************************************************** - * NtSignalAndWaitForSingleObject (NTDLL.@) - */ -NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, - BOOLEAN alertable, const LARGE_INTEGER *timeout ) -{ - return unix_funcs->NtSignalAndWaitForSingleObject( signal, wait, alertable, timeout ); -} - - -/****************************************************************** - * NtYieldExecution (NTDLL.@) - */ -NTSTATUS WINAPI NtYieldExecution(void) -{ - return unix_funcs->NtYieldExecution(); -} - - -/****************************************************************** - * NtDelayExecution (NTDLL.@) - */ -NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeout ) -{ - return unix_funcs->NtDelayExecution( alertable, timeout ); -} - - /****************************************************************************** * NtCreateKeyedEvent (NTDLL.@) */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 53c12384e9..d2ebeae935 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1372,7 +1372,6 @@ static struct unix_funcs unix_funcs = NtCreateThreadEx, NtCreateUserProcess, NtCurrentTeb, - NtDelayExecution, NtDeleteFile, NtDeviceIoControlFile, NtDuplicateObject, @@ -1430,7 +1429,6 @@ static struct unix_funcs unix_funcs = NtSetLdtEntries, NtSetSystemTime, NtSetVolumeInformationFile, - NtSignalAndWaitForSingleObject, NtSuspendProcess, NtSuspendThread, NtTerminateProcess, @@ -1438,12 +1436,9 @@ static struct unix_funcs unix_funcs = NtUnlockVirtualMemory, NtUnmapViewOfSection, NtWaitForKeyedEvent, - NtWaitForMultipleObjects, - NtWaitForSingleObject, NtWriteFile, NtWriteFileGather, NtWriteVirtualMemory, - NtYieldExecution, DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, RtlWaitOnAddress, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 5546107d02..9f83b30c40 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 79 +#define NTDLL_UNIXLIB_VERSION 80 struct unix_funcs { @@ -67,7 +67,6 @@ struct unix_funcs RTL_USER_PROCESS_PARAMETERS *params, PS_CREATE_INFO *info, PS_ATTRIBUTE_LIST *attr ); TEB * (WINAPI *NtCurrentTeb)(void); - NTSTATUS (WINAPI *NtDelayExecution)( BOOLEAN alertable, const LARGE_INTEGER *timeout ); NTSTATUS (WINAPI *NtDeleteFile)( OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtDeviceIoControlFile)( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io, ULONG code, @@ -184,8 +183,6 @@ struct unix_funcs NTSTATUS (WINAPI *NtSetSystemTime)( const LARGE_INTEGER *new, LARGE_INTEGER *old ); NTSTATUS (WINAPI *NtSetVolumeInformationFile)( HANDLE handle, IO_STATUS_BLOCK *io, void *info, ULONG length, FS_INFORMATION_CLASS class ); - NTSTATUS (WINAPI *NtSignalAndWaitForSingleObject)( HANDLE signal, HANDLE wait, - BOOLEAN alertable, const LARGE_INTEGER *timeout ); NTSTATUS (WINAPI *NtSuspendProcess)( HANDLE handle ); NTSTATUS (WINAPI *NtSuspendThread)( HANDLE handle, ULONG *count ); NTSTATUS (WINAPI *NtTerminateProcess)( HANDLE handle, LONG exit_code ); @@ -195,11 +192,6 @@ struct unix_funcs NTSTATUS (WINAPI *NtUnmapViewOfSection)( HANDLE process, PVOID addr ); NTSTATUS (WINAPI *NtWaitForKeyedEvent)( HANDLE handle, const void *key, BOOLEAN alertable, const LARGE_INTEGER *timeout ); - NTSTATUS (WINAPI *NtWaitForMultipleObjects)( DWORD count, const HANDLE *handles, - BOOLEAN wait_any, BOOLEAN alertable, - const LARGE_INTEGER *timeout ); - NTSTATUS (WINAPI *NtWaitForSingleObject)( HANDLE handle, BOOLEAN alertable, - const LARGE_INTEGER *timeout ); NTSTATUS (WINAPI *NtWriteFile)( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, const void *buffer, ULONG length, LARGE_INTEGER *offset, ULONG *key ); @@ -209,7 +201,6 @@ struct unix_funcs LARGE_INTEGER *offset, ULONG *key ); NTSTATUS (WINAPI *NtWriteVirtualMemory)( HANDLE process, void *addr, const void *buffer, SIZE_T size, SIZE_T *bytes_written ); - NTSTATUS (WINAPI *NtYieldExecution)(void); /* other Win32 API functions */ NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process );

1 0

Zebediah Figura : quartz/tests: Test previous filter states.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 88d2afb79cc416108179d5f44b52f158c8f882a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88d2afb79cc416108179d5f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 22:57:14 2020 -0500 quartz/tests: Test previous filter states. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 0c627aaeaf..bd6562b0ed 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1166,14 +1166,15 @@ struct testfilter IFilterGraph *graph; WCHAR *name; IReferenceClock *clock; - FILTER_STATE state; - REFERENCE_TIME start_time; IEnumPins IEnumPins_iface; struct testpin *pins; unsigned int pin_count, enum_idx; + FILTER_STATE state; + REFERENCE_TIME start_time; HRESULT state_hr, GetState_hr, seek_hr; + FILTER_STATE expect_stop_prev, expect_run_prev; IAMFilterMiscFlags IAMFilterMiscFlags_iface; ULONG misc_flags; @@ -1358,6 +1359,10 @@ static HRESULT WINAPI testfilter_Stop(IBaseFilter *iface) struct testfilter *filter = impl_from_IBaseFilter(iface); if (winetest_debug > 1) trace("%p->Stop()\n", filter); + todo_wine_if (filter->expect_stop_prev == State_Running) + ok(filter->state == filter->expect_stop_prev, "Expected previous state %#x, got %#x.\n", + filter->expect_stop_prev, filter->state); + check_state_transition(filter, State_Stopped); filter->state = State_Stopped; @@ -1380,6 +1385,9 @@ static HRESULT WINAPI testfilter_Run(IBaseFilter *iface, REFERENCE_TIME start) struct testfilter *filter = impl_from_IBaseFilter(iface); if (winetest_debug > 1) trace("%p->Run(%s)\n", filter, wine_dbgstr_longlong(start)); + ok(filter->state == filter->expect_run_prev, "Expected previous state %#x, got %#x.\n", + filter->expect_run_prev, filter->state); + check_state_transition(filter, State_Running); filter->state = State_Running; @@ -1831,7 +1839,9 @@ static void testfilter_init(struct testfilter *filter, struct testpin *pins, int filter->pin_count = pin_count; for (i = 0; i < pin_count; i++) pins[i].filter = &filter->IBaseFilter_iface; + filter->state = State_Stopped; + filter->expect_stop_prev = filter->expect_run_prev = State_Paused; } static HRESULT WINAPI testfilter_cf_QueryInterface(IClassFactory *iface, REFIID iid, void **out) @@ -3383,6 +3393,7 @@ static void test_filter_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); + source.expect_run_prev = sink.expect_run_prev = State_Stopped; hr = IReferenceClock_GetTime(clock, &start_time); ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); hr = IMediaFilter_Run(filter, 0); @@ -3400,6 +3411,7 @@ static void test_filter_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Paused); + source.expect_run_prev = sink.expect_run_prev = State_Paused; hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); @@ -3587,6 +3599,7 @@ todo_wine /* This logic doesn't apply when using IMediaFilter methods directly. */ + source.expect_run_prev = sink.expect_run_prev = State_Stopped; sink.state_hr = S_FALSE; sink.GetState_hr = VFW_S_STATE_INTERMEDIATE; hr = IMediaFilter_Run(filter, 0); @@ -3610,6 +3623,8 @@ todo_wine ok(sink.state == State_Stopped, "Got state %u.\n", sink.state); ok(source.state == State_Stopped, "Got state %u.\n", source.state); + source.expect_run_prev = sink.expect_run_prev = State_Paused; + /* Test VFW_S_CANT_CUE. */ sink.GetState_hr = VFW_S_CANT_CUE; @@ -3658,7 +3673,7 @@ todo_wine /* Destroying the graph while it's running stops all filters. */ - hr = IMediaFilter_Run(filter, 0); + hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); todo_wine @@ -3667,6 +3682,7 @@ todo_wine 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)); + source.expect_stop_prev = sink.expect_stop_prev = State_Running; IMediaFilter_Release(filter); IMediaControl_Release(control); ref = IFilterGraph2_Release(graph);

1 0