wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Alexandre Julliard : kernel32: Move QueryPerformanceCounter/ Frequency functions to ntdll.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: a311140f93fbcb4512e2cd31be027be31b4f4072 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a311140f93fbcb4512e2cd31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 12:08:27 2019 +0200 kernel32: Move QueryPerformanceCounter/Frequency functions to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 45 ----------------------------------------- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/kernelbase/registry.c | 3 +-- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/time.c | 17 ++++++++++++++++ include/winternl.h | 2 ++ 7 files changed, 26 insertions(+), 51 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 3f4f6c6..b360463 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -46,51 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); -/**************************************************************************** - * QueryPerformanceCounter (KERNEL32.@) - * - * Get the current value of the performance counter. - * - * PARAMS - * counter [O] Destination for the current counter reading - * - * RETURNS - * Success: TRUE. counter contains the current reading - * Failure: FALSE. - * - * SEE ALSO - * See QueryPerformanceFrequency. - */ -BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER counter) -{ - NtQueryPerformanceCounter( counter, NULL ); - return TRUE; -} - - -/**************************************************************************** - * QueryPerformanceFrequency (KERNEL32.@) - * - * Get the resolution of the performance counter. - * - * PARAMS - * frequency [O] Destination for the counter resolution - * - * RETURNS - * Success. TRUE. Frequency contains the resolution of the counter. - * Failure: FALSE. - * - * SEE ALSO - * See QueryPerformanceCounter. - */ -BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER frequency) -{ - LARGE_INTEGER counter; - NtQueryPerformanceCounter( &counter, frequency ); - return TRUE; -} - - /*********************************************************************** * GetSystemInfo [KERNEL32.@] * diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c2cd10..566dfb3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1169,8 +1169,8 @@ @ stdcall -import QueryMemoryResourceNotification(ptr ptr) @ stub QueryNumberOfEventLogRecords @ stub QueryOldestEventLogRecord -@ stdcall QueryPerformanceCounter(ptr) -@ stdcall QueryPerformanceFrequency(ptr) +@ stdcall -import QueryPerformanceCounter(ptr) +@ stdcall -import QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode @ stdcall QueryProcessCycleTime(long ptr) @ stdcall QueryThreadCycleTime(long ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index fbeb58c..ee064c3 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1204,8 +1204,8 @@ # @ stub QueryInterruptTimePrecise @ stdcall QueryMemoryResourceNotification(ptr ptr) # @ stub QueryOptionalDelayLoadedAPI -@ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter -@ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency +@ stdcall QueryPerformanceCounter(ptr) ntdll.RtlQueryPerformanceCounter +@ stdcall QueryPerformanceFrequency(ptr) ntdll.RtlQueryPerformanceFrequency @ stub QueryProcessAffinityUpdateMode @ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime # @ stub QueryProtectedPolicy diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index adf9ef6..30c5e9f 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -1368,8 +1368,7 @@ static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD pdb->HeaderLength = sizeof(*pdb); pdb->NumObjectTypes = 0; pdb->DefaultObject = 0; - QueryPerformanceCounter(&pdb->PerfTime); - QueryPerformanceFrequency(&pdb->PerfFreq); + NtQueryPerformanceCounter( &pdb->PerfTime, &pdb->PerfFreq ); data = pdb + 1; pdb->SystemNameOffset = sizeof(*pdb); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 94e70e5..98a423a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -850,6 +850,8 @@ @ stub RtlQueryInformationActiveActivationContext @ stub RtlQueryInterfaceMemoryStream @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) +@ stdcall RtlQueryPerformanceCounter(ptr) +@ stdcall RtlQueryPerformanceFrequency(ptr) @ stub RtlQueryProcessBackTraceInformation @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 20de627..91e5887 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -552,6 +552,23 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER return STATUS_SUCCESS; } +/****************************************************************************** + * RtlQueryPerformanceCounter [NTDLL.@] + */ +BOOL WINAPI DECLSPEC_HOTPATCH RtlQueryPerformanceCounter( LARGE_INTEGER *counter ) +{ + counter->QuadPart = monotonic_counter(); + return TRUE; +} + +/****************************************************************************** + * RtlQueryPerformanceFrequency [NTDLL.@] + */ +BOOL WINAPI DECLSPEC_HOTPATCH RtlQueryPerformanceFrequency( LARGE_INTEGER *frequency ) +{ + frequency->QuadPart = TICKSPERSEC; + return TRUE; +} /****************************************************************************** * NtGetTickCount (NTDLL.@) diff --git a/include/winternl.h b/include/winternl.h index 4715b05..3f2e07b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2799,6 +2799,8 @@ NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PU NTSYSAPI NTSTATUS WINAPI RtlQueryHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationAcl(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationActivationContext(ULONG,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); +NTSYSAPI BOOL WINAPI RtlQueryPerformanceCounter(LARGE_INTEGER*); +NTSYSAPI BOOL WINAPI RtlQueryPerformanceFrequency(LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI RtlQueryProcessDebugInformation(ULONG,ULONG,PDEBUG_BUFFER); NTSYSAPI NTSTATUS WINAPI RtlQueryRegistryValues(ULONG, PCWSTR, PRTL_QUERY_REGISTRY_TABLE, PVOID, PVOID); NTSYSAPI NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION*);

1 0

Alexandre Julliard : kernel32: Move unhandled exception functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: ddf82f7c0dd421508efa896252c966ab8f61f0b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf82f7c0dd421508efa8962… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 22:30:38 2019 +0200 kernel32: Move unhandled exception functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/except.c | 511 ---------------------------------------- dlls/kernel32/kernel32.spec | 10 +- dlls/kernel32/process.c | 10 + dlls/kernelbase/debug.c | 429 ++++++++++++++++++++++++++++++++- dlls/kernelbase/kernelbase.spec | 16 +- 6 files changed, 451 insertions(+), 526 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddf82f7c0dd421508efa…

1 0

Alexandre Julliard : kernel32: Move debugger functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 3b002685fe18ca3985af744d8f147f29b2c588f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b002685fe18ca3985af744d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 21:51:50 2019 +0200 kernel32: Move debugger functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 417 ---------------------------------------- dlls/kernel32/kernel32.spec | 16 +- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/debug.c | 358 ++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 18 +- 5 files changed, 376 insertions(+), 434 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b002685fe18ca3985af…

1 0

Alexandre Julliard : kernel32: Move OS version functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 471c2f565c1c9dae7c2a9a50ec7edb6267a8c80d URL: https://source.winehq.org/git/wine.git/?a=commit;h=471c2f565c1c9dae7c2a9a50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 21:28:18 2019 +0200 kernel32: Move OS version functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 ++-- dlls/kernel32/version.c | 77 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 6 ++-- dlls/kernelbase/version.c | 66 +++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 83 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f9d24a7..8bbb08d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -875,9 +875,9 @@ @ stdcall GetUserDefaultUILanguage() @ stdcall GetUserGeoID(long) @ stub GetVDMCurrentDirectories -@ stdcall GetVersion() -@ stdcall GetVersionExA(ptr) -@ stdcall GetVersionExW(ptr) +@ stdcall -import GetVersion() +@ stdcall -import GetVersionExA(ptr) +@ stdcall -import GetVersionExW(ptr) @ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) @ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 3cca2ae..e68da5b 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -42,83 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ver); -/*********************************************************************** - * GetVersion (KERNEL32.@) - * - * Win31 0x80000a03 - * Win95 0xc0000004 - * Win98 0xc0000a04 - * WinME 0xc0005a04 - * NT351 0x04213303 - * NT4 0x05650004 - * Win2000 0x08930005 - * WinXP 0x0a280105 - */ -DWORD WINAPI GetVersion(void) -{ - DWORD result = MAKELONG( MAKEWORD( NtCurrentTeb()->Peb->OSMajorVersion, - NtCurrentTeb()->Peb->OSMinorVersion ), - (NtCurrentTeb()->Peb->OSPlatformId ^ 2) << 14 ); - if (NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT) - result |= LOWORD(NtCurrentTeb()->Peb->OSBuildNumber) << 16; - return result; -} - - -/*********************************************************************** - * GetVersionExA (KERNEL32.@) - */ -BOOL WINAPI GetVersionExA(OSVERSIONINFOA *v) -{ - RTL_OSVERSIONINFOEXW infoW; - - if (v->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA) && - v->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXA)) - { - WARN("wrong OSVERSIONINFO size from app (got: %d)\n", - v->dwOSVersionInfoSize ); - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - infoW.dwOSVersionInfoSize = sizeof(infoW); - if (RtlGetVersion( &infoW ) != STATUS_SUCCESS) return FALSE; - - v->dwMajorVersion = infoW.dwMajorVersion; - v->dwMinorVersion = infoW.dwMinorVersion; - v->dwBuildNumber = infoW.dwBuildNumber; - v->dwPlatformId = infoW.dwPlatformId; - WideCharToMultiByte( CP_ACP, 0, infoW.szCSDVersion, -1, - v->szCSDVersion, sizeof(v->szCSDVersion), NULL, NULL ); - - if(v->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) - { - LPOSVERSIONINFOEXA vex = (LPOSVERSIONINFOEXA) v; - vex->wServicePackMajor = infoW.wServicePackMajor; - vex->wServicePackMinor = infoW.wServicePackMinor; - vex->wSuiteMask = infoW.wSuiteMask; - vex->wProductType = infoW.wProductType; - } - return TRUE; -} - - -/*********************************************************************** - * GetVersionExW (KERNEL32.@) - */ -BOOL WINAPI GetVersionExW( OSVERSIONINFOW *info ) -{ - if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOW) && - info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW)) - { - WARN("wrong OSVERSIONINFO size from app (got: %d)\n", - info->dwOSVersionInfoSize); - return FALSE; - } - return (RtlGetVersion( (RTL_OSVERSIONINFOEXW *)info ) == STATUS_SUCCESS); -} - - /****************************************************************************** * VerifyVersionInfoA (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 6a137dc..dc108f1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -750,9 +750,9 @@ # @ stub GetUserOverrideString # @ stub GetUserOverrideWord @ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) kernel32.GetUserPreferredUILanguages -@ stdcall GetVersion() kernel32.GetVersion -@ stdcall GetVersionExA(ptr) kernel32.GetVersionExA -@ stdcall GetVersionExW(ptr) kernel32.GetVersionExW +@ stdcall GetVersion() +@ stdcall GetVersionExA(ptr) +@ stdcall GetVersionExW(ptr) @ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationA @ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 1608bdb..df96dab 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1337,3 +1337,69 @@ DWORD WINAPI VerFindFileW( DWORD flags, LPCWSTR filename, LPCWSTR win_dir, LPCWS debugstr_w(cur_dir), debugstr_w(dest)); return retval; } + + +/*********************************************************************** + * GetVersion (kernelbase.@) + */ +DWORD WINAPI GetVersion(void) +{ + DWORD result = MAKELONG( MAKEWORD( NtCurrentTeb()->Peb->OSMajorVersion, + NtCurrentTeb()->Peb->OSMinorVersion ), + (NtCurrentTeb()->Peb->OSPlatformId ^ 2) << 14 ); + if (NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT) + result |= LOWORD(NtCurrentTeb()->Peb->OSBuildNumber) << 16; + return result; +} + + +/*********************************************************************** + * GetVersionExA (kernelbase.@) + */ +BOOL WINAPI GetVersionExA( OSVERSIONINFOA *info ) +{ + RTL_OSVERSIONINFOEXW infoW; + + if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA) && + info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXA)) + { + WARN( "wrong OSVERSIONINFO size from app (got: %d)\n", info->dwOSVersionInfoSize ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + + infoW.dwOSVersionInfoSize = sizeof(infoW); + if (!set_ntstatus( RtlGetVersion( &infoW ))) return FALSE; + + info->dwMajorVersion = infoW.dwMajorVersion; + info->dwMinorVersion = infoW.dwMinorVersion; + info->dwBuildNumber = infoW.dwBuildNumber; + info->dwPlatformId = infoW.dwPlatformId; + WideCharToMultiByte( CP_ACP, 0, infoW.szCSDVersion, -1, + info->szCSDVersion, sizeof(info->szCSDVersion), NULL, NULL ); + + if (info->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) + { + OSVERSIONINFOEXA *vex = (OSVERSIONINFOEXA *)info; + vex->wServicePackMajor = infoW.wServicePackMajor; + vex->wServicePackMinor = infoW.wServicePackMinor; + vex->wSuiteMask = infoW.wSuiteMask; + vex->wProductType = infoW.wProductType; + } + return TRUE; +} + + +/*********************************************************************** + * GetVersionExW (kernelbase.@) + */ +BOOL WINAPI GetVersionExW( OSVERSIONINFOW *info ) +{ + if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOW) && + info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW)) + { + WARN( "wrong OSVERSIONINFO size from app (got: %d)\n", info->dwOSVersionInfoSize ); + return FALSE; + } + return set_ntstatus( RtlGetVersion( (RTL_OSVERSIONINFOEXW *)info )); +}

1 0

Alexandre Julliard : kernel32: Move global/ local memory functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: d38a5ba4e6ec05afe6f085b9999fc7e2073a4924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d38a5ba4e6ec05afe6f085b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 21:20:21 2019 +0200 kernel32: Move global/local memory functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 459 +--------------------------------------- dlls/kernel32/kernel32.spec | 14 +- dlls/kernelbase/kernelbase.spec | 14 +- dlls/kernelbase/memory.c | 351 +++++++++++++++++++++++++++++- 4 files changed, 369 insertions(+), 469 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d38a5ba4e6ec05afe6f0…

1 0

Alexandre Julliard : kernel32: Move memory resource functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 67a9700267f05da6425f52b6e68111c785b5019e URL: https://source.winehq.org/git/wine.git/?a=commit;h=67a9700267f05da6425f52b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 15:03:17 2019 +0200 kernel32: Move memory resource functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +-- dlls/kernel32/sync.c | 62 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 4 +-- dlls/kernelbase/memory.c | 57 +++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 66 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f856597..33c97fd 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -298,7 +298,7 @@ @ stub CreateKernelThread @ stdcall CreateMailslotA(str long long ptr) @ stdcall CreateMailslotW(wstr long long ptr) -@ stdcall CreateMemoryResourceNotification(long) +@ stdcall -import CreateMemoryResourceNotification(long) @ stdcall -import CreateMutexA(ptr long str) @ stdcall -import CreateMutexExA(ptr str long long) @ stdcall -import CreateMutexExW(ptr wstr long long) @@ -1166,7 +1166,7 @@ # @ stub QueryIdleProcessorCycleTime # @ stub QueryIdleProcessorCycleTimeEx @ stdcall QueryInformationJobObject(long long ptr long ptr) -@ stdcall QueryMemoryResourceNotification(ptr ptr) +@ stdcall -import QueryMemoryResourceNotification(ptr ptr) @ stub QueryNumberOfEventLogRecords @ stub QueryOldestEventLogRecord @ stdcall QueryPerformanceCounter(ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 9c2d29f..054b8c2 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1009,68 +1009,6 @@ BOOL WINAPI BindIoCompletionCallback( HANDLE FileHandle, LPOVERLAPPED_COMPLETION } -/*********************************************************************** - * CreateMemoryResourceNotification (KERNEL32.@) - */ -HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE type) -{ - static const WCHAR lowmemW[] = - {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', - '\\','L','o','w','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n',0}; - static const WCHAR highmemW[] = - {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', - '\\','H','i','g','h','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n',0}; - HANDLE ret; - UNICODE_STRING nameW; - OBJECT_ATTRIBUTES attr; - NTSTATUS status; - - switch (type) - { - case LowMemoryResourceNotification: - RtlInitUnicodeString( &nameW, lowmemW ); - break; - case HighMemoryResourceNotification: - RtlInitUnicodeString( &nameW, highmemW ); - break; - default: - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - status = NtOpenEvent( &ret, EVENT_ALL_ACCESS, &attr ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return 0; - } - return ret; -} - -/*********************************************************************** - * QueryMemoryResourceNotification (KERNEL32.@) - */ -BOOL WINAPI QueryMemoryResourceNotification(HANDLE handle, PBOOL state) -{ - switch (WaitForSingleObject( handle, 0 )) - { - case WAIT_OBJECT_0: - *state = TRUE; - return TRUE; - case WAIT_TIMEOUT: - *state = FALSE; - return TRUE; - } - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; -} - #ifdef __i386__ /*********************************************************************** diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 4d5e644..e4125a4 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -194,7 +194,7 @@ @ stdcall CreateHardLinkA(str str ptr) kernel32.CreateHardLinkA @ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW @ stdcall CreateIoCompletionPort(long long long long) -@ stdcall CreateMemoryResourceNotification(long) kernel32.CreateMemoryResourceNotification +@ stdcall CreateMemoryResourceNotification(long) @ stdcall CreateMutexA(ptr long str) @ stdcall CreateMutexExA(ptr str long long) @ stdcall CreateMutexExW(ptr wstr long long) @@ -1202,7 +1202,7 @@ # @ stub QueryIdleProcessorCycleTimeEx # @ stub QueryInterruptTime # @ stub QueryInterruptTimePrecise -@ stdcall QueryMemoryResourceNotification(ptr ptr) kernel32.QueryMemoryResourceNotification +@ stdcall QueryMemoryResourceNotification(ptr ptr) # @ stub QueryOptionalDelayLoadedAPI @ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter @ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index ec9eace..aa834a3 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -382,3 +382,60 @@ BOOL WINAPI DECLSPEC_HOTPATCH HeapWalk( HANDLE heap, PROCESS_HEAP_ENTRY *entry ) { return set_ntstatus( RtlWalkHeap( heap, entry )); } + + +/*********************************************************************** + * Memory resource functions + ***********************************************************************/ + + +/*********************************************************************** + * CreateMemoryResourceNotification (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateMemoryResourceNotification( MEMORY_RESOURCE_NOTIFICATION_TYPE type ) +{ + static const WCHAR lowmemW[] = + {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', + '\\','L','o','w','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n',0}; + static const WCHAR highmemW[] = + {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', + '\\','H','i','g','h','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n',0}; + HANDLE ret; + UNICODE_STRING nameW; + OBJECT_ATTRIBUTES attr; + + switch (type) + { + case LowMemoryResourceNotification: + RtlInitUnicodeString( &nameW, lowmemW ); + break; + case HighMemoryResourceNotification: + RtlInitUnicodeString( &nameW, highmemW ); + break; + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + if (!set_ntstatus( NtOpenEvent( &ret, EVENT_ALL_ACCESS, &attr ))) return 0; + return ret; +} + +/*********************************************************************** + * QueryMemoryResourceNotification (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH QueryMemoryResourceNotification( HANDLE handle, BOOL *state ) +{ + switch (WaitForSingleObject( handle, 0 )) + { + case WAIT_OBJECT_0: + *state = TRUE; + return TRUE; + case WAIT_TIMEOUT: + *state = FALSE; + return TRUE; + } + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; +}

1 0

Alexandre Julliard : kernel32: Move heap functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: cad0f61808cf6eba8109b40a19cacd96389cd139 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad0f61808cf6eba8109b40a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 14:48:13 2019 +0200 kernel32: Move heap functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 94 ----------------------------------------- dlls/kernel32/kernel32.spec | 16 +++---- dlls/kernelbase/kernelbase.spec | 20 ++++----- dlls/kernelbase/memory.c | 91 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 112 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 80e1152..8e0f8d4 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -171,85 +171,6 @@ BOOL WINAPI HeapDestroy( HANDLE heap /* [in] Handle of heap */ ) } -/*********************************************************************** - * HeapCompact (KERNEL32.@) - */ -SIZE_T WINAPI HeapCompact( HANDLE heap, DWORD flags ) -{ - return RtlCompactHeap( heap, flags ); -} - - -/*********************************************************************** - * HeapValidate (KERNEL32.@) - * Validates a specified heap. - * - * NOTES - * Flags is ignored. - * - * RETURNS - * TRUE: Success - * FALSE: Failure - */ -BOOL WINAPI HeapValidate( - HANDLE heap, /* [in] Handle to the heap */ - DWORD flags, /* [in] Bit flags that control access during operation */ - LPCVOID block /* [in] Optional pointer to memory block to validate */ -) { - return RtlValidateHeap( heap, flags, block ); -} - - -/*********************************************************************** - * HeapWalk (KERNEL32.@) - * Enumerates the memory blocks in a specified heap. - * - * TODO - * - handling of PROCESS_HEAP_ENTRY_MOVEABLE and - * PROCESS_HEAP_ENTRY_DDESHARE (needs heap.c support) - * - * RETURNS - * TRUE: Success - * FALSE: Failure - */ -BOOL WINAPI HeapWalk( - HANDLE heap, /* [in] Handle to heap to enumerate */ - LPPROCESS_HEAP_ENTRY entry /* [out] Pointer to structure of enumeration info */ -) { - NTSTATUS ret = RtlWalkHeap( heap, entry ); - if (ret) SetLastError( RtlNtStatusToDosError(ret) ); - return !ret; -} - - -/*********************************************************************** - * HeapLock (KERNEL32.@) - * Attempts to acquire the critical section object for a specified heap. - * - * RETURNS - * TRUE: Success - * FALSE: Failure - */ -BOOL WINAPI HeapLock( - HANDLE heap /* [in] Handle of heap to lock for exclusive access */ -) { - return RtlLockHeap( heap ); -} - - -/*********************************************************************** - * HeapUnlock (KERNEL32.@) - * Releases ownership of the critical section object. - * - * RETURNS - * TRUE: Success - * FALSE: Failure - */ -BOOL WINAPI HeapUnlock( - HANDLE heap /* [in] Handle to the heap to unlock */ -) { - return RtlUnlockHeap( heap ); -} @@ -278,21 +199,6 @@ SIZE_T WINAPI HeapSize( HANDLE heap, DWORD flags, LPCVOID ptr ) return RtlSizeHeap( heap, flags, ptr ); } -BOOL WINAPI HeapQueryInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, - PVOID info, SIZE_T size_in, PSIZE_T size_out) -{ - NTSTATUS ret = RtlQueryHeapInformation( heap, info_class, info, size_in, size_out ); - if (ret) SetLastError( RtlNtStatusToDosError(ret) ); - return !ret; -} - -BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size) -{ - NTSTATUS ret = RtlSetHeapInformation( heap, infoclass, info, size ); - if (ret) SetLastError( RtlNtStatusToDosError(ret) ); - return !ret; -} - /* * Win32 Global heap functions (GlobalXXX). * These functions included in Win32 for compatibility with 16 bit Windows diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9d5e9eb..f856597 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -918,24 +918,24 @@ @ stub Heap32ListNext @ stub Heap32Next @ stdcall HeapAlloc(long long long) ntdll.RtlAllocateHeap -@ stdcall HeapCompact(long long) +@ stdcall -import HeapCompact(long long) @ stdcall HeapCreate(long long long) @ stub HeapCreateTagsW @ stdcall HeapDestroy(long) @ stub HeapExtend -@ stdcall HeapFree(long long ptr) ntdll.RtlFreeHeap -@ stdcall HeapLock(long) -@ stdcall HeapQueryInformation(long long ptr long ptr) +@ stdcall HeapFree(long long ptr) +@ stdcall -import HeapLock(long) +@ stdcall -import HeapQueryInformation(long long ptr long ptr) @ stub HeapQueryTagW @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap @ stub HeapSetFlags -@ stdcall HeapSetInformation(ptr long ptr long) +@ stdcall -import HeapSetInformation(ptr long ptr long) @ stdcall HeapSize(long long ptr) ntdll.RtlSizeHeap @ stub HeapSummary -@ stdcall HeapUnlock(long) +@ stdcall -import HeapUnlock(long) @ stub HeapUsage -@ stdcall HeapValidate(long long ptr) -@ stdcall HeapWalk(long ptr) +@ stdcall -import HeapValidate(long long ptr) +@ stdcall -import HeapWalk(long ptr) @ stdcall IdnToAscii(long wstr long ptr long) @ stdcall IdnToNameprepUnicode(long wstr long ptr long) @ stdcall IdnToUnicode(long wstr long ptr long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8889638..4d5e644 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -773,19 +773,19 @@ # @ stub HasPolicyForegroundProcessingCompletedInternal @ stdcall HashData(ptr long ptr long) @ stdcall HeapAlloc(long long long) ntdll.RtlAllocateHeap -@ stdcall HeapCompact(long long) kernel32.HeapCompact -@ stdcall HeapCreate(long long long) kernel32.HeapCreate -@ stdcall HeapDestroy(long) kernel32.HeapDestroy -@ stdcall HeapFree(long long ptr) ntdll.RtlFreeHeap -@ stdcall HeapLock(long) kernel32.HeapLock -@ stdcall HeapQueryInformation(long long ptr long ptr) kernel32.HeapQueryInformation +@ stdcall HeapCompact(long long) +@ stdcall HeapCreate(long long long) +@ stdcall HeapDestroy(long) +@ stdcall HeapFree(long long ptr) +@ stdcall HeapLock(long) +@ stdcall HeapQueryInformation(long long ptr long ptr) @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap -@ stdcall HeapSetInformation(ptr long ptr long) kernel32.HeapSetInformation +@ stdcall HeapSetInformation(ptr long ptr long) @ stdcall HeapSize(long long ptr) ntdll.RtlSizeHeap @ stub HeapSummary -@ stdcall HeapUnlock(long) kernel32.HeapUnlock -@ stdcall HeapValidate(long long ptr) kernel32.HeapValidate -@ stdcall HeapWalk(long ptr) kernel32.HeapWalk +@ stdcall HeapUnlock(long) +@ stdcall HeapValidate(long long ptr) +@ stdcall HeapWalk(long ptr) @ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii @ stdcall IdnToNameprepUnicode(long wstr long ptr long) kernel32.IdnToNameprepUnicode @ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 55e03df..ec9eace 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -291,3 +291,94 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteProcessMemory( HANDLE process, void *addr, co { return set_ntstatus( NtWriteVirtualMemory( process, addr, buffer, size, bytes_written )); } + + +/*********************************************************************** + * Heap functions + ***********************************************************************/ + + +/*********************************************************************** + * HeapCompact (kernelbase.@) + */ +SIZE_T WINAPI DECLSPEC_HOTPATCH HeapCompact( HANDLE heap, DWORD flags ) +{ + return RtlCompactHeap( heap, flags ); +} + + +/*********************************************************************** + * HeapCreate (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH HeapCreate( DWORD flags, SIZE_T init_size, SIZE_T max_size ) +{ + HANDLE ret = RtlCreateHeap( flags, NULL, max_size, init_size, NULL, NULL ); + if (!ret) SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return ret; +} + + +/*********************************************************************** + * HeapDestroy (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH HeapDestroy( HANDLE heap ) +{ + if (!RtlDestroyHeap( heap )) return TRUE; + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; +} + + +/*********************************************************************** + * HeapLock (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH HeapLock( HANDLE heap ) +{ + return RtlLockHeap( heap ); +} + + +/*********************************************************************** + * HeapQueryInformation (kernelbase.@) + */ +BOOL WINAPI HeapQueryInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, + PVOID info, SIZE_T size, PSIZE_T size_out ) +{ + return set_ntstatus( RtlQueryHeapInformation( heap, info_class, info, size, size_out )); +} + + +/*********************************************************************** + * HeapSetInformation (kernelbase.@) + */ +BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size ) +{ + return set_ntstatus( RtlSetHeapInformation( heap, infoclass, info, size )); +} + + +/*********************************************************************** + * HeapUnlock (kernelbase.@) + */ +BOOL WINAPI HeapUnlock( HANDLE heap ) +{ + return RtlUnlockHeap( heap ); +} + + +/*********************************************************************** + * HeapValidate (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH HeapValidate( HANDLE heap, DWORD flags, LPCVOID ptr ) +{ + return RtlValidateHeap( heap, flags, ptr ); +} + + +/*********************************************************************** + * HeapWalk (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH HeapWalk( HANDLE heap, PROCESS_HEAP_ENTRY *entry ) +{ + return set_ntstatus( RtlWalkHeap( heap, entry )); +}

1 0

Alexandre Julliard : kernel32: Move virtual memory functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 61516e2223da79234216b9a47d2d860bb627bfca URL: https://source.winehq.org/git/wine.git/?a=commit;h=61516e2223da79234216b9a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 14:13:32 2019 +0200 kernel32: Move virtual memory functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 40 ++-- dlls/kernel32/process.c | 24 --- dlls/kernel32/virtual.c | 420 ---------------------------------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 40 ++-- dlls/kernelbase/memory.c | 293 ++++++++++++++++++++++++++++ 6 files changed, 334 insertions(+), 484 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61516e2223da79234216…

1 0

Alexandre Julliard : kernel32: Move file change notification functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 0b5c0bc769f9e58eef0cb49ac6d70358005f92ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b5c0bc769f9e58eef0cb49a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 13:31:35 2019 +0200 kernel32: Move file change notification functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/change.c | 208 ---------------------------------------- dlls/kernel32/kernel32.spec | 10 +- dlls/kernelbase/file.c | 136 ++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 10 +- 5 files changed, 146 insertions(+), 219 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b5c0bc769f9e58eef0c…

1 0

Alexandre Julliard : kernel32: Move interlocked functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: c683e7e5a1a1bc1846ccf666e44a5869609b230f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c683e7e5a1a1bc1846ccf666… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 13:17:48 2019 +0200 kernel32: Move interlocked functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +-- dlls/kernel32/sync.c | 29 ------------- dlls/kernelbase/kernelbase.spec | 16 ++++---- dlls/kernelbase/sync.c | 90 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b562c74..0b0129f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -940,9 +940,9 @@ @ stdcall IdnToNameprepUnicode(long wstr long ptr long) @ stdcall IdnToUnicode(long wstr long ptr long) @ stdcall InitAtomTable(long) -@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) -@ stdcall InitOnceComplete(ptr long ptr) -@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) +@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernelbase.InitOnceBeginInitialize +@ stdcall InitOnceComplete(ptr long ptr) kernelbase.InitOnceComplete +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) kernelbase.InitOnceExecuteOnce @ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize @ stdcall InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable # @ stub InitializeContext diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index a510657..9c2d29f 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1071,35 +1071,6 @@ BOOL WINAPI QueryMemoryResourceNotification(HANDLE handle, PBOOL state) return FALSE; } -/*********************************************************************** - * InitOnceBeginInitialize (KERNEL32.@) - */ -BOOL WINAPI InitOnceBeginInitialize( INIT_ONCE *once, DWORD flags, BOOL *pending, void **context ) -{ - NTSTATUS status = RtlRunOnceBeginInitialize( once, flags, context ); - if (status >= 0) *pending = (status == STATUS_PENDING); - else SetLastError( RtlNtStatusToDosError(status) ); - return status >= 0; -} - -/*********************************************************************** - * InitOnceComplete (KERNEL32.@) - */ -BOOL WINAPI InitOnceComplete( INIT_ONCE *once, DWORD flags, void *context ) -{ - NTSTATUS status = RtlRunOnceComplete( once, flags, context ); - if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); - return !status; -} - -/*********************************************************************** - * InitOnceExecuteOnce (KERNEL32.@) - */ -BOOL WINAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void *param, void **context ) -{ - return !RtlRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); -} - #ifdef __i386__ /*********************************************************************** diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7dff3ed..f554a0f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -794,9 +794,9 @@ @ stdcall ImpersonateNamedPipeClient(long) @ stdcall ImpersonateSelf(long) # @ stub IncrementPackageStatusVersion -@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernel32.InitOnceBeginInitialize -@ stdcall InitOnceComplete(ptr long ptr) kernel32.InitOnceComplete -@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) kernel32.InitOnceExecuteOnce +@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) +@ stdcall InitOnceComplete(ptr long ptr) +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) @ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize @ stdcall InitializeAcl(ptr long long) @ stdcall InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @@ -813,13 +813,13 @@ @ stdcall InitializeSid(ptr ptr long) # @ stub InitializeSynchronizationBarrier # @ stub InstallELAMCertificateInfo -@ stdcall -arch=i386 InterlockedCompareExchange(ptr long long) kernel32.InterlockedCompareExchange +@ stdcall -arch=i386 InterlockedCompareExchange(ptr long long) @ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr int64 int64) ntdll.RtlInterlockedCompareExchange64 -@ stdcall -arch=i386 InterlockedDecrement(ptr) kernel32.InterlockedDecrement -@ stdcall -arch=i386 InterlockedExchange(ptr long) kernel32.InterlockedExchange -@ stdcall -arch=i386 InterlockedExchangeAdd(ptr long ) kernel32.InterlockedExchangeAdd +@ stdcall -arch=i386 InterlockedDecrement(ptr) +@ stdcall -arch=i386 InterlockedExchange(ptr long) +@ stdcall -arch=i386 InterlockedExchangeAdd(ptr long ) @ stdcall InterlockedFlushSList(ptr) ntdll.RtlInterlockedFlushSList -@ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement +@ stdcall -arch=i386 InterlockedIncrement(ptr) @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList @ stdcall -fastcall InterlockedPushListSList(ptr ptr ptr long) ntdll.RtlInterlockedPushListSList diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 31df6c7..51763c1 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -1383,3 +1383,93 @@ BOOL WINAPI DECLSPEC_HOTPATCH WaitNamedPipeW( LPCWSTR name, DWORD timeout ) NtClose( pipe_dev ); return set_ntstatus( status ); } + + + +/*********************************************************************** + * Interlocked functions + ***********************************************************************/ + + +/*********************************************************************** + * InitOnceBeginInitialize (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH InitOnceBeginInitialize( INIT_ONCE *once, DWORD flags, + BOOL *pending, void **context ) +{ + NTSTATUS status = RtlRunOnceBeginInitialize( once, flags, context ); + if (status >= 0) *pending = (status == STATUS_PENDING); + else SetLastError( RtlNtStatusToDosError(status) ); + return status >= 0; +} + + +/*********************************************************************** + * InitOnceComplete (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH InitOnceComplete( INIT_ONCE *once, DWORD flags, void *context ) +{ + return set_ntstatus( RtlRunOnceComplete( once, flags, context )); +} + + +/*********************************************************************** + * InitOnceExecuteOnce (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, + void *param, void **context ) +{ + return !RtlRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); +} + +#ifdef __i386__ + +/*********************************************************************** + * InterlockedCompareExchange (kernelbase.@) + */ +__ASM_STDCALL_FUNC(InterlockedCompareExchange, 12, + "movl 12(%esp),%eax\n\t" + "movl 8(%esp),%ecx\n\t" + "movl 4(%esp),%edx\n\t" + "lock; cmpxchgl %ecx,(%edx)\n\t" + "ret $12") + +/*********************************************************************** + * InterlockedExchange (kernelbase.@) + */ +__ASM_STDCALL_FUNC(InterlockedExchange, 8, + "movl 8(%esp),%eax\n\t" + "movl 4(%esp),%edx\n\t" + "lock; xchgl %eax,(%edx)\n\t" + "ret $8") + +/*********************************************************************** + * InterlockedExchangeAdd (kernelbase.@) + */ +__ASM_STDCALL_FUNC(InterlockedExchangeAdd, 8, + "movl 8(%esp),%eax\n\t" + "movl 4(%esp),%edx\n\t" + "lock; xaddl %eax,(%edx)\n\t" + "ret $8") + +/*********************************************************************** + * InterlockedIncrement (kernelbase.@) + */ +__ASM_STDCALL_FUNC(InterlockedIncrement, 4, + "movl 4(%esp),%edx\n\t" + "movl $1,%eax\n\t" + "lock; xaddl %eax,(%edx)\n\t" + "incl %eax\n\t" + "ret $4") + +/*********************************************************************** + * InterlockedDecrement (kernelbase.@) + */ +__ASM_STDCALL_FUNC(InterlockedDecrement, 4, + "movl 4(%esp),%edx\n\t" + "movl $-1,%eax\n\t" + "lock; xaddl %eax,(%edx)\n\t" + "decl %eax\n\t" + "ret $4") + +#endif /* __i386__ */

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019