From 1d0de632fd2b8a6a74e3bf28f0c223cc330a74f5 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Thu, 21 Jul 2011 17:21:43 +0000 Subject: [PATCH] [KERNEL32]: C'mon cmake..you can do it! svn path=/trunk/; revision=52762 --- .../dll/win32/kernel32/client/misc/lzexpand.c | 2 + reactos/dll/win32/kernel32/client/vista.c | 45 +++++++++---------- reactos/dll/win32/kernel32/kernel32.pspec | 4 -- reactos/dll/win32/kernel32/kernel32.spec | 4 -- 4 files changed, 24 insertions(+), 31 deletions(-) diff --git a/reactos/dll/win32/kernel32/client/misc/lzexpand.c b/reactos/dll/win32/kernel32/client/misc/lzexpand.c index 1a2bfdc1d6e..51380c115bb 100644 --- a/reactos/dll/win32/kernel32/client/misc/lzexpand.c +++ b/reactos/dll/win32/kernel32/client/misc/lzexpand.c @@ -56,6 +56,8 @@ #define HeapAlloc RtlAllocateHeap #define HeapReAlloc RtlReAllocateHeap #define HeapFree RtlFreeHeap +#define _lread(a, b, c) (long)(_hread(a, b, (long)c)) +#define _lwrite(a, b, c) (long)(_hwrite(a, b, (long)c)) WINE_DEFAULT_DEBUG_CHANNEL(file); /* The readahead length of the decompressor. Reading single bytes diff --git a/reactos/dll/win32/kernel32/client/vista.c b/reactos/dll/win32/kernel32/client/vista.c index fc5acd01c7a..397131668c4 100644 --- a/reactos/dll/win32/kernel32/client/vista.c +++ b/reactos/dll/win32/kernel32/client/vista.c @@ -309,29 +309,6 @@ RegisterApplicationRestart(IN PCWSTR pwzCommandline OPTIONAL, return E_FAIL; } -/* - * @implemented - */ -ULONGLONG -WINAPI -GetTickCount64(VOID) -{ - ULARGE_INTEGER TickCount; - - while (TRUE) - { - TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; - TickCount.LowPart = SharedUserData->TickCount.LowPart; - - if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) break; - - YieldProcessor(); - } - - return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + - (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); -} - /*-------------------------------------------------------------- * GetConsoleHistoryInfo * @@ -869,3 +846,25 @@ OpenFileById(IN HANDLE hFile, #endif +/* + * @implemented + */ +ULONGLONG +WINAPI +GetTickCount64(VOID) +{ + ULARGE_INTEGER TickCount; + + while (TRUE) + { + TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; + TickCount.LowPart = SharedUserData->TickCount.LowPart; + + if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) break; + + YieldProcessor(); + } + + return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + + (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); +} diff --git a/reactos/dll/win32/kernel32/kernel32.pspec b/reactos/dll/win32/kernel32/kernel32.pspec index 2f8bcbce115..4e91a4d2725 100644 --- a/reactos/dll/win32/kernel32/kernel32.pspec +++ b/reactos/dll/win32/kernel32/kernel32.pspec @@ -773,7 +773,6 @@ ;@ stdcall InitializeConditionVariable ntdll.RtlInitializeConditionVariable ; Win 7 @ stdcall InitializeCriticalSection(ptr) ; FIXME: ntdll.RtlInitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -@ stdcall InitializeCriticalSectionEx(ptr long long) ;@ stdcall InitializeExtendedContext ; Win 7 ;@ stdcall InitializeProcThreadAttributeList api-ms-win-core-processthreads-l1-1-0.InitializeProcThreadAttributeList ; Win 7 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @@ -971,8 +970,6 @@ @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) -@ stdcall QueryFullProcessImageNameA(ptr long str ptr) ; Vista and later -@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) ; Vista and later ;@ stdcall QueryIdleProcessorCycleTime ; Win 7 ;@ stdcall QueryIdleProcessorCycleTimeEx ; Win 7 @ stdcall QueryInformationJobObject(long long ptr long ptr) @@ -1053,7 +1050,6 @@ ;@ stdcall RegUnLoadKeyA ; Win 7 ;@ stdcall RegUnLoadKeyW ; Win 7 ;@ stdcall RegisterApplicationRecoveryCallback ; Win 7 -@ stdcall RegisterApplicationRestart(wstr long) @ stdcall RegisterConsoleIME(ptr ptr) @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long) diff --git a/reactos/dll/win32/kernel32/kernel32.spec b/reactos/dll/win32/kernel32/kernel32.spec index 3df5c72b1bd..e5d0a4c395b 100644 --- a/reactos/dll/win32/kernel32/kernel32.spec +++ b/reactos/dll/win32/kernel32/kernel32.spec @@ -771,7 +771,6 @@ ;@ stdcall InitializeConditionVariable ntdll.RtlInitializeConditionVariable ; Win 7 @ stdcall InitializeCriticalSection(ptr) ; FIXME: ntdll.RtlInitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -@ stdcall InitializeCriticalSectionEx(ptr long long) ;@ stdcall InitializeExtendedContext ; Win 7 ;@ stdcall InitializeProcThreadAttributeList api-ms-win-core-processthreads-l1-1-0.InitializeProcThreadAttributeList ; Win 7 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @@ -969,8 +968,6 @@ @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) -@ stdcall QueryFullProcessImageNameA(ptr long str ptr) ; Vista and later -@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) ; Vista and later ;@ stdcall QueryIdleProcessorCycleTime ; Win 7 ;@ stdcall QueryIdleProcessorCycleTimeEx ; Win 7 @ stdcall QueryInformationJobObject(long long ptr long ptr) @@ -1051,7 +1048,6 @@ ;@ stdcall RegUnLoadKeyA ; Win 7 ;@ stdcall RegUnLoadKeyW ; Win 7 ;@ stdcall RegisterApplicationRecoveryCallback ; Win 7 -@ stdcall RegisterApplicationRestart(wstr long) @ stdcall RegisterConsoleIME(ptr ptr) @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long)