Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

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

by fireball＠svn.reactos.org

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

18 years, 5 months

[fireball] 22301: Alex finally paid attention to my code, so I'm fixing a few things...

by fireball＠svn.reactos.org

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

18 years, 5 months

[hpoussin] 22300: After some tests, change SetupDiClassNameFromGuidExW and SetupDiGetClassDescriptionExW to match Windows XP behavior

by hpoussin＠svn.reactos.org

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

18 years, 5 months

[hpoussin] 22299: Cleanup: - Check that mandatory arguments are provided - Better tracing system - Prepend private function names with SETUP_ - Use MultiByteToUnicode instead of MultiByteToUnicode + HeapAlloc - ...

by hpoussin＠svn.reactos.org

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

18 years, 5 months

[fireball] 22298: [FORMATTING] Very small cleanup, formatting and typecasting change

by fireball＠svn.reactos.org

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

18 years, 5 months

[fireball] 22297: Revert accidental change of ntfs.sys driver's Start value made in last commit

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jun 11 00:32:25 2006 New Revision: 22297 URL: http://svn.reactos.ru/svn/reactos?rev=22297&view=rev Log: Revert accidental change of ntfs.sys driver's Start value made in last commit Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sun Jun 11 00:32:25 2006 @@ -666,7 +666,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ImagePath",0x00020000,"system32\drivers\ntfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Type",0x00010001,0x00000002 ; Null device driver

18 years, 5 months

[fireball] 22296: Add loading of kernel-mode regression testing driver into hivesys.inf (it's commented out of course by default). To run km regression tests under windows, one should use kmtloader.exe app To run them on reactos, one should copy kmtest.sys to reactos\system32\drivers, and uncomment entries in hivesys.inf

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 10 22:05:44 2006 New Revision: 22296 URL: http://svn.reactos.ru/svn/reactos?rev=22296&view=rev Log: Add loading of kernel-mode regression testing driver into hivesys.inf (it's commented out of course by default). To run km regression tests under windows, one should use kmtloader.exe app To run them on reactos, one should copy kmtest.sys to reactos\system32\drivers, and uncomment entries in hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sat Jun 10 22:05:44 2006 @@ -568,6 +568,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSysRq",0x00010001,0x00000001 +; Kernel-Mode Tests +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ErrorControl",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Group",0x00000000,"Base" +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ImagePath",0x00020000,"system32\drivers\kmtest.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Start",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Type",0x00010001,0x00000001 + ; Keyboard class driver HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Keyboard Class" @@ -659,7 +666,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ImagePath",0x00020000,"system32\drivers\ntfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Type",0x00010001,0x00000002 ; Null device driver

18 years, 5 months

[fireball] 22295: - Add create/insert object tests - Add simple referencing tests (now disabled) - All tests pass currently on Windows 2003

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 10 20:37:34 2006 New Revision: 22295 URL: http://svn.reactos.ru/svn/reactos?rev=22295&view=rev Log: - Add create/insert object tests - Add simple referencing tests (now disabled) - All tests pass currently on Windows 2003 Modified: trunk/reactos/drivers/test/kmtest/ntos_ob.c Modified: trunk/reactos/drivers/test/kmtest/ntos_ob.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_ob… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_ob.c (original) +++ trunk/reactos/drivers/test/kmtest/ntos_ob.c Sat Jun 10 20:37:34 2006 @@ -60,6 +60,9 @@ PVOID ObBody[NUM_OBTYPES]; PMY_OBJECT1 ObObject1; PMY_OBJECT2 ObObject2; +HANDLE ObHandle1[NUM_OBTYPES]; +HANDLE ObHandle2[NUM_OBTYPES]; +HANDLE DirectoryHandle; /* PRIVATE FUNCTIONS **********************************************************/ @@ -70,30 +73,34 @@ DbgPrint("DumpProc() called\n"); } +// prototype doesn't match Win2003! (causes BSOD) VOID OpenProc(IN OB_OPEN_REASON OpenReason, - IN PEPROCESS Process, + IN PEPROCESS Process, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount) +{ + DbgPrint("OpenProc() called\n"); + DbgBreakPoint(); +} + +// Tested in Win2k3 +VOID +CloseProc(IN PEPROCESS Process, IN PVOID Object, IN ACCESS_MASK GrantedAccess, - IN ULONG HandleCount) -{ - DbgPrint("OpenProc() called\n"); -} - -VOID -CloseProc(IN PEPROCESS Process, - IN PVOID Object, - IN ACCESS_MASK GrantedAccess, - IN ULONG ProcessHandleCount, - IN ULONG SystemHandleCount) -{ - DbgPrint("CloseProc() called\n"); -} - + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount) +{ + DPRINT("CloseProc() called for Object=0x%p\n", Object); +} + +// Tested in Win2k3 VOID DeleteProc(IN PVOID Object) { - DbgPrint("DeleteProc()called\n"); + DPRINT("DeleteProc() called for Object=0x%p\n", Object); } NTSTATUS @@ -115,7 +122,7 @@ VOID ObtCreateObjectTypes() { - UCHAR i; + USHORT i; NTSTATUS Status; for (i=0; i<NUM_OBTYPES; i++) @@ -135,11 +142,19 @@ ObTypeInitializer[i].MaintainHandleCount = TRUE; ObTypeInitializer[i].ValidAccessMask = OBJECT_TYPE_ALL_ACCESS; + // Test for invalid parameter + // FIXME: Make it more exact, to see which params Win2k3 checks + // existence of + Status = ObCreateObjectType(&ObTypeName[i], &ObTypeInitializer[i], + (PSECURITY_DESCRIPTOR)NULL, &ObTypes[i]); + ok(Status == STATUS_INVALID_PARAMETER, + "ObCreateObjectType returned 0x%lX", Status); + // Object procedures ObTypeInitializer[i].CloseProcedure = (OB_CLOSE_METHOD)CloseProc; ObTypeInitializer[i].DeleteProcedure = (OB_DELETE_METHOD)DeleteProc; ObTypeInitializer[i].DumpProcedure = (OB_DUMP_METHOD)DumpProc; - ObTypeInitializer[i].OpenProcedure = (OB_OPEN_METHOD)OpenProc; + //ObTypeInitializer[i].OpenProcedure = (OB_OPEN_METHOD)OpenProc; ObTypeInitializer[i].ParseProcedure = (OB_PARSE_METHOD)ParseProc; Status = ObCreateObjectType(&ObTypeName[i], &ObTypeInitializer[i], @@ -153,7 +168,6 @@ ObtCreateDirectory() { NTSTATUS Status; - HANDLE DirectoryHandle; // Directory will have permanent and case insensitive flags RtlInitUnicodeString(&ObDirectoryName, L"\\ObtDirectory"); @@ -163,17 +177,15 @@ Status = ZwCreateDirectoryObject(&DirectoryHandle, 0, &ObDirectoryAttributes); ok(Status == STATUS_SUCCESS, "Failed to create directory object with status=0x%lX", Status); - - Status = ZwClose(DirectoryHandle); - ok(Status == STATUS_SUCCESS, - "Failed to close handle with status=0x%lX", Status); } VOID ObtCreateObjects() { + PVOID ObBody1[2]; NTSTATUS Status; + // Create two objects RtlInitUnicodeString(&ObName[0], L"\\ObtDirectory\\MyObject1"); InitializeObjectAttributes(&ObAttributes[0], &ObName[0], OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -187,20 +199,175 @@ (PVOID *)&ObBody[0]); ok(Status == STATUS_SUCCESS, "Failed to create object with status=0x%lX", Status); - DPRINT("Created Object 0\n"); Status = ObCreateObject(KernelMode, ObTypes[1], &ObAttributes[1], KernelMode, NULL, (ULONG)sizeof(MY_OBJECT2), 0L, 0L, (PVOID *)&ObBody[1]); ok(Status == STATUS_SUCCESS, "Failed to create object with status=0x%lX", Status); - DPRINT("Created Object 1\n"); + + // Insert them + Status = ObInsertObject(ObBody[0], NULL, STANDARD_RIGHTS_ALL, 0, + &ObBody[0], &ObHandle1[0]); + ok(Status == STATUS_SUCCESS, + "Failed to insert object 0 with status=0x%lX", Status); + ok(ObBody[0] != NULL, "Object body = NULL"); + ok(ObHandle1[0] != NULL, "Handle = NULL"); + + Status = ObInsertObject(ObBody[1], NULL, GENERIC_ALL, 0, + &ObBody[1], &ObHandle1[1]); + ok(Status == STATUS_SUCCESS, + "Failed to insert object 1 with status=0x%lX", Status); + ok(ObBody[1] != NULL, "Object body = NULL"); + ok(ObHandle1[1] != NULL, "Handle = NULL"); + + // Now create an object of type 0, of the same name and expect it to fail + // inserting, but success creation + RtlInitUnicodeString(&ObName[0], L"\\ObtDirectory\\MyObject1"); + InitializeObjectAttributes(&ObAttributes[0], &ObName[0], OBJ_OPENIF, + NULL, NULL); + + Status = ObCreateObject(KernelMode, ObTypes[0], &ObAttributes[0], KernelMode, + NULL, (ULONG)sizeof(MY_OBJECT1), 0L, 0L, (PVOID *)&ObBody1[0]); + ok(Status == STATUS_SUCCESS, + "Failed to create object with status=0x%lX", Status); + + Status = ObInsertObject(ObBody1[0], NULL, GENERIC_ALL, 0, + &ObBody1[1], &ObHandle2[0]); + ok(Status == STATUS_OBJECT_NAME_EXISTS, + "Object insertion should have failed, but got 0x%lX", Status); + ok(ObBody[0] == ObBody1[1], + "Object bodies doesn't match, 0x%p != 0x%p", ObBody[0], ObBody1[1]); + ok(ObHandle2[0] != NULL, "Bad handle returned 0x%lX", (ULONG)ObHandle2[0]); + + // Close its handle + Status = ZwClose(ObHandle2[0]); + ok(Status == STATUS_SUCCESS, + "Failed to close handle status=0x%lX", Status); + + // Object referenced 2 times: + // 1) ObInsertObject + // 2) AdditionalReferences + ObDereferenceObject(ObBody1[1]); } VOID ObtClose() { - // TODO: Close what we have opened and free what we allocated + PVOID DirObject; + NTSTATUS Status; + //PVOID TypeObject; + //USHORT i; + //UNICODE_STRING ObPathName[NUM_OBTYPES]; + + // Close what we have opened and free what we allocated + ZwClose(ObHandle1[0]); + ZwClose(ObHandle1[1]); + ZwClose(ObHandle2[0]); + ZwClose(ObHandle2[1]); + + // Now we have to get rid of a directory object + // Since it is permanent, we have to firstly make it temporary + // and only then kill + // (this procedure is described in DDK) + Status = ObReferenceObjectByHandle(DirectoryHandle, 0L, NULL, + KernelMode, &DirObject, NULL); + ok(Status == STATUS_SUCCESS, + "Failed to reference object by handle with status=0x%lX", Status); + + // Dereference 2 times - first for just previous referencing + // and 2nd time for creation of permanent object itself + ObDereferenceObject(DirObject); + ObDereferenceObject(DirObject); + + Status = ZwMakeTemporaryObject(DirectoryHandle); + ok(Status == STATUS_SUCCESS, + "Failed to make temp object with status=0x%lX", Status); + + // Close the handle now and we are done + Status = ZwClose(DirectoryHandle); + ok(Status == STATUS_SUCCESS, + "Failed to close handle with status=0x%lX", Status); + + // Now delete the last piece - object types + // FIXME: How to do this correctly? + /* + for (i=0; i<NUM_OBTYPES; i++) + { + ObDereferenceObject(ObTypes[i]); + }*/ + /* + RtlInitUnicodeString(&ObPathName[0], L"\\ObjectTypes\\MyObjectType1"); + RtlInitUnicodeString(&ObPathName[1], L"\\ObjectTypes\\MyObjectType2"); + + for (i=0; i<NUM_OBTYPES; i++) + { + Status = ObReferenceObjectByName(&ObPathName[i], + OBJ_CASE_INSENSITIVE, NULL, 0L, NULL, KernelMode, NULL, + &TypeObject); + + ObDereferenceObject(TypeObject); + ObDereferenceObject(TypeObject); + DPRINT("Reference Name %S = %p, ObTypes[%d] = %p\n", + ObPathName[i], TypeObject, i, ObTypes[i]); + }*/ +} + +VOID +ObtReferenceTests() +{ + USHORT i; + NTSTATUS Status; + UNICODE_STRING ObPathName[NUM_OBTYPES]; + + // Reference them by handle + for (i=0; i<NUM_OBTYPES; i++) + { + Status = ObReferenceObjectByHandle(ObHandle1[i], 0L, ObTypes[i], + KernelMode, &ObBody[i], NULL); + ok(Status == STATUS_SUCCESS, + "Failed to reference object by handle, status=0x%lX", Status); + DPRINT("Ref by handle %lx = %p\n", ObHandle1[i], ObBody[i]); + } + + // Reference them by pointer + for (i=0; i<NUM_OBTYPES; i++) + { + Status = ObReferenceObjectByPointer(ObBody[i], 0L, ObTypes[i], KernelMode); + ok(Status == STATUS_SUCCESS, + "Failed to reference object by pointer, status=0x%lX", Status); + } + + // Reference them by name + RtlInitUnicodeString(&ObPathName[0], L"\\ObtDirectory\\MyObject1"); + RtlInitUnicodeString(&ObPathName[1], L"\\ObtDirectory\\MyObject2"); + + for (i=0; i<NUM_OBTYPES; i++) + { + Status = ObReferenceObjectByName(&ObPathName[i], + OBJ_CASE_INSENSITIVE, NULL, 0L, ObTypes[i], KernelMode, NULL, + &ObBody[0]); + + DPRINT("Ref by name %S = %p\n", ObPathName[i], ObBody[i]); + } + + // Dereference now all of them + + // For ObInsertObject, AdditionalReference + ObDereferenceObject(ObBody[0]); + ObDereferenceObject(ObBody[1]); + + // For ByHandle + ObDereferenceObject(ObBody[0]); + ObDereferenceObject(ObBody[1]); + + // For ByPointer + ObDereferenceObject(ObBody[0]); + ObDereferenceObject(ObBody[1]); + + // For ByName + ObDereferenceObject(ObBody[0]); + ObDereferenceObject(ObBody[1]); } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -223,7 +390,13 @@ ObtCreateObjects(); DPRINT("ObtCreateObjects() done\n"); + // Reference them in a variety of ways + // FIXME: Disabled due to ParseProcedure call + //ObtReferenceTests(); + // Clean up + // FIXME: Disabled to see results of creating objects in usermode + // and also due to problems with object types removal ObtClose(); DPRINT("Cleanup done\n");

18 years, 5 months

[ion] 22294: - Update sweep callback to send the handle number. Patch by Thomas Weidenmueller (w3seek@reactos.org) - Export ObCloseHandle since it's implemented now - Implement ObpCreateUnnamedHandle and ObpIncrementUnnamedHandleCount as optimizations for ObInsertObject with unnamed objects.

by ion＠svn.reactos.org

Author: ion Date: Sat Jun 10 04:41:16 2006 New Revision: 22294 URL: http://svn.reactos.ru/svn/reactos?rev=22294&view=rev Log: - Update sweep callback to send the handle number. Patch by Thomas Weidenmueller (w3seek(a)reactos.org) - Export ObCloseHandle since it's implemented now - Implement ObpCreateUnnamedHandle and ObpIncrementUnnamedHandleCount as optimizations for ObInsertObject with unnamed objects. Modified: trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/ntoskrnl.def trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Sat Jun 10 04:41:16 2006 @@ -168,6 +168,7 @@ IN PVOID Context OPTIONAL) { PHANDLE_TABLE_ENTRY **tlp, **lasttlp, *mlp, *lastmlp; + LONG ExHandle = 0; PAGED_CODE(); @@ -209,12 +210,18 @@ if(curee->Object != NULL && SweepHandleCallback != NULL) { curee->ObAttributes |= EX_HANDLE_ENTRY_LOCKED; - SweepHandleCallback(HandleTable, curee->Object, curee->GrantedAccess, Context); + SweepHandleCallback(curee, EX_HANDLE_TO_HANDLE(ExHandle), Context); } + + ExHandle++; } } - } - } + else + break; + } + } + else + break; } ExReleaseHandleLock(HandleTable); Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/e… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Sat Jun 10 04:41:16 2006 @@ -160,9 +160,8 @@ EX_HANDLE_ENTRY_AUDITONCLOSE) typedef VOID (STDCALL PEX_SWEEP_HANDLE_CALLBACK)( - PHANDLE_TABLE HandleTable, - PVOID Object, - ULONG GrantedAccess, + PHANDLE_TABLE_ENTRY HandleTableEntry, + HANDLE Handle, PVOID Context ); Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Sat Jun 10 04:41:16 2006 @@ -836,7 +836,7 @@ ObAssignSecurity@16 ;ObCheckCreateObjectAccess@28 ;ObCheckObjectAccess@20 -;ObCloseHandle@4 +ObCloseHandle@8 ObCreateObject@36 ObCreateObjectType@16 ObDereferenceObject@4 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 Sat Jun 10 04:41:16 2006 @@ -382,6 +382,270 @@ ObjectHeader->HandleCount, ObjectHeader->PointerCount); return STATUS_SUCCESS; +} + +/*++ +* @name ObpIncrementUnnamedHandleCount +* +* The ObpIncrementUnnamedHandleCount routine <FILLMEIN> +* +* @param Object +* <FILLMEIN>. +* +* @param AccessState +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param HandleAttributes +* <FILLMEIN>. +* +* @param Process +* <FILLMEIN>. +* +* @param OpenReason +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +ObpIncrementUnnamedHandleCount(IN PVOID Object, + IN PACCESS_MASK DesiredAccess, + IN KPROCESSOR_MODE AccessMode, + IN ULONG HandleAttributes, + IN PEPROCESS Process) +{ + POBJECT_HEADER ObjectHeader; + POBJECT_TYPE ObjectType; + ULONG ProcessHandleCount; + NTSTATUS Status; + + /* Get the object header and type */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + ObjectType = ObjectHeader->Type; + OBTRACE("OBTRACE - %s - Incrementing count for: %p. UNNAMED. HC LC %lx %lx\n", + __FUNCTION__, + Object, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + + /* Charge quota and remove the creator info flag */ + Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType); + if (!NT_SUCCESS(Status)) return Status; + + /* Convert MAXIMUM_ALLOWED to GENERIC_ALL */ + if (*DesiredAccess & MAXIMUM_ALLOWED) + { + /* Mask out MAXIMUM_ALLOWED and stick GENERIC_ALL instead */ + *DesiredAccess &= ~MAXIMUM_ALLOWED; + *DesiredAccess |= GENERIC_ALL; + } + + /* Check if we have to map the GENERIC mask */ + if (*DesiredAccess & GENERIC_ACCESS) + { + /* Map it to the correct access masks */ + RtlMapGenericMask(DesiredAccess, + &ObjectType->TypeInfo.GenericMapping); + } + + /* Increase the handle count */ + if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) + { + /* + * FIXME: Is really needed? Perhaps we should instead take + * advantage of the AddtionalReferences parameter to add the + * bias when required. This might be the source of the mysterious + * ReactOS bug where ObInsertObject *requires* an immediate dereference + * even in a success case. + * Will have to think more about this when doing the Increment/Create + * split later. + */ + ObReferenceObject(Object); + } + + /* FIXME: Use the Handle Database */ + ProcessHandleCount = 0; + + /* Check if we have an open procedure */ + if (ObjectType->TypeInfo.OpenProcedure) + { + /* Call it */ + ObjectType->TypeInfo.OpenProcedure(ObCreateHandle, + Process, + Object, + *DesiredAccess, + ProcessHandleCount); + } + + /* Increase total number of handles */ + ObjectType->TotalNumberOfHandles++; + OBTRACE("OBTRACE - %s - Incremented count for: %p. UNNAMED HC LC %lx %lx\n", + __FUNCTION__, + Object, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + return STATUS_SUCCESS; +} + +/*++ +* @name ObpCreateUnnamedHandle +* +* The ObpCreateUnnamedHandle routine <FILLMEIN> +* +* @param Object +* <FILLMEIN>. +* +* @param DesiredAccess +* <FILLMEIN>. +* +* @param AdditionalReferences +* <FILLMEIN>. +* +* @param HandleAttributes +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param ReturnedObject +* <FILLMEIN>. +* +* @param ReturnedHandle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +ObpCreateUnnamedHandle(IN PVOID Object, + IN ACCESS_MASK DesiredAccess, + IN ULONG AdditionalReferences, + IN ULONG HandleAttributes, + IN KPROCESSOR_MODE AccessMode, + OUT PVOID *ReturnedObject, + OUT PHANDLE ReturnedHandle) +{ + HANDLE_TABLE_ENTRY NewEntry; + POBJECT_HEADER ObjectHeader; + HANDLE Handle; + KAPC_STATE ApcState; + BOOLEAN AttachedToProcess = FALSE; + PVOID HandleTable; + NTSTATUS Status; + PAGED_CODE(); + + /* Get the object header and type */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + OBTRACE("OBTRACE - %s - Creating handle for: %p. UNNAMED. HC LC %lx %lx\n", + __FUNCTION__, + Object, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + + /* Check if this is a kernel handle */ + if ((HandleAttributes & OBJ_KERNEL_HANDLE) && (AccessMode == KernelMode)) + { + /* Set the handle table */ + HandleTable = ObpKernelHandleTable; + + /* Check if we're not in the system process */ + if (PsGetCurrentProcess() != PsInitialSystemProcess) + { + /* Attach to the system process */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + AttachedToProcess = TRUE; + } + } + else + { + /* Get the current handle table */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Increment the handle count */ + Status = ObpIncrementUnnamedHandleCount(Object, + &DesiredAccess, + AccessMode, + HandleAttributes, + PsGetCurrentProcess()); + if (!NT_SUCCESS(Status)) + { + /* + * We failed (meaning security failure, according to NT Internals) + * detach and return + */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + return Status; + } + + /* Save the object header (assert its validity too) */ + ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); + NewEntry.Object = ObjectHeader; + + /* Mask out the internal attributes */ + NewEntry.ObAttributes |= HandleAttributes & + (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | + EX_HANDLE_ENTRY_INHERITABLE | + EX_HANDLE_ENTRY_AUDITONCLOSE); + + /* Save the access mask */ + NewEntry.GrantedAccess = DesiredAccess; + + /* + * Create the actual handle. We'll need to do this *after* calling + * ObpIncrementHandleCount to make sure that Object Security is valid + * (specified in Gl00my documentation on Ob) + */ + OBTRACE("OBTRACE - %s - Handle Properties: [%p-%lx-%lx]\n", + __FUNCTION__, + NewEntry.Object, NewEntry.ObAttributes & 3, NewEntry.GrantedAccess); + Handle = ExCreateHandle(HandleTable, &NewEntry); + + /* Detach if needed */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + + /* Make sure we got a handle */ + if (Handle) + { + /* Handle extra references */ + while (AdditionalReferences--) + { + /* Increment the count */ + InterlockedIncrement(&ObjectHeader->PointerCount); + } + + /* Check if this was a kernel handle */ + if (HandleAttributes & OBJ_KERNEL_HANDLE) + { + /* Set the kernel handle bit */ + Handle = ObMarkHandleAsKernelHandle(Handle); + } + + /* Return handle and object */ + *ReturnedHandle = Handle; + if (ReturnedObject) *ReturnedObject = Object; + OBTRACE("OBTRACE - %s - Returning Handle: %lx HC LC %lx %lx\n", + __FUNCTION__, + Handle, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + return STATUS_SUCCESS; + } + + /* Decrement the handle count and detach */ + ObpDecrementHandleCount(&ObjectHeader->Body, + PsGetCurrentProcess(), + NewEntry.GrantedAccess); + return STATUS_INSUFFICIENT_RESOURCES; } /*++ @@ -752,35 +1016,21 @@ * @remarks None. * *--*/ -#if 0 // waiting on thomas -BOOLEAN +VOID NTAPI ObpCloseHandleCallback(IN PHANDLE_TABLE_ENTRY HandleTableEntry, IN HANDLE Handle, IN PVOID Context) { +#if 0 POBP_CLOSE_HANDLE_CONTEXT CloseContext = (POBP_CLOSE_HANDLE_CONTEXT)Context; /* Simply decrement the handle count */ - ObpCloseHandleTableEntry(Context->HandleTable, + ObpCloseHandleTableEntry(CloseContext->HandleTable, HandleTableEntry, Handle, - Context->AccessMode, + CloseContext->AccessMode, TRUE); - - /* Return success */ - return TRUE; -#else -VOID -NTAPI -ObpCloseHandleCallback(IN PHANDLE_TABLE HandleTable, - IN PVOID Object, - IN ULONG GrantedAccess, - IN PVOID Context) -{ - ObpDecrementHandleCount(&EX_OBJ_TO_HDR(Object)->Body, - PsGetCurrentProcess(), - GrantedAccess); #endif } @@ -1409,7 +1659,6 @@ AUX_DATA AuxData; BOOLEAN IsNamed = FALSE; OB_OPEN_REASON OpenReason = ObCreateHandle; - static int LostOptimizations = 0; PAGED_CODE(); /* Get the Header and Create Info */ @@ -1424,14 +1673,31 @@ /* Check if the object is unnamed and also doesn't have security */ if ((!ObjectType->TypeInfo.SecurityRequired) && !(IsNamed)) { - /* - * FIXME: TODO (Optimized path through ObpIncrement*UnNamed*HandleCount). - * Described in chapter 6 of Gl00my, but babelfish translation isn't fully - * clear, so waiting on Aleksey's translation. Currently just profiling. - * (about ~500 calls per boot - not critical atm). - */ - ++LostOptimizations; - DPRINT("Optimized case could've be taken: %d times!\n", LostOptimizations); + /* ReactOS HACK */ + if (Handle) + { + /* Assume failure */ + *Handle = NULL; + + /* Create the handle */ + Status = ObpCreateUnnamedHandle(Object, + DesiredAccess, + AdditionalReferences + 1, + ObjectCreateInfo->Attributes, + ExGetPreviousMode(), + ReferencedObject, + Handle); + } + + /* Free the create information */ + ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo); + Header->ObjectCreateInfo = NULL; + + /* Remove the extra keep-alive reference */ + //ObDereferenceObject(Object); FIXME: Will require massive changes + + /* Return */ + return Status; } /* Check if we didn't get an access state */

18 years, 5 months

[turner] 22293: eol-style:native and some TCHAR fixes

by turner＠svn.reactos.org

Author: turner Date: Fri Jun 9 19:59:56 2006 New Revision: 22293 URL: http://svn.reactos.ru/svn/reactos?rev=22293&view=rev Log: eol-style:native and some TCHAR fixes Modified: trunk/rosapps/tests/readconsole/main.c trunk/rosapps/tests/readconsole/readconsole.rbuild (contents, props changed) Modified: trunk/rosapps/tests/readconsole/main.c URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/tests/readconsole/main.c?re… ============================================================================== --- trunk/rosapps/tests/readconsole/main.c (original) +++ trunk/rosapps/tests/readconsole/main.c Fri Jun 9 19:59:56 2006 @@ -1,5 +1,6 @@ -#include "stdio.h" -#include "Windows.h" +#include <stdio.h> +#include <tchar.h> +#include <windows.h> int main() { @@ -20,10 +21,10 @@ // // We print out this char as an int to show that infact a backspace does count as input // - printf("You printed %c :: ", Buffer); - printf("With a value %d :: ", Buffer); - printf("Number of chars recieved %lu :: ", Count); - printf("Char equal to backspace %d \n", (Buffer == '\b')); + _tprintf(TEXT("You printed %c :: "), Buffer); + _tprintf(TEXT("With a value %d :: "), Buffer); + _tprintf(TEXT("Number of chars recieved %lu :: "), Count); + _tprintf(TEXT("Char equal to backspace %d \n"), (Buffer == TEXT('\b'))); // // :) Modified: trunk/rosapps/tests/readconsole/readconsole.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/tests/readconsole/readconso… ============================================================================== --- trunk/rosapps/tests/readconsole/readconsole.rbuild (original) +++ trunk/rosapps/tests/readconsole/readconsole.rbuild Fri Jun 9 19:59:56 2006 @@ -1,5 +1,7 @@ -<module name="readconsole" type="win32cui" installbase="bin" installname="readconsole.exe"> - <define name="__USE_W32API" /> - <library>kernel32</library> - <file>main.c</file> -</module> +<module name="readconsole" type="win32cui" installbase="bin" installname="readconsole.exe"> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>main.c</file> +</module> Propchange: trunk/rosapps/tests/readconsole/readconsole.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

18 years, 5 months

← Newer
1
...
41
42
43
44
45
46
47
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006