Author: ion Date: Thu Jul 21 17:21:43 2011 New Revision: 52762
URL: http://svn.reactos.org/svn/reactos?rev=52762&view=rev Log: [KERNEL32]: C'mon cmake..you can do it!
Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c trunk/reactos/dll/win32/kernel32/client/vista.c trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/kernel32.spec
Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/m... ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -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
Modified: trunk/reactos/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/v... ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -307,29 +307,6 @@ { UNIMPLEMENTED; 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); }
/*-------------------------------------------------------------- @@ -869,3 +846,25 @@
#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); +}
Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel32... ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -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)
Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel32... ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -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)
-
ion＠svn.reactos.org