October 2019 - Wine-commits

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 : 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 : 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

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

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 LoadLibrary functions to kernelbase.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: c5dc41e980b311a9d49122c6e3e33a1c4483c660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5dc41e980b311a9d49122c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 3 19:41:40 2019 +0200 kernel32: Move LoadLibrary functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 10 +- dlls/kernel32/module.c | 265 ----------------------------------- dlls/kernelbase/kernelbase.spec | 12 +- dlls/kernelbase/loader.c | 296 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 307 insertions(+), 276 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5dc41e980b311a9d491…

1 0

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

03 Oct '19

Module: wine Branch: master Commit: 0bdaecd2d7cf1f786e7f57d2d1ee37db2fcb0e3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bdaecd2d7cf1f786e7f57d2… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Oct 3 16:27:33 2019 +0200 msvcrt: Implement %e 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 | 6 ++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 86799c900f..9795c92baf 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -618,6 +618,11 @@ static void test_strftime(void) 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, "%e", 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, "%F", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b9fcde7978..cbffd77f32 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1177,6 +1177,12 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) return 0; break; + case 'e': + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + return 0; + if(!alternate && str[ret-2] == '0') + str[ret-2] = ' '; + break; case 'F': tmp = 1900+mstm->tm_year; if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 1ba4280a54..aecbc9dca5 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -907,6 +907,14 @@ static void test_strftime(void) ok(retA == 6, "expected 6, got %d\n", (int)retA); ok(!strcmp(bufA, "1/1/70"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%e", &epoch); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, " 1"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#e", &epoch); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "1"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%F", &epoch); ok(retA == 10, "expected 10, got %d\n", (int)retA); ok(!strcmp(bufA, "1970-01-01"), "got %s\n", bufA);

1 0

Alistair Leslie-Hughes : dsound/tests: Allow more time for an event to be signalled.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 594cc41e94d7a20d383d9e1e3a0e42926ce89283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=594cc41e94d7a20d383d9e1e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 3 04:55:07 2019 +0000 dsound/tests: Allow more time for an event to be signalled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47868 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/dsound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index d242bf6b24..7fdac9144e 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1089,7 +1089,7 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, ok(rc == DS_OK,"Failed %08x\n",rc); ok(status == 0 /* Stopped */,"got %08x\n", status); - ret=WaitForMultipleObjects(count,event,FALSE,0); + ret = WaitForMultipleObjects(count, event, FALSE, 3000); ok(ret==expected,"expected %d. got %d\n",expected,ret); return rc;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_ps_consts_i().
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 638459bd5b42f41919d9c864196495b816b50df2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=638459bd5b42f41919d9c864… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 19:39:56 2019 -0500 wined3d: Introduce wined3d_stateblock_set_ps_consts_i(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 20 ++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 64a900fbde..0ff3199525 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1366,6 +1366,26 @@ HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stat return WINED3D_OK; } +HRESULT CDECL wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) +{ + unsigned int i; + + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) + return WINED3DERR_INVALIDCALL; + + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + + memcpy(&stateblock->stateblock_state.ps_consts_i[start_idx], constants, count * sizeof(*constants)); + for (i = start_idx; i < count + start_idx; ++i) + stateblock->changed.pixelShaderConstantsI |= (1u << i); + return WINED3D_OK; +} + void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 016cf55c03..9772874c8b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,7 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) +@ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c4c469d4fe..215e50116c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2663,6 +2663,8 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); +HRESULT __cdecl wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantI().
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: c19b82ad1aba11b145b11c68fd625f68864af48a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19b82ad1aba11b145b11c68… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 19:39:57 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantI(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 539af97fbb..daa0b1b502 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3850,8 +3850,11 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_i(device->wined3d_device, + hr = wined3d_stateblock_set_ps_consts_i(device->update_state, reg_idx, count, (const struct wined3d_ivec4 *)data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_ps_consts_i(device->wined3d_device, + reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr;

1 0