Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 22307: [AUDIT] According to Fireball, this file is clean because it contains only well-known interlocked operations taking up a few asm instructions
by hpoussin＠svn.reactos.org 11 Jun '06

11 Jun '06

Author: hpoussin Date: Sun Jun 11 16:15:43 2006 New Revision: 22307 URL: http://svn.reactos.ru/svn/reactos?rev=22307&view=rev Log: [AUDIT] According to Fireball, this file is clean because it contains only well-known interlocked operations taking up a few asm instructions Modified: trunk/reactos/lib/intrlck/intrlck.c (props changed) Propchange: trunk/reactos/lib/intrlck/intrlck.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[hpoussin] 22306: Add some tests for interlocked functions
by hpoussin＠svn.reactos.org 11 Jun '06

11 Jun '06

Author: hpoussin Date: Sun Jun 11 16:02:04 2006 New Revision: 22306 URL: http://svn.reactos.ru/svn/reactos?rev=22306&view=rev Log: Add some tests for interlocked functions Added: trunk/reactos/regtests/winetests/kernel32/interlck.c (with props) Modified: trunk/reactos/regtests/winetests/kernel32/kernel32.rbuild trunk/reactos/regtests/winetests/kernel32/testlist.c Added: trunk/reactos/regtests/winetests/kernel32/interlck.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/kernel32… ============================================================================== --- trunk/reactos/regtests/winetests/kernel32/interlck.c (added) +++ trunk/reactos/regtests/winetests/kernel32/interlck.c Sun Jun 11 16:02:04 2006 @@ -1,0 +1,130 @@ +/* + * Unit test suite for interlocked functions. + * + * Copyright 2006 Hervé Poussineau + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +static void test_InterlockedCompareExchange(void) +{ + LONG dest, res; + + dest = 0; + res = InterlockedCompareExchange( &dest, 1, 0 ); + ok( res == 0 && dest == 1, + "Expected 0 and 1, got %ld and %ld", res, dest ); + + dest = 1; + res = InterlockedCompareExchange( &dest, 2, 0 ); + ok( res == 1 && dest == 1, + "Expected 1 and 1, got %ld and %ld", res, dest ); +} + +static void test_InterlockedDecrement(void) +{ + LONG dest, res; + + dest = 1; + res = InterlockedDecrement( &dest ); + ok( res == 0 && dest == 0, + "Expected 0 and 0, got %ld and %ld", res, dest ); + + dest = 0; + res = InterlockedDecrement( &dest ); + ok( res == -1 && dest == -1, + "Expected -1 and -1, got %ld and %ld", res, dest ); + + dest = -1; + res = InterlockedDecrement( &dest ); + ok( res == -2 && dest == -2, + "Expected -2 and -2, got %ld and %ld", res, dest ); +} + +static void test_InterlockedExchange(void) +{ + LONG dest, res; + + dest = 0; + res = InterlockedExchange( &dest, 1 ); + ok( res == 0 && dest == 1, + "Expected 0 and 1, got %ld and %ld", res, dest ); + + dest = 1; + res = InterlockedExchange( &dest, 2 ); + ok( res == 1 && dest == 2, + "Expected 1 and 2, got %ld and %ld", res, dest ); + + dest = 1; + res = InterlockedExchange( &dest, -1 ); + ok( res == 1 && dest == -1, + "Expected 1 and -1, got %ld and %ld", res, dest ); +} + +static void test_InterlockedExchangeAdd(void) +{ + LONG dest, res; + + dest = 0; + res = InterlockedExchangeAdd( &dest, 1 ); + ok( res == 0 && dest == 1, + "Expected 0 and 1, got %ld and %ld", res, dest ); + + dest = 1; + res = InterlockedExchangeAdd( &dest, 2 ); + ok( res == 1 && dest == 3, + "Expected 1 and 3, got %ld and %ld", res, dest ); + + dest = 1; + res = InterlockedExchangeAdd( &dest, -1 ); + ok( res == 1 && dest == 0, + "Expected 1 and 0, got %ld and %ld", res, dest ); +} + +static void test_InterlockedIncrement(void) +{ + LONG dest, res; + + dest = -2; + res = InterlockedIncrement( &dest ); + ok( res == -1 && dest == -1, + "Expected -1 and -1, got %ld and %ld", res, dest ); + + dest = -1; + res = InterlockedIncrement( &dest ); + ok( res == 0 && dest == 0, + "Expected 0 and 0, got %ld and %ld", res, dest ); + + dest = 0; + res = InterlockedIncrement( &dest ); + ok( res == 1 && dest == 1, + "Expected 1 and 1, got %ld and %ld", res, dest ); +} + +START_TEST(interlck) +{ + test_InterlockedCompareExchange(); + test_InterlockedDecrement(); + test_InterlockedExchange(); + test_InterlockedExchangeAdd(); + test_InterlockedIncrement(); +} Propchange: trunk/reactos/regtests/winetests/kernel32/interlck.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/regtests/winetests/kernel32/kernel32.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/kernel32… ============================================================================== --- trunk/reactos/regtests/winetests/kernel32/kernel32.rbuild (original) +++ trunk/reactos/regtests/winetests/kernel32/kernel32.rbuild Sun Jun 11 16:02:04 2006 @@ -15,6 +15,7 @@ <file>file.c</file> <file>format_msg.c</file> <file>heap.c</file> + <file>interlck.c</file> <file>locale.c</file> <file>mailslot.c</file> <file>module.c</file> Modified: trunk/reactos/regtests/winetests/kernel32/testlist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/kernel32… ============================================================================== --- trunk/reactos/regtests/winetests/kernel32/testlist.c (original) +++ trunk/reactos/regtests/winetests/kernel32/testlist.c Sun Jun 11 16:02:04 2006 @@ -22,6 +22,7 @@ extern void func_file(void); extern void func_format_msg(void); extern void func_heap(void); +extern void func_interlck(void); extern void func_locale(void); extern void func_module(void); extern void func_mailslot(void); @@ -49,6 +50,7 @@ { "file", func_file }, { "format_msg", func_format_msg }, { "heap", func_heap }, + { "interlck", func_interlck }, { "locale", func_locale }, { "module", func_module }, { "mailslot", func_mailslot },

1 0

[ion] 22305: * Significant improve boot speed and debug log neatness: - Get rid of a dozen of debug prints that have been straying along for a long time (some for years), most of which I must shamefully admit I am responsible for. - Fix a critical bug subsystem bug in smss and don't hang the system 15 seconds on boot-up. - Rebase some problematic modules (and fix wshtcpip's rbuild file) to avoid relocations on bootup and some process startup. - Enable lsass startup in winlogon and the registry.
by ion＠svn.reactos.org 11 Jun '06

11 Jun '06

Author: ion Date: Sun Jun 11 12:25:10 2006 New Revision: 22305 URL: http://svn.reactos.ru/svn/reactos?rev=22305&view=rev Log: * Significant improve boot speed and debug log neatness: - Get rid of a dozen of debug prints that have been straying along for a long time (some for years), most of which I must shamefully admit I am responsible for. - Fix a critical bug subsystem bug in smss and don't hang the system 15 seconds on boot-up. - Rebase some problematic modules (and fix wshtcpip's rbuild file) to avoid relocations on bootup and some process startup. - Enable lsass startup in winlogon and the registry. - Only show debug log header when actually debugging to a file. Modified: trunk/reactos/base/system/smss/client.c trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/user32/windows/bitmap.c trunk/reactos/drivers/input/i8042prt/mouse.c trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c trunk/reactos/drivers/network/wshtcpip/wshtcpip.rbuild trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/lib/rtl/process.c trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/io/disk.c trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/kd/kdio.c trunk/reactos/ntoskrnl/ke/main.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/base/system/smss/client.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/smss/client.c?r… ============================================================================== --- trunk/reactos/base/system/smss/client.c (original) +++ trunk/reactos/base/system/smss/client.c Sun Jun 11 12:25:10 2006 @@ -170,6 +170,7 @@ PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); ULONG SbApiPortNameSize = SM_CONNECT_DATA_SIZE(*Request); INT ClientIndex = SM_INVALID_CLIENT_INDEX; + HANDLE Process; DPRINT("SM: %s(%08lx,%08lx) called\n", __FUNCTION__, @@ -182,26 +183,25 @@ if (NULL != SmpClientDirectory.CandidateClient) { PROCESS_BASIC_INFORMATION pbi; + OBJECT_ATTRIBUTES ObjectAttributes; RtlZeroMemory (& pbi, sizeof pbi); - Status = NtQueryInformationProcess (Request->Header.ClientId.UniqueProcess, + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + Status = NtOpenProcess(&Process, + PROCESS_ALL_ACCESS, + &ObjectAttributes, + &Request->Header.ClientId); + ASSERT(NT_SUCCESS(Status)); + Status = NtQueryInformationProcess (Process, ProcessBasicInformation, & pbi, sizeof pbi, NULL); - if (NT_SUCCESS(Status)) + ASSERT(NT_SUCCESS(Status)); { SmpClientDirectory.CandidateClient->ServerProcessId = (ULONG) pbi.UniqueProcessId; } - else - { - LARGE_INTEGER Fixme; - Fixme.QuadPart = -50000000; - DPRINT1("WARNING! UniqueProcess IS A THREAD HANDLE!!!\n"); - NtDelayExecution(FALSE, &Fixme); - DPRINT1("FIXME!\n"); - } } else { Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=2230… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Sun Jun 11 12:25:10 2006 @@ -47,6 +47,7 @@ <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> <property name="BASEADDRESS_ACLUI" value="0x71550000" /> + <property name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> <property name="BASEADDRESS_SHDOCVW" value="0x71700000" /> <property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> <property name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> @@ -92,29 +93,29 @@ <property name="BASEADDRESS_WINTRUST" value="0x76c30000" /> <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> - <property name="BASEADDRESS_SHELL32" value="0x77260000" /> - <property name="BASEADDRESS_IPHLPAPI" value="0x77400000" /> + <property name="BASEADDRESS_SHELL32" value="0x6a360000" /> + <property name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> <property name="BASEADDRESS_MSVFW32" value="0x77400000" /> <property name="BASEADDRESS_MSACM32" value="0x77400000" /> - <property name="BASEADDRESS_MMDRV" value="0x77530000" /> + <property name="BASEADDRESS_MMDRV" value="0x74C30000" /> <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> <property name="BASEADDRESS_AUTHZ" value="0x77690000" /> <property name="BASEADDRESS_CFGMGR32" value="0x77700000" /> <property name="BASEADDRESS_PACKET" value="0x77780000" /> - <property name="BASEADDRESS_MSAFD" value="0x777a0000" /> - <property name="BASEADDRESS_MSI" value="0x777b0000" /> - <property name="BASEADDRESS_SNMPAPI" value="0x777c0000" /> + <property name="BASEADDRESS_MSAFD" value="0x77780000" /> + <property name="BASEADDRESS_MSI" value="0x77790000" /> + <property name="BASEADDRESS_SNMPAPI" value="0x777a0000" /> <property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> - <property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" /> - <property name="BASEADDRESS_WINMM" value="0x777d0000" /> + <property name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> + <property name="BASEADDRESS_WINMM" value="0x697d0000" /> <property name="BASEADDRESS_WS2HELP" value="0x777e0000" /> <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> <property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> <property name="BASEADDRESS_VERSION" value="0x77a40000" /> <property name="BASEADDRESS_OLE32" value="0x77a50000" /> - <property name="BASEADDRESS_WS2_32" value="0x77aa0000" /> + <property name="BASEADDRESS_WS2_32" value="0x74aa0000" /> <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> - <property name="BASEADDRESS_CRYPT32" value="0x77ab0000" /> + <property name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> <property name="BASEADDRESS_USER32" value="0x77e50000" /> <property name="BASEADDRESS_GDI32" value="0x77f10000" /> Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Sun Jun 11 12:25:10 2006 @@ -737,7 +737,7 @@ ;HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000000 +HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartGUI",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?r… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c Sun Jun 11 12:25:10 2006 @@ -14,7 +14,7 @@ { HANDLE hEvent; - DPRINT1("LsapInitLsa() called\n"); + DPRINT("LsapInitLsa() called\n"); LsarStartRpcServer(); Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/bi… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Sun Jun 11 12:25:10 2006 @@ -567,7 +567,7 @@ { case IMAGE_BITMAP: { - DbgPrint("WARNING: Incomplete implementation of CopyImage!\n"); + DPRINT("WARNING: Incomplete implementation of CopyImage!\n"); /* * FIXME: Support flags LR_COPYDELETEORG, LR_COPYFROMRESOURCE, * LR_COPYRETURNORG, LR_CREATEDIBSECTION and LR_MONOCHROME. @@ -596,7 +596,7 @@ /* FIXME: support loading the image as shared from an instance */ if (!IconMsgDisplayed) { - DbgPrint("FIXME: CopyImage doesn't support IMAGE_ICON correctly!\n"); + DPRINT("FIXME: CopyImage doesn't support IMAGE_ICON correctly!\n"); IconMsgDisplayed = TRUE; } return CopyIcon(hnd); @@ -608,7 +608,7 @@ /* FIXME: support loading the image as shared from an instance */ if (!IconMsgDisplayed) { - DbgPrint("FIXME: CopyImage doesn't support IMAGE_CURSOR correctly!\n"); + DPRINT("FIXME: CopyImage doesn't support IMAGE_CURSOR correctly!\n"); IconMsgDisplayed = TRUE; } return CopyCursor(hnd); Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/i8042prt/mous… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c Sun Jun 11 12:25:10 2006 @@ -62,7 +62,7 @@ /* Check if the last byte came too long ago */ if (Now.QuadPart - DevExt->MousePacketStartTime.QuadPart > DevExt->Settings.MouseSynchIn100ns) { - DPRINT1("Mouse input packet timeout\n"); + DPRINT("Mouse input packet timeout\n"); DevExt->MouseState = MouseIdle; } } Modified: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c Sun Jun 11 12:25:10 2006 @@ -221,7 +221,7 @@ TI_DbgPrint(DEBUG_INFO,("Called\n")); - OskitDumpBuffer( (OSK_PCHAR)Buffer, BufferSize ); + //OskitDumpBuffer( (OSK_PCHAR)Buffer, BufferSize ); if( InfoClass == INFO_CLASS_PROTOCOL && InfoType == INFO_TYPE_PROVIDER && Modified: trunk/reactos/drivers/network/wshtcpip/wshtcpip.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/wshtcpip/ws… ============================================================================== --- trunk/reactos/drivers/network/wshtcpip/wshtcpip.rbuild (original) +++ trunk/reactos/drivers/network/wshtcpip/wshtcpip.rbuild Sun Jun 11 12:25:10 2006 @@ -1,4 +1,4 @@ -<module name="wshtcpip" type="win32dll" installbase="system32" installname="wshtcpip.dll"> +<module name="wshtcpip" type="win32dll" baseaddress="${BASEADDRESS_WSHTCPIP}" installbase="system32" installname="wshtcpip.dll"> <importlibrary definition="wshtcpip.def"></importlibrary> <include base="wshtcpip">.</include> <define name="UNICODE" /> Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c (original) +++ trunk/reactos/hal/halx86/generic/timer.c Sun Jun 11 12:25:10 2006 @@ -223,7 +223,7 @@ } - DbgPrint("Calibrating delay loop... ["); + DPRINT("Calibrating delay loop... ["); /* Stage 1: Coarse calibration */ @@ -246,7 +246,7 @@ Pcr->StallScaleFactor >>= 1; /* Get bottom value for delay */ /* Stage 2: Fine calibration */ - DbgPrint("delay_count: %d", Pcr->StallScaleFactor); + DPRINT("delay_count: %d", Pcr->StallScaleFactor); calib_bit = Pcr->StallScaleFactor; /* Which bit are we going to test */ @@ -275,9 +275,9 @@ Pcr->StallScaleFactor /= (MILLISEC / 2); /* Calculate delay_count for 1ms */ - DbgPrint("]\n"); - DbgPrint("delay_count: %d\n", Pcr->StallScaleFactor); - DbgPrint("CPU speed: %d\n", Pcr->StallScaleFactor / 250); + DPRINT("]\n"); + DPRINT("delay_count: %d\n", Pcr->StallScaleFactor); + DPRINT("CPU speed: %d\n", Pcr->StallScaleFactor / 250); #if 0 DbgPrint("About to start delay loop test\n"); DbgPrint("Waiting for five minutes..."); Modified: trunk/reactos/lib/rtl/process.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/process.c?rev=22305… ============================================================================== --- trunk/reactos/lib/rtl/process.c (original) +++ trunk/reactos/lib/rtl/process.c Sun Jun 11 12:25:10 2006 @@ -44,8 +44,8 @@ DPRINT1("Failed to read image file from disk\n"); return(Status); } - - /* Now create a section for this image */ + + /* Now create a section for this image */ Status = ZwCreateSection(Section, SECTION_ALL_ACCESS, NULL, @@ -75,10 +75,9 @@ ULONG EnviroSize; ULONG Size; PWCHAR Environment = 0; - DPRINT("RtlpInitEnvironment (hProcess: %p, Peb: %p Params: %p)\n", ProcessHandle, Peb, ProcessParameters); - + /* Give the caller 1MB if he requested it */ if (ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB) { @@ -97,7 +96,7 @@ return(Status); } } - + /* Find the end of the Enviroment Block */ if ((Environment = (PWCHAR)ProcessParameters->Environment)) { @@ -106,7 +105,6 @@ /* Calculate the size of the block */ EnviroSize = (ULONG)((ULONG_PTR)Environment - (ULONG_PTR)ProcessParameters->Environment); - DPRINT("EnvironmentSize %ld\n", EnviroSize); /* Allocate and Initialize new Environment Block */ Size = EnviroSize; @@ -121,24 +119,21 @@ DPRINT1("Failed to allocate Environment Block\n"); return(Status); } - + /* Write the Environment Block */ ZwWriteVirtualMemory(ProcessHandle, BaseAddress, ProcessParameters->Environment, EnviroSize, NULL); - + /* Save pointer */ ProcessParameters->Environment = BaseAddress; } - - DPRINT("EnvironmentPointer %p\n", BaseAddress); - DPRINT("Ppb->MaximumLength 0x%lx\n", ProcessParameters->MaximumLength); /* Now allocate space for the Parameter Block */ BaseAddress = NULL; - Size = ProcessParameters->MaximumLength; + Size = ProcessParameters->MaximumLength; Status = ZwAllocateVirtualMemory(ProcessHandle, &BaseAddress, 0, @@ -150,14 +145,14 @@ DPRINT1("Failed to allocate Parameter Block\n"); return(Status); } - + /* Write the Parameter Block */ ZwWriteVirtualMemory(ProcessHandle, BaseAddress, ProcessParameters, ProcessParameters->Length, NULL); - + /* Write pointer to Parameter Block */ ZwWriteVirtualMemory(ProcessHandle, &Peb->ProcessParameters, @@ -200,7 +195,6 @@ HANDLE hSection; PROCESS_BASIC_INFORMATION ProcessBasicInfo; OBJECT_ATTRIBUTES ObjectAttributes; - DPRINT("RtlCreateUserProcess: %wZ\n", ImageFileName); /* Map and Load the File */ @@ -212,10 +206,10 @@ DPRINT1("Could not map process image\n"); return Status; } - + /* Clean out the CurDir Handle if we won't use it */ if (!InheritHandles) ProcessParameters->CurrentDirectory.Handle = NULL; - + /* Use us as parent if none other specified */ if (!ParentProcess) ParentProcess = NtCurrentProcess(); @@ -240,8 +234,7 @@ NULL, ProcessSecurityDescriptor); } - - + /* Create Kernel Process Object */ Status = ZwCreateProcess(&ProcessInfo->ProcessHandle, PROCESS_ALL_ACCESS, @@ -257,7 +250,7 @@ ZwClose(hSection); return(Status); } - + /* Get some information on the image */ Status = ZwQuerySection(hSection, SectionImageInformation, @@ -284,7 +277,7 @@ ZwClose(ProcessInfo->ProcessHandle); ZwClose(hSection); return(Status); - } + } /* Create Process Environment */ RtlpInitEnvironment(ProcessInfo->ProcessHandle, @@ -309,7 +302,7 @@ ZwClose(hSection); /* Don't try to optimize this on top! */ return Status; } - + /* Close the Section Handle and return */ ZwClose(hSection); return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Sun Jun 11 12:25:10 2006 @@ -866,17 +866,20 @@ DPRINT("DestroyHandleByEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry); - KeEnterCriticalRegion(); - ExAcquireHandleLockExclusive(HandleTable); - - /* free and automatically unlock the handle. However we don't need to pulse - the contention event since other locks on this entry will fail */ - ExpFreeHandleTableEntry(HandleTable, - Entry, - HANDLE_TO_EX_HANDLE(Handle)); - - ExReleaseHandleLock(HandleTable); - KeLeaveCriticalRegion(); + if (!(HandleTable->Flags & EX_HANDLE_TABLE_CLOSING)) + { + KeEnterCriticalRegion(); + ExAcquireHandleLockExclusive(HandleTable); + + /* free and automatically unlock the handle. However we don't need to pulse + the contention event since other locks on this entry will fail */ + ExpFreeHandleTableEntry(HandleTable, + Entry, + HANDLE_TO_EX_HANDLE(Handle)); + + ExReleaseHandleLock(HandleTable); + KeLeaveCriticalRegion(); + } } PHANDLE_TABLE_ENTRY Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=2230… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun Jun 11 12:25:10 2006 @@ -261,7 +261,6 @@ ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); - DPRINT1("NPXThread offset: %lx\n", FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread)); ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD); ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0); ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE); Modified: trunk/reactos/ntoskrnl/io/disk.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/disk.c?rev=2230… ============================================================================== --- trunk/reactos/ntoskrnl/io/disk.c (original) +++ trunk/reactos/ntoskrnl/io/disk.c Sun Jun 11 12:25:10 2006 @@ -646,7 +646,7 @@ RDiskCount = xHalpGetRDiskCount(); - DPRINT1("RDiskCount %d\n", RDiskCount); + DPRINT("RDiskCount %d\n", RDiskCount); Buffer1 = (PWSTR)ExAllocatePool(PagedPool, 64 * sizeof(WCHAR)); Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2230… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Sun Jun 11 12:25:10 2006 @@ -139,9 +139,9 @@ { if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) { - DPRINT1("Mount the logical volume\n"); + DPRINT("Mount the logical volume\n"); Status = IoMountVolume(DeviceObject, FALSE); - DPRINT1("Status %x\n", Status); + DPRINT("Status %x\n", Status); } DeviceObject = DeviceObject->Vpb->DeviceObject; } Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=2230… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c Sun Jun 11 12:25:10 2006 @@ -103,6 +103,10 @@ /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); + + /* Display separator + ReactOS version at start of the debug log */ + DPRINT1("---------------------------------------------------------------\n"); + DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); } else if (BootPhase == 2) { Modified: trunk/reactos/ntoskrnl/ke/main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ke/main.c?rev=2230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/main.c (original) +++ trunk/reactos/ntoskrnl/ke/main.c Sun Jun 11 12:25:10 2006 @@ -287,10 +287,6 @@ /* Initialize HAL */ HalInitSystem (0, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); - /* Display separator + ReactOS version at start of the debug log */ - DPRINT1("---------------------------------------------------------------\n"); - DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); - /* Do general System Startup */ KiSystemStartup(1); } Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=22305&… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c (original) +++ trunk/reactos/ntoskrnl/mm/mm.c Sun Jun 11 12:25:10 2006 @@ -150,7 +150,7 @@ } if (PsGetCurrentProcess() == NULL) { - CPRINT("No current process\n"); + DPRINT("No current process\n"); return(STATUS_UNSUCCESSFUL); } @@ -280,7 +280,7 @@ /* Allow this! It lets us page alloc much earlier! It won't be needed * after my init patch anyways */ - CPRINT("No current process\n"); + DPRINT("No current process\n"); if (Address < (ULONG_PTR)MmSystemRangeStart) { return(STATUS_UNSUCCESSFUL); Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Sun Jun 11 12:25:10 2006 @@ -384,7 +384,6 @@ MmInitGlobalKernelPageDirectory(); DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGE_SIZE) / 1024); - DPRINT1("Kernel Stack Limits. InitTop = 0x%x, Init = 0x%x\n", init_stack_top, init_stack); LastKernelAddress = (ULONG_PTR)MmInitializePageList( FirstKrnlPhysAddr, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Sun Jun 11 12:25:10 2006 @@ -1175,7 +1175,7 @@ if (Class != NULL) { ClassAlreadyExists: - DPRINT1("Class 0x%p does already exist!\n", ClassAtom); + DPRINT("Class 0x%p does already exist!\n", ClassAtom); SetLastWin32Error(ERROR_CLASS_ALREADY_EXISTS); return (RTL_ATOM)0; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Sun Jun 11 12:25:10 2006 @@ -722,7 +722,7 @@ if (!Desktop) { - DPRINT1("IntShellHookNotify: No desktop!\n"); + DPRINT("IntShellHookNotify: No desktop!\n"); return; }

1 0

[hpoussin] 22304: - Support more than one child - vbemp shouldn't parse the EDID, so return it to videoprt
by hpoussin＠svn.reactos.org 11 Jun '06

11 Jun '06

Author: hpoussin Date: Sun Jun 11 11:57:37 2006 New Revision: 22304 URL: http://svn.reactos.ru/svn/reactos?rev=22304&view=rev Log: - Support more than one child - vbemp shouldn't parse the EDID, so return it to videoprt Modified: trunk/reactos/drivers/video/miniport/vbe/edid.c trunk/reactos/drivers/video/miniport/vbe/vbemp.h Modified: trunk/reactos/drivers/video/miniport/vbe/edid.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/edid.c (original) +++ trunk/reactos/drivers/video/miniport/vbe/edid.c Sun Jun 11 11:57:37 2006 @@ -37,7 +37,8 @@ VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); BiosRegisters.Eax = VBE_DDC; BiosRegisters.Ebx = VBE_DDC_WRITE_SCL_CLOCK_LINE; - BiosRegisters.Ecx = data; + BiosRegisters.Ecx = VBEDeviceExtension->CurrentChildIndex; + BiosRegisters.Edx = data; VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); @@ -55,7 +56,8 @@ VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); BiosRegisters.Eax = VBE_DDC; BiosRegisters.Ebx = VBE_DDC_WRITE_SDA_DATA_LINE; - BiosRegisters.Ecx = data; + BiosRegisters.Ecx = VBEDeviceExtension->CurrentChildIndex; + BiosRegisters.Edx = data; VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); @@ -72,6 +74,7 @@ VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); BiosRegisters.Eax = VBE_DDC; BiosRegisters.Ebx = VBE_DDC_READ_SCL_CLOCK_LINE; + BiosRegisters.Ecx = VBEDeviceExtension->CurrentChildIndex; VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); @@ -90,6 +93,7 @@ VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); BiosRegisters.Eax = VBE_DDC; BiosRegisters.Ebx = VBE_DDC_READ_SDA_DATA_LINE; + BiosRegisters.Ecx = VBEDeviceExtension->CurrentChildIndex; VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); @@ -99,8 +103,9 @@ static BOOLEAN VBEReadEdidUsingSCI( - PVOID HwDeviceExtension, - PVBE_EDID Edid) + IN PVOID HwDeviceExtension, + IN ULONG ChildIndex, + OUT PVOID Edid) { INT10_BIOS_ARGUMENTS BiosRegisters; PVBE_DEVICE_EXTENSION VBEDeviceExtension = @@ -116,6 +121,7 @@ VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); BiosRegisters.Eax = VBE_DDC; BiosRegisters.Ebx = VBE_DDC_REPORT_CAPABILITIES; + BiosRegisters.Ecx = VBEDeviceExtension->CurrentChildIndex; VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); @@ -131,6 +137,7 @@ VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); BiosRegisters.Eax = VBE_DDC; BiosRegisters.Ebx = VBE_DDC_BEGIN_SCL_SDA_CONTROL; + BiosRegisters.Ecx = VBEDeviceExtension->CurrentChildIndex; VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); @@ -140,6 +147,7 @@ /* * Read EDID information */ + VBEDeviceExtension->CurrentChildIndex = ChildIndex; DDCControl.Size = sizeof(DDC_CONTROL); DDCControl.I2CCallbacks.WriteClockLine = VBEWriteClockLine; DDCControl.I2CCallbacks.WriteDataLine = VBEWriteDataLine; @@ -150,7 +158,7 @@ HwDeviceExtension, &DDCControl, (PUCHAR)&Edid, - sizeof(VBE_EDID)); + MAX_SIZE_OF_EDID); /* * Disable I²C interface @@ -168,8 +176,9 @@ static BOOLEAN VBEReadEdid( - PVBE_DEVICE_EXTENSION VBEDeviceExtension, - PVBE_EDID Edid) + IN PVBE_DEVICE_EXTENSION VBEDeviceExtension, + IN ULONG ChildIndex, + OUT PVOID Edid) { INT10_BIOS_ARGUMENTS BiosRegisters; @@ -181,6 +190,7 @@ VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); BiosRegisters.Eax = VBE_DDC; BiosRegisters.Ebx = VBE_DDC_READ_EDID; + BiosRegisters.Ecx = ChildIndex; BiosRegisters.Edx = 1; BiosRegisters.Edi = VBEDeviceExtension->TrampolineMemoryOffset; BiosRegisters.SegEs = VBEDeviceExtension->TrampolineMemorySegment; @@ -199,7 +209,7 @@ VBEDeviceExtension->TrampolineMemorySegment, VBEDeviceExtension->TrampolineMemoryOffset, Edid, - sizeof(VBE_EDID)); + MAX_SIZE_OF_EDID); return TRUE; } @@ -215,24 +225,51 @@ { PVBE_DEVICE_EXTENSION VBEDeviceExtension = (PVBE_DEVICE_EXTENSION)HwDeviceExtension; - VBE_EDID Edid; + ULONG ChildIndex; /* * We are called very early in device initialization, even before * VBEInitialize is called. So, our Int10 interface is not set. - * Ignore this call, we will trigger it ourselves later. + * Ignore this call, we will trigger another one later. */ if (VBEDeviceExtension->Int10Interface.Size == 0) return VIDEO_ENUM_NO_MORE_DEVICES; + if (ChildEnumInfo->Size != sizeof(VIDEO_CHILD_ENUM_INFO)) + { + VideoPortDebugPrint(Error, "VBEMP: Wrong VIDEO_CHILD_ENUM_INFO structure size\n"); + return VIDEO_ENUM_NO_MORE_DEVICES; + } + else if (ChildEnumInfo->ChildDescriptorSize < MAX_SIZE_OF_EDID) + { + VideoPortDebugPrint(Warn, "VBEMP: Too small buffer for EDID\n"); + return VIDEO_ENUM_NO_MORE_DEVICES; + } + else if (ChildEnumInfo->ChildIndex == DISPLAY_ADAPTER_HW_ID) + { + *VideoChildType = VideoChip; + *UId = 0; + return VIDEO_ENUM_MORE_DEVICES; /* FIXME: not sure... */ + } + + /* + * Get Child ID + */ + if (ChildEnumInfo->ChildIndex != 0) + ChildIndex = ChildEnumInfo->ChildIndex; + else + ChildIndex = ChildEnumInfo->ACPIHwId; + VideoPortDebugPrint(Info, "VBEMP: ChildEnumInfo->ChildIndex %lu, ChildEnumInfo->ACPIHwId %lu => %lu\n", + ChildEnumInfo->ChildIndex, ChildEnumInfo->ACPIHwId, ChildIndex); + /* * Try to read EDID information using 2 different methods. */ - if (VBEReadEdid(HwDeviceExtension, &Edid)) + if (VBEReadEdid(HwDeviceExtension, ChildIndex, pChildDescriptor)) { VideoPortDebugPrint(Info, "VBEMP: EDID information read directly\n"); } - else if (VBEReadEdidUsingSCI(HwDeviceExtension, &Edid)) + else if (VBEReadEdidUsingSCI(HwDeviceExtension, ChildIndex, pChildDescriptor)) { VideoPortDebugPrint(Info, "VBEMP: EDID information read using I²C\n"); } @@ -243,9 +280,18 @@ } /* - * Process the EDID data. - */ - /* FIXME */ - VideoPortDebugPrint(Error, "VBEMP: Need to parse EDID information\n"); - return VIDEO_ENUM_NO_MORE_DEVICES; -} + * Fill return data + */ + *VideoChildType = Monitor; + if (ChildIndex == 0) + { + /* + * This is the actual display adapter + */ + *UId = DISPLAY_ADAPTER_HW_ID; + } + else + *UId = ChildIndex; + *pUnused = 0; + return VIDEO_ENUM_MORE_DEVICES; +} Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h Sun Jun 11 11:57:37 2006 @@ -189,10 +189,7 @@ CHAR Reserved4[189]; } VBE_MODEINFO, *PVBE_MODEINFO; -typedef struct -{ - UCHAR Reserved[128]; -} VBE_EDID, *PVBE_EDID; +#define MAX_SIZE_OF_EDID 256 #include <poppack.h> @@ -213,6 +210,9 @@ USHORT *ModeNumbers; PVBE_MODEINFO ModeInfo; USHORT CurrentMode; + + /* Current child been enumerated */ + ULONG CurrentChildIndex; } VBE_DEVICE_EXTENSION, *PVBE_DEVICE_EXTENSION; /* edid.c */

1 0

[ion] 22303: - Fix definitions of OB_QUERYNAME_METHOD and OB_OKAYTOCLOSE_METHOD. Add fixme for OB_SECURITY_METHOD, will change it later. - Simplified NtDuplicateObject to a simple stub around ObDuplicateObject, there is no need to have lengthy hacks for NtCurrentProcess/NtCurrentThread(). - Cleanup ObDuplicateObject to use normal Ob routines instead of grovelling through handle table structures and manually touching the handle count: It now calls ObpIncrementHandleCount and all the underlying op
by ion＠svn.reactos.org 11 Jun '06

11 Jun '06

Author: ion Date: Sun Jun 11 10:52:56 2006 New Revision: 22303 URL: http://svn.reactos.ru/svn/reactos?rev=22303&view=rev Log: - Fix definitions of OB_QUERYNAME_METHOD and OB_OKAYTOCLOSE_METHOD. Add fixme for OB_SECURITY_METHOD, will change it later. - Simplified NtDuplicateObject to a simple stub around ObDuplicateObject, there is no need to have lengthy hacks for NtCurrentProcess/NtCurrentThread(). - Cleanup ObDuplicateObject to use normal Ob routines instead of grovelling through handle table structures and manually touching the handle count: It now calls ObpIncrementHandleCount and all the underlying operations are done on the duplicated handle. Also access state creation is done if the duplicated handle has different desired access. Modified: trunk/reactos/include/ndk/obtypes.h trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/obtypes.h (original) +++ trunk/reactos/include/ndk/obtypes.h Sun Jun 11 10:52:56 2006 @@ -215,7 +215,7 @@ (NTAPI *OB_SECURITY_METHOD)( IN PVOID Object, IN SECURITY_OPERATION_CODE OperationType, - IN SECURITY_INFORMATION SecurityInformation, + IN SECURITY_INFORMATION SecurityInformation, // FIXME: <= should be a pointer IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN OUT PULONG CapturedLength, IN OUT PSECURITY_DESCRIPTOR *ObjectSecurityDescriptor, @@ -229,14 +229,16 @@ IN BOOLEAN HasObjectName, OUT POBJECT_NAME_INFORMATION ObjectNameInfo, IN ULONG Length, - OUT PULONG ReturnLength + OUT PULONG ReturnLength, + IN KPROCESSOR_MODE AccessMode ); typedef NTSTATUS (NTAPI *OB_OKAYTOCLOSE_METHOD)( IN PEPROCESS Process OPTIONAL, IN PVOID Object, - IN HANDLE Handle + IN HANDLE Handle, + IN KPROCESSOR_MODE AccessMode ); #else Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=22303&… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sun Jun 11 10:52:56 2006 @@ -467,7 +467,8 @@ IN BOOLEAN HasObjectName, POBJECT_NAME_INFORMATION ObjectNameInfo, ULONG Length, - PULONG ReturnLength); + PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode); NTSTATUS CmiImportHiveBins(PREGISTRY_HIVE Hive, Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Sun Jun 11 10:52:56 2006 @@ -691,7 +691,8 @@ IN BOOLEAN HasName, POBJECT_NAME_INFORMATION ObjectNameInfo, ULONG Length, - PULONG ReturnLength) + PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode) { PKEY_OBJECT KeyObject; NTSTATUS Status; Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Jun 11 10:52:56 2006 @@ -518,7 +518,8 @@ IN BOOLEAN HasName, POBJECT_NAME_INFORMATION ObjectNameInfo, ULONG Length, - PULONG ReturnLength + PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode ); VOID Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Sun Jun 11 10:52:56 2006 @@ -121,18 +121,6 @@ IN PVOID Object ); -NTSTATUS -NTAPI -ObDuplicateObject( - PEPROCESS SourceProcess, - PEPROCESS TargetProcess, - HANDLE SourceHandle, - PHANDLE TargetHandle, - ACCESS_MASK DesiredAccess, - ULONG HandleAttributes, - ULONG Options -); - VOID NTAPI ObQueryDeviceMapInformation( Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2230… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Sun Jun 11 10:52:56 2006 @@ -411,7 +411,8 @@ IN BOOLEAN HasName, POBJECT_NAME_INFORMATION ObjectNameInfo, ULONG Length, - PULONG ReturnLength) + PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode) { POBJECT_NAME_INFORMATION LocalInfo; PFILE_OBJECT FileObject; Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Sun Jun 11 10:52:56 2006 @@ -196,7 +196,8 @@ /* Call it and check if it's not letting us close it */ if (!ObjectType->TypeInfo.OkayToCloseProcedure(PsGetCurrentProcess(), Body, - Handle)) + Handle, + AccessMode)) { /* Fail */ ExUnlockHandleTableEntry(HandleTable, HandleEntry); @@ -1188,158 +1189,201 @@ NTSTATUS NTAPI -ObDuplicateObject(PEPROCESS SourceProcess, - PEPROCESS TargetProcess, - HANDLE SourceHandle, - PHANDLE TargetHandle, - ACCESS_MASK DesiredAccess, - ULONG HandleAttributes, - ULONG Options) +ObDuplicateObject(IN PEPROCESS SourceProcess, + IN HANDLE SourceHandle, + IN PEPROCESS TargetProcess OPTIONAL, + IN PHANDLE TargetHandle OPTIONAL, + IN ACCESS_MASK DesiredAccess, + IN ULONG HandleAttributes, + IN ULONG Options, + IN KPROCESSOR_MODE PreviousMode) { - PHANDLE_TABLE_ENTRY SourceHandleEntry; HANDLE_TABLE_ENTRY NewHandleEntry; BOOLEAN AttachedToProcess = FALSE; - PVOID ObjectBody; + PVOID SourceObject; POBJECT_HEADER ObjectHeader; - ULONG NewHandleCount; - HANDLE NewTargetHandle; - PEPROCESS CurrentProcess; + POBJECT_TYPE ObjectType; + HANDLE NewHandle; KAPC_STATE ApcState; NTSTATUS Status = STATUS_SUCCESS; - + ACCESS_MASK TargetAccess, SourceAccess; + ACCESS_STATE AccessState; + PACCESS_STATE PassedAccessState = NULL; + AUX_DATA AuxData; + PHANDLE_TABLE HandleTable = NULL; + OBJECT_HANDLE_INFORMATION HandleInformation; PAGED_CODE(); - - if(SourceProcess == NULL || - ObIsKernelHandle(SourceHandle, ExGetPreviousMode())) - { - SourceProcess = PsInitialSystemProcess; - SourceHandle = ObKernelHandleToHandle(SourceHandle); - } - - CurrentProcess = PsGetCurrentProcess(); - - KeEnterCriticalRegion(); - - if (SourceProcess != CurrentProcess) - { - KeStackAttachProcess(&SourceProcess->Pcb, - &ApcState); + OBTRACE("OBTRACE - %s - Duplicating handle: %lx for %p into %p\n", + __FUNCTION__, + SourceHandle, + SourceProcess, + TargetProcess); + + /* Check if we're not in the source process */ + if (SourceProcess != PsGetCurrentProcess()) + { + /* Attach to it */ + KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); AttachedToProcess = TRUE; } - SourceHandleEntry = ExMapHandleToPointer(SourceProcess->ObjectTable, - SourceHandle); - if (SourceHandleEntry == NULL) - { - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - return STATUS_INVALID_HANDLE; - } - - ObjectHeader = EX_HTE_TO_HDR(SourceHandleEntry); - ObjectBody = &ObjectHeader->Body; - - NewHandleEntry.Object = SourceHandleEntry->Object; - if(HandleAttributes & OBJ_INHERIT) - NewHandleEntry.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; - else - NewHandleEntry.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - NewHandleEntry.GrantedAccess = ((Options & DUPLICATE_SAME_ACCESS) ? - SourceHandleEntry->GrantedAccess : - DesiredAccess); - if (Options & DUPLICATE_SAME_ACCESS) - { - NewHandleEntry.GrantedAccess = SourceHandleEntry->GrantedAccess; - } - else - { - if (DesiredAccess & GENERIC_ACCESS) - { - RtlMapGenericMask(&DesiredAccess, - &ObjectHeader->Type->TypeInfo.GenericMapping); - } - NewHandleEntry.GrantedAccess = DesiredAccess; - } - - /* reference the object so it doesn't get deleted after releasing the lock - and before creating a new handle for it */ - ObReferenceObject(ObjectBody); - - /* increment the handle count of the object, it should always be >= 2 because - we're holding a handle lock to this object! if the new handle count was - 1 here, we're in big trouble... it would've been safe to increment and - check the handle count without using interlocked functions because the - entry is locked, which means the handle count can't change. */ - NewHandleCount = InterlockedIncrement(&ObjectHeader->HandleCount); - ASSERT(NewHandleCount >= 2); - - ExUnlockHandleTableEntry(SourceProcess->ObjectTable, - SourceHandleEntry); - + + /* Now reference the source handle */ + Status = ObReferenceObjectByHandle(SourceHandle, + 0, + NULL, + PreviousMode, + (PVOID*)&SourceObject, + &HandleInformation); + + /* Check if we were attached */ if (AttachedToProcess) { + /* We can safely detach now */ KeUnstackDetachProcess(&ApcState); AttachedToProcess = FALSE; } - if (TargetProcess != CurrentProcess) - { - KeStackAttachProcess(&TargetProcess->Pcb, - &ApcState); + /* Fail if we couldn't reference it */ + if (!NT_SUCCESS(Status)) return Status; + + /* Get the source access */ + SourceAccess = HandleInformation.GrantedAccess; + + /* Check if we're not in the target process */ + if (TargetProcess != PsGetCurrentProcess()) + { + /* Attach to it */ + KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); AttachedToProcess = TRUE; } - /* attempt to create the new handle */ - NewTargetHandle = ExCreateHandle(TargetProcess->ObjectTable, - &NewHandleEntry); + /* Check if we're duplicating the attributes */ + if (Options & DUPLICATE_SAME_ATTRIBUTES) + { + /* Duplicate them */ + HandleAttributes = HandleInformation.HandleAttributes; + } + + /* Check if we're duplicating the access */ + if (Options & DUPLICATE_SAME_ACCESS) DesiredAccess = SourceAccess; + + /* Get object data */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(SourceObject); + ObjectType = ObjectHeader->Type; + + /* Fill out the entry */ + NewHandleEntry.Object = ObjectHeader; + NewHandleEntry.ObAttributes |= HandleAttributes & + (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | + EX_HANDLE_ENTRY_INHERITABLE | + EX_HANDLE_ENTRY_AUDITONCLOSE); + + /* Check if we're using a generic mask */ + if (DesiredAccess & GENERIC_ACCESS) + { + /* Map it */ + RtlMapGenericMask(&DesiredAccess, &ObjectType->TypeInfo.GenericMapping); + } + + /* Set the target access */ + TargetAccess = DesiredAccess; + NewHandleEntry.GrantedAccess = TargetAccess; + + /* Check if we're asking for new access */ + if (TargetAccess & ~SourceAccess) + { + /* We are. We need the security procedure to validate this */ + if (ObjectType->TypeInfo.SecurityProcedure == SeDefaultObjectMethod) + { + /* Use our built-in access state */ + PassedAccessState = &AccessState; + Status = SeCreateAccessState(&AccessState, + &AuxData, + TargetAccess, + &ObjectType->TypeInfo.GenericMapping); + } + else + { + /* Otherwise we can't allow this privilege elevation */ + Status = STATUS_ACCESS_DENIED; + } + } + else + { + /* We don't need an access state */ + Status = STATUS_SUCCESS; + } + + /* Make sure the access state was created OK */ + if (NT_SUCCESS(Status)) + { + /* Add a new handle */ + Status = ObpIncrementHandleCount(SourceObject, + PassedAccessState, + PreviousMode, + HandleAttributes, + PsGetCurrentProcess(), + ObDuplicateHandle); + + /* Set the handle table, now that we know this handle was added */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Check if we were attached */ if (AttachedToProcess) { + /* We can safely detach now */ KeUnstackDetachProcess(&ApcState); AttachedToProcess = FALSE; } - if (NewTargetHandle != NULL) - { - if (Options & DUPLICATE_CLOSE_SOURCE) - { - if (SourceProcess != CurrentProcess) - { - KeStackAttachProcess(&SourceProcess->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - - /* delete the source handle */ - NtClose(SourceHandle); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - } - - ObDereferenceObject(ObjectBody); - - *TargetHandle = NewTargetHandle; - } - else - { - /* decrement the handle count we previously incremented, but don't call the - closing procedure because we're not closing a handle! */ - if(InterlockedDecrement(&ObjectHeader->HandleCount) == 0) - { - ObDereferenceObject(ObjectBody); - } - - ObDereferenceObject(ObjectBody); - Status = STATUS_UNSUCCESSFUL; - } - - KeLeaveCriticalRegion(); - + /* Check if we have to close the source handle */ + if (Options & DUPLICATE_CLOSE_SOURCE) + { + /* Attach and close */ + KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); + NtClose(SourceHandle); + KeUnstackDetachProcess(&ApcState); + } + + /* Check if we had an access state */ + if (PassedAccessState) SeDeleteAccessState(PassedAccessState); + + /* Now check if incrementing actually failed */ + if (!NT_SUCCESS(Status)) + { + /* Dereference the source object */ + ObDereferenceObject(SourceObject); + return Status; + } + + /* Now create the handle */ + ObDereferenceObject(SourceObject); + NewHandle = ExCreateHandle(HandleTable, &NewHandleEntry); + if (!NewHandle) + { + /* Undo the increment */ + ObpDecrementHandleCount(SourceObject, + TargetProcess, + TargetAccess); + + /* Deference the object and set failure status */ + ObDereferenceObject(SourceObject); + Status = STATUS_INSUFFICIENT_RESOURCES; + } + + /* Return the handle */ + if (TargetHandle) *TargetHandle = NewHandle; + + /* Return status */ + OBTRACE("OBTRACE - %s - Duplicated handle: %lx for %p into %p. Source: %p HC PC %lx %lx\n", + __FUNCTION__, + NewHandle, + SourceProcess, + TargetProcess, + SourceObject, + ObjectHeader->PointerCount, + ObjectHeader->HandleCount); return Status; } @@ -1934,184 +1978,118 @@ return ObpCloseHandle(Handle, ExGetPreviousMode()); } -/* -* @implemented -*/ -NTSTATUS STDCALL -NtDuplicateObject (IN HANDLE SourceProcessHandle, - IN HANDLE SourceHandle, - IN HANDLE TargetProcessHandle, - OUT PHANDLE TargetHandle OPTIONAL, - IN ACCESS_MASK DesiredAccess, - IN ULONG HandleAttributes, - IN ULONG Options) +NTSTATUS +NTAPI +NtDuplicateObject(IN HANDLE SourceProcessHandle, + IN HANDLE SourceHandle, + IN HANDLE TargetProcessHandle OPTIONAL, + OUT PHANDLE TargetHandle OPTIONAL, + IN ACCESS_MASK DesiredAccess, + IN ULONG HandleAttributes, + IN ULONG Options) { - PEPROCESS SourceProcess; - PEPROCESS TargetProcess; - PEPROCESS CurrentProcess; + PEPROCESS SourceProcess, TargetProcess, Target; HANDLE hTarget; - BOOLEAN AttachedToProcess = FALSE; - KPROCESSOR_MODE PreviousMode; - KAPC_STATE ApcState; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - ACCESS_STATE AccessState; - AUX_DATA AuxData; - PACCESS_STATE PassedAccessState = NULL; - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if(TargetHandle != NULL && PreviousMode != KernelMode) - { + OBTRACE("OBTRACE - %s - Duplicating handle: %lx for %lx into %lx.\n", + __FUNCTION__, + SourceHandle, + SourceProcessHandle, + TargetProcessHandle); + + if((TargetHandle) && (PreviousMode != KernelMode)) + { + /* Enter SEH */ _SEH_TRY { + /* Probe the handle */ ProbeForWriteHandle(TargetHandle); } _SEH_HANDLE { + /* Get the exception status */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - + /* Fail if the pointer was invalid */ + if (!NT_SUCCESS(Status)) return Status; + } + + /* Now reference the input handle */ Status = ObReferenceObjectByHandle(SourceProcessHandle, - PROCESS_DUP_HANDLE, - NULL, - PreviousMode, - (PVOID*)&SourceProcess, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - Status = ObReferenceObjectByHandle(TargetProcessHandle, - PROCESS_DUP_HANDLE, - NULL, - PreviousMode, - (PVOID*)&TargetProcess, - NULL); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(SourceProcess); - return(Status); - } - - CurrentProcess = PsGetCurrentProcess(); - - /* Check for magic handle first */ - if (SourceHandle == NtCurrentThread() || - SourceHandle == NtCurrentProcess()) - { - PVOID ObjectBody; - POBJECT_TYPE ObjectType; - - ObjectType = (SourceHandle == NtCurrentThread()) ? PsThreadType : PsProcessType; - - Status = ObReferenceObjectByHandle(SourceHandle, - 0, - ObjectType, - PreviousMode, - &ObjectBody, - NULL); - if(NT_SUCCESS(Status)) - { - if (Options & DUPLICATE_SAME_ACCESS) - { - /* grant all access rights */ - DesiredAccess = ((ObjectType == PsThreadType) ? THREAD_ALL_ACCESS : PROCESS_ALL_ACCESS); - } - else - { - if (DesiredAccess & GENERIC_ACCESS) - { - RtlMapGenericMask(&DesiredAccess, - &ObjectType->TypeInfo.GenericMapping); - } - } - - if (TargetProcess != CurrentProcess) - { - KeStackAttachProcess(&TargetProcess->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - - /* Use our built-in access state */ - PassedAccessState = &AccessState; - Status = SeCreateAccessState(&AccessState, - &AuxData, - DesiredAccess, - &ObjectType->TypeInfo.GenericMapping); - - /* Add a new handle */ - Status = ObpIncrementHandleCount(ObjectBody, - PassedAccessState, - PreviousMode, - HandleAttributes, - PsGetCurrentProcess(), - ObDuplicateHandle); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - AttachedToProcess = FALSE; - } - - ObDereferenceObject(ObjectBody); - - if (Options & DUPLICATE_CLOSE_SOURCE) - { - if (SourceProcess != CurrentProcess) - { - KeStackAttachProcess(&SourceProcess->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - - NtClose(SourceHandle); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - } + PROCESS_DUP_HANDLE, + PsProcessType, + PreviousMode, + (PVOID*)&SourceProcess, + NULL); + if (!NT_SUCCESS(Status)) return(Status); + + /* Check if got a target handle */ + if (TargetProcessHandle) + { + /* Now reference the output handle */ + Status = ObReferenceObjectByHandle(TargetProcessHandle, + PROCESS_DUP_HANDLE, + PsProcessType, + PreviousMode, + (PVOID*)&TargetProcess, + NULL); + if (NT_SUCCESS(Status)) + { + /* Use this target process */ + Target = TargetProcess; + } + else + { + /* No target process */ + Target = NULL; } } else { - Status = ObDuplicateObject(SourceProcess, - TargetProcess, - SourceHandle, - &hTarget, - DesiredAccess, - HandleAttributes, - Options); - } - + /* No target process */ + Status = STATUS_SUCCESS; + Target = NULL; + } + + /* Call the internal routine */ + Status = ObDuplicateObject(SourceProcess, + SourceHandle, + Target, + &hTarget, + DesiredAccess, + HandleAttributes, + Options, + PreviousMode); + + /* Check if the caller wanted the return handle */ + if (TargetHandle) + { + /* Protect the write to user mode */ + _SEH_TRY + { + /* Write the new handle */ + *TargetHandle = hTarget; + } + _SEH_HANDLE + { + /* Otherwise, get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + /* Dereference the processes */ + OBTRACE("OBTRACE - %s - Duplicated handle: %lx into %lx S %lx\n", + __FUNCTION__, + hTarget, + TargetProcessHandle, + Status); ObDereferenceObject(TargetProcess); ObDereferenceObject(SourceProcess); - - if(NT_SUCCESS(Status) && TargetHandle != NULL) - { - _SEH_TRY - { - *TargetHandle = hTarget; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - return Status; } - /* EOF */ Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Sun Jun 11 10:52:56 2006 @@ -394,7 +394,7 @@ /* PUBLIC FUNCTIONS *********************************************************/ NTSTATUS -STDCALL +NTAPI ObQueryNameString(IN PVOID Object, OUT POBJECT_NAME_INFORMATION ObjectNameInfo, IN ULONG Length, @@ -418,7 +418,8 @@ TRUE, //fixme ObjectNameInfo, Length, - ReturnLength); + ReturnLength, + KernelMode); } /* Check if the object doesn't even have a name */

1 0

[fireball] 22302: - Further improvements to Ob tests (fixing obvious mistakes/etc), however reference tests still cause bugcheck, so they are disabled - Clean-up is enabled now, so basically it's possible to run the test a number of times in win2k3, and every time it will go from scratch by creating everything. But I have a feeling that deleting object-types causes some type of corruption. To be investigated later.
by fireball＠svn.reactos.org 10 Jun '06

10 Jun '06

Author: fireball Date: Sun Jun 11 02:39:14 2006 New Revision: 22302 URL: http://svn.reactos.ru/svn/reactos?rev=22302&view=rev Log: - Further improvements to Ob tests (fixing obvious mistakes/etc), however reference tests still cause bugcheck, so they are disabled - Clean-up is enabled now, so basically it's possible to run the test a number of times in win2k3, and every time it will go from scratch by creating everything. But I have a feeling that deleting object-types causes some type of corruption. To be investigated later. Modified: trunk/reactos/drivers/test/kmtest/ntos_ob.c Modified: trunk/reactos/drivers/test/kmtest/ntos_ob.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_ob… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_ob.c (original) +++ trunk/reactos/drivers/test/kmtest/ntos_ob.c Sun Jun 11 02:39:14 2006 @@ -121,7 +121,8 @@ OUT PVOID *Object) { DbgPrint("ParseProc() called\n"); - return STATUS_SUCCESS; + *Object = NULL; + return STATUS_OBJECT_NAME_NOT_FOUND;//STATUS_SUCCESS; } VOID @@ -260,7 +261,7 @@ PVOID DirObject; NTSTATUS Status; //PVOID TypeObject; - //USHORT i; + USHORT i; //UNICODE_STRING ObPathName[NUM_OBTYPES]; // Close what we have opened and free what we allocated @@ -293,13 +294,11 @@ "Failed to close handle with status=0x%lX", Status); // Now delete the last piece - object types - // FIXME: How to do this correctly? - /* - for (i=0; i<NUM_OBTYPES; i++) - { + // In fact, it's weird to get rid of object types, especially the way, + // how it's done in the commented section below + for (i=0; i<NUM_OBTYPES; i++) ObDereferenceObject(ObTypes[i]); - }*/ - /* +/* RtlInitUnicodeString(&ObPathName[0], L"\\ObjectTypes\\MyObjectType1"); RtlInitUnicodeString(&ObPathName[1], L"\\ObjectTypes\\MyObjectType2"); @@ -313,7 +312,8 @@ ObDereferenceObject(TypeObject); DPRINT("Reference Name %S = %p, ObTypes[%d] = %p\n", ObPathName[i], TypeObject, i, ObTypes[i]); - }*/ + } +*/ } VOID @@ -351,7 +351,7 @@ OBJ_CASE_INSENSITIVE, NULL, 0L, ObTypes[i], KernelMode, NULL, &ObBody[0]); - DPRINT("Ref by name %S = %p\n", ObPathName[i], ObBody[i]); + DPRINT("Ref by name %wZ = %p\n", &ObPathName[i], ObBody[i]); } // Dereference now all of them @@ -394,12 +394,11 @@ DPRINT("ObtCreateObjects() done\n"); // Reference them in a variety of ways - // FIXME: Disabled due to ParseProcedure call //ObtReferenceTests(); // Clean up - // FIXME: Disabled to see results of creating objects in usermode - // and also due to problems with object types removal + // FIXME: Disable to see results of creating objects in usermode. + // Also it has problems with object types removal ObtClose(); DPRINT("Cleanup done\n");

1 0

[fireball] 22301: Alex finally paid attention to my code, so I'm fixing a few things...
by fireball＠svn.reactos.org 10 Jun '06

10 Jun '06

Author: fireball Date: Sun Jun 11 01:17:43 2006 New Revision: 22301 URL: http://svn.reactos.ru/svn/reactos?rev=22301&view=rev Log: Alex finally paid attention to my code, so I'm fixing a few things... Modified: trunk/reactos/drivers/test/kmtest/kmtest.h trunk/reactos/drivers/test/kmtest/ntos_ob.c Modified: trunk/reactos/drivers/test/kmtest/kmtest.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest.… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.h (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.h Sun Jun 11 01:17:43 2006 @@ -3,6 +3,7 @@ #include <stdio.h> #include <stdarg.h> +#include <string.h> /* Some macros, structs, and vars are based or inspired from the great Modified: trunk/reactos/drivers/test/kmtest/ntos_ob.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_ob… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_ob.c (original) +++ trunk/reactos/drivers/test/kmtest/ntos_ob.c Sun Jun 11 01:17:43 2006 @@ -67,6 +67,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ VOID +NTAPI DumpProc(IN PVOID Object, IN POB_DUMP_CONTROL DumpControl) { @@ -75,6 +76,7 @@ // prototype doesn't match Win2003! (causes BSOD) VOID +NTAPI OpenProc(IN OB_OPEN_REASON OpenReason, IN PEPROCESS Process, IN PVOID Object, @@ -87,6 +89,7 @@ // Tested in Win2k3 VOID +NTAPI CloseProc(IN PEPROCESS Process, IN PVOID Object, IN ACCESS_MASK GrantedAccess, @@ -98,12 +101,14 @@ // Tested in Win2k3 VOID +NTAPI DeleteProc(IN PVOID Object) { DPRINT("DeleteProc() called for Object=0x%p\n", Object); } NTSTATUS +NTAPI ParseProc(IN PVOID ParseObject, IN PVOID ObjectType, IN OUT PACCESS_STATE AccessState, @@ -124,16 +129,14 @@ { USHORT i; NTSTATUS Status; + WCHAR Name[15]; for (i=0; i<NUM_OBTYPES; i++) { // Prepare object type name // TODO: Generate type names and don't use this unprofessional, - // ugly looking, and otherwise bad if-condition - if (i == 0) - RtlInitUnicodeString(&ObTypeName[i], L"MyObjectType1"); - else - RtlInitUnicodeString(&ObTypeName[i], L"MyObjectType2"); + swprintf(Name, L"MyObjectType%lx", i); + RtlInitUnicodeString(&ObTypeName[i], Name); // Prepare initializer RtlZeroMemory(&ObTypeInitializer[i], sizeof(ObTypeInitializer[i]));

1 0

[hpoussin] 22300: After some tests, change SetupDiClassNameFromGuidExW and SetupDiGetClassDescriptionExW to match Windows XP behavior
by hpoussin＠svn.reactos.org 10 Jun '06

10 Jun '06

Author: hpoussin Date: Sun Jun 11 00:51:18 2006 New Revision: 22300 URL: http://svn.reactos.ru/svn/reactos?rev=22300&view=rev Log: After some tests, change SetupDiClassNameFromGuidExW and SetupDiGetClassDescriptionExW to match Windows XP behavior Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devclass… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Sun Jun 11 00:51:18 2006 @@ -599,13 +599,24 @@ IN PCWSTR MachineName OPTIONAL, IN PVOID Reserved) { - HKEY hKey; - DWORD dwLength; + HKEY hKey = INVALID_HANDLE_VALUE; + DWORD dwLength, dwRegType; LONG rc; BOOL ret = FALSE; TRACE("%s %p %lu %p %s %p\n", debugstr_guid(ClassGuid), ClassName, ClassNameSize, RequiredSize, debugstr_w(MachineName), Reserved); + + if (!ClassGuid) + { + SetLastError(ERROR_INVALID_CLASS); + goto cleanup; + } + else if (!ClassName && ClassNameSize > 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } hKey = SetupDiOpenClassRegKeyExW(ClassGuid, KEY_QUERY_VALUE, @@ -615,38 +626,39 @@ if (hKey == INVALID_HANDLE_VALUE) goto cleanup; - if (RequiredSize != NULL) - { + if (ClassNameSize < sizeof(UNICODE_NULL) || !ClassName) dwLength = 0; - rc = RegQueryValueExW(hKey, - Class, - NULL, - NULL, - NULL, - &dwLength); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - - *RequiredSize = dwLength / sizeof(WCHAR); - } - - dwLength = ClassNameSize * sizeof(WCHAR); + else + dwLength = ClassNameSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); + rc = RegQueryValueExW(hKey, Class, NULL, - NULL, + &dwRegType, (LPBYTE)ClassName, &dwLength); - if (rc != ERROR_SUCCESS) + if (rc != ERROR_MORE_DATA && rc != ERROR_SUCCESS) { SetLastError(rc); goto cleanup; } - - ret = TRUE; + else if (dwRegType != REG_SZ) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + if (RequiredSize) + *RequiredSize = dwLength / sizeof(WCHAR) + 1; + + if (ClassNameSize * sizeof(WCHAR) >= dwLength + sizeof(UNICODE_STRING)) + { + if (ClassNameSize > sizeof(UNICODE_NULL)) + ClassName[ClassNameSize / sizeof(WCHAR)] = UNICODE_NULL; + ret = TRUE; + } + else + SetLastError(ERROR_INSUFFICIENT_BUFFER); cleanup: if (hKey != INVALID_HANDLE_VALUE) @@ -755,11 +767,23 @@ IN PVOID Reserved) { HKEY hKey = INVALID_HANDLE_VALUE; - DWORD dwLength; + DWORD dwLength, dwRegType; + LONG rc; BOOL ret = FALSE; TRACE("%s %p %lu %p %s %p\n", debugstr_guid(ClassGuid), ClassDescription, ClassDescriptionSize, RequiredSize, debugstr_w(MachineName), Reserved); + + if (!ClassGuid) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + else if (!ClassDescription && ClassDescriptionSize > 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } hKey = SetupDiOpenClassRegKeyExW(ClassGuid, KEY_QUERY_VALUE, @@ -772,34 +796,39 @@ goto cleanup; } - if (RequiredSize != NULL) - { + if (ClassDescriptionSize < sizeof(UNICODE_NULL) || !ClassDescription) dwLength = 0; - if (RegQueryValueExW(hKey, - NULL, - NULL, - NULL, - NULL, - &dwLength) != ERROR_SUCCESS) - { - goto cleanup; - } - - *RequiredSize = dwLength / sizeof(WCHAR); - } - - dwLength = ClassDescriptionSize * sizeof(WCHAR); - if (RegQueryValueExW(hKey, - NULL, - NULL, - NULL, - (LPBYTE)ClassDescription, - &dwLength) != ERROR_SUCCESS) - { - goto cleanup; - } - - ret = TRUE; + else + dwLength = ClassDescriptionSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); + + rc = RegQueryValueExW(hKey, + NULL, + NULL, + &dwRegType, + (LPBYTE)ClassDescription, + &dwLength); + if (rc != ERROR_MORE_DATA && rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + else if (dwRegType != REG_SZ) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + if (RequiredSize) + *RequiredSize = dwLength / sizeof(WCHAR) + 1; + + if (ClassDescriptionSize * sizeof(WCHAR) >= dwLength + sizeof(UNICODE_STRING)) + { + if (ClassDescriptionSize > sizeof(UNICODE_NULL)) + ClassDescription[ClassDescriptionSize / sizeof(WCHAR)] = UNICODE_NULL; + ret = TRUE; + } + else + SetLastError(ERROR_INSUFFICIENT_BUFFER); cleanup: if (hKey != INVALID_HANDLE_VALUE) @@ -1877,7 +1906,7 @@ rc = RegOpenKeyExW(HKLM, lpKeyName, 0, - ClassGuid ? 0 : samDesired, + ClassGuid ? KEY_ENUMERATE_SUB_KEYS : samDesired, &hClassesKey); if (MachineName != NULL) RegCloseKey(HKLM);

1 0

[hpoussin] 22299: Cleanup: - Check that mandatory arguments are provided - Better tracing system - Prepend private function names with SETUP_ - Use MultiByteToUnicode instead of MultiByteToUnicode + HeapAlloc - ...
by hpoussin＠svn.reactos.org 10 Jun '06

10 Jun '06

Author: hpoussin Date: Sun Jun 11 00:48:17 2006 New Revision: 22299 URL: http://svn.reactos.ru/svn/reactos?rev=22299&view=rev Log: Cleanup: - Check that mandatory arguments are provided - Better tracing system - Prepend private function names with SETUP_ - Use MultiByteToUnicode instead of MultiByteToUnicode + HeapAlloc - ... Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devclass… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Sun Jun 11 00:48:17 2006 @@ -45,7 +45,7 @@ IN DWORD ClassInstallParamsSize); static BOOL -PropertyChangeHandler( +SETUP_PropertyChangeHandler( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, @@ -69,7 +69,7 @@ NULL, /* DIF_DETECT */ NULL, /* DIF_INSTALLWIZARD */ NULL, /* DIF_DESTROYWIZARDDATA */ - PropertyChangeHandler, /* DIF_PROPERTYCHANGE */ + SETUP_PropertyChangeHandler, /* DIF_PROPERTYCHANGE */ NULL, /* DIF_ENABLECLASS */ NULL, /* DIF_DETECTVERIFY */ NULL, /* DIF_INSTALLDEVICEFILES */ @@ -153,7 +153,8 @@ LPWSTR MachineNameW = NULL; BOOL bResult; - TRACE("\n"); + TRACE("0x%lx %p %lu %p %s %p\n", Flags, ClassGuidList, + ClassGuidListSize, RequiredSize, debugstr_a(MachineName), Reserved); if (MachineName) { @@ -165,8 +166,7 @@ ClassGuidListSize, RequiredSize, MachineNameW, Reserved); - if (MachineNameW) - MyFree(MachineNameW); + MyFree(MachineNameW); return bResult; } @@ -210,8 +210,16 @@ TRACE("0x%lx %p %lu %p %s %p\n", Flags, ClassGuidList, ClassGuidListSize, RequiredSize, debugstr_w(MachineName), Reserved); - if (RequiredSize != NULL) - *RequiredSize = 0; + if (!RequiredSize) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + else if (!ClassGuidList && ClassGuidListSize > 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } hClassesKey = SetupDiOpenClassRegKeyExW(NULL, KEY_ENUMERATE_SUB_KEYS, @@ -232,7 +240,6 @@ NULL, NULL, NULL); - TRACE("RegEnumKeyExW() returns %ld\n", lError); if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) { TRACE("Key name: %s\n", debugstr_w(szKeyName)); @@ -288,7 +295,6 @@ { if (szKeyName[0] == L'{' && szKeyName[37] == L'}') szKeyName[37] = 0; - TRACE("Guid: %s\n", debugstr_w(&szKeyName[1])); UuidFromStringW(&szKeyName[1], &ClassGuidList[dwGuidListIndex]); @@ -296,9 +302,11 @@ dwGuidListIndex++; } + else + TRACE("RegEnumKeyExW() returns 0x%lx\n", lError); if (lError != ERROR_SUCCESS) - break; + break; } if (RequiredSize != NULL) @@ -360,31 +368,34 @@ { LPWSTR ClassNameW = NULL; LPWSTR MachineNameW = NULL; - BOOL bResult; - - TRACE("\n"); + BOOL bResult = FALSE; + + TRACE("%s %p %lu %p %s %p\n", debugstr_a(ClassName), ClassGuidList, + ClassGuidListSize, RequiredSize, debugstr_a(MachineName), Reserved); + + if (!ClassName) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } ClassNameW = MultiByteToUnicode(ClassName, CP_ACP); if (ClassNameW == NULL) - return FALSE; - - if (MachineNameW) + goto cleanup; + + if (MachineName) { MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); if (MachineNameW == NULL) - { - MyFree(ClassNameW); - return FALSE; - } + goto cleanup; } bResult = SetupDiClassGuidsFromNameExW(ClassNameW, ClassGuidList, ClassGuidListSize, RequiredSize, MachineNameW, Reserved); - if (MachineNameW) - MyFree(MachineNameW); - +cleanup: + MyFree(MachineNameW); MyFree(ClassNameW); return bResult; @@ -403,7 +414,7 @@ IN PVOID Reserved) { WCHAR szKeyName[MAX_GUID_STRING_LEN + 1]; - WCHAR szClassName[256]; + WCHAR szClassName[MAX_CLASS_NAME_LEN]; HKEY hClassesKey = INVALID_HANDLE_VALUE; HKEY hClassKey = NULL; DWORD dwLength; @@ -415,8 +426,17 @@ TRACE("%s %p %lu %p %s %p\n", debugstr_w(ClassName), ClassGuidList, ClassGuidListSize, RequiredSize, debugstr_w(MachineName), Reserved); - if (RequiredSize != NULL) - *RequiredSize = 0; + if (!ClassName || !RequiredSize) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + else if (!ClassGuidList && ClassGuidListSize > 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + *RequiredSize = 0; hClassesKey = SetupDiOpenClassRegKeyExW(NULL, KEY_ENUMERATE_SUB_KEYS, @@ -437,7 +457,6 @@ NULL, NULL, NULL); - TRACE("RegEnumKeyExW() returns %ld\n", lError); if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) { TRACE("Key name: %s\n", debugstr_w(szKeyName)); @@ -453,7 +472,7 @@ goto cleanup; } - dwLength = 256 * sizeof(WCHAR); + dwLength = MAX_CLASS_NAME_LEN * sizeof(WCHAR); if (RegQueryValueExW(hClassKey, Class, NULL, @@ -472,7 +491,6 @@ { if (szKeyName[0] == L'{' && szKeyName[37] == L'}') szKeyName[37] = 0; - TRACE("Guid: %s\n", debugstr_w(&szKeyName[1])); UuidFromStringW(&szKeyName[1], &ClassGuidList[dwGuidListIndex]); @@ -482,6 +500,8 @@ } } } + else + TRACE("RegEnumKeyExW() returns 0x%lx\n", lError); if (lError != ERROR_SUCCESS) break; @@ -552,14 +572,16 @@ if (MachineName) MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); ret = SetupDiClassNameFromGuidExW(ClassGuid, ClassNameW, MAX_CLASS_NAME_LEN, - NULL, MachineNameW, Reserved); + RequiredSize, MachineNameW, Reserved); if (ret) { int len = WideCharToMultiByte(CP_ACP, 0, ClassNameW, -1, ClassName, - ClassNameSize, NULL, NULL); - - if (!ClassNameSize && RequiredSize) - *RequiredSize = len; + ClassNameSize, NULL, NULL); + if (len > ClassNameSize) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } } MyFree(MachineNameW); return ret; @@ -674,23 +696,22 @@ IN PCSTR MachineName OPTIONAL, IN PVOID Reserved) { - PWCHAR ClassDescriptionW; + PWCHAR ClassDescriptionW = NULL; LPWSTR MachineNameW = NULL; - BOOL ret; - - TRACE("\n"); + BOOL ret = FALSE; + + TRACE("%s %p %lu %p %s %p\n", debugstr_guid(ClassGuid), ClassDescription, + ClassDescriptionSize, RequiredSize, debugstr_a(MachineName), Reserved); + if (ClassDescriptionSize > 0) { - ClassDescriptionW = HeapAlloc(GetProcessHeap(), 0, ClassDescriptionSize * sizeof(WCHAR)); + ClassDescriptionW = MyMalloc(ClassDescriptionSize * sizeof(WCHAR)); if (!ClassDescriptionW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - ret = FALSE; - goto end; - } - } - else - ClassDescriptionW = NULL; + goto cleanup; + } + } if (MachineName) { @@ -698,24 +719,25 @@ if (!MachineNameW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + } + + ret = SetupDiGetClassDescriptionExW(ClassGuid, ClassDescriptionW, + ClassDescriptionSize * sizeof(WCHAR), RequiredSize, MachineNameW, Reserved); + if (ret) + { + int len = WideCharToMultiByte(CP_ACP, 0, ClassDescriptionW, -1, ClassDescription, + ClassDescriptionSize, NULL, NULL); + if (len > ClassDescriptionSize) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); ret = FALSE; - goto end; - } - } - - ret = SetupDiGetClassDescriptionExW(ClassGuid, ClassDescriptionW, ClassDescriptionSize * sizeof(WCHAR), - NULL, MachineNameW, Reserved); - if (ret) - { - int len = WideCharToMultiByte(CP_ACP, 0, ClassDescriptionW, -1, ClassDescription, - ClassDescriptionSize, NULL, NULL); - - if (!ClassDescriptionSize && RequiredSize) - *RequiredSize = len; - } - -end: - HeapFree(GetProcessHeap(), 0, ClassDescriptionW); + } + } + +cleanup: + MyFree(ClassDescriptionW); MyFree(MachineNameW); return ret; } @@ -782,7 +804,6 @@ cleanup: if (hKey != INVALID_HANDLE_VALUE) RegCloseKey(hKey); - return ret; } @@ -827,49 +848,50 @@ IN PCSTR MachineName OPTIONAL, IN PVOID Reserved) { - HDEVINFO ret; - LPWSTR enumstrW = NULL; - LPWSTR machineW = NULL; + LPWSTR EnumeratorW = NULL; + LPWSTR MachineNameW = NULL; + HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE; if (Enumerator) { - int len = MultiByteToWideChar(CP_ACP, 0, Enumerator, -1, NULL, 0); - enumstrW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!enumstrW) - { - ret = (HDEVINFO)INVALID_HANDLE_VALUE; - goto end; - } - MultiByteToWideChar(CP_ACP, 0, Enumerator, -1, enumstrW, len); + EnumeratorW = MultiByteToUnicode(Enumerator, CP_ACP); + if (!EnumeratorW) + goto cleanup; } if (MachineName) { - int len = MultiByteToWideChar(CP_ACP, 0, MachineName, -1, NULL, 0); - machineW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!machineW) - { - ret = (HDEVINFO)INVALID_HANDLE_VALUE; - goto end; - } - MultiByteToWideChar(CP_ACP, 0, MachineName, -1, machineW, len); - } - ret = SetupDiGetClassDevsExW(ClassGuid, enumstrW, hwndParent, Flags, DeviceInfoSet, machineW, Reserved); - -end: - HeapFree(GetProcessHeap(), 0, enumstrW); - HeapFree(GetProcessHeap(), 0, machineW); + MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); + if (!MachineNameW) + goto cleanup; + } + ret = SetupDiGetClassDevsExW(ClassGuid, EnumeratorW, hwndParent, + Flags, DeviceInfoSet, MachineNameW, Reserved); + +cleanup: + MyFree(EnumeratorW); + MyFree(MachineNameW); return ret; } /*********************************************************************** - * Helper functions for SetupDiGetClassDevsExW + * SETUP_CreateDevicesListFromEnumerator + * + * PARAMS + * list [I] Device info set to fill with discovered devices. + * pClassGuid [I] If specified, only devices which belong to this class will be added. + * Enumerator [I] Location to search devices to add. + * hEnumeratorKey [O] Registry key corresponding to Enumerator key. Must have KEY_ENUMERATE_SUB_KEYS right. + * + * RETURNS + * Success: ERROR_SUCCESS. + * Failure: an error code. */ static LONG -SETUP_CreateDevListFromEnumerator( - struct DeviceInfoSet *list, - CONST GUID *pClassGuid OPTIONAL, - LPCWSTR Enumerator, - HKEY hEnumeratorKey) /* handle to Enumerator registry key */ +SETUP_CreateDevicesListFromEnumerator( + IN OUT struct DeviceInfoSet *list, + IN CONST GUID *pClassGuid OPTIONAL, + IN LPCWSTR Enumerator, + IN HKEY hEnumeratorKey) /* handle to Enumerator registry key */ { HKEY hDeviceIdKey = NULL, hInstanceIdKey; WCHAR KeyBuffer[MAX_PATH]; @@ -947,7 +969,7 @@ } else { - KeyBuffer[37] = '\0'; /* Replace the } by a NULL character */ + KeyBuffer[MAX_GUID_STRING_LEN - 2] = '\0'; /* Replace the } by a NULL character */ if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) /* Bad GUID, skip the entry */ continue; @@ -979,11 +1001,11 @@ } static LONG -SETUP_CreateDevList( - struct DeviceInfoSet *list, - PCWSTR MachineName OPTIONAL, - CONST GUID *class OPTIONAL, - PCWSTR Enumerator OPTIONAL) +SETUP_CreateDevicesList( + IN OUT struct DeviceInfoSet *list, + IN PCWSTR MachineName OPTIONAL, + IN CONST GUID *Class OPTIONAL, + IN PCWSTR Enumerator OPTIONAL) { HKEY HKLM = HKEY_LOCAL_MACHINE; HKEY hEnumKey = NULL; @@ -993,8 +1015,8 @@ DWORD dwLength; DWORD rc; - if (class && IsEqualIID(class, &GUID_NULL)) - class = NULL; + if (Class && IsEqualIID(Class, &GUID_NULL)) + Class = NULL; /* Open Enum key (if applicable) */ if (MachineName != NULL) @@ -1013,8 +1035,8 @@ if (rc != ERROR_SUCCESS) goto cleanup; - /* If enumerator is provided, call directly SETUP_CreateDevListFromEnumerator. - * Else, enumerate all enumerators and call SETUP_CreateDevListFromEnumerator + /* If enumerator is provided, call directly SETUP_CreateDevicesListFromEnumerator. + * Else, enumerate all enumerators and call SETUP_CreateDevicesListFromEnumerator * for each one. */ if (Enumerator) @@ -1027,7 +1049,7 @@ &hEnumeratorKey); if (rc != ERROR_SUCCESS) goto cleanup; - rc = SETUP_CreateDevListFromEnumerator(list, class, Enumerator, hEnumeratorKey); + rc = SETUP_CreateDevicesListFromEnumerator(list, Class, Enumerator, hEnumeratorKey); } else { @@ -1050,8 +1072,8 @@ if (rc != ERROR_SUCCESS) goto cleanup; - /* Call SETUP_CreateDevListFromEnumerator */ - rc = SETUP_CreateDevListFromEnumerator(list, class, KeyBuffer, hEnumeratorKey); + /* Call SETUP_CreateDevicesListFromEnumerator */ + rc = SETUP_CreateDevicesListFromEnumerator(list, Class, KeyBuffer, hEnumeratorKey); if (rc != ERROR_SUCCESS) goto cleanup; } @@ -1121,7 +1143,7 @@ if (Flags & DIGCF_ALLCLASSES) { - rc = SETUP_CreateDevList(list, MachineName, pClassGuid, Enumerator); + rc = SETUP_CreateDevicesList(list, MachineName, pClassGuid, Enumerator); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -1147,7 +1169,7 @@ } else { - rc = SETUP_CreateDevList(list, MachineName, ClassGuid, Enumerator); + rc = SETUP_CreateDevicesList(list, MachineName, ClassGuid, Enumerator); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -1166,7 +1188,7 @@ * SetupDiGetClassImageIndex (SETUPAPI.@) */ static BOOL -GetIconIndex( +SETUP_GetIconIndex( IN HKEY hClassKey, OUT PINT ImageIndex) { @@ -1240,7 +1262,7 @@ hKey = SetupDiOpenClassRegKeyExW(ClassGuid, KEY_QUERY_VALUE, DIOCR_INTERFACE, list->MachineName, NULL); if (hKey == INVALID_HANDLE_VALUE) goto cleanup; - if (!GetIconIndex(hKey, &iconIndex)) + if (!SETUP_GetIconIndex(hKey, &iconIndex)) goto cleanup; if (iconIndex >= 0) @@ -1292,8 +1314,7 @@ ret = SetupDiGetClassImageListExW(ClassImageListData, MachineNameW, Reserved); - if (MachineNameW) - MyFree(MachineNameW); + MyFree(MachineNameW); return ret; } @@ -1379,7 +1400,7 @@ if (hKey == INVALID_HANDLE_VALUE) goto cleanup; - if (!GetIconIndex(hKey, &iconIndex)) + if (!SETUP_GetIconIndex(hKey, &iconIndex)) goto cleanup; if (iconIndex > 0) @@ -1534,7 +1555,7 @@ * Helper function for SetupDiInstallClassExW */ static HKEY -CreateClassKey(HINF hInf) +SETUP_CreateClassKey(HINF hInf) { WCHAR FullBuffer[MAX_PATH]; WCHAR Buffer[MAX_PATH]; @@ -1698,7 +1719,7 @@ else { /* Create or open the class registry key 'HKLM\CurrentControlSet\Class\{GUID}' */ - hRootKey = CreateClassKey(hInf); + hRootKey = SETUP_CreateClassKey(hInf); if (hRootKey == INVALID_HANDLE_VALUE) goto cleanup; @@ -1788,7 +1809,8 @@ PWSTR MachineNameW = NULL; HKEY hKey; - TRACE("\n"); + TRACE("%s 0x%lx 0x%lx %s %p\n", debugstr_guid(ClassGuid), samDesired, + Flags, debugstr_a(MachineName), Reserved); if (MachineName) { @@ -1800,8 +1822,7 @@ hKey = SetupDiOpenClassRegKeyExW(ClassGuid, samDesired, Flags, MachineNameW, Reserved); - if (MachineNameW) - MyFree(MachineNameW); + MyFree(MachineNameW); return hKey; } @@ -1836,7 +1857,7 @@ lpKeyName = REGSTR_PATH_DEVICE_CLASSES; else { - ERR("Invalid Flags parameter!\n"); + TRACE("Unknown flags: 0x%lx\n", Flags); SetLastError(ERROR_INVALID_FLAGS); goto cleanup; } @@ -1858,7 +1879,8 @@ 0, ClassGuid ? 0 : samDesired, &hClassesKey); - if (MachineName != NULL) RegCloseKey(HKLM); + if (MachineName != NULL) + RegCloseKey(HKLM); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -1933,7 +1955,7 @@ * Helper functions for SetupDiSetClassInstallParamsW */ static BOOL -PropertyChangeHandler( +SETUP_PropertyChangeHandler( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, @@ -2108,7 +2130,7 @@ }; static BOOL WINAPI -GetClassDevPropertySheetsCallback( +SETUP_GetClassDevPropertySheetsCallback( IN HPROPSHEETPAGE hPropSheetPage, IN OUT LPARAM lParam) { @@ -2230,7 +2252,7 @@ PropPageData.PropertySheetPages = &PropertySheetHeader->phpage[PropertySheetHeader->nPages]; PropPageData.MaximumNumberOfPages = PropertySheetHeaderPageListSize - PropertySheetHeader->nPages; PropPageData.NumberOfPages = 0; - ret = pPropPageProvider(&Request, GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); + ret = pPropPageProvider(&Request, SETUP_GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); if (!ret) goto cleanup;

1 0

[fireball] 22298: [FORMATTING] Very small cleanup, formatting and typecasting change
by fireball＠svn.reactos.org 10 Jun '06

10 Jun '06

Author: fireball Date: Sun Jun 11 00:41:54 2006 New Revision: 22298 URL: http://svn.reactos.ru/svn/reactos?rev=22298&view=rev Log: [FORMATTING] Very small cleanup, formatting and typecasting change Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=22298&r1=… ============================================================================== --- trunk/reactos/hal/hal/hal.c (original) +++ trunk/reactos/hal/hal/hal.c Sun Jun 11 00:41:54 2006 @@ -1051,28 +1051,20 @@ UNIMPLEMENTED; } -/* - * @unimplemented - */ KIRQL FASTCALL KeAcquireQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) { - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ + UNIMPLEMENTED; + return (KIRQL)0; +} + VOID FASTCALL KeReleaseQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle, IN KIRQL OldIrql) { - UNIMPLEMENTED; -} - - + UNIMPLEMENTED; +} /* EOF */

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