October 2019 - Wine-Commits

Piotr Caban : kernel32: Add write watch test on OVERLAPPED structure.
by Alexandre Julliard Oct. 3, 2019

Oct. 3, 2019

Module: wine Branch: master Commit: 37d2b5843f6f3d5bb18b7bf9445c7019cf25a56d URL: https://source.winehq.org/git/wine.git/?a=commit;h=37d2b5843f6f3d5bb18b7bf9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 3 20:54:32 2019 +0200 kernel32: Add write watch test on OVERLAPPED structure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 63 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index bde71b9c64..9a35bfe290 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1602,7 +1602,7 @@ static void test_write_watch(void) DWORD ret, size, old_prot, num_bytes; MEMORY_BASIC_INFORMATION info; HANDLE readpipe, writepipe, file; - OVERLAPPED overlapped; + OVERLAPPED overlapped, *overlapped2; void *results[64]; ULONG_PTR count; ULONG i, pagesize; @@ -1906,6 +1906,67 @@ static void test_write_watch(void) ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); ok( count == 0, "wrong count %lu\n", count ); + /* OVERLAPPED structure write watch */ + memset( &overlapped, 0, sizeof(overlapped) ); + overlapped.hEvent = CreateEventA( NULL, TRUE, FALSE, NULL ); + + readpipe = CreateNamedPipeA( pipename, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_INBOUND, + PIPE_TYPE_MESSAGE | PIPE_WAIT, 1, 1024, 1024, + NMPWAIT_USE_DEFAULT_WAIT, NULL ); + ok( readpipe != INVALID_HANDLE_VALUE, "CreateNamedPipeA failed %u\n", GetLastError() ); + + success = ConnectNamedPipe( readpipe, &overlapped ); + ok( !success, "ConnectNamedPipe unexpectedly succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + + writepipe = CreateFileA( pipename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL ); + ok( writepipe != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError() ); + + ret = WaitForSingleObject( overlapped.hEvent, 1000 ); + ok( ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret ); + + memset( base, 0, size ); + overlapped2 = (OVERLAPPED*)(base + size - sizeof(*overlapped2)); + overlapped2->hEvent = CreateEventA( NULL, TRUE, FALSE, NULL ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + success = ReadFile( readpipe, base, sizeof(testdata), NULL, overlapped2 ); + ok( !success, "ReadFile unexpectedly succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + overlapped2->Internal = 0xdeadbeef; + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 2, "wrong count %lu\n", count ); + + num_bytes = 0; + success = WriteFile( writepipe, testdata, sizeof(testdata), &num_bytes, NULL ); + ok( success, "WriteFile failed %u\n", GetLastError() ); + ok( num_bytes == sizeof(testdata), "wrong number of bytes written %u\n", num_bytes ); + + num_bytes = 0; + success = GetOverlappedResult( readpipe, overlapped2, &num_bytes, TRUE ); + ok( success, "GetOverlappedResult failed %u\n", GetLastError() ); + ok( num_bytes == sizeof(testdata), "wrong number of bytes read %u\n", num_bytes ); + ok( !memcmp( base, testdata, sizeof(testdata)), "didn't receive expected data\n" ); + + count = 64; + memset( results, 0, sizeof(results) ); + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 2, "wrong count %lu\n", count ); + ok( results[0] == base, "wrong result %p\n", results[0] ); + + CloseHandle( readpipe ); + CloseHandle( writepipe ); + CloseHandle( overlapped.hEvent ); + CloseHandle( overlapped2->hEvent ); + /* some invalid parameter tests */ SetLastError( 0xdeadbeef );

1 0

Jacek Caban : vbscript: Store entire EXCEPINFO in script context.
by Alexandre Julliard Oct. 3, 2019

Oct. 3, 2019

Module: wine Branch: master Commit: 8277c24806cfd174617bc35d06a7cb7a7284e44c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8277c24806cfd174617bc35d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 3 18:18:37 2019 +0200 vbscript: Store entire EXCEPINFO in script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 4 ++-- dlls/vbscript/interp.c | 12 ++++++++++-- dlls/vbscript/vbscript.c | 1 + dlls/vbscript/vbscript.h | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e09099ecaf..98bcc516d7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2477,7 +2477,7 @@ static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARI return E_NOTIMPL; } - hres = This->desc->ctx->err_number; + hres = This->desc->ctx->ei.scode; return return_int(res, HRESULT_FACILITY(hres) == FACILITY_VBS ? HRESULT_CODE(hres) : hres); } @@ -2494,7 +2494,7 @@ static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIA if(!This->desc) return E_UNEXPECTED; - This->desc->ctx->err_number = S_OK; + clear_ei(&This->desc->ctx->ei); return S_OK; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 6b9fd60a75..9c561826fa 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -247,6 +247,14 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, return S_OK; } +void clear_ei(EXCEPINFO *ei) +{ + SysFreeString(ei->bstrSource); + SysFreeString(ei->bstrDescription); + SysFreeString(ei->bstrHelpFile); + memset(ei, 0, sizeof(*ei)); +} + static inline VARIANT *stack_pop(exec_ctx_t *ctx) { assert(ctx->top); @@ -1321,7 +1329,7 @@ static HRESULT interp_errmode(exec_ctx_t *ctx) TRACE("%d\n", err_mode); ctx->resume_next = err_mode; - ctx->script->err_number = S_OK; + clear_ei(&ctx->script->ei); return S_OK; } @@ -2158,7 +2166,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP op = exec.instr->op; hres = op_funcs[op](&exec); if(FAILED(hres)) { - ctx->err_number = hres = map_hres(hres); + ctx->ei.scode = hres = map_hres(hres); if(exec.resume_next) { unsigned stack_off; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index aa768a57e7..69dc1a151b 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -153,6 +153,7 @@ static void release_script(script_ctx_t *ctx) class_desc_t *class_desc; collect_objects(ctx); + clear_ei(&ctx->ei); release_dynamic_vars(ctx->global_vars); ctx->global_vars = NULL; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index c9018c4648..003d759046 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -192,7 +192,7 @@ struct _script_ctx_t { class_desc_t err_desc; vbdisp_t *err_obj; - HRESULT err_number; + EXCEPINFO ei; dynamic_var_t *global_vars; function_t *global_funcs; @@ -358,6 +358,7 @@ HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t** HRESULT exec_script(script_ctx_t*,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; +void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; typedef struct { UINT16 len;

1 0

Kevin Puetz : msvcp: Use fput[w]c in basic_filebuf_char_overflow.
by Alexandre Julliard Oct. 3, 2019

Oct. 3, 2019

Module: wine Branch: master Commit: 925e56acff4e714364cbf3507f669aff570132b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=925e56acff4e714364cbf350… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Oct 3 18:06:42 2019 +0200 msvcp: Use fput[w]c in basic_filebuf_char_overflow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8e6884c8f9..84174e4f95 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3374,7 +3374,7 @@ int __thiscall basic_filebuf_char_overflow(basic_filebuf_char *this, int c) return !c; if(!this->cvt) - return fwrite(&ch, sizeof(char), 1, this->file) ? c : EOF; + return fputc(ch, this->file); from_next = &ch; do { @@ -4009,7 +4009,7 @@ unsigned short __thiscall basic_filebuf_wchar_overflow(basic_filebuf_wchar *this return !c; if(!this->cvt) - return fwrite(&ch, sizeof(wchar_t), 1, this->file) ? c : WEOF; + return fputwc(ch, this->file); from_next = &ch; do {

1 0

Alexandre Julliard : kernel32: Move exe path functions to ntdll.
by Alexandre Julliard Oct. 3, 2019

Oct. 3, 2019

Module: wine Branch: master Commit: a5d45e9ae5a6a88f859c1ca1f05b4c93a0817103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5d45e9ae5a6a88f859c1ca1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 3 19:26:01 2019 +0200 kernel32: Move exe path functions to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 19 ++++++++---- dlls/kernel32/tests/path.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 25 ++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 5 files changed, 116 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 3aae3d129e..d2682ac83e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -438,11 +438,18 @@ static HANDLE open_exe_file( const WCHAR *name, BOOL *is_64bit ) */ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE *handle ) { - TRACE("looking for %s\n", debugstr_w(name) ); + WCHAR *load_path; + BOOL ret; + + if (!set_ntstatus( RtlGetExePath( name, &load_path ))) return FALSE; + + TRACE("looking for %s in %s\n", debugstr_w(name), debugstr_w(load_path) ); - if (!SearchPathW( NULL, name, exeW, buflen, buffer, NULL ) && - /* no builtin found, try native without extension in case it is a Unix app */ - !SearchPathW( NULL, name, NULL, buflen, buffer, NULL )) return FALSE; + ret = (SearchPathW( load_path, name, exeW, buflen, buffer, NULL ) || + /* no builtin found, try native without extension in case it is a Unix app */ + SearchPathW( load_path, name, NULL, buflen, buffer, NULL )); + RtlReleasePath( load_path ); + if (!ret) return FALSE; TRACE( "Trying native exe %s\n", debugstr_w(buffer) ); *handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, @@ -1412,12 +1419,14 @@ void * CDECL __wine_kernel_init(void) { BOOL is_64bit; - if (!SearchPathW( NULL, __wine_main_wargv[0], exeW, MAX_PATH, main_exe_name, NULL ) && + RtlGetExePath( __wine_main_wargv[0], &load_path ); + if (!SearchPathW( load_path, __wine_main_wargv[0], exeW, MAX_PATH, main_exe_name, NULL ) && !get_builtin_path( __wine_main_wargv[0], exeW, main_exe_name, MAX_PATH, &is_64bit )) { MESSAGE( "wine: cannot find '%s'\n", __wine_main_argv[0] ); ExitProcess( GetLastError() ); } + RtlReleasePath( load_path ); update_library_argv0( main_exe_name ); if (!build_command_line( __wine_main_wargv )) goto error; start_wineboot( boot_events ); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 1610370064..71577793b0 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -78,6 +78,7 @@ static BOOL (WINAPI *pRemoveDllDirectory)(DLL_DIRECTORY_COOKIE); static BOOL (WINAPI *pSetSearchPathMode)(DWORD); static BOOL (WINAPI *pSetDllDirectoryW)(LPCWSTR); static BOOL (WINAPI *pSetDefaultDllDirectories)(DWORD); +static NTSTATUS (WINAPI *pRtlGetExePath)(LPCWSTR,LPWSTR*); static NTSTATUS (WINAPI *pRtlGetSearchPath)(LPWSTR*); static void (WINAPI *pRtlReleasePath)(LPWSTR); static NTSTATUS (WINAPI *pLdrGetDllPath)(LPCWSTR,ULONG,LPWSTR*,LPWSTR*); @@ -2218,6 +2219,7 @@ static void init_pointers(void) MAKEFUNC(CheckNameLegalDOS8Dot3A); mod = GetModuleHandleA("ntdll.dll"); MAKEFUNC(LdrGetDllPath); + MAKEFUNC(RtlGetExePath); MAKEFUNC(RtlGetSearchPath); MAKEFUNC(RtlReleasePath); #undef MAKEFUNC @@ -2570,6 +2572,78 @@ static void test_RtlGetSearchPath(void) SetEnvironmentVariableW( pathW, old_path ); } +static void test_RtlGetExePath(void) +{ + static const WCHAR fooW[] = {'\\','f','o','o',0}; + static const WCHAR emptyW[1]; + NTSTATUS ret; + WCHAR *path; + WCHAR buffer[2048], old_path[2048], dlldir[4]; + + if (!pRtlGetExePath) + { + win_skip( "RtlGetExePath isn't available\n" ); + return; + } + + GetEnvironmentVariableW( pathW, old_path, ARRAY_SIZE(old_path) ); + GetWindowsDirectoryW( buffer, ARRAY_SIZE(buffer) ); + lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); + SetEnvironmentVariableA( "NoDefaultCurrentDirectoryInExePath", NULL ); + + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + path = (WCHAR *)0xdeadbeef; + ret = pRtlGetExePath( fooW, &path ); + ok( !ret, "RtlGetExePath failed %x\n", ret ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + path = (WCHAR *)0xdeadbeef; + ret = pRtlGetExePath( fooW + 1, &path ); + ok( !ret, "RtlGetExePath failed %x\n", ret ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + SetEnvironmentVariableA( "NoDefaultCurrentDirectoryInExePath", "yes" ); + + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + path = (WCHAR *)0xdeadbeef; + ret = pRtlGetExePath( fooW, &path ); + ok( !ret, "RtlGetExePath failed %x\n", ret ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + build_search_path( buffer, ARRAY_SIZE(buffer), emptyW, TRUE ); + path = (WCHAR *)0xdeadbeef; + ret = pRtlGetExePath( fooW + 1, &path ); + ok( !ret, "RtlGetExePath failed %x\n", ret ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + SetEnvironmentVariableA( "PATH", "foo" ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + path = (WCHAR *)0xdeadbeef; + ret = pRtlGetExePath( fooW, &path ); + ok( !ret, "RtlGetExePath failed %x\n", ret ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + if (pSetDllDirectoryW) + { + ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + path = (WCHAR *)0xdeadbeef; + ret = pRtlGetExePath( fooW, &path ); + ok( !ret, "RtlGetExePath failed %x\n", ret ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + pSetDllDirectoryW( NULL ); + } + + SetEnvironmentVariableW( pathW, old_path ); +} + static void test_LdrGetDllPath(void) { static const WCHAR fooW[] = {'f','o','o',0}; @@ -2705,5 +2779,6 @@ START_TEST(path) test_CheckNameLegalDOS8Dot3(); test_SetSearchPathMode(); test_RtlGetSearchPath(); + test_RtlGetExePath(); test_LdrGetDllPath(); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4b528b5ea8..5eacc5a23c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4132,6 +4132,31 @@ NTSTATUS WINAPI RtlSetSearchPathMode( ULONG flags ) } +/****************************************************************** + * RtlGetExePath (NTDLL.@) + */ +NTSTATUS WINAPI RtlGetExePath( PCWSTR name, PWSTR *path ) +{ + static const WCHAR emptyW[1]; + const WCHAR *dlldir = dotW; + const WCHAR *module = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + + /* same check as NeedCurrentDirectoryForExePathW */ + if (!strchrW( name, '\\' )) + { + static const WCHAR env_name[] = {'N','o','D','e','f','a','u','l','t','C','u','r','r','e','n','t', + 'D','i','r','e','c','t','o','r','y','I','n', + 'E','x','e','P','a','t','h',0}; + UNICODE_STRING name, value = { 0 }; + + RtlInitUnicodeString( &name, env_name ); + if (RtlQueryEnvironmentVariable_U( NULL, &name, &value ) != STATUS_VARIABLE_NOT_FOUND) + dlldir = emptyW; + } + return get_dll_load_path( module, dlldir, FALSE, path ); +} + + /****************************************************************** * RtlGetSearchPath (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c33f12121b..3dd184d8c7 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -687,6 +687,7 @@ @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stub RtlGetElementGenericTable # @ stub RtlGetElementGenericTableAvl +@ stdcall RtlGetExePath(wstr ptr) # @ stub RtlGetFirstRange @ stdcall RtlGetFrame() @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) diff --git a/include/winternl.h b/include/winternl.h index 95105c67b4..16df963770 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2724,6 +2724,7 @@ NTSYSAPI NTSTATUS WINAPI RtlGetControlSecurityDescriptor(PSECURITY_DESCRIPTOR, NTSYSAPI ULONG WINAPI RtlGetCurrentDirectory_U(ULONG, LPWSTR); NTSYSAPI PEB * WINAPI RtlGetCurrentPeb(void); NTSYSAPI NTSTATUS WINAPI RtlGetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,PBOOLEAN,PACL *,PBOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlGetExePath(PCWSTR,PWSTR*); NTSYSAPI TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void); NTSYSAPI ULONG WINAPI RtlGetFullPathName_U(PCWSTR,ULONG,PWSTR,PWSTR*); NTSYSAPI NTSTATUS WINAPI RtlGetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID *,PBOOLEAN);

1 0

Nikolay Sivov : mfplat: Unify event method traces format.
by Alexandre Julliard Oct. 3, 2019

Oct. 3, 2019

Module: wine Branch: master Commit: 5ebf0b0b78ea4b47b8e4eb10beb035cd513d18ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ebf0b0b78ea4b47b8e4eb10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 3 11:28:16 2019 +0300 mfplat: Unify event method traces format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 64 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 30810daa44..6be9a194d4 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5585,7 +5585,7 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver) return S_OK; } -typedef struct media_event +struct media_event { struct attributes attributes; IMFMediaEvent IMFMediaEvent_iface; @@ -5594,28 +5594,28 @@ typedef struct media_event GUID extended_type; HRESULT status; PROPVARIANT value; -} mfmediaevent; +}; -static inline mfmediaevent *impl_from_IMFMediaEvent(IMFMediaEvent *iface) +static inline struct media_event *impl_from_IMFMediaEvent(IMFMediaEvent *iface) { - return CONTAINING_RECORD(iface, mfmediaevent, IMFMediaEvent_iface); + return CONTAINING_RECORD(iface, struct media_event, IMFMediaEvent_iface); } static HRESULT WINAPI mfmediaevent_QueryInterface(IMFMediaEvent *iface, REFIID riid, void **out) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); + struct media_event *event = impl_from_IMFMediaEvent(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IMFAttributes) || IsEqualGUID(riid, &IID_IMFMediaEvent)) { - *out = &This->IMFMediaEvent_iface; + *out = &event->IMFMediaEvent_iface; } else { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); + FIXME("%s, %p.\n", debugstr_guid(riid), out); *out = NULL; return E_NOINTERFACE; } @@ -5626,29 +5626,29 @@ static HRESULT WINAPI mfmediaevent_QueryInterface(IMFMediaEvent *iface, REFIID r static ULONG WINAPI mfmediaevent_AddRef(IMFMediaEvent *iface) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); - ULONG ref = InterlockedIncrement(&This->attributes.ref); + struct media_event *event = impl_from_IMFMediaEvent(iface); + ULONG refcount = InterlockedIncrement(&event->attributes.ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("%p, refcount %u.\n", iface, refcount); - return ref; + return refcount; } static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) { struct media_event *event = impl_from_IMFMediaEvent(iface); - ULONG ref = InterlockedDecrement(&event->attributes.ref); + ULONG refcount = InterlockedDecrement(&event->attributes.ref); - TRACE("(%p) ref=%u\n", iface, ref); + TRACE("%p, refcount %u.\n", iface, refcount); - if (!ref) + if (!refcount) { clear_attributes_object(&event->attributes); PropVariantClear(&event->value); heap_free(event); } - return ref; + return refcount; } static HRESULT WINAPI mfmediaevent_GetItem(IMFMediaEvent *iface, REFGUID key, PROPVARIANT *value) @@ -5927,42 +5927,44 @@ static HRESULT WINAPI mfmediaevent_CopyAllItems(IMFMediaEvent *iface, IMFAttribu static HRESULT WINAPI mfmediaevent_GetType(IMFMediaEvent *iface, MediaEventType *type) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); + struct media_event *event = impl_from_IMFMediaEvent(iface); - TRACE("%p, %p\n", This, type); + TRACE("%p, %p.\n", iface, type); - *type = This->type; + *type = event->type; return S_OK; } static HRESULT WINAPI mfmediaevent_GetExtendedType(IMFMediaEvent *iface, GUID *extended_type) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); + struct media_event *event = impl_from_IMFMediaEvent(iface); - TRACE("%p, %p\n", This, extended_type); + TRACE("%p, %p.\n", iface, extended_type); - *extended_type = This->extended_type; + *extended_type = event->extended_type; return S_OK; } static HRESULT WINAPI mfmediaevent_GetStatus(IMFMediaEvent *iface, HRESULT *status) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); + struct media_event *event = impl_from_IMFMediaEvent(iface); - TRACE("%p, %p\n", This, status); + TRACE("%p, %p.\n", iface, status); - *status = This->status; + *status = event->status; return S_OK; } static HRESULT WINAPI mfmediaevent_GetValue(IMFMediaEvent *iface, PROPVARIANT *value) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); + struct media_event *event = impl_from_IMFMediaEvent(iface); + + TRACE("%p, %p.\n", iface, value); - PropVariantCopy(value, &This->value); + PropVariantCopy(value, &event->value); return S_OK; } @@ -6014,14 +6016,14 @@ static const IMFMediaEventVtbl mfmediaevent_vtbl = HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HRESULT status, const PROPVARIANT *value, IMFMediaEvent **event) { - mfmediaevent *object; + struct media_event *object; HRESULT hr; - TRACE("%s, %s, %08x, %s, %p\n", debugstr_eventid(type), debugstr_guid(extended_type), status, + TRACE("%s, %s, %#x, %s, %p.\n", debugstr_eventid(type), debugstr_guid(extended_type), status, debugstr_propvar(value), event); - object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); - if(!object) + object = heap_alloc(sizeof(*object)); + if (!object) return E_OUTOFMEMORY; if (FAILED(hr = init_attributes_object(&object->attributes, 0)))

1 0

Alexandre Julliard : kernel32: Move dll path functions to ntdll.
by Alexandre Julliard Oct. 3, 2019

Oct. 3, 2019

Module: wine Branch: master Commit: 619bd16e7a7486ca72cde1df01791629efb61341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=619bd16e7a7486ca72cde1df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 3 14:14:36 2019 +0200 kernel32: Move dll path functions to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/kernel_private.h | 3 - dlls/kernel32/module.c | 400 +--------------------------------------- dlls/kernel32/process.c | 5 +- dlls/kernel32/tests/path.c | 150 +++++++++++++-- dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/loader.c | 32 ++++ dlls/ntdll/loader.c | 266 +++++++++++++++++++++++--- dlls/ntdll/ntdll.spec | 6 +- include/winternl.h | 4 + 10 files changed, 437 insertions(+), 441 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=619bd16e7a7486ca72cd…

1 0

Nikolay Sivov : mf: Subscribe to media stream events for current presentation.
by Alexandre Julliard Oct. 3, 2019

Oct. 3, 2019

Module: wine Branch: master Commit: 41853aee79fcd71e7912c5cba9805cac55181aad URL: https://source.winehq.org/git/wine.git/?a=commit;h=41853aee79fcd71e7912c5cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 3 11:28:15 2019 +0300 mf: Subscribe to media stream events for current presentation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 168 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41853aee79fcd71e7912…

1 0

Zebediah Figura : quartz/vmr9: Create the window on the same thread as the filter.
by Alexandre Julliard Oct. 3, 2019

Oct. 3, 2019

Module: wine Branch: master Commit: ff5644174e7e6e82e4f7575a95cf09e11bc52abd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff5644174e7e6e82e4f7575a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 22:01:09 2019 -0500 quartz/vmr9: Create the window on the same thread as the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2c9c825b50..cc7ef69810 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -153,10 +153,6 @@ typedef struct LONG refCount; - HANDLE ack; - DWORD tid; - HANDLE hWndThread; - IDirect3DDevice9 *d3d9_dev; IDirect3D9 *d3d9_ptr; IDirect3DSurface9 **d3d9_surfaces; @@ -2238,7 +2234,6 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) { DWORD i; TRACE("Destroying\n"); - CloseHandle(This->ack); IDirect3D9_Release(This->d3d9_ptr); TRACE("Number of surfaces: %u\n", This->num_surfaces); @@ -2476,32 +2471,6 @@ static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(VMR9DefaultAllocatorP return hr; } -static DWORD WINAPI MessageLoop(LPVOID lpParameter) -{ - MSG msg; - BOOL fGotMessage; - VMR9DefaultAllocatorPresenterImpl *This = lpParameter; - - TRACE("Starting message loop\n"); - - if (FAILED(BaseWindowImpl_PrepareWindow(&This->pVMR9->baseControlWindow.baseWindow))) - { - FIXME("Failed to prepare window\n"); - return FALSE; - } - - SetEvent(This->ack); - while ((fGotMessage = GetMessageW(&msg, NULL, 0, 0)) != 0 && fGotMessage != -1) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } - - TRACE("End of message loop\n"); - - return 0; -} - static UINT d3d9_adapter_from_hwnd(IDirect3D9 *d3d9, HWND hwnd, HMONITOR *mon_out) { UINT d3d9_adapter; @@ -2533,14 +2502,9 @@ static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9A TRACE("(%p)->()\n", This); - This->hWndThread = CreateThread(NULL, 0, MessageLoop, This, 0, &This->tid); - if (!This->hWndThread) + if (FAILED(BaseWindowImpl_PrepareWindow(&This->pVMR9->baseControlWindow.baseWindow))) return FALSE; - WaitForSingleObject(This->ack, INFINITE); - - if (!This->pVMR9->baseControlWindow.baseWindow.hWnd) return FALSE; - /* Obtain a monitor and d3d9 device */ d3d9_adapter = d3d9_adapter_from_hwnd(This->d3d9_ptr, This->pVMR9->baseControlWindow.baseWindow.hWnd, &This->hMon); @@ -2617,10 +2581,6 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocator return S_OK; } - SendMessageW(This->pVMR9->baseControlWindow.baseWindow.hWnd, WM_CLOSE, 0, 0); - PostThreadMessageW(This->tid, WM_QUIT, 0, 0); - WaitForSingleObject(This->hWndThread, INFINITE); - This->hWndThread = NULL; BaseWindowImpl_DoneWithWindow(&This->pVMR9->baseControlWindow.baseWindow); return S_OK; @@ -2839,8 +2799,6 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren This->hMon = 0; This->d3d9_vertex = NULL; This->num_surfaces = 0; - This->hWndThread = NULL; - This->ack = CreateEventW(NULL, 0, 0, NULL); This->SurfaceAllocatorNotify = NULL; This->reset = FALSE;

1 0

Zebediah Figura : quartz/videorenderer: Create the window on the same thread as the filter.
by Alexandre Julliard Oct. 3, 2019

Oct. 3, 2019

Module: wine Branch: master Commit: 3b5198c8283d891095612c1001edb5e5788d6059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b5198c8283d891095612c10… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 22:01:08 2019 -0500 quartz/videorenderer: Create the window on the same thread as the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/videorenderer.c | 47 +---------------------------------------- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f93f355b60..b6e9f3ab0f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4095,7 +4095,7 @@ static void test_window_threading(void) if ((hwnd = get_renderer_hwnd(graph))) { tid = GetWindowThreadProcessId(hwnd, NULL); - todo_wine ok(tid == GetCurrentThreadId(), "Window should be created on main thread.\n"); + ok(tid == GetCurrentThreadId(), "Window should be created on main thread.\n"); } else skip("Could not find renderer window.\n"); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 429b59bfe3..87ff9f59bf 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -45,11 +45,8 @@ typedef struct VideoRendererImpl IOverlay IOverlay_iface; BOOL init; - HANDLE hThread; - DWORD ThreadID; HANDLE hEvent; - BOOL ThreadResult; RECT SourceRect; RECT DestRect; RECT WindowPos; @@ -83,54 +80,15 @@ static inline VideoRendererImpl *impl_from_BaseControlVideo(BaseControlVideo *if return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo); } -static DWORD WINAPI MessageLoop(LPVOID lpParameter) -{ - VideoRendererImpl* This = lpParameter; - MSG msg; - BOOL fGotMessage; - - TRACE("Starting message loop\n"); - - if (FAILED(BaseWindowImpl_PrepareWindow(&This->baseControlWindow.baseWindow))) - { - This->ThreadResult = FALSE; - SetEvent(This->hEvent); - return 0; - } - - This->ThreadResult = TRUE; - SetEvent(This->hEvent); - - while ((fGotMessage = GetMessageW(&msg, NULL, 0, 0)) != 0 && fGotMessage != -1) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } - - TRACE("End of message loop\n"); - - return msg.wParam; -} - static BOOL CreateRenderingSubsystem(VideoRendererImpl* This) { This->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (!This->hEvent) return FALSE; - This->hThread = CreateThread(NULL, 0, MessageLoop, This, 0, &This->ThreadID); - if (!This->hThread) - { - CloseHandle(This->hEvent); - return FALSE; - } - - WaitForSingleObject(This->hEvent, INFINITE); - - if (!This->ThreadResult) + if (FAILED(BaseWindowImpl_PrepareWindow(&This->baseControlWindow.baseWindow))) { CloseHandle(This->hEvent); - CloseHandle(This->hThread); return FALSE; } @@ -379,9 +337,6 @@ static void video_renderer_destroy(BaseRenderer *iface) BaseControlWindow_Destroy(&filter->baseControlWindow); BaseControlVideo_Destroy(&filter->baseControlVideo); - PostThreadMessageW(filter->ThreadID, WM_QUIT, 0, 0); - WaitForSingleObject(filter->hThread, INFINITE); - CloseHandle(filter->hThread); CloseHandle(filter->hEvent); strmbase_renderer_cleanup(&filter->renderer);

1 0

Zebediah Figura : quartz/filtergraph: Create filters on a separate thread if requested.
by Alexandre Julliard Oct. 3, 2019

Oct. 3, 2019

Module: wine Branch: master Commit: 5994c8cc85022b4e9ad8eba0b1e64377e148a76a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5994c8cc85022b4e9ad8eba0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 22:01:06 2019 -0500 quartz/filtergraph: Create filters on a separate thread if requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 105 ++++++++++++++++++++++++++++++++++------ dlls/quartz/main.c | 4 +- dlls/quartz/quartz_private.h | 4 +- dlls/quartz/tests/filtergraph.c | 5 +- 4 files changed, 97 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index f947327aaa..4dd3075463 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -208,6 +208,9 @@ typedef struct _IFilterGraphImpl { LONG recursioncount; IUnknown *pSite; LONG version; + + HANDLE message_thread, message_thread_ret; + DWORD message_thread_id; } IFilterGraphImpl; struct enum_filters @@ -489,6 +492,13 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) CloseHandle(This->hEventCompletion); EventsQueue_Destroy(&This->evqueue); This->cs.DebugInfo->Spare[0] = 0; + if (This->message_thread) + { + PostThreadMessageW(This->message_thread_id, WM_USER + 1, 0, 0); + WaitForSingleObject(This->message_thread, INFINITE); + CloseHandle(This->message_thread); + CloseHandle(This->message_thread_ret); + } DeleteCriticalSection(&This->cs); CoTaskMemFree(This); } @@ -964,6 +974,63 @@ static HRESULT GetFilterInfo(IMoniker* pMoniker, VARIANT* pvar) return hr; } +struct filter_create_params +{ + HRESULT hr; + IMoniker *moniker; + IBaseFilter *filter; +}; + +static DWORD WINAPI message_thread_run(void *ctx) +{ + IFilterGraphImpl *graph = ctx; + MSG msg; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + for (;;) + { + GetMessageW(&msg, NULL, 0, 0); + + if (!msg.hwnd && msg.message == WM_USER) + { + struct filter_create_params *params = (struct filter_create_params *)msg.wParam; + + params->hr = IMoniker_BindToObject(params->moniker, NULL, NULL, + &IID_IBaseFilter, (void **)&params->filter); + SetEvent(graph->message_thread_ret); + } + else if (!msg.hwnd && msg.message == WM_USER + 1) + { + break; + } + else + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + + CoUninitialize(); + return 0; +} + +static HRESULT create_filter(IFilterGraphImpl *graph, IMoniker *moniker, IBaseFilter **filter) +{ + if (graph->message_thread) + { + struct filter_create_params params; + + params.moniker = moniker; + PostThreadMessageW(graph->message_thread_id, WM_USER, (WPARAM)&params, 0); + WaitForSingleObject(graph->message_thread_ret, INFINITE); + *filter = params.filter; + return params.hr; + } + else + return IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void **)filter); +} + /* Attempt to connect one of the output pins on filter to sink. Helper for * FilterGraph2_Connect(). */ static HRESULT connect_output_pin(IFilterGraphImpl *graph, IBaseFilter *filter, IPin *sink) @@ -1164,7 +1231,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } - hr = IMoniker_BindToObject(pMoniker, NULL, NULL, &IID_IBaseFilter, (LPVOID*)&pfilter); + hr = create_filter(This, pMoniker, &pfilter); IMoniker_Release(pMoniker); if (FAILED(hr)) { WARN("Unable to create filter (%x), trying next one\n", hr); @@ -1497,7 +1564,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) goto error; } - hr = IMoniker_BindToObject(pMoniker, NULL, NULL, &IID_IBaseFilter, (LPVOID*)&pfilter); + hr = create_filter(This, pMoniker, &pfilter); IMoniker_Release(pMoniker); if (FAILED(hr)) { @@ -5565,15 +5632,12 @@ static const IUnknownVtbl IInner_VTable = FilterGraphInner_Release }; -/* This is the only function that actually creates a FilterGraph class... */ -HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) +static HRESULT filter_graph_common_create(IUnknown *outer, void **out, BOOL threaded) { IFilterGraphImpl *fimpl; HRESULT hr; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); - - *ppObj = NULL; + *out = NULL; fimpl = CoTaskMemAlloc(sizeof(*fimpl)); fimpl->defaultclock = TRUE; @@ -5617,10 +5681,15 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->recursioncount = 0; fimpl->version = 0; - if (pUnkOuter) - fimpl->outer_unk = pUnkOuter; + if (threaded) + { + fimpl->message_thread = CreateThread(NULL, 0, message_thread_run, fimpl, 0, &fimpl->message_thread_id); + fimpl->message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); + } else - fimpl->outer_unk = &fimpl->IUnknown_inner; + fimpl->message_thread = NULL; + + fimpl->outer_unk = outer ? outer : &fimpl->IUnknown_inner; /* create Filtermapper aggregated. */ hr = CoCreateInstance(&CLSID_FilterMapper2, fimpl->outer_unk, CLSCTX_INPROC_SERVER, @@ -5637,12 +5706,20 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) return hr; } - *ppObj = &fimpl->IUnknown_inner; + *out = &fimpl->IUnknown_inner; return S_OK; } -HRESULT FilterGraphNoThread_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT filter_graph_create(IUnknown *outer, void **out) { - FIXME("CLSID_FilterGraphNoThread partially implemented - Forwarding to CLSID_FilterGraph\n"); - return FilterGraph_create(pUnkOuter, ppObj); + TRACE("outer %p, out %p.\n", outer, out); + + return filter_graph_common_create(outer, out, TRUE); +} + +HRESULT filter_graph_no_thread_create(IUnknown *outer, void **out) +{ + TRACE("outer %p, out %p.\n", outer, out); + + return filter_graph_common_create(outer, out, FALSE); } diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 36ec59c4e0..9540fa9293 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -63,8 +63,8 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { { &CLSID_SeekingPassThru, SeekingPassThru_create }, - { &CLSID_FilterGraph, FilterGraph_create }, - { &CLSID_FilterGraphNoThread, FilterGraphNoThread_create }, + { &CLSID_FilterGraph, filter_graph_create }, + { &CLSID_FilterGraphNoThread, filter_graph_no_thread_create }, { &CLSID_FilterMapper, FilterMapper_create }, { &CLSID_FilterMapper2, FilterMapper2_create }, { &CLSID_AsyncReader, AsyncReader_create }, diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 353d1e5a57..1213aea352 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -40,8 +40,8 @@ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define BYTES_FROM_MEDIATIME(time) ((time) / 10000000) -HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT FilterGraphNoThread_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT filter_graph_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; +HRESULT filter_graph_no_thread_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT FilterMapper2_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT FilterMapper_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6c357041f2..f93f355b60 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -760,10 +760,9 @@ static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) HRESULT hr; hr = IFilterGraph2_RenderFile(graph, filename, NULL); - ok(SUCCEEDED(hr), "RenderFile failed: %x\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - if (SUCCEEDED(hr)) - rungraph(graph, TRUE); + rungraph(graph, TRUE); return 0; }

1 0