Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[akhaldi] 62111: [MESA/MAIN] * We don't need these source files in the static lib. Jerome please review.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Feb 10 20:08:53 2014 New Revision: 62111 URL: http://svn.reactos.org/svn/reactos?rev=62111&view=rev Log: [MESA/MAIN] * We don't need these source files in the static lib. Jerome please review. Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/CMake… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] Mon Feb 10 20:08:53 2014 @@ -35,7 +35,7 @@ getstring.c hash.c hint.c - histogram.c + #histogram.c image.c imports.c light.c @@ -62,7 +62,7 @@ texgetimage.c teximage.c texobj.c - texpal.c + #texpal.c texparam.c texstate.c texstorage.c

10 years, 7 months

[ekohl] 62110: [MSV1_0] - Encrypt the old and new passwords before changing the password. [MSGINA] - Store the new password after a successful password change in order to be able to unlock a locked...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 10 20:08:29 2014 New Revision: 62110 URL: http://svn.reactos.org/svn/reactos?rev=62110&view=rev Log: [MSV1_0] - Encrypt the old and new passwords before changing the password. [MSGINA] - Store the new password after a successful password change in order to be able to unlock a locked computer with the new password. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msv1_0/msv1_0.c trunk/reactos/dll/win32/msv1_0/msv1_0.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Mon Feb 10 20:08:29 2014 @@ -283,7 +283,7 @@ IN HWND hwndDlg) { WCHAR UserName[256]; - WCHAR DomainName[256]; + WCHAR Domain[256]; WCHAR OldPassword[256]; WCHAR NewPassword1[256]; WCHAR NewPassword2[256]; @@ -297,7 +297,7 @@ NTSTATUS Status; GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_USERNAME, UserName, 256); - GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_DOMAIN, DomainName, 256); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_DOMAIN, Domain, 256); GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_OLDPWD, OldPassword, 256); GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD1, NewPassword1, 256); GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD2, NewPassword2, 256); @@ -315,7 +315,7 @@ /* Calculate the request buffer size */ RequestBufferSize = sizeof(MSV1_0_CHANGEPASSWORD_REQUEST) + - ((wcslen(DomainName) + 1) * sizeof(WCHAR)) + + ((wcslen(Domain) + 1) * sizeof(WCHAR)) + ((wcslen(UserName) + 1) * sizeof(WCHAR)) + ((wcslen(OldPassword) + 1) * sizeof(WCHAR)) + ((wcslen(NewPassword1) + 1) * sizeof(WCHAR)); @@ -337,12 +337,12 @@ Ptr = (LPWSTR)((ULONG_PTR)RequestBuffer + sizeof(MSV1_0_CHANGEPASSWORD_REQUEST)); /* Pack the domain name */ - RequestBuffer->DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + RequestBuffer->DomainName.Length = wcslen(Domain) * sizeof(WCHAR); RequestBuffer->DomainName.MaximumLength = RequestBuffer->DomainName.Length + sizeof(WCHAR); RequestBuffer->DomainName.Buffer = Ptr; RtlCopyMemory(RequestBuffer->DomainName.Buffer, - DomainName, + Domain, RequestBuffer->DomainName.MaximumLength); Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->DomainName.MaximumLength); @@ -412,6 +412,14 @@ MB_OK | MB_ICONINFORMATION, IDS_CHANGEPWDTITLE, IDS_PASSWORDCHANGED); + + if ((wcscmp(UserName, pgContext->UserName) == 0) && + (wcscmp(Domain, pgContext->Domain) == 0) && + (wcscmp(OldPassword, pgContext->Password) == 0)) + { + ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR)); + wcscpy(pgContext->Password, NewPassword1); + } done: if (RequestBuffer != NULL) @@ -755,11 +763,8 @@ if (GetTextboxText(hwndDlg, IDC_PASSWORD, &Password) && DoLoginTasks(pgContext, UserName, Domain, Password)) { - pgContext->Password = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - (wcslen(Password) + 1) * sizeof(WCHAR)); - if (pgContext->Password != NULL) - wcscpy(pgContext->Password, Password); + ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR)); + wcscpy(pgContext->Password, Password); result = WLX_SAS_ACTION_LOGON; } Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Mon Feb 10 20:08:29 2014 @@ -871,11 +871,8 @@ if (result == TRUE) { - pgContext->Password = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - (wcslen(Password) + 1) * sizeof(WCHAR)); - if (pgContext->Password != NULL) - wcscpy(pgContext->Password, Password); + ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR)); + wcscpy(pgContext->Password, Password); NotifyBootConfigStatus(TRUE); } Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Mon Feb 10 20:08:29 2014 @@ -42,7 +42,7 @@ /* Information to be filled during logon */ WCHAR UserName[256]; WCHAR Domain[256]; - LPWSTR Password; + WCHAR Password[256]; SYSTEMTIME LogonTime; HANDLE UserToken; PLUID pAuthenticationId; Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Mon Feb 10 20:08:29 2014 @@ -437,6 +437,22 @@ SAMPR_ULONG_ARRAY Use = {0, NULL}; NTSTATUS Status; + ENCRYPTED_NT_OWF_PASSWORD OldNtPassword; + ENCRYPTED_NT_OWF_PASSWORD NewNtPassword; + ENCRYPTED_LM_OWF_PASSWORD OldLmPassword; + ENCRYPTED_LM_OWF_PASSWORD NewLmPassword; + OEM_STRING LmPwdString; + CHAR LmPwdBuffer[15]; + BOOLEAN OldLmPasswordPresent = FALSE; + BOOLEAN NewLmPasswordPresent = FALSE; + + ENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm; + ENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm; + ENCRYPTED_LM_OWF_PASSWORD OldNtEncryptedWithNewNt; + ENCRYPTED_LM_OWF_PASSWORD NewNtEncryptedWithOldNt; + PENCRYPTED_LM_OWF_PASSWORD pOldLmEncryptedWithNewLm = NULL; + PENCRYPTED_LM_OWF_PASSWORD pNewLmEncryptedWithOldLm = NULL; + TRACE("()\n"); RequestBuffer = (PMSV1_0_CHANGEPASSWORD_REQUEST)ProtocolSubmitBuffer; @@ -523,26 +539,128 @@ } - -#if 0 + /* Calculate the NT hash for the old password */ + Status = SystemFunction007(&RequestBuffer->OldPassword, + (LPBYTE)&OldNtPassword); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction007 failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Calculate the NT hash for the new password */ + Status = SystemFunction007(&RequestBuffer->NewPassword, + (LPBYTE)&NewNtPassword); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction007 failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Calculate the LM password and hash for the old password */ + LmPwdString.Length = 15; + LmPwdString.MaximumLength = 15; + LmPwdString.Buffer = LmPwdBuffer; + ZeroMemory(LmPwdString.Buffer, LmPwdString.MaximumLength); + + Status = RtlUpcaseUnicodeStringToOemString(&LmPwdString, + &RequestBuffer->OldPassword, + FALSE); + if (NT_SUCCESS(Status)) + { + /* Calculate the LM hash value of the password */ + Status = SystemFunction006(LmPwdString.Buffer, + (LPSTR)&OldLmPassword); + if (NT_SUCCESS(Status)) + { + OldLmPasswordPresent = TRUE; + } + } + + /* Calculate the LM password and hash for the new password */ + LmPwdString.Length = 15; + LmPwdString.MaximumLength = 15; + LmPwdString.Buffer = LmPwdBuffer; + ZeroMemory(LmPwdString.Buffer, LmPwdString.MaximumLength); + + Status = RtlUpcaseUnicodeStringToOemString(&LmPwdString, + &RequestBuffer->NewPassword, + FALSE); + if (NT_SUCCESS(Status)) + { + /* Calculate the LM hash value of the password */ + Status = SystemFunction006(LmPwdString.Buffer, + (LPSTR)&NewLmPassword); + if (NT_SUCCESS(Status)) + { + NewLmPasswordPresent = TRUE; + } + } + + /* Encrypt the old and new LM passwords, if they exist */ + if (OldLmPasswordPresent && NewLmPasswordPresent) + { + /* Encrypt the old LM password */ + Status = SystemFunction012((const BYTE *)&OldLmPassword, + (const BYTE *)&NewLmPassword, + (LPBYTE)&OldLmEncryptedWithNewLm); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Encrypt the new LM password */ + Status = SystemFunction012((const BYTE *)&NewLmPassword, + (const BYTE *)&OldLmPassword, + (LPBYTE)&NewLmEncryptedWithOldLm); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + goto done; + } + + pOldLmEncryptedWithNewLm = &OldLmEncryptedWithNewLm; + pNewLmEncryptedWithOldLm = &NewLmEncryptedWithOldLm; + } + + /* Encrypt the old NT password */ + Status = SystemFunction012((const BYTE *)&OldNtPassword, + (const BYTE *)&NewNtPassword, + (LPBYTE)&OldNtEncryptedWithNewNt); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Encrypt the new NT password */ + Status = SystemFunction012((const BYTE *)&NewNtPassword, + (const BYTE *)&OldNtPassword, + (LPBYTE)&NewNtEncryptedWithOldNt); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Change the password */ Status = SamrChangePasswordUser(UserHandle, - IN unsigned char LmPresent, - IN PENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm, - IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm, - IN unsigned char NtPresent, - IN PENCRYPTED_NT_OWF_PASSWORD OldNtEncryptedWithNewNt, - IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithOldNt, - IN unsigned char NtCrossEncryptionPresent, - IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithNewLm, - IN unsigned char LmCrossEncryptionPresent, - IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithNewNt) + OldLmPasswordPresent && NewLmPasswordPresent, + pOldLmEncryptedWithNewLm, + pNewLmEncryptedWithOldLm, + TRUE, + &OldNtEncryptedWithNewNt, + &NewNtEncryptedWithOldNt, + FALSE, + NULL, + FALSE, + NULL); if (!NT_SUCCESS(Status)) { TRACE("SamrChangePasswordUser failed (Status %08lx)\n", Status); goto done; } -#endif done: if (UserHandle != NULL) Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.h?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] Mon Feb 10 20:08:29 2014 @@ -186,6 +186,20 @@ NTSTATUS NTAPI +SamrChangePasswordUser(IN SAMPR_HANDLE UserHandle, + IN unsigned char LmPresent, + IN PENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm, + IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm, + IN unsigned char NtPresent, + IN PENCRYPTED_NT_OWF_PASSWORD OldNtEncryptedWithNewNt, + IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithOldNt, + IN unsigned char NtCrossEncryptionPresent, + IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithNewLm, + IN unsigned char LmCrossEncryptionPresent, + IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithNewNt); + +NTSTATUS +NTAPI SamrCloseHandle(IN OUT SAMPR_HANDLE *SamHandle); NTSTATUS @@ -317,4 +331,10 @@ SystemFunction007(PUNICODE_STRING string, LPBYTE hash); +NTSTATUS +WINAPI +SystemFunction012(const BYTE *in, + const BYTE *key, + LPBYTE out); + /* EOF */

10 years, 7 months

[akhaldi] 62109: [HAL] * Prepare the CMake scripts for PCH. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Feb 10 18:35:12 2014 New Revision: 62109 URL: http://svn.reactos.org/svn/reactos?rev=62109&view=rev Log: [HAL] * Prepare the CMake scripts for PCH. CORE-7716 Added: trunk/reactos/hal/halx86/minihal/ (with props) trunk/reactos/hal/halx86/minihal/CMakeLists.txt - copied, changed from r62101, trunk/reactos/hal/halx86/minihal.cmake Removed: trunk/reactos/hal/halx86/minihal.cmake Modified: trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/hal/halx86/generic.cmake Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Mon Feb 10 18:35:12 2014 @@ -56,7 +56,7 @@ include(legacy.cmake) include(up.cmake) include(pic.cmake) - include(minihal.cmake) + add_subdirectory(minihal) # hal add_hal(hal SOURCES up/halup.rc COMPONENTS generic legacy up pic) Modified: trunk/reactos/hal/halx86/generic.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic.cmake?r… ============================================================================== --- trunk/reactos/hal/halx86/generic.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic.cmake [iso-8859-1] Mon Feb 10 18:35:12 2014 @@ -24,4 +24,3 @@ add_asm_files(lib_hal_generic_asm ${HAL_GENERIC_ASM_SOURCE}) add_object_library(lib_hal_generic ${HAL_GENERIC_SOURCE} ${lib_hal_generic_asm}) add_dependencies(lib_hal_generic asm) -add_pch(lib_hal_generic include/hal.h) Propchange: trunk/reactos/hal/halx86/minihal/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Feb 10 18:35:12 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/hal/halx86/minihal/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/hal/halx86/minihal/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/hal/halx86/minihal/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Removed: trunk/reactos/hal/halx86/minihal.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/minihal.cmake?r… ============================================================================== --- trunk/reactos/hal/halx86/minihal.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/minihal.cmake (removed) @@ -1,31 +0,0 @@ - -list(APPEND MINI_HAL_SOURCE - generic/portio.c - legacy/bus/bushndlr.c - legacy/bus/cmosbus.c - legacy/bus/isabus.c - legacy/bus/pcibus.c - legacy/bus/sysbus.c - legacy/bussupp.c - generic/beep.c - generic/bios.c - generic/cmos.c - generic/dma.c - generic/display.c - generic/drive.c - generic/misc.c - generic/profil.c - generic/reboot.c - generic/spinlock.c - generic/sysinfo.c - generic/timer.c - generic/usage.c - up/halinit_mini.c - up/pic.c - up/processor.c) - -# mini_hal -add_asm_files(mini_hal_asm generic/systimer.S) -add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm}) -add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_) -add_dependencies(mini_hal psdk bugcodes asm) Copied: trunk/reactos/hal/halx86/minihal/CMakeLists.txt (from r62101, trunk/reactos/hal/halx86/minihal.cmake) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/minihal/CMakeLi… ============================================================================== --- trunk/reactos/hal/halx86/minihal.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/minihal/CMakeLists.txt [iso-8859-1] Mon Feb 10 18:35:12 2014 @@ -1,31 +1,32 @@ list(APPEND MINI_HAL_SOURCE - generic/portio.c - legacy/bus/bushndlr.c - legacy/bus/cmosbus.c - legacy/bus/isabus.c - legacy/bus/pcibus.c - legacy/bus/sysbus.c - legacy/bussupp.c - generic/beep.c - generic/bios.c - generic/cmos.c - generic/dma.c - generic/display.c - generic/drive.c - generic/misc.c - generic/profil.c - generic/reboot.c - generic/spinlock.c - generic/sysinfo.c - generic/timer.c - generic/usage.c - up/halinit_mini.c - up/pic.c - up/processor.c) + ../generic/portio.c + ../legacy/bus/bushndlr.c + ../legacy/bus/cmosbus.c + ../legacy/bus/isabus.c + ../legacy/bus/pcibus.c + ../legacy/bus/sysbus.c + ../legacy/bussupp.c + ../generic/beep.c + ../generic/bios.c + ../generic/cmos.c + ../generic/dma.c + ../generic/display.c + ../generic/drive.c + ../generic/misc.c + ../generic/profil.c + ../generic/reboot.c + ../generic/spinlock.c + ../generic/sysinfo.c + ../generic/timer.c + ../generic/usage.c + ../up/halinit_mini.c + ../up/pic.c + ../up/processor.c + ../include/hal.h) -# mini_hal -add_asm_files(mini_hal_asm generic/systimer.S) +add_asm_files(mini_hal_asm ../generic/systimer.S) add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm}) add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_) add_dependencies(mini_hal psdk bugcodes asm) +add_pch(mini_hal ../include/hal.h MINI_HAL_SOURCE)

10 years, 7 months

[tkreuzer] 62108: [NTOSKRNL] Implement TokenAuditPolicy case in NtSetInformationToken

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 10 18:05:08 2014 New Revision: 62108 URL: http://svn.reactos.org/svn/reactos?rev=62108&view=rev Log: [NTOSKRNL] Implement TokenAuditPolicy case in NtSetInformationToken Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=62… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Mon Feb 10 18:05:08 2014 @@ -17,6 +17,18 @@ #pragma alloc_text(INIT, SepInitializeTokenImplementation) #endif +#include <ntlsa.h> + +typedef struct _TOKEN_AUDIT_POLICY_INFORMATION +{ + ULONG PolicyCount; + struct + { + ULONG Category; + UCHAR Value; + } Policies[1]; +} TOKEN_AUDIT_POLICY_INFORMATION, *PTOKEN_AUDIT_POLICY_INFORMATION; + /* GLOBALS ********************************************************************/ POBJECT_TYPE SeTokenObjectType = NULL; @@ -39,11 +51,11 @@ ICI_SQ_SAME( 0, 0, 0), /* TokenUser */ - ICI_SQ_SAME( sizeof(TOKEN_USER), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_USER), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ), /* TokenGroups */ - ICI_SQ_SAME( sizeof(TOKEN_GROUPS), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_GROUPS), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ), /* TokenPrivileges */ - ICI_SQ_SAME( sizeof(TOKEN_PRIVILEGES), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_PRIVILEGES), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ), /* TokenOwner */ ICI_SQ_SAME( sizeof(TOKEN_OWNER), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), /* TokenPrimaryGroup */ @@ -51,13 +63,13 @@ /* TokenDefaultDacl */ ICI_SQ_SAME( sizeof(TOKEN_DEFAULT_DACL), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), /* TokenSource */ - ICI_SQ_SAME( sizeof(TOKEN_SOURCE), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_SOURCE), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ), /* TokenType */ ICI_SQ_SAME( sizeof(TOKEN_TYPE), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), /* TokenImpersonationLevel */ ICI_SQ_SAME( sizeof(SECURITY_IMPERSONATION_LEVEL), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), /* TokenStatistics */ - ICI_SQ_SAME( sizeof(TOKEN_STATISTICS), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_STATISTICS), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ), /* TokenRestrictedSids */ ICI_SQ_SAME( sizeof(TOKEN_GROUPS), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), /* TokenSessionId */ @@ -69,9 +81,9 @@ /* TokenSandBoxInert */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), /* TokenAuditPolicy */ - ICI_SQ_SAME( /* FIXME */0, sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), + ICI_SQ_SAME( /* FIXME */0, sizeof(ULONG), ICIF_QUERY | ICIF_SET | ICIF_QUERY_SIZE_VARIABLE ), /* TokenOrigin */ - ICI_SQ_SAME( sizeof(TOKEN_ORIGIN), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_ORIGIN), sizeof(ULONG), ICIF_QUERY | ICIF_SET | ICIF_QUERY_SIZE_VARIABLE ), }; /* FUNCTIONS *****************************************************************/ @@ -1945,11 +1957,106 @@ } - default: + + case TokenAuditPolicy: + { + PTOKEN_AUDIT_POLICY_INFORMATION PolicyInformation = + (PTOKEN_AUDIT_POLICY_INFORMATION)TokenInformation; + SEP_AUDIT_POLICY AuditPolicy; + ULONG i; + + _SEH2_TRY + { + ProbeForRead(PolicyInformation, + FIELD_OFFSET(TOKEN_AUDIT_POLICY_INFORMATION, + Policies[PolicyInformation->PolicyCount]), + sizeof(ULONG)); + + /* Loop all policies in the structure */ + for (i = 0; i < PolicyInformation->PolicyCount; i++) + { + /* Set the corresponding bits in the packed structure */ + switch (PolicyInformation->Policies[i].Category) + { + case AuditCategorySystem: + AuditPolicy.PolicyElements.System = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryLogon: + AuditPolicy.PolicyElements.Logon = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryObjectAccess: + AuditPolicy.PolicyElements.ObjectAccess = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryPrivilegeUse: + AuditPolicy.PolicyElements.PrivilegeUse = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryDetailedTracking: + AuditPolicy.PolicyElements.DetailedTracking = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryPolicyChange: + AuditPolicy.PolicyElements.PolicyChange = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryAccountManagement: + AuditPolicy.PolicyElements.AccountManagement = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryDirectoryServiceAccess: + AuditPolicy.PolicyElements.DirectoryServiceAccess = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryAccountLogon: + AuditPolicy.PolicyElements.AccountLogon = PolicyInformation->Policies[i].Value; + break; + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + goto Cleanup; + } + _SEH2_END; + + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, + PreviousMode)) + { + Status = STATUS_PRIVILEGE_NOT_HELD; + break; + } + + /* Lock the token */ + SepAcquireTokenLockExclusive(Token); + + /* Set the new audit policy */ + Token->AuditPolicy = AuditPolicy; + + /* Unlock the token */ + SepReleaseTokenLock(Token); + + break; + } + + + + case TokenOrigin: { DPRINT1("Unhandled TokenInformationClass: 0x%lx\n", TokenInformationClass); Status = STATUS_NOT_IMPLEMENTED; + break; + } + + default: + { + DPRINT1("Invalid TokenInformationClass: 0x%lx\n", + TokenInformationClass); + Status = STATUS_INVALID_INFO_CLASS; break; } }

10 years, 7 months

[tkreuzer] 62107: [NTOSKRNL] Implement NtImpersonateClientOfPort

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 10 17:52:40 2014 New Revision: 62107 URL: http://svn.reactos.org/svn/reactos?rev=62107&view=rev Log: [NTOSKRNL] Implement NtImpersonateClientOfPort Modified: trunk/reactos/ntoskrnl/lpc/port.c Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=62… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] Mon Feb 10 17:52:40 2014 @@ -84,6 +84,40 @@ return TRUE; } +BOOLEAN +NTAPI +LpcpValidateClientPort( + PETHREAD ClientThread, + PLPCP_PORT_OBJECT Port) +{ + PLPCP_PORT_OBJECT ThreadPort; + + /* Get the thread's port */ + ThreadPort = LpcpGetPortFromThread(ClientThread); + if (ThreadPort == NULL) + { + return FALSE; + } + + /* Check if the port matches directly */ + if ((Port == ThreadPort) || + (Port == ThreadPort->ConnectionPort) || + (Port == ThreadPort->ConnectedPort)) + { + return TRUE; + } + + /* Check if this is a communication port and the connection port matches */ + if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_COMMUNICATION_PORT) && + (Port->ConnectionPort == ThreadPort)) + { + return TRUE; + } + + return FALSE; +} + + /* PUBLIC FUNCTIONS **********************************************************/ NTSTATUS @@ -91,8 +125,153 @@ NtImpersonateClientOfPort(IN HANDLE PortHandle, IN PPORT_MESSAGE ClientMessage) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + KPROCESSOR_MODE PreviousMode; + CLIENT_ID ClientId; + ULONG MessageId; + PLPCP_PORT_OBJECT Port = NULL, ConnectedPort = NULL; + PETHREAD ClientThread = NULL; + SECURITY_CLIENT_CONTEXT ClientContext; + NTSTATUS Status; + PAGED_CODE(); + + /* Check the previous mode */ + PreviousMode = ExGetPreviousMode(); + if (PreviousMode == KernelMode) + { + ClientId = ClientMessage->ClientId; + MessageId = ClientMessage->MessageId; + } + else + { + _SEH2_TRY + { + ProbeForRead(ClientMessage, sizeof(*ClientMessage), sizeof(PVOID)); + ClientId = ClientMessage->ClientId; + MessageId = ClientMessage->MessageId; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Got exception!\n"); + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + + /* Reference the port handle */ + Status = ObReferenceObjectByHandle(PortHandle, + PORT_ALL_ACCESS, + LpcPortObjectType, + PreviousMode, + (PVOID*)&Port, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference port handle: 0x%ls\n", Status); + return Status; + } + + /* Make sure this is a connection port */ + if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_COMMUNICATION_PORT) + { + /* It isn't, fail */ + DPRINT1("Port is not a communication port\n"); + Status = STATUS_INVALID_PORT_HANDLE; + goto Cleanup; + } + + /* Look up the client thread */ + Status = PsLookupProcessThreadByCid(&ClientId, NULL, &ClientThread); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to lookup client thread: 0x%ls\n", Status); + goto Cleanup; + } + + /* Acquire the lock */ + KeAcquireGuardedMutex(&LpcpLock); + + /* Get the connected port and try to reference it */ + ConnectedPort = Port->ConnectedPort; + if ((ConnectedPort == NULL) || + !ObReferenceObjectSafe(ConnectedPort)) + { + DPRINT1("Failed to reference the connected port\n"); + ConnectedPort = NULL; + Status = STATUS_PORT_DISCONNECTED; + goto CleanupWithLock; + } + + /* Check for no-impersonation flag */ + if ((ULONG_PTR)ClientThread->LpcReplyMessage & LPCP_THREAD_FLAG_NO_IMPERSONATION) + { + DPRINT1("Reply message has no impersonation flag set\n"); + Status = STATUS_ACCESS_DENIED; + goto CleanupWithLock; + } + + /* Check for message id mismatch */ + if ((ClientThread->LpcReplyMessageId != MessageId) || (MessageId == 0)) + { + DPRINT1("LpcReplyMessageId mismatch: 0x%lx/0x%lx.\n", + ClientThread->LpcReplyMessageId, MessageId); + Status = STATUS_REPLY_MESSAGE_MISMATCH; + goto CleanupWithLock; + } + + /* Validate the port */ + if (!LpcpValidateClientPort(ClientThread, Port)) + { + DPRINT1("LpcpValidateClientPort failed\n"); + Status = STATUS_REPLY_MESSAGE_MISMATCH; + goto CleanupWithLock; + } + + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); + + /* Check if security is static */ + if (!(ConnectedPort->Flags & LPCP_SECURITY_DYNAMIC)) + { + /* Use the static security for impersonation */ + Status = SeImpersonateClientEx(&ConnectedPort->StaticSecurity, NULL); + goto Cleanup; + } + + /* Create new dynamic security */ + Status = SeCreateClientSecurity(ClientThread, + &ConnectedPort->SecurityQos, + FALSE, + &ClientContext); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SeCreateClientSecurity failed\n"); + goto Cleanup; + } + + /* Use dynamic security for impersonation */ + Status = SeImpersonateClientEx(&ClientContext, NULL); + + /* Get rid of the security context */ + SeDeleteClientSecurity(&ClientContext); + + goto Cleanup; + +CleanupWithLock: + + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); + +Cleanup: + + if (ConnectedPort != NULL) + ObDereferenceObject(ConnectedPort); + + if (ClientThread != NULL) + ObDereferenceObject(ClientThread); + + ObDereferenceObject(Port); + + return Status; } NTSTATUS

10 years, 7 months

[tkreuzer] 62106: Another try to fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 10 17:44:07 2014 New Revision: 62106 URL: http://svn.reactos.org/svn/reactos?rev=62106&view=rev Log: Another try to fix build Modified: trunk/reactos/include/psdk/ntlsa.h Modified: trunk/reactos/include/psdk/ntlsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntlsa.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] Mon Feb 10 17:44:07 2014 @@ -57,7 +57,7 @@ #define SECURITY_ACCESS_REMOTE_INTERACTIVE_LOGON 0x00000400 #define SECURITY_ACCESS_DENY_REMOTE_INTERACTIVE_LOGON 0x00000800 -#ifndef _NTSECAPI_H // HACK to avoid redefinition from ntsecapi.h +#ifdef _NTIFS_INCLUDED_ // HACK to avoid redefinition from ntsecapi.h typedef enum _POLICY_AUDIT_EVENT_TYPE { AuditCategorySystem,

10 years, 7 months

[tkreuzer] 62105: Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 10 17:37:20 2014 New Revision: 62105 URL: http://svn.reactos.org/svn/reactos?rev=62105&view=rev Log: Fix build Modified: trunk/reactos/include/psdk/ntlsa.h Modified: trunk/reactos/include/psdk/ntlsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntlsa.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] Mon Feb 10 17:37:20 2014 @@ -57,6 +57,7 @@ #define SECURITY_ACCESS_REMOTE_INTERACTIVE_LOGON 0x00000400 #define SECURITY_ACCESS_DENY_REMOTE_INTERACTIVE_LOGON 0x00000800 +#ifndef _NTSECAPI_H // HACK to avoid redefinition from ntsecapi.h typedef enum _POLICY_AUDIT_EVENT_TYPE { AuditCategorySystem, @@ -69,6 +70,7 @@ AuditCategoryDirectoryServiceAccess, AuditCategoryAccountLogon } POLICY_AUDIT_EVENT_TYPE, *PPOLICY_AUDIT_EVENT_TYPE; +#endif #ifdef __cplusplus }

10 years, 7 months

[tkreuzer] 62104: [PSDK] Add POLICY_AUDIT_EVENT_TYPE to ntlsa.h [NDK] Fix definition of SEP_AUDIT_POLICY_OVERLAY

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 10 17:29:50 2014 New Revision: 62104 URL: http://svn.reactos.org/svn/reactos?rev=62104&view=rev Log: [PSDK] Add POLICY_AUDIT_EVENT_TYPE to ntlsa.h [NDK] Fix definition of SEP_AUDIT_POLICY_OVERLAY Modified: trunk/reactos/include/ndk/setypes.h trunk/reactos/include/psdk/ntlsa.h Modified: trunk/reactos/include/ndk/setypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/setypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/setypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/setypes.h [iso-8859-1] Mon Feb 10 17:29:50 2014 @@ -127,7 +127,7 @@ typedef struct _SEP_AUDIT_POLICY_OVERLAY { ULONGLONG PolicyBits:36; - UCHAR SetBit:1; + ULONGLONG SetBit:1; } SEP_AUDIT_POLICY_OVERLAY, *PSEP_AUDIT_POLICY_OVERLAY; typedef struct _SEP_AUDIT_POLICY Modified: trunk/reactos/include/psdk/ntlsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntlsa.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] Mon Feb 10 17:29:50 2014 @@ -57,6 +57,18 @@ #define SECURITY_ACCESS_REMOTE_INTERACTIVE_LOGON 0x00000400 #define SECURITY_ACCESS_DENY_REMOTE_INTERACTIVE_LOGON 0x00000800 +typedef enum _POLICY_AUDIT_EVENT_TYPE +{ + AuditCategorySystem, + AuditCategoryLogon, + AuditCategoryObjectAccess, + AuditCategoryPrivilegeUse, + AuditCategoryDetailedTracking, + AuditCategoryPolicyChange, + AuditCategoryAccountManagement, + AuditCategoryDirectoryServiceAccess, + AuditCategoryAccountLogon +} POLICY_AUDIT_EVENT_TYPE, *PPOLICY_AUDIT_EVENT_TYPE; #ifdef __cplusplus }

10 years, 7 months

[akhaldi] 62103: [NTOS] * Prepare the CMake scripts for PCH. * Add header guards to the main header. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Feb 10 17:12:41 2014 New Revision: 62103 URL: http://svn.reactos.org/svn/reactos?rev=62103&view=rev Log: [NTOS] * Prepare the CMake scripts for PCH. * Add header guards to the main header. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/ntoskrnl/guid.c (with props) trunk/reactos/ntoskrnl/ntkrnlmp/ (with props) trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt (with props) trunk/reactos/ntoskrnl/ntos.cmake (with props) Modified: trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Feb 10 17:12:41 2014 @@ -1,437 +1,23 @@ PROJECT(NTOS) +include(ntos.cmake) + +set(NTOSKRNL_SOURCE ${SOURCE}) +set(NTOSKRNL_ASM_SOURCE ${ASM_SOURCE}) + +set(NTKRNLMP_SOURCE ${SOURCE}) +set(NTKRNLMP_ASM_SOURCE ${ASM_SOURCE}) + spec2def(ntoskrnl.exe ntoskrnl.spec ADD_IMPORTLIB) -include_directories( - ${REACTOS_SOURCE_DIR} - ${REACTOS_SOURCE_DIR}/lib/cmlib - include - ${CMAKE_CURRENT_BINARY_DIR}/include - ${CMAKE_CURRENT_BINARY_DIR}/include/internal - ${REACTOS_SOURCE_DIR}/include/reactos/drivers) - -add_definitions( - -D__NTOSKRNL__ - -D_NTOSKRNL_ - -D_NTSYSTEM_ - -D_IN_KERNEL_ - -DNTDDI_VERSION=0x05020400) - -if(NOT DEFINED NEWCC) - set(NEWCC FALSE) -endif() - -if(NEWCC) - add_definitions(-DNEWCC) - list(APPEND SOURCE - cache/cachesub.c - cache/copysup.c - cache/fssup.c - cache/lazyrite.c - cache/logsup.c - cache/mdlsup.c - cache/pinsup.c) -else() - list(APPEND SOURCE - cc/cacheman.c - cc/copy.c - cc/fs.c - cc/mdl.c - cc/pin.c - cc/view.c) -endif() - -list(APPEND SOURCE - cache/section/io.c - cache/section/data.c - cache/section/fault.c - cache/section/reqtools.c - cache/section/sptab.c - cache/section/swapout.c - config/cmalloc.c - config/cmapi.c - config/cmboot.c - config/cmcheck.c - config/cmconfig.c - config/cmcontrl.c - config/cmdata.c - config/cmdelay.c - config/cmhook.c - config/cmhvlist.c - config/cmindex.c - config/cminit.c - config/cmkcbncb.c - config/cmkeydel.c - config/cmlazy.c - config/cmmapvw.c - config/cmname.c - config/cmnotify.c - config/cmparse.c - config/cmquota.c - config/cmse.c - config/cmsecach.c - config/cmsysini.c - config/cmvalche.c - config/cmvalue.c - config/cmwraprs.c - config/ntapi.c - dbgk/dbgkobj.c - dbgk/dbgkutil.c - ex/atom.c - ex/callback.c - ex/dbgctrl.c - ex/efi.c - ex/event.c - ex/evtpair.c - ex/exintrin.c - ex/fmutex.c - ex/handle.c - ex/harderr.c - ex/hdlsterm.c - ex/init.c - ex/interlocked.c - ex/keyedevt.c - ex/locale.c - ex/lookas.c - ex/mutant.c - ex/profile.c - ex/pushlock.c - ex/resource.c - ex/rundown.c - ex/sem.c - ex/shutdown.c - ex/sysinfo.c - ex/time.c - ex/timer.c - ex/uuid.c - ex/win32k.c - ex/work.c - ex/xipdisp.c - ex/zone.c - fsrtl/dbcsname.c - fsrtl/fastio.c - fsrtl/faulttol.c - fsrtl/filelock.c - fsrtl/filter.c - fsrtl/filtrctx.c - fsrtl/fsfilter.c - fsrtl/fsrtlpc.c - fsrtl/largemcb.c - fsrtl/mcb.c - fsrtl/name.c - fsrtl/notify.c - fsrtl/oplock.c - fsrtl/pnp.c - fsrtl/stackovf.c - fsrtl/tunnel.c - fsrtl/unc.c - fstub/disksup.c - fstub/fstubex.c - fstub/halstub.c - fstub/translate.c - inbv/inbv.c - inbv/inbvport.c - io/iomgr/adapter.c - io/iomgr/arcname.c - io/iomgr/bootlog.c - io/iomgr/controller.c - io/iomgr/device.c - io/iomgr/deviface.c - io/iomgr/driver.c - io/iomgr/error.c - io/iomgr/file.c - io/iomgr/iocomp.c - io/iomgr/ioevent.c - io/iomgr/iofunc.c - io/iomgr/iomdl.c - io/iomgr/iomgr.c - io/iomgr/iorsrce.c - io/iomgr/iotimer.c - io/iomgr/iowork.c - io/iomgr/irp.c - io/iomgr/irq.c - io/iomgr/ramdisk.c - io/iomgr/rawfs.c - io/iomgr/remlock.c - io/iomgr/symlink.c - io/iomgr/util.c - io/iomgr/volume.c - io/pnpmgr/plugplay.c - io/pnpmgr/pnpdma.c - io/pnpmgr/pnpinit.c - io/pnpmgr/pnpmgr.c - io/pnpmgr/pnpnotify.c - io/pnpmgr/pnpreport.c - io/pnpmgr/pnpres.c - io/pnpmgr/pnproot.c - io/pnpmgr/pnputil.c - ke/apc.c - ke/balmgr.c - ke/bug.c - ke/clock.c - ke/config.c - ke/devqueue.c - ke/dpc.c - ke/eventobj.c - ke/except.c - ke/freeze.c - ke/gate.c - ke/gmutex.c - ke/ipi.c - ke/krnlinit.c - ke/mutex.c - ke/procobj.c - ke/profobj.c - ke/queue.c - ke/semphobj.c - ke/spinlock.c - ke/thrdobj.c - ke/thrdschd.c - ke/time.c - ke/timerobj.c - ke/wait.c - lpc/close.c - lpc/complete.c - lpc/connect.c - lpc/create.c - lpc/listen.c - lpc/port.c - lpc/reply.c - lpc/send.c - mm/ARM3/contmem.c - mm/ARM3/drvmgmt.c - mm/ARM3/dynamic.c - mm/ARM3/expool.c - mm/ARM3/hypermap.c - mm/ARM3/iosup.c - mm/ARM3/largepag.c - mm/ARM3/mdlsup.c - mm/ARM3/mmdbg.c - mm/ARM3/mminit.c - mm/ARM3/mmsup.c - mm/ARM3/ncache.c - mm/ARM3/pagfault.c - mm/ARM3/pfnlist.c - mm/ARM3/pool.c - mm/ARM3/procsup.c - mm/ARM3/section.c - mm/ARM3/session.c - mm/ARM3/special.c - mm/ARM3/sysldr.c - mm/ARM3/syspte.c - mm/ARM3/vadnode.c - mm/ARM3/virtual.c - mm/ARM3/zeropage.c - mm/balance.c - mm/freelist.c - mm/marea.c - mm/mmfault.c - mm/mminit.c - mm/pagefile.c - mm/region.c - mm/rmap.c - mm/section.c - ob/obdir.c - ob/obhandle.c - ob/obinit.c - ob/oblife.c - ob/oblink.c - ob/obname.c - ob/obref.c - ob/obsdcach.c - ob/obsecure.c - ob/obwait.c - po/events.c - po/guid.c - po/poshtdwn.c - po/povolume.c - po/power.c - ps/debug.c - ps/job.c - ps/kill.c - ps/process.c - ps/psmgr.c - ps/psnotify.c - ps/query.c - ps/quota.c - ps/security.c - ps/state.c - ps/thread.c - ps/win32.c - rtl/libsupp.c - rtl/misc.c - se/access.c - se/accesschk.c - se/acl.c - se/audit.c - se/lsa.c - se/priv.c - se/sd.c - se/semgr.c - se/sid.c - se/token.c - vf/driver.c - wmi/wmi.c - ntoskrnl.rc) - -list(APPEND ASM_SOURCE ex/zw.S) - -if(ARCH STREQUAL "i386") - list(APPEND ASM_SOURCE - ex/i386/fastinterlck_asm.S - ex/i386/ioport.S - ke/i386/ctxswitch.S - ke/i386/trap.s - ke/i386/usercall_asm.S - rtl/i386/stack.S) - list(APPEND SOURCE - config/i386/cmhardwr.c - ke/i386/abios.c - ke/i386/cpu.c - ke/i386/context.c - ke/i386/exp.c - ke/i386/irqobj.c - ke/i386/kiinit.c - ke/i386/ldt.c - ke/i386/mtrr.c - ke/i386/patpge.c - ke/i386/thrdini.c - ke/i386/traphdlr.c - ke/i386/usercall.c - ke/i386/v86vdm.c - mm/i386/page.c - mm/ARM3/i386/init.c - ps/i386/psctx.c - ps/i386/psldt.c - vdm/vdmmain.c - vdm/vdmexec.c) -elseif(ARCH STREQUAL "amd64") - list(APPEND ASM_SOURCE - ke/amd64/boot.S - ke/amd64/ctxswitch.S - ke/amd64/trap.S) - list(APPEND SOURCE - config/i386/cmhardwr.c - ke/amd64/context.c - ke/amd64/cpu.c - ke/amd64/except.c - ke/amd64/interrupt.c - ke/amd64/irql.c - ke/amd64/kiinit.c - ke/amd64/krnlinit.c - ke/amd64/spinlock.c - ke/amd64/stubs.c - ke/amd64/thrdini.c - mm/amd64/init.c - mm/amd64/page.c - ps/amd64/psctx.c) -elseif(ARCH STREQUAL "arm") - list(APPEND ASM_SOURCE - ke/arm/boot.s - ke/arm/ctxswtch.s - ke/arm/stubs_asm.s - ke/arm/trap.s) - list(APPEND SOURCE - config/arm/cmhardwr.c - ke/arm/cpu.c - ke/arm/exp.c - ke/arm/kiinit.c - ke/arm/thrdini.c - ke/arm/trapc.c - ke/arm/usercall.c - mm/arm/page.c - mm/ARM3/arm/init.c - ps/arm/psctx.c - rtl/arm/rtlexcpt.c) -elseif(ARCH STREQUAL "powerpc") - list(APPEND ASM_SOURCE - ke/powerpc/main_asm.S - ke/powerpc/ctxhelp.S) - list(APPEND SOURCE - config/powerpc/cmhardwr.c - ke/powerpc/cpu.c - ke/powerpc/exp.c - ke/powerpc/kiinit.c - ke/powerpc/ppc_irq.c - ke/powerpc/stubs.c - ke/powerpc/systimer.c - ke/powerpc/thrdini.c - ke/powerpc/ctxswitch.c - mm/powerpc/pfault.c - mm/powerpc/page.c) -endif() - -if(NOT _WINKD_) - if(ARCH STREQUAL "i386") - list(APPEND SOURCE - kd/i386/kdbg.c - kd/i386/kdmemsup.c - kd/wrappers/gdbstub.c) - if(KDBG) - list(APPEND ASM_SOURCE kdbg/i386/kdb_help.S) - list(APPEND SOURCE kdbg/i386/i386-dis.c) - endif() - elseif(ARCH STREQUAL "amd64") - list(APPEND SOURCE - kd/amd64/kd.c - kd/i386/kdbg.c # Use the x86 file - kd/amd64/kdmemsup.c) - if(KDBG) - list(APPEND ASM_SOURCE kdbg/amd64/kdb_help.S) - list(APPEND SOURCE - kdbg/amd64/i386-dis.c - kdbg/amd64/kdb.c) - endif() - elseif(ARCH STREQUAL "arm") - list(APPEND SOURCE kd/arm/kdbg.c) - elseif(ARCH STREQUAL "powerpc") - list(APPEND SOURCE kd/wrappers/gdbstub_powerpc.c) - endif() - - if(KDBG) - list(APPEND SOURCE - kdbg/kdb.c - kdbg/kdb_cli.c - kdbg/kdb_expr.c - kdbg/kdb_keyboard.c - kdbg/kdb_serial.c - kdbg/kdb_symbols.c) - endif() - - list(APPEND SOURCE - kd/wrappers/bochs.c - kd/wrappers/kdbg.c - kd/kdinit.c - kd/kdio.c - kd/kdmain.c) - -else() # _WINKD_ - - list(APPEND SOURCE - kd64/kdapi.c - kd64/kdbreak.c - kd64/kddata.c - kd64/kdinit.c - kd64/kdlock.c - kd64/kdprint.c - kd64/kdtrap.c) - - if(ARCH STREQUAL "i386") - list(APPEND SOURCE kd64/i386/kdx86.c) - elseif(ARCH STREQUAL "amd64") - list(APPEND SOURCE kd64/amd64/kdx64.c) - elseif(ARCH STREQUAL "arm") - list(APPEND SOURCE kd64/arm/kdarm.c) - endif() - -endif() - -add_asm_files(ntoskrnl_asm ${ASM_SOURCE}) +add_asm_files(ntoskrnl_asm ${NTOSKRNL_ASM_SOURCE}) add_executable(ntoskrnl ${ntoskrnl_asm} - ${SOURCE} + ${NTOSKRNL_SOURCE} + guid.c + ntoskrnl.rc ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl.def) if(ARCH STREQUAL "i386") @@ -464,48 +50,12 @@ ioevent) add_importlibs(ntoskrnl hal kdcom bootvid) -add_pch(ntoskrnl include/ntoskrnl.h) +add_pch(ntoskrnl ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h NTOSKRNL_SOURCE) add_dependencies(ntoskrnl psdk bugcodes asm) add_cd_file(TARGET ntoskrnl DESTINATION reactos/system32 NO_CAB FOR all) if(BUILD_MP) - spec2def(ntkrnlmp.exe ntoskrnl.spec) - - if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS")) - set_source_files_properties(${ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "CONFIG_SMP") - endif() - - add_asm_files(ntkrnlmp_asm ${ASM_SOURCE}) - - add_executable(ntkrnlmp - ${ntkrnlmp_asm} - ${SOURCE} - ${CMAKE_CURRENT_BINARY_DIR}/ntkrnlmp.def) - - add_target_compile_definitions(ntkrnlmp CONFIG_SMP) - - if(ARCH STREQUAL "i386") - set_entrypoint(ntkrnlmp KiSystemStartup 4) - else() - set_entrypoint(ntkrnlmp KiSystemStartup) - endif() - set_subsystem(ntkrnlmp native) - - if(MSVC) - set_image_base(ntkrnlmp 0x00400000) - else() - set_image_base(ntkrnlmp 0x80800000) - endif() - - # Linker bug - if(NOT MSVC AND LTCG) - add_target_link_flags(ntkrnlmp "-shared") - endif() - - target_link_libraries(ntkrnlmp cportlib csq ${PSEH_LIB} cmlib rtl ${ROSSYM_LIB} libcntpr wdmguid ioevent) - add_importlibs(ntkrnlmp hal kdcom bootvid) - add_dependencies(ntkrnlmp psdk bugcodes asm) - add_cd_file(TARGET ntkrnlmp DESTINATION reactos/system32 NO_CAB FOR all) + add_subdirectory(ntkrnlmp) endif() add_asm_files(ntdllsys_asm ntdll.S) Added: trunk/reactos/ntoskrnl/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/guid.c?rev=62103 ============================================================================== --- trunk/reactos/ntoskrnl/guid.c (added) +++ trunk/reactos/ntoskrnl/guid.c [iso-8859-1] Mon Feb 10 17:12:41 2014 @@ -0,0 +1,8 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <wdm.h> +#include <batclass.h> +#include <initguid.h> +#include <poclass.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/ntoskrnl/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Mon Feb 10 17:12:41 2014 @@ -5,6 +5,9 @@ * PURPOSE: Main Kernel Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ + +#ifndef _NTOSKRNL_PCH +#define _NTOSKRNL_PCH /* INCLUDES ******************************************************************/ @@ -69,9 +72,6 @@ /* SEH support with PSEH */ #include <pseh/pseh2.h> -/* ReactOS Headers */ -#include <reactos/bugcodes.h> - /* SetupLDR Support */ #include <arc/setupblk.h> @@ -125,3 +125,4 @@ #include "internal/probe.h" #include "resource.h" +#endif /* _NTOSKRNL_PCH */ Propchange: trunk/reactos/ntoskrnl/ntkrnlmp/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Feb 10 17:12:41 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/ntoskrnl/ntkrnlmp/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/ntoskrnl/ntkrnlmp/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/ntoskrnl/ntkrnlmp/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLis… ============================================================================== --- trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt (added) +++ trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt [iso-8859-1] Mon Feb 10 17:12:41 2014 @@ -0,0 +1,52 @@ +include(../ntos.cmake) + +spec2def(ntkrnlmp.exe ../ntoskrnl.spec) + +if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS")) + set_source_files_properties(${NTKRNLMP_ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "CONFIG_SMP") +endif() + +add_asm_files(ntkrnlmp_asm ${NTKRNLMP_ASM_SOURCE}) + +add_executable(ntkrnlmp + ${ntkrnlmp_asm} + ${NTKRNLMP_SOURCE} + ${REACTOS_SOURCE_DIR}/ntoskrnl/guid.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ntoskrnl.rc + ${CMAKE_CURRENT_BINARY_DIR}/ntkrnlmp.def) + +add_target_compile_definitions(ntkrnlmp CONFIG_SMP) + +if(ARCH STREQUAL "i386") + set_entrypoint(ntkrnlmp KiSystemStartup 4) +else() + set_entrypoint(ntkrnlmp KiSystemStartup) +endif() +set_subsystem(ntkrnlmp native) + +if(MSVC) + set_image_base(ntkrnlmp 0x00400000) +else() + set_image_base(ntkrnlmp 0x80800000) +endif() + +# Linker bug +if(NOT MSVC AND LTCG) + add_target_link_flags(ntkrnlmp "-shared") +endif() + +target_link_libraries(ntkrnlmp + cportlib + csq + ${PSEH_LIB} + cmlib + rtl + ${ROSSYM_LIB} + libcntpr + wdmguid + ioevent) + +add_importlibs(ntkrnlmp hal kdcom bootvid) +add_pch(ntkrnlmp ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h NTKRNLMP_SOURCE) +add_dependencies(ntkrnlmp psdk bugcodes asm) +add_cd_file(TARGET ntkrnlmp DESTINATION reactos/system32 NO_CAB FOR all) Propchange: trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/ntoskrnl/ntos.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntos.cmake?rev=62… ============================================================================== --- trunk/reactos/ntoskrnl/ntos.cmake (added) +++ trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] Mon Feb 10 17:12:41 2014 @@ -0,0 +1,424 @@ + +include_directories( + ${REACTOS_SOURCE_DIR} + ${REACTOS_SOURCE_DIR}/lib/cmlib + include + ${CMAKE_CURRENT_BINARY_DIR}/include + ${CMAKE_CURRENT_BINARY_DIR}/include/internal + ${REACTOS_SOURCE_DIR}/include/reactos/drivers) + +add_definitions( + -D__NTOSKRNL__ + -D_NTOSKRNL_ + -D_NTSYSTEM_ + -D_IN_KERNEL_ + -DNTDDI_VERSION=0x05020400) + +if(NOT DEFINED NEWCC) + set(NEWCC FALSE) +endif() + +if(NEWCC) + add_definitions(-DNEWCC) + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/cachesub.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/copysup.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/fssup.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/lazyrite.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/logsup.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/mdlsup.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/pinsup.c) +else() + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/cacheman.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/copy.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/fs.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/mdl.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/pin.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cc/view.c) +endif() + +list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/io.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/data.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/fault.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/reqtools.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/sptab.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/swapout.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmalloc.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmapi.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmboot.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmcheck.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmconfig.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmcontrl.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmdata.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmdelay.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmhook.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmhvlist.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmindex.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cminit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmkcbncb.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmkeydel.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmlazy.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmmapvw.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmname.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmnotify.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmparse.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmquota.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmse.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmsecach.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmsysini.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmvalche.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmvalue.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmwraprs.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/ntapi.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/dbgk/dbgkobj.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/dbgk/dbgkutil.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/atom.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/callback.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/dbgctrl.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/efi.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/event.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/evtpair.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/exintrin.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/fmutex.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/handle.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/harderr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/hdlsterm.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/init.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/interlocked.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/keyedevt.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/locale.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/lookas.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/mutant.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/profile.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/pushlock.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/resource.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/rundown.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/sem.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/shutdown.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/sysinfo.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/time.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/timer.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/uuid.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/win32k.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/work.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/xipdisp.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/zone.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/dbcsname.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/fastio.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/faulttol.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/filelock.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/filter.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/filtrctx.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/fsfilter.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/fsrtlpc.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/largemcb.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/mcb.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/name.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/notify.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/oplock.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/pnp.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/stackovf.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/tunnel.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fsrtl/unc.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fstub/disksup.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fstub/fstubex.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fstub/halstub.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/fstub/translate.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/inbv/inbv.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/inbv/inbvport.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/adapter.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/arcname.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/bootlog.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/controller.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/device.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/deviface.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/driver.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/error.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/file.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iocomp.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/ioevent.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iofunc.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iomdl.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iomgr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iorsrce.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iotimer.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/iowork.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/irp.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/irq.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/ramdisk.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/rawfs.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/remlock.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/symlink.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/util.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/volume.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/plugplay.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpdma.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpinit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpmgr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpnotify.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpreport.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnpres.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnproot.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnputil.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/apc.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/balmgr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/bug.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/clock.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/config.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/devqueue.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/dpc.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/eventobj.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/except.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/freeze.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/gate.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/gmutex.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/ipi.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/krnlinit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/mutex.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/procobj.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/profobj.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/queue.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/semphobj.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/spinlock.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/thrdobj.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/thrdschd.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/time.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/timerobj.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/wait.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/close.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/complete.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/connect.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/create.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/listen.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/port.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/reply.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/lpc/send.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/contmem.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/drvmgmt.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/dynamic.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/expool.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/hypermap.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/iosup.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/largepag.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/mdlsup.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/mmdbg.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/mminit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/mmsup.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/ncache.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/pagfault.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/pfnlist.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/pool.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/procsup.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/section.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/session.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/special.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/sysldr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/syspte.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/vadnode.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/virtual.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/zeropage.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/balance.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/freelist.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/marea.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/mmfault.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/mminit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/pagefile.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/region.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/rmap.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/section.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obdir.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obhandle.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obinit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/oblife.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/oblink.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obname.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obref.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obsdcach.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obsecure.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obwait.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/po/events.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/po/guid.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/po/poshtdwn.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/po/povolume.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/po/power.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/debug.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/job.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/kill.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/process.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/psmgr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/psnotify.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/query.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/quota.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/security.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/state.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/thread.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/win32.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/libsupp.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/misc.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/access.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/accesschk.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/acl.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/audit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/lsa.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/priv.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sd.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/semgr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sid.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/token.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/vf/driver.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmi.c) + +list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/zw.S) + +if(ARCH STREQUAL "i386") + list(APPEND ASM_SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/i386/fastinterlck_asm.S + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/i386/ioport.S + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/ctxswitch.S + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/trap.s + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/usercall_asm.S + ${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/i386/stack.S) + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/i386/cmhardwr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/abios.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/cpu.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/context.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/exp.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/irqobj.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/kiinit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/ldt.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/mtrr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/patpge.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/thrdini.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/traphdlr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/usercall.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/v86vdm.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/i386/page.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/i386/init.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/i386/psctx.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/i386/psldt.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/vdm/vdmmain.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/vdm/vdmexec.c) +elseif(ARCH STREQUAL "amd64") + list(APPEND ASM_SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/boot.S + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/ctxswitch.S + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/trap.S) + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/i386/cmhardwr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/context.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/cpu.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/except.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/interrupt.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/irql.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/kiinit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/krnlinit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/spinlock.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/stubs.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/thrdini.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/amd64/init.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/amd64/page.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/amd64/psctx.c) +elseif(ARCH STREQUAL "arm") + list(APPEND ASM_SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/boot.s + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/ctxswtch.s + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/stubs_asm.s + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/trap.s) + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/arm/cmhardwr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/cpu.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/exp.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/kiinit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/thrdini.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/trapc.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/usercall.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/arm/page.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/arm/init.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/arm/psctx.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/arm/rtlexcpt.c) +elseif(ARCH STREQUAL "powerpc") + list(APPEND ASM_SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/main_asm.S + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/ctxhelp.S) + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/powerpc/cmhardwr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/cpu.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/exp.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/kiinit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/ppc_irq.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/stubs.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/systimer.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/thrdini.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/powerpc/ctxswitch.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/powerpc/pfault.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/powerpc/page.c) +endif() + +if(NOT _WINKD_) + if(ARCH STREQUAL "i386") + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdbg.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdmemsup.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/gdbstub.c) + if(KDBG) + list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/kdb_help.S) + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/i386-dis.c) + endif() + elseif(ARCH STREQUAL "amd64") + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/amd64/kd.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdbg.c # Use the x86 file + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/amd64/kdmemsup.c) + if(KDBG) + list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/amd64/kdb_help.S) + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/amd64/i386-dis.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/amd64/kdb.c) + endif() + elseif(ARCH STREQUAL "arm") + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdbg.c) + elseif(ARCH STREQUAL "powerpc") + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/gdbstub_powerpc.c) + endif() + + if(KDBG) + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_cli.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_expr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_keyboard.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_serial.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_symbols.c) + endif() + + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/bochs.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/kdbg.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdinit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdio.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c) + +else() # _WINKD_ + + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdapi.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdbreak.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kddata.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdinit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdlock.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdprint.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdtrap.c) + + if(ARCH STREQUAL "i386") + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/i386/kdx86.c) + elseif(ARCH STREQUAL "amd64") + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/amd64/kdx64.c) + elseif(ARCH STREQUAL "arm") + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/arm/kdarm.c) + endif() + +endif() Propchange: trunk/reactos/ntoskrnl/ntos.cmake ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=62… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Mon Feb 10 17:12:41 2014 @@ -9,7 +9,6 @@ /* INCLUDES ******************************************************************/ -#include "initguid.h" #include <ntoskrnl.h> #define NDEBUG #include <debug.h>

10 years, 7 months

[akhaldi] 62102: [ROSAUTOTEST] * Prepare the CMake script for PCH. * Add header guards to the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Feb 10 17:05:15 2014 New Revision: 62102 URL: http://svn.reactos.org/svn/reactos?rev=62102&view=rev Log: [ROSAUTOTEST] * Prepare the CMake script for PCH. * Add header guards to the main header. CORE-7716 Modified: trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/rosautotest/precomp.h Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Mon Feb 10 17:05:15 2014 @@ -16,12 +16,13 @@ CWineTest.cpp main.cpp shutdown.cpp - tools.cpp) + tools.cpp + precomp.h) add_executable(rosautotest ${SOURCE}) set_module_type(rosautotest win32cui UNICODE) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) -add_pch(rosautotest precomp.h) +add_pch(rosautotest precomp.h SOURCE) add_cd_file(TARGET rosautotest DESTINATION reactos/system32 FOR all) Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Mon Feb 10 17:05:15 2014 @@ -1,3 +1,6 @@ +#ifndef _ROSAUTOTEST_H_ +#define _ROSAUTOTEST_H_ + /* General includes */ #include <iostream> #include <memory> @@ -57,3 +60,5 @@ string StringOut(const string& String, bool forcePrint = true); string UnicodeToAscii(PCWSTR UnicodeString); string UnicodeToAscii(const wstring& UnicodeString); + +#endif /* _ROSAUTOTEST_H_ */

10 years, 7 months

← Newer
1
...
23
24
25
26
27
28
29
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2014