Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 31011: Revert r29433, it's wrong Thanks Alex ; )
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 16:40:14 2007 New Revision: 31011 URL: http://svn.reactos.org/svn/reactos?rev=31011&view=rev Log: Revert r29433, it's wrong Thanks Alex ;) Modified: trunk/reactos/dll/ntdll/ntdll.rbuild Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Wed Dec 5 16:40:14 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="ntdll" type="nativedll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> +<module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> <bootstrap installbase="$(CDOUTPUT)/system32" /> <importlibrary definition="def/ntdll.def" /> <include base="ntdll">inc</include>

1 0

[fireball] 31010: Andrey Korotaev <unc0rr@mail.ru>: - Never trust MaximumLength passed from usermode when copying a unicode string (fixes a wide amount of crashes, tested with CdrLabel 4.1).
by fireball＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: fireball Date: Wed Dec 5 01:52:05 2007 New Revision: 31010 URL: http://svn.reactos.org/svn/reactos?rev=31010&view=rev Log: Andrey Korotaev <unc0rr(a)mail.ru>: - Never trust MaximumLength passed from usermode when copying a unicode string (fixes a wide amount of crashes, tested with CdrLabel 4.1). Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Wed Dec 5 01:52:05 2007 @@ -2397,10 +2397,10 @@ Src = Dest->Buffer; Dest->Buffer = NULL; + Dest->MaximumLength = Dest->Length; if(Dest->Length > 0 && Src) { - Dest->MaximumLength = Dest->Length; Dest->Buffer = ExAllocatePoolWithTag(PagedPool, Dest->MaximumLength, TAG_STRING); if(!Dest->Buffer) { @@ -2443,6 +2443,7 @@ Src = Dest->Buffer; Dest->Buffer = NULL; + Dest->MaximumLength = 0; if(Dest->Length > 0 && Src) {

1 0

[fireball] 31009: - Finish correct definition of CM_KEY_NODE. - Fix broken CmpTestRegistryLock functions, they could return FALSE even if the lock was held. - Enable some extra assertions. - Update KCB flags as well when updating keynode flags in CmpDoCreate. - Update KCB Last write time as well when updating keynode lastwritetime in CmpDoCreate. - Do CmpDoOpen with the registry lock held, and tell CmpCreateKeycontrolBlock to lock the KCB exclusively. - Enable link-node create code to set the Ch
by fireball＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: fireball Date: Wed Dec 5 00:39:15 2007 New Revision: 31009 URL: http://svn.reactos.org/svn/reactos?rev=31009&view=rev Log: - Finish correct definition of CM_KEY_NODE. - Fix broken CmpTestRegistryLock functions, they could return FALSE even if the lock was held. - Enable some extra assertions. - Update KCB flags as well when updating keynode flags in CmpDoCreate. - Update KCB Last write time as well when updating keynode lastwritetime in CmpDoCreate. - Do CmpDoOpen with the registry lock held, and tell CmpCreateKeycontrolBlock to lock the KCB exclusively. - Enable link-node create code to set the ChildHiveRefernece values. This is used to "escape" the current Hive when a KEY_HIVE_EXIT node is detected (an internal symlink) and required for new parsing semantics. - Implement CmpHandleExitNode to test how "escaping" from an exit node into a link hive works (it does). - Plug that function into the new parse routine for testing purposes. - Enable CmpDoOpen path in the new parse routine, only used for link node creation for now. Modified: trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=310… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h (original) +++ trunk/reactos/lib/cmlib/cmdata.h Wed Dec 5 00:39:15 2007 @@ -103,7 +103,7 @@ HCELL_INDEX SubKeyLists[HTYPE_COUNT]; CHILD_LIST ValueList; }; - //CM_KEY_REFERENCE ChildHiveReference; + CM_KEY_REFERENCE ChildHiveReference; }; HCELL_INDEX Security; HCELL_INDEX Class; Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Wed Dec 5 00:39:15 2007 @@ -379,11 +379,12 @@ ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyCell == Cell); ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyHive == Hive); ASSERT(KeyBody->KeyControlBlock->ParentKcb == ParentKcb); - //ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); + ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); /* Update the timestamp */ KeQuerySystemTime(&TimeStamp); KeyNode->LastWriteTime = TimeStamp; + KeyBody->KeyControlBlock->ParentKcb->KcbLastWriteTime = TimeStamp; /* Check if we need to update name maximum */ if (KeyNode->MaxNameLen < Name->Length) @@ -413,6 +414,7 @@ /* Update the flags */ CellData->u.KeyNode.Flags |= KEY_SYM_LINK; + KeyBody->KeyControlBlock->Flags = CellData->u.KeyNode.Flags; HvReleaseCell(Hive, KeyCell); } } @@ -448,6 +450,9 @@ /* It is, don't touch it */ return STATUS_OBJECT_NAME_NOT_FOUND; } + + /* Do this in the registry lock */ + CmpLockRegistry(); /* If we have a KCB, make sure it's locked */ //ASSERT(CmpIsKcbLockedExclusive(*CachedKcb)); @@ -457,13 +462,16 @@ Cell, Node, *CachedKcb, - CMP_LOCK_HASHES_FOR_KCB, + 0, KeyName); if (!Kcb) return STATUS_INSUFFICIENT_RESOURCES; /* Make sure it's also locked, and set the pointer */ //ASSERT(CmpIsKcbLockedExclusive(Kcb)); *CachedKcb = Kcb; + + /* Release the registry lock */ + CmpUnlockRegistry(); /* Allocate the key object */ Status = ObCreateObject(AccessMode, @@ -671,8 +679,8 @@ KeyNode->ClassLength = 0; /* Reference the root node */ - //KeyNode->ChildHiveReference.KeyHive = Context->ChildHive.KeyHive; - //KeyNode->ChildHiveReference.KeyCell = ChildCell; + KeyNode->ChildHiveReference.KeyHive = Context->ChildHive.KeyHive; + KeyNode->ChildHiveReference.KeyCell = ChildCell; HvReleaseCell(Hive, LinkCell); /* Get the parent node */ @@ -698,7 +706,7 @@ /* Sanity checks */ ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyCell == Cell); ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyHive == Hive); - //ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); + ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); /* Update the timestamp */ KeQuerySystemTime(&TimeStamp); @@ -725,6 +733,42 @@ ExReleasePushLock((PVOID)&((PCMHIVE)Context->ChildHive.KeyHive)->FlusherLock); ExReleasePushLock((PVOID)&((PCMHIVE)Hive)->FlusherLock); return Status; +} + +VOID +NTAPI +CmpHandleExitNode(IN OUT PHHIVE *Hive, + IN OUT HCELL_INDEX *Cell, + IN OUT PCM_KEY_NODE *KeyNode, + IN OUT PHHIVE *ReleaseHive, + IN OUT HCELL_INDEX *ReleaseCell) +{ + /* Check if we have anything to release */ + if (*ReleaseCell != HCELL_NIL) + { + /* Release it */ + ASSERT(*ReleaseHive != NULL); + HvReleaseCell((*ReleaseHive), *ReleaseCell); + } + + /* Get the link references */ + *Hive = (*KeyNode)->ChildHiveReference.KeyHive; + *Cell = (*KeyNode)->ChildHiveReference.KeyCell; + + /* Get the new node */ + *KeyNode = (PCM_KEY_NODE)HvGetCell((*Hive), *Cell); + if (*KeyNode) + { + /* Set the new release values */ + *ReleaseCell = *Cell; + *ReleaseHive = *Hive; + } + else + { + /* Nothing to release */ + *ReleaseCell = HCELL_NIL; + *ReleaseHive = NULL; + } } NTSTATUS @@ -775,11 +819,13 @@ IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, OUT PVOID *Object) { - NTSTATUS Status = STATUS_UNSUCCESSFUL; + NTSTATUS Status; PCM_KEY_CONTROL_BLOCK Kcb, ParentKcb; PHHIVE Hive = NULL; PCM_KEY_NODE Node = NULL; HCELL_INDEX Cell = HCELL_NIL, NextCell; + PHHIVE HiveToRelease = NULL; + HCELL_INDEX CellToRelease = HCELL_NIL; UNICODE_STRING Current, NextName; PCM_PARSE_CONTEXT ParseContext = Context; ULONG TotalRemainingSubkeys = 0, MatchRemainSubkeyLevel = 0, TotalSubkeys = 0; @@ -852,7 +898,7 @@ DPRINT1("Node Parse: %p\n", Node); /* Start parsing */ - Status = STATUS_SUCCESS; + Status = STATUS_NOT_IMPLEMENTED; while (TRUE) { /* Get the next component */ @@ -865,7 +911,7 @@ { /* Find the subkey */ NextCell = CmpFindSubKeyByName(Hive, Node, &NextName); - DPRINT1("NextCell Parse: %lx\n", NextCell); + DPRINT1("NextCell Parse: %lx %wZ\n", NextCell, &NextName); if (NextCell != HCELL_NIL) { /* Get the new node */ @@ -877,17 +923,57 @@ /* Check if this was the last key */ if (Last) { - /* Shouldn't happen yet */ - DPRINT1("Unhandled: Open of last key\n"); + /* Is this an exit node */ + if (Node->Flags & KEY_HIVE_EXIT) + { + /* Handle it */ + DPRINT1("Exit node\n"); + CmpHandleExitNode(&Hive, + &Cell, + &Node, + &HiveToRelease, + &CellToRelease); + DPRINT1("Node Parse: %p\n", Node); + if (!Node) ASSERT(FALSE); + } + + /* Do the open */ + Status = CmpDoOpen(Hive, + Cell, + Node, + AccessState, + AccessMode, + Attributes, + ParseContext, + 0, + &Kcb, + &NextName, + Object); + if (Status == STATUS_REPARSE) + { + /* Not implemented */ + DPRINT1("Parsing sym link\n"); + while (TRUE); + } + + /* We are done */ + DPRINT1("Open of last key\n"); break; } - /* Get hive and cell from reference */ - //Hive = Node->ChildHiveReference.KeyHive; - //Cell = Node->ChildHiveReference.KeyCell; - Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); - DPRINT1("Node Parse: %p\n", Node); - if (!Node) ASSERT(FALSE); + /* Is this an exit node */ + if (Node->Flags & KEY_HIVE_EXIT) + { + /* Handle it */ + DPRINT1("Exit node: %lx\n", Node->Flags); + CmpHandleExitNode(&Hive, + &Cell, + &Node, + &HiveToRelease, + &CellToRelease); + DPRINT1("Node Parse: %p\n", Node); + if (!Node) ASSERT(FALSE); + } /* Create a KCB for this key */ Kcb = CmpCreateKeyControlBlock(Hive, @@ -959,5 +1045,5 @@ /* Unlock the registry */ CmpUnlockRegistry(); - return STATUS_NOT_IMPLEMENTED; + return Status; } Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Wed Dec 5 00:39:15 2007 @@ -1580,7 +1580,7 @@ CmpTestRegistryLock(VOID) { /* Test the lock */ - return (BOOLEAN)ExIsResourceAcquiredSharedLite(&CmpRegistryLock); + return !ExIsResourceAcquiredSharedLite(&CmpRegistryLock) ? FALSE : TRUE; } BOOLEAN @@ -1588,7 +1588,7 @@ CmpTestRegistryLockExclusive(VOID) { /* Test the lock */ - return ExIsResourceAcquiredExclusiveLite(&CmpRegistryLock); + return !ExIsResourceAcquiredExclusiveLite(&CmpRegistryLock) ? FALSE : TRUE; } VOID

1 0

[fireball] 31008: - Remove GreatLordisms. - Slightly improve NtGdiOpenDCW() code (without changing the logic).
by fireball＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: fireball Date: Tue Dec 4 23:07:35 2007 New Revision: 31008 URL: http://svn.reactos.org/svn/reactos?rev=31008&view=rev Log: - Remove GreatLordisms. - Slightly improve NtGdiOpenDCW() code (without changing the logic). Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Dec 4 23:07:35 2007 @@ -732,25 +732,7 @@ RtlInitUnicodeString(&StdDriver, L"DISPLAY"); - if (Driver != NULL) - { - DPRINT("NAME Driver: %wZ\n", Driver); - } - else - { - DPRINT("NAME Driver: NULL\n", Driver); - } - - - if (Driver != NULL) - { - DPRINT("NAME Device: %wZ\n", Device); - } - else - { - DPRINT("NAME Device: NULL\n", Device); - } - + DPRINT("DriverName: %wZ, DeviceName: %wZ\n", Driver, Device); if (NULL == Driver || 0 == RtlCompareUnicodeString(Driver, &StdDriver, TRUE)) { @@ -792,12 +774,6 @@ return NtGdiCreateCompatibleDC(hDC); } - if (Driver != NULL && Driver->Buffer != NULL) - { - if (Driver!=NULL) - DPRINT("NAME: %wZ\n", Driver); - } - /* Allocate a DC object */ if ((hNewDC = DC_AllocDC(Driver)) == NULL) { @@ -922,10 +898,10 @@ } } - Ret = IntGdiCreateDC(NULL == Device ? NULL : &SafeDevice, + Ret = IntGdiCreateDC(Device ? &SafeDevice : NULL, NULL, - NULL == pUMdhpdev ? NULL : &Dhpdev, - NULL == InitData ? NULL : &SafeInitData, + pUMdhpdev ? &Dhpdev : NULL, + InitData ? &SafeInitData : NULL, (BOOL) iType); // FALSE 0 DCW, TRUE 1 ICW if (pUMdhpdev) pUMdhpdev = Dhpdev;

1 0

[gbrunmar] 31007: Fixed msvc project generation making duplicate project names.
by gbrunmar＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: gbrunmar Date: Tue Dec 4 22:53:47 2007 New Revision: 31007 URL: http://svn.reactos.org/svn/reactos?rev=31007&view=rev Log: Fixed msvc project generation making duplicate project names. Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Tue Dec 4 22:53:47 2007 @@ -272,7 +272,7 @@ MSVCBackend::VcprojFileName ( const Module& module ) const { return FixSeparatorForSystemCommand( - ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_" + _get_vc_dir() + "_auto.vcproj" ) + ReplaceExtension ( module.output->relative_path + "\\" + module.name, "_" + _get_vc_dir() + "_auto.vcproj" ) ); }

1 0

[fireball] 31006: - Fix _enable/_disable intrinsics when compiling with WDK 6001.
by fireball＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: fireball Date: Tue Dec 4 22:22:33 2007 New Revision: 31006 URL: http://svn.reactos.org/svn/reactos?rev=31006&view=rev Log: - Fix _enable/_disable intrinsics when compiling with WDK 6001. Modified: trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Tue Dec 4 22:22:33 2007 @@ -55,6 +55,8 @@ // The DDK steals these away from you. // #ifdef _MSC_VER +void __cdecl _enable(void); +void __cdecl _disable(void); #pragma intrinsic(_enable) #pragma intrinsic(_disable) #endif

1 0

[fireball] 31005: - Fix a typo.
by fireball＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: fireball Date: Tue Dec 4 21:56:25 2007 New Revision: 31005 URL: http://svn.reactos.org/svn/reactos?rev=31005&view=rev Log: - Fix a typo. Modified: trunk/reactos/lib/cmlib/cmdata.h Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=310… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h (original) +++ trunk/reactos/lib/cmlib/cmdata.h Tue Dec 4 21:56:25 2007 @@ -105,8 +105,6 @@ }; //CM_KEY_REFERENCE ChildHiveReference; }; - HCELL_INDEX SubKeyLists[HTYPE_COUNT]; - CHILD_LIST ValueList; HCELL_INDEX Security; HCELL_INDEX Class; ULONG MaxNameLen;

1 0

[fireball] 31004: Do a full clean rebuild after this commit! - Begin fixing CM_KEY_NODE. - More proper use of registry lock in create operations. - Use ObOpenObjectByName (as a test only, ignore the results) in CmpLinkHiveToMaster. - Implement routines to acquire/release two KCB locks atomically. - Implement KCB dereference without lock. - Fix locking in CmpCreateKeyControlBlock so that it now properly locks KCBs when requested. - Implement rudimentary new-style parse routine that only walks the
by fireball＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: fireball Date: Tue Dec 4 21:44:51 2007 New Revision: 31004 URL: http://svn.reactos.org/svn/reactos?rev=31004&view=rev Log: Do a full clean rebuild after this commit! - Begin fixing CM_KEY_NODE. - More proper use of registry lock in create operations. - Use ObOpenObjectByName (as a test only, ignore the results) in CmpLinkHiveToMaster. - Implement routines to acquire/release two KCB locks atomically. - Implement KCB dereference without lock. - Fix locking in CmpCreateKeyControlBlock so that it now properly locks KCBs when requested. - Implement rudimentary new-style parse routine that only walks the registry path until it's time to create the link node (since this is the only scenario where it's called from). Prints out the status of the operation but doesn't actually do anything. Modified: trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=310… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h (original) +++ trunk/reactos/lib/cmlib/cmdata.h Tue Dec 4 21:44:51 2007 @@ -77,6 +77,15 @@ } CHILD_LIST, *PCHILD_LIST; // +// Node Key Reference to Parents +// +typedef struct _CM_KEY_REFERENCE +{ + HCELL_INDEX KeyCell; + PHHIVE KeyHive; +} CM_KEY_REFERENCE, *PCM_KEY_REFERENCE; + +// // Node Key // typedef struct _CM_KEY_NODE @@ -87,6 +96,15 @@ ULONG Spare; HCELL_INDEX Parent; ULONG SubKeyCounts[HTYPE_COUNT]; + union + { + struct + { + HCELL_INDEX SubKeyLists[HTYPE_COUNT]; + CHILD_LIST ValueList; + }; + //CM_KEY_REFERENCE ChildHiveReference; + }; HCELL_INDEX SubKeyLists[HTYPE_COUNT]; CHILD_LIST ValueList; HCELL_INDEX Security; Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Tue Dec 4 21:44:51 2007 @@ -136,6 +136,9 @@ Status = STATUS_OBJECT_NAME_NOT_FOUND; goto Cleanup; } + + /* Lock the registry */ + CmpLockRegistry(); /* Create the key */ Status = CmpDoCreate(Parent->KeyControlBlock->KeyHive, @@ -187,6 +190,9 @@ /* Add the keep-alive reference */ ObReferenceObject(KeyObject); + + /* Unlock registry */ + CmpUnlockRegistry(); /* Force a lazy flush */ CmpLazyFlush(); Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Tue Dec 4 21:44:51 2007 @@ -493,20 +493,31 @@ return STATUS_SUCCESS; } - +NTSTATUS +NTAPI +CmpParseKey2(IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object); NTSTATUS NTAPI CmpParseKey(IN PVOID ParsedObject, - IN PVOID ObjectType, - IN OUT PACCESS_STATE AccessState, - IN KPROCESSOR_MODE AccessMode, - IN ULONG Attributes, - IN OUT PUNICODE_STRING FullPath, - IN OUT PUNICODE_STRING RemainingName, - IN OUT PVOID Context OPTIONAL, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, - OUT PVOID *NextObject) + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING FullPath, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *NextObject) { HCELL_INDEX BlockOffset; PKEY_OBJECT FoundObject; @@ -523,6 +534,22 @@ PCM_KEY_CONTROL_BLOCK ParentKcb = NULL, Kcb; PCM_KEY_NODE Node; + /* Detect new-style parse */ + if (Context) + { + /* Call proper parse routine */ + return CmpParseKey2(ParsedObject, + ObjectType, + AccessState, + AccessMode, + Attributes, + FullPath, + RemainingName, + Context, + SecurityQos, + NextObject); + } + ParsedKey = ParsedObject; VERIFY_KEY_OBJECT(ParsedKey); Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Tue Dec 4 21:44:51 2007 @@ -192,15 +192,6 @@ ULONG Count; ULONG HashKey[ANYSIZE_ARRAY]; } CM_INDEX_HINT_BLOCK, *PCM_INDEX_HINT_BLOCK; - -// -// Key Reference -// -typedef struct _CM_KEY_REFERENCE -{ - HCELL_INDEX KeyCell; - PHHIVE KeyHive; -} CM_KEY_REFERENCE, *PCM_KEY_REFERENCE; // // Key Body @@ -782,6 +773,12 @@ VOID ); +BOOLEAN +NTAPI +CmpTestRegistryLock( + VOID +); + VOID NTAPI CmpLockRegistryExclusive( @@ -886,6 +883,12 @@ VOID NTAPI +CmpDereferenceKeyControlBlock( + IN PCM_KEY_CONTROL_BLOCK Kcb +); + +VOID +NTAPI EnlistKeyBodyWithKCB( IN PCM_KEY_BODY KeyObject, IN ULONG Flags @@ -904,6 +907,20 @@ IN PHHIVE Hive, IN HCELL_INDEX Cell, IN BOOLEAN Unlink +); + +VOID +NTAPI +CmpAcquireTwoKcbLocksExcusiveByKey( + IN ULONG ConvKey1, + IN ULONG ConvKey2 +); + +VOID +NTAPI +CmpReleaseTwoKcbLockByKey( + IN ULONG ConvKey1, + IN ULONG ConvKey2 ); // Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c Tue Dec 4 21:44:51 2007 @@ -503,6 +503,39 @@ VOID NTAPI +CmpDereferenceKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + LONG OldRefCount, NewRefCount; + ULONG ConvKey; + + /* Get the ref count and update it */ + OldRefCount = *(PLONG)&Kcb->RefCount; + NewRefCount = OldRefCount - 1; + + /* Check if we still have refenreces */ + if( (NewRefCount & 0xffff) > 0) + { + /* Do the dereference */ + if (InterlockedCompareExchange((PLONG)&Kcb->RefCount, + NewRefCount, + OldRefCount) == OldRefCount) + { + /* We'de done */ + return; + } + } + + /* Save the key */ + ConvKey = Kcb->ConvKey; + + /* Do the dereference inside the lock */ + CmpAcquireKcbLockExclusive(Kcb); + CmpDereferenceKeyControlBlockWithLock(Kcb, FALSE); + CmpReleaseKcbLockByKey(ConvKey); +} + +VOID +NTAPI CmpDereferenceKeyControlBlockWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, IN BOOLEAN LockHeldExclusively) { @@ -621,10 +654,19 @@ /* Check if we have two hash entires */ HashLock = Flags & CMP_LOCK_HASHES_FOR_KCB ? TRUE : FALSE; - if (HashLock) - { - /* Not yet implemented */ - KeBugCheck(0); + if (!HashLock) + { + /* It's not locked, do we have a parent? */ + if (Parent) + { + /* Lock the parent KCB and ourselves */ + CmpAcquireTwoKcbLocksExcusiveByKey(ConvKey, Parent->ConvKey); + } + else + { + /* Lock only ourselves */ + CmpAcquireKcbLockExclusive(Kcb); + } } /* Check if we already have a KCB */ @@ -746,10 +788,19 @@ ASSERT((!Kcb) || (Kcb->Delete == FALSE)); /* Check if we had locked the hashes */ - if (HashLock) - { - /* Not yet implemented: Unlock hashes */ - KeBugCheck(0); + if (!HashLock) + { + /* We locked them manually, do we have a parent? */ + if (Parent) + { + /* Unlock the parent KCB and ourselves */ + CmpReleaseTwoKcbLockByKey(ConvKey, Parent->ConvKey); + } + else + { + /* Unlock only ourselves */ + CmpReleaseKcbLockByKey(ConvKey); + } } /* Return the KCB */ @@ -764,3 +815,4 @@ ASSERT(FALSE); } + Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Tue Dec 4 21:44:51 2007 @@ -215,7 +215,7 @@ *KeyCell, KeyNode, ParentKcb, - 0, + CMP_LOCK_HASHES_FOR_KCB, Name); if (!Kcb) { @@ -281,6 +281,12 @@ UNICODE_STRING LocalClass = {0}; if (!Class) Class = &LocalClass; + /* Sanity check */ +#if 0 + ASSERT((CmpIsKcbLockedExclusive(ParentKcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); +#endif + /* Acquire the flusher lock */ ExAcquirePushLockShared((PVOID)&((PCMHIVE)Hive)->FlusherLock); @@ -447,7 +453,12 @@ //ASSERT(CmpIsKcbLockedExclusive(*CachedKcb)); /* Create the KCB. FIXME: Use lock flag */ - Kcb = CmpCreateKeyControlBlock(Hive, Cell, Node, *CachedKcb, 0, KeyName); + Kcb = CmpCreateKeyControlBlock(Hive, + Cell, + Node, + *CachedKcb, + CMP_LOCK_HASHES_FOR_KCB, + KeyName); if (!Kcb) return STATUS_INSUFFICIENT_RESOURCES; /* Make sure it's also locked, and set the pointer */ @@ -503,7 +514,10 @@ LARGE_INTEGER TimeStamp; PCM_KEY_NODE KeyNode; PCM_KEY_CONTROL_BLOCK Kcb = ParentKcb; - +#if 0 + CMP_ASSERT_REGISTRY_LOCK(); +#endif + /* Link nodes only allowed on the master */ if (Hive != &CmiVolatileHive->Hive) { @@ -712,3 +726,238 @@ ExReleasePushLock((PVOID)&((PCMHIVE)Hive)->FlusherLock); return Status; } + +NTSTATUS +NTAPI +CmpBuildHashStackAndLookupCache(IN PCM_KEY_BODY ParseObject, + IN OUT PCM_KEY_CONTROL_BLOCK *Kcb, + IN PUNICODE_STRING Current, + OUT PHHIVE *Hive, + OUT HCELL_INDEX *Cell, + OUT PULONG TotalRemainingSubkeys, + OUT PULONG MatchRemainSubkeyLevel, + OUT PULONG TotalSubkeys, + OUT PULONG OuterStackArray, + OUT PULONG *LockedKcbs) +{ + ULONG HashKeyCopy; + + /* We don't lock anything for now */ + *LockedKcbs = NULL; + + /* Make a copy of the hash key */ + HashKeyCopy = (*Kcb)->ConvKey; + + /* Calculate hash values */ + *TotalRemainingSubkeys = 0xBAADF00D; + + /* Lock the registry */ + CmpLockRegistry(); + + /* Return hive and cell data */ + *Hive = (*Kcb)->KeyHive; + *Cell = (*Kcb)->KeyCell; + + /* Return success for now */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpParseKey2(IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object) +{ + NTSTATUS Status = STATUS_UNSUCCESSFUL; + PCM_KEY_CONTROL_BLOCK Kcb, ParentKcb; + PHHIVE Hive = NULL; + PCM_KEY_NODE Node = NULL; + HCELL_INDEX Cell = HCELL_NIL, NextCell; + UNICODE_STRING Current, NextName; + PCM_PARSE_CONTEXT ParseContext = Context; + ULONG TotalRemainingSubkeys = 0, MatchRemainSubkeyLevel = 0, TotalSubkeys = 0; + PULONG LockedKcbs = NULL; + BOOLEAN Result, Last; + PAGED_CODE(); + DPRINT1("New style parse routine called: %wZ %wZ!\n", CompleteName, RemainingName); + + /* Loop path separators at the end */ + while ((RemainingName->Length) && + (RemainingName->Buffer[(RemainingName->Length / sizeof(WCHAR)) - 1] == + OBJ_NAME_PATH_SEPARATOR)) + { + /* Remove path separator */ + RemainingName->Length -= sizeof(WCHAR); + } + + /* Fail if this isn't a key object */ + if (ObjectType != CmpKeyObjectType) return STATUS_OBJECT_TYPE_MISMATCH; + + /* Copy the remaining name */ + Current = *RemainingName; + + /* Check if this is a create */ + if (!(ParseContext) || !(ParseContext->CreateOperation)) + { + /* It isn't, so no context */ + ParseContext = NULL; + } + + /* Grab the KCB */ + Kcb = ((PKEY_OBJECT)ParseObject)->KeyControlBlock; + DPRINT1("KCB Parse: %p\n", Kcb); + + /* Lookup in the cache */ + Status = CmpBuildHashStackAndLookupCache(ParseObject, + &Kcb, + &Current, + &Hive, + &Cell, + &TotalRemainingSubkeys, + &MatchRemainSubkeyLevel, + &TotalSubkeys, + NULL, + &LockedKcbs); + + /* This is now the parent */ + ParentKcb = Kcb; + DPRINT1("ParentKcb Parse: %p\n", ParentKcb); + DPRINT1("Hive Parse: %p\n", Hive); + DPRINT1("Cell Parse: %p\n", Cell); + + /* Check if everything was found cached */ + if (!TotalRemainingSubkeys) ASSERTMSG("Caching not implemented", FALSE); + + /* Don't do anything if we're being deleted */ + if (Kcb->Delete) return STATUS_OBJECT_NAME_NOT_FOUND; + + /* Check if this is a symlink */ + if (Kcb->Flags & KEY_SYM_LINK) + { + /* Not implemented */ + DPRINT1("Parsing sym link\n"); + while (TRUE); + } + + /* Get the key node */ + Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); + if (!Node) return STATUS_INSUFFICIENT_RESOURCES; + DPRINT1("Node Parse: %p\n", Node); + + /* Start parsing */ + Status = STATUS_SUCCESS; + while (TRUE) + { + /* Get the next component */ + Result = CmpGetNextName(&Current, &NextName, &Last); + DPRINT1("Result Parse: %p\n", Result); + if ((Result) && (NextName.Length)) + { + /* See if this is a sym link */ + if (!(Kcb->Flags & KEY_SYM_LINK)) + { + /* Find the subkey */ + NextCell = CmpFindSubKeyByName(Hive, Node, &NextName); + DPRINT1("NextCell Parse: %lx\n", NextCell); + if (NextCell != HCELL_NIL) + { + /* Get the new node */ + Cell = NextCell; + Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); + DPRINT1("Node Parse: %p\n", Node); + if (!Node) ASSERT(FALSE); + + /* Check if this was the last key */ + if (Last) + { + /* Shouldn't happen yet */ + DPRINT1("Unhandled: Open of last key\n"); + break; + } + + /* Get hive and cell from reference */ + //Hive = Node->ChildHiveReference.KeyHive; + //Cell = Node->ChildHiveReference.KeyCell; + Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); + DPRINT1("Node Parse: %p\n", Node); + if (!Node) ASSERT(FALSE); + + /* Create a KCB for this key */ + Kcb = CmpCreateKeyControlBlock(Hive, + Cell, + Node, + ParentKcb, + 0, + &NextName); + if (!Kcb) ASSERT(FALSE); + DPRINT1("Kcb Parse: %p\n", Kcb); + + /* Dereference the parent and set the new one */ + CmpDereferenceKeyControlBlock(ParentKcb); + ParentKcb = Kcb; + } + else + { + /* Check if this was the last key for a create */ + if ((Last) && (ParseContext)) + { + /* Check if we're doing a link node */ + if (ParseContext->CreateLink) + { + /* The only thing we should see */ + DPRINT1("Expected: Creating new link\n"); + } + else + { + /* Create: should not see this (yet) */ + DPRINT1("Unexpected: Creating new child\n"); + while (TRUE); + } + + /* Update disposition */ + ParseContext->Disposition = REG_CREATED_NEW_KEY; + break; + } + else + { + /* Key not found */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + break; + } + } + } + else + { + /* Not implemented */ + DPRINT1("Parsing sym link\n"); + while (TRUE); + } + } + else if ((Result) && (Last)) + { + /* Opening root: unexpected */ + DPRINT1("Unexpected: Opening root\n"); + while (TRUE); + } + else + { + /* Bogus */ + Status = STATUS_INVALID_PARAMETER; + break; + } + } + + /* Dereference the parent if it exists */ + if (ParentKcb) CmpDereferenceKeyControlBlock(ParentKcb); + + /* Unlock the registry */ + CmpUnlockRegistry(); + return STATUS_NOT_IMPLEMENTED; +} Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Tue Dec 4 21:44:51 2007 @@ -504,6 +504,7 @@ UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; CM_PARSE_CONTEXT ParseContext = {0}; + HANDLE KeyHandle; PAGED_CODE(); /* Setup the object attributes */ @@ -529,6 +530,17 @@ /* We have one */ ParseContext.ChildHive.KeyCell = RegistryHive->Hive.BaseBlock->RootCell; } + + DPRINT1("Ready to parse\n"); + Status = ObOpenObjectByName(&ObjectAttributes, + CmpKeyObjectType, + KernelMode, + NULL, + KEY_READ | KEY_WRITE, + (PVOID)&ParseContext, + &KeyHandle); + DPRINT1("Parse done: %lx\n", Status); + //while (TRUE); /* Capture all the info */ Status = ObpCaptureObjectAttributes(&ObjectAttributes, @@ -1604,6 +1616,73 @@ VOID NTAPI +CmpAcquireTwoKcbLocksExcusiveByKey(IN ULONG ConvKey1, + IN ULONG ConvKey2) +{ + ULONG Index1, Index2; + + /* Sanity check */ + CMP_ASSERT_REGISTRY_LOCK(); + + /* Get hash indexes */ + Index1 = GET_HASH_INDEX(ConvKey1); + Index2 = GET_HASH_INDEX(ConvKey2); + + /* See which one is highest */ + if (Index1 < Index2) + { + /* Grab them in the proper order */ + CmpAcquireKcbLockExclusiveByKey(ConvKey1); + CmpAcquireKcbLockExclusiveByKey(ConvKey2); + } + else + { + /* Grab the second one first, then the first */ + CmpAcquireKcbLockExclusiveByKey(ConvKey2); + if (Index1 != Index2) CmpAcquireKcbLockExclusiveByKey(ConvKey1); + } +} + +VOID +NTAPI +CmpReleaseTwoKcbLockByKey(IN ULONG ConvKey1, + IN ULONG ConvKey2) +{ + ULONG Index1, Index2; + + /* Sanity check */ + CMP_ASSERT_REGISTRY_LOCK(); + + /* Get hash indexes */ + Index1 = GET_HASH_INDEX(ConvKey1); + Index2 = GET_HASH_INDEX(ConvKey2); + ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey2).Owner == KeGetCurrentThread()) || + (CmpTestRegistryLockExclusive())); + + /* See which one is highest */ + if (Index1 < Index2) + { + /* Grab them in the proper order */ + ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1).Owner == KeGetCurrentThread()) || + (CmpTestRegistryLockExclusive())); + CmpReleaseKcbLockByKey(ConvKey2); + CmpReleaseKcbLockByKey(ConvKey1); + } + else + { + /* Release the first one first, then the second */ + if (Index1 != Index2) + { + ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1).Owner == KeGetCurrentThread()) || + (CmpTestRegistryLockExclusive())); + CmpReleaseKcbLockByKey(ConvKey1); + } + CmpReleaseKcbLockByKey(ConvKey2); + } +} + +VOID +NTAPI CmShutdownSystem(VOID) { /* Kill the workers and fush all hives */

1 0

[hpoussin] 31003: Change service interface too
by hpoussin＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: hpoussin Date: Tue Dec 4 20:21:46 2007 New Revision: 31003 URL: http://svn.reactos.org/svn/reactos?rev=31003&view=rev Log: Change service interface too Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Tue Dec 4 20:21:46 2007 @@ -17,6 +17,9 @@ #define NDEBUG #include <debug.h> +#define SC_LOCK unsigned int +#define SC_STATUS_TYPE unsigned long +#define SC_ENUM_TYPE unsigned long /* GLOBALS *****************************************************************/ @@ -237,9 +240,9 @@ /* Function 0 */ -unsigned long +DWORD ScmrCloseServiceHandle(handle_t BindingHandle, - unsigned int hScObject) + unsigned long hScObject) { PMANAGER_HANDLE hManager; @@ -289,10 +292,10 @@ /* Function 1 */ -unsigned long +DWORD ScmrControlService(handle_t BindingHandle, - unsigned int hService, - unsigned long dwControl, + unsigned long hService, + DWORD dwControl, LPSERVICE_STATUS lpServiceStatus) { PSERVICE_HANDLE hSvc; @@ -378,9 +381,9 @@ /* Function 2 */ -unsigned long +DWORD ScmrDeleteService(handle_t BindingHandle, - unsigned int hService) + unsigned long hService) { PSERVICE_HANDLE hSvc; PSERVICE lpService; @@ -428,10 +431,10 @@ /* Function 3 */ -unsigned long +DWORD ScmrLockServiceDatabase(handle_t BindingHandle, - unsigned int hSCManager, - unsigned int *hLock) + unsigned long hSCManager, + SC_LOCK *hLock) { PMANAGER_HANDLE hMgr; @@ -457,13 +460,13 @@ /* Function 4 */ -unsigned long +DWORD ScmrQueryServiceObjectSecurity(handle_t BindingHandle, - unsigned int hService, - unsigned long dwSecurityInformation, + unsigned long hService, + DWORD dwSecurityInformation, unsigned char *lpSecurityDescriptor, - unsigned long dwSecuityDescriptorSize, - unsigned long *pcbBytesNeeded) + DWORD dwSecuityDescriptorSize, + DWORD *pcbBytesNeeded) { #if 0 PSERVICE_HANDLE hSvc; @@ -541,12 +544,12 @@ /* Function 5 */ -unsigned long +DWORD ScmrSetServiceObjectSecurity(handle_t BindingHandle, - unsigned int hService, - unsigned long dwSecurityInformation, + unsigned long hService, + DWORD dwSecurityInformation, unsigned char *lpSecurityDescriptor, - unsigned long dwSecuityDescriptorSize) + DWORD dwSecuityDescriptorSize) { PSERVICE_HANDLE hSvc; PSERVICE lpService; @@ -661,9 +664,9 @@ /* Function 6 */ -unsigned long +DWORD ScmrQueryServiceStatus(handle_t BindingHandle, - unsigned int hService, + unsigned long hService, LPSERVICE_STATUS lpServiceStatus) { PSERVICE_HANDLE hSvc; @@ -705,9 +708,9 @@ /* Function 7 */ -unsigned long +DWORD ScmrSetServiceStatus(handle_t BindingHandle, - unsigned long hServiceStatus, + SERVICE_STATUS_HANDLE hServiceStatus, LPSERVICE_STATUS lpServiceStatus) { PSERVICE lpService; @@ -736,9 +739,9 @@ /* Function 8 */ -unsigned long +DWORD ScmrUnlockServiceDatabase(handle_t BindingHandle, - unsigned int hLock) + SC_LOCK hLock) { DPRINT1("ScmrUnlockServiceDatabase() called\n"); /* FIXME */ @@ -747,9 +750,9 @@ /* Function 9 */ -unsigned long +DWORD ScmrNotifyBootConfigStatus(handle_t BindingHandle, - unsigned long BootAcceptable) + BOOL BootAcceptable) { DPRINT1("ScmrNotifyBootConfigStatus() called\n"); /* FIXME */ @@ -758,12 +761,12 @@ /* Function 10 */ -unsigned long +DWORD ScmrSetServiceBitsW(handle_t BindingHandle, - unsigned long hServiceStatus, - unsigned long dwServiceBits, - unsigned long bSetBitsOn, - unsigned long bUpdateImmediately, + SERVICE_STATUS_HANDLE hServiceStatus, + DWORD dwServiceBits, + BOOL bSetBitsOn, + BOOL bUpdateImmediately, wchar_t *lpString) { DPRINT1("ScmrSetServiceBitsW() called\n"); @@ -773,20 +776,20 @@ /* Function 11 */ -unsigned long +DWORD ScmrChangeServiceConfigW(handle_t BiningHandle, - unsigned int hService, - unsigned long dwServiceType, - unsigned long dwStartType, - unsigned long dwErrorControl, + unsigned long hService, + DWORD dwServiceType, + DWORD dwStartType, + DWORD dwErrorControl, wchar_t *lpBinaryPathName, wchar_t *lpLoadOrderGroup, - unsigned long *lpdwTagId, /* in, out, unique */ + DWORD *lpdwTagId, /* in, out, unique */ wchar_t *lpDependencies, - unsigned long dwDependenciesLength, + DWORD dwDependenciesLength, wchar_t *lpServiceStartName, wchar_t *lpPassword, - unsigned long dwPasswordLength, + DWORD dwPasswordLength, wchar_t *lpDisplayName) { DWORD dwError = ERROR_SUCCESS; @@ -994,24 +997,24 @@ /* Function 12 */ -unsigned long +DWORD ScmrCreateServiceW(handle_t BindingHandle, - unsigned int hSCManager, + unsigned long hSCManager, wchar_t *lpServiceName, wchar_t *lpDisplayName, - unsigned long dwDesiredAccess, - unsigned long dwServiceType, - unsigned long dwStartType, - unsigned long dwErrorControl, + DWORD dwDesiredAccess, + DWORD dwServiceType, + DWORD dwStartType, + DWORD dwErrorControl, wchar_t *lpBinaryPathName, wchar_t *lpLoadOrderGroup, - unsigned long *lpdwTagId, /* in, out */ + DWORD *lpdwTagId, /* in, out */ wchar_t *lpDependencies, - unsigned long dwDependenciesLength, + DWORD dwDependenciesLength, wchar_t *lpServiceStartName, wchar_t *lpPassword, - unsigned long dwPasswordLength, - unsigned int *hService) /* out */ + DWORD dwPasswordLength, + unsigned long *hService) /* out */ { PMANAGER_HANDLE hManager; DWORD dwError = ERROR_SUCCESS; @@ -1244,7 +1247,7 @@ if (dwError == ERROR_SUCCESS) { DPRINT("hService %lx\n", hServiceHandle); - *hService = (unsigned int)hServiceHandle; + *hService = (unsigned long)hServiceHandle; if (lpdwTagId != NULL) *lpdwTagId = lpService->dwTag; @@ -1255,7 +1258,7 @@ if (lpService->lpServiceName != NULL) HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName); - if (hServiceHandle != NULL) + if (hServiceHandle) { /* Remove the service handle */ HeapFree(GetProcessHeap(), 0, hServiceHandle); @@ -1277,14 +1280,14 @@ /* Function 13 */ -unsigned long +DWORD ScmrEnumDependentServicesW(handle_t BindingHandle, - unsigned int hService, - unsigned long dwServiceState, + unsigned long hService, + DWORD dwServiceState, unsigned char *lpServices, - unsigned long cbBufSize, - unsigned long *pcbBytesNeeded, - unsigned long *lpServicesReturned) + DWORD cbBufSize, + DWORD *pcbBytesNeeded, + DWORD *lpServicesReturned) { DWORD dwError = ERROR_SUCCESS; @@ -1299,16 +1302,16 @@ /* Function 14 */ -unsigned long +DWORD ScmrEnumServicesStatusW(handle_t BindingHandle, - unsigned int hSCManager, - unsigned long dwServiceType, - unsigned long dwServiceState, + unsigned long hSCManager, + DWORD dwServiceType, + DWORD dwServiceState, unsigned char *lpServices, - unsigned long dwBufSize, - unsigned long *pcbBytesNeeded, - unsigned long *lpServicesReturned, - unsigned long *lpResumeHandle) + DWORD dwBufSize, + DWORD *pcbBytesNeeded, + DWORD *lpServicesReturned, + DWORD *lpResumeHandle) { PMANAGER_HANDLE hManager; PSERVICE lpService; @@ -1498,12 +1501,12 @@ /* Function 15 */ -unsigned long +DWORD ScmrOpenSCManagerW(handle_t BindingHandle, wchar_t *lpMachineName, wchar_t *lpDatabaseName, - unsigned long dwDesiredAccess, - unsigned int *hScm) + DWORD dwDesiredAccess, + unsigned long *hScm) { DWORD dwError; SC_HANDLE hHandle; @@ -1536,7 +1539,7 @@ return dwError; } - *hScm = (unsigned int)hHandle; + *hScm = (unsigned long)hHandle; DPRINT("*hScm = %x\n", *hScm); DPRINT("ScmrOpenSCManagerW() done\n"); @@ -1546,12 +1549,12 @@ /* Function 16 */ -unsigned long +DWORD ScmrOpenServiceW(handle_t BindingHandle, - unsigned int hSCManager, + unsigned long hSCManager, wchar_t *lpServiceName, - unsigned long dwDesiredAccess, - unsigned int *hService) + DWORD dwDesiredAccess, + unsigned long *hService) { PSERVICE lpService; PMANAGER_HANDLE hManager; @@ -1603,7 +1606,7 @@ return dwError; } - *hService = (unsigned int)hHandle; + *hService = (unsigned long)hHandle; DPRINT("*hService = %x\n", *hService); DPRINT("ScmrOpenServiceW() done\n"); @@ -1613,12 +1616,12 @@ /* Function 17 */ -unsigned long +DWORD ScmrQueryServiceConfigW(handle_t BindingHandle, - unsigned int hService, + unsigned long hService, unsigned char *lpServiceConfig, - unsigned long cbBufSize, - unsigned long *pcbBytesNeeded) + DWORD cbBufSize, + DWORD *pcbBytesNeeded) { DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; @@ -1773,12 +1776,12 @@ /* Function 18 */ -unsigned long +DWORD ScmrQueryServiceLockStatusW(handle_t BindingHandle, - unsigned int hSCManager, + unsigned long hSCManager, unsigned char *lpLockStatus, /* [out, unique, size_is(cbBufSize)] */ - unsigned long cbBufSize, /* [in] */ - unsigned long *pcbBytesNeeded) /* [out] */ + DWORD cbBufSize, /* [in] */ + DWORD *pcbBytesNeeded) /* [out] */ { DPRINT1("ScmrQueryServiceLockStatusW() called\n"); return ERROR_CALL_NOT_IMPLEMENTED; @@ -1786,12 +1789,12 @@ /* Function 19 */ -unsigned long +DWORD ScmrStartServiceW(handle_t BindingHandle, - unsigned int hService, - unsigned long dwNumServiceArgs, + unsigned long hService, + DWORD dwNumServiceArgs, unsigned char *lpServiceArgBuffer, - unsigned long cbBufSize) + DWORD cbBufSize) { DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; @@ -1837,12 +1840,12 @@ /* Function 20 */ -unsigned long +DWORD ScmrGetServiceDisplayNameW(handle_t BindingHandle, - unsigned int hSCManager, + unsigned long hSCManager, wchar_t *lpServiceName, wchar_t *lpDisplayName, /* [out, unique] */ - unsigned long *lpcchBuffer) + DWORD *lpcchBuffer) { // PMANAGER_HANDLE hManager; PSERVICE lpService; @@ -1887,12 +1890,12 @@ /* Function 21 */ -unsigned long +DWORD ScmrGetServiceKeyNameW(handle_t BindingHandle, - unsigned int hSCManager, + unsigned long hSCManager, wchar_t *lpDisplayName, wchar_t *lpServiceName, /* [out, unique] */ - unsigned long *lpcchBuffer) + DWORD *lpcchBuffer) { // PMANAGER_HANDLE hManager; PSERVICE lpService; @@ -1937,12 +1940,12 @@ /* Function 22 */ -unsigned long +DWORD ScmrSetServiceBitsA(handle_t BindingHandle, - unsigned long hServiceStatus, - unsigned long dwServiceBits, - unsigned long bSetBitsOn, - unsigned long bUpdateImmediately, + SERVICE_STATUS_HANDLE hServiceStatus, + DWORD dwServiceBits, + BOOL bSetBitsOn, + BOOL bUpdateImmediately, char *lpString) { DPRINT1("ScmrSetServiceBitsA() is unimplemented\n"); @@ -1951,20 +1954,20 @@ /* Function 23 */ -unsigned long +DWORD ScmrChangeServiceConfigA(handle_t BiningHandle, - unsigned int hService, - unsigned long dwServiceType, - unsigned long dwStartType, - unsigned long dwErrorControl, + unsigned long hService, + DWORD dwServiceType, + DWORD dwStartType, + DWORD dwErrorControl, char *lpBinaryPathName, char *lpLoadOrderGroup, - unsigned long *lpdwTagId, + DWORD *lpdwTagId, char *lpDependencies, - unsigned long dwDependenciesLength, + DWORD dwDependenciesLength, char *lpServiceStartName, char *lpPassword, - unsigned long dwPasswordLength, + DWORD dwPasswordLength, char *lpDisplayName) { DPRINT1("ScmrChangeServiceConfigA() is unimplemented\n"); @@ -1973,24 +1976,24 @@ /* Function 24 */ -unsigned long +DWORD ScmrCreateServiceA(handle_t BindingHandle, - unsigned int hSCManager, + unsigned long hSCManager, char *lpServiceName, char *lpDisplayName, - unsigned long dwDesiredAccess, - unsigned long dwServiceType, - unsigned long dwStartType, - unsigned long dwErrorControl, + DWORD dwDesiredAccess, + DWORD dwServiceType, + DWORD dwStartType, + DWORD dwErrorControl, char *lpBinaryPathName, char *lpLoadOrderGroup, - unsigned long *lpdwTagId, /* in, out */ + DWORD *lpdwTagId, /* in, out */ char *lpDependencies, - unsigned long dwDependenciesLength, + DWORD dwDependenciesLength, char *lpServiceStartName, char *lpPassword, - unsigned long dwPasswordLength, - unsigned int *hService) /* out */ + DWORD dwPasswordLength, + unsigned long *hService) /* out */ { DPRINT1("ScmrCreateServiceA() is unimplemented\n"); return ERROR_CALL_NOT_IMPLEMENTED; @@ -1998,14 +2001,14 @@ /* Function 25 */ -unsigned long +DWORD ScmrEnumDependentServicesA(handle_t BindingHandle, - unsigned int hService, - unsigned long dwServiceState, + unsigned long hService, + DWORD dwServiceState, unsigned char *lpServices, - unsigned long cbBufSize, - unsigned long *pcbBytesNeeded, - unsigned long *lpServicesReturned) + DWORD cbBufSize, + DWORD *pcbBytesNeeded, + DWORD *lpServicesReturned) { DPRINT1("ScmrEnumDependentServicesA() is unimplemented\n"); *pcbBytesNeeded = 0; @@ -2015,15 +2018,15 @@ /* Function 26 */ -unsigned long +DWORD ScmrEnumServicesStatusA(handle_t BindingHandle, - unsigned int hSCManager, - unsigned long dwServiceType, - unsigned long dwServiceState, + unsigned long hSCManager, + DWORD dwServiceType, + DWORD dwServiceState, unsigned char *lpServices, - unsigned long dwBufSize, - unsigned long *pcbBytesNeeded, - unsigned long *lpServicesReturned, + DWORD dwBufSize, + DWORD *pcbBytesNeeded, + DWORD *lpServicesReturned, unsigned long *lpResumeHandle) { DPRINT1("ScmrEnumServicesAtatusA() is unimplemented\n"); @@ -2032,12 +2035,12 @@ /* Function 27 */ -unsigned long +DWORD ScmrOpenSCManagerA(handle_t BindingHandle, char *lpMachineName, char *lpDatabaseName, - unsigned long dwDesiredAccess, - unsigned int *hScm) + DWORD dwDesiredAccess, + unsigned long *hScm) { UNICODE_STRING MachineName; UNICODE_STRING DatabaseName; @@ -2070,12 +2073,12 @@ /* Function 28 */ -unsigned int +DWORD ScmrOpenServiceA(handle_t BindingHandle, - unsigned int hSCManager, + unsigned long hSCManager, char *lpServiceName, - unsigned long dwDesiredAccess, - unsigned int *hService) + DWORD dwDesiredAccess, + unsigned long *hService) { UNICODE_STRING ServiceName; DWORD dwError; @@ -2098,12 +2101,12 @@ /* Function 29 */ -unsigned long +DWORD ScmrQueryServiceConfigA(handle_t BindingHandle, - unsigned int hService, + unsigned long hService, unsigned char *lpServiceConfig, - unsigned long cbBufSize, - unsigned long *pcbBytesNeeded) + DWORD cbBufSize, + DWORD *pcbBytesNeeded) { DPRINT1("ScmrQueryServiceConfigA() is unimplemented\n"); return ERROR_CALL_NOT_IMPLEMENTED; @@ -2111,12 +2114,12 @@ /* Function 30 */ -unsigned long +DWORD ScmrQueryServiceLockStatusA(handle_t BindingHandle, - unsigned int hSCManager, + unsigned long hSCManager, unsigned char *lpLockStatus, /* [out, unique, size_is(cbBufSize)] */ - unsigned long cbBufSize, /* [in] */ - unsigned long *pcbBytesNeeded) /* [out] */ + DWORD cbBufSize, /* [in] */ + DWORD *pcbBytesNeeded) /* [out] */ { DPRINT1("ScmrQueryServiceLockStatusA() called\n"); return ERROR_CALL_NOT_IMPLEMENTED; @@ -2124,12 +2127,12 @@ /* Function 31 */ -unsigned long +DWORD ScmrStartServiceA(handle_t BindingHandle, - unsigned int hService, - unsigned long dwNumServiceArgs, + unsigned long hService, + DWORD dwNumServiceArgs, unsigned char *lpServiceArgBuffer, - unsigned long cbBufSize) + DWORD cbBufSize) { DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; @@ -2179,12 +2182,12 @@ /* Function 32 */ -unsigned long +DWORD ScmrGetServiceDisplayNameA(handle_t BindingHandle, - unsigned int hSCManager, + unsigned long hSCManager, char *lpServiceName, char *lpDisplayName, /* [out, unique] */ - unsigned long *lpcchBuffer) + DWORD *lpcchBuffer) { DPRINT1("ScmrGetServiceDisplayNameA() is unimplemented\n"); return ERROR_CALL_NOT_IMPLEMENTED; @@ -2192,12 +2195,12 @@ /* Function 33 */ -unsigned long +DWORD ScmrGetServiceKeyNameA(handle_t BindingHandle, - unsigned int hSCManager, + unsigned long hSCManager, char *lpDisplayName, char *lpServiceName, /* [out, unique] */ - unsigned long *lpcchBuffer) + DWORD *lpcchBuffer) { DPRINT1("ScmrGetServiceKeyNameA() is unimplemented\n"); return ERROR_CALL_NOT_IMPLEMENTED; @@ -2205,7 +2208,7 @@ /* Function 34 */ -unsigned long +DWORD ScmrGetCurrentGroupStateW(handle_t BindingHandle) { DPRINT1("ScmrGetCurrentGroupStateW() is unimplemented\n"); @@ -2214,7 +2217,7 @@ /* Function 35 */ -unsigned long +DWORD ScmrEnumServiceGroupW(handle_t BindingHandle) { DPRINT1("ScmrEnumServiceGroupW() is unimplemented\n"); @@ -2223,12 +2226,12 @@ /* Function 36 */ -unsigned long +DWORD ScmrChangeServiceConfig2A(handle_t BindingHandle, - unsigned int hService, - unsigned long dwInfoLevel, + unsigned long hService, + DWORD dwInfoLevel, unsigned char *lpInfo, - unsigned long dwInfoSize) + DWORD dwInfoSize) { DPRINT1("ScmrChangeServiceConfig2A() is unimplemented\n"); return ERROR_CALL_NOT_IMPLEMENTED; @@ -2236,12 +2239,12 @@ /* Function 37 */ -unsigned long +DWORD ScmrChangeServiceConfig2W(handle_t BindingHandle, - unsigned int hService, - unsigned long dwInfoLevel, + unsigned long hService, + DWORD dwInfoLevel, unsigned char *lpInfo, - unsigned long dwInfoSize) + DWORD dwInfoSize) { DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; @@ -2332,13 +2335,13 @@ /* Function 38 */ -unsigned long +DWORD ScmrQueryServiceConfig2A(handle_t BindingHandle, - unsigned int hService, - unsigned long dwInfoLevel, + unsigned long hService, + DWORD dwInfoLevel, unsigned char *lpBuffer, - unsigned long cbBufSize, - unsigned long *pcbBytesNeeded) + DWORD cbBufSize, + DWORD *pcbBytesNeeded) { DPRINT1("ScmrQueryServiceConfig2A() is unimplemented\n"); return ERROR_CALL_NOT_IMPLEMENTED; @@ -2346,13 +2349,13 @@ /* Function 39 */ -unsigned long +DWORD ScmrQueryServiceConfig2W(handle_t BindingHandle, - unsigned int hService, - unsigned long dwInfoLevel, + unsigned long hService, + DWORD dwInfoLevel, unsigned char *lpBuffer, - unsigned long cbBufSize, - unsigned long *pcbBytesNeeded) + DWORD cbBufSize, + DWORD *pcbBytesNeeded) { DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; @@ -2444,13 +2447,13 @@ /* Function 40 */ -unsigned long +DWORD ScmrQueryServiceStatusEx(handle_t BindingHandle, - unsigned int hService, - unsigned long InfoLevel, + unsigned long hService, + SC_STATUS_TYPE InfoLevel, unsigned char *lpBuffer, /* out */ - unsigned long cbBufSize, - unsigned long *pcbBytesNeeded) /* out */ + DWORD cbBufSize, + DWORD *pcbBytesNeeded) /* out */ { LPSERVICE_STATUS_PROCESS lpStatus; PSERVICE_HANDLE hSvc; @@ -2505,16 +2508,16 @@ /* Function 41 */ -unsigned long +DWORD ScmrEnumServicesStatusExA(handle_t BindingHandle, - unsigned int hSCManager, - unsigned long InfoLevel, - unsigned long dwServiceType, - unsigned long dwServiceState, + unsigned long hSCManager, + SC_STATUS_TYPE InfoLevel, + DWORD dwServiceType, + DWORD dwServiceState, unsigned char *lpServices, - unsigned long dwBufSize, - unsigned long *pcbBytesNeeded, - unsigned long *lpServicesReturned, + DWORD dwBufSize, + DWORD *pcbBytesNeeded, + DWORD *lpServicesReturned, unsigned long *lpResumeHandle, char *pszGroupName) { @@ -2526,17 +2529,17 @@ /* Function 42 */ -unsigned long +DWORD ScmrEnumServicesStatusExW(handle_t BindingHandle, - unsigned int hSCManager, - unsigned long InfoLevel, - unsigned long dwServiceType, - unsigned long dwServiceState, + unsigned long hSCManager, + SC_ENUM_TYPE InfoLevel, + DWORD dwServiceType, + DWORD dwServiceState, unsigned char *lpServices, - unsigned long dwBufSize, - unsigned long *pcbBytesNeeded, - unsigned long *lpServicesReturned, - unsigned long *lpResumeHandle, + DWORD dwBufSize, + DWORD *pcbBytesNeeded, + DWORD *lpServicesReturned, + DWORD *lpResumeHandle, wchar_t *pszGroupName) { PMANAGER_HANDLE hManager; Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Tue Dec 4 20:21:46 2007 @@ -657,7 +657,7 @@ (LPWSTR)lpServiceStartName, NULL, /* FIXME: lpPassword */ 0, /* FIXME: dwPasswordLength */ - (unsigned int *)&hService); + (unsigned long *)&hService); if (dwError != ERROR_SUCCESS) { DPRINT("ScmrCreateServiceW() failed (Error %lu)\n", dwError); @@ -1334,7 +1334,7 @@ (LPSTR)lpMachineName, (LPSTR)lpDatabaseName, dwDesiredAccess, - (unsigned int*)&hScm); + (unsigned long*)&hScm); if (dwError != ERROR_SUCCESS) { DPRINT1("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); @@ -1373,7 +1373,7 @@ (LPWSTR)lpMachineName, (LPWSTR)lpDatabaseName, dwDesiredAccess, - (unsigned int*)&hScm); + (unsigned long*)&hScm); if (dwError != ERROR_SUCCESS) { DPRINT1("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); @@ -1410,7 +1410,7 @@ (unsigned int)hSCManager, (LPSTR)lpServiceName, dwDesiredAccess, - (unsigned int*)&hService); + (unsigned long*)&hService); if (dwError != ERROR_SUCCESS) { DPRINT1("ScmrOpenServiceA() failed (Error %lu)\n", dwError); @@ -1447,7 +1447,7 @@ (unsigned int)hSCManager, (LPWSTR)lpServiceName, dwDesiredAccess, - (unsigned int*)&hService); + (unsigned long*)&hService); if (dwError != ERROR_SUCCESS) { DPRINT("ScmrOpenServiceW() failed (Error %lu)\n", dwError); Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl Tue Dec 4 20:21:46 2007 @@ -6,7 +6,7 @@ //#include <winsvc.h> #include "include/reactos/idl/wtypes.idl" -#define SC_HANDLE unsigned int +#define SC_HANDLE unsigned long #define SC_LOCK unsigned int #define SERVICE_STATUS_HANDLE unsigned long #define SC_STATUS_TYPE unsigned long @@ -268,7 +268,7 @@ [in] DWORD dwBufSize, [out] LPDWORD pcbBytesNeeded, [out] LPDWORD lpServicesReturned, - [in, out, unique] LPDWORD lpResumeHandle); + [in, out, unique] SC_HANDLE *lpResumeHandle); /* Function 27 */ DWORD R(OpenSCManagerA) ([in] handle_t BindingHandle, @@ -278,11 +278,11 @@ [out] SC_HANDLE *hScm); /* Function 28 */ - SC_HANDLE R(OpenServiceA) ([in] handle_t BindingHandle, - [in] SC_HANDLE hSCManager, - [in, string] LPCSTR lpServiceName, - [in] DWORD dwDesiredAccess, - [out] SC_HANDLE *hScm); + DWORD R(OpenServiceA) ([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string] LPCSTR lpServiceName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); /* Function 29 */ DWORD R(QueryServiceConfigA) ([in] handle_t BindingHandle, @@ -379,7 +379,7 @@ [in] DWORD cbBufSize, [out] LPDWORD pcbBytesNeeded, [out] LPDWORD lpServicesReturned, - [in, out, unique] LPDWORD lpResumeHandle, + [in, out, unique] SC_HANDLE *lpResumeHandle, [in, string, unique] LPCSTR pszGroupName); /* Function 42 */

1 0

[hpoussin] 31002: Update idl file too
by hpoussin＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: hpoussin Date: Tue Dec 4 20:10:45 2007 New Revision: 31002 URL: http://svn.reactos.org/svn/reactos?rev=31002&view=rev Log: Update idl file too Modified: trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/idl/wtypes.idl Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl (original) +++ trunk/reactos/include/reactos/idl/pnp.idl Tue Dec 4 20:10:45 2007 @@ -64,11 +64,11 @@ cpp_quote("#define PNP_BRANCH_ENUM 1") cpp_quote("#define PNP_BRANCH_CLASS 2") CONFIGRET PNP_EnumerateSubKeys(handle_t BindingHandle, - [in] unsigned long Branch, - [in] unsigned long Index, + [in] DWORD Branch, + [in] DWORD Index, [out, string, size_is(Length)] wchar_t *Buffer, - [in] unsigned long Length, - [out] unsigned long *RequiredLength, + [in] DWORD Length, + [out] DWORD *RequiredLength, [in] DWORD Flags); /* Function 10 */ @@ -93,11 +93,11 @@ /* Function 13 */ CONFIGRET PNP_GetDeviceRegProp(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, - [in] unsigned long Property, - [in, out] unsigned long *DataType, + [in] DWORD Property, + [in, out] DWORD *DataType, [out, size_is(*TransferLen)] char *Buffer, - [in, out] unsigned long *TransferLen, - [in, out] unsigned long *Length, + [in, out] DWORD *TransferLen, + [in, out] DWORD *Length, [in] DWORD Flags); /* Function 14 */ @@ -192,7 +192,7 @@ [in] DWORD Action, [in, string] wchar_t *DeviceId, [in] DWORD ProfileId, - [in, out] unsigned long *Value, + [in, out] DWORD *Value, [in] DWORD Flags); /* Function 42 */ Modified: trunk/reactos/include/reactos/idl/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wtypes… ============================================================================== --- trunk/reactos/include/reactos/idl/wtypes.idl (original) +++ trunk/reactos/include/reactos/idl/wtypes.idl Tue Dec 4 20:10:45 2007 @@ -2,7 +2,7 @@ #define WORD unsigned short #define DWORD unsigned long #define ULONG unsigned long -#define BOOL unsigned long +#define BOOL int #define LPSTR char* #define LPCSTR char* #define LPWSTR wchar_t*

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