wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Alexandre Julliard : kernel32: Move exe path functions to ntdll.
by Alexandre Julliard 03 Oct '19

03 Oct '19

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

Alexandre Julliard : kernel32: Move dll path functions to ntdll.
by Alexandre Julliard 03 Oct '19

03 Oct '19

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: Keep media source state based on raised events.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: b8ba4909ee764009e3ab96597d57a90b2beaaf4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8ba4909ee764009e3ab9659… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 3 11:28:19 2019 +0300 mf: Keep media source state based on raised events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index d007202b1f..169ba7403b 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -81,10 +81,18 @@ struct media_stream IMFMediaStream *stream; }; +enum source_state +{ + SOURCE_STATE_STOPPED = 0, + SOURCE_STATE_STARTED, + SOURCE_STATE_PAUSED, +}; + struct media_source { struct list entry; IMFMediaSource *source; + enum source_state state; struct list streams; }; @@ -1075,10 +1083,25 @@ static HRESULT session_add_media_stream(struct media_source *source, IMFMediaStr return S_OK; } +static void session_set_source_state(struct media_session *session, IMFMediaSource *source, enum source_state state) +{ + struct media_source *cur; + + LIST_FOR_EACH_ENTRY(cur, &session->presentation.sources, struct media_source, entry) + { + if (source == cur->source) + { + cur->state = state; + break; + } + } +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); IMFMediaEventGenerator *event_source; + enum source_state source_state; IMFMediaEvent *event = NULL; MediaEventType event_type; struct media_source *cur; @@ -1111,6 +1134,20 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM switch (event_type) { + case MESourceStarted: + case MESourcePaused: + case MESourceStopped: + if (event_type == MESourceStarted) + source_state = SOURCE_STATE_STARTED; + else if (event_type == MESourcePaused) + source_state = SOURCE_STATE_PAUSED; + else + source_state = SOURCE_STATE_STOPPED; + + EnterCriticalSection(&session->cs); + session_set_source_state(session, (IMFMediaSource *)event_source, source_state); + LeaveCriticalSection(&session->cs); + break; case MENewStream: stream = (IMFMediaStream *)value.punkVal;

1 0

Nikolay Sivov : mfreadwrite: Remove unnecessary typedef.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 9681e8ca5801179af60334ba0e5a3b2e84b3033f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9681e8ca5801179af60334ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 3 11:28:18 2019 +0300 mfreadwrite: Remove unnecessary typedef. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 3637d2f5ed..6859af8d53 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -95,7 +95,7 @@ struct media_stream enum media_stream_state state; }; -typedef struct source_reader +struct source_reader { IMFSourceReader IMFSourceReader_iface; IMFAsyncCallback source_events_callback; @@ -110,7 +110,7 @@ typedef struct source_reader struct media_stream *streams; DWORD stream_count; CRITICAL_SECTION cs; -} srcreader; +}; struct sink_writer { @@ -118,9 +118,9 @@ struct sink_writer LONG refcount; }; -static inline srcreader *impl_from_IMFSourceReader(IMFSourceReader *iface) +static inline struct source_reader *impl_from_IMFSourceReader(IMFSourceReader *iface) { - return CONTAINING_RECORD(iface, srcreader, IMFSourceReader_iface); + return CONTAINING_RECORD(iface, struct source_reader, IMFSourceReader_iface); } static struct source_reader *impl_from_source_callback_IMFAsyncCallback(IMFAsyncCallback *iface) @@ -481,14 +481,14 @@ static const IMFAsyncCallbackVtbl stream_events_callback_vtbl = static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID riid, void **out) { - srcreader *This = impl_from_IMFSourceReader(iface); + struct source_reader *reader = impl_from_IMFSourceReader(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_IMFSourceReader)) { - *out = &This->IMFSourceReader_iface; + *out = &reader->IMFSourceReader_iface; } else { @@ -503,12 +503,12 @@ static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID r static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) { - srcreader *This = impl_from_IMFSourceReader(iface); - ULONG ref = InterlockedIncrement(&This->refcount); + struct source_reader *reader = impl_from_IMFSourceReader(iface); + ULONG refcount = InterlockedIncrement(&reader->refcount); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("%p, refcount %u.\n", iface, refcount); - return ref; + return refcount; } static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) @@ -517,7 +517,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) ULONG refcount = InterlockedDecrement(&reader->refcount); unsigned int i; - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { @@ -868,8 +868,8 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x\n", This, index); + FIXME("%p, %#x.\n", iface, index); + return E_NOTIMPL; }

1 0

Nikolay Sivov : mfplat: Remove unnecessary typedef.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: b04959961d8f5220962b0f8da599b17fd90e50b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b04959961d8f5220962b0f8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 3 11:28:17 2019 +0300 mfplat: Remove unnecessary typedef. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6be9a194d4..19178d9d51 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4763,7 +4763,7 @@ struct resolver_cancel_object enum resolved_object_origin origin; }; -typedef struct source_resolver +struct source_resolver { IMFSourceResolver IMFSourceResolver_iface; LONG refcount; @@ -4771,7 +4771,7 @@ typedef struct source_resolver IMFAsyncCallback url_callback; CRITICAL_SECTION cs; struct list pending; -} mfsourceresolver; +}; static struct source_resolver *impl_from_IMFSourceResolver(IMFSourceResolver *iface) { @@ -5272,14 +5272,14 @@ static HRESULT resolver_end_create_object(struct source_resolver *resolver, enum static HRESULT WINAPI source_resolver_QueryInterface(IMFSourceResolver *iface, REFIID riid, void **obj) { - mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + struct source_resolver *resolver = impl_from_IMFSourceResolver(iface); - TRACE("(%p->(%s, %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFSourceResolver) || IsEqualIID(riid, &IID_IUnknown)) { - *obj = &This->IMFSourceResolver_iface; + *obj = &resolver->IMFSourceResolver_iface; } else { @@ -5335,7 +5335,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromURL(IMFSourceResolver *ifa MFASYNCRESULT *data; HRESULT hr; - TRACE("%p, %s, %#x, %p, %p, %p\n", iface, debugstr_w(url), flags, props, obj_type, object); + TRACE("%p, %s, %#x, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, obj_type, object); if (!url || !obj_type || !object) return E_POINTER;

1 0

Nikolay Sivov : mfplat: Unify event method traces format.
by Alexandre Julliard 03 Oct '19

03 Oct '19

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

Nikolay Sivov : mf: Subscribe to media stream events for current presentation.
by Alexandre Julliard 03 Oct '19

03 Oct '19

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

Martin Storsjo : msvcrt: Fix the layout of threadlocaleinfostruct for ucrt.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 56e6ce93b8b4c35ee4bef0b6be75c05ebf6d7763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56e6ce93b8b4c35ee4bef0b6… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Oct 2 23:12:32 2019 +0300 msvcrt: Fix the layout of threadlocaleinfostruct for ucrt. In ucrt, this struct has a different layout, with only three fields exposed in headers (which can be used by inline functions). This fixes use of some ctype.h functions like e.g. _isdigit_l from applications that use ucrt (both with MSVC and mingw-w64). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 552b48aa53..6e0e338a20 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -163,8 +163,16 @@ typedef struct { } MSVCRT___lc_time_data; typedef struct MSVCRT_threadlocaleinfostruct { +#if _MSVCR_VER >= 140 + unsigned short *pctype; + int mb_cur_max; + unsigned int lc_codepage; +#endif + int refcount; +#if _MSVCR_VER < 140 unsigned int lc_codepage; +#endif unsigned int lc_collate_cp; MSVCRT_ulong lc_handle[6]; MSVCRT_LC_ID lc_id[6]; @@ -175,14 +183,18 @@ typedef struct MSVCRT_threadlocaleinfostruct { int *wrefcount; } lc_category[6]; int lc_clike; +#if _MSVCR_VER < 140 int mb_cur_max; +#endif int *lconv_intl_refcount; int *lconv_num_refcount; int *lconv_mon_refcount; struct MSVCRT_lconv *lconv; int *ctype1_refcount; unsigned short *ctype1; +#if _MSVCR_VER < 140 unsigned short *pctype; +#endif unsigned char *pclmap; unsigned char *pcumap; MSVCRT___lc_time_data *lc_time_curr;

1 0

Vijay Kiran Kamuju : msvcrt: Implement %C format for strftime.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 37624027797c1d4c858e44a7fc55bcd6feea8c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37624027797c1d4c858e44a7… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Oct 2 22:11:38 2019 +0200 msvcrt: Implement %C format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 7 +++++++ dlls/ucrtbase/tests/misc.c | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 016c9775de..86799c900f 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -608,6 +608,11 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%C", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%D", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 450663fd1f..b9fcde7978 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1153,6 +1153,13 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_str(str, &ret, max, time_data->str.names.mon[mstm->tm_mon])) return 0; break; +#if _MSVCR_VER>=140 + case 'C': + tmp = (1900+mstm->tm_year)/100; + if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99)) + return 0; + break; +#endif case 'd': if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c58b631565..1ba4280a54 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -895,6 +895,10 @@ static void test_strftime(void) char bufA[256]; size_t retA; + retA = p_strftime(bufA, sizeof(bufA), "%C", &epoch); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, "19"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%D", &epoch); ok(retA == 8, "expected 8, got %d\n", (int)retA); ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA);

1 0

Zebediah Figura : quartz/vmr9: Create the window on the same thread as the filter.
by Alexandre Julliard 03 Oct '19

03 Oct '19

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

← Newer
1
...
50
51
52
53
54
55
56
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2019