Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[hpoussin] 18448: Big Plug-and-Play patch for ReactOS:
by hpoussin＠svn.reactos.com 14 Oct '05

14 Oct '05

Big Plug-and-Play patch for ReactOS: - Install drivers for devices at first boot - Remove now useless entries in hivesys.inf At the moment, driver installation only uses .inf files in ReactOS\Inf directory, and the needed files have to be in ReactOS\Inf or their final location (ReactOS\system32 or ReactOS\system32\drivers) + the user can't provide a custom driver Plug-and-Plays devices are only USB controllers (OHCI and UHCI) and serial ports now. Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-10-14 18:14:19 UTC (rev 18447) +++ trunk/reactos/bootdata/hivesys.inf 2005-10-14 18:24:19 UTC (rev 18448) @@ -594,47 +594,6 @@ HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","ClassGUID",0x0000000 0,"{4D36E966-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","ParentIdPrefix",0x00 00000,"0000" -;USB UHCI Driver -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010 001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x0 0000003 -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Ba se" -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000 ,"System32\DRIVERS\usbuhci.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Tag",0x00010001,0x000 0000f -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","DisplayName",0x000000 00,"ReactOS USB UHCI controller miniport driver" -;hard coded values for VMWARE -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","0",0x00000000,"P CI\VEN_8086&DEV_7112&SUBSYS_197615AD&REV_00\0000" -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","Count",0x0001000 1,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","NextInstance",0x 00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_8086&DEV_7112&SUBSYS_197615 AD&REV_00\0000","Service",0x0000000,"usbuhci" -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_8086&DEV_7112&SUBSYS_197615 AD&REV_00\0000","ParentIdPrefix",0x0000000,"0000" - -;USB OHCI Driver (Cromwell), especially the same name as windows OHCI miniport -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ErrorControl",0x00010 001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Start",0x00010001,0x0 0000003 -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Group",0x00000000,"Ba se" -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ImagePath",0x00020000 ,"System32\drivers\usbohci.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Tag",0x00010001,0x000 0000f -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","DisplayName",0x000000 00,"ReactOS USB OHCI cromwell-type driver" -;hard coded values for Virtual PC 6/7 (Mac) -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci\Enum","0",0x00000000,"P CI\VEN_2955&DEV_6E61&SUBSYS_6E612955&REV_11\0000" -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci\Enum","Count",0x0001000 1,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci\Enum","NextInstance",0x 00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_2955&DEV_6E61&SUBSYS_6E6129 55&REV_11\0000","Service",0x0000000,"usbohci" - -;USB Hub driver -HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Type",0x00010001,0x000 00001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","ErrorControl",0x000100 01,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Start",0x00010001,0x00 000003 -HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Group",0x00000000,"Bas e" -HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","ImagePath",0x00020000, "System32\drivers\usbhub.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Tag",0x00010001,0x0000 0011 -HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","DisplayName",0x0000000 0,"ReactOS USB HUB cromwell-type driver" -;hard coded values -HKLM,"SYSTEM\CurrentControlSet\Enum\USB\ROOT_HUB\0000","Service",0x0000 000,"usbhub" -HKLM,"SYSTEM\CurrentControlSet\Enum\USB\ROOT_HUB20\0000","Service",0x00 00000,"usbhub" - ; ReactOS PCNet NIC driver ; To use the AMD supplied driver change the driver name to pcntn5m.sys ; @@ -699,23 +658,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Null","Start",0x00010001,0x00000 001 HKLM,"SYSTEM\CurrentControlSet\Services\Null","Type",0x00010001,0x000000 01 -; Serial device driver -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","ClassGUID",0x00000 000,"{4D36E978-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","Service",0x0000000 0,"serial" -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","UpperFilters",0x00 010000,"serenum" -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","ClassGUID",0x00000 000,"{4D36E978-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","Service",0x0000000 0,"serial" -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","UpperFilters",0x00 010000,"serenum" - ; Packet driver HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x0001000 1,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Group",0x00000000,"PNP_ TDI" HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ImagePath",0x00020000," system32\drivers\packet.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Start",0x00010001,0x000 00004 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x0000 0001 -; NOTE: These settings should be added by the network setup -HKLM,"SYSTEM\CurrentControlSet\Services\Packet\Linkage","Bind",0x000100 00,"\Device\Ne20001" -HKLM,"SYSTEM\CurrentControlSet\Services\Packet\Linkage","Export",0x0001 0000,"\Device\packet" ; Plug and Play manager HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ErrorControl",0x00010 001,0x00000000 @@ -737,16 +685,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Start",0x00010001,0x0 0000000 HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Type",0x00010001,0x00 000001 -; Serial mouse driver -HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","ErrorControl",0x0001 0001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Group",0x00000000,"P ointer Port" -HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","ImagePath",0x0002000 0,"system32\drivers\sermouse.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Start",0x00010001,0x 00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Type",0x00010001,0x0 0000001 -;hard coded values for some serial mice -HKLM,"SYSTEM\CurrentControlSet\Enum\Serenum\Mouse\0000","Service",0x000 0000,"sermouse" -HKLM,"SYSTEM\CurrentControlSet\Enum\Serenum\Mouse\0000","ClassGUID",0x0 000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" - ; TCP/IP driver HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ErrorControl",0x00010001 ,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Group",0x00000000,"PNP_T DI" _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-10-14 18:14:19 UTC (rev 18447) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-10-14 18:24:19 UTC (rev 18448) @@ -529,6 +529,9 @@ break; } } + if (!NT_SUCCESS(Status)) + /* Try to load it. It may just have been installed by PnP manager */ + Status = LdrLoadModule(&ServiceImagePath, ModuleObject); } /* _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-10-14 18:14:19 UTC (rev 18447) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-10-14 18:24:19 UTC (rev 18448) @@ -22,6 +22,7 @@ * FILE: services/umpnpmgr/umpnpmgr.c * PURPOSE: User-mode Plug and Play manager * PROGRAMMER: Eric Kohl + * HervÚ Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -874,7 +875,52 @@ return ret; } +typedef BOOL (*PDEV_INSTALL_W)(HWND, HINSTANCE, LPCWSTR, INT); +static BOOL +InstallDevice(PCWSTR DeviceInstance) +{ + PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; + HMODULE hNewDev = NULL; + PDEV_INSTALL_W DevInstallW; + NTSTATUS Status; + BOOL DeviceInstalled = FALSE; + + RtlInitUnicodeString(&PlugPlayData.DeviceInstance, + DeviceInstance); + PlugPlayData.Operation = 0; /* Get status */ + + /* Get device status */ + Status = NtPlugPlayControl(PlugPlayControlDeviceStatus, + (PVOID)&PlugPlayData, + sizeof(PLUGPLAY_CONTROL_STATUS_DATA)); + if (!NT_SUCCESS(Status)) + return FALSE; + + if (PlugPlayData.DeviceStatus & DNF_STARTED || PlugPlayData.DeviceStatus & DNF_START_FAILED) + /* Device is already started, or disabled due to some problem. Don't install it */ + return TRUE; + + /* Install device */ + SetEnvironmentVariable(L"USERPROFILE", L"."); /* FIXME: why is it needed? */ + hNewDev = LoadLibraryW(L"newdev.dll"); + if (!hNewDev) + goto cleanup; + DevInstallW = (PDEV_INSTALL_W)GetProcAddress(hNewDev, (LPCSTR)"DevInstallW"); + if (!DevInstallW) + goto cleanup; + if (!DevInstallW(NULL, NULL, DeviceInstance, SW_SHOWNOACTIVATE)) + goto cleanup; + + DeviceInstalled = TRUE; + +cleanup: + if (hNewDev != NULL) + FreeLibrary(hNewDev); + + return DeviceInstalled; +} + static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { @@ -915,6 +961,7 @@ if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) { DPRINT("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); + InstallDevice(PnpEvent->TargetDevice.DeviceIds); } else {

1 0

[hpoussin] 18447: Step 2 for a PnP ReactOS: add some (little) hacks
by hpoussin＠svn.reactos.com 14 Oct '05

14 Oct '05

Step 2 for a PnP ReactOS: add some (little) hacks Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/ntoskrnl/io/driver.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-10-14 18:09:17 UTC (rev 18446) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-10-14 18:14:19 UTC (rev 18447) @@ -262,12 +262,14 @@ { SC_HANDLE hService = NULL; DWORD dwError; + HKEY hEnumKey, hKey; DPRINT1("CreateServiceW() called\n"); HandleBind(); /* Call to services.exe using RPC */ +#if 0 dwError = ScmrCreateServiceW(BindingHandle, (unsigned int)hSCManager, (LPWSTR)lpServiceName, @@ -285,6 +287,19 @@ NULL, /* FIXME: lpPassword */ 0, /* FIXME: dwPasswordLength */ (unsigned int *)&hService); +#else + RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services", 0, KEY_ENUMERATE_SUB_KEYS, &hEnumKey); + RegCreateKeyExW(hEnumKey, lpServiceName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL); + RegCloseKey(hEnumKey); + if (lpLoadOrderGroup) + RegSetValueExW(hKey, L"Group", 0, REG_SZ, (const BYTE*)lpLoadOrderGroup, (wcslen(lpLoadOrderGroup) + 1) * sizeof(WCHAR)); + RegSetValueExW(hKey, L"ImagePath", 0, REG_EXPAND_SZ, (const BYTE*)lpBinaryPathName, (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); + RegSetValueExW(hKey, L"ErrorControl", 0, REG_DWORD, (const BYTE*)&dwErrorControl, sizeof(dwErrorControl)); + RegSetValueExW(hKey, L"Start", 0, REG_DWORD, (const BYTE*)&dwStartType, sizeof(dwStartType)); + RegSetValueExW(hKey, L"Type", 0, REG_DWORD, (const BYTE*)&dwStartType, sizeof(dwStartType)); + RegCloseKey(hKey); + hService = INVALID_HANDLE_VALUE; dwError = ERROR_SUCCESS; +#endif if (dwError != ERROR_SUCCESS) { DPRINT1("ScmrCreateServiceW() failed (Error %lu)\n", dwError); _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-10-14 18:09:17 UTC (rev 18446) +++ trunk/reactos/lib/setupapi/install.c 2005-10-14 18:14:19 UTC (rev 18447) @@ -1104,7 +1104,12 @@ ServiceType, StartType, ErrorControl, - ServiceBinary, + /* BIG HACK!!! As GetLineText() give us a full path, ignore the + * first letters which should be the OS directory. If that's not + * the case, the file name written to registry will be bad and + * the driver will not load... + */ + ServiceBinary + GetWindowsDirectoryW(NULL, 0), LoadOrderGroup, NULL, Dependencies, @@ -1119,7 +1124,7 @@ CloseServiceHandle(hSCManager); return FALSE; } - CloseServiceHandle(hService); + //CloseServiceHandle(hService); return CloseServiceHandle(hSCManager); } _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-10-14 18:09:17 UTC (rev 18446) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-10-14 18:14:19 UTC (rev 18447) @@ -465,7 +465,7 @@ return Status; } - IopDisplayLoadingMessage(ServiceName->Buffer, TRUE); + //IopDisplayLoadingMessage(ServiceName->Buffer, TRUE); /* * Normalize the image path for all later processing.

1 0

[hpoussin] 18446: Process AddReg directive in main section to install
by hpoussin＠svn.reactos.com 14 Oct '05

14 Oct '05

Process AddReg directive in main section to install Simplify a call to SetupInstallFromInfSectionW Fix a warning (thanks w3seek) Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-14 18:00:39 UTC (rev 18445) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-14 18:09:17 UTC (rev 18446) @@ -2936,7 +2936,7 @@ { LIST_ENTRY ClassCoInstallersListHead; LIST_ENTRY DeviceCoInstallersListHead; - HMODULE ClassInstallerLibrary; + HMODULE ClassInstallerLibrary = NULL; CLASS_INSTALL_PROC ClassInstaller = NULL; COINSTALLER_CONTEXT_DATA Context; PLIST_ENTRY ListEntry; @@ -4828,7 +4828,6 @@ HKEY hClassKey = INVALID_HANDLE_VALUE; LONG rc; HWND hWnd; - PVOID callback_context; BOOL ret = FALSE; /* Return value */ TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); @@ -4916,6 +4915,17 @@ if (hKey == INVALID_HANDLE_VALUE) goto cleanup; + /* Install main section */ + /* Files have already been copied in SetupDiInstallDriverFiles. + * Process only registry entries. */ + *pSectionName = '\0'; + Result = SetupInstallFromInfSectionW(hWnd, hInf, SectionName, + SPINST_REGISTRY, hKey, NULL, 0, + SetupDefaultQueueCallbackW, NULL, + NULL, NULL); + if (!Result) + goto cleanup; + /* Write information to driver key */ *pSectionName = UNICODE_NULL; TRACE("Write information to driver key\n"); @@ -5048,12 +5058,10 @@ /* Install .HW section */ wcscpy(pSectionName, L".HW"); - callback_context = SetupInitDefaultQueueCallback(hWnd); Result = SetupInstallFromInfSectionW(hWnd, hInf, SectionName, SPINST_REGISTRY, hKey, NULL, 0, - SetupDefaultQueueCallbackW, callback_context, + SetupDefaultQueueCallbackW, NULL, NULL, NULL); - SetupTermDefaultQueueCallback(callback_context); if (!Result) goto cleanup;

1 0

[hpoussin] 18445: Transform ReactOS to a Plug-and-Play system. Step 1: add some .inf files
by hpoussin＠svn.reactos.com 14 Oct '05

14 Oct '05

Transform ReactOS to a Plug-and-Play system. Step 1: add some .inf files Added: trunk/reactos/media/inf/acpi.inf Modified: trunk/reactos/media/inf/inf.xml Added: trunk/reactos/media/inf/machine.inf Added: trunk/reactos/media/inf/netamd.inf Added: trunk/reactos/media/inf/netisa.inf Modified: trunk/reactos/media/inf/syssetup.inf Added: trunk/reactos/media/inf/usbstor.inf _____ Added: trunk/reactos/media/inf/acpi.inf --- trunk/reactos/media/inf/acpi.inf 2005-10-14 16:53:18 UTC (rev 18444) +++ trunk/reactos/media/inf/acpi.inf 2005-10-14 18:00:39 UTC (rev 18445) @@ -0,0 +1,47 @@ +; ACPI.INF + +; Installation file for ACPI driver + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = System +ClassGUID = {4D36E97D-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 10/11/2005,1.01.0.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +%*PNP0C08.DeviceDesc% = ACPI_Inst,*PNP0C08 + +;------------------------------ ACPI DRIVER ----------------------------- + +[ACPI_Inst.NT] +CopyFiles = ACPI_CopyFiles.NT + +[ACPI_CopyFiles.NT] +acpi.sys + +[ACPI_Inst.NT.Services] +AddService = acpi, 0x00000002, acpi_Service_Inst + +[acpi_Service_Inst] +ServiceType = 1 +StartType = 0 +ErrorControl = 1 +ServiceBinary = %12%\acpi.sys +LoadOrderGroup = Boot Bus Extender + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" + +GenericMfg = "(Generic system devices)" +*PNP0C08.DeviceDesc = "ACPI hardware" \ No newline at end of file _____ Modified: trunk/reactos/media/inf/inf.xml --- trunk/reactos/media/inf/inf.xml 2005-10-14 16:53:18 UTC (rev 18444) +++ trunk/reactos/media/inf/inf.xml 2005-10-14 18:00:39 UTC (rev 18445) @@ -1,8 +1,15 @@ +<group> +<installfile base="inf">acpi.inf</installfile> <installfile base="inf">cdrom.inf</installfile> <installfile base="inf">layout.inf</installfile> +<installfile base="inf">machine.inf</installfile> <installfile base="inf">mouse.inf</installfile> <installfile base="inf">NET_NIC.inf</installfile> +<installfile base="inf">netamd.inf</installfile> +<installfile base="inf">netisa.inf</installfile> <installfile base="inf">ports.inf</installfile> <installfile base="inf">scsi.inf</installfile> <installfile base="inf">syssetup.inf</installfile> -<installfile base="inf">usbport.inf</installfile> \ No newline at end of file +<installfile base="inf">usbport.inf</installfile> +<installfile base="inf">usbstor.inf</installfile> +<group> \ No newline at end of file _____ Added: trunk/reactos/media/inf/machine.inf --- trunk/reactos/media/inf/machine.inf 2005-10-14 16:53:18 UTC (rev 18444) +++ trunk/reactos/media/inf/machine.inf 2005-10-14 18:00:39 UTC (rev 18445) @@ -0,0 +1,57 @@ +; MACHINE.INF + +; Installation file for machine internal stuff + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = System +ClassGUID = {4D36E97D-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 10/11/2005,1.01.0.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[ClassInstall32.NT] +AddReg = SystemClass.NT.AddReg + +[SystemClass.NT.AddReg] +HKR, , , 0, %SystemClassName% +HKR, , Icon, 0, "-27" + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +%*PNP0A03.DeviceDesc% = PCI_Inst,*PNP0A03 +%PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604 + +;---------------------------- PCI BUS DRIVER ---------------------------- + +[PCI_Inst.NT] +CopyFiles = PCI_CopyFiles.NT + +[PCI_CopyFiles.NT] +pci.sys + +[PCI_Inst.NT.Services] +AddService = pci, 0x00000002, pci_Service_Inst + +[pci_Service_Inst] +ServiceType = 1 +StartType = 0 +ErrorControl = 3 +ServiceBinary = %12%\pci.sys +LoadOrderGroup = Boot Bus Extender + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" +SystemClassName = "System devices" + +GenericMfg = "(Generic system devices)" +*PNP0A03.DeviceDesc = "PCI bus" +PCI\CC_0604.DeviceDesc = "Standard PCI to PCI bridge" \ No newline at end of file _____ Added: trunk/reactos/media/inf/netamd.inf --- trunk/reactos/media/inf/netamd.inf 2005-10-14 16:53:18 UTC (rev 18444) +++ trunk/reactos/media/inf/netamd.inf 2005-10-14 18:00:39 UTC (rev 18445) @@ -0,0 +1,61 @@ +; NETAMD.INF + +; Installation file for PCI network cards with VendorID=1022 (AMD) + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Net +ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 10/08/2005,1.01.0.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%AMDMfg% = AMDMfg + +[AMDMfg] +%PCNET.DeviceDesc% = PCNet_Inst,PCI\VEN_1022&DEV_2000 + +;----------------------------- PCNET DRIVER ----------------------------- + +[PCNet_Inst.NT] +AddReg = PCNet_AddReg.NT +CopyFiles = PCNet_CopyFiles.NT + +[PCNet_AddReg.NT] +HKR,,BUS_TO_SCAN,,"ALL" +HKR,,BUSTIMER,,"0" +HKR,,BUSTYPE,,"5" +HKR,,EXTPHY,,"0" +HKR,,FDUP,,"0" +HKR,,LED0,,"10000" +HKR,,LED1,,"10000" +HKR,,LED2,,"10000" +HKR,,LED3,,"10000" +HKR,,MPMODE,,"0" +HKR,,TP,,"1" + +[PCNet_CopyFiles.NT] +pcnet.sys + +[PCNet_Inst.NT.Services] +AddService = PCNet, 0x00000002, PCNet_Service_Inst + +[PCNet_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 0 +ServiceBinary = %12%\pcnet.sys +LoadOrderGroup = NDIS + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" + +AMDMfg = "Advanced Micro Devices (AMD)" +PCNET.DeviceDesc = "AMD 79c970 [PCnet32 LANCE]" _____ Added: trunk/reactos/media/inf/netisa.inf --- trunk/reactos/media/inf/netisa.inf 2005-10-14 16:53:18 UTC (rev 18444) +++ trunk/reactos/media/inf/netisa.inf 2005-10-14 18:00:39 UTC (rev 18445) @@ -0,0 +1,53 @@ +; NETISA.INF + +; Installation file for ISA network cards + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Net +ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 10/08/2005,1.01.0.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +%*PNP80D6.DeviceDesc% = NE2000_Inst,*PNP80D6 + +;---------------------------- NE2000 DRIVER ----------------------------- + +[NE2000_Inst.NT] +AddReg = NE2000_AddReg.NT +CopyFiles = NE2000_CopyFiles.NT + +[NE2000_AddReg.NT] +HKR,,Port,0x00000000,"c100" +HKR,,Irq,0x00000000,"B" +HKR,,NetworkAddress,0x00000000,"001122334455" + +[NE2000_CopyFiles.NT] +ne2000.sys + +[NE2000_Inst.NT.Services] +AddService = ne2000, 0x00000002, ne2000_Service_Inst + +[ne2000_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\ne2000.sys +LoadOrderGroup = NDIS + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" + +GenericMfg = "(Generic network cards)" +*PNP80D6.DeviceDesc = "NE2000 Compatible" _____ Modified: trunk/reactos/media/inf/syssetup.inf --- trunk/reactos/media/inf/syssetup.inf 2005-10-14 16:53:18 UTC (rev 18444) +++ trunk/reactos/media/inf/syssetup.inf 2005-10-14 18:00:39 UTC (rev 18445) @@ -15,6 +15,7 @@ ; MS uses netnovel.inf as class-installer INF for NICs ; we use a separate one to keep things clean cdrom.inf +machine.inf mouse.inf NET_NIC.inf ports.inf _____ Added: trunk/reactos/media/inf/usbstor.inf --- trunk/reactos/media/inf/usbstor.inf 2005-10-14 16:53:18 UTC (rev 18444) +++ trunk/reactos/media/inf/usbstor.inf 2005-10-14 18:00:39 UTC (rev 18445) @@ -0,0 +1,46 @@ +; USBSTOR.INF + +; Installation file for USB storage devices + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = USB +ClassGUID = {36FC9E60-C465-11CF-8056-444553540000} +Provider = %ReactOS% +DriverVer = 10/02/2005,1.01.0.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +%GenericBulkOnlyTransport.DeviceDesc% = USBBulkOnly_Inst,USB\Class_08&SubClass_06&Prot_50 + +;-------------------------- USB STORAGE DRIVER -------------------------- + +[USBBulkOnly_Inst.NT] +CopyFiles = USBBulkOnly_CopyFiles.NT + +[USBBulkOnly_CopyFiles.NT] +usbstor.sys + +[USBBulkOnly_Inst.NT.Services] +AddService = usbstor, 0x00000002, usbstor_Service_Inst + +[usbstor_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\usbstor.sys + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" + +GenericMfg = "(Generic USB devices)" +GenericBulkOnlyTransport.DeviceDesc = "USB Storage device" \ No newline at end of file

1 0

[hpoussin] 18444: Implement SetupDiCreateDevRegKeyW and SetupDiOpenDevRegKey
by hpoussin＠svn.reactos.com 14 Oct '05

14 Oct '05

Implement SetupDiCreateDevRegKeyW and SetupDiOpenDevRegKey Use them in SetupDiInstallDevice Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-14 13:39:27 UTC (rev 18443) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-14 16:53:18 UTC (rev 18444) @@ -3173,6 +3173,156 @@ } /*********************************************************************** + * SetupDiCreateDevRegKey (SETUPAPI.@) + */ +HKEY WINAPI SetupDiCreateDevRegKeyW( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + IN DWORD Scope, + IN DWORD HwProfile, + IN DWORD KeyType, + IN HINF InfHandle OPTIONAL, + IN PCWSTR InfSectionName OPTIONAL) +{ + struct DeviceInfoSet *list; + HKEY ret = INVALID_HANDLE_VALUE; + + TRACE("%p %p %lu %lu %lu %p %s\n", DeviceInfoSet, DeviceInfoData, + Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) + SetLastError(ERROR_INVALID_PARAMETER); + else if (KeyType != DIREG_DEV && KeyType != DIREG_DRV) + SetLastError(ERROR_INVALID_PARAMETER); + else if (InfHandle && !InfSectionName) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!InfHandle && InfSectionName) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + LPWSTR lpGuidString = NULL; + LPWSTR DriverKey = NULL; /* {GUID}\Index */ + LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ + DWORD Index; /* Index used in the DriverKey name */ + DWORD rc; + HKEY hClassKey = INVALID_HANDLE_VALUE; + HKEY hDeviceKey = INVALID_HANDLE_VALUE; + HKEY hKey = INVALID_HANDLE_VALUE; + + if (Scope == DICS_FLAG_CONFIGSPECIFIC) + { + FIXME("DICS_FLAG_CONFIGSPECIFIC case unimplemented\n"); + goto cleanup; + } + + if (KeyType == DIREG_DEV) + { + FIXME("DIREG_DEV case unimplemented\n"); + } + else /* KeyType == DIREG_DRV */ + { + if (UuidToStringW((UUID*)&DeviceInfoData->ClassGuid, &lpGuidString) != RPC_S_OK) + goto cleanup; + /* The driver key is in HKLM\System\CurrentControlSet\Control\Class\{GUID}\Index */ + DriverKey = HeapAlloc(GetProcessHeap(), 0, (wcslen(lpGuidString) + 7) * sizeof(WCHAR) + sizeof(UNICODE_STRING)); + if (!DriverKey) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + wcscpy(DriverKey, L"{"); + wcscat(DriverKey, lpGuidString); + wcscat(DriverKey, L"}\\"); + pDeviceInstance = &DriverKey[wcslen(DriverKey)]; + rc = RegOpenKeyExW(list->HKLM, + ControlClass, + 0, + KEY_CREATE_SUB_KEY, + &hClassKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + + /* Try all values for Index between 0 and 9999 */ + Index = 0; + while (Index <= 9999) + { + DWORD Disposition; + wsprintf(pDeviceInstance, L"%04lu", Index); + rc = RegCreateKeyEx(hClassKey, + DriverKey, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ | KEY_WRITE, + NULL, + &hKey, + &Disposition); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + if (Disposition == REG_CREATED_NEW_KEY) + break; + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; + Index++; + } + if (Index > 9999) + { + /* Unable to create more than 9999 devices within the same class */ + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + /* Open device key, to write Driver value */ + hDeviceKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, Scope, HwProfile, DIREG_DEV, KEY_SET_VALUE); + if (hDeviceKey == INVALID_HANDLE_VALUE) + goto cleanup; + rc = RegSetValueEx(hDeviceKey, L"Driver", 0, REG_SZ, (const BYTE *)DriverKey, (wcslen(DriverKey) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + } + + /* Do installation of the specified section */ + if (InfHandle) + { + FIXME("Need to install section %s in file %p\n", + debugstr_w(InfSectionName), InfHandle); + } + ret = hKey; + +cleanup: + if (lpGuidString) + RpcStringFreeW(&lpGuidString); + HeapFree(GetProcessHeap(), 0, DriverKey); + if (hClassKey != INVALID_HANDLE_VALUE) + RegCloseKey(hClassKey); + if (hDeviceKey != INVALID_HANDLE_VALUE) + RegCloseKey(hDeviceKey); + if (hKey != INVALID_HANDLE_VALUE && hKey != ret) + RegCloseKey(hKey); + } + + TRACE("Returning 0x%p\n", ret); + return ret; +} + +/********************************************************************** * * SetupDiOpenDevRegKey (SETUPAPI.@) */ HKEY WINAPI SetupDiOpenDevRegKey( @@ -3183,9 +3333,130 @@ DWORD KeyType, REGSAM samDesired) { - FIXME("%p %p %ld %ld %ld %lx\n", DeviceInfoSet, DeviceInfoData, + struct DeviceInfoSet *list; + HKEY ret = INVALID_HANDLE_VALUE; + + TRACE("%p %p %lu %lu %lu 0x%lx\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, samDesired); - return INVALID_HANDLE_VALUE; + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) + SetLastError(ERROR_INVALID_PARAMETER); + else if (KeyType != DIREG_DEV && KeyType != DIREG_DRV) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + HKEY hKey = INVALID_HANDLE_VALUE; + HKEY hRootKey = INVALID_HANDLE_VALUE; + struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + LPWSTR DriverKey = NULL; + DWORD dwLength = 0; + DWORD dwRegType; + DWORD rc; + + if (Scope == DICS_FLAG_CONFIGSPECIFIC) + { + FIXME("DICS_FLAG_CONFIGSPECIFIC case unimplemented\n"); + } + else /* Scope == DICS_FLAG_GLOBAL */ + { + rc = RegOpenKeyExW( + list->HKLM, + EnumKeyName, + 0, /* Options */ + KEY_ENUMERATE_SUB_KEYS, + &hRootKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + rc = RegOpenKeyExW( + hRootKey, + deviceInfo->DeviceName, + 0, /* Options */ + KeyType == DIREG_DEV ? samDesired : KEY_QUERY_VALUE, + &hKey); + RegCloseKey(hRootKey); + hRootKey = INVALID_HANDLE_VALUE; + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + if (KeyType == DIREG_DEV) + { + /* We're done. Just return the hKey handle */ + ret = hKey; + goto cleanup; + } + /* Read the 'Driver' key */ + rc = RegQueryValueExW(hKey, L"Driver", NULL, &dwRegType, NULL, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + if (dwRegType != REG_SZ) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + DriverKey = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (!DriverKey) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + rc = RegQueryValueExW(hKey, L"Driver", NULL, &dwRegType, (LPBYTE)DriverKey, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; + /* Need to open the driver key */ + rc = RegOpenKeyExW( + list->HKLM, + ControlClass, + 0, /* Options */ + KEY_ENUMERATE_SUB_KEYS, + &hRootKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + rc = RegOpenKeyExW( + hRootKey, + DriverKey, + 0, /* Options */ + samDesired, + &hKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + ret = hKey; + } +cleanup: + if (hRootKey != INVALID_HANDLE_VALUE) + RegCloseKey(hRootKey); + if (hKey != INVALID_HANDLE_VALUE && hKey != ret) + RegCloseKey(hKey); + } + + TRACE("Returning 0x%p\n", ret); + return ret; } /*********************************************************************** @@ -4537,7 +4808,6 @@ IN PSP_DEVINFO_DATA DeviceInfoData) { struct DriverInfoElement *DriverInfo; - struct DeviceInfoSet *DevInfoSet = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; SYSTEMTIME DriverDate; WCHAR SectionName[MAX_PATH]; @@ -4554,11 +4824,8 @@ GUID ClassGuid; LPWSTR lpGuidString = NULL, lpFullGuidString = NULL; BOOL RebootRequired = FALSE; - HKEY hEnumKey, hKey = INVALID_HANDLE_VALUE; + HKEY hKey = INVALID_HANDLE_VALUE; HKEY hClassKey = INVALID_HANDLE_VALUE; - LPWSTR DriverKey = NULL; /* {GUID}\Index */ - LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ - DWORD Index; /* Index used in the DriverKey name */ LONG rc; HWND hWnd; PVOID callback_context; @@ -4642,59 +4909,12 @@ lpFullGuidString[RequiredSize + 1] = '}'; lpFullGuidString[RequiredSize + 2] = '\0'; - /* Create driver key information */ - /* The driver key is in HKLM\System\CurrentControlSet\Control\Class\{GUID}\{#ID} */ - DriverKey = HeapAlloc(GetProcessHeap(), 0, (wcslen(lpFullGuidString) + 6) * sizeof(WCHAR)); - if (!DriverKey) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + /* Open/Create driver key information */ + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_SET_VALUE); + if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + if (hKey == INVALID_HANDLE_VALUE) goto cleanup; - } - wcscpy(DriverKey, lpFullGuidString); - wcscat(DriverKey, L"\\"); - pDeviceInstance = &DriverKey[wcslen(DriverKey)]; - rc = RegOpenKeyExW(DevInfoSet->HKLM, - ControlClass, - 0, - KEY_CREATE_SUB_KEY, - &hClassKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - /* Try all values for Index between 0 and 9999 */ - Index = 0; - while (Index <= 9999) - { - DWORD Disposition; - wsprintf(pDeviceInstance, L"%04lu", Index); - rc = RegCreateKeyEx(hClassKey, - DriverKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_SET_VALUE, - NULL, - &hKey, - &Disposition); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - if (Disposition == REG_CREATED_NEW_KEY) - break; - RegCloseKey(hKey); - hKey = INVALID_HANDLE_VALUE; - Index++; - } - if (Index > 9999) - { - /* Unable to create more than 9999 devices within the same class */ - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; - } /* Write information to driver key */ *pSectionName = UNICODE_NULL; @@ -4821,29 +5041,10 @@ /* Copy .inf file to Inf\ directory */ FIXME("FIXME: Copy .inf file to Inf\\ directory\n"); /* SetupCopyOEMInf */ - /* Open enum key */ - rc = RegOpenKeyExW(DevInfoSet->HKLM, - EnumKeyName, - 0, - KEY_ENUMERATE_SUB_KEYS, - &hEnumKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - rc = RegOpenKeyExW( - hEnumKey, - DevInfo->DeviceName, - 0, /* Options */ - KEY_SET_VALUE, - &hKey); - RegCloseKey(hEnumKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } + /* Open device registry key */ + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_SET_VALUE); + if (hKey == INVALID_HANDLE_VALUE) + goto cleanup; /* Install .HW section */ wcscpy(pSectionName, L".HW"); @@ -4862,7 +5063,6 @@ TRACE("Class : '%S'\n", ClassName); TRACE("ClassGUID : '%S'\n", lpFullGuidString); TRACE("DeviceDesc : '%S'\n", DriverInfo->Info.Description); - TRACE("Driver : '%S'\n", DriverKey); TRACE("Mfg : '%S'\n", DriverInfo->Info.MfgName); rc = RegSetValueEx(hKey, L"Service", 0, REG_SZ, (const BYTE *)AssociatedService, (wcslen(AssociatedService) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) @@ -4872,8 +5072,6 @@ if (rc == ERROR_SUCCESS) rc = RegSetValueEx(hKey, L"DeviceDesc", 0, REG_SZ, (const BYTE *)DriverInfo->Info.Description, (wcslen(DriverInfo->Info.Description) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"Driver", 0, REG_SZ, (const BYTE *)DriverKey, (wcslen(DriverKey) + 1) * sizeof(WCHAR)); - if (rc == ERROR_SUCCESS) rc = RegSetValueEx(hKey, L"Mfg", 0, REG_SZ, (const BYTE *)DriverInfo->Info.MfgName, (wcslen(DriverInfo->Info.MfgName) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { @@ -4902,7 +5100,6 @@ if (lpGuidString) RpcStringFreeW(&lpGuidString); HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); - HeapFree(GetProcessHeap(), 0, DriverKey); HeapFree(GetProcessHeap(), 0, ClassName); HeapFree(GetProcessHeap(), 0, lpFullGuidString); if (hInf != INVALID_HANDLE_VALUE) _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-10-14 13:39:27 UTC (rev 18443) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-10-14 16:53:18 UTC (rev 18444) @@ -282,7 +282,7 @@ @ stdcall SetupDiClassNameFromGuidExW(ptr wstr long ptr wstr ptr) @ stdcall SetupDiClassNameFromGuidW(ptr wstr long ptr) @ stub SetupDiCreateDevRegKeyA -@ stub SetupDiCreateDevRegKeyW +@ stdcall SetupDiCreateDevRegKeyW(ptr ptr long long long ptr wstr) @ stdcall SetupDiCreateDeviceInfoA(ptr str ptr str ptr long ptr) @ stdcall SetupDiCreateDeviceInfoW(ptr wstr ptr wstr ptr long ptr) @ stdcall SetupDiCreateDeviceInfoList(ptr ptr)

1 0

[gvg] 18443: Fix tab/space mess
by gvg＠svn.reactos.com 14 Oct '05

14 Oct '05

Fix tab/space mess Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-10-14 13:04:11 UTC (rev 18442) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-10-14 13:39:27 UTC (rev 18443) @@ -1,6 +1,6 @@ /*********************************************************************** ***** - THIS SOFTWARE IS NOT COPYRIGHTED + THIS SOFTWARE IS NOT COPYRIGHTED HP offers the following for use in the public domain. HP makes no warranty with regard to the software or it's performance and the @@ -110,14 +110,14 @@ KD_PORT_INFORMATION GdbPortInfo = { 2, 115200, 0 }; /* FIXME hardcoded for COM2, 115200 baud */ /* Number of Registers. */ -#define NUMREGS 16 +#define NUMREGS 16 enum REGISTER_NAMES { EAX, ECX, EDX, EBX, ESP, EBP, ESI, EDI, - PC /* also known as eip */, - PS /* also known as eflags */, - CS, SS, DS, ES, FS, GS + PC /* also known as eip */, + PS /* also known as eflags */, + CS, SS, DS, ES, FS, GS }; typedef struct _CPU_REGISTER @@ -213,47 +213,36 @@ /* now, read until a # or end of Buffer is found */ while (Count < BUFMAX) - { - ch = GdbGetChar (); - if (ch == '$') - goto retry; - if (ch == '#') - break; - Checksum = Checksum + ch; - Buffer[Count] = ch; - Count = Count + 1; - } + { + ch = GdbGetChar (); + if (ch == '$') + goto retry; + if (ch == '#') + break; + Checksum = Checksum + ch; + Buffer[Count] = ch; + Count = Count + 1; + } Buffer[Count] = 0; if (ch == '#') - { - ch = GdbGetChar (); - XmitChecksum = (CHAR)(HexValue (ch) << 4); - ch = GdbGetChar (); - XmitChecksum += (CHAR)(HexValue (ch)); + { + ch = GdbGetChar (); + XmitChecksum = (CHAR)(HexValue (ch) << 4); + ch = GdbGetChar (); + XmitChecksum += (CHAR)(HexValue (ch)); - if (Checksum != XmitChecksum) - { - GdbPutChar ('-'); /* failed checksum */ - } - else - { - GdbPutChar ('+'); /* successful transfer */ + if (Checksum != XmitChecksum) + { + GdbPutChar ('-'); /* failed checksum */ + } + else + { + GdbPutChar ('+'); /* successful transfer */ -#if 0 - /* if a sequence char is present, reply the sequence ID */ - if (Buffer[2] == ':') - { - GdbPutChar (Buffer[0]); - GdbPutChar (Buffer[1]); - - return &Buffer[3]; - } -#endif - - return &Buffer[0]; - } - } + return &Buffer[0]; + } + } } } @@ -274,11 +263,11 @@ Count = 0; while ((ch = Buffer[Count])) - { - GdbPutChar (ch); - Checksum += ch; - Count += 1; - } + { + GdbPutChar (ch); + Checksum += ch; + Count += 1; + } GdbPutChar ('#'); GdbPutChar (HexChars[(Checksum >> 4) & 0xf]); @@ -301,11 +290,11 @@ Count = 0; while ((ch = Buffer[Count])) - { - GdbPutChar (ch); - Checksum += ch; - Count += 1; - } + { + GdbPutChar (ch); + Checksum += ch; + Count += 1; + } GdbPutChar ('#'); GdbPutChar (HexChars[(Checksum >> 4) & 0xf]); @@ -425,37 +414,33 @@ switch (ExceptionCode) { case STATUS_INTEGER_DIVIDE_BY_ZERO: - SigVal = 8; - break; /* divide by zero */ + SigVal = 8; /* divide by zero */ + break; case STATUS_SINGLE_STEP: - /* debug exception */ case STATUS_BREAKPOINT: - SigVal = 5; - break; /* breakpoint */ + SigVal = 5; /* breakpoint */ + break; case STATUS_INTEGER_OVERFLOW: - /* into instruction (overflow) */ case STATUS_ARRAY_BOUNDS_EXCEEDED: - SigVal = 16; - break; /* bound instruction */ + SigVal = 16; /* bound instruction */ + break; case STATUS_ILLEGAL_INSTRUCTION: - SigVal = 4; - break; /* Invalid opcode */ + SigVal = 4; /* Invalid opcode */ + break; #if 0 case STATUS_FLT_INVALID_OPERATION: SigVal = 8; - break; /* coprocessor not available */ + break; #endif case STATUS_STACK_OVERFLOW: - /* stack exception */ case STATUS_DATATYPE_MISALIGNMENT: - /* page fault */ case STATUS_ACCESS_VIOLATION: - SigVal = 11; /* access violation */ + SigVal = 11; /* access violation */ break; default: - SigVal = 7; /* "software generated" */ + SigVal = 7; /* "software generated" */ } - return (SigVal); + return SigVal; } @@ -476,12 +461,14 @@ { Hex = HexValue (**Address); if (Hex >= 0) - { - *Value = (*Value << 4) | Hex; - NumChars++; - } - else - break; + { + *Value = (*Value << 4) | Hex; + NumChars++; + } + else + { + break; + } (*Address)++; } @@ -631,7 +618,7 @@ ThreadId = (HANDLE)uThreadId; if (!NT_SUCCESS (PsLookupThreadByThreadId (ThreadId, &ThreadInfo))) - { + { *Thread = NULL; return FALSE; } @@ -650,7 +637,7 @@ switch (Request[0]) { case 'c': /* Run thread */ - if (GspFindThread (ptr, &ThreadInfo)) + if (GspFindThread(ptr, &ThreadInfo)) { GspOutBuffer[0] = 'O'; GspOutBuffer[1] = 'K'; @@ -672,18 +659,21 @@ break; case 'g': /* Debug thread */ if (GspFindThread (ptr, &ThreadInfo)) - { - GspOutBuffer[0] = 'O'; - GspOutBuffer[1] = 'K'; + { + GspOutBuffer[0] = 'O'; + GspOutBuffer[1] = 'K'; - if(GspDbgThread) ObDereferenceObject(GspDbgThread); + if (GspDbgThread) + { + ObDereferenceObject(GspDbgThread); + } - GspDbgThread = ThreadInfo; - } - else - { - GspOutBuffer[0] = 'E'; - } + GspDbgThread = ThreadInfo; + } + else + { + GspOutBuffer[0] = 'E'; + } break; default: break; @@ -905,96 +895,98 @@ "=r" (addr2), "=r" (addr3) : ); } while (FALSE); #elif defined(_MSC_VER) - __asm + __asm { - mov eax, dr7; mov dr7_, eax; - mov eax, dr0; mov addr0, eax; - mov eax, dr1; mov addr1, eax; - mov eax, dr2; mov addr2, eax; - mov eax, dr3; mov addr3, eax; + mov eax, dr7; mov dr7_, eax; + mov eax, dr0; mov addr0, eax; + mov eax, dr1; mov addr1, eax; + mov eax, dr2; mov addr2, eax; + mov eax, dr3; mov addr3, eax; } #else #error Unknown compiler for inline assembler #endif - CorrectIt = FALSE; - for (BreakpointNumber = 0; BreakpointNumber < 3; BreakpointNumber++) + CorrectIt = FALSE; + for (BreakpointNumber = 0; BreakpointNumber < 3; BreakpointNumber++) { - Bit = 2 << (BreakpointNumber << 1); - if (!(dr7_ & Bit) && GspBreakpoints[BreakpointNumber].Enabled) { - CorrectIt = TRUE; - dr7_ |= Bit; - dr7_ &= ~(0xf0000 << (BreakpointNumber << 2)); - dr7_ |= (((GspBreakpoints[BreakpointNumber].Length << 2) | - GspBreakpoints[BreakpointNumber].Type) << 16) << (BreakpointNumber << 2); - switch (BreakpointNumber) { + Bit = 2 << (BreakpointNumber << 1); + if (!(dr7_ & Bit) && GspBreakpoints[BreakpointNumber].Enabled) + { + CorrectIt = TRUE; + dr7_ |= Bit; + dr7_ &= ~(0xf0000 << (BreakpointNumber << 2)); + dr7_ |= (((GspBreakpoints[BreakpointNumber].Length << 2) | + GspBreakpoints[BreakpointNumber].Type) << 16) << (BreakpointNumber << 2); + switch (BreakpointNumber) + { #if defined(__GNUC__) - case 0: - asm volatile ("movl %0, %%dr0\n" - : : "r" (GspBreakpoints[BreakpointNumber].Address) ); - break; + case 0: + asm volatile ("movl %0, %%dr0\n" + : : "r" (GspBreakpoints[BreakpointNumber].Address) ); + break; - case 1: - asm volatile ("movl %0, %%dr1\n" - : : "r" (GspBreakpoints[BreakpointNumber].Address) ); - break; + case 1: + asm volatile ("movl %0, %%dr1\n" + : : "r" (GspBreakpoints[BreakpointNumber].Address) ); + break; - case 2: - asm volatile ("movl %0, %%dr2\n" - : : "r" (GspBreakpoints[BreakpointNumber].Address) ); - break; + case 2: + asm volatile ("movl %0, %%dr2\n" + : : "r" (GspBreakpoints[BreakpointNumber].Address) ); + break; - case 3: - asm volatile ("movl %0, %%dr3\n" - : : "r" (GspBreakpoints[BreakpointNumber].Address) ); - break; + case 3: + asm volatile ("movl %0, %%dr3\n" + : : "r" (GspBreakpoints[BreakpointNumber].Address) ); + break; #elif defined(_MSC_VER) - case 0: - { - ULONG addr = GspBreakpoints[BreakpointNumber].Address; - __asm mov eax, addr; - __asm mov dr0, eax; - } - break; - case 1: - { - ULONG addr = GspBreakpoints[BreakpointNumber].Address; - __asm mov eax, addr; - __asm mov dr1, eax; - } - break; - case 2: - { - ULONG addr = GspBreakpoints[BreakpointNumber].Address; - __asm mov eax, addr; - __asm mov dr2, eax; - } - break; - case 3: - { - ULONG addr = GspBreakpoints[BreakpointNumber].Address; - __asm mov eax, addr; - __asm mov dr3, eax; - } - break; + case 0: + { + ULONG addr = GspBreakpoints[BreakpointNumber].Address; + __asm mov eax, addr; + __asm mov dr0, eax; + } + break; + case 1: + { + ULONG addr = GspBreakpoints[BreakpointNumber].Address; + __asm mov eax, addr; + __asm mov dr1, eax; + } + break; + case 2: + { + ULONG addr = GspBreakpoints[BreakpointNumber].Address; + __asm mov eax, addr; + __asm mov dr2, eax; + } + break; + case 3: + { + ULONG addr = GspBreakpoints[BreakpointNumber].Address; + __asm mov eax, addr; + __asm mov dr3, eax; + } + break; #else #error Unknown compiler for inline assembler #endif - } + } + } + else if ((dr7_ & Bit) && !GspBreakpoints[BreakpointNumber].Enabled) + { + CorrectIt = TRUE; + dr7_ &= ~Bit; + dr7_ &= ~(0xf0000 << (BreakpointNumber << 2)); + } } - else if ((dr7_ & Bit) && !GspBreakpoints[BreakpointNumber].Enabled) - { - CorrectIt = TRUE; - dr7_ &= ~Bit; - dr7_ &= ~(0xf0000 << (BreakpointNumber << 2)); - } - } if (CorrectIt) { #if defined(__GNUC__) - asm volatile ( "movl %0, %%db7\n" : : "r" (dr7_)); + asm volatile ( "movl %0, %%db7\n" : : "r" (dr7_)); #elif defined(_MSC_VER) - __asm mov eax, dr7_; - __asm mov dr7, eax; + __asm mov eax, dr7_; + __asm mov dr7, eax; #else #error Unknown compiler for inline assembler #endif @@ -1004,12 +996,12 @@ ULONG GspRemoveHwBreakpoint(ULONG BreakpointNumber) { - if (!GspBreakpoints[BreakpointNumber].Enabled) + if (!GspBreakpoints[BreakpointNumber].Enabled) { - return -1; - } - GspBreakpoints[BreakpointNumber].Enabled = 0; - return 0; + return -1; + } + GspBreakpoints[BreakpointNumber].Enabled = 0; + return 0; } @@ -1019,15 +1011,15 @@ ULONG Length, ULONG Address) { - if (GspBreakpoints[BreakpointNumber].Enabled) - { - return -1; - } - GspBreakpoints[BreakpointNumber].Enabled = TRUE; - GspBreakpoints[BreakpointNumber].Type = Type; - GspBreakpoints[BreakpointNumber].Length = Length; - GspBreakpoints[BreakpointNumber].Address = Address; - return 0; + if (GspBreakpoints[BreakpointNumber].Enabled) + { + return -1; + } + GspBreakpoints[BreakpointNumber].Enabled = TRUE; + GspBreakpoints[BreakpointNumber].Type = Type; + GspBreakpoints[BreakpointNumber].Length = Length; + GspBreakpoints[BreakpointNumber].Address = Address; + return 0; } @@ -1080,42 +1072,45 @@ /* ugly hack to avoid attempting to send status at the very * beginning, right when GDB is trying to query the stub */ - if (gdb_attached_yet) { - LONG Esp; - - stop_reply: - /* reply to host that an exception has occurred */ - SigVal = GspComputeSignal (ExceptionRecord->ExceptionCode); - - ptr = &GspOutBuffer[0]; + if (gdb_attached_yet) + { + LONG Esp; + + stop_reply: + /* reply to host that an exception has occurred */ + SigVal = GspComputeSignal (ExceptionRecord->ExceptionCode); - *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ - *ptr++ = HexChars[(SigVal >> 4) & 0xf]; - *ptr++ = HexChars[SigVal & 0xf]; + ptr = &GspOutBuffer[0]; - *ptr++ = HexChars[ESP]; - *ptr++ = ':'; - - Esp = GspGetEspFromTrapFrame (TrapFrame); /* SP */ - ptr = GspMem2Hex ((PCHAR) &Esp, ptr, 4, 0); - *ptr++ = ';'; - - *ptr++ = HexChars[EBP]; - *ptr++ = ':'; - ptr = GspMem2Hex ((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ - *ptr++ = ';'; - - *ptr++ = HexChars[PC]; - *ptr++ = ':'; - ptr = GspMem2Hex((PCHAR) &TrapFrame->Eip, ptr, 4, 0); /* PC */ - *ptr++ = ';'; + *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ + *ptr++ = HexChars[(SigVal >> 4) & 0xf]; + *ptr++ = HexChars[SigVal & 0xf]; - *ptr = '\0'; + *ptr++ = HexChars[ESP]; + *ptr++ = ':'; + + Esp = GspGetEspFromTrapFrame (TrapFrame); /* SP */ + ptr = GspMem2Hex ((PCHAR) &Esp, ptr, 4, 0); + *ptr++ = ';'; + + *ptr++ = HexChars[EBP]; + *ptr++ = ':'; + ptr = GspMem2Hex ((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ + *ptr++ = ';'; + + *ptr++ = HexChars[PC]; + *ptr++ = ':'; + ptr = GspMem2Hex((PCHAR) &TrapFrame->Eip, ptr, 4, 0); /* PC */ + *ptr++ = ';'; - GspPutPacket (&GspOutBuffer[0]); - } else { - gdb_attached_yet = 1; - } + *ptr = '\0'; + + GspPutPacket (&GspOutBuffer[0]); + } + else + { + gdb_attached_yet = 1; + } Stepping = FALSE; @@ -1128,8 +1123,8 @@ switch (*ptr++) { case '?': - /* a little hack to send more complete status information */ - goto stop_reply; + /* a little hack to send more complete status information */ + goto stop_reply; GspOutBuffer[0] = 'S'; GspOutBuffer[1] = HexChars[SigVal >> 4]; GspOutBuffer[2] = HexChars[SigVal % 16]; @@ -1138,7 +1133,7 @@ case 'd': GspRemoteDebug = !GspRemoteDebug; /* toggle debug flag */ break; - case 'g': /* return the value of the CPU Registers */ + case 'g': /* return the value of the CPU Registers */ if (NULL != GspDbgThread) { GspGetRegistersFromTrapFrame (&GspOutBuffer[0], Context, GspDbgThread->Tcb.TrapFrame); @@ -1148,7 +1143,7 @@ GspGetRegistersFromTrapFrame (&GspOutBuffer[0], Context, TrapFrame); } break; - case 'G': /* set the value of the CPU Registers - return OK */ + case 'G': /* set the value of the CPU Registers - return OK */ if (NULL != GspDbgThread) { GspSetRegistersInTrapFrame (ptr, Context, GspDbgThread->Tcb.TrapFrame); @@ -1159,7 +1154,7 @@ } strcpy (GspOutBuffer, "OK"); break; - case 'P': /* set the value of a single CPU register - return OK */ + case 'P': /* set the value of a single CPU register - return OK */ { LONG Register; @@ -1288,12 +1283,12 @@ break; } - case 'k': /* kill the program */ + case 'k': /* kill the program */ strcpy (GspOutBuffer, "OK"); break; /* kill the program */ - case 'H': /* Set thread */ + case 'H': /* Set thread */ GspSetThread (ptr); break; @@ -1351,7 +1346,7 @@ default: break; - } /* switch */ + } /* reply to the request */ GspPutPacket (&GspOutBuffer[0]); @@ -1411,24 +1406,8 @@ STDCALL KdpGdbDebugPrint(PCH Message, ULONG Length) { -#if 0 - /* This can be quite annoying! */ - if (GspInitialized) - { - ULONG Length; - - GspOutBuffer[0] = 'O'; - GspOutBuffer[1] = '\0'; - strcat (&GspOutBuffer[0], Message); - Length = strlen (Message); - GspOutBuffer[2 + Length] = '\n'; - GspOutBuffer[3 + Length] = '\0'; - GspPutPacketNoWait (&GspOutBuffer[0]); - } -#endif } - extern LIST_ENTRY ModuleListHead; VOID

1 0

[hpoussin] 18442: Don't always return STATUS_BUFFER_TOO_SMALL when an error occurs in ZwQueryValueKey.
by hpoussin＠svn.reactos.com 14 Oct '05

14 Oct '05

Don't always return STATUS_BUFFER_TOO_SMALL when an error occurs in ZwQueryValueKey. The "if" was triggered because ValueInformation->DataLength is 0xcdcdcdcd at the return of the function Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-14 13:00:18 UTC (rev 18441) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-14 13:04:11 UTC (rev 18442) @@ -322,15 +322,18 @@ *ResultLength = ValueInformation->DataLength; ZwClose(KeyHandle); - if (ValueInformation->DataLength > BufferLength) - Status = STATUS_BUFFER_TOO_SMALL; - if (!NT_SUCCESS(Status)) { ExFreePool(ValueInformation); return Status; } + if (ValueInformation->DataLength > BufferLength) + { + ExFreePool(ValueInformation); + return STATUS_BUFFER_TOO_SMALL; + } + /* FIXME: Verify the value (NULL-terminated, correct format). */ RtlCopyMemory(PropertyBuffer, ValueInformation->Data,

1 0

[gvg] 18441: Identify the process in ThreadExtraInfo
by gvg＠svn.reactos.com 14 Oct '05

14 Oct '05

Identify the process in ThreadExtraInfo Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-10-14 09:44:48 UTC (rev 18440) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-10-14 13:00:18 UTC (rev 18441) @@ -128,28 +128,26 @@ BOOLEAN SetInContext; } CPU_REGISTER, *PCPU_REGISTER; -#define KTRAP_FRAME_X86 KTRAP_FRAME - #define EIP_REGNO 8 static CPU_REGISTER GspRegisters[NUMREGS] = { - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Eax), FIELD_OFFSET (CONTEXT, Eax), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Ecx), FIELD_OFFSET (CONTEXT, Ecx), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Edx), FIELD_OFFSET (CONTEXT, Edx), FALSE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Ebx), FIELD_OFFSET (CONTEXT, Ebx), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Esp), FIELD_OFFSET (CONTEXT, Esp), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Ebp), FIELD_OFFSET (CONTEXT, Ebp), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Esi), FIELD_OFFSET (CONTEXT, Esi), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Edi), FIELD_OFFSET (CONTEXT, Edi), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Eip), FIELD_OFFSET (CONTEXT, Eip), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Eflags), FIELD_OFFSET (CONTEXT, EFlags), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Cs), FIELD_OFFSET (CONTEXT, SegCs), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Ss), FIELD_OFFSET (CONTEXT, SegSs), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Ds), FIELD_OFFSET (CONTEXT, SegDs), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Es), FIELD_OFFSET (CONTEXT, SegEs), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Fs), FIELD_OFFSET (CONTEXT, SegFs), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Gs), FIELD_OFFSET (CONTEXT, SegGs), TRUE } + { 4, FIELD_OFFSET (KTRAP_FRAME, Eax), FIELD_OFFSET (CONTEXT, Eax), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Ecx), FIELD_OFFSET (CONTEXT, Ecx), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Edx), FIELD_OFFSET (CONTEXT, Edx), FALSE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Ebx), FIELD_OFFSET (CONTEXT, Ebx), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Esp), FIELD_OFFSET (CONTEXT, Esp), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, DebugEbp), FIELD_OFFSET (CONTEXT, Ebp), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Esi), FIELD_OFFSET (CONTEXT, Esi), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Edi), FIELD_OFFSET (CONTEXT, Edi), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, DebugEip), FIELD_OFFSET (CONTEXT, Eip), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Eflags), FIELD_OFFSET (CONTEXT, EFlags), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Cs), FIELD_OFFSET (CONTEXT, SegCs), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Ss), FIELD_OFFSET (CONTEXT, SegSs), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Ds), FIELD_OFFSET (CONTEXT, SegDs), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Es), FIELD_OFFSET (CONTEXT, SegEs), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Fs), FIELD_OFFSET (CONTEXT, SegFs), TRUE }, + { 4, FIELD_OFFSET (KTRAP_FRAME, Gs), FIELD_OFFSET (CONTEXT, SegGs), TRUE } }; static PCHAR GspThreadStates[DeferredReady+1] = @@ -696,11 +694,9 @@ VOID GspQuery(PCHAR Request) { - PCHAR Command; ULONG Value; - Command = strtok (Request, ","); - if (strncmp (Command, "C", 1) == 0) + if (strncmp(Request, "C", 1) == 0) { PCHAR ptr = &GspOutBuffer[2]; @@ -717,7 +713,7 @@ } GspLong2Hex (&ptr, Value); } - else if (strncmp (Command, "fThreadInfo", 11) == 0) + else if (strncmp (Request, "fThreadInfo", 11) == 0) { PEPROCESS Process; PLIST_ENTRY AThread, AProcess; @@ -751,7 +747,7 @@ /* GspOutBuffer[0] = 'l'; */ } } - else if (strncmp (Command, "sThreadInfo", 11) == 0) + else if (strncmp (Request, "sThreadInfo", 11) == 0) { PEPROCESS Process; PLIST_ENTRY AThread, AProcess; @@ -803,67 +799,34 @@ GspOutBuffer[0] = 'l'; } } - else if (strncmp (Command, "ThreadExtraInfo", 15) == 0) + else if (strncmp (Request, "ThreadExtraInfo", 15) == 0) { PETHREAD ThreadInfo; - PCHAR ptr = &Command[15]; /* Get thread information */ - if (GspFindThread (ptr, &ThreadInfo)) - { - PCHAR String = GspThreadStates[ThreadInfo->Tcb.State]; + if (GspFindThread(Request + 16, &ThreadInfo)) + { + char Buffer[64]; + PEPROCESS Proc; - ObDereferenceObject(ThreadInfo); + Proc = (PEPROCESS) ThreadInfo->Tcb.ApcState.Process; - GspMem2Hex (String, &GspOutBuffer[0], strlen (String), FALSE); - } - } -#if 0 - else if (strncmp (Command, "L", 1) == 0) - { - PLIST_ENTRY CurrentEntry; - PETHREAD Current; - ULONG MaxThreads = 0; - ULONG ThreadId = 0; - ULONG ThreadCount = 0; - - /* List threads */ - GspHex2Mem (&Request[1], (PCHAR) &MaxThreads, 2, TRUE); - GspHex2Mem (&Request[3], (PCHAR) &Value, 4, TRUE); - GspHex2Mem (&Request[11], (PCHAR) &ThreadId, 4, TRUE); - - GspOutBuffer[0] = 'q'; - GspOutBuffer[1] = 'M'; - Value = 0; - GspMem2Hex ((PCHAR) &Value, &GspOutBuffer[5], 4, TRUE); - GspMem2Hex ((PCHAR) &ThreadId, &GspOutBuffer[13], 4, TRUE); - - CurrentEntry = PiThreadListHead.Flink; - while ((CurrentEntry != &PiThreadListHead) && (ThreadCount < MaxThreads)) + Buffer[0] = '\0'; + if (NULL != Proc ) { - Current = CONTAINING_RECORD (CurrentEntry, ETHREAD, Tcb.ThreadListEntry); - Value = 0; - GspMem2Hex ((PCHAR) &Value, &GspOutBuffer[21+ThreadCount*16], 4, TRUE); - Value = (ULONG) Current->Cid.UniqueThread; - GspMem2Hex ((PCHAR) &Value, &GspOutBuffer[21+ThreadCount*16+8], 4, TRUE); - CurrentEntry = CurrentEntry->Flink; - ThreadCount++; + sprintf(Buffer, "%s [%d:0x%x], ", Proc->ImageFileName, + (int) Proc->UniqueProcessId, + (int) ThreadInfo->Cid.UniqueThread); } + strcpy(Buffer + strlen(Buffer), GspThreadStates[ThreadInfo->Tcb.State]); - if (CurrentEntry != &PiThreadListHead) - { - GspOutBuffer[4] = '0'; - } - else - { - GspOutBuffer[4] = '1'; - } + ObDereferenceObject(ThreadInfo); - GspMem2Hex ((PCHAR) &ThreadCount, &GspOutBuffer[2], 1, TRUE); + GspMem2Hex(Buffer, &GspOutBuffer[0], strlen(Buffer), FALSE); + } } -#endif #if 0 - else if (strncmp (Command, "Offsets", 7) == 0) + else if (strncmp (Request, "Offsets", 7) == 0) { strcpy (GspOutBuffer, "Text=0;Data=0;Bss=0"); }

1 0

[gvg] 18440: Merge from trunk. tsk <tsk_n@mail.goo.ne.jp>:
by gvg＠svn.reactos.com 14 Oct '05

14 Oct '05

Merge from trunk. tsk <tsk_n(a)mail.goo.ne.jp>: UsageMessage is a printf format string. Modified: branches/ros-branch-0_2_8/reactos/subsys/system/sm/sm.c _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/system/sm/sm.c --- branches/ros-branch-0_2_8/reactos/subsys/system/sm/sm.c 2005-10-14 09:44:12 UTC (rev 18439) +++ branches/ros-branch-0_2_8/reactos/subsys/system/sm/sm.c 2005-10-14 09:44:48 UTC (rev 18440) @@ -98,7 +98,7 @@ { LoadString( GetModuleHandle(NULL), IDS_Unknown, (LPTSTR) UsageMessage,RC_STRING_MAX_SIZE); - _ftprintf(stderr, _T("%s '%s'.\n"), UsageMessage, CommandName); + _ftprintf(stderr, UsageMessage, CommandName); return NULL; } return & Command [i];

1 0

[gvg] 18439: tsk <tsk_n@mail.goo.ne.jp>:
by gvg＠svn.reactos.com 14 Oct '05

14 Oct '05

tsk <tsk_n(a)mail.goo.ne.jp>: UsageMessage is a printf format string. Modified: trunk/reactos/subsys/system/sm/sm.c _____ Modified: trunk/reactos/subsys/system/sm/sm.c --- trunk/reactos/subsys/system/sm/sm.c 2005-10-14 09:34:15 UTC (rev 18438) +++ trunk/reactos/subsys/system/sm/sm.c 2005-10-14 09:44:12 UTC (rev 18439) @@ -98,7 +98,7 @@ { LoadString( GetModuleHandle(NULL), IDS_Unknown, (LPTSTR) UsageMessage,RC_STRING_MAX_SIZE); - _ftprintf(stderr, _T("%s '%s'.\n"), UsageMessage, CommandName); + _ftprintf(stderr, UsageMessage, CommandName); return NULL; } return & Command [i];

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
74
Older →

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 October 2005