Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 15959: - Declare IO_ERROR_LOG_MESSAGE.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

- Declare IO_ERROR_LOG_MESSAGE. - Define ERROR_LOG_LIMIT_SIZE and IO_ERROR_LOG_MESSAGE_HEADER_LENGTH. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 09:46:29 UTC (rev 15958) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 09:57:28 UTC (rev 15959) @@ -1556,6 +1556,36 @@ IO_RESOURCE_LIST List[1]; } IO_RESOURCE_REQUIREMENTS_LIST, *PIO_RESOURCE_REQUIREMENTS_LIST; +typedef struct _IO_ERROR_LOG_PACKET { + UCHAR MajorFunctionCode; + UCHAR RetryCount; + USHORT DumpDataSize; + USHORT NumberOfStrings; + USHORT StringOffset; + USHORT EventCategory; + NTSTATUS ErrorCode; + ULONG UniqueErrorValue; + NTSTATUS FinalStatus; + ULONG SequenceNumber; + ULONG IoControlCode; + LARGE_INTEGER DeviceOffset; + ULONG DumpData[1]; +} IO_ERROR_LOG_PACKET, *PIO_ERROR_LOG_PACKET; + +typedef struct _IO_ERROR_LOG_MESSAGE { + USHORT Type; + USHORT Size; + USHORT DriverNameLength; + LARGE_INTEGER TimeStamp; + ULONG DriverNameOffset; + IO_ERROR_LOG_PACKET EntryData; +} IO_ERROR_LOG_MESSAGE, *PIO_ERROR_LOG_MESSAGE; + +#define ERROR_LOG_LIMIT_SIZE 240 +#define IO_ERROR_LOG_MESSAGE_HEADER_LENGTH (sizeof(IO_ERROR_LOG_MESSAGE) - \ + sizeof(IO_ERROR_LOG_PACKET) + \ + (sizeof(WCHAR) * 40)) + typedef struct _CONTROLLER_OBJECT { CSHORT Type; CSHORT Size; @@ -6248,22 +6278,6 @@ IN ULONG DriverObjectExtensionSize, OUT PVOID *DriverObjectExtension); -typedef struct _IO_ERROR_LOG_PACKET { - UCHAR MajorFunctionCode; - UCHAR RetryCount; - USHORT DumpDataSize; - USHORT NumberOfStrings; - USHORT StringOffset; - USHORT EventCategory; - NTSTATUS ErrorCode; - ULONG UniqueErrorValue; - NTSTATUS FinalStatus; - ULONG SequenceNumber; - ULONG IoControlCode; - LARGE_INTEGER DeviceOffset; - ULONG DumpData[1]; -} IO_ERROR_LOG_PACKET, *PIO_ERROR_LOG_PACKET; - NTOSAPI PVOID DDKAPI

1 0

[weiden] 15958: implemented IsTokenRestricted(), inspired by a patch to winehq by James Hawkins
by weiden＠svn.reactos.com 17 Jun '05

17 Jun '05

implemented IsTokenRestricted(), inspired by a patch to winehq by James Hawkins Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/token/token.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-06-17 09:46:21 UTC (rev 15957) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-06-17 09:46:29 UTC (rev 15958) @@ -319,7 +319,7 @@ InitiateSystemShutdownW@20 ;InstallApplication IsTextUnicode(a)12=NTDLL.RtlIsTextUnicode -;IsTokenRestricted +IsTokenRestricted@4 ;IsTokenUntrusted IsValidAcl@4 IsValidSecurityDescriptor@4 _____ Modified: trunk/reactos/lib/advapi32/token/token.c --- trunk/reactos/lib/advapi32/token/token.c 2005-06-17 09:46:21 UTC (rev 15957) +++ trunk/reactos/lib/advapi32/token/token.c 2005-06-17 09:46:29 UTC (rev 15958) @@ -401,4 +401,71 @@ return Result; } +BOOL STDCALL +IsTokenRestricted(HANDLE TokenHandle) +{ + ULONG RetLength; + PTOKEN_GROUPS lpGroups; + NTSTATUS Status; + BOOL Ret = FALSE; + + /* determine the required buffer size and allocate enough memory to read the + list of restricted SIDs */ + + Status = NtQueryInformationToken(TokenHandle, + TokenRestrictedSids, + NULL, + 0, + &RetLength); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + +AllocAndReadRestrictedSids: + lpGroups = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(), + 0, + RetLength); + if (lpGroups == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + /* actually read the list of the restricted SIDs */ + + Status = NtQueryInformationToken(TokenHandle, + TokenRestrictedSids, + lpGroups, + RetLength, + &RetLength); + if (NT_SUCCESS(Status)) + { + Ret = (lpGroups->GroupCount != 0); + } + else if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* looks like the token was modified in the meanwhile, let's just try again */ + + HeapFree(GetProcessHeap(), + 0, + lpGroups); + + goto AllocAndReadRestrictedSids; + } + else + { + SetLastError(RtlNtStatusToDosError(Status)); + } + + /* free allocated memory */ + + HeapFree(GetProcessHeap(), + 0, + lpGroups); + + return Ret; +} + /* EOF */

1 0

[navaraf] 15957: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/subsys/system/usetup/console.c Modified: trunk/reactos/subsys/system/usetup/console.h Modified: trunk/reactos/subsys/system/usetup/filesup.c Modified: trunk/reactos/subsys/system/usetup/filesup.h Modified: trunk/reactos/subsys/system/usetup/precomp.h Modified: trunk/reactos/subsys/system/usetup/usetup.c Modified: trunk/reactos/subsys/system/usetup/usetup.xml _____ Modified: trunk/reactos/subsys/system/usetup/console.c --- trunk/reactos/subsys/system/usetup/console.c 2005-06-17 09:46:03 UTC (rev 15956) +++ trunk/reactos/subsys/system/usetup/console.c 2005-06-17 09:46:21 UTC (rev 15957) @@ -48,7 +48,7 @@ NTSTATUS -GetConsoleScreenBufferInfo(PCONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo); +ConGetConsoleScreenBufferInfo(PCONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo); /* FUNCTIONS *****************************************************************/ @@ -56,7 +56,7 @@ NTSTATUS -AllocConsole(VOID) +ConAllocConsole(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; @@ -98,7 +98,7 @@ if (!NT_SUCCESS(Status)) return(Status); - GetConsoleScreenBufferInfo(&csbi); + ConGetConsoleScreenBufferInfo(&csbi); xScreen = csbi.dwSize.X; yScreen = csbi.dwSize.Y; @@ -108,7 +108,7 @@ VOID -FreeConsole(VOID) +ConFreeConsole(VOID) { DPRINT("FreeConsole() called\n"); @@ -125,9 +125,9 @@ NTSTATUS -WriteConsole(PCHAR Buffer, - ULONG NumberOfCharsToWrite, - PULONG NumberOfCharsWritten) +ConWriteConsole(PCHAR Buffer, + ULONG NumberOfCharsToWrite, + PULONG NumberOfCharsWritten) { IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status = STATUS_SUCCESS; @@ -192,7 +192,7 @@ NTSTATUS -ReadConsoleInput(PINPUT_RECORD Buffer) +ConReadConsoleInput(PINPUT_RECORD Buffer) { IO_STATUS_BLOCK Iosb; NTSTATUS Status; @@ -220,10 +220,10 @@ NTSTATUS -ReadConsoleOutputCharacters(LPSTR lpCharacter, - ULONG nLength, - COORD dwReadCoord, - PULONG lpNumberOfCharsRead) +ConReadConsoleOutputCharacters(LPSTR lpCharacter, + ULONG nLength, + COORD dwReadCoord, + PULONG lpNumberOfCharsRead) { IO_STATUS_BLOCK IoStatusBlock; OUTPUT_CHARACTER Buffer; @@ -252,10 +252,10 @@ NTSTATUS -ReadConsoleOutputAttributes(PUSHORT lpAttribute, - ULONG nLength, - COORD dwReadCoord, - PULONG lpNumberOfAttrsRead) +ConReadConsoleOutputAttributes(PUSHORT lpAttribute, + ULONG nLength, + COORD dwReadCoord, + PULONG lpNumberOfAttrsRead) { IO_STATUS_BLOCK IoStatusBlock; OUTPUT_ATTRIBUTE Buffer; @@ -284,9 +284,9 @@ NTSTATUS -WriteConsoleOutputCharacters(LPCSTR lpCharacter, - ULONG nLength, - COORD dwWriteCoord) +ConWriteConsoleOutputCharacters(LPCSTR lpCharacter, + ULONG nLength, + COORD dwWriteCoord) { IO_STATUS_BLOCK IoStatusBlock; PCHAR Buffer; @@ -323,9 +323,9 @@ NTSTATUS -WriteConsoleOutputCharactersW(LPCWSTR lpCharacter, - ULONG nLength, - COORD dwWriteCoord) +ConWriteConsoleOutputCharactersW(LPCWSTR lpCharacter, + ULONG nLength, + COORD dwWriteCoord) { IO_STATUS_BLOCK IoStatusBlock; PCHAR Buffer; @@ -367,10 +367,10 @@ NTSTATUS -WriteConsoleOutputAttributes(CONST USHORT *lpAttribute, - ULONG nLength, - COORD dwWriteCoord, - PULONG lpNumberOfAttrsWritten) +ConWriteConsoleOutputAttributes(CONST USHORT *lpAttribute, + ULONG nLength, + COORD dwWriteCoord, + PULONG lpNumberOfAttrsWritten) { IO_STATUS_BLOCK IoStatusBlock; PUSHORT Buffer; @@ -407,10 +407,10 @@ NTSTATUS -FillConsoleOutputAttribute(USHORT wAttribute, - ULONG nLength, - COORD dwWriteCoord, - PULONG lpNumberOfAttrsWritten) +ConFillConsoleOutputAttribute(USHORT wAttribute, + ULONG nLength, + COORD dwWriteCoord, + PULONG lpNumberOfAttrsWritten) { IO_STATUS_BLOCK IoStatusBlock; OUTPUT_ATTRIBUTE Buffer; @@ -441,10 +441,10 @@ NTSTATUS -FillConsoleOutputCharacter(CHAR Character, - ULONG Length, - COORD WriteCoord, - PULONG NumberOfCharsWritten) +ConFillConsoleOutputCharacter(CHAR Character, + ULONG Length, + COORD WriteCoord, + PULONG NumberOfCharsWritten) { IO_STATUS_BLOCK IoStatusBlock; OUTPUT_CHARACTER Buffer; @@ -562,7 +562,7 @@ NTSTATUS -GetConsoleScreenBufferInfo(PCONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo) +ConGetConsoleScreenBufferInfo(PCONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo) { IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; @@ -583,7 +583,7 @@ NTSTATUS -SetConsoleCursorInfo(PCONSOLE_CURSOR_INFO lpConsoleCursorInfo) +ConSetConsoleCursorInfo(PCONSOLE_CURSOR_INFO lpConsoleCursorInfo) { IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; @@ -604,13 +604,13 @@ NTSTATUS -SetConsoleCursorPosition(COORD dwCursorPosition) +ConSetConsoleCursorPosition(COORD dwCursorPosition) { CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; - Status = GetConsoleScreenBufferInfo(&ConsoleScreenBufferInfo); + Status = ConGetConsoleScreenBufferInfo(&ConsoleScreenBufferInfo); if (!NT_SUCCESS(Status)) return(Status); @@ -633,7 +633,7 @@ NTSTATUS -SetConsoleTextAttribute(USHORT wAttributes) +ConSetConsoleTextAttribute(USHORT wAttributes) { IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; @@ -661,7 +661,7 @@ while (TRUE) { - ReadConsoleInput(Buffer); + ConReadConsoleInput(Buffer); if ((Buffer->EventType == KEY_EVENT) && (Buffer->Event.KeyEvent.bKeyDown == TRUE)) @@ -675,9 +675,9 @@ { ULONG Written; - WriteConsole(&c, - 1, - &Written); + ConWriteConsole(&c, + 1, + &Written); } @@ -686,12 +686,12 @@ { ULONG Written; - WriteConsole(szText, - strlen(szText), - &Written); - WriteConsole("\n", - 1, - &Written); + ConWriteConsole(szText, + strlen(szText), + &Written); + ConWriteConsole("\n", + 1, + &Written); } @@ -706,9 +706,9 @@ vsprintf(szOut, szFormat, arg_ptr); va_end(arg_ptr); - WriteConsole(szOut, - strlen(szOut), - &dwWritten); + ConWriteConsole(szOut, + strlen(szOut), + &dwWritten); } @@ -720,7 +720,7 @@ { CONSOLE_SCREEN_BUFFER_INFO csbi; - GetConsoleScreenBufferInfo(&csbi); + ConGetConsoleScreenBufferInfo(&csbi); return(csbi.dwCursorPosition.X); } @@ -731,7 +731,7 @@ { CONSOLE_SCREEN_BUFFER_INFO csbi; - GetConsoleScreenBufferInfo(&csbi); + ConGetConsoleScreenBufferInfo(&csbi); return(csbi.dwCursorPosition.Y); } @@ -743,7 +743,7 @@ { CONSOLE_SCREEN_BUFFER_INFO csbi; - GetConsoleScreenBufferInfo(&csbi); + ConGetConsoleScreenBufferInfo(&csbi); if (maxx) *maxx = csbi.dwSize.X; @@ -762,7 +762,7 @@ cci.dwSize = bInsert ? 10 : 99; cci.bVisible = bVisible; - SetConsoleCursorInfo(&cci); + ConSetConsoleCursorInfo(&cci); } @@ -774,7 +774,7 @@ coPos.X = x; coPos.Y = y; - SetConsoleCursorPosition(coPos); + ConSetConsoleCursorPosition(coPos); } @@ -896,28 +896,28 @@ Length = len - 1; } - FillConsoleOutputAttribute(0x70, - len, - coPos, - &Written); + ConFillConsoleOutputAttribute(0x70, + len, + coPos, + &Written); - WriteConsoleOutputCharactersW(Text, - Length, - coPos); + ConWriteConsoleOutputCharactersW(Text, + Length, + coPos); coPos.X += Length; - FillConsoleOutputCharacter('_', - 1, - coPos, - &Written); + ConFillConsoleOutputCharacter('_', + 1, + coPos, + &Written); if (len > Length + 1) { coPos.X++; - FillConsoleOutputCharacter(' ', - len - Length - 1, - coPos, - &Written); + ConFillConsoleOutputCharacter(' ', + len - Length - 1, + coPos, + &Written); } } @@ -934,15 +934,15 @@ Length = strlen(Text); - WriteConsoleOutputCharacters(Text, - Length, - coPos); + ConWriteConsoleOutputCharacters(Text, + Length, + coPos); coPos.Y++; - FillConsoleOutputCharacter(0xCD, - Length, - coPos, - &Written); + ConFillConsoleOutputCharacter(0xCD, + Length, + coPos, + &Written); } @@ -958,14 +958,14 @@ Length = strlen(Text); - FillConsoleOutputAttribute(0x71, - Length, - coPos, - &Written); + ConFillConsoleOutputAttribute(0x71, + Length, + coPos, + &Written); - WriteConsoleOutputCharacters(Text, - Length, - coPos); + ConWriteConsoleOutputCharacters(Text, + Length, + coPos); } @@ -981,14 +981,14 @@ Length = strlen(Text); - FillConsoleOutputAttribute(0x1F, - Length, - coPos, - &Written); + ConFillConsoleOutputAttribute(0x1F, + Length, + coPos, + &Written); - WriteConsoleOutputCharacters(Text, - Length, - coPos); + ConWriteConsoleOutputCharacters(Text, + Length, + coPos); } @@ -1006,9 +1006,9 @@ coPos.X = x; coPos.Y = y; - WriteConsoleOutputCharacters(buffer, - strlen(buffer), - coPos); + ConWriteConsoleOutputCharacters(buffer, + strlen(buffer), + coPos); } @@ -1034,18 +1034,18 @@ Length = len - 1; } - WriteConsoleOutputCharacters(buffer, - Length, - coPos); + ConWriteConsoleOutputCharacters(buffer, + Length, + coPos); coPos.X += Length; if (len > Length) { - FillConsoleOutputCharacter(' ', - len - Length, - coPos, - &Written); + ConFillConsoleOutputCharacter(' ', + len - Length, + coPos, + &Written); } } _____ Modified: trunk/reactos/subsys/system/usetup/console.h --- trunk/reactos/subsys/system/usetup/console.h 2005-06-17 09:46:03 UTC (rev 15956) +++ trunk/reactos/subsys/system/usetup/console.h 2005-06-17 09:46:21 UTC (rev 15957) @@ -29,47 +29,56 @@ #include <ntos/keyboard.h> +#define AllocConsole ConAllocConsole +#define FreeConsole ConFreeConsole +#define ReadConsoleOutputCharacters ConReadConsoleOutputCharacters +#define ReadConsoleOutputAttributes ConReadConsoleOutputAttributes +#define WriteConsoleOutputCharacters ConWriteConsoleOutputCharacters +#define WriteConsoleOutputAttributes ConWriteConsoleOutputAttributes +#define FillConsoleOutputAttribute ConFillConsoleOutputAttribute +#undef FillConsoleOutputCharacter +#define FillConsoleOutputCharacter ConFillConsoleOutputCharacter NTSTATUS -AllocConsole(VOID); +ConAllocConsole(VOID); VOID -FreeConsole(VOID); +ConFreeConsole(VOID); NTSTATUS -ReadConsoleOutputCharacters(LPSTR lpCharacter, - ULONG nLength, - COORD dwReadCoord, - PULONG lpNumberOfCharsRead); +ConReadConsoleOutputCharacters(LPSTR lpCharacter, + ULONG nLength, + COORD dwReadCoord, + PULONG lpNumberOfCharsRead); NTSTATUS -ReadConsoleOutputAttributes(PUSHORT lpAttribute, - ULONG nLength, - COORD dwReadCoord, - PULONG lpNumberOfAttrsRead); +ConReadConsoleOutputAttributes(PUSHORT lpAttribute, + ULONG nLength, + COORD dwReadCoord, + PULONG lpNumberOfAttrsRead); NTSTATUS -WriteConsoleOutputCharacters(LPCSTR lpCharacter, - ULONG nLength, - COORD dwWriteCoord); +ConWriteConsoleOutputCharacters(LPCSTR lpCharacter, + ULONG nLength, + COORD dwWriteCoord); NTSTATUS -WriteConsoleOutputAttributes(CONST USHORT *lpAttribute, - ULONG nLength, - COORD dwWriteCoord, - PULONG lpNumberOfAttrsWritten); +ConWriteConsoleOutputAttributes(CONST USHORT *lpAttribute, + ULONG nLength, + COORD dwWriteCoord, + PULONG lpNumberOfAttrsWritten); NTSTATUS -FillConsoleOutputAttribute(USHORT wAttribute, - ULONG nLength, - COORD dwWriteCoord, - PULONG lpNumberOfAttrsWritten); +ConFillConsoleOutputAttribute(USHORT wAttribute, + ULONG nLength, + COORD dwWriteCoord, + PULONG lpNumberOfAttrsWritten); NTSTATUS -FillConsoleOutputCharacter(CHAR Character, - ULONG Length, - COORD WriteCoord, - PULONG NumberOfCharsWritten); +ConFillConsoleOutputCharacter(CHAR Character, + ULONG Length, + COORD WriteCoord, + PULONG NumberOfCharsWritten); #if 0 NTSTATUS _____ Modified: trunk/reactos/subsys/system/usetup/filesup.c --- trunk/reactos/subsys/system/usetup/filesup.c 2005-06-17 09:46:03 UTC (rev 15956) +++ trunk/reactos/subsys/system/usetup/filesup.c 2005-06-17 09:46:21 UTC (rev 15957) @@ -44,7 +44,7 @@ static WCHAR CurrentCabinetName[MAX_PATH]; NTSTATUS -CreateDirectory(PWCHAR DirectoryName) +SetupCreateDirectory(PWCHAR DirectoryName) { OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; _____ Modified: trunk/reactos/subsys/system/usetup/filesup.h --- trunk/reactos/subsys/system/usetup/filesup.h 2005-06-17 09:46:03 UTC (rev 15956) +++ trunk/reactos/subsys/system/usetup/filesup.h 2005-06-17 09:46:21 UTC (rev 15957) @@ -28,7 +28,7 @@ #define __FILESUP_H__ NTSTATUS -CreateDirectory(PWCHAR DirectoryName); +SetupCreateDirectory(PWCHAR DirectoryName); NTSTATUS SetupCopyFile(PWCHAR SourceFileName, _____ Modified: trunk/reactos/subsys/system/usetup/precomp.h --- trunk/reactos/subsys/system/usetup/precomp.h 2005-06-17 09:46:03 UTC (rev 15956) +++ trunk/reactos/subsys/system/usetup/precomp.h 2005-06-17 09:46:21 UTC (rev 15957) @@ -1 +1 @@ -#include <ddk/ntddk.h> +#include <ntos.h> _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-06-17 09:46:03 UTC (rev 15956) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-06-17 09:46:21 UTC (rev 15957) @@ -536,7 +536,7 @@ * Number of the next page. */ static PAGE_NUMBER -StartPage(PINPUT_RECORD Ir) +SetupStartPage(PINPUT_RECORD Ir) { SYSTEM_DEVICE_INFORMATION Sdi; NTSTATUS Status; @@ -2896,7 +2896,7 @@ } /* Create the install directory */ - Status = CreateDirectory(PathBuffer); + Status = SetupCreateDirectory(PathBuffer); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); @@ -2967,7 +2967,7 @@ DPRINT("FullPath: '%S'\n", PathBuffer); - Status = CreateDirectory(PathBuffer); + Status = SetupCreateDirectory(PathBuffer); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); @@ -3808,7 +3808,7 @@ { /* Start page */ case START_PAGE: - Page = StartPage(&Ir); + Page = SetupStartPage(&Ir); break; /* License page */ _____ Modified: trunk/reactos/subsys/system/usetup/usetup.xml --- trunk/reactos/subsys/system/usetup/usetup.xml 2005-06-17 09:46:03 UTC (rev 15956) +++ trunk/reactos/subsys/system/usetup/usetup.xml 2005-06-17 09:46:21 UTC (rev 15957) @@ -2,7 +2,9 @@ <bootstrap base="reactos/system32" nameoncd="smss.exe" /> <include base="usetup">.</include> <include base="zlib">.</include> + <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0502</define> <linkerflag>-lgcc</linkerflag> <library>zlib</library> <library>vfatlib</library>

1 0

[navaraf] 15956: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/subsys/system/autochk/autochk.c Modified: trunk/reactos/subsys/system/autochk/autochk.xml _____ Modified: trunk/reactos/subsys/system/autochk/autochk.c --- trunk/reactos/subsys/system/autochk/autochk.c 2005-06-17 09:45:42 UTC (rev 15955) +++ trunk/reactos/subsys/system/autochk/autochk.c 2005-06-17 09:46:03 UTC (rev 15956) @@ -27,7 +27,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include <ntos.h> #include <napi/shared_data.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/subsys/system/autochk/autochk.xml --- trunk/reactos/subsys/system/autochk/autochk.xml 2005-06-17 09:45:42 UTC (rev 15955) +++ trunk/reactos/subsys/system/autochk/autochk.xml 2005-06-17 09:46:03 UTC (rev 15956) @@ -1,5 +1,6 @@ <module name="autochk" type="nativecui" installbase="system32" installname="autochk.exe"> <include base="autochk">.</include> + <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <file>autochk.c</file>

1 0

[navaraf] 15955: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/subsys/smss/smss.xml _____ Modified: trunk/reactos/subsys/smss/smss.xml --- trunk/reactos/subsys/smss/smss.xml 2005-06-17 08:12:20 UTC (rev 15954) +++ trunk/reactos/subsys/smss/smss.xml 2005-06-17 09:45:42 UTC (rev 15955) @@ -1,5 +1,6 @@ <module name="smss" type="nativecui" installbase="system32" installname="smss.exe"> <include base="smss">.</include> + <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <library>smlib</library> <library>ntdll</library>

1 0

[navaraf] 15954: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/lib/acledit/acledit.xml Modified: trunk/reactos/lib/acledit/stubs.c Modified: trunk/reactos/lib/dxguid/dxguid.xml Modified: trunk/reactos/lib/epsapi/epsapi.xml Modified: trunk/reactos/lib/freetype/freetype.xml Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.xml Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.xml Modified: trunk/reactos/lib/lzexpand/lz32.xml Modified: trunk/reactos/lib/msimg32/msimg32.xml Modified: trunk/reactos/lib/samlib/samlib.c Modified: trunk/reactos/lib/samlib/samlib.xml Modified: trunk/reactos/lib/snmpapi/debug.h Modified: trunk/reactos/lib/snmpapi/snmpapi.xml Modified: trunk/reactos/lib/strmiids/strmiids.xml Modified: trunk/reactos/lib/twain/twain_32.xml Modified: trunk/reactos/lib/winspool/winspool.xml _____ Modified: trunk/reactos/lib/acledit/acledit.xml --- trunk/reactos/lib/acledit/acledit.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/acledit/acledit.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -4,6 +4,7 @@ <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__REACTOS__" /> + <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> _____ Modified: trunk/reactos/lib/acledit/stubs.c --- trunk/reactos/lib/acledit/stubs.c 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/acledit/stubs.c 2005-06-17 08:12:20 UTC (rev 15954) @@ -17,6 +17,8 @@ #include <acledit.h> #include "acleditint.h" +ULONG DbgPrint(PCH Format,...); + #define UNIMPLEMENTED \ DbgPrint("ACLEDIT: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) _____ Modified: trunk/reactos/lib/dxguid/dxguid.xml --- trunk/reactos/lib/dxguid/dxguid.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/dxguid/dxguid.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -1,5 +1,6 @@ <module name="dxguid" type="staticlibrary"> <define name="_DISABLE_TIDENTS" /> <define name="__REACTOS__" /> + <define name="__USE_W32API" /> <file>dxguid-mingw.c</file> </module> _____ Modified: trunk/reactos/lib/epsapi/epsapi.xml --- trunk/reactos/lib/epsapi/epsapi.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/epsapi/epsapi.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -1,5 +1,6 @@ <module name="epsapi" type="objectlibrary"> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> <directory name="enum"> <file>drivers.c</file> <file>modules.c</file> _____ Modified: trunk/reactos/lib/freetype/freetype.xml --- trunk/reactos/lib/freetype/freetype.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/freetype/freetype.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -5,6 +5,7 @@ <define name="_SEH_NO_NATIVE_NLG" /> <define name="__NTDRIVER__" /> <define name="__NO_CTYPE_INLINES" /> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <directory name="i386"> _____ Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.xml --- trunk/reactos/lib/fslib/vfatlib/vfatlib.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -1,6 +1,7 @@ <module name="vfatlib" type="staticlibrary"> <include base="vfatlib">.</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> <file>fat12.c</file> <file>fat16.c</file> <file>fat32.c</file> _____ Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.xml --- trunk/reactos/lib/fslib/vfatxlib/vfatxlib.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/fslib/vfatxlib/vfatxlib.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -1,6 +1,7 @@ <module name="vfatxlib" type="staticlibrary"> <include base="vfatxlib">.</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> <file>fatx.c</file> <file>vfatxlib.c</file> </module> _____ Modified: trunk/reactos/lib/lzexpand/lz32.xml --- trunk/reactos/lib/lzexpand/lz32.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/lzexpand/lz32.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -2,6 +2,7 @@ <importlibrary definition="lz32.def" /> <include base="lz32">.</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> <file>lzexpand_main.c</file> _____ Modified: trunk/reactos/lib/msimg32/msimg32.xml --- trunk/reactos/lib/msimg32/msimg32.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/msimg32/msimg32.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -3,6 +3,7 @@ <include base="msimg32">.</include> <include base="msimg32">include</include> <define name="__REACTOS__" /> + <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> <library>gdi32</library> _____ Modified: trunk/reactos/lib/samlib/samlib.c --- trunk/reactos/lib/samlib/samlib.c 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/samlib/samlib.c 2005-06-17 08:12:20 UTC (rev 15954) @@ -28,6 +28,8 @@ /* INCLUDES *****************************************************************/ #include <windows.h> +#include <ntos.h> +#include <ntdll/rtl.h> #include <winerror.h> #include <string.h> _____ Modified: trunk/reactos/lib/samlib/samlib.xml --- trunk/reactos/lib/samlib/samlib.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/samlib/samlib.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -2,6 +2,7 @@ <importlibrary definition="samlib.def" /> <include base="samlib">.</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> _____ Modified: trunk/reactos/lib/snmpapi/debug.h --- trunk/reactos/lib/snmpapi/debug.h 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/snmpapi/debug.h 2005-06-17 08:12:20 UTC (rev 15954) @@ -17,6 +17,8 @@ #define DEBUG_ULTRA 0xFFFFFFFF +ULONG DbgPrint(PCH Format,...); + #ifdef DBG extern DWORD DebugTraceLevel; _____ Modified: trunk/reactos/lib/snmpapi/snmpapi.xml --- trunk/reactos/lib/snmpapi/snmpapi.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/snmpapi/snmpapi.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -1,6 +1,7 @@ <module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}" installbase="system32" installname="snmpapi.dll"> <importlibrary definition="snmpapi.def" /> <include base="snmpapi">.</include> + <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> _____ Modified: trunk/reactos/lib/strmiids/strmiids.xml --- trunk/reactos/lib/strmiids/strmiids.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/strmiids/strmiids.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -1,4 +1,5 @@ <module name="strmiids" type="staticlibrary"> + <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <define name="__REACTOS__" /> <file>strmiids.c</file> _____ Modified: trunk/reactos/lib/twain/twain_32.xml --- trunk/reactos/lib/twain/twain_32.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/twain/twain_32.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -1,6 +1,7 @@ <module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}" installbase="system32" installname="twain_32.dll"> <importlibrary definition="twain_32.def" /> <include base="twain_32">.</include> + <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <library>wine</library> <library>ntdll</library> _____ Modified: trunk/reactos/lib/winspool/winspool.xml --- trunk/reactos/lib/winspool/winspool.xml 2005-06-17 08:08:58 UTC (rev 15953) +++ trunk/reactos/lib/winspool/winspool.xml 2005-06-17 08:12:20 UTC (rev 15954) @@ -1,6 +1,7 @@ <module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv"> <importlibrary definition="winspool.def" /> <include base="winspool">.</include> + <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <define name="UNICODE" /> <define name="_UNICODE" />

1 0

[navaraf] 15953: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/include/lsass/lsass.h Modified: trunk/reactos/lib/secur32/lsa.c Modified: trunk/reactos/lib/secur32/secur32.xml _____ Modified: trunk/reactos/include/lsass/lsass.h --- trunk/reactos/include/lsass/lsass.h 2005-06-17 08:05:58 UTC (rev 15952) +++ trunk/reactos/include/lsass/lsass.h 2005-06-17 08:08:58 UTC (rev 15953) @@ -95,20 +95,23 @@ LSA_OPERATIONAL_MODE OperationalMode; } LSASS_REGISTER_LOGON_PROCESS_REPLY, *PLSASS_REGISTER_LOGON_PROCESS_REPLY; -typedef struct _LSASS_REQUEST +typedef union _LSASS_REQUEST { LPC_MESSAGE Header; - ULONG Type; - union - { - LSASS_REGISTER_LOGON_PROCESS_REQUEST RegisterLogonProcessRequest; - LSASS_LOGON_USER_REQUEST LogonUserRequest; - LSASS_CALL_AUTHENTICATION_PACKAGE_REQUEST - CallAuthenticationPackageRequest; - LSASS_DEREGISTER_LOGON_PROCESS_REPLY DeregisterLogonProcessRequest; - LSASS_LOOKUP_AUTHENTICATION_PACKAGE_REQUEST - LookupAuthenticationPackageRequest; - } d; + struct { + UCHAR LpcHeader[LPC_MESSAGE_BASE_SIZE]; + ULONG Type; + union + { + LSASS_REGISTER_LOGON_PROCESS_REQUEST RegisterLogonProcessRequest; + LSASS_LOGON_USER_REQUEST LogonUserRequest; + LSASS_CALL_AUTHENTICATION_PACKAGE_REQUEST + CallAuthenticationPackageRequest; + LSASS_DEREGISTER_LOGON_PROCESS_REPLY DeregisterLogonProcessRequest; + LSASS_LOOKUP_AUTHENTICATION_PACKAGE_REQUEST + LookupAuthenticationPackageRequest; + } d; + }; } LSASS_REQUEST, *PLSASS_REQUEST; typedef struct _LSASS_REPLY _____ Modified: trunk/reactos/lib/secur32/lsa.c --- trunk/reactos/lib/secur32/lsa.c 2005-06-17 08:05:58 UTC (rev 15952) +++ trunk/reactos/lib/secur32/lsa.c 2005-06-17 08:08:58 UTC (rev 15953) @@ -11,9 +11,9 @@ /* INCLUDES ******************************************************************/ #include <windows.h> -#include <ddk/ntddk.h> +#include <ntsecapi.h> +#include <lsass/lsass.h> #include <rosrtl/string.h> -#include <lsass/lsass.h> #include <string.h> /* GLOBALS *******************************************************************/ @@ -83,9 +83,9 @@ Reply = (PLSASS_REPLY)RawReply; Request->Header.DataSize = sizeof(LSASS_REQUEST) + SubmitBufferLength - - sizeof(LPC_MESSAGE); + LPC_MESSAGE_BASE_SIZE; Request->Header.MessageSize = - Request->Header.DataSize + sizeof(LPC_MESSAGE); + Request->Header.DataSize + LPC_MESSAGE_BASE_SIZE; Request->Type = LSASS_REQUEST_CALL_AUTHENTICATION_PACKAGE; Request->d.CallAuthenticationPackageRequest.AuthenticationPackage = AuthenticationPackage; @@ -146,9 +146,9 @@ Request = (PLSASS_REQUEST)RawRequest; Request->Header.DataSize = sizeof(LSASS_REQUEST) + PackageName->Length - - sizeof(LPC_MESSAGE); + LPC_MESSAGE_BASE_SIZE; Request->Header.MessageSize = Request->Header.DataSize + - sizeof(LPC_MESSAGE); + LPC_MESSAGE_BASE_SIZE; Request->Type = LSASS_REQUEST_LOOKUP_AUTHENTICATION_PACKAGE; Status = NtRequestWaitReplyPort(LsaHandle, @@ -196,7 +196,7 @@ UCHAR RawReply[MAX_MESSAGE_DATA]; NTSTATUS Status; - RequestLength = sizeof(LSASS_REQUEST) - sizeof(LPC_MESSAGE); + RequestLength = sizeof(LSASS_REQUEST) - LPC_MESSAGE_BASE_SIZE; RequestLength = RequestLength + (OriginName->Length * sizeof(WCHAR)); RequestLength = RequestLength + AuthenticationInformationLength; RequestLength = RequestLength + @@ -236,8 +236,8 @@ Request->d.LogonUserRequest.SourceContext = *SourceContext; Request->Type = LSASS_REQUEST_LOGON_USER; - Request->Header.DataSize = RequestLength - sizeof(LPC_MESSAGE); - Request->Header.MessageSize = RequestLength + sizeof(LPC_MESSAGE); + Request->Header.DataSize = RequestLength - LPC_MESSAGE_BASE_SIZE; + Request->Header.MessageSize = RequestLength + LPC_MESSAGE_BASE_SIZE; Reply = (PLSASS_REPLY)RawReply; @@ -303,12 +303,13 @@ Request.Type = LSASS_REQUEST_REGISTER_LOGON_PROCESS; Request.Header.DataSize = sizeof(LSASS_REQUEST) - - sizeof(LPC_MESSAGE); + LPC_MESSAGE_BASE_SIZE; Request.Header.MessageSize = sizeof(LSASS_REQUEST); Request.d.RegisterLogonProcessRequest.Length = LsaLogonProcessName->Length; - wcscpy(Request.d.RegisterLogonProcessRequest.LogonProcessNameBuffer, - LsaLogonProcessName->Buffer); + memcpy(Request.d.RegisterLogonProcessRequest.LogonProcessNameBuffer, + LsaLogonProcessName->Buffer, + Request.d.RegisterLogonProcessRequest.Length); Status = NtRequestWaitReplyPort(*Handle, &Request.Header, _____ Modified: trunk/reactos/lib/secur32/secur32.xml --- trunk/reactos/lib/secur32/secur32.xml 2005-06-17 08:05:58 UTC (rev 15952) +++ trunk/reactos/lib/secur32/secur32.xml 2005-06-17 08:08:58 UTC (rev 15953) @@ -2,6 +2,7 @@ <importlibrary definition="secur32.def" /> <include base="secur32">.</include> <define name="__SECUR32__" /> + <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library>

1 0

[navaraf] 15952: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/include/sm/api.h Modified: trunk/reactos/lib/smdll/smdll.xml Modified: trunk/reactos/lib/smlib/smlib.xml _____ Modified: trunk/reactos/include/sm/api.h --- trunk/reactos/include/sm/api.h 2005-06-17 08:02:05 UTC (rev 15951) +++ trunk/reactos/include/sm/api.h 2005-06-17 08:05:58 UTC (rev 15952) @@ -109,29 +109,31 @@ /*** | ****************************************************************/ -typedef struct _SM_PORT_MESSAGE +typedef union _SM_PORT_MESSAGE { /*** LPC common header ***/ LPC_MESSAGE Header; - /*** SM common header ***/ struct { - DWORD ApiIndex; - NTSTATUS Status; - } SmHeader; - /*** SM per API arguments ***/ - union { + UCHAR LpcHeader[LPC_MESSAGE_BASE_SIZE]; + /*** SM common header ***/ + struct { + DWORD ApiIndex; + NTSTATUS Status; + } SmHeader; + /*** SM per API arguments ***/ union { - SM_PORT_MESSAGE_COMPSES CompSes; - SM_PORT_MESSAGE_EXECPGM ExecPgm; - SM_PORT_MESSAGE_QRYINFO QryInfo; - } Request; - union { - SM_PORT_MESSAGE_COMPSES CompSes; - SM_PORT_MESSAGE_EXECPGM ExecPgm; - SM_PORT_MESSAGE_QRYINFO QryInfo; - } Reply; + union { + SM_PORT_MESSAGE_COMPSES CompSes; + SM_PORT_MESSAGE_EXECPGM ExecPgm; + SM_PORT_MESSAGE_QRYINFO QryInfo; + } Request; + union { + SM_PORT_MESSAGE_COMPSES CompSes; + SM_PORT_MESSAGE_EXECPGM ExecPgm; + SM_PORT_MESSAGE_QRYINFO QryInfo; + } Reply; + }; }; - } SM_PORT_MESSAGE, * PSM_PORT_MESSAGE; #pragma pack(pop) _____ Modified: trunk/reactos/lib/smdll/smdll.xml --- trunk/reactos/lib/smdll/smdll.xml 2005-06-17 08:02:05 UTC (rev 15951) +++ trunk/reactos/lib/smdll/smdll.xml 2005-06-17 08:05:58 UTC (rev 15952) @@ -1,6 +1,7 @@ <module name="smdll" type="nativedll" baseaddress="${BASEADDRESS_SMDLL}" installbase="system32" installname="smdll.dll"> <importlibrary definition="smdll.def" /> <include base="smdll">.</include> + <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <library>smlib</library> <library>ntdll</library> _____ Modified: trunk/reactos/lib/smlib/smlib.xml --- trunk/reactos/lib/smlib/smlib.xml 2005-06-17 08:02:05 UTC (rev 15951) +++ trunk/reactos/lib/smlib/smlib.xml 2005-06-17 08:05:58 UTC (rev 15952) @@ -1,5 +1,6 @@ <module name="smlib" type="staticlibrary"> <include base="smlib">.</include> + <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <file>connect.c</file> <file>execpgm.c</file>

1 0

[navaraf] 15951: Cleanup the usage of W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Cleanup the usage of W32API. Modified: trunk/reactos/lib/kernel32/k32.h Modified: trunk/reactos/lib/kernel32/kernel32.xml Modified: trunk/reactos/lib/kernel32/misc/lzexpand_main.c _____ Modified: trunk/reactos/lib/kernel32/k32.h --- trunk/reactos/lib/kernel32/k32.h 2005-06-17 08:00:30 UTC (rev 15950) +++ trunk/reactos/lib/kernel32/k32.h 2005-06-17 08:02:05 UTC (rev 15951) @@ -1,7 +1,4 @@ -#define _WIN32_WINNT 0x0502 -#define __USE_W32API #define NTOS_MODE_USER -#define __NO_CTYPE_INLINES #include <ntos.h> #include <ctype.h> #include <stdarg.h> _____ Modified: trunk/reactos/lib/kernel32/kernel32.xml --- trunk/reactos/lib/kernel32/kernel32.xml 2005-06-17 08:00:30 UTC (rev 15950) +++ trunk/reactos/lib/kernel32/kernel32.xml 2005-06-17 08:02:05 UTC (rev 15951) @@ -3,6 +3,9 @@ <include base="kernel32_base">include</include> <define name="_DISABLE_TIDENTS" /> <define name="_SEH_NO_NATIVE_NLG" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0502</define> + <define name="__NO_CTYPE_INLINES" /> <define name="WINVER">0x0500</define> <pch>k32.h</pch> <directory name="debug"> @@ -109,6 +112,7 @@ <include base="kernel32">include</include> <define name="_DISABLE_TIDENTS" /> <define name="_SEH_NO_NATIVE_NLG" /> + <define name="__USE_W32API" /> <define name="WINVER">0x0500</define> <library>kernel32_base</library> <library>pseh</library> _____ Modified: trunk/reactos/lib/kernel32/misc/lzexpand_main.c --- trunk/reactos/lib/kernel32/misc/lzexpand_main.c 2005-06-17 08:00:30 UTC (rev 15950) +++ trunk/reactos/lib/kernel32/misc/lzexpand_main.c 2005-06-17 08:02:05 UTC (rev 15951) @@ -24,20 +24,11 @@ //#include "config.h" +#include <k32.h> #define NDEBUG #include "../include/debug.h" -#include <string.h> -#define __NO_CTYPE_INLINES -#include <ctype.h> -#include <sys/types.h> -#include <stdio.h> -#include <stdarg.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -#include "windows.h" #include "lzexpand.h" + #define HFILE_ERROR ((HFILE)-1) /* The readahead length of the decompressor. Reading single bytes

1 0

[navaraf] 15950: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/lib/ntdll/csr/lpc.c Modified: trunk/reactos/lib/ntdll/dbg/debug.c Modified: trunk/reactos/lib/ntdll/ldr/res.c Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/lib/ntdll/ntdll.xml Modified: trunk/reactos/lib/ntdll/rtl/apc.c Modified: trunk/reactos/lib/ntdll/rtl/atom.c Modified: trunk/reactos/lib/ntdll/rtl/callback.c Modified: trunk/reactos/lib/ntdll/rtl/critical.c Modified: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c Modified: trunk/reactos/lib/ntdll/rtl/exception.c Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Modified: trunk/reactos/lib/ntdll/rtl/message.c Modified: trunk/reactos/lib/ntdll/rtl/misc.c Modified: trunk/reactos/lib/ntdll/rtl/path.c Modified: trunk/reactos/lib/ntdll/rtl/process.c Modified: trunk/reactos/lib/ntdll/rtl/rangelist.c Modified: trunk/reactos/lib/ntdll/rtl/resource.c Modified: trunk/reactos/lib/ntdll/stdio/sscanf.c Modified: trunk/reactos/lib/ntdll/stdlib/mbstowcs.c Modified: trunk/reactos/lib/ntdll/stdlib/wcstombs.c _____ Modified: trunk/reactos/lib/ntdll/csr/lpc.c --- trunk/reactos/lib/ntdll/csr/lpc.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/csr/lpc.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -104,7 +104,7 @@ return (STATUS_UNSUCCESSFUL); } - Request->Header.DataSize = Length - sizeof(LPC_MESSAGE); + Request->Header.DataSize = Length - LPC_MESSAGE_BASE_SIZE; Request->Header.MessageSize = Length; Status = NtRequestWaitReplyPort(WindowsApiPort, _____ Modified: trunk/reactos/lib/ntdll/dbg/debug.c --- trunk/reactos/lib/ntdll/dbg/debug.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/dbg/debug.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -12,6 +12,7 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> +#include <ntos.h> #include <ntdll/rtl.h> #include <rosrtl/string.h> #include <rosrtl/thread.h> _____ Modified: trunk/reactos/lib/ntdll/ldr/res.c --- trunk/reactos/lib/ntdll/ldr/res.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/ldr/res.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -25,11 +25,12 @@ #include <reactos/config.h> #include <ddk/ntddk.h> +#include <ntos.h> +#include <ntos/ldrtypes.h> #include <windows.h> #include <string.h> #include <wchar.h> #include <ntdll/ldr.h> -#include <ntos/minmax.h> #define NDEBUG #include <ntdll/ntdll.h> _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -32,8 +32,8 @@ extern unsigned int _image_base__; -static CRITICAL_SECTION PebLock; -static CRITICAL_SECTION LoaderLock; +static RTL_CRITICAL_SECTION PebLock; +static RTL_CRITICAL_SECTION LoaderLock; static RTL_BITMAP TlsBitMap; PLDR_MODULE ExeModule; _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -21,11 +21,12 @@ #include <reactos/config.h> #include <ddk/ntddk.h> +#include <ntos.h> #include <windows.h> #include <string.h> #include <wchar.h> #include <ntdll/ldr.h> -#include <ntos/minmax.h> +#include <ntdll/rtl.h> #define LDRP_PROCESS_CREATION_TIME 0x8000000 @@ -264,7 +265,7 @@ TRUE, IMAGE_DIRECTORY_ENTRY_TLS, NULL); - assert(Module->TlsIndex < LdrpTlsCount); + ASSERT(Module->TlsIndex < LdrpTlsCount); TlsData = &LdrpTlsArray[Module->TlsIndex]; TlsData->StartAddressOfRawData = (PVOID)TlsDirectory->StartAddressOfRawData; TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData; @@ -466,7 +467,7 @@ PLDR_MODULE Module; Module = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof (LDR_MODULE)); - assert(Module); + ASSERT(Module); memset(Module, 0, sizeof(LDR_MODULE)); Module->BaseAddress = (PVOID)ImageBase; Module->EntryPoint = NTHeaders->OptionalHeader.AddressOfEntryPoint; @@ -2076,7 +2077,7 @@ DPRINT("Mapped %wZ at %x\n", &FullDosName, ImageBase); if (MappedAsDataFile) { - assert(NULL != BaseAddress); + ASSERT(NULL != BaseAddress); if (NULL != BaseAddress) { *BaseAddress = (PVOID) ((char *) *BaseAddress + 1); _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-06-17 08:00:30 UTC (rev 15950) @@ -3,6 +3,9 @@ <importlibrary definition="def/ntdll.def" /> <define name="__NTDLL__" /> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0502</define> + <define name="_NTOSKRNL_" /> <library>rtl</library> <library>rosrtl</library> <library>string</library> _____ Modified: trunk/reactos/lib/ntdll/rtl/apc.c --- trunk/reactos/lib/ntdll/rtl/apc.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/apc.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -26,7 +26,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include <ntos.h> #include <string.h> #include <debug.h> _____ Modified: trunk/reactos/lib/ntdll/rtl/atom.c --- trunk/reactos/lib/ntdll/rtl/atom.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/atom.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include <ntos.h> #include <ntdll/rtl.h> #include <ntos/heap.h> @@ -653,11 +653,11 @@ { AtomTable->Lock = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(CRITICAL_SECTION)); + sizeof(RTL_CRITICAL_SECTION)); if (AtomTable->Lock == NULL) return STATUS_NO_MEMORY; - RtlInitializeCriticalSection((PCRITICAL_SECTION)AtomTable->Lock); + RtlInitializeCriticalSection((PRTL_CRITICAL_SECTION)AtomTable->Lock); return STATUS_SUCCESS; } @@ -668,7 +668,7 @@ { if (AtomTable->Lock) { - RtlDeleteCriticalSection((PCRITICAL_SECTION)AtomTable->Lock); + RtlDeleteCriticalSection((PRTL_CRITICAL_SECTION)AtomTable->Lock); RtlFreeHeap(RtlGetProcessHeap(), 0, AtomTable->Lock); @@ -680,7 +680,7 @@ static BOOLEAN RtlpLockAtomTable(PRTL_ATOM_TABLE AtomTable) { - RtlEnterCriticalSection((PCRITICAL_SECTION)AtomTable->Lock); + RtlEnterCriticalSection((PRTL_CRITICAL_SECTION)AtomTable->Lock); return TRUE; } @@ -688,7 +688,7 @@ static VOID RtlpUnlockAtomTable(PRTL_ATOM_TABLE AtomTable) { - RtlLeaveCriticalSection((PCRITICAL_SECTION)AtomTable->Lock); + RtlLeaveCriticalSection((PRTL_CRITICAL_SECTION)AtomTable->Lock); } _____ Modified: trunk/reactos/lib/ntdll/rtl/callback.c --- trunk/reactos/lib/ntdll/rtl/callback.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/callback.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -9,15 +9,15 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include <ntos.h> #include <string.h> #include <napi/teb.h> /* TYPES *********************************************************************/ -typedef NTSTATUS STDCALL_FUNC (*CALLBACK_FUNCTION)(PVOID Argument, - ULONG ArgumentLength); +typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument, + ULONG ArgumentLength); /* FUNCTIONS *****************************************************************/ @@ -28,10 +28,10 @@ { PPEB Peb; NTSTATUS Status; - CALLBACK_FUNCTION Callback; + KERNEL_CALLBACK_FUNCTION Callback; Peb = NtCurrentPeb(); - Callback = (CALLBACK_FUNCTION)Peb->KernelCallbackTable[RoutineIndex]; + Callback = (KERNEL_CALLBACK_FUNCTION)Peb->KernelCallbackTable[RoutineIndex]; Status = Callback(Argument, ArgumentLength); ZwCallbackReturn(NULL, 0, Status); } _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -12,9 +12,9 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> +#include <windows.h> +#include <ntos.h> #include <ntdll/rtl.h> -#include <ntos/synch.h> #define NDEBUG #include <ntdll/ntdll.h> _____ Modified: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c --- trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -36,7 +36,7 @@ #include <napi/teb.h> #include <ntdll/rtl.h> #include <ntdll/ldr.h> -#include <ddk/ntddk.h> +#include <ntos.h> #include <rosrtl/thread.h> _____ Modified: trunk/reactos/lib/ntdll/rtl/exception.c --- trunk/reactos/lib/ntdll/rtl/exception.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/exception.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -14,15 +14,16 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include <ntos.h> #include <windows.h> #include <string.h> +#include <ntdll/rtl.h> #include <napi/teb.h> #define NDEBUG #include <debug.h> -static CRITICAL_SECTION RtlpVectoredExceptionLock; +static RTL_CRITICAL_SECTION RtlpVectoredExceptionLock; static LIST_ENTRY RtlpVectoredExceptionHead; typedef struct _RTL_VECTORED_EXCEPTION_HANDLER _____ Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -9,7 +9,7 @@ * */ -#include <ddk/ntddk.h> +#include <ntos.h> #include <ntdll/rtl.h> #include <ctype.h> #include <ntos/minmax.h> _____ Modified: trunk/reactos/lib/ntdll/rtl/message.c --- trunk/reactos/lib/ntdll/rtl/message.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/message.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -11,7 +11,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include <ntos.h> +#include <ntos/ldrtypes.h> +#include <ddk/ldrfuncs.h> #define NDEBUG #include <ntdll/ntdll.h> _____ Modified: trunk/reactos/lib/ntdll/rtl/misc.c --- trunk/reactos/lib/ntdll/rtl/misc.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/misc.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -12,7 +12,7 @@ /* INCLUDES *****************************************************************/ #include <windows.h> -#include <ddk/ntddk.h> +#include <ntos.h> #include <ntdll/rtl.h> #define NDEBUG _____ Modified: trunk/reactos/lib/ntdll/rtl/path.c --- trunk/reactos/lib/ntdll/rtl/path.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/path.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -10,14 +10,12 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> +#include <ntos.h> #include <ntdll/rtl.h> #include <ntos/minmax.h> #include <string.h> #include <stdio.h> #include <ctype.h> -#include <base.h> -#include <ddk/obfuncs.h> #define NDEBUG #include <ntdll/ntdll.h> _____ Modified: trunk/reactos/lib/ntdll/rtl/process.c --- trunk/reactos/lib/ntdll/rtl/process.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/process.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -11,7 +11,7 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> +#include <ntos.h> #include <windows.h> #include <napi/i386/segment.h> #include <ntdll/ldr.h> _____ Modified: trunk/reactos/lib/ntdll/rtl/rangelist.c --- trunk/reactos/lib/ntdll/rtl/rangelist.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/rangelist.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -26,7 +26,8 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> +#include <ntos.h> +#include <ntdll/rtl.h> #define NDEBUG #include <ntdll/ntdll.h> _____ Modified: trunk/reactos/lib/ntdll/rtl/resource.c --- trunk/reactos/lib/ntdll/rtl/resource.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/rtl/resource.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -18,9 +18,8 @@ * The code is based on information published in WDJ January 1999 issue. */ -#include <ddk/ntddk.h> +#include <ntos.h> #include <ntdll/rtl.h> -#include <ntos/synch.h> #define NDEBUG #include <ntdll/ntdll.h> _____ Modified: trunk/reactos/lib/ntdll/stdio/sscanf.c --- trunk/reactos/lib/ntdll/stdio/sscanf.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/stdio/sscanf.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -1,8 +1,8 @@ /**/ #include <stdio.h> -#include <ddk/ntddk.h> -#include <ntos/heap.h> +#include <ntos.h> +#include <ntdll/rtl.h> #define NDEBUG #include <ntdll/ntdll.h> _____ Modified: trunk/reactos/lib/ntdll/stdlib/mbstowcs.c --- trunk/reactos/lib/ntdll/stdlib/mbstowcs.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/stdlib/mbstowcs.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -6,7 +6,7 @@ * PURPOSE: converts a multi byte string to a unicode string */ -#include <ddk/ntddk.h> +#include <ntos.h> #include <stdlib.h> #include <string.h> _____ Modified: trunk/reactos/lib/ntdll/stdlib/wcstombs.c --- trunk/reactos/lib/ntdll/stdlib/wcstombs.c 2005-06-17 07:59:43 UTC (rev 15949) +++ trunk/reactos/lib/ntdll/stdlib/wcstombs.c 2005-06-17 08:00:30 UTC (rev 15950) @@ -6,7 +6,7 @@ * PURPOSE: converts a unicode string to a multi byte string */ -#include <ddk/ntddk.h> +#include <ntos.h> #include <stdlib.h> #include <string.h>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs