Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[ion] 16298: Fix kdbg build and some more header cleanups: add csq.q to ntifs, since it's now fully documented by MS (kept vizzini's comments though), moved af_irda to w32api because it's part of PSDK, moved ntbootvid.h to bootvid directory, removed ldrfuncs.h and add ndk's ldrfuncs.h to umode ndk (it was missing)

by ion＠svn.reactos.com

Fix kdbg build and some more header cleanups: add csq.q to ntifs, since it's now fully documented by MS (kept vizzini's comments though), moved af_irda to w32api because it's part of PSDK, moved ntbootvid.h to bootvid directory, removed ldrfuncs.h and add ndk's ldrfuncs.h to umode ndk (it was missing) Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c Added: trunk/reactos/drivers/dd/bootvid/ntbootvid.h Modified: trunk/reactos/drivers/lib/csq/csq.c Added: trunk/reactos/drivers/lib/csq/csq.h Deleted: trunk/reactos/include/ddk/af_irda.h Deleted: trunk/reactos/include/ddk/csq.h Deleted: trunk/reactos/include/ddk/ldrfuncs.h Deleted: trunk/reactos/include/ddk/ntbootvid.h Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/lib/kernel32/misc/res.c Modified: trunk/reactos/lib/ntdll/rtl/message.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_string.c Added: trunk/reactos/w32api/include/af_irda.h Added: trunk/reactos/w32api/include/ddk/csq.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c --- trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-06-26 19:29:12 UTC (rev 16298) @@ -24,9 +24,9 @@ /* INCLUDES ******************************************************************/ #include <ddk/ntddk.h> -#include <ddk/ntbootvid.h> #include <ndk/ldrfuncs.h> #include "bootvid.h" +#include "ntbootvid.h" #include "resource.h" #define NDEBUG _____ Copied: trunk/reactos/drivers/dd/bootvid/ntbootvid.h (from rev 16273, trunk/reactos/include/ddk/ntbootvid.h) --- trunk/reactos/include/ddk/ntbootvid.h 2005-06-26 01:12:21 UTC (rev 16273) +++ trunk/reactos/drivers/dd/bootvid/ntbootvid.h 2005-06-26 19:29:12 UTC (rev 16298) @@ -0,0 +1,13 @@ + +/* FIXME: Bootvid will eventually become a DLL and this will be deprecated */ +#define FILE_DEVICE_BOOTVID 53335 + +#define IOCTL_BOOTVID_INITIALIZE \ + CTL_CODE(FILE_DEVICE_BOOTVID, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_BOOTVID_CLEANUP \ + CTL_CODE(FILE_DEVICE_BOOTVID, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) + +typedef struct +{ + BOOL (STDCALL *ResetDisplay)(VOID); +} NTBOOTVID_FUNCTION_TABLE; _____ Modified: trunk/reactos/drivers/lib/csq/csq.c --- trunk/reactos/drivers/lib/csq/csq.c 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/drivers/lib/csq/csq.c 2005-06-26 19:29:12 UTC (rev 16298) @@ -27,7 +27,7 @@ #define __NTDRIVER__ #include <ddk/ntddk.h> -#include <ddk/csq.h> +#include <ddk/ntifs.h> static VOID NTAPI IopCsqCancelRoutine(PDEVICE_OBJECT DeviceObject, _____ Copied: trunk/reactos/drivers/lib/csq/csq.h (from rev 16273, trunk/reactos/include/ddk/csq.h) _____ Deleted: trunk/reactos/include/ddk/af_irda.h --- trunk/reactos/include/ddk/af_irda.h 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/include/ddk/af_irda.h 2005-06-26 19:29:12 UTC (rev 16298) @@ -1,221 +0,0 @@ -/* - * af_irda.h - * - * IrDa ports interface - * - * This file is part of the MinGW package. - * - * Contributors: - * Created by Robert Dickenson <robd(a)users.sourceforge.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 - * DISCLAMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __AF_IRDA_H -#define __AF_IRDA_H - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#pragma pack(push,4) - - -/* GUIDs */ - -#ifdef DEFINE_GUID -DEFINE_GUID(GUID_DEVINTERFACE_IRDAPORT, - 0x86e0d1e0L, 0x8089, 0x11d0, 0x9c, 0xe4, 0x08, 0x00, 0x3e, 0x30, 0x1f, 0x74); -DEFINE_GUID(GUID_DEVINTERFACE_IRDAENUM_BUS_ENUMERATOR, - 0x4D36E978L, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x19); -#endif /* DEFINE_GUID */ - -#define WINDOWS_AF_IRDA 26 -#define WINDOWS_PF_IRDA WINDOWS_AF_IRDA - -#ifndef AF_IRDA -#define AF_IRDA WINDOWS_AF_IRDA -#endif - -#define IRDA_PROTO_SOCK_STREAM 1 -#define PF_IRDA AF_IRDA -#define SOL_IRLMP 0x00FF -#define SIO_LAZY_DISCOVERY _IOR('t', 127, ULONG) - - -#define IAS_MAX_USER_STRING 256 -#define IAS_MAX_OCTET_STRING 1024 -#define IAS_MAX_CLASSNAME 64 -#define IAS_MAX_ATTRIBNAME 256 - -#define IAS_ATTRIB_NO_CLASS ((ULONG)0x10) -#define IAS_ATTRIB_NO_ATTRIB ((ULONG)0x00) -#define IAS_ATTRIB_INT ((ULONG)0x01) -#define IAS_ATTRIB_OCTETSEQ ((ULONG)0x02) -#define IAS_ATTRIB_STR ((ULONG)0x03) - -#define IRLMP_ENUMDEVICES ((ULONG)0x10) -#define IRLMP_IAS_SET ((ULONG)0x11) -#define IRLMP_IAS_QUERY ((ULONG)0x12) -#define IRLMP_SEND_PDU_LEN ((ULONG)0x13) -#define IRLMP_EXCLUSIVE_MODE ((ULONG)0x14) -#define IRLMP_IRLPT_MODE ((ULONG)0x15) -#define IRLMP_9WIRE_MODE ((ULONG)0x16) - -#if 0 -/* Available/Used on Windows 98 only ??? */ -#define IRLMP_TINYTP_MODE ((ULONG)0x17) -#define IRLMP_PARAMETERS ((ULONG)0x18) -#define IRLMP_DISCOVERY_MODE ((ULONG)0x19) -/* Available/Used on Windows CE only ??? */ -#define IRLMP_SHARP_MODE ((ULONG)0x20) -#endif - -enum { -/* First hint byte */ - LM_HB1_PnP = 0x01, - LM_HB1_PDA_Palmtop = 0x02, - LM_HB1_Computer = 0x04, - LM_HB1_Printer = 0x08, - LM_HB1_Modem = 0x10, - LM_HB1_Fax = 0x20, - LM_HB1_LANAccess = 0x40, -/* Second hint byte */ - LM_HB2_Telephony = 0x01, - LM_HB2_FileServer = 0x02, -/* Any hint byte */ - LM_HB_Extension = 0x80, -}; - -#define LmCharSetASCII 0x00 -#define LmCharSetISO_8859_1 0x01 -#define LmCharSetISO_8859_2 0x02 -#define LmCharSetISO_8859_3 0x03 -#define LmCharSetISO_8859_4 0x04 -#define LmCharSetISO_8859_5 0x05 -#define LmCharSetISO_8859_6 0x06 -#define LmCharSetISO_8859_7 0x07 -#define LmCharSetISO_8859_8 0x08 -#define LmCharSetISO_8859_9 0x09 -#define LmCharSetUNICODE 0xFF - -#define LM_BAUD_1200 1200 -#define LM_BAUD_2400 2400 -#define LM_BAUD_9600 9600 -#define LM_BAUD_19200 19200 -#define LM_BAUD_38400 38400 -#define LM_BAUD_57600 57600 -#define LM_BAUD_115200 115200 -#define LM_BAUD_576K 576000 -#define LM_BAUD_1152K 1152000 -#define LM_BAUD_4M 4000000 - -#if 0 /* Available/Used on Windows 98 only ??? */ -typedef ULONG LM_BAUD_RATE; -typedef struct { - ULONG nTXDataBytes; /* packet transmit receive bytes */ - ULONG nRXDataBytes; /* packet maximum receive bytes */ - LM_BAUD_RATE nBaudRate; /* link negotiated baud */ - ULONG thresholdTime; /* milliseconds for threshold time */ - ULONG discTime; /* milliseconds for disconnect time - USHORT nMSLinkTurn; /* milliseconds for link turn around time */ - UCHAR nTXPackets; /* transmit window packets */ - UCHAR nRXPackets; /* receive window packets */ -} LM_IRPARMS; -typedef LM_IRPARMS *PLM_IRPARMS; -#endif - -typedef struct _SOCKADDR_IRDA { - USHORT irdaAddressFamily; - UCHAR irdaDeviceID[4]; - char irdaServiceName[25]; -} SOCKADDR_IRDA; - -typedef struct _WINDOWS_IRDA_DEVICE_INFO { - UCHAR irdaDeviceID[4]; - char irdaDeviceName[22]; - UCHAR irdaDeviceHints1; - UCHAR irdaDeviceHints2; - UCHAR irdaCharSet; -} WINDOWS_IRDA_DEVICE_INFO; - -typedef struct _WINDOWS_IAS_SET { - char irdaClassName[IAS_MAX_CLASSNAME]; - char irdaAttribName[IAS_MAX_ATTRIBNAME]; - ULONG irdaAttribType; - union { - LONG irdaAttribInt; - struct { - USHORT Len; - UCHAR OctetSeq[IAS_MAX_OCTET_STRING]; - } irdaAttribOctetSeq; - struct { - UCHAR Len; - UCHAR CharSet; - UCHAR UsrStr[IAS_MAX_USER_STRING]; - } irdaAttribUsrStr; - } irdaAttribute; -} WINDOWS_IAS_SET; - -typedef struct _WINDOWS_IAS_QUERY { - UCHAR irdaDeviceID[4]; - char irdaClassName[IAS_MAX_CLASSNAME]; - char irdaAttribName[IAS_MAX_ATTRIBNAME]; - ULONG irdaAttribType; - union { - LONG irdaAttribInt; - struct { - ULONG Len; - UCHAR OctetSeq[IAS_MAX_OCTET_STRING]; - } irdaAttribOctetSeq; - struct { - ULONG Len; - ULONG CharSet; - UCHAR UsrStr[IAS_MAX_USER_STRING]; - } irdaAttribUsrStr; - } irdaAttribute; -} WINDOWS_IAS_QUERY; - -typedef struct _WINDOWS_DEVICELIST { - ULONG numDevice; - WINDOWS_IRDA_DEVICE_INFO Device[1]; -} WINDOWS_DEVICELIST; - -typedef WINDOWS_DEVICELIST DEVICELIST; -typedef WINDOWS_DEVICELIST *PDEVICELIST; -typedef WINDOWS_DEVICELIST *PWINDOWS_DEVICELIST; - -typedef WINDOWS_IRDA_DEVICE_INFO IRDA_DEVICE_INFO; -typedef WINDOWS_IRDA_DEVICE_INFO *PIRDA_DEVICE_INFO; -typedef WINDOWS_IRDA_DEVICE_INFO *PWINDOWS_IRDA_DEVICE_INFO; - -typedef WINDOWS_IAS_SET IAS_SET; -typedef WINDOWS_IAS_SET *PIAS_SET; -typedef WINDOWS_IAS_SET *PWINDOWS_IAS_SET; - -typedef WINDOWS_IAS_QUERY IAS_QUERY; -typedef WINDOWS_IAS_QUERY *PIAS_QUERY; -typedef WINDOWS_IAS_QUERY *PWINDOWS_IAS_QUERY; - -typedef SOCKADDR_IRDA *PSOCKADDR_IRDA; - -#pragma pack(pop) - -#ifdef __cplusplus -} -#endif - -#endif /* __AF_IRDA_H */ _____ Deleted: trunk/reactos/include/ddk/csq.h --- trunk/reactos/include/ddk/csq.h 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/include/ddk/csq.h 2005-06-26 19:29:12 UTC (rev 16298) @@ -1,289 +0,0 @@ -/* - * Cancel-Safe Queue Library - * Copyright (c) 2004, Vizzini (vizzini(a)plasmic.com) - * Licensed under the GNU GPL for the ReactOS project - * - * This header defines the interface to the ReactOS Cancel-Safe Queue library. - * This interface is based on and is similar to the Microsoft Cancel-Safe - * Queue interface. - * - * BACKGROUND - * - * IRP queuing is a royal pain in the butt, due to the fact that there are - * tons of built-in race conditions. IRP handling is difficult in general, - * but the cancel logic has been particularly complicated due to some subtle - * races, coupled with the fact that the system interfaces have changed over - * time. - * - * Walter Oney (2nd. Ed. of Programming the Windows Driver Model) states a - * common opinion among driver developers when he says that it is foolish - * to try to roll your own cancel logic. There are only a very few people - * who have gotten it right in the past. He suggests, instead, that you - * either use his own well-tested code, or use the code in the Microsoft - * Cancel-Safe Queue Library. - * - * We cannot do either, of course, due to copyright issues. I have therefore - * created this clone of the Microsoft library in order to concentrate all - * of the IRP-queuing bugs in one place. I'm quite sure there are problems - * here, so if you are a driver writer, I'd be glad to hear your feedback. - * - * Apart from that, please try to use these routines, rather than building - * your own. If you think you have found a bug, please bring it up with me - * or on-list, as this is complicated and non-obvious stuff. Don't just - * change this and hope for the best! - * - * USAGE - * - * This library follows exactly the same interface as the Microsoft Cancel-Safe - * Queue routines (IoCsqXxx()). As such, the authoritative reference is the - * current DDK. There is also a DDK sample called "cancel" that has an - * example of how to use this code. I have also provided a sample driver - * that makes use of this queue. Finally, please do read the header and the - * source if you're curious about the inner workings of these routines. - */ - -#ifndef _REACTOS_CSQ_H -#define _REACTOS_CSQ_H - -/* - * Prevent including the CSQ definitions twice. They're present in NTDDK - * now too, except the *_EX versions. - */ -#ifndef IO_TYPE_CSQ_IRP_CONTEXT - -struct _IO_CSQ; - - -/* - * CSQ Callbacks - * - * The cancel-safe queue is implemented as a set of IoCsqXxx() OS routines - * copuled with a set of driver callbacks to handle the basic operations of - * the queue. You need to supply one of each of these functions in your own - * driver. These routines are also documented in the DDK under CsqXxx(). - * That is the authoritative documentation. - */ - -/* - * Function to insert an IRP in the queue. No need to worry about locking; - * just tack it onto your list or something. - * - * Sample implementation: - * - VOID NTAPI CsqInsertIrp(PIO_CSQ Csq, PIRP Irp) - { - KdPrint(("Inserting IRP 0x%x into CSQ\n", Irp)); - InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); - } - * - */ -typedef VOID (NTAPI *PIO_CSQ_INSERT_IRP) (struct _IO_CSQ *Csq, - PIRP Irp); - - -/* - * Function to remove an IRP from the queue. - * - * Sample: - * - VOID NTAPI CsqRemoveIrp(PIO_CSQ Csq, PIRP Irp) - { - KdPrint(("Removing IRP 0x%x from CSQ\n", Irp)); - RemoveEntryList(&Irp->Tail.Overlay.ListEntry); - } - * - */ -typedef VOID (NTAPI *PIO_CSQ_REMOVE_IRP) (struct _IO_CSQ *Csq, - PIRP Irp); - -/* - * Function to look for an IRP in the queue - * - * Sample: - * - PIRP NTAPI CsqPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext) - { - KdPrint(("Peeking for next IRP\n")); - - if(Irp) - return CONTAINING_RECORD(&Irp->Tail.Overlay.ListEntry.Flink, IRP, Tail.Overlay.ListEntry); - - if(IsListEmpty(&IrpQueue)) - return NULL; - - return CONTAINING_RECORD(IrpQueue.Flink, IRP, Tail.Overlay.ListEntry); - } - * - */ -typedef PIRP (NTAPI *PIO_CSQ_PEEK_NEXT_IRP) (struct _IO_CSQ *Csq, - PIRP Irp, - PVOID PeekContext); - -/* - * Lock the queue. This can be a spinlock, a mutex, or whatever - * else floats your boat. - * - * Sample: - * - VOID NTAPI CsqAcquireLock(PIO_CSQ Csq, PKIRQL Irql) - { - KdPrint(("Acquiring spin lock\n")); - KeAcquireSpinLock(&IrpQueueLock, Irql); - } - * - */ -typedef VOID (NTAPI *PIO_CSQ_ACQUIRE_LOCK) (struct _IO_CSQ *Csq, - PKIRQL Irql); - -/* - * Unlock the queue: - * - VOID NTAPI CsqReleaseLock(PIO_CSQ Csq, KIRQL Irql) - { - KdPrint(("Releasing spin lock\n")); - KeReleaseSpinLock(&IrpQueueLock, Irql); - } - * - */ -typedef VOID (NTAPI *PIO_CSQ_RELEASE_LOCK) (struct _IO_CSQ *Csq, - KIRQL Irql); - -/* - * Finally, this is called by the queue library when it wants to complete - * a canceled IRP. - * - * Sample: - * - VOID NTAPI CsqCompleteCancelledIrp(PIO_CSQ Csq, PIRP Irp) - { - KdPrint(("cancelling irp 0x%x\n", Irp)); - Irp->IoStatus.Status = STATUS_CANCELLED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - * - */ -typedef VOID (NTAPI *PIO_CSQ_COMPLETE_CANCELED_IRP) (struct _IO_CSQ *Csq, - PIRP Irp); - - -/* - * STRUCTURES - * - * NOTE: Please do not use these directly. You will make incompatible code - * if you do. Always only use the documented IoCsqXxx() interfaces and you - * will amass much Good Karma. - */ -#define IO_TYPE_CSQ_IRP_CONTEXT 1 -#define IO_TYPE_CSQ 2 - -/* - * IO_CSQ - Queue control structure - */ -typedef struct _IO_CSQ { - ULONG Type; - PIO_CSQ_INSERT_IRP CsqInsertIrp; - PIO_CSQ_REMOVE_IRP CsqRemoveIrp; - PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp; - PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock; - PIO_CSQ_RELEASE_LOCK CsqReleaseLock; - PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp; - PVOID ReservePointer; /* must be NULL */ -} IO_CSQ, *PIO_CSQ; - -/* - * IO_CSQ_IRP_CONTEXT - Context used to track an IRP in the CSQ - */ -typedef struct _IO_CSQ_IRP_CONTEXT { - ULONG Type; - PIRP Irp; - PIO_CSQ Csq; -} IO_CSQ_IRP_CONTEXT, *PIO_CSQ_IRP_CONTEXT; - -#endif /* IO_TYPE_CSQ_IRP_CONTEXT */ - -/* See IO_TYPE_CSQ_* above */ -#define IO_TYPE_CSQ_EX 3 - -/* - * Function to insert an IRP into the queue with extended context information. - * This is useful if you need to be able to de-queue particular IRPs more - * easily in some cases. - * - * Same deal as above; sample implementation: - * - NTSTATUS NTAPI CsqInsertIrpEx(PIO_CSQ Csq, PIRP Irp, PVOID InsertContext) - { - CsqInsertIrp(Csq, Irp); - return STATUS_PENDING; - } - * - */ -typedef NTSTATUS (NTAPI *PIO_CSQ_INSERT_IRP_EX) (struct _IO_CSQ *Csq, - PIRP Irp, - PVOID InsertContext); - -/* - * CANCEL-SAFE QUEUE DDIs - * - * These device driver interfaces are called to make use of the queue. Again, - * authoritative documentation for these functions is in the DDK. The csqtest - * driver also makes use of some of them. - */ - - -/* - * Call this in DriverEntry or similar in order to set up the Csq structure. - * As long as the Csq struct and the functions you pass in are resident, - * there are no IRQL restrictions. - */ -NTSTATUS NTAPI IoCsqInitialize(PIO_CSQ Csq, - PIO_CSQ_INSERT_IRP CsqInsertIrp, - PIO_CSQ_REMOVE_IRP CsqRemoveIrp, - PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, - PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock, - PIO_CSQ_RELEASE_LOCK CsqReleaseLock, - PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp); - -/* - * Same as above, except you provide a CsqInsertIrpEx routine instead of - * CsqInsertIrp. This eventually allows you to supply extra tracking - * information for use with the queue. - */ -NTSTATUS NTAPI IoCsqInitializeEx(PIO_CSQ Csq, - PIO_CSQ_INSERT_IRP_EX CsqInsertIrpEx, - PIO_CSQ_REMOVE_IRP CsqRemoveIrp, - PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, - PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock, - PIO_CSQ_RELEASE_LOCK CsqReleaseLock, - PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp); - -/* - * Insert an IRP into the queue - */ -VOID NTAPI IoCsqInsertIrp(PIO_CSQ Csq, - PIRP Irp, - PIO_CSQ_IRP_CONTEXT Context); - -/* - * Insert an IRP into the queue, with special context maintained that - * makes it easy to find IRPs in the queue - */ -NTSTATUS NTAPI IoCsqInsertIrpEx(PIO_CSQ Csq, - PIRP Irp, - PIO_CSQ_IRP_CONTEXT Context, - PVOID InsertContext); - -/* - * Remove a particular IRP from the queue - */ -PIRP NTAPI IoCsqRemoveIrp(PIO_CSQ Csq, - PIO_CSQ_IRP_CONTEXT Context); - -/* - * Remove the next IRP from the queue - */ -PIRP NTAPI IoCsqRemoveNextIrp(PIO_CSQ Csq, - PVOID PeekContext); - -#endif /* _REACTOS_CSQ_H */ _____ Deleted: trunk/reactos/include/ddk/ldrfuncs.h --- trunk/reactos/include/ddk/ldrfuncs.h 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/include/ddk/ldrfuncs.h 2005-06-26 19:29:12 UTC (rev 16298) @@ -1,30 +0,0 @@ -#ifndef __INCLUDE_DDK_LDRFUNCS_H -#define __INCLUDE_DDK_LDRFUNCS_H -/* $Id$ */ - -NTSTATUS STDCALL -LdrAccessResource(IN PVOID BaseAddress, - IN PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry, - OUT PVOID *Resource OPTIONAL, - OUT PULONG Size OPTIONAL); - -NTSTATUS STDCALL -LdrFindResource_U(IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO ResourceInfo, - IN ULONG Level, - OUT PIMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry); - -NTSTATUS STDCALL -LdrFindResourceDirectory_U( IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO ResourceInfo, - IN ULONG Level, - OUT PIMAGE_RESOURCE_DIRECTORY *ResourceDirectory); - -NTSTATUS STDCALL -LdrEnumResources(IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO ResourceInfo, - IN ULONG Level, - IN OUT PULONG ResourceCount, - OUT PVOID Resources OPTIONAL); - -#endif /* __INCLUDE_DDK_LDRFUNCS_H */ _____ Deleted: trunk/reactos/include/ddk/ntbootvid.h --- trunk/reactos/include/ddk/ntbootvid.h 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/include/ddk/ntbootvid.h 2005-06-26 19:29:12 UTC (rev 16298) @@ -1,11 +0,0 @@ -#define FILE_DEVICE_BOOTVID 53335 - -#define IOCTL_BOOTVID_INITIALIZE \ - CTL_CODE(FILE_DEVICE_BOOTVID, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_BOOTVID_CLEANUP \ - CTL_CODE(FILE_DEVICE_BOOTVID, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) - -typedef struct -{ - BOOL (STDCALL *ResetDisplay)(VOID); -} NTBOOTVID_FUNCTION_TABLE; _____ Modified: trunk/reactos/include/ndk/ldrfuncs.h --- trunk/reactos/include/ndk/ldrfuncs.h 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/include/ndk/ldrfuncs.h 2005-06-26 19:29:12 UTC (rev 16298) @@ -35,6 +35,15 @@ ); NTSTATUS +STDCALL +LdrFindResourceDirectory_U( + IN PVOID BaseAddress, + IN PLDR_RESOURCE_INFO ResourceInfo, + IN ULONG Level, + OUT PIMAGE_RESOURCE_DIRECTORY *ResourceDirectory +); + +NTSTATUS STDCALL LdrGetProcedureAddress( IN PVOID BaseAddress, _____ Modified: trunk/reactos/include/ndk/ntndk.h --- trunk/reactos/include/ndk/ntndk.h 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/include/ndk/ntndk.h 2005-06-26 19:29:12 UTC (rev 16298) @@ -23,7 +23,6 @@ #include "iofuncs.h" /* Input/Output Manager Functions */ #include "ketypes.h" /* Kernel Types */ #include "kefuncs.h" /* Kernel Functions */ - #include "ldrfuncs.h" /* Loader Functions */ #include "lpctypes.h" /* Local Procedure Call Types */ #include "mmtypes.h" /* Memory Manager Types */ #include "mmfuncs.h" /* Memory Manager Functions */ @@ -40,6 +39,7 @@ #endif /* Shared NDK */ +#include "ldrfuncs.h" /* Loader Functions */ #include "ldrtypes.h" /* Loader Types */ #include "pstypes.h" /* Process Manager Types */ #include "rtltypes.h" /* Runtime Library Types */ _____ Modified: trunk/reactos/lib/kernel32/misc/res.c --- trunk/reactos/lib/kernel32/misc/res.c 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/lib/kernel32/misc/res.c 2005-06-26 19:29:12 UTC (rev 16298) @@ -8,7 +8,6 @@ */ #include <k32.h> -#include <ddk/ldrfuncs.h> #define NDEBUG #include "../include/debug.h" _____ Modified: trunk/reactos/lib/ntdll/rtl/message.c --- trunk/reactos/lib/ntdll/rtl/message.c 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/lib/ntdll/rtl/message.c 2005-06-26 19:29:12 UTC (rev 16298) @@ -14,7 +14,6 @@ #include <ntdll.h> #define NDEBUG #include <debug.h> -#include <ddk/ldrfuncs.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/inbv/inbv.c --- trunk/reactos/ntoskrnl/inbv/inbv.c 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/ntoskrnl/inbv/inbv.c 2005-06-26 19:29:12 UTC (rev 16298) @@ -11,7 +11,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include <ddk/ntbootvid.h> +#include "../../drivers/dd/bootvid/ntbootvid.h" #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-26 19:29:12 UTC (rev 16298) @@ -32,7 +32,7 @@ #include "port.h" #include "nls.h" #ifdef KDBG -#include "kdb.h" +#include "../kdbg/kdb.h" #endif #include "dbgk.h" #include "tag.h" _____ Modified: trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S --- trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S 2005-06-26 19:29:12 UTC (rev 16298) @@ -1,5 +1,5 @@ -#include <internal/ke.h> -#include <internal/i386/segment.h> +#include <internal/asm.h> +#include <ndk/i386/segment.h> .text _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-06-26 19:29:12 UTC (rev 16298) @@ -29,8 +29,6 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include <ctype.h> -#include <internal/kdb.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c --- trunk/reactos/ntoskrnl/kdbg/kdb_expr.c 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/ntoskrnl/kdbg/kdb_expr.c 2005-06-26 19:29:12 UTC (rev 16298) @@ -35,7 +35,6 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include <internal/kdb.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_string.c --- trunk/reactos/ntoskrnl/kdbg/kdb_string.c 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/ntoskrnl/kdbg/kdb_string.c 2005-06-26 19:29:12 UTC (rev 16298) @@ -91,8 +91,8 @@ } if (base == 0) base = c == '0' ? 8 : 10; - cutoff = (unsigned long)ULONG_MAX / (unsigned long)base; - cutlim = (unsigned long)ULONG_MAX % (unsigned long)base; + cutoff = (unsigned long)0xffffffff / (unsigned long)base; + cutlim = (unsigned long)0xffffffff % (unsigned long)base; for (acc = 0, any = 0;; c = *s++) { if (isdigit(c)) @@ -113,7 +113,7 @@ } if (any < 0) { - acc = ULONG_MAX; + acc = 0xffffffff; } else if (neg) acc = -acc; _____ Copied: trunk/reactos/w32api/include/af_irda.h (from rev 16273, trunk/reactos/include/ddk/af_irda.h) _____ Copied: trunk/reactos/w32api/include/ddk/csq.h (from rev 16273, trunk/reactos/include/ddk/csq.h) _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-26 18:04:20 UTC (rev 16297) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-26 19:29:12 UTC (rev 16298) @@ -29,7 +29,7 @@ #endif #include "ntddk.h" -//#include "ntapi.h" +#include "csq.h" #ifdef __cplusplus extern "C" {

19 years, 6 months

[ekohl] 16297: Revert patch 16283 because it breaks PSDK compatibility.

by ekohl＠svn.reactos.com

Revert patch 16283 because it breaks PSDK compatibility. Modified: trunk/reactos/w32api/include/ntsecapi.h _____ Modified: trunk/reactos/w32api/include/ntsecapi.h --- trunk/reactos/w32api/include/ntsecapi.h 2005-06-26 18:00:22 UTC (rev 16296) +++ trunk/reactos/w32api/include/ntsecapi.h 2005-06-26 18:04:20 UTC (rev 16297) @@ -122,7 +122,7 @@ #define TRUST_TYPE_UPLEVEL 2 #define TRUST_TYPE_MIT 3 #define TRUST_TYPE_DCE 4 -#if !defined(_NTDEF_H) && !defined(_SUBAUTH_H) && !defined(_NTNDK_) +#if !defined(_NTDEF_H) && !defined(_SUBAUTH_H) typedef LONG NTSTATUS, *PNTSTATUS; typedef struct _UNICODE_STRING { USHORT Length; @@ -293,7 +293,7 @@ PSID Sid; } LSA_ENUMERATION_INFORMATION, *PLSA_ENUMERATION_INFORMATION; typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE; -#if !defined(_NTDEF_H) && !defined(_NTNDK_) +#if !defined(_NTDEF_H) typedef struct _LSA_OBJECT_ATTRIBUTES { ULONG Length; HANDLE RootDirectory;

19 years, 6 months

[ion] 16296: Seems I forgot to commit this, sorry

by ion＠svn.reactos.com

Seems I forgot to commit this, sorry Modified: trunk/reactos/subsys/win32k/main/dllmain.c _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-06-26 17:22:34 UTC (rev 16295) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-06-26 18:00:22 UTC (rev 16296) @@ -36,13 +36,32 @@ PSHARED_SECTION_POOL SessionSharedSectionPool = NULL; -NTSTATUS STDCALL -Win32kProcessCallback (struct _EPROCESS *Process, - BOOLEAN Create) +NTSTATUS +STDCALL +Win32kProcessCallback(struct _EPROCESS *Process, + BOOLEAN Create) { - PW32PROCESS Win32Process; + PW32PROCESS Win32Process; + + /* Get the Win32 Process */ + Win32Process = PsGetProcessWin32Process(Process); + + /* Allocate one if needed */ + if (!Win32Process) + { + /* FIXME - lock the process */ + Win32Process = ExAllocatePoolWithTag(NonPagedPool, + sizeof(W32PROCESS), + TAG('W', '3', '2', 'p')); - Win32Process = (PW32PROCESS)Process->Win32Process; + if (Win32Process == NULL) return STATUS_NO_MEMORY; + + RtlZeroMemory(Win32Process, sizeof(W32PROCESS)); + + PsSetProcessWin32Process(Process, Win32Process); + /* FIXME - unlock the process */ + } + if (Create) { DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); @@ -97,15 +116,34 @@ } -NTSTATUS STDCALL -Win32kThreadCallback (struct _ETHREAD *Thread, - BOOLEAN Create) +NTSTATUS +STDCALL +Win32kThreadCallback(struct _ETHREAD *Thread, + BOOLEAN Create) { - struct _EPROCESS *Process; - PW32THREAD Win32Thread; + struct _EPROCESS *Process; + PW32THREAD Win32Thread; - Process = Thread->ThreadsProcess; - Win32Thread = Thread->Tcb.Win32Thread; + Process = Thread->ThreadsProcess; + + /* Get the Win32 Thread */ + Win32Thread = PsGetThreadWin32Thread(Thread); + + /* Allocate one if needed */ + if (!Win32Thread) + { + /* FIXME - lock the process */ + Win32Thread = ExAllocatePoolWithTag(NonPagedPool, + sizeof(W32THREAD), + TAG('W', '3', '2', 't')); + + if (Win32Thread == NULL) return STATUS_NO_MEMORY; + + RtlZeroMemory(Win32Thread, sizeof(W32THREAD)); + + PsSetThreadWin32Thread(Thread, Win32Thread); + /* FIXME - unlock the process */ + } if (Create) { HWINSTA hWinSta = NULL; @@ -237,7 +275,7 @@ { NTSTATUS Status; BOOLEAN Result; - W32_OBJECT_CALLBACK Win32kObjectCallbacks; + W32_CALLOUT_DATA CalloutData; /* * Register user mode call interface @@ -254,24 +292,22 @@ return STATUS_UNSUCCESSFUL; } - /* - * Register Object Manager Callbacks - */ - Win32kObjectCallbacks.WinStaCreate = IntWinStaObjectOpen; - Win32kObjectCallbacks.WinStaParse = IntWinStaObjectParse; - Win32kObjectCallbacks.WinStaDelete = IntWinStaObjectDelete; - Win32kObjectCallbacks.WinStaFind = IntWinStaObjectFind; - Win32kObjectCallbacks.DesktopCreate = IntDesktopObjectCreate; - Win32kObjectCallbacks.DesktopDelete = IntDesktopObjectDelete; - /* - * Register our per-process and per-thread structures. - */ - PsEstablishWin32Callouts (Win32kProcessCallback, - Win32kThreadCallback, - &Win32kObjectCallbacks, - 0, - sizeof(W32THREAD), - sizeof(W32PROCESS)); + /* + * Register Object Manager Callbacks + */ + CalloutData.WinStaCreate = IntWinStaObjectOpen; + CalloutData.WinStaParse = IntWinStaObjectParse; + CalloutData.WinStaDelete = IntWinStaObjectDelete; + CalloutData.WinStaFind = IntWinStaObjectFind; + CalloutData.DesktopCreate = IntDesktopObjectCreate; + CalloutData.DesktopDelete = IntDesktopObjectDelete; + CalloutData.W32ProcessCallout = Win32kProcessCallback; + CalloutData.W32ThreadCallout = Win32kThreadCallback; + + /* + * Register our per-process and per-thread structures. + */ + PsEstablishWin32Callouts(&CalloutData); Status = IntUserCreateSharedSectionPool(48 * 1024 * 1024, /* 48 MB by default */ &SessionSharedSectionPool);

19 years, 6 months

[ekohl] 16295: Add missing base address for cfgmgr32.dll and lsasrv.dll.

by ekohl＠svn.reactos.com

Add missing base address for cfgmgr32.dll and lsasrv.dll. Modified: trunk/reactos/baseaddress.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-06-26 17:11:20 UTC (rev 16294) +++ trunk/reactos/baseaddress.xml 2005-06-26 17:22:34 UTC (rev 16295) @@ -36,6 +36,7 @@ <property name="BASEADDRESS_LZ32" value="0x73d80000" /> <property name="BASEADDRESS_USERENV" value="0x74850000" /> <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> +<property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> <property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> <property name="BASEADDRESS_CABINET" value="0x75120000" /> <property name="BASEADDRESS_MSGINA" value="0x75970000" /> @@ -48,6 +49,7 @@ <property name="BASEADDRESS_RICHED32" value="0x76340000" /> <property name="BASEADDRESS_RICHED20" value="0x76360000" /> <property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> +<property name="BASEADDRESS_LSASRV" value="0x76540000" /> <property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> @@ -59,6 +61,7 @@ <property name="BASEADDRESS_IPHLPAPI" value="0x77300000" /> <property name="BASEADDRESS_MMDRV" value="0x77500000" /> <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> +<property name="BASEADDRESS_CFGMGR32" value="0x77700000" /> <property name="BASEADDRESS_MSAFD" value="0x777a0000" /> <property name="BASEADDRESS_MSI" value="0x777b0000" /> <property name="BASEADDRESS_SNMPAPI" value="0x777c0000" /> @@ -95,7 +98,6 @@ <property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> <property name="BASEADDRESS_COMMCTRL" value="0x75e60000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> -<property name="BASEADDRESS_LSASRV" value="0x76540000" /> <property name="BASEADDRESS_ODBC32" value="0x76660000" /> <property name="BASEADDRESS_MSACM32" value="0x77400000" /> <property name="BASEADDRESS_PACKET" value="0x77780000" />

19 years, 6 months

[ion] 16294: Fix build

by ion＠svn.reactos.com

Fix build Modified: trunk/reactos/include/ndk/pstypes.h _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-06-26 16:35:51 UTC (rev 16293) +++ trunk/reactos/include/ndk/pstypes.h 2005-06-26 17:11:20 UTC (rev 16294) @@ -256,6 +256,7 @@ #ifndef NTOS_MODE_USER #include "mmtypes.h" +#include "obtypes.h" #include "extypes.h" #include "setypes.h"

19 years, 6 months

[ion] 16293: Finalize organization of rtlfuncs.h and update FIXME status.

by ion＠svn.reactos.com

Finalize organization of rtlfuncs.h and update FIXME status. Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/zwfuncs.h _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-06-26 16:35:17 UTC (rev 16292) +++ trunk/reactos/include/ndk/fixmes.txt 2005-06-26 16:35:51 UTC (rev 16293) @@ -13,10 +13,10 @@ Priority 1: - LDR_DATA_TABLE_ENTRY has a ROSSYM Hack (GvG) [ldrtypes.h] - FIXED: LDR_FLAGS are not correct (Alex) [ldrtypes.h] - - FIXED: Remove extra Process Info classes from ddk [zwtypes.h] + - FIXED: Remove extra Process Info classes from ddk (Alex) [zwtypes.h] - FIXED: PsEstablishWin32Callouts + Parameters don't match NT (Alex) [obtypes.h] - - PROCESS_SET_PORT was removed, ThomasW did a patch about this? (Thomas) [pstypes.h] - - Some files need cleanup (Alex + Eric) [zwfuncs.h, rtlfuncs.h, rtltypes.h] + - FIXED: PROCESS_SET_PORT was removed, ThomasW did a patch about this? (Thomas) [pstypes.h] + - FIXED: Some files need cleanup (Alex + Eric) [zwfuncs.h, rtlfuncs.h, rtltypes.h] Priority 2: - DEVICE_NODE has 2 fields not part of NT's defintion [iotypes.h] _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-06-26 16:35:17 UTC (rev 16292) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-06-26 16:35:51 UTC (rev 16293) @@ -16,8 +16,6 @@ /* PROTOTYPES ****************************************************************/ -/* FIXME: FILE NEEDS SOME ALPHABETIZING AND REGROUP */ - /* * Error and Exception Functions */ @@ -60,10 +58,10 @@ VOID STDCALL RtlUnwind( - PEXCEPTION_REGISTRATION RegistrationFrame, - PVOID ReturnAddress, - PEXCEPTION_RECORD ExceptionRecord, - DWORD EaxValue + PEXCEPTION_REGISTRATION RegistrationFrame, + PVOID ReturnAddress, + PEXCEPTION_RECORD ExceptionRecord, + DWORD EaxValue ); /* @@ -759,10 +757,6 @@ ); /* - * Ansi->Multibyte String Functions - */ - -/* * Ansi->Unicode String Functions */ NTSTATUS @@ -843,6 +837,14 @@ IN OUT PUNICODE_STRING DestinationString, IN PCWSTR SourceString); +ULONG +STDCALL +RtlIsTextUnicode( + PVOID Buffer, + ULONG Length, + ULONG *Flags +); + BOOLEAN STDCALL RtlPrefixUnicodeString( @@ -979,8 +981,6 @@ /* * Process Management Functions */ -/* FIXME: Some of these will be split up into enviro/path functions */ - VOID STDCALL RtlAcquirePebLock(VOID); @@ -1017,21 +1017,6 @@ NTSTATUS STDCALL -RtlDestroyProcessParameters(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters); - -VOID -STDCALL -RtlReleasePebLock(VOID); - -NTSTATUS -STDCALL -RtlCreateEnvironment( - BOOLEAN Inherit, - PWSTR *Environment -); - -NTSTATUS -STDCALL RtlCreateUserThread( IN HANDLE ProcessHandle, IN PSECURITY_DESCRIPTOR SecurityDescriptor, @@ -1047,25 +1032,34 @@ PRTL_USER_PROCESS_PARAMETERS STDCALL -RtlDeNormalizeProcessParams( - IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters -); +RtlDeNormalizeProcessParams(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters); +NTSTATUS +STDCALL +RtlDestroyProcessParameters(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters); + +PRTL_USER_PROCESS_PARAMETERS +STDCALL +RtlNormalizeProcessParams(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters); + VOID STDCALL -RtlDestroyEnvironment( - PWSTR Environment -); +RtlReleasePebLock(VOID); +/* + * Environment/Path Functions + */ NTSTATUS STDCALL -RtlExpandEnvironmentStrings_U( - PWSTR Environment, - PUNICODE_STRING Source, - PUNICODE_STRING Destination, - PULONG Length +RtlCreateEnvironment( + BOOLEAN Inherit, + PWSTR *Environment ); +VOID +STDCALL +RtlDestroyEnvironment(PWSTR Environment); + BOOLEAN STDCALL RtlDoesFileExists_U(PWSTR FileName); @@ -1085,6 +1079,24 @@ WCHAR **shortname ); +BOOLEAN +STDCALL +RtlDosPathNameToNtPathName_U( + PWSTR DosName, + PUNICODE_STRING NtName, + PWSTR *ShortName, + PCURDIR CurrentDirectory +); + +NTSTATUS +STDCALL +RtlExpandEnvironmentStrings_U( + PWSTR Environment, + PUNICODE_STRING Source, + PUNICODE_STRING Destination, + PULONG Length +); + ULONG STDCALL RtlGetCurrentDirectory_U( @@ -1101,10 +1113,12 @@ WCHAR **shortname ); -PRTL_USER_PROCESS_PARAMETERS +BOOLEAN STDCALL -RtlNormalizeProcessParams( - IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters +RtlIsNameLegalDOS8Dot3( + IN PUNICODE_STRING UnicodeName, + IN PANSI_STRING AnsiName, + PBOOLEAN Unknown ); NTSTATUS @@ -1211,7 +1225,6 @@ IN PRTL_RESOURCE Resource ); - /* * Compression Functions */ @@ -1394,43 +1407,43 @@ */ PRTL_HANDLE_TABLE_ENTRY STDCALL -RtlAllocateHandle ( - IN PRTL_HANDLE_TABLE HandleTable, - IN OUT PULONG Index +RtlAllocateHandle( + IN PRTL_HANDLE_TABLE HandleTable, + IN OUT PULONG Index ); VOID STDCALL -RtlDestroyHandleTable (IN PRTL_HANDLE_TABLE HandleTable); +RtlDestroyHandleTable(IN PRTL_HANDLE_TABLE HandleTable); BOOLEAN STDCALL -RtlFreeHandle ( - IN PRTL_HANDLE_TABLE HandleTable, - IN PRTL_HANDLE_TABLE_ENTRY Handle +RtlFreeHandle( + IN PRTL_HANDLE_TABLE HandleTable, + IN PRTL_HANDLE_TABLE_ENTRY Handle ); VOID STDCALL -RtlInitializeHandleTable ( - IN ULONG TableSize, - IN ULONG HandleSize, - IN PRTL_HANDLE_TABLE HandleTable +RtlInitializeHandleTable( + IN ULONG TableSize, + IN ULONG HandleSize, + IN PRTL_HANDLE_TABLE HandleTable ); BOOLEAN STDCALL -RtlIsValidHandle ( - IN PRTL_HANDLE_TABLE HandleTable, - IN PRTL_HANDLE_TABLE_ENTRY Handle +RtlIsValidHandle( + IN PRTL_HANDLE_TABLE HandleTable, + IN PRTL_HANDLE_TABLE_ENTRY Handle ); BOOLEAN STDCALL -RtlIsValidIndexHandle ( - IN PRTL_HANDLE_TABLE HandleTable, - IN OUT PRTL_HANDLE_TABLE_ENTRY *Handle, - IN ULONG Index +RtlIsValidIndexHandle( + IN PRTL_HANDLE_TABLE HandleTable, + IN OUT PRTL_HANDLE_TABLE_ENTRY *Handle, + IN ULONG Index ); /* @@ -1555,34 +1568,6 @@ RtlResetRtlTranslations(IN PNLSTABLEINFO NlsTable); /* - * Misc String Functions - */ -BOOLEAN -STDCALL -RtlDosPathNameToNtPathName_U( - PWSTR DosName, - PUNICODE_STRING NtName, - PWSTR *ShortName, - PCURDIR CurrentDirectory -); - -BOOLEAN -STDCALL -RtlIsNameLegalDOS8Dot3( - IN PUNICODE_STRING UnicodeName, - IN PANSI_STRING AnsiName, - PBOOLEAN Unknown -); - -ULONG -STDCALL -RtlIsTextUnicode( - PVOID Buffer, - ULONG Length, - ULONG *Flags -); - -/* * Misc conversion functions */ LARGE_INTEGER _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-06-26 16:35:17 UTC (rev 16292) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-06-26 16:35:51 UTC (rev 16293) @@ -19,7 +19,6 @@ /* PROTOTYPES ****************************************************************/ -/* FIXME: FILE NEEDS CLEANUP */ NTSTATUS STDCALL NtAcceptConnectPort(

19 years, 6 months

[ion] 16292: Remove depcrecated constant

by ion＠svn.reactos.com

Remove depcrecated constant Modified: trunk/reactos/include/ndk/pstypes.h _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-06-26 16:07:49 UTC (rev 16291) +++ trunk/reactos/include/ndk/pstypes.h 2005-06-26 16:35:17 UTC (rev 16292) @@ -31,9 +31,6 @@ #define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|31) #endif -/* FIXME: This was changed in XP... Ask ThomasW about it */ -#define PROCESS_SET_PORT 0x800 - #define THREAD_ALERT 0x4 #define USER_SHARED_DATA (0x7FFE0000)

19 years, 6 months

[ion] 16291: Update FIXME status.

by ion＠svn.reactos.com

Update FIXME status. Modified: trunk/reactos/include/ndk/fixmes.txt _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-06-26 16:06:32 UTC (rev 16290) +++ trunk/reactos/include/ndk/fixmes.txt 2005-06-26 16:07:49 UTC (rev 16291) @@ -12,9 +12,9 @@ List: Priority 1: - LDR_DATA_TABLE_ENTRY has a ROSSYM Hack (GvG) [ldrtypes.h] - - LDR_FLAGS are not correct (Alex) [ldrtypes.h] - - Remove extra Process Info classes from ddk [zwtypes.h] - - PsEstablishWin32Callouts + Parameters don't match NT (Alex) [obtypes.h] + - FIXED: LDR_FLAGS are not correct (Alex) [ldrtypes.h] + - FIXED: Remove extra Process Info classes from ddk [zwtypes.h] + - FIXED: PsEstablishWin32Callouts + Parameters don't match NT (Alex) [obtypes.h] - PROCESS_SET_PORT was removed, ThomasW did a patch about this? (Thomas) [pstypes.h] - Some files need cleanup (Alex + Eric) [zwfuncs.h, rtlfuncs.h, rtltypes.h]

19 years, 6 months

[ion] 16290: Fixes for NDK compatibily (and plain ol' good design): - Use correct LDRP_ flags instead of our own made up ones. - Remove extra Process Info Classes that aren't in winddk, and use an add-on enumeration in the NDK. - Make ntoskrnl even more unaware of Win32K Internals by removing the deprecated PsCreateWin32Process function, moving w32process/thread allocation to win32k, and fixing the PsEstablishWin32Callouts function to use the latest NT prototype and callout data. These changes a

by ion＠svn.reactos.com

Fixes for NDK compatibily (and plain ol' good design): - Use correct LDRP_ flags instead of our own made up ones. - Remove extra Process Info Classes that aren't in winddk, and use an add-on enumeration in the NDK. - Make ntoskrnl even more unaware of Win32K Internals by removing the deprecated PsCreateWin32Process function, moving w32process/thread allocation to win32k, and fixing the PsEstablishWin32Callouts function to use the latest NT prototype and callout data. These changes are similar to the ones done in NT. Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/include/ndk/ketypes.h 2005-06-26 16:06:32 UTC (rev 16290) @@ -251,13 +251,38 @@ ULONG PageFrameNumber : 20; } HARDWARE_PTE_X86, *PHARDWARE_PTE_X86; +typedef struct _DESCRIPTOR +{ + WORD Pad; + WORD Limit; + DWORD Base; +} KDESCRIPTOR, *PKDESCRIPTOR; + +typedef struct _KSPECIAL_REGISTERS +{ + DWORD Cr0; + DWORD Cr2; + DWORD Cr3; + DWORD Cr4; + DWORD KernelDr0; + DWORD KernelDr1; + DWORD KernelDr2; + DWORD KernelDr3; + DWORD KernelDr6; + DWORD KernelDr7; + KDESCRIPTOR Gdtr; + KDESCRIPTOR Idtr; + WORD Tr; + WORD Ldtr; + DWORD Reserved[6]; +} KSPECIAL_REGISTERS, *PKSPECIAL_REGISTERS; + #pragma pack(push,4) -/* Fixme: Use correct types? */ typedef struct _KPROCESSOR_STATE { PCONTEXT ContextFrame; - PVOID SpecialRegisters; + KSPECIAL_REGISTERS SpecialRegisters; } KPROCESSOR_STATE; /* Processor Control Block */ _____ Modified: trunk/reactos/include/ndk/ldrtypes.h --- trunk/reactos/include/ndk/ldrtypes.h 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/include/ndk/ldrtypes.h 2005-06-26 16:06:32 UTC (rev 16290) @@ -19,19 +19,24 @@ #define RESOURCE_LANGUAGE_LEVEL 2 #define RESOURCE_DATA_LEVEL 3 -/* FIXME: USE CORRRECT LDR_ FLAGS */ -#define IMAGE_DLL 0x00000004 -#define LOAD_IN_PROGRESS 0x00001000 -#define UNLOAD_IN_PROGRESS 0x00002000 -#define ENTRY_PROCESSED 0x00004000 -#define DONT_CALL_FOR_THREAD 0x00040000 -#define PROCESS_ATTACH_CALLED 0x00080000 -#define IMAGE_NOT_AT_BASE 0x00200000 +/* LDR_DATA_TABLE_ENTRY Flags */ +#define LDRP_STATIC_LINK 0x00000002 +#define LDRP_IMAGE_DLL 0x00000004 +#define LDRP_LOAD_IN_PROGRESS 0x00001000 +#define LDRP_UNLOAD_IN_PROGRESS 0x00002000 +#define LDRP_ENTRY_PROCESSED 0x00004000 +#define LDRP_ENTRY_INSERTED 0x00008000 +#define LDRP_CURRENT_LOAD 0x00010000 +#define LDRP_FAILED_BUILTIN_LOAD 0x00020000 +#define LDRP_DONT_CALL_FOR_THREADS 0x00040000 +#define LDRP_PROCESS_ATTACH_CALLED 0x00080000 +#define LDRP_DEBUG_SYMBOLS_LOADED 0x00100000 +#define LDRP_IMAGE_NOT_AT_BASE 0x00200000 +#define LDRP_WX86_IGNORE_MACHINETYPE 0x00400000 /* ENUMERATIONS **************************************************************/ /* TYPES *********************************************************************/ -/* FIXME: Update with _LDR_DATA_TABLE_ENTRY and LDR_ flags */ typedef struct _PEB_LDR_DATA { ULONG Length; @@ -54,8 +59,8 @@ UNICODE_STRING FullDllName; UNICODE_STRING BaseDllName; ULONG Flags; - USHORT LoadCount; /* FIXME: HACK!!! FIX ASAP */ - USHORT TlsIndex; /* FIXME: HACK!!! FIX ASAP */ + USHORT LoadCount; + USHORT TlsIndex; LIST_ENTRY HashLinks; PVOID SectionPointer; ULONG CheckSum; _____ Modified: trunk/reactos/include/ndk/obtypes.h --- trunk/reactos/include/ndk/obtypes.h 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/include/ndk/obtypes.h 2005-06-26 16:06:32 UTC (rev 16290) @@ -115,17 +115,6 @@ /* TYPES *********************************************************************/ -/* FIXME: Does this match NT's? */ -typedef struct _W32_OBJECT_CALLBACK -{ - OB_OPEN_METHOD WinStaCreate; - OB_PARSE_METHOD WinStaParse; - OB_DELETE_METHOD WinStaDelete; - OB_FIND_METHOD WinStaFind; - OB_CREATE_METHOD DesktopCreate; - OB_DELETE_METHOD DesktopDelete; -} W32_OBJECT_CALLBACK, *PW32_OBJECT_CALLBACK; - typedef struct _OBJECT_BASIC_INFORMATION { ULONG Attributes; _____ Modified: trunk/reactos/include/ndk/psfuncs.h --- trunk/reactos/include/ndk/psfuncs.h 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/include/ndk/psfuncs.h 2005-06-26 16:06:32 UTC (rev 16290) @@ -14,8 +14,30 @@ /* PROTOTYPES ****************************************************************/ +PVOID +STDCALL +PsGetProcessWin32Process(PEPROCESS Process); + VOID STDCALL +PsSetProcessWin32Process( + PEPROCESS Process, + PVOID Win32Process +); + +VOID +STDCALL +PsSetThreadWin32Thread( + PETHREAD Thread, + PVOID Win32Thread +); + +PVOID +STDCALL +PsGetThreadWin32Thread(PETHREAD Thread); + +VOID +STDCALL PsRevertThreadToSelf( IN struct _ETHREAD* Thread ); @@ -34,14 +56,7 @@ VOID STDCALL -PsEstablishWin32Callouts( - PW32_PROCESS_CALLBACK W32ProcessCallback, - PW32_THREAD_CALLBACK W32ThreadCallback, - PW32_OBJECT_CALLBACK W32ObjectCallback, - PVOID Param4, - ULONG W32ThreadSize, - ULONG W32ProcessSize -); +PsEstablishWin32Callouts(PW32_CALLOUT_DATA CalloutData); HANDLE STDCALL _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/include/ndk/pstypes.h 2005-06-26 16:06:32 UTC (rev 16290) @@ -617,6 +617,29 @@ } EJOB, *PEJOB; #include <poppack.h> +typedef struct _W32_CALLOUT_DATA +{ + PW32_PROCESS_CALLBACK W32ProcessCallout; + PW32_THREAD_CALLBACK W32ThreadCallout; + PVOID UserGlobalAtomTableCallout; + PVOID UserPowerEventCallout; + PVOID UserPowerStateCallout; + PVOID UserJobCallout; + PVOID NtGdiUserFlushUserBatch; + OB_OPEN_METHOD DesktopOpen; + PVOID DesktopUnmap; + OB_DELETE_METHOD DesktopDelete; + OB_OKAYTOCLOSE_METHOD WinstaOkayToClose; + OB_DELETE_METHOD WinStaDelete; + OB_PARSE_METHOD WinStaParse; + OB_OPEN_METHOD WinStaOpen; + + /* FIXME: These are ROS-ONLY and are fixed in a future local patch */ + OB_FIND_METHOD WinStaFind; + OB_OPEN_METHOD WinStaCreate; + OB_CREATE_METHOD DesktopCreate; +} W32_CALLOUT_DATA, *PW32_CALLOUT_DATA; + #endif #endif _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/include/ndk/zwtypes.h 2005-06-26 16:06:32 UTC (rev 16290) @@ -95,16 +95,14 @@ /* * 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, ProcessUnknown34, ProcessUnknown35, - ProcessCookie + ProcessCookie, + MaximumProcessInformationClass } PROCESS_INFORMATION_FLAGS; -#endif /* * System _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-06-26 16:06:32 UTC (rev 16290) @@ -366,7 +366,7 @@ FullNtDllPath); RtlCreateUnicodeString (&NtModule->BaseDllName, L"ntdll.dll"); - NtModule->Flags = IMAGE_DLL|ENTRY_PROCESSED; + NtModule->Flags = LDRP_IMAGE_DLL|LDRP_ENTRY_PROCESSED; NtModule->LoadCount = -1; /* don't unload */ NtModule->TlsIndex = -1; @@ -415,7 +415,7 @@ &ExeModule->BaseDllName, &ExeModule->FullDllName); - ExeModule->Flags = ENTRY_PROCESSED; + ExeModule->Flags = LDRP_ENTRY_PROCESSED; ExeModule->LoadCount = -1; /* don't unload */ ExeModule->TlsIndex = -1; ExeModule->SectionPointer = NULL; _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-26 16:06:32 UTC (rev 16290) @@ -170,7 +170,7 @@ static BOOLEAN LdrpCallDllEntry(PLDR_DATA_TABLE_ENTRY Module, DWORD dwReason, PVOID lpReserved) { - if (!(Module->Flags & IMAGE_DLL) || + if (!(Module->Flags & LDRP_IMAGE_DLL) || Module->EntryPoint == 0) { return TRUE; @@ -1723,7 +1723,7 @@ { BOOLEAN WrongForwarder; WrongForwarder = FALSE; - if (ImportedModule->Flags & IMAGE_NOT_AT_BASE) + if (ImportedModule->Flags & LDRP_IMAGE_NOT_AT_BASE) { TRACE_LDR("%wZ has stale binding to %s\n", &Module->BaseDllName, ImportedName); @@ -1757,7 +1757,7 @@ LdrpDecrementLoadCount(Module, FALSE); } if (ForwarderModule->TimeDateStamp != BoundForwarderRef->TimeDateStamp || - ForwarderModule->Flags & IMAGE_NOT_AT_BASE) + ForwarderModule->Flags & LDRP_IMAGE_NOT_AT_BASE) { TRACE_LDR("%wZ has stale binding to %s\n", &Module->BaseDllName, ForwarderName); @@ -1771,7 +1771,7 @@ } } if (WrongForwarder || - ImportedModule->Flags & IMAGE_NOT_AT_BASE) + ImportedModule->Flags & LDRP_IMAGE_NOT_AT_BASE) { Status = LdrpProcessImportDirectory(Module, ImportedModule, ImportedName); if (!NT_SUCCESS(Status)) @@ -1780,7 +1780,7 @@ return Status; } } - else if (ImportedModule->Flags & IMAGE_NOT_AT_BASE) + else if (ImportedModule->Flags & LDRP_IMAGE_NOT_AT_BASE) { TRACE_LDR("Adjust imports for %s from %wZ\n", ImportedName, &Module->BaseDllName); @@ -1938,7 +1938,7 @@ if (ImageBase != (PVOID) NTHeaders->OptionalHeader.ImageBase) { - (*Module)->Flags |= IMAGE_NOT_AT_BASE; + (*Module)->Flags |= LDRP_IMAGE_NOT_AT_BASE; } /* @@ -2107,11 +2107,11 @@ (*Module)->SectionPointer = SectionHandle; if (ImageBase != (PVOID) NtHeaders->OptionalHeader.ImageBase) { - (*Module)->Flags |= IMAGE_NOT_AT_BASE; + (*Module)->Flags |= LDRP_IMAGE_NOT_AT_BASE; } if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_DLL) { - (*Module)->Flags |= IMAGE_DLL; + (*Module)->Flags |= LDRP_IMAGE_DLL; } /* fixup the imported calls entry points */ Status = LdrFixupImports(SearchPath, *Module); @@ -2292,7 +2292,7 @@ { if (Module->TlsIndex == 0xFFFF) { - Module->Flags |= DONT_CALL_FOR_THREAD; + Module->Flags |= LDRP_DONT_CALL_FOR_THREADS; Status = STATUS_SUCCESS; } break; @@ -2420,15 +2420,15 @@ { Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); if (((UnloadAll && Module->LoadCount <= 0) || Module->LoadCount == 0) && - Module->Flags & ENTRY_PROCESSED && - !(Module->Flags & UNLOAD_IN_PROGRESS)) + Module->Flags & LDRP_ENTRY_PROCESSED && + !(Module->Flags & LDRP_UNLOAD_IN_PROGRESS)) { - Module->Flags |= UNLOAD_IN_PROGRESS; + Module->Flags |= LDRP_UNLOAD_IN_PROGRESS; if (Module == LdrpLastModule) { LdrpLastModule = NULL; } - if (Module->Flags & PROCESS_ATTACH_CALLED) + if (Module->Flags & LDRP_PROCESS_ATTACH_CALLED) { TRACE_LDR("Unload %wZ - Calling entry point at %x\n", &Module->BaseDllName, Module->EntryPoint); @@ -2453,7 +2453,7 @@ { Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); Entry = Entry->Blink; - if (Module->Flags & UNLOAD_IN_PROGRESS && + if (Module->Flags & LDRP_UNLOAD_IN_PROGRESS && ((UnloadAll && Module->LoadCount != 0xFFFF) || Module->LoadCount == 0)) { /* remove the module entry from the list */ @@ -2512,9 +2512,9 @@ while (Entry != ModuleListHead) { Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); - if (!(Module->Flags & (LOAD_IN_PROGRESS|UNLOAD_IN_PROGRESS|ENTRY_PROCESSED))) + if (!(Module->Flags & (LDRP_LOAD_IN_PROGRESS|LDRP_UNLOAD_IN_PROGRESS|LDRP_ENTRY_PROCESSED))) { - Module->Flags |= LOAD_IN_PROGRESS; + Module->Flags |= LDRP_LOAD_IN_PROGRESS; TRACE_LDR("%wZ loaded - Calling init routine at %x for process attaching\n", &Module->BaseDllName, Module->EntryPoint); Result = LdrpCallDllEntry(Module, DLL_PROCESS_ATTACH, (PVOID)(Module->LoadCount == 0xFFFF ? 1 : 0)); @@ -2523,15 +2523,15 @@ Status = STATUS_DLL_INIT_FAILED; break; } - if (Module->Flags & IMAGE_DLL && Module->EntryPoint != 0) + if (Module->Flags & LDRP_IMAGE_DLL && Module->EntryPoint != 0) { - Module->Flags |= PROCESS_ATTACH_CALLED|ENTRY_PROCESSED; + Module->Flags |= LDRP_PROCESS_ATTACH_CALLED|LDRP_ENTRY_PROCESSED; } else { - Module->Flags |= ENTRY_PROCESSED; + Module->Flags |= LDRP_ENTRY_PROCESSED; } - Module->Flags &= ~LOAD_IN_PROGRESS; + Module->Flags &= ~LDRP_LOAD_IN_PROGRESS; } Entry = Entry->Flink; } @@ -2578,9 +2578,9 @@ while (Entry != ModuleListHead) { Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); - if (Module->Flags & PROCESS_ATTACH_CALLED && - !(Module->Flags & DONT_CALL_FOR_THREAD) && - !(Module->Flags & UNLOAD_IN_PROGRESS)) + if (Module->Flags & LDRP_PROCESS_ATTACH_CALLED && + !(Module->Flags & LDRP_DONT_CALL_FOR_THREADS) && + !(Module->Flags & LDRP_UNLOAD_IN_PROGRESS)) { TRACE_LDR("%wZ - Calling entry point at %x for thread attaching\n", &Module->BaseDllName, Module->EntryPoint); @@ -2623,9 +2623,9 @@ { Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); - if (Module->Flags & PROCESS_ATTACH_CALLED && - !(Module->Flags & DONT_CALL_FOR_THREAD) && - !(Module->Flags & UNLOAD_IN_PROGRESS)) + if (Module->Flags & LDRP_PROCESS_ATTACH_CALLED && + !(Module->Flags & LDRP_DONT_CALL_FOR_THREADS) && + !(Module->Flags & LDRP_UNLOAD_IN_PROGRESS)) { TRACE_LDR("%wZ - Calling entry point at %x for thread detaching\n", &Module->BaseDllName, Module->EntryPoint); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-26 16:06:32 UTC (rev 16290) @@ -43,7 +43,7 @@ /* * Defines a descriptor as it appears in the processor tables */ -typedef struct _DESCRIPTOR +typedef struct __DESCRIPTOR { ULONG a; ULONG b; _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-06-26 16:06:32 UTC (rev 16290) @@ -871,11 +871,10 @@ PsChargeProcessPoolQuota@12 PsCreateSystemProcess@12 PsCreateSystemThread@28 -PsCreateWin32Process@4 PsDereferenceImpersonationToken@4=PsDereferencePrimaryToken@4 PsDereferencePrimaryToken@4 PsDisableImpersonation@8 -PsEstablishWin32Callouts@24 +PsEstablishWin32Callouts@4 PsGetCurrentProcessId@0 PsGetCurrentProcessSessionId@0 PsGetCurrentThreadId@0 _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-06-26 16:06:32 UTC (rev 16290) @@ -669,6 +669,20 @@ return (HANDLE)Process->Session; } +struct _W32THREAD* +STDCALL +PsGetWin32Thread(VOID) +{ + return(PsGetCurrentThread()->Tcb.Win32Thread); +} + +struct _W32PROCESS* +STDCALL +PsGetWin32Process(VOID) +{ + return (struct _W32PROCESS*)PsGetCurrentProcess()->Win32Process; +} + /* * @implemented */ _____ Modified: trunk/reactos/ntoskrnl/ps/win32.c --- trunk/reactos/ntoskrnl/ps/win32.c 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/ntoskrnl/ps/win32.c 2005-06-26 16:06:32 UTC (rev 16290) @@ -18,8 +18,6 @@ static PW32_PROCESS_CALLBACK PspWin32ProcessCallback = NULL; static PW32_THREAD_CALLBACK PspWin32ThreadCallback = NULL; -static ULONG PspWin32ProcessSize = 0; -static ULONG PspWin32ThreadSize = 0; extern OB_OPEN_METHOD ExpWindowStationObjectOpen; extern OB_PARSE_METHOD ExpWindowStationObjectParse; @@ -45,106 +43,48 @@ /* FUNCTIONS ***************************************************************/ -struct _W32THREAD* -STDCALL -PsGetWin32Thread(VOID) -{ - return(PsGetCurrentThread()->Tcb.Win32Thread); -} - -struct _W32PROCESS* -STDCALL -PsGetWin32Process(VOID) -{ - return (struct _W32PROCESS*)PsGetCurrentProcess()->Win32Process; -} - -NTSTATUS STDCALL -PsCreateWin32Process(PEPROCESS Process) -{ - if (Process->Win32Process != NULL) - return(STATUS_SUCCESS); - - Process->Win32Process = ExAllocatePool(NonPagedPool, - PspWin32ProcessSize); - if (Process->Win32Process == NULL) - return(STATUS_NO_MEMORY); - - RtlZeroMemory(Process->Win32Process, - PspWin32ProcessSize); - - return(STATUS_SUCCESS); -} - - /* * @implemented */ -VOID STDCALL -PsEstablishWin32Callouts (PW32_PROCESS_CALLBACK W32ProcessCallback, - PW32_THREAD_CALLBACK W32ThreadCallback, - PW32_OBJECT_CALLBACK W32ObjectCallback, - PVOID Param4, - ULONG W32ThreadSize, - ULONG W32ProcessSize) +VOID +STDCALL +PsEstablishWin32Callouts(PW32_CALLOUT_DATA CalloutData) { - PspWin32ProcessCallback = W32ProcessCallback; - PspWin32ThreadCallback = W32ThreadCallback; - - PspWin32ProcessSize = W32ProcessSize; - PspWin32ThreadSize = W32ThreadSize; - - ExpWindowStationObjectOpen = W32ObjectCallback->WinStaCreate; - ExpWindowStationObjectParse = W32ObjectCallback->WinStaParse; - ExpWindowStationObjectDelete = W32ObjectCallback->WinStaDelete; - ExpWindowStationObjectFind = W32ObjectCallback->WinStaFind; - ExpDesktopObjectCreate = W32ObjectCallback->DesktopCreate; - ExpDesktopObjectDelete = W32ObjectCallback->DesktopDelete; + PspWin32ProcessCallback = CalloutData->W32ProcessCallout; + PspWin32ThreadCallback = CalloutData->W32ThreadCallout; + ExpWindowStationObjectOpen = CalloutData->WinStaCreate; + ExpWindowStationObjectParse = CalloutData->WinStaParse; + ExpWindowStationObjectDelete = CalloutData->WinStaDelete; + ExpWindowStationObjectFind = CalloutData->WinStaFind; + ExpDesktopObjectCreate = CalloutData->DesktopCreate; + ExpDesktopObjectDelete = CalloutData->DesktopDelete; } NTSTATUS PsInitWin32Thread (PETHREAD Thread) { - PEPROCESS Process; + PEPROCESS Process; + NTSTATUS Status; - Process = Thread->ThreadsProcess; + Process = Thread->ThreadsProcess; - if (Process->Win32Process == NULL) + if (Process->Win32Process == NULL) { - /* FIXME - lock the process */ - Process->Win32Process = ExAllocatePool (NonPagedPool, - PspWin32ProcessSize); - - if (Process->Win32Process == NULL) - return STATUS_NO_MEMORY; - - RtlZeroMemory (Process->Win32Process, - PspWin32ProcessSize); - /* FIXME - unlock the process */ - - if (PspWin32ProcessCallback != NULL) - { - PspWin32ProcessCallback (Process, TRUE); - } + if (PspWin32ProcessCallback != NULL) + { + Status = PspWin32ProcessCallback(Process, TRUE); + } } - if (Thread->Tcb.Win32Thread == NULL) + if (Thread->Tcb.Win32Thread == NULL) { - Thread->Tcb.Win32Thread = ExAllocatePool (NonPagedPool, - PspWin32ThreadSize); - if (Thread->Tcb.Win32Thread == NULL) - return STATUS_NO_MEMORY; - - RtlZeroMemory (Thread->Tcb.Win32Thread, - PspWin32ThreadSize); - - if (PspWin32ThreadCallback != NULL) - { - PspWin32ThreadCallback (Thread, TRUE); - } + if (PspWin32ThreadCallback != NULL) + { + Status = PspWin32ThreadCallback(Thread, TRUE); + } } - return(STATUS_SUCCESS); + return Status; } _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-26 15:49:56 UTC (rev 16289) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-26 16:06:32 UTC (rev 16290) @@ -4330,10 +4330,6 @@ ProcessDebugObjectHandle, ProcessDebugFlags, ProcessHandleTracing, - ProcessUnknown33, - ProcessUnknown34, - ProcessUnknown35, - ProcessCookie, MaxProcessInfoClass } PROCESSINFOCLASS;

19 years, 6 months

[jimtabor] 16289: Setup support for ShowOwnedPopups and expand new function in NtUserCallTwoParam.

by jimtabor＠svn.reactos.com

Setup support for ShowOwnedPopups and expand new function in NtUserCallTwoParam. Modified: trunk/reactos/include/win32k/ntuser.h _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-06-26 15:22:44 UTC (rev 16288) +++ trunk/reactos/include/win32k/ntuser.h 2005-06-26 15:49:56 UTC (rev 16289) @@ -220,6 +220,7 @@ #define TWOPARAM_ROUTINE_GETSYSCOLORPENS 0x64 #define TWOPARAM_ROUTINE_GETSYSCOLORS 0x65 #define TWOPARAM_ROUTINE_SETSYSCOLORS 0x66 +#define TWOPARAM_ROUTINE_ROS_SHOWWINDOW 0x1000 DWORD STDCALL NtUserCallTwoParam(

19 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
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