Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 16258: Dmitry Philippov (shedon@mail.ru): implement GetCommConfig and SetCommConfig
by hpoussin＠svn.reactos.com 24 Jun '05

24 Jun '05

Dmitry Philippov (shedon(a)mail.ru): implement GetCommConfig and SetCommConfig Modified: trunk/reactos/lib/kernel32/misc/comm.c _____ Modified: trunk/reactos/lib/kernel32/misc/comm.c --- trunk/reactos/lib/kernel32/misc/comm.c 2005-06-24 18:11:16 UTC (rev 16257) +++ trunk/reactos/lib/kernel32/misc/comm.c 2005-06-24 18:19:40 UTC (rev 16258) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/misc/comm.c @@ -8,6 +7,7 @@ * modified from WINE [ Onno Hovers, (onno(a)stack.urc.tue.nl) ] * Robert Dickenson (robd(a)mok.lvcom.com) * Saveliy Tretiakov (saveliyt(a)mail.ru) + * Dmitry Philippov (shedon(a)mail.ru) * UPDATE HISTORY: * Created 01/11/98 * RDD (30/09/2002) implemented many function bodies to call serial driver. @@ -15,6 +15,8 @@ * ST (21/03/2005) implemented GetCommProperties * ST (24/03/2005) implemented ClearCommError. Corrected many functions. * ST (05/04/2005) implemented CommConfigDialog + * DP (11/06/2005) implemented GetCommConfig + * DP (12/06/2005) implemented SetCommConfig * */ @@ -927,14 +929,64 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL GetCommConfig(HANDLE hCommDev, LPCOMMCONFIG lpCC, LPDWORD lpdwSize) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + BOOL ReturnValue = FALSE; + + DPRINT("GetCommConfig(%d, %p, %p)\n", hCommDev, lpCC, lpdwSize); + + hProcessHeap = GetProcessHeap(); + + LPCOMMPROP lpComPort = RtlAllocateHeap( hProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(COMMPROP) + 0x100 ); + if(NULL == lpComPort) { + DPRINT("GetCommConfig() - ERROR_NOT_ENOUGH_MEMORY\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if( (NULL == lpdwSize) + || (NULL == lpCC) ) { + DPRINT("GetCommConfig() - invalid parameter\n"); + SetLastError(STATUS_INVALID_PARAMETER); + ReturnValue = FALSE; + } + else + { + lpComPort->wPacketLength = sizeof(COMMPROP) + 0x100; + lpComPort->dwProvSpec1 = COMMPROP_INITIALIZED; + ReturnValue = GetCommProperties(hCommDev, lpComPort); + if( ReturnValue ) + { + lpCC->dwSize = sizeof(COMMCONFIG); + lpCC->wVersion = 1; + lpCC->wReserved = 0; + lpCC->dwProviderSubType = lpComPort->dwProvSubType; + lpCC->dwProviderSize = lpComPort->dwProvSpec2; + *lpdwSize = lpCC->dwSize+lpCC->dwProviderSize; + if( 0 == lpComPort->dwProvSpec2 ) { + lpCC->dwProviderOffset = 0; + } else { + lpCC->dwProviderOffset = (ULONG_PTR)&lpCC->wcProviderData[0] - (ULONG_PTR)lpCC; + } + if( (lpCC->dwProviderSize+lpCC->dwSize) > *lpdwSize ) { + DPRINT("GetCommConfig() - STATUS_BUFFER_TOO_SMALL\n"); + SetLastError(STATUS_BUFFER_TOO_SMALL); + ReturnValue = FALSE; + } else { + RtlCopyMemory(lpCC->wcProviderData, lpComPort->wcProvChar, lpCC->dwProviderSize); + ReturnValue = GetCommState(hCommDev, &lpCC->dcb); + } + } + } + + RtlFreeHeap(hProcessHeap, 0, lpComPort); + return (ReturnValue); } @@ -1160,14 +1212,28 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL SetCommConfig(HANDLE hCommDev, LPCOMMCONFIG lpCC, DWORD dwSize) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + BOOL ReturnValue = FALSE; + + DPRINT("SetCommConfig(%d, %p, %d)\n", hCommDev, lpCC, dwSize); + + if(NULL == lpCC) + { + DPRINT("SetCommConfig() - invalid parameter\n"); + SetLastError(STATUS_INVALID_PARAMETER); + ReturnValue = FALSE; + } + else + { + ReturnValue = SetCommState(hCommDev, &lpCC->dcb); + } + + return ReturnValue; }

1 0

[weiden] 16257: - Moved ntdll's atom table implementation to rtl, rewrote it to use proper structures and share the generic implementation between ntoskrnl and ntdll
by weiden＠svn.reactos.com 24 Jun '05

24 Jun '05

- Moved ntdll's atom table implementation to rtl, rewrote it to use proper structures and share the generic implementation between ntoskrnl and ntdll - Updated the rtl handle table implementation to use proper structures. Reserved handles are not yet supported correctly. 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/ntdll/rtl.h Modified: trunk/reactos/include/ntos/rtltypes.h Modified: trunk/reactos/lib/ntdll/ntdll.xml Deleted: trunk/reactos/lib/ntdll/rtl/atom.c Modified: trunk/reactos/lib/ntdll/rtl/handle.c Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Added: trunk/reactos/lib/rtl/atom.c Modified: trunk/reactos/lib/rtl/rtl.xml Deleted: trunk/reactos/ntoskrnl/include/internal/handle.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Modified: trunk/reactos/ntoskrnl/rtl/atom.c Deleted: trunk/reactos/ntoskrnl/rtl/handle.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-06-24 16:39:49 UTC (rev 16256) +++ trunk/reactos/include/ndk/extypes.h 2005-06-24 18:11:16 UTC (rev 16257) @@ -86,7 +86,7 @@ ERESOURCE HandleTableLock; LIST_ENTRY HandleTableList; KEVENT HandleContentionEvent; -} HANDLE_TABLE; +} HANDLE_TABLE, *PHANDLE_TABLE; #endif _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-06-24 16:39:49 UTC (rev 16256) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-06-24 18:11:16 UTC (rev 16257) @@ -859,6 +859,14 @@ PULONG Value ); +NTSTATUS +STDCALL +RtlHashUnicodeString( + IN CONST UNICODE_STRING *String, + IN BOOLEAN CaseInSensitive, + IN ULONG HashAlgorithm, + OUT PULONG HashValue); + /* * Ansi String Functions */ @@ -1333,7 +1341,7 @@ /* * Handle Table Functions */ -PRTL_HANDLE +PRTL_HANDLE_TABLE_ENTRY STDCALL RtlAllocateHandle ( IN PRTL_HANDLE_TABLE HandleTable, @@ -1348,7 +1356,7 @@ STDCALL RtlFreeHandle ( IN PRTL_HANDLE_TABLE HandleTable, - IN PRTL_HANDLE Handle + IN PRTL_HANDLE_TABLE_ENTRY Handle ); VOID @@ -1363,15 +1371,15 @@ STDCALL RtlIsValidHandle ( IN PRTL_HANDLE_TABLE HandleTable, - IN PRTL_HANDLE Handle + IN PRTL_HANDLE_TABLE_ENTRY Handle ); BOOLEAN STDCALL RtlIsValidIndexHandle ( - IN PRTL_HANDLE_TABLE HandleTable, - IN OUT PRTL_HANDLE *Handle, - IN ULONG Index + IN PRTL_HANDLE_TABLE HandleTable, + IN OUT PRTL_HANDLE_TABLE_ENTRY *Handle, + IN ULONG Index ); /* _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-06-24 16:39:49 UTC (rev 16256) +++ trunk/reactos/include/ndk/rtltypes.h 2005-06-24 18:11:16 UTC (rev 16257) @@ -50,6 +50,13 @@ #define PDI_HEAP_TAGS 0x08 /* The heap tags */ #define PDI_HEAP_BLOCKS 0x10 /* The heap blocks */ #define PDI_LOCKS 0x20 /* The locks created by the process */ + +/* RTL Handle Flags */ +#define RTL_HANDLE_VALID 0x1 + +/* RTL Atom Flags */ +#define RTL_ATOM_IS_PINNED 0x1 + /* ENUMERATIONS **************************************************************/ typedef enum @@ -173,20 +180,23 @@ ULONG NumberOfSharedWaiters; ULONG NumberOfExclusiveWaiters; } DEBUG_LOCK_INFORMATION, *PDEBUG_LOCK_INFORMATION; -typedef struct _RTL_HANDLE + +typedef struct _RTL_HANDLE_TABLE_ENTRY { - struct _RTL_HANDLE *Next; /* pointer to next free handle */ -} RTL_HANDLE, *PRTL_HANDLE; - + ULONG Flags; + struct _RTL_HANDLE_TABLE_ENTRY *NextFree; +} RTL_HANDLE_TABLE_ENTRY, *PRTL_HANDLE_TABLE_ENTRY; typedef struct _RTL_HANDLE_TABLE { - ULONG TableSize; /* maximum number of handles */ - ULONG HandleSize; /* size of handle in bytes */ - PRTL_HANDLE Handles; /* pointer to handle array */ - PRTL_HANDLE Limit; /* limit of pointers */ - PRTL_HANDLE FirstFree; /* pointer to first free handle */ - PRTL_HANDLE LastUsed; /* pointer to last allocated handle */ + ULONG MaximumNumberOfHandles; + ULONG SizeOfHandleTableEntry; + ULONG Reserved[2]; + PRTL_HANDLE_TABLE_ENTRY FreeHandles; + PRTL_HANDLE_TABLE_ENTRY CommittedHandles; + PRTL_HANDLE_TABLE_ENTRY UnCommittedHandles; + PRTL_HANDLE_TABLE_ENTRY MaxReservedHandles; } RTL_HANDLE_TABLE, *PRTL_HANDLE_TABLE; + typedef struct _LOCK_INFORMATION { ULONG LockCount; @@ -346,15 +356,32 @@ SECTION_IMAGE_INFORMATION ImageInfo; } RTL_PROCESS_INFO, *PRTL_PROCESS_INFO; -/* FIXME: This is a Windows Type which which we are not implementing properly - The type below however is our own implementation. We will eventually use Windows' */ -typedef struct _RTL_ATOM_TABLE +typedef struct _RTL_ATOM_TABLE_ENTRY { - ULONG TableSize; - ULONG NumberOfAtoms; - PVOID Lock; /* fast mutex (kernel mode)/ critical section (user mode) */ - PVOID HandleTable; - LIST_ENTRY Slot[0]; + struct _RTL_ATOM_TABLE_ENTRY *HashLink; + USHORT HandleIndex; + USHORT Atom; + USHORT ReferenceCount; + UCHAR Flags; + UCHAR NameLength; + WCHAR Name[1]; +} RTL_ATOM_TABLE_ENTRY, *PRTL_ATOM_TABLE_ENTRY; + +typedef struct _RTL_ATOM_TABLE +{ + ULONG Signature; + union + { + RTL_CRITICAL_SECTION CriticalSection; + FAST_MUTEX FastMutex; + }; + union + { + RTL_HANDLE_TABLE RtlHandleTable; + PHANDLE_TABLE ExHandleTable; + }; + ULONG NumberOfBuckets; + PRTL_ATOM_TABLE_ENTRY Buckets[1]; } RTL_ATOM_TABLE, *PRTL_ATOM_TABLE; /* Let Kernel Drivers use this */ _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-06-24 16:39:49 UTC (rev 16256) +++ trunk/reactos/include/ndk/umtypes.h 2005-06-24 18:11:16 UTC (rev 16257) @@ -1382,6 +1382,10 @@ PUNICODE_PREFIX_TABLE_ENTRY LastNextEntry; } UNICODE_PREFIX_TABLE, *PUNICODE_PREFIX_TABLE; +/* FIXME - need FAST_MUTEX and PHANDLE_TABLE for RTL_ATOM_TABLE in umode! */ +typedef void *FAST_MUTEX; +typedef void *PHANDLE_TABLE; + typedef OSVERSIONINFOW RTL_OSVERSIONINFOW; typedef LPOSVERSIONINFOW PRTL_OSVERSIONINFOW; typedef OSVERSIONINFOEXW RTL_OSVERSIONINFOEXW; _____ Modified: trunk/reactos/include/ntdll/rtl.h --- trunk/reactos/include/ntdll/rtl.h 2005-06-24 16:39:49 UTC (rev 16256) +++ trunk/reactos/include/ntdll/rtl.h 2005-06-24 18:11:16 UTC (rev 16257) @@ -132,19 +132,21 @@ PVOID DebugInfo; /* ?? */ } RTL_RESOURCE, *PRTL_RESOURCE; -typedef struct _RTL_HANDLE +typedef struct _RTL_HANDLE_TABLE_ENTRY { - struct _RTL_HANDLE *Next; /* pointer to next free handle */ -} RTL_HANDLE, *PRTL_HANDLE; + ULONG Flags; + struct _RTL_HANDLE_TABLE_ENTRY *NextFree; +} RTL_HANDLE_TABLE_ENTRY, *PRTL_HANDLE_TABLE_ENTRY; typedef struct _RTL_HANDLE_TABLE { - ULONG TableSize; /* maximum number of handles */ - ULONG HandleSize; /* size of handle in bytes */ - PRTL_HANDLE Handles; /* pointer to handle array */ - PRTL_HANDLE Limit; /* limit of pointers */ - PRTL_HANDLE FirstFree; /* pointer to first free handle */ - PRTL_HANDLE LastUsed; /* pointer to last allocated handle */ + ULONG MaximumNumberOfHandles; + ULONG SizeOfHandleTableEntry; + ULONG Reserved[2]; + PRTL_HANDLE_TABLE_ENTRY FreeHandles; + PRTL_HANDLE_TABLE_ENTRY CommittedHandles; + PRTL_HANDLE_TABLE_ENTRY UnCommittedHandles; + PRTL_HANDLE_TABLE_ENTRY MaxReservedHandles; } RTL_HANDLE_TABLE, *PRTL_HANDLE_TABLE; @@ -594,7 +596,7 @@ /* handle table functions */ -PRTL_HANDLE +PRTL_HANDLE_TABLE_ENTRY STDCALL RtlAllocateHandle ( IN PRTL_HANDLE_TABLE HandleTable, @@ -611,7 +613,7 @@ STDCALL RtlFreeHandle ( IN PRTL_HANDLE_TABLE HandleTable, - IN PRTL_HANDLE Handle + IN PRTL_HANDLE_TABLE_ENTRY Handle ); VOID @@ -626,14 +628,14 @@ STDCALL RtlIsValidHandle ( IN PRTL_HANDLE_TABLE HandleTable, - IN PRTL_HANDLE Handle + IN PRTL_HANDLE_TABLE_ENTRY Handle ); BOOLEAN STDCALL RtlIsValidIndexHandle ( IN PRTL_HANDLE_TABLE HandleTable, - IN OUT PRTL_HANDLE *Handle, + IN OUT PRTL_HANDLE_TABLE_ENTRY *Handle, IN ULONG Index ); _____ Modified: trunk/reactos/include/ntos/rtltypes.h --- trunk/reactos/include/ntos/rtltypes.h 2005-06-24 16:39:49 UTC (rev 16256) +++ trunk/reactos/include/ntos/rtltypes.h 2005-06-24 18:11:16 UTC (rev 16257) @@ -227,18 +227,51 @@ ULONG Unknown[11]; } RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION; +typedef struct _RTL_HANDLE_TABLE_ENTRY +{ + ULONG Flags; + struct _RTL_HANDLE_TABLE_ENTRY *NextFree; +} RTL_HANDLE_TABLE_ENTRY, *PRTL_HANDLE_TABLE_ENTRY; +typedef struct _RTL_HANDLE_TABLE +{ + ULONG MaximumNumberOfHandles; + ULONG SizeOfHandleTableEntry; + ULONG Reserved[2]; + PRTL_HANDLE_TABLE_ENTRY FreeHandles; + PRTL_HANDLE_TABLE_ENTRY CommittedHandles; + PRTL_HANDLE_TABLE_ENTRY UnCommittedHandles; + PRTL_HANDLE_TABLE_ENTRY MaxReservedHandles; +} RTL_HANDLE_TABLE, *PRTL_HANDLE_TABLE; + +typedef struct _RTL_ATOM_TABLE_ENTRY +{ + struct _RTL_ATOM_TABLE_ENTRY *HashLink; + USHORT HandleIndex; + USHORT Atom; + USHORT ReferenceCount; + UCHAR Flags; + UCHAR NameLength; + WCHAR Name[1]; +} RTL_ATOM_TABLE_ENTRY, *PRTL_ATOM_TABLE_ENTRY; + typedef struct _RTL_ATOM_TABLE { - ULONG TableSize; - ULONG NumberOfAtoms; - PVOID Lock; /* fast mutex (kernel mode)/ critical section (user mode) */ - PVOID HandleTable; - LIST_ENTRY Slot[0]; + ULONG Signature; + union + { + RTL_CRITICAL_SECTION CriticalSection; + FAST_MUTEX FastMutex; + }; + union + { + RTL_HANDLE_TABLE RtlHandleTable; + PHANDLE_TABLE ExHandleTable; + }; + ULONG NumberOfBuckets; + PRTL_ATOM_TABLE_ENTRY Buckets[1]; } RTL_ATOM_TABLE, *PRTL_ATOM_TABLE; - - #include <pshpack1.h> typedef struct _NLS_FILE_HEADER _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-06-24 16:39:49 UTC (rev 16256) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-06-24 18:11:16 UTC (rev 16257) @@ -36,7 +36,6 @@ <file>ftol.c</file> </directory> <file>apc.c</file> - <file>atom.c</file> <file>callback.c</file> <file>crc32.c</file> <file>critical.c</file> _____ Deleted: trunk/reactos/lib/ntdll/rtl/atom.c --- trunk/reactos/lib/ntdll/rtl/atom.c 2005-06-24 16:39:49 UTC (rev 16256) +++ trunk/reactos/lib/ntdll/rtl/atom.c 2005-06-24 18:11:16 UTC (rev 16257) @@ -1,722 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ntdll/rtl/atom.c - * PURPOSE: Atom managment - * PROGRAMMER: Nobody - * UPDATE HISTORY: - * Created 22/05/98 - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* LOCAL TYPES ***************************************************************/ - -typedef struct _RTL_ATOM_ENTRY -{ - LIST_ENTRY List; - UNICODE_STRING Name; - ULONG RefCount; - BOOLEAN Locked; - ULONG Index; - PRTL_HANDLE Handle; -} RTL_ATOM_ENTRY, *PRTL_ATOM_ENTRY; - -typedef struct _RTL_ATOM_HANDLE -{ - RTL_HANDLE Handle; - PRTL_ATOM_ENTRY Entry; -} RTL_ATOM_HANDLE, *PRTL_ATOM_HANDLE; - - -/* PROTOTYPES ****************************************************************/ - -static ULONG RtlpHashAtomName(ULONG TableSize, PWSTR AtomName); -static BOOLEAN RtlpCheckIntegerAtom(PWSTR AtomName, PUSHORT AtomValue); - -static NTSTATUS RtlpInitAtomTableLock(PRTL_ATOM_TABLE AtomTable); -static VOID RtlpDestroyAtomTableLock(PRTL_ATOM_TABLE AtomTable); -static BOOLEAN RtlpLockAtomTable(PRTL_ATOM_TABLE AtomTable); -static VOID RtlpUnlockAtomTable(PRTL_ATOM_TABLE AtomTable); - -static BOOLEAN RtlpCreateAtomHandleTable(PRTL_ATOM_TABLE AtomTable); -static VOID RtlpDestroyAtomHandleTable(PRTL_ATOM_TABLE AtomTable); - - -/* FUNCTIONS *****************************************************************/ - - -/* - * @implemented - */ -NTSTATUS STDCALL -RtlCreateAtomTable(ULONG TableSize, - PRTL_ATOM_TABLE *AtomTable) -{ - PRTL_ATOM_TABLE Table; - ULONG i; - NTSTATUS Status; - - DPRINT("RtlCreateAtomTable(TableSize %lu AtomTable %p)\n", - TableSize, AtomTable); - - if (*AtomTable != NULL) - { - return STATUS_SUCCESS; - } - - /* allocate atom table */ - Table = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - TableSize * sizeof(LIST_ENTRY) + - sizeof(RTL_ATOM_TABLE)); - if (Table == NULL) - { - return STATUS_NO_MEMORY; - } - - /* initialize atom table */ - Table->TableSize = TableSize; - - for (i = 0; i < TableSize; i++) - { - InitializeListHead(&Table->Slot[i]); - } - - Status = RtlpInitAtomTableLock(Table); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Table); - return Status; - } - - if (RtlpCreateAtomHandleTable(Table) == FALSE) - { - RtlpDestroyAtomTableLock(Table); - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Table); - return STATUS_NO_MEMORY; - } - - *AtomTable = Table; - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -RtlDestroyAtomTable(IN PRTL_ATOM_TABLE AtomTable) -{ - PLIST_ENTRY Current; - PRTL_ATOM_ENTRY AtomEntry; - ULONG i; - - if (RtlpLockAtomTable(AtomTable) == FALSE) - { - return (STATUS_INVALID_PARAMETER); - } - - /* delete all atoms */ - for (i = 0; i < AtomTable->TableSize; i++) - { - - Current = AtomTable->Slot[i].Flink; - while (Current != &AtomTable->Slot[i]) - { - AtomEntry = (PRTL_ATOM_ENTRY)Current; - RtlFreeUnicodeString(&AtomEntry->Name); - RemoveEntryList(&AtomEntry->List); - RtlFreeHeap(RtlGetProcessHeap(), - 0, - AtomEntry); - Current = AtomTable->Slot[i].Flink; - } - - } - - RtlpDestroyAtomHandleTable(AtomTable); - - RtlpUnlockAtomTable(AtomTable); - - RtlpDestroyAtomTableLock(AtomTable); - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - AtomTable); - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -RtlEmptyAtomTable(PRTL_ATOM_TABLE AtomTable, - BOOLEAN DeletePinned) -{ - PLIST_ENTRY Current, Next; - PRTL_ATOM_ENTRY AtomEntry; - ULONG i; - - DPRINT("RtlEmptyAtomTable (AtomTable %p DeletePinned %x)\n", - AtomTable, DeletePinned); - - if (RtlpLockAtomTable(AtomTable) == FALSE) - { - return (STATUS_INVALID_PARAMETER); - } - - /* delete all atoms */ - for (i = 0; i < AtomTable->TableSize; i++) - { - Current = AtomTable->Slot[i].Flink; - while (Current != &AtomTable->Slot[i]) - { - Next = Current->Flink; - AtomEntry = (PRTL_ATOM_ENTRY)Current; - - if ((AtomEntry->Locked == FALSE) || - ((AtomEntry->Locked == TRUE) && (DeletePinned == TRUE))) - { - RtlFreeUnicodeString(&AtomEntry->Name); - - RtlFreeHandle(AtomTable->HandleTable, - AtomEntry->Handle); - - RemoveEntryList(&AtomEntry->List); - RtlFreeHeap(RtlGetProcessHeap(), - 0, - AtomEntry); - } - Current = Next; - } - - } - - RtlpUnlockAtomTable(AtomTable); - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -RtlAddAtomToAtomTable(IN PRTL_ATOM_TABLE AtomTable, - IN PWSTR AtomName, - OUT PRTL_ATOM Atom) -{ - ULONG Hash; - PLIST_ENTRY Current; - PRTL_ATOM_ENTRY Entry; - USHORT AtomValue; - NTSTATUS Status; - PRTL_ATOM_HANDLE AtomHandle; - ULONG AtomIndex; - - DPRINT("RtlAddAtomToAtomTable (AtomTable %p AtomName %S Atom %p)\n", - AtomTable, AtomName, Atom); - - if (RtlpCheckIntegerAtom (AtomName, &AtomValue)) - { - /* integer atom */ - if (AtomValue >= 0xC000) - { - AtomValue = 0; - Status = STATUS_INVALID_PARAMETER; - } - else - { - Status = STATUS_SUCCESS; - } - - if (Atom) - *Atom = (RTL_ATOM)AtomValue; - - return Status; - } - - RtlpLockAtomTable(AtomTable); - - /* string atom */ - Hash = RtlpHashAtomName(AtomTable->TableSize, AtomName); - - /* search for existing atom */ - Current = AtomTable->Slot[Hash].Flink; - while (Current != &AtomTable->Slot[Hash]) - { - Entry = (PRTL_ATOM_ENTRY)Current; - - DPRINT("Comparing %S and %S\n", Entry->Name.Buffer, AtomName); - if (_wcsicmp(Entry->Name.Buffer, AtomName) == 0) - { - Entry->RefCount++; - if (Atom) - *Atom = (RTL_ATOM)(Entry->Index + 0xC000); - RtlpUnlockAtomTable(AtomTable); - return STATUS_SUCCESS; - } - Current = Current->Flink; - } - - /* insert new atom */ - Entry = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(RTL_ATOM_ENTRY)); - if (Entry == NULL) - { - RtlpUnlockAtomTable(AtomTable); - return STATUS_NO_MEMORY; - } - - InsertTailList(&AtomTable->Slot[Hash], &Entry->List); - RtlCreateUnicodeString (&Entry->Name, - AtomName); - Entry->RefCount = 1; - Entry->Locked = FALSE; - - /* FIXME: use general function instead !! */ - AtomHandle = (PRTL_ATOM_HANDLE)RtlAllocateHandle(AtomTable->HandleTable, - &AtomIndex); - - DPRINT("AtomHandle %p AtomIndex %x\n", AtomHandle, AtomIndex); - - AtomHandle->Entry = Entry; - Entry->Index = AtomIndex; - Entry->Handle = (PRTL_HANDLE)AtomHandle; - - if (Atom) - *Atom = (RTL_ATOM)(AtomIndex + 0xC000); - - RtlpUnlockAtomTable(AtomTable); - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -RtlDeleteAtomFromAtomTable(IN PRTL_ATOM_TABLE AtomTable, - IN RTL_ATOM Atom) -{ - PRTL_ATOM_HANDLE AtomHandle; - PRTL_ATOM_ENTRY AtomEntry; - - DPRINT("RtlDeleteAtomFromAtomTable (AtomTable %p Atom %x)\n", - AtomTable, Atom); - - if (Atom < 0xC000) - { - return STATUS_SUCCESS; - } - - RtlpLockAtomTable(AtomTable); - - /* FIXME: use general function instead !! */ - if (!RtlIsValidIndexHandle(AtomTable->HandleTable, - (PRTL_HANDLE *)&AtomHandle, - (ULONG)Atom - 0xC000)) - { - RtlpUnlockAtomTable(AtomTable); - return STATUS_INVALID_HANDLE; - } - - DPRINT("AtomHandle %x\n", AtomHandle); - DPRINT("AtomHandle->Entry %x\n", AtomHandle->Entry); - - AtomEntry = AtomHandle->Entry; - - DPRINT("Atom name: %wZ\n", &AtomEntry->Name); - - AtomEntry->RefCount--; - - if (AtomEntry->RefCount == 0) - { - if (AtomEntry->Locked == TRUE) - { - DPRINT("Atom %wZ is locked!\n", &AtomEntry->Name); - - RtlpUnlockAtomTable(AtomTable); - return STATUS_WAS_LOCKED; - } - - DPRINT("Removing atom: %wZ\n", &AtomEntry->Name); - - RtlFreeUnicodeString(&AtomEntry->Name); - RemoveEntryList(&AtomEntry->List); - RtlFreeHeap(RtlGetProcessHeap(), - 0, - AtomEntry); - RtlFreeHandle(AtomTable->HandleTable, - (PRTL_HANDLE)AtomHandle); - } - - RtlpUnlockAtomTable(AtomTable); - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -RtlLookupAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable, - IN PWSTR AtomName, - OUT PRTL_ATOM Atom) -{ - ULONG Hash; - PLIST_ENTRY Current; - PRTL_ATOM_ENTRY Entry; - USHORT AtomValue; - NTSTATUS Status; - - DPRINT("RtlLookupAtomInAtomTable (AtomTable %p AtomName %S Atom %p)\n", - AtomTable, AtomName, Atom); - - if (RtlpCheckIntegerAtom (AtomName, &AtomValue)) - { - /* integer atom */ - if (AtomValue >= 0xC000) - { - AtomValue = 0; - Status = STATUS_INVALID_PARAMETER; - } - else - { - Status = STATUS_SUCCESS; - } - - if (Atom) - *Atom = (RTL_ATOM)AtomValue; - - return Status; - } - - RtlpLockAtomTable(AtomTable); - - /* string atom */ - Hash = RtlpHashAtomName(AtomTable->TableSize, AtomName); - - /* search for existing atom */ - Current = AtomTable->Slot[Hash].Flink; - while (Current != &AtomTable->Slot[Hash]) - { - Entry = (PRTL_ATOM_ENTRY)Current; - - DPRINT("Comparing %S and %S\n", Entry->Name.Buffer, AtomName); - if (_wcsicmp(Entry->Name.Buffer, AtomName) == 0) - { - if (Atom) - *Atom = (RTL_ATOM)(Entry->Index + 0xC000); - RtlpUnlockAtomTable(AtomTable); - return STATUS_SUCCESS; - } - - Current = Current->Flink; - } - - RtlpUnlockAtomTable(AtomTable); - - return STATUS_OBJECT_NAME_NOT_FOUND; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -RtlPinAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable, - IN RTL_ATOM Atom) -{ - PRTL_ATOM_HANDLE AtomHandle; - PRTL_ATOM_ENTRY AtomEntry; - - DPRINT("RtlPinAtomInAtomTable (AtomTable %p Atom %x)\n", - AtomTable, Atom); - - if (Atom < 0xC000) - { - return STATUS_SUCCESS; - } - - RtlpLockAtomTable(AtomTable); - - /* FIXME: use general function instead !! */ - if (!RtlIsValidIndexHandle(AtomTable->HandleTable, - (PRTL_HANDLE *)&AtomHandle, - (ULONG)Atom - 0xC000)) - { - RtlpUnlockAtomTable(AtomTable); - return STATUS_INVALID_HANDLE; - } - - DPRINT("AtomHandle %x\n", AtomHandle); - DPRINT("AtomHandle->Entry %x\n", AtomHandle->Entry); - - AtomEntry = AtomHandle->Entry; - - DPRINT("Atom name: %wZ\n", &AtomEntry->Name); - - AtomEntry->Locked = TRUE; - - RtlpUnlockAtomTable(AtomTable); - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -RtlQueryAtomInAtomTable(PRTL_ATOM_TABLE AtomTable, - RTL_ATOM Atom, - PULONG RefCount, - PULONG PinCount, - PWSTR AtomName, - PULONG NameLength) -{ - ULONG Length; - PRTL_ATOM_HANDLE AtomHandle; - PRTL_ATOM_ENTRY AtomEntry; - - if (Atom < 0xC000) - { - if (RefCount != NULL) - { - *RefCount = 1; - } - - if (PinCount != NULL) - { - *PinCount = 1; - } - - if ((AtomName != NULL) && (NameLength != NULL) && (NameLength > 0)) - { - Length = swprintf(AtomName, L"#%lu", (ULONG)Atom); - *NameLength = Length * sizeof(WCHAR); - } - - return STATUS_SUCCESS; - } - - RtlpLockAtomTable(AtomTable); - - /* FIXME: use general function instead !! */ - if (!RtlIsValidIndexHandle(AtomTable->HandleTable, - (PRTL_HANDLE *)&AtomHandle, - (ULONG)Atom - 0xC000)) - { - RtlpUnlockAtomTable(AtomTable); - return STATUS_INVALID_HANDLE; - } - - DPRINT("AtomHandle %x\n", AtomHandle); - DPRINT("AtomHandle->Entry %x\n", AtomHandle->Entry); - - AtomEntry = AtomHandle->Entry; - - DPRINT("Atom name: %wZ\n", &AtomEntry->Name); - - if (RefCount != NULL) - { - *RefCount = AtomEntry->RefCount; - } - - if (PinCount != NULL) - { - *PinCount = (ULONG)AtomEntry->Locked; - } - - if ((AtomName != NULL) && (NameLength != NULL)) - { - if (*NameLength < AtomEntry->Name.Length) - { - *NameLength = AtomEntry->Name.Length; - RtlpUnlockAtomTable(AtomTable); - return STATUS_BUFFER_TOO_SMALL; - } - - Length = swprintf(AtomName, L"%s", AtomEntry->Name.Buffer); - *NameLength = Length * sizeof(WCHAR); - } - - RtlpUnlockAtomTable(AtomTable); - - return STATUS_SUCCESS; -} - - -/* INTERNAL FUNCTIONS ********************************************************/ - -static ULONG -RtlpHashAtomName(ULONG TableSize, - PWSTR AtomName) -{ - ULONG q = 0; - PWCHAR p; - - DPRINT("RtlpHashAtomName(TableSize %ld AtomName '%S')\n", - TableSize, AtomName); - - /* convert the string to an internal representation */ - p = AtomName; - while (*p != 0) - { - q += (ULONG)towupper(*p); - p++; - } - - DPRINT("q %lu Hash %lu\n", q, q % TableSize); - - return (q % TableSize); -} - - -static BOOLEAN -RtlpCheckIntegerAtom(PWSTR AtomName, - PUSHORT AtomValue) -{ - UNICODE_STRING AtomString; - USHORT LoValue; - ULONG LongValue; - PWCHAR p; - - DPRINT("RtlpCheckIntegerAtom(AtomName '%S' AtomValue %p)\n", - AtomName, AtomValue); - - if (!((ULONG)AtomName & 0xFFFF0000)) - { - LoValue = (USHORT)((ULONG)AtomName & 0xFFFF); - - if (LoValue >= 0xC000) - return FALSE; - - if (LoValue == 0) - LoValue = 0xC000; - - if (AtomValue != NULL) - *AtomValue = LoValue; - - return TRUE; - } - - if (*AtomName != L'#') - return FALSE; - - p = AtomName; - p++; - while (*p) - { - if ((*p < L'0') || (*p > L'9')) - return FALSE; - p++; - } - - p = AtomName; - p++; - RtlInitUnicodeString(&AtomString, - p); - - RtlUnicodeStringToInteger(&AtomString,10, &LongValue); - - *AtomValue = (USHORT)(LongValue & 0x0000FFFF); - - return TRUE; -} - - -/* lock functions */ - -static NTSTATUS -RtlpInitAtomTableLock(PRTL_ATOM_TABLE AtomTable) -{ - AtomTable->Lock = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(RTL_CRITICAL_SECTION)); - if (AtomTable->Lock == NULL) - return STATUS_NO_MEMORY; - - RtlInitializeCriticalSection((PRTL_CRITICAL_SECTION)AtomTable->Lock); - - return STATUS_SUCCESS; -} - - -static VOID -RtlpDestroyAtomTableLock(PRTL_ATOM_TABLE AtomTable) -{ - if (AtomTable->Lock) - { - RtlDeleteCriticalSection((PRTL_CRITICAL_SECTION)AtomTable->Lock); - RtlFreeHeap(RtlGetProcessHeap(), - 0, - AtomTable->Lock); - AtomTable->Lock = NULL; - } [truncated at 1000 lines; 2400 more skipped]

