diff --git a/reactos/lib/kernel32/file/dir.c b/reactos/lib/kernel32/file/dir.c index 7287134a847..107f6b8a496 100644 --- a/reactos/lib/kernel32/file/dir.c +++ b/reactos/lib/kernel32/file/dir.c @@ -578,7 +578,7 @@ GetShortPathNameW ( DWORD shortlen ) { - WCHAR tmpshortpath[PATH_MAX]; + WCHAR tmpshortpath[MAX_PATH]; LPCWSTR p; DWORD sp = 0, lp = 0; DWORD tmplen; diff --git a/reactos/lib/kernel32/file/move.c b/reactos/lib/kernel32/file/move.c index 24f8c4bd5d0..66bb981c5af 100644 --- a/reactos/lib/kernel32/file/move.c +++ b/reactos/lib/kernel32/file/move.c @@ -12,6 +12,7 @@ /* INCLUDES *****************************************************************/ #include +#include #define NDEBUG #include "../include/debug.h" diff --git a/reactos/lib/kernel32/file/npipe.c b/reactos/lib/kernel32/file/npipe.c index 6d10c1f382f..8614ec4f93d 100644 --- a/reactos/lib/kernel32/file/npipe.c +++ b/reactos/lib/kernel32/file/npipe.c @@ -177,7 +177,7 @@ CreateNamedPipeW(LPCWSTR lpName, if (nMaxInstances >= PIPE_UNLIMITED_INSTANCES) { - nMaxInstances = ULONG_MAX; + nMaxInstances = 0xFFFFFFFF; } DefaultTimeOut.QuadPart = nDefaultTimeOut * -10000LL; diff --git a/reactos/lib/kernel32/k32.h b/reactos/lib/kernel32/k32.h index 5d1638810fe..a95732247ed 100755 --- a/reactos/lib/kernel32/k32.h +++ b/reactos/lib/kernel32/k32.h @@ -1,38 +1,49 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/ntdll/inc/ntdll.h + * PURPOSE: Native Libary Header + * PROGRAMMER: Alex Ionescu (alex@relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +/* PSDK/NDK Headers */ +#include #define NTOS_MODE_USER -#include -#include -#include -#include -#include -#include +#include + +/* C Headers */ #include -#include -#include + +/* DDK Driver Headers */ #include #include -#include -#include +#include + +/* FIXME: Clean this sh*t up */ #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +/* Toolhelp & CSRSS Header */ +#include +#include + +/* FIXME: KILL ROSRTL */ +#include #include #include +/* Internal Kernel32 Header */ #include "include/kernel32.h" +/* PSEH for SEH Support */ #include + +/* Helper Header */ +#include +#include + diff --git a/reactos/lib/kernel32/mem/global.c b/reactos/lib/kernel32/mem/global.c index 2829b77c873..82f825f07b3 100644 --- a/reactos/lib/kernel32/mem/global.c +++ b/reactos/lib/kernel32/mem/global.c @@ -407,38 +407,38 @@ GlobalMemoryStatusEx(LPMEMORYSTATUSEX lpBuffer) */ lpBuffer->dwMemoryLoad = (SysBasicInfo.NumberOfPhysicalPages - SysPerfInfo.AvailablePages) * 100 / - SysBasicInfo.NumberOfPhysicalPages; + SysBasicInfo.PageSize; DPRINT1("Memory Load: %d\n",lpBuffer->dwMemoryLoad ); lpBuffer->ullTotalPhys = SysBasicInfo.NumberOfPhysicalPages * - SysBasicInfo.PhysicalPageSize; + SysBasicInfo.PageSize; lpBuffer->ullAvailPhys = SysPerfInfo.AvailablePages * - SysBasicInfo.PhysicalPageSize; + SysBasicInfo.PageSize; DPRINT("%d\n",SysPerfInfo.AvailablePages ); DPRINT("%d\n",lpBuffer->ullAvailPhys ); - lpBuffer->ullTotalPageFile = SysPerfInfo.TotalCommitLimit * - SysBasicInfo.PhysicalPageSize; + lpBuffer->ullTotalPageFile = SysPerfInfo.CommitLimit * + SysBasicInfo.PageSize; DPRINT("%d\n",lpBuffer->ullTotalPageFile ); - lpBuffer->ullAvailPageFile = ((SysPerfInfo.TotalCommitLimit - - SysPerfInfo.TotalCommittedPages) * - SysBasicInfo.PhysicalPageSize); + lpBuffer->ullAvailPageFile = ((SysPerfInfo.CommitLimit - + SysPerfInfo.CommittedPages) * + SysBasicInfo.PageSize); /* VM available to the calling processes, User Mem? */ - lpBuffer->ullTotalVirtual = SysBasicInfo.HighestUserAddress - - SysBasicInfo.LowestUserAddress; + lpBuffer->ullTotalVirtual = SysBasicInfo.MaximumUserModeAddress - + SysBasicInfo.MinimumUserModeAddress; lpBuffer->ullAvailVirtual = (lpBuffer->ullTotalVirtual - (UserMemory * - SysBasicInfo.PhysicalPageSize)); + SysBasicInfo.PageSize)); DPRINT("%d\n",lpBuffer->ullAvailVirtual ); DPRINT("%d\n",UserMemory); - DPRINT("%d\n",SysBasicInfo.PhysicalPageSize); + DPRINT("%d\n",SysBasicInfo.PageSize); /* lol! Memory from beyond! */ lpBuffer->ullAvailExtendedVirtual = 0; diff --git a/reactos/lib/kernel32/misc/lzexpand_main.c b/reactos/lib/kernel32/misc/lzexpand_main.c index 8a05d4f240b..416f8e45857 100644 --- a/reactos/lib/kernel32/misc/lzexpand_main.c +++ b/reactos/lib/kernel32/misc/lzexpand_main.c @@ -28,6 +28,7 @@ #define NDEBUG #include "../include/debug.h" #include "lzexpand.h" +#include #define HFILE_ERROR ((HFILE)-1) diff --git a/reactos/lib/kernel32/misc/sysinfo.c b/reactos/lib/kernel32/misc/sysinfo.c index 66c290e0da0..4542e45d696 100644 --- a/reactos/lib/kernel32/misc/sysinfo.c +++ b/reactos/lib/kernel32/misc/sysinfo.c @@ -58,11 +58,11 @@ GetSystemInfo ( Si->wProcessorArchitecture = Spi.ProcessorArchitecture; /* For future use: always zero */ Si->wReserved = 0; - Si->dwPageSize = Sbi.PhysicalPageSize; - Si->lpMinimumApplicationAddress = (PVOID)Sbi.LowestUserAddress; - Si->lpMaximumApplicationAddress = (PVOID)Sbi.HighestUserAddress; - Si->dwActiveProcessorMask = Sbi.ActiveProcessors; - Si->dwNumberOfProcessors = Sbi.NumberProcessors; + Si->dwPageSize = Sbi.PageSize; + Si->lpMinimumApplicationAddress = (PVOID)Sbi.MinimumUserModeAddress; + Si->lpMaximumApplicationAddress = (PVOID)Sbi.MaximumUserModeAddress; + Si->dwActiveProcessorMask = Sbi.ActiveProcessorsAffinityMask; + Si->dwNumberOfProcessors = Sbi.NumberOfProcessors; /* * Compatibility (no longer relevant): * PROCESSOR_INTEL_386 386 diff --git a/reactos/lib/kernel32/misc/time.c b/reactos/lib/kernel32/misc/time.c index d389f55ffbf..af78b8db068 100644 --- a/reactos/lib/kernel32/misc/time.c +++ b/reactos/lib/kernel32/misc/time.c @@ -366,7 +366,7 @@ SetTimeZoneInformation(CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation) DPRINT("SetTimeZoneInformation()\n"); - Status = RtlSetTimeZoneInformation((PTIME_ZONE_INFORMATION)lpTimeZoneInformation); + Status = RtlSetTimeZoneInformation((LPTIME_ZONE_INFORMATION)lpTimeZoneInformation); if (!NT_SUCCESS(Status)) { DPRINT1("RtlSetTimeZoneInformation() failed (Status %lx)\n", Status); @@ -442,12 +442,12 @@ GetSystemTimeAdjustment(PDWORD lpTimeAdjustment, PDWORD lpTimeIncrement, PBOOL lpTimeAdjustmentDisabled) { - SYSTEM_QUERY_TIME_ADJUSTMENT Buffer; + SYSTEM_QUERY_TIME_ADJUST_INFORMATION Buffer; NTSTATUS Status; Status = NtQuerySystemInformation(SystemTimeAdjustmentInformation, &Buffer, - sizeof(SYSTEM_QUERY_TIME_ADJUSTMENT), + sizeof(SYSTEM_QUERY_TIME_ADJUST_INFORMATION), NULL); if (!NT_SUCCESS(Status)) { @@ -456,8 +456,8 @@ GetSystemTimeAdjustment(PDWORD lpTimeAdjustment, } *lpTimeAdjustment = (DWORD)Buffer.TimeAdjustment; - *lpTimeIncrement = (DWORD)Buffer.MaximumIncrement; - *lpTimeAdjustmentDisabled = (BOOL)Buffer.TimeSynchronization; + *lpTimeIncrement = (DWORD)Buffer.TimeIncrement; + *lpTimeAdjustmentDisabled = (BOOL)Buffer.Enable; return TRUE; } @@ -471,14 +471,14 @@ SetSystemTimeAdjustment(DWORD dwTimeAdjustment, BOOL bTimeAdjustmentDisabled) { NTSTATUS Status; - SYSTEM_SET_TIME_ADJUSTMENT Buffer; + SYSTEM_SET_TIME_ADJUST_INFORMATION Buffer; Buffer.TimeAdjustment = (ULONG)dwTimeAdjustment; - Buffer.TimeSynchronization = (BOOLEAN)bTimeAdjustmentDisabled; + Buffer.Enable = (BOOLEAN)bTimeAdjustmentDisabled; Status = NtSetSystemInformation(SystemTimeAdjustmentInformation, &Buffer, - sizeof(SYSTEM_SET_TIME_ADJUSTMENT)); + sizeof(SYSTEM_SET_TIME_ADJUST_INFORMATION)); if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); diff --git a/reactos/lib/kernel32/process/create.c b/reactos/lib/kernel32/process/create.c index 3802b423994..8f3b8fe8f01 100644 --- a/reactos/lib/kernel32/process/create.c +++ b/reactos/lib/kernel32/process/create.c @@ -139,11 +139,11 @@ BOOL STDCALL CreateProcessA(LPCSTR lpApplicationName, BOOL bRetVal; STARTUPINFOW wsiStartupInfo; - NTSTATUS STDCALL_FUNC (*pTrue)(UNICODE_STRING *, + NTSTATUS (STDCALL *pTrue)(UNICODE_STRING *, ANSI_STRING *, BOOLEAN); - ULONG STDCALL_FUNC (*pRtlMbStringToUnicodeSize)(ANSI_STRING *); + ULONG (STDCALL *pRtlMbStringToUnicodeSize)(ANSI_STRING *); DPRINT("dwCreationFlags %x, lpEnvironment %x, lpCurrentDirectory %x, " "lpStartupInfo %x, lpProcessInformation %x\n", @@ -1156,7 +1156,7 @@ CreateProcessW(LPCWSTR lpApplicationName, */ CsrRequest.Type = CSRSS_CREATE_PROCESS; CsrRequest.Data.CreateProcessRequest.NewProcessId = - ProcessBasicInfo.UniqueProcessId; + (HANDLE)ProcessBasicInfo.UniqueProcessId; if (Sii.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { /* Do not create a console for GUI applications */ @@ -1306,7 +1306,7 @@ CreateProcessW(LPCWSTR lpApplicationName, if (IsConsoleHandle(Ppb->hStdError)) { CsrRequest.Type = CSRSS_DUPLICATE_HANDLE; - CsrRequest.Data.DuplicateHandleRequest.ProcessId = ProcessBasicInfo.UniqueProcessId; + CsrRequest.Data.DuplicateHandleRequest.ProcessId = (HANDLE)ProcessBasicInfo.UniqueProcessId; CsrRequest.Data.DuplicateHandleRequest.Handle = CsrReply.Data.CreateProcessReply.OutputHandle; Status = CsrClientCallServer(&CsrRequest, &CsrReply, diff --git a/reactos/lib/kernel32/process/proc.c b/reactos/lib/kernel32/process/proc.c index 12d209b3806..eb56a1af87d 100644 --- a/reactos/lib/kernel32/process/proc.c +++ b/reactos/lib/kernel32/process/proc.c @@ -62,7 +62,7 @@ GetProcessAffinityMask (HANDLE hProcess, } *lpProcessAffinityMask = (DWORD)ProcessInfo.AffinityMask; - *lpSystemAffinityMask = (DWORD)SystemInfo.ActiveProcessors; + *lpSystemAffinityMask = (DWORD)SystemInfo.ActiveProcessorsAffinityMask; return TRUE; }