Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[tkreuzer] 53901: [NTOSKRNL] - Remove 2 amd64 hacks, remove unused variables, silence some DPRINTs

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 30 07:39:48 2011 New Revision: 53901 URL: http://svn.reactos.org/svn/reactos?rev=53901&view=rev Log: [NTOSKRNL] - Remove 2 amd64 hacks, remove unused variables, silence some DPRINTs Modified: trunk/reactos/ntoskrnl/ke/amd64/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/kiinit.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Fri Sep 30 07:39:48 2011 @@ -24,9 +24,6 @@ /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; -/* BIOS Memory Map. Not NTLDR-compliant yet */ -extern ULONG KeMemoryMapRangeCount; -extern ADDRESS_RANGE KeMemoryMap[64]; KIPCR KiInitialPcr; @@ -46,28 +43,28 @@ if (KeFeatureBits & KF_LARGE_PAGE) { /* FIXME: Support this */ - DPRINT1("Large Page support detected but not yet taken advantage of!\n"); + DPRINT("Large Page support detected but not yet taken advantage of!\n"); } /* Check for global page support */ if (KeFeatureBits & KF_GLOBAL_PAGE) { /* FIXME: Support this */ - DPRINT1("Global Page support detected but not yet taken advantage of!\n"); + DPRINT("Global Page support detected but not yet taken advantage of!\n"); } /* Check if we have MTRR */ if (KeFeatureBits & KF_MTRR) { /* FIXME: Support this */ - DPRINT1("MTRR support detected but not yet taken advantage of!\n"); + DPRINT("MTRR support detected but not yet taken advantage of!\n"); } /* Check for PAT and/or MTRR support */ if (KeFeatureBits & KF_PAT) { /* FIXME: Support this */ - DPRINT1("PAT support detected but not yet taken advantage of!\n"); + DPRINT("PAT support detected but not yet taken advantage of!\n"); } /* Allocate the IOPM save area. */ @@ -344,9 +341,6 @@ FrLdrDbgPrint = LoaderBlock->u.I386.CommonDataArea; FrLdrDbgPrint("Hello from KiSystemStartup!!!\n"); - /* HACK, because freeldr maps page 0 */ - MiAddressToPte((PVOID)0)->u.Hard.Valid = 0; - /* Save the loader block */ KeLoaderBlock = LoaderBlock; @@ -403,12 +397,6 @@ /* Check for break-in */ if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); - - /* Hack! Wait for the debugger! */ -#ifdef _WINKD_x - while (!KdPollBreakIn()); - DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); -#endif } DPRINT1("Pcr = %p, Gdt = %p, Idt = %p, Tss = %p\n",

12 years, 11 months

[tkreuzer] 53900: [NDK] Fix 64 bit issues of SYSTEM_VERIFIER_INFORMATION and SYSTEM_POOLTAG. Reported by dmex.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 30 07:18:20 2011 New Revision: 53900 URL: http://svn.reactos.org/svn/reactos?rev=53900&view=rev Log: [NDK] Fix 64 bit issues of SYSTEM_VERIFIER_INFORMATION and SYSTEM_POOLTAG. Reported by dmex. Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Fri Sep 30 07:18:20 2011 @@ -1092,10 +1092,10 @@ }; ULONG PagedAllocs; ULONG PagedFrees; - ULONG PagedUsed; + SIZE_T PagedUsed; ULONG NonPagedAllocs; ULONG NonPagedFrees; - ULONG NonPagedUsed; + SIZE_T NonPagedUsed; } SYSTEM_POOLTAG, *PSYSTEM_POOLTAG; typedef struct _SYSTEM_POOLTAG_INFORMATION { @@ -1331,10 +1331,10 @@ ULONG CurrentNonPagedPoolAllocations; ULONG PeakPagedPoolAllocations; ULONG PeakNonPagedPoolAllocations; - ULONG PagedPoolUsageInBytes; - ULONG NonPagedPoolUsageInBytes; - ULONG PeakPagedPoolUsageInBytes; - ULONG PeakNonPagedPoolUsageInBytes; + SIZE_T PagedPoolUsageInBytes; + SIZE_T NonPagedPoolUsageInBytes; + SIZE_T PeakPagedPoolUsageInBytes; + SIZE_T PeakNonPagedPoolUsageInBytes; } SYSTEM_VERIFIER_INFORMATION, *PSYSTEM_VERIFIER_INFORMATION; // FIXME: Class 52

12 years, 11 months

[cgutman] 53899: [ACPI] - Report the device's lockable status in the device capabilities request - Only report the device as disabled if it is both not enabled and not functional

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Sep 30 04:12:31 2011 New Revision: 53899 URL: http://svn.reactos.org/svn/reactos?rev=53899&view=rev Log: [ACPI] - Report the device's lockable status in the device capabilities request - Only report the device as disabled if it is both not enabled and not functional Modified: trunk/reactos/drivers/bus/acpi/buspdo.c Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Fri Sep 30 04:12:31 2011 @@ -372,8 +372,9 @@ if (device) { + deviceCapabilities->LockSupported = device->flags.lockable; deviceCapabilities->EjectSupported = device->flags.ejectable; - deviceCapabilities->HardwareDisabled = !device->status.enabled; + deviceCapabilities->HardwareDisabled = !device->status.enabled && !device->status.functional; deviceCapabilities->Removable = device->flags.removable; deviceCapabilities->SurpriseRemovalOK = device->flags.suprise_removal_ok; deviceCapabilities->UniqueID = device->flags.unique_id;

12 years, 11 months

[cgutman] 53898: [ACPI] - Remove a couple of debugging changes that were never meant to see the light of day ; )

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Sep 30 01:17:33 2011 New Revision: 53898 URL: http://svn.reactos.org/svn/reactos?rev=53898&view=rev Log: [ACPI] - Remove a couple of debugging changes that were never meant to see the light of day ;) Modified: trunk/reactos/drivers/bus/acpi/osl.c Modified: trunk/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Fri Sep 30 01:17:33 2011 @@ -131,7 +131,7 @@ void * AcpiOsAllocate (ACPI_SIZE size) { - //DPRINT("AcpiOsAllocate size %d\n",size); + DPRINT("AcpiOsAllocate size %d\n",size); return ExAllocatePool(NonPagedPool, size); } @@ -736,8 +736,6 @@ UINT32 Width) { PCI_SLOT_NUMBER slot; - - if (1) return AE_ERROR; slot.u.AsULONG = 0; slot.u.bits.DeviceNumber = PciId->Device;

12 years, 11 months

[tfaber] 53897: [SETUPAPI/FORMATTING] - Try to fix some indentation nightmares. No code changes

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Sep 29 22:30:48 2011 New Revision: 53897 URL: http://svn.reactos.org/svn/reactos?rev=53897&view=rev Log: [SETUPAPI/FORMATTING] - Try to fix some indentation nightmares. No code changes Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/diskspace.c trunk/reactos/dll/win32/setupapi/parser.c trunk/reactos/dll/win32/setupapi/query.c trunk/reactos/dll/win32/setupapi/queue.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Thu Sep 29 22:30:48 2011 @@ -756,104 +756,104 @@ Reserved); if (hClassesKey == INVALID_HANDLE_VALUE) { - return FALSE; + return FALSE; } for (dwIndex = 0; ; dwIndex++) { - dwLength = 40; - lError = RegEnumKeyExW(hClassesKey, - dwIndex, - szKeyName, - &dwLength, - NULL, - NULL, - NULL, - NULL); - TRACE("RegEnumKeyExW() returns %d\n", lError); - if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) - { - TRACE("Key name: %s\n", debugstr_w(szKeyName)); - - if (RegOpenKeyExW(hClassesKey, - szKeyName, - 0, - KEY_QUERY_VALUE, - &hClassKey)) - { - RegCloseKey(hClassesKey); - return FALSE; - } - - if (!RegQueryValueExW(hClassKey, - REGSTR_VAL_NOUSECLASS, - NULL, - NULL, - NULL, - NULL)) - { - TRACE("'NoUseClass' value found!\n"); - RegCloseKey(hClassKey); - continue; - } - - if ((Flags & DIBCI_NOINSTALLCLASS) && - (!RegQueryValueExW(hClassKey, - REGSTR_VAL_NOINSTALLCLASS, - NULL, - NULL, - NULL, - NULL))) - { - TRACE("'NoInstallClass' value found!\n"); - RegCloseKey(hClassKey); - continue; - } - - if ((Flags & DIBCI_NODISPLAYCLASS) && - (!RegQueryValueExW(hClassKey, - REGSTR_VAL_NODISPLAYCLASS, - NULL, - NULL, - NULL, - NULL))) - { - TRACE("'NoDisplayClass' value found!\n"); - RegCloseKey(hClassKey); - continue; - } - - RegCloseKey(hClassKey); - - TRACE("Guid: %s\n", debugstr_w(szKeyName)); - if (dwGuidListIndex < ClassGuidListSize) - { - if (szKeyName[0] == '{' && szKeyName[37] == '}') - { - szKeyName[37] = 0; - } - TRACE("Guid: %p\n", &szKeyName[1]); - - UuidFromStringW(&szKeyName[1], - &ClassGuidList[dwGuidListIndex]); - } - - dwGuidListIndex++; - } - - if (lError != ERROR_SUCCESS) - break; + dwLength = 40; + lError = RegEnumKeyExW(hClassesKey, + dwIndex, + szKeyName, + &dwLength, + NULL, + NULL, + NULL, + NULL); + TRACE("RegEnumKeyExW() returns %d\n", lError); + if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) + { + TRACE("Key name: %s\n", debugstr_w(szKeyName)); + + if (RegOpenKeyExW(hClassesKey, + szKeyName, + 0, + KEY_QUERY_VALUE, + &hClassKey)) + { + RegCloseKey(hClassesKey); + return FALSE; + } + + if (!RegQueryValueExW(hClassKey, + REGSTR_VAL_NOUSECLASS, + NULL, + NULL, + NULL, + NULL)) + { + TRACE("'NoUseClass' value found!\n"); + RegCloseKey(hClassKey); + continue; + } + + if ((Flags & DIBCI_NOINSTALLCLASS) && + (!RegQueryValueExW(hClassKey, + REGSTR_VAL_NOINSTALLCLASS, + NULL, + NULL, + NULL, + NULL))) + { + TRACE("'NoInstallClass' value found!\n"); + RegCloseKey(hClassKey); + continue; + } + + if ((Flags & DIBCI_NODISPLAYCLASS) && + (!RegQueryValueExW(hClassKey, + REGSTR_VAL_NODISPLAYCLASS, + NULL, + NULL, + NULL, + NULL))) + { + TRACE("'NoDisplayClass' value found!\n"); + RegCloseKey(hClassKey); + continue; + } + + RegCloseKey(hClassKey); + + TRACE("Guid: %s\n", debugstr_w(szKeyName)); + if (dwGuidListIndex < ClassGuidListSize) + { + if (szKeyName[0] == '{' && szKeyName[37] == '}') + { + szKeyName[37] = 0; + } + TRACE("Guid: %p\n", &szKeyName[1]); + + UuidFromStringW(&szKeyName[1], + &ClassGuidList[dwGuidListIndex]); + } + + dwGuidListIndex++; + } + + if (lError != ERROR_SUCCESS) + break; } RegCloseKey(hClassesKey); if (RequiredSize != NULL) - *RequiredSize = dwGuidListIndex; + *RequiredSize = dwGuidListIndex; if (ClassGuidListSize < dwGuidListIndex) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; } return TRUE; @@ -868,9 +868,9 @@ DWORD ClassGuidListSize, PDWORD RequiredSize) { - return SetupDiClassGuidsFromNameExA(ClassName, ClassGuidList, - ClassGuidListSize, RequiredSize, - NULL, NULL); + return SetupDiClassGuidsFromNameExA(ClassName, ClassGuidList, + ClassGuidListSize, RequiredSize, + NULL, NULL); } /*********************************************************************** @@ -882,9 +882,9 @@ DWORD ClassGuidListSize, PDWORD RequiredSize) { - return SetupDiClassGuidsFromNameExW(ClassName, ClassGuidList, - ClassGuidListSize, RequiredSize, - NULL, NULL); + return SetupDiClassGuidsFromNameExW(ClassName, ClassGuidList, + ClassGuidListSize, RequiredSize, + NULL, NULL); } /*********************************************************************** @@ -959,7 +959,7 @@ ClassGuidListSize, RequiredSize, debugstr_w(MachineName), Reserved); if (!ClassName || !RequiredSize) - { + { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -968,7 +968,7 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - *RequiredSize = 0; + *RequiredSize = 0; hClassesKey = SetupDiOpenClassRegKeyExW(NULL, KEY_ENUMERATE_SUB_KEYS, @@ -977,82 +977,82 @@ Reserved); if (hClassesKey == INVALID_HANDLE_VALUE) { - return FALSE; + return FALSE; } for (dwIndex = 0; ; dwIndex++) { - dwLength = 40; - lError = RegEnumKeyExW(hClassesKey, - dwIndex, - szKeyName, - &dwLength, - NULL, - NULL, - NULL, - NULL); - TRACE("RegEnumKeyExW() returns %d\n", lError); - if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) - { - TRACE("Key name: %p\n", szKeyName); - - if (RegOpenKeyExW(hClassesKey, - szKeyName, - 0, - KEY_QUERY_VALUE, - &hClassKey)) - { - RegCloseKey(hClassesKey); - return FALSE; - } - - dwLength = MAX_CLASS_NAME_LEN * sizeof(WCHAR); - if (!RegQueryValueExW(hClassKey, - Class, - NULL, - NULL, - (LPBYTE)szClassName, - &dwLength)) - { - TRACE("Class name: %p\n", szClassName); - - if (strcmpiW(szClassName, ClassName) == 0) - { - TRACE("Found matching class name\n"); - - TRACE("Guid: %p\n", szKeyName); - if (dwGuidListIndex < ClassGuidListSize) - { - if (szKeyName[0] == '{' && szKeyName[37] == '}') - { - szKeyName[37] = 0; - } - TRACE("Guid: %p\n", &szKeyName[1]); - - UuidFromStringW(&szKeyName[1], - &ClassGuidList[dwGuidListIndex]); - } - - dwGuidListIndex++; - } - } - - RegCloseKey(hClassKey); - } - - if (lError != ERROR_SUCCESS) - break; + dwLength = 40; + lError = RegEnumKeyExW(hClassesKey, + dwIndex, + szKeyName, + &dwLength, + NULL, + NULL, + NULL, + NULL); + TRACE("RegEnumKeyExW() returns %d\n", lError); + if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) + { + TRACE("Key name: %p\n", szKeyName); + + if (RegOpenKeyExW(hClassesKey, + szKeyName, + 0, + KEY_QUERY_VALUE, + &hClassKey)) + { + RegCloseKey(hClassesKey); + return FALSE; + } + + dwLength = MAX_CLASS_NAME_LEN * sizeof(WCHAR); + if (!RegQueryValueExW(hClassKey, + Class, + NULL, + NULL, + (LPBYTE)szClassName, + &dwLength)) + { + TRACE("Class name: %p\n", szClassName); + + if (strcmpiW(szClassName, ClassName) == 0) + { + TRACE("Found matching class name\n"); + + TRACE("Guid: %p\n", szKeyName); + if (dwGuidListIndex < ClassGuidListSize) + { + if (szKeyName[0] == '{' && szKeyName[37] == '}') + { + szKeyName[37] = 0; + } + TRACE("Guid: %p\n", &szKeyName[1]); + + UuidFromStringW(&szKeyName[1], + &ClassGuidList[dwGuidListIndex]); + } + + dwGuidListIndex++; + } + } + + RegCloseKey(hClassKey); + } + + if (lError != ERROR_SUCCESS) + break; } RegCloseKey(hClassesKey); if (RequiredSize != NULL) - *RequiredSize = dwGuidListIndex; + *RequiredSize = dwGuidListIndex; if (ClassGuidListSize < dwGuidListIndex) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; } return TRUE; @@ -1067,9 +1067,9 @@ DWORD ClassNameSize, PDWORD RequiredSize) { - return SetupDiClassNameFromGuidExA(ClassGuid, ClassName, - ClassNameSize, RequiredSize, - NULL, NULL); + return SetupDiClassNameFromGuidExA(ClassGuid, ClassName, + ClassNameSize, RequiredSize, + NULL, NULL); } /*********************************************************************** @@ -1081,9 +1081,9 @@ DWORD ClassNameSize, PDWORD RequiredSize) { - return SetupDiClassNameFromGuidExW(ClassGuid, ClassName, - ClassNameSize, RequiredSize, - NULL, NULL); + return SetupDiClassNameFromGuidExW(ClassGuid, ClassName, + ClassNameSize, RequiredSize, + NULL, NULL); } /*********************************************************************** @@ -1104,11 +1104,11 @@ if (MachineName) MachineNameW = pSetupMultiByteToUnicode(MachineName, CP_ACP); ret = SetupDiClassNameFromGuidExW(ClassGuid, ClassNameW, MAX_CLASS_NAME_LEN, - RequiredSize, MachineNameW, Reserved); + RequiredSize, MachineNameW, Reserved); if (ret) { int len = WideCharToMultiByte(CP_ACP, 0, ClassNameW, -1, ClassName, - ClassNameSize, NULL, NULL); + ClassNameSize, NULL, NULL); if (len == 0 || len > ClassNameSize) { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -1214,9 +1214,9 @@ */ HDEVINFO WINAPI SetupDiCreateDeviceInfoList(const GUID *ClassGuid, - HWND hwndParent) -{ - return SetupDiCreateDeviceInfoListExW(ClassGuid, hwndParent, NULL, NULL); + HWND hwndParent) +{ + return SetupDiCreateDeviceInfoListExW(ClassGuid, hwndParent, NULL, NULL); } /*********************************************************************** @@ -1224,9 +1224,9 @@ */ HDEVINFO WINAPI SetupDiCreateDeviceInfoListExA(const GUID *ClassGuid, - HWND hwndParent, - PCSTR MachineName, - PVOID Reserved) + HWND hwndParent, + PCSTR MachineName, + PVOID Reserved) { LPWSTR MachineNameW = NULL; HDEVINFO hDevInfo; @@ -1268,9 +1268,9 @@ */ HDEVINFO WINAPI SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, - HWND hwndParent, - PCWSTR MachineName, - PVOID Reserved) + HWND hwndParent, + PCWSTR MachineName, + PVOID Reserved) { struct DeviceInfoSet *list = NULL; DWORD size = FIELD_OFFSET(struct DeviceInfoSet, szData); @@ -1670,13 +1670,13 @@ * SetupDiCreateDeviceInfoA (SETUPAPI.@) */ BOOL WINAPI SetupDiCreateDeviceInfoA( - HDEVINFO DeviceInfoSet, - PCSTR DeviceName, - CONST GUID *ClassGuid, - PCSTR DeviceDescription, - HWND hwndParent, - DWORD CreationFlags, - PSP_DEVINFO_DATA DeviceInfoData) + HDEVINFO DeviceInfoSet, + PCSTR DeviceName, + CONST GUID *ClassGuid, + PCSTR DeviceDescription, + HWND hwndParent, + DWORD CreationFlags, + PSP_DEVINFO_DATA DeviceInfoData) { BOOL ret; LPWSTR DeviceNameW = NULL; @@ -1712,13 +1712,13 @@ * SetupDiCreateDeviceInfoW (SETUPAPI.@) */ BOOL WINAPI SetupDiCreateDeviceInfoW( - HDEVINFO DeviceInfoSet, - PCWSTR DeviceName, - CONST GUID *ClassGuid, - PCWSTR DeviceDescription, - HWND hwndParent, - DWORD CreationFlags, - PSP_DEVINFO_DATA DeviceInfoData) + HDEVINFO DeviceInfoSet, + PCWSTR DeviceName, + CONST GUID *ClassGuid, + PCWSTR DeviceDescription, + HWND hwndParent, + DWORD CreationFlags, + PSP_DEVINFO_DATA DeviceInfoData) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfo *deviceInfo = NULL; @@ -1918,18 +1918,18 @@ * SetupDiGetDeviceInstanceIdA (SETUPAPI.@) */ BOOL WINAPI SetupDiGetDeviceInstanceIdA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSTR DeviceInstanceId, - DWORD DeviceInstanceIdSize, - PDWORD RequiredSize) + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSTR DeviceInstanceId, + DWORD DeviceInstanceIdSize, + PDWORD RequiredSize) { BOOL ret = FALSE; DWORD size; PWSTR instanceId; TRACE("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, - DeviceInstanceIdSize, RequiredSize); + DeviceInstanceIdSize, RequiredSize); if (!DeviceInstanceId && DeviceInstanceIdSize > 0) { @@ -1987,17 +1987,17 @@ * SetupDiGetDeviceInstanceIdW (SETUPAPI.@) */ BOOL WINAPI SetupDiGetDeviceInstanceIdW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PWSTR DeviceInstanceId, - DWORD DeviceInstanceIdSize, - PDWORD RequiredSize) + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PWSTR DeviceInstanceId, + DWORD DeviceInstanceIdSize, + PDWORD RequiredSize) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfo *devInfo; TRACE("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, - DeviceInstanceIdSize, RequiredSize); + DeviceInstanceIdSize, RequiredSize); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) { @@ -2077,14 +2077,14 @@ */ BOOL WINAPI SetupDiGetActualSectionToInstallExA( - IN HINF InfHandle, - IN PCSTR InfSectionName, - IN PSP_ALTPLATFORM_INFO AlternatePlatformInfo OPTIONAL, - OUT PSTR InfSectionWithExt OPTIONAL, - IN DWORD InfSectionWithExtSize, - OUT PDWORD RequiredSize OPTIONAL, - OUT PSTR* Extension OPTIONAL, - IN PVOID Reserved) + IN HINF InfHandle, + IN PCSTR InfSectionName, + IN PSP_ALTPLATFORM_INFO AlternatePlatformInfo OPTIONAL, + OUT PSTR InfSectionWithExt OPTIONAL, + IN DWORD InfSectionWithExtSize, + OUT PDWORD RequiredSize OPTIONAL, + OUT PSTR* Extension OPTIONAL, + IN PVOID Reserved) { LPWSTR InfSectionNameW = NULL; LPWSTR InfSectionWithExtW = NULL; @@ -2143,9 +2143,9 @@ DWORD ClassDescriptionSize, PDWORD RequiredSize) { - return SetupDiGetClassDescriptionExA(ClassGuid, ClassDescription, - ClassDescriptionSize, - RequiredSize, NULL, NULL); + return SetupDiGetClassDescriptionExA(ClassGuid, ClassDescription, + ClassDescriptionSize, + RequiredSize, NULL, NULL); } /*********************************************************************** @@ -2157,9 +2157,9 @@ DWORD ClassDescriptionSize, PDWORD RequiredSize) { - return SetupDiGetClassDescriptionExW(ClassGuid, ClassDescription, - ClassDescriptionSize, - RequiredSize, NULL, NULL); + return SetupDiGetClassDescriptionExW(ClassGuid, ClassDescription, + ClassDescriptionSize, + RequiredSize, NULL, NULL); } /*********************************************************************** @@ -2316,10 +2316,10 @@ * SetupDiGetClassDevsA (SETUPAPI.@) */ HDEVINFO WINAPI SetupDiGetClassDevsA( - CONST GUID *class, - LPCSTR enumstr, - HWND parent, - DWORD flags) + CONST GUID *class, + LPCSTR enumstr, + HWND parent, + DWORD flags) { return SetupDiGetClassDevsExA(class, enumstr, parent, flags, NULL, NULL, NULL); @@ -2372,10 +2372,10 @@ * SetupDiGetClassDevsW (SETUPAPI.@) */ HDEVINFO WINAPI SetupDiGetClassDevsW( - CONST GUID *class, - LPCWSTR enumstr, - HWND parent, - DWORD flags) + CONST GUID *class, + LPCWSTR enumstr, + HWND parent, + DWORD flags) { return SetupDiGetClassDevsExW(class, enumstr, parent, flags, NULL, NULL, NULL); @@ -2860,11 +2860,11 @@ * Failure: FALSE. Call GetLastError() for more info. */ BOOL WINAPI SetupDiEnumDeviceInterfaces( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - CONST GUID * InterfaceClassGuid, - DWORD MemberIndex, - PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + CONST GUID * InterfaceClassGuid, + DWORD MemberIndex, + PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; BOOL ret = FALSE; @@ -2997,12 +2997,12 @@ * SetupDiGetDeviceInterfaceDetailA (SETUPAPI.@) */ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( - HDEVINFO DeviceInfoSet, - PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, - PSP_DEVICE_INTERFACE_DETAIL_DATA_A DeviceInterfaceDetailData, - DWORD DeviceInterfaceDetailDataSize, - PDWORD RequiredSize, - PSP_DEVINFO_DATA DeviceInfoData) + HDEVINFO DeviceInfoSet, + PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, + PSP_DEVICE_INTERFACE_DETAIL_DATA_A DeviceInterfaceDetailData, + DWORD DeviceInterfaceDetailDataSize, + PDWORD RequiredSize, + PSP_DEVINFO_DATA DeviceInfoData) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailDataW = NULL; @@ -3031,14 +3031,14 @@ SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - - if((DeviceInterfaceDetailDataSize != 0) && + + if((DeviceInterfaceDetailDataSize != 0) && (DeviceInterfaceDetailDataSize < (FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(CHAR)))) { SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - + if (!DeviceInterfaceDetailData && DeviceInterfaceDetailDataSize) { SetLastError(ERROR_INVALID_USER_BUFFER); @@ -3091,12 +3091,12 @@ * SetupDiGetDeviceInterfaceDetailW (SETUPAPI.@) */ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( - HDEVINFO DeviceInfoSet, - PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, - PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData, - DWORD DeviceInterfaceDetailDataSize, - PDWORD RequiredSize, - PSP_DEVINFO_DATA DeviceInfoData) + HDEVINFO DeviceInfoSet, + PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, + PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData, + DWORD DeviceInterfaceDetailDataSize, + PDWORD RequiredSize, + PSP_DEVINFO_DATA DeviceInfoData) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; BOOL ret = FALSE; @@ -3249,14 +3249,13 @@ } } - ret = SetupDiGetDeviceRegistryPropertyW( - DeviceInfoSet, - DeviceInfoData, - Property, - &RegType, - PropertyBufferW, - PropertyBufferSizeW, - &RequiredSizeW); + ret = SetupDiGetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + Property, + &RegType, + PropertyBufferW, + PropertyBufferSizeW, + &RequiredSizeW); if (ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -3395,11 +3394,11 @@ * SetupDiSetDeviceRegistryPropertyA (SETUPAPI.@) */ BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Property, - const BYTE *PropertyBuffer, - DWORD PropertyBufferSize) + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Property, + const BYTE *PropertyBuffer, + DWORD PropertyBufferSize) { BOOL ret = FALSE; struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; @@ -3434,11 +3433,11 @@ * SetupDiSetDeviceRegistryPropertyW (SETUPAPI.@) */ BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Property, - const BYTE *PropertyBuffer, - DWORD PropertyBufferSize) + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Property, + const BYTE *PropertyBuffer, + DWORD PropertyBufferSize) { BOOL ret = FALSE; struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; @@ -3465,8 +3464,8 @@ if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) && PropertyMap[Property].nameW) { - HKEY hKey; - LONG l; + HKEY hKey; + LONG l; hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_SET_VALUE); if (hKey == INVALID_HANDLE_VALUE) return FALSE; @@ -3551,14 +3550,14 @@ HKEY hClassKey; if (!SetupGetLineTextW(NULL, - hInf, - Version, - ClassGUID, - Buffer, - MAX_PATH, - &RequiredSize)) - { - return INVALID_HANDLE_VALUE; + hInf, + Version, + ClassGUID, + Buffer, + MAX_PATH, + &RequiredSize)) + { + return INVALID_HANDLE_VALUE; } lstrcpyW(FullBuffer, REGSTR_PATH_CLASS_NT); @@ -3566,48 +3565,47 @@ lstrcatW(FullBuffer, Buffer); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - FullBuffer, - 0, - KEY_SET_VALUE, - &hClassKey)) - { - if (!SetupGetLineTextW(NULL, - hInf, - Version, - Class, - Buffer, - MAX_PATH, - &RequiredSize)) - { - return INVALID_HANDLE_VALUE; - } - - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, - FullBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_SET_VALUE, - NULL, - &hClassKey, - NULL)) - { - return INVALID_HANDLE_VALUE; - } - + FullBuffer, + 0, + KEY_SET_VALUE, + &hClassKey)) + { + if (!SetupGetLineTextW(NULL, + hInf, + Version, + Class, + Buffer, + MAX_PATH, + &RequiredSize)) + { + return INVALID_HANDLE_VALUE; + } + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, + FullBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, + NULL, + &hClassKey, + NULL)) + { + return INVALID_HANDLE_VALUE; + } } if (RegSetValueExW(hClassKey, - Class, - 0, - REG_SZ, - (LPBYTE)Buffer, - RequiredSize * sizeof(WCHAR))) - { - RegCloseKey(hClassKey); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, - FullBuffer); - return INVALID_HANDLE_VALUE; + Class, + 0, + REG_SZ, + (LPBYTE)Buffer, + RequiredSize * sizeof(WCHAR))) + { + RegCloseKey(hClassKey); + RegDeleteKeyW(HKEY_LOCAL_MACHINE, + FullBuffer); + return INVALID_HANDLE_VALUE; } return hClassKey; @@ -3720,10 +3718,10 @@ if (!ClassGuid) { if ((l = RegOpenKeyExW(HKLM, - lpKeyName, - 0, - samDesired, - &hClassesKey))) + lpKeyName, + 0, + samDesired, + &hClassesKey))) { SetLastError(ERROR_INVALID_CLASS); hClassesKey = INVALID_HANDLE_VALUE; @@ -3739,19 +3737,19 @@ SETUPDI_GuidToString(ClassGuid, bracedGuidString); if (!(l = RegOpenKeyExW(HKLM, - lpKeyName, - 0, - samDesired, - &hClassesKey))) - { - if (MachineName != NULL) - RegCloseKey(HKLM); - + lpKeyName, + 0, + samDesired, + &hClassesKey))) + { + if (MachineName != NULL) + RegCloseKey(HKLM); + if ((l = RegOpenKeyExW(hClassesKey, - bracedGuidString, - 0, - samDesired, - &key))) + bracedGuidString, + 0, + samDesired, + &key))) { SetLastError(l); key = INVALID_HANDLE_VALUE; @@ -3773,10 +3771,10 @@ * SetupDiOpenDeviceInterfaceW (SETUPAPI.@) */ BOOL WINAPI SetupDiOpenDeviceInterfaceW( - HDEVINFO DeviceInfoSet, - PCWSTR DevicePath, - DWORD OpenFlags, - PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) + HDEVINFO DeviceInfoSet, + PCWSTR DevicePath, + DWORD OpenFlags, + PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { struct DeviceInfoSet * list; PCWSTR pEnd; @@ -3978,7 +3976,7 @@ RegCloseKey(hDevKey); dwIndex++; - }while(TRUE); + } while(TRUE); RegCloseKey(hKey); return FALSE; @@ -3988,10 +3986,10 @@ * SetupDiOpenDeviceInterfaceA (SETUPAPI.@) */ BOOL WINAPI SetupDiOpenDeviceInterfaceA( - HDEVINFO DeviceInfoSet, - PCSTR DevicePath, - DWORD OpenFlags, - PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) + HDEVINFO DeviceInfoSet, + PCSTR DevicePath, + DWORD OpenFlags, + PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { LPWSTR DevicePathW = NULL; BOOL bResult; @@ -4014,10 +4012,10 @@ * SetupDiSetClassInstallParamsA (SETUPAPI.@) */ BOOL WINAPI SetupDiSetClassInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_CLASSINSTALL_HEADER ClassInstallParams, - DWORD ClassInstallParamsSize) + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_CLASSINSTALL_HEADER ClassInstallParams, + DWORD ClassInstallParamsSize) { FIXME("%p %p %x %u\n",DeviceInfoSet, DeviceInfoData, ClassInstallParams->InstallFunction, ClassInstallParamsSize); @@ -4026,8 +4024,8 @@ static BOOL WINAPI IntSetupDiRegisterDeviceInfo( - IN HDEVINFO DeviceInfoSet, - IN OUT PSP_DEVINFO_DATA DeviceInfoData) + IN HDEVINFO DeviceInfoSet, + IN OUT PSP_DEVINFO_DATA DeviceInfoData) { return SetupDiRegisterDeviceInfo(DeviceInfoSet, DeviceInfoData, 0, NULL, NULL, NULL); } @@ -4036,9 +4034,9 @@ * SetupDiCallClassInstaller (SETUPAPI.@) */ BOOL WINAPI SetupDiCallClassInstaller( - DI_FUNCTION InstallFunction, - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData) + DI_FUNCTION InstallFunction, + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData) { BOOL ret = FALSE; @@ -4391,9 +4389,9 @@ * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ BOOL WINAPI SetupDiGetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) { SP_DEVINSTALL_PARAMS_W deviceInstallParamsW; BOOL ret = FALSE; @@ -4434,8 +4432,8 @@ */ BOOL WINAPI SetupDiGetDeviceInfoListClass( - IN HDEVINFO DeviceInfoSet, - OUT LPGUID ClassGuid) + IN HDEVINFO DeviceInfoSet, + OUT LPGUID ClassGuid) { struct DeviceInfoSet *list; BOOL ret = FALSE; @@ -4464,9 +4462,9 @@ */ BOOL WINAPI SetupDiGetDeviceInstallParamsW( - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, - OUT PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + OUT PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) { struct DeviceInfoSet *list; BOOL ret = FALSE; @@ -4512,7 +4510,7 @@ static BOOL CheckDeviceInstallParameters( - IN PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) + IN PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) { DWORD SupportedFlags = DI_NOVCP | /* 0x00000008 */ @@ -4571,9 +4569,9 @@ */ BOOL WINAPI SetupDiSetDeviceInstallParamsW( - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, - IN PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) { struct DeviceInfoSet *list; BOOL ret = FALSE; @@ -4611,9 +4609,9 @@ */ BOOL WINAPI SetupDiSetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) { SP_DEVINSTALL_PARAMS_W deviceInstallParamsW; int len = 0; @@ -4648,9 +4646,9 @@ static HKEY OpenHardwareProfileKey( - IN HKEY HKLM, - IN DWORD HwProfile, - IN DWORD samDesired) + IN HKEY HKLM, + IN DWORD HwProfile, + IN DWORD samDesired) { HKEY hHWProfilesKey = NULL; HKEY hHWProfileKey = NULL; @@ -4658,10 +4656,10 @@ LONG rc; rc = RegOpenKeyExW(HKLM, - REGSTR_PATH_HWPROFILES, - 0, - 0, - &hHWProfilesKey); + REGSTR_PATH_HWPROFILES, + 0, + 0, + &hHWProfilesKey); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -4669,24 +4667,22 @@ } if (HwProfile == 0) { - rc = RegOpenKeyExW( - hHWProfilesKey, - REGSTR_KEY_CURRENT, - 0, - KEY_CREATE_SUB_KEY, - &hHWProfileKey); + rc = RegOpenKeyExW(hHWProfilesKey, + REGSTR_KEY_CURRENT, + 0, + KEY_CREATE_SUB_KEY, + &hHWProfileKey); } else { WCHAR subKey[5]; snprintfW(subKey, 4, InstanceKeyFormat, HwProfile); subKey[4] = '\0'; - rc = RegOpenKeyExW( - hHWProfilesKey, - subKey, - 0, - KEY_CREATE_SUB_KEY, - &hHWProfileKey); + rc = RegOpenKeyExW(hHWProfilesKey, + subKey, + 0, + KEY_CREATE_SUB_KEY, + &hHWProfileKey); } if (rc != ERROR_SUCCESS) { @@ -4705,8 +4701,8 @@ static BOOL IsDeviceInfoInDeviceInfoSet( - struct DeviceInfoSet *deviceInfoSet, - struct DeviceInfo *deviceInfo) + struct DeviceInfoSet *deviceInfoSet, + struct DeviceInfo *deviceInfo) { PLIST_ENTRY ListEntry; @@ -4727,8 +4723,8 @@ */ BOOL WINAPI SetupDiDeleteDeviceInfo( - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData) + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) { struct DeviceInfoSet *deviceInfoSet; struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData; @@ -4760,11 +4756,11 @@ */ BOOL WINAPI SetupDiOpenDeviceInfoA( - IN HDEVINFO DeviceInfoSet, - IN PCSTR DeviceInstanceId, - IN HWND hwndParent OPTIONAL, - IN DWORD OpenFlags, - OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + IN HDEVINFO DeviceInfoSet, + IN PCSTR DeviceInstanceId, + IN HWND hwndParent OPTIONAL, + IN DWORD OpenFlags, + OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { LPWSTR DeviceInstanceIdW = NULL; BOOL bResult; @@ -4789,11 +4785,11 @@ */ BOOL WINAPI SetupDiOpenDeviceInfoW( - IN HDEVINFO DeviceInfoSet, - IN PCWSTR DeviceInstanceId, - IN HWND hwndParent OPTIONAL, - IN DWORD OpenFlags, - OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + IN HDEVINFO DeviceInfoSet, + IN PCWSTR DeviceInstanceId, + IN HWND hwndParent OPTIONAL, + IN DWORD OpenFlags, + OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { struct DeviceInfoSet *list; HKEY hEnumKey, hKey = NULL; @@ -4918,8 +4914,8 @@ */ BOOL WINAPI SetupDiGetSelectedDevice( - IN HDEVINFO DeviceInfoSet, - OUT PSP_DEVINFO_DATA DeviceInfoData) + IN HDEVINFO DeviceInfoSet, + OUT PSP_DEVINFO_DATA DeviceInfoData) { struct DeviceInfoSet *list; BOOL ret = FALSE; @@ -4956,8 +4952,8 @@ */ BOOL WINAPI SetupDiSetSelectedDevice( - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData) + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) { struct DeviceInfoSet *list; BOOL ret = FALSE; @@ -4988,7 +4984,7 @@ /* Return the current hardware profile id, or -1 if error */ static DWORD SETUPAPI_GetCurrentHwProfile( - IN HDEVINFO DeviceInfoSet) + IN HDEVINFO DeviceInfoSet) { HKEY hKey = NULL; DWORD dwRegType, dwLength; @@ -4996,12 +4992,11 @@ LONG rc; DWORD ret = (DWORD)-1; - rc = RegOpenKeyExW( - ((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, - REGSTR_PATH_IDCONFIGDB, - 0, /* Options */ - KEY_QUERY_VALUE, - &hKey); + rc = RegOpenKeyExW(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, + REGSTR_PATH_IDCONFIGDB, + 0, /* Options */ + KEY_QUERY_VALUE, + &hKey); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -5009,12 +5004,11 @@ } dwLength = sizeof(DWORD); - rc = RegQueryValueExW( - hKey, - REGSTR_VAL_CURRENTCONFIG, - NULL, - &dwRegType, - (LPBYTE)&hwProfile, &dwLength); + rc = RegQueryValueExW(hKey, + REGSTR_VAL_CURRENTCONFIG, + NULL, + &dwRegType, + (LPBYTE)&hwProfile, &dwLength); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -5037,8 +5031,8 @@ static BOOL ResetDevice( - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData) + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) { #ifndef __WINESRC__ struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; @@ -5060,8 +5054,8 @@ } static BOOL StopDevice( - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData) + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) { FIXME("Stub: StopDevice(%p %p)\n", DeviceInfoSet, DeviceInfoData); return TRUE; @@ -5072,8 +5066,8 @@ */ BOOL WINAPI SetupDiChangeState( - IN HDEVINFO DeviceInfoSet, - IN OUT PSP_DEVINFO_DATA DeviceInfoData) + IN HDEVINFO DeviceInfoSet, + IN OUT PSP_DEVINFO_DATA DeviceInfoData) { PSP_PROPCHANGE_PARAMS PropChange; HKEY hKey = INVALID_HANDLE_VALUE; @@ -5184,12 +5178,12 @@ */ 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; + IN HDEVINFO DeviceInfoSet, + IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + FIXME("%p %p\n", DeviceInfoSet, DeviceInfoData); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } @@ -5198,8 +5192,8 @@ */ BOOL WINAPI SetupDiRegisterCoDeviceInstallers( - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData) + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) { BOOL ret = FALSE; /* Return value */ @@ -5290,8 +5284,8 @@ static BOOL InfIsFromOEMLocation( - IN PCWSTR FullName, - OUT LPBOOL IsOEMLocation) + IN PCWSTR FullName, + OUT LPBOOL IsOEMLocation) { PWCHAR last; @@ -5344,8 +5338,8 @@ */ BOOL WINAPI SetupDiInstallDevice( - IN HDEVINFO DeviceInfoSet, - IN OUT PSP_DEVINFO_DATA DeviceInfoData) + IN HDEVINFO DeviceInfoSet, + IN OUT PSP_DEVINFO_DATA DeviceInfoData) { SP_DEVINSTALL_PARAMS_W InstallParams; struct DriverInfoElement *SelectedDriver; @@ -5729,12 +5723,12 @@ * SetupDiOpenDevRegKey (SETUPAPI.@) */ HKEY WINAPI SetupDiOpenDevRegKey( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Scope, - DWORD HwProfile, - DWORD KeyType, - REGSAM samDesired) + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Scope, + DWORD HwProfile, + DWORD KeyType, + REGSAM samDesired) { struct DeviceInfoSet *set = DeviceInfoSet; struct DeviceInfo *devInfo; @@ -5816,11 +5810,11 @@ * SetupDiDeleteDevRegKey (SETUPAPI.@) */ BOOL WINAPI SetupDiDeleteDevRegKey( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Scope, - DWORD HwProfile, - DWORD KeyType) + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Scope, + DWORD HwProfile, + DWORD KeyType) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfo *devInfo; Modified: trunk/reactos/dll/win32/setupapi/diskspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/diskspa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] Thu Sep 29 22:30:48 2011 @@ -52,9 +52,9 @@ list = HeapAlloc(GetProcessHeap(),0,sizeof(DISKSPACELIST)); list->dwDriveCount = 0; - + ptr = drives; - + while (*ptr) { DWORD type = GetDriveTypeW(ptr); @@ -89,8 +89,8 @@ /*********************************************************************** * SetupAddInstallSectionToDiskSpaceListA (SETUPAPI.@) */ -BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace, - HINF InfHandle, HINF LayoutInfHandle, +BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace, + HINF InfHandle, HINF LayoutInfHandle, LPCSTR SectionName, PVOID Reserved1, UINT Reserved2) { FIXME ("Stub\n"); @@ -100,8 +100,8 @@ /*********************************************************************** * SetupQuerySpaceRequiredOnDriveA (SETUPAPI.@) */ -BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, - LPCSTR DriveSpec, LONGLONG* SpaceRequired, +BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, + LPCSTR DriveSpec, LONGLONG* SpaceRequired, PVOID Reserved1, UINT Reserved2) { WCHAR driveW[20]; @@ -115,7 +115,7 @@ lstrcatW(driveW,bkslsh); TRACE("Looking for drive %s\n",debugstr_w(driveW)); - + for (i = 0; i < list->dwDriveCount; i++) { TRACE("checking drive %s\n",debugstr_w(list->Drives[i].lpzName)); @@ -137,5 +137,5 @@ { LPDISKSPACELIST list = (LPDISKSPACELIST)DiskSpace; HeapFree(GetProcessHeap(),0,list); - return TRUE; + return TRUE; } Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] Thu Sep 29 22:30:48 2011 @@ -149,9 +149,9 @@ if (new_count < 32) new_count = 32; if (array) - new_array = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, array, new_count * elem ); + new_array = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, array, new_count * elem ); else - new_array = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * elem ); + new_array = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * elem ); if (new_array) *count = new_count; @@ -327,35 +327,35 @@ strings_section = file->sections[file->strings_section]; for (j = 0, line = strings_section->lines; j < strings_section->nb_lines; j++, line++) { - if (line->key_field == -1) continue; - if (strncmpiW( str, file->fields[line->key_field].text, *len )) continue; + if (line->key_field == -1) continue; + if (strncmpiW( str, file->fields[line->key_field].text, *len )) continue; if (!file->fields[line->key_field].text[*len]) break; - } - if (j == strings_section->nb_lines || !line->nb_fields) goto not_found; - field = &file->fields[line->first_field]; - GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, Lang, sizeof(Lang)/sizeof(TCHAR)); // get the current system locale for translated strings - strcatW(StringLangId, Lang); // append the Language identifier from GetLocaleInfo - // now you have e.g. Strings.0407 for german translations - for (i = 0; i < file->nb_sections; i++) // search in all sections - { - if (!strcmpiW(file->sections[i]->name,StringLangId)) // if the section is a Strings.* section - { - strings_section = file->sections[i]; // select this section for further use - for (j = 0, line = strings_section->lines; j < strings_section->nb_lines; j++, line++) // process all lines in this section - { - if (line->key_field == -1) continue; // if no key then skip - if (strncmpiW( str, file->fields[line->key_field].text, *len )) continue; // if wrong key name, then skip - if (!file->fields[line->key_field].text[*len]) // if value exist - { - field = &file->fields[line->first_field]; // then extract value and - break; // no more search necessary - } - } - } - } - *len = strlenW( field->text ); // set length - ret = field->text; // return the english or translated string - return ret; + } + if (j == strings_section->nb_lines || !line->nb_fields) goto not_found; + field = &file->fields[line->first_field]; + GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, Lang, sizeof(Lang)/sizeof(TCHAR)); // get the current system locale for translated strings + strcatW(StringLangId, Lang); // append the Language identifier from GetLocaleInfo + // now you have e.g. Strings.0407 for german translations + for (i = 0; i < file->nb_sections; i++) // search in all sections + { + if (!strcmpiW(file->sections[i]->name,StringLangId)) // if the section is a Strings.* section + { + strings_section = file->sections[i]; // select this section for further use + for (j = 0, line = strings_section->lines; j < strings_section->nb_lines; j++, line++) // process all lines in this section + { + if (line->key_field == -1) continue; // if no key then skip + if (strncmpiW( str, file->fields[line->key_field].text, *len )) continue; // if wrong key name, then skip + if (!file->fields[line->key_field].text[*len]) // if value exist + { + field = &file->fields[line->first_field]; // then extract value and + break; // no more search necessary + } + } + } + } + *len = strlenW( field->text ); // set length + ret = field->text; // return the english or translated string + return ret; not_found: /* check for integer id */ @@ -1511,7 +1511,7 @@ index -= file->sections[section_index]->nb_lines; } TRACE( "(%p,%s) not found\n", hinf, debugstr_w(section) ); - SetLastError( ERROR_LINE_NOT_FOUND ); + SetLastError( ERROR_LINE_NOT_FOUND ); return FALSE; } @@ -1578,7 +1578,7 @@ } } TRACE( "(%p,%s,%s): not found\n", hinf, debugstr_w(section), debugstr_w(key) ); - SetLastError( ERROR_LINE_NOT_FOUND ); + SetLastError( ERROR_LINE_NOT_FOUND ); return FALSE; } Modified: trunk/reactos/dll/win32/setupapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/query.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/query.c [iso-8859-1] Thu Sep 29 22:30:48 2011 @@ -114,7 +114,7 @@ /*********************************************************************** * SetupGetInfInformationW (SETUPAPI.@) - * + * * BUGS * Only handles the case when InfSpec is an INF handle. */ @@ -242,7 +242,7 @@ */ BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation, UINT InfIndex, PWSTR ReturnBuffer, - DWORD ReturnBufferSize, PDWORD RequiredSize) + DWORD ReturnBufferSize, PDWORD RequiredSize) { DWORD len; LPWSTR ptr; Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] Thu Sep 29 22:30:48 2011 @@ -938,43 +938,43 @@ strcpyW(new_path, path); while((len = strlenW(new_path)) && new_path[len - 1] == '\\') - new_path[len - 1] = 0; + new_path[len - 1] = 0; while(!CreateDirectoryW(new_path, NULL)) { - WCHAR *slash; - DWORD last_error = GetLastError(); - - if(last_error == ERROR_ALREADY_EXISTS) - break; - - if(last_error != ERROR_PATH_NOT_FOUND) - { - ret = FALSE; - break; - } - - if(!(slash = strrchrW(new_path, '\\'))) - { - ret = FALSE; - break; - } - - len = slash - new_path; - new_path[len] = 0; - if(!create_full_pathW(new_path)) - { - ret = FALSE; - break; - } - new_path[len] = '\\'; + WCHAR *slash; + DWORD last_error = GetLastError(); + + if(last_error == ERROR_ALREADY_EXISTS) + break; + + if(last_error != ERROR_PATH_NOT_FOUND) + { + ret = FALSE; + break; + } + + if(!(slash = strrchrW(new_path, '\\'))) + { + ret = FALSE; + break; + } + + len = slash - new_path; + new_path[len] = 0; + if(!create_full_pathW(new_path)) + { + ret = FALSE; + break; + } + new_path[len] = '\\'; } HeapFree(GetProcessHeap(), 0, new_path); return ret; } -static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, +static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, PSP_FILE_CALLBACK_W handler, PVOID context ) { BOOL rc = FALSE; @@ -1311,15 +1311,15 @@ debugstr_w( op_result == FILEOP_NEWPATH ? newpath : paths.Source ), debugstr_w(paths.Target) ); if (op->dst_path) - { - if (!create_full_pathW( op->dst_path )) - { - paths.Win32Error = GetLastError(); - op_result = handler( context, SPFILENOTIFY_COPYERROR, - (UINT_PTR)&paths, (UINT_PTR)newpath ); - if (op_result == FILEOP_ABORT) goto done; - } - } + { + if (!create_full_pathW( op->dst_path )) + { + paths.Win32Error = GetLastError(); + op_result = handler( context, SPFILENOTIFY_COPYERROR, + (UINT_PTR)&paths, (UINT_PTR)newpath ); + if (op_result == FILEOP_ABORT) goto done; + } + } if (do_file_copyW( op_result == FILEOP_NEWPATH ? newpath : paths.Source, paths.Target, op->style, handler, context )) break; /* success */ /* try to extract it from the cabinet file */ @@ -1721,10 +1721,10 @@ * SetupCopyErrorA (SETUPAPI.@) */ -UINT WINAPI SetupCopyErrorA( HWND parent, PCSTR dialogTitle, PCSTR diskname, +UINT WINAPI SetupCopyErrorA( HWND parent, PCSTR dialogTitle, PCSTR diskname, PCSTR sourcepath, PCSTR sourcefile, PCSTR targetpath, - UINT w32error, DWORD style, PSTR pathbuffer, - DWORD buffersize, PDWORD requiredsize) + UINT w32error, DWORD style, PSTR pathbuffer, + DWORD buffersize, PDWORD requiredsize) { FIXME( "stub: (Error Number %d when attempting to copy file %s from %s to %s)\n", w32error, debugstr_a(sourcefile), debugstr_a(sourcepath) ,debugstr_a(targetpath)); @@ -1735,10 +1735,10 @@ * SetupCopyErrorW (SETUPAPI.@) */ -UINT WINAPI SetupCopyErrorW( HWND parent, PCWSTR dialogTitle, PCWSTR diskname, +UINT WINAPI SetupCopyErrorW( HWND parent, PCWSTR dialogTitle, PCWSTR diskname, PCWSTR sourcepath, PCWSTR sourcefile, PCWSTR targetpath, - UINT w32error, DWORD style, PWSTR pathbuffer, - DWORD buffersize, PDWORD requiredsize) + UINT w32error, DWORD style, PWSTR pathbuffer, + DWORD buffersize, PDWORD requiredsize) { FIXME( "stub: (Error Number %d when attempting to copy file %s from %s to %s)\n", w32error, debugstr_w(sourcefile), debugstr_w(sourcepath) ,debugstr_w(targetpath));

12 years, 11 months

[tkreuzer] 53896: [FREELDR] - Move some disk related stuff that is unrelated to the registry data into a new file, hwdisk.c - Don't get the disk count from the size value of a structure that was pr...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Sep 29 21:12:40 2011 New Revision: 53896 URL: http://svn.reactos.org/svn/reactos?rev=53896&view=rev Log: [FREELDR] - Move some disk related stuff that is unrelated to the registry data into a new file, hwdisk.c - Don't get the disk count from the size value of a structure that was previously calculated from the disk count, but instead save it in a global variable. - Initialize certain data in a better place Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Thu Sep 29 21:12:40 2011 @@ -83,6 +83,7 @@ arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c + arch/i386/hwdisk.c arch/i386/hwpci.c arch/i386/i386bug.c arch/i386/i386disk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Thu Sep 29 21:12:40 2011 @@ -82,12 +82,16 @@ DBG_DEFAULT_CHANNEL(HWDETECT); -static CHAR Hex[] = "0123456789abcdef"; static unsigned int delay_count = 1; -extern ULONG reactos_disk_count; -extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; -extern char reactos_arc_strings[32][256]; +extern UCHAR PcBiosDiskCount; + +PCHAR +GetHarddiskIdentifier( + UCHAR DriveNumber); + +VOID +HwInitializeBiosDisks(VOID); /* FUNCTIONS ****************************************************************/ @@ -402,218 +406,6 @@ return PartialResourceList; } -typedef struct tagDISKCONTEXT -{ - UCHAR DriveNumber; - ULONG SectorSize; - ULONGLONG SectorOffset; - ULONGLONG SectorCount; - ULONGLONG SectorNumber; -} DISKCONTEXT; - -static LONG DiskClose(ULONG FileId) -{ - DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - - MmHeapFree(Context); - return ESUCCESS; -} - -static LONG DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) -{ - DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - - RtlZeroMemory(Information, sizeof(FILEINFORMATION)); - Information->EndingAddress.QuadPart = (Context->SectorOffset + Context->SectorCount) * Context->SectorSize; - Information->CurrentAddress.QuadPart = (Context->SectorOffset + Context->SectorNumber) * Context->SectorSize; - - return ESUCCESS; -} - -static LONG DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) -{ - DISKCONTEXT* Context; - UCHAR DriveNumber; - ULONG DrivePartition, SectorSize; - ULONGLONG SectorOffset = 0; - ULONGLONG SectorCount = 0; - PARTITION_TABLE_ENTRY PartitionTableEntry; - CHAR FileName[1]; - - if (!DissectArcPath(Path, FileName, &DriveNumber, &DrivePartition)) - return EINVAL; - - if (DrivePartition == 0xff) - { - /* This is a CD-ROM device */ - SectorSize = 2048; - } - else - { - /* This is either a floppy disk device (DrivePartition == 0) or - * a hard disk device (DrivePartition != 0 && DrivePartition != 0xFF) but - * it doesn't matter which one because they both have 512 bytes per sector */ - SectorSize = 512; - } - - if (DrivePartition != 0xff && DrivePartition != 0) - { - if (!DiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) - return EINVAL; - SectorOffset = PartitionTableEntry.SectorCountBeforePartition; - SectorCount = PartitionTableEntry.PartitionSectorCount; - } - - Context = MmHeapAlloc(sizeof(DISKCONTEXT)); - if (!Context) - return ENOMEM; - Context->DriveNumber = DriveNumber; - Context->SectorSize = SectorSize; - Context->SectorOffset = SectorOffset; - Context->SectorCount = SectorCount; - Context->SectorNumber = 0; - FsSetDeviceSpecific(*FileId, Context); - - return ESUCCESS; -} - -static LONG DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) -{ - DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - UCHAR* Ptr = (UCHAR*)Buffer; - ULONG i, Length; - BOOLEAN ret; - - *Count = 0; - i = 0; - while (N > 0) - { - Length = N; - if (Length > Context->SectorSize) - Length = Context->SectorSize; - ret = MachDiskReadLogicalSectors( - Context->DriveNumber, - Context->SectorNumber + Context->SectorOffset + i, - 1, - (PVOID)DISKREADBUFFER); - if (!ret) - return EIO; - RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, Length); - Ptr += Length; - *Count += Length; - N -= Length; - i++; - } - - return ESUCCESS; -} - -static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) -{ - DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->LowPart & (Context->SectorSize - 1)) - return EINVAL; - - /* FIXME: take HighPart into account */ - Context->SectorNumber = Position->LowPart / Context->SectorSize; - return ESUCCESS; -} - -static const DEVVTBL DiskVtbl = { - DiskClose, - DiskGetFileInformation, - DiskOpen, - DiskRead, - DiskSeek, -}; - -static VOID -GetHarddiskIdentifier(PCHAR Identifier, - UCHAR DriveNumber) -{ - PMASTER_BOOT_RECORD Mbr; - ULONG *Buffer; - ULONG i; - ULONG Checksum; - ULONG Signature; - CHAR ArcName[256]; - PARTITION_TABLE_ENTRY PartitionTableEntry; - - /* Read the MBR */ - if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) - { - ERR("Reading MBR failed\n"); - return; - } - - Buffer = (ULONG*)DISKREADBUFFER; - Mbr = (PMASTER_BOOT_RECORD)DISKREADBUFFER; - - Signature = Mbr->Signature; - TRACE("Signature: %x\n", Signature); - - /* Calculate the MBR checksum */ - Checksum = 0; - for (i = 0; i < 128; i++) - { - Checksum += Buffer[i]; - } - Checksum = ~Checksum + 1; - TRACE("Checksum: %x\n", Checksum); - - /* Fill out the ARC disk block */ - reactos_arc_disk_info[reactos_disk_count].Signature = Signature; - reactos_arc_disk_info[reactos_disk_count].CheckSum = Checksum; - sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)", reactos_disk_count); - strcpy(reactos_arc_strings[reactos_disk_count], ArcName); - reactos_arc_disk_info[reactos_disk_count].ArcName = - reactos_arc_strings[reactos_disk_count]; - reactos_disk_count++; - - sprintf(ArcName, "multi(0)disk(0)rdisk(%u)partition(0)", DriveNumber - 0x80); - FsRegisterDevice(ArcName, &DiskVtbl); - - /* Add partitions */ - i = 1; - DiskReportError(FALSE); - while (DiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) - { - if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) - { - sprintf(ArcName, "multi(0)disk(0)rdisk(%u)partition(%lu)", DriveNumber - 0x80, i); - FsRegisterDevice(ArcName, &DiskVtbl); - } - i++; - } - DiskReportError(TRUE); - - /* Convert checksum and signature to identifier string */ - Identifier[0] = Hex[(Checksum >> 28) & 0x0F]; - Identifier[1] = Hex[(Checksum >> 24) & 0x0F]; - Identifier[2] = Hex[(Checksum >> 20) & 0x0F]; - Identifier[3] = Hex[(Checksum >> 16) & 0x0F]; - Identifier[4] = Hex[(Checksum >> 12) & 0x0F]; - Identifier[5] = Hex[(Checksum >> 8) & 0x0F]; - Identifier[6] = Hex[(Checksum >> 4) & 0x0F]; - Identifier[7] = Hex[Checksum & 0x0F]; - Identifier[8] = '-'; - Identifier[9] = Hex[(Signature >> 28) & 0x0F]; - Identifier[10] = Hex[(Signature >> 24) & 0x0F]; - Identifier[11] = Hex[(Signature >> 20) & 0x0F]; - Identifier[12] = Hex[(Signature >> 16) & 0x0F]; - Identifier[13] = Hex[(Signature >> 12) & 0x0F]; - Identifier[14] = Hex[(Signature >> 8) & 0x0F]; - Identifier[15] = Hex[(Signature >> 4) & 0x0F]; - Identifier[16] = Hex[Signature & 0x0F]; - Identifier[17] = '-'; - Identifier[18] = 'A'; - Identifier[19] = 0; - TRACE("Identifier: %s\n", Identifier); -} - static UCHAR GetFloppyCount(VOID) { @@ -810,37 +602,8 @@ UCHAR DiskCount; USHORT i; ULONG Size; - BOOLEAN Changed; - - /* Count the number of visible drives */ - DiskReportError(FALSE); - DiskCount = 0; - - /* There are some really broken BIOSes out there. There are even BIOSes - * that happily report success when you ask them to read from non-existent - * harddisks. So, we set the buffer to known contents first, then try to - * read. If the BIOS reports success but the buffer contents haven't - * changed then we fail anyway */ - memset((PVOID) DISKREADBUFFER, 0xcd, 512); - while (MachDiskReadLogicalSectors(0x80 + DiskCount, 0ULL, 1, (PVOID)DISKREADBUFFER)) - { - Changed = FALSE; - for (i = 0; ! Changed && i < 512; i++) - { - Changed = ((PUCHAR)DISKREADBUFFER)[i] != 0xcd; - } - if (! Changed) - { - TRACE("BIOS reports success for disk %d but data didn't change\n", - (int)DiskCount); - break; - } - DiskCount++; - memset((PVOID) DISKREADBUFFER, 0xcd, 512); - } - DiskReportError(TRUE); - TRACE("BIOS reports %d harddisk%s\n", - (int)DiskCount, (DiskCount == 1) ? "": "s"); + + DiskCount = PcBiosDiskCount; /* Allocate resource descriptor */ Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + @@ -900,49 +663,11 @@ return SystemKey; } -static UCHAR -GetDiskCount(PCONFIGURATION_COMPONENT_DATA BusKey) -{ - PCONFIGURATION_COMPONENT_DATA System; - ULONG ConfigurationDataLength; - UCHAR DiskCount = 0; - - // - // Get root component - // - System = BusKey; - while (System->Parent) - System = System->Parent; - - // - // Get root configuration data length - // - ConfigurationDataLength = System->ComponentEntry.ConfigurationDataLength; - - // - // We assume that nothing wrong happened, and that configuration - // only consists of one CM_PARTIAL_RESOURCE_LIST entry, followed - // by n entries of CM_INT13_DRIVE_PARAMETER - // - if (ConfigurationDataLength > 0) - DiskCount = (UCHAR)((ConfigurationDataLength - sizeof(CM_PARTIAL_RESOURCE_LIST)) - / sizeof(CM_INT13_DRIVE_PARAMETER)); - - // - // Return number of disks - // - TRACE("Retrieving %lu INT13 disks\\0\n", DiskCount); - return DiskCount; -}; - static VOID DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA BusKey) { PCONFIGURATION_COMPONENT_DATA DiskKey, ControllerKey; - BOOLEAN BootDriveReported = FALSE; ULONG i; - UCHAR DiskCount = GetDiskCount(BusKey); - CHAR BootPath[512]; FldrCreateComponentKey(BusKey, ControllerClass, @@ -957,19 +682,16 @@ TRACE("Created key: DiskController\\0\n"); /* Create and fill subkey for each harddisk */ - for (i = 0; i < DiskCount; i++) + for (i = 0; i < PcBiosDiskCount; i++) { PCM_PARTIAL_RESOURCE_LIST PartialResourceList; ULONG Size; - CHAR Identifier[20]; + PCHAR Identifier; UCHAR DriveNumber = 0x80 + (UCHAR)i; - - if (FrldrBootDrive == DriveNumber) - BootDriveReported = TRUE; /* Get disk values */ PartialResourceList = GetHarddiskConfigurationData(DriveNumber, &Size); - GetHarddiskIdentifier(Identifier, DriveNumber); + Identifier = GetHarddiskIdentifier(DriveNumber); /* Create disk key */ FldrCreateComponentKey(ControllerKey, @@ -984,40 +706,6 @@ &DiskKey); } - /* Get the drive we're booting from */ - MachDiskGetBootPath(BootPath, sizeof(BootPath)); - - /* Add it, if it's a floppy or cdrom */ - if ((FrldrBootDrive >= 0x80 && !BootDriveReported) || - DiskIsDriveRemovable(FrldrBootDrive)) - { - /* TODO: Check if it's really a cdrom drive */ - ULONG* Buffer; - ULONG Checksum = 0; - - /* Read the MBR */ - if (!MachDiskReadLogicalSectors(FrldrBootDrive, 16ULL, 1, (PVOID)DISKREADBUFFER)) - { - ERR("Reading MBR failed\n"); - return; - } - - Buffer = (ULONG*)DISKREADBUFFER; - - /* Calculate the MBR checksum */ - for (i = 0; i < 2048 / sizeof(ULONG); i++) Checksum += Buffer[i]; - Checksum = ~Checksum + 1; - TRACE("Checksum: %x\n", Checksum); - - /* Fill out the ARC disk block */ - reactos_arc_disk_info[reactos_disk_count].CheckSum = Checksum; - strcpy(reactos_arc_strings[reactos_disk_count], BootPath); - reactos_arc_disk_info[reactos_disk_count].ArcName = - reactos_arc_strings[reactos_disk_count]; - reactos_disk_count++; - - FsRegisterDevice(BootPath, &DiskVtbl); - } } static VOID @@ -2019,6 +1707,8 @@ TRACE("DetectHardware()\n"); + HwInitializeBiosDisks(); + /* Create the 'System' key */ SystemKey = DetectSystem(); Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Thu Sep 29 21:12:40 2011 @@ -1,0 +1,342 @@ +/* + * FreeLoader + * + * Copyright (C) 2003, 2004 Eric Kohl + * Copyright (C) 2009 Hervé Poussineau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <freeldr.h> + +#define NDEBUG +#include <debug.h> + +DBG_DEFAULT_CHANNEL(HWDETECT); + +typedef struct tagDISKCONTEXT +{ + UCHAR DriveNumber; + ULONG SectorSize; + ULONGLONG SectorOffset; + ULONGLONG SectorCount; + ULONGLONG SectorNumber; +} DISKCONTEXT; + +extern ULONG reactos_disk_count; +extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; +extern char reactos_arc_strings[32][256]; + +static CHAR Hex[] = "0123456789abcdef"; +UCHAR PcBiosDiskCount = 0; +CHAR PcDiskIdentifier[32][20]; + + +static LONG DiskClose(ULONG FileId) +{ + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + + MmHeapFree(Context); + return ESUCCESS; +} + +static LONG DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + + RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + Information->EndingAddress.QuadPart = (Context->SectorOffset + Context->SectorCount) * Context->SectorSize; + Information->CurrentAddress.QuadPart = (Context->SectorOffset + Context->SectorNumber) * Context->SectorSize; + + return ESUCCESS; +} + +static LONG DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + DISKCONTEXT* Context; + UCHAR DriveNumber; + ULONG DrivePartition, SectorSize; + ULONGLONG SectorOffset = 0; + ULONGLONG SectorCount = 0; + PARTITION_TABLE_ENTRY PartitionTableEntry; + CHAR FileName[1]; + + if (!DissectArcPath(Path, FileName, &DriveNumber, &DrivePartition)) + return EINVAL; + + if (DrivePartition == 0xff) + { + /* This is a CD-ROM device */ + SectorSize = 2048; + } + else + { + /* This is either a floppy disk device (DrivePartition == 0) or + * a hard disk device (DrivePartition != 0 && DrivePartition != 0xFF) but + * it doesn't matter which one because they both have 512 bytes per sector */ + SectorSize = 512; + } + + if (DrivePartition != 0xff && DrivePartition != 0) + { + if (!DiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) + return EINVAL; + SectorOffset = PartitionTableEntry.SectorCountBeforePartition; + SectorCount = PartitionTableEntry.PartitionSectorCount; + } + + Context = MmHeapAlloc(sizeof(DISKCONTEXT)); + if (!Context) + return ENOMEM; + Context->DriveNumber = DriveNumber; + Context->SectorSize = SectorSize; + Context->SectorOffset = SectorOffset; + Context->SectorCount = SectorCount; + Context->SectorNumber = 0; + FsSetDeviceSpecific(*FileId, Context); + + return ESUCCESS; +} + +static LONG DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + UCHAR* Ptr = (UCHAR*)Buffer; + ULONG i, Length; + BOOLEAN ret; + + *Count = 0; + i = 0; + while (N > 0) + { + Length = N; + if (Length > Context->SectorSize) + Length = Context->SectorSize; + ret = MachDiskReadLogicalSectors( + Context->DriveNumber, + Context->SectorNumber + Context->SectorOffset + i, + 1, + (PVOID)DISKREADBUFFER); + if (!ret) + return EIO; + RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, Length); + Ptr += Length; + *Count += Length; + N -= Length; + i++; + } + + return ESUCCESS; +} + +static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + + if (SeekMode != SeekAbsolute) + return EINVAL; + if (Position->LowPart & (Context->SectorSize - 1)) + return EINVAL; + + /* FIXME: take HighPart into account */ + Context->SectorNumber = Position->LowPart / Context->SectorSize; + return ESUCCESS; +} + +static const DEVVTBL DiskVtbl = { + DiskClose, + DiskGetFileInformation, + DiskOpen, + DiskRead, + DiskSeek, +}; + +PCHAR +GetHarddiskIdentifier( + UCHAR DriveNumber) +{ + return PcDiskIdentifier[DriveNumber - 0x80]; +} + +VOID +GetHarddiskInformation( + UCHAR DriveNumber) +{ + PMASTER_BOOT_RECORD Mbr; + ULONG *Buffer; + ULONG i; + ULONG Checksum; + ULONG Signature; + CHAR ArcName[256]; + PARTITION_TABLE_ENTRY PartitionTableEntry; + PCHAR Identifier = PcDiskIdentifier[DriveNumber - 0x80]; + + /* Read the MBR */ + if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) + { + ERR("Reading MBR failed\n"); + return; + } + + Buffer = (ULONG*)DISKREADBUFFER; + Mbr = (PMASTER_BOOT_RECORD)DISKREADBUFFER; + + Signature = Mbr->Signature; + TRACE("Signature: %x\n", Signature); + + /* Calculate the MBR checksum */ + Checksum = 0; + for (i = 0; i < 128; i++) + { + Checksum += Buffer[i]; + } + Checksum = ~Checksum + 1; + TRACE("Checksum: %x\n", Checksum); + + /* Fill out the ARC disk block */ + reactos_arc_disk_info[reactos_disk_count].Signature = Signature; + reactos_arc_disk_info[reactos_disk_count].CheckSum = Checksum; + sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)", reactos_disk_count); + strcpy(reactos_arc_strings[reactos_disk_count], ArcName); + reactos_arc_disk_info[reactos_disk_count].ArcName = + reactos_arc_strings[reactos_disk_count]; + reactos_disk_count++; + + sprintf(ArcName, "multi(0)disk(0)rdisk(%u)partition(0)", DriveNumber - 0x80); + FsRegisterDevice(ArcName, &DiskVtbl); + + /* Add partitions */ + i = 1; + DiskReportError(FALSE); + while (DiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) + { + if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) + { + sprintf(ArcName, "multi(0)disk(0)rdisk(%u)partition(%lu)", DriveNumber - 0x80, i); + FsRegisterDevice(ArcName, &DiskVtbl); + } + i++; + } + DiskReportError(TRUE); + + /* Convert checksum and signature to identifier string */ + Identifier[0] = Hex[(Checksum >> 28) & 0x0F]; + Identifier[1] = Hex[(Checksum >> 24) & 0x0F]; + Identifier[2] = Hex[(Checksum >> 20) & 0x0F]; + Identifier[3] = Hex[(Checksum >> 16) & 0x0F]; + Identifier[4] = Hex[(Checksum >> 12) & 0x0F]; + Identifier[5] = Hex[(Checksum >> 8) & 0x0F]; + Identifier[6] = Hex[(Checksum >> 4) & 0x0F]; + Identifier[7] = Hex[Checksum & 0x0F]; + Identifier[8] = '-'; + Identifier[9] = Hex[(Signature >> 28) & 0x0F]; + Identifier[10] = Hex[(Signature >> 24) & 0x0F]; + Identifier[11] = Hex[(Signature >> 20) & 0x0F]; + Identifier[12] = Hex[(Signature >> 16) & 0x0F]; + Identifier[13] = Hex[(Signature >> 12) & 0x0F]; + Identifier[14] = Hex[(Signature >> 8) & 0x0F]; + Identifier[15] = Hex[(Signature >> 4) & 0x0F]; + Identifier[16] = Hex[Signature & 0x0F]; + Identifier[17] = '-'; + Identifier[18] = 'A'; + Identifier[19] = 0; + TRACE("Identifier: %s\n", Identifier); +} + + +VOID +HwInitializeBiosDisks(VOID) +{ + UCHAR DiskCount, DriveNumber; + ULONG i; + BOOLEAN Changed; + CHAR BootPath[512]; + BOOLEAN BootDriveReported = FALSE; + + /* Count the number of visible drives */ + DiskReportError(FALSE); + DiskCount = 0; + DriveNumber = 0x80; + + /* There are some really broken BIOSes out there. There are even BIOSes + * that happily report success when you ask them to read from non-existent + * harddisks. So, we set the buffer to known contents first, then try to + * read. If the BIOS reports success but the buffer contents haven't + * changed then we fail anyway */ + memset((PVOID) DISKREADBUFFER, 0xcd, 512); + while (MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) + { + Changed = FALSE; + for (i = 0; ! Changed && i < 512; i++) + { + Changed = ((PUCHAR)DISKREADBUFFER)[i] != 0xcd; + } + if (! Changed) + { + TRACE("BIOS reports success for disk %d but data didn't change\n", + (int)DiskCount); + break; + } + + GetHarddiskInformation(DriveNumber); + + if (FrldrBootDrive == DriveNumber) + BootDriveReported = TRUE; + + DiskCount++; + DriveNumber++; + memset((PVOID) DISKREADBUFFER, 0xcd, 512); + } + DiskReportError(TRUE); + TRACE("BIOS reports %d harddisk%s\n", + (int)DiskCount, (DiskCount == 1) ? "": "s"); + + /* Get the drive we're booting from */ + MachDiskGetBootPath(BootPath, sizeof(BootPath)); + + /* Add it, if it's a floppy or cdrom */ + if ((FrldrBootDrive >= 0x80 && !BootDriveReported) || + DiskIsDriveRemovable(FrldrBootDrive)) + { + /* TODO: Check if it's really a cdrom drive */ + ULONG* Buffer; + ULONG Checksum = 0; + + /* Read the MBR */ + if (!MachDiskReadLogicalSectors(FrldrBootDrive, 16ULL, 1, (PVOID)DISKREADBUFFER)) + { + ERR("Reading MBR failed\n"); + return; + } + + Buffer = (ULONG*)DISKREADBUFFER; + + /* Calculate the MBR checksum */ + for (i = 0; i < 2048 / sizeof(ULONG); i++) Checksum += Buffer[i]; + Checksum = ~Checksum + 1; + TRACE("Checksum: %x\n", Checksum); + + /* Fill out the ARC disk block */ + reactos_arc_disk_info[reactos_disk_count].CheckSum = Checksum; + strcpy(reactos_arc_strings[reactos_disk_count], BootPath); + reactos_arc_disk_info[reactos_disk_count].ArcName = + reactos_arc_strings[reactos_disk_count]; + reactos_disk_count++; + + FsRegisterDevice(BootPath, &DiskVtbl); + } + + PcBiosDiskCount = DiskCount; +} Propchange: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Thu Sep 29 21:12:40 2011 @@ -289,7 +289,6 @@ } //DECLSPEC_NORETURN -NTKERNELAPI VOID NTAPI KeBugCheckEx( Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Thu Sep 29 21:12:40 2011 @@ -19,6 +19,7 @@ <file>hardware.c</file> <file>hwacpi.c</file> <file>hwapm.c</file> + <file>hwdisk.c</file> <file>hwpci.c</file> <file>i386bug.c</file> <file>i386disk.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c [iso-8859-1] Thu Sep 29 21:12:40 2011 @@ -18,6 +18,8 @@ */ #include <freeldr.h> +#include <debug.h> +DBG_DEFAULT_CHANNEL(INIFILE); static LONG IniOpenIniFile(ULONG* FileId) { @@ -44,6 +46,7 @@ ULONG FreeLoaderIniFileSize, Count; LONG ret; BOOLEAN Success; + TRACE("IniFileInitialize()\n"); // // Open freeldr.ini

12 years, 11 months

[cgutman] 53895: [ACPI] - Update ACPICA from 20091214 to 20110922 - Rewrite a large portion of the OSL code - Perform a full initialization of ACPI objects (don't skip devices and events) - Please ...

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Sep 29 20:57:14 2011 New Revision: 53895 URL: http://svn.reactos.org/svn/reactos?rev=53895&view=rev Log: [ACPI] - Update ACPICA from 20091214 to 20110922 - Rewrite a large portion of the OSL code - Perform a full initialization of ACPI objects (don't skip devices and events) - Please retest ACPI bugs after this commit Added: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsargs.c (with props) trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dscontrol.c (with props) trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload2.c (with props) trunk/reactos/drivers/bus/acpi/acpica/events/evglock.c (with props) trunk/reactos/drivers/bus/acpi/acpica/events/evgpeinit.c (with props) trunk/reactos/drivers/bus/acpi/acpica/events/evgpeutil.c (with props) trunk/reactos/drivers/bus/acpi/acpica/events/evxfgpe.c (with props) trunk/reactos/drivers/bus/acpi/acpica/executer/exdebug.c (with props) trunk/reactos/drivers/bus/acpi/acpica/hardware/hwpci.c (with props) trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c (with props) trunk/reactos/drivers/bus/acpi/acpica/utilities/utosi.c (with props) trunk/reactos/drivers/bus/acpi/acpica/utilities/utxferror.c (with props) Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/bus/acpi/acpi.rbuild trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsfield.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsinit.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsobject.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsopcode.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswexec.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswscope.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswstate.c trunk/reactos/drivers/bus/acpi/acpica/events/evevent.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpe.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpeblk.c trunk/reactos/drivers/bus/acpi/acpica/events/evmisc.c trunk/reactos/drivers/bus/acpi/acpica/events/evregion.c trunk/reactos/drivers/bus/acpi/acpica/events/evrgnini.c trunk/reactos/drivers/bus/acpi/acpica/events/evsci.c trunk/reactos/drivers/bus/acpi/acpica/events/evxface.c trunk/reactos/drivers/bus/acpi/acpica/events/evxfevnt.c trunk/reactos/drivers/bus/acpi/acpica/events/evxfregn.c trunk/reactos/drivers/bus/acpi/acpica/executer/exconfig.c trunk/reactos/drivers/bus/acpi/acpica/executer/exconvrt.c trunk/reactos/drivers/bus/acpi/acpica/executer/excreate.c trunk/reactos/drivers/bus/acpi/acpica/executer/exdump.c trunk/reactos/drivers/bus/acpi/acpica/executer/exfield.c trunk/reactos/drivers/bus/acpi/acpica/executer/exfldio.c trunk/reactos/drivers/bus/acpi/acpica/executer/exmisc.c trunk/reactos/drivers/bus/acpi/acpica/executer/exmutex.c trunk/reactos/drivers/bus/acpi/acpica/executer/exnames.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg1.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg2.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg3.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg6.c trunk/reactos/drivers/bus/acpi/acpica/executer/exprep.c trunk/reactos/drivers/bus/acpi/acpica/executer/exregion.c trunk/reactos/drivers/bus/acpi/acpica/executer/exresnte.c trunk/reactos/drivers/bus/acpi/acpica/executer/exresolv.c trunk/reactos/drivers/bus/acpi/acpica/executer/exresop.c trunk/reactos/drivers/bus/acpi/acpica/executer/exstore.c trunk/reactos/drivers/bus/acpi/acpica/executer/exstoren.c trunk/reactos/drivers/bus/acpi/acpica/executer/exstorob.c trunk/reactos/drivers/bus/acpi/acpica/executer/exsystem.c trunk/reactos/drivers/bus/acpi/acpica/executer/exutils.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwacpi.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwgpe.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwsleep.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwtimer.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwvalid.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxface.c trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h trunk/reactos/drivers/bus/acpi/acpica/include/accommon.h trunk/reactos/drivers/bus/acpi/acpica/include/acconfig.h trunk/reactos/drivers/bus/acpi/acpica/include/acdebug.h trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h trunk/reactos/drivers/bus/acpi/acpica/include/acdispat.h trunk/reactos/drivers/bus/acpi/acpica/include/acevents.h trunk/reactos/drivers/bus/acpi/acpica/include/acexcep.h trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h trunk/reactos/drivers/bus/acpi/acpica/include/achware.h trunk/reactos/drivers/bus/acpi/acpica/include/acinterp.h trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h trunk/reactos/drivers/bus/acpi/acpica/include/acnames.h trunk/reactos/drivers/bus/acpi/acpica/include/acnamesp.h trunk/reactos/drivers/bus/acpi/acpica/include/acobject.h trunk/reactos/drivers/bus/acpi/acpica/include/acopcode.h trunk/reactos/drivers/bus/acpi/acpica/include/acoutput.h trunk/reactos/drivers/bus/acpi/acpica/include/acparser.h trunk/reactos/drivers/bus/acpi/acpica/include/acpi.h trunk/reactos/drivers/bus/acpi/acpica/include/acpiosxf.h trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h trunk/reactos/drivers/bus/acpi/acpica/include/acpredef.h trunk/reactos/drivers/bus/acpi/acpica/include/acresrc.h trunk/reactos/drivers/bus/acpi/acpica/include/acrestyp.h trunk/reactos/drivers/bus/acpi/acpica/include/acstruct.h trunk/reactos/drivers/bus/acpi/acpica/include/actables.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl1.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl2.h trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h trunk/reactos/drivers/bus/acpi/acpica/include/amlcode.h trunk/reactos/drivers/bus/acpi/acpica/include/amlresrc.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/accygwin.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acefi.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acfreebsd.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acintel.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acmsvc.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acnetbsd.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acos2.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsalloc.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdumpdv.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nseval.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsload.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsnames.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsobject.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsparse.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nspredef.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair2.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nssearch.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsutils.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nswalk.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfname.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfobj.c trunk/reactos/drivers/bus/acpi/acpica/parser/psargs.c trunk/reactos/drivers/bus/acpi/acpica/parser/psloop.c trunk/reactos/drivers/bus/acpi/acpica/parser/psopcode.c trunk/reactos/drivers/bus/acpi/acpica/parser/psparse.c trunk/reactos/drivers/bus/acpi/acpica/parser/psscope.c trunk/reactos/drivers/bus/acpi/acpica/parser/pstree.c trunk/reactos/drivers/bus/acpi/acpica/parser/psutils.c trunk/reactos/drivers/bus/acpi/acpica/parser/pswalk.c trunk/reactos/drivers/bus/acpi/acpica/parser/psxface.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsaddr.c trunk/reactos/drivers/bus/acpi/acpica/resources/rscalc.c trunk/reactos/drivers/bus/acpi/acpica/resources/rscreate.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsdump.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsinfo.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsio.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsirq.c trunk/reactos/drivers/bus/acpi/acpica/resources/rslist.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsmemory.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsmisc.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsutils.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsxface.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbfind.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfroot.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utalloc.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utcache.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utcopy.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdebug.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdelete.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uteval.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utglobal.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utids.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utinit.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utlock.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utmath.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utmisc.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utmutex.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utobject.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utstate.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uttrack.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxface.c trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/osl.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpi.rbui… Modified: trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ac… Added: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Added: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dscontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsfield.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Added: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswscope.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Added: trunk/reactos/drivers/bus/acpi/acpica/events/evglock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpeblk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Added: trunk/reactos/drivers/bus/acpi/acpica/events/evgpeinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Added: trunk/reactos/drivers/bus/acpi/acpica/events/evgpeutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evregion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evrgnini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evsci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxfevnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Added: trunk/reactos/drivers/bus/acpi/acpica/events/evxfgpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxfregn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exconvrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/excreate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Added: trunk/reactos/drivers/bus/acpi/acpica/executer/exdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exfield.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exfldio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exnames.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg6.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exprep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exregion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exresnte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exresolv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exresop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exstoren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exstorob.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exsystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwgpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Added: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwsleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwtimer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwvalid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/accommon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdispat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acevents.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acexcep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/achware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acinterp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acnames.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acnamesp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acopcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acparser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpiosxf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpredef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acresrc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acrestyp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acstruct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl1.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/amlcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/amlresrc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/accygwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acefi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acfreebsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acintel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acmsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acnetbsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acos2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdumpdv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nseval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsnames.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nspredef.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nssearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nswalk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psscope.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/pstree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/pswalk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsaddr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rscalc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rscreate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsirq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbfind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfroot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Added: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdelete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uteval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utglobal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utmath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Added: trunk/reactos/drivers/bus/acpi/acpica/utilities/utosi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uttrack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Added: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxferror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… Modified: trunk/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev…

12 years, 11 months

[cgutman] 53894: [ACPI] - Silence debug spam - Add comment about the width parameter (bits not bytes)

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Sep 29 18:49:10 2011 New Revision: 53894 URL: http://svn.reactos.org/svn/reactos?rev=53894&view=rev Log: [ACPI] - Silence debug spam - Add comment about the width parameter (bits not bytes) Modified: trunk/reactos/drivers/bus/acpi/osl.c Modified: trunk/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Thu Sep 29 18:49:10 2011 @@ -462,7 +462,7 @@ sizeof(PciConfig)); if (ReadLength == 0) { - DPRINT1("PCI device is not present\n"); + DPRINT("PCI device is not present\n"); return FALSE; } @@ -470,7 +470,7 @@ if (PciConfig.VendorID == PCI_INVALID_VENDORID) { - DPRINT1("Invalid vendor ID in PCI configuration space\n"); + DPRINT("Invalid vendor ID in PCI configuration space\n"); return FALSE; } @@ -497,6 +497,7 @@ if (!OslIsPciDevicePresent(PciId->Bus, slot.u.AsULONG)) return AE_NOT_FOUND; + /* Width is in BITS */ HalGetBusDataByOffset(PCIConfiguration, PciId->Bus, slot.u.AsULONG, @@ -526,6 +527,7 @@ if (!OslIsPciDevicePresent(PciId->Bus, slot.u.AsULONG)) return AE_NOT_FOUND; + /* Width is in BITS */ HalSetBusDataByOffset(PCIConfiguration, PciId->Bus, slot.u.AsULONG,

12 years, 11 months

[akhaldi] 53893: [SHELL32] * Properly stub SHPropStgCreate, SHPropStgReadMultiple and SHPropStgWriteMultiple. By Claudiu Mihail. * Shell32 shellole winetest doesn't crash anymore.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 29 16:55:52 2011 New Revision: 53893 URL: http://svn.reactos.org/svn/reactos?rev=53893&view=rev Log: [SHELL32] * Properly stub SHPropStgCreate, SHPropStgReadMultiple and SHPropStgWriteMultiple. By Claudiu Mihail. * Shell32 shellole winetest doesn't crash anymore. Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellole.cpp Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Thu Sep 29 16:55:52 2011 @@ -418,9 +418,9 @@ 681 stdcall -noname SHGetAppCompatFlags(long) shlwapi.SHGetAppCompatFlags 683 stub -noname SHStgOpenStorageW 684 stub -noname SHStgOpenStorageA -685 stub SHPropStgCreate -688 stub SHPropStgReadMultiple -689 stub SHPropStgWriteMultiple +685 stdcall SHPropStgCreate(ptr ptr ptr long long long ptr ptr) +688 stdcall SHPropStgReadMultiple(ptr long long ptr ptr) +689 stdcall SHPropStgWriteMultiple(ptr ptr long ptr ptr long) 690 stub -noname SHIsLegacyAnsiProperty 691 stub -noname SHFileSysBindToStorage 700 stdcall CDefFolderMenu_Create(ptr ptr long ptr ptr ptr ptr ptr ptr) Modified: trunk/reactos/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] Thu Sep 29 16:55:52 2011 @@ -580,3 +580,31 @@ GlobalUnlock(hDrop); return i; } + +/************************************************************************* + * SHPropStgCreate [SHELL32.685] + */ +EXTERN_C HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, + const CLSID *pclsid, DWORD grfFlags, DWORD grfMode, + DWORD dwDisposition, IPropertyStorage **ppstg, UINT *puCodePage) +{ + return E_NOTIMPL; +} + +/************************************************************************* + * SHPropStgReadMultiple [SHELL32.688] + */ +EXTERN_C HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, + ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar) +{ + return E_NOTIMPL; +} + +/************************************************************************* + * SHPropStgWriteMultiple [SHELL32.689] + */ +EXTERN_C HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, + ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar, PROPID propidNameFirst) +{ + return E_NOTIMPL; +}

12 years, 11 months

[cgutman] 53892: [ACPI] - Add a hack to skip calling methods of the HPET object because it causes a hardlock on VMWare - Attempt #2 at fixing VMware

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Sep 29 16:03:49 2011 New Revision: 53892 URL: http://svn.reactos.org/svn/reactos?rev=53892&view=rev Log: [ACPI] - Add a hack to skip calling methods of the HPET object because it causes a hardlock on VMWare - Attempt #2 at fixing VMware Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Thu Sep 29 16:03:49 2011 @@ -1195,6 +1195,15 @@ } sprintf(device->pnp.bus_id, "%s", bus_id); buffer.Pointer = NULL; + + /* HACK: Skip HPET */ + if (strstr(device->pnp.bus_id, "HPET")) + { + DPRINT1("Using HPET hack\n"); + result = -1; + goto end; + } + break; }

12 years, 11 months

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 September 2011