1 0

[ros-diffs] [ion] 16256: Fix rtshared, didn't know about this module
by ion＠svn.reactos.com 24 Jun '05

24 Jun '05

Fix rtshared, didn't know about this module Modified: trunk/reactos/regtests/shared/regtests.c _____ Modified: trunk/reactos/regtests/shared/regtests.c --- trunk/reactos/regtests/shared/regtests.c 2005-06-24 15:38:29 UTC (rev 16255) +++ trunk/reactos/regtests/shared/regtests.c 2005-06-24 16:39:49 UTC (rev 16256) @@ -7,6 +7,8 @@ * 06-07-2003 CSH Created */ #include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <pseh.h> #include "regtests.h"

1 0

[ion] 16255: Build regtess with standard windows header only, not NTOS
by ion＠svn.reactos.com 24 Jun '05

24 Jun '05

Build regtess with standard windows header only, not NTOS Modified: trunk/reactos/regtests/shared/regtests.c _____ Modified: trunk/reactos/regtests/shared/regtests.c --- trunk/reactos/regtests/shared/regtests.c 2005-06-24 15:34:40 UTC (rev 16254) +++ trunk/reactos/regtests/shared/regtests.c 2005-06-24 15:38:29 UTC (rev 16255) @@ -6,13 +6,7 @@ * UPDATE HISTORY: * 06-07-2003 CSH Created */ -#include <ctype.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <malloc.h> -#define NTOS_MODE_USER -#include <ntos.h> +#include <windows.h> #include <pseh.h> #include "regtests.h"

1 0

[ion] 16254: Forgot to commit this fix to ntifs
by ion＠svn.reactos.com 24 Jun '05

24 Jun '05

Forgot to commit this fix to ntifs Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-24 01:37:08 UTC (rev 16253) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-24 15:34:40 UTC (rev 16254) @@ -703,14 +703,6 @@ ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; } COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; -typedef struct _DEVICE_MAP { - POBJECT_DIRECTORY DosDevicesDirectory; - POBJECT_DIRECTORY GlobalDosDevicesDirectory; - ULONG ReferenceCount; - ULONG DriveMap; - UCHAR DriveType[32]; -} DEVICE_MAP, *PDEVICE_MAP; - #if (VER_PRODUCTBUILD >= 2600) typedef struct _EX_FAST_REF {

1 0

[ion] 16253: Build HAL with NDK
by ion＠svn.reactos.com 24 Jun '05

24 Jun '05

Build HAL with NDK Modified: trunk/reactos/hal/halx86/generic/adapter.c Modified: trunk/reactos/hal/halx86/generic/generic.xml Modified: trunk/reactos/hal/halx86/generic/reboot.c Modified: trunk/reactos/hal/halx86/include/hal.h Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml _____ Modified: trunk/reactos/hal/halx86/generic/adapter.c --- trunk/reactos/hal/halx86/generic/adapter.c 2005-06-24 01:31:23 UTC (rev 16252) +++ trunk/reactos/hal/halx86/generic/adapter.c 2005-06-24 01:37:08 UTC (rev 16253) @@ -17,10 +17,6 @@ #define NDEBUG #include <debug.h> -/* Hmm, needed for KDBG := 1. Why? */ -extern POBJECT_TYPE IMPORTED IoAdapterObjectType; -#undef KeGetCurrentIrql - /* FUNCTIONS *****************************************************************/ /* NOTE: IoAllocateAdapterChannel in NTOSKRNL.EXE */ _____ Modified: trunk/reactos/hal/halx86/generic/generic.xml --- trunk/reactos/hal/halx86/generic/generic.xml 2005-06-24 01:31:23 UTC (rev 16252) +++ trunk/reactos/hal/halx86/generic/generic.xml 2005-06-24 01:37:08 UTC (rev 16253) @@ -24,6 +24,7 @@ <file>sysinfo.c</file> <file>time.c</file> <file>timer.c</file> + <pch>../include/hal.h</pch> </module> <module name="hal_generic_up" type="objectlibrary"> <include base="hal_generic_up">../include</include> _____ Modified: trunk/reactos/hal/halx86/generic/reboot.c --- trunk/reactos/hal/halx86/generic/reboot.c 2005-06-24 01:31:23 UTC (rev 16252) +++ trunk/reactos/hal/halx86/generic/reboot.c 2005-06-24 01:37:08 UTC (rev 16253) @@ -54,7 +54,7 @@ VOID STDCALL HalReturnToFirmware ( - ULONG Action + FIRMWARE_REENTRY Action ) { if (Action == HalHaltRoutine) _____ Modified: trunk/reactos/hal/halx86/include/hal.h --- trunk/reactos/hal/halx86/include/hal.h 2005-06-24 01:31:23 UTC (rev 16252) +++ trunk/reactos/hal/halx86/include/hal.h 2005-06-24 01:37:08 UTC (rev 16253) @@ -8,21 +8,17 @@ /* INCLUDES ******************************************************************/ -/* SDK/DDK/NDK Headers. */ +/* IFS/DDK/NDK Headers */ #include <ddk/ntddk.h> -#include <stdio.h> +#include <ddk/ntifs.h> +#include <ndk/ntndk.h> -/* FIXME: NDK Headers */ -#include <roskrnl.h> - /* Internal Kernel Headers */ //#include <internal/mm.h> #include <internal/ke.h> #include <internal/i386/ps.h> -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - -//Temporary hack below. +//Temporary hack below until ntoskrnl is on NDK PVOID STDCALL MmAllocateContiguousAlignedMemory(IN ULONG NumberOfBytes, IN PHYSICAL_ADDRESS LowestAcceptableAddress, @@ -31,25 +27,6 @@ IN MEMORY_CACHING_TYPE CacheType OPTIONAL, IN ULONG Alignment); -/* FIXME: NDK */ -VOID STDCALL KeEnterKernelDebugger (VOID); -VOID FASTCALL KiAcquireSpinLock(PKSPIN_LOCK SpinLock); -VOID FASTCALL KiReleaseSpinLock(PKSPIN_LOCK SpinLock); -VOID STDCALL KiDispatchInterrupt(VOID); -NTSTATUS -STDCALL -ObCreateObject ( - IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL, - IN POBJECT_TYPE ObjectType, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN OUT PVOID ParseContext OPTIONAL, - IN ULONG ObjectSize, - IN ULONG PagedPoolCharge OPTIONAL, - IN ULONG NonPagedPoolCharge OPTIONAL, - OUT PVOID *Object -); - /* Internal HAL Headers */ #include "apic.h" #include "bus.h" @@ -58,14 +35,7 @@ #include "mps.h" #include "ioapic.h" -/* Helper Macros FIXME: NDK */ -#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) -#ifndef HIWORD -#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF)) -#endif -#ifndef LOWORD -#define LOWORD(l) ((WORD)(l)) -#endif +/* Helper Header */ +#include <reactos/helper.h> /* EOF */ _____ Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml --- trunk/reactos/hal/halx86/xbox/halxbox.xml 2005-06-24 01:31:23 UTC (rev 16252) +++ trunk/reactos/hal/halx86/xbox/halxbox.xml 2005-06-24 01:37:08 UTC (rev 16253) @@ -15,4 +15,5 @@ <file>part_xbox.c</file> <file>pci_xbox.c</file> <file>halxbox.rc</file> + <pch>../include/hal.h</pch> </module>

1 0

[ion] 16252: Build eventlog, umpnpmgr, rpcss with NDK
by ion＠svn.reactos.com 24 Jun '05

24 Jun '05

Build eventlog, umpnpmgr, rpcss with NDK Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ntos/ntpnp.h Modified: trunk/reactos/include/ntos/obtypes.h Modified: trunk/reactos/services/eventlog/eventlog.c Modified: trunk/reactos/services/eventlog/logport.c Modified: trunk/reactos/services/rpcss/rpcss.c Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-06-23 21:36:40 UTC (rev 16251) +++ trunk/reactos/include/ndk/umtypes.h 2005-06-24 01:31:23 UTC (rev 16252) @@ -734,8 +734,35 @@ typedef struct _OBJECT_NAME_INFORMATION { UNICODE_STRING Name; -} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; +} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; +typedef struct _IO_ERROR_LOG_PACKET +{ + UCHAR MajorFunctionCode; + UCHAR RetryCount; + USHORT DumpDataSize; + USHORT NumberOfStrings; + USHORT StringOffset; + USHORT EventCategory; + NTSTATUS ErrorCode; + ULONG UniqueErrorValue; + NTSTATUS FinalStatus; + ULONG SequenceNumber; + ULONG IoControlCode; + LARGE_INTEGER DeviceOffset; + ULONG DumpData[1]; +}IO_ERROR_LOG_PACKET, *PIO_ERROR_LOG_PACKET; + +typedef struct _IO_ERROR_LOG_MESSAGE +{ + USHORT Type; + USHORT Size; + USHORT DriverNameLength; + LARGE_INTEGER TimeStamp; + ULONG DriverNameOffset; + IO_ERROR_LOG_PACKET EntryData; +} IO_ERROR_LOG_MESSAGE, *PIO_ERROR_LOG_MESSAGE; + typedef struct _CLIENT_ID { HANDLE UniqueProcess; _____ Modified: trunk/reactos/include/ntos/ntpnp.h --- trunk/reactos/include/ntos/ntpnp.h 2005-06-23 21:36:40 UTC (rev 16251) +++ trunk/reactos/include/ntos/ntpnp.h 2005-06-24 01:31:23 UTC (rev 16252) @@ -106,7 +106,7 @@ PULONG Result; ULONG Flags; ULONG TotalSize; - PDEVICE_OBJECT DeviceObject; + PVOID DeviceObject; union { struct { GUID ClassGuid; _____ Modified: trunk/reactos/include/ntos/obtypes.h --- trunk/reactos/include/ntos/obtypes.h 2005-06-23 21:36:40 UTC (rev 16251) +++ trunk/reactos/include/ntos/obtypes.h 2005-06-24 01:31:23 UTC (rev 16252) @@ -144,6 +144,8 @@ ULONG SessionId; } OBJECT_DIRECTORY, *POBJECT_DIRECTORY; +#endif /* __USE_W32API */ + typedef struct _DEVICE_MAP { POBJECT_DIRECTORY DosDevicesDirectory; POBJECT_DIRECTORY GlobalDosDevicesDirectory; @@ -152,8 +154,6 @@ UCHAR DriveType[32]; } DEVICE_MAP, *PDEVICE_MAP; -#endif /* __USE_W32API */ - extern POBJECT_TYPE ObDirectoryType; extern PDEVICE_MAP ObSystemDeviceMap; _____ Modified: trunk/reactos/services/eventlog/eventlog.c --- trunk/reactos/services/eventlog/eventlog.c 2005-06-23 21:36:40 UTC (rev 16251) +++ trunk/reactos/services/eventlog/eventlog.c 2005-06-24 01:31:23 UTC (rev 16252) @@ -26,10 +26,9 @@ /* INCLUDES *****************************************************************/ -#define NTOS_MODE_USER -#include <ntos.h> #include <windows.h> -#include <stdio.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include "eventlog.h" _____ Modified: trunk/reactos/services/eventlog/logport.c --- trunk/reactos/services/eventlog/logport.c 2005-06-23 21:36:40 UTC (rev 16251) +++ trunk/reactos/services/eventlog/logport.c 2005-06-24 01:31:23 UTC (rev 16252) @@ -26,10 +26,9 @@ /* INCLUDES *****************************************************************/ -#define NTOS_MODE_USER -#include <ntos.h> #include <windows.h> -#include <string.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include "eventlog.h" _____ Modified: trunk/reactos/services/rpcss/rpcss.c --- trunk/reactos/services/rpcss/rpcss.c 2005-06-23 21:36:40 UTC (rev 16251) +++ trunk/reactos/services/rpcss/rpcss.c 2005-06-24 01:31:23 UTC (rev 16252) @@ -29,10 +29,9 @@ #define UNICODE -#define NTOS_MODE_USER -#include <ntos.h> #include <windows.h> -#include <stdio.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include "rpcss.h" //#include "services.h" _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-06-23 21:36:40 UTC (rev 16251) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-06-24 01:31:23 UTC (rev 16252) @@ -27,24 +27,20 @@ /* INCLUDES *****************************************************************/ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> -#include <ntos/ntpnp.h> +#include <ndk/ntndk.h> #include <ddk/wdmguid.h> -#include <windows.h> -#include <tchar.h> -#include <stdio.h> #include <rpc.h> #include <rpcdce.h> +#include <ntos/ntpnp.h> #include "pnp_c.h" #define NDEBUG #include <debug.h> - - /* GLOBALS ******************************************************************/ static VOID CALLBACK @@ -52,7 +48,7 @@ static SERVICE_TABLE_ENTRY ServiceTable[2] = { - {_T("PlugPlay"), ServiceMain}, + {TEXT("PlugPlay"), ServiceMain}, {NULL, NULL} };

1 0

[hpoussin] 16251: Add COMMPROP_INITIALIZED constant. It is used in COMMPROP structure, for dwProvSpec1 field
by hpoussin＠svn.reactos.com 23 Jun '05

23 Jun '05

Add COMMPROP_INITIALIZED constant. It is used in COMMPROP structure, for dwProvSpec1 field Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2005-06-23 20:34:17 UTC (rev 16250) +++ trunk/reactos/w32api/include/winbase.h 2005-06-23 21:36:40 UTC (rev 16251) @@ -11,6 +11,7 @@ extern "C" { #endif +#define COMMPROP_INITIALIZED 0xE73CF52E #define SP_SERIALCOMM 1 #define PST_UNSPECIFIED 0 #define PST_RS232 1

1 0

[hpoussin] 16250: Assign provider-specific fields in IOCTL_SERIAL_GET_PROPERTIES
by hpoussin＠svn.reactos.com 23 Jun '05

23 Jun '05

Assign provider-specific fields in IOCTL_SERIAL_GET_PROPERTIES Big clean up in serial.h header Fix header text (remove $Id...) Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c Modified: trunk/reactos/drivers/dd/serial/cleanup.c Modified: trunk/reactos/drivers/dd/serial/close.c Modified: trunk/reactos/drivers/dd/serial/create.c Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/info.c Modified: trunk/reactos/drivers/dd/serial/legacy.c Modified: trunk/reactos/drivers/dd/serial/misc.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/power.c Modified: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/drivers/dd/serial/serial.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c --- trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/circularbuffer.c * PURPOSE: Operations on a circular buffer * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: trunk/reactos/drivers/dd/serial/cleanup.c --- trunk/reactos/drivers/dd/serial/cleanup.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/cleanup.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/cleanup.c * PURPOSE: Serial IRP_MJ_CLEANUP operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: trunk/reactos/drivers/dd/serial/close.c --- trunk/reactos/drivers/dd/serial/close.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/close.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/close.c * PURPOSE: Serial IRP_MJ_CLOSE operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: trunk/reactos/drivers/dd/serial/create.c --- trunk/reactos/drivers/dd/serial/create.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/create.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/create.c * PURPOSE: Serial IRP_MJ_CREATE operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/devctrl.c * PURPOSE: Serial IRP_MJ_DEVICE_CONTROL operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG @@ -196,12 +195,13 @@ RtlZeroMemory(pCommProp, sizeof(SERIAL_COMMPROP)); - pCommProp->PacketLength = sizeof(SERIAL_COMMPROP); + if (!(pCommProp->ProvSpec1 & COMMPROP_INITIALIZED)) + pCommProp->PacketLength = sizeof(SERIAL_COMMPROP); pCommProp->PacketVersion = 2; pCommProp->ServiceMask = SERIAL_SP_SERIALCOMM; pCommProp->MaxTxQueue = pCommProp->CurrentTxQueue = DeviceExtension->OutputBuffer.Length - 1; pCommProp->MaxRxQueue = pCommProp->CurrentRxQueue = DeviceExtension->InputBuffer.Length - 1; - pCommProp->ProvSubType = 1; // PST_RS232; + pCommProp->ProvSubType = PST_RS232; pCommProp->ProvCapabilities = SERIAL_PCF_DTRDSR | SERIAL_PCF_INTTIMEOUTS | SERIAL_PCF_PARITY_CHECK | SERIAL_PCF_RTSCTS | SERIAL_PCF_SETXCHAR | SERIAL_PCF_SPECIALCHARS | SERIAL_PCF_TOTALTIMEOUTS | SERIAL_PCF_XONXOFF; @@ -227,6 +227,8 @@ pCommProp->SettableStopParity = SERIAL_STOPBITS_10 | SERIAL_STOPBITS_15 | SERIAL_STOPBITS_20 | SERIAL_PARITY_NONE | SERIAL_PARITY_ODD | SERIAL_PARITY_EVEN | SERIAL_PARITY_MARK | SERIAL_PARITY_SPACE; + pCommProp->ProvSpec2 = 0; /* Size of provider-specific data */ + return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/dd/serial/info.c --- trunk/reactos/drivers/dd/serial/info.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/info.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/info.c * PURPOSE: Serial IRP_MJ_QUERY_INFORMATION operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: trunk/reactos/drivers/dd/serial/legacy.c --- trunk/reactos/drivers/dd/serial/legacy.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/legacy.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/bus/serial/legacy.c * PURPOSE: Legacy serial port enumeration * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) * Mark Junker (mjscod(a)gmx.de) */ _____ Modified: trunk/reactos/drivers/dd/serial/misc.c --- trunk/reactos/drivers/dd/serial/misc.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/misc.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/misc.c * PURPOSE: Misceallenous operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/pnp.c * PURPOSE: Serial IRP_MJ_PNP operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ _____ Modified: trunk/reactos/drivers/dd/serial/power.c --- trunk/reactos/drivers/dd/serial/power.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/power.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/power.c * PURPOSE: Serial IRP_MJ_POWER operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: trunk/reactos/drivers/dd/serial/rw.c --- trunk/reactos/drivers/dd/serial/rw.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/rw.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/create.c * PURPOSE: Serial IRP_MJ_READ/IRP_MJ_WRITE operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: trunk/reactos/drivers/dd/serial/serial.c --- trunk/reactos/drivers/dd/serial/serial.c 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/serial.c 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial driver * FILE: drivers/dd/serial/serial.c * PURPOSE: Serial driver loading/unloading * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ //#define NDEBUG _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-06-23 18:15:04 UTC (rev 16249) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-06-23 20:34:17 UTC (rev 16250) @@ -1,47 +1,42 @@ -#if defined(__GNUC__) - #include <ddk/ntddk.h> - #include <ddk/ntddser.h> - #include <stdio.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Serial driver + * FILE: drivers/dd/serial/serial.h + * PURPOSE: Serial driver header + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ - #include <debug.h> +#include <ntddk.h> +#include <ntddser.h> +#include <stdio.h> - /* FIXME: these prototypes MUST NOT be here! */ - NTSTATUS STDCALL - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); - +#if defined(__GNUC__) + #include <debug.h> #elif defined(_MSC_VER) - #include <ntddk.h> - #include <ntddser.h> - #include <stdio.h> - #define STDCALL #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) - - NTSTATUS STDCALL - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); - - #ifdef NDEBUG2 - #define DPRINT - #define CHECKPOINT - #else - #define DPRINT DPRINT1 - #define CHECKPOINT CHECKPOINT1 - #undef NDEBUG - #endif + #define DPRINT + #define CHECKPOINT #else #error Unknown compiler! #endif #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +/* See winbase.h */ +#define PST_RS232 1 +#define COMMPROP_INITIALIZED 0xE73CF52E + +/* FIXME: I don't know why it is not defined anywhere... */ +NTSTATUS STDCALL +IoAttachDeviceToDeviceStackSafe( + IN PDEVICE_OBJECT SourceDevice, + IN PDEVICE_OBJECT TargetDevice, + OUT PDEVICE_OBJECT *AttachedToDeviceObject); + typedef enum { dsStopped,

1 0

[sedwards] 16249: convert all of the gdiplus stuff to lowercase
by sedwards＠svn.reactos.com 23 Jun '05

23 Jun '05

convert all of the gdiplus stuff to lowercase Modified: trunk/reactos/lib/gdiplus/gdiplus/arrow.c Modified: trunk/reactos/lib/gdiplus/gdiplus/bitmap.c Modified: trunk/reactos/lib/gdiplus/gdiplus/brush.c Modified: trunk/reactos/lib/gdiplus/gdiplus/clip.c Modified: trunk/reactos/lib/gdiplus/gdiplus/codec.c Modified: trunk/reactos/lib/gdiplus/gdiplus/container.c Modified: trunk/reactos/lib/gdiplus/gdiplus/dllmain.c Modified: trunk/reactos/lib/gdiplus/gdiplus/draw.c Modified: trunk/reactos/lib/gdiplus/gdiplus/effect.c Modified: trunk/reactos/lib/gdiplus/gdiplus/fill.c Modified: trunk/reactos/lib/gdiplus/gdiplus/font.c Modified: trunk/reactos/lib/gdiplus/gdiplus/graphics.c Modified: trunk/reactos/lib/gdiplus/gdiplus/image.c Modified: trunk/reactos/lib/gdiplus/gdiplus/linecap.c Modified: trunk/reactos/lib/gdiplus/gdiplus/linegradient.c Modified: trunk/reactos/lib/gdiplus/gdiplus/matrix.c Modified: trunk/reactos/lib/gdiplus/gdiplus/memory.c Modified: trunk/reactos/lib/gdiplus/gdiplus/metafile.c Modified: trunk/reactos/lib/gdiplus/gdiplus/palette.c Modified: trunk/reactos/lib/gdiplus/gdiplus/path.c Modified: trunk/reactos/lib/gdiplus/gdiplus/pathgradient.c Modified: trunk/reactos/lib/gdiplus/gdiplus/pathiterator.c Modified: trunk/reactos/lib/gdiplus/gdiplus/pen.c Modified: trunk/reactos/lib/gdiplus/gdiplus/region.c Modified: trunk/reactos/lib/gdiplus/gdiplus/string.c Modified: trunk/reactos/lib/gdiplus/gdiplus/texture.c Modified: trunk/reactos/lib/gdiplus/gdiplus/transform.c Deleted: trunk/reactos/lib/gdiplus/include/GdiPlusPrivate.h Added: trunk/reactos/lib/gdiplus/include/gdiplusprivate.h Deleted: trunk/reactos/w32api/include/GdiPlus.h Deleted: trunk/reactos/w32api/include/GdiPlusBase.h Deleted: trunk/reactos/w32api/include/GdiPlusBrush.h Deleted: trunk/reactos/w32api/include/GdiPlusColor.h Deleted: trunk/reactos/w32api/include/GdiPlusColorMatrix.h Deleted: trunk/reactos/w32api/include/GdiPlusEffects.h Deleted: trunk/reactos/w32api/include/GdiPlusEnums.h Deleted: trunk/reactos/w32api/include/GdiPlusFlat.h Deleted: trunk/reactos/w32api/include/GdiPlusGpStubs.h Deleted: trunk/reactos/w32api/include/GdiPlusGraphics.h Deleted: trunk/reactos/w32api/include/GdiPlusHeaders.h Deleted: trunk/reactos/w32api/include/GdiPlusImageAttributes.h Deleted: trunk/reactos/w32api/include/GdiPlusImaging.h Deleted: trunk/reactos/w32api/include/GdiPlusInit.h Deleted: trunk/reactos/w32api/include/GdiPlusLineCaps.h Deleted: trunk/reactos/w32api/include/GdiPlusMatrix.h Deleted: trunk/reactos/w32api/include/GdiPlusMem.h Deleted: trunk/reactos/w32api/include/GdiPlusMetaFile.h Deleted: trunk/reactos/w32api/include/GdiPlusMetaHeader.h Deleted: trunk/reactos/w32api/include/GdiPlusPath.h Deleted: trunk/reactos/w32api/include/GdiPlusPen.h Deleted: trunk/reactos/w32api/include/GdiPlusPixelFormats.h Deleted: trunk/reactos/w32api/include/GdiPlusStringFormat.h Deleted: trunk/reactos/w32api/include/GdiPlusTypes.h Added: trunk/reactos/w32api/include/gdiplus.h Added: trunk/reactos/w32api/include/gdiplusbase.h Added: trunk/reactos/w32api/include/gdiplusbrush.h Added: trunk/reactos/w32api/include/gdipluscolor.h Added: trunk/reactos/w32api/include/gdipluscolormatrix.h Added: trunk/reactos/w32api/include/gdipluseffects.h Added: trunk/reactos/w32api/include/gdiplusenums.h Added: trunk/reactos/w32api/include/gdiplusflat.h Added: trunk/reactos/w32api/include/gdiplusgpstubs.h Added: trunk/reactos/w32api/include/gdiplusgraphics.h Added: trunk/reactos/w32api/include/gdiplusheaders.h Added: trunk/reactos/w32api/include/gdiplusimageattributes.h Added: trunk/reactos/w32api/include/gdiplusimaging.h Added: trunk/reactos/w32api/include/gdiplusinit.h Added: trunk/reactos/w32api/include/gdipluslinecaps.h Added: trunk/reactos/w32api/include/gdiplusmatrix.h Added: trunk/reactos/w32api/include/gdiplusmem.h Added: trunk/reactos/w32api/include/gdiplusmetafile.h Added: trunk/reactos/w32api/include/gdiplusmetaheader.h Added: trunk/reactos/w32api/include/gdipluspath.h Added: trunk/reactos/w32api/include/gdipluspen.h Added: trunk/reactos/w32api/include/gdipluspixelformats.h Added: trunk/reactos/w32api/include/gdiplusstringformat.h Added: trunk/reactos/w32api/include/gdiplustypes.h _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/arrow.c --- trunk/reactos/lib/gdiplus/gdiplus/arrow.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/arrow.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/bitmap.c --- trunk/reactos/lib/gdiplus/gdiplus/bitmap.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/bitmap.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/brush.c --- trunk/reactos/lib/gdiplus/gdiplus/brush.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/brush.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/clip.c --- trunk/reactos/lib/gdiplus/gdiplus/clip.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/clip.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/codec.c --- trunk/reactos/lib/gdiplus/gdiplus/codec.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/codec.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/container.c --- trunk/reactos/lib/gdiplus/gdiplus/container.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/container.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/dllmain.c --- trunk/reactos/lib/gdiplus/gdiplus/dllmain.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/dllmain.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> #ifdef DBG _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/draw.c --- trunk/reactos/lib/gdiplus/gdiplus/draw.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/draw.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/effect.c --- trunk/reactos/lib/gdiplus/gdiplus/effect.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/effect.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/fill.c --- trunk/reactos/lib/gdiplus/gdiplus/fill.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/fill.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/font.c --- trunk/reactos/lib/gdiplus/gdiplus/font.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/font.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/graphics.c --- trunk/reactos/lib/gdiplus/gdiplus/graphics.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/graphics.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/image.c --- trunk/reactos/lib/gdiplus/gdiplus/image.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/image.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/linecap.c --- trunk/reactos/lib/gdiplus/gdiplus/linecap.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/linecap.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,7 +1,6 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> -#include <GdiPlusPrivate.h> /* * @unimplemented _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/linegradient.c --- trunk/reactos/lib/gdiplus/gdiplus/linegradient.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/linegradient.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/matrix.c --- trunk/reactos/lib/gdiplus/gdiplus/matrix.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/matrix.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/memory.c --- trunk/reactos/lib/gdiplus/gdiplus/memory.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/memory.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/metafile.c --- trunk/reactos/lib/gdiplus/gdiplus/metafile.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/metafile.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/palette.c --- trunk/reactos/lib/gdiplus/gdiplus/palette.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/palette.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/path.c --- trunk/reactos/lib/gdiplus/gdiplus/path.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/path.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/pathgradient.c --- trunk/reactos/lib/gdiplus/gdiplus/pathgradient.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/pathgradient.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/pathiterator.c --- trunk/reactos/lib/gdiplus/gdiplus/pathiterator.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/pathiterator.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/pen.c --- trunk/reactos/lib/gdiplus/gdiplus/pen.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/pen.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/region.c --- trunk/reactos/lib/gdiplus/gdiplus/region.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/region.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/string.c --- trunk/reactos/lib/gdiplus/gdiplus/string.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/string.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/texture.c --- trunk/reactos/lib/gdiplus/gdiplus/texture.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/texture.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/gdiplus/gdiplus/transform.c --- trunk/reactos/lib/gdiplus/gdiplus/transform.c 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/gdiplus/transform.c 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Deleted: trunk/reactos/lib/gdiplus/include/GdiPlusPrivate.h --- trunk/reactos/lib/gdiplus/include/GdiPlusPrivate.h 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/lib/gdiplus/include/GdiPlusPrivate.h 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,342 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS gdiplus.dll - * FILE: include/GdiPlusPrivate.h - * PURPOSE: GDI+ private definitions - */ -#ifndef __GDIPLUSPRIVATE_H -#define __GDIPLUSPRIVATE_H - -#include <GdiPlusEnums.h> -#include <GdiPlusPixelFormats.h> - -typedef float REAL; -typedef ARGB Color; -#include <GdiPlusColorMatrix.h> - -#define WINGDIPAPI __stdcall -#define GDIPCONST const - -typedef BOOL (CALLBACK * ImageAbort)(VOID *); -typedef ImageAbort DrawImageAbort; -typedef ImageAbort GetThumbnailImageAbort; -typedef BOOL (CALLBACK * EnumerateMetafileProc)(EmfPlusRecordType, - UINT, - UINT, - const BYTE*, - VOID*); - -typedef enum { - Ok = 0, - GenericError = 1, - InvalidParameter = 2, - OutOfMemory = 3, - ObjectBusy = 4, - InsufficientBuffer = 5, - NotImplemented = 6, - Win32Error = 7, - WrongState = 8, - Aborted = 9, - FileNotFound = 10, - ValueOverflow = 11, - AccessDenied = 12, - UnknownImageFormat = 13, - FontFamilyNotFound = 14, - FontStyleNotFound = 15, - NotTrueTypeFont = 16, - UnsupportedGdiplusVersion = 17, - GdiplusNotInitialized = 18, - PropertyNotFound = 19, - PropertyNotSupported = 20, - ProfileNotFound = 21 -} GpStatus; - -typedef GpStatus Status; - -typedef struct -{ -} GpAdjustableArrowCap; - -typedef struct -{ -} GpBitmap; - -typedef struct -{ -} GpGraphics; - -typedef struct -{ -} BitmapData; - -typedef struct -{ -} CGpEffect; - -typedef struct -{ -} GpCachedBitmap; - -typedef struct -{ -} IDirectDrawSurface7; - -typedef struct -{ -} GpBrush; - -typedef BrushType GpBrushType; - -typedef HatchStyle GpHatchStyle; - -typedef struct -{ -} GpHatch; - -typedef struct -{ -} GpPath; - -typedef struct -{ -} GpRegion; - -typedef struct -{ - CLSID Clsid; - GUID FormatID; - WCHAR *CodecName; - WCHAR *DllName; - WCHAR *FormatDescription; - WCHAR *FilenameExtension; - WCHAR *MimeType; - DWORD Flags; - DWORD Version; - DWORD SigCount; - DWORD SigSize; - BYTE *SigPattern; - BYTE *SigMask; -} ImageCodecInfo; - -typedef Unit GpUnit; - -typedef struct -{ -} GpPen; - -typedef struct -{ - REAL X; - REAL Y; -} GpPointF; - -typedef struct -{ - INT X; - INT Y; -} GpPoint; - -typedef FillMode GpFillMode; - -typedef struct -{ -} GpSolidFill; - -typedef struct -{ -} GpFont; - -typedef struct -{ -} GpFontFamily; - -typedef struct -{ -} GpFontCollection; - -typedef FlushIntention GpFlushIntention; - -typedef struct -{ -} GpImage; - -typedef struct -{ -} GpImageAttributes; - -typedef struct -{ -} GpMatrix; - -typedef struct -{ - GUID Guid; - ULONG NumberOfValues; - ULONG Type; - VOID *Value; -} EncoderParameter; - -typedef struct -{ - UINT Count; - EncoderParameter Parameter[1]; -} EncoderParameters; - -typedef struct -{ - PROPID id; - ULONG length; - WORD type; - VOID *value; -} PropertyItem; - -typedef struct -{ - UINT Size; - UINT Position; - VOID *Desc; - UINT DescSize; - UINT *Data; - UINT DataSize; - UINT Cookie; -} ImageItemData; - -typedef enum { - ColorChannelFlagsC = 0, - ColorChannelFlagsM = 1, - ColorChannelFlagsY = 2, - ColorChannelFlagsK = 3, - ColorChannelFlagsLast = 4 -} ColorChannelFlags; - -typedef LineCap GpLineCap; - -typedef struct -{ -} GpCustomLineCap; - -typedef LineJoin GpLineJoin; - -typedef WrapMode GpWrapMode; - -typedef struct -{ -} GpLineGradient; - -typedef MatrixOrder GpMatrixOrder; - -typedef struct -{ -} GpMetafile; - -typedef struct -{ - REAL X; - REAL Y; -} PointF; - -typedef struct -{ - INT X; - INT Y; -} Point; - -typedef struct -{ - REAL X; - REAL Y; - REAL Width; - REAL Height; -} RectF; - -typedef RectF GpRectF; - -typedef struct -{ - INT X; - INT Y; - INT Width; - INT Height; -} Rect; - -typedef Rect GpRect; - -typedef struct -{ -} MetafileHeader; - -typedef struct { - INT16 Left; - INT16 Top; - INT16 Right; - INT16 Bottom; -} PWMFRect16; - -typedef struct { - UINT32 Key; - INT16 Hmf; - PWMFRect16 BoundingBox; - INT16 Inch; - UINT32 Reserved; - INT16 Checksum; -} WmfPlaceableFileHeader; - -typedef struct -{ -} GpPathData; - -typedef struct -{ -} GpStringFormat; - -typedef struct -{ -} GpPathGradient; - -typedef struct -{ -} GpPathIterator; - -typedef DashCap GpDashCap; - -typedef PenAlignment GpPenAlignment; - -typedef PenType GpPenType; - -typedef DashStyle GpDashStyle; - -typedef struct -{ -} CharacterRange; - -typedef struct -{ -} GpTexture; - -typedef CoordinateSpace GpCoordinateSpace; - -typedef enum { - DebugEventLevelFatal, - DebugEventLevelWarning -} DebugEventLevel; - -typedef VOID (WINAPI *DebugEventProc)(DebugEventLevel level, - CHAR *message); - -typedef struct -{ - UINT32 GdiplusVersion; - DebugEventProc DebugEventCallback; - BOOL SuppressBackgroundThread; - BOOL SuppressExternalCodecs; -} GdiplusStartupInput; - -typedef Status (WINAPI *NotificationHookProc)(OUT ULONG_PTR *token); -typedef VOID (WINAPI *NotificationUnhookProc)(ULONG_PTR token); - -typedef struct { - NotificationHookProc NotificationHook; - NotificationUnhookProc NotificationUnhook; -} GdiplusStartupOutput; - -#endif /* __GDIPLUSPRIVATE_H */ _____ Copied: trunk/reactos/lib/gdiplus/include/gdiplusprivate.h (from rev 16244, trunk/reactos/lib/gdiplus/include/GdiPlusPrivate.h) --- trunk/reactos/lib/gdiplus/include/GdiPlusPrivate.h 2005-06-23 13:31:33 UTC (rev 16244) +++ trunk/reactos/lib/gdiplus/include/gdiplusprivate.h 2005-06-23 18:15:04 UTC (rev 16249) @@ -0,0 +1,342 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS gdiplus.dll + * FILE: include/GdiPlusPrivate.h + * PURPOSE: GDI+ private definitions + */ +#ifndef __GDIPLUSPRIVATE_H +#define __GDIPLUSPRIVATE_H + +#include <gdiplusenums.h> +#include <gdipluspixelformats.h> + +typedef float REAL; +typedef ARGB Color; +#include <gdipluscolormatrix.h> + +#define WINGDIPAPI __stdcall +#define GDIPCONST const + +typedef BOOL (CALLBACK * ImageAbort)(VOID *); +typedef ImageAbort DrawImageAbort; +typedef ImageAbort GetThumbnailImageAbort; +typedef BOOL (CALLBACK * EnumerateMetafileProc)(EmfPlusRecordType, + UINT, + UINT, + const BYTE*, + VOID*); + +typedef enum { + Ok = 0, + GenericError = 1, + InvalidParameter = 2, + OutOfMemory = 3, + ObjectBusy = 4, + InsufficientBuffer = 5, + NotImplemented = 6, + Win32Error = 7, + WrongState = 8, + Aborted = 9, + FileNotFound = 10, + ValueOverflow = 11, + AccessDenied = 12, + UnknownImageFormat = 13, + FontFamilyNotFound = 14, + FontStyleNotFound = 15, + NotTrueTypeFont = 16, + UnsupportedGdiplusVersion = 17, + GdiplusNotInitialized = 18, + PropertyNotFound = 19, + PropertyNotSupported = 20, + ProfileNotFound = 21 +} GpStatus; + +typedef GpStatus Status; + +typedef struct +{ +} GpAdjustableArrowCap; + +typedef struct +{ +} GpBitmap; + +typedef struct +{ +} GpGraphics; + +typedef struct +{ +} BitmapData; + +typedef struct +{ +} CGpEffect; + +typedef struct +{ +} GpCachedBitmap; + +typedef struct +{ +} IDirectDrawSurface7; + +typedef struct +{ +} GpBrush; + +typedef BrushType GpBrushType; + +typedef HatchStyle GpHatchStyle; + +typedef struct +{ +} GpHatch; + +typedef struct +{ +} GpPath; + +typedef struct +{ +} GpRegion; + +typedef struct +{ + CLSID Clsid; + GUID FormatID; + WCHAR *CodecName; + WCHAR *DllName; + WCHAR *FormatDescription; + WCHAR *FilenameExtension; + WCHAR *MimeType; + DWORD Flags; + DWORD Version; + DWORD SigCount; + DWORD SigSize; + BYTE *SigPattern; + BYTE *SigMask; +} ImageCodecInfo; + +typedef Unit GpUnit; + +typedef struct +{ +} GpPen; + +typedef struct +{ + REAL X; + REAL Y; +} GpPointF; + +typedef struct +{ + INT X; + INT Y; +} GpPoint; + +typedef FillMode GpFillMode; + +typedef struct +{ +} GpSolidFill; + +typedef struct +{ +} GpFont; + +typedef struct +{ +} GpFontFamily; + +typedef struct +{ +} GpFontCollection; + +typedef FlushIntention GpFlushIntention; + +typedef struct +{ +} GpImage; + +typedef struct +{ +} GpImageAttributes; + +typedef struct +{ +} GpMatrix; + +typedef struct +{ + GUID Guid; + ULONG NumberOfValues; + ULONG Type; + VOID *Value; +} EncoderParameter; + +typedef struct +{ + UINT Count; + EncoderParameter Parameter[1]; +} EncoderParameters; + +typedef struct +{ + PROPID id; + ULONG length; + WORD type; + VOID *value; +} PropertyItem; + +typedef struct +{ + UINT Size; + UINT Position; + VOID *Desc; + UINT DescSize; + UINT *Data; + UINT DataSize; + UINT Cookie; +} ImageItemData; + +typedef enum { + ColorChannelFlagsC = 0, + ColorChannelFlagsM = 1, + ColorChannelFlagsY = 2, + ColorChannelFlagsK = 3, + ColorChannelFlagsLast = 4 +} ColorChannelFlags; + +typedef LineCap GpLineCap; + +typedef struct +{ +} GpCustomLineCap; + +typedef LineJoin GpLineJoin; + +typedef WrapMode GpWrapMode; + +typedef struct +{ +} GpLineGradient; + +typedef MatrixOrder GpMatrixOrder; + +typedef struct +{ +} GpMetafile; + +typedef struct +{ + REAL X; + REAL Y; +} PointF; + +typedef struct +{ + INT X; + INT Y; +} Point; + +typedef struct +{ + REAL X; + REAL Y; + REAL Width; + REAL Height; +} RectF; + +typedef RectF GpRectF; + +typedef struct +{ + INT X; + INT Y; + INT Width; + INT Height; +} Rect; + +typedef Rect GpRect; + +typedef struct +{ +} MetafileHeader; + +typedef struct { + INT16 Left; + INT16 Top; + INT16 Right; + INT16 Bottom; +} PWMFRect16; + +typedef struct { + UINT32 Key; + INT16 Hmf; + PWMFRect16 BoundingBox; + INT16 Inch; + UINT32 Reserved; + INT16 Checksum; +} WmfPlaceableFileHeader; + +typedef struct +{ +} GpPathData; + +typedef struct +{ +} GpStringFormat; + +typedef struct +{ +} GpPathGradient; + +typedef struct +{ +} GpPathIterator; + +typedef DashCap GpDashCap; + +typedef PenAlignment GpPenAlignment; + +typedef PenType GpPenType; + +typedef DashStyle GpDashStyle; + +typedef struct +{ +} CharacterRange; + +typedef struct +{ +} GpTexture; + +typedef CoordinateSpace GpCoordinateSpace; + +typedef enum { + DebugEventLevelFatal, + DebugEventLevelWarning +} DebugEventLevel; + +typedef VOID (WINAPI *DebugEventProc)(DebugEventLevel level, + CHAR *message); + +typedef struct +{ + UINT32 GdiplusVersion; + DebugEventProc DebugEventCallback; + BOOL SuppressBackgroundThread; + BOOL SuppressExternalCodecs; +} GdiplusStartupInput; + +typedef Status (WINAPI *NotificationHookProc)(OUT ULONG_PTR *token); +typedef VOID (WINAPI *NotificationUnhookProc)(ULONG_PTR token); + +typedef struct { + NotificationHookProc NotificationHook; + NotificationUnhookProc NotificationUnhook; +} GdiplusStartupOutput; + +#endif /* __GDIPLUSPRIVATE_H */ _____ Deleted: trunk/reactos/w32api/include/GdiPlus.h --- trunk/reactos/w32api/include/GdiPlus.h 2005-06-23 18:12:17 UTC (rev 16248) +++ trunk/reactos/w32api/include/GdiPlus.h 2005-06-23 18:15:04 UTC (rev 16249) @@ -1,78 +0,0 @@ -/* - * GdiPlus.h [truncated at 1000 lines; 7556 more skipped]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs