Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[gadamopoulos] 62081: [filebrowser] - Do not embed a manifest in the resources in order to allow three different scenarios that can be accomplished by using two manifests - In the first scenario we...
by gadamopoulos＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: gadamopoulos Date: Sun Feb 9 21:23:07 2014 New Revision: 62081 URL: http://svn.reactos.org/svn/reactos?rev=62081&view=rev Log: [filebrowser] - Do not embed a manifest in the resources in order to allow three different scenarios that can be accomplished by using two manifests - In the first scenario we have filebrowser.exe + filebrowser.exe.manifest in the same folder. This should work only in windows xp, 2003 and reactos as it depends on the browseui that exists in windows - The second scenario is to have filebrowser.exe + filebrowser.exe.manifest + browseui.dll in the same folder. This should also work in the same platforms as above but the core of the file browser will be used from the supplied browseui. However browseui will also request to instantiate some com objects implemented in browse and as a result some objects will be used from the browseui that exists in windows - The third scenario is to have filebrowser.exe + filebrowser.exe.regfree.manifest + browseui.dll + browseui.sxs.manifest. This scenario should work in windows xp and all later versions. Note that filebrowser.exe.regfree.manifest must be renamed to filebrowser.exe.manifest. In this scenario all the functionality of the file browser window is used from the supplied browseui.dll Added: branches/shell-experiments/base/shell/filebrowser/browseui.sxs.manifest (with props) branches/shell-experiments/base/shell/filebrowser/filebrowser.exe.regfree.manifest (with props) Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.rc Added: branches/shell-experiments/base/shell/filebrowser/browseui.sxs.manifest URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/browseui.sxs.manifest (added) +++ branches/shell-experiments/base/shell/filebrowser/browseui.sxs.manifest [iso-8859-1] Sun Feb 9 21:23:07 2014 @@ -0,0 +1,25 @@ +ï»¿<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + +<assemblyIdentity + type="win32" + name="browseui.sxs" + version="6.0.2900.2180" /> + +<file name="browseui.dll"> + + <comClass clsid="{0BE35200-8F91-11CE-9DE3-00AA004BB851}"/> + <comClass clsid="{00BB2765-6A77-11D0-A535-00C04FD7D062}"/> + <comClass clsid="{01E04581-4EEE-11d0-BFE9-00AA005B4383}"/> + <comClass clsid="{A08C11D2-A228-11d0-825B-00AA005B4383}"/> + <comClass clsid="{F61FFEC1-754F-11d0-80CA-00AA005B4383}"/> + <comClass clsid="{ECD4FC4D-521C-11D0-B792-00A0C90312E1}"/> + <comClass clsid="{ECD4FC4E-521C-11D0-B792-00A0C90312E1}"/> + <comClass clsid="{22BF0C20-6DA7-11D0-B373-00A0C9034938}"/> + <comClass clsid="{AF604EFE-8897-11D1-B944-00A0C90312E1}"/> + <comClass clsid="{EF8AD2D1-AE36-11D1-B2D2-006097DF8C11}"/> + <comClass clsid="{5E6AB780-7743-11CF-A12B-00AA004AE837}"/> + <comClass clsid="{AF4F6510-F982-11d0-8595-00AA004CD6D8}"/> +</file> + +</assembly> Propchange: branches/shell-experiments/base/shell/filebrowser/browseui.sxs.manifest ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/base/shell/filebrowser/filebrowser.exe.regfree.manifest URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.exe.regfree.manifest (added) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.exe.regfree.manifest [iso-8859-1] Sun Feb 9 21:23:07 2014 @@ -0,0 +1,28 @@ +ï»¿<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + +<assemblyIdentity + type="win32" + name="client" + version="1.0.0.0" /> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="browseui.sxs" + version="6.0.2900.2180" /> + </dependentAssembly> + </dependency> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Propchange: branches/shell-experiments/base/shell/filebrowser/filebrowser.exe.regfree.manifest ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.rc [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.rc [iso-8859-1] Sun Feb 9 21:23:07 2014 @@ -7,5 +7,3 @@ #include <reactos/version.rc> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "filebrowser.exe.manifest"

1 0

[ekohl] 62080: [SAMLIB] SamChangePasswordUser: Encrypt the old and the new password hashes before calling the remote function. [SAMSRV] SamrChangePasswordUser: Decrypt the old and the new password ...
by ekohl＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: ekohl Date: Sun Feb 9 20:51:39 2014 New Revision: 62080 URL: http://svn.reactos.org/svn/reactos?rev=62080&view=rev Log: [SAMLIB] SamChangePasswordUser: Encrypt the old and the new password hashes before calling the remote function. [SAMSRV] SamrChangePasswordUser: Decrypt the old and the new password hashes before checking the old password and storing the new password. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sun Feb 9 20:51:39 2014 @@ -45,6 +45,12 @@ SystemFunction007(PUNICODE_STRING string, LPBYTE hash); +NTSTATUS +WINAPI +SystemFunction012(const BYTE *in, + const BYTE *key, + LPBYTE out); + /* GLOBALS *******************************************************************/ @@ -254,6 +260,13 @@ BOOLEAN NewLmPasswordPresent = FALSE; NTSTATUS Status; + 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; + /* Calculate the NT hash for the old password */ Status = SystemFunction007(OldPassword, (LPBYTE)&OldNtPassword); @@ -312,15 +325,57 @@ } } + if (OldLmPasswordPresent && NewLmPasswordPresent) + { + Status = SystemFunction012((const BYTE *)&OldLmPassword, + (const BYTE *)&NewLmPassword, + (LPBYTE)&OldLmEncryptedWithNewLm); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + return Status; + } + + Status = SystemFunction012((const BYTE *)&NewLmPassword, + (const BYTE *)&OldLmPassword, + (LPBYTE)&NewLmEncryptedWithOldLm); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + return Status; + } + + pOldLmEncryptedWithNewLm = &OldLmEncryptedWithNewLm; + pNewLmEncryptedWithOldLm = &NewLmEncryptedWithOldLm; + } + + Status = SystemFunction012((const BYTE *)&OldNtPassword, + (const BYTE *)&NewNtPassword, + (LPBYTE)&OldNtEncryptedWithNewNt); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + return Status; + } + + Status = SystemFunction012((const BYTE *)&NewNtPassword, + (const BYTE *)&OldNtPassword, + (LPBYTE)&NewNtEncryptedWithOldNt); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + return Status; + } + RpcTryExcept { Status = SamrChangePasswordUser((SAMPR_HANDLE)UserHandle, OldLmPasswordPresent && NewLmPasswordPresent, - &OldLmPassword, - &NewLmPassword, + pOldLmEncryptedWithNewLm, + pNewLmEncryptedWithOldLm, TRUE, - &OldNtPassword, - &NewNtPassword, + &OldNtEncryptedWithNewNt, + &NewNtEncryptedWithOldNt, FALSE, NULL, FALSE, Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Feb 9 20:51:39 2014 @@ -8047,10 +8047,10 @@ { ENCRYPTED_LM_OWF_PASSWORD StoredLmPassword; ENCRYPTED_NT_OWF_PASSWORD StoredNtPassword; - PENCRYPTED_LM_OWF_PASSWORD OldLmPassword; - PENCRYPTED_LM_OWF_PASSWORD NewLmPassword; - PENCRYPTED_NT_OWF_PASSWORD OldNtPassword; - PENCRYPTED_NT_OWF_PASSWORD NewNtPassword; + ENCRYPTED_LM_OWF_PASSWORD OldLmPassword; + ENCRYPTED_LM_OWF_PASSWORD NewLmPassword; + ENCRYPTED_NT_OWF_PASSWORD OldNtPassword; + ENCRYPTED_NT_OWF_PASSWORD NewNtPassword; BOOLEAN StoredLmPresent = FALSE; BOOLEAN StoredNtPresent = FALSE; BOOLEAN StoredLmEmpty = TRUE; @@ -8153,21 +8153,62 @@ if (!NT_SUCCESS(Status)) { TRACE("SampGetObjectAttribute failed to retrieve the fixed domain data (Status 0x%08lx)\n", Status); - return Status; + goto done; } if (DomainFixedData.MinPasswordAge.QuadPart > 0) { if (SystemTime.QuadPart < (UserFixedData.PasswordLastSet.QuadPart + DomainFixedData.MinPasswordAge.QuadPart)) - return STATUS_ACCOUNT_RESTRICTION; - } - } - - /* FIXME: Decrypt passwords */ - OldLmPassword = OldLmEncryptedWithNewLm; - NewLmPassword = NewLmEncryptedWithOldLm; - OldNtPassword = OldNtEncryptedWithNewNt; - NewNtPassword = NewNtEncryptedWithOldNt; + { + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } + } + } + + /* Decrypt the LM passwords, if present */ + if (LmPresent) + { + Status = SystemFunction013((const BYTE *)NewLmEncryptedWithOldLm, + (const BYTE *)&StoredLmPassword, + (LPBYTE)&NewLmPassword); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction013 failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = SystemFunction013((const BYTE *)OldLmEncryptedWithNewLm, + (const BYTE *)&NewLmPassword, + (LPBYTE)&OldLmPassword); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction013 failed (Status 0x%08lx)\n", Status); + goto done; + } + } + + /* Decrypt the NT passwords, if present */ + if (NtPresent) + { + Status = SystemFunction013((const BYTE *)NewNtEncryptedWithOldNt, + (const BYTE *)&StoredNtPassword, + (LPBYTE)&NewNtPassword); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction013 failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = SystemFunction013((const BYTE *)OldNtEncryptedWithNewNt, + (const BYTE *)&NewNtPassword, + (LPBYTE)&OldNtPassword); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction013 failed (Status 0x%08lx)\n", Status); + goto done; + } + } /* Check if the old passwords match the stored ones */ if (NtPresent) @@ -8175,7 +8216,7 @@ if (LmPresent) { if (!RtlEqualMemory(&StoredLmPassword, - OldLmPassword, + &OldLmPassword, sizeof(ENCRYPTED_LM_OWF_PASSWORD))) { TRACE("Old LM Password does not match!\n"); @@ -8184,7 +8225,7 @@ else { if (!RtlEqualMemory(&StoredNtPassword, - OldNtPassword, + &OldNtPassword, sizeof(ENCRYPTED_LM_OWF_PASSWORD))) { TRACE("Old NT Password does not match!\n"); @@ -8195,7 +8236,7 @@ else { if (!RtlEqualMemory(&StoredNtPassword, - OldNtPassword, + &OldNtPassword, sizeof(ENCRYPTED_LM_OWF_PASSWORD))) { TRACE("Old NT Password does not match!\n"); @@ -8208,7 +8249,7 @@ if (LmPresent) { if (!RtlEqualMemory(&StoredLmPassword, - OldLmPassword, + &OldLmPassword, sizeof(ENCRYPTED_LM_OWF_PASSWORD))) { TRACE("Old LM Password does not match!\n"); @@ -8225,9 +8266,9 @@ if (NT_SUCCESS(Status)) { Status = SampSetUserPassword(UserObject, - NewNtPassword, + &NewNtPassword, NtPresent, - NewLmPassword, + &NewLmPassword, LmPresent); if (NT_SUCCESS(Status)) { Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun Feb 9 20:51:39 2014 @@ -434,4 +434,10 @@ SystemFunction007(PUNICODE_STRING string, LPBYTE hash); +NTSTATUS +WINAPI +SystemFunction013(const BYTE *in, + const BYTE *key, + LPBYTE out); + #endif /* _SAMSRV_PCH_ */

1 0

[tkreuzer] 62079: [FREELDR] Improve performance of registry enumeration by returning the enumerated subkey in RegEnumKey, instead of searching it by name again.
by tkreuzer＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: tkreuzer Date: Sun Feb 9 18:05:00 2014 New Revision: 62079 URL: http://svn.reactos.org/svn/reactos?rev=62079&view=rev Log: [FREELDR] Improve performance of registry enumeration by returning the enumerated subkey in RegEnumKey, instead of searching it by name again. Modified: trunk/reactos/boot/freeldr/freeldr/include/registry.h trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/include/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/registry.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/registry.h [iso-8859-1] Sun Feb 9 18:05:00 2014 @@ -78,10 +78,12 @@ PCWSTR Name); LONG -RegEnumKey(FRLDRHKEY Key, - ULONG Index, - PWCHAR Name, - ULONG* NameSize); +RegEnumKey( + _In_ FRLDRHKEY Key, + _In_ ULONG Index, + _Out_ PWCHAR Name, + _Inout_ ULONG* NameSize, + _Out_opt_ FRLDRHKEY *SubKey); LONG RegOpenKey(FRLDRHKEY ParentKey, Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c [iso-8859-1] Sun Feb 9 18:05:00 2014 @@ -259,13 +259,13 @@ return NULL; } -// FIXME: optionally return the subkey node/handle as optimization LONG RegEnumKey( _In_ FRLDRHKEY Key, _In_ ULONG Index, _Out_ PWCHAR Name, - _Inout_ ULONG* NameSize) + _Inout_ ULONG* NameSize, + _Out_opt_ FRLDRHKEY *SubKey) { PHHIVE Hive = &CmHive->Hive; PCM_KEY_NODE KeyNode, SubKeyNode; @@ -304,6 +304,11 @@ } *NameSize = CmCopyKeyName(SubKeyNode, Name, *NameSize); + + if (SubKey != NULL) + { + *SubKey = (FRLDRHKEY)SubKeyNode; + } TRACE("RegEnumKey done -> %u, '%.*s'\n", *NameSize, *NameSize, Name); return STATUS_SUCCESS; Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Sun Feb 9 18:05:00 2014 @@ -537,7 +537,7 @@ { /* Get the Driver's Name */ ValueSize = sizeof(ServiceName); - rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize); + rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize, &hDriverKey); TRACE("RegEnumKey(): rc %d\n", (int)rc); /* Make sure it's valid, and check if we're done */ @@ -550,62 +550,58 @@ } //TRACE_CH(REACTOS, "Service %d: '%S'\n", (int)Index, ServiceName); - /* open driver Key */ - rc = RegOpenKey(hServiceKey, ServiceName, &hDriverKey); - if (rc == ERROR_SUCCESS) + /* Read the Start Value */ + ValueSize = sizeof(ULONG); + rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); + if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; + //TRACE_CH(REACTOS, " Start: %x \n", (int)StartValue); + + /* Read the Tag */ + ValueSize = sizeof(ULONG); + rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); + if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; + //TRACE_CH(REACTOS, " Tag: %x \n", (int)TagValue); + + /* Read the driver's group */ + DriverGroupSize = sizeof(DriverGroup); + rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); + //TRACE_CH(REACTOS, " Group: '%S' \n", DriverGroup); + + /* Make sure it should be started */ + if ((StartValue == 0) && + (TagValue == OrderList[TagIndex]) && + (_wcsicmp(DriverGroup, GroupName) == 0)) { + + /* Get the Driver's Location */ + ValueSize = sizeof(TempImagePath); + rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); + + /* Write the whole path if it suceeded, else prepare to fail */ + if (rc != ERROR_SUCCESS) { + TRACE_CH(REACTOS, "ImagePath: not found\n"); + TempImagePath[0] = 0; + sprintf(ImagePath, "%s\\system32\\drivers\\%S.sys", DirectoryPath, ServiceName); + } else if (TempImagePath[0] != L'\\') { + sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath); + } else { + sprintf(ImagePath, "%S", TempImagePath); + TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath); + } + + TRACE("Adding boot driver: '%s'\n", ImagePath); + + Status = WinLdrAddDriverToList(BootDriverListHead, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", + TempImagePath, + ServiceName); + + if (!Status) + ERR("Failed to add boot driver\n"); + } + else { - /* Read the Start Value */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); - if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Start: %x \n", (int)StartValue); - - /* Read the Tag */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); - if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Tag: %x \n", (int)TagValue); - - /* Read the driver's group */ - DriverGroupSize = sizeof(DriverGroup); - rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); - //TRACE_CH(REACTOS, " Group: '%S' \n", DriverGroup); - - /* Make sure it should be started */ - if ((StartValue == 0) && - (TagValue == OrderList[TagIndex]) && - (_wcsicmp(DriverGroup, GroupName) == 0)) { - - /* Get the Driver's Location */ - ValueSize = sizeof(TempImagePath); - rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); - - /* Write the whole path if it suceeded, else prepare to fail */ - if (rc != ERROR_SUCCESS) { - TRACE_CH(REACTOS, "ImagePath: not found\n"); - TempImagePath[0] = 0; - sprintf(ImagePath, "%s\\system32\\drivers\\%S.sys", DirectoryPath, ServiceName); - } else if (TempImagePath[0] != L'\\') { - sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath); - } else { - sprintf(ImagePath, "%S", TempImagePath); - TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath); - } - - TRACE("Adding boot driver: '%s'\n", ImagePath); - - Status = WinLdrAddDriverToList(BootDriverListHead, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - TempImagePath, - ServiceName); - - if (!Status) - ERR("Failed to add boot driver\n"); - } else - { - //TRACE(" Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current Tag %d, current group '%S')\n", - // ServiceName, StartValue, TagValue, DriverGroup, OrderList[TagIndex], GroupName); - } + //TRACE(" Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current Tag %d, current group '%S')\n", + // ServiceName, StartValue, TagValue, DriverGroup, OrderList[TagIndex], GroupName); } Index++; @@ -617,7 +613,7 @@ { /* Get the Driver's Name */ ValueSize = sizeof(ServiceName); - rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize); + rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize, &hDriverKey); //TRACE_CH(REACTOS, "RegEnumKey(): rc %d\n", (int)rc); if (rc == ERROR_NO_MORE_ITEMS) @@ -629,61 +625,57 @@ } TRACE("Service %d: '%S'\n", (int)Index, ServiceName); - /* open driver Key */ - rc = RegOpenKey(hServiceKey, ServiceName, &hDriverKey); - if (rc == ERROR_SUCCESS) + /* Read the Start Value */ + ValueSize = sizeof(ULONG); + rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); + if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; + //TRACE_CH(REACTOS, " Start: %x \n", (int)StartValue); + + /* Read the Tag */ + ValueSize = sizeof(ULONG); + rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); + if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; + //TRACE_CH(REACTOS, " Tag: %x \n", (int)TagValue); + + /* Read the driver's group */ + DriverGroupSize = sizeof(DriverGroup); + rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); + //TRACE_CH(REACTOS, " Group: '%S' \n", DriverGroup); + + for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) { + if (TagValue == OrderList[TagIndex]) break; + } + + if ((StartValue == 0) && + (TagIndex > OrderList[0]) && + (_wcsicmp(DriverGroup, GroupName) == 0)) { + + ValueSize = sizeof(TempImagePath); + rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); + if (rc != ERROR_SUCCESS) { + TRACE_CH(REACTOS, "ImagePath: not found\n"); + TempImagePath[0] = 0; + sprintf(ImagePath, "%ssystem32\\drivers\\%S.sys", DirectoryPath, ServiceName); + } else if (TempImagePath[0] != L'\\') { + sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath); + } else { + sprintf(ImagePath, "%S", TempImagePath); + TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath); + } + TRACE(" Adding boot driver: '%s'\n", ImagePath); + + Status = WinLdrAddDriverToList(BootDriverListHead, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", + TempImagePath, + ServiceName); + + if (!Status) + ERR(" Failed to add boot driver\n"); + } + else { - /* Read the Start Value */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); - if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Start: %x \n", (int)StartValue); - - /* Read the Tag */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); - if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Tag: %x \n", (int)TagValue); - - /* Read the driver's group */ - DriverGroupSize = sizeof(DriverGroup); - rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); - //TRACE_CH(REACTOS, " Group: '%S' \n", DriverGroup); - - for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) { - if (TagValue == OrderList[TagIndex]) break; - } - - if ((StartValue == 0) && - (TagIndex > OrderList[0]) && - (_wcsicmp(DriverGroup, GroupName) == 0)) { - - ValueSize = sizeof(TempImagePath); - rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); - if (rc != ERROR_SUCCESS) { - TRACE_CH(REACTOS, "ImagePath: not found\n"); - TempImagePath[0] = 0; - sprintf(ImagePath, "%ssystem32\\drivers\\%S.sys", DirectoryPath, ServiceName); - } else if (TempImagePath[0] != L'\\') { - sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath); - } else { - sprintf(ImagePath, "%S", TempImagePath); - TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath); - } - TRACE(" Adding boot driver: '%s'\n", ImagePath); - - Status = WinLdrAddDriverToList(BootDriverListHead, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - TempImagePath, - ServiceName); - - if (!Status) - ERR(" Failed to add boot driver\n"); - } else - { - //TRACE(" Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current group '%S')\n", - // ServiceName, StartValue, TagValue, DriverGroup, GroupName); - } + //TRACE(" Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current group '%S')\n", + // ServiceName, StartValue, TagValue, DriverGroup, GroupName); } Index++;

1 0

[aandrejevic] 62078: [BASESRV] Add an (incomplete) definition for VDM console records and VDM DOS records. Implement BaseSrvIsFirstVDM. Start implementing BaseSrvCheckVDM.
by aandrejevic＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: aandrejevic Date: Sun Feb 9 17:37:35 2014 New Revision: 62078 URL: http://svn.reactos.org/svn/reactos?rev=62078&view=rev Log: [BASESRV] Add an (incomplete) definition for VDM console records and VDM DOS records. Implement BaseSrvIsFirstVDM. Start implementing BaseSrvCheckVDM. Added: branches/ntvdm/subsystems/win/basesrv/vdm.h (with props) Modified: branches/ntvdm/subsystems/win/basesrv/init.c branches/ntvdm/subsystems/win/basesrv/vdm.c Modified: branches/ntvdm/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/in… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/init.c [iso-8859-1] Sun Feb 9 17:37:35 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include "basesrv.h" +#include "vdm.h" #include <winreg.h> @@ -591,6 +592,9 @@ /* Initialize DOS devices management */ BaseInitDefineDosDevice(); + /* Initialize VDM support */ + BaseInitializeVDM(); + /* All done */ return STATUS_SUCCESS; } Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Sun Feb 9 17:37:35 2014 @@ -4,20 +4,90 @@ * FILE: subsystems/win/basesrv/vdm.c * PURPOSE: Virtual DOS Machines (VDM) Support * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ /* INCLUDES *******************************************************************/ #include "basesrv.h" +#include "vdm.h" #define NDEBUG #include <debug.h> + +/* GLOBALS ********************************************************************/ + +BOOLEAN FirstVDM = TRUE; +LIST_ENTRY VDMConsoleListHead; +RTL_CRITICAL_SECTION DosCriticalSection; + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS NTAPI BaseSrvGetConsoleRecord(HANDLE ConsoleHandle, PVDM_CONSOLE_RECORD *Record) +{ + PLIST_ENTRY i; + PVDM_CONSOLE_RECORD CurrentRecord = NULL; + + /* Search for a record that has the same console handle */ + for (i = VDMConsoleListHead.Flink; i != &VDMConsoleListHead; i = i->Flink) + { + CurrentRecord = CONTAINING_RECORD(i, VDM_CONSOLE_RECORD, Entry); + if (CurrentRecord->ConsoleHandle == ConsoleHandle) break; + } + + *Record = CurrentRecord; + return CurrentRecord ? STATUS_SUCCESS : STATUS_NOT_FOUND; +} + +VOID NTAPI BaseInitializeVDM(VOID) +{ + /* Initialize the list head */ + InitializeListHead(&VDMConsoleListHead); + + /* Initialize the critical section */ + RtlInitializeCriticalSection(&DosCriticalSection); +} /* PUBLIC SERVER APIS *********************************************************/ CSR_API(BaseSrvCheckVDM) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); + PBASE_CHECK_VDM CheckVdmRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.CheckVDMRequest; + + /* Validate the message buffers */ + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&CheckVdmRequest->CmdLine, + CheckVdmRequest->CmdLen, + sizeof(*CheckVdmRequest->CmdLine)) + || !CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&CheckVdmRequest->AppName, + CheckVdmRequest->AppLen, + sizeof(*CheckVdmRequest->AppName)) + || !CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&CheckVdmRequest->PifFile, + CheckVdmRequest->PifLen, + sizeof(*CheckVdmRequest->PifFile)) + || !CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&CheckVdmRequest->CurDirectory, + CheckVdmRequest->CurDirectoryLen, + sizeof(*CheckVdmRequest->CurDirectory)) + || !CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&CheckVdmRequest->Desktop, + CheckVdmRequest->DesktopLen, + sizeof(*CheckVdmRequest->Desktop)) + || !CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&CheckVdmRequest->Title, + CheckVdmRequest->TitleLen, + sizeof(*CheckVdmRequest->Title)) + || !CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&CheckVdmRequest->Reserved, + CheckVdmRequest->ReservedLen, + sizeof(*CheckVdmRequest->Reserved))) + { + return STATUS_INVALID_PARAMETER; + } + + // TODO: NOT IMPLEMENTED return STATUS_NOT_IMPLEMENTED; } @@ -41,8 +111,15 @@ CSR_API(BaseSrvIsFirstVDM) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + PBASE_IS_FIRST_VDM IsFirstVDMRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.IsFirstVDMRequest; + + /* Return the result */ + IsFirstVDMRequest->FirstVDM = FirstVDM; + + /* Clear the first VDM flag */ + FirstVDM = FALSE; + + return STATUS_SUCCESS; } CSR_API(BaseSrvGetVDMExitCode) Added: branches/ntvdm/subsystems/win/basesrv/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.h (added) +++ branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] Sun Feb 9 17:37:35 2014 @@ -0,0 +1,33 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Base API Server DLL + * FILE: subsystems/win/basesrv/vdm.h + * PURPOSE: VDM Definitions + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef __VDM_H__ +#define __VDM_H__ + +/* DEFINITIONS ****************************************************************/ + +typedef struct _VDM_CONSOLE_RECORD +{ + LIST_ENTRY Entry; + HANDLE ConsoleHandle; + LIST_ENTRY DosListHead; + // TODO: Structure incomplete!!! +} VDM_CONSOLE_RECORD, *PVDM_CONSOLE_RECORD; + +typedef struct _VDM_DOS_RECORD +{ + LIST_ENTRY Entry; + // TODO: Structure incomplete!!! +} VDM_DOS_RECORD, *PVDM_DOS_RECORD; + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS NTAPI BaseSrvGetConsoleRecord(HANDLE ConsoleHandle, PVDM_CONSOLE_RECORD *Record); +VOID NTAPI BaseInitializeVDM(VOID); + +#endif // __VDM_H__ Propchange: branches/ntvdm/subsystems/win/basesrv/vdm.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 62077: [DRIVERS] * Prepare the CMake scripts for PCH. CORE-7716
by akhaldi＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: akhaldi Date: Sun Feb 9 17:28:01 2014 New Revision: 62077 URL: http://svn.reactos.org/svn/reactos?rev=62077&view=rev Log: [DRIVERS] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/drivers/base/bootvid/CMakeLists.txt trunk/reactos/drivers/base/condrv/CMakeLists.txt trunk/reactos/drivers/base/kdcom/CMakeLists.txt trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt trunk/reactos/drivers/bus/isapnp/CMakeLists.txt trunk/reactos/drivers/bus/pci/CMakeLists.txt trunk/reactos/drivers/bus/pcix/CMakeLists.txt trunk/reactos/drivers/bus/pcmcia/CMakeLists.txt trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt trunk/reactos/drivers/filesystems/fastfat/CMakeLists.txt trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt trunk/reactos/drivers/filesystems/mup/CMakeLists.txt trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt trunk/reactos/drivers/hid/hidclass/CMakeLists.txt trunk/reactos/drivers/input/i8042prt/CMakeLists.txt trunk/reactos/drivers/input/kbdclass/CMakeLists.txt trunk/reactos/drivers/input/mouclass/CMakeLists.txt trunk/reactos/drivers/input/sermouse/CMakeLists.txt trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt trunk/reactos/drivers/network/afd/CMakeLists.txt trunk/reactos/drivers/network/dd/ne2000/CMakeLists.txt trunk/reactos/drivers/network/dd/pcnet/CMakeLists.txt trunk/reactos/drivers/network/dd/rtl8139/CMakeLists.txt trunk/reactos/drivers/network/ndis/CMakeLists.txt trunk/reactos/drivers/network/ndisuio/CMakeLists.txt trunk/reactos/drivers/network/tcpip/CMakeLists.txt trunk/reactos/drivers/network/tdi/CMakeLists.txt trunk/reactos/drivers/sac/driver/CMakeLists.txt trunk/reactos/drivers/serial/serenum/CMakeLists.txt trunk/reactos/drivers/serial/serial/CMakeLists.txt trunk/reactos/drivers/setup/blue/CMakeLists.txt trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt trunk/reactos/drivers/storage/classpnp/CMakeLists.txt trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt trunk/reactos/drivers/storage/floppy/CMakeLists.txt trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt trunk/reactos/drivers/storage/scsiport/CMakeLists.txt trunk/reactos/drivers/usb/usbccgp/CMakeLists.txt trunk/reactos/drivers/usb/usbehci/CMakeLists.txt trunk/reactos/drivers/usb/usbhub/CMakeLists.txt trunk/reactos/drivers/usb/usbohci/CMakeLists.txt trunk/reactos/drivers/usb/usbstor/CMakeLists.txt trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt trunk/reactos/drivers/wdm/audio/filters/kmixer/CMakeLists.txt trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt trunk/reactos/drivers/wdm/audio/sysaudio/CMakeLists.txt Modified: trunk/reactos/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/CMake… ============================================================================== --- trunk/reactos/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,29 +1,30 @@ spec2def(bootvid.dll bootvid.spec ADD_IMPORTLIB) -list(APPEND SOURCE +if((ARCH STREQUAL "i386") OR (ARCH STREQUAL "amd64")) + list(APPEND SOURCE + i386/bootvid.c + i386/bootdata.c + i386/vga.c) +elseif(ARCH STREQUAL "arm") + list(APPEND SOURCE + arm/bootvid.c + arm/bootdata.c) +endif() + +list(APPEND SOURCE precomp.h) + +add_library(bootvid SHARED + ${SOURCE} bootvid.rc ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def) - -if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") -list(APPEND SOURCE - i386/bootvid.c - i386/bootdata.c - i386/vga.c) -elseif(ARCH STREQUAL "arm") -list(APPEND SOURCE - arm/bootvid.c - arm/bootdata.c) -endif(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") - -add_library(bootvid SHARED ${SOURCE}) set_entrypoint(bootvid 0) set_subsystem(bootvid native) set_image_base(bootvid 0x00010000) add_importlibs(bootvid ntoskrnl hal) -add_pch(bootvid precomp.h) +add_pch(bootvid precomp.h SOURCE) add_dependencies(bootvid psdk bugcodes) add_cd_file(TARGET bootvid DESTINATION reactos/system32 NO_CAB FOR all) Modified: trunk/reactos/drivers/base/condrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/CMakeL… ============================================================================== --- trunk/reactos/drivers/base/condrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/condrv/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -3,13 +3,17 @@ ## spec2def(condrv.sys condrv.spec ADD_IMPORTLIB) -add_library(condrv SHARED +list(APPEND SOURCE condrv.c control.c + condrv.h) + +add_library(condrv SHARED + ${SOURCE} condrv.rc) # ${CMAKE_CURRENT_BINARY_DIR}/condrv.def) -add_pch(condrv condrv.h) +add_pch(condrv condrv.h SOURCE) set_module_type(condrv kernelmodedriver) target_link_libraries(condrv ${PSEH_LIB}) Modified: trunk/reactos/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/CMakeLi… ============================================================================== --- trunk/reactos/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,10 +1,14 @@ spec2def(kdcom.dll kdcom.spec ADD_IMPORTLIB) -add_library(kdcom SHARED +list(APPEND SOURCE kdcom.c kddll.c kdserial.c + kddll.h) + +add_library(kdcom SHARED + ${SOURCE} kdcom.rc ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) @@ -15,5 +19,5 @@ add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) add_dependencies(kdcom psdk bugcodes) - +add_pch(kdcom kddll.h SOURCE) add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all) Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -7,7 +7,7 @@ add_definitions(-DWIN64) endif() -add_library(acpica +list(APPEND ACPICA_SOURCE acpica/dispatcher/dsargs.c acpica/dispatcher/dscontrol.c acpica/dispatcher/dsfield.c @@ -122,7 +122,6 @@ acpica/utilities/utdecode.c acpica/utilities/utdelete.c acpica/utilities/uteval.c - acpica/utilities/utglobal.c acpica/utilities/utids.c acpica/utilities/utinit.c acpica/utilities/utlock.c @@ -135,12 +134,18 @@ acpica/utilities/utstate.c acpica/utilities/uttrack.c acpica/utilities/utxface.c - acpica/utilities/utxferror.c) + acpica/utilities/utxferror.c + acpica/include/acpi.h) +add_library(acpica + ${ACPICA_SOURCE} + acpica/utilities/utglobal.c) + +add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE) set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE") add_dependencies(acpica bugcodes) -add_library(acpi SHARED +list(APPEND ACPI_SOURCE busmgr/bus.c busmgr/button.c busmgr/power.c @@ -153,11 +158,14 @@ pnp.c power.c buspdo.c - main.c) + main.c + precomp.h) +add_library(acpi SHARED ${ACPI_SOURCE}) set_module_type(acpi kernelmodedriver) target_link_libraries(acpi wdmguid acpica ${PSEH_LIB}) add_importlibs(acpi ntoskrnl hal) +add_pch(acpi precomp.h ACPI_SOURCE) add_cd_file(TARGET acpi DESTINATION reactos/system32/drivers NO_CAB FOR all) add_subdirectory(cmbatt) Modified: trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/CM… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -4,15 +4,17 @@ cmexec.c cmbpnp.c cmbwmi.c + cmbatt.h) + +add_library(cmbatt SHARED + ${SOURCE} guid.c cmbatt.rc) - -add_library(cmbatt SHARED ${SOURCE}) set_module_type(cmbatt kernelmodedriver) add_importlibs(cmbatt ntoskrnl hal battc wmilib) -add_pch(cmbatt cmbatt.h) +add_pch(cmbatt cmbatt.h SOURCE) add_cd_file(TARGET cmbatt DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -3,14 +3,16 @@ compbatt.c compmisc.c comppnp.c + compbatt.h) + +add_library(compbatt SHARED + ${SOURCE} guid.c compbatt.rc) - -add_library(compbatt SHARED ${SOURCE}) set_module_type(compbatt kernelmodedriver) add_importlibs(compbatt ntoskrnl hal battc) -add_pch(compbatt compbatt.h) +add_pch(compbatt compbatt.h SOURCE) add_cd_file(TARGET compbatt DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/bus/isapnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/CMakeLi… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,12 +1,13 @@ -add_library(isapnp SHARED +list(APPEND SOURCE isapnp.c pdo.c fdo.c hardware.c - isapnp.rc) + isapnp.h) +add_library(isapnp SHARED ${SOURCE} isapnp.rc) set_module_type(isapnp kernelmodedriver) add_importlibs(isapnp ntoskrnl hal) -add_pch(isapnp isapnp.h) +add_pch(isapnp isapnp.h SOURCE) add_cd_file(TARGET isapnp DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/bus/pci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/CMakeLists… ============================================================================== --- trunk/reactos/drivers/bus/pci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,11 +1,12 @@ -add_library(pci SHARED +list(APPEND SOURCE fdo.c pci.c pdo.c - pci.rc) + pci.h) +add_library(pci SHARED ${SOURCE} pci.rc) set_module_type(pci kernelmodedriver) add_importlibs(pci ntoskrnl hal) -add_pch(pci pci.h) +add_pch(pci pci.h SOURCE) add_cd_file(TARGET pci DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/bus/pcix/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -26,7 +26,6 @@ dispatch.c enum.c fdo.c - guid.c hookhal.c init.c pcivrify.c @@ -34,14 +33,17 @@ power.c usage.c utils.c + pci.h) + +add_library(pcix SHARED + ${SOURCE} + guid.c pci.rc) - -add_library(pcix SHARED ${SOURCE}) set_module_type(pcix kernelmodedriver) add_importlibs(pcix ntoskrnl hal) -add_pch(pcix pci.h) +add_pch(pcix pci.h SOURCE) add_dependencies(pcix pciclass) add_cd_file(TARGET pcix DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/bus/pcmcia/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/CMakeLi… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,11 +1,12 @@ -add_library(pcmcia SHARED +list(APPEND SOURCE fdo.c pcmcia.c pdo.c - pcmcia.rc) + pcmcia.h) +add_library(pcmcia SHARED ${SOURCE} pcmcia.rc) set_module_type(pcmcia kernelmodedriver) -add_pch(pcmcia pcmcia.h) +add_pch(pcmcia pcmcia.h SOURCE) add_importlibs(pcmcia ntoskrnl hal) add_cd_file(TARGET pcmcia DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -15,13 +15,13 @@ misc.c rw.c volinfo.c - cdfs.rc) + cdfs.h) -add_library(cdfs SHARED ${SOURCE}) +add_library(cdfs SHARED ${SOURCE} cdfs.rc) set_module_type(cdfs kernelmodedriver) add_importlibs(cdfs ntoskrnl hal) -add_pch(cdfs cdfs.h) +add_pch(cdfs cdfs.h SOURCE) add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/C… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -19,8 +19,9 @@ src/read.c src/cleanup.c src/misc.c - src/shutdown.c) - + src/shutdown.c + inc/ext2fsd.h) + add_library(ext2fs SHARED ${SOURCE}) if(NOT MSVC) @@ -29,7 +30,7 @@ allow_warnings(ext2fs) target_link_libraries(ext2fs ${PSEH_LIB}) -add_pch(ext2fs inc/ext2fsd.h) +add_pch(ext2fs inc/ext2fsd.h SOURCE) set_module_type(ext2fs kernelmodedriver) add_importlibs(ext2fs ntoskrnl hal) add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/filesystems/fastfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -21,13 +21,13 @@ shutdown.c string.c volume.c - vfatfs.rc) + vfat.h) -add_library(fastfat SHARED ${SOURCE}) +add_library(fastfat SHARED ${SOURCE} vfatfs.rc) set_module_type(fastfat kernelmodedriver) add_importlibs(fastfat ntoskrnl hal) -add_pch(fastfat vfat.h) +add_pch(fastfat vfat.h SOURCE) add_cd_file(TARGET fastfat DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,5 +1,5 @@ -add_library(fs_rec SHARED +list(APPEND SOURCE blockdev.c cdfs.c ext2.c @@ -7,9 +7,10 @@ fs_rec.c ntfs.c udfs.c - fs_rec.rc) + fs_rec.h) +add_library(fs_rec SHARED ${SOURCE} fs_rec.rc) set_module_type(fs_rec kernelmodedriver) add_importlibs(fs_rec ntoskrnl hal) -add_pch(fs_rec fs_rec.h) +add_pch(fs_rec fs_rec.h SOURCE) add_cd_file(TARGET fs_rec DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -5,13 +5,13 @@ fsctrl.c msfs.c rw.c - msfs.rc) + msfs.h) -add_library(msfs SHARED ${SOURCE}) +add_library(msfs SHARED ${SOURCE} msfs.rc) set_module_type(msfs kernelmodedriver) add_importlibs(msfs ntoskrnl hal) -add_pch(msfs msfs.h) +add_pch(msfs msfs.h SOURCE) add_cd_file(TARGET msfs DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/filesystems/mup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/CM… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,10 +1,11 @@ -add_library(mup SHARED +list(APPEND SOURCE create.c mup.c - mup.rc) + mup.h) +add_library(mup SHARED ${SOURCE} mup.rc) set_module_type(mup kernelmodedriver) add_importlibs(mup ntoskrnl hal) -add_pch(mup mup.h) +add_pch(mup mup.h SOURCE) add_cd_file(TARGET mup DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -19,11 +19,12 @@ volinfo.c waitsup.c write.c - writesup.c) + writesup.c + npfs.h) add_library(npfs SHARED ${SOURCE}) set_module_type(npfs kernelmodedriver) target_link_libraries(npfs ${PSEH_LIB}) add_importlibs(npfs ntoskrnl hal) -add_pch(npfs npfs.h) +add_pch(npfs npfs.h SOURCE) add_cd_file(TARGET npfs DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -15,13 +15,13 @@ ntfs.c rw.c volinfo.c - ntfs.rc) + ntfs.h) -add_library(ntfs SHARED ${SOURCE}) +add_library(ntfs SHARED ${SOURCE} ntfs.rc) set_module_type(ntfs kernelmodedriver) add_importlibs(ntfs ntoskrnl hal) -add_pch(ntfs ntfs.h) +add_pch(ntfs ntfs.h SOURCE) add_cd_file(TARGET ntfs DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/C… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -7,12 +7,12 @@ point.c symlink.c uniqueid.c - mountmgr.rc) + mntmgr.h) -add_library(mountmgr SHARED ${SOURCE}) +add_library(mountmgr SHARED ${SOURCE} mountmgr.rc) target_link_libraries(mountmgr wdmguid ioevent) set_module_type(mountmgr kernelmodedriver) add_importlibs(mountmgr ntoskrnl hal) -add_pch(mountmgr mntmgr.h) +add_pch(mountmgr mntmgr.h SOURCE) add_cd_file(TARGET mountmgr DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/CMake… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -4,12 +4,14 @@ list(APPEND SOURCE fdo.c hidclass.c + pdo.c + precomp.h) + +add_library(hidclass SHARED + ${SOURCE} + guid.c hidclass.rc - pdo.c - guid.c ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) - -add_library(hidclass SHARED ${SOURCE}) set_entrypoint(hidclass 0) set_subsystem(hidclass native) @@ -18,5 +20,5 @@ add_importlibs(hidclass ntoskrnl hidparse hal) add_dependencies(hidclass bugcodes) - +add_pch(hidclass precomp.h SOURCE) add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/input/i8042prt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/CMa… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,5 +1,5 @@ -add_library(i8042prt SHARED +list(APPEND SOURCE createclose.c i8042prt.c keyboard.c @@ -9,10 +9,14 @@ ps2pp.c readwrite.c registry.c + i8042prt.h) + +add_library(i8042prt SHARED + ${SOURCE} guid.c i8042prt.rc) set_module_type(i8042prt kernelmodedriver) add_importlibs(i8042prt ntoskrnl hal) -add_pch(i8042prt i8042prt.h) +add_pch(i8042prt i8042prt.h SOURCE) add_cd_file(TARGET i8042prt DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/CMa… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,12 +1,16 @@ + +list(APPEND SOURCE + kbdclass.c + misc.c + kbdclass.h) add_library(kbdclass SHARED - kbdclass.c - misc.c + ${SOURCE} guid.c kbdclass.rc) set_module_type(kbdclass kernelmodedriver) -add_pch(kbdclass kbdclass.h) +add_pch(kbdclass kbdclass.h SOURCE) target_link_libraries(kbdclass ${PSEH_LIB}) add_importlibs(kbdclass ntoskrnl hal) add_cd_file(TARGET kbdclass DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/input/mouclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/CMa… ============================================================================== --- trunk/reactos/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,12 +1,16 @@ + +list(APPEND SOURCE + misc.c + mouclass.c + mouclass.h) add_library(mouclass SHARED - misc.c - mouclass.c + ${SOURCE} guid.c mouclass.rc) set_module_type(mouclass kernelmodedriver) -add_pch(mouclass mouclass.h) target_link_libraries(mouclass ${PSEH_LIB}) add_importlibs(mouclass ntoskrnl hal) +add_pch(mouclass mouclass.h SOURCE) add_cd_file(TARGET mouclass DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/input/sermouse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/CMa… ============================================================================== --- trunk/reactos/drivers/input/sermouse/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,5 +1,5 @@ -add_library(sermouse SHARED +list(APPEND SOURCE createclose.c detect.c fdo.c @@ -7,9 +7,10 @@ misc.c readmouse.c sermouse.c - sermouse.rc) + sermouse.h) +add_library(sermouse SHARED ${SOURCE} sermouse.rc) set_module_type(sermouse kernelmodedriver) -add_pch(sermouse sermouse.h) +add_pch(sermouse sermouse.h SOURCE) add_importlibs(sermouse ntoskrnl hal) add_cd_file(TARGET sermouse DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/CMakeL… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -28,14 +28,17 @@ worker.c kcom.c swenum.c - ks.rc - ${CMAKE_CURRENT_BINARY_DIR}/ks.def) + precomp.h) if(MSVC) add_asm_files(ks_asm msvc.S) endif() -add_library(ks SHARED ${SOURCE} ${ks_asm}) +add_library(ks SHARED + ${SOURCE} + ${ks_asm} + ks.rc + ${CMAKE_CURRENT_BINARY_DIR}/ks.def) set_target_properties(ks PROPERTIES SUFFIX ".sys") @@ -44,7 +47,7 @@ set_image_base(ks 0x00010000) target_link_libraries(ks ${PSEH_LIB}) -add_pch(ks priv.h) +add_pch(ks precomp.h SOURCE) add_importlibs(ks ntoskrnl hal) add_dependencies(ks psdk bugcodes) add_cd_file(TARGET ks DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/network/afd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/CMakeL… ============================================================================== --- trunk/reactos/drivers/network/afd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -16,12 +16,12 @@ afd/tdi.c afd/tdiconn.c afd/write.c - afd.rc) + include/afd.h) -add_library(afd SHARED ${SOURCE}) +add_library(afd SHARED ${SOURCE} afd.rc) target_link_libraries(afd ${PSEH_LIB}) set_module_type(afd kernelmodedriver) add_importlibs(afd ntoskrnl hal) -add_pch(afd include/afd.h) +add_pch(afd include/afd.h SOURCE) add_cd_file(TARGET afd DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/network/dd/ne2000/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -4,10 +4,10 @@ list(APPEND SOURCE ne2000/8390.c ne2000/main.c - ne2000.rc) + include/ne2000.h) -add_library(ne2000 SHARED ${SOURCE}) -add_pch(ne2000 include/ne2000.h) +add_library(ne2000 SHARED ${SOURCE} ne2000.rc) +add_pch(ne2000 include/ne2000.h SOURCE) set_module_type(ne2000 kernelmodedriver) add_importlibs(ne2000 ndis ntoskrnl hal) add_cd_file(TARGET ne2000 DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/network/dd/pcnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/C… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -8,10 +8,10 @@ list(APPEND SOURCE pcnet.c requests.c - pcnet.rc) + pcnet.h) -add_library(pcnet SHARED ${SOURCE}) -add_pch(pcnet pcnet.h) +add_library(pcnet SHARED ${SOURCE} pcnet.rc) +add_pch(pcnet pcnet.h SOURCE) set_module_type(pcnet kernelmodedriver) add_importlibs(pcnet ndis ntoskrnl hal) add_cd_file(TARGET pcnet DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/network/dd/rtl8139/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/rtl8139… ============================================================================== --- trunk/reactos/drivers/network/dd/rtl8139/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/rtl8139/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -9,10 +9,10 @@ hardware.c info.c interrupt.c - rtl8139.rc) + nic.h) -add_library(rtl8139 SHARED ${SOURCE}) -add_pch(rtl8139 nic.h) +add_library(rtl8139 SHARED ${SOURCE} rtl8139.rc) +add_pch(rtl8139 nic.h SOURCE) set_module_type(rtl8139 kernelmodedriver) add_importlibs(rtl8139 ndis ntoskrnl hal) add_cd_file(TARGET rtl8139 DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/network/ndis/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/CMake… ============================================================================== --- trunk/reactos/drivers/network/ndis/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -32,15 +32,17 @@ ndis/protocol.c ndis/string.c ndis/time.c + include/ndissys.h) + +add_library(ndis SHARED + ${SOURCE} ndis.rc ${CMAKE_CURRENT_BINARY_DIR}/ndis.def) - -add_library(ndis SHARED ${SOURCE}) set_module_type(ndis kernelmodedriver) add_importlibs(ndis ntoskrnl hal) -add_pch(ndis include/ndissys.h) +add_pch(ndis include/ndissys.h SOURCE) add_cd_file(TARGET ndis DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/network/ndisuio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndisuio/CM… ============================================================================== --- trunk/reactos/drivers/network/ndisuio/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndisuio/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -7,19 +7,16 @@ ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio) list(APPEND SOURCE - createclose.c - ioctl.c - main.c - misc.c - protocol.c - readwrite.c - ndisuio.rc) + createclose.c + ioctl.c + main.c + misc.c + protocol.c + readwrite.c + ndisuio.h) -add_library(ndisuio SHARED ${SOURCE}) - +add_library(ndisuio SHARED ${SOURCE} ndisuio.rc) set_module_type(ndisuio kernelmodedriver) add_importlibs(ndisuio ndis ntoskrnl hal) - -add_pch(ndisuio ndisuio.h) - +add_pch(ndisuio ndisuio.h SOURCE) add_cd_file(TARGET ndisuio DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/network/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/CMak… ============================================================================== --- trunk/reactos/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -24,10 +24,12 @@ tcpip/proto.c tcpip/tinfo.c tcpip/wait.c + include/precomp.h) + +add_library(tcpip SHARED + ${SOURCE} tcpip.rc ${CMAKE_CURRENT_BINARY_DIR}/tcpip.def) - -add_library(tcpip SHARED ${SOURCE}) target_link_libraries(tcpip ip @@ -38,6 +40,6 @@ set_module_type(tcpip kernelmodedriver) add_importlibs(tcpip ndis ntoskrnl hal) -add_pch(tcpip include/precomp.h) +add_pch(tcpip include/precomp.h SOURCE) add_cd_file(TARGET tcpip DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/network/tdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/CMakeL… ============================================================================== --- trunk/reactos/drivers/network/tdi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -15,15 +15,18 @@ cte/string.c cte/timer.c misc/main.c - misc/tdi.rc tdi/dereg.c tdi/handler.c tdi/obsolete.c tdi/stubs.c + precomp.h) + +add_library(tdi SHARED + ${SOURCE} + misc/tdi.rc ${CMAKE_CURRENT_BINARY_DIR}/tdi.def) -add_library(tdi SHARED ${SOURCE}) -add_pch(tdi precomp.h) +add_pch(tdi precomp.h SOURCE) set_module_type(tdi kernelmodedriver) add_importlibs(tdi ntoskrnl hal) add_cd_file(TARGET tdi DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/sac/driver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/CMakeLi… ============================================================================== --- trunk/reactos/drivers/sac/driver/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -2,21 +2,23 @@ include_directories(${REACTOS_SOURCE_DIR}) list(APPEND SOURCE - chanmgr.c - channel.c - cmdchan.c - concmd.c - conmgr.c - data.c - dispatch.c - init.c - memory.c - rawchan.c - util.c - vtutf8chan.c) + chanmgr.c + channel.c + cmdchan.c + concmd.c + conmgr.c + data.c + dispatch.c + init.c + memory.c + rawchan.c + util.c + vtutf8chan.c + sacdrv.h) add_library(sacdrv SHARED ${SOURCE} sacdrv.rc) set_module_type(sacdrv kernelmodedriver) add_importlibs(sacdrv ntoskrnl hal) add_dependencies(sacdrv sacmsg) +add_pch(sacdrv sacdrv.h SOURCE) add_cd_file(TARGET sacdrv DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/serial/serenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/CMa… ============================================================================== --- trunk/reactos/drivers/serial/serenum/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serenum/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,14 +1,18 @@ -add_library(serenum SHARED +list(APPEND SOURCE detect.c fdo.c misc.c pdo.c serenum.c + serenum.h) + +add_library(serenum SHARED + ${SOURCE} guid.c serenum.rc) -add_pch(serenum serenum.h) +add_pch(serenum serenum.h SOURCE) set_module_type(serenum kernelmodedriver) add_importlibs(serenum ntoskrnl hal) add_cd_file(TARGET serenum DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/serial/serial/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/CMak… ============================================================================== --- trunk/reactos/drivers/serial/serial/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,5 +1,5 @@ -add_library(serial SHARED +list(APPEND SOURCE circularbuffer.c cleanup.c close.c @@ -12,10 +12,14 @@ power.c rw.c serial.c + serial.h) + +add_library(serial SHARED + ${SOURCE} guid.c serial.rc) -add_pch(serial serial.h) set_module_type(serial kernelmodedriver) add_importlibs(serial ntoskrnl hal) +add_pch(serial serial.h SOURCE) add_cd_file(TARGET serial DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/setup/blue/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/CMakeLi… ============================================================================== --- trunk/reactos/drivers/setup/blue/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,9 +1,13 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) -add_library(blue SHARED blue.c font.c blue.rc) +list(APPEND SOURCE + blue.c + font.c + blue.h) -add_pch(blue blue.h) +add_library(blue SHARED ${SOURCE} blue.rc) set_module_type(blue kernelmodedriver) add_importlibs(blue ntoskrnl hal) +add_pch(blue blue.h SOURCE) add_cd_file(TARGET blue DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,7 +1,12 @@ include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/class) -add_library(cdrom SHARED cdrom.c findscsi.c cdrom.rc) +list(APPEND SOURCE + cdrom.c + findscsi.c + precomp.h) + +add_library(cdrom SHARED ${SOURCE} cdrom.rc) set_module_type(cdrom kernelmodedriver) add_importlibs(cdrom @@ -10,5 +15,5 @@ ntoskrnl hal) -add_pch(cdrom precomp.h) +add_pch(cdrom precomp.h SOURCE) add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -6,7 +6,8 @@ data.c ioctl.c mmc.c - sec.c) + sec.c + cdrom.h) add_library(cdrom_new SHARED ${SOURCE}) @@ -22,3 +23,4 @@ set_module_type(cdrom_new kernelmodedriver) add_importlibs(cdrom_new classpnp ntoskrnl hal) +add_pch(cdrom_new cdrom.h SOURCE) Modified: trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -7,11 +7,10 @@ enum.c geometry.c part.c - pnp.c) + pnp.c + disk.h) -add_library(disk_new SHARED - ${SOURCE} - disk.rc) +add_library(disk_new SHARED ${SOURCE} disk.rc) target_link_libraries(disk_new libcntpr wdmguid) if(ARCH STREQUAL "i386") @@ -24,4 +23,5 @@ set_module_type(disk_new kernelmodedriver) add_importlibs(disk_new classpnp ntoskrnl hal) +add_pch(disk_new disk.h SOURCE) add_cd_file(TARGET disk_new DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/C… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -26,12 +26,13 @@ retry.c utils.c xferpkt.c - guid.c - ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def) + classp.h) add_library(classpnp SHARED ${SOURCE} - class.rc) + guid.c + class.rc + ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def) if(ARCH STREQUAL "i386") # FIXME: http://www.cmake.org/Bug/view.php?id=12998 @@ -40,7 +41,7 @@ endif() endif() -add_pch(classpnp classp.h) +add_pch(classpnp classp.h SOURCE) target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) add_importlibs(classpnp hal ntoskrnl) Modified: trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/CM… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,12 +1,13 @@ -add_library(fdc SHARED +list(APPEND SOURCE fdc.c fdo.c misc.c pdo.c - fdc.rc) + fdc.h) +add_library(fdc SHARED ${SOURCE} fdc.rc) set_module_type(fdc kernelmodedriver) add_importlibs(fdc hal ntoskrnl) - +add_pch(fdc fdc.h SOURCE) add_cd_file(TARGET fdc DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/storage/floppy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/CMa… ============================================================================== --- trunk/reactos/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,14 +1,15 @@ -add_library(floppy SHARED +list(APPEND SOURCE csqrtns.c floppy.c hardware.c ioctl.c readwrite.c - floppy.rc) + precomp.h) +add_library(floppy SHARED ${SOURCE} floppy.rc) target_link_libraries(floppy csq) -add_pch(floppy precomp.h) +add_pch(floppy precomp.h SOURCE) set_module_type(floppy kernelmodedriver) add_importlibs(floppy hal ntoskrnl) add_cd_file(TARGET floppy DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -7,11 +7,14 @@ misc.c pciidex.c pdo.c + pciidex.h) + +add_library(pciidex SHARED + ${SOURCE} pciidex.rc ${CMAKE_CURRENT_BINARY_DIR}/pciidex.def) -add_library(pciidex SHARED ${SOURCE}) -add_pch(pciidex pciidex.h) +add_pch(pciidex pciidex.h SOURCE) set_module_type(pciidex kernelmodedriver) add_importlibs(pciidex ntoskrnl) add_cd_file(TARGET pciidex DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -15,7 +15,8 @@ id_probe.cpp id_queue.cpp id_sata.cpp - ros_glue/ros_glue.cpp) + ros_glue/ros_glue.cpp + stdafx.h) add_library(uniata SHARED ${SOURCE} idedma.rc) @@ -26,7 +27,7 @@ set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-unused-but-set-variable -Wno-narrowing") endif() -add_pch(uniata stdafx.h) +add_pch(uniata stdafx.h SOURCE) set_module_type(uniata kernelmodedriver) add_importlibs(uniata scsiport ntoskrnl hal) add_cd_file(TARGET uniata DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/C… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -4,11 +4,14 @@ list(APPEND SOURCE scsiport.c stubs.c + precomp.h) + +add_library(scsiport SHARED + ${SOURCE} scsiport.rc ${CMAKE_CURRENT_BINARY_DIR}/scsiport.def) - -add_library(scsiport SHARED ${SOURCE}) -add_pch(scsiport precomp.h) + +add_pch(scsiport precomp.h SOURCE) set_module_type(scsiport kernelmodedriver) add_importlibs(scsiport ntoskrnl hal) Modified: trunk/reactos/drivers/usb/usbccgp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -6,11 +6,23 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbccgp SHARED descriptor.c fdo.c function.c misc.c pdo.c usbccgp.c guid.c usbccgp.rc) +list(APPEND SOURCE + descriptor.c + fdo.c + function.c + misc.c + pdo.c + usbccgp.c + usbccgp.h) + +add_library(usbccgp SHARED + ${SOURCE} + guid.c + usbccgp.rc) target_link_libraries(usbccgp ${PSEH_LIB}) set_module_type(usbccgp kernelmodedriver) add_importlibs(usbccgp ntoskrnl hal usbd) - +add_pch(usbccgp usbccgp.h SOURCE) add_cd_file(TARGET usbccgp DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -11,10 +11,11 @@ usb_request.cpp usb_queue.cpp hardware.cpp - guid.cpp) + usbehci.h) add_library(usbehci SHARED ${SOURCE} + guid.cpp usbehci.rc) target_link_libraries(usbehci @@ -25,5 +26,5 @@ set_module_type(usbehci kernelmodedriver) add_importlibs(usbehci ntoskrnl hal usbd) - +add_pch(usbehci usbehci.h SOURCE) add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/usb/usbhub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/CMakeLi… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -3,11 +3,22 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbhub SHARED fdo.c misc.c pdo.c hub_fdo.c usbhub.c guid.c usbhub.rc) +list(APPEND SOURCE + fdo.c + hub_fdo.c + misc.c + pdo.c + usbhub.c + usbhub.h) + +add_library(usbhub SHARED + ${SOURCE} + guid.c + usbhub.rc) target_link_libraries(usbhub ${PSEH_LIB}) set_module_type(usbhub kernelmodedriver) add_importlibs(usbhub ntoskrnl hal usbd) - +add_pch(usbhub usbhub.h SOURCE) add_cd_file(TARGET usbhub DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/usb/usbohci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -11,10 +11,11 @@ usb_request.cpp usb_queue.cpp hardware.cpp - guid.cpp) + usbohci.h) add_library(usbohci SHARED ${SOURCE} + guid.cpp usbohci.rc) target_link_libraries(usbohci @@ -25,5 +26,5 @@ set_module_type(usbohci kernelmodedriver) add_importlibs(usbohci ntoskrnl hal usbd) - +add_pch(usbohci usbohci.h SOURCE) add_cd_file(TARGET usbohci DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -3,9 +3,24 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c error.c scsi.c usbstor.c guid.c usbstor.rc) +list(APPEND SOURCE + descriptor.c + disk.c + fdo.c + misc.c + pdo.c + queue.c + error.c + scsi.c + usbstor.c + usbstor.h) + +add_library(usbstor SHARED + ${SOURCE} + guid.c + usbstor.rc) set_module_type(usbstor kernelmodedriver) add_importlibs(usbstor ntoskrnl hal usbd) - +add_pch(usbstor usbstor.h SOURCE) add_cd_file(TARGET usbstor DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -12,10 +12,11 @@ usb_request.cpp usb_queue.cpp hardware.cpp - guid.cpp) + usbuhci.h) add_library(usbuhci SHARED ${SOURCE} + guid.cpp usbuhci.rc) target_link_libraries(usbuhci @@ -26,5 +27,5 @@ set_module_type(usbuhci kernelmodedriver) add_importlibs(usbuhci ntoskrnl hal usbd) - +add_pch(usbuhci usbuhci.h SOURCE) add_cd_file(TARGET usbuhci DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -47,18 +47,19 @@ undoc.cpp unregister.cpp version.cpp - guid.cpp - ${CMAKE_CURRENT_BINARY_DIR}/portcls.def) + private.hpp) add_library(portcls SHARED ${SOURCE} - portcls.rc) + guid.cpp + portcls.rc + ${CMAKE_CURRENT_BINARY_DIR}/portcls.def) target_link_libraries(portcls libcntpr ${PSEH_LIB}) set_module_type(portcls kernelmodedriver ENTRYPOINT 0 ) -add_pch(portcls private.hpp) +add_pch(portcls private.hpp SOURCE) add_importlibs(portcls ntoskrnl ks drmk hal) add_cd_file(TARGET portcls DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,17 +1,19 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) -add_library(kmixer SHARED +list(APPEND SOURCE kmixer.c filter.c - pin.c) + pin.c + kmixer.h) +add_library(kmixer SHARED ${SOURCE}) set_module_type(kmixer kernelmodedriver) target_link_libraries(kmixer libcntpr libsamplerate) -add_pch(kmixer kmixer.h) +add_pch(kmixer kmixer.h SOURCE) add_importlibs(kmixer ntoskrnl ks hal) add_cd_file(TARGET kmixer DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -5,20 +5,21 @@ ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -add_library(wdmaud SHARED +list(APPEND SOURCE control.c deviface.c entry.c mmixer.c sup.c - wdmaud.rc) + wdmaud.h) +add_library(wdmaud SHARED ${SOURCE} wdmaud.rc) set_module_type(wdmaud kernelmodedriver) target_link_libraries(wdmaud mmixer libcntpr) -add_pch(wdmaud wdmaud.h) +add_pch(wdmaud wdmaud.h SOURCE) add_importlibs(wdmaud ntoskrnl ks hal) add_cd_file(TARGET wdmaud DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/wdm/audio/sysaudio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:28:01 2014 @@ -1,16 +1,17 @@ add_definitions(-D_COMDDK_) -add_library(sysaudio SHARED +list(APPEND SOURCE control.c deviface.c dispatcher.c main.c pin.c - sysaudio.rc) + sysaudio.h) -add_pch(sysaudio sysaudio.h) +add_library(sysaudio SHARED ${SOURCE} sysaudio.rc) set_module_type(sysaudio kernelmodedriver) target_link_libraries(sysaudio libcntpr) add_importlibs(sysaudio ntoskrnl ks hal) +add_pch(sysaudio sysaudio.h SOURCE) add_cd_file(TARGET sysaudio DESTINATION reactos/system32/drivers FOR all)

1 0

[cwittich] 62076: [wlansvc] disable debugging
by cwittich＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: cwittich Date: Sun Feb 9 17:21:04 2014 New Revision: 62076 URL: http://svn.reactos.org/svn/reactos?rev=62076&view=rev Log: [wlansvc] disable debugging Modified: trunk/reactos/base/services/wlansvc/wlansvc.c Modified: trunk/reactos/base/services/wlansvc/wlansvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/wlan… ============================================================================== --- trunk/reactos/base/services/wlansvc/wlansvc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/wlansvc.c [iso-8859-1] Sun Feb 9 17:21:04 2014 @@ -10,7 +10,7 @@ #include "precomp.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> /* GLOBALS ******************************************************************/

1 0

[akhaldi] 62075: [WDMAUD] * We don't need to link to PSEH.
by akhaldi＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: akhaldi Date: Sun Feb 9 17:09:16 2014 New Revision: 62075 URL: http://svn.reactos.org/svn/reactos?rev=62075&view=rev Log: [WDMAUD] * We don't need to link to PSEH. Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] Sun Feb 9 17:09:16 2014 @@ -17,8 +17,7 @@ target_link_libraries(wdmaud mmixer - libcntpr - ${PSEH_LIB}) + libcntpr) add_pch(wdmaud wdmaud.h) add_importlibs(wdmaud ntoskrnl ks hal)

1 0

[tkreuzer] 62074: [NTOSKRNL] - Rename SepAccessCheck to SepAccessCheckEx, start adding support for ObjectType and result lists, call SepAccessCheckEx from SepAccessCheck
by tkreuzer＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: tkreuzer Date: Sun Feb 9 16:57:42 2014 New Revision: 62074 URL: http://svn.reactos.org/svn/reactos?rev=62074&view=rev Log: [NTOSKRNL] - Rename SepAccessCheck to SepAccessCheckEx, start adding support for ObjectType and result lists, call SepAccessCheckEx from SepAccessCheck Modified: trunk/reactos/ntoskrnl/se/accesschk.c Modified: trunk/reactos/ntoskrnl/se/accesschk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Sun Feb 9 16:57:42 2014 @@ -21,22 +21,25 @@ #define OLD_ACCESS_CHECK BOOLEAN NTAPI -SepAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, +SepAccessCheckEx(IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext, IN ACCESS_MASK DesiredAccess, + IN POBJECT_TYPE_LIST ObjectTypeList, + IN ULONG ObjectTypeListLength, IN ACCESS_MASK PreviouslyGrantedAccess, OUT PPRIVILEGE_SET* Privileges, IN PGENERIC_MAPPING GenericMapping, IN KPROCESSOR_MODE AccessMode, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus) + OUT PACCESS_MASK GrantedAccessList, + OUT PNTSTATUS AccessStatusList, + IN BOOLEAN UseResultList) { ACCESS_MASK RemainingAccess; ACCESS_MASK TempAccess; ACCESS_MASK TempGrantedAccess = 0; ACCESS_MASK TempDeniedAccess = 0; PACCESS_TOKEN Token; - ULONG i; + ULONG i, ResultListLength; PACL Dacl; BOOLEAN Present; BOOLEAN Defaulted; @@ -52,15 +55,14 @@ if (!PreviouslyGrantedAccess) { /* Then there's nothing to give */ - *AccessStatus = STATUS_ACCESS_DENIED; - return FALSE; + Status = STATUS_ACCESS_DENIED; + goto ReturnCommonStatus; } /* Return the previous access only */ - *GrantedAccess = PreviouslyGrantedAccess; - *AccessStatus = STATUS_SUCCESS; + Status = STATUS_SUCCESS; *Privileges = NULL; - return TRUE; + goto ReturnCommonStatus; } /* Map given accesses */ @@ -83,16 +85,14 @@ UserMode); if (!NT_SUCCESS(Status)) { - *AccessStatus = Status; - return FALSE; + goto ReturnCommonStatus; } /* Succeed if there are no more rights to grant */ if (RemainingAccess == 0) { - *GrantedAccess = PreviouslyGrantedAccess; - *AccessStatus = STATUS_SUCCESS; - return TRUE; + Status = STATUS_SUCCESS; + goto ReturnCommonStatus; } /* Get the DACL */ @@ -102,25 +102,21 @@ &Defaulted); if (!NT_SUCCESS(Status)) { - *AccessStatus = Status; - return FALSE; + goto ReturnCommonStatus; } /* RULE 1: Grant desired access if the object is unprotected */ if (Present == FALSE || Dacl == NULL) { - if (DesiredAccess & MAXIMUM_ALLOWED) - { - *GrantedAccess = GenericMapping->GenericAll; - *GrantedAccess |= (DesiredAccess | PreviouslyGrantedAccess) & ~MAXIMUM_ALLOWED; - } - else - { - *GrantedAccess = DesiredAccess | PreviouslyGrantedAccess; - } - - *AccessStatus = STATUS_SUCCESS; - return TRUE; + PreviouslyGrantedAccess |= RemainingAccess; + if (RemainingAccess & MAXIMUM_ALLOWED) + { + PreviouslyGrantedAccess &= ~MAXIMUM_ALLOWED; + PreviouslyGrantedAccess |= GenericMapping->GenericAll; + } + + Status = STATUS_SUCCESS; + goto ReturnCommonStatus; } /* Deny access if the DACL is empty */ @@ -128,24 +124,14 @@ { if (RemainingAccess == MAXIMUM_ALLOWED && PreviouslyGrantedAccess != 0) { - *GrantedAccess = PreviouslyGrantedAccess; - *AccessStatus = STATUS_SUCCESS; - return TRUE; + Status = STATUS_SUCCESS; } else { - *GrantedAccess = 0; - *AccessStatus = STATUS_ACCESS_DENIED; - return FALSE; - } - } - - /* Fail if DACL is absent */ - if (Present == FALSE) - { - *GrantedAccess = 0; - *AccessStatus = STATUS_ACCESS_DENIED; - return FALSE; + PreviouslyGrantedAccess = 0; + Status = STATUS_ACCESS_DENIED; + } + goto ReturnCommonStatus; } /* Determine the MAXIMUM_ALLOWED access rights according to the DACL */ @@ -195,23 +181,22 @@ RemainingAccess &= ~(MAXIMUM_ALLOWED | TempGrantedAccess); if (RemainingAccess != 0) { - *GrantedAccess = 0; - *AccessStatus = STATUS_ACCESS_DENIED; - return FALSE; + PreviouslyGrantedAccess = 0; + Status = STATUS_ACCESS_DENIED; + goto ReturnCommonStatus; } /* Set granted access right and access status */ - *GrantedAccess = TempGrantedAccess | PreviouslyGrantedAccess; - if (*GrantedAccess != 0) - { - *AccessStatus = STATUS_SUCCESS; - return TRUE; + PreviouslyGrantedAccess |= TempGrantedAccess; + if (PreviouslyGrantedAccess != 0) + { + Status = STATUS_SUCCESS; } else { - *AccessStatus = STATUS_ACCESS_DENIED; - return FALSE; - } + Status = STATUS_ACCESS_DENIED; + } + goto ReturnCommonStatus; } /* RULE 4: Grant rights according to the DACL */ @@ -226,9 +211,9 @@ if (SepSidInToken(Token, Sid)) { #ifdef OLD_ACCESS_CHECK - *GrantedAccess = 0; - *AccessStatus = STATUS_ACCESS_DENIED; - return FALSE; + PreviouslyGrantedAccess = 0; + Status = STATUS_ACCESS_DENIED; + goto ReturnCommonStatus; #else /* Map access rights from the ACE */ TempAccess = CurrentAce->AccessMask; @@ -272,23 +257,23 @@ DPRINT("PreviouslyGrantedAccess %08lx\n DesiredAccess %08lx\n", PreviouslyGrantedAccess, DesiredAccess); - *GrantedAccess = PreviouslyGrantedAccess & DesiredAccess; - - if ((*GrantedAccess & ~VALID_INHERIT_FLAGS) == + PreviouslyGrantedAccess &= DesiredAccess; + + if ((PreviouslyGrantedAccess & ~VALID_INHERIT_FLAGS) == (DesiredAccess & ~VALID_INHERIT_FLAGS)) { - *AccessStatus = STATUS_SUCCESS; - return TRUE; + Status = STATUS_SUCCESS; + goto ReturnCommonStatus; } else { DPRINT1("HACK: Should deny access for caller: granted 0x%lx, desired 0x%lx (generic mapping %p).\n", - *GrantedAccess, DesiredAccess, GenericMapping); + PreviouslyGrantedAccess, DesiredAccess, GenericMapping); //*AccessStatus = STATUS_ACCESS_DENIED; //return FALSE; - *GrantedAccess = DesiredAccess; - *AccessStatus = STATUS_SUCCESS; - return TRUE; + PreviouslyGrantedAccess = DesiredAccess; + Status = STATUS_SUCCESS; + goto ReturnCommonStatus; } #else DPRINT("DesiredAccess %08lx\nPreviouslyGrantedAccess %08lx\nRemainingAccess %08lx\n", @@ -298,25 +283,61 @@ if (RemainingAccess != 0) { *GrantedAccess = 0; - *AccessStatus = STATUS_ACCESS_DENIED; - return FALSE; + Status = STATUS_ACCESS_DENIED; + goto ReturnCommonStatus; } /* Set granted access rights */ - *GrantedAccess = DesiredAccess | PreviouslyGrantedAccess; + PreviouslyGrantedAccess |= DesiredAccess; DPRINT("GrantedAccess %08lx\n", *GrantedAccess); /* Fail if no rights have been granted */ - if (*GrantedAccess == 0) - { - *AccessStatus = STATUS_ACCESS_DENIED; - return FALSE; - } - - *AccessStatus = STATUS_SUCCESS; - return TRUE; + if (PreviouslyGrantedAccess == 0) + { + Status = STATUS_ACCESS_DENIED; + goto ReturnCommonStatus; + } + + Status = STATUS_SUCCESS; + goto ReturnCommonStatus; #endif + +ReturnCommonStatus: + + ResultListLength = UseResultList ? ObjectTypeListLength : 1; + for (i = 0; i < ResultListLength; i++) + { + GrantedAccessList[i] = PreviouslyGrantedAccess; + AccessStatusList[i] = Status; + } + + return NT_SUCCESS(Status); +} + +BOOLEAN NTAPI +SepAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext, + IN ACCESS_MASK DesiredAccess, + IN ACCESS_MASK PreviouslyGrantedAccess, + OUT PPRIVILEGE_SET* Privileges, + IN PGENERIC_MAPPING GenericMapping, + IN KPROCESSOR_MODE AccessMode, + OUT PACCESS_MASK GrantedAccess, + OUT PNTSTATUS AccessStatus) +{ + return SepAccessCheckEx(SecurityDescriptor, + SubjectSecurityContext, + DesiredAccess, + NULL, + 0, + PreviouslyGrantedAccess, + Privileges, + GenericMapping, + AccessMode, + GrantedAccess, + AccessStatus, + FALSE); } static PSID

1 0

[akhaldi] 62073: [ACPICA] * We don't need these source files in the static lib.
by akhaldi＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: akhaldi Date: Sun Feb 9 16:55:58 2014 New Revision: 62073 URL: http://svn.reactos.org/svn/reactos?rev=62073&view=rev Log: [ACPICA] * We don't need these source files in the static lib. Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Sun Feb 9 16:55:58 2014 @@ -40,7 +40,7 @@ acpica/executer/exconvrt.c acpica/executer/excreate.c acpica/executer/exdebug.c - acpica/executer/exdump.c + #acpica/executer/exdump.c acpica/executer/exfield.c acpica/executer/exfldio.c acpica/executer/exmisc.c @@ -70,8 +70,8 @@ acpica/hardware/hwxface.c acpica/namespace/nsaccess.c acpica/namespace/nsalloc.c - acpica/namespace/nsdump.c - acpica/namespace/nsdumpdv.c + #acpica/namespace/nsdump.c + #acpica/namespace/nsdumpdv.c acpica/namespace/nseval.c acpica/namespace/nsinit.c acpica/namespace/nsload.c @@ -99,7 +99,7 @@ acpica/resources/rsaddr.c acpica/resources/rscalc.c acpica/resources/rscreate.c - acpica/resources/rsdump.c + #acpica/resources/rsdump.c acpica/resources/rsinfo.c acpica/resources/rsio.c acpica/resources/rsirq.c

1 0

[tkreuzer] 62072: [NTOSKRNL] - In SepAccessCheck remove CurrentAccess (which is in all cases only a duplicate of PreviouslyGrantedAccess) and replace AccessMask with TempAccess
by tkreuzer＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: tkreuzer Date: Sun Feb 9 16:21:49 2014 New Revision: 62072 URL: http://svn.reactos.org/svn/reactos?rev=62072&view=rev Log: [NTOSKRNL] - In SepAccessCheck remove CurrentAccess (which is in all cases only a duplicate of PreviouslyGrantedAccess) and replace AccessMask with TempAccess Modified: trunk/reactos/ntoskrnl/se/accesschk.c Modified: trunk/reactos/ntoskrnl/se/accesschk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Sun Feb 9 16:21:49 2014 @@ -31,9 +31,6 @@ OUT PACCESS_MASK GrantedAccess, OUT PNTSTATUS AccessStatus) { -#ifdef OLD_ACCESS_CHECK - ACCESS_MASK CurrentAccess, AccessMask; -#endif ACCESS_MASK RemainingAccess; ACCESS_MASK TempAccess; ACCESS_MASK TempGrantedAccess = 0; @@ -115,7 +112,7 @@ if (DesiredAccess & MAXIMUM_ALLOWED) { *GrantedAccess = GenericMapping->GenericAll; - *GrantedAccess |= (DesiredAccess & ~MAXIMUM_ALLOWED); + *GrantedAccess |= (DesiredAccess | PreviouslyGrantedAccess) & ~MAXIMUM_ALLOWED; } else { @@ -125,10 +122,6 @@ *AccessStatus = STATUS_SUCCESS; return TRUE; } - -#ifdef OLD_ACCESS_CHECK - CurrentAccess = PreviouslyGrantedAccess; -#endif /* Deny access if the DACL is empty */ if (Dacl->AceCount == 0) @@ -252,9 +245,9 @@ if (SepSidInToken(Token, Sid)) { #ifdef OLD_ACCESS_CHECK - AccessMask = CurrentAce->AccessMask; - RtlMapGenericMask(&AccessMask, GenericMapping); - CurrentAccess |= AccessMask; + TempAccess = CurrentAce->AccessMask; + RtlMapGenericMask(&TempAccess, GenericMapping); + PreviouslyGrantedAccess |= TempAccess; #else /* Map access rights from the ACE */ TempAccess = CurrentAce->AccessMask; @@ -276,10 +269,10 @@ } #ifdef OLD_ACCESS_CHECK - DPRINT("CurrentAccess %08lx\n DesiredAccess %08lx\n", - CurrentAccess, DesiredAccess); - - *GrantedAccess = CurrentAccess & DesiredAccess; + DPRINT("PreviouslyGrantedAccess %08lx\n DesiredAccess %08lx\n", + PreviouslyGrantedAccess, DesiredAccess); + + *GrantedAccess = PreviouslyGrantedAccess & DesiredAccess; if ((*GrantedAccess & ~VALID_INHERIT_FLAGS) == (DesiredAccess & ~VALID_INHERIT_FLAGS))

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
47
Older →

Jump to page:

2025

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