Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

by ion＠svn.reactos.com

Build tcpip with NDK Modified: trunk/reactos/drivers/net/tcpip/include/precomp.h Modified: trunk/reactos/drivers/net/tcpip/include/tcpip.h _____ Modified: trunk/reactos/drivers/net/tcpip/include/precomp.h --- trunk/reactos/drivers/net/tcpip/include/precomp.h 2005-06-22 17:58:19 UTC (rev 16217) +++ trunk/reactos/drivers/net/tcpip/include/precomp.h 2005-06-22 17:58:42 UTC (rev 16218) @@ -35,5 +35,5 @@ #include <interface.h> #include <ports.h> #include <ipifcons.h> -#define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> + _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcpip.h --- trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-06-22 17:58:19 UTC (rev 16217) +++ trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-06-22 17:58:42 UTC (rev 16218) @@ -112,6 +112,10 @@ #endif /* i386 */ +/* AF_INET and other things Arty likes to use ;) */ +#define AF_INET 2 +#define SOCK_STREAM 1 + typedef TDI_STATUS (*InfoRequest_f)( UINT InfoClass, UINT InfoType, UINT InfoId,

19 years, 2 months

[ion] 16217: Fix one more bug in NDK, and fix w32api headers to use FLOWSPEC structure inside NDIS.h, and use qos.h instead of winsock2, and implement FLOWSPEC in qos.h, moving it outside from winsock2.

by ion＠svn.reactos.com

Fix one more bug in NDK, and fix w32api headers to use FLOWSPEC structure inside NDIS.h, and use qos.h instead of winsock2, and implement FLOWSPEC in qos.h, moving it outside from winsock2. Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/w32api/include/ddk/ndis.h Added: trunk/reactos/w32api/include/qos.h Modified: trunk/reactos/w32api/include/winsock2.h _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-06-22 17:43:59 UTC (rev 16216) +++ trunk/reactos/include/ndk/umtypes.h 2005-06-22 17:58:19 UTC (rev 16217) @@ -734,7 +734,6 @@ typedef struct _OBJECT_TYPE *POBJECT_TYPE; struct _ETHREAD; struct _CSR_API_MESSAGE; -struct _EVENT_TRACE_HEADER; /* <--- We might want to declare this one */ typedef ULONG EXECUTION_STATE; /* Basic NT Types */ _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-06-22 17:43:59 UTC (rev 16216) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-06-22 17:58:19 UTC (rev 16217) @@ -13,6 +13,7 @@ #include "lpctypes.h" #include "zwtypes.h" #include "kdtypes.h" +#include <evntrace.h> /* FUNCTION TYPES ************************************************************/ _____ Modified: trunk/reactos/w32api/include/ddk/ndis.h --- trunk/reactos/w32api/include/ddk/ndis.h 2005-06-22 17:43:59 UTC (rev 16216) +++ trunk/reactos/w32api/include/ddk/ndis.h 2005-06-22 17:58:19 UTC (rev 16217) @@ -40,7 +40,7 @@ #include "ntddndis.h" #include "netpnp.h" #include "netevent.h" -#include <winsock2.h> +#include <qos.h> #ifdef __cplusplus extern "C" { @@ -729,17 +729,6 @@ ULONG MinorVersion; } CO_ADDRESS_FAMILY, *PCO_ADDRESS_FAMILY; -typedef struct _CO_FLOW_PARAMETERS { - ULONG TokenRate; - ULONG TokenBucketSize; - ULONG PeakBandwidth; - ULONG Latency; - ULONG DelayVariation; - SERVICETYPE ServiceType; - ULONG MaxSduSize; - ULONG MinimumPolicedSize; -} CO_FLOW_PARAMETERS, *PCO_FLOW_PARAMETERS; - typedef struct _CO_SPECIFIC_PARAMETERS { ULONG ParamType; ULONG Length; @@ -747,8 +736,8 @@ } CO_SPECIFIC_PARAMETERS, *PCO_SPECIFIC_PARAMETERS; typedef struct _CO_CALL_MANAGER_PARAMETERS { - CO_FLOW_PARAMETERS Transmit; - CO_FLOW_PARAMETERS Receive; + FLOWSPEC Transmit; + FLOWSPEC Receive; CO_SPECIFIC_PARAMETERS CallMgrSpecific; } CO_CALL_MANAGER_PARAMETERS, *PCO_CALL_MANAGER_PARAMETERS; _____ Added: trunk/reactos/w32api/include/qos.h --- trunk/reactos/w32api/include/qos.h 2005-06-22 17:43:59 UTC (rev 16216) +++ trunk/reactos/w32api/include/qos.h 2005-06-22 17:58:19 UTC (rev 16217) @@ -0,0 +1,46 @@ +/* + * qos.h + * + * Structures and definitions for QoS data types. + * + * This file is part of the w32api package. + * + * Contributors: + * Created by Alex Ionescu <alex(a)relsoft.net> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ +#ifndef __QOS_H +#define __QOS_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +typedef ULONG SERVICETYPE; + +typedef struct _flowspec +{ + ULONG TokenRate; + ULONG TokenBucketSize; + ULONG PeakBandwidth; + ULONG Latency; + ULONG DelayVariation; + SERVICETYPE ServiceType; + ULONG MaxSduSize; + ULONG MinimumPolicedSize; +} FLOWSPEC, *PFLOWSPEC, *LPFLOWSPEC; + +#endif _____ Modified: trunk/reactos/w32api/include/winsock2.h --- trunk/reactos/w32api/include/winsock2.h 2005-06-22 17:43:59 UTC (rev 16216) +++ trunk/reactos/w32api/include/winsock2.h 2005-06-22 17:58:19 UTC (rev 16217) @@ -670,29 +670,6 @@ GuaranteedService } GUARANTEE; -/* TODO: FLOWSPEC and related definitions belong in qos.h */ - -/* - Windows Sockets 2 Application Programming Interface, - revision 2.2.2 (1997) uses the type uint32 for SERVICETYPE - and the elements of _flowspec, but the type uint32 is not defined - or used anywhere else in the w32api. For now, just use - unsigned int, which is 32 bits on _WIN32 and _WIN64. -*/ - -typedef unsigned int SERVICETYPE; -typedef struct _flowspec -{ - unsigned int TokenRate; - unsigned int TokenBucketSize; - unsigned int PeakBandwidth; - unsigned int Latency; - unsigned int DelayVariation; - SERVICETYPE ServiceType; - unsigned int MaxSduSize; - unsigned int MinimumPolicedSize; - } FLOWSPEC, *PFLOWSPEC, *LPFLOWSPEC; - typedef struct _QualityOfService { FLOWSPEC SendingFlowspec;

19 years, 2 months

[hbirr] 16216: - Initialized Reply with NULL for the first call to NtReplyWaitReceivePort.

by hbirr＠svn.reactos.com

- Initialized Reply with NULL for the first call to NtReplyWaitReceivePort. - Removed LpcReply because it wasn't really used. Modified: trunk/reactos/subsys/csrss/api/wapi.c _____ Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2005-06-22 17:39:10 UTC (rev 16215) +++ trunk/reactos/subsys/csrss/api/wapi.c 2005-06-22 17:43:59 UTC (rev 16216) @@ -113,7 +113,6 @@ ClientConnectionThread(HANDLE ServerPort) { NTSTATUS Status; - LPC_MAX_MESSAGE LpcReply; LPC_MAX_MESSAGE LpcRequest; PCSR_API_MESSAGE Request; PCSR_API_MESSAGE Reply; @@ -121,6 +120,9 @@ DPRINT("CSR: %s called", __FUNCTION__); + /* Reply must be NULL at the first call to NtReplyWaitReceivePort */ + Reply = NULL; + /* Loop and reply/wait for a new message */ for (;;) { @@ -144,7 +146,6 @@ /* Get the CSR Message */ Request = (PCSR_API_MESSAGE)&LpcRequest; - Reply = (PCSR_API_MESSAGE)&LpcReply; DPRINT("CSR: Got CSR API: %x [Message Origin: %x]\n", Request->Type,

19 years, 2 months

[greatlrd] 16215: Brandon Turner <turnerb7@msu.edu> Added exclusive deletion "del * -abc.txt -text*.txt"

by greatlrd＠svn.reactos.com

Brandon Turner <turnerb7(a)msu.edu> Added exclusive deletion "del * -abc.txt -text*.txt" Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/wishlist.txt _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-06-22 05:04:02 UTC (rev 16214) +++ trunk/reactos/subsys/system/cmd/del.c 2005-06-22 17:39:10 UTC (rev 16215) @@ -32,6 +32,9 @@ * * 28-Jan-2004 (Michael Fritscher <michael(a)fritscher.net>) * Added prompt ("/P"), yes ("/Y") and wipe("/W") option. + * + * 22-Jun-2005 (Brandon Turner <turnerb7(a)msu.edu>) + * Added exclusive deletion "del * -abc.txt -text*.txt" */ #include "precomp.h" @@ -60,6 +63,10 @@ static BOOL RemoveFile (LPTSTR lpFileName, DWORD dwFlags) { + /*This function is called by CommandDelete and + does the actual process of deleting the single + file*/ + if (dwFlags & DEL_WIPE) { @@ -92,26 +99,38 @@ ConOutPrintf (_T("100%% %s\n"),szMsg); CloseHandle (file); } - return DeleteFile (lpFileName); } INT CommandDelete (LPTSTR cmd, LPTSTR param) { + /*cmd is the command that was given, in this case it will always be "del" or "delete" + param is whatever is given after the command*/ + TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szFullPath[MAX_PATH]; LPTSTR pFilePart; LPTSTR *arg = NULL; + TCHAR exfileName[MAX_PATH]; + TCHAR * szFileName; INT args; INT i; + INT ii; INT res; INT nEvalArgs = 0; /* nunber of evaluated arguments */ DWORD dwFlags = 0; DWORD dwFiles = 0; HANDLE hFile; + HANDLE hFileExcl; WIN32_FIND_DATA f; + WIN32_FIND_DATA f2; LONG ch; + BOOL bExclusion; + + /*checks the first two chars of param to see if it is /? + this however allows the following command to not show help + "del frog.txt /?" */ if (!_tcsncmp (param, _T("/?"), 2)) { @@ -128,6 +147,7 @@ { if (*arg[i] == _T('/')) { + /*found a command, but check to make sure it has something after it*/ if (_tcslen (arg[i]) >= 2) { ch = _totupper (arg[i][1]); @@ -169,7 +189,8 @@ } } - /* there are only options on the command line --> error!!! */ + /* there are only options on the command line --> error!!! + there is the same number of args as there is flags, so none of the args were filenames*/ if (args == nEvalArgs) { error_req_param_missing (); @@ -187,6 +208,9 @@ if (!_tcscmp (arg[i], _T("*")) || !_tcscmp (arg[i], _T("*.*"))) { + /*well, the user wants to delete everything but if they didnt yes DEL_YES, DEL_QUIET, or DEL_PROMPT + then we are going to want to make sure that in fact they want to do that. */ + if (!((dwFlags & DEL_YES) || (dwFlags & DEL_QUIET) || (dwFlags & DEL_PROMPT))) { LoadString( CMD_ModuleHandle, STRING_DEL_HELP2, szMsg, RC_STRING_MAX_SIZE); @@ -196,8 +220,9 @@ break; } } - - if (*arg[i] != _T('/')) + + /*this checks to see if it isnt a flag, if it isnt, we assume it is a file name*/ + if ((*arg[i] != _T('/')) && (*arg[i] != _T('-'))) { #ifdef _DEBUG ConErrPrintf (_T("File: %s\n"), arg[i]); @@ -209,7 +234,7 @@ #ifdef _DEBUG ConErrPrintf(_T("Wildcards!\n\n")); #endif - + GetFullPathName (arg[i], MAX_PATH, szFullPath, @@ -230,12 +255,44 @@ do { + + + /*bExclusion is the check varible to see if it has a match + and it needs to be set to false before each loop, as it hasnt been matched yet*/ + bExclusion = 0; + + /*loop through each of the arguments*/ + for (ii = 0; ii < args; ii++) + { + /*check to see if it is a exclusion tag*/ + if(_tcschr (arg[ii], _T('-'))) + { + /*remove the - from the front to get the real name*/ + _tcscpy (exfileName , arg[ii]); + szFileName = strtok (exfileName,"-"); + GetFullPathName (szFileName, + MAX_PATH, + szFullPath, + &pFilePart); + hFileExcl = FindFirstFile (szFullPath, &f2); + do + { + /*check to see if the filenames match*/ + if(!_tcscmp (f.cFileName, f2.cFileName)) + bExclusion = 1; + } + while (FindNextFile (hFileExcl, &f2)); + } + } + + if(!bExclusion) + { /* ignore ".", ".." and directories */ if (!_tcscmp (f.cFileName, _T(".")) || !_tcscmp (f.cFileName, _T("..")) || f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; - + _tcscpy (pFilePart, f.cFileName); #ifdef _DEBUG @@ -256,13 +313,14 @@ continue; //FIXME: Errorcode? } } - + + /*user cant ask it to be quiet and tell you what it did*/ if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) { LoadString(CMD_ModuleHandle, STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, szFullPath); } - + /* delete the file */ if (!(dwFlags & DEL_NOTHING)) { @@ -296,12 +354,14 @@ } } } + } } while (FindNextFile (hFile, &f)); FindClose (hFile); } else { + /* no wildcards in filespec */ #ifdef _DEBUG ConErrPrintf(_T("No Wildcards!\n")); @@ -395,7 +455,6 @@ ConOutPrintf(szMsg, dwFiles); } - return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/wishlist.txt --- trunk/reactos/subsys/system/cmd/wishlist.txt 2005-06-22 05:04:02 UTC (rev 16214) +++ trunk/reactos/subsys/system/cmd/wishlist.txt 2005-06-22 17:39:10 UTC (rev 16215) @@ -2,9 +2,6 @@ Wishlist for ReactOS CMD ~~~~~~~~~~~~~~~~~~~~~~~~ - - Exclusion wildcards: "del /r *.bak -abcd.bak" - Deletes ALL *.bak files EXCEPT abcd.bak. - - Progress indikator on long file operations (copy/move). Percentage at the right side of the filename.

19 years, 2 months

[ion] 16214: Fix some NDK issues when attempting to use it from kmode, and fix some winddk/ntifs inconsistencies aswell (move PFILE_QUOTA_INFORMATION and remove all RtlRange functions from the DDK, plus add PPEB)

by ion＠svn.reactos.com

Fix some NDK issues when attempting to use it from kmode, and fix some winddk/ntifs inconsistencies aswell (move PFILE_QUOTA_INFORMATION and remove all RtlRange functions from the DDK, plus add PPEB) Modified: trunk/reactos/include/napi/core.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/include/ntos/rtltypes.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/napi/core.h --- trunk/reactos/include/napi/core.h 2005-06-22 04:02:32 UTC (rev 16213) +++ trunk/reactos/include/napi/core.h 2005-06-22 05:04:02 UTC (rev 16214) @@ -1,12 +1,10 @@ #ifndef __INCLUDE_NAPI_CORE_H #define __INCLUDE_NAPI_CORE_H -#include "../ntoskrnl/include/internal/ke.h" -#include <ddk/ntddscsi.h> - #define MM_CORE_DUMP_HEADER_MAGIC (0xdeafbead) #define MM_CORE_DUMP_HEADER_VERSION (0x1) +#include <ddk/ntddscsi.h> typedef struct _MM_CORE_DUMP_HEADER { ULONG Magic; _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-06-22 04:02:32 UTC (rev 16213) +++ trunk/reactos/include/ndk/extypes.h 2005-06-22 05:04:02 UTC (rev 16214) @@ -11,6 +11,7 @@ #define _EXTYPES_H /* DEPENDENCIES **************************************************************/ +#include "ketypes.h" /* EXPORTED DATA *************************************************************/ extern POBJECT_TYPE NTOSAPI ExIoCompletionType; @@ -24,6 +25,8 @@ /* TYPES *********************************************************************/ +/* You'll need the IFS for these, so let's not force everyone to have it */ +#ifdef _NTIFS_ typedef struct _EX_QUEUE_WORKER_INFO { UCHAR QueueDisabled:1; @@ -41,6 +44,7 @@ ULONG QueueDepthLastPass; EX_QUEUE_WORKER_INFO Info; } EX_WORK_QUEUE, *PEX_WORK_QUEUE; +#endif typedef struct _HANDLE_TABLE_ENTRY_INFO { _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-06-22 04:02:32 UTC (rev 16213) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-06-22 05:04:02 UTC (rev 16214) @@ -10,200 +10,15 @@ #define _RTLFUNCS_H /* DEPENDENCIES **************************************************************/ -#include <ndk/rtltypes.h> -#include <ndk/pstypes.h> +#include "rtltypes.h" +#include "pstypes.h" +#include <ddk/ntnls.h> /* PROTOTYPES ****************************************************************/ /* FIXME: FILE NEEDS SOME ALPHABETIZING AND REGROUP */ -/* List Macros */ -static __inline -VOID -InitializeListHead( - IN PLIST_ENTRY ListHead) -{ - ListHead->Flink = ListHead->Blink = ListHead; -} - -static __inline -VOID -InsertHeadList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY Entry) -{ - PLIST_ENTRY OldFlink; - OldFlink = ListHead->Flink; - Entry->Flink = OldFlink; - Entry->Blink = ListHead; - OldFlink->Blink = Entry; - ListHead->Flink = Entry; -} - -static __inline -VOID -InsertTailList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY Entry) -{ - PLIST_ENTRY OldBlink; - OldBlink = ListHead->Blink; - Entry->Flink = ListHead; - Entry->Blink = OldBlink; - OldBlink->Flink = Entry; - ListHead->Blink = Entry; -} - -#define IsListEmpty(ListHead) \ - ((ListHead)->Flink == (ListHead)) - -#define PopEntryList(ListHead) \ - (ListHead)->Next; \ - { \ - PSINGLE_LIST_ENTRY _FirstEntry; \ - _FirstEntry = (ListHead)->Next; \ - if (_FirstEntry != NULL) \ - (ListHead)->Next = _FirstEntry->Next; \ - } - -#define PushEntryList(_ListHead, _Entry) \ - (_Entry)->Next = (_ListHead)->Next; \ - (_ListHead)->Next = (_Entry); \ - -static __inline -BOOLEAN -RemoveEntryList( - IN PLIST_ENTRY Entry) -{ - PLIST_ENTRY OldFlink; - PLIST_ENTRY OldBlink; - - OldFlink = Entry->Flink; - OldBlink = Entry->Blink; - OldFlink->Blink = OldBlink; - OldBlink->Flink = OldFlink; - return (OldFlink == OldBlink); -} - -static __inline -PLIST_ENTRY -RemoveHeadList( - IN PLIST_ENTRY ListHead) -{ - PLIST_ENTRY Flink; - PLIST_ENTRY Entry; - - Entry = ListHead->Flink; - Flink = Entry->Flink; - ListHead->Flink = Flink; - Flink->Blink = ListHead; - return Entry; -} - -static __inline -PLIST_ENTRY -RemoveTailList( - IN PLIST_ENTRY ListHead) -{ - PLIST_ENTRY Blink; - PLIST_ENTRY Entry; - - Entry = ListHead->Blink; - Blink = Entry->Blink; - ListHead->Blink = Blink; - Blink->Flink = ListHead; - return Entry; -} - -#define IsFirstEntry(ListHead, Entry) \ - ((ListHead)->Flink == Entry) - -#define IsLastEntry(ListHead, Entry) \ - ((ListHead)->Blink == Entry) - -#define InsertAscendingListFIFO(ListHead, Type, ListEntryField, NewEntry, SortField)\ -{\ - PLIST_ENTRY current;\ -\ - current = (ListHead)->Flink;\ - while (current != (ListHead))\ - {\ - if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >\ - (NewEntry)->SortField)\ - {\ - break;\ - }\ - current = current->Flink;\ - }\ -\ - InsertTailList(current, &((NewEntry)->ListEntryField));\ -} - -#define InsertDescendingListFIFO(ListHead, Type, ListEntryField, NewEntry, SortField)\ -{\ - PLIST_ENTRY current;\ -\ - current = (ListHead)->Flink;\ - while (current != (ListHead))\ - {\ - if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField <\ - (NewEntry)->SortField)\ - {\ - break;\ - }\ - current = current->Flink;\ - }\ -\ - InsertTailList(current, &((NewEntry)->ListEntryField));\ -} - -#define InsertAscendingList(ListHead, Type, ListEntryField, NewEntry, SortField)\ -{\ - PLIST_ENTRY current;\ -\ - current = (ListHead)->Flink;\ - while (current != (ListHead))\ - {\ - if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >=\ - (NewEntry)->SortField)\ - {\ - break;\ - }\ - current = current->Flink;\ - }\ -\ - InsertTailList(current, &((NewEntry)->ListEntryField));\ -} - -#define InsertDescendingList(ListHead, Type, ListEntryField, NewEntry, SortField)\ -{\ - PLIST_ENTRY current;\ -\ - current = (ListHead)->Flink;\ - while (current != (ListHead))\ - {\ - if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField <=\ - (NewEntry)->SortField)\ - {\ - break;\ - }\ - current = current->Flink;\ - }\ -\ - InsertTailList(current, &((NewEntry)->ListEntryField));\ -} - /* - * Constant String Macro - */ -#define RTL_CONSTANT_STRING(__SOURCE_STRING__) \ -{ \ - sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ - sizeof(__SOURCE_STRING__), \ - (__SOURCE_STRING__) \ -} - -/* * Error and Exception Functions */ PVOID _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-06-22 04:02:32 UTC (rev 16213) +++ trunk/reactos/include/ndk/rtltypes.h 2005-06-22 05:04:02 UTC (rev 16214) @@ -381,6 +381,12 @@ SYSTEMTIME DaylightDate; LONG DaylightBias; } TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; + + typedef enum _ACL_INFORMATION_CLASS + { + AclRevisionInformation = 1, + AclSizeInformation + } ACL_INFORMATION_CLASS; #endif #endif _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-06-22 04:02:32 UTC (rev 16213) +++ trunk/reactos/include/ndk/umtypes.h 2005-06-22 05:04:02 UTC (rev 16214) @@ -184,6 +184,192 @@ #define VER_CONDITION_MASK 7 #define VER_NUM_BITS_PER_CONDITION_MASK 3 +/* List Macros */ +static __inline +VOID +InitializeListHead( + IN PLIST_ENTRY ListHead) +{ + ListHead->Flink = ListHead->Blink = ListHead; +} + +static __inline +VOID +InsertHeadList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY Entry) +{ + PLIST_ENTRY OldFlink; + OldFlink = ListHead->Flink; + Entry->Flink = OldFlink; + Entry->Blink = ListHead; + OldFlink->Blink = Entry; + ListHead->Flink = Entry; +} + +static __inline +VOID +InsertTailList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY Entry) +{ + PLIST_ENTRY OldBlink; + OldBlink = ListHead->Blink; + Entry->Flink = ListHead; + Entry->Blink = OldBlink; + OldBlink->Flink = Entry; + ListHead->Blink = Entry; +} + +#define IsListEmpty(ListHead) \ + ((ListHead)->Flink == (ListHead)) + +#define PopEntryList(ListHead) \ + (ListHead)->Next; \ + { \ + PSINGLE_LIST_ENTRY _FirstEntry; \ + _FirstEntry = (ListHead)->Next; \ + if (_FirstEntry != NULL) \ + (ListHead)->Next = _FirstEntry->Next; \ + } + +#define PushEntryList(_ListHead, _Entry) \ + (_Entry)->Next = (_ListHead)->Next; \ + (_ListHead)->Next = (_Entry); \ + +static __inline +BOOLEAN +RemoveEntryList( + IN PLIST_ENTRY Entry) +{ + PLIST_ENTRY OldFlink; + PLIST_ENTRY OldBlink; + + OldFlink = Entry->Flink; + OldBlink = Entry->Blink; + OldFlink->Blink = OldBlink; + OldBlink->Flink = OldFlink; + return (OldFlink == OldBlink); +} + +static __inline +PLIST_ENTRY +RemoveHeadList( + IN PLIST_ENTRY ListHead) +{ + PLIST_ENTRY Flink; + PLIST_ENTRY Entry; + + Entry = ListHead->Flink; + Flink = Entry->Flink; + ListHead->Flink = Flink; + Flink->Blink = ListHead; + return Entry; +} + +static __inline +PLIST_ENTRY +RemoveTailList( + IN PLIST_ENTRY ListHead) +{ + PLIST_ENTRY Blink; + PLIST_ENTRY Entry; + + Entry = ListHead->Blink; + Blink = Entry->Blink; + ListHead->Blink = Blink; + Blink->Flink = ListHead; + return Entry; +} + +#define IsFirstEntry(ListHead, Entry) \ + ((ListHead)->Flink == Entry) + +#define IsLastEntry(ListHead, Entry) \ + ((ListHead)->Blink == Entry) + +#define InsertAscendingListFIFO(ListHead, Type, ListEntryField, NewEntry, SortField)\ +{\ + PLIST_ENTRY current;\ +\ + current = (ListHead)->Flink;\ + while (current != (ListHead))\ + {\ + if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >\ + (NewEntry)->SortField)\ + {\ + break;\ + }\ + current = current->Flink;\ + }\ +\ + InsertTailList(current, &((NewEntry)->ListEntryField));\ +} + +#define InsertDescendingListFIFO(ListHead, Type, ListEntryField, NewEntry, SortField)\ +{\ + PLIST_ENTRY current;\ +\ + current = (ListHead)->Flink;\ + while (current != (ListHead))\ + {\ + if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField <\ + (NewEntry)->SortField)\ + {\ + break;\ + }\ + current = current->Flink;\ + }\ +\ + InsertTailList(current, &((NewEntry)->ListEntryField));\ +} + +#define InsertAscendingList(ListHead, Type, ListEntryField, NewEntry, SortField)\ +{\ + PLIST_ENTRY current;\ +\ + current = (ListHead)->Flink;\ + while (current != (ListHead))\ + {\ + if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >=\ + (NewEntry)->SortField)\ + {\ + break;\ + }\ + current = current->Flink;\ + }\ +\ + InsertTailList(current, &((NewEntry)->ListEntryField));\ +} + +#define InsertDescendingList(ListHead, Type, ListEntryField, NewEntry, SortField)\ +{\ + PLIST_ENTRY current;\ +\ + current = (ListHead)->Flink;\ + while (current != (ListHead))\ + {\ + if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField <=\ + (NewEntry)->SortField)\ + {\ + break;\ + }\ + current = current->Flink;\ + }\ +\ + InsertTailList(current, &((NewEntry)->ListEntryField));\ +} + +/* + * Constant String Macro + */ +#define RTL_CONSTANT_STRING(__SOURCE_STRING__) \ +{ \ + sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ + sizeof(__SOURCE_STRING__), \ + (__SOURCE_STRING__) \ +} + /* ENUMERATIONS **************************************************************/ /* Kernel Shared Data Values */ @@ -283,23 +469,6 @@ MaximumInterfaceType }INTERFACE_TYPE, *PINTERFACE_TYPE; -typedef enum _PNP_VETO_TYPE -{ - PNP_VetoTypeUnknown, - PNP_VetoLegacyDevice, - PNP_VetoPendingClose, - PNP_VetoWindowsApp, - PNP_VetoWindowsService, - PNP_VetoOutstandingOpen, - PNP_VetoDevice, - PNP_VetoDriver, - PNP_VetoIllegalDeviceRequest, - PNP_VetoInsufficientPower, - PNP_VetoNonDisableable, - PNP_VetoLegacyDriver, - PNP_VetoInsufficientRights -} PNP_VETO_TYPE, *PPNP_VETO_TYPE; - typedef enum _MODE { KernelMode, _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-06-22 04:02:32 UTC (rev 16213) +++ trunk/reactos/include/ndk/zwtypes.h 2005-06-22 05:04:02 UTC (rev 16214) @@ -11,6 +11,7 @@ /* DEPENDENCIES **************************************************************/ #include "rtltypes.h" +#include <ddk/cfg.h> /* EXPORTED DATA *************************************************************/ @@ -92,6 +93,8 @@ /* * Process (extra ones not defined in DDK) */ +/* FIXME: Temporary hack until all KMODE stuf are NDK */ +#ifndef __WINDDK_H typedef enum _PROCESS_INFORMATION_FLAGS { ProcessUnknown33 = 33, @@ -99,6 +102,7 @@ ProcessUnknown35, ProcessCookie } PROCESS_INFORMATION_FLAGS; +#endif /* * System _____ Modified: trunk/reactos/include/ntos/rtltypes.h --- trunk/reactos/include/ntos/rtltypes.h 2005-06-22 04:02:32 UTC (rev 16213) +++ trunk/reactos/include/ntos/rtltypes.h 2005-06-22 05:04:02 UTC (rev 16214) @@ -40,6 +40,7 @@ #define VER_NT_SERVER 0x0000003 */ + typedef struct _CONTROLLER_OBJECT { CSHORT Type; @@ -440,4 +441,44 @@ (*PHEAP_ENUMERATION_ROUTINE)(IN PVOID HeapHandle, IN PVOID UserParam); + +#define RTL_RANGE_LIST_ADD_IF_CONFLICT 0x00000001 +#define RTL_RANGE_LIST_ADD_SHARED 0x00000002 + +#define RTL_RANGE_LIST_SHARED_OK 0x00000001 +#define RTL_RANGE_LIST_NULL_CONFLICT_OK 0x00000002 + +#define RTL_RANGE_LIST_MERGE_IF_CONFLICT RTL_RANGE_LIST_ADD_IF_CONFLICT + +typedef struct _RTL_RANGE { + ULONGLONG Start; + ULONGLONG End; + PVOID UserData; + PVOID Owner; + UCHAR Attributes; + UCHAR Flags; +} RTL_RANGE, *PRTL_RANGE; + +#define RTL_RANGE_SHARED 0x01 +#define RTL_RANGE_CONFLICT 0x02 + +typedef struct _RTL_RANGE_LIST { + LIST_ENTRY ListHead; + ULONG Flags; + ULONG Count; + ULONG Stamp; +} RTL_RANGE_LIST, *PRTL_RANGE_LIST; + +typedef struct _RANGE_LIST_ITERATOR { + PLIST_ENTRY RangeListHead; + PLIST_ENTRY MergedHead; + PVOID Current; + ULONG Stamp; +} RTL_RANGE_LIST_ITERATOR, *PRTL_RANGE_LIST_ITERATOR; + +typedef BOOLEAN +(STDCALL *PRTL_CONFLICT_RANGE_CALLBACK)( + IN PVOID Context, + IN PRTL_RANGE Range); + #endif /* __DDK_RTLTYPES_H */ _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-22 04:02:32 UTC (rev 16213) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-22 05:04:02 UTC (rev 16214) @@ -1163,16 +1163,6 @@ WCHAR Name[1]; } FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER; -typedef struct _FILE_QUOTA_INFORMATION { - ULONG NextEntryOffset; - ULONG SidLength; - LARGE_INTEGER ChangeTime; - LARGE_INTEGER QuotaUsed; - LARGE_INTEGER QuotaThreshold; - LARGE_INTEGER QuotaLimit; - SID Sid; -} FILE_QUOTA_INFORMATION, *PFILE_QUOTA_INFORMATION; - typedef struct _FILE_RENAME_INFORMATION { BOOLEAN ReplaceIfExists; HANDLE RootDirectory; _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-22 04:02:32 UTC (rev 16213) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-22 05:04:02 UTC (rev 16214) @@ -186,6 +186,7 @@ typedef struct _HAL_PRIVATE_DISPATCH_TABLE *PHAL_PRIVATE_DISPATCH_TABLE; typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT; typedef struct _BUS_HANDLER *PBUS_HANDLER; +typedef struct _PEB *PPEB; typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; /* Constants */ @@ -2513,6 +2514,16 @@ BOOLEAN DeleteFile; } FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; +typedef struct _FILE_QUOTA_INFORMATION { + ULONG NextEntryOffset; + ULONG SidLength; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER QuotaUsed; + LARGE_INTEGER QuotaThreshold; + LARGE_INTEGER QuotaLimit; + SID Sid; +} FILE_QUOTA_INFORMATION, *PFILE_QUOTA_INFORMATION; + typedef struct _FILE_END_OF_FILE_INFORMATION { LARGE_INTEGER EndOfFile; } FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION; @@ -4372,45 +4383,6 @@ #define DRIVER_VERIFIER_TRACK_POOL_ALLOCATIONS 0x0008 #define DRIVER_VERIFIER_IO_CHECKING 0x0010 -#define RTL_RANGE_LIST_ADD_IF_CONFLICT 0x00000001 -#define RTL_RANGE_LIST_ADD_SHARED 0x00000002 - -#define RTL_RANGE_LIST_SHARED_OK 0x00000001 -#define RTL_RANGE_LIST_NULL_CONFLICT_OK 0x00000002 - -#define RTL_RANGE_LIST_MERGE_IF_CONFLICT RTL_RANGE_LIST_ADD_IF_CONFLICT - -typedef struct _RTL_RANGE { - ULONGLONG Start; - ULONGLONG End; - PVOID UserData; - PVOID Owner; - UCHAR Attributes; - UCHAR Flags; -} RTL_RANGE, *PRTL_RANGE; - -#define RTL_RANGE_SHARED 0x01 -#define RTL_RANGE_CONFLICT 0x02 - -typedef struct _RTL_RANGE_LIST { - LIST_ENTRY ListHead; - ULONG Flags; - ULONG Count; - ULONG Stamp; -} RTL_RANGE_LIST, *PRTL_RANGE_LIST; - -typedef struct _RANGE_LIST_ITERATOR { - PLIST_ENTRY RangeListHead; - PLIST_ENTRY MergedHead; - PVOID Current; - ULONG Stamp; -} RTL_RANGE_LIST_ITERATOR, *PRTL_RANGE_LIST_ITERATOR; - -typedef BOOLEAN -(DDKAPI *PRTL_CONFLICT_RANGE_CALLBACK)( - IN PVOID Context, - IN PRTL_RANGE Range); - #define HASH_STRING_ALGORITHM_DEFAULT 0 #define HASH_STRING_ALGORITHM_X65599 1 #define HASH_STRING_ALGORITHM_INVALID 0xffffffff @@ -4915,18 +4887,6 @@ NTOSAPI NTSTATUS DDKAPI -RtlAddRange( - IN OUT PRTL_RANGE_LIST RangeList, - IN ULONGLONG Start, - IN ULONGLONG End, - IN UCHAR Attributes, - IN ULONG Flags, - IN PVOID UserData OPTIONAL, - IN PVOID Owner OPTIONAL); - -NTOSAPI -NTSTATUS -DDKAPI RtlAnsiStringToUnicodeString( IN OUT PUNICODE_STRING DestinationString, IN PANSI_STRING SourceString, @@ -5078,13 +5038,6 @@ IN ULONG Length); NTOSAPI -NTSTATUS -DDKAPI -RtlCopyRangeList( - OUT PRTL_RANGE_LIST CopyRangeList, - IN PRTL_RANGE_LIST RangeList); - -NTOSAPI VOID DDKAPI RtlCopyString( @@ -5115,22 +5068,6 @@ NTOSAPI NTSTATUS DDKAPI -RtlDeleteOwnersRanges( - IN OUT PRTL_RANGE_LIST RangeList, - IN PVOID Owner); - -NTOSAPI -NTSTATUS -DDKAPI -RtlDeleteRange( - IN OUT PRTL_RANGE_LIST RangeList, - IN ULONGLONG Start, - IN ULONGLONG End, - IN PVOID Owner); - -NTOSAPI -NTSTATUS -DDKAPI RtlDeleteRegistryValue( IN ULONG RelativeTo, IN PCWSTR Path, @@ -5255,21 +5192,6 @@ OUT PULONG StartingRunIndex); NTOSAPI -NTSTATUS -DDKAPI -RtlFindRange( - IN PRTL_RANGE_LIST RangeList, - IN ULONGLONG Minimum, - IN ULONGLONG Maximum, - IN ULONG Length, - IN ULONG Alignment, - IN ULONG Flags, - IN UCHAR AttributeAvailableMask, - IN PVOID Context OPTIONAL, - IN PRTL_CONFLICT_RANGE_CALLBACK Callback OPTIONAL, - OUT PULONGLONG Start); - -NTOSAPI ULONG DDKAPI RtlFindSetBits( @@ -5294,12 +5216,6 @@ NTOSAPI VOID DDKAPI -RtlFreeRangeList( - IN PRTL_RANGE_LIST RangeList); - -NTOSAPI -VOID -DDKAPI RtlFreeUnicodeString( IN PUNICODE_STRING UnicodeString); @@ -5319,32 +5235,6 @@ NTOSAPI NTSTATUS DDKAPI -RtlGetFirstRange( - IN PRTL_RANGE_LIST RangeList, - OUT PRTL_RANGE_LIST_ITERATOR Iterator, - OUT PRTL_RANGE *Range); - -NTOSAPI -NTSTATUS -DDKAPI -RtlGetNextRange( - IN OUT PRTL_RANGE_LIST_ITERATOR Iterator, - OUT PRTL_RANGE *Range, - IN BOOLEAN MoveForwards); - -#define FOR_ALL_RANGES(RangeList, Iterator, Current) \ - for (RtlGetFirstRange((RangeList), (Iterator), &(Current)); \ - (Current) != NULL; \ - RtlGetNextRange((Iterator), &(Current), TRUE)) - -#define FOR_ALL_RANGES_BACKWARDS(RangeList, Iterator, Current) \ - for (RtlGetLastRange((RangeList), (Iterator), &(Current)); \ - (Current) != NULL; \ - RtlGetNextRange((Iterator), &(Current), FALSE)) - -NTOSAPI -NTSTATUS -DDKAPI RtlGUIDFromString( IN PUNICODE_STRING GuidString, OUT GUID *Guid); @@ -5376,12 +5266,6 @@ NTOSAPI VOID DDKAPI -RtlInitializeRangeList( - IN OUT PRTL_RANGE_LIST RangeList); - -NTOSAPI -VOID -DDKAPI RtlInitString( IN OUT PSTRING DestinationString, IN PCSZ SourceString); @@ -5417,26 +5301,6 @@ ULONG Base OPTIONAL, PUNICODE_STRING String); -NTOSAPI -NTSTATUS -DDKAPI -RtlInvertRangeList( - OUT PRTL_RANGE_LIST InvertedRangeList, - IN PRTL_RANGE_LIST RangeList); - -NTOSAPI -NTSTATUS -DDKAPI -RtlIsRangeAvailable( - IN PRTL_RANGE_LIST RangeList, - IN ULONGLONG Start, - IN ULONGLONG End, - IN ULONG Flags, - IN UCHAR AttributeAvailableMask, - IN PVOID Context OPTIONAL, - IN PRTL_CONFLICT_RANGE_CALLBACK Callback OPTIONAL, - OUT PBOOLEAN Available); - /* * BOOLEAN * RtlIsZeroLuid( @@ -5458,15 +5322,6 @@ IN OUT PACCESS_MASK AccessMask, IN PGENERIC_MAPPING GenericMapping); -NTOSAPI -NTSTATUS -DDKAPI -RtlMergeRangeLists( - OUT PRTL_RANGE_LIST MergedRangeList, - IN PRTL_RANGE_LIST RangeList1, - IN PRTL_RANGE_LIST RangeList2, - IN ULONG Flags); - /* * VOID * RtlMoveMemory(

19 years, 2 months

[ion] 16213: Large change to modify NTDLL'S CSR Functions to be compatible with NT. They are external and we should at least try to match the number of arguments (one vs eight? come on!). Because this is also the direction that Emanuele wants to be taking, the whole external calling interface was modified to be more compatible with NT (although internally it still isn't, and does not have a reason to be). API Names are now generated by a macro from the Server ID, like Emanuele and I noticed from

by ion＠svn.reactos.com

Large change to modify NTDLL'S CSR Functions to be compatible with NT. They are external and we should at least try to match the number of arguments (one vs eight? come on!). Because this is also the direction that Emanuele wants to be taking, the whole external calling interface was modified to be more compatible with NT (although internally it still isn't, and does not have a reason to be). API Names are now generated by a macro from the Server ID, like Emanuele and I noticed from traces, and I've entirely removed the concept of a reply structure. CSRSS uses full-duplex one-way structures, not dual-strutures (this would've been incompatible with the external interface anyways). I don't seem to have introduced any new bugs (console-ROS works great for me, as does the GUI), but there is still a chance some obscure bug might happen, so please bear with me, I had to hand-edit over 250 calls. Also, this now allows full removal of ntdll headers and the next commits will clean this up Modified: trunk/reactos/include/csrss/csrss.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ntos.h Modified: trunk/reactos/lib/kernel32/file/create.c Modified: trunk/reactos/lib/kernel32/k32.h Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/misc/dllmain.c Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/kernel32/process/proc.c Modified: trunk/reactos/lib/ntdll/csr/lpc.c Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/lib/ntdll/inc/ntdll.h Modified: trunk/reactos/lib/user32/include/user32.h Modified: trunk/reactos/lib/user32/misc/exit.c Modified: trunk/reactos/lib/user32/misc/misc.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/api/user.c Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/csrss.c Modified: trunk/reactos/subsys/csrss/include/api.h Modified: trunk/reactos/subsys/csrss/init.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c Modified: trunk/reactos/subsys/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c Modified: trunk/reactos/subsys/win32k/include/csr.h Modified: trunk/reactos/subsys/win32k/ntuser/csr.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c _____ Modified: trunk/reactos/include/csrss/csrss.h --- trunk/reactos/include/csrss/csrss.h 2005-06-21 23:42:58 UTC (rev 16212) +++ trunk/reactos/include/csrss/csrss.h 2005-06-22 04:02:32 UTC (rev 16213) @@ -7,51 +7,52 @@ #include <ntos.h> #endif +#define CSR_NATIVE 0x0000 +#define CSR_CONSOLE 0x0001 +#define CSR_GUI 0x0002 + +/* +typedef union _CSR_API_NUMBER +{ + WORD Index; // CSRSS API number + WORD Subsystem; // 0=NTDLL;1=KERNEL32;2=KERNEL32 +} CSR_API_NUMBER, *PCSR_API_NUMBER; +*/ + +typedef ULONG CSR_API_NUMBER; + +#define MAKE_CSR_API(Number, Server) \ + ((Server) << 16) + Number + #define CSR_CSRSS_SECTION_SIZE (65536) typedef __declspec(noreturn) VOID CALLBACK(*PCONTROLDISPATCHER)(DWORD); typedef struct { -} CSRSS_CONNECT_PROCESS_REQUEST, *PCSRSS_CONNECT_PROCESS_REQUEST; +} CSRSS_CONNECT_PROCESS, *PCSRSS_CONNECT_PROCESS; typedef struct { -} CSRSS_CONNECT_PROCESS_REPLY, *PCSRSS_CONNECT_PROCESS_REPLY; - -typedef struct -{ HANDLE NewProcessId; ULONG Flags; PCONTROLDISPATCHER CtrlDispatcher; -} CSRSS_CREATE_PROCESS_REQUEST, *PCSRSS_CREATE_PROCESS_REQUEST; - -typedef struct -{ HANDLE Console; HANDLE InputHandle; HANDLE OutputHandle; -} CSRSS_CREATE_PROCESS_REPLY, *PCSRSS_CREATE_PROCESS_REPLY; +} CSRSS_CREATE_PROCESS, *PCSRSS_CREATE_PROCESS; typedef struct { -} CSRSS_TERMINATE_PROCESS_REQUEST, *PCSRSS_TERMINATE_PROCESS_REQUEST; +} CSRSS_TERMINATE_PROCESS, *PCSRSS_TERMINATE_PROCESS; typedef struct { -} CSRSS_TERMINATE_PROCESS_REPLY, *PCSRSS_TERMINATE_PROCESS_REPLY; - -typedef struct -{ ULONG nMaxIds; -} CSRSS_GET_PROCESS_LIST_REQUEST, *PCSRSS_GET_PROCESS_LIST_REQUEST; - -typedef struct -{ ULONG nProcessIdsCopied; ULONG nProcessIdsTotal; HANDLE ProcessId[1]; -} CSRSS_GET_PROCESS_LIST_REPLY, *PCSRSS_GET_PROCESS_LIST_REPLY; +} CSRSS_GET_PROCESS_LIST, *PCSRSS_GET_PROCESS_LIST; typedef struct { @@ -59,12 +60,8 @@ BOOL Unicode; ULONG NrCharactersToWrite; BYTE Buffer[1]; -} CSRSS_WRITE_CONSOLE_REQUEST, *PCSRSS_WRITE_CONSOLE_REQUEST; - -typedef struct -{ ULONG NrCharactersWritten; -} CSRSS_WRITE_CONSOLE_REPLY, *PCSRSS_WRITE_CONSOLE_REPLY; +} CSRSS_WRITE_CONSOLE, *PCSRSS_WRITE_CONSOLE; typedef struct { @@ -72,57 +69,37 @@ BOOL Unicode; WORD NrCharactersToRead; WORD nCharsCanBeDeleted; /* number of chars already in buffer that can be backspaced */ -} CSRSS_READ_CONSOLE_REQUEST, *PCSRSS_READ_CONSOLE_REQUEST; - -typedef struct -{ HANDLE EventHandle; ULONG NrCharactersRead; BYTE Buffer[1]; -} CSRSS_READ_CONSOLE_REPLY, *PCSRSS_READ_CONSOLE_REPLY; +} CSRSS_READ_CONSOLE, *PCSRSS_READ_CONSOLE; typedef struct { PCONTROLDISPATCHER CtrlDispatcher; -} CSRSS_ALLOC_CONSOLE_REQUEST, *PCSRSS_ALLOC_CONSOLE_REQUEST; - -typedef struct -{ HANDLE Console; HANDLE InputHandle; HANDLE OutputHandle; -} CSRSS_ALLOC_CONSOLE_REPLY, *PCSRSS_ALLOC_CONSOLE_REPLY; +} CSRSS_ALLOC_CONSOLE, *PCSRSS_ALLOC_CONSOLE; typedef struct { -} CSRSS_FREE_CONSOLE_REQUEST, *PCSRSS_FREE_CONSOLE_REQUEST; +} CSRSS_FREE_CONSOLE, *PCSRSS_FREE_CONSOLE; typedef struct { -} CSRSS_FREE_CONSOLE_REPLY, *PCSRSS_FREE_CONSOLE_REPLY; - -typedef struct -{ HANDLE ConsoleHandle; -} CSRSS_SCREEN_BUFFER_INFO_REQUEST, *PCSRSS_SCREEN_BUFFER_INFO_REQUEST; - -typedef struct -{ CONSOLE_SCREEN_BUFFER_INFO Info; -} CSRSS_SCREEN_BUFFER_INFO_REPLY, *PCSRSS_SCREEN_BUFFER_INFO_REPLY; +} CSRSS_SCREEN_BUFFER_INFO, *PCSRSS_SCREEN_BUFFER_INFO; typedef struct { HANDLE ConsoleHandle; COORD Position; -} CSRSS_SET_CURSOR_REQUEST, *PCSRSS_SET_CURSOR_REQUEST; +} CSRSS_SET_CURSOR, *PCSRSS_SET_CURSOR; typedef struct { -} CSRSS_SET_CURSOR_REPLY, *PCSRSS_SET_CURSOR_REPLY; - -typedef struct -{ HANDLE ConsoleHandle; BOOL Unicode; union @@ -132,12 +109,8 @@ } Char; COORD Position; WORD Length; -} CSRSS_FILL_OUTPUT_REQUEST, *PCSRSS_FILL_OUTPUT_REQUEST; - -typedef struct -{ ULONG NrCharactersWritten; -} CSRSS_FILL_OUTPUT_REPLY, *PCSRSS_FILL_OUTPUT_REPLY; +} CSRSS_FILL_OUTPUT, *PCSRSS_FILL_OUTPUT; typedef struct { @@ -145,24 +118,16 @@ CHAR Attribute; COORD Coord; WORD Length; -} CSRSS_FILL_OUTPUT_ATTRIB_REQUEST, *PCSRSS_FILL_OUTPUT_ATTRIB_REQUEST; +} CSRSS_FILL_OUTPUT_ATTRIB, *PCSRSS_FILL_OUTPUT_ATTRIB; typedef struct { -} CSRSS_FILL_OUTPUT_ATTRIB_REPLY, *PCSRSS_FILL_OUTPUT_ATTRIB_REPLY; - -typedef struct -{ HANDLE ConsoleHandle; BOOL Unicode; -} CSRSS_READ_INPUT_REQUEST, *PCSRSS_READ_INPUT_REQUEST; - -typedef struct -{ INPUT_RECORD Input; BOOL MoreEvents; HANDLE Event; -} CSRSS_READ_INPUT_REPLY, *PCSRSS_READ_INPUT_REPLY; +} CSRSS_READ_INPUT, *PCSRSS_READ_INPUT; typedef struct { @@ -171,13 +136,9 @@ WORD Length; COORD Coord; CHAR String[1]; -} CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST, *PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST; - -typedef struct -{ COORD EndCoord; ULONG NrCharactersWritten; -} CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REPLY, *PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REPLY; +} CSRSS_WRITE_CONSOLE_OUTPUT_CHAR, *PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR; typedef struct { @@ -185,114 +146,69 @@ WORD Length; COORD Coord; CHAR String[1]; -} CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST, *PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST; - -typedef struct -{ COORD EndCoord; -} CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REPLY, *PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REPLY; +} CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB, *PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB; typedef struct { HANDLE ConsoleHandle; -} CSRSS_GET_CURSOR_INFO_REQUEST, *PCSRSS_GET_CURSOR_INFO_REQUEST; - -typedef struct -{ CONSOLE_CURSOR_INFO Info; -} CSRSS_GET_CURSOR_INFO_REPLY, *PCSRSS_GET_CURSOR_INFO_REPLY; +} CSRSS_GET_CURSOR_INFO, *PCSRSS_GET_CURSOR_INFO; typedef struct { HANDLE ConsoleHandle; CONSOLE_CURSOR_INFO Info; -} CSRSS_SET_CURSOR_INFO_REQUEST, *PCSRSS_SET_CURSOR_INFO_REQUEST; +} CSRSS_SET_CURSOR_INFO, *PCSRSS_SET_CURSOR_INFO; typedef struct { -} CSRSS_SET_CURSOR_INFO_REPLY, *PCSRSS_SET_CURSOR_INFO_REPLY; - -typedef struct -{ HANDLE ConsoleHandle; CHAR Attrib; -} CSRSS_SET_ATTRIB_REQUEST, *PCSRSS_SET_ATTRIB_REQUEST; +} CSRSS_SET_ATTRIB, *PCSRSS_SET_ATTRIB; typedef struct { -} CSRSS_SET_ATTRIB_REPLY, *PCSRSS_SET_ATTRIB_REPLY; - -typedef struct -{ HANDLE ConsoleHandle; DWORD Mode; -} CSRSS_SET_CONSOLE_MODE_REQUEST, *PCSRSS_SET_CONSOLE_MODE_REQUEST; +} CSRSS_SET_CONSOLE_MODE, *PCSRSS_SET_CONSOLE_MODE; typedef struct { -} CSRSS_SET_CONSOLE_MODE_REPLY, *PCSRSS_SET_CONSOLE_MODE_REPLY; - -typedef struct -{ HANDLE ConsoleHandle; -} CSRSS_GET_CONSOLE_MODE_REQUEST, *PCSRSS_GET_CONSOLE_MODE_REQUEST; - -typedef struct -{ DWORD ConsoleMode; -} CSRSS_GET_CONSOLE_MODE_REPLY, *PCSRSS_GET_CONSOLE_MODE_REPLY; +} CSRSS_GET_CONSOLE_MODE, *PCSRSS_GET_CONSOLE_MODE; typedef struct { /* may want to add some parameters here someday */ -} CSRSS_CREATE_SCREEN_BUFFER_REQUEST, *PCSRSS_CREATE_SCREEN_BUFFER_REQUEST; - -typedef struct -{ HANDLE OutputHandle; /* handle to newly created screen buffer */ -} CSRSS_CREATE_SCREEN_BUFFER_REPLY, *PCSRSS_CREATE_SCREEN_BUFFER_REPLY; +} CSRSS_CREATE_SCREEN_BUFFER, *PCSRSS_CREATE_SCREEN_BUFFER; typedef struct { HANDLE OutputHandle; /* handle to screen buffer to switch to */ -} CSRSS_SET_SCREEN_BUFFER_REQUEST, *PCSRSS_SET_SCREEN_BUFFER_REQUEST; +} CSRSS_SET_SCREEN_BUFFER, *PCSRSS_SET_SCREEN_BUFFER; typedef struct { -} CSRSS_SET_SCREEN_BUFFER_REPLY, *PCSRSS_SET_SCREEN_BUFFER_REPLY; - -typedef struct -{ HANDLE UniqueThread; -} CSRSS_IDENTIFY_ALERTABLE_THREAD_REQUEST, *PCSRSS_IDENTIFY_ALERTABLE_THREAD_REQUEST; - -typedef struct -{ CLIENT_ID Cid; -} CSRSS_IDENTIFY_ALERTABLE_THREAD_REPLY, *PCSRSS_IDENTIFY_ALERTABLE_THREAD_REPLY; +} CSRSS_IDENTIFY_ALERTABLE_THREAD, *PCSRSS_IDENTIFY_ALERTABLE_THREAD; typedef struct { HANDLE Console; DWORD Length; WCHAR Title[1]; -} CSRSS_SET_TITLE_REQUEST, *PCSRSS_SET_TITLE_REQUEST; +} CSRSS_SET_TITLE, *PCSRSS_SET_TITLE; typedef struct { -} CSRSS_SET_TITLE_REPLY, *PCSRSS_SET_TITLE_REPLY; - -typedef struct -{ HANDLE ConsoleHandle; -} CSRSS_GET_TITLE_REQUEST, *PCSRSS_GET_TITLE_REQUEST; - -typedef struct -{ - HANDLE ConsoleHandle; DWORD Length; WCHAR Title[1]; -} CSRSS_GET_TITLE_REPLY, *PCSRSS_GET_TITLE_REPLY; +} CSRSS_GET_TITLE, *PCSRSS_GET_TITLE; typedef struct { @@ -302,24 +218,15 @@ COORD BufferCoord; SMALL_RECT WriteRegion; CHAR_INFO* CharInfo; -} CSRSS_WRITE_CONSOLE_OUTPUT_REQUEST, *PCSRSS_WRITE_CONSOLE_OUTPUT_REQUEST; +} CSRSS_WRITE_CONSOLE_OUTPUT, *PCSRSS_WRITE_CONSOLE_OUTPUT; typedef struct { - SMALL_RECT WriteRegion; -} CSRSS_WRITE_CONSOLE_OUTPUT_REPLY, *PCSRSS_WRITE_CONSOLE_OUTPUT_REPLY; - -typedef struct -{ HANDLE ConsoleInput; -} CSRSS_FLUSH_INPUT_BUFFER_REQUEST, *PCSRSS_FLUSH_INPUT_BUFFER_REQUEST; +} CSRSS_FLUSH_INPUT_BUFFER, *PCSRSS_FLUSH_INPUT_BUFFER; typedef struct { -} CSRSS_FLUSH_INPUT_BUFFER_REPLY, *PCSRSS_FLUSH_INPUT_BUFFER_REPLY; - -typedef struct -{ HANDLE ConsoleHandle; BOOL Unicode; SMALL_RECT ScrollRectangle; @@ -327,88 +234,56 @@ SMALL_RECT ClipRectangle; COORD DestinationOrigin; CHAR_INFO Fill; -} CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REQUEST, *PCSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REQUEST; +} CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER, *PCSRSS_SCROLL_CONSOLE_SCREEN_BUFFER; typedef struct { -} CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REPLY, *PCSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REPLY; - -typedef struct -{ HANDLE ConsoleHandle; BOOL Unicode; DWORD NumCharsToRead; COORD ReadCoord; -}CSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST; - -typedef struct -{ COORD EndCoord; DWORD CharsRead; CHAR String[1]; -}CSRSS_READ_CONSOLE_OUTPUT_CHAR_REPLY, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR_REPLY; +}CSRSS_READ_CONSOLE_OUTPUT_CHAR, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR; typedef struct { HANDLE ConsoleHandle; DWORD NumAttrsToRead; COORD ReadCoord; -}CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST; - -typedef struct -{ COORD EndCoord; CHAR String[1]; -}CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REPLY, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REPLY; +}CSRSS_READ_CONSOLE_OUTPUT_ATTRIB, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB; typedef struct { HANDLE ConsoleHandle; -}CSRSS_GET_NUM_INPUT_EVENTS_REQUEST, *PCSRSS_GET_NUM_INPUT_EVENTS_REQUEST; - -typedef struct -{ DWORD NumInputEvents; -}CSRSS_GET_NUM_INPUT_EVENTS_REPLY, *PCSRSS_GET_NUM_INPUT_EVENTS_REPLY; +}CSRSS_GET_NUM_INPUT_EVENTS, *PCSRSS_GET_NUM_INPUT_EVENTS; typedef struct { HANDLE ProcessId; -} CSRSS_REGISTER_SERVICES_PROCESS_REQUEST, *PCSRSS_REGISTER_SERVICES_PROCESS_REQUEST; +} CSRSS_REGISTER_SERVICES_PROCESS, *PCSRSS_REGISTER_SERVICES_PROCESS; typedef struct { -} CSRSS_REGISTER_SERVICES_PROCESS_REPLY, *PCSRSS_REGISTER_SERVICES_PROCESS_REPLY; - -typedef struct -{ UINT Flags; DWORD Reserved; -} CSRSS_EXIT_REACTOS_REQUEST, *PCSRSS_EXIT_REACTOS_REQUEST; +} CSRSS_EXIT_REACTOS, *PCSRSS_EXIT_REACTOS; typedef struct { -} CSRSS_EXIT_REACTOS_REPLY, *PCSRSS_EXIT_REACTOS_REPLY; - -typedef struct -{ DWORD Level; DWORD Flags; -} CSRSS_SET_SHUTDOWN_PARAMETERS_REQUEST, *PCSRSS_SET_SHUTDOWN_PARAMETERS_REQUEST; +} CSRSS_SET_SHUTDOWN_PARAMETERS, *PCSRSS_SET_SHUTDOWN_PARAMETERS; typedef struct { -} CSRSS_SET_SHUTDOWN_PARAMETERS_REPLY, *PCSRSS_SET_SHUTDOWN_PARAMETERS_REPLY; - -typedef struct -{ -} CSRSS_GET_SHUTDOWN_PARAMETERS_REQUEST, *PCSRSS_GET_SHUTDOWN_PARAMETERS_REQUEST; - -typedef struct -{ DWORD Level; DWORD Flags; -} CSRSS_GET_SHUTDOWN_PARAMETERS_REPLY, *PCSRSS_GET_SHUTDOWN_PARAMETERS_REPLY; +} CSRSS_GET_SHUTDOWN_PARAMETERS, *PCSRSS_GET_SHUTDOWN_PARAMETERS; typedef struct { @@ -416,88 +291,52 @@ BOOL Unicode; DWORD Length; INPUT_RECORD* InputRecord; -} CSRSS_PEEK_CONSOLE_INPUT_REQUEST, *PCSRSS_PEEK_CONSOLE_INPUT_REQUEST; +} CSRSS_PEEK_CONSOLE_INPUT, *PCSRSS_PEEK_CONSOLE_INPUT; typedef struct { - DWORD Length; -} CSRSS_PEEK_CONSOLE_INPUT_REPLY, *PCSRSS_PEEK_CONSOLE_INPUT_REPLY; - -typedef struct -{ HANDLE ConsoleHandle; BOOL Unicode; COORD BufferSize; COORD BufferCoord; SMALL_RECT ReadRegion; CHAR_INFO* CharInfo; -} CSRSS_READ_CONSOLE_OUTPUT_REQUEST, *PCSRSS_READ_CONSOLE_OUTPUT_REQUEST; +} CSRSS_READ_CONSOLE_OUTPUT, *PCSRSS_READ_CONSOLE_OUTPUT; typedef struct { - SMALL_RECT ReadRegion; -} CSRSS_READ_CONSOLE_OUTPUT_REPLY, *PCSRSS_READ_CONSOLE_OUTPUT_REPLY; - -typedef struct -{ HANDLE ConsoleHandle; BOOL Unicode; DWORD Length; INPUT_RECORD* InputRecord; -} CSRSS_WRITE_CONSOLE_INPUT_REQUEST, *PCSRSS_WRITE_CONSOLE_INPUT_REQUEST; +} CSRSS_WRITE_CONSOLE_INPUT, *PCSRSS_WRITE_CONSOLE_INPUT; typedef struct { - DWORD Length; -} CSRSS_WRITE_CONSOLE_INPUT_REPLY, *PCSRSS_WRITE_CONSOLE_INPUT_REPLY; - -typedef struct -{ -} CSRSS_GET_INPUT_HANDLE_REQUEST, *PCSRSS_GET_INPUT_HANDLE_REQUEST; - -typedef struct -{ HANDLE InputHandle; -} CSRSS_GET_INPUT_HANDLE_REPLY, *PCSRSS_GET_INPUT_HANDLE_REPLY; +} CSRSS_GET_INPUT_HANDLE, *PCSRSS_GET_INPUT_HANDLE; typedef struct { -} CSRSS_GET_OUTPUT_HANDLE_REQUEST, *PCSRSS_GET_OUTPUT_HANDLE_REQUEST; - -typedef struct -{ HANDLE OutputHandle; -} CSRSS_GET_OUTPUT_HANDLE_REPLY, *PCSRSS_GET_OUTPUT_HANDLE_REPLY; +} CSRSS_GET_OUTPUT_HANDLE, *PCSRSS_GET_OUTPUT_HANDLE; typedef struct { HANDLE Handle; -} CSRSS_CLOSE_HANDLE_REQUEST, *PCSRSS_CLOSE_HANDLE_REQUEST; +} CSRSS_CLOSE_HANDLE, *PCSRSS_CLOSE_HANDLE; typedef struct { -} CSRSS_CLOSE_HANDLE_REPLY, *PCSRSS_CLOSE_HANDLE_REPLY; - -typedef struct -{ HANDLE Handle; -} CSRSS_VERIFY_HANDLE_REQUEST, *PCSRSS_VERIFY_HANDLE_REQUEST; +} CSRSS_VERIFY_HANDLE, *PCSRSS_VERIFY_HANDLE; typedef struct { -} CSRSS_VERIFY_HANDLE_REPLY, *PCSRSS_VERIFY_HANDLE_REPLY; - -typedef struct -{ HANDLE Handle; HANDLE ProcessId; -} CSRSS_DUPLICATE_HANDLE_REQUEST, *PCSRSS_DUPLICATE_HANDLE_REQUEST; +} CSRSS_DUPLICATE_HANDLE, *PCSRSS_DUPLICATE_HANDLE; -typedef struct -{ - HANDLE Handle; -} CSRSS_DUPLICATE_HANDLE_REPLY, *PCSRSS_DUPLICATE_HANDLE_REPLY; - #define CONSOLE_HARDWARE_STATE_GET 0 #define CONSOLE_HARDWARE_STATE_SET 1 @@ -509,204 +348,149 @@ HANDLE ConsoleHandle; DWORD SetGet; /* 0=get; 1=set */ DWORD State; -} CSRSS_SETGET_CONSOLE_HW_STATE_REQUEST, *PCSRSS_SETGET_CONSOLE_HW_STATE_REQUEST; +} CSRSS_SETGET_CONSOLE_HW_STATE, *PCSRSS_SETGET_CONSOLE_HW_STATE; typedef struct { - HANDLE ConsoleHandle; - DWORD SetGet; /* 0=get; 1=set */ - DWORD State; -} CSRSS_SETGET_CONSOLE_HW_STATE_REPLY, *PCSRSS_SETGET_CONSOLE_HW_STATE_REPLY; - -typedef struct -{ -} CSRSS_GET_CONSOLE_WINDOW_REQUEST, *PCSRSS_GET_CONSOLE_WINDOW_REQUEST; - -typedef struct -{ HWND WindowHandle; -} CSRSS_GET_CONSOLE_WINDOW_REPLY, *PCSRSS_GET_CONSOLE_WINDOW_REPLY; +} CSRSS_GET_CONSOLE_WINDOW, *PCSRSS_GET_CONSOLE_WINDOW; typedef struct { HICON WindowIcon; -} CSRSS_SET_CONSOLE_ICON_REQUEST, *PCSRSS_SET_CONSOLE_ICON_REQUEST; +} CSRSS_SET_CONSOLE_ICON, *PCSRSS_SET_CONSOLE_ICON; typedef struct { -} CSRSS_SET_CONSOLE_ICON_REPLY, *PCSRSS_SET_CONSOLE_ICON_REPLY; - -typedef struct -{ HDESK DesktopHandle; -} CSRSS_CREATE_DESKTOP_REQUEST, *PCSRSS_CREATE_DESKTOP_REQUEST; +} CSRSS_CREATE_DESKTOP, *PCSRSS_CREATE_DESKTOP; typedef struct { -} CSRSS_CREATE_DESKTOP_REPLY, *PCSRSS_CREATE_DESKTOP_REPLY; - -typedef struct -{ HWND DesktopWindow; ULONG Width; ULONG Height; -} CSRSS_SHOW_DESKTOP_REQUEST, *PCSRSS_SHOW_DESKTOP_REQUEST; +} CSRSS_SHOW_DESKTOP, *PCSRSS_SHOW_DESKTOP; typedef struct { -} CSRSS_SHOW_DESKTOP_REPLY, *PCSRSS_SHOW_DESKTOP_REPLY; - -typedef struct -{ HWND DesktopWindow; -} CSRSS_HIDE_DESKTOP_REQUEST, *PCSRSS_HIDE_DESKTOP_REQUEST; +} CSRSS_HIDE_DESKTOP, *PCSRSS_HIDE_DESKTOP; typedef struct { -} CSRSS_HIDE_DESKTOP_REPLY, *PCSRSS_HIDE_DESKTOP_REPLY; - -typedef struct -{ HWND LogonNotifyWindow; -} CSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST, *PCSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST; +} CSRSS_SET_LOGON_NOTIFY_WINDOW, *PCSRSS_SET_LOGON_NOTIFY_WINDOW; typedef struct { -} CSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY, *PCSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY; - -typedef struct -{ HANDLE ProcessId; BOOL Register; -} CSRSS_REGISTER_LOGON_PROCESS_REQUEST, *PCSRSS_REGISTER_LOGON_PROCESS_REQUEST; +} CSRSS_REGISTER_LOGON_PROCESS, *PCSRSS_REGISTER_LOGON_PROCESS; typedef struct { -} CSRSS_REGISTER_LOGON_PROCESS_REPLY, *PCSRSS_REGISTER_LOGON_PROCESS_REPLY; - -typedef struct -{ -} CSRSS_GET_CONSOLE_CP_REQUEST, *PCSRSS_GET_CONSOLE_CP_REQUEST; - -typedef struct -{ UINT CodePage; -} CSRSS_GET_CONSOLE_CP_REPLY, *PCSRSS_GET_CONSOLE_CP_REPLY; +} CSRSS_GET_CONSOLE_CP, *PCSRSS_GET_CONSOLE_CP; typedef struct { UINT CodePage; -} CSRSS_SET_CONSOLE_CP_REQUEST, *PCSRSS_SET_CONSOLE_CP_REQUEST; +} CSRSS_SET_CONSOLE_CP, *PCSRSS_SET_CONSOLE_CP; typedef struct { -} CSRSS_SET_CONSOLE_CP_REPLY, *PCSRSS_SET_CONSOLE_CP_REPLY; - -typedef struct -{ -} CSRSS_GET_CONSOLE_OUTPUT_CP_REQUEST, *PCSRSS_GET_CONSOLE_OUTPUT_CP_REQUEST; - -typedef struct -{ UINT CodePage; -} CSRSS_GET_CONSOLE_OUTPUT_CP_REPLY, *PCSRSS_GET_CONSOLE_OUTPUT_CP_REPLY; +} CSRSS_GET_CONSOLE_OUTPUT_CP, *PCSRSS_GET_CONSOLE_OUTPUT_CP; typedef struct { UINT CodePage; -} CSRSS_SET_CONSOLE_OUTPUT_CP_REQUEST, *PCSRSS_SET_CONSOLE_OUTPUT_CP_REQUEST; +} CSRSS_SET_CONSOLE_OUTPUT_CP, *PCSRSS_SET_CONSOLE_OUTPUT_CP; typedef struct { -} CSRSS_SET_CONSOLE_OUTPUT_CP_REPLY, *PCSRSS_SET_CONSOLE_OUTPUT_CP_REPLY; - -typedef struct -{ -} CSRSS_GET_INPUT_WAIT_HANDLE_REQUEST, *PCSRSS_GET_INPUT_WAIT_HANDLE_REQUEST; - -typedef struct -{ HANDLE InputWaitHandle; -} CSRSS_GET_INPUT_WAIT_HANDLE_REPLY, *PCSRSS_GET_INPUT_WAIT_HANDLE_REPLY; +} CSRSS_GET_INPUT_WAIT_HANDLE, *PCSRSS_GET_INPUT_WAIT_HANDLE; -#define CSRSS_MAX_WRITE_CONSOLE_REQUEST \ - (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(CSRSS_WRITE_CONSOLE_REQUEST)) +#define CSRSS_MAX_WRITE_CONSOLE \ + (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(CSRSS_WRITE_CONSOLE)) -#define CSRSS_MAX_SET_TITLE_REQUEST (MAX_MESSAGE_DATA - sizeof( HANDLE ) - sizeof( DWORD ) - sizeof( ULONG ) - LPC_MESSAGE_BASE_SIZE) +#define CSRSS_MAX_SET_TITLE (MAX_MESSAGE_DATA - sizeof( HANDLE ) - sizeof( DWORD ) - sizeof( ULONG ) - LPC_MESSAGE_BASE_SIZE) -#define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR (MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST )) +#define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR (MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_WRITE_CONSOLE_OUTPUT_CHAR )) -#define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB ((MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST )) / 2) +#define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB ((MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB )) / 2) -#define CSRSS_MAX_READ_CONSOLE_REQUEST (MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_READ_CONSOLE_REQUEST )) +#define CSRSS_MAX_READ_CONSOLE (MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_READ_CONSOLE )) -#define CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(HANDLE) - sizeof(DWORD) - sizeof(CSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST)) +#define CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(HANDLE) - sizeof(DWORD) - sizeof(CSRSS_READ_CONSOLE_OUTPUT_CHAR)) -#define CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(HANDLE) - sizeof(DWORD) - sizeof(CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST)) +#define CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(HANDLE) - sizeof(DWORD) - sizeof(CSRSS_READ_CONSOLE_OUTPUT_ATTRIB)) /* WCHARs, not bytes! */ #define CSRSS_MAX_TITLE_LENGTH 80 -#define CSRSS_CREATE_PROCESS (0x0) -#define CSRSS_TERMINATE_PROCESS (0x1) -#define CSRSS_WRITE_CONSOLE (0x2) -#define CSRSS_READ_CONSOLE (0x3) -#define CSRSS_ALLOC_CONSOLE (0x4) -#define CSRSS_FREE_CONSOLE (0x5) -#define CSRSS_CONNECT_PROCESS (0x6) -#define CSRSS_SCREEN_BUFFER_INFO (0x7) -#define CSRSS_SET_CURSOR (0x8) -#define CSRSS_FILL_OUTPUT (0x9) -#define CSRSS_READ_INPUT (0xA) -#define CSRSS_WRITE_CONSOLE_OUTPUT_CHAR (0xB) -#define CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB (0xC) -#define CSRSS_FILL_OUTPUT_ATTRIB (0xD) -#define CSRSS_GET_CURSOR_INFO (0xE) -#define CSRSS_SET_CURSOR_INFO (0xF) -#define CSRSS_SET_ATTRIB (0x10) -#define CSRSS_GET_CONSOLE_MODE (0x11) -#define CSRSS_SET_CONSOLE_MODE (0x12) -#define CSRSS_CREATE_SCREEN_BUFFER (0x13) -#define CSRSS_SET_SCREEN_BUFFER (0x14) -#define CSRSS_SET_TITLE (0x15) -#define CSRSS_GET_TITLE (0x16) -#define CSRSS_WRITE_CONSOLE_OUTPUT (0x17) -#define CSRSS_FLUSH_INPUT_BUFFER (0x18) -#define CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER (0x19) -#define CSRSS_READ_CONSOLE_OUTPUT_CHAR (0x1A) -#define CSRSS_READ_CONSOLE_OUTPUT_ATTRIB (0x1B) -#define CSRSS_GET_NUM_INPUT_EVENTS (0x1C) -#define CSRSS_REGISTER_SERVICES_PROCESS (0x1D) -#define CSRSS_EXIT_REACTOS (0x1E) -#define CSRSS_GET_SHUTDOWN_PARAMETERS (0x1F) -#define CSRSS_SET_SHUTDOWN_PARAMETERS (0x20) -#define CSRSS_PEEK_CONSOLE_INPUT (0x21) -#define CSRSS_READ_CONSOLE_OUTPUT (0x22) -#define CSRSS_WRITE_CONSOLE_INPUT (0x23) -#define CSRSS_GET_INPUT_HANDLE (0x24) -#define CSRSS_GET_OUTPUT_HANDLE (0x25) -#define CSRSS_CLOSE_HANDLE (0x26) -#define CSRSS_VERIFY_HANDLE (0x27) -#define CSRSS_DUPLICATE_HANDLE (0x28) -#define CSRSS_SETGET_CONSOLE_HW_STATE (0x29) -#define CSRSS_GET_CONSOLE_WINDOW (0x2A) -#define CSRSS_CREATE_DESKTOP (0x2B) -#define CSRSS_SHOW_DESKTOP (0x2C) -#define CSRSS_HIDE_DESKTOP (0x2D) -#define CSRSS_SET_CONSOLE_ICON (0x2E) -#define CSRSS_SET_LOGON_NOTIFY_WINDOW (0x2F) -#define CSRSS_REGISTER_LOGON_PROCESS (0x30) -#define CSRSS_GET_CONSOLE_CP (0x31) -#define CSRSS_SET_CONSOLE_CP (0x32) -#define CSRSS_GET_CONSOLE_OUTPUT_CP (0x33) -#define CSRSS_SET_CONSOLE_OUTPUT_CP (0x34) -#define CSRSS_GET_INPUT_WAIT_HANDLE (0x35) -#define CSRSS_GET_PROCESS_LIST (0x36) +#define CREATE_PROCESS (0x0) +#define TERMINATE_PROCESS (0x1) +#define WRITE_CONSOLE (0x2) +#define READ_CONSOLE (0x3) +#define ALLOC_CONSOLE (0x4) +#define FREE_CONSOLE (0x5) +#define CONNECT_PROCESS (0x6) +#define SCREEN_BUFFER_INFO (0x7) +#define SET_CURSOR (0x8) +#define FILL_OUTPUT (0x9) +#define READ_INPUT (0xA) +#define WRITE_CONSOLE_OUTPUT_CHAR (0xB) +#define WRITE_CONSOLE_OUTPUT_ATTRIB (0xC) +#define FILL_OUTPUT_ATTRIB (0xD) +#define GET_CURSOR_INFO (0xE) +#define SET_CURSOR_INFO (0xF) +#define SET_ATTRIB (0x10) +#define GET_CONSOLE_MODE (0x11) +#define SET_CONSOLE_MODE (0x12) +#define CREATE_SCREEN_BUFFER (0x13) +#define SET_SCREEN_BUFFER (0x14) +#define SET_TITLE (0x15) +#define GET_TITLE (0x16) +#define WRITE_CONSOLE_OUTPUT (0x17) +#define FLUSH_INPUT_BUFFER (0x18) +#define SCROLL_CONSOLE_SCREEN_BUFFER (0x19) +#define READ_CONSOLE_OUTPUT_CHAR (0x1A) +#define READ_CONSOLE_OUTPUT_ATTRIB (0x1B) +#define GET_NUM_INPUT_EVENTS (0x1C) +#define REGISTER_SERVICES_PROCESS (0x1D) +#define EXIT_REACTOS (0x1E) +#define GET_SHUTDOWN_PARAMETERS (0x1F) +#define SET_SHUTDOWN_PARAMETERS (0x20) +#define PEEK_CONSOLE_INPUT (0x21) +#define READ_CONSOLE_OUTPUT (0x22) +#define WRITE_CONSOLE_INPUT (0x23) +#define GET_INPUT_HANDLE (0x24) +#define GET_OUTPUT_HANDLE (0x25) +#define CLOSE_HANDLE (0x26) +#define VERIFY_HANDLE (0x27) +#define DUPLICATE_HANDLE (0x28) +#define SETGET_CONSOLE_HW_STATE (0x29) +#define GET_CONSOLE_WINDOW (0x2A) +#define CREATE_DESKTOP (0x2B) +#define SHOW_DESKTOP (0x2C) +#define HIDE_DESKTOP (0x2D) +#define SET_CONSOLE_ICON (0x2E) +#define SET_LOGON_NOTIFY_WINDOW (0x2F) +#define REGISTER_LOGON_PROCESS (0x30) +#define GET_CONSOLE_CP (0x31) +#define SET_CONSOLE_CP (0x32) +#define GET_CONSOLE_OUTPUT_CP (0x33) +#define SET_CONSOLE_OUTPUT_CP (0x34) +#define GET_INPUT_WAIT_HANDLE (0x35) +#define GET_PROCESS_LIST (0x36) /* Keep in sync with definition below. */ -#define CSRSS_REQUEST_HEADER_SIZE (LPC_MESSAGE_BASE_SIZE + sizeof(ULONG)) +#define CSRSS_HEADER_SIZE (LPC_MESSAGE_BASE_SIZE + sizeof(ULONG) + sizeof(NTSTATUS)) -typedef struct +typedef struct _CSR_API_MESSAGE { union { @@ -715,118 +499,65 @@ { BYTE HeaderReserved[LPC_MESSAGE_BASE_SIZE]; ULONG Type; - union - { - CSRSS_CREATE_PROCESS_REQUEST CreateProcessRequest; - CSRSS_CONNECT_PROCESS_REQUEST ConnectRequest; - CSRSS_WRITE_CONSOLE_REQUEST WriteConsoleRequest; - CSRSS_READ_CONSOLE_REQUEST ReadConsoleRequest; - CSRSS_ALLOC_CONSOLE_REQUEST AllocConsoleRequest; - CSRSS_SCREEN_BUFFER_INFO_REQUEST ScreenBufferInfoRequest; - CSRSS_SET_CURSOR_REQUEST SetCursorRequest; - CSRSS_FILL_OUTPUT_REQUEST FillOutputRequest; - CSRSS_READ_INPUT_REQUEST ReadInputRequest; - CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST WriteConsoleOutputCharRequest; - CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST WriteConsoleOutputAttribRequest; - CSRSS_FILL_OUTPUT_ATTRIB_REQUEST FillOutputAttribRequest; - CSRSS_SET_CURSOR_INFO_REQUEST SetCursorInfoRequest; - CSRSS_GET_CURSOR_INFO_REQUEST GetCursorInfoRequest; - CSRSS_SET_ATTRIB_REQUEST SetAttribRequest; - CSRSS_SET_CONSOLE_MODE_REQUEST SetConsoleModeRequest; - CSRSS_GET_CONSOLE_MODE_REQUEST GetConsoleModeRequest; - CSRSS_CREATE_SCREEN_BUFFER_REQUEST CreateScreenBufferRequest; - CSRSS_SET_SCREEN_BUFFER_REQUEST SetScreenBufferRequest; - CSRSS_SET_TITLE_REQUEST SetTitleRequest; - CSRSS_GET_TITLE_REQUEST GetTitleRequest; - CSRSS_WRITE_CONSOLE_OUTPUT_REQUEST WriteConsoleOutputRequest; - CSRSS_FLUSH_INPUT_BUFFER_REQUEST FlushInputBufferRequest; - CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REQUEST ScrollConsoleScreenBufferRequest; - CSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST ReadConsoleOutputCharRequest; - CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST ReadConsoleOutputAttribRequest; - CSRSS_GET_NUM_INPUT_EVENTS_REQUEST GetNumInputEventsRequest; - CSRSS_REGISTER_SERVICES_PROCESS_REQUEST RegisterServicesProcessRequest; - CSRSS_EXIT_REACTOS_REQUEST ExitReactosRequest; - CSRSS_SET_SHUTDOWN_PARAMETERS_REQUEST SetShutdownParametersRequest; - CSRSS_GET_SHUTDOWN_PARAMETERS_REQUEST GetShutdownParametersRequest; - CSRSS_PEEK_CONSOLE_INPUT_REQUEST PeekConsoleInputRequest; - CSRSS_READ_CONSOLE_OUTPUT_REQUEST ReadConsoleOutputRequest; - CSRSS_WRITE_CONSOLE_INPUT_REQUEST WriteConsoleInputRequest; - CSRSS_CLOSE_HANDLE_REQUEST CloseHandleRequest; - CSRSS_VERIFY_HANDLE_REQUEST VerifyHandleRequest; - CSRSS_DUPLICATE_HANDLE_REQUEST DuplicateHandleRequest; - CSRSS_SETGET_CONSOLE_HW_STATE_REQUEST ConsoleHardwareStateRequest; - CSRSS_GET_CONSOLE_WINDOW_REQUEST GetConsoleWindowRequest; - CSRSS_CREATE_DESKTOP_REQUEST CreateDesktopRequest; - CSRSS_SHOW_DESKTOP_REQUEST ShowDesktopRequest; - CSRSS_HIDE_DESKTOP_REQUEST HideDesktopRequest; - CSRSS_SET_CONSOLE_ICON_REQUEST SetConsoleIconRequest; - CSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST SetLogonNotifyWindowRequest; - CSRSS_REGISTER_LOGON_PROCESS_REQUEST RegisterLogonProcessRequest; - CSRSS_GET_CONSOLE_CP_REQUEST GetConsoleCodePage; - CSRSS_SET_CONSOLE_CP_REQUEST SetConsoleCodePage; - CSRSS_GET_CONSOLE_OUTPUT_CP_REQUEST GetConsoleOutputCodePage; - CSRSS_SET_CONSOLE_OUTPUT_CP_REQUEST SetConsoleOutputCodePage; - CSRSS_GET_INPUT_WAIT_HANDLE_REQUEST GetConsoleInputWaitHandle; - CSRSS_GET_PROCESS_LIST_REQUEST GetProcessListRequest; - } Data; - }; - }; -} CSRSS_API_REQUEST, *PCSRSS_API_REQUEST; - -typedef struct -{ - union - { - LPC_MESSAGE Header; - struct - { - BYTE HeaderReserved[LPC_MESSAGE_BASE_SIZE]; NTSTATUS Status; union { - CSRSS_CREATE_PROCESS_REPLY CreateProcessReply; - CSRSS_CONNECT_PROCESS_REPLY ConnectReply; - CSRSS_FILL_OUTPUT_REPLY FillOutputReply; - CSRSS_WRITE_CONSOLE_REPLY WriteConsoleReply; - CSRSS_READ_CONSOLE_REPLY ReadConsoleReply; - CSRSS_ALLOC_CONSOLE_REPLY AllocConsoleReply; - CSRSS_SCREEN_BUFFER_INFO_REPLY ScreenBufferInfoReply; - CSRSS_READ_INPUT_REPLY ReadInputReply; - CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REPLY WriteConsoleOutputCharReply; - CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REPLY WriteConsoleOutputAttribReply; - CSRSS_GET_CURSOR_INFO_REPLY GetCursorInfoReply; - CSRSS_GET_CONSOLE_MODE_REPLY GetConsoleModeReply; - CSRSS_CREATE_SCREEN_BUFFER_REPLY CreateScreenBufferReply; - CSRSS_GET_TITLE_REPLY GetTitleReply; - CSRSS_WRITE_CONSOLE_OUTPUT_REPLY WriteConsoleOutputReply; - CSRSS_READ_CONSOLE_OUTPUT_CHAR_REPLY ReadConsoleOutputCharReply; - CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REPLY ReadConsoleOutputAttribReply; - CSRSS_GET_NUM_INPUT_EVENTS_REPLY GetNumInputEventsReply; - CSRSS_SET_SHUTDOWN_PARAMETERS_REPLY SetShutdownParametersReply; - CSRSS_GET_SHUTDOWN_PARAMETERS_REPLY GetShutdownParametersReply; - CSRSS_PEEK_CONSOLE_INPUT_REPLY PeekConsoleInputReply; - CSRSS_READ_CONSOLE_OUTPUT_REPLY ReadConsoleOutputReply; - CSRSS_WRITE_CONSOLE_INPUT_REPLY WriteConsoleInputReply; - CSRSS_GET_INPUT_HANDLE_REPLY GetInputHandleReply; - CSRSS_GET_OUTPUT_HANDLE_REPLY GetOutputHandleReply; - CSRSS_DUPLICATE_HANDLE_REPLY DuplicateHandleReply; - CSRSS_SETGET_CONSOLE_HW_STATE_REPLY ConsoleHardwareStateReply; - CSRSS_GET_CONSOLE_WINDOW_REPLY GetConsoleWindowReply; - CSRSS_CREATE_DESKTOP_REPLY CreateDesktopReply; - CSRSS_SHOW_DESKTOP_REPLY ShowDesktopReply; - CSRSS_HIDE_DESKTOP_REPLY HideDesktopReply; - CSRSS_SET_CONSOLE_ICON_REPLY SetConsoleIconReply; - CSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY SetLogonNotifyWindowReply; - CSRSS_REGISTER_LOGON_PROCESS_REPLY RegisterLogonProcessReply; - CSRSS_GET_CONSOLE_CP_REPLY GetConsoleCodePage; - CSRSS_SET_CONSOLE_CP_REPLY SetConsoleCodePage; - CSRSS_GET_CONSOLE_OUTPUT_CP_REPLY GetConsoleOutputCodePage; - CSRSS_SET_CONSOLE_OUTPUT_CP_REPLY SetConsoleOutputCodePage; - CSRSS_GET_INPUT_WAIT_HANDLE_REPLY GetConsoleInputWaitHandle; - CSRSS_GET_PROCESS_LIST_REPLY GetProcessListReply; + CSRSS_CREATE_PROCESS CreateProcessRequest; + CSRSS_CONNECT_PROCESS ConnectRequest; + CSRSS_WRITE_CONSOLE WriteConsoleRequest; + CSRSS_READ_CONSOLE ReadConsoleRequest; + CSRSS_ALLOC_CONSOLE AllocConsoleRequest; + CSRSS_SCREEN_BUFFER_INFO ScreenBufferInfoRequest; + CSRSS_SET_CURSOR SetCursorRequest; + CSRSS_FILL_OUTPUT FillOutputRequest; + CSRSS_READ_INPUT ReadInputRequest; + CSRSS_WRITE_CONSOLE_OUTPUT_CHAR WriteConsoleOutputCharRequest; + CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB WriteConsoleOutputAttribRequest; + CSRSS_FILL_OUTPUT_ATTRIB FillOutputAttribRequest; + CSRSS_SET_CURSOR_INFO SetCursorInfoRequest; + CSRSS_GET_CURSOR_INFO GetCursorInfoRequest; + CSRSS_SET_ATTRIB SetAttribRequest; + CSRSS_SET_CONSOLE_MODE SetConsoleModeRequest; + CSRSS_GET_CONSOLE_MODE GetConsoleModeRequest; + CSRSS_CREATE_SCREEN_BUFFER CreateScreenBufferRequest; + CSRSS_SET_SCREEN_BUFFER SetScreenBufferRequest; + CSRSS_SET_TITLE SetTitleRequest; + CSRSS_GET_TITLE GetTitleRequest; + CSRSS_WRITE_CONSOLE_OUTPUT WriteConsoleOutputRequest; + CSRSS_FLUSH_INPUT_BUFFER FlushInputBufferRequest; + CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER ScrollConsoleScreenBufferRequest; + CSRSS_READ_CONSOLE_OUTPUT_CHAR ReadConsoleOutputCharRequest; + CSRSS_READ_CONSOLE_OUTPUT_ATTRIB ReadConsoleOutputAttribRequest; + CSRSS_GET_NUM_INPUT_EVENTS GetNumInputEventsRequest; + CSRSS_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest; + CSRSS_EXIT_REACTOS ExitReactosRequest; + CSRSS_SET_SHUTDOWN_PARAMETERS SetShutdownParametersRequest; + CSRSS_GET_SHUTDOWN_PARAMETERS GetShutdownParametersRequest; + CSRSS_PEEK_CONSOLE_INPUT PeekConsoleInputRequest; + CSRSS_READ_CONSOLE_OUTPUT ReadConsoleOutputRequest; + CSRSS_WRITE_CONSOLE_INPUT WriteConsoleInputRequest; + CSRSS_GET_INPUT_HANDLE GetInputHandleRequest; + CSRSS_GET_OUTPUT_HANDLE GetOutputHandleRequest; + CSRSS_CLOSE_HANDLE CloseHandleRequest; + CSRSS_VERIFY_HANDLE VerifyHandleRequest; + CSRSS_DUPLICATE_HANDLE DuplicateHandleRequest; + CSRSS_SETGET_CONSOLE_HW_STATE ConsoleHardwareStateRequest; + CSRSS_GET_CONSOLE_WINDOW GetConsoleWindowRequest; + CSRSS_CREATE_DESKTOP CreateDesktopRequest; + CSRSS_SHOW_DESKTOP ShowDesktopRequest; + CSRSS_HIDE_DESKTOP HideDesktopRequest; + CSRSS_SET_CONSOLE_ICON SetConsoleIconRequest; + CSRSS_SET_LOGON_NOTIFY_WINDOW SetLogonNotifyWindowRequest; + CSRSS_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest; [truncated at 1000 lines; 5109 more skipped]

19 years, 2 months

[hyperion] 16212: Partial merge from the ROX-U branch (various fixes for Visual C++ compilation, see logs for r16198 and r16208)

by hyperion＠svn.reactos.com

Partial merge from the ROX-U branch (various fixes for Visual C++ compilation, see logs for r16198 and r16208) Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/fs/name.c Modified: trunk/reactos/ntoskrnl/include/internal/arch/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/arch/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/arch/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/io/wmi.c Modified: trunk/reactos/ntoskrnl/ke/ipi.c Modified: trunk/reactos/ntoskrnl/ke/kqueue.c Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ke/profile.c Modified: trunk/reactos/ntoskrnl/ldr/loader.c Modified: trunk/reactos/ntoskrnl/ldr/resource.c Modified: trunk/reactos/ntoskrnl/ldr/rtl.c Modified: trunk/reactos/ntoskrnl/mm/iospace.c Modified: trunk/reactos/ntoskrnl/mm/process.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ob/handle.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/se/acl.c Modified: trunk/reactos/ntoskrnl/se/luid.c Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/w32api/include/ddk/batclass.h Modified: trunk/reactos/w32api/include/ddk/ntddk.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/ntpoapi.h Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/ntdef.h Modified: trunk/reactos/w32api/include/windef.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/ntoskrnl/cc/copy.c --- trunk/reactos/ntoskrnl/cc/copy.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/cc/copy.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -136,7 +136,7 @@ while (current2 != NULL && !current2->Valid && current_size < MAX_RW_LENGTH) { PVOID address = current2->BaseAddress; - for (i = 0; i < (Bcb->CacheSegmentSize / PAGE_SIZE); i++, address += PAGE_SIZE) + for (i = 0; i < (Bcb->CacheSegmentSize / PAGE_SIZE); i++, address = RVA(address, PAGE_SIZE)) { *MdlPages++ = MmGetPfnForProcess(NULL, address); } _____ Modified: trunk/reactos/ntoskrnl/cc/fs.c --- trunk/reactos/ntoskrnl/cc/fs.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/cc/fs.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -39,9 +39,8 @@ IN PVOID Context2 ) { - UNIMPLEMENTED; - LARGE_INTEGER i; + UNIMPLEMENTED; i.QuadPart = 0; return i; } @@ -69,9 +68,8 @@ OUT PLARGE_INTEGER OldestLsn OPTIONAL ) { - UNIMPLEMENTED; - LARGE_INTEGER i; + UNIMPLEMENTED; i.QuadPart = 0; return i; } _____ Modified: trunk/reactos/ntoskrnl/ex/evtpair.c --- trunk/reactos/ntoskrnl/ex/evtpair.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ex/evtpair.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -18,7 +18,7 @@ /* GLOBALS *******************************************************************/ -POBJECT_TYPE EXPORTED ExEventPairObjectType = NULL; +POBJECT_TYPE ExEventPairObjectType = NULL; static GENERIC_MAPPING ExEventPairMapping = { STANDARD_RIGHTS_READ, _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -496,7 +496,7 @@ KeCreateApplicationProcessorIdleThread(KeNumberProcessors); /* Allocate a stack for use when booting the processor */ - ProcessorStack = Ki386InitialStackArray[((int)KeNumberProcessors)] + MM_STACK_SIZE; + ProcessorStack = RVA(Ki386InitialStackArray[((int)KeNumberProcessors)], MM_STACK_SIZE); /* Tell HAL a new CPU is being started */ HalStartNextProcessor(0, (ULONG)ProcessorStack - 2*sizeof(FX_SAVE_AREA)); _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -835,6 +835,10 @@ /* Class 16 - Handle Information */ QSI_DEF(SystemHandleInformation) { + PEPROCESS pr, syspr; + int curSize, i = 0; + ULONG hCount = 0; + PSYSTEM_HANDLE_INFORMATION Shi = (PSYSTEM_HANDLE_INFORMATION) Buffer; @@ -848,10 +852,6 @@ DPRINT("SystemHandleInformation 1\n"); - PEPROCESS pr, syspr; - int curSize, i = 0; - ULONG hCount = 0; - /* First Calc Size from Count. */ syspr = PsGetNextProcess(NULL); pr = syspr; @@ -937,6 +937,7 @@ /* Class 18 - Information */ QSI_DEF(SystemPageFileInformation) { + UNICODE_STRING FileName; /* FIXME */ SYSTEM_PAGEFILE_INFORMATION *Spfi = (SYSTEM_PAGEFILE_INFORMATION *) Buffer; if (Size < sizeof (SYSTEM_PAGEFILE_INFORMATION)) @@ -945,7 +946,6 @@ return (STATUS_INFO_LENGTH_MISMATCH); } - UNICODE_STRING FileName; /* FIXME */ RtlInitUnicodeString(&FileName, NULL); /* FIXME */ /* FIXME */ _____ Modified: trunk/reactos/ntoskrnl/fs/name.c --- trunk/reactos/ntoskrnl/fs/name.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/fs/name.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -149,7 +149,7 @@ FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL /* 0x7f */ }; -PUCHAR EXPORTED FsRtlLegalAnsiCharacterArray = LegalAnsiCharacterArray; +PUCHAR FsRtlLegalAnsiCharacterArray = LegalAnsiCharacterArray; /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/include/internal/arch/ke.h --- trunk/reactos/ntoskrnl/include/internal/arch/ke.h 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/include/internal/arch/ke.h 2005-06-21 23:42:58 UTC (rev 16212) @@ -19,7 +19,7 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_KE_H #define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_KE_H -#ifdef i386 +#ifdef _M_IX86 #include "../i386/ke.h" #else #error "Unknown processor" _____ Modified: trunk/reactos/ntoskrnl/include/internal/arch/mm.h --- trunk/reactos/ntoskrnl/include/internal/arch/mm.h 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/include/internal/arch/mm.h 2005-06-21 23:42:58 UTC (rev 16212) @@ -19,7 +19,7 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_MM_H #define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_MM_H -#ifdef i386 +#ifdef _M_IX86 #include <internal/i386/mm.h> #else #error "Unknown processor" _____ Modified: trunk/reactos/ntoskrnl/include/internal/arch/ps.h --- trunk/reactos/ntoskrnl/include/internal/arch/ps.h 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/include/internal/arch/ps.h 2005-06-21 23:42:58 UTC (rev 16212) @@ -19,7 +19,7 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_PS_H #define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_PS_H -#ifdef i386 +#ifdef _M_IX86 #include <internal/i386/ps.h> #define KiArchContextSwitch KiSwapContext #define KiArchInitThreadWithContext Ke386InitThreadWithContext _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-06-21 23:42:58 UTC (rev 16212) @@ -189,8 +189,7 @@ typedef VOID -STDCALL -(*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine, +(STDCALL*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine, PVOID StartContext); VOID @@ -215,7 +214,7 @@ #define LOCK "lock ; " #else #define LOCK "" -#define KeGetCurrentIrql(X) (((PKPCR)KPCR_BASE)->Irql) +#define KeGetCurrentIrql() (((PKPCR)KPCR_BASE)->Irql) #endif #if defined(__GNUC__) _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-21 23:42:58 UTC (rev 16212) @@ -224,13 +224,13 @@ /* MACROS ************************************************************************ */ -#define KeEnterCriticalRegion(X) \ +#define KeEnterCriticalRegion() \ { \ PKTHREAD _Thread = KeGetCurrentThread(); \ if (_Thread) _Thread->KernelApcDisable--; \ } -#define KeLeaveCriticalRegion(X) \ +#define KeLeaveCriticalRegion() \ { \ PKTHREAD _Thread = KeGetCurrentThread(); \ if((_Thread) && (++_Thread->KernelApcDisable == 0)) \ @@ -354,8 +354,8 @@ VOID STDCALL DbgBreakPointNoBugCheck(VOID); +VOID STDCALL -VOID KeInitializeProfile(struct _KPROFILE* Profile, struct _KPROCESS* Process, PVOID ImageBase, @@ -364,21 +364,21 @@ KPROFILE_SOURCE ProfileSource, KAFFINITY Affinity); +VOID STDCALL -VOID KeStartProfile(struct _KPROFILE* Profile, PVOID Buffer); +VOID STDCALL -VOID KeStopProfile(struct _KPROFILE* Profile); +ULONG STDCALL -ULONG KeQueryIntervalProfile(KPROFILE_SOURCE ProfileSource); +VOID STDCALL -VOID KeSetIntervalProfile(KPROFILE_SOURCE ProfileSource, ULONG Interval); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-06-21 23:42:58 UTC (rev 16212) @@ -160,7 +160,7 @@ ULONG OwnsSessionWorkingSetShared:1; ULONG ApcNeeded:1; }; - ULONG SameThreadPassiveFlags; /* 248 */ + ULONG SameThreadApcFlags; /* 248 */ }; UCHAR ForwardClusterOnly; /* 24C */ UCHAR DisablePageFaultClustering; /* 24D */ _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -337,8 +337,8 @@ IopDisplayLoadingMessage(PVOID ServiceName, BOOLEAN Unicode) { + CHAR TextBuffer[256]; if (SetupMode) return; - CHAR TextBuffer[256]; if (Unicode) { sprintf(TextBuffer, "Loading %S...\n", (PWCHAR)ServiceName); _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -15,16 +15,16 @@ /* DATA ********************************************************************/ -POBJECT_TYPE EXPORTED IoDeviceObjectType = NULL; -POBJECT_TYPE EXPORTED IoFileObjectType = NULL; +POBJECT_TYPE IoDeviceObjectType = NULL; +POBJECT_TYPE IoFileObjectType = NULL; extern POBJECT_TYPE IoControllerObjectType; -ULONG EXPORTED IoReadOperationCount = 0; -LARGE_INTEGER EXPORTED IoReadTransferCount = {{0, 0}}; -ULONG EXPORTED IoWriteOperationCount = 0; -LARGE_INTEGER EXPORTED IoWriteTransferCount = {{0, 0}}; -ULONG IoOtherOperationCount = 0; -LARGE_INTEGER IoOtherTransferCount = {{0, 0}}; -KSPIN_LOCK EXPORTED IoStatisticsLock = 0; +ULONG IoReadOperationCount = 0; +LARGE_INTEGER IoReadTransferCount = {{0, 0}}; +ULONG IoWriteOperationCount = 0; +LARGE_INTEGER IoWriteTransferCount = {{0, 0}}; +ULONG IoOtherOperationCount = 0; +LARGE_INTEGER IoOtherTransferCount = {{0, 0}}; +KSPIN_LOCK IoStatisticsLock = 0; GENERIC_MAPPING IopFileMapping = { FILE_GENERIC_READ, _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -619,13 +619,6 @@ } /* Probe and Lock */ - _SEH_FILTER(FreeAndGoOn) - { - /* Free the IRP and its MDL */ - IoFreeMdl(Irp->MdlAddress); - IoFreeIrp(Irp); - return EXCEPTION_CONTINUE_SEARCH; - } _SEH_TRY { /* Do the probe */ _____ Modified: trunk/reactos/ntoskrnl/io/wmi.c --- trunk/reactos/ntoskrnl/io/wmi.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/io/wmi.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -19,8 +19,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIRegistrationControl( IN PDEVICE_OBJECT DeviceObject, IN ULONG Action @@ -33,8 +33,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIAllocateInstanceIds( IN GUID *Guid, IN ULONG InstanceCount, @@ -48,8 +48,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMISuggestInstanceName( IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, IN PUNICODE_STRING SymbolicLinkName OPTIONAL, @@ -64,8 +64,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIWriteEvent( IN PVOID WnodeEventItem ) @@ -77,8 +77,8 @@ /* * @unimplemented */ -STDCALL -NTSTATUS IoWMIOpenBlock( +NTSTATUS +STDCALL IoWMIOpenBlock( IN GUID *DataBlockGuid, IN ULONG DesiredAccess, OUT PVOID *DataBlockObject @@ -91,8 +91,8 @@ /* * @unimplemented */ -STDCALL -NTSTATUS IoWMIQueryAllData( +NTSTATUS +STDCALL IoWMIQueryAllData( IN PVOID DataBlockObject, IN OUT ULONG *InOutBufferSize, OUT PVOID OutBuffer @@ -105,8 +105,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIQueryAllDataMultiple( IN PVOID *DataBlockObjectList, IN ULONG ObjectCount, @@ -121,8 +121,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIQuerySingleInstance( IN PVOID DataBlockObject, IN PUNICODE_STRING InstanceName, @@ -137,8 +137,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIQuerySingleInstanceMultiple( IN PVOID *DataBlockObjectList, IN PUNICODE_STRING InstanceNames, @@ -154,8 +154,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMISetSingleInstance( IN PVOID DataBlockObject, IN PUNICODE_STRING InstanceName, @@ -171,8 +171,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMISetSingleItem( IN PVOID DataBlockObject, IN PUNICODE_STRING InstanceName, @@ -189,8 +189,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIExecuteMethod( IN PVOID DataBlockObject, IN PUNICODE_STRING InstanceName, @@ -207,8 +207,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMISetNotificationCallback( IN PVOID Object, IN WMI_NOTIFICATION_CALLBACK Callback, @@ -222,8 +222,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIHandleToInstanceName( IN PVOID DataBlockObject, IN HANDLE FileHandle, @@ -237,8 +237,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIDeviceObjectToInstanceName( IN PVOID DataBlockObject, IN PDEVICE_OBJECT DeviceObject, _____ Modified: trunk/reactos/ntoskrnl/ke/ipi.c --- trunk/reactos/ntoskrnl/ke/ipi.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ke/ipi.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -89,7 +89,7 @@ #endif } } - ((VOID STDCALL(*)(PVOID))(Prcb->SignalDone->WorkerRoutine))(Prcb->SignalDone->C urrentPacket[0]); + ((VOID (STDCALL*)(PVOID))(Prcb->SignalDone->WorkerRoutine))(Prcb->SignalDone->C urrentPacket[0]); Ke386TestAndClearBit(KeGetCurrentProcessorNumber(), &Prcb->SignalDone->TargetSet); if (InterlockedCompareExchangeUL(&Prcb->SignalDone->CurrentPacket[2], 0, 0)) { @@ -116,7 +116,7 @@ VOID STDCALL -KiIpiSendPacket(ULONG TargetSet, VOID STDCALL (*WorkerRoutine)(PVOID), PVOID Argument, ULONG Count, BOOLEAN Synchronize) +KiIpiSendPacket(ULONG TargetSet, VOID (STDCALL*WorkerRoutine)(PVOID), PVOID Argument, ULONG Count, BOOLEAN Synchronize) { ULONG i, Processor, CurrentProcessor; PKPRCB Prcb, CurrentPrcb; _____ Modified: trunk/reactos/ntoskrnl/ke/kqueue.c --- trunk/reactos/ntoskrnl/ke/kqueue.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ke/kqueue.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -245,8 +245,8 @@ /* * @unimplemented */ +PKDEVICE_QUEUE_ENTRY STDCALL -PKDEVICE_QUEUE_ENTRY KeRemoveByKeyDeviceQueueIfBusy(IN PKDEVICE_QUEUE DeviceQueue, IN ULONG SortKey) { _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -82,7 +82,9 @@ } VOID +#ifdef __GNUC__ __attribute((noinline)) +#endif KiSystemStartup(BOOLEAN BootProcessor) { DPRINT("KiSystemStartup(%d)\n", BootProcessor); _____ Modified: trunk/reactos/ntoskrnl/ke/profile.c --- trunk/reactos/ntoskrnl/ke/profile.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ke/profile.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -22,8 +22,8 @@ /* FUNCTIONS *****************************************************************/ +VOID STDCALL -VOID KeInitializeProfile(PKPROFILE Profile, PKPROCESS Process, PVOID ImageBase, @@ -40,14 +40,14 @@ Profile->Process = Process; Profile->RegionStart = ImageBase; Profile->BucketShift = BucketSize - 2; /* See ntinternals.net -- Alex */ - Profile->RegionEnd = (PVOID)(ULONG_PTR)ImageBase + ImageSize; + Profile->RegionEnd = (PVOID)((ULONG_PTR)ImageBase + ImageSize); Profile->Active = FALSE; Profile->Source = ProfileSource; Profile->Affinity = Affinity; } +VOID STDCALL -VOID KeStartProfile(PKPROFILE Profile, PVOID Buffer) { @@ -133,8 +133,8 @@ if (!FreeBuffer) ExFreePool(SourceBuffer); } +VOID STDCALL -VOID KeStopProfile(PKPROFILE Profile) { KIRQL OldIrql; @@ -178,8 +178,8 @@ if (CurrentSource) ExFreePool(CurrentSource); } +ULONG STDCALL -ULONG KeQueryIntervalProfile(KPROFILE_SOURCE ProfileSource) { /* Check if this is the timer profile */ @@ -200,8 +200,8 @@ } } +VOID STDCALL -VOID KeSetIntervalProfile(KPROFILE_SOURCE ProfileSource, ULONG Interval) { @@ -224,8 +224,8 @@ /* * @implemented */ +VOID STDCALL -VOID KeProfileInterrupt(PKTRAP_FRAME TrapFrame) { /* Called from HAL for Timer Profiling */ @@ -257,7 +257,7 @@ } /* Get the Pointer to the Bucket Value representing this EIP */ - BucketValue = (PULONG)(((ULONG_PTR)(Profile->Buffer + + BucketValue = (PULONG)((((ULONG_PTR)Profile->Buffer + (TrapFrame->Eip - (ULONG_PTR)Profile->RegionStart)) >> Profile->BucketShift) &~ 0x3); @@ -276,8 +276,8 @@ * from the trap frame into the buffer, while using buckets and * shifting like we specified. -- Alex */ +VOID STDCALL -VOID KeProfileInterruptWithSource(IN PKTRAP_FRAME TrapFrame, IN KPROFILE_SOURCE Source) { @@ -291,8 +291,8 @@ /* * @implemented */ +VOID STDCALL -VOID KeSetProfileIrql(IN KIRQL ProfileIrql) { /* Set the IRQL at which Profiling will run */ _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -910,7 +910,7 @@ Protect = PAGE_EXECUTE_READWRITE; } #endif - if (PageAddress < DriverBase + DriverSize) + if (PageAddress < RVA(DriverBase, DriverSize)) { MmSetPageProtect(NULL, PageAddress, Protect); } @@ -937,14 +937,14 @@ PageAddress = (PVOID)((ULONG_PTR)PageAddress + PAGE_SIZE); while ((ULONG_PTR)PageAddress + PAGE_SIZE < (ULONG_PTR)BaseAddress + Length) { - if (PageAddress < DriverBase + DriverSize) + if (PageAddress < RVA(DriverBase, DriverSize)) { MmSetPageProtect(NULL, PageAddress, Protect); } PageAddress = (PVOID)((ULONG_PTR)PageAddress + PAGE_SIZE); } if (PageAddress < (PVOID)((ULONG_PTR)BaseAddress + Length) && - PageAddress < DriverBase + DriverSize) + PageAddress < RVA(DriverBase, DriverSize)) { Protect = LdrLookupPageProtection(PageAddress, DriverBase, &PENtHeaders->FileHeader, PESectionHeaders); MmSetPageProtect(NULL, PageAddress, Protect); @@ -1214,20 +1214,20 @@ Delta = (ULONG_PTR)DriverBase - NtHeaders->OptionalHeader.ImageBase; RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)DriverBase + RelocationDDir->VirtualAddress); RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size); - MaxAddress = DriverBase + DriverSize; + MaxAddress = RVA(DriverBase, DriverSize); while (RelocationDir < RelocationEnd && RelocationDir->SizeOfBlock > 0) { Count = (RelocationDir->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof(USHORT); - Address = DriverBase + RelocationDir->VirtualAddress; + Address = RVA(DriverBase, RelocationDir->VirtualAddress); TypeOffset = (PUSHORT)(RelocationDir + 1); for (i = 0; i < Count; i++) { Offset = *TypeOffset & 0xFFF; Type = *TypeOffset >> 12; - ShortPtr = (PUSHORT)(Address + Offset); + ShortPtr = (PUSHORT)(RVA(Address, Offset)); /* Don't relocate after the end of the loaded driver */ if ((PVOID)ShortPtr >= MaxAddress) @@ -1276,6 +1276,9 @@ return STATUS_SUCCESS; } +#ifndef PATH_MAX +#define PATH_MAX 260 +#endif static NTSTATUS LdrPEGetOrLoadModule ( @@ -1552,16 +1555,16 @@ } /* Get the import address list. */ - ImportAddressList = (PVOID*)(DriverBase + (ULONG_PTR)ImportModuleDirectory->FirstThunk); + ImportAddressList = (PVOID*)RVA(DriverBase, ImportModuleDirectory->FirstThunk); /* Get the list of functions to import. */ if (ImportModuleDirectory->OriginalFirstThunk != 0) { - FunctionNameList = (PULONG) (DriverBase + (ULONG_PTR)ImportModuleDirectory->OriginalFirstThunk); + FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->OriginalFirstThunk); } else { - FunctionNameList = (PULONG)(DriverBase + (ULONG_PTR)ImportModuleDirectory->FirstThunk); + FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->FirstThunk); } /* Walk through function list and fixup addresses. */ _____ Modified: trunk/reactos/ntoskrnl/ldr/resource.c --- trunk/reactos/ntoskrnl/ldr/resource.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ldr/resource.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -195,8 +195,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS LdrFindResourceDirectory_U( IN PVOID BaseAddress, IN PLDR_RESOURCE_INFO ResourceInfo, @@ -211,8 +211,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS LdrEnumResources( IN PVOID BaseAddress, IN PLDR_RESOURCE_INFO ResourceInfo, _____ Modified: trunk/reactos/ntoskrnl/ldr/rtl.c --- trunk/reactos/ntoskrnl/ldr/rtl.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ldr/rtl.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -17,8 +17,6 @@ /* FUNCTIONS ****************************************************************/ -#define RVA(m, b) ((ULONG)b + m) - NTSTATUS STDCALL LdrGetProcedureAddress (IN PVOID BaseAddress, IN PANSI_STRING Name, _____ Modified: trunk/reactos/ntoskrnl/mm/iospace.c --- trunk/reactos/ntoskrnl/mm/iospace.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/mm/iospace.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -145,7 +145,7 @@ PVOID Address = BaseAddress; Offset = (ULONG_PTR)Address % PAGE_SIZE; - Address -= Offset; + Address = RVA(Address, - Offset); NumberOfBytes += Offset; MmLockAddressSpace(MmGetKernelAddressSpace()); _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/mm/process.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -28,8 +28,8 @@ PMADDRESS_SPACE ProcessAddressSpace = &Process->AddressSpace; PMEMORY_AREA MemoryArea; PHYSICAL_ADDRESS BoundaryAddressMultiple; + PVOID AllocatedBase = BaseAddress; BoundaryAddressMultiple.QuadPart = 0; - PVOID AllocatedBase = BaseAddress; /* Acquire the Lock */ MmLockAddressSpace(ProcessAddressSpace); @@ -54,7 +54,7 @@ TRUE, FALSE, BoundaryAddressMultiple); - AllocatedBase = AllocatedBase - PAGE_SIZE; + AllocatedBase = RVA(AllocatedBase, -PAGE_SIZE); } while (Status != STATUS_SUCCESS); /* Initialize the Region */ @@ -69,7 +69,7 @@ /* Unlock Address Space */ DPRINT("Returning\n"); MmUnlockAddressSpace(ProcessAddressSpace); - return AllocatedBase + PAGE_SIZE; + return RVA(AllocatedBase, PAGE_SIZE); } VOID @@ -345,9 +345,9 @@ PVOID BaseAddress; PMEMORY_AREA MemoryArea; PHYSICAL_ADDRESS BoundaryAddressMultiple; - BoundaryAddressMultiple.QuadPart = 0; ULONG ViewSize = 0; PVOID ImageBase = 0; + BoundaryAddressMultiple.QuadPart = 0; /* Initialize the Addresss Space */ MmInitializeAddressSpace(Process, ProcessAddressSpace); _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -1952,7 +1952,7 @@ if (Section->AllocationAttributes & SEC_IMAGE) { Segment = MemoryArea->Data.SectionData.Segment; - Info->AllocationBase = MemoryArea->StartingAddress - Segment->VirtualAddress; + Info->AllocationBase = (PBYTE)MemoryArea->StartingAddress - Segment->VirtualAddress; Info->Type = MEM_IMAGE; } else _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -60,8 +60,8 @@ ObpDecrementHandleCount(PVOID ObjectBody) { POBJECT_HEADER ObjectHeader = BODY_TO_HEADER(ObjectBody); + LONG NewHandleCount = InterlockedDecrement(&ObjectHeader->HandleCount); DPRINT("Header: %x\n", ObjectHeader); - LONG NewHandleCount = InterlockedDecrement(&ObjectHeader->HandleCount); DPRINT("NewHandleCount: %x\n", NewHandleCount); DPRINT("HEADER_TO_OBJECT_NAME: %x\n", HEADER_TO_OBJECT_NAME(ObjectHeader)); @@ -1008,15 +1008,15 @@ if (FoundHeader && FoundHeader->Type == ObDirectoryType && RemainingPath.Buffer) { - ObpAddEntryDirectory(FoundObject, Header, NULL); - ObjectAttached = TRUE; - /* The name was changed so let's update it */ /* FIXME: TEMPORARY HACK This will go in ObFindObject in the next commit */ PVOID NewName; PWSTR BufferPos = RemainingPath.Buffer; ULONG Delta = 0; + ObpAddEntryDirectory(FoundObject, Header, NULL); + ObjectAttached = TRUE; + ObjectNameInfo = HEADER_TO_OBJECT_NAME(Header); if (BufferPos[0] == L'\\') _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -24,8 +24,8 @@ /* FUNCTIONS *****************************************************************/ +VOID STDCALL -VOID PspReapRoutine(PVOID Context) { KIRQL OldIrql; _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -173,8 +173,7 @@ ProcessObject, sizeof(EPROCESS), FALSE); - PsIdleProcess->Pcb.DirectoryTableBase = - (LARGE_INTEGER)(LONGLONG)(ULONG)MmGetPageDirectory(); + PsIdleProcess->Pcb.DirectoryTableBase.QuadPart = (ULONG_PTR)MmGetPageDirectory(); strcpy(PsIdleProcess->ImageFileName, "Idle"); /* @@ -234,6 +233,7 @@ InitializeListHead(&PsInitialSystemProcess->ThreadListHead); #ifndef SCHED_REWRITE + { PTOKEN BootToken; /* No parent, this is the Initial System Process. Assign Boot Token */ @@ -241,6 +241,7 @@ BootToken->TokenInUse = TRUE; PsInitialSystemProcess->Token.Object = BootToken; /* FIXME */ ObReferenceObject(BootToken); + } #endif } _____ Modified: trunk/reactos/ntoskrnl/se/acl.c --- trunk/reactos/ntoskrnl/se/acl.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/se/acl.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -15,8 +15,8 @@ /* GLOBALS ******************************************************************/ -PACL EXPORTED SePublicDefaultDacl = NULL; -PACL EXPORTED SeSystemDefaultDacl = NULL; +PACL SePublicDefaultDacl = NULL; +PACL SeSystemDefaultDacl = NULL; PACL SePublicDefaultUnrestrictedDacl = NULL; PACL SePublicOpenDacl = NULL; _____ Modified: trunk/reactos/ntoskrnl/se/luid.c --- trunk/reactos/ntoskrnl/se/luid.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/se/luid.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -39,7 +39,7 @@ /* atomically increment the luid */ do { - PrevLuid = (volatile LARGE_INTEGER)LuidValue; + PrevLuid = LuidValue; NewLuid = RtlLargeIntegerAdd(PrevLuid, LuidIncrement); } while(ExfInterlockedCompareExchange64(&LuidValue.QuadPart, _____ Modified: trunk/reactos/ntoskrnl/se/semgr.c --- trunk/reactos/ntoskrnl/se/semgr.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/se/semgr.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -16,7 +16,7 @@ /* GLOBALS ******************************************************************/ -PSE_EXPORTS EXPORTED SeExports = NULL; +PSE_EXPORTS SeExports = NULL; SE_EXPORTS SepExports; static ERESOURCE SepSubjectContextLock; _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/ntoskrnl/se/token.c 2005-06-21 23:42:58 UTC (rev 16212) @@ -1820,18 +1820,20 @@ NTSTATUS Status; ULONG uSize; ULONG i; + ULONG uLocalSystemLength; + ULONG uWorldLength; + ULONG uAuthUserLength; + ULONG uAdminsLength; + PTOKEN AccessToken; + PVOID SidArea; PAGED_CODE(); - ULONG uLocalSystemLength = RtlLengthSid(SeLocalSystemSid); - ULONG uWorldLength = RtlLengthSid(SeWorldSid); - ULONG uAuthUserLength = RtlLengthSid(SeAuthenticatedUserSid); - ULONG uAdminsLength = RtlLengthSid(SeAliasAdminsSid); + uLocalSystemLength = RtlLengthSid(SeLocalSystemSid); + uWorldLength = RtlLengthSid(SeWorldSid); + uAuthUserLength = RtlLengthSid(SeAuthenticatedUserSid); + uAdminsLength = RtlLengthSid(SeAliasAdminsSid); - PTOKEN AccessToken; - - PVOID SidArea; - /* * Initialize the token */ _____ Modified: trunk/reactos/w32api/include/ddk/batclass.h --- trunk/reactos/w32api/include/ddk/batclass.h 2005-06-21 22:07:44 UTC (rev 16211) +++ trunk/reactos/w32api/include/ddk/batclass.h 2005-06-21 23:42:58 UTC (rev 16212) @@ -183,12 +183,12 @@ CTL_CODE(FILE_DEVICE_BATTERY, 0x13, METHOD_BUFFERED, FILE_READ_ACCESS) -typedef NTSTATUS DDKAPI -(*BCLASS_DISABLE_STATUS_NOTIFY)( +typedef NTSTATUS +(DDKAPI*BCLASS_DISABLE_STATUS_NOTIFY)( IN PVOID Context); -typedef NTSTATUS DDKAPI -(*BCLASS_QUERY_INFORMATION)( +typedef NTSTATUS +(DDKAPI*BCLASS_QUERY_INFORMATION)( IN PVOID Context, IN ULONG BatteryTag, IN BATTERY_QUERY_INFORMATION_LEVEL Level, @@ -197,26 +197,26 @@ IN ULONG BufferLength, OUT PULONG ReturnedLength); -typedef NTSTATUS DDKAPI -(*BCLASS_QUERY_STATUS)( +typedef NTSTATUS +(DDKAPI*BCLASS_QUERY_STATUS)( IN PVOID Context, IN ULONG BatteryTag, OUT PBATTERY_STATUS BatteryStatus); -typedef NTSTATUS DDKAPI -(*BCLASS_QUERY_TAG)( +typedef NTSTATUS +(DDKAPI*BCLASS_QUERY_TAG)( IN PVOID Context, OUT PULONG BatteryTag); [truncated at 1000 lines; 333 more skipped]

19 years, 3 months

[greatlrd] 16211: add error code for file not found it was missing on one place

by greatlrd＠svn.reactos.com

add error code for file not found it was missing on one place Modified: trunk/reactos/subsys/system/cmd/error.c _____ Modified: trunk/reactos/subsys/system/cmd/error.c --- trunk/reactos/subsys/system/cmd/error.c 2005-06-21 21:35:07 UTC (rev 16210) +++ trunk/reactos/subsys/system/cmd/error.c 2005-06-21 22:07:44 UTC (rev 16211) @@ -136,6 +136,7 @@ LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(_T("%s - %s\n"), szMsg, f); + nErrorLevel = 1; }

19 years, 3 months

[hpoussin] 16210: Silent debug messages

by hpoussin＠svn.reactos.com

Silent debug messages Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c Modified: trunk/reactos/drivers/storage/floppy/floppy.c Modified: trunk/reactos/drivers/storage/floppy/floppy.h Modified: trunk/reactos/drivers/storage/floppy/hardware.c Modified: trunk/reactos/drivers/storage/floppy/ioctl.c Modified: trunk/reactos/drivers/storage/floppy/readwrite.c _____ Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c --- trunk/reactos/drivers/storage/floppy/csqrtns.c 2005-06-21 19:17:49 UTC (rev 16209) +++ trunk/reactos/drivers/storage/floppy/csqrtns.c 2005-06-21 21:35:07 UTC (rev 16210) @@ -38,6 +38,8 @@ * that my lock choice is a spin lock. */ +#define NDEBUG +#include <debug.h> #include <ntddk.h> #include "floppy.h" @@ -68,7 +70,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - KdPrint(("CSQ: Removing IRP 0x%x\n", Irp)); + DPRINT(("CSQ: Removing IRP 0x%x\n", Irp)); RemoveEntryList(&Irp->Tail.Overlay.ListEntry); } @@ -91,7 +93,7 @@ { UNREFERENCED_PARAMETER(UnusedCsq); UNREFERENCED_PARAMETER(PeekContext); - KdPrint(("CSQ: Peeking for next IRP\n")); + DPRINT(("CSQ: Peeking for next IRP\n")); if(Irp) return CONTAINING_RECORD(&Irp->Tail.Overlay.ListEntry.Flink, IRP, Tail.Overlay.ListEntry); @@ -113,7 +115,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - KdPrint(("CSQ: Acquiring spin lock\n")); + DPRINT(("CSQ: Acquiring spin lock\n")); KeAcquireSpinLock(&IrpQueueLock, Irql); } @@ -128,7 +130,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - KdPrint(("CSQ: Releasing spin lock\n")); + DPRINT(("CSQ: Releasing spin lock\n")); KeReleaseSpinLock(&IrpQueueLock, Irql); } @@ -146,7 +148,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - KdPrint(("CSQ: Canceling irp 0x%x\n", Irp)); + DPRINT(("CSQ: Canceling irp 0x%x\n", Irp)); Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -171,7 +173,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - KdPrint(("CSQ: Inserting IRP 0x%x\n", Irp)); + DPRINT(("CSQ: Inserting IRP 0x%x\n", Irp)); InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); KeReleaseSemaphore(&QueueSemaphore, 0, 1, FALSE); } _____ Modified: trunk/reactos/drivers/storage/floppy/floppy.c --- trunk/reactos/drivers/storage/floppy/floppy.c 2005-06-21 19:17:49 UTC (rev 16209) +++ trunk/reactos/drivers/storage/floppy/floppy.c 2005-06-21 21:35:07 UTC (rev 16210) @@ -40,6 +40,8 @@ * TODO: Media detection based on sector 1 */ +#define NDEBUG +#include <debug.h> #include <ntddk.h> #include "floppy.h" @@ -86,7 +88,7 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(ControllerInfo); - KdPrint(("floppy: MotorStopDpcFunc called\n")); + DPRINT(("floppy: MotorStopDpcFunc called\n")); HwTurnOffMotor(ControllerInfo); ControllerInfo->StopDpcQueued = FALSE; @@ -113,20 +115,22 @@ PAGED_CODE(); ASSERT(DriveInfo); - KdPrint(("floppy: StartMotor called\n")); + DPRINT(("floppy: StartMotor called\n")); if(DriveInfo->ControllerInfo->StopDpcQueued && !KeCancelTimer(&DriveInfo->ControllerInfo->MotorTimer)) { /* Motor turner-offer is already running; wait for it to finish */ - KdPrint(("floppy: StartMotor: motor turner-offer is already running; waiting for it\n")); + DPRINT(("floppy: StartMotor: motor turner-offer is already running; waiting for it\n")); KeWaitForSingleObject(&DriveInfo->ControllerInfo->MotorStoppedEvent, Executive, KernelMode, FALSE, NULL); - KdPrint(("floppy: StartMotor: wait satisfied\n")); + DPRINT(("floppy: StartMotor: wait satisfied\n")); } DriveInfo->ControllerInfo->StopDpcQueued = FALSE; if(HwTurnOnMotor(DriveInfo) != STATUS_SUCCESS) - KdPrint(("floppy: StartMotor(): warning: HwTurnOnMotor failed\n")); + { + DPRINT(("floppy: StartMotor(): warning: HwTurnOnMotor failed\n")); + } } @@ -145,7 +149,7 @@ ASSERT(ControllerInfo); - KdPrint(("floppy: StopMotor called\n")); + DPRINT(("floppy: StopMotor called\n")); /* one relative second, in 100-ns units */ StopTime.QuadPart = 10000000; @@ -198,7 +202,7 @@ { UNREFERENCED_PARAMETER(DeviceObject); - KdPrint(("floppy: CreateClose called\n")); + DPRINT(("floppy: CreateClose called\n")); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = FILE_OPENED; @@ -233,10 +237,10 @@ StartMotor(DriveInfo); /* set the data rate */ - KdPrint(("floppy: FIXME: UN-HARDCODE DATA RATE\n")); + DPRINT(("floppy: FIXME: UN-HARDCODE DATA RATE\n")); if(HwSetDataRate(DriveInfo->ControllerInfo, 0) != STATUS_SUCCESS) { - KdPrint(("floppy: Recalibrate: HwSetDataRate failed\n")); + DPRINT(("floppy: Recalibrate: HwSetDataRate failed\n")); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -254,7 +258,7 @@ Status = HwRecalibrate(DriveInfo); if(Status != STATUS_SUCCESS) { - KdPrint(("floppy: Recalibrate: HwRecalibrate returned error\n")); + DPRINT(("floppy: Recalibrate: HwRecalibrate returned error\n")); continue; } @@ -264,7 +268,7 @@ Status = HwRecalibrateResult(DriveInfo->ControllerInfo); if(Status != STATUS_SUCCESS) { - KdPrint(("floppy: Recalibrate: HwRecalibrateResult returned error\n")); + DPRINT(("floppy: Recalibrate: HwRecalibrateResult returned error\n")); break; } } @@ -299,7 +303,7 @@ PAGED_CODE(); ASSERT(DriveInfo); - KdPrint(("floppy: ResetChangeFlag called\n")); + DPRINT(("floppy: ResetChangeFlag called\n")); /* Try to recalibrate. We don't care if it works. */ Recalibrate(DriveInfo); @@ -313,7 +317,7 @@ /* Seek to 1 */ if(HwSeek(DriveInfo, 1) != STATUS_SUCCESS) { - KdPrint(("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n")); + DPRINT(("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n")); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -322,7 +326,7 @@ if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { - KdPrint(("floppy: ResetChangeFlag(): HwSenseInterruptStatus failed; bailing out\n")); + DPRINT(("floppy: ResetChangeFlag(): HwSenseInterruptStatus failed; bailing out\n")); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -330,7 +334,7 @@ /* Seek back to 0 */ if(HwSeek(DriveInfo, 0) != STATUS_SUCCESS) { - KdPrint(("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n")); + DPRINT(("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n")); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -339,7 +343,7 @@ if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { - KdPrint(("floppy: ResetChangeFlag(): HwSenseInterruptStatus #2 failed; bailing\n")); + DPRINT(("floppy: ResetChangeFlag(): HwSenseInterruptStatus #2 failed; bailing\n")); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -347,7 +351,7 @@ /* Check the change bit */ if(HwDiskChanged(DriveInfo, &DiskChanged) != STATUS_SUCCESS) { - KdPrint(("floppy: ResetChangeFlag(): HwDiskChagned failed; returning STATUS_IO_DEVICE_ERROR\n")); + DPRINT(("floppy: ResetChangeFlag(): HwDiskChagned failed; returning STATUS_IO_DEVICE_ERROR\n")); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -375,7 +379,7 @@ PAGED_CODE(); UNREFERENCED_PARAMETER(DriverObject); - KdPrint(("floppy: unloading\n")); + DPRINT(("floppy: unloading\n")); KeSetEvent(&QueueThreadTerminate, 0, FALSE); KeWaitForSingleObject(QueueThreadObject, Executive, KernelMode, FALSE, 0); @@ -409,7 +413,9 @@ /* Power down the controller */ if(HwPowerOff(&gControllerInfo[i]) != STATUS_SUCCESS) - KdPrint(("floppy: unload: warning: HwPowerOff failed\n")); + { + DPRINT(("floppy: unload: warning: HwPowerOff failed\n")); + } } } @@ -477,7 +483,7 @@ UNREFERENCED_PARAMETER(PathName); - KdPrint(("floppy: ConfigCallback called with ControllerNumber %d\n", ControllerNumber)); + DPRINT(("floppy: ConfigCallback called with ControllerNumber %d\n", ControllerNumber)); gControllerInfo[gNumberOfControllers].ControllerNumber = ControllerNumber; gControllerInfo[gNumberOfControllers].InterfaceType = BusType; @@ -508,7 +514,7 @@ if(!HalTranslateBusAddress(BusType, BusNumber, PartialDescriptor->u.Port.Start, &AddressSpace, &TranslatedAddress)) { - KdPrint(("floppy: HalTranslateBusAddress failed; returning\n")); + DPRINT(("floppy: HalTranslateBusAddress failed; returning\n")); return STATUS_IO_DEVICE_ERROR; } @@ -600,7 +606,7 @@ ASSERT(ControllerInfo); - KdPrint(("floppy: ISR called\n")); + DPRINT(("floppy: ISR called\n")); /* * Due to the stupidity of the drive/controller relationship on the floppy drive, only one device object @@ -644,7 +650,7 @@ ASSERT(ControllerInfo); - KdPrint(("floppy: DpcForIsr called\n")); + DPRINT(("floppy: DpcForIsr called\n")); KeSetEvent(&ControllerInfo->SynchEvent, EVENT_INCREMENT, FALSE); } @@ -668,29 +674,29 @@ PAGED_CODE(); ASSERT(ControllerInfo); - KdPrint(("floppy: InitController called with Controller 0x%x\n", ControllerInfo)); + DPRINT(("floppy: InitController called with Controller 0x%x\n", ControllerInfo)); KeClearEvent(&ControllerInfo->SynchEvent); - KdPrint(("floppy: InitController: resetting the controller\n")); + DPRINT(("floppy: InitController: resetting the controller\n")); /* Reset the controller */ if(HwReset(ControllerInfo) != STATUS_SUCCESS) { - KdPrint(("floppy: InitController: unable to reset controller\n")); + DPRINT(("floppy: InitController: unable to reset controller\n")); return STATUS_IO_DEVICE_ERROR; } - KdPrint(("floppy: InitController: setting data rate\n")); + DPRINT(("floppy: InitController: setting data rate\n")); /* Set data rate */ if(HwSetDataRate(ControllerInfo, DRSR_DSEL_500KBPS) != STATUS_SUCCESS) { - KdPrint(("floppy: InitController: unable to set data rate\n")); + DPRINT(("floppy: InitController: unable to set data rate\n")); return STATUS_IO_DEVICE_ERROR; } - KdPrint(("floppy: InitController: waiting for initial interrupt\n")); + DPRINT(("floppy: InitController: waiting for initial interrupt\n")); /* Wait for an interrupt */ WaitForControllerInterrupt(ControllerInfo); @@ -698,16 +704,16 @@ /* Reset means you have to clear each of the four interrupts (one per drive) */ for(i = 0; i < MAX_DRIVES_PER_CONTROLLER; i++) { - KdPrint(("floppy: InitController: Sensing interrupt %d\n", i)); + DPRINT(("floppy: InitController: Sensing interrupt %d\n", i)); if(HwSenseInterruptStatus(ControllerInfo) != STATUS_SUCCESS) { - KdPrint(("floppy: InitController: Unable to clear interrupt 0x%x\n", i)); + DPRINT(("floppy: InitController: Unable to clear interrupt 0x%x\n", i)); return STATUS_IO_DEVICE_ERROR; } } - KdPrint(("floppy: InitController: done sensing interrupts\n")); + DPRINT(("floppy: InitController: done sensing interrupts\n")); /* Next, see if we have the right version to do implied seek */ if(HwGetVersion(ControllerInfo) == VERSION_ENHANCED) @@ -715,12 +721,12 @@ /* If so, set that up -- all defaults below except first TRUE for EIS */ if(HwConfigure(ControllerInfo, TRUE, TRUE, FALSE, 0, 0) != STATUS_SUCCESS) { - KdPrint(("floppy: InitController: unable to set up implied seek\n")); + DPRINT(("floppy: InitController: unable to set up implied seek\n")); ControllerInfo->ImpliedSeeks = FALSE; } else { - KdPrint(("floppy: InitController: implied seeks set!\n")); + DPRINT(("floppy: InitController: implied seeks set!\n")); ControllerInfo->ImpliedSeeks = TRUE; } @@ -747,23 +753,23 @@ } else { - KdPrint(("floppy: InitController: enhanced version not supported; disabling implied seeks\n")); + DPRINT(("floppy: InitController: enhanced version not supported; disabling implied seeks\n")); ControllerInfo->ImpliedSeeks = FALSE; ControllerInfo->Model30 = FALSE; } /* Specify */ - KdPrint(("FLOPPY: FIXME: Figure out speed\n")); + DPRINT(("FLOPPY: FIXME: Figure out speed\n")); HeadLoadTime = SPECIFY_HLT_500K; HeadUnloadTime = SPECIFY_HUT_500K; StepRateTime = SPECIFY_SRT_500K; - KdPrint(("floppy: InitController: issuing specify command to controller\n")); + DPRINT(("floppy: InitController: issuing specify command to controller\n")); /* Don't disable DMA --> enable dma (dumb & confusing) */ if(HwSpecify(ControllerInfo, HeadLoadTime, HeadUnloadTime, StepRateTime, FALSE) != STATUS_SUCCESS) { - KdPrint(("floppy: InitController: unable to specify options\n")); + DPRINT(("floppy: InitController: unable to specify options\n")); return STATUS_IO_DEVICE_ERROR; } @@ -779,11 +785,11 @@ */ for(i = 0; i < ControllerInfo->NumberOfDrives; i++) { - KdPrint(("floppy: InitController: recalibrating drive 0x%x on controller 0x%x\n", i, ControllerInfo)); + DPRINT(("floppy: InitController: recalibrating drive 0x%x on controller 0x%x\n", i, ControllerInfo)); Recalibrate(&ControllerInfo->DriveInfo[i]); } - KdPrint(("floppy: InitController: done initializing; returning STATUS_SUCCESS\n")); + DPRINT(("floppy: InitController: done initializing; returning STATUS_SUCCESS\n")); return STATUS_SUCCESS; } @@ -825,7 +831,7 @@ */ if(!gControllerInfo[0].Populated) { - KdPrint(("floppy: AddControllers: failed to get controller info from registry\n")); + DPRINT(("floppy: AddControllers: failed to get controller info from registry\n")); return FALSE; } @@ -843,7 +849,7 @@ /* Must set up the DPC before we connect the interrupt */ KeInitializeDpc(&gControllerInfo[i].Dpc, DpcForIsr, &gControllerInfo[i]); - KdPrint(("floppy: Connecting interrupt %d to controller%d (object 0x%x)\n", gControllerInfo[i].MappedVector, + DPRINT(("floppy: Connecting interrupt %d to controller%d (object 0x%x)\n", gControllerInfo[i].MappedVector, i, &gControllerInfo[i])); /* NOTE: We cannot share our interrupt, even on level-triggered buses. See Isr() for details. */ @@ -851,7 +857,7 @@ gControllerInfo[i].MappedLevel, gControllerInfo[i].MappedLevel, gControllerInfo[i].InterruptMode, FALSE, Affinity, 0) != STATUS_SUCCESS) { - KdPrint(("floppy: AddControllers: unable to connect interrupt\n")); + DPRINT(("floppy: AddControllers: unable to connect interrupt\n")); continue; } @@ -870,7 +876,7 @@ if(!gControllerInfo[i].AdapterObject) { - KdPrint(("floppy: AddControllers: unable to allocate an adapter object\n")); + DPRINT(("floppy: AddControllers: unable to allocate an adapter object\n")); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); continue; } @@ -878,7 +884,7 @@ /* 2b: Initialize the new controller */ if(InitController(&gControllerInfo[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: AddControllers():Unable to set up controller %d - initialization failed\n", i)); + DPRINT(("floppy: AddControllers():Unable to set up controller %d - initialization failed\n", i)); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); continue; } @@ -895,7 +901,7 @@ UNICODE_STRING ArcPath; UCHAR DriveNumber; - KdPrint(("floppy: AddControllers(): Configuring drive %d on controller %d\n", i, j)); + DPRINT(("floppy: AddControllers(): Configuring drive %d on controller %d\n", i, j)); /* * 3a: create a device object for the drive @@ -919,12 +925,12 @@ FILE_DEVICE_DISK, FILE_REMOVABLE_MEDIA | FILE_FLOPPY_DISKETTE, FALSE, &gControllerInfo[i].DriveInfo[j].DeviceObject) != STATUS_SUCCESS) { - KdPrint(("floppy: AddControllers: unable to register a Device object\n")); + DPRINT(("floppy: AddControllers: unable to register a Device object\n")); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); continue; /* continue on to next drive */ } - KdPrint(("floppy: AddControllers: New device: %S (0x%x)\n", DeviceNameBuf, gControllerInfo[i].DriveInfo[j].DeviceObject)); + DPRINT(("floppy: AddControllers: New device: %S (0x%x)\n", DeviceNameBuf, gControllerInfo[i].DriveInfo[j].DeviceObject)); /* 3b.5: Create an ARC path in case we're booting from this drive */ swprintf(gControllerInfo[i].DriveInfo[j].ArcPathBuffer, @@ -941,7 +947,7 @@ RtlInitUnicodeString(&LinkName, gControllerInfo[i].DriveInfo[j].SymLinkBuffer); if(IoCreateSymbolicLink(&LinkName, &DeviceName) != STATUS_SUCCESS) { - KdPrint(("floppy: AddControllers: Unable to create a symlink for drive %d\n", DriveNumber)); + DPRINT(("floppy: AddControllers: Unable to create a symlink for drive %d\n", DriveNumber)); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); IoDeassignArcName(&ArcPath); continue; /* continue to next drive */ @@ -964,7 +970,7 @@ } } - KdPrint(("floppy: AddControllers: --------------------------------------------> finished adding controllers\n")); + DPRINT(("floppy: AddControllers: --------------------------------------------> finished adding controllers\n")); return TRUE; } @@ -985,7 +991,7 @@ { PDRIVE_INFO DriveInfo = DeviceObject->DeviceExtension; - KdPrint(("floppy: SignalMediaChanged called\n")); + DPRINT(("floppy: SignalMediaChanged called\n")); DriveInfo->DiskChangeCount++; @@ -1038,18 +1044,18 @@ if(KeReadStateEvent(&QueueThreadTerminate)) { - KdPrint(("floppy: QueueThread terminating\n")); + DPRINT(("floppy: QueueThread terminating\n")); return; } - KdPrint(("floppy: QueueThread: servicing an IRP\n")); + DPRINT(("floppy: QueueThread: servicing an IRP\n")); Irp = IoCsqRemoveNextIrp(&Csq, 0); /* we won't get an irp if it was canceled */ if(!Irp) { - KdPrint(("floppy: QueueThread: IRP queue empty\n")); + DPRINT(("floppy: QueueThread: IRP queue empty\n")); continue; } @@ -1072,7 +1078,7 @@ break; default: - KdPrint(("floppy: QueueThread(): Unrecognized irp: mj: 0x%x\n", Stack->MajorFunction)); + DPRINT(("floppy: QueueThread(): Unrecognized irp: mj: 0x%x\n", Stack->MajorFunction)); Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -1149,13 +1155,13 @@ */ if(PsCreateSystemThread(&ThreadHandle, 0, 0, 0, 0, QueueThread, 0) != STATUS_SUCCESS) { - KdPrint(("floppy: Unable to create system thread; failing init\n")); + DPRINT(("floppy: Unable to create system thread; failing init\n")); return STATUS_INSUFFICIENT_RESOURCES; } if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, NULL, KernelMode, &QueueThreadObject, NULL) != STATUS_SUCCESS) { - KdPrint(("floppy: Unable to reference returned thread handle; failing init\n")); + DPRINT(("floppy: Unable to reference returned thread handle; failing init\n")); return STATUS_UNSUCCESSFUL; } _____ Modified: trunk/reactos/drivers/storage/floppy/floppy.h --- trunk/reactos/drivers/storage/floppy/floppy.h 2005-06-21 19:17:49 UTC (rev 16209) +++ trunk/reactos/drivers/storage/floppy/floppy.h 2005-06-21 21:35:07 UTC (rev 16210) @@ -35,32 +35,6 @@ /* need ioctls in ddk build mode */ #include <ntdddisk.h> -/* missing from ros headers */ -/* TODO: fix this right */ -#ifndef KdPrint -#if 0 -#define KdPrint(x) DbgPrint x -#else -#define KdPrint(x) -#endif -#endif - -#ifndef ASSERT -#define ASSERT(x) { if(!(x)) __asm__("int $3\n"); } -#endif - -#ifndef assert -#define assert(x) ASSERT(x) -#endif - -#ifndef PAGED_CODE -#define PAGED_CODE() {ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL);} -#endif - -#ifndef UNREFERENCED_PARAMETER -#define UNREFERENCED_PARAMETER(x) { (x) = (x); } -#endif - struct _CONTROLLER_INFO; typedef struct _DRIVE_INFO _____ Modified: trunk/reactos/drivers/storage/floppy/hardware.c --- trunk/reactos/drivers/storage/floppy/hardware.c 2005-06-21 19:17:49 UTC (rev 16209) +++ trunk/reactos/drivers/storage/floppy/hardware.c 2005-06-21 21:35:07 UTC (rev 16210) @@ -48,6 +48,8 @@ * TODO: Figure out the right delays in Send_Byte and Get_Byte */ +#define NDEBUG +#include <debug.h> #include <ntddk.h> #include "floppy.h" @@ -181,7 +183,7 @@ return STATUS_SUCCESS; } - KdPrint(("floppy: Send_Byte: timed out trying to write\n")); + DPRINT(("floppy: Send_Byte: timed out trying to write\n")); HwDumpRegisters(ControllerInfo); return STATUS_UNSUCCESSFUL; } @@ -250,7 +252,7 @@ return STATUS_SUCCESS; } - KdPrint(("floppy: Get_Byte: timed out trying to read\n")); + DPRINT(("floppy: Get_Byte: timed out trying to read\n")); HwDumpRegisters(ControllerInfo); return STATUS_UNSUCCESSFUL; } @@ -267,7 +269,7 @@ * STATUS_SUCCESS */ { - KdPrint(("floppy: HwSetDataRate called; writing rate code 0x%x to offset 0x%x\n", DataRate, DATA_RATE_SELECT_REGISTER)); + DPRINT(("floppy: HwSetDataRate called; writing rate code 0x%x to offset 0x%x\n", DataRate, DATA_RATE_SELECT_REGISTER)); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DataRate); @@ -288,7 +290,7 @@ * - Called at DISPATCH_LEVEL */ { - KdPrint(("floppy: HwTurnOffMotor: writing byte 0x%x to offset 0x%x\n", DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE, DIGITAL_OUTPUT_REGISTER)); + DPRINT(("floppy: HwTurnOffMotor: writing byte 0x%x to offset 0x%x\n", DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE, DIGITAL_OUTPUT_REGISTER)); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE); @@ -330,7 +332,7 @@ else if (Unit == 3) Buffer |= DOR_FLOPPY_MOTOR_ON_D; - KdPrint(("floppy: HwTurnOnMotor: writing byte 0x%x to offset 0x%x\n", Buffer, DIGITAL_OUTPUT_REGISTER)); + DPRINT(("floppy: HwTurnOnMotor: writing byte 0x%x to offset 0x%x\n", Buffer, DIGITAL_OUTPUT_REGISTER)); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, Buffer); return STATUS_SUCCESS; @@ -355,7 +357,7 @@ PAGED_CODE(); - KdPrint(("floppy: HwSenseDriveStatus called\n")); + DPRINT(("floppy: HwSenseDriveStatus called\n")); Buffer[0] = COMMAND_SENSE_DRIVE_STATUS; Buffer[1] = DriveInfo->UnitNumber; /* hard-wired to head 0 for now */ @@ -363,7 +365,7 @@ for(i = 0; i < 2; i++) if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: HwSenseDriveStatus: failed to write FIFO\n")); + DPRINT(("floppy: HwSenseDriveStatus: failed to write FIFO\n")); return STATUS_UNSUCCESSFUL; } @@ -429,11 +431,11 @@ /* Send the command */ for(i = 0; i < 9; i++) { - KdPrint(("floppy: HwReadWriteData: Sending a command byte to the FIFO: 0x%x\n", Buffer[i])); + DPRINT(("floppy: HwReadWriteData: Sending a command byte to the FIFO: 0x%x\n", Buffer[i])); if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("HwReadWriteData: Unable to write to the FIFO\n")); + DPRINT(("HwReadWriteData: Unable to write to the FIFO\n")); return STATUS_UNSUCCESSFUL; } } @@ -465,19 +467,19 @@ if(Send_Byte(ControllerInfo, COMMAND_SENSE_INTERRUPT_STATUS) != STATUS_SUCCESS) { - KdPrint(("floppy: HwRecalibrateResult: Unable to write the controller\n")); + DPRINT(("floppy: HwRecalibrateResult: Unable to write the controller\n")); return STATUS_UNSUCCESSFUL; } for(i = 0; i < 2; i++) if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: HwRecalibrateResult: unable to read FIFO\n")); + DPRINT(("floppy: HwRecalibrateResult: unable to read FIFO\n")); return STATUS_UNSUCCESSFUL; } /* Validate that it did what we told it to */ - KdPrint(("floppy: HwRecalibrateResult results: ST0: 0x%x PCN: 0x%x\n", Buffer[0], Buffer[1])); + DPRINT(("floppy: HwRecalibrateResult results: ST0: 0x%x PCN: 0x%x\n", Buffer[0], Buffer[1])); /* * Buffer[0] = ST0 @@ -487,20 +489,20 @@ /* Is the PCN 0? */ if(Buffer[1] != 0) { - KdPrint(("floppy: HwRecalibrateResult: PCN not 0\n")); + DPRINT(("floppy: HwRecalibrateResult: PCN not 0\n")); return STATUS_UNSUCCESSFUL; } /* test seek complete */ if((Buffer[0] & SR0_SEEK_COMPLETE) != SR0_SEEK_COMPLETE) { - KdPrint(("floppy: HwRecalibrateResult: Failed to complete the seek\n")); + DPRINT(("floppy: HwRecalibrateResult: Failed to complete the seek\n")); return STATUS_UNSUCCESSFUL; } /* Is the equipment check flag set? Could be no disk in drive... */ if((Buffer[0] & SR0_EQUIPMENT_CHECK) == SR0_EQUIPMENT_CHECK) - KdPrint(("floppy: HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning STATUS_SUCCESS anyway\n")); + DPRINT(("floppy: HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning STATUS_SUCCESS anyway\n")); return STATUS_SUCCESS; } @@ -530,12 +532,12 @@ for(i = 0; i < 7; i++) if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: HwReadWriteResult: unable to read fifo\n")); + DPRINT(("floppy: HwReadWriteResult: unable to read fifo\n")); return STATUS_UNSUCCESSFUL; } /* Validate that it did what we told it to */ - KdPrint(("floppy: HwReadWriteResult results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], + DPRINT(("floppy: HwReadWriteResult results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], Buffer[4], Buffer[5], Buffer[6])); /* Last command successful? */ @@ -563,7 +565,7 @@ UCHAR Buffer[2]; int i; - KdPrint(("floppy: HwRecalibrate called\n")); + DPRINT(("floppy: HwRecalibrate called\n")); PAGED_CODE(); @@ -573,7 +575,7 @@ for(i = 0; i < 2; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: HwRecalibrate: unable to write FIFO\n")); + DPRINT(("floppy: HwRecalibrate: unable to write FIFO\n")); return STATUS_UNSUCCESSFUL; } @@ -598,7 +600,7 @@ if(Send_Byte(ControllerInfo, COMMAND_SENSE_INTERRUPT_STATUS) != STATUS_SUCCESS) { - KdPrint(("floppy: HwSenseInterruptStatus: failed to write controller\n")); + DPRINT(("floppy: HwSenseInterruptStatus: failed to write controller\n")); return STATUS_UNSUCCESSFUL; } @@ -606,12 +608,12 @@ { if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: HwSenseInterruptStatus: failed to read controller\n")); + DPRINT(("floppy: HwSenseInterruptStatus: failed to read controller\n")); return STATUS_UNSUCCESSFUL; } } - KdPrint(("floppy: HwSenseInterruptStatus returned 0x%x 0x%x\n", Buffer[0], Buffer[1])); + DPRINT(("floppy: HwSenseInterruptStatus returned 0x%x 0x%x\n", Buffer[0], Buffer[1])); return STATUS_SUCCESS; } @@ -633,7 +635,7 @@ UCHAR Buffer[2]; int i; - KdPrint(("floppy: HwReadId called\n")); + DPRINT(("floppy: HwReadId called\n")); PAGED_CODE(); @@ -643,7 +645,7 @@ for(i = 0; i < 2; i++) if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: HwReadId: unable to send bytes to fifo\n")); + DPRINT(("floppy: HwReadId: unable to send bytes to fifo\n")); return STATUS_UNSUCCESSFUL; } @@ -676,7 +678,7 @@ UCHAR Buffer[6]; int i; - KdPrint(("floppy: HwFormatTrack called\n")); + DPRINT(("floppy: HwFormatTrack called\n")); PAGED_CODE(); @@ -690,7 +692,7 @@ for(i = 0; i < 6; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: HwFormatTrack: unable to send bytes to floppy\n")); + DPRINT(("floppy: HwFormatTrack: unable to send bytes to floppy\n")); return STATUS_UNSUCCESSFUL; } @@ -716,7 +718,7 @@ UCHAR Buffer[3]; int i; - KdPrint(("floppy: HwSeek called for cyl 0x%x\n", Cylinder)); + DPRINT(("floppy: HwSeek called for cyl 0x%x\n", Cylinder)); PAGED_CODE(); @@ -727,7 +729,7 @@ for(i = 0; i < 3; i++) if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: HwSeek: failed to write fifo\n")); + DPRINT(("floppy: HwSeek: failed to write fifo\n")); return STATUS_UNSUCCESSFUL; } @@ -767,7 +769,7 @@ UCHAR Buffer[4]; int i; - KdPrint(("floppy: HwConfigure called\n")); + DPRINT(("floppy: HwConfigure called\n")); PAGED_CODE(); @@ -779,7 +781,7 @@ for(i = 0; i < 4; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: HwConfigure: failed to write the fifo\n")); + DPRINT(("floppy: HwConfigure: failed to write the fifo\n")); return STATUS_UNSUCCESSFUL; } @@ -807,17 +809,17 @@ if(Send_Byte(ControllerInfo, COMMAND_VERSION) != STATUS_SUCCESS) { - KdPrint(("floppy: HwGetVersion: unable to write fifo\n")); + DPRINT(("floppy: HwGetVersion: unable to write fifo\n")); return STATUS_UNSUCCESSFUL; } if(Get_Byte(ControllerInfo, &Buffer) != STATUS_SUCCESS) { - KdPrint(("floppy: HwGetVersion: unable to write fifo\n")); + DPRINT(("floppy: HwGetVersion: unable to write fifo\n")); return STATUS_UNSUCCESSFUL; } - KdPrint(("floppy: HwGetVersion returning version 0x%x\n", Buffer)); + DPRINT(("floppy: HwGetVersion returning version 0x%x\n", Buffer)); return Buffer; } @@ -841,18 +843,18 @@ Buffer = READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_INPUT_REGISTER); - KdPrint(("floppy: HwDiskChanged: read 0x%x from DIR\n", Buffer)); + DPRINT(("floppy: HwDiskChanged: read 0x%x from DIR\n", Buffer)); if(ControllerInfo->Model30) { if(!(Buffer & DIR_DISKETTE_CHANGE)) { - KdPrint(("floppy: HdDiskChanged - Model30 - returning TRUE\n")); + DPRINT(("floppy: HdDiskChanged - Model30 - returning TRUE\n")); *DiskChanged = TRUE; } else { - KdPrint(("floppy: HdDiskChanged - Model30 - returning FALSE\n")); + DPRINT(("floppy: HdDiskChanged - Model30 - returning FALSE\n")); *DiskChanged = FALSE; } } @@ -860,12 +862,12 @@ { if(Buffer & DIR_DISKETTE_CHANGE) { - KdPrint(("floppy: HdDiskChanged - PS2 - returning TRUE\n")); + DPRINT(("floppy: HdDiskChanged - PS2 - returning TRUE\n")); *DiskChanged = TRUE; } else { - KdPrint(("floppy: HdDiskChanged - PS2 - returning FALSE\n")); + DPRINT(("floppy: HdDiskChanged - PS2 - returning FALSE\n")); *DiskChanged = FALSE; } } @@ -891,11 +893,11 @@ if(Get_Byte(ControllerInfo, Status) != STATUS_SUCCESS) { - KdPrint(("floppy: HwSenseDriveStatus: unable to read fifo\n")); + DPRINT(("floppy: HwSenseDriveStatus: unable to read fifo\n")); return STATUS_UNSUCCESSFUL; } - KdPrint(("floppy: HwSenseDriveStatusResult: ST3: 0x%x\n", *Status)); + DPRINT(("floppy: HwSenseDriveStatusResult: ST3: 0x%x\n", *Status)); return STATUS_SUCCESS; } @@ -929,25 +931,25 @@ for(i = 0; i < 7; i++) if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: ReadIdResult(): can't read from the controller\n")); + DPRINT(("floppy: ReadIdResult(): can't read from the controller\n")); return STATUS_UNSUCCESSFUL; } /* Validate that it did what we told it to */ - KdPrint(("floppy: ReadId results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], + DPRINT(("floppy: ReadId results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], Buffer[4], Buffer[5], Buffer[6])); /* Last command successful? */ if((Buffer[0] & SR0_LAST_COMMAND_STATUS) != SR0_LCS_SUCCESS) { - KdPrint(("floppy: ReadId didn't return last command success\n")); + DPRINT(("floppy: ReadId didn't return last command success\n")); return STATUS_UNSUCCESSFUL; } /* ID mark found? */ if(Buffer[1] & SR1_CANNOT_FIND_ID_ADDRESS) { - KdPrint(("floppy: ReadId didn't find an address mark\n")); + DPRINT(("floppy: ReadId didn't find an address mark\n")); return STATUS_UNSUCCESSFUL; } @@ -994,13 +996,13 @@ Buffer[1] = 0xdf; Buffer[2] = 0x2; - //KdPrint(("HwSpecify: sending 0x%x 0x%x 0x%x to FIFO\n", Buffer[0], Buffer[1], Buffer[2])); - KdPrint(("FLOPPY: HWSPECIFY: FIXME - sending 0x3 0xd1 0x2 to FIFO\n")); + //DPRINT(("HwSpecify: sending 0x%x 0x%x 0x%x to FIFO\n", Buffer[0], Buffer[1], Buffer[2])); + DPRINT(("FLOPPY: HWSPECIFY: FIXME - sending 0x3 0xd1 0x2 to FIFO\n")); for(i = 0; i < 3; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - KdPrint(("floppy: HwSpecify: unable to write to controller\n")); + DPRINT(("floppy: HwSpecify: unable to write to controller\n")); return STATUS_UNSUCCESSFUL; } @@ -1019,7 +1021,7 @@ * - Generates an interrupt that must be serviced four times (one per drive) */ { - KdPrint(("floppy: HwReset called\n")); + DPRINT(("floppy: HwReset called\n")); /* Write the reset bit in the DRSR */ WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DRSR_SW_RESET); @@ -1028,13 +1030,13 @@ if(!(READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER) & DOR_RESET)) { HwDumpRegisters(ControllerInfo); - KdPrint(("floppy: HwReset: Setting Enable bit\n")); + DPRINT(("floppy: HwReset: Setting Enable bit\n")); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, DOR_DMA_IO_INTERFACE_ENABLE|DOR_RESET); HwDumpRegisters(ControllerInfo); if(!(READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER) & DOR_RESET)) { - KdPrint(("floppy: HwReset: failed to set the DOR enable bit!\n")); + DPRINT(("floppy: HwReset: failed to set the DOR enable bit!\n")); HwDumpRegisters(ControllerInfo); return STATUS_UNSUCCESSFUL; } @@ -1055,7 +1057,7 @@ * - Wake up with a hardware reset */ { - KdPrint(("floppy: HwPowerOff called on controller 0x%x\n", ControllerInfo)); + DPRINT(("floppy: HwPowerOff called on controller 0x%x\n", ControllerInfo)); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DRSR_POWER_DOWN); @@ -1071,11 +1073,11 @@ { UNREFERENCED_PARAMETER(ControllerInfo); - KdPrint(("floppy: STATUS: ")); - KdPrint(("STATUS_REGISTER_A = 0x%x ", READ_PORT_UCHAR(ControllerInfo->BaseAddress + STATUS_REGISTER_A))); - KdPrint(("STATUS_REGISTER_B = 0x%x ", READ_PORT_UCHAR(ControllerInfo->BaseAddress + STATUS_REGISTER_B))); - KdPrint(("DIGITAL_OUTPUT_REGISTER = 0x%x ", READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER))); - KdPrint(("MAIN_STATUS_REGISTER =0x%x ", READ_PORT_UCHAR(ControllerInfo->BaseAddress + MAIN_STATUS_REGISTER))); - KdPrint(("DIGITAL_INPUT_REGISTER = 0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_INPUT_REGISTER))); + DPRINT(("floppy: STATUS: ")); + DPRINT(("STATUS_REGISTER_A = 0x%x ", READ_PORT_UCHAR(ControllerInfo->BaseAddress + STATUS_REGISTER_A))); + DPRINT(("STATUS_REGISTER_B = 0x%x ", READ_PORT_UCHAR(ControllerInfo->BaseAddress + STATUS_REGISTER_B))); [truncated at 1000 lines; 513 more skipped]

19 years, 3 months

[mbosma] 16209: Martin Rottensteiner (2005only@pianonote.at):

by mbosma＠svn.reactos.com

Martin Rottensteiner (2005only(a)pianonote.at): - set errorlevel to 9009 if command not found - implemented exit /b # in batchfiles Modified: trunk/reactos/subsys/system/cmd/error.c Modified: trunk/reactos/subsys/system/cmd/if.c Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/error.c --- trunk/reactos/subsys/system/cmd/error.c 2005-06-21 18:44:20 UTC (rev 16208) +++ trunk/reactos/subsys/system/cmd/error.c 2005-06-21 19:17:49 UTC (rev 16209) @@ -119,12 +119,14 @@ VOID error_path_not_found (VOID) { ConErrResPuts(STRING_ERROR_PATH_NOT_FOUND); + nErrorLevel = 1; } VOID error_file_not_found (VOID) { ConErrResPuts(STRING_ERROR_FILE_NOT_FOUND); + nErrorLevel = 1; } @@ -152,6 +154,7 @@ VOID error_bad_command (VOID) { ConErrResPuts(STRING_ERROR_BADCOMMAND); + nErrorLevel = 9009; } _____ Modified: trunk/reactos/subsys/system/cmd/if.c --- trunk/reactos/subsys/system/cmd/if.c 2005-06-21 18:44:20 UTC (rev 16208) +++ trunk/reactos/subsys/system/cmd/if.c 2005-06-21 19:17:49 UTC (rev 16209) @@ -130,7 +130,7 @@ while (_istdigit (*pp)) n = n * 10 + (*pp++ - _T('0')); - x_flag ^= (nErrorLevel < n) ? 0 : X_EXEC; + x_flag ^= (nErrorLevel != n) ? 0 : X_EXEC; x_flag |= X_EMPTY; /* Syntax error if comd empty */ } _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-06-21 18:44:20 UTC (rev 16208) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-06-21 19:17:49 UTC (rev 16209) @@ -482,16 +482,26 @@ INT CommandExit (LPTSTR cmd, LPTSTR param) { if (!_tcsncmp (param, _T("/?"), 2)) + ConOutResPuts(STRING_EXIT_HELP); + + if (bc != NULL && _tcsnicmp(param,_T("/b"),2) == 0) { - ConOutResPuts(STRING_EXIT_HELP); - return 0; + param += 2; + while (_istspace (*param)) + param++; + if (_istdigit(*param)) + nErrorLevel = _ttoi(param); + ExitBatch (NULL); } + + else + bExit = TRUE; - bExit = TRUE; + return 0; + } - #ifdef INCLUDE_CMD_REM /* * does nothing

19 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005