Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 43371: - Implement pool corruption tests for testing pool overrun/underrun detectors. Tests invocation is commented out by default.
by fireball＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: fireball Date: Sun Oct 11 12:00:56 2009 New Revision: 43371 URL: http://svn.reactos.org/svn/reactos?rev=43371&view=rev Log: - Implement pool corruption tests for testing pool overrun/underrun detectors. Tests invocation is commented out by default. Modified: trunk/rostests/drivers/kmtest/kmtest.rbuild trunk/rostests/drivers/kmtest/ntos_pools.c Modified: trunk/rostests/drivers/kmtest/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtest.rbu… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtest.rbuild [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtest.rbuild [iso-8859-1] Sun Oct 11 12:00:56 2009 @@ -3,6 +3,7 @@ <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> <library>hal</library> + <library>pseh</library> <file>kmtest.c</file> <file>deviface.c</file> <file>deviface_test.c</file> Modified: trunk/rostests/drivers/kmtest/ntos_pools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_pools… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_pools.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_pools.c [iso-8859-1] Sun Oct 11 12:00:56 2009 @@ -25,6 +25,8 @@ #include <ddk/ntddk.h> #include <ntifs.h> #include <ndk/ntndk.h> +/* SEH support with PSEH */ +#include <pseh/pseh2.h> #include "kmtest.h" //#define NDEBUG @@ -125,10 +127,61 @@ FinishTest("NTOSKRNL Pools Tests"); } +VOID +PoolsCorruption() +{ + PULONG Ptr, TestPtr; + ULONG AllocSize; + NTSTATUS Status = STATUS_SUCCESS; + + StartTest(); + + // start with non-paged pool + AllocSize = 4096 + 0x10; + Ptr = ExAllocatePoolWithTag(NonPagedPool, AllocSize, TAG_POOLTEST); + + // touch all bytes, it shouldn't cause an exception + RtlZeroMemory(Ptr, AllocSize); + + // test buffer overrun, right after our allocation ends + _SEH2_TRY + { + TestPtr = (PULONG)((PUCHAR)Ptr + AllocSize); + //Ptr[4] = 0xd33dbeef; + *TestPtr = 0xd33dbeef; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the status */ + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; + + ok(Status == STATUS_ACCESS_VIOLATION, "Exception should occur, but got Status 0x%08lX\n", Status); + + // test overrun in a distant byte range, but within 4096KB + _SEH2_TRY + { + Ptr[2020] = 0xdeadb33f; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the status */ + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; + + ok(Status == STATUS_ACCESS_VIOLATION, "Exception should occur, but got Status 0x%08lX\n", Status); + + // free the pool + ExFreePoolWithTag(Ptr, TAG_POOLTEST); + + FinishTest("NTOSKRNL Pool Corruption"); +} + /* PUBLIC FUNCTIONS ***********************************************************/ VOID NtoskrnlPoolsTest() { PoolsTest(); + //PoolsCorruption(); }

1 0

[fireball] 43370: [powrprof] - Implement some powrprof.dll according to regression tests committed in r43368, by Alexander Wurzinger <lohnegrim@gmx.net>. - Minor bugfix by me. See issue #3381 for more details.
by fireball＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: fireball Date: Sun Oct 11 11:54:41 2009 New Revision: 43370 URL: http://svn.reactos.org/svn/reactos?rev=43370&view=rev Log: [powrprof] - Implement some powrprof.dll according to regression tests committed in r43368, by Alexander Wurzinger <lohnegrim(a)gmx.net>. - Minor bugfix by me. See issue #3381 for more details. Modified: trunk/reactos/dll/win32/powrprof/powrprof.c Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Sun Oct 11 11:54:41 2009 @@ -29,17 +29,28 @@ #include <stdio.h> #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(powrprof); static const WCHAR szPowerCfgSubKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg"; +static const WCHAR szUserPowerConfigSubKey[] = + L"Control Panel\\PowerCfg"; +static const WCHAR szCurrentPowerPolicies[] = + L"CurrentPowerPolicy"; static const WCHAR szPolicies[] = L"Policies"; +static const WCHAR szName[] = L"Name"; +static const WCHAR szDescription[] = L"Description"; static const WCHAR szSemaphoreName[] = L"PowerProfileRegistrySemaphore"; static const WCHAR szDiskMax[] = L"DiskSpindownMax"; static const WCHAR szDiskMin[] = L"DiskSpindownMin"; static const WCHAR szLastID[] = L"LastID"; + +UINT g_LastID = -1; + +BOOLEAN WINAPI WritePwrPolicy(PUINT puiID, PPOWER_POLICY pPowerPolicy); HANDLE PPRegSemaphore = NULL; @@ -50,6 +61,12 @@ PVOID lpOutputBuffer, ULONG nOutputBufferSize) { + BOOLEAN old; + + //Lohnegrim: In order to get the right results, we have to ajust our Privilegs + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); + RtlAdjustPrivilege(SE_CREATE_PAGEFILE_PRIVILEGE, TRUE, FALSE, &old); + return NtPowerInformation(InformationLevel, lpInputBuffer, nInputBufferSize, @@ -325,7 +342,7 @@ NtPowerInformation(SystemPowerPolicyDc, 0, 0, &DCPower, sizeof(SYSTEM_POWER_POLICY)); return FALSE; - */ + */ /* Lohnegrim: I dont know why this Function shoud call NtPowerInformation, becouse as far as i know, it simply returns the GlobalPowerPolicy and the AktivPowerScheme! @@ -455,14 +472,24 @@ return FALSE; } - BOOLEAN WINAPI IsPwrHibernateAllowed(VOID) { SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); - NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + NTSTATUS ret; + BOOLEAN old; + + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); + ret = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + if (ret == STATUS_SUCCESS) + { + return PowerCaps.SystemS4 && PowerCaps.HiberFilePresent; // IsHiberfilPresent(); + } + else + { + SetLastError(RtlNtStatusToDosError(ret)); + return FALSE; + } } @@ -470,9 +497,20 @@ IsPwrShutdownAllowed(VOID) { SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); - NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + NTSTATUS ret; + BOOLEAN old; + + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); + ret = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + if (ret == STATUS_SUCCESS) + { + return PowerCaps.SystemS5; + } + else + { + SetLastError(RtlNtStatusToDosError(ret)); + return FALSE; + } } @@ -480,9 +518,20 @@ IsPwrSuspendAllowed(VOID) { SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); - NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + NTSTATUS ret; + BOOLEAN old; + + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); + ret = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + if (ret == STATUS_SUCCESS) + { + return PowerCaps.SystemS1 || PowerCaps.SystemS2 || PowerCaps.SystemS3; + } + else + { + SetLastError(RtlNtStatusToDosError(ret)); + return FALSE; + } } @@ -555,8 +604,40 @@ ReadProcessorPwrScheme(UINT uiID, PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) { - FIXME("(%d, %p) stub!\n", uiID, pMachineProcessorPowerPolicy); - SetLastError(ERROR_FILE_NOT_FOUND); + HKEY hKey; + WCHAR szPath[MAX_PATH]; + DWORD len=sizeof(MACHINE_PROCESSOR_POWER_POLICY); + + swprintf(szPath, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\ProcessorPolicies\\%i", uiID); + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + szPath, + 0, + KEY_ALL_ACCESS, + &hKey) == ERROR_SUCCESS) + { + if (RegQueryValueExW(hKey,szPolicies,NULL,0,(LPBYTE)pMachineProcessorPowerPolicy,&len) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + else + { + RegCloseKey(hKey); + if (uiID != 0) + { + return ReadProcessorPwrScheme(0,pMachineProcessorPowerPolicy); + } + else + { + return FALSE; + } + } + } + else + { + RegCloseKey(hKey); + return FALSE; + } return FALSE; } @@ -600,9 +681,54 @@ PGLOBAL_POWER_POLICY lpGlobalPowerPolicy, PPOWER_POLICY lpPowerPolicy) { - FIXME("(%d, %p, %p) stub!\n", uiID, lpGlobalPowerPolicy, lpPowerPolicy); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; + POWER_POLICY tmp; + HKEY hKey; + WCHAR Buf[MAX_PATH]; + BOOLEAN ret; + + if (ReadPwrScheme(uiID,&tmp)) + { + if (RegOpenKeyEx(HKEY_CURRENT_USER,szUserPowerConfigSubKey,(DWORD)NULL,KEY_ALL_ACCESS,&hKey) != ERROR_SUCCESS) + { + return FALSE; + } + swprintf(Buf,L"%i",uiID); + + if (RegSetValueExW(hKey,szCurrentPowerPolicies,(DWORD)NULL,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + if ((lpGlobalPowerPolicy != NULL) || (lpPowerPolicy != NULL)) + { + ret = ValidatePowerPolicies(lpGlobalPowerPolicy,lpPowerPolicy); + if (ret) + { + ret = TRUE; + if (lpGlobalPowerPolicy != NULL) + { + ret = WriteGlobalPwrPolicy(lpGlobalPowerPolicy); + } + if (ret && lpPowerPolicy != NULL) + { + ret = WritePwrPolicy(&uiID,lpPowerPolicy); + } + } + return ret; + } + else + { + return TRUE; + } + } + else + { + RegCloseKey(hKey); + return FALSE; + } + } + else + { + return FALSE; + } } @@ -666,11 +792,38 @@ WriteProcessorPwrScheme(UINT ID, PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) { - FIXME("(%d, %p) stub!\n", ID, pMachineProcessorPowerPolicy); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - + WCHAR Buf[MAX_PATH]; + HKEY hKey; + + swprintf(Buf,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\ProcessorPolicies\\%i",ID); + + if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf, &hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)pMachineProcessorPowerPolicy,sizeof(MACHINE_PROCESSOR_POWER_POLICY)); + RegCloseKey(hKey); + return TRUE; + } + else + { + return FALSE; + } +} + +void SetLastID() +{ + WCHAR Buf[MAX_PATH]; + HKEY hKey; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + szPowerCfgSubKey, + 0, + KEY_WRITE, + &hKey) != ERROR_SUCCESS) + return; + swprintf(Buf,L"%i",g_LastID); + RegSetValueExW(hKey,szLastID,(DWORD)NULL,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)); + RegCloseKey(hKey); +} BOOLEAN WINAPI WritePwrScheme(PUINT puiID, @@ -678,40 +831,338 @@ LPWSTR lpszDescription, PPOWER_POLICY pPowerPolicy) { - FIXME("(%p, %s, %s, %p) stub!\n", puiID, debugstr_w(lpszName), debugstr_w(lpszDescription), pPowerPolicy); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + WCHAR Buf[MAX_PATH]; + HKEY hKey; + + if (*puiID == -1) + { + g_LastID++; + *puiID = g_LastID; + SetLastID(); + } + + swprintf(Buf,L"Control Panel\\PowerCfg\\PowerPolicies\\%i",*puiID); + + if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey,szName,(DWORD)NULL,REG_SZ,(const unsigned char *)lpszName,strlenW((const char *)lpszName)*sizeof(WCHAR)); + RegSetValueExW(hKey,szDescription,(DWORD)NULL,REG_SZ,(const unsigned char *)lpszDescription,strlenW((const char *)lpszDescription)*sizeof(WCHAR)); + RegCloseKey(hKey); + return WritePwrPolicy(puiID,pPowerPolicy); + } + else + { + return FALSE; + } return FALSE; } +BOOLEAN CheckPowerActionPolicy(PPOWER_ACTION_POLICY pPAP, SYSTEM_POWER_CAPABILITIES PowerCaps) +{ +/* + Lohnegrim: this is an Helperfunction, it checks if the POWERACTIONPOLICY is valid + Also, if the System dosn't support Hipernation, then change the PowerAction +*/ + switch (pPAP->Action) + { + case PowerActionNone: + return TRUE; + case PowerActionReserved: + if (PowerCaps.SystemS1 || PowerCaps.SystemS2 || PowerCaps.SystemS3) + pPAP->Action = PowerActionSleep; + else + pPAP->Action = PowerActionReserved; + case PowerActionSleep: + return TRUE; + case PowerActionHibernate: + if (!(PowerCaps.SystemS4 && PowerCaps.HiberFilePresent)) + { + if (PowerCaps.SystemS1 || PowerCaps.SystemS2 || PowerCaps.SystemS3) + pPAP->Action = PowerActionSleep; + else + pPAP->Action = PowerActionReserved; + } + case PowerActionShutdown: + case PowerActionShutdownReset: + case PowerActionShutdownOff: + case PowerActionWarmEject: + return TRUE; + default: + SetLastError(ERROR_INVALID_DATA); + return FALSE; + }; +} + +VOID FixSystemPowerState(PSYSTEM_POWER_STATE Psps, SYSTEM_POWER_CAPABILITIES PowerCaps) +{ + + //Lohnegrim: If the System dosn't support the Powerstates, then we have to change them + if (!PowerCaps.SystemS1 && *Psps == PowerSystemSleeping1) + *Psps = PowerSystemSleeping2; + if (!PowerCaps.SystemS2 && *Psps == PowerSystemSleeping2) + *Psps = PowerSystemSleeping3; + if (!PowerCaps.SystemS3 && *Psps == PowerSystemSleeping3) + *Psps = PowerSystemHibernate; + if (!(PowerCaps.SystemS4 && PowerCaps.HiberFilePresent) && *Psps == PowerSystemHibernate) + *Psps = PowerSystemSleeping2; + if (!PowerCaps.SystemS1 && *Psps == PowerSystemSleeping1) + *Psps = PowerSystemSleeping2; + if (!PowerCaps.SystemS2 && *Psps == PowerSystemSleeping2) + *Psps = PowerSystemSleeping3; + if (!PowerCaps.SystemS3 && *Psps == PowerSystemSleeping3) + *Psps = PowerSystemShutdown; + +} + BOOLEAN WINAPI ValidatePowerPolicies(PGLOBAL_POWER_POLICY pGPP, PPOWER_POLICY pPP) { - GLOBAL_POWER_POLICY pGlobalPowerPolicy; - POWER_POLICY pPowerPolicy; - - FIXME("(%p, %p) not fully implemented\n", pGPP, pPP); - - if (!GetCurrentPowerPolicies(&pGlobalPowerPolicy, &pPowerPolicy)) - { - ERR("GetCurrentPowerPolicies(%p, %p) failed\n", pGPP, pPP); + SYSTEM_POWER_CAPABILITIES PowerCaps; + NTSTATUS ret; + BOOLEAN old; + + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); + ret = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + if (ret != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(ret)); return FALSE; } if (pGPP) { - //memcpy(&pGPP, &pGlobalPowerPolicy, sizeof(GLOBAL_POWER_POLICY)); + if (pGPP->user.Revision != 1 || pGPP->mach.Revision != 1) + { + SetLastError(ERROR_REVISION_MISMATCH); + return FALSE; + } + if (pGPP->mach.LidOpenWakeAc == PowerSystemUnspecified) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if ((int)pGPP->mach.LidOpenWakeAc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if (pGPP->mach.LidOpenWakeDc < PowerSystemWorking) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if ((int)pGPP->mach.LidOpenWakeDc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + //Lohnegrim: unneeded + /*if ((pGPP->mach.LidOpenWakeDc < PowerSystemWorking) || (pGPP->mach.LidOpenWakeDc >= PowerSystemMaximum)) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + }*/ + if (!CheckPowerActionPolicy(&pGPP->user.LidCloseAc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pGPP->user.LidCloseDc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pGPP->user.PowerButtonAc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pGPP->user.PowerButtonDc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pGPP->user.SleepButtonAc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pGPP->user.SleepButtonDc,PowerCaps)) + { + return FALSE; + } + //Lohnegrim: The BroadcastCapacityResolution presents the Powerlevel in Percent, if invalid set th 100 == FULL + if ((pGPP->mach.BroadcastCapacityResolution < 0) || (pGPP->mach.BroadcastCapacityResolution > 100)) + pGPP->mach.BroadcastCapacityResolution=100; + + //Lohnegrim: I have no idear, if they are realy needed, or if they are spezific for my System, or what they mean, so i removed them + //pGPP->user.DischargePolicy[1].PowerPolicy.EventCode = pGPP->user.DischargePolicy[1].PowerPolicy.EventCode | 0x010000; + //pGPP->user.DischargePolicy[2].PowerPolicy.EventCode = pGPP->user.DischargePolicy[2].PowerPolicy.EventCode | 0x020000; + //pGPP->user.DischargePolicy[3].PowerPolicy.EventCode = pGPP->user.DischargePolicy[3].PowerPolicy.EventCode | 0x030000; + + FixSystemPowerState(&pGPP->mach.LidOpenWakeAc,PowerCaps); + FixSystemPowerState(&pGPP->mach.LidOpenWakeDc,PowerCaps); + } if (pPP) { - //memcpy(&pPP, &pPowerPolicy, sizeof(POWER_POLICY)); + if (pPP->user.Revision != 1 || pPP->mach.Revision != 1) + { + SetLastError(ERROR_REVISION_MISMATCH); + return FALSE; + } + + //Lohnegrim: unneeded + //if (pPP->mach.MinSleepAc < PowerSystemWorking) + //{ + // SetLastError(ERROR_GEN_FAILURE); + // return FALSE; + //} + if ((int)pPP->mach.MinSleepAc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + //Lohnegrim: unneeded + //if (pPP->mach.MinSleepDc < PowerSystemWorking) + //{ + // SetLastError(ERROR_GEN_FAILURE); + // return FALSE; + //} + if ((int)pPP->mach.MinSleepDc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if (pPP->mach.ReducedLatencySleepAc == PowerSystemUnspecified) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if ((int)pPP->mach.ReducedLatencySleepAc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if (pPP->mach.ReducedLatencySleepDc < PowerSystemWorking) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if ((int)pPP->mach.ReducedLatencySleepDc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + + if (!CheckPowerActionPolicy(&pPP->mach.OverThrottledAc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pPP->mach.OverThrottledDc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pPP->user.IdleAc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pPP->user.IdleDc,PowerCaps)) + { + return FALSE; + } + if (pPP->user.MaxSleepAc < PowerSystemWorking) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + //Lohnegrim: unneeded + /*if ((int)pPP->user.MaxSleepAc > PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + }*/ + if (pPP->user.MaxSleepDc < PowerSystemWorking) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + //Lohnegrim: unneeded + /*if ((int)pPP->user.MaxSleepDc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + }*/ + if (PowerCaps.SystemS1) + { + pPP->mach.MinSleepAc=PowerSystemSleeping1; + pPP->mach.MinSleepDc=PowerSystemSleeping1; + } + else if (PowerCaps.SystemS2) + { + pPP->mach.MinSleepAc=PowerSystemSleeping2; + pPP->mach.MinSleepDc=PowerSystemSleeping2; + } + else if (PowerCaps.SystemS3) + { + pPP->mach.MinSleepAc=PowerSystemSleeping3; + pPP->mach.MinSleepDc=PowerSystemSleeping3; + } + + if (PowerCaps.SystemS4) + { + pPP->user.MaxSleepAc=PowerSystemSleeping3; + pPP->user.MaxSleepDc=PowerSystemSleeping3; + } + else if (PowerCaps.SystemS3) + { + pPP->user.MaxSleepAc=PowerSystemSleeping2; + pPP->user.MaxSleepDc=PowerSystemSleeping2; + } + else if (PowerCaps.SystemS1) + { + pPP->user.MaxSleepAc=PowerSystemSleeping1; + pPP->user.MaxSleepDc=PowerSystemSleeping1; + } + //Lohnegrim: I dont know where to get this info from, so i removed it + //pPP->user.OptimizeForPowerAc=TRUE; + //pPP->user.OptimizeForPowerDc=TRUE; + + FixSystemPowerState(&pPP->mach.ReducedLatencySleepAc,PowerCaps); + FixSystemPowerState(&pPP->mach.ReducedLatencySleepDc,PowerCaps); } SetLastError(ERROR_SUCCESS); return TRUE; } +BOOLEAN WINAPI WritePwrPolicy(PUINT puiID, PPOWER_POLICY pPowerPolicy) +{ + + WCHAR Buf[MAX_PATH]; + HKEY hKey; + + swprintf(Buf,L"Control Panel\\PowerCfg\\PowerPolicies\\%i",*puiID); + + if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&pPowerPolicy->user,sizeof(USER_POWER_POLICY)); + RegCloseKey(hKey); + swprintf(Buf,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\PowerPolicies\\%i",*puiID); + + if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf,&hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&pPowerPolicy->mach,sizeof(MACHINE_POWER_POLICY)); + RegCloseKey(hKey); + return TRUE; + } + else + { + return FALSE; + } + } + else + { + return FALSE; + } +} BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -735,10 +1186,14 @@ } else { - BYTE lpValue[40]; + WCHAR lpValue[MAX_PATH]; DWORD cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue); - if (r != ERROR_SUCCESS) + r = RegQueryValueExW(hKey, szLastID, 0, 0, (BYTE*)lpValue, &cbValue); + if (r == ERROR_SUCCESS) + { + g_LastID = _wtoi(lpValue); + } + else { TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); }

1 0

[janderwald] 43369: - Store KSPROPERTY_SET in Irp when using KsPropertyHandler - Fix a bug in KsPinDataIntersection
by janderwald＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: janderwald Date: Sun Oct 11 11:49:10 2009 New Revision: 43369 URL: http://svn.reactos.org/svn/reactos?rev=43369&view=rev Log: - Store KSPROPERTY_SET in Irp when using KsPropertyHandler - Fix a bug in KsPinDataIntersection Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/ksfilter/ks/property.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Sun Oct 11 11:49:10 2009 @@ -291,7 +291,7 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); Buffer = Irp->UserBuffer; - DPRINT("KsPinPropertyHandler Irp %p Property %p Data %p DescriptorsCount %u Descriptor %p OutputLength %u Id %x\n", Irp, Property, Data, DescriptorsCount, Descriptor, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Property->Id); + DPRINT("KsPinPropertyHandler Irp %p Property %p Data %p DescriptorsCount %u Descriptor %p OutputLength %u Id %u\n", Irp, Property, Data, DescriptorsCount, Descriptor, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Property->Id); switch(Property->Id) { @@ -585,6 +585,24 @@ } /* + @unimplemented +*/ +KSDDKAPI NTSTATUS NTAPI +KsPinDataIntersectionEx( + IN PIRP Irp, + IN PKSP_PIN Pin, + OUT PVOID Data, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor, + IN ULONG DescriptorSize, + IN PFNKSINTERSECTHANDLEREX IntersectHandler OPTIONAL, + IN PVOID HandlerContext OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* @implemented */ KSDDKAPI @@ -627,7 +645,7 @@ } /* get start item */ - Item = (KSMULTIPLE_ITEM*)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + Item = (KSMULTIPLE_ITEM*)(Pin + 1); /* get first data range */ DataRange = (KSDATARANGE*)(Item + 1); /* iterate through all data ranges */ Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Sun Oct 11 11:49:10 2009 @@ -81,25 +81,6 @@ return Status; } -/* - @unimplemented -*/ -KSDDKAPI NTSTATUS NTAPI -KsPinDataIntersectionEx( - IN PIRP Irp, - IN PKSP_PIN Pin, - OUT PVOID Data, - IN ULONG DescriptorsCount, - IN const KSPIN_DESCRIPTOR* Descriptor, - IN ULONG DescriptorSize, - IN PFNKSINTERSECTHANDLEREX IntersectHandler OPTIONAL, - IN PVOID HandlerContext OPTIONAL) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - - NTSTATUS KspCopyCreateRequest( IN PIRP Irp, Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Sun Oct 11 11:49:10 2009 @@ -18,7 +18,8 @@ IN ULONG InputBufferLength, IN ULONG OutputBufferLength, OUT PVOID OutputBuffer, - OUT PFNKSHANDLER *PropertyHandler) + OUT PFNKSHANDLER *PropertyHandler, + OUT PKSPROPERTY_SET * Set) { ULONG Index, ItemIndex; //PULONG Flags; @@ -93,6 +94,7 @@ if (Property->Flags & KSPROPERTY_TYPE_GET) *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].GetPropertyHandler; + *Set = (PKSPROPERTY_SET)&PropertySet[Index]; return STATUS_SUCCESS; } } @@ -111,6 +113,7 @@ IN ULONG PropertyItemSize OPTIONAL) { PKSPROPERTY Property; + PKSPROPERTY_SET Set; PIO_STACK_LOCATION IoStack; NTSTATUS Status; PFNKSHANDLER PropertyHandler = NULL; @@ -139,11 +142,12 @@ ASSERT(PropertyItemSize == 0 || PropertyItemSize == sizeof(KSPROPERTY_ITEM)); /* find the property handler */ - Status = FindPropertyHandler(&Irp->IoStatus, PropertySet, PropertySetsCount, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Irp->UserBuffer, &PropertyHandler); + Status = FindPropertyHandler(&Irp->IoStatus, PropertySet, PropertySetsCount, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Irp->UserBuffer, &PropertyHandler, &Set); if (NT_SUCCESS(Status) && PropertyHandler) { /* call property handler */ + KSPROPERTY_SET_IRP_STORAGE(Irp) = Set; Status = PropertyHandler(Irp, Property, Irp->UserBuffer); if (Status == STATUS_BUFFER_TOO_SMALL)

1 0

[fireball] 43368: [powrprof] - Add more powrprof.dll tests, by Alexander Wurzinger <lohnegrim@gmx.net>. - Some cleanup and code typo fixes by me. See issue #3381 for more details.
by fireball＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: fireball Date: Sun Oct 11 11:49:09 2009 New Revision: 43368 URL: http://svn.reactos.org/svn/reactos?rev=43368&view=rev Log: [powrprof] - Add more powrprof.dll tests, by Alexander Wurzinger <lohnegrim(a)gmx.net>. - Some cleanup and code typo fixes by me. See issue #3381 for more details. Modified: trunk/rostests/winetests/powrprof/pwrprof.c trunk/rostests/winetests/powrprof/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/powrprof/pwrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/pwrpro… Modified: trunk/rostests/winetests/powrprof/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/testli…

1 0

[dgorbachev] 43367: Fix English resource file. Patch by Joshua Rice, bug #4763.
by dgorbachev＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: dgorbachev Date: Sun Oct 11 02:09:41 2009 New Revision: 43367 URL: http://svn.reactos.org/svn/reactos?rev=43367&view=rev Log: Fix English resource file. Patch by Joshua Rice, bug #4763. Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Sun Oct 11 02:09:41 2009 @@ -178,7 +178,7 @@ IDS_MODIFY "Modify" IDS_APPS_COUNT "Applications count: %d" IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!\n\n" - IDS_WELCOME_TEXT "Choose a category on the left, then choose a application for install or uninstall.\nReactOS Web Site: " + IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: " IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "Installed" IDS_AVAILABLEFORINST "Available for installation"

1 0

[jimtabor] 43366: - Fix exception. Spotted by Stefan Ginsberg.
by jimtabor＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: jimtabor Date: Sat Oct 10 23:51:24 2009 New Revision: 43366 URL: http://svn.reactos.org/svn/reactos?rev=43366&view=rev Log: - Fix exception. Spotted by Stefan Ginsberg. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Sat Oct 10 23:51:24 2009 @@ -492,7 +492,7 @@ pci->pClientThreadInfo = NULL; // FIXME Need to set it in desktop.c! pci->ppi = ppi; pci->fsHooks = pti->fsHooks; - pci->hKL = pti->KeyboardLayout->hkl; + if (pti->KeyboardLayout) pci->hKL = pti->KeyboardLayout->hkl; /* CI may not have been initialized. */ if (!pci->pDeskInfo && pti->pDeskInfo) {

1 0

[sginsberg] 43365: KD64 Compatibility Bringup: - Add some missing control set structures to windbgkd.h from Singularity and fix some x86 assumptions. - Use CopyExceptionRecord instead of ExceptionRecord32To64 as we can just copy directly on 64-bit. - Add KeGetTrapFrameInterruptState macro to retrieve the interrupt state (ON/OFF) from a trap frame. - Use macros for retrieving certain parameters from CONTEXT in KdpTrap instead of hardcoding x86. - Add kdsup.c for x86/AMD64/ARM and move certain arc
by sginsberg＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: sginsberg Date: Sat Oct 10 21:27:54 2009 New Revision: 43365 URL: http://svn.reactos.org/svn/reactos?rev=43365&view=rev Log: KD64 Compatibility Bringup: - Add some missing control set structures to windbgkd.h from Singularity and fix some x86 assumptions. - Use CopyExceptionRecord instead of ExceptionRecord32To64 as we can just copy directly on 64-bit. - Add KeGetTrapFrameInterruptState macro to retrieve the interrupt state (ON/OFF) from a trap frame. - Use macros for retrieving certain parameters from CONTEXT in KdpTrap instead of hardcoding x86. - Add kdsup.c for x86/AMD64/ARM and move certain architecture dependent routines in here. - Stub out MSR, Bus and I/O Space read/write support and use KdpSys* for Control Space as it is architecture dependent. Also stub out low memory check (for x86 PAE). - Fix assumptions in the break point code that a breakpoint is 1 byte long (it is 4 byte on ARM, for example). Define the type required to contain a breakpoint per architecture and use KD_BREAKPOINT_SIZE when copying. - KD supports 32 breakpoints, not 20. - Be portable when initializing members of the KD version and debugger data block. - Pointers in the debugger data block should not be sign extended as done in the version block -- fix KdInitSystem and KdUpdateDataBlock that did this. - Fix some comments that were x86 specific and use more generic terms instead. - Fix a cast in KeBugCheckWithTf. Added: trunk/reactos/ntoskrnl/kd64/amd64/ (with props) trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c (with props) trunk/reactos/ntoskrnl/kd64/arm/ (with props) trunk/reactos/ntoskrnl/kd64/arm/kdsup.c (with props) trunk/reactos/ntoskrnl/kd64/i386/ (with props) trunk/reactos/ntoskrnl/kd64/i386/kdsup.c (with props) Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/include/reactos/windbgkd.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kdbreak.c trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/kd64/kdinit.c trunk/reactos/ntoskrnl/kd64/kdtrap.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=4336… ============================================================================== --- trunk/reactos/include/ndk/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/asm.h [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -521,6 +521,7 @@ #define CBSTACK_EBP 0x18 #define CBSTACK_RESULT 0x20 #define CBSTACK_RESULT_LENGTH 0x24 +#define CBSTACK_FRAME_POINTER CBSTACK_EBP // // NTSTATUS, Bugcheck Codes and Debug Codes Modified: trunk/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/windbgkd.h… ============================================================================== --- trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -142,7 +142,7 @@ // Control Report Flags // #define REPORT_INCLUDES_SEGS 0x0001 -#define REPORT_INCLUDES_CS 0x0002 +#define REPORT_STANDARD_CS 0x0002 // // Protocol Versions @@ -227,6 +227,11 @@ ULONG CurrentSymbolEnd; } X86_DBGKD_CONTROL_SET, *PX86_DBGKD_CONTROL_SET; +typedef struct _ALPHA_DBGKD_CONTROL_SET +{ + ULONG __padding; +} ALPHA_DBGKD_CONTROL_SET, *PALPHA_DBGKD_CONTROL_SET; + typedef struct _IA64_DBGKD_CONTROL_SET { ULONG Continue; @@ -254,14 +259,23 @@ union { X86_DBGKD_CONTROL_SET X86ControlSet; + ALPHA_DBGKD_CONTROL_SET AlphaControlSet; IA64_DBGKD_CONTROL_SET IA64ControlSet; AMD64_DBGKD_CONTROL_SET Amd64ControlSet; - ARM_DBGKD_CONTROL_SET ArmControlSet; + ARM_DBGKD_CONTROL_SET ARMControlSet; }; } DBGKD_ANY_CONTROL_SET, *PDBGKD_ANY_CONTROL_SET; #include <poppack.h> +#if defined(_M_IX86) typedef X86_DBGKD_CONTROL_SET DBGKD_CONTROL_SET, *PDBGKD_CONTROL_SET; +#elif defined(_M_AMD64) +typedef AMD64_DBGKD_CONTROL_SET DBGKD_CONTROL_SET, *PDBGKD_CONTROL_SET; +#elif defined(_M_ARM) +typedef ARM_DBGKD_CONTROL_SET DBGKD_CONTROL_SET, *PDBGKD_CONTROL_SET; +#else +#error Unsupported Architecture +#endif // // DBGKM Structure for Exceptions @@ -321,7 +335,12 @@ USHORT SegFs; } AMD64_DBGKD_CONTROL_REPORT, *PAMD64_DBGKD_CONTROL_REPORT; -typedef X86_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT; +typedef struct _ARM_DBGKD_CONTROL_REPORT +{ + ULONG Cpsr; + ULONG InstructionCount; + UCHAR InstructionStream[DBGKD_MAXSTREAM]; +} ARM_DBGKD_CONTROL_REPORT, *PARM_DBGKD_CONTROL_REPORT; typedef struct _DBGKD_ANY_CONTROL_REPORT { @@ -331,8 +350,19 @@ ALPHA_DBGKD_CONTROL_REPORT AlphaControlReport; IA64_DBGKD_CONTROL_REPORT IA64ControlReport; AMD64_DBGKD_CONTROL_REPORT Amd64ControlReport; + ARM_DBGKD_CONTROL_REPORT ARMControlReport; }; } DBGKD_ANY_CONTROL_REPORT, *PDBGKD_ANY_CONTROL_REPORT; + +#if defined(_M_IX86) +typedef X86_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; +#elif defined(_M_AMD64) +typedef AMD64_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; +#elif defined(_M_ARM) +typedef ARM_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; +#else +#error Unsupported Architecture +#endif // // DBGKD Structure for Debug I/O Type Print String @@ -834,6 +864,13 @@ } u; } DBGKD_TRACE_IO, *PDBGKD_TRACE_IO; +#if defined(_M_AMD64) + +#define CopyExceptionRecord(Ex64From, Ex64To) \ + RtlCopyMemory(Ex64To, Ex64From, sizeof(EXCEPTION_RECORD64)) + +#else + FORCEINLINE VOID ExceptionRecord32To64(IN PEXCEPTION_RECORD32 Ex32, @@ -853,4 +890,9 @@ } } +#define CopyExceptionRecord(Ex32From, Ex64To) \ + ExceptionRecord32To64((PEXCEPTION_RECORD32)Ex32From, Ex64To) + #endif + +#endif Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -12,7 +12,9 @@ // // BKPT is 4 bytes long // -#define KD_BREAKPOINT_SIZE 4 +#define KD_BREAKPOINT_TYPE ULONG +#define KD_BREAKPOINT_SIZE sizeof(ULONG) +//#define KD_BREAKPOINT_VALUE // // Macros for getting and setting special purpose registers in portable code @@ -31,6 +33,12 @@ #define KeSetContextReturnRegister(Context, ReturnValue) \ ((Context)->R0 = (ReturnValue)) + +// +// Returns the Interrupt State from a Trap Frame. +// ON = TRUE, OFF = FALSE +// +//#define KeGetTrapFrameInterruptState(TrapFrame) \ VOID KiPassiveRelease( Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -13,7 +13,9 @@ // // INT3 is 1 byte long // -#define KD_BREAKPOINT_SIZE 1 +#define KD_BREAKPOINT_TYPE UCHAR +#define KD_BREAKPOINT_SIZE sizeof(UCHAR) +#define KD_BREAKPOINT_VALUE 0xCC // // Macros for getting and setting special purpose registers in portable code @@ -32,6 +34,13 @@ #define KeSetContextReturnRegister(Context, ReturnValue) \ ((Context)->Eax = (ReturnValue)) + +// +// Returns the Interrupt State from a Trap Frame. +// ON = TRUE, OFF = FALSE +// +#define KeGetTrapFrameInterruptState(TrapFrame) \ + BooleanFlagOn((TrapFrame)->EFlags, EFLAGS_INTERRUPT_MASK) VOID FASTCALL Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -7,6 +7,11 @@ */ // +// Maximum supported number of breakpoints +// +#define KD_BREAKPOINT_MAX 32 + +// // Breakpoint Status Flags // typedef enum _KDP_BREAKPOINT_FLAGS @@ -25,7 +30,7 @@ ULONG Flags; PKPROCESS Process; PVOID Address; - UCHAR Content; + KD_BREAKPOINT_TYPE Content; } BREAKPOINT_ENTRY, *PBREAKPOINT_ENTRY; // @@ -260,6 +265,139 @@ NTAPI KdpAddBreakpoint( IN PVOID Address +); + +// +// Architecture dependent support routines +// + +// +// Version +// +VOID +NTAPI +KdpSysGetVersion( + IN PDBGKD_GET_VERSION64 Version +); + +// +// Context +// +VOID +NTAPI +KdpGetStateChange( + IN PDBGKD_MANIPULATE_STATE64 State, + IN PCONTEXT Context +); + +VOID +NTAPI +KdpSetContextState( + IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, + IN PCONTEXT Context +); + +// +// MSR +// +NTSTATUS +NTAPI +KdpSysReadMsr( + IN ULONG Msr, + OUT PLARGE_INTEGER MsrValue +); + +NTSTATUS +NTAPI +KdpSysWriteMsr( + IN ULONG Msr, + IN PLARGE_INTEGER MsrValue +); + +// +// Bus +// +NTSTATUS +NTAPI +KdpSysReadBusData( + IN ULONG BusDataType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length, + OUT PULONG ActualLength +); + +NTSTATUS +NTAPI +KdpSysWriteBusData( + IN ULONG BusDataType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length, + OUT PULONG ActualLength +); + +// +// Control Space +// +NTSTATUS +NTAPI +KdpSysReadControlSpace( + IN ULONG Processor, + IN ULONG64 BaseAddress, + IN PVOID Buffer, + IN ULONG Length, + OUT PULONG ActualLength +); + +NTSTATUS +NTAPI +KdpSysWriteControlSpace( + IN ULONG Processor, + IN ULONG64 BaseAddress, + IN PVOID Buffer, + IN ULONG Length, + OUT PULONG ActualLength +); + +// +// I/O Space +// +NTSTATUS +NTAPI +KdpSysReadIoSpace( + IN ULONG InterfaceType, + IN ULONG BusNumber, + IN ULONG AddressSpace, + IN ULONG64 IoAddress, + IN PULONG DataValue, + IN ULONG DataSize, + OUT PULONG ActualDataSize +); + +NTSTATUS +NTAPI +KdpSysWriteIoSpace( + IN ULONG InterfaceType, + IN ULONG BusNumber, + IN ULONG AddressSpace, + IN ULONG64 IoAddress, + IN PULONG DataValue, + IN ULONG DataSize, + OUT PULONG ActualDataSize +); + +// +// Low Memory +// +NTSTATUS +NTAPI +KdpSysCheckLowMemory( + IN ULONG Flags ); // @@ -307,8 +445,8 @@ extern ULONG Kd_WIN2000_Mask; extern PULONG KdComponentTable[104]; extern CHAR KdpMessageBuffer[4096], KdpPathBuffer[4096]; -extern BREAKPOINT_ENTRY KdpBreakpointTable[20]; -extern ULONG KdpBreakpointInstruction; +extern BREAKPOINT_ENTRY KdpBreakpointTable[KD_BREAKPOINT_MAX]; +extern KD_BREAKPOINT_TYPE KdpBreakpointInstruction; extern BOOLEAN KdpOweBreakpoint; extern BOOLEAN BreakpointsSuspended; extern ULONG KdpNumInternalBreakpoints; Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -37,6 +37,10 @@ #define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_POWERPC +//#define KD_BREAKPOINT_TYPE +//#define KD_BREAKPOINT_SIZE +//#define KD_BREAKPOINT_VALUE + // // Macros for getting and setting special purpose registers in portable code // @@ -54,6 +58,12 @@ #define KeSetContextReturnRegister(Context, ReturnValue) \ ((Context)->Gpr3 = (ReturnValue)) + +// +// Returns the Interrupt State from a Trap Frame. +// ON = TRUE, OFF = FALSE +// +//#define KeGetTrapFrameInterruptState(TrapFrame) \ #define KePPCRdmsr(msr,val1,val2) __asm__ __volatile__("mfmsr 3") Propchange: trunk/reactos/ntoskrnl/kd64/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Oct 10 21:27:54 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/ntoskrnl/kd64/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/ntoskrnl/kd64/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/ntoskrnl/kd64/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/amd64/kdsup.… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c (added) +++ trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -1,0 +1,159 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/amd64/kdsup.c + * PURPOSE: KD support routines for AMD64 + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#undef UNIMPLEMENTED +#define UNIMPLEMENTED KdpDprintf("%s is unimplemented\n", __FUNCTION__) + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State, + IN PCONTEXT Context) +{ + UNIMPLEMENTED; + while (TRUE); +} + +VOID +NTAPI +KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, + IN PCONTEXT Context) +{ + UNIMPLEMENTED; + while (TRUE); +} + +VOID +NTAPI +KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) +{ + UNIMPLEMENTED; + while (TRUE); +} + +NTSTATUS +NTAPI +KdpSysReadMsr(IN ULONG Msr, + OUT PLARGE_INTEGER MsrValue) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysWriteMsr(IN ULONG Msr, + IN PLARGE_INTEGER MsrValue) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysReadBusData(IN ULONG BusDataType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length, + OUT PULONG ActualLength) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysWriteBusData(IN ULONG BusDataType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length, + OUT PULONG ActualLength) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysReadControlSpace(IN ULONG Processor, + IN ULONG64 BaseAddress, + IN PVOID Buffer, + IN ULONG Length, + OUT PULONG ActualLength) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysWriteControlSpace(IN ULONG Processor, + IN ULONG64 BaseAddress, + IN PVOID Buffer, + IN ULONG Length, + OUT PULONG ActualLength) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysReadIoSpace(IN ULONG InterfaceType, + IN ULONG BusNumber, + IN ULONG AddressSpace, + IN ULONG64 IoAddress, + IN PULONG DataValue, + IN ULONG DataSize, + OUT PULONG ActualDataSize) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysWriteIoSpace(IN ULONG InterfaceType, + IN ULONG BusNumber, + IN ULONG AddressSpace, + IN ULONG64 IoAddress, + IN PULONG DataValue, + IN ULONG DataSize, + OUT PULONG ActualDataSize) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysCheckLowMemory(IN ULONG Flags) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} Propchange: trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/kd64/arm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Oct 10 21:27:54 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/ntoskrnl/kd64/arm/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/ntoskrnl/kd64/arm/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/ntoskrnl/kd64/arm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/ntoskrnl/kd64/arm/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/arm/kdsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/arm/kdsup.c (added) +++ trunk/reactos/ntoskrnl/kd64/arm/kdsup.c [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -1,0 +1,159 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/kd64/arm/kdsup.c + * PURPOSE: KD support routines for ARM + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#undef UNIMPLEMENTED +#define UNIMPLEMENTED KdpDprintf("%s is unimplemented\n", __FUNCTION__) + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State, + IN PCONTEXT Context) +{ + UNIMPLEMENTED; + while (TRUE); +} + +VOID +NTAPI +KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, + IN PCONTEXT Context) +{ + UNIMPLEMENTED; + while (TRUE); +} + +VOID +NTAPI +KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) +{ + UNIMPLEMENTED; + while (TRUE); +} + +NTSTATUS +NTAPI +KdpSysReadMsr(IN ULONG Msr, + OUT PLARGE_INTEGER MsrValue) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysWriteMsr(IN ULONG Msr, + IN PLARGE_INTEGER MsrValue) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysReadBusData(IN ULONG BusDataType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length, + OUT PULONG ActualLength) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysWriteBusData(IN ULONG BusDataType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length, + OUT PULONG ActualLength) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysReadControlSpace(IN ULONG Processor, + IN ULONG64 BaseAddress, + IN PVOID Buffer, + IN ULONG Length, + OUT PULONG ActualLength) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysWriteControlSpace(IN ULONG Processor, + IN ULONG64 BaseAddress, + IN PVOID Buffer, + IN ULONG Length, + OUT PULONG ActualLength) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysReadIoSpace(IN ULONG InterfaceType, + IN ULONG BusNumber, + IN ULONG AddressSpace, + IN ULONG64 IoAddress, + IN PULONG DataValue, + IN ULONG DataSize, + OUT PULONG ActualDataSize) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysWriteIoSpace(IN ULONG InterfaceType, + IN ULONG BusNumber, + IN ULONG AddressSpace, + IN ULONG64 IoAddress, + IN PULONG DataValue, + IN ULONG DataSize, + OUT PULONG ActualDataSize) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysCheckLowMemory(IN ULONG Flags) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} Propchange: trunk/reactos/ntoskrnl/kd64/arm/kdsup.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/kd64/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Oct 10 21:27:54 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/ntoskrnl/kd64/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/ntoskrnl/kd64/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/ntoskrnl/kd64/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/ntoskrnl/kd64/i386/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/i386/kdsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/i386/kdsup.c (added) +++ trunk/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -1,0 +1,262 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/i386/kdsup.c + * PURPOSE: KD support routines for x86 + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#undef UNIMPLEMENTED +#define UNIMPLEMENTED KdpDprintf("%s is unimplemented\n", __FUNCTION__) + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) +{ + /* Copy the version block */ + RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); +} + +VOID +NTAPI +KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State, + IN PCONTEXT Context) +{ + PKPRCB Prcb; + ULONG i; + + /* Check for success */ + if (NT_SUCCESS(State->u.Continue2.ContinueStatus)) + { + /* Check if we're tracing */ + if (State->u.Continue2.ControlSet.TraceFlag) + { + /* Enable TF */ + Context->EFlags |= EFLAGS_TF; + } + else + { + /* Remove it */ + Context->EFlags &= ~EFLAGS_TF; + } + + /* Loop all processors */ + for (i = 0; i < KeNumberProcessors; i++) + { + /* Get the PRCB and update DR7 and DR6 */ + Prcb = KiProcessorBlock[i]; + Prcb->ProcessorState.SpecialRegisters.KernelDr7 = + State->u.Continue2.ControlSet.Dr7; + Prcb->ProcessorState.SpecialRegisters.KernelDr6 = 0; + } + + /* Check if we have new symbol information */ + if (State->u.Continue2.ControlSet.CurrentSymbolStart != 1) + { + /* Update it */ + KdpCurrentSymbolStart = + State->u.Continue2.ControlSet.CurrentSymbolStart; + KdpCurrentSymbolEnd= State->u.Continue2.ControlSet.CurrentSymbolEnd; + } + } +} + +VOID +NTAPI +KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, + IN PCONTEXT Context) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + + /* Copy i386 specific debug registers */ + WaitStateChange->ControlReport.Dr6 = Prcb->ProcessorState.SpecialRegisters. + KernelDr6; + WaitStateChange->ControlReport.Dr7 = Prcb->ProcessorState.SpecialRegisters. + KernelDr7; + + /* Copy i386 specific segments */ + WaitStateChange->ControlReport.SegCs = (USHORT)Context->SegCs; + WaitStateChange->ControlReport.SegDs = (USHORT)Context->SegDs; + WaitStateChange->ControlReport.SegEs = (USHORT)Context->SegEs; + WaitStateChange->ControlReport.SegFs = (USHORT)Context->SegFs; + + /* Copy EFlags */ + WaitStateChange->ControlReport.EFlags = Context->EFlags; + + /* Set Report Flags */ + WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; + if (WaitStateChange->ControlReport.SegCs == KGDT_R0_CODE) + { + WaitStateChange->ControlReport.ReportFlags = REPORT_STANDARD_CS; + } +} + +NTSTATUS +NTAPI +KdpSysReadMsr(IN ULONG Msr, + OUT PLARGE_INTEGER MsrValue) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysWriteMsr(IN ULONG Msr, + IN PLARGE_INTEGER MsrValue) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysReadBusData(IN ULONG BusDataType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length, + OUT PULONG ActualLength) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysWriteBusData(IN ULONG BusDataType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length, + OUT PULONG ActualLength) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysReadControlSpace(IN ULONG Processor, + IN ULONG64 BaseAddress, + IN PVOID Buffer, + IN ULONG Length, + OUT PULONG ActualLength) +{ + PVOID ControlStart; + ULONG RealLength; + + /* Make sure that this is a valid request */ + if (((ULONG)BaseAddress < sizeof(KPROCESSOR_STATE)) && + (Processor < KeNumberProcessors)) + { + /* Get the actual length */ + RealLength = sizeof(KPROCESSOR_STATE) - (ULONG_PTR)BaseAddress; + if (RealLength < Length) Length = RealLength; + + /* Set the proper address */ + ControlStart = (PVOID)((ULONG_PTR)BaseAddress + + (ULONG_PTR)&KiProcessorBlock[Processor]-> + ProcessorState); + + /* Copy the memory */ + RtlCopyMemory(Buffer, ControlStart, Length); + + /* Finish up */ + *ActualLength = Length; + return STATUS_SUCCESS; + } + else + { + /* Invalid request */ + *ActualLength = 0; + return STATUS_UNSUCCESSFUL; + } +} + +NTSTATUS +NTAPI +KdpSysWriteControlSpace(IN ULONG Processor, + IN ULONG64 BaseAddress, + IN PVOID Buffer, + IN ULONG Length, + OUT PULONG ActualLength) +{ + PVOID ControlStart; + + /* Make sure that this is a valid request */ + if ((((ULONG)BaseAddress + Length) <= sizeof(KPROCESSOR_STATE)) && + (Processor < KeNumberProcessors)) + { + /* Set the proper address */ + ControlStart = (PVOID)((ULONG_PTR)BaseAddress + + (ULONG_PTR)&KiProcessorBlock[Processor]-> + ProcessorState); + + /* Copy the memory */ + RtlCopyMemory(ControlStart, Buffer, Length); + + /* Finish up */ + *ActualLength = Length; + return STATUS_SUCCESS; + } + else + { + /* Invalid request */ + *ActualLength = 0; + return STATUS_UNSUCCESSFUL; + } +} + +NTSTATUS +NTAPI +KdpSysReadIoSpace(IN ULONG InterfaceType, + IN ULONG BusNumber, + IN ULONG AddressSpace, + IN ULONG64 IoAddress, + IN PULONG DataValue, + IN ULONG DataSize, + OUT PULONG ActualDataSize) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysWriteIoSpace(IN ULONG InterfaceType, + IN ULONG BusNumber, + IN ULONG AddressSpace, + IN ULONG64 IoAddress, + IN PULONG DataValue, + IN ULONG DataSize, + OUT PULONG ActualDataSize) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KdpSysCheckLowMemory(IN ULONG Flags) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_UNSUCCESSFUL; +} Propchange: trunk/reactos/ntoskrnl/kd64/i386/kdsup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -27,7 +27,7 @@ if (Memory->AddressSpace == DBGKD_QUERY_MEMORY_VIRTUAL) { /* Check if this is process memory */ - if ((PVOID)(LONG_PTR)Memory->Address < MmHighestUserAddress) + if ((PVOID)(ULONG_PTR)Memory->Address < MmHighestUserAddress) { /* It is */ Memory->AddressSpace = DBGKD_QUERY_MEMORY_PROCESS; @@ -80,7 +80,7 @@ /* Create the breakpoint */ Breakpoint->BreakPointHandle = - KdpAddBreakpoint((PVOID)(LONG_PTR)Breakpoint->BreakPointAddress); + KdpAddBreakpoint((PVOID)(ULONG_PTR)Breakpoint->BreakPointAddress); if (!Breakpoint->BreakPointHandle) { /* We failed */ @@ -112,50 +112,6 @@ /* Reset the buffer location */ TraceDataBufferPosition = 1; -} - -VOID -NTAPI -KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State, - IN PCONTEXT Context) -{ - PKPRCB Prcb; - ULONG i; - - /* Check for success */ - if (NT_SUCCESS(State->u.Continue2.ContinueStatus)) - { - /* Check if we're tracing */ - if (State->u.Continue2.ControlSet.TraceFlag) - { - /* Enable TF */ - Context->EFlags |= EFLAGS_TF; - } - else - { - /* Remove it */ - Context->EFlags &= ~EFLAGS_TF; - } - - /* Loop all processors */ - for (i = 0; i < KeNumberProcessors; i++) - { - /* Get the PRCB and update DR7 and DR6 */ - Prcb = KiProcessorBlock[i]; - Prcb->ProcessorState.SpecialRegisters.KernelDr7 = - State->u.Continue2.ControlSet.Dr7; - Prcb->ProcessorState.SpecialRegisters.KernelDr6 = 0; - } - - /* Check if we have new symbol information */ - if (State->u.Continue2.ControlSet.CurrentSymbolStart != 1) - { - /* Update it */ - KdpCurrentSymbolStart = - State->u.Continue2.ControlSet.CurrentSymbolStart; - KdpCurrentSymbolEnd= State->u.Continue2.ControlSet.CurrentSymbolEnd; - } - } } VOID @@ -188,7 +144,7 @@ /* Clear all the breakpoints in this region */ HadBreakpoints = - KdpDeleteBreakpointRange((PVOID)(LONG_PTR)WaitStateChange->ProgramCounter, + KdpDeleteBreakpointRange((PVOID)(ULONG_PTR)WaitStateChange->ProgramCounter, (PVOID)((ULONG_PTR)WaitStateChange->ProgramCounter + WaitStateChange->ControlReport.InstructionCount - 1)); if (HadBreakpoints) @@ -202,44 +158,6 @@ VOID NTAPI -KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, - IN PCONTEXT Context) -{ - PKPRCB Prcb = KeGetCurrentPrcb(); - - /* Copy i386 specific debug registers */ - WaitStateChange->ControlReport.Dr6 = Prcb->ProcessorState.SpecialRegisters. - KernelDr6; - WaitStateChange->ControlReport.Dr7 = Prcb->ProcessorState.SpecialRegisters. - KernelDr7; - - /* Copy i386 specific segments */ - WaitStateChange->ControlReport.SegCs = (USHORT)Context->SegCs; - WaitStateChange->ControlReport.SegDs = (USHORT)Context->SegDs; - WaitStateChange->ControlReport.SegEs = (USHORT)Context->SegEs; - WaitStateChange->ControlReport.SegFs = (USHORT)Context->SegFs; - - /* Copy EFlags */ - WaitStateChange->ControlReport.EFlags = Context->EFlags; - - /* Set Report Flags */ - WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; - if (WaitStateChange->ControlReport.SegCs == KGDT_R0_CODE) - { - WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_CS; - } -} - -VOID -NTAPI -KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) -{ - /* Copy the version block */ - RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); -} - -VOID -NTAPI KdpGetVersion(IN PDBGKD_MANIPULATE_STATE64 State) { STRING Header; @@ -324,8 +242,7 @@ { PDBGKD_READ_MEMORY64 ReadMemory = &State->u.ReadMemory; STRING Header; - ULONG Length, RealLength; - PVOID ControlStart; + ULONG Length; /* Setup the header */ Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); @@ -340,35 +257,15 @@ Length = PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64); } - /* Make sure that this is a valid request */ - if (((ULONG)ReadMemory->TargetBaseAddress < sizeof(KPROCESSOR_STATE)) && - (State->Processor < KeNumberProcessors)) - { - /* Get the actual length */ - RealLength = sizeof(KPROCESSOR_STATE) - - (ULONG_PTR)ReadMemory->TargetBaseAddress; - if (RealLength < Length) Length = RealLength; - - /* Set the proper address */ - ControlStart = (PVOID)((ULONG_PTR)ReadMemory->TargetBaseAddress + - (ULONG_PTR)&KiProcessorBlock[State->Processor]-> - ProcessorState); - - /* Copy the memory */ - RtlCopyMemory(Data->Buffer, ControlStart, Length); - Data->Length = Length; - - /* Finish up */ - State->ReturnStatus = STATUS_SUCCESS; - ReadMemory->ActualBytesRead = Data->Length; - } - else - { - /* Invalid request */ - Data->Length = 0; - State->ReturnStatus = STATUS_UNSUCCESSFUL; - ReadMemory->ActualBytesRead = 0; - } + /* Call the internal routine */ + State->ReturnStatus = KdpSysReadControlSpace(State->Processor, + ReadMemory->TargetBaseAddress, + Data->Buffer, + Length, + &Length); + + /* Return the actual length read */ + Data->Length = ReadMemory->ActualBytesRead = Length; /* Send the reply */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, @@ -386,38 +283,20 @@ PDBGKD_WRITE_MEMORY64 WriteMemory = &State->u.WriteMemory; STRING Header; ULONG Length; - PVOID ControlStart; /* Setup the header */ Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); Header.Buffer = (PCHAR)State; - /* Make sure that this is a valid request */ - Length = WriteMemory->TransferCount; - if ((((ULONG)WriteMemory->TargetBaseAddress + Length) <= - sizeof(KPROCESSOR_STATE)) && - (State->Processor < KeNumberProcessors)) - { - /* Set the proper address */ - ControlStart = (PVOID)((ULONG_PTR)WriteMemory->TargetBaseAddress + - (ULONG_PTR)&KiProcessorBlock[State->Processor]-> - ProcessorState); - - /* Copy the memory */ - RtlCopyMemory(ControlStart, Data->Buffer, Data->Length); - Length = Data->Length; - - /* Finish up */ - State->ReturnStatus = STATUS_SUCCESS; - WriteMemory->ActualBytesWritten = Length; - } - else - { - /* Invalid request */ - Data->Length = 0; - State->ReturnStatus = STATUS_UNSUCCESSFUL; - WriteMemory->ActualBytesWritten = 0; - } + /* Call the internal routine */ + State->ReturnStatus = KdpSysWriteControlSpace(State->Processor, + WriteMemory->TargetBaseAddress, + Data->Buffer, + Data->Length, + &Length); + + /* Return the length written */ + WriteMemory->ActualBytesWritten = Length; /* Send the reply */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, @@ -568,6 +447,293 @@ KeBugCheck(MANUALLY_INITIATED_CRASH); } +VOID +NTAPI +KdpReadMachineSpecificRegister(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PDBGKD_READ_WRITE_MSR ReadMsr = &State->u.ReadWriteMsr; + LARGE_INTEGER MsrValue; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Call the internal routine */ + State->ReturnStatus = KdpSysReadMsr(ReadMsr->Msr, + &MsrValue); + + /* Return the data */ + ReadMsr->DataValueLow = MsrValue.LowPart; + ReadMsr->DataValueHigh = MsrValue.HighPart; + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + +VOID +NTAPI +KdpWriteMachineSpecificRegister(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PDBGKD_READ_WRITE_MSR WriteMsr = &State->u.ReadWriteMsr; + LARGE_INTEGER MsrValue; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Call the internal routine */ + MsrValue.LowPart = WriteMsr->DataValueLow; + MsrValue.HighPart = WriteMsr->DataValueHigh; + State->ReturnStatus = KdpSysWriteMsr(WriteMsr->Msr, + &MsrValue); + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + +VOID +NTAPI +KdpGetBusData(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PDBGKD_GET_SET_BUS_DATA GetBusData = &State->u.GetSetBusData; + ULONG Length; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Check the length requested */ + Length = GetBusData->Length; + if (Length > (PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64))) + { + /* Use maximum allowed */ + Length = PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64); + } + + /* Call the internal routine */ + State->ReturnStatus = KdpSysReadBusData(GetBusData->BusDataType, + GetBusData->BusNumber, + GetBusData->SlotNumber, + Data->Buffer, + GetBusData->Offset, + Length, + &Length); + + /* Return the actual length read */ + Data->Length = GetBusData->Length = Length; + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI +KdpSetBusData(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PDBGKD_GET_SET_BUS_DATA SetBusData = &State->u.GetSetBusData; + ULONG Length; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Call the internal routine */ + State->ReturnStatus = KdpSysWriteBusData(SetBusData->BusDataType, + SetBusData->BusNumber, + SetBusData->SlotNumber, + Data->Buffer, + SetBusData->Offset, + SetBusData->Length, + &Length); + + /* Return the actual length written */ + SetBusData->Length = Length; + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI +KdpReadIoSpace(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PDBGKD_READ_WRITE_IO64 ReadIo = &State->u.ReadWriteIo; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* + * Clear the value so 1 or 2 byte reads + * don't leave the higher bits unmodified + */ + ReadIo->DataValue = 0; + + /* Call the internal routine */ + State->ReturnStatus = KdpSysReadIoSpace(Isa, + 0, + 1, + ReadIo->IoAddress, + &ReadIo->DataValue, + ReadIo->DataSize, + &ReadIo->DataSize); + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + +VOID +NTAPI +KdpWriteIoSpace(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PDBGKD_READ_WRITE_IO64 WriteIo = &State->u.ReadWriteIo; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Call the internal routine */ + State->ReturnStatus = KdpSysWriteIoSpace(Isa, + 0, + 1, + WriteIo->IoAddress, + &WriteIo->DataValue, + WriteIo->DataSize, + &WriteIo->DataSize); + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + +VOID +NTAPI +KdpReadIoSpaceExtended(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PDBGKD_READ_WRITE_IO_EXTENDED64 ReadIoExtended = &State->u. + ReadWriteIoExtended; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* + * Clear the value so 1 or 2 byte reads + * don't leave the higher bits unmodified + */ + ReadIoExtended->DataValue = 0; + + /* Call the internal routine */ + State->ReturnStatus = KdpSysReadIoSpace(ReadIoExtended->InterfaceType, + ReadIoExtended->BusNumber, + ReadIoExtended->AddressSpace, + ReadIoExtended->IoAddress, + &ReadIoExtended->DataValue, + ReadIoExtended->DataSize, + &ReadIoExtended->DataSize); + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + +VOID +NTAPI +KdpWriteIoSpaceExtended(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PDBGKD_READ_WRITE_IO_EXTENDED64 WriteIoExtended = &State->u. + ReadWriteIoExtended; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Call the internal routine */ + State->ReturnStatus = KdpSysReadIoSpace(WriteIoExtended->InterfaceType, + WriteIoExtended->BusNumber, + WriteIoExtended->AddressSpace, + WriteIoExtended->IoAddress, + &WriteIoExtended->DataValue, + WriteIoExtended->DataSize, + &WriteIoExtended->DataSize); + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + +VOID +NTAPI +KdpCheckLowMemory(IN PDBGKD_MANIPULATE_STATE64 State) +{ + STRING Header; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Call the internal routine */ + State->ReturnStatus = KdpSysCheckLowMemory(0x4); + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + KCONTINUE_STATUS NTAPI KdpSendWaitContinue(IN ULONG PacketType, @@ -670,16 +836,14 @@ case DbgKdReadIoSpaceApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdReadIoSpaceApi called\n"); - while (TRUE); + /* Read I/O Space */ + KdpReadIoSpace(&ManipulateState, &Data, Context); break; case DbgKdWriteIoSpaceApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdWriteIoSpaceApi called\n"); - while (TRUE); + /* Write I/O Space */ + KdpWriteIoSpace(&ManipulateState, &Data, Context); break; case DbgKdRebootApi: @@ -757,16 +921,14 @@ case DbgKdReadIoSpaceExtendedApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdReadIoSpaceExtendedApi called\n"); - while (TRUE); + /* Read I/O Space */ + KdpReadIoSpaceExtended(&ManipulateState, &Data, Context); break; case DbgKdWriteIoSpaceExtendedApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdWriteIoSpaceExtendedApi called\n"); - while (TRUE); + /* Write I/O Space */ + KdpWriteIoSpaceExtended(&ManipulateState, &Data, Context); break; case DbgKdGetVersionApi: @@ -811,16 +973,14 @@ case DbgKdReadMachineSpecificRegister: - /* FIXME: TODO */ - KdpDprintf("DbgKdReadMachineSpecificRegister called\n"); - while (TRUE); + /* Read from the specified MSR */ + KdpReadMachineSpecificRegister(&ManipulateState, &Data, Context); break; case DbgKdWriteMachineSpecificRegister: - /* FIXME: TODO */ - KdpDprintf("DbgKdWriteMachineSpecificRegister called\n"); - while (TRUE); + /* Write to the specified MSR */ + KdpWriteMachineSpecificRegister(&ManipulateState, &Data, Context); break; case OldVlm1: @@ -846,23 +1006,20 @@ case DbgKdGetBusDataApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdGetBusDataApi called\n"); - while (TRUE); + /* Read from the bus */ + KdpGetBusData(&ManipulateState, &Data, Context); break; case DbgKdSetBusDataApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdSetBusDataApi called\n"); - while (TRUE); + /* Write to the bus */ + KdpSetBusData(&ManipulateState, &Data, Context); break; case DbgKdCheckLowMemoryApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdCheckLowMemoryApi called\n"); - while (TRUE); + /* Check for memory corruption in the lower 4 GB */ + KdpCheckLowMemory(&ManipulateState); break; case DbgKdClearAllInternalBreakpointsApi: @@ -936,7 +1093,7 @@ /* Fill out load data */ WaitStateChange.u.LoadSymbols.UnloadSymbols = Unload; - WaitStateChange.u.LoadSymbols.BaseOfDll = (ULONGLONG)(LONG_PTR)SymbolInfo->BaseOfDll; + WaitStateChange.u.LoadSymbols.BaseOfDll = (ULONG64)(LONG_PTR)SymbolInfo->BaseOfDll; WaitStateChange.u.LoadSymbols.ProcessId = SymbolInfo->ProcessId; WaitStateChange.u.LoadSymbols.CheckSum = SymbolInfo->CheckSum; WaitStateChange.u.LoadSymbols.SizeOfImage = SymbolInfo->SizeOfImage; @@ -981,7 +1138,7 @@ { STRING Header, Data; DBGKD_WAIT_STATE_CHANGE64 WaitStateChange; - BOOLEAN Status; + KCONTINUE_STATUS Status; /* Start report loop */ do @@ -989,9 +1146,9 @@ /* Build the architecture common parts of the message */ KdpSetCommonState(DbgKdExceptionStateChange, Context, &WaitStateChange); - /* Convert the exception record to 64-bits and set First Chance flag */ - ExceptionRecord32To64((PEXCEPTION_RECORD32)ExceptionRecord, - &WaitStateChange.u.Exception.ExceptionRecord); + /* Copy the Exception Record and set First Chance flag */ + CopyExceptionRecord(ExceptionRecord, + &WaitStateChange.u.Exception.ExceptionRecord); WaitStateChange.u.Exception.FirstChance = !SecondChanceException; /* Now finish creating the structure */ @@ -1091,7 +1248,7 @@ LARGE_INTEGER Null = {{0}}; /* Check if interrupts were disabled */ - if (!(TrapFrame->EFlags & EFLAGS_INTERRUPT_MASK)) + if (!KeGetTrapFrameInterruptState(TrapFrame)) { /* Nothing to return */ return Null; @@ -1191,9 +1348,14 @@ NTSTATUS NTAPI -KdEnableDebuggerWithLock(BOOLEAN NeedLock) -{ - KIRQL OldIrql = PASSIVE_LEVEL; +KdEnableDebuggerWithLock(IN BOOLEAN NeedLock) +{ + KIRQL OldIrql; + +#if defined(__GNUC__) + /* Make gcc happy */ + OldIrql = PASSIVE_LEVEL; +#endif /* Check if we need to acquire the lock */ if (NeedLock) Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdbreak.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -18,11 +18,11 @@ NTAPI KdpAddBreakpoint(IN PVOID Address) { - UCHAR Content; + KD_BREAKPOINT_TYPE Content; ULONG i; /* Loop current breakpoints */ - for (i = 0; i < 20; i++) + for (i = 0; i < KD_BREAKPOINT_MAX; i++) { /* Check if the breakpoint is valid */ if ((KdpBreakpointTable[i].Flags & KdpBreakpointActive) && @@ -44,21 +44,21 @@ } /* Find a free entry */ - for (i = 0; i < 20; i++) if (!(KdpBreakpointTable[i].Flags)) break; + for (i = 0; i < KD_BREAKPOINT_MAX; i++) if (!(KdpBreakpointTable[i].Flags)) break; /* Fail if no free entry was found */ - if (i == 20) return 0; + if (i == KD_BREAKPOINT_MAX) return 0; /* Save the old instruction */ - RtlCopyMemory(&Content, Address, sizeof(UCHAR)); + RtlCopyMemory(&Content, Address, KD_BREAKPOINT_SIZE); /* Write the entry */ KdpBreakpointTable[i].Address = Address; KdpBreakpointTable[i].Content = Content; KdpBreakpointTable[i].Flags = KdpBreakpointActive; - /* Write the INT3 and return the handle */ - RtlCopyMemory(Address, &KdpBreakpointInstruction, sizeof(UCHAR)); + /* Write the breakpoint and return the handle */ + RtlCopyMemory(Address, &KdpBreakpointInstruction, KD_BREAKPOINT_SIZE); return i + 1; } @@ -74,7 +74,7 @@ return TRUE; } - /* Is the original instruction an INT3 anyway? */ + /* Is the original instruction a breakpoint anyway? */ if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) { /* Then leave it that way... */ @@ -84,7 +84,7 @@ /* We have an active breakpoint with an instruction to bring back. Do it. */ RtlCopyMemory(KdpBreakpointTable[BpIndex].Address, &KdpBreakpointTable[BpIndex].Content, - sizeof(UCHAR)); + KD_BREAKPOINT_SIZE); /* Everything went fine, return */ return TRUE; @@ -102,7 +102,7 @@ return TRUE; } - /* Are we merely writing an INT3 on top of another INT3? */ + /* Are we merely writing a breakpoint on top of another breakpoint? */ if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) { /* Nothing to do then... */ @@ -112,7 +112,7 @@ /* Ok, we actually have to overwrite the instruction now */ RtlCopyMemory(KdpBreakpointTable[BpIndex].Address, &KdpBreakpointInstruction, - sizeof(UCHAR)); + KD_BREAKPOINT_SIZE); /* Clear any possible previous pending flag and return success */ KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointPending; @@ -126,7 +126,7 @@ ULONG BpIndex = BpEntry - 1; /* Check for invalid breakpoint entry */ - if (!(BpEntry) || (BpEntry > 20)) return FALSE; + if (!(BpEntry) || (BpEntry > KD_BREAKPOINT_MAX)) return FALSE; /* If the specified breakpoint table entry is not valid, then return FALSE. */ if (!KdpBreakpointTable[BpIndex].Flags) return FALSE; @@ -157,7 +157,7 @@ BOOLEAN Return = FALSE; /* Loop the breakpoint table */ - for (BpIndex = 0; BpIndex < 20; BpIndex++) + for (BpIndex = 0; BpIndex < KD_BREAKPOINT_MAX; BpIndex++) { /* Make sure that the breakpoint is active and matches the range. */ if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && @@ -183,7 +183,7 @@ BreakpointsSuspended = FALSE; /* Loop the breakpoints */ - for (BpIndex = 0; BpIndex < 20; BpIndex++ ) + for (BpIndex = 0; BpIndex < KD_BREAKPOINT_MAX; BpIndex++ ) { /* Check if they are valid, suspended breakpoints */ if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -14,6 +14,35 @@ #include <debug.h> VOID NTAPI RtlpBreakWithStatusInstruction(VOID); + +// +// Apply the KIPCR WDK workaround for x86 and AMD64 +// +#if defined(_M_IX86) || defined(_M_AMD64) +#define KPCR KIPCR +#endif + +#if defined(_M_IX86) + +#define KPCR_SELF_OFFSET FIELD_OFFSET(KPCR, Self) +#define KPCR_CURRENT_PRCB_OFFSET FIELD_OFFSET(KPCR, Prcb) +#define KPCR_CONTAINED_PRCB_OFFSET FIELD_OFFSET(KPCR, PrcbData) + +#elif defined(_M_AMD64) + +#define KPCR_SELF_OFFSET FIELD_OFFSET(KPCR, Self) +#define KPCR_CURRENT_PRCB_OFFSET FIELD_OFFSET(KPCR, CurrentPrcb) +#define KPCR_CONTAINED_PRCB_OFFSET FIELD_OFFSET(KPCR, Prcb) + +#elif defined(_M_ARM) + +//#define KPCR_SELF_OFFSET +#define KPCR_CURRENT_PRCB_OFFSET FIELD_OFFSET(KPCR, Prcb) +//#define KPCR_CONTAINED_PRCB_OFFSET + +#else +#error Unsupported Architecture +#endif /* GLOBALS *******************************************************************/ @@ -48,12 +77,8 @@ // // Breakpoint Data // -BREAKPOINT_ENTRY KdpBreakpointTable[20]; -#if defined(_M_IX86) || defined(_M_AMD64) -ULONG KdpBreakpointInstruction = 0xCC; // INT3 -#else -#error Define the breakpoint instruction for this architecture -#endif +BREAKPOINT_ENTRY KdpBreakpointTable[KD_BREAKPOINT_MAX]; +KD_BREAKPOINT_TYPE KdpBreakpointInstruction = KD_BREAKPOINT_VALUE; BOOLEAN KdpOweBreakpoint; BOOLEAN BreakpointsSuspended; ULONG KdpNumInternalBreakpoints; @@ -329,8 +354,12 @@ 0, 0, DBGKD_64BIT_PROTOCOL_VERSION2, - KD_SECONDARY_VERSION_DEFAULT, + CURRENT_KD_SECONDARY_VERSION, +#if defined(_M_AMD64) + DBGKD_VERS_FLAG_DATA | DBGKD_VERS_FLAG_PTR64, +#else DBGKD_VERS_FLAG_DATA, +#endif IMAGE_FILE_MACHINE_ARCHITECTURE, PACKET_TYPE_MAX, 0, @@ -345,46 +374,46 @@ { {{0}}, 0, - {PtrToUlong(RtlpBreakWithStatusInstruction)}, + {(ULONG_PTR)RtlpBreakWithStatusInstruction}, 0, FIELD_OFFSET(KTHREAD, CallbackStack), CBSTACK_CALLBACK_STACK, - CBSTACK_EBP, + CBSTACK_FRAME_POINTER, FALSE, - {PtrToUlong(KiCallUserMode)}, - 0, - {PtrToUlong(&PsLoadedModuleList)}, - {PtrToUlong(&PsActiveProcessHead)}, - {PtrToUlong(&PspCidTable)}, - {PtrToUlong(&ExpSystemResourcesList)}, + {(ULONG_PTR)KiCallUserMode}, + 0, + {(ULONG_PTR)&PsLoadedModuleList}, + {(ULONG_PTR)&PsActiveProcessHead}, + {(ULONG_PTR)&PspCidTable}, + {(ULONG_PTR)&ExpSystemResourcesList}, {0}, // ExpPagedPoolDescriptor {0}, // ExpNumberOfPagedPools - {PtrToUlong(&KeTimeIncrement)}, - {PtrToUlong(&KeBugcheckCallbackListHead)}, - {PtrToUlong(KiBugCheckData)}, - {PtrToUlong(&IopErrorLogListHead)}, - {PtrToUlong(&ObpRootDirectoryObject)}, - {PtrToUlong(&ObpTypeObjectType)}, + {(ULONG_PTR)&KeTimeIncrement}, + {(ULONG_PTR)&KeBugcheckCallbackListHead}, + {(ULONG_PTR)KiBugCheckData}, + {(ULONG_PTR)&IopErrorLogListHead}, + {(ULONG_PTR)&ObpRootDirectoryObject}, + {(ULONG_PTR)&ObpTypeObjectType}, {0}, // MmSystemCacheStart {0}, // MmSystemCacheEnd {0}, // MmSystemCacheWs - {PtrToUlong(&MmPfnDatabase)}, - {PtrToUlong(MmSystemPtesStart)}, - {PtrToUlong(MmSystemPtesEnd)}, + {(ULONG_PTR)&MmPfnDatabase}, + {(ULONG_PTR)MmSystemPtesStart}, + {(ULONG_PTR)MmSystemPtesEnd}, {0}, // MmSubsectionBase {0}, // MmNumberOfPagingFiles - {PtrToUlong(&MmLowestPhysicalPage)}, - {PtrToUlong(&MmHighestPhysicalPage)}, - {PtrToUlong(&MmNumberOfPhysicalPages)}, - {PtrToUlong(&MmMaximumNonPagedPoolInBytes)}, - {PtrToUlong(&MmNonPagedSystemStart)}, - {PtrToUlong(&MmNonPagedPoolStart)}, - {PtrToUlong(&MmNonPagedPoolEnd)}, - {PtrToUlong(&MmPagedPoolStart)}, - {PtrToUlong(&MmPagedPoolEnd)}, - {PtrToUlong(&MmPagedPoolInfo)}, + {(ULONG_PTR)&MmLowestPhysicalPage}, + {(ULONG_PTR)&MmHighestPhysicalPage}, + {(ULONG_PTR)&MmNumberOfPhysicalPages}, + {(ULONG_PTR)&MmMaximumNonPagedPoolInBytes}, + {(ULONG_PTR)&MmNonPagedSystemStart}, + {(ULONG_PTR)&MmNonPagedPoolStart}, + {(ULONG_PTR)&MmNonPagedPoolEnd}, + {(ULONG_PTR)&MmPagedPoolStart}, + {(ULONG_PTR)&MmPagedPoolEnd}, + {(ULONG_PTR)&MmPagedPoolInfo}, PAGE_SIZE, - {PtrToUlong(&MmSizeOfPagedPoolInBytes)}, + {(ULONG_PTR)&MmSizeOfPagedPoolInBytes}, {0}, // MmTotalCommitLimit {0}, // MmTotalCommittedPages {0}, // MmSharedCommit @@ -400,18 +429,18 @@ {0}, // MmAvailablePages {0}, // MmResidentAvailablePages {0}, // PoolTrackTable - {PtrToUlong(&NonPagedPoolDescriptor)}, - {PtrToUlong(&MmHighestUserAddress)}, - {PtrToUlong(&MmSystemRangeStart)}, - {PtrToUlong(&MmUserProbeAddress)}, - {PtrToUlong(KdPrintDefaultCircularBuffer)}, - {PtrToUlong(KdPrintDefaultCircularBuffer + 1)}, - {PtrToUlong(&KdPrintWritePointer)}, - {PtrToUlong(&KdPrintRolloverCount)}, + {(ULONG_PTR)&NonPagedPoolDescriptor}, + {(ULONG_PTR)&MmHighestUserAddress}, + {(ULONG_PTR)&MmSystemRangeStart}, + {(ULONG_PTR)&MmUserProbeAddress}, + {(ULONG_PTR)KdPrintDefaultCircularBuffer}, + {(ULONG_PTR)KdPrintDefaultCircularBuffer + 1}, + {(ULONG_PTR)&KdPrintWritePointer}, + {(ULONG_PTR)&KdPrintRolloverCount}, {0}, // MmLoadedUserImageList - {PtrToUlong(&NtBuildLab)}, + {(ULONG_PTR)&NtBuildLab}, {0}, - {PtrToUlong(KiProcessorBlock)}, + {(ULONG_PTR)KiProcessorBlock}, {0}, // MmUnloadedDrivers {0}, // MmLastUnloadedDrivers {0}, // MmTriageActionTaken @@ -421,10 +450,10 @@ {0}, // MmAllocatedNonPagedPool {0}, // MmPeakCommitment {0}, // MmtotalCommitLimitMaximum - {PtrToUlong(&CmNtCSDVersion)}, - {PtrToUlong(&MmPhysicalMemoryBlock)}, - {PtrToUlong(&MmSessionBase)}, - {PtrToUlong(&MmSessionSize)}, + {(ULONG_PTR)&CmNtCSDVersion}, + {(ULONG_PTR)&MmPhysicalMemoryBlock}, + {(ULONG_PTR)&MmSessionBase}, + {(ULONG_PTR)&MmSessionSize}, {0}, {0}, FIELD_OFFSET(KTHREAD, NextProcessor), @@ -448,20 +477,24 @@ FIELD_OFFSET(KPRCB, ProcessorState.ContextFrame), FIELD_OFFSET(KPRCB, Number), sizeof(ETHREAD), - {PtrToUlong(KdPrintDefaultCircularBuffer)}, - {PtrToUlong(&KdPrintBufferSize)}, - {PtrToUlong(&KeLoaderBlock)}, - sizeof(KIPCR) + sizeof(KPRCB), - FIELD_OFFSET(KIPCR, Self), - FIELD_OFFSET(KPCR, Prcb), - FIELD_OFFSET(KIPCR, PrcbData), - 0, - 0, - 0, - 0, - 0, - FIELD_OFFSET(KIPCR, PrcbData) + + {(ULONG_PTR)KdPrintDefaultCircularBuffer}, + {(ULONG_PTR)&KdPrintBufferSize}, + {(ULONG_PTR)&KeLoaderBlock}, + sizeof(KPCR) + sizeof(KPRCB), + KPCR_SELF_OFFSET, + KPCR_CURRENT_PRCB_OFFSET, + KPCR_CONTAINED_PRCB_OFFSET, + 0, + 0, + 0, + 0, + 0, + KPCR_CONTAINED_PRCB_OFFSET + FIELD_OFFSET(KPRCB, ProcessorState.SpecialRegisters), +#if defined(_M_IX86) + // + // x86 GDT/LDT/TSS constants + // KGDT_R0_CODE, KGDT_R0_DATA, KGDT_R0_PCR, @@ -472,6 +505,35 @@ KGDT_TSS, 0, 0, +#elif defined(_M_AMD64) + // + // AMD64 GDT/LDT/TSS constants + // + KGDT_64_R0_CODE, + KGDT_64_DATA, + KGDT_64_DATA, + KGDT_64_R3_CODE, + KGDT_64_DATA, + KGDT_64_DATA, + 0, + KGDT_TSS, + 0, + 0, +#else + // + // No GDT/LDT/TSS on other architectures + // + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, +#endif {0}, // IopNumTriageDumpDataBlocks {0}, // IopTriageDumpDataBlocks }; Modified: trunk/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -20,7 +20,7 @@ { /* Update the KeUserCallbackDispatcher pointer */ KdDebuggerDataBlock.KeUserCallbackDispatcher = - (ULONG64)(LONG_PTR)KeUserCallbackDispatcher; + (ULONG_PTR)KeUserCallbackDispatcher; } BOOLEAN @@ -119,8 +119,8 @@ #endif /* Save Pointers to Loaded Module List and Debugger Data */ - KdVersionBlock.PsLoadedModuleList = (ULONGLONG)(LONG_PTR)&PsLoadedModuleList; - KdVersionBlock.DebuggerDataList = (ULONGLONG)(LONG_PTR)&KdpDebuggerDataListHead; + KdVersionBlock.PsLoadedModuleList = (ULONG64)(LONG_PTR)&PsLoadedModuleList; + KdVersionBlock.DebuggerDataList = (ULONG64)(LONG_PTR)&KdpDebuggerDataListHead; /* Set protocol limits */ KdVersionBlock.MaxStateChange = DbgKdMaximumStateChange - @@ -143,7 +143,7 @@ /* Save the Kernel Base */ PsNtosImageBase = (ULONG_PTR)LdrEntry->DllBase; - KdVersionBlock.KernBase = (ULONGLONG)(LONG_PTR)LdrEntry->DllBase; + KdVersionBlock.KernBase = (ULONG64)(LONG_PTR)LdrEntry->DllBase; /* Check if we have a command line */ CommandLine = LoaderBlock->LoadOptions; @@ -183,14 +183,14 @@ else { /* Called from a bugcheck...Save the Kernel Base */ - KdVersionBlock.KernBase = (ULONGLONG)(LONG_PTR)PsNtosImageBase; + KdVersionBlock.KernBase = (ULONG64)(LONG_PTR)PsNtosImageBase; /* Unconditionally enable KD */ EnableKd = TRUE; } /* Set the Kernel Base in the Data Block */ - KdDebuggerDataBlock.KernBase = (ULONGLONG)(LONG_PTR)KdVersionBlock.KernBase; + KdDebuggerDataBlock.KernBase = (ULONG_PTR)KdVersionBlock.KernBase; /* Initialize the debugger if requested */ if ((EnableKd) && (NT_SUCCESS(KdDebuggerInitialize0(LoaderBlock)))) Modified: trunk/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdtrap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -11,6 +11,34 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +// +// Retrieves the ComponentId and Level for BREAKPOINT_PRINT +// and OutputString and OutputStringLength for BREAKPOINT_PROMPT. +// +#if defined(_M_IX86) + +// +// EBX/EDI on x86 +// +#define KdpGetFirstParameter(Context) ((Context)->Ebx) +#define KdpGetSecondParameter(Context) ((Context)->Edi) + +#elif defined(_M_AMD64) + +// +// R8/R9 on AMD64 +// +#define KdpGetFirstParameter(Context) ((Context)->R8) +#define KdpGetSecondParameter(Context) ((Context)->R9) + +#elif defined(_M_ARM) + +#error Yo Ninjas! + +#else +#error Unsupported Architecture +#endif /* FUNCTIONS *****************************************************************/ @@ -27,7 +55,7 @@ PKPRCB Prcb; NTSTATUS ExceptionCode = ExceptionRecord->ExceptionCode; - /* Check if this is INT1 or 3, or if we're forced to handle it */ + /* Check if this is single step or a breakpoint, or if we're forced to handle it */ if ((ExceptionCode == STATUS_BREAKPOINT) || (ExceptionCode == STATUS_SINGLE_STEP) || (ExceptionCode == STATUS_ASSERTION_FAILURE) || @@ -109,8 +137,8 @@ case BREAKPOINT_PRINT: /* Call the worker routine */ - ReturnValue = KdpPrint((ULONG)ContextRecord->Ebx, - (ULONG)ContextRecord->Edi, + ReturnValue = KdpPrint((ULONG)KdpGetFirstParameter(ContextRecord), + (ULONG)KdpGetSecondParameter(ContextRecord), (LPSTR)ExceptionRecord-> ExceptionInformation[1], (USHORT)ExceptionRecord-> @@ -132,8 +160,8 @@ ExceptionInformation[1], (USHORT)ExceptionRecord-> ExceptionInformation[2], - (LPSTR)ContextRecord->Ebx, - (USHORT)ContextRecord->Edi, + (LPSTR)KdpGetFirstParameter(ContextRecord), + (USHORT)KdpGetSecondParameter(ContextRecord), PreviousMode, TrapFrame, ExceptionFrame); @@ -143,7 +171,7 @@ KeSetContextReturnRegister(ContextRecord, ReturnValue); break; - /* DbgUnloadImageSymbols */ + /* DbgUnLoadImageSymbols */ case BREAKPOINT_UNLOAD_SYMBOLS: /* Drop into the load case below, with the unload parameter */ Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4336… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -1063,7 +1063,7 @@ /* Check if we need to save the context for KD */ #ifdef _WINKD_ - if (!KdPitchDebugger) KdDebuggerDataBlock.SavedContext = (ULONG)&Context; + if (!KdPitchDebugger) KdDebuggerDataBlock.SavedContext = (ULONG_PTR)&Context; #endif /* Check if a debugger is connected */ Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Oct 10 21:27:54 2009 @@ -321,6 +321,21 @@ </if> <if property="_WINKD_" value ="1"> <directory name="kd64"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>kdsup.c</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>kdsup.c</file> + </directory> + </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>kdsup.c</file> + </directory> + </if> <file>kdapi.c</file> <file>kdbreak.c</file> <file>kddata.c</file>

1 0

[fireball] 43364: [ntoskrnl] - Reimplement HalpCalibrateStallExecution which was removed in r24964. Real Windows uses a different algorithm, however existing one seems to work acceptably. This patch is critical for devices support on real hardware. The only downside is that uniata initialization takes a substantial amount of time now, this is going to be investigated. Patch by Daniel Zimmermann. See issue #4600 for more details.
by fireball＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: fireball Date: Sat Oct 10 20:22:56 2009 New Revision: 43364 URL: http://svn.reactos.org/svn/reactos?rev=43364&view=rev Log: [ntoskrnl] - Reimplement HalpCalibrateStallExecution which was removed in r24964. Real Windows uses a different algorithm, however existing one seems to work acceptably. This patch is critical for devices support on real hardware. The only downside is that uniata initialization takes a substantial amount of time now, this is going to be investigated. Patch by Daniel Zimmermann. See issue #4600 for more details. Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Sat Oct 10 20:22:56 2009 @@ -101,7 +101,7 @@ HalpInitializeClock(); /* Setup busy waiting */ - //HalpCalibrateStallExecution(); + HalpCalibrateStallExecution(); /* Fill out the dispatch tables */ HalQuerySystemInformation = HaliQuerySystemInformation; Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] Sat Oct 10 20:22:56 2009 @@ -54,6 +54,34 @@ ret 4 .endfunc + +.globl _HalpQuery8254Counter@0 +.func HalpQuery8254Counter@0 +_HalpQuery8254Counter@0: + + /* Save EFLAGS and disable interrupts */ + pushfd + cli + + /* Set timer data */ + mov al, 0 + out 0x43, al + jmp $+2 + + /* Read current timer */ + in al, 0x40 + jmp $+2 + movzx ecx, al + in al, 0x40 + mov ch, al + + /* Return it and restore interrupt state */ + mov eax, ecx + popfd + ret +.endfunc + + .global _KeQueryPerformanceCounter@4 .func KeQueryPerformanceCounter@4 _KeQueryPerformanceCounter@4: Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Sat Oct 10 20:22:56 2009 @@ -13,6 +13,11 @@ #include <debug.h> /* GLOBALS *******************************************************************/ + +/* time to wait */ +#define MICROSECOND_TO_WAIT 1000 +/* the tick count for 1 ms is 1193.182 (1193182 Hz) round it up */ +#define TICKCOUNT_TO_WAIT 1194 BOOLEAN HalpClockSetMSRate; ULONG HalpCurrentTimeIncrement; @@ -130,4 +135,161 @@ return HalpRolloverTable[Increment - 1].HighPart; } +ULONG +WaitFor8254Wraparound(VOID) +{ + ULONG StartTicks; + ULONG PrevTicks; + LONG Delta; + + StartTicks = HalpQuery8254Counter(); + + do + { + PrevTicks = StartTicks; + StartTicks = HalpQuery8254Counter(); + Delta = StartTicks - PrevTicks; + + /* + * This limit for delta seems arbitrary, but it isn't, it's + * slightly above the level of error a buggy Mercury/Neptune + * chipset timer can cause. + */ + + } + while (Delta < 300); + + return StartTicks; +} + +VOID +NTAPI +HalpCalibrateStallExecution(VOID) +{ + ULONG CalibrationBit; + ULONG EndTicks; + ULONG StartTicks; + ULONG OverheadTicks; + PKIPCR Pcr; + + Pcr = (PKIPCR)KeGetPcr(); + + /* Measure the delay for the minimum call overhead in ticks */ + Pcr->StallScaleFactor = 1; + StartTicks = WaitFor8254Wraparound(); + KeStallExecutionProcessor(1); + EndTicks = HalpQuery8254Counter(); + OverheadTicks = (StartTicks - EndTicks); + + do + { + /* Increase the StallScaleFactor */ + Pcr->StallScaleFactor = Pcr->StallScaleFactor * 2; + + if (Pcr->StallScaleFactor == 0) + { + /* Nothing found */ + break; + } + + /* Get the start ticks */ + StartTicks = WaitFor8254Wraparound(); + + /* Wait for a defined time */ + KeStallExecutionProcessor(MICROSECOND_TO_WAIT); + + /* Get the end ticks */ + EndTicks = HalpQuery8254Counter(); + + DPRINT("Pcr->StallScaleFactor: %d\n", Pcr->StallScaleFactor); + DPRINT("Time1 : StartTicks %i - EndTicks %i = %i\n", + StartTicks, EndTicks, StartTicks - EndTicks); + } while ((StartTicks - EndTicks) <= (TICKCOUNT_TO_WAIT + OverheadTicks)); + + /* A StallScaleFactor lesser than INITIAL_STALL_COUNT makes no sense */ + if (Pcr->StallScaleFactor >= (INITIAL_STALL_COUNT * 2)) + { + /* Adjust the StallScaleFactor */ + Pcr->StallScaleFactor = Pcr->StallScaleFactor / 2; + + /* Setup the CalibrationBit */ + CalibrationBit = Pcr->StallScaleFactor; + + for (;;) + { + /* Lower the CalibrationBit */ + CalibrationBit = CalibrationBit / 2; + if (CalibrationBit == 0) + { + break; + } + + /* Add the CalibrationBit */ + Pcr->StallScaleFactor = Pcr->StallScaleFactor + CalibrationBit; + + /* Get the start ticks */ + StartTicks = WaitFor8254Wraparound(); + + /* Wait for a defined time */ + KeStallExecutionProcessor(MICROSECOND_TO_WAIT); + + /* Get the end ticks */ + EndTicks = HalpQuery8254Counter(); + + DPRINT("Pcr->StallScaleFactor: %d\n", Pcr->StallScaleFactor); + DPRINT("Time2 : StartTicks %i - EndTicks %i = %i\n", + StartTicks, EndTicks, StartTicks - EndTicks); + + if ((StartTicks-EndTicks) > (TICKCOUNT_TO_WAIT+OverheadTicks)) + { + /* Too big so subtract the CalibrationBit */ + Pcr->StallScaleFactor = Pcr->StallScaleFactor - CalibrationBit; + } + } + DPRINT("New StallScaleFactor: %d\n", Pcr->StallScaleFactor); + } + else + { + /* Set StallScaleFactor to the default */ + Pcr->StallScaleFactor = INITIAL_STALL_COUNT; + } + +#if 0 + /* For debugging */ + ULONG i; + + DPRINT1("About to start delay loop test\n"); + DPRINT1("Waiting for a minute..."); + for (i = 0; i < (60*1000*20); i++) + { + KeStallExecutionProcessor(50); + } + DPRINT1("finished\n"); + + + DPRINT1("About to start delay loop test\n"); + DPRINT1("Waiting for a minute..."); + for (i = 0; i < (60*1000); i++) + { + KeStallExecutionProcessor(1000); + } + DPRINT1("finished\n"); + + + DPRINT1("About to start delay loop test\n"); + DPRINT1("Waiting for a minute..."); + for (i = 0; i < (60*1000*1000); i++) + { + KeStallExecutionProcessor(1); + } + DPRINT1("finished\n"); + + DPRINT1("About to start delay loop test\n"); + DPRINT1("Waiting for a minute..."); + KeStallExecutionProcessor(60*1000000); + DPRINT1("finished\n"); +#endif +} + + /* EOF */ Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sat Oct 10 20:22:56 2009 @@ -40,6 +40,16 @@ /* udelay.c */ VOID NTAPI HalpInitializeClock(VOID); + +VOID +NTAPI +HalpCalibrateStallExecution(VOID); + +ULONG +NTAPI +HalpQuery8254Counter( + VOID +); /* pci.c */ VOID HalpInitPciBus (VOID);

1 0

[fireball] 43363: - Implement RtlpDidUnicodeToOemWork to check for unmapped characters. Based on a patch by Daniel Zimmerman. See issue #4548 for more details.
by fireball＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: fireball Date: Sat Oct 10 15:22:41 2009 New Revision: 43363 URL: http://svn.reactos.org/svn/reactos?rev=43363&view=rev Log: - Implement RtlpDidUnicodeToOemWork to check for unmapped characters. Based on a patch by Daniel Zimmerman. See issue #4548 for more details. Modified: trunk/reactos/lib/rtl/nls.c trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=43363&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/nls.c [iso-8859-1] Sat Oct 10 15:22:41 2009 @@ -32,6 +32,10 @@ PCHAR NlsUnicodeToOemTable =NULL; PWCHAR NlsDbcsUnicodeToOemTable = NULL; PUSHORT _NlsOemLeadByteInfo = NULL; /* exported */ + +USHORT NlsOemDefaultChar = '\0'; +USHORT NlsUnicodeDefaultChar = 0; + #define NlsOemLeadByteInfo _NlsOemLeadByteInfo #define INIT_FUNCTION @@ -435,6 +439,10 @@ /* Set Unicode case map data */ NlsUnicodeUpcaseTable = NlsTable->UpperCaseTable; NlsUnicodeLowercaseTable = NlsTable->LowerCaseTable; + + /* set the default characters for RtlpDidUnicodeToOemWork */ + NlsOemDefaultChar = NlsTable->OemTableInfo.DefaultChar; + NlsUnicodeDefaultChar = NlsTable->OemTableInfo.TransDefaultChar; } Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=4336… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Sat Oct 10 15:22:41 2009 @@ -22,6 +22,9 @@ extern BOOLEAN NlsMbCodePageTag; extern BOOLEAN NlsMbOemCodePageTag; extern PUSHORT NlsLeadByteInfo; + +extern USHORT NlsOemDefaultChar; +extern USHORT NlsUnicodeDefaultChar; /* FUNCTIONS *****************************************************************/ @@ -393,6 +396,45 @@ RtlpFreeStringMemory(UnicodeString->Buffer, TAG_USTR); RtlZeroMemory(UnicodeString, sizeof(UNICODE_STRING)); } +} + + +/* + * @implemented + * + * NOTES + * Check the oem-string to match the uincoded-string. + * + * Functions who convert unicode strings to oem strings will set a DefaultChar from + * the OemCodepage when the character are unknown. So check it against the unicode string + * and return false when the unicode string not contain an TransDefaultChar. + */ +BOOLEAN +NTAPI +RtlpDidUnicodeToOemWork(IN PCUNICODE_STRING UnicodeString, + IN POEM_STRING OemString) +{ + ULONG i = 0; + + /* Go through all characters of a string */ + while ((OemString->Buffer[i] != 0) && + (i < OemString->Length)) + { + /* Check if it got translated into '?', but source char + wasn't '?' equivalent */ + if ((OemString->Buffer[i] == NlsOemDefaultChar) && + (UnicodeString->Buffer[i] != NlsUnicodeDefaultChar)) + { + /* Yes, it means unmappable characters were found */ + return FALSE; + } + + /* Move to the next char */ + i++; + } + + /* All chars were translated successfuly */ + return TRUE; } /* @@ -1534,8 +1576,9 @@ UniSource->Buffer, UniSource->Length); - /* FIXME: Check if everything mapped correctly and - * return STATUS_UNMAPPABLE_CHARACTER */ + /* Check for unmapped character */ + if (NT_SUCCESS(Status) && !RtlpDidUnicodeToOemWork(UniSource, OemDest)) + Status = STATUS_UNMAPPABLE_CHARACTER; if (!NT_SUCCESS(Status) && AllocateDestinationString) { @@ -1763,7 +1806,9 @@ UniSource->Buffer, UniSource->Length); - /* FIXME: Special check needed and return STATUS_UNMAPPABLE_CHARACTER */ + /* Check for unmapped characters */ + if (NT_SUCCESS(Status) && !RtlpDidUnicodeToOemWork(UniSource, OemDest)) + Status = STATUS_UNMAPPABLE_CHARACTER; if (!NT_SUCCESS(Status) && AllocateDestinationString) { @@ -1816,7 +1861,9 @@ UniSource->Buffer, UniSource->Length); - /* FIXME: Special check needed and return STATUS_UNMAPPABLE_CHARACTER */ + /* Check for unmapped characters */ + if (NT_SUCCESS(Status) && !RtlpDidUnicodeToOemWork(UniSource, OemDest)) + Status = STATUS_UNMAPPABLE_CHARACTER; if (!NT_SUCCESS(Status) && AllocateDestinationString) {

1 0

[fireball] 43362: [freeldr] Andrew Steinborn <asteinborn78@gmail.com> - Display error message when boot sector reading fails. See issue #4641 for more details.
by fireball＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: fireball Date: Sat Oct 10 15:05:02 2009 New Revision: 43362 URL: http://svn.reactos.org/svn/reactos?rev=43362&view=rev Log: [freeldr] Andrew Steinborn <asteinborn78(a)gmail.com> - Display error message when boot sector reading fails. See issue #4641 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/miscb… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] Sat Oct 10 15:05:02 2009 @@ -62,6 +62,7 @@ // Read boot sector if (!FsReadFile(FilePointer, 512, &BytesRead, (void*)0x7c00) || (BytesRead != 512)) { + UiMessageBox("Unable to read boot sector."); return; } @@ -133,6 +134,7 @@ // If this fails then abort if (!MachDiskReadLogicalSectors(DriveNumber, PartitionTableEntry.SectorCountBeforePartition, 1, (PVOID)0x7C00)) { + UiMessageBox("Unable to read partition's boot sector."); return; } @@ -186,6 +188,7 @@ // If this fails then abort if (!MachDiskReadLogicalSectors(DriveNumber, 0, 1, (PVOID)0x7C00)) { + UiMessageBox("Unable to read boot sector"); return; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs