Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 13384: Correct prototype for NtGetPlugPlayEvent and use the ntpnp.h header.
by navaraf＠svn.reactos.com 01 Feb '05

01 Feb '05

Correct prototype for NtGetPlugPlayEvent and use the ntpnp.h header. Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/plugplay.c _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-02-01 17:53:55 UTC (rev 13383) +++ trunk/reactos/include/ntos/zw.h 2005-02-01 17:54:25 UTC (rev 13384) @@ -4929,21 +4929,6 @@ VOID ); -/* --- PLUG AND PLAY --- */ - -NTSTATUS -STDCALL -NtPlugPlayControl(IN ULONG ControlCode, - IN OUT PVOID Buffer, - IN ULONG BufferLength); - -NTSTATUS -STDCALL -NtGetPlugPlayEvent(IN ULONG Reserved1, - IN ULONG Reserved2, - OUT PVOID Buffer, - IN ULONG BufferLength); - /* --- POWER MANAGEMENT --- */ #ifndef __USE_W32API _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-02-01 17:53:55 UTC (rev 13383) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-02-01 17:54:25 UTC (rev 13384) @@ -20,6 +20,7 @@ #include <ntos/synch.h> #include <ntos/keyboard.h> #include <ntos/ntdef.h> +#include <ntos/ntpnp.h> #include <rosrtl/minmax.h> #include <rosrtl/string.h> #include <ddk/halfuncs.h> _____ Modified: trunk/reactos/ntoskrnl/io/plugplay.c --- trunk/reactos/ntoskrnl/io/plugplay.c 2005-02-01 17:53:55 UTC (rev 13383) +++ trunk/reactos/ntoskrnl/io/plugplay.c 2005-02-01 17:54:25 UTC (rev 13384) @@ -15,13 +15,11 @@ #define NDEBUG #include <internal/debug.h> - /* GLOBALS *******************************************************************/ static LIST_ENTRY IopPnpEventListHead; static KEVENT IopPnpNotifyEvent; - /* FUNCTIONS *****************************************************************/ NTSTATUS INIT_FUNCTION @@ -67,7 +65,7 @@ NTSTATUS STDCALL NtGetPlugPlayEvent(IN ULONG Reserved1, IN ULONG Reserved2, - OUT PVOID Buffer, + OUT PPLUGPLAY_EVENT_BLOCK Buffer, IN ULONG BufferLength) { NTSTATUS Status;

1 0

[gdalsnes] 13383: RtlCreateUnicodeString->RtlpCreateUnicodeString
by gdalsnes＠svn.reactos.com 01 Feb '05

01 Feb '05

RtlCreateUnicodeString->RtlpCreateUnicodeString Modified: trunk/reactos/ntoskrnl/cm/import.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/dbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/ntoskrnl/io/create.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/object.c Modified: trunk/reactos/ntoskrnl/rtl/atom.c Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/ntoskrnl/cm/import.c --- trunk/reactos/ntoskrnl/cm/import.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/cm/import.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -196,12 +196,12 @@ } /* Set the hive filename */ - RtlCreateUnicodeString (&RegistryHive->HiveFileName, - SYSTEM_REG_FILE); + RtlpCreateUnicodeString (&RegistryHive->HiveFileName, + SYSTEM_REG_FILE, NonPagedPool); /* Set the log filename */ - RtlCreateUnicodeString (&RegistryHive->LogFileName, - SYSTEM_LOG_FILE); + RtlpCreateUnicodeString (&RegistryHive->LogFileName, + SYSTEM_LOG_FILE, NonPagedPool); return TRUE; } _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -200,8 +200,7 @@ } else { - RtlCreateUnicodeString(&KeyObject->Name, - Start); + RtlpCreateUnicodeString(&KeyObject->Name, Start, NonPagedPool); RtlFreeUnicodeString(&RemainingPath); } _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -863,11 +863,11 @@ RegistryHive, Filename); /* Duplicate Filename */ - Status = RtlCreateUnicodeString(&RegistryHive->HiveFileName, - Filename); + Status = RtlpCreateUnicodeString(&RegistryHive->HiveFileName, + Filename, NonPagedPool); if (!NT_SUCCESS(Status)) { - DPRINT("RtlCreateUnicodeString() failed (Status %lx)\n", Status); + DPRINT("RtlpCreateUnicodeString() failed (Status %lx)\n", Status); return(Status); } _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -315,7 +315,7 @@ RootKey->NumberOfSubKeys = 0; RootKey->SubKeys = NULL; RootKey->SizeOfSubKeys = 0; - Status = RtlCreateUnicodeString(&RootKey->Name, L"Registry"); + Status = RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); ASSERT(NT_SUCCESS(Status)); #if 0 @@ -662,12 +662,12 @@ DPRINT ("SubName %S\n", SubName); - Status = RtlCreateUnicodeString(&NewKey->Name, - SubName); + Status = RtlpCreateUnicodeString(&NewKey->Name, + SubName, NonPagedPool); RtlFreeUnicodeString(&RemainingPath); if (!NT_SUCCESS(Status)) { - DPRINT1("RtlCreateUnicodeString() failed (Status %lx)\n", Status); + DPRINT1("RtlpCreateUnicodeString() failed (Status %lx)\n", Status); if (NewKey->SubKeys != NULL) { ExFreePool (NewKey->SubKeys); _____ Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -160,8 +160,8 @@ FoundObject->KeyCell = SubKeyCell; FoundObject->KeyCellOffset = BlockOffset; FoundObject->RegistryHive = ParsedKey->RegistryHive; - RtlCreateUnicodeString(&FoundObject->Name, - KeyName.Buffer); + RtlpCreateUnicodeString(&FoundObject->Name, + KeyName.Buffer, NonPagedPool); CmiAddKeyToList(ParsedKey, FoundObject); DPRINT("Created object 0x%x\n", FoundObject); } @@ -248,8 +248,8 @@ Start = RemainingPath; if(*Start == L'\\') Start++; - RtlCreateUnicodeString(&KeyObject->Name, - Start); + RtlpCreateUnicodeString(&KeyObject->Name, + Start, NonPagedPool); } else { _____ Modified: trunk/reactos/ntoskrnl/dbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/dbg/kdb_symbols.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/dbg/kdb_symbols.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -715,7 +715,7 @@ RtlZeroMemory(CacheEntry, sizeof (IMAGE_SYMBOL_INFO_CACHE)); /* fill entry */ - RtlCreateUnicodeString(&CacheEntry->FileName, FileName->Buffer); + RtlpCreateUnicodeString(&CacheEntry->FileName, FileName->Buffer, NonPagedPool); ASSERT(CacheEntry->FileName.Buffer); CacheEntry->RefCount = 1; CacheEntry->FileBuffer = SymbolInfo->FileBuffer; _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -54,7 +54,7 @@ { ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExEventObjectType->TypeName, L"Event"); + RtlpCreateUnicodeString(&ExEventObjectType->TypeName, L"Event", NonPagedPool); ExEventObjectType->Tag = TAG('E', 'V', 'T', 'T'); ExEventObjectType->PeakObjects = 0; _____ Modified: trunk/reactos/ntoskrnl/ex/evtpair.c --- trunk/reactos/ntoskrnl/ex/evtpair.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/ex/evtpair.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -60,7 +60,7 @@ { ExEventPairObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExEventPairObjectType->TypeName, L"EventPair"); + RtlpCreateUnicodeString(&ExEventPairObjectType->TypeName, L"EventPair", NonPagedPool); ExEventPairObjectType->Tag = TAG('E', 'v', 'P', 'a'); ExEventPairObjectType->PeakObjects = 0; ExEventPairObjectType->PeakHandles = 0; _____ Modified: trunk/reactos/ntoskrnl/ex/mutant.c --- trunk/reactos/ntoskrnl/ex/mutant.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/ex/mutant.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -65,7 +65,7 @@ { ExMutantObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExMutantObjectType->TypeName, L"Mutant"); + RtlpCreateUnicodeString(&ExMutantObjectType->TypeName, L"Mutant", NonPagedPool); ExMutantObjectType->Tag = TAG('M', 'T', 'N', 'T'); ExMutantObjectType->PeakObjects = 0; _____ Modified: trunk/reactos/ntoskrnl/ex/profile.c --- trunk/reactos/ntoskrnl/ex/profile.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/ex/profile.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -68,7 +68,7 @@ ExProfileObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExProfileObjectType->TypeName, L"Profile"); + RtlpCreateUnicodeString(&ExProfileObjectType->TypeName, L"Profile", NonPagedPool); ExProfileObjectType->Tag = TAG('P', 'R', 'O', 'F'); ExProfileObjectType->PeakObjects = 0; _____ Modified: trunk/reactos/ntoskrnl/ex/sem.c --- trunk/reactos/ntoskrnl/ex/sem.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/ex/sem.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -53,7 +53,7 @@ { ExSemaphoreObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExSemaphoreObjectType->TypeName, L"Semaphore"); + RtlpCreateUnicodeString(&ExSemaphoreObjectType->TypeName, L"Semaphore", NonPagedPool); ExSemaphoreObjectType->Tag = TAG('S', 'E', 'M', 'T'); ExSemaphoreObjectType->PeakObjects = 0; _____ Modified: trunk/reactos/ntoskrnl/ex/timer.c --- trunk/reactos/ntoskrnl/ex/timer.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/ex/timer.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -119,7 +119,7 @@ ASSERT(!ExTimerType) ExTimerType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExTimerType->TypeName, L"Timer"); + RtlpCreateUnicodeString(&ExTimerType->TypeName, L"Timer", NonPagedPool); ExTimerType->Tag = TAG('T', 'I', 'M', 'T'); ExTimerType->PeakObjects = 0; _____ Modified: trunk/reactos/ntoskrnl/ex/win32k.c --- trunk/reactos/ntoskrnl/ex/win32k.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/ex/win32k.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -84,7 +84,7 @@ DPRINT("Creating window station (0x%X) Name (%wZ)\n", WinSta, &UnicodeString); - Status = RtlCreateUnicodeString(&WinSta->Name, UnicodeString.Buffer); + Status = RtlpCreateUnicodeString(&WinSta->Name, UnicodeString.Buffer, NonPagedPool); if (!NT_SUCCESS(Status)) { return Status; @@ -247,7 +247,7 @@ &Desktop->ListEntry, &Desktop->WindowStation->Lock); - return RtlCreateUnicodeString(&Desktop->Name, UnicodeString.Buffer); + return RtlpCreateUnicodeString(&Desktop->Name, UnicodeString.Buffer, NonPagedPool); } VOID STDCALL _____ Modified: trunk/reactos/ntoskrnl/io/create.c --- trunk/reactos/ntoskrnl/io/create.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/io/create.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -147,8 +147,8 @@ DeviceObject = DeviceObject->Vpb->DeviceObject; DPRINT("FsDeviceObject %lx\n", DeviceObject); } - RtlCreateUnicodeString(&(FileObject->FileName), - RemainingPath); + RtlpCreateUnicodeString(&(FileObject->FileName), + RemainingPath, NonPagedPool); } } else @@ -165,8 +165,8 @@ FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; - RtlCreateUnicodeString(&(FileObject->FileName), - RemainingPath); + RtlpCreateUnicodeString(&(FileObject->FileName), + RemainingPath, NonPagedPool); } DPRINT("FileObject->FileName %wZ\n", _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -794,8 +794,7 @@ RtlZeroMemory(Group, sizeof(SERVICE_GROUP)); - if (!RtlCreateUnicodeString(&Group->GroupName, - (PWSTR)ValueData)) + if (!RtlpCreateUnicodeString(&Group->GroupName, (PWSTR)ValueData, NonPagedPool)) { ExFreePool(Group); return(STATUS_INSUFFICIENT_RESOURCES); @@ -1864,7 +1863,7 @@ Start = DriverServiceName->Buffer; else Start++; - RtlCreateUnicodeString(&DeviceNode->ServiceName, Start); + RtlpCreateUnicodeString(&DeviceNode->ServiceName, Start, NonPagedPool); /* * Initialize the driver module _____ Modified: trunk/reactos/ntoskrnl/io/iocomp.c --- trunk/reactos/ntoskrnl/io/iocomp.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/io/iocomp.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -119,7 +119,7 @@ { ExIoCompletionType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - RtlCreateUnicodeString(&ExIoCompletionType->TypeName, L"IoCompletion"); + RtlpCreateUnicodeString(&ExIoCompletionType->TypeName, L"IoCompletion", NonPagedPool); ExIoCompletionType->Tag = IOC_TAG; ExIoCompletionType->PeakObjects = 0; _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -195,7 +195,7 @@ { KIRQL oldlvl; - RtlCreateUnicodeString(&Header->Name, Name); + RtlpCreateUnicodeString(&Header->Name, Name, NonPagedPool); Header->Parent = Parent; KeAcquireSpinLock(&Parent->Lock, &oldlvl); _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -439,7 +439,7 @@ } if (current) - RtlCreateUnicodeString (RemainingPath, current); + RtlpCreateUnicodeString (RemainingPath, current, NonPagedPool); RtlFreeUnicodeString (&PathString); *ReturnedObject = CurrentObject; _____ Modified: trunk/reactos/ntoskrnl/rtl/atom.c --- trunk/reactos/ntoskrnl/rtl/atom.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/rtl/atom.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -377,8 +377,8 @@ } InsertTailList(&AtomTable->Slot[Hash], &Entry->List); - RtlCreateUnicodeString (&Entry->Name, - AtomName); + RtlpCreateUnicodeString (&Entry->Name, + AtomName, NonPagedPool); Entry->RefCount = 1; Entry->Locked = FALSE; _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-02-01 17:41:49 UTC (rev 13382) +++ trunk/reactos/ntoskrnl/se/token.c 2005-02-01 17:53:55 UTC (rev 13383) @@ -547,8 +547,8 @@ SepTokenObjectType->Create = NULL; SepTokenObjectType->DuplicationNotify = NULL; - RtlCreateUnicodeString(&SepTokenObjectType->TypeName, - L"Token"); + RtlpCreateUnicodeString(&SepTokenObjectType->TypeName, + L"Token", NonPagedPool); ObpCreateTypeObject (SepTokenObjectType); }

1 0

[navaraf] 13382: - Header with declarations for NtPlugPlayControl and NtGetPlugPlayEvent.
by navaraf＠svn.reactos.com 01 Feb '05

01 Feb '05

- Header with declarations for NtPlugPlayControl and NtGetPlugPlayEvent. Added: trunk/reactos/include/ntos/ntpnp.h _____ Added: trunk/reactos/include/ntos/ntpnp.h --- trunk/reactos/include/ntos/ntpnp.h 2005-02-01 17:40:21 UTC (rev 13381) +++ trunk/reactos/include/ntos/ntpnp.h 2005-02-01 17:41:49 UTC (rev 13382) @@ -0,0 +1,250 @@ +/* + * ntpnp.h + * + * Plug-and-play interface routines + * + * Contributors: + * Created by Filip Navara <xnavara(a)volny.cz> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +#ifndef __NTPNP_H +#define __NTPNP_H + +/* + * TODO: + * - Describe the undocumented GUIDs. + * - Finish the description of NtPlugPlayControl. + */ + +/* + * Undocumented GUIDs used by NtGetPlugPlayEvent. + */ + +DEFINE_GUID(GUID_DEVICE_STANDBY_VETOED, 0x03B21C13, 0x11D3, 0x18D6, 0xA0, 0x00, 0xDB, 0x97, 0x2E, 0x52, 0x40, 0xC9); +DEFINE_GUID(GUID_DEVICE_KERNEL_INITIATED_EJECT, 0x14689B54, 0x11D3, 0x0703, 0xA0, 0x00, 0xD2, 0x97, 0x2E, 0x52, 0x40, 0xC9); +DEFINE_GUID(GUID_DEVICE_THERMAL_ZONE, 0x4AFA3D51, 0x11D0, 0x74A7, 0xA0, 0x00, 0x5E, 0xBE, 0x57, 0x28, 0x06, 0xC9); +DEFINE_GUID(GUID_DEVICE_SYS_BUTTON, 0x4AFA3D53, 0x11D0, 0x74A7, 0xA0, 0x00, 0x5E, 0xBE, 0x57, 0x28, 0x06, 0xC9); +DEFINE_GUID(GUID_DEVICE_REMOVAL_VETOED, 0x60DBD5FA, 0x11D2, 0xDDD2, 0xA0, 0x00, 0xB8, 0x97, 0x2E, 0x52, 0x40, 0xC9); +DEFINE_GUID(GUID_DEVICE_HIBERNATE_VETOED, 0x61173AD9, 0x11D3, 0x194F, 0xA0, 0x00, 0xDC, 0x97, 0x2E, 0x52, 0x40, 0xC9); +DEFINE_GUID(GUID_DEVICE_BATTERY, 0x72631E54, 0x11D0, 0x78A4, 0xAA, 0x00, 0xF7, 0xBC, 0x2A, 0xB3, 0xB7, 0x00); +DEFINE_GUID(GUID_DEVICE_SAFE_REMOVAL, 0x8FBEF967, 0x11D2, 0xD6C5, 0xA0, 0x00, 0xB5, 0x97, 0x2E, 0x52, 0x40, 0xC9); +/* DEFINE_GUID(GUID_DEVICE_INTERFACE_ARRIVAL, 0xCB3A4004, 0x11D0, 0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); */ +/* DEFINE_GUID(GUID_DEVICE_INTERFACE_REMOVAL, 0xCB3A4005, 0x11D0, 0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); */ +DEFINE_GUID(GUID_DEVICE_ARRIVAL, 0xCB3A4009, 0x11D0, 0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); +DEFINE_GUID(GUID_DEVICE_ENUMERATED, 0xCB3A400A, 0x11D0, 0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); +DEFINE_GUID(GUID_DEVICE_ENUMERATE_REQUEST, 0xCB3A400B, 0x11D0, 0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); +DEFINE_GUID(GUID_DEVICE_START_REQUEST, 0xCB3A400C, 0x11D0, 0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); +DEFINE_GUID(GUID_DEVICE_REMOVE_PENDING, 0xCB3A400D, 0x11D0, 0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); +DEFINE_GUID(GUID_DEVICE_QUERY_AND_REMOVE, 0xCB3A400E, 0x11D0, 0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); +DEFINE_GUID(GUID_DEVICE_EJECT, 0xCB3A400F, 0x11D0, 0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); +DEFINE_GUID(GUID_DEVICE_NOOP, 0xCB3A4010, 0x11D0, 0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); +DEFINE_GUID(GUID_DEVICE_WARM_EJECT_VETOED, 0xCBF4C1F9, 0x11D3, 0x18D5, 0xA0, 0x00, 0xDB, 0x97, 0x2E, 0x52, 0x40, 0xC9); +DEFINE_GUID(GUID_DEVICE_SURPRISE_REMOVAL, 0xCE5AF000, 0x11D2, 0x80DD, 0xA0, 0x00, 0x8D, 0xA8, 0x4B, 0x6B, 0x69, 0xC9); +DEFINE_GUID(GUID_DEVICE_EJECT_VETOED, 0xCF7B71E8, 0x11D2, 0xD8FD, 0xA0, 0x00, 0xB5, 0x97, 0x2E, 0x52, 0x40, 0xC9); +DEFINE_GUID(GUID_DEVICE_EVENT_RBC, 0xD0744792, 0x11D2, 0xA98E, 0xA0, 0x00, 0x7A, 0x91, 0xF3, 0x8F, 0x06, 0xC9); + +typedef enum _PLUGPLAY_EVENT_CATEGORY { + HardwareProfileChangeEvent, + TargetDeviceChangeEvent, + DeviceClassChangeEvent, + CustomDeviceEvent, + DeviceInstallEvent, + DeviceArrivalEvent, + PowerEvent, + VetoEvent, + BlockedDriverEvent, + MaxPlugEventCategory +} PLUGPLAY_EVENT_CATEGORY; + +typedef enum _PNP_VETO_TYPE { + PNP_VetoTypeUnknown, + PNP_VetoLegacyDevice, + PNP_VetoPendingClose, + PNP_VetoWindowsApp, + PNP_VetoWindowsService, + PNP_VetoOutstandingOpen, + PNP_VetoDevice, + PNP_VetoDriver, + PNP_VetoIllegalDeviceRequest, + PNP_VetoInsufficientPower, + PNP_VetoNonDisableable, + PNP_VetoLegacyDriver, + PNP_VetoInsufficientRights, +} PNP_VETO_TYPE; + +/* + * Plug and Play event structure used by NtGetPlugPlayEvent. + * + * EventGuid + * Can be one of the following values: + * GUID_HWPROFILE_QUERY_CHANGE + * GUID_HWPROFILE_CHANGE_CANCELLED + * GUID_HWPROFILE_CHANGE_COMPLETE + * GUID_TARGET_DEVICE_QUERY_REMOVE + * GUID_TARGET_DEVICE_REMOVE_CANCELLED + * GUID_TARGET_DEVICE_REMOVE_COMPLETE + * GUID_PNP_CUSTOM_NOTIFICATION + * GUID_PNP_POWER_NOTIFICATION + * GUID_DEVICE_* (see above) + * + * EventCategory + * Type of the event that happened. + * + * Result + * ? + * + * Flags + * ? + * + * TotalSize + * Size of the event block including the device IDs and other + * per category specific fields. + */ + +typedef struct _PLUGPLAY_EVENT_BLOCK { + GUID EventGuid; + PLUGPLAY_EVENT_CATEGORY EventCategory; + PULONG Result; + ULONG Flags; + ULONG TotalSize; + PDEVICE_OBJECT DeviceObject; + union { + struct { + GUID ClassGuid; + WCHAR SymbolicLinkName[ANYSIZE_ARRAY]; + } DeviceClass; + struct { + WCHAR DeviceIds[ANYSIZE_ARRAY]; + } TargetDevice; + struct { + WCHAR DeviceId[ANYSIZE_ARRAY]; + } InstallDevice; + struct { + PVOID NotificationStructure; + WCHAR DeviceIds[ANYSIZE_ARRAY]; + } CustomNotification; + struct { + PVOID Notification; + } ProfileNotification; + struct { + ULONG NotificationCode; + ULONG NotificationData; + } PowerNotification; + struct { + PNP_VETO_TYPE VetoType; + WCHAR DeviceIdVetoNameBuffer[ANYSIZE_ARRAY]; + } VetoNotification; + struct { + GUID BlockedDriverGuid; + } BlockedDriverNotification; + }; +} PLUGPLAY_EVENT_BLOCK, *PPLUGPLAY_EVENT_BLOCK; + +/* + * NtGetPlugPlayEvent + * + * Returns one Plug & Play event from a global queue. + * + * Parameters + * Reserved1 + * Reserved2 + * Always set to zero. + * + * Buffer + * The buffer that will be filled with the event information on + * successful return from the function. + * + * BufferSize + * Size of the buffer pointed by the Buffer parameter. If the + * buffer size is not large enough to hold the whole event + * information, error STATUS_BUFFER_TOO_SMALL is returned and + * the buffer remains untouched. + * + * Return Values + * STATUS_PRIVILEGE_NOT_HELD + * STATUS_BUFFER_TOO_SMALL + * STATUS_SUCCESS + * + * Remarks + * This function isn't multi-thread safe! + */ + +NTSTATUS STDCALL +NtGetPlugPlayEvent( + ULONG Reserved1, + ULONG Reserved2, + PPLUGPLAY_EVENT_BLOCK Buffer, + ULONG BufferSize); + +/* + * NtPlugPlayControl + * + * A function for doing various Plug & Play operations from user mode. + * + * Parameters + * ControlCode + * 0x00 Reenumerate device tree + * + * Buffer points to UNICODE_STRING decribing the instance + * path (like "HTREE\ROOT\0" or "Root\ACPI_HAL\0000"). For + * more information about instance paths see !devnode command + * in kernel debugger or look at "Inside Windows 2000" book, + * chapter "Driver Loading, Initialization, and Installation". + * + * 0x01 Register new device + * 0x02 Deregister device + * 0x03 Initialize device + * 0x04 Start device + * 0x06 Query and remove device + * 0x07 User response + * + * Called after processing the message from NtGetPlugPlayEvent. + * + * 0x08 Generate legacy device + * 0x09 Get interface device list + * 0x0A Get property data + * 0x0B Device class association (Registration) + * 0x0C Get related device + * 0x0D Get device interface alias + * 0x0E Get/set device status + * 0x0F Get device depth + * 0x10 Query device relations + * 0x11 Query target device relation + * 0x12 Query conflict list + * 0x13 Retrieve dock data + * 0x14 Reset device + * 0x15 Halt device + * 0x16 Get blocked driver data + * + * Buffer + * The buffer contains information that is specific to each control + * code. The buffer is read-only. + * + * BufferSize + * Size of the buffer pointed by the Buffer parameter. If the + * buffer size specifies incorrect value for specified control + * code, error ??? is returned. + * + * Return Values + * STATUS_PRIVILEGE_NOT_HELD + * STATUS_SUCCESS + * ... + */ + +NTSTATUS STDCALL +NtPlugPlayControl( + ULONG ControlCode, + PVOID Buffer, + ULONG BufferSize); + +#endif /* __NTPNP_H */

1 0

[jimtabor] 13381: Added Jimtabor to list.
by jimtabor＠svn.reactos.com 01 Feb '05

01 Feb '05

Added Jimtabor to list. Modified: trunk/rosapps/notevil/notevil.rc _____ Modified: trunk/rosapps/notevil/notevil.rc --- trunk/rosapps/notevil/notevil.rc 2005-02-01 16:40:23 UTC (rev 13380) +++ trunk/rosapps/notevil/notevil.rc 2005-02-01 17:40:21 UTC (rev 13381) @@ -69,6 +69,7 @@ 41, "Thomas Weidenmueller" 42, "Jonathan Wilson" 43, "Alex Ionescu" + 44, "Jim Tabor" END /* EOF */

1 0

[ekohl] 13380: NtDisplayString: Convert Unicode string to OEM.
by ekohl＠svn.reactos.com 01 Feb '05

01 Feb '05

NtDisplayString: Convert Unicode string to OEM. Modified: trunk/reactos/ntoskrnl/inbv/inbv.c _____ Modified: trunk/reactos/ntoskrnl/inbv/inbv.c --- trunk/reactos/ntoskrnl/inbv/inbv.c 2005-02-01 16:38:02 UTC (rev 13379) +++ trunk/reactos/ntoskrnl/inbv/inbv.c 2005-02-01 16:40:23 UTC (rev 13380) @@ -59,6 +59,7 @@ return(STATUS_SUCCESS); } + VOID STDCALL InbvAcquireDisplayOwnership(VOID) @@ -81,6 +82,7 @@ return FALSE; } + BOOLEAN STDCALL InbvResetDisplayParameters(ULONG SizeX, ULONG SizeY) @@ -88,6 +90,7 @@ return(InbvResetDisplay()); } + VOID STDCALL INIT_FUNCTION InbvEnableBootDriver(IN BOOLEAN Enable) @@ -148,6 +151,7 @@ } } + BOOLEAN STDCALL InbvEnableDisplayString(IN BOOLEAN Enable) @@ -221,13 +225,11 @@ STDCALL NtDisplayString(IN PUNICODE_STRING DisplayString) { - ANSI_STRING AnsiString; + OEM_STRING OemString; - RtlUnicodeStringToAnsiString (&AnsiString, DisplayString, TRUE); + RtlUnicodeStringToOemString(&OemString, DisplayString, TRUE); + HalDisplayString(OemString.Buffer); + RtlFreeOemString(&OemString); - HalDisplayString (AnsiString.Buffer); - - RtlFreeAnsiString (&AnsiString); - - return(STATUS_SUCCESS); + return STATUS_SUCCESS; }

1 0

[jimtabor] 13379: But back Advpack for now.
by jimtabor＠svn.reactos.com 01 Feb '05

01 Feb '05

But back Advpack for now. Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-02-01 16:35:30 UTC (rev 13378) +++ trunk/reactos/Makefile 2005-02-01 16:38:02 UTC (rev 13379) @@ -54,8 +54,8 @@ DLLS_SHELLEXT = shellext # User mode libraries -# advpack libpcap packet epsapi -DLLS = acledit aclui advapi32 cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ +# libpcap packet epsapi +DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \ msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi snmpapi syssetup twain \

1 0

[hbirr] 13378: - Removed some wrong calls to MmUnlockAddressSpace.
by hbirr＠svn.reactos.com 01 Feb '05

01 Feb '05

- Removed some wrong calls to MmUnlockAddressSpace. - Dereference the section object after creating the section. Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-02-01 16:24:10 UTC (rev 13377) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-02-01 16:35:30 UTC (rev 13378) @@ -954,7 +954,6 @@ MmUnlockAddressSpace(&Process->AddressSpace); if (!NT_SUCCESS(Status)) { - MmUnlockAddressSpace(&Process->AddressSpace); /* FIXME ? */ DPRINT1("Failed to create shared data page\n"); ObDereferenceObject(Process); goto exitdereferenceobjects; @@ -972,7 +971,6 @@ &hProcess); if (!NT_SUCCESS(Status)) { - MmUnlockAddressSpace(&Process->AddressSpace); /* FIXME ? */ DPRINT1("Failed to create a handle for the process\n"); ObDereferenceObject(Process); goto exitdereferenceobjects; @@ -987,7 +985,6 @@ if (!NT_SUCCESS(Status)) { DbgPrint("LdrpMapSystemDll failed (Status %x)\n", Status); - MmUnlockAddressSpace(&Process->AddressSpace); /* FIXME ? */ ObDereferenceObject(Process); goto exitdereferenceobjects; } @@ -1009,11 +1006,10 @@ 0, MEM_COMMIT, PAGE_READWRITE); - + ObDereferenceObject(SectionObject); if (!NT_SUCCESS(Status)) { DbgPrint("Failed to map the process section (Status %x)\n", Status); - MmUnlockAddressSpace(&Process->AddressSpace); /* FIXME ? */ ObDereferenceObject(Process); goto exitdereferenceobjects; }

1 0

[ekohl] 13377: First attempt at implementing NtGetPlugPlayEvent.
by ekohl＠svn.reactos.com 01 Feb '05

01 Feb '05

First attempt at implementing NtGetPlugPlayEvent. Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/io/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-02-01 16:15:24 UTC (rev 13376) +++ trunk/reactos/include/ntos/zw.h 2005-02-01 16:24:10 UTC (rev 13377) @@ -2702,7 +2702,7 @@ FileNamesInformation FILE_NAMES_INFORMATION FileDispositionInformation FILE_DISPOSITION_INFORMATION FilePositionInformation FILE_POSITION_INFORMATION - FileFullEaInformation FILE_FULL_EA_INFORMATION + FileFullEaInformation FILE_FULL_EA_INFORMATION FileModeInformation FILE_MODE_INFORMATION FileAlignmentInformation FILE_ALIGNMENT_INFORMATION FileAllInformation FILE_ALL_INFORMATION @@ -2715,7 +2715,7 @@ FilePipeRemoteInformation FileMailslotQueryInformation FileMailslotSetInformation - FileCompressionInformation FILE_COMPRESSION_INFORMATION + FileCompressionInformation FILE_COMPRESSION_INFORMATION FileCopyOnWriteInformation FileCompletionInformation IO_COMPLETION_CONTEXT FileMoveClusterInformation @@ -2728,7 +2728,7 @@ FileContentIndexInformation FileInheritContentIndexInformation FileOleInformation - FileMaximumInformation + FileMaximumInformation * REMARK: * This procedure maps to the win32 GetShortPathName, GetLongPathName, @@ -4933,16 +4933,16 @@ NTSTATUS STDCALL -NtPlugPlayControl (DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); +NtPlugPlayControl(IN ULONG ControlCode, + IN OUT PVOID Buffer, + IN ULONG BufferLength); NTSTATUS STDCALL -NtGetPlugPlayEvent (ULONG Reserved1, - ULONG Reserved2, - PVOID Buffer, - ULONG BufferLength); +NtGetPlugPlayEvent(IN ULONG Reserved1, + IN ULONG Reserved2, + OUT PVOID Buffer, + IN ULONG BufferLength); /* --- POWER MANAGEMENT --- */ @@ -5027,12 +5027,6 @@ ULONG Selector2, LDT_ENTRY LdtEntry2); -NTSTATUS -STDCALL -NtQueryOleDirectoryFile ( - VOID - ); - /* * FUNCTION: Checks a clients access rights to a object * ARGUMENTS: _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-02-01 16:15:24 UTC (rev 13376) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-02-01 16:24:10 UTC (rev 13377) @@ -500,6 +500,13 @@ VOID FASTCALL IopReinitializeDrivers(VOID); + +/* pnpevent.c */ + +NTSTATUS INIT_FUNCTION +IopInitPlugPlayEvents(VOID); + + /* pnpmgr.c */ NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/io/plugplay.c --- trunk/reactos/ntoskrnl/io/plugplay.c 2005-02-01 16:15:24 UTC (rev 13376) +++ trunk/reactos/ntoskrnl/io/plugplay.c 2005-02-01 16:24:10 UTC (rev 13377) @@ -1,9 +1,9 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/plugplay.c - * PURPOSE: Mysterious nt4 support for plug-and-play + * PURPOSE: Plug-and-play interface routines * * PROGRAMMERS: David Welch (welch(a)mcmail.com) */ @@ -11,27 +11,129 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> + +#define NDEBUG #include <internal/debug.h> + +/* GLOBALS *******************************************************************/ + +static LIST_ENTRY IopPnpEventListHead; +static KEVENT IopPnpNotifyEvent; + + /* FUNCTIONS *****************************************************************/ -NTSTATUS -STDCALL -NtPlugPlayControl (DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) +NTSTATUS INIT_FUNCTION +IopInitPlugPlayEvents(VOID) { - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); + + InitializeListHead(&IopPnpEventListHead); + + KeInitializeEvent(&IopPnpNotifyEvent, + NotificationEvent, + FALSE); + + return STATUS_SUCCESS; } -NTSTATUS -STDCALL -NtGetPlugPlayEvent (ULONG Reserved1, - ULONG Reserved2, - PVOID Buffer, - ULONG BufferLength) + +#if 0 +/* Insert a new pnp event at the head of the event queue */ +VOID +IopEnqueuePlugPlayEvent(VOID) { - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); + } +#endif + + +#if 0 +/* + * Remove the current PnP event from the tail of the event queue + * and signal IopPnpNotifyEvent if there is yet another event in the queue. + */ +VOID +IopDequeuePlugPlayEvent(VOID) +{ + +} +#endif + + +/* + * @unimplemented + */ +NTSTATUS STDCALL +NtGetPlugPlayEvent(IN ULONG Reserved1, + IN ULONG Reserved2, + OUT PVOID Buffer, + IN ULONG BufferLength) +{ + NTSTATUS Status; + + DPRINT("NtGetPlugPlayEvent() called\n"); + + /* Function can only be called from user-mode */ + if (KeGetPreviousMode() != UserMode) + { + DPRINT1("NtGetPlugPlayEvent cannot be called from kernel mode!\n"); + return STATUS_ACCESS_DENIED; + } + + /* Check for Tcb privilege */ + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, + UserMode)) + { + DPRINT1("NtGetPlugPlayEvent: Caller requires the SeTcbPrivilege privilege!\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* Wait for a PnP event */ + DPRINT("Waiting for pnp notification event\n"); + Status = KeWaitForSingleObject(&IopPnpNotifyEvent, + UserRequest, + KernelMode, + FALSE, + NULL); + if (NT_SUCCESS(Status)) + { + DPRINT("Waiting done\n"); + +#if 0 + /* Get entry from the tail of the list */ + Entry = IopPnpEventListHead.Blink; + + /* Check the buffer size */ + if (BufferLength < Entry->Event.Size) + { + DPRINT1("Buffer is too small for the pnp-event\n"); + return STATUS_BUFFER_TOO_SMALL; + } + + /* Copy event data to user buffer */ + memcpy(Buffer, + &Entry->Event, + &Entry->Event.Size); +#endif + } + + DPRINT("NtGetPlugPlayEvent() done\n"); + + return Status; +} + + +/* + * @unimplemented + */ +NTSTATUS STDCALL +NtPlugPlayControl(IN ULONG ControlCode, + IN OUT PVOID Buffer, + IN ULONG BufferLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-02-01 16:15:24 UTC (rev 13376) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-02-01 16:24:10 UTC (rev 13377) @@ -481,7 +481,7 @@ return STATUS_UNSUCCESSFUL; } -/********************************************************************** +/* * DESCRIPTION * Creates a device node * @@ -1556,7 +1556,6 @@ * parent node. This function just calls IopActionInitChildServices with * BootDrivers = TRUE. */ - NTSTATUS IopActionInitBootServices( PDEVICE_NODE DeviceNode, @@ -1581,7 +1580,6 @@ * Return Value * Status */ - NTSTATUS IopInitializePnpServices( IN PDEVICE_NODE DeviceNode, @@ -1768,6 +1766,14 @@ KeInitializeSpinLock(&IopDeviceTreeLock); + /* Initialize PnP-Event notification support */ + Status = IopInitPlugPlayEvents(); + if (!NT_SUCCESS(Status)) + { + CPRINT("IopInitPlugPlayEvents() failed\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + /* * Create root device node */

1 0

[ekohl] 13376: Fix typos in shutdown messages.
by ekohl＠svn.reactos.com 01 Feb '05

01 Feb '05

Fix typos in shutdown messages. Modified: trunk/reactos/ntoskrnl/ex/power.c _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-02-01 13:58:33 UTC (rev 13375) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-02-01 16:15:24 UTC (rev 13376) @@ -154,8 +154,8 @@ "tell me..., in the future... will I be artificial intelligent enough to actually feel\n" "sad serving you this screen?\n", "Thank you for some well deserved rest.\n", - "ItÆs been great, maybe we can boot me up again some time soon.\n", - "For whatÆs it worth, IÆve enjoyed every single CPU cycle.\n", + "It's been great, maybe we can boot me up again some time soon.\n", + "For what's it worth, I've enjoyed every single CPU cycle.\n", "There are many questions when the end is near.\n" "What to expect, what will it be like...what should I look for?\n", "I've seen things you people wouldn't believe. Attack ships on fire\n" @@ -212,6 +212,4 @@ return STATUS_SUCCESS; } - /* EOF */ -

1 0

[ros-diffs] [ekohl] 13375: - Implement SetupDiBuildClassInfoListExA, SetupDiClassGuidsFromNameExA, SetupDiCreateDeviceInfoListExA and SetupDiOpenClassRegKeyExA using MultiByteToUnicode.
by ekohl＠svn.reactos.com 01 Feb '05

01 Feb '05

- Implement SetupDiBuildClassInfoListExA, SetupDiClassGuidsFromNameExA, SetupDiCreateDeviceInfoListExA and SetupDiOpenClassRegKeyExA using MultiByteToUnicode. - Retrieve OS version upon process attach. Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h Modified: trunk/reactos/lib/setupapi/setupcab.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-01-31 23:58:10 UTC (rev 13374) +++ trunk/reactos/lib/setupapi/devinst.c 2005-02-01 13:58:33 UTC (rev 13375) @@ -20,7 +20,7 @@ #include "config.h" #include "wine/port.h" - + #include <stdarg.h> #include "windef.h" @@ -38,7 +38,9 @@ #include "rpc.h" #include "rpcdce.h" +#include "setupapi_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Unicode constants */ @@ -90,8 +92,26 @@ LPCSTR MachineName, PVOID Reserved) { - FIXME("\n"); - return FALSE; + LPWSTR MachineNameW = NULL; + BOOL bResult; + + TRACE("\n"); + + if (MachineName) + { + MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); + if (MachineNameW == NULL) + return FALSE; + } + + bResult = SetupDiBuildClassInfoListExW(Flags, ClassGuidList, + ClassGuidListSize, RequiredSize, + MachineNameW, Reserved); + + if (MachineNameW) + MyFree(MachineNameW); + + return bResult; } /*********************************************************************** @@ -237,9 +257,9 @@ DWORD ClassGuidListSize, PDWORD RequiredSize) { - return SetupDiClassGuidsFromNameExA(ClassName, ClassGuidList, - ClassGuidListSize, RequiredSize, - NULL, NULL); + return SetupDiClassGuidsFromNameExA(ClassName, ClassGuidList, + ClassGuidListSize, RequiredSize, + NULL, NULL); } /*********************************************************************** @@ -251,9 +271,9 @@ DWORD ClassGuidListSize, PDWORD RequiredSize) { - return SetupDiClassGuidsFromNameExW(ClassName, ClassGuidList, - ClassGuidListSize, RequiredSize, - NULL, NULL); + return SetupDiClassGuidsFromNameExW(ClassName, ClassGuidList, + ClassGuidListSize, RequiredSize, + NULL, NULL); } /*********************************************************************** @@ -267,8 +287,36 @@ LPCSTR MachineName, PVOID Reserved) { - FIXME("\n"); - return FALSE; + LPWSTR ClassNameW = NULL; + LPWSTR MachineNameW = NULL; + BOOL bResult; + + FIXME("\n"); + + ClassNameW = MultiByteToUnicode(ClassName, CP_ACP); + if (ClassNameW == NULL) + return FALSE; + + if (MachineNameW) + { + MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); + if (MachineNameW == NULL) + { + MyFree(ClassNameW); + return FALSE; + } + } + + bResult = SetupDiClassGuidsFromNameExW(ClassNameW, ClassGuidList, + ClassGuidListSize, RequiredSize, + MachineNameW, Reserved); + + if (MachineNameW) + MyFree(MachineNameW); + + MyFree(ClassNameW); + + return bResult; } /*********************************************************************** @@ -502,8 +550,25 @@ PCSTR MachineName, PVOID Reserved) { - FIXME("\n"); - return (HDEVINFO)INVALID_HANDLE_VALUE; + LPWSTR MachineNameW = NULL; + HDEVINFO hDevInfo; + + TRACE("\n"); + + if (MachineName) + { + MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); + if (MachineNameW == NULL) + return (HDEVINFO)INVALID_HANDLE_VALUE; + } + + hDevInfo = SetupDiCreateDeviceInfoListExW(ClassGuid, hwndParent, + MachineNameW, Reserved); + + if (MachineNameW) + MyFree(MachineNameW); + + return hDevInfo; } /*********************************************************************** @@ -587,17 +652,10 @@ PWSTR *Extension) { WCHAR szBuffer[MAX_PATH]; - OSVERSIONINFOW OsVersionInfo; DWORD dwLength; DWORD dwFullLength; LONG lLineCount = -1; - OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); - if (!GetVersionExW(&OsVersionInfo)) - { - return FALSE; - } - lstrcpyW(szBuffer, InfSectionName); dwLength = lstrlenW(szBuffer); @@ -1048,8 +1106,25 @@ PCSTR MachineName, PVOID Reserved) { - FIXME("\n"); - return INVALID_HANDLE_VALUE; + PWSTR MachineNameW = NULL; + HKEY hKey; + + TRACE("\n"); + + if (MachineName) + { + MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); + if (MachineNameW == NULL) + return INVALID_HANDLE_VALUE; + } + + hKey = SetupDiOpenClassRegKeyExW(ClassGuid, samDesired, + Flags, MachineNameW, Reserved); + + if (MachineNameW) + MyFree(MachineNameW); + + return hKey; } @@ -1125,7 +1200,7 @@ } /*********************************************************************** - * SetupDiOpenDeviceInterfaceA (SETUPAPI.@) + * SetupDiOpenDeviceInterfaceW (SETUPAPI.@) */ BOOL WINAPI SetupDiOpenDeviceInterfaceW( HDEVINFO DeviceInfoSet, _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-01-31 23:58:10 UTC (rev 13374) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-02-01 13:58:33 UTC (rev 13375) @@ -54,4 +54,6 @@ #define _S_IWRITE 0x0080 #define _S_IREAD 0x0100 +extern OSVERSIONINFOW OsVersionInfo; + #endif /* __SETUPAPI_PRIVATE_H */ _____ Modified: trunk/reactos/lib/setupapi/setupcab.c --- trunk/reactos/lib/setupapi/setupcab.c 2005-01-31 23:58:10 UTC (rev 13374) +++ trunk/reactos/lib/setupapi/setupcab.c 2005-02-01 13:58:33 UTC (rev 13375) @@ -44,6 +44,8 @@ #include "wine/debug.h" +OSVERSIONINFOW OsVersionInfo; + static HINSTANCE CABINET_hInstance = 0; static HFDI (__cdecl *sc_FDICreate)(PFNALLOC, PFNFREE, PFNOPEN, @@ -674,6 +676,9 @@ switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); + OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + if (!GetVersionExW(&OsVersionInfo)) + return FALSE; break; case DLL_PROCESS_DETACH: UnloadCABINETDll();

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs