May 2019 - Wine-devel - list.winehq.org

[PATCH 4/5] server: Associate create and close IRPs with current thread.
by Jacek Caban 30 May '19

30 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ server/device.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

2 1

[PATCH 3/5] ntoskrnl.exe: Dispatch server IRPs in critical region.
by Jacek Caban 30 May '19

30 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ dlls/ntoskrnl.exe/tests/driver.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)

2 1

[PATCH 1/5] ntoskrnl.exe: Implement KeAreApcsDisabled.
by Jacek Caban 30 May '19

30 May '19

From: Derek Lesho <dereklesho52(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 16 ++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/tests/driver.c | 23 +++++++++++++++++++++++ include/ddk/ntddk.h | 1 + 5 files changed, 40 insertions(+), 3 deletions(-)

2 1

[PATCH 1/3] mf: Maintain sample grabber sink state.
by Nikolay Sivov 30 May '19

30 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 68 ++++++++++++++++++++++++++++++++++++----- include/mfidl.idl | 3 ++ 2 files changed, 63 insertions(+), 8 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index d501e0865d..e2766c086c 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -28,6 +28,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +enum sink_state +{ + SINK_STATE_STOPPED = 0, + SINK_STATE_RUNNING, +}; + struct sample_grabber; struct sample_grabber_stream @@ -51,6 +57,7 @@ struct sample_grabber struct sample_grabber_stream *stream; IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; + enum sink_state state; CRITICAL_SECTION cs; }; @@ -685,32 +692,77 @@ static ULONG WINAPI sample_grabber_clock_sink_Release(IMFClockStateSink *iface) return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); } +static void sample_grabber_set_state(struct sample_grabber *grabber, enum sink_state state) +{ + static const DWORD events[] = + { + MEStreamSinkStopped, /* SINK_STATE_STOPPED */ + MEStreamSinkStarted, /* SINK_STATE_RUNNING */ + }; + BOOL set_state = FALSE; + + EnterCriticalSection(&grabber->cs); + + switch (grabber->state) + { + case SINK_STATE_STOPPED: + set_state = state == SINK_STATE_RUNNING; + break; + case SINK_STATE_RUNNING: + set_state = state == SINK_STATE_STOPPED; + break; + default: + ; + } + + if (set_state) + { + grabber->state = state; + if (grabber->stream) + IMFStreamSink_QueueEvent(&grabber->stream->IMFStreamSink_iface, events[state], &GUID_NULL, S_OK, NULL); + } + + LeaveCriticalSection(&grabber->cs); +} + static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) { - FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(systime), wine_dbgstr_longlong(offset)); + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(systime), wine_dbgstr_longlong(offset)); + + sample_grabber_set_state(grabber, SINK_STATE_RUNNING); + + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + sample_grabber_set_state(grabber, SINK_STATE_STOPPED); + + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + sample_grabber_set_state(grabber, SINK_STATE_RUNNING); + + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) diff --git a/include/mfidl.idl b/include/mfidl.idl index 2421c06f50..93e20a6978 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -820,3 +820,6 @@ cpp_quote("EXTERN_GUID(MF_TOPOLOGY_START_TIME_ON_PRESENTATION_SWITCH, 0xc8cc113f cpp_quote("EXTERN_GUID(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS, 0xb86cac42, 0x41a6, 0x4b79, 0x89, 0x7a, 0x1a, 0xb0, 0xe5, 0x2b, 0x4a, 0x1b);") cpp_quote("EXTERN_GUID(MF_RATE_CONTROL_SERVICE, 0x866fa297, 0xb802, 0x4bf8, 0x9d, 0xc9, 0x5e, 0x3b, 0x6a, 0x9f, 0x53, 0xc9);") + +cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, 0x62e3d776, 0x8100, 0x4e03, 0xa6, 0xe8, 0xbd, 0x38, 0x57, 0xac, 0x9c, 0x47);") +cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 0x0efda2c0, 0x2b69, 0x4e2e, 0xab, 0x8d, 0x46, 0xdc, 0xbf, 0xf7, 0xd2, 0x5d);") -- 2.20.1

1 2

[PATCH 2/5] server: Use current thread for IRP calls without associated thread.
by Jacek Caban 30 May '19

30 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/device.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[PATCH resend 1/2] comctl32/listbox: Don't try to paint non-visible items for multi-column listboxes
by Gabriel Ivăncescu 30 May '19

30 May '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Although these were reviewed and signed off by Nikolay, they slipped through the cracks, so they have been resent. I hope that's not an issue. dlls/comctl32/listbox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index e71b34d..8fd556c 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1148,6 +1148,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) rect.right += descr->column_width; rect.top = 0; col_pos = descr->page_size - 1; + if (rect.left >= descr->width) break; } else { -- 2.21.0

2 2

[PATCH] advapi32: Implement LookupAccountSidLocalA/W.
by Andrey Gusev 30 May '19

30 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47286 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/advapi32/advapi32.spec | 2 ++ dlls/advapi32/security.c | 30 +++++++++++++++++++ .../api-ms-win-security-lsalookup-l1-1-0.spec | 4 +-- include/winbase.h | 3 ++ 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index a97161fa27..06c4f8f696 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -430,6 +430,8 @@ @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 802743401a..2030ebf638 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2315,6 +2315,21 @@ LookupAccountSidA( return r; } +/****************************************************************************** + * LookupAccountSidLocalA [ADVAPI32.@] + */ +BOOL WINAPI +LookupAccountSidLocalA( + PSID sid, + LPSTR account, + LPDWORD accountSize, + LPSTR domain, + LPDWORD domainSize, + PSID_NAME_USE name_use ) +{ + return LookupAccountSidA(NULL, sid, account, accountSize, domain, domainSize, name_use); +} + /****************************************************************************** * LookupAccountSidW [ADVAPI32.@] * @@ -2491,6 +2506,21 @@ LookupAccountSidW( return FALSE; } +/****************************************************************************** + * LookupAccountSidLocalW [ADVAPI32.@] + */ +BOOL WINAPI +LookupAccountSidLocalW( + PSID sid, + LPWSTR account, + LPDWORD accountSize, + LPWSTR domain, + LPDWORD domainSize, + PSID_NAME_USE name_use ) +{ + return LookupAccountSidW(NULL, sid, account, accountSize, domain, domainSize, name_use); +} + /****************************************************************************** * SetFileSecurityA [ADVAPI32.@] * diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec index 9b452656b0..6e9e6edc95 100644 --- a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec +++ b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec @@ -1,7 +1,7 @@ @ stub LookupAccountNameLocalA @ stub LookupAccountNameLocalW -@ stub LookupAccountSidLocalA -@ stub LookupAccountSidLocalW +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalA +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalW @ stub LsaLookupClose @ stub LsaLookupFreeMemory @ stub LsaLookupGetDomainInfo diff --git a/include/winbase.h b/include/winbase.h index 8b2eb2ccac..44bfe98c04 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2430,6 +2430,9 @@ WINADVAPI BOOL WINAPI LookupAccountNameW(LPCWSTR,LPCWSTR,PSID,LPDWORD,LP WINADVAPI BOOL WINAPI LookupAccountSidA(LPCSTR,PSID,LPSTR,LPDWORD,LPSTR,LPDWORD,PSID_NAME_USE); WINADVAPI BOOL WINAPI LookupAccountSidW(LPCWSTR,PSID,LPWSTR,LPDWORD,LPWSTR,LPDWORD,PSID_NAME_USE); #define LookupAccountSid WINELIB_NAME_AW(LookupAccountSid) +WINADVAPI BOOL WINAPI LookupAccountSidLocalA(PSID,LPSTR,LPDWORD,LPSTR,LPDWORD,PSID_NAME_USE); +WINADVAPI BOOL WINAPI LookupAccountSidLocalW(PSID,LPWSTR,LPDWORD,LPWSTR,LPDWORD,PSID_NAME_USE); +#define LookupAccountSidLocal WINELIB_NAME_AW(LookupAccountSidLocal) WINBASEAPI BOOL WINAPI LocalFileTimeToFileTime(const FILETIME*,LPFILETIME); WINBASEAPI BOOL WINAPI LockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI LockFileEx(HANDLE, DWORD, DWORD, DWORD, DWORD, LPOVERLAPPED); -- 2.21.0

1 0

[PATCH v2 1/3] ntdll: Separate NtGetTickCount from get_tick_count64.
by Andrew Wesie 30 May '19

30 May '19

Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/ntdll/ntdll.spec | 7 +++++-- dlls/ntdll/ntdll_misc.h | 3 --- dlls/ntdll/time.c | 8 ++++++-- include/winternl.h | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 050ebc7..4ffb3c9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -194,7 +194,7 @@ @ stdcall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState @ stub NtGetPlugPlayEvent -@ stdcall -ret64 NtGetTickCount() get_tick_count64 +@ stdcall NtGetTickCount() @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @ stdcall NtImpersonateAnonymousToken(long) @ stub NtImpersonateClientOfPort @@ -1142,7 +1142,7 @@ @ stdcall -private ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber # @ stub ZwGetDevicePowerState @ stub ZwGetPlugPlayEvent -@ stdcall -private -ret64 ZwGetTickCount() get_tick_count64 +@ stdcall -private ZwGetTickCount() NtGetTickCount @ stdcall -private ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch @ stdcall -private ZwImpersonateAnonymousToken(long) NtImpersonateAnonymousToken @ stub ZwImpersonateClientOfPort @@ -1529,3 +1529,6 @@ # Filesystem @ cdecl wine_nt_to_unix_file_name(ptr ptr long long) @ cdecl wine_unix_to_nt_file_name(ptr ptr) + +# Time +@ cdecl -ret64 wine_get_tick_count64() diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 2d83f54..72510b1c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -269,7 +269,4 @@ void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); int __cdecl NTDLL_tolower( int c ); int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ); -/* time functions */ -ULONGLONG WINAPI get_tick_count64( void ); -#define NtGetTickCount get_tick_count64 #endif diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 41e4563..d3853e0 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -552,14 +552,18 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER return STATUS_SUCCESS; } +ULONGLONG CDECL wine_get_tick_count64(void) +{ + return monotonic_counter() / TICKSPERMSEC; +} /****************************************************************************** * NtGetTickCount (NTDLL.@) * ZwGetTickCount (NTDLL.@) */ -ULONGLONG WINAPI DECLSPEC_HOTPATCH get_tick_count64(void) +ULONG WINAPI NtGetTickCount(void) { - return monotonic_counter() / TICKSPERMSEC; + return wine_get_tick_count64(); } /* calculate the mday of dst change date, so that for instance Sun 5 Oct 2007 diff --git a/include/winternl.h b/include/winternl.h index e7f89b0..921386d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2946,6 +2946,7 @@ NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL); NTSYSAPI NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret, UINT disposition, BOOLEAN check_case ); NTSYSAPI NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt ); +NTSYSAPI ULONGLONG CDECL wine_get_tick_count64( void ); /*********************************************************************** -- 2.1.4

4 7

[PATCH 2/2] oledb32/tests: Add conversion tests to DBTYPE_I1. [v2]
by Owen Rudge 30 May '19

30 May '19

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/oledb32/tests/convert.c | 312 +++++++++++++++++++++++++++++++++++ 1 file changed, 312 insertions(+)

1 0

[PATCH 1/2] oledb32: Implement support for converting to DBTYPE_I1. [v2]
by Owen Rudge 30 May '19

30 May '19

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/oledb32/convert.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)

1 0