January 2014 - Wine-commits

Bruno Jesus : programs: Add support to arguments with dash in taskkill.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 8a7687d868728bd3c9fe922562f5a78045f05242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7687d868728bd3c9fe92256… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 21 21:24:54 2014 -0200 programs: Add support to arguments with dash in taskkill. --- programs/taskkill/taskkill.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 18edec3..7f0e7ad 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -447,36 +447,46 @@ static BOOL add_to_task_list(WCHAR *name) * options are detected as parameters when placed after options that accept one. */ static BOOL process_arguments(int argc, WCHAR *argv[]) { - static const WCHAR slashForceTerminate[] = {'/','f',0}; - static const WCHAR slashImage[] = {'/','i','m',0}; - static const WCHAR slashPID[] = {'/','p','i','d',0}; - static const WCHAR slashHelp[] = {'/','?',0}; - static const WCHAR slashTerminateChildren[] = {'/','t',0}; + static const WCHAR opForceTerminate[] = {'f',0}; + static const WCHAR opImage[] = {'i','m',0}; + static const WCHAR opPID[] = {'p','i','d',0}; + static const WCHAR opHelp[] = {'?',0}; + static const WCHAR opTerminateChildren[] = {'t',0}; if (argc > 1) { int i; + WCHAR *argdata; BOOL has_im = FALSE, has_pid = FALSE; /* Only the lone help option is recognized. */ - if (argc == 2 && !strcmpW(slashHelp, argv[1])) + if (argc == 2) { - taskkill_message(STRING_USAGE); - exit(0); + argdata = argv[1]; + if ((*argdata == '/' || *argdata == '-') && !strcmpW(opHelp, argdata + 1)) + { + taskkill_message(STRING_USAGE); + exit(0); + } } for (i = 1; i < argc; i++) { int got_im = 0, got_pid = 0; - if (!strcmpiW(slashTerminateChildren, argv[i])) - WINE_FIXME("/T not supported\n"); - if (!strcmpiW(slashForceTerminate, argv[i])) + argdata = argv[i]; + if (*argdata != '/' && *argdata != '-') + goto invalid; + argdata++; + + if (!strcmpiW(opTerminateChildren, argdata)) + WINE_FIXME("argument T not supported\n"); + if (!strcmpiW(opForceTerminate, argdata)) force_termination = TRUE; /* Options /IM and /PID appear to behave identically, except for * the fact that they cannot be specified at the same time. */ - else if ((got_im = !strcmpiW(slashImage, argv[i])) || - (got_pid = !strcmpiW(slashPID, argv[i]))) + else if ((got_im = !strcmpiW(opImage, argdata)) || + (got_pid = !strcmpiW(opPID, argdata))) { if (!argv[i + 1]) { @@ -501,6 +511,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) } else { + invalid: taskkill_message(STRING_INVALID_OPTION); taskkill_message(STRING_USAGE); return FALSE;

1 0

Austin English : mscms: Make missing lcms2 an error, not a fixme.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 77f871ab7c6b5617e35580ef7d6d3d2c73c72ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f871ab7c6b5617e35580ef7… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 22 21:28:27 2014 -0800 mscms: Make missing lcms2 an error, not a fixme. --- dlls/mscms/mscms_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 4653cc7..e4c5f28 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -54,7 +54,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) #ifdef HAVE_LCMS2 cmsSetLogErrorHandler( lcms_error_handler ); #else - FIXME( "Wine was built without support for liblcms2, expect problems\n" ); + ERR( "Wine was built without support for liblcms2, expect problems\n" ); #endif break; case DLL_PROCESS_DETACH:

1 0

Sebastian Lackner : ntdll: Throw STATUS_RESOURCE_NOT_OWNED when it' s impossible to acquire/release the SRWLock.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 8ca96a9de0686431294030a7607de916d8ace9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca96a9de0686431294030a76… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jan 21 22:04:20 2014 +0100 ntdll: Throw STATUS_RESOURCE_NOT_OWNED when it's impossible to acquire/release the SRWLock. --- dlls/ntdll/sync.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 9e0395d..7d18d20 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1435,6 +1435,14 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu #define srwlock_key_shared(lock) (&lock->Ptr) #endif +static inline void srwlock_check_invalid( unsigned int val ) +{ + /* Throw exception if it's impossible to acquire/release this lock. */ + if ((val & SRWLOCK_MASK_EXCLUSIVE_QUEUE) == SRWLOCK_MASK_EXCLUSIVE_QUEUE || + (val & SRWLOCK_MASK_SHARED_QUEUE) == SRWLOCK_MASK_SHARED_QUEUE) + RtlRaiseStatus(STATUS_RESOURCE_NOT_OWNED); +} + static inline unsigned int srwlock_lock_exclusive( unsigned int *dest, int incr ) { unsigned int val, tmp; @@ -1445,6 +1453,7 @@ static inline unsigned int srwlock_lock_exclusive( unsigned int *dest, int incr for (val = *dest;; val = tmp) { tmp = val + incr; + srwlock_check_invalid( tmp ); if ((tmp & SRWLOCK_MASK_EXCLUSIVE_QUEUE) && !(tmp & SRWLOCK_MASK_SHARED_QUEUE)) tmp |= SRWLOCK_MASK_IN_EXCLUSIVE; if ((tmp = interlocked_cmpxchg( (int *)dest, tmp, val )) == val) @@ -1463,6 +1472,7 @@ static inline unsigned int srwlock_unlock_exclusive( unsigned int *dest, int inc for (val = *dest;; val = tmp) { tmp = val + incr; + srwlock_check_invalid( tmp ); if (!(tmp & SRWLOCK_MASK_EXCLUSIVE_QUEUE)) tmp &= SRWLOCK_MASK_SHARED_QUEUE; if ((tmp = interlocked_cmpxchg( (int *)dest, tmp, val )) == val)

1 0

Sebastian Lackner : ntdll: Implement RtlTryAcquireSRWLockShared/ Exclusive commands.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 899fc8d4eeb2f442eeed4ea122ac92f78208a994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=899fc8d4eeb2f442eeed4ea12… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jan 21 22:18:10 2014 +0100 ntdll: Implement RtlTryAcquireSRWLockShared/Exclusive commands. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/sync.c | 33 +++++++++++++++++++++++++++++++++ include/winternl.h | 2 ++ 3 files changed, 37 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2e507bb..4140ff9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -891,6 +891,8 @@ # @ stub RtlTraceDatabaseLock # @ stub RtlTraceDatabaseUnlock # @ stub RtlTraceDatabaseValidate +@ stdcall RtlTryAcquireSRWLockExclusive(ptr) +@ stdcall RtlTryAcquireSRWLockShared(ptr) @ stdcall RtlTryEnterCriticalSection(ptr) @ cdecl -i386 -norelay RtlUlongByteSwap() NTDLL_RtlUlongByteSwap @ cdecl -ret64 RtlUlonglongByteSwap(int64) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 7d18d20..6404ac5 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1535,6 +1535,10 @@ void WINAPI RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) /*********************************************************************** * RtlAcquireSRWLockShared (NTDLL.@) + * + * NOTES + * Do not call this function recursively - it will only succeed when + * there are no threads waiting for an exclusive lock! */ void WINAPI RtlAcquireSRWLockShared( RTL_SRWLOCK *lock ) { @@ -1583,6 +1587,35 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) } /*********************************************************************** + * RtlTryAcquireSRWLockExclusive (NTDLL.@) + * + * NOTES + * Similar to AcquireSRWLockExclusive recusive calls are not allowed + * and will fail with return value FALSE. + */ +BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) +{ + return interlocked_cmpxchg( (int *)&lock->Ptr, SRWLOCK_MASK_IN_EXCLUSIVE | + SRWLOCK_RES_EXCLUSIVE, 0 ) == 0; +} + +/*********************************************************************** + * RtlTryAcquireSRWLockShared (NTDLL.@) + */ +BOOLEAN WINAPI RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) +{ + unsigned int val, tmp; + for (val = *(unsigned int *)&lock->Ptr;; val = tmp) + { + if (val & SRWLOCK_MASK_EXCLUSIVE_QUEUE) + return FALSE; + if ((tmp = interlocked_cmpxchg( (int *)&lock->Ptr, val + SRWLOCK_RES_SHARED, val )) == val) + break; + } + return TRUE; +} + +/*********************************************************************** * RtlInitializeConditionVariable (NTDLL.@) * * Initializes the condition variable with NULL. diff --git a/include/winternl.h b/include/winternl.h index c840732..d3a02bf 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2512,6 +2512,8 @@ NTSYSAPI BOOLEAN WINAPI RtlTimeFieldsToTime(PTIME_FIELDS,PLARGE_INTEGER); NTSYSAPI void WINAPI RtlTimeToElapsedTimeFields(const LARGE_INTEGER *,PTIME_FIELDS); NTSYSAPI BOOLEAN WINAPI RtlTimeToSecondsSince1970(const LARGE_INTEGER *,LPDWORD); NTSYSAPI BOOLEAN WINAPI RtlTimeToSecondsSince1980(const LARGE_INTEGER *,LPDWORD); +NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive(RTL_SRWLOCK *); +NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockShared(RTL_SRWLOCK *); NTSYSAPI BOOL WINAPI RtlTryEnterCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG); NTSYSAPI DWORD WINAPI RtlUnicodeStringToAnsiSize(const UNICODE_STRING*);

1 0

Sebastian Lackner : kernel32: Forward TryAcquireSRWLockShared/ Exclusive to ntdll.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 60c0637f62812456c35f227ebca40a50a5c35c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c0637f62812456c35f227eb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 00:36:20 2014 +0100 kernel32: Forward TryAcquireSRWLockShared/Exclusive to ntdll. --- dlls/kernel32/kernel32.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 02b1bdb..3bb4255 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1219,6 +1219,8 @@ @ stdcall TransactNamedPipe(long ptr long ptr long ptr ptr) @ stdcall TransmitCommChar(long long) @ stub TrimVirtualBuffer +@ stdcall TryAcquireSRWLockExclusive(ptr) ntdll.RtlTryAcquireSRWLockExclusive +@ stdcall TryAcquireSRWLockShared(ptr) ntdll.RtlTryAcquireSRWLockShared @ stdcall TryEnterCriticalSection(ptr) ntdll.RtlTryEnterCriticalSection @ stdcall TzSpecificLocalTimeToSystemTime(ptr ptr ptr) @ stdcall -i386 -private UTRegister(long str str str ptr ptr ptr) krnl386.exe16.UTRegister

1 0

Sebastian Lackner : kernel32/tests: Add tests for TryAcquireSRWLockExclusive/Shared.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: e7b3a43759fffd1dc921fb9a953526fc33beac6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b3a43759fffd1dc921fb9a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 00:37:28 2014 +0100 kernel32/tests: Add tests for TryAcquireSRWLockExclusive/Shared. --- dlls/kernel32/tests/sync.c | 207 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7b3a43759fffd1dc921f…

1 0

Sebastian Lackner : ntdll: Implement RtlSleepConditionVariableSRW.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: fad29fc5d997cfc13d75c0a5b5563c85188ba2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad29fc5d997cfc13d75c0a5b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 01:05:15 2014 +0100 ntdll: Implement RtlSleepConditionVariableSRW. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/sync.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 3 files changed, 46 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4140ff9..3c751ea 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -869,6 +869,7 @@ @ stub RtlSetUserValueHeap @ stdcall RtlSizeHeap(long long ptr) @ stdcall RtlSleepConditionVariableCS(ptr ptr ptr) +@ stdcall RtlSleepConditionVariableSRW(ptr ptr ptr long) @ stub RtlSplay @ stub RtlStartRXact # @ stub RtlStatMemoryStream diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 6404ac5..8ef16cc 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1696,3 +1696,47 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R RtlEnterCriticalSection( crit ); return status; } + +/*********************************************************************** + * RtlSleepConditionVariableSRW (NTDLL.@) + * + * Atomically releases the SRWLock and suspends the thread, + * waiting for a Wake(All)ConditionVariable event. Afterwards it enters + * the SRWLock again with the same access rights and returns. + * + * PARAMS + * variable [I/O] condition variable + * lock [I/O] SRWLock to leave temporarily + * timeout [I] timeout + * flags [I] type of the current lock (exclusive / shared) + * + * RETURNS + * see NtWaitForKeyedEvent for all possible return values. + * + * NOTES + * the behaviour is undefined if the thread doesn't own the lock. + */ +NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, + const LARGE_INTEGER *timeout, ULONG flags ) +{ + NTSTATUS status; + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + if (status != STATUS_SUCCESS) + { + if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + return status; +} diff --git a/include/winternl.h b/include/winternl.h index d3a02bf..22ee8e8 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2503,6 +2503,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); NTSYSAPI SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableCS(RTL_CONDITION_VARIABLE*,RTL_CRITICAL_SECTION*,const LARGE_INTEGER*); +NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableSRW(RTL_CONDITION_VARIABLE*,RTL_SRWLOCK*,const LARGE_INTEGER*,ULONG); NTSYSAPI NTSTATUS WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING); NTSYSAPI LPDWORD WINAPI RtlSubAuthoritySid(PSID,DWORD); NTSYSAPI LPBYTE WINAPI RtlSubAuthorityCountSid(PSID);

1 0

Sebastian Lackner : kernel32: Forward SleepConditionVariableSRW to ntdll.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 72cf5d6f12daafc69c4b50f7803613d5fd6ba65d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72cf5d6f12daafc69c4b50f78… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 01:09:49 2014 +0100 kernel32: Forward SleepConditionVariableSRW to ntdll. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/sync.c | 18 ++++++++++++++++++ include/winbase.h | 1 + 3 files changed, 20 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3bb4255..f7f3320 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1196,6 +1196,7 @@ @ stdcall SizeofResource(long long) @ stdcall Sleep(long) @ stdcall SleepConditionVariableCS(ptr ptr long) +@ stdcall SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) @ stdcall SuspendThread(long) @ stdcall SwitchToFiber(ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 2b7f4b0..f77637c 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2339,3 +2339,21 @@ BOOL WINAPI SleepConditionVariableCS( CONDITION_VARIABLE *variable, CRITICAL_SEC } return TRUE; } + +/*********************************************************************** + * SleepConditionVariableSRW (KERNEL32.@) + */ +BOOL WINAPI SleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, DWORD timeout, ULONG flags ) +{ + NTSTATUS status; + LARGE_INTEGER time; + + status = RtlSleepConditionVariableSRW( variable, lock, get_nt_timeout( &time, timeout ), flags ); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; +} diff --git a/include/winbase.h b/include/winbase.h index 3c620e4..2d01c45 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2363,6 +2363,7 @@ WINBASEAPI DWORD WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL); WINBASEAPI DWORD WINAPI SizeofResource(HMODULE,HRSRC); WINBASEAPI VOID WINAPI Sleep(DWORD); WINBASEAPI BOOL WINAPI SleepConditionVariableCS(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); +WINBASEAPI BOOL WINAPI SleepConditionVariableSRW(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); WINBASEAPI DWORD WINAPI SleepEx(DWORD,BOOL); WINBASEAPI DWORD WINAPI SuspendThread(HANDLE); WINBASEAPI void WINAPI SwitchToFiber(LPVOID);

1 0

Sebastian Lackner : kernel32/tests: Add tests for SleepConditionVariableSRW.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 2ff6bd271bca5110d4531f03f32337d820715a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff6bd271bca5110d4531f03f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 26 01:29:04 2014 +0100 kernel32/tests: Add tests for SleepConditionVariableSRW. --- dlls/kernel32/tests/sync.c | 91 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 61dd7e1..74f1a84 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -44,6 +44,7 @@ static BOOL (WINAPI *pInitOnceComplete)(PINIT_ONCE,DWORD,LPVOID); static VOID (WINAPI *pInitializeConditionVariable)(PCONDITION_VARIABLE); static BOOL (WINAPI *pSleepConditionVariableCS)(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); +static BOOL (WINAPI *pSleepConditionVariableSRW)(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); static VOID (WINAPI *pWakeAllConditionVariable)(PCONDITION_VARIABLE); static VOID (WINAPI *pWakeConditionVariable)(PCONDITION_VARIABLE); @@ -1547,6 +1548,7 @@ static void test_condvars_consumer_producer(void) static DWORD condvar_seq = 0; static CONDITION_VARIABLE condvar_base = CONDITION_VARIABLE_INIT; static CRITICAL_SECTION condvar_crit; +static SRWLOCK condvar_srwlock; /* Sequence of wake/sleep to check boundary conditions: * 0: init @@ -1558,7 +1560,14 @@ static CRITICAL_SECTION condvar_crit; * 6: a wakeall is handed to a SleepConditionVariableCS * 7: sleep after above should timeout * 8: wake with crit section locked into the sleep timeout - * 9: end + * + * the following tests will only be executed if InitializeSRWLock is available + * + * 9: producer (exclusive) wakes up consumer (exclusive) + * 10: producer (exclusive) wakes up consumer (shared) + * 11: producer (shared) wakes up consumer (exclusive) + * 12: producer (shared) wakes up consumer (shared) + * 13: end */ static DWORD WINAPI condvar_base_producer(LPVOID x) { while (condvar_seq < 1) Sleep(1); @@ -1585,6 +1594,31 @@ static DWORD WINAPI condvar_base_producer(LPVOID x) { Sleep(50); LeaveCriticalSection (&condvar_crit); + /* skip over remaining tests if InitializeSRWLock is not available */ + if (!pInitializeSRWLock) + return 0; + + while (condvar_seq < 9) Sleep(1); + pAcquireSRWLockExclusive(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockExclusive(&condvar_srwlock); + + while (condvar_seq < 10) Sleep(1); + pAcquireSRWLockExclusive(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockExclusive(&condvar_srwlock); + + while (condvar_seq < 11) Sleep(1); + pAcquireSRWLockShared(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockShared(&condvar_srwlock); + + while (condvar_seq < 12) Sleep(1); + Sleep(50); /* ensure that consumer waits for cond variable */ + pAcquireSRWLockShared(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockShared(&condvar_srwlock); + return 0; } @@ -1634,8 +1668,40 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 20); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should still return TRUE on crit unlock delay\n"); - condvar_seq = 9; + /* skip over remaining tests if InitializeSRWLock is not available */ + if (!pInitializeSRWLock) + { + win_skip("no srw lock support.\n"); + condvar_seq = 13; /* end */ + return 0; + } + + pAcquireSRWLockExclusive(&condvar_srwlock); + condvar_seq = 9; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + pReleaseSRWLockExclusive(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + pAcquireSRWLockShared(&condvar_srwlock); + condvar_seq = 10; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + pReleaseSRWLockShared(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + pAcquireSRWLockExclusive(&condvar_srwlock); + condvar_seq = 11; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + pReleaseSRWLockExclusive(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + pAcquireSRWLockShared(&condvar_srwlock); + condvar_seq = 12; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + pReleaseSRWLockShared(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + condvar_seq = 13; return 0; } @@ -1653,6 +1719,9 @@ static void test_condvars_base(void) { InitializeCriticalSection (&condvar_crit); + if (pInitializeSRWLock) + pInitializeSRWLock(&condvar_srwlock); + EnterCriticalSection (&condvar_crit); ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); @@ -1660,6 +1729,23 @@ static void test_condvars_base(void) { ok (!ret, "SleepConditionVariableCS should return FALSE on untriggered condvar\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); + if (pInitializeSRWLock) + { + pAcquireSRWLockExclusive(&condvar_srwlock); + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, 0); + pReleaseSRWLockExclusive(&condvar_srwlock); + + ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); + ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); + + pAcquireSRWLockShared(&condvar_srwlock); + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); + pReleaseSRWLockShared(&condvar_srwlock); + + ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); + ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); + } + hp = CreateThread(NULL, 0, condvar_base_producer, NULL, 0, &dummy); hc = CreateThread(NULL, 0, condvar_base_consumer, NULL, 0, &dummy); @@ -2216,6 +2302,7 @@ START_TEST(sync) pInitOnceComplete = (void *)GetProcAddress(hdll, "InitOnceComplete"); pInitializeConditionVariable = (void *)GetProcAddress(hdll, "InitializeConditionVariable"); pSleepConditionVariableCS = (void *)GetProcAddress(hdll, "SleepConditionVariableCS"); + pSleepConditionVariableSRW = (void *)GetProcAddress(hdll, "SleepConditionVariableSRW"); pWakeAllConditionVariable = (void *)GetProcAddress(hdll, "WakeAllConditionVariable"); pWakeConditionVariable = (void *)GetProcAddress(hdll, "WakeConditionVariable"); pInitializeSRWLock = (void *)GetProcAddress(hdll, "InitializeSRWLock");

1 0

Bruno Jesus : user32: Cope with null LPMENUITEMINFO in SetMenuItemInfo.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 06a6b189f6c9712e64f3f7da908403f410295785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a6b189f6c9712e64f3f7da9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 18 12:59:01 2014 -0200 user32: Cope with null LPMENUITEMINFO in SetMenuItemInfo. --- dlls/user32/menu.c | 4 ++-- dlls/user32/tests/menu.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 50545ee..bbaa5f3 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4795,8 +4795,8 @@ static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, MENUITEMINFOW *pmii_out ) { /* do we recognize the size? */ - if( pmii_in->cbSize != sizeof( MENUITEMINFOW) && - pmii_in->cbSize != sizeof( MENUITEMINFOW) - sizeof( pmii_in->hbmpItem)) { + if( !pmii_in || (pmii_in->cbSize != sizeof( MENUITEMINFOW) && + pmii_in->cbSize != sizeof( MENUITEMINFOW) - sizeof( pmii_in->hbmpItem)) ) { SetLastError( ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 20126d4..d02eb91 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -948,6 +948,19 @@ static void test_menu_add_string( void ) ok (!lstrcmpW( strbackW, expectedString ), "Menu text from Unicode version incorrect\n"); } + /* Just try some invalid parameter tests */ + SetLastError(0xdeadbeef); + rc = SetMenuItemInfoA( hmenu, 0, TRUE, NULL ); + ret = GetLastError(); + ok (!rc, "SetMenuItemInfoA succeeded unexpectedly\n"); + ok (ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + + SetLastError(0xdeadbeef); + rc = SetMenuItemInfoA( hmenu, 0, FALSE, NULL ); + ret = GetLastError(); + ok (!rc, "SetMenuItemInfoA succeeded unexpectedly\n"); + ok (ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + /* Just change ftype to string and see what text is stored */ memset(&info, 0x00, sizeof(info)); info.cbSize= sizeof(MENUITEMINFOA);

1 0