wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Alexandre Julliard : kernel32: Move named pipe functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: bc28ed4c6c626f918f1b6f92e7e44f9694b12c10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc28ed4c6c626f918f1b6f92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 19:28:32 2019 +0200 kernel32: Move named pipe functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 18 +- dlls/kernel32/sync.c | 439 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 18 +- dlls/kernelbase/sync.c | 360 ++++++++++++++++++++++++++++++++ 4 files changed, 378 insertions(+), 457 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc28ed4c6c626f918f1b…

1 0

Alexandre Julliard : kernel32: Move I/ O completion functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 1834d9e9fe20f7e01e68c481a6a5e49c27f4f3a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1834d9e9fe20f7e01e68c481… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 18:45:06 2019 +0200 kernel32: Move I/O completion functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 8 +-- dlls/kernel32/sync.c | 115 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 8 +-- dlls/kernelbase/sync.c | 109 +++++++++++++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1834d9e9fe20f7e01e68…

1 0

Alexandre Julliard : kernel32: Move condition variable functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 9585990a46442a36dd0ecca770847f0b56966eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=9585990a46442a36dd0ecca7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 17:15:13 2019 +0200 kernel32: Move condition variable functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/sync.c | 36 ------------------------------------ dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/kernelbase/sync.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bd4f551..c42ec44 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1482,8 +1482,8 @@ @ stdcall SignalObjectAndWait(long long long long) @ stdcall SizeofResource(long long) @ stdcall Sleep(long) -@ stdcall SleepConditionVariableCS(ptr ptr long) -@ stdcall SleepConditionVariableSRW(ptr ptr long long) +@ stdcall -import SleepConditionVariableCS(ptr ptr long) +@ stdcall -import SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) # @ stub SortCloseHandle # @ stub SortGetHandle diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 036bf85..be92aee 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1875,39 +1875,3 @@ __ASM_STDCALL_FUNC(InterlockedDecrement, 4, "ret $4") #endif /* __i386__ */ - -/*********************************************************************** - * SleepConditionVariableCS (KERNEL32.@) - */ -BOOL WINAPI SleepConditionVariableCS( CONDITION_VARIABLE *variable, CRITICAL_SECTION *crit, DWORD timeout ) -{ - NTSTATUS status; - LARGE_INTEGER time; - - status = RtlSleepConditionVariableCS( variable, crit, get_nt_timeout( &time, timeout ) ); - - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - 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/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7851675..52982b2 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1512,8 +1512,8 @@ @ stdcall SignalObjectAndWait(long long long long) kernel32.SignalObjectAndWait @ stdcall SizeofResource(long long) kernel32.SizeofResource @ stdcall Sleep(long) kernel32.Sleep -@ stdcall SleepConditionVariableCS(ptr ptr long) kernel32.SleepConditionVariableCS -@ stdcall SleepConditionVariableSRW(ptr ptr long long) kernel32.SleepConditionVariableSRW +@ stdcall SleepConditionVariableCS(ptr ptr long) +@ stdcall SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) kernel32.SleepEx @ stub SpecialMBToWC @ stub StartThreadpoolIo diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 5ab9005..ba64b85 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -45,6 +45,14 @@ static inline BOOL is_version_nt(void) return !(GetVersion() & 0x80000000); } +/* helper for kernel32->ntdll timeout format conversion */ +static inline LARGE_INTEGER *get_nt_timeout( LARGE_INTEGER *time, DWORD timeout ) +{ + if (timeout == INFINITE) return NULL; + time->QuadPart = (ULONGLONG)timeout * -10000; + return time; +} + /*********************************************************************** * BaseGetNamedObjectDirectory (kernelbase.@) @@ -719,3 +727,33 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileMappingW( DWORD access, BOOL inherit, LP } return ret; } + + +/*********************************************************************** + * Condition variables + ***********************************************************************/ + + +/*********************************************************************** + * SleepConditionVariableCS (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SleepConditionVariableCS( CONDITION_VARIABLE *variable, + CRITICAL_SECTION *crit, DWORD timeout ) +{ + LARGE_INTEGER time; + + return set_ntstatus( RtlSleepConditionVariableCS( variable, crit, get_nt_timeout( &time, timeout ))); +} + + +/*********************************************************************** + * SleepConditionVariableSRW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, DWORD timeout, ULONG flags ) +{ + LARGE_INTEGER time; + + return set_ntstatus( RtlSleepConditionVariableSRW( variable, lock, + get_nt_timeout( &time, timeout ), flags )); +}

1 0

Alexandre Julliard : kernel32: Move file mapping functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 628d4450cdd84230780235f78798ab47bd2e2ab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=628d4450cdd84230780235f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 17:01:01 2019 +0200 kernel32: Move file mapping functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/sync.c | 97 -------------------------------------- dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/sync.c | 102 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 101 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3f3f903..bd4f551 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -285,7 +285,7 @@ @ stdcall CreateFileMappingA(long ptr long long long str) # @ stub CreateFileMappingNumaA # @ stub CreateFileMappingNumaW -@ stdcall CreateFileMappingW(long ptr long long long wstr) +@ stdcall -import CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) @ stdcall CreateHardLinkA(str str ptr) @ stdcall CreateHardLinkTransactedA(str str ptr ptr) @@ -1117,7 +1117,7 @@ @ stdcall OpenFile(str ptr long) @ stdcall OpenFileById(long ptr long long ptr long) @ stdcall OpenFileMappingA(long long str) -@ stdcall OpenFileMappingW(long long wstr) +@ stdcall -import OpenFileMappingW(long long wstr) @ stdcall OpenJobObjectA(long long str) @ stdcall OpenJobObjectW(long long wstr) @ stdcall OpenMutexA(long long str) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 7667af9..036bf85 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -663,73 +663,6 @@ HANDLE WINAPI CreateFileMappingA( HANDLE file, SECURITY_ATTRIBUTES *sa, DWORD pr /*********************************************************************** - * CreateFileMappingW (KERNEL32.@) - */ -HANDLE WINAPI CreateFileMappingW( HANDLE file, LPSECURITY_ATTRIBUTES sa, DWORD protect, - DWORD size_high, DWORD size_low, LPCWSTR name ) -{ - static const int sec_flags = (SEC_FILE | SEC_IMAGE | SEC_RESERVE | SEC_COMMIT | - SEC_NOCACHE | SEC_WRITECOMBINE | SEC_LARGE_PAGES); - HANDLE ret; - NTSTATUS status; - DWORD access, sec_type; - LARGE_INTEGER size; - UNICODE_STRING nameW; - OBJECT_ATTRIBUTES attr; - - sec_type = protect & sec_flags; - protect &= ~sec_flags; - if (!sec_type) sec_type = SEC_COMMIT; - - /* Win9x compatibility */ - if (!protect && !is_version_nt()) protect = PAGE_READONLY; - - switch(protect) - { - case PAGE_READONLY: - case PAGE_WRITECOPY: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ; - break; - case PAGE_READWRITE: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE; - break; - case PAGE_EXECUTE_READ: - case PAGE_EXECUTE_WRITECOPY: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE; - break; - case PAGE_EXECUTE_READWRITE: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; - break; - default: - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - - size.u.LowPart = size_low; - size.u.HighPart = size_high; - - if (file == INVALID_HANDLE_VALUE) - { - file = 0; - if (!size.QuadPart) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - } - - get_create_object_attributes( &attr, &nameW, sa, name ); - - status = NtCreateSection( &ret, access, &attr, &size, protect, sec_type, file ); - if (status == STATUS_OBJECT_NAME_EXISTS) - SetLastError( ERROR_ALREADY_EXISTS ); - else - SetLastError( RtlNtStatusToDosError(status) ); - return ret; -} - - -/*********************************************************************** * OpenFileMappingA (KERNEL32.@) */ HANDLE WINAPI OpenFileMappingA( DWORD access, BOOL inherit, LPCSTR name ) @@ -747,36 +680,6 @@ HANDLE WINAPI OpenFileMappingA( DWORD access, BOOL inherit, LPCSTR name ) } -/*********************************************************************** - * OpenFileMappingW (KERNEL32.@) - */ -HANDLE WINAPI OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name ) -{ - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - HANDLE ret; - NTSTATUS status; - - if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; - - if (access == FILE_MAP_COPY) access = SECTION_MAP_READ; - - if (!is_version_nt()) - { - /* win9x doesn't do access checks, so try with full access first */ - if (!NtOpenSection( &ret, access | SECTION_MAP_READ | SECTION_MAP_WRITE, &attr )) return ret; - } - - status = NtOpenSection( &ret, access, &attr ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return 0; - } - return ret; -} - - /* * Pipes */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e9fa0d2..7851675 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -189,7 +189,7 @@ @ stdcall CreateFileA(str long long ptr long long long) kernel32.CreateFileA # @ stub CreateFileMappingFromApp @ stub CreateFileMappingNumaW -@ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW +@ stdcall CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) kernel32.CreateFileW @ stdcall CreateHardLinkA(str str ptr) kernel32.CreateHardLinkA @ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW @@ -985,7 +985,7 @@ @ stdcall OpenEventW(long long wstr) @ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById # @ stub OpenFileMappingFromApp -@ stdcall OpenFileMappingW(long long wstr) kernel32.OpenFileMappingW +@ stdcall OpenFileMappingW(long long wstr) # @ stub OpenGlobalizationUserSettingsKey @ stdcall OpenMutexW(long long wstr) # @ stub OpenPackageInfoByFullName diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 21ba6d2..5ab9005 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -617,3 +617,105 @@ BOOL WINAPI DECLSPEC_HOTPATCH InitializeCriticalSectionEx( CRITICAL_SECTION *cri if (ret) RtlRaiseStatus( ret ); return !ret; } + + +/*********************************************************************** + * File mappings + ***********************************************************************/ + + +/*********************************************************************** + * CreateFileMappingW (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileMappingW( HANDLE file, LPSECURITY_ATTRIBUTES sa, DWORD protect, + DWORD size_high, DWORD size_low, LPCWSTR name ) +{ + static const int sec_flags = (SEC_FILE | SEC_IMAGE | SEC_RESERVE | SEC_COMMIT | + SEC_NOCACHE | SEC_WRITECOMBINE | SEC_LARGE_PAGES); + HANDLE ret; + NTSTATUS status; + DWORD access, sec_type; + LARGE_INTEGER size; + UNICODE_STRING nameW; + OBJECT_ATTRIBUTES attr; + + sec_type = protect & sec_flags; + protect &= ~sec_flags; + if (!sec_type) sec_type = SEC_COMMIT; + + /* Win9x compatibility */ + if (!protect && !is_version_nt()) protect = PAGE_READONLY; + + switch(protect) + { + case PAGE_READONLY: + case PAGE_WRITECOPY: + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ; + break; + case PAGE_READWRITE: + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE; + break; + case PAGE_EXECUTE_READ: + case PAGE_EXECUTE_WRITECOPY: + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE; + break; + case PAGE_EXECUTE_READWRITE: + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; + break; + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + size.u.LowPart = size_low; + size.u.HighPart = size_high; + + if (file == INVALID_HANDLE_VALUE) + { + file = 0; + if (!size.QuadPart) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + } + + get_create_object_attributes( &attr, &nameW, sa, name ); + + status = NtCreateSection( &ret, access, &attr, &size, protect, sec_type, file ); + if (status == STATUS_OBJECT_NAME_EXISTS) + SetLastError( ERROR_ALREADY_EXISTS ); + else + SetLastError( RtlNtStatusToDosError(status) ); + return ret; +} + + +/*********************************************************************** + * OpenFileMappingW (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE ret; + NTSTATUS status; + + if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; + + if (access == FILE_MAP_COPY) access = SECTION_MAP_READ; + + if (!is_version_nt()) + { + /* win9x doesn't do access checks, so try with full access first */ + if (!NtOpenSection( &ret, access | SECTION_MAP_READ | SECTION_MAP_WRITE, &attr )) return ret; + } + + status = NtOpenSection( &ret, access, &attr ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return 0; + } + return ret; +}

1 0

Alexandre Julliard : kernel32: Move critical section functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: aa7f8e930d730876fd560fe1aef94f392b210eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa7f8e930d730876fd560fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 16:59:39 2019 +0200 kernel32: Move critical section functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 ++-- dlls/kernel32/sync.c | 61 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 4 +-- dlls/kernelbase/sync.c | 25 +++++++++++++++++ 4 files changed, 30 insertions(+), 66 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index be9ed3f..3f3f903 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -946,9 +946,9 @@ @ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize @ stdcall InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable # @ stub InitializeContext -@ stdcall InitializeCriticalSection(ptr) -@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -@ stdcall InitializeCriticalSectionEx(ptr long long) +@ stdcall InitializeCriticalSection(ptr) ntdll.RtlInitializeCriticalSection +@ stdcall -import InitializeCriticalSectionAndSpinCount(ptr long) +@ stdcall -import InitializeCriticalSectionEx(ptr long long) @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 5b8eef6..7667af9 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -308,67 +308,6 @@ DWORD WINAPI SignalObjectAndWait( HANDLE hObjectToSignal, HANDLE hObjectToWaitOn } /*********************************************************************** - * InitializeCriticalSection (KERNEL32.@) - * - * Initialise a critical section before use. - * - * PARAMS - * crit [O] Critical section to initialise. - * - * RETURNS - * Nothing. If the function fails an exception is raised. - */ -void WINAPI InitializeCriticalSection( CRITICAL_SECTION *crit ) -{ - InitializeCriticalSectionEx( crit, 0, 0 ); -} - -/*********************************************************************** - * InitializeCriticalSectionAndSpinCount (KERNEL32.@) - * - * Initialise a critical section with a spin count. - * - * PARAMS - * crit [O] Critical section to initialise. - * spincount [I] Number of times to spin upon contention. - * - * RETURNS - * Success: TRUE. - * Failure: Nothing. If the function fails an exception is raised. - * - * NOTES - * spincount is ignored on uni-processor systems. - */ -BOOL WINAPI InitializeCriticalSectionAndSpinCount( CRITICAL_SECTION *crit, DWORD spincount ) -{ - return InitializeCriticalSectionEx( crit, spincount, 0 ); -} - -/*********************************************************************** - * InitializeCriticalSectionEx (KERNEL32.@) - * - * Initialise a critical section with a spin count and flags. - * - * PARAMS - * crit [O] Critical section to initialise. - * spincount [I] Number of times to spin upon contention. - * flags [I] CRITICAL_SECTION_ flags from winbase.h. - * - * RETURNS - * Success: TRUE. - * Failure: Nothing. If the function fails an exception is raised. - * - * NOTES - * spincount is ignored on uni-processor systems. - */ -BOOL WINAPI InitializeCriticalSectionEx( CRITICAL_SECTION *crit, DWORD spincount, DWORD flags ) -{ - NTSTATUS ret = RtlInitializeCriticalSectionEx( crit, spincount, flags ); - if (ret) RtlRaiseStatus( ret ); - return !ret; -} - -/*********************************************************************** * MakeCriticalSectionGlobal (KERNEL32.@) */ void WINAPI MakeCriticalSectionGlobal( CRITICAL_SECTION *crit ) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c81fd0e..e9fa0d2 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -802,8 +802,8 @@ @ stdcall InitializeConditionVariable(ptr) kernel32.InitializeConditionVariable # @ stub InitializeContext @ stdcall InitializeCriticalSection(ptr) kernel32.InitializeCriticalSection -@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) kernel32.InitializeCriticalSectionAndSpinCount -@ stdcall InitializeCriticalSectionEx(ptr long long) kernel32.InitializeCriticalSectionEx +@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) +@ stdcall InitializeCriticalSectionEx(ptr long long) # @ stub InitializeEnclave @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList # @ stub InitializeProcessForWsWatch diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index cd0348d..21ba6d2 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -592,3 +592,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeleteTimerQueueTimer( HANDLE queue, HANDLE timer, { return set_ntstatus( RtlDeleteTimer( queue, timer, event )); } + + +/*********************************************************************** + * Critical sections + ***********************************************************************/ + + +/*********************************************************************** + * InitializeCriticalSectionAndSpinCount (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH InitializeCriticalSectionAndSpinCount( CRITICAL_SECTION *crit, DWORD count ) +{ + return !RtlInitializeCriticalSectionAndSpinCount( crit, count ); +} + +/*********************************************************************** + * InitializeCriticalSectionEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH InitializeCriticalSectionEx( CRITICAL_SECTION *crit, DWORD spincount, + DWORD flags ) +{ + NTSTATUS ret = RtlInitializeCriticalSectionEx( crit, spincount, flags ); + if (ret) RtlRaiseStatus( ret ); + return !ret; +}

1 0

Alexandre Julliard : kernel32: Move timer queue functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: d33d05ce273151b980b52939a703fe35bee849fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d33d05ce273151b980b52939… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 16:42:17 2019 +0200 kernel32: Move timer queue functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 10 ++-- dlls/kernel32/sync.c | 104 +--------------------------------------- dlls/kernelbase/kernelbase.spec | 10 ++-- dlls/kernelbase/sync.c | 61 +++++++++++++++++++++++ 4 files changed, 72 insertions(+), 113 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f371ad7..be9ed3f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -213,7 +213,7 @@ # @ stub CancelThreadpoolIo @ stdcall CancelTimerQueueTimer(ptr ptr) @ stdcall -import CancelWaitableTimer(long) -@ stdcall ChangeTimerQueueTimer(ptr ptr long long) +@ stdcall -import ChangeTimerQueueTimer(ptr ptr long long) # @ stub CheckElevation # @ stub CheckElevationEnabled # @ stub CheckForReadOnlyResource @@ -335,8 +335,8 @@ @ stdcall CreateThreadpoolTimer(ptr ptr ptr) @ stdcall CreateThreadpoolWait(ptr ptr ptr) @ stdcall CreateThreadpoolWork(ptr ptr ptr) -@ stdcall CreateTimerQueue () -@ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) +@ stdcall -import CreateTimerQueue() +@ stdcall -import CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) @ stdcall -arch=x86_64 CreateUmsCompletionList(ptr) @ stdcall -arch=x86_64 CreateUmsThreadContext(ptr) @@ -369,8 +369,8 @@ # @ stub DisableThreadProfiling @ stdcall DisassociateCurrentThreadFromCallback(ptr) ntdll.TpDisassociateCallback @ stdcall DeleteTimerQueue(long) -@ stdcall DeleteTimerQueueEx (long long) -@ stdcall DeleteTimerQueueTimer(long long long) +@ stdcall -import DeleteTimerQueueEx(long long) +@ stdcall -import DeleteTimerQueueTimer(long long long) @ stdcall -arch=x86_64 DeleteUmsCompletionList(ptr) @ stdcall -arch=x86_64 DeleteUmsThreadContext(ptr) @ stdcall DeleteVolumeMountPointA(str) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index f12234d..5b8eef6 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -682,40 +682,6 @@ HANDLE WINAPI OpenWaitableTimerA( DWORD access, BOOL inherit, LPCSTR name ) /*********************************************************************** - * CreateTimerQueue (KERNEL32.@) - */ -HANDLE WINAPI CreateTimerQueue(void) -{ - HANDLE q; - NTSTATUS status = RtlCreateTimerQueue(&q); - - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return NULL; - } - - return q; -} - - -/*********************************************************************** - * DeleteTimerQueueEx (KERNEL32.@) - */ -BOOL WINAPI DeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) -{ - NTSTATUS status = RtlDeleteTimerQueueEx(TimerQueue, CompletionEvent); - - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - - return TRUE; -} - -/*********************************************************************** * DeleteTimerQueue (KERNEL32.@) */ BOOL WINAPI DeleteTimerQueue(HANDLE TimerQueue) @@ -724,81 +690,13 @@ BOOL WINAPI DeleteTimerQueue(HANDLE TimerQueue) } /*********************************************************************** - * CreateTimerQueueTimer (KERNEL32.@) - * - * Creates a timer-queue timer. This timer expires at the specified due - * time (in ms), then after every specified period (in ms). When the timer - * expires, the callback function is called. - * - * RETURNS - * nonzero on success or zero on failure - */ -BOOL WINAPI CreateTimerQueueTimer( PHANDLE phNewTimer, HANDLE TimerQueue, - WAITORTIMERCALLBACK Callback, PVOID Parameter, - DWORD DueTime, DWORD Period, ULONG Flags ) -{ - NTSTATUS status = RtlCreateTimer(phNewTimer, TimerQueue, Callback, - Parameter, DueTime, Period, Flags); - - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - - return TRUE; -} - -/*********************************************************************** - * ChangeTimerQueueTimer (KERNEL32.@) - * - * Changes the times at which the timer expires. - * - * RETURNS - * nonzero on success or zero on failure - */ -BOOL WINAPI ChangeTimerQueueTimer( HANDLE TimerQueue, HANDLE Timer, - ULONG DueTime, ULONG Period ) -{ - NTSTATUS status = RtlUpdateTimer(TimerQueue, Timer, DueTime, Period); - - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - - return TRUE; -} - -/*********************************************************************** * CancelTimerQueueTimer (KERNEL32.@) */ BOOL WINAPI CancelTimerQueueTimer(HANDLE queue, HANDLE timer) { - FIXME("stub: %p %p\n", queue, timer); - return FALSE; + return DeleteTimerQueueTimer( queue, timer, NULL ); } -/*********************************************************************** - * DeleteTimerQueueTimer (KERNEL32.@) - * - * Cancels a timer-queue timer. - * - * RETURNS - * nonzero on success or zero on failure - */ -BOOL WINAPI DeleteTimerQueueTimer( HANDLE TimerQueue, HANDLE Timer, - HANDLE CompletionEvent ) -{ - NTSTATUS status = RtlDeleteTimer(TimerQueue, Timer, CompletionEvent); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - return TRUE; -} /* diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index fb4559d..c81fd0e 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -108,7 +108,7 @@ @ stub CancelThreadpoolIo @ stdcall CancelWaitableTimer(long) # @ stub CeipIsOptedIn -@ stdcall ChangeTimerQueueTimer(ptr ptr long long) kernel32.ChangeTimerQueueTimer +@ stdcall ChangeTimerQueueTimer(ptr ptr long long) @ stdcall CharLowerA(str) @ stdcall CharLowerBuffA(str long) @ stdcall CharLowerBuffW(wstr long) @@ -229,8 +229,8 @@ @ stdcall CreateThreadpoolTimer(ptr ptr ptr) kernel32.CreateThreadpoolTimer @ stdcall CreateThreadpoolWait(ptr ptr ptr) kernel32.CreateThreadpoolWait @ stdcall CreateThreadpoolWork(ptr ptr ptr) kernel32.CreateThreadpoolWork -@ stdcall CreateTimerQueue() kernel32.CreateTimerQueue -@ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) kernel32.CreateTimerQueueTimer +@ stdcall CreateTimerQueue() +@ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateWaitableTimerExW(ptr wstr long long) @ stdcall CreateWaitableTimerW(ptr long wstr) @ stdcall CreateWellKnownSid(long ptr ptr ptr) @@ -257,8 +257,8 @@ # @ stub DeleteStateContainer # @ stub DeleteStateContainerValue # @ stub DeleteSynchronizationBarrier -@ stdcall DeleteTimerQueueEx(long long) kernel32.DeleteTimerQueueEx -@ stdcall DeleteTimerQueueTimer(long long long) kernel32.DeleteTimerQueueTimer +@ stdcall DeleteTimerQueueEx(long long) +@ stdcall DeleteTimerQueueTimer(long long long) @ stdcall DeleteVolumeMountPointW(wstr) kernel32.DeleteVolumeMountPointW @ stdcall DestroyPrivateObjectSecurity(ptr) @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) kernel32.DeviceIoControl diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 862dd0f..cd0348d 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -531,3 +531,64 @@ BOOL WINAPI DECLSPEC_HOTPATCH CancelWaitableTimer( HANDLE handle ) { return set_ntstatus( NtCancelTimer( handle, NULL )); } + + +/*********************************************************************** + * Timer queues + ***********************************************************************/ + + +/*********************************************************************** + * CreateTimerQueue (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateTimerQueue(void) +{ + HANDLE q; + NTSTATUS status = RtlCreateTimerQueue( &q ); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status )); + return NULL; + } + return q; +} + + +/*********************************************************************** + * CreateTimerQueueTimer (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CreateTimerQueueTimer( PHANDLE timer, HANDLE queue, + WAITORTIMERCALLBACK callback, PVOID arg, + DWORD when, DWORD period, ULONG flags ) +{ + return set_ntstatus( RtlCreateTimer( timer, queue, callback, arg, when, period, flags )); +} + + +/*********************************************************************** + * ChangeTimerQueueTimer (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ChangeTimerQueueTimer( HANDLE queue, HANDLE timer, + ULONG when, ULONG period ) +{ + return set_ntstatus( RtlUpdateTimer( queue, timer, when, period )); +} + + +/*********************************************************************** + * DeleteTimerQueueEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH DeleteTimerQueueEx( HANDLE queue, HANDLE event ) +{ + return set_ntstatus( RtlDeleteTimerQueueEx( queue, event )); +} + + +/*********************************************************************** + * DeleteTimerQueueTimer (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH DeleteTimerQueueTimer( HANDLE queue, HANDLE timer, HANDLE event ) +{ + return set_ntstatus( RtlDeleteTimer( queue, timer, event )); +}

1 0

Alexandre Julliard : kernel32: Move waitable timer functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 8c63d02d5f743ed07a2894b1d40ad1a08e0524ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c63d02d5f743ed07a2894b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 16:21:37 2019 +0200 kernel32: Move waitable timer functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 12 ++--- dlls/kernel32/sync.c | 105 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 12 ++--- dlls/kernelbase/sync.c | 98 +++++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c63d02d5f743ed07a28…

1 0

Alexandre Julliard : kernel32: Move semaphore functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 591266881c4c14b913ac840ed0ae03c7e516e3d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=591266881c4c14b913ac840e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 16:08:22 2019 +0200 kernel32: Move semaphore functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 8 ++--- dlls/kernel32/sync.c | 66 -------------------------------------- dlls/kernelbase/kernelbase.spec | 8 ++--- dlls/kernelbase/sync.c | 70 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 74 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 4868df8..1b5a0ae 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -320,8 +320,8 @@ @ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) @ stdcall CreateSemaphoreA(ptr long long str) @ stdcall CreateSemaphoreExA(ptr long long str long long) -@ stdcall CreateSemaphoreExW(ptr long long wstr long long) -@ stdcall CreateSemaphoreW(ptr long long wstr) +@ stdcall -import CreateSemaphoreExW(ptr long long wstr long long) +@ stdcall -import CreateSemaphoreW(ptr long long wstr) @ stdcall CreateSocketHandle() @ stdcall CreateSymbolicLinkA(str str long) # @ stub CreateSymbolicLinkTransactedA @@ -1128,7 +1128,7 @@ # @ stub OpenProcessToken @ stdcall OpenProfileUserMapping() @ stdcall OpenSemaphoreA(long long str) -@ stdcall OpenSemaphoreW(long long wstr) +@ stdcall -import OpenSemaphoreW(long long wstr) @ stdcall OpenThread(long long long) # @ stub OpenThreadToken @ stdcall -i386 OpenVxDHandle(long) @@ -1258,7 +1258,7 @@ @ stdcall ReleaseActCtx(ptr) @ stdcall -import ReleaseMutex(long) @ stdcall ReleaseMutexWhenCallbackReturns(ptr long) ntdll.TpCallbackReleaseMutexOnCompletion -@ stdcall ReleaseSemaphore(long long ptr) +@ stdcall -import ReleaseSemaphore(long long ptr) @ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) ntdll.TpCallbackReleaseSemaphoreOnCompletion @ stdcall ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive @ stdcall ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 6bfcfee..1303ea4 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -453,15 +453,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreA( SECURITY_ATTRIBUTES *sa, LONG /*********************************************************************** - * CreateSemaphoreW (KERNEL32.@) - */ -HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreW( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, LPCWSTR name ) -{ - return CreateSemaphoreExW( sa, initial, max, name, 0, SEMAPHORE_ALL_ACCESS ); -} - - -/*********************************************************************** * CreateSemaphoreExA (KERNEL32.@) */ HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExA( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, @@ -481,28 +472,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExA( SECURITY_ATTRIBUTES *sa, LON /*********************************************************************** - * CreateSemaphoreExW (KERNEL32.@) - */ -HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExW( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, - LPCWSTR name, DWORD flags, DWORD access ) -{ - HANDLE ret = 0; - UNICODE_STRING nameW; - OBJECT_ATTRIBUTES attr; - NTSTATUS status; - - get_create_object_attributes( &attr, &nameW, sa, name ); - - status = NtCreateSemaphore( &ret, access, &attr, initial, max ); - if (status == STATUS_OBJECT_NAME_EXISTS) - SetLastError( ERROR_ALREADY_EXISTS ); - else - SetLastError( RtlNtStatusToDosError(status) ); - return ret; -} - - -/*********************************************************************** * OpenSemaphoreA (KERNEL32.@) */ HANDLE WINAPI DECLSPEC_HOTPATCH OpenSemaphoreA( DWORD access, BOOL inherit, LPCSTR name ) @@ -520,41 +489,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenSemaphoreA( DWORD access, BOOL inherit, LPCS } -/*********************************************************************** - * OpenSemaphoreW (KERNEL32.@) - */ -HANDLE WINAPI DECLSPEC_HOTPATCH OpenSemaphoreW( DWORD access, BOOL inherit, LPCWSTR name ) -{ - HANDLE ret; - UNICODE_STRING nameW; - OBJECT_ATTRIBUTES attr; - NTSTATUS status; - - if (!is_version_nt()) access = SEMAPHORE_ALL_ACCESS; - - if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; - - status = NtOpenSemaphore( &ret, access, &attr ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return 0; - } - return ret; -} - - -/*********************************************************************** - * ReleaseSemaphore (KERNEL32.@) - */ -BOOL WINAPI DECLSPEC_HOTPATCH ReleaseSemaphore( HANDLE handle, LONG count, LONG *previous ) -{ - NTSTATUS status = NtReleaseSemaphore( handle, count, (PULONG)previous ); - if (status) SetLastError( RtlNtStatusToDosError(status) ); - return !status; -} - - /* * Jobs */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f0c87ae..dca79c4 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -214,8 +214,8 @@ @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread @ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) kernel32.CreateRemoteThreadEx @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) -@ stdcall CreateSemaphoreExW(ptr long long wstr long long) kernel32.CreateSemaphoreExW -@ stdcall CreateSemaphoreW(ptr long long wstr) kernel32.CreateSemaphoreW +@ stdcall CreateSemaphoreExW(ptr long long wstr long long) +@ stdcall CreateSemaphoreW(ptr long long wstr) # @ stub CreateStateAtom # @ stub CreateStateChangeNotification # @ stub CreateStateContainer @@ -994,7 +994,7 @@ @ stdcall OpenProcess(long long long) kernel32.OpenProcess @ stdcall OpenProcessToken(long long ptr) @ stub OpenRegKey -@ stdcall OpenSemaphoreW(long long wstr) kernel32.OpenSemaphoreW +@ stdcall OpenSemaphoreW(long long wstr) # @ stub OpenState # @ stub OpenStateAtom # @ stub OpenStateExplicit @@ -1328,7 +1328,7 @@ @ stdcall ReleaseMutexWhenCallbackReturns(ptr long) kernel32.ReleaseMutexWhenCallbackReturns @ stdcall ReleaseSRWLockExclusive(ptr) kernel32.ReleaseSRWLockExclusive @ stdcall ReleaseSRWLockShared(ptr) kernel32.ReleaseSRWLockShared -@ stdcall ReleaseSemaphore(long long ptr) kernel32.ReleaseSemaphore +@ stdcall ReleaseSemaphore(long long ptr) @ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) kernel32.ReleaseSemaphoreWhenCallbackReturns # @ stub ReleaseStateLock @ stdcall RemapPredefinedHandleInternal(long long) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index ebbb209..58d62ed 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -363,3 +363,73 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReleaseMutex( HANDLE handle ) { return set_ntstatus( NtReleaseMutant( handle, NULL )); } + + +/*********************************************************************** + * Semaphores + ***********************************************************************/ + + +/*********************************************************************** + * CreateSemaphoreW (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreW( SECURITY_ATTRIBUTES *sa, LONG initial, + LONG max, LPCWSTR name ) +{ + return CreateSemaphoreExW( sa, initial, max, name, 0, SEMAPHORE_ALL_ACCESS ); +} + + +/*********************************************************************** + * CreateSemaphoreExW (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExW( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, + LPCWSTR name, DWORD flags, DWORD access ) +{ + HANDLE ret = 0; + UNICODE_STRING nameW; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + + get_create_object_attributes( &attr, &nameW, sa, name ); + + status = NtCreateSemaphore( &ret, access, &attr, initial, max ); + if (status == STATUS_OBJECT_NAME_EXISTS) + SetLastError( ERROR_ALREADY_EXISTS ); + else + SetLastError( RtlNtStatusToDosError(status) ); + return ret; +} + + +/*********************************************************************** + * OpenSemaphoreW (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH OpenSemaphoreW( DWORD access, BOOL inherit, LPCWSTR name ) +{ + HANDLE ret; + UNICODE_STRING nameW; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + + if (!is_version_nt()) access = SEMAPHORE_ALL_ACCESS; + + if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; + + status = NtOpenSemaphore( &ret, access, &attr ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return 0; + } + return ret; +} + + +/*********************************************************************** + * ReleaseSemaphore (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ReleaseSemaphore( HANDLE handle, LONG count, LONG *previous ) +{ + return set_ntstatus( NtReleaseSemaphore( handle, count, (PULONG)previous )); +}

1 0

Alexandre Julliard : kernel32: Move mutex functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 93a5451152ae0a2ab7252bfc422abdabc62d9663 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a5451152ae0a2ab7252bfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 16:05:17 2019 +0200 kernel32: Move mutex functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 12 ++--- dlls/kernel32/sync.c | 99 --------------------------------------- dlls/kernelbase/kernelbase.spec | 12 ++--- dlls/kernelbase/sync.c | 100 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93a5451152ae0a2ab725…

1 0

Alexandre Julliard : kernel32: Move event functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 558e48aafdcc55fb2b184a619dae35f58e4f6601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=558e48aafdcc55fb2b184a61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 15:53:28 2019 +0200 kernel32: Move event functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 20 +-- dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/sync.c | 195 +---------------------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.h | 33 +++++ dlls/kernelbase/kernelbase.spec | 20 +-- dlls/kernelbase/security.c | 7 +- dlls/kernelbase/sync.c | 265 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 326 insertions(+), 216 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=558e48aafdcc55fb2b18…

1 0

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 July 2019