Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 22106: Hidden bug in our tcp/ip stack, at shutdown api the so can be NULL if that happen, ReactOS will bsod the tcp/ip stack. Arty can u look if this changes is right if not revert it. This changes was tested in fireforx at http://www.mirc.com/get.html and try d/l mirc. This patch do not make firefox bsod, instead it genrate a long crash log at serial debug.
by greatlrd＠svn.reactos.org 29 May '06

29 May '06

Author: greatlrd Date: Mon May 29 16:43:01 2006 New Revision: 22106 URL: http://svn.reactos.ru/svn/reactos?rev=22106&view=rev Log: Hidden bug in our tcp/ip stack, at shutdown api the so can be NULL if that happen, ReactOS will bsod the tcp/ip stack. Arty can u look if this changes is right if not revert it. This changes was tested in fireforx at http://www.mirc.com/get.html and try d/l mirc. This patch do not make firefox bsod, instead it genrate a long crash log at serial debug. Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskitt… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c Mon May 29 16:43:01 2006 @@ -827,6 +827,19 @@ register struct socket *so; register int how; { + if (so == NULL) + { + register struct protosw *pr = NULL; + + how++; + if (how & FREAD) + sorflush(so); + if (how & FWRITE) + return ((*pr->pr_usrreq)(so, PRU_SHUTDOWN, + (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0)); + return (0); + } + register struct protosw *pr = so->so_proto; how++;

1 0

[greatlrd] 22105: revers r22073 and r22075 bugfix for envinmert for it break firefox, not tested in trunk, I tested to revers this change in r22075
by greatlrd＠svn.reactos.org 29 May '06

29 May '06

Author: greatlrd Date: Mon May 29 15:28:55 2006 New Revision: 22105 URL: http://svn.reactos.ru/svn/reactos?rev=22105&view=rev Log: revers r22073 and r22075 bugfix for envinmert for it break firefox, not tested in trunk, I tested to revers this change in r22075 Modified: trunk/reactos/lib/crt/misc/environ.c Modified: trunk/reactos/lib/crt/misc/environ.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/misc/environ.c?rev=… ============================================================================== --- trunk/reactos/lib/crt/misc/environ.c (original) +++ trunk/reactos/lib/crt/misc/environ.c Mon May 29 15:28:55 2006 @@ -222,7 +222,6 @@ if (option == NULL || (epos = wcschr(option, L'=')) == NULL) return -1; - remove = (epos[1] == 0); /* Duplicate environment if needed. */ @@ -245,15 +244,6 @@ memcpy(name, option, (epos - option) * sizeof(wchar_t)); name[epos - option] = 0; - if ((*name == 0) || (wcschr(option, L'=') !=NULL)) - { - /* fixme check see if name contain any space or so - so we really locate first char in name and compare - it with equal - */ - free(name); - return -1; - } /* Find the option we're trying to modify. */ for (index = 0, wenvptr = _wenviron; *wenvptr != NULL; wenvptr++, index++) {

1 0

[hpoussin] 22104: Do the normal install before custom install actions. So, we should get the right .inf filename in SP_DRVINFO_DETAIL_DATA.InfFileName, as it is modified if the file is copied to %SYSTEMROOT%/Inf
by hpoussin＠svn.reactos.org 29 May '06

29 May '06

Author: hpoussin Date: Mon May 29 15:09:54 2006 New Revision: 22104 URL: http://svn.reactos.ru/svn/reactos?rev=22104&view=rev Log: Do the normal install before custom install actions. So, we should get the right .inf filename in SP_DRVINFO_DETAIL_DATA.InfFileName, as it is modified if the file is copied to %SYSTEMROOT%/Inf Modified: trunk/reactos/dll/cpl/desk/classinst.c Modified: trunk/reactos/dll/cpl/desk/classinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/classinst.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/classinst.c (original) +++ trunk/reactos/dll/cpl/desk/classinst.c Mon May 29 15:09:54 2006 @@ -36,7 +36,7 @@ if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; - /* Set DI_NEEDRESTART flag */ + /* Set DI_DONOTCALLCONFIGMG flag */ InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); result = SetupDiGetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams); if (!result) @@ -46,13 +46,22 @@ goto cleanup; } - InstallParams.Flags |= DI_NEEDRESTART; + InstallParams.Flags |= DI_DONOTCALLCONFIGMG; result = SetupDiSetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams); if (!result) { rc = GetLastError(); DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", rc); + goto cleanup; + } + + /* Do normal install */ + result = SetupDiInstallDevice(DeviceInfoSet, DeviceInfoData); + if (!result) + { + rc = GetLastError(); + DPRINT("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx\n", rc); goto cleanup; } @@ -96,15 +105,6 @@ goto cleanup; } _tcscat(SectionName, _T(".SoftwareSettings")); - - /* Do normal install */ - result = SetupDiInstallDevice(DeviceInfoSet, DeviceInfoData); - if (!result) - { - rc = GetLastError(); - DPRINT("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx\n", rc); - goto cleanup; - } /* Open driver registry key and create Settings subkey */ hDriverKey = SetupDiOpenDevRegKey(

1 0

[hpoussin] 22103: SP_DRVINFO_DETAIL_DATA_W.InfFileName must contain the full file name Add SetupDiSelectDevice stub
by hpoussin＠svn.reactos.org 29 May '06

29 May '06

Author: hpoussin Date: Mon May 29 15:03:24 2006 New Revision: 22103 URL: http://svn.reactos.ru/svn/reactos?rev=22103&view=rev Log: SP_DRVINFO_DETAIL_DATA_W.InfFileName must contain the full file name Add SetupDiSelectDevice stub Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Mon May 29 15:03:24 2006 @@ -3805,7 +3805,7 @@ } else if (UpdateClassInstallParamHandlers[ClassInstallParams->InstallFunction - DIF_SELECTDEVICE] == NULL) { - FIXME("InstallFunction %u is valid, but has no associated update handler\n", ClassInstallParams->InstallFunction); + ERR("InstallFunction %u is valid, but has no associated update handler\n", ClassInstallParams->InstallFunction); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto done; } @@ -4070,7 +4070,7 @@ break; case DIF_SELECTDEVICE: CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; - DefaultHandler = SetupDiSelectBestCompatDrv; + DefaultHandler = SetupDiSelectDevice; break; case DIF_TROUBLESHOOTER: CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; @@ -4491,6 +4491,7 @@ DI_RESOURCEPAGE_ADDED | /* 0x00002000 */ DI_PROPERTIES_CHANGE | /* 0x00004000 */ DI_ENUMSINGLEINF | /* 0x00010000 */ + DI_DONOTCALLCONFIGMG | /* 0x00020000 */ DI_CLASSINSTALLPARAMS | /* 0x00100000 */ DI_NODI_DEFAULTACTION | /* 0x00200000 */ DI_QUIETINSTALL | /* 0x00800000 */ @@ -6146,7 +6147,7 @@ &ClassGuid, ContextDevice, currentInfFileDetails, - filename, + FullInfFileName, ProviderName, ManufacturerName, NULL, @@ -6203,7 +6204,7 @@ &ClassGuid, ContextDevice, currentInfFileDetails, - filename, + FullInfFileName, ProviderName, ManufacturerName, currentId, @@ -6224,7 +6225,7 @@ &ClassGuid, ContextDevice, currentInfFileDetails, - filename, + FullInfFileName, ProviderName, ManufacturerName, currentId, @@ -7553,6 +7554,19 @@ } /*********************************************************************** + * SetupDiSelectDevice (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiSelectDevice( + IN HDEVINFO DeviceInfoSet, + IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + FIXME("%p %p\n", DeviceInfoSet, DeviceInfoData); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetupDiInstallDriverFiles (SETUPAPI.@) */ BOOL WINAPI Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Mon May 29 15:03:24 2006 @@ -372,7 +372,7 @@ @ stdcall SetupDiRemoveDevice(ptr ptr) @ stub SetupDiRemoveDeviceInterface @ stdcall SetupDiSelectBestCompatDrv(ptr ptr) -@ stub SetupDiSelectDevice +@ stdcall SetupDiSelectDevice(ptr ptr) @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) @ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long)

1 0

[hpoussin] 22102: Don't stop the search after the first driver found. Next ones may be better
by hpoussin＠svn.reactos.org 29 May '06

29 May '06

Author: hpoussin Date: Mon May 29 13:36:26 2006 New Revision: 22102 URL: http://svn.reactos.ru/svn/reactos?rev=22102&view=rev Log: Don't stop the search after the first driver found. Next ones may be better Modified: trunk/reactos/dll/win32/newdev/newdev.c Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c (original) +++ trunk/reactos/dll/win32/newdev/newdev.c Mon May 29 13:36:26 2006 @@ -54,12 +54,12 @@ /* FIXME: InstallFlags bRebootRequired ignored! */ /* Check flags */ - /* FIXME: if (InstallFlags & ~(INSTALLFLAG_FORCE | INSTALLFLAG_READONLY | INSTALLFLAG_NONINTERACTIVE)) + if (InstallFlags & ~(INSTALLFLAG_FORCE | INSTALLFLAG_READONLY | INSTALLFLAG_NONINTERACTIVE)) { DPRINT("Unknown flags: 0x%08lx\n", InstallFlags & ~(INSTALLFLAG_FORCE | INSTALLFLAG_READONLY | INSTALLFLAG_NONINTERACTIVE)); SetLastError(ERROR_INVALID_FLAGS); goto cleanup; - }*/ + } /* Enumerate all devices of the system */ DevInstData.hDevInfo = SetupDiGetClassDevsW(NULL, NULL, hwndParent, DIGCF_ALLCLASSES | DIGCF_PRESENT); @@ -374,7 +374,7 @@ if (SearchDriverRecursive(DevInstData, FullPath)) { retval = TRUE; - break; + /* We continue the search for a better driver */ } } else @@ -392,14 +392,13 @@ if (SearchDriver(DevInstData, DirPath, NULL)) { retval = TRUE; - goto cleanup; + /* We continue the search for a better driver */ } } } } -cleanup: if (hFindFile != INVALID_HANDLE_VALUE) FindClose(hFindFile); return retval;

1 0

[hpoussin] 22101: Fix some whitespaces Change swprintf by sprintfW
by hpoussin＠svn.reactos.org 29 May '06

29 May '06

Author: hpoussin Date: Mon May 29 12:55:08 2006 New Revision: 22101 URL: http://svn.reactos.ru/svn/reactos?rev=22101&view=rev Log: Fix some whitespaces Change swprintf by sprintfW Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Mon May 29 12:55:08 2006 @@ -153,7 +153,7 @@ BOOL WINAPI SetupDiBuildClassInfoList( IN DWORD Flags, - OUT LPGUID ClassGuidList OPTIONAL, + OUT LPGUID ClassGuidList OPTIONAL, IN DWORD ClassGuidListSize, OUT PDWORD RequiredSize) { @@ -169,10 +169,10 @@ BOOL WINAPI SetupDiBuildClassInfoListExA( IN DWORD Flags, - OUT LPGUID ClassGuidList OPTIONAL, + OUT LPGUID ClassGuidList OPTIONAL, IN DWORD ClassGuidListSize, OUT PDWORD RequiredSize, - IN PCSTR MachineName OPTIONAL, + IN PCSTR MachineName OPTIONAL, IN PVOID Reserved) { LPWSTR MachineNameW = NULL; @@ -202,10 +202,10 @@ BOOL WINAPI SetupDiBuildClassInfoListExW( IN DWORD Flags, - OUT LPGUID ClassGuidList OPTIONAL, + OUT LPGUID ClassGuidList OPTIONAL, IN DWORD ClassGuidListSize, OUT PDWORD RequiredSize, - IN PCWSTR MachineName OPTIONAL, + IN PCWSTR MachineName OPTIONAL, IN PVOID Reserved) { WCHAR szKeyName[MAX_GUID_STRING_LEN + 1]; @@ -365,7 +365,7 @@ OUT LPGUID ClassGuidList, IN DWORD ClassGuidListSize, OUT PDWORD RequiredSize, - IN PCSTR MachineName OPTIONAL, + IN PCSTR MachineName OPTIONAL, IN PVOID Reserved) { LPWSTR ClassNameW = NULL; @@ -409,7 +409,7 @@ OUT LPGUID ClassGuidList, IN DWORD ClassGuidListSize, OUT PDWORD RequiredSize, - IN PCWSTR MachineName OPTIONAL, + IN PCWSTR MachineName OPTIONAL, IN PVOID Reserved) { WCHAR szKeyName[MAX_GUID_STRING_LEN + 1]; @@ -521,7 +521,7 @@ IN CONST GUID* ClassGuid, OUT PSTR ClassName, IN DWORD ClassNameSize, - OUT PDWORD RequiredSize OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL) { return SetupDiClassNameFromGuidExA(ClassGuid, ClassName, ClassNameSize, RequiredSize, @@ -536,7 +536,7 @@ IN CONST GUID* ClassGuid, OUT PWSTR ClassName, IN DWORD ClassNameSize, - OUT PDWORD RequiredSize OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL) { return SetupDiClassNameFromGuidExW(ClassGuid, ClassName, ClassNameSize, RequiredSize, @@ -551,8 +551,8 @@ IN CONST GUID* ClassGuid, OUT PSTR ClassName, IN DWORD ClassNameSize, - OUT PDWORD RequiredSize OPTIONAL, - IN PCSTR MachineName OPTIONAL, + OUT PDWORD RequiredSize OPTIONAL, + IN PCSTR MachineName OPTIONAL, IN PVOID Reserved) { WCHAR ClassNameW[MAX_CLASS_NAME_LEN]; @@ -583,8 +583,8 @@ IN CONST GUID* ClassGuid, OUT PWSTR ClassName, IN DWORD ClassNameSize, - OUT PDWORD RequiredSize OPTIONAL, - IN PCWSTR MachineName OPTIONAL, + OUT PDWORD RequiredSize OPTIONAL, + IN PCWSTR MachineName OPTIONAL, IN PVOID Reserved) { HKEY hKey; @@ -647,8 +647,8 @@ */ HDEVINFO WINAPI SetupDiCreateDeviceInfoList( - IN CONST GUID *ClassGuid OPTIONAL, - IN HWND hwndParent OPTIONAL) + IN CONST GUID *ClassGuid OPTIONAL, + IN HWND hwndParent OPTIONAL) { return SetupDiCreateDeviceInfoListExW(ClassGuid, hwndParent, NULL, NULL); } @@ -658,9 +658,9 @@ */ HDEVINFO WINAPI SetupDiCreateDeviceInfoListExA( - IN CONST GUID *ClassGuid OPTIONAL, - IN HWND hwndParent OPTIONAL, - IN PCSTR MachineName OPTIONAL, + IN CONST GUID *ClassGuid OPTIONAL, + IN HWND hwndParent OPTIONAL, + IN PCSTR MachineName OPTIONAL, IN PVOID Reserved) { LPWSTR MachineNameW = NULL; @@ -718,9 +718,9 @@ */ HDEVINFO WINAPI SetupDiCreateDeviceInfoListExW( - IN CONST GUID *ClassGuid OPTIONAL, - IN HWND hwndParent OPTIONAL, - IN PCWSTR MachineName OPTIONAL, + IN CONST GUID *ClassGuid OPTIONAL, + IN HWND hwndParent OPTIONAL, + IN PCWSTR MachineName OPTIONAL, IN PVOID Reserved) { struct DeviceInfoSet *list; @@ -868,10 +868,10 @@ SetupDiGetActualSectionToInstallA( IN HINF InfHandle, IN PCSTR InfSectionName, - OUT PSTR InfSectionWithExt OPTIONAL, + OUT PSTR InfSectionWithExt OPTIONAL, IN DWORD InfSectionWithExtSize, - OUT PDWORD RequiredSize OPTIONAL, - OUT PSTR *Extension OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL, + OUT PSTR *Extension OPTIONAL) { return SetupDiGetActualSectionToInstallExA(InfHandle, InfSectionName, NULL, InfSectionWithExt, InfSectionWithExtSize, RequiredSize, @@ -885,10 +885,10 @@ SetupDiGetActualSectionToInstallW( IN HINF InfHandle, IN PCWSTR InfSectionName, - OUT PWSTR InfSectionWithExt OPTIONAL, + OUT PWSTR InfSectionWithExt OPTIONAL, IN DWORD InfSectionWithExtSize, - OUT PDWORD RequiredSize OPTIONAL, - OUT PWSTR *Extension OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL, + OUT PWSTR *Extension OPTIONAL) { return SetupDiGetActualSectionToInstallExW(InfHandle, InfSectionName, NULL, InfSectionWithExt, InfSectionWithExtSize, RequiredSize, @@ -902,11 +902,11 @@ SetupDiGetActualSectionToInstallExA( IN HINF InfHandle, IN PCSTR InfSectionName, - IN PSP_ALTPLATFORM_INFO AlternatePlatformInfo OPTIONAL, - OUT PSTR InfSectionWithExt OPTIONAL, + IN PSP_ALTPLATFORM_INFO AlternatePlatformInfo OPTIONAL, + OUT PSTR InfSectionWithExt OPTIONAL, IN DWORD InfSectionWithExtSize, - OUT PDWORD RequiredSize OPTIONAL, - OUT PSTR* Extension OPTIONAL, + OUT PDWORD RequiredSize OPTIONAL, + OUT PSTR* Extension OPTIONAL, IN PVOID Reserved) { LPWSTR InfSectionNameW = NULL; @@ -1249,11 +1249,11 @@ SetupDiGetActualSectionToInstallExW( IN HINF InfHandle, IN PCWSTR InfSectionName, - IN PSP_ALTPLATFORM_INFO AlternatePlatformInfo OPTIONAL, - OUT PWSTR InfSectionWithExt OPTIONAL, + IN PSP_ALTPLATFORM_INFO AlternatePlatformInfo OPTIONAL, + OUT PWSTR InfSectionWithExt OPTIONAL, IN DWORD InfSectionWithExtSize, - OUT PDWORD RequiredSize OPTIONAL, - OUT PWSTR* Extension OPTIONAL, + OUT PDWORD RequiredSize OPTIONAL, + OUT PWSTR* Extension OPTIONAL, IN PVOID Reserved) { BOOL ret = FALSE; @@ -1368,7 +1368,7 @@ IN CONST GUID *ClassGuid, OUT PSTR ClassDescription, IN DWORD ClassDescriptionSize, - OUT PDWORD RequiredSize OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL) { return SetupDiGetClassDescriptionExA(ClassGuid, ClassDescription, ClassDescriptionSize, @@ -1383,7 +1383,7 @@ IN CONST GUID *ClassGuid, OUT PWSTR ClassDescription, IN DWORD ClassDescriptionSize, - OUT PDWORD RequiredSize OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL) { return SetupDiGetClassDescriptionExW(ClassGuid, ClassDescription, ClassDescriptionSize, @@ -1398,8 +1398,8 @@ IN CONST GUID *ClassGuid, OUT PSTR ClassDescription, IN DWORD ClassDescriptionSize, - OUT PDWORD RequiredSize OPTIONAL, - IN PCSTR MachineName OPTIONAL, + OUT PDWORD RequiredSize OPTIONAL, + IN PCSTR MachineName OPTIONAL, IN PVOID Reserved) { PWCHAR ClassDescriptionW; @@ -1456,8 +1456,8 @@ IN CONST GUID *ClassGuid, OUT PWSTR ClassDescription, IN DWORD ClassDescriptionSize, - OUT PDWORD RequiredSize OPTIONAL, - IN PCWSTR MachineName OPTIONAL, + OUT PDWORD RequiredSize OPTIONAL, + IN PCWSTR MachineName OPTIONAL, IN PVOID Reserved) { HKEY hKey = INVALID_HANDLE_VALUE; @@ -1519,9 +1519,9 @@ */ HDEVINFO WINAPI SetupDiGetClassDevsA( - IN CONST GUID *ClassGuid OPTIONAL, - IN PCSTR Enumerator OPTIONAL, - IN HWND hwndParent OPTIONAL, + IN CONST GUID *ClassGuid OPTIONAL, + IN PCSTR Enumerator OPTIONAL, + IN HWND hwndParent OPTIONAL, IN DWORD Flags) { return SetupDiGetClassDevsExA(ClassGuid, Enumerator, hwndParent, @@ -1533,9 +1533,9 @@ */ HDEVINFO WINAPI SetupDiGetClassDevsW( - IN CONST GUID *ClassGuid OPTIONAL, - IN PCWSTR Enumerator OPTIONAL, - IN HWND hwndParent OPTIONAL, + IN CONST GUID *ClassGuid OPTIONAL, + IN PCWSTR Enumerator OPTIONAL, + IN HWND hwndParent OPTIONAL, IN DWORD Flags) { return SetupDiGetClassDevsExW(ClassGuid, Enumerator, hwndParent, @@ -1547,12 +1547,12 @@ */ HDEVINFO WINAPI SetupDiGetClassDevsExA( - IN CONST GUID *ClassGuid OPTIONAL, - IN PCSTR Enumerator OPTIONAL, - IN HWND hwndParent OPTIONAL, + IN CONST GUID *ClassGuid OPTIONAL, + IN PCSTR Enumerator OPTIONAL, + IN HWND hwndParent OPTIONAL, IN DWORD Flags, - IN HDEVINFO DeviceInfoSet OPTIONAL, - IN PCSTR MachineName OPTIONAL, + IN HDEVINFO DeviceInfoSet OPTIONAL, + IN PCSTR MachineName OPTIONAL, IN PVOID Reserved) { HDEVINFO ret; @@ -2099,12 +2099,12 @@ */ HDEVINFO WINAPI SetupDiGetClassDevsExW( - IN CONST GUID *ClassGuid OPTIONAL, - IN PCWSTR Enumerator OPTIONAL, - IN HWND hwndParent OPTIONAL, + IN CONST GUID *ClassGuid OPTIONAL, + IN PCWSTR Enumerator OPTIONAL, + IN HWND hwndParent OPTIONAL, IN DWORD Flags, - IN HDEVINFO DeviceInfoSet OPTIONAL, - IN PCWSTR MachineName OPTIONAL, + IN HDEVINFO DeviceInfoSet OPTIONAL, + IN PCWSTR MachineName OPTIONAL, IN PVOID Reserved) { HDEVINFO hDeviceInfo = INVALID_HANDLE_VALUE; @@ -2304,7 +2304,7 @@ BOOL WINAPI SetupDiGetClassImageListExA( OUT PSP_CLASSIMAGELIST_DATA ClassImageListData, - IN PCSTR MachineName OPTIONAL, + IN PCSTR MachineName OPTIONAL, IN PVOID Reserved) { PWSTR MachineNameW = NULL; @@ -2331,7 +2331,7 @@ BOOL WINAPI SetupDiGetClassImageListExW( OUT PSP_CLASSIMAGELIST_DATA ClassImageListData, - IN PCWSTR MachineName OPTIONAL, + IN PCWSTR MachineName OPTIONAL, IN PVOID Reserved) { BOOL ret = FALSE; @@ -2388,8 +2388,8 @@ BOOL WINAPI SetupDiLoadClassIcon( IN CONST GUID *ClassGuid, - OUT HICON *LargeIcon OPTIONAL, - OUT PINT MiniIconIndex OPTIONAL) + OUT HICON *LargeIcon OPTIONAL, + OUT PINT MiniIconIndex OPTIONAL) { BOOL ret = FALSE; @@ -2503,7 +2503,7 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN CONST GUID *InterfaceClassGuid, IN DWORD MemberIndex, OUT PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) @@ -2680,10 +2680,10 @@ SetupDiGetDeviceInterfaceDetailA( IN HDEVINFO DeviceInfoSet, IN PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, - OUT PSP_DEVICE_INTERFACE_DETAIL_DATA_A DeviceInterfaceDetailData OPTIONAL, + OUT PSP_DEVICE_INTERFACE_DETAIL_DATA_A DeviceInterfaceDetailData OPTIONAL, IN DWORD DeviceInterfaceDetailDataSize, - OUT PDWORD RequiredSize OPTIONAL, - OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL, + OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailDataW = NULL; DWORD sizeW = 0, sizeA; @@ -2751,10 +2751,10 @@ SetupDiGetDeviceInterfaceDetailW( IN HDEVINFO DeviceInfoSet, IN PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, - OUT PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData OPTIONAL, + OUT PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData OPTIONAL, IN DWORD DeviceInterfaceDetailDataSize, - OUT PDWORD RequiredSize OPTIONAL, - OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL, + OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { BOOL ret = FALSE; @@ -2819,10 +2819,10 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, IN DWORD Property, - OUT PDWORD PropertyRegDataType OPTIONAL, - OUT PBYTE PropertyBuffer OPTIONAL, + OUT PDWORD PropertyRegDataType OPTIONAL, + OUT PBYTE PropertyBuffer OPTIONAL, IN DWORD PropertyBufferSize, - OUT PDWORD RequiredSize OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL) { BOOL bResult; BOOL bIsStringProperty; @@ -2906,10 +2906,10 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, IN DWORD Property, - OUT PDWORD PropertyRegDataType OPTIONAL, - OUT PBYTE PropertyBuffer OPTIONAL, + OUT PDWORD PropertyRegDataType OPTIONAL, + OUT PBYTE PropertyBuffer OPTIONAL, IN DWORD PropertyBufferSize, - OUT PDWORD RequiredSize OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL) { HKEY hEnumKey, hKey; DWORD rc; @@ -3105,7 +3105,7 @@ IN HDEVINFO DeviceInfoSet, IN OUT PSP_DEVINFO_DATA DeviceInfoData, IN DWORD Property, - IN CONST BYTE *PropertyBuffer OPTIONAL, + IN CONST BYTE *PropertyBuffer OPTIONAL, IN DWORD PropertyBufferSize) { FIXME("%p %p 0x%lx %p 0x%lx\n", DeviceInfoSet, DeviceInfoData, @@ -3122,7 +3122,7 @@ IN HDEVINFO DeviceInfoSet, IN OUT PSP_DEVINFO_DATA DeviceInfoData, IN DWORD Property, - IN CONST BYTE *PropertyBuffer OPTIONAL, + IN CONST BYTE *PropertyBuffer OPTIONAL, IN DWORD PropertyBufferSize) { struct DeviceInfoSet *list; @@ -3254,10 +3254,10 @@ */ BOOL WINAPI SetupDiInstallClassA( - IN HWND hwndParent OPTIONAL, + IN HWND hwndParent OPTIONAL, IN PCSTR InfFileName, IN DWORD Flags, - IN HSPFILEQ FileQueue OPTIONAL) + IN HSPFILEQ FileQueue OPTIONAL) { return SetupDiInstallClassExA(hwndParent, InfFileName, Flags, FileQueue, NULL, NULL, NULL); } @@ -3268,10 +3268,10 @@ */ BOOL WINAPI SetupDiInstallClassW( - IN HWND hwndParent OPTIONAL, + IN HWND hwndParent OPTIONAL, IN PCWSTR InfFileName, IN DWORD Flags, - IN HSPFILEQ FileQueue OPTIONAL) + IN HSPFILEQ FileQueue OPTIONAL) { return SetupDiInstallClassExW(hwndParent, InfFileName, Flags, FileQueue, NULL, NULL, NULL); } @@ -3282,11 +3282,11 @@ */ BOOL WINAPI SetupDiInstallClassExA( - IN HWND hwndParent OPTIONAL, - IN PCSTR InfFileName OPTIONAL, + IN HWND hwndParent OPTIONAL, + IN PCSTR InfFileName OPTIONAL, IN DWORD Flags, - IN HSPFILEQ FileQueue OPTIONAL, - IN CONST GUID *InterfaceClassGuid OPTIONAL, + IN HSPFILEQ FileQueue OPTIONAL, + IN CONST GUID *InterfaceClassGuid OPTIONAL, IN PVOID Reserved1, IN PVOID Reserved2) { @@ -3388,11 +3388,11 @@ */ BOOL WINAPI SetupDiInstallClassExW( - IN HWND hwndParent OPTIONAL, - IN PCWSTR InfFileName OPTIONAL, + IN HWND hwndParent OPTIONAL, + IN PCWSTR InfFileName OPTIONAL, IN DWORD Flags, - IN HSPFILEQ FileQueue OPTIONAL, - IN CONST GUID *InterfaceClassGuid OPTIONAL, + IN HSPFILEQ FileQueue OPTIONAL, + IN CONST GUID *InterfaceClassGuid OPTIONAL, IN PVOID Reserved1, IN PVOID Reserved2) { @@ -3548,7 +3548,7 @@ */ HKEY WINAPI SetupDiOpenClassRegKey( - IN CONST GUID *ClassGuid OPTIONAL, + IN CONST GUID *ClassGuid OPTIONAL, IN REGSAM samDesired) { return SetupDiOpenClassRegKeyExW(ClassGuid, samDesired, @@ -3561,10 +3561,10 @@ */ HKEY WINAPI SetupDiOpenClassRegKeyExA( - IN CONST GUID *ClassGuid OPTIONAL, + IN CONST GUID *ClassGuid OPTIONAL, IN REGSAM samDesired, IN DWORD Flags, - IN PCSTR MachineName OPTIONAL, + IN PCSTR MachineName OPTIONAL, IN PVOID Reserved) { PWSTR MachineNameW = NULL; @@ -3594,10 +3594,10 @@ */ HKEY WINAPI SetupDiOpenClassRegKeyExW( - IN CONST GUID* ClassGuid OPTIONAL, + IN CONST GUID* ClassGuid OPTIONAL, IN REGSAM samDesired, IN DWORD Flags, - IN PCWSTR MachineName OPTIONAL, + IN PCWSTR MachineName OPTIONAL, IN PVOID Reserved) { LPWSTR lpGuidString = NULL; @@ -3705,7 +3705,7 @@ IN HDEVINFO DeviceInfoSet, IN PCWSTR DevicePath, IN DWORD OpenFlags, - OUT PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData OPTIONAL) + OUT PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData OPTIONAL) { FIXME("%p %s %08lx %p\n", DeviceInfoSet, debugstr_w(DevicePath), OpenFlags, DeviceInterfaceData); @@ -3720,7 +3720,7 @@ IN HDEVINFO DeviceInfoSet, IN PCSTR DevicePath, IN DWORD OpenFlags, - OUT PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData OPTIONAL) + OUT PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData OPTIONAL) { LPWSTR DevicePathW = NULL; BOOL bResult; @@ -3745,8 +3745,8 @@ BOOL WINAPI SetupDiSetClassInstallParamsA( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, - IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, IN DWORD ClassInstallParamsSize) { FIXME("%p %p %x %lu\n",DeviceInfoSet, DeviceInfoData, @@ -3760,8 +3760,8 @@ BOOL WINAPI SetupDiSetClassInstallParamsW( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, - IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, IN DWORD ClassInstallParamsSize) { struct DeviceInfoSet *list; @@ -3976,7 +3976,7 @@ SetupDiCallClassInstaller( IN DI_FUNCTION InstallFunction, IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { BOOL ret = FALSE; @@ -4401,7 +4401,7 @@ BOOL WINAPI SetupDiGetDeviceInstallParamsA( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, OUT PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) { SP_DEVINSTALL_PARAMS_W deviceInstallParamsW; @@ -4444,7 +4444,7 @@ BOOL WINAPI SetupDiGetDeviceInstallParamsW( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, OUT PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) { struct DeviceInfoSet *list; @@ -4538,7 +4538,7 @@ BOOL WINAPI SetupDiSetDeviceInstallParamsW( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) { struct DeviceInfoSet *list; @@ -4579,9 +4579,9 @@ SetupDiGetDeviceInstanceIdA( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, - OUT PSTR DeviceInstanceId OPTIONAL, + OUT PSTR DeviceInstanceId OPTIONAL, IN DWORD DeviceInstanceIdSize, - OUT PDWORD RequiredSize OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL) { PWSTR DeviceInstanceIdW = NULL; BOOL ret = FALSE; @@ -4626,9 +4626,9 @@ SetupDiGetDeviceInstanceIdW( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, - OUT PWSTR DeviceInstanceId OPTIONAL, + OUT PWSTR DeviceInstanceId OPTIONAL, IN DWORD DeviceInstanceIdSize, - OUT PDWORD RequiredSize OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL) { BOOL ret = FALSE; @@ -4675,10 +4675,10 @@ BOOL WINAPI SetupDiGetClassDevPropertySheetsA( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN LPPROPSHEETHEADERA PropertySheetHeader, IN DWORD PropertySheetHeaderPageListSize, - OUT PDWORD RequiredSize OPTIONAL, + OUT PDWORD RequiredSize OPTIONAL, IN DWORD PropertySheetType) { PROPSHEETHEADERW psh; @@ -4736,10 +4736,10 @@ BOOL WINAPI SetupDiGetClassDevPropertySheetsW( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN OUT LPPROPSHEETHEADERW PropertySheetHeader, IN DWORD PropertySheetHeaderPageListSize, - OUT PDWORD RequiredSize OPTIONAL, + OUT PDWORD RequiredSize OPTIONAL, IN DWORD PropertySheetType) { struct DeviceInfoSet *list; @@ -4872,8 +4872,8 @@ IN DWORD Scope, IN DWORD HwProfile, IN DWORD KeyType, - IN HINF InfHandle OPTIONAL, - IN PCSTR InfSectionName OPTIONAL) + IN HINF InfHandle OPTIONAL, + IN PCSTR InfSectionName OPTIONAL) { PCWSTR InfSectionNameW = NULL; HKEY ret = INVALID_HANDLE_VALUE; @@ -4965,8 +4965,8 @@ IN DWORD Scope, IN DWORD HwProfile, IN DWORD KeyType, - IN HINF InfHandle OPTIONAL, - IN PCWSTR InfSectionName OPTIONAL) + IN HINF InfHandle OPTIONAL, + IN PCWSTR InfSectionName OPTIONAL) { struct DeviceInfoSet *list; HKEY ret = INVALID_HANDLE_VALUE; @@ -5310,10 +5310,10 @@ IN HDEVINFO DeviceInfoSet, IN PCSTR DeviceName, IN CONST GUID *ClassGuid, - IN PCSTR DeviceDescription OPTIONAL, - IN HWND hwndParent OPTIONAL, + IN PCSTR DeviceDescription OPTIONAL, + IN HWND hwndParent OPTIONAL, IN DWORD CreationFlags, - OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { LPWSTR DeviceNameW = NULL; LPWSTR DeviceDescriptionW = NULL; @@ -5355,10 +5355,10 @@ IN HDEVINFO DeviceInfoSet, IN PCWSTR DeviceName, IN CONST GUID *ClassGuid, - IN PCWSTR DeviceDescription OPTIONAL, - IN HWND hwndParent OPTIONAL, + IN PCWSTR DeviceDescription OPTIONAL, + IN HWND hwndParent OPTIONAL, IN DWORD CreationFlags, - OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { struct DeviceInfoSet *list; BOOL ret = FALSE; @@ -5902,7 +5902,7 @@ BOOL WINAPI SetupDiBuildDriverInfoList( IN HDEVINFO DeviceInfoSet, - IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN DWORD DriverType) { struct DeviceInfoSet *list; @@ -6310,7 +6310,7 @@ BOOL WINAPI SetupDiDestroyDriverInfoList( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN DWORD DriverType) { struct DeviceInfoSet *list; @@ -6397,7 +6397,7 @@ IN PCSTR DeviceInstanceId, IN HWND hwndParent OPTIONAL, IN DWORD OpenFlags, - OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { LPWSTR DeviceInstanceIdW = NULL; BOOL bResult; @@ -6426,7 +6426,7 @@ IN PCWSTR DeviceInstanceId, IN HWND hwndParent OPTIONAL, IN DWORD OpenFlags, - OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { struct DeviceInfoSet *list; HKEY hEnumKey, hKey = NULL; @@ -6535,7 +6535,7 @@ BOOL WINAPI SetupDiEnumDriverInfoA( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN DWORD DriverType, IN DWORD MemberIndex, OUT PSP_DRVINFO_DATA_A DriverInfoData) @@ -6599,7 +6599,7 @@ BOOL WINAPI SetupDiEnumDriverInfoW( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN DWORD DriverType, IN DWORD MemberIndex, OUT PSP_DRVINFO_DATA_W DriverInfoData) @@ -6703,7 +6703,7 @@ BOOL WINAPI SetupDiGetSelectedDriverA( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, OUT PSP_DRVINFO_DATA_A DriverInfoData) { SP_DRVINFO_DATA_V2_W driverInfoData2W; @@ -6763,7 +6763,7 @@ BOOL WINAPI SetupDiGetSelectedDriverW( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, OUT PSP_DRVINFO_DATA_W DriverInfoData) { BOOL ret = FALSE; @@ -6847,8 +6847,8 @@ BOOL WINAPI SetupDiSetSelectedDriverA( IN HDEVINFO DeviceInfoSet, - IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, - IN OUT PSP_DRVINFO_DATA_A DriverInfoData OPTIONAL) + IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN OUT PSP_DRVINFO_DATA_A DriverInfoData OPTIONAL) { SP_DRVINFO_DATA_V1_W DriverInfoDataW; PSP_DRVINFO_DATA_W pDriverInfoDataW = NULL; @@ -6910,8 +6910,8 @@ BOOL WINAPI SetupDiSetSelectedDriverW( IN HDEVINFO DeviceInfoSet, - IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, - IN OUT PSP_DRVINFO_DATA_W DriverInfoData OPTIONAL) + IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN OUT PSP_DRVINFO_DATA_W DriverInfoData OPTIONAL) { BOOL ret = FALSE; @@ -6997,11 +6997,11 @@ BOOL WINAPI SetupDiGetDriverInfoDetailA( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN PSP_DRVINFO_DATA_A DriverInfoData, - IN OUT PSP_DRVINFO_DETAIL_DATA_A DriverInfoDetailData OPTIONAL, + IN OUT PSP_DRVINFO_DETAIL_DATA_A DriverInfoDetailData OPTIONAL, IN DWORD DriverInfoDetailDataSize, - OUT PDWORD RequiredSize OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL) { SP_DRVINFO_DATA_V2_W DriverInfoDataW; PSP_DRVINFO_DETAIL_DATA_W DriverInfoDetailDataW = NULL; @@ -7198,11 +7198,11 @@ BOOL WINAPI SetupDiGetDriverInfoDetailW( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN PSP_DRVINFO_DATA_W DriverInfoData, - IN OUT PSP_DRVINFO_DETAIL_DATA_W DriverInfoDetailData OPTIONAL, + IN OUT PSP_DRVINFO_DETAIL_DATA_W DriverInfoDetailData OPTIONAL, IN DWORD DriverInfoDetailDataSize, - OUT PDWORD RequiredSize OPTIONAL) + OUT PDWORD RequiredSize OPTIONAL) { BOOL ret = FALSE; @@ -7522,7 +7522,7 @@ BOOL WINAPI SetupDiSelectBestCompatDrv( IN HDEVINFO DeviceInfoSet, - IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { SP_DRVINFO_DATA_W drvInfoData; BOOL ret; @@ -8096,7 +8096,7 @@ TRACE("InfSectionExt : '%s'\n", debugstr_w(&SectionName[strlenW(SelectedDriver->Details.SectionName)])); TRACE("MatchingDeviceId: '%s'\n", debugstr_w(SelectedDriver->MatchingId)); TRACE("ProviderName : '%s'\n", debugstr_w(SelectedDriver->Info.ProviderName)); - swprintf(Buffer, L"%u-%u-%u", DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); + sprintfW(Buffer, L"%u-%u-%u", DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); rc = RegSetValueEx(hKey, REGSTR_DRIVER_DATE, 0, REG_SZ, (const BYTE *)Buffer, (strlenW(Buffer) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) rc = RegSetValueEx(hKey, REGSTR_DRIVER_DATE_DATA, 0, REG_BINARY, (const BYTE *)&SelectedDriver->Info.DriverDate, sizeof(FILETIME)); @@ -8104,7 +8104,7 @@ rc = RegSetValueEx(hKey, REGSTR_VAL_DRVDESC, 0, REG_SZ, (const BYTE *)SelectedDriver->Info.Description, (strlenW(SelectedDriver->Info.Description) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) { - swprintf(Buffer, L"%u.%u.%u.%u", fullVersion.HighPart >> 16, fullVersion.HighPart & 0xffff, fullVersion.LowPart >> 16, fullVersion.LowPart & 0xffff); + sprintfW(Buffer, L"%u.%u.%u.%u", fullVersion.HighPart >> 16, fullVersion.HighPart & 0xffff, fullVersion.LowPart >> 16, fullVersion.LowPart & 0xffff); rc = RegSetValueEx(hKey, REGSTR_DRIVER_VERSION, 0, REG_SZ, (const BYTE *)Buffer, (strlenW(Buffer) + 1) * sizeof(WCHAR)); } if (rc == ERROR_SUCCESS)

1 0

[ion] 22100: - Object Manager Improvements (3 of 3): * Implement Per-Processor Lookaside List based allocation and de-allocation of the Object Create Information (object attributes capture) and of the object name. I counted over 4000 allocations for only 30 seconds of runtime, so this change greatly reduces pool fragmentation and increases speed. (Implementation is similar to the IRP lookaside list implementation, but inlined for speed). * Fix some cases where we weren't freeing captured informa
by ion＠svn.reactos.org 29 May '06

29 May '06

Author: ion Date: Mon May 29 07:32:43 2006 New Revision: 22100 URL: http://svn.reactos.ru/svn/reactos?rev=22100&view=rev Log: - Object Manager Improvements (3 of 3): * Implement Per-Processor Lookaside List based allocation and de-allocation of the Object Create Information (object attributes capture) and of the object name. I counted over 4000 allocations for only 30 seconds of runtime, so this change greatly reduces pool fragmentation and increases speed. (Implementation is similar to the IRP lookaside list implementation, but inlined for speed). * Fix some cases where we weren't freeing captured information properly. This patch should also decrease memory leaks/usage. * Comment/formatting fixes. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=22… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Mon May 29 07:32:43 2006 @@ -6168,6 +6168,17 @@ ((STRING)->Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR) \ ) +FORCEINLINE +VOID +RtlInitEmptyUnicodeString(OUT PUNICODE_STRING UnicodeString, + IN PWSTR Buffer, + IN USHORT BufferSize) +{ + UnicodeString->Length = 0; + UnicodeString->MaximumLength = BufferSize; + UnicodeString->Buffer = Buffer; +} + NTOSAPI NTSTATUS DDKAPI Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Mon May 29 07:32:43 2006 @@ -241,7 +241,7 @@ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, PreviousMode, - CmiKeyType, + FALSE, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -471,7 +471,7 @@ ReleaseCapturedUnicodeString(&CapturedClass, PreviousMode); } - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); if (FreeRemainingPath) RtlFreeUnicodeString(&RemainingPath); if (Object != NULL) ObDereferenceObject(Object); @@ -1305,7 +1305,7 @@ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, PreviousMode, - CmiKeyType, + FALSE, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -1320,7 +1320,7 @@ if (!NT_SUCCESS(Status)) { ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); return Status; } @@ -1372,7 +1372,7 @@ PostOpenKeyInfo.Object = NT_SUCCESS(Status) ? (PVOID)Object : NULL; PostOpenKeyInfo.Status = Status; CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); if (Object) { Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Mon May 29 07:32:43 2006 @@ -712,7 +712,7 @@ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(KeyObjectAttributes, KernelMode, - CmiKeyType, + FALSE, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -729,7 +729,7 @@ NULL, NULL); ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); if (!NT_SUCCESS(Status)) { return Status; Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=2210… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Mon May 29 07:32:43 2006 @@ -514,6 +514,9 @@ /* Check if the structures match the ASM offset constants */ ExecuteRuntimeAsserts(); + /* Set 1 CPU for now, we'll increment this later */ + KeNumberProcessors = 1; + /* Sets up the Text Sections of the Kernel and HAL for debugging */ LdrInit1(); @@ -554,21 +557,18 @@ /* Load basic Security for other Managers */ if (!SeInit1()) KEBUGCHECK(SECURITY_INITIALIZATION_FAILED); + /* Initialize Lookaside Lists */ + ExpInitLookasideLists(); + /* Create the Basic Object Manager Types to allow new Object Types */ ObInit(); - /* Initialize Lookaside Lists */ - ExpInitLookasideLists(); - /* Set up Region Maps, Sections and the Paging File */ MmInit2(); /* Initialize Tokens now that the Object Manager is ready */ if (!SeInit2()) KEBUGCHECK(SECURITY1_INITIALIZATION_FAILED); - /* Set 1 CPU for now, we'll increment this later */ - KeNumberProcessors = 1; - /* Initalize the Process Manager */ PiInitProcessManager(); 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 Mon May 29 07:32:43 2006 @@ -32,6 +32,7 @@ extern PHANDLE_TABLE ObpKernelHandleTable; extern WORK_QUEUE_ITEM ObpReaperWorkItem; extern volatile PVOID ObpReaperList; +extern NPAGED_LOOKASIDE_LIST ObpNmLookasideList, ObpCiLookasideList; BOOLEAN NTAPI @@ -221,14 +222,15 @@ PVOID Object ); -/* Secure object information functions */ +/* Object Create and Object Name Capture Functions */ NTSTATUS STDCALL ObpCaptureObjectName( IN PUNICODE_STRING CapturedName, IN PUNICODE_STRING ObjectName, - IN KPROCESSOR_MODE AccessMode + IN KPROCESSOR_MODE AccessMode, + IN BOOLEAN AllocateFromLookaside ); NTSTATUS @@ -236,17 +238,124 @@ ObpCaptureObjectAttributes( IN POBJECT_ATTRIBUTES ObjectAttributes, IN KPROCESSOR_MODE AccessMode, - IN POBJECT_TYPE ObjectType, + IN BOOLEAN AllocateFromLookaside, IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, OUT PUNICODE_STRING ObjectName ); VOID -STDCALL -ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo); - -/* object information classes */ - - +static __inline +ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) +{ + /* Check if we have a security descriptor */ + if (ObjectCreateInfo->SecurityDescriptor) + { + /* Release it */ + SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, + ObjectCreateInfo->ProbeMode, + TRUE); + ObjectCreateInfo->SecurityDescriptor = NULL; + } +} + +PVOID +static __inline +ObpAllocateCapturedAttributes(IN PP_NPAGED_LOOKASIDE_NUMBER Type) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + PVOID Buffer; + PNPAGED_LOOKASIDE_LIST List; + + /* Get the P list first */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].P; + + /* Attempt allocation */ + List->L.TotalAllocates++; + Buffer = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); + if (!Buffer) + { + /* Let the balancer know that the P list failed */ + List->L.AllocateMisses++; + + /* Try the L List */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].L; + List->L.TotalAllocates++; + Buffer = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); + if (!Buffer) + { + /* Let the balancer know the L list failed too */ + List->L.AllocateMisses++; + + /* Allocate it */ + Buffer = List->L.Allocate(List->L.Type, List->L.Size, List->L.Tag); + } + } + + /* Return buffer */ + return Buffer; +} + +VOID +static __inline +ObpFreeCapturedAttributes(IN PVOID Buffer, + IN PP_NPAGED_LOOKASIDE_NUMBER Type) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + PNPAGED_LOOKASIDE_LIST List; + + /* Use the P List */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].P; + List->L.TotalFrees++; + + /* Check if the Free was within the Depth or not */ + if (ExQueryDepthSList(&List->L.ListHead) >= List->L.Depth) + { + /* Let the balancer know */ + List->L.FreeMisses++; + + /* Use the L List */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[Type].L; + List->L.TotalFrees++; + + /* Check if the Free was within the Depth or not */ + if (ExQueryDepthSList(&List->L.ListHead) >= List->L.Depth) + { + /* All lists failed, use the pool */ + List->L.FreeMisses++; + List->L.Free(Buffer); + } + } + else + { + /* The free was within the Depth */ + InterlockedPushEntrySList(&List->L.ListHead, + (PSINGLE_LIST_ENTRY)Buffer); + } +} + +VOID +static __inline +ObpReleaseCapturedName(IN PUNICODE_STRING Name) +{ + /* We know this is a pool-allocation if the size doesn't match */ + if (Name->MaximumLength != 248) + { + ExFreePool(Name->Buffer); + } + else + { + /* Otherwise, free from the lookaside */ + ObpFreeCapturedAttributes(Name, LookasideNameBufferList); + } +} + +VOID +static __inline +ObpFreeAndReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) +{ + /* First release the attributes, then free them from the lookaside list */ + ObpReleaseCapturedAttributes(ObjectCreateInfo); + ObpFreeCapturedAttributes(ObjectCreateInfo, LookasideCreateInfoList); +} #endif /* __INCLUDE_INTERNAL_OBJMGR_H */ Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2210… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Mon May 29 07:32:43 2006 @@ -962,7 +962,7 @@ Status = ObpCaptureObjectAttributes(ObjectAttributes, AccessMode, - NULL, + FALSE, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -977,7 +977,7 @@ 0, NULL); ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); /* FIXME: wt... */ @@ -2415,7 +2415,7 @@ { Status = ObpCaptureObjectAttributes(ObjectAttributes, AccessMode, - NULL, + FALSE, &ObjectCreateInfo, &ObjectName); } @@ -2440,7 +2440,7 @@ if (AccessMode != KernelMode) { ObpReleaseCapturedAttributes(&ObjectCreateInfo); - ExFreePool(ObjectName.Buffer); + if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); } if (!NT_SUCCESS (Status)) { 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 Mon May 29 07:32:43 2006 @@ -767,7 +767,7 @@ /* Capture all the info */ Status = ObpCaptureObjectAttributes(ObjectAttributes, AccessMode, - ObjectType, + TRUE, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) return Status; @@ -828,7 +828,7 @@ /* Release the object attributes and return status */ Quickie: ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); return Status; } @@ -1054,8 +1054,7 @@ /* We can delete the Create Info now */ Header->ObjectCreateInfo = NULL; - ObpReleaseCapturedAttributes(ObjectCreateInfo); - ExFreePool(ObjectCreateInfo); + ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo); DPRINT("Status %x\n", Status); return Status; Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Mon May 29 07:32:43 2006 @@ -43,6 +43,90 @@ VOID INIT_FUNCTION +ObInit2(VOID) +{ + ULONG i; + PKPRCB Prcb; + PNPAGED_LOOKASIDE_LIST CurrentList = NULL; + + /* Initialize the OBJECT_CREATE_INFORMATION List */ + ExInitializeNPagedLookasideList(&ObpCiLookasideList, + NULL, + NULL, + 0, + sizeof(OBJECT_CREATE_INFORMATION), + TAG('O', 'b', 'C', 'I'), + 32); + + /* Set the captured UNICODE_STRING Object Name List */ + ExInitializeNPagedLookasideList(&ObpNmLookasideList, + NULL, + NULL, + 0, + 248, + TAG('O', 'b', 'N', 'M'), + 16); + + /* Now allocate the per-processor lists */ + for (i = 0; i < KeNumberProcessors; i++) + { + /* Get the PRCB for this CPU */ + Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; + + /* Set the OBJECT_CREATE_INFORMATION List */ + Prcb->PPLookasideList[LookasideCreateInfoList].L = &ObpCiLookasideList.L; + CurrentList = ExAllocatePoolWithTag(NonPagedPool, + sizeof(NPAGED_LOOKASIDE_LIST), + TAG('O', 'b', 'C', 'I')); + if (CurrentList) + { + /* Initialize it */ + ExInitializeNPagedLookasideList(CurrentList, + NULL, + NULL, + 0, + sizeof(OBJECT_CREATE_INFORMATION), + TAG('O', 'b', 'C', 'I'), + 32); + } + else + { + /* No list, use the static buffer */ + CurrentList = &ObpCiLookasideList; + } + + /* Link it */ + Prcb->PPLookasideList[LookasideCreateInfoList].P = &CurrentList->L; + + /* Set the captured UNICODE_STRING Object Name List */ + Prcb->PPLookasideList[LookasideNameBufferList].L = &ObpNmLookasideList.L; + CurrentList = ExAllocatePoolWithTag(NonPagedPool, + sizeof(NPAGED_LOOKASIDE_LIST), + TAG('O', 'b', 'N', 'M')); + if (CurrentList) + { + /* Initialize it */ + ExInitializeNPagedLookasideList(CurrentList, + NULL, + NULL, + 0, + 248, + TAG('O', 'b', 'N', 'M'), + 16); + } + else + { + /* No list, use the static buffer */ + CurrentList = &ObpNmLookasideList; + } + + /* Link it */ + Prcb->PPLookasideList[LookasideNameBufferList].P = &CurrentList->L; + } +} + +VOID +INIT_FUNCTION ObInit(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; @@ -59,6 +143,9 @@ /* Setup the Object Reaper */ ExInitializeWorkItem(&ObpReaperWorkItem, ObpReapObject, NULL); + + /* Initialize lookaside lists */ + ObInit2(); /* Create the Type Type */ DPRINT("Creating Type Type\n"); @@ -72,7 +159,7 @@ ObjectTypeInitializer.GenericMapping = ObpTypeMapping; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_TYPE); ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObTypeObjectType); - + /* Create the Directory Type */ DPRINT("Creating Directory Type\n"); RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Mon May 29 07:32:43 2006 @@ -21,6 +21,9 @@ POBJECT_TYPE ObTypeObjectType = NULL; KEVENT ObpDefaultObject; + +NPAGED_LOOKASIDE_LIST ObpNmLookasideList, ObpCiLookasideList; + WORK_QUEUE_ITEM ObpReaperWorkItem; volatile PVOID ObpReaperList; @@ -64,7 +67,7 @@ if (Header->ObjectCreateInfo) { /* Free it */ - ObpReleaseCapturedAttributes(Header->ObjectCreateInfo); + ObpFreeAndReleaseCapturedAttributes(Header->ObjectCreateInfo); Header->ObjectCreateInfo = NULL; } } @@ -178,31 +181,30 @@ } NTSTATUS -STDCALL +NTAPI ObpCaptureObjectName(IN OUT PUNICODE_STRING CapturedName, IN PUNICODE_STRING ObjectName, - IN KPROCESSOR_MODE AccessMode) + IN KPROCESSOR_MODE AccessMode, + IN BOOLEAN AllocateFromLookaside) { NTSTATUS Status = STATUS_SUCCESS; - ULONG StringLength; + ULONG StringLength, MaximumLength; PWCHAR StringBuffer = NULL; UNICODE_STRING LocalName = {}; /* <= GCC 4.0 + Optimizer */ - + PAGED_CODE(); + /* Initialize the Input String */ - RtlInitUnicodeString(CapturedName, NULL); + RtlInitEmptyUnicodeString(CapturedName, NULL, 0); /* Protect everything */ _SEH_TRY { - /* First Probe the String */ - DPRINT("ObpCaptureObjectName: %wZ\n", ObjectName); + /* Check if we came from user mode */ if (AccessMode != KernelMode) { - ProbeForRead(ObjectName, - sizeof(UNICODE_STRING), - sizeof(USHORT)); + /* First Probe the String */ + ProbeForReadUnicodeString(ObjectName); LocalName = *ObjectName; - ProbeForRead(LocalName.Buffer, LocalName.Length, sizeof(WCHAR)); @@ -214,13 +216,12 @@ } /* Make sure there really is a string */ - DPRINT("Probing OK\n"); if ((StringLength = LocalName.Length)) { /* Check that the size is a valid WCHAR multiple */ if ((StringLength & (sizeof(WCHAR) - 1)) || /* Check that the NULL-termination below will work */ - (StringLength == (MAXUSHORT - sizeof(WCHAR) + 1))) + (StringLength == (MAXUSHORT - sizeof(UNICODE_NULL) + 1))) { /* PS: Please keep the checks above expanded for clarity */ DPRINT1("Invalid String Length\n"); @@ -228,19 +229,36 @@ } else { - /* Allocate a non-paged buffer for this string */ - DPRINT("Capturing String\n"); + /* Set the maximum length to the length plus the terminator */ + MaximumLength = StringLength + sizeof(UNICODE_NULL); + + /* Check if we should use the lookaside buffer */ + //if (!(AllocateFromLookaside) || (MaximumLength > 248)) + { + /* Nope, allocate directly from pool */ + StringBuffer = ExAllocatePoolWithTag(NonPagedPool, + MaximumLength, + OB_NAME_TAG); + } + //else + { + /* Allocate from the lookaside */ + // MaximumLength = 248; + // StringBuffer = + // ObpAllocateCapturedAttributes(LookasideNameBufferList); + } + + /* Setup the string */ CapturedName->Length = StringLength; - CapturedName->MaximumLength = StringLength + sizeof(WCHAR); - if ((StringBuffer = ExAllocatePoolWithTag(NonPagedPool, - StringLength + sizeof(WCHAR), - OB_NAME_TAG))) - { + CapturedName->MaximumLength = MaximumLength; + CapturedName->Buffer = StringBuffer; + + /* Make sure we have a buffer */ + if (StringBuffer) + { /* Copy the string and null-terminate it */ RtlMoveMemory(StringBuffer, LocalName.Buffer, StringLength); StringBuffer[StringLength / sizeof(WCHAR)] = UNICODE_NULL; - CapturedName->Buffer = StringBuffer; - DPRINT("String Captured: %wZ\n", CapturedName); } else { @@ -254,23 +272,19 @@ _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { Status = _SEH_GetExceptionCode(); - - /* Remember to free the buffer in case of failure */ - DPRINT1("Failed\n"); if (StringBuffer) ExFreePool(StringBuffer); } _SEH_END; - + /* Return */ - DPRINT("Returning: %lx\n", Status); return Status; } NTSTATUS -STDCALL +NTAPI ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, IN KPROCESSOR_MODE AccessMode, - IN POBJECT_TYPE ObjectType, + IN BOOLEAN AllocateFromLookaside, IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, OUT PUNICODE_STRING ObjectName) { @@ -278,90 +292,92 @@ PSECURITY_DESCRIPTOR SecurityDescriptor; PSECURITY_QUALITY_OF_SERVICE SecurityQos; PUNICODE_STRING LocalObjectName = NULL; + PAGED_CODE(); /* Zero out the Capture Data */ - DPRINT("ObpCaptureObjectAttributes\n"); RtlZeroMemory(ObjectCreateInfo, sizeof(OBJECT_CREATE_INFORMATION)); - + /* SEH everything here for protection */ _SEH_TRY { - /* Check if we got Oba */ + /* Check if we got attributes */ if (ObjectAttributes) { + /* Check if we're in user mode */ if (AccessMode != KernelMode) { - DPRINT("Probing OBA\n"); + /* Probe the attributes */ ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); } - + /* Validate the Size and Attributes */ - DPRINT("Validating OBA\n"); if ((ObjectAttributes->Length != sizeof(OBJECT_ATTRIBUTES)) || (ObjectAttributes->Attributes & ~OBJ_VALID_ATTRIBUTES)) { + /* Invalid combination, fail */ Status = STATUS_INVALID_PARAMETER; - DPRINT1("Invalid Size: %lx or Attributes: %lx\n", - ObjectAttributes->Length, ObjectAttributes->Attributes); _SEH_LEAVE; } - + /* Set some Create Info */ - DPRINT("Creating OBCI\n"); ObjectCreateInfo->RootDirectory = ObjectAttributes->RootDirectory; ObjectCreateInfo->Attributes = ObjectAttributes->Attributes; LocalObjectName = ObjectAttributes->ObjectName; SecurityDescriptor = ObjectAttributes->SecurityDescriptor; SecurityQos = ObjectAttributes->SecurityQualityOfService; - - /* Validate the SD */ + + /* Check if we have a security descriptor */ if (SecurityDescriptor) { - DPRINT("Probing SD: %x\n", SecurityDescriptor); + /* Capture it */ Status = SeCaptureSecurityDescriptor(SecurityDescriptor, AccessMode, NonPagedPool, TRUE, - &ObjectCreateInfo->SecurityDescriptor); + &ObjectCreateInfo-> + SecurityDescriptor); if(!NT_SUCCESS(Status)) { - DPRINT1("Unable to capture the security descriptor!!!\n"); + /* Capture failed, quit */ ObjectCreateInfo->SecurityDescriptor = NULL; _SEH_LEAVE; } - - DPRINT("Probe done\n"); + + /* Save the probe mode and security descriptor size */ ObjectCreateInfo->SecurityDescriptorCharge = 2048; /* FIXME */ ObjectCreateInfo->ProbeMode = AccessMode; } - - /* Validate the QoS */ + + /* Check if we have QoS */ if (SecurityQos) { + /* Check if we came from user mode */ if (AccessMode != KernelMode) { - DPRINT("Probing QoS\n"); + /* Validate the QoS */ ProbeForRead(SecurityQos, sizeof(SECURITY_QUALITY_OF_SERVICE), sizeof(ULONG)); } - + /* Save Info */ ObjectCreateInfo->SecurityQualityOfService = *SecurityQos; - ObjectCreateInfo->SecurityQos = &ObjectCreateInfo->SecurityQualityOfService; + ObjectCreateInfo->SecurityQos = + &ObjectCreateInfo->SecurityQualityOfService; } } else { + /* We don't have a name */ LocalObjectName = NULL; } } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + /* Get the exception */ Status = _SEH_GetExceptionCode(); - DPRINT1("Failed\n"); } _SEH_END; @@ -370,46 +386,29 @@ /* Now check if the Object Attributes had an Object Name */ if (LocalObjectName) { - DPRINT("Name Buffer: %wZ\n", LocalObjectName); Status = ObpCaptureObjectName(ObjectName, LocalObjectName, - AccessMode); + AccessMode, + AllocateFromLookaside); } else { /* Clear the string */ - RtlInitUnicodeString(ObjectName, NULL); + RtlInitEmptyUnicodeString(ObjectName, NULL, 0); /* He can't have specified a Root Directory */ if (ObjectCreateInfo->RootDirectory) { - DPRINT1("Invalid name\n"); Status = STATUS_OBJECT_NAME_INVALID; } } } - else - { - DPRINT1("Failed to capture, cleaning up\n"); - ObpReleaseCapturedAttributes(ObjectCreateInfo); - } - - DPRINT("Return to caller %x\n", Status); + + /* Cleanup if we failed */ + if (!NT_SUCCESS(Status)) ObpReleaseCapturedAttributes(ObjectCreateInfo); + + /* Return status to caller */ return Status; -} - -VOID -STDCALL -ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) -{ - /* Release the SD, it's the only thing we allocated */ - if (ObjectCreateInfo->SecurityDescriptor) - { - SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, - ObjectCreateInfo->ProbeMode, - TRUE); - ObjectCreateInfo->SecurityDescriptor = NULL; - } } NTSTATUS @@ -688,20 +687,17 @@ POBJECT_CREATE_INFORMATION ObjectCreateInfo; UNICODE_STRING ObjectName; POBJECT_HEADER Header; - DPRINT("ObCreateObject(Type %p ObjectAttributes %p, Object %p)\n", Type, ObjectAttributes, Object); - /* Allocate a Buffer for the Object Create Info */ - ObjectCreateInfo = ExAllocatePoolWithTag(NonPagedPool, - sizeof(*ObjectCreateInfo), - TAG('O','b','C', 'I')); + /* Allocate a capture buffer */ + ObjectCreateInfo = ObpAllocateCapturedAttributes(LookasideCreateInfoList); if (!ObjectCreateInfo) return STATUS_INSUFFICIENT_RESOURCES; /* Capture all the info */ Status = ObpCaptureObjectAttributes(ObjectAttributes, ObjectAttributesAccessMode, - Type, + FALSE, ObjectCreateInfo, &ObjectName); if (NT_SUCCESS(Status)) @@ -730,32 +726,32 @@ { /* Return the Object */ *Object = &Header->Body; - - /* Check if this is a permanent object */ - if (Header->Flags & OB_FLAG_PERMANENT) + + /* Check if this is a permanent object */ + if (Header->Flags & OB_FLAG_PERMANENT) + { + /* Do the privilege check */ + if (!SeSinglePrivilegeCheck(SeCreatePermanentPrivilege, + ObjectAttributesAccessMode)) { - /* Do the privilege check */ - if (!SeSinglePrivilegeCheck(SeCreatePermanentPrivilege, - ObjectAttributesAccessMode)) - { - /* Fail */ - ObpDeallocateObject(*Object); - Status = STATUS_PRIVILEGE_NOT_HELD; - } + /* Fail */ + ObpDeallocateObject(*Object); + Status = STATUS_PRIVILEGE_NOT_HELD; } - - /* Return status */ + } + + /* Return status */ return Status; } } /* Release the Capture Info, we don't need it */ ObpReleaseCapturedAttributes(ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); } /* We failed, so release the Buffer */ - ExFreePool(ObjectCreateInfo); + ObpFreeCapturedAttributes(ObjectCreateInfo, LookasideCreateInfoList); return Status; } Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=221… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Mon May 29 07:32:43 2006 @@ -216,7 +216,7 @@ ACCESS_STATE AccessState; /* Capture the name */ - Status = ObpCaptureObjectName(&ObjectName, ObjectPath, AccessMode); + Status = ObpCaptureObjectName(&ObjectName, ObjectPath, AccessMode, TRUE); if (!NT_SUCCESS(Status)) return Status; /* Check if we didn't get an access state */ @@ -264,7 +264,7 @@ Quickie: /* Free the captured name if we had one, and return status */ - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); return Status; }

1 0

[ion] 22099: - Object Manager Fixes (2 of 3): * Remove superflous debug prints used a long time ago while debugging * Set the CreatorUniqueProcess * Align code to 80 chars * Do a privilege check of OB_FLAG_PERMANENT is being used, and de-allocate the object if this failed. * Send the PreviousMode to ObpAllocateObject so that it can honor it and set the OB_FLAG_KERNEL_MODE flag. * Use OBJECT_TYPE accounting to increase TotalNumberOfObjects. * Fail ObCreateObject in low-memory situations instead o
by ion＠svn.reactos.org 29 May '06

29 May '06

Author: ion Date: Mon May 29 04:18:36 2006 New Revision: 22099 URL: http://svn.reactos.ru/svn/reactos?rev=22099&view=rev Log: - Object Manager Fixes (2 of 3): * Remove superflous debug prints used a long time ago while debugging * Set the CreatorUniqueProcess * Align code to 80 chars * Do a privilege check of OB_FLAG_PERMANENT is being used, and de-allocate the object if this failed. * Send the PreviousMode to ObpAllocateObject so that it can honor it and set the OB_FLAG_KERNEL_MODE flag. * Use OBJECT_TYPE accounting to increase TotalNumberOfObjects. * Fail ObCreateObject in low-memory situations instead of ignoring it. * Respect OBJECT_TYPE.TypeInfo.InvalidAttributes if an attempt is to create an object with invalid attributes is detected. * Respect PagedPoolCharge and NonPagedPoolCharge parameters and save them in the OBJECT_CREATE_INFORMATION strucutre. Modified: trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Mon May 29 04:18:36 2006 @@ -56,6 +56,9 @@ /* Initialize the Default Event */ KeInitializeEvent(&ObpDefaultObject, NotificationEvent, TRUE ); + + /* Setup the Object Reaper */ + ExInitializeWorkItem(&ObpReaperWorkItem, ObpReapObject, NULL); /* Create the Type Type */ DPRINT("Creating Type Type\n"); Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Mon May 29 04:18:36 2006 @@ -398,7 +398,6 @@ return Status; } - VOID STDCALL ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) @@ -414,12 +413,13 @@ } NTSTATUS -STDCALL -ObpAllocateObject(POBJECT_CREATE_INFORMATION ObjectCreateInfo, - PUNICODE_STRING ObjectName, - POBJECT_TYPE ObjectType, - ULONG ObjectSize, - POBJECT_HEADER *ObjectHeader) +NTAPI +ObpAllocateObject(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, + IN PUNICODE_STRING ObjectName, + IN POBJECT_TYPE ObjectType, + IN ULONG ObjectSize, + IN KPROCESSOR_MODE PreviousMode, + IN POBJECT_HEADER *ObjectHeader) { POBJECT_HEADER Header; BOOLEAN HasHandleInfo = FALSE; @@ -431,9 +431,9 @@ POOL_TYPE PoolType; ULONG FinalSize = ObjectSize; ULONG Tag; + PAGED_CODE(); /* If we don't have an Object Type yet, force NonPaged */ - DPRINT("ObpAllocateObject\n"); if (!ObjectType) { PoolType = NonPagedPool; @@ -445,7 +445,6 @@ Tag = ObjectType->Key; } - DPRINT("Checking ObjectName: %x\n", ObjectName); /* Check if the Object has a name */ if (ObjectName->Buffer) { @@ -456,7 +455,6 @@ if (ObjectType) { /* Check if the Object maintains handle counts */ - DPRINT("Checking ObjectType->TypeInfo: %x\n", &ObjectType->TypeInfo); if (ObjectType->TypeInfo.MaintainHandleCount) { FinalSize += sizeof(OBJECT_HEADER_HANDLE_INFO); @@ -472,18 +470,13 @@ } /* Allocate memory for the Object and Header */ - DPRINT("Allocating: %x %x\n", FinalSize, Tag); Header = ExAllocatePoolWithTag(PoolType, FinalSize, Tag); - if (!Header) { - DPRINT1("Not enough memory!\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } + if (!Header) return STATUS_INSUFFICIENT_RESOURCES; /* Initialize Handle Info */ if (HasHandleInfo) { HandleInfo = (POBJECT_HEADER_HANDLE_INFO)Header; - DPRINT("Info: %x\n", HandleInfo); HandleInfo->SingleEntry.HandleCount = 0; Header = (POBJECT_HEADER)(HandleInfo + 1); } @@ -492,7 +485,6 @@ if (HasNameInfo) { NameInfo = (POBJECT_HEADER_NAME_INFO)Header; - DPRINT("Info: %x %wZ\n", NameInfo, ObjectName); NameInfo->Name = *ObjectName; NameInfo->Directory = NULL; Header = (POBJECT_HEADER)(NameInfo + 1); @@ -502,48 +494,56 @@ if (HasCreatorInfo) { CreatorInfo = (POBJECT_HEADER_CREATOR_INFO)Header; - DPRINT("Info: %x\n", CreatorInfo); - /* FIXME: Needs Alex's Init patch - * CreatorInfo->CreatorUniqueProcess = PsGetCurrentProcessId(); - */ + CreatorInfo->CreatorUniqueProcess = PsGetCurrentProcess() ? + PsGetCurrentProcessId() : 0; InitializeListHead(&CreatorInfo->TypeList); Header = (POBJECT_HEADER)(CreatorInfo + 1); } /* Initialize the object header */ RtlZeroMemory(Header, ObjectSize); - DPRINT("Initalized header %p\n", Header); - Header->HandleCount = 0; Header->PointerCount = 1; Header->Type = ObjectType; Header->Flags = OB_FLAG_CREATE_INFO; + Header->ObjectCreateInfo = ObjectCreateInfo; /* Set the Offsets for the Info */ if (HasHandleInfo) { - Header->HandleInfoOffset = HasNameInfo * sizeof(OBJECT_HEADER_NAME_INFO) + + Header->HandleInfoOffset = HasNameInfo * + sizeof(OBJECT_HEADER_NAME_INFO) + sizeof(OBJECT_HEADER_HANDLE_INFO) + - HasCreatorInfo * sizeof(OBJECT_HEADER_CREATOR_INFO); + HasCreatorInfo * + sizeof(OBJECT_HEADER_CREATOR_INFO); + + /* Set the flag so we know when freeing */ Header->Flags |= OB_FLAG_SINGLE_PROCESS; } if (HasNameInfo) { Header->NameInfoOffset = sizeof(OBJECT_HEADER_NAME_INFO) + - HasCreatorInfo * sizeof(OBJECT_HEADER_CREATOR_INFO); + HasCreatorInfo * + sizeof(OBJECT_HEADER_CREATOR_INFO); } if (HasCreatorInfo) Header->Flags |= OB_FLAG_CREATOR_INFO; - - if (ObjectCreateInfo && ObjectCreateInfo->Attributes & OBJ_PERMANENT) - { + if ((ObjectCreateInfo) && (ObjectCreateInfo->Attributes & OBJ_PERMANENT)) + { + /* Set the needed flag so we can check */ Header->Flags |= OB_FLAG_PERMANENT; } - if (ObjectCreateInfo && ObjectCreateInfo->Attributes & OBJ_EXCLUSIVE) - { + if ((ObjectCreateInfo) && (ObjectCreateInfo->Attributes & OBJ_EXCLUSIVE)) + { + /* Set the needed flag so we can check */ Header->Flags |= OB_FLAG_EXCLUSIVE; } - - /* Link stuff to Object Header */ - Header->ObjectCreateInfo = ObjectCreateInfo; + if (PreviousMode == KernelMode) + { + /* Set the kernel flag */ + Header->Flags |= OB_FLAG_KERNEL_MODE; + } + + /* Increase the number of objects of this type */ + if (ObjectType) ObjectType->TotalNumberOfObjects++; /* Return Header */ *ObjectHeader = Header; @@ -560,41 +560,34 @@ POBJECT_TYPE LocalObjectType; ULONG HeaderSize; NTSTATUS Status; - - DPRINT("ObpCreateTypeObject(ObjectType: %wZ)\n", TypeName); - + CHAR Tag[4]; + OBP_LOOKUP_CONTEXT Context; + /* Allocate the Object */ Status = ObpAllocateObject(NULL, TypeName, ObTypeObjectType, sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), + KernelMode, (POBJECT_HEADER*)&Header); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObpAllocateObject failed!\n"); - return Status; - } - + if (!NT_SUCCESS(Status)) return Status; LocalObjectType = (POBJECT_TYPE)&Header->Body; - DPRINT("Local ObjectType: %p Header: %p \n", LocalObjectType, Header); /* Check if this is the first Object Type */ if (!ObTypeObjectType) { ObTypeObjectType = LocalObjectType; Header->Type = ObTypeObjectType; + LocalObjectType->TotalNumberOfObjects = 1; LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); } else { - CHAR Tag[4]; + /* Set Tag */ Tag[0] = TypeName->Buffer[0]; Tag[1] = TypeName->Buffer[1]; Tag[2] = TypeName->Buffer[2]; Tag[3] = TypeName->Buffer[3]; - - /* Set Tag */ - DPRINT("Convert: %s \n", Tag); LocalObjectType->Key = *(PULONG)Tag; } @@ -662,7 +655,6 @@ /* Insert it into the Object Directory */ if (ObpTypeDirectoryObject) { - OBP_LOOKUP_CONTEXT Context; Context.Directory = ObpTypeDirectoryObject; Context.DirectoryLocked = TRUE; ObpLookupEntryDirectory(ObpTypeDirectoryObject, @@ -701,46 +693,68 @@ Type, ObjectAttributes, Object); /* Allocate a Buffer for the Object Create Info */ - DPRINT("Allocating Create Buffer\n"); ObjectCreateInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ObjectCreateInfo), TAG('O','b','C', 'I')); + if (!ObjectCreateInfo) return STATUS_INSUFFICIENT_RESOURCES; /* Capture all the info */ - DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, ObjectAttributesAccessMode, Type, ObjectCreateInfo, &ObjectName); - if (NT_SUCCESS(Status)) { - /* Allocate the Object */ - DPRINT("Allocating: %wZ\n", &ObjectName); - Status = ObpAllocateObject(ObjectCreateInfo, - &ObjectName, - Type, - ObjectSize + sizeof(OBJECT_HEADER), - &Header); - if (NT_SUCCESS(Status)) - { - /* Return the Object */ - DPRINT("Returning Object\n"); - *Object = &Header->Body; - - /* Return to caller, leave the Capture Info Alive for ObInsert */ - return Status; + /* Validate attributes */ + if (Type->TypeInfo.InvalidAttributes & + ObjectCreateInfo->Attributes) + { + /* Fail */ + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* Save the pool charges */ + ObjectCreateInfo->PagedPoolCharge = PagedPoolCharge; + ObjectCreateInfo->NonPagedPoolCharge = NonPagedPoolCharge; + + /* Allocate the Object */ + Status = ObpAllocateObject(ObjectCreateInfo, + &ObjectName, + Type, + ObjectSize + sizeof(OBJECT_HEADER), + AccessMode, + &Header); + if (NT_SUCCESS(Status)) + { + /* Return the Object */ + *Object = &Header->Body; + + /* Check if this is a permanent object */ + if (Header->Flags & OB_FLAG_PERMANENT) + { + /* Do the privilege check */ + if (!SeSinglePrivilegeCheck(SeCreatePermanentPrivilege, + ObjectAttributesAccessMode)) + { + /* Fail */ + ObpDeallocateObject(*Object); + Status = STATUS_PRIVILEGE_NOT_HELD; + } + } + + /* Return status */ + return Status; + } } /* Release the Capture Info, we don't need it */ - DPRINT1("Allocation failed\n"); ObpReleaseCapturedAttributes(ObjectCreateInfo); if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); } /* We failed, so release the Buffer */ - DPRINT1("Capture failed\n"); ExFreePool(ObjectCreateInfo); return Status; }

1 0

[ion] 22098: - Object Manager Improvement Patch 1/3: - Re-implement delayed object deletion by using an optimized Object Reaper based on OBJECT_HEADER->NextToFree. Thanks to Thomas for the algorithm. - Refactor object deletion into two operations: Removal and de-allocation (this is needed for failure during allocation, which we don't do yet). - BugFixes: * After freeing an object header structure, also clear the pointer so we don't attempt it again. * Clear the handle database if there is one *
by ion＠svn.reactos.org 29 May '06

29 May '06

Author: ion Date: Mon May 29 04:05:07 2006 New Revision: 22098 URL: http://svn.reactos.ru/svn/reactos?rev=22098&view=rev Log: - Object Manager Improvement Patch 1/3: - Re-implement delayed object deletion by using an optimized Object Reaper based on OBJECT_HEADER->NextToFree. Thanks to Thomas for the algorithm. - Refactor object deletion into two operations: Removal and de-allocation (this is needed for failure during allocation, which we don't do yet). - BugFixes: * After freeing an object header structure, also clear the pointer so we don't attempt it again. * Clear the handle database if there is one * Make sure the create info flag is set before deleting captured attributes. * Use the allocation pool tag when de-allocating. * Use OBJECT_TYPE accounting for tracking the numbef of objects. * Remove the object from it's typelist if it has creator information. * Call the security procedure to delete the security descriptor. Modified: trunk/reactos/include/ndk/obtypes.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obref.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 Mon May 29 04:05:07 2006 @@ -416,7 +416,7 @@ union { LONG HandleCount; - PVOID NextToFree; + volatile PVOID NextToFree; }; POBJECT_TYPE Type; UCHAR NameInfoOffset; 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 Mon May 29 04:05:07 2006 @@ -30,6 +30,8 @@ extern POBJECT_DIRECTORY NameSpaceRoot; extern POBJECT_DIRECTORY ObpTypeDirectoryObject; extern PHANDLE_TABLE ObpKernelHandleTable; +extern WORK_QUEUE_ITEM ObpReaperWorkItem; +extern volatile PVOID ObpReaperList; BOOLEAN NTAPI @@ -157,10 +159,16 @@ STDCALL ObKillProcess(PEPROCESS Process); -NTSTATUS -ObpDeleteObjectDpcLevel( - IN POBJECT_HEADER ObjectHeader, - IN LONG OldPointerCount +VOID +FASTCALL +ObpDeleteObject( + IN PVOID Object +); + +VOID +NTAPI +ObpReapObject( + IN PVOID Unused ); /* Security descriptor cache functions */ Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Mon May 29 04:05:07 2006 @@ -21,59 +21,33 @@ POBJECT_TYPE ObTypeObjectType = NULL; KEVENT ObpDefaultObject; - -typedef struct _RETENTION_CHECK_PARAMS -{ - WORK_QUEUE_ITEM WorkItem; - POBJECT_HEADER ObjectHeader; -} RETENTION_CHECK_PARAMS, *PRETENTION_CHECK_PARAMS; +WORK_QUEUE_ITEM ObpReaperWorkItem; +volatile PVOID ObpReaperList; /* PRIVATE FUNCTIONS *********************************************************/ -static NTSTATUS -ObpDeleteObject(POBJECT_HEADER Header) -{ - PVOID HeaderLocation = Header; +VOID +FASTCALL +ObpDeallocateObject(IN PVOID Object) +{ + PVOID HeaderLocation; + POBJECT_HEADER Header; + POBJECT_TYPE ObjectType; POBJECT_HEADER_HANDLE_INFO HandleInfo; POBJECT_HEADER_NAME_INFO NameInfo; POBJECT_HEADER_CREATOR_INFO CreatorInfo; - - DPRINT("ObpDeleteObject(Header %p)\n", Header); - if (KeGetCurrentIrql() != PASSIVE_LEVEL) - { - DPRINT("ObpDeleteObject called at an unsupported IRQL. Use ObpDeleteObjectDpcLevel instead.\n"); - KEBUGCHECK(0); - } - - if (Header->Type != NULL && - Header->Type->TypeInfo.DeleteProcedure != NULL) - { - Header->Type->TypeInfo.DeleteProcedure(&Header->Body); - } - - if (Header->SecurityDescriptor != NULL) - { - ObpRemoveSecurityDescriptor(Header->SecurityDescriptor); - } - - if (OBJECT_HEADER_TO_NAME_INFO(Header)) - { - if(OBJECT_HEADER_TO_NAME_INFO(Header)->Name.Buffer) - { - ExFreePool(OBJECT_HEADER_TO_NAME_INFO(Header)->Name.Buffer); - } - } - if (Header->ObjectCreateInfo) - { - ObpReleaseCapturedAttributes(Header->ObjectCreateInfo); - ExFreePool(Header->ObjectCreateInfo); - } + PAGED_CODE(); + + /* Get the header and assume this is what we'll free */ + Header = OBJECT_TO_OBJECT_HEADER(Object); + ObjectType = Header->Type; + HeaderLocation = Header; /* To find the header, walk backwards from how we allocated */ if ((CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header))) { HeaderLocation = CreatorInfo; - } + } if ((NameInfo = OBJECT_HEADER_TO_NAME_INFO(Header))) { HeaderLocation = NameInfo; @@ -83,88 +57,124 @@ HeaderLocation = HandleInfo; } - DPRINT("ObPerformRetentionChecks() = Freeing object\n"); - ExFreePool(HeaderLocation); - - return(STATUS_SUCCESS); -} - - -VOID STDCALL -ObpDeleteObjectWorkRoutine (IN PVOID Parameter) -{ - PRETENTION_CHECK_PARAMS Params = (PRETENTION_CHECK_PARAMS)Parameter; - /* ULONG Tag; */ /* See below */ - - ASSERT(Params); - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); /* We need PAGED_CODE somewhere... */ - - /* Turn this on when we have ExFreePoolWithTag - Tag = Params->ObjectHeader->Type->Tag; */ - ObpDeleteObject(Params->ObjectHeader); - ExFreePool(Params); - /* ExFreePoolWithTag(Params, Tag); */ -} - - -NTSTATUS -ObpDeleteObjectDpcLevel(IN POBJECT_HEADER ObjectHeader, - IN LONG OldPointerCount) -{ -#if 0 - if (ObjectHeader->PointerCount < 0) - { - CPRINT("Object %p/%p has invalid reference count (%d)\n", - ObjectHeader, HEADER_TO_BODY(ObjectHeader), - ObjectHeader->PointerCount); - KEBUGCHECK(0); - } - - if (ObjectHeader->HandleCount < 0) - { - CPRINT("Object %p/%p has invalid handle count (%d)\n", - ObjectHeader, HEADER_TO_BODY(ObjectHeader), - ObjectHeader->HandleCount); - KEBUGCHECK(0); - } -#endif - - - switch (KeGetCurrentIrql ()) - { - case PASSIVE_LEVEL: - return ObpDeleteObject (ObjectHeader); - - case APC_LEVEL: - case DISPATCH_LEVEL: - { - PRETENTION_CHECK_PARAMS Params; - - /* - We use must succeed pool here because if the allocation fails - then we leak memory. - */ - Params = (PRETENTION_CHECK_PARAMS) - ExAllocatePoolWithTag(NonPagedPoolMustSucceed, - sizeof(RETENTION_CHECK_PARAMS), - ObjectHeader->Type->Key); - Params->ObjectHeader = ObjectHeader; - ExInitializeWorkItem(&Params->WorkItem, - ObpDeleteObjectWorkRoutine, - (PVOID)Params); - ExQueueWorkItem(&Params->WorkItem, - CriticalWorkQueue); - } - return STATUS_PENDING; - - default: - DPRINT("ObpDeleteObjectDpcLevel called at unsupported " - "IRQL %u!\n", KeGetCurrentIrql()); - KEBUGCHECK(0); - return STATUS_UNSUCCESSFUL; - } - - return STATUS_SUCCESS; + /* Check if we have create info */ + if (Header->Flags & OB_FLAG_CREATE_INFO) + { + /* Double-check that it exists */ + if (Header->ObjectCreateInfo) + { + /* Free it */ + ObpReleaseCapturedAttributes(Header->ObjectCreateInfo); + Header->ObjectCreateInfo = NULL; + } + } + + /* Check if a handle database was active */ + if ((HandleInfo) && (Header->Flags & OB_FLAG_SINGLE_PROCESS)) + { + /* Free it */ + ExFreePool(HandleInfo->HandleCountDatabase); + HandleInfo->HandleCountDatabase = NULL; + } + + /* Check if we have a name */ + if ((NameInfo) && (NameInfo->Name.Buffer)) + { + /* Free it */ + ExFreePool(NameInfo->Name.Buffer); + NameInfo->Name.Buffer = NULL; + } + + /* Free the object using the same allocation tag */ + ExFreePoolWithTag(HeaderLocation, + ObjectType ? TAG('T', 'j', 'b', 'O') : ObjectType->Key); + + /* Decrease the total */ + ObjectType->TotalNumberOfObjects--; +} + +VOID +FASTCALL +ObpDeleteObject(IN PVOID Object) +{ + POBJECT_HEADER Header; + POBJECT_TYPE ObjectType; + POBJECT_HEADER_NAME_INFO NameInfo; + POBJECT_HEADER_CREATOR_INFO CreatorInfo; + PAGED_CODE(); + + /* Get the header and type */ + Header = OBJECT_TO_OBJECT_HEADER(Object); + ObjectType = Header->Type; + + /* Get creator and name information */ + NameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); + CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header); + + /* Check if the object is on a type list */ + if ((CreatorInfo) && !(IsListEmpty(&CreatorInfo->TypeList))) + { + /* Remove the object from the type list */ + RemoveEntryList(&CreatorInfo->TypeList); + } + + /* Check if we have a name */ + if ((NameInfo) && (NameInfo->Name.Buffer)) + { + /* Free it */ + ExFreePool(NameInfo->Name.Buffer); + + /* Clean up the string so we don't try this again */ + RtlInitUnicodeString(&NameInfo->Name, NULL); + } + + /* Check if we have a security descriptor */ + if (Header->SecurityDescriptor) + { + ObjectType->TypeInfo.SecurityProcedure(Object, + DeleteSecurityDescriptor, + 0, + NULL, + NULL, + &Header->SecurityDescriptor, + 0, + NULL); + } + + /* Check if we have a delete procedure */ + if (ObjectType->TypeInfo.DeleteProcedure) + { + /* Call it */ + ObjectType->TypeInfo.DeleteProcedure(Object); + } + + /* Now de-allocate all object members */ + ObpDeallocateObject(Object); +} + +VOID +NTAPI +ObpReapObject(IN PVOID Parameter) +{ + POBJECT_HEADER ReapObject; + PVOID NextObject; + + /* Start reaping */ + while((ReapObject = InterlockedExchangePointer(&ObpReaperList, NULL))) + { + /* Start deletion loop */ + do + { + /* Get the next object */ + NextObject = ReapObject->NextToFree; + + /* Delete the object */ + ObpDeleteObject(&ReapObject->Body); + + /* Move to the next one */ + ReapObject = NextObject; + } while(NextObject != NULL); + } } NTSTATUS Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Mon May 29 04:05:07 2006 @@ -104,28 +104,37 @@ ObfDereferenceObject(IN PVOID Object) { POBJECT_HEADER Header; - LONG NewPointerCount; - BOOL Permanent; - - ASSERT(Object); - - /* Extract the object header. */ + + /* Extract the object header */ Header = OBJECT_TO_OBJECT_HEADER(Object); - Permanent = Header->Flags & OB_FLAG_PERMANENT; - - /* - Drop our reference and get the new count so we can tell if this was the - last reference. - */ - NewPointerCount = InterlockedDecrement(&Header->PointerCount); - DPRINT("ObfDereferenceObject(0x%x)==%d\n", Object, NewPointerCount); - ASSERT(NewPointerCount >= 0); /* Check whether the object can now be deleted. */ - if (NewPointerCount == 0 && - !Permanent) - { - ObpDeleteObjectDpcLevel(Header, NewPointerCount); + if (!(InterlockedDecrement(&Header->PointerCount)) && + !(Header->Flags & OB_FLAG_PERMANENT)) + { + /* Sanity check */ + ASSERT(!Header->HandleCount); + + /* Check if we're at PASSIVE */ + if (KeGetCurrentIrql() == PASSIVE_LEVEL) + { + /* Remove the object */ + ObpDeleteObject(Object); + } + else + { + /* Add us to the list */ + do + { + Header->NextToFree = ObpReaperList; + } while (InterlockedCompareExchangePointer(&ObpReaperList, + Header, + Header->NextToFree) != + Header->NextToFree); + + /* Queue the work item */ + ExQueueWorkItem(&ObpReaperWorkItem, DelayedWorkQueue); + } } }

1 0

[jimtabor] 22097: Fix build. Missing chg for GetOutlineTextMetrics.
by jimtabor＠svn.reactos.org 28 May '06

28 May '06

Author: jimtabor Date: Mon May 29 03:11:56 2006 New Revision: 22097 URL: http://svn.reactos.ru/svn/reactos?rev=22097&view=rev Log: Fix build. Missing chg for GetOutlineTextMetrics. Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubsa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c Mon May 29 03:11:56 2006 @@ -32,22 +32,6 @@ return 0; } -/* - * @unimplemented - */ -UINT -APIENTRY -GetOutlineTextMetricsA( - HDC hdc, - UINT cbData, - LPOUTLINETEXTMETRICA lpOTM - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubsw… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Mon May 29 03:11:56 2006 @@ -40,22 +40,6 @@ #endif } -/* - * @unimplemented - */ -UINT -APIENTRY -GetOutlineTextMetricsW( - HDC hdc, - UINT cbData, - LPOUTLINETEXTMETRICW lpOTM - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - /* * @unimplemented

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