Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 62063: [BASE/SYSTEM] * 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 10:40:34 2014 New Revision: 62063 URL: http://svn.reactos.org/svn/reactos?rev=62063&view=rev Log: [BASE/SYSTEM] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt trunk/reactos/base/system/msiexec/CMakeLists.txt trunk/reactos/base/system/services/CMakeLists.txt trunk/reactos/base/system/smss/CMakeLists.txt trunk/reactos/base/system/winlogon/CMakeLists.txt Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake… ============================================================================== --- trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] Sun Feb 9 10:40:34 2014 @@ -1,48 +1,50 @@ -add_executable(diskpart - active.c - add.c - assign.c - attach.c - attributes.c - automount.c - break.c - clean.c - compact.c - convert.c - create.c - delete.c - detach.c - detail.c - diskpart.c - expand.c - extend.c - filesystems.c - format.c - gpt.c - help.c - import.c - inactive.c - interpreter.c - list.c - merge.c - offline.c - online.c - recover.c - remove.c - repair.c - rescan.c - retain.c - san.c - select.c - setid.c - shrink.c - uniqueid.c - diskpart.rc) +list(APPEND SOURCE + active.c + add.c + assign.c + attach.c + attributes.c + automount.c + break.c + clean.c + compact.c + convert.c + create.c + delete.c + detach.c + detail.c + diskpart.c + expand.c + extend.c + filesystems.c + format.c + gpt.c + help.c + import.c + inactive.c + interpreter.c + list.c + merge.c + offline.c + online.c + recover.c + remove.c + repair.c + rescan.c + retain.c + san.c + select.c + setid.c + shrink.c + uniqueid.c + diskpart.h) +add_executable(diskpart ${SOURCE} diskpart.rc) set_module_type(diskpart win32cui UNICODE) add_importlibs(diskpart user32 msvcrt advapi32 kernel32) if(MSVC) add_importlibs(diskpart ntdll) endif() +add_pch(diskpart diskpart.h SOURCE) add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/msiexec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/CMakeL… ============================================================================== --- trunk/reactos/base/system/msiexec/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/CMakeLists.txt [iso-8859-1] Sun Feb 9 10:40:34 2014 @@ -3,12 +3,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/wine) -add_executable(msiexec +list(APPEND SOURCE msiexec.c service.c - rsrc.rc) + precomp.h) + +add_executable(msiexec ${SOURCE} rsrc.rc) set_module_type(msiexec win32gui) target_link_libraries(msiexec uuid wine) add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll) +add_pch(msiexec precomp.h SOURCE) add_cd_file(TARGET msiexec DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/CMake… ============================================================================== --- trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] Sun Feb 9 10:40:34 2014 @@ -16,10 +16,10 @@ lock.c rpcserver.c services.c - services.rc + services.h ${CMAKE_CURRENT_BINARY_DIR}/svcctl_s.c) -add_executable(services ${SOURCE}) +add_executable(services ${SOURCE} services.rc) if(NOT MSVC) target_link_libraries(services ${PSEH_LIB}) @@ -27,5 +27,5 @@ set_module_type(services win32gui UNICODE) add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_pch(services services.h ${CMAKE_CURRENT_BINARY_DIR}/svcctl_s.h) +add_pch(services services.h SOURCE) add_cd_file(TARGET services DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/smss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/CMakeList… ============================================================================== --- trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] Sun Feb 9 10:40:34 2014 @@ -11,11 +11,11 @@ smsubsys.c smutil.c smss.c - smss.rc) + smss.h) -add_executable(smss WIN32 ${SOURCE}) +add_executable(smss WIN32 ${SOURCE} smss.rc) target_link_libraries(smss nt ${PSEH_LIB} smlib) -add_pch(smss smss.h) set_module_type(smss nativecui) add_importlibs(smss ntdll) +add_pch(smss smss.h SOURCE) add_cd_file(TARGET smss DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/winlogon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/CMake… ============================================================================== --- trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] Sun Feb 9 10:40:34 2014 @@ -6,13 +6,11 @@ setup.c winlogon.c wlx.c - winlogon.rc) + winlogon.h) -add_executable(winlogon ${SOURCE}) - +add_executable(winlogon ${SOURCE} winlogon.rc) target_link_libraries(winlogon wine) - set_module_type(winlogon win32gui) add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll) -add_pch(winlogon winlogon.h) +add_pch(winlogon winlogon.h SOURCE) add_cd_file(TARGET winlogon DESTINATION reactos/system32 FOR all)

1 0

[janderwald] 62062: [NETSHELL] - fix identation - found by Christoph
by janderwald＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: janderwald Date: Sun Feb 9 10:24:31 2014 New Revision: 62062 URL: http://svn.reactos.org/svn/reactos?rev=62062&view=rev Log: [NETSHELL] - fix identation - found by Christoph Modified: trunk/reactos/dll/win32/netshell/lanconnectui.cpp Modified: trunk/reactos/dll/win32/netshell/lanconnectui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] Sun Feb 9 10:24:31 2014 @@ -54,7 +54,7 @@ VOID EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type); VOID InitializeLANPropertiesUIDlg(HWND hwndDlg); VOID ShowNetworkComponentProperties(HWND hwndDlg); - BOOL GetDeviceInstanceID(OUT LPOLESTR *DeviceInstanceID); + BOOL GetDeviceInstanceID(OUT LPOLESTR *DeviceInstanceID); static INT_PTR CALLBACK LANPropertiesUIDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INetConnection * pCon;

1 0

[hbelusca] 62061: [CONSRV] Silence a DPRINT.
by hbelusca＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: hbelusca Date: Sat Feb 8 22:30:45 2014 New Revision: 62061 URL: http://svn.reactos.org/svn/reactos?rev=62061&view=rev Log: [CONSRV] Silence a DPRINT. Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv_new/handle.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Sat Feb 8 22:30:45 2014 @@ -435,8 +435,8 @@ /*(Type != 0 && ObjectEntry->Type != Type)*/ (Type != 0 && (ObjectEntry->Type & Type) == 0) ) { - DPRINT1("ConSrvGetObject -- Invalid handle 0x%x of type %lu with access %lu ; retrieved object 0x%x (handle 0x%x) of type %lu with access %lu\n", - Handle, Type, Access, ObjectEntry, HandleEntry, (ObjectEntry ? ObjectEntry->Type : 0), (HandleEntry ? HandleEntry->Access : 0)); + DPRINT("ConSrvGetObject -- Invalid handle 0x%x of type %lu with access %lu ; retrieved object 0x%x (handle 0x%x) of type %lu with access %lu\n", + Handle, Type, Access, ObjectEntry, HandleEntry, (ObjectEntry ? ObjectEntry->Type : 0), (HandleEntry ? HandleEntry->Access : 0)); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_INVALID_HANDLE; Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv_new/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv_new/handle.c [iso-8859-1] Sat Feb 8 22:30:45 2014 @@ -438,8 +438,8 @@ /*(Type != 0 && ObjectEntry->Type != Type)*/ (Type != 0 && (ObjectEntry->Type & Type) == 0) ) { - DPRINT1("ConSrvGetObject -- Invalid handle 0x%x of type %lu with access %lu ; retrieved object 0x%x (handle 0x%x) of type %lu with access %lu\n", - Handle, Type, Access, ObjectEntry, HandleEntry, (ObjectEntry ? ObjectEntry->Type : 0), (HandleEntry ? HandleEntry->Access : 0)); + DPRINT("ConSrvGetObject -- Invalid handle 0x%x of type %lu with access %lu ; retrieved object 0x%x (handle 0x%x) of type %lu with access %lu\n", + Handle, Type, Access, ObjectEntry, HandleEntry, (ObjectEntry ? ObjectEntry->Type : 0), (HandleEntry ? HandleEntry->Access : 0)); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_INVALID_HANDLE;

1 0

[hbelusca] 62060: [KERNEL32] Fix finding the environment multi-string size (use the same code as in RtlpInitEnvironment instead of using hackish and broken code; the two while() are here because th...
by hbelusca＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: hbelusca Date: Sat Feb 8 22:22:21 2014 New Revision: 62060 URL: http://svn.reactos.org/svn/reactos?rev=62060&view=rev Log: [KERNEL32] Fix finding the environment multi-string size (use the same code as in RtlpInitEnvironment instead of using hackish and broken code; the two while() are here because the environment string is a "multi-string", hence a list of strings, each terminated by a NULL char, and the whole multi-string is terminated by two NULL chars (the one of the last string plus an empty string). Also fix a cast. This fixes the launch of some programs, and this was triggered by tring to compiling the host-tools of the ReactOS source code with RosBE, on ReactOS. CORE-7870 #resolve #comment Fixed in revision 62060. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sat Feb 8 22:22:21 2014 @@ -673,9 +673,8 @@ if (lpEnvironment) { /* Find the environment size */ - while ((ScanChar[0]) || (ScanChar[1])) ++ScanChar; - ScanChar += (2 * sizeof(UNICODE_NULL)); - EnviroSize = (ULONG_PTR)ScanChar - (ULONG_PTR)lpEnvironment; + while (*ScanChar++) while (*ScanChar++); + EnviroSize = (ULONG)((ULONG_PTR)ScanChar - (ULONG_PTR)lpEnvironment); /* Allocate and Initialize new Environment Block */ Size = EnviroSize;

1 0

[ekohl] 62059: [MSGINA] - Display the current domain in the logon dialog and pass it to the logon routine. - Fix wrong default domain registry value name.
by ekohl＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: ekohl Date: Sat Feb 8 21:33:13 2014 New Revision: 62059 URL: http://svn.reactos.org/svn/reactos?rev=62059&view=rev Log: [MSGINA] - Display the current domain in the logon dialog and pass it to the logon routine. - Fix wrong default domain registry value name. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sat Feb 8 21:33:13 2014 @@ -707,6 +707,9 @@ if (pgContext->bShutdownWithoutLogon == FALSE) EnableWindow(GetDlgItem(hwndDlg, IDC_SHUTDOWN), FALSE); + SendDlgItemMessageW(hwndDlg, IDC_LOGON_TO, CB_ADDSTRING, 0, (LPARAM)pgContext->Domain); + SendDlgItemMessageW(hwndDlg, IDC_LOGON_TO, CB_SETCURSEL, 0, 0); + SetFocus(GetDlgItem(hwndDlg, pgContext->bDontDisplayLastUserName ? IDC_USERNAME : IDC_PASSWORD)); pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); @@ -735,13 +738,15 @@ { case IDOK: { - LPWSTR UserName = NULL, Password = NULL; + LPWSTR UserName = NULL, Password = NULL, Domain = NULL; INT result = WLX_SAS_ACTION_NONE; if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0') break; + if (GetTextboxText(hwndDlg, IDC_LOGON_TO, &Domain) && *Domain == '\0') + break; if (GetTextboxText(hwndDlg, IDC_PASSWORD, &Password) && - DoLoginTasks(pgContext, UserName, NULL, Password)) + DoLoginTasks(pgContext, UserName, Domain, Password)) { pgContext->Password = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -753,6 +758,7 @@ } HeapFree(GetProcessHeap(), 0, UserName); HeapFree(GetProcessHeap(), 0, Password); + HeapFree(GetProcessHeap(), 0, Domain); EndDialog(hwndDlg, result); return TRUE; } Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sat Feb 8 21:33:13 2014 @@ -237,7 +237,7 @@ dwSize = 256 * sizeof(WCHAR); rc = RegQueryValueExW(hKey, - L"DefaultDomainName", + L"DefaultDomain", NULL, NULL, (LPBYTE)&pgContext->Domain, @@ -801,7 +801,7 @@ LPWSTR AutoCount = NULL; LPWSTR IgnoreShiftOverride = NULL; LPWSTR UserName = NULL; - LPWSTR DomainName = NULL; + LPWSTR Domain = NULL; LPWSTR Password = NULL; BOOL result = FALSE; LONG rc; @@ -860,14 +860,14 @@ rc = ReadRegSzKey(WinLogonKey, L"DefaultUserName", &UserName); if (rc != ERROR_SUCCESS) goto cleanup; - rc = ReadRegSzKey(WinLogonKey, L"DefaultDomainName", &DomainName); + rc = ReadRegSzKey(WinLogonKey, L"DefaultDomain", &Domain); if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND) goto cleanup; rc = ReadRegSzKey(WinLogonKey, L"DefaultPassword", &Password); if (rc != ERROR_SUCCESS) goto cleanup; - result = DoLoginTasks(pgContext, UserName, DomainName, Password); + result = DoLoginTasks(pgContext, UserName, Domain, Password); if (result == TRUE) { @@ -888,7 +888,7 @@ HeapFree(GetProcessHeap(), 0, AutoCount); HeapFree(GetProcessHeap(), 0, IgnoreShiftOverride); HeapFree(GetProcessHeap(), 0, UserName); - HeapFree(GetProcessHeap(), 0, DomainName); + HeapFree(GetProcessHeap(), 0, Domain); HeapFree(GetProcessHeap(), 0, Password); TRACE("DoAutoLogon(): AutoLogonState = %lu, returning %d\n", pgContext->AutoLogonState, result);

1 0

[tkreuzer] 62058: [NTOSKRNL] - Lock the token in SepPrivilegeCheck - Make use of RtlEqualLuid instead of manual comparison of fields - Implement SepSinglePrivilegeCheck and SePrivilegePolicyCheck a...
by tkreuzer＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: tkreuzer Date: Sat Feb 8 20:01:09 2014 New Revision: 62058 URL: http://svn.reactos.org/svn/reactos?rev=62058&view=rev Log: [NTOSKRNL] - Lock the token in SepPrivilegeCheck - Make use of RtlEqualLuid instead of manual comparison of fields - Implement SepSinglePrivilegeCheck and SePrivilegePolicyCheck and use the latter in SepAccessCheck Modified: trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/se/accesschk.c trunk/reactos/ntoskrnl/se/priv.c Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Sat Feb 8 20:01:09 2014 @@ -380,6 +380,16 @@ KPROCESSOR_MODE PreviousMode ); +NTSTATUS +NTAPI +SePrivilegePolicyCheck( + _Inout_ PACCESS_MASK DesiredAccess, + _Inout_ PACCESS_MASK GrantedAccess, + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext, + _In_ PTOKEN Token, + _Out_opt_ PPRIVILEGE_SET *OutPrivilegeSet, + _In_ KPROCESSOR_MODE PreviousMode); + BOOLEAN NTAPI SeCheckPrivilegedObject( 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] Sat Feb 8 20:01:09 2014 @@ -31,7 +31,6 @@ OUT PACCESS_MASK GrantedAccess, OUT PNTSTATUS AccessStatus) { - LUID_AND_ATTRIBUTES Privilege; #ifdef OLD_ACCESS_CHECK ACCESS_MASK CurrentAccess, AccessMask; #endif @@ -72,43 +71,31 @@ if (PreviouslyGrantedAccess) RtlMapGenericMask(&PreviouslyGrantedAccess, GenericMapping); -#ifdef OLD_ACCESS_CHECK - CurrentAccess = PreviouslyGrantedAccess; -#endif /* Initialize remaining access rights */ RemainingAccess = DesiredAccess; Token = SubjectSecurityContext->ClientToken ? - SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken; - - /* Check for system security access */ - if (RemainingAccess & ACCESS_SYSTEM_SECURITY) - { - Privilege.Luid = SeSecurityPrivilege; - Privilege.Attributes = SE_PRIVILEGE_ENABLED; - - /* Fail if we do not the SeSecurityPrivilege */ - if (!SepPrivilegeCheck(Token, - &Privilege, - 1, - PRIVILEGE_SET_ALL_NECESSARY, - AccessMode)) - { - *AccessStatus = STATUS_PRIVILEGE_NOT_HELD; - return FALSE; - } - - /* Adjust access rights */ - RemainingAccess &= ~ACCESS_SYSTEM_SECURITY; - PreviouslyGrantedAccess |= ACCESS_SYSTEM_SECURITY; - - /* Succeed if there are no more rights to grant */ - if (RemainingAccess == 0) - { - *GrantedAccess = PreviouslyGrantedAccess; - *AccessStatus = STATUS_SUCCESS; - return TRUE; - } + SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken; + + /* Check for ACCESS_SYSTEM_SECURITY and WRITE_OWNER access */ + Status = SePrivilegePolicyCheck(&RemainingAccess, + &PreviouslyGrantedAccess, + NULL, + Token, + NULL, + UserMode); + if (!NT_SUCCESS(Status)) + { + *AccessStatus = Status; + return FALSE; + } + + /* Succeed if there are no more rights to grant */ + if (RemainingAccess == 0) + { + *GrantedAccess = PreviouslyGrantedAccess; + *AccessStatus = STATUS_SUCCESS; + return TRUE; } /* Get the DACL */ @@ -142,35 +129,6 @@ #ifdef OLD_ACCESS_CHECK CurrentAccess = PreviouslyGrantedAccess; #endif - - /* RULE 2: Check token for 'take ownership' privilege */ - if (DesiredAccess & WRITE_OWNER) - { - Privilege.Luid = SeTakeOwnershipPrivilege; - Privilege.Attributes = SE_PRIVILEGE_ENABLED; - - if (SepPrivilegeCheck(Token, - &Privilege, - 1, - PRIVILEGE_SET_ALL_NECESSARY, - AccessMode)) - { - /* Adjust access rights */ - RemainingAccess &= ~WRITE_OWNER; - PreviouslyGrantedAccess |= WRITE_OWNER; -#ifdef OLD_ACCESS_CHECK - CurrentAccess |= WRITE_OWNER; -#endif - - /* Succeed if there are no more rights to grant */ - if (RemainingAccess == 0) - { - *GrantedAccess = PreviouslyGrantedAccess; - *AccessStatus = STATUS_SUCCESS; - return TRUE; - } - } - } /* Deny access if the DACL is empty */ if (Dacl->AceCount == 0) Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=620… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Sat Feb 8 20:01:09 2014 @@ -89,6 +89,9 @@ /* Get the number of privileges that are required to match */ Required = (PrivilegeControl & PRIVILEGE_SET_ALL_NECESSARY) ? PrivilegeCount : 1; + /* Acquire a shared token lock */ + SepAcquireTokenLockShared(Token); + /* Loop all requested privileges until we found the required ones */ for (i = 0; i < PrivilegeCount; i++) { @@ -96,8 +99,7 @@ for (j = 0; j < Token->PrivilegeCount; j++) { /* Check if the LUIDs match */ - if (Token->Privileges[j].Luid.LowPart == Privileges[i].Luid.LowPart && - Token->Privileges[j].Luid.HighPart == Privileges[i].Luid.HighPart) + if (RtlEqualLuid(&Token->Privileges[j].Luid, &Privileges[i].Luid)) { DPRINT("Found privilege. Attributes: %lx\n", Token->Privileges[j].Attributes); @@ -112,6 +114,7 @@ if (Required == 0) { /* We're done! */ + SepReleaseTokenLock(Token); return TRUE; } } @@ -122,9 +125,131 @@ } } + /* Release the token lock */ + SepReleaseTokenLock(Token); + /* When we reached this point, we did not find all privileges */ NT_ASSERT(Required > 0); return FALSE; +} + +NTSTATUS +NTAPI +SepSinglePrivilegeCheck( + LUID PrivilegeValue, + PTOKEN Token, + KPROCESSOR_MODE PreviousMode) +{ + LUID_AND_ATTRIBUTES Privilege; + PAGED_CODE(); + ASSERT(!RtlEqualLuid(&PrivilegeValue, &SeTcbPrivilege)); + + Privilege.Luid = PrivilegeValue; + Privilege.Attributes = SE_PRIVILEGE_ENABLED; + return SepPrivilegeCheck(Token, + &Privilege, + 1, + PRIVILEGE_SET_ALL_NECESSARY, + PreviousMode); +} + +NTSTATUS +NTAPI +SePrivilegePolicyCheck( + _Inout_ PACCESS_MASK DesiredAccess, + _Inout_ PACCESS_MASK GrantedAccess, + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext, + _In_ PTOKEN Token, + _Out_opt_ PPRIVILEGE_SET *OutPrivilegeSet, + _In_ KPROCESSOR_MODE PreviousMode) +{ + SIZE_T PrivilegeSize; + PPRIVILEGE_SET PrivilegeSet; + ULONG PrivilegeCount = 0, Index = 0; + ACCESS_MASK AccessMask = 0; + PAGED_CODE(); + + /* Check if we have a security subject context */ + if (SubjectContext != NULL) + { + /* Check if there is a client impersonation token */ + if (SubjectContext->ClientToken != NULL) + Token = SubjectContext->ClientToken; + else + Token = SubjectContext->PrimaryToken; + } + + /* Check if the caller wants ACCESS_SYSTEM_SECURITY access */ + if (*DesiredAccess & ACCESS_SYSTEM_SECURITY) + { + /* Do the privilege check */ + if (SepSinglePrivilegeCheck(SeSecurityPrivilege, Token, PreviousMode)) + { + /* Remember this access flag */ + AccessMask |= ACCESS_SYSTEM_SECURITY; + PrivilegeCount++; + } + else + { + return STATUS_PRIVILEGE_NOT_HELD; + } + } + + /* Check if the caller wants WRITE_OWNER access */ + if (*DesiredAccess & WRITE_OWNER) + { + /* Do the privilege check */ + if (SepSinglePrivilegeCheck(SeTakeOwnershipPrivilege, Token, PreviousMode)) + { + /* Remember this access flag */ + AccessMask |= WRITE_OWNER; + PrivilegeCount++; + } + } + + /* Update the access masks */ + *GrantedAccess |= AccessMask; + *DesiredAccess &= ~AccessMask; + + /* Does the caller want a privilege set? */ + if (OutPrivilegeSet != NULL) + { + /* Do we have any privileges to report? */ + if (PrivilegeCount > 0) + { + /* Calculate size and allocate the structure */ + PrivilegeSize = FIELD_OFFSET(PRIVILEGE_SET, Privilege[PrivilegeCount]); + PrivilegeSet = ExAllocatePoolWithTag(PagedPool, PrivilegeSize, 'rPeS'); + *OutPrivilegeSet = PrivilegeSet; + if (PrivilegeSet == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + PrivilegeSet->PrivilegeCount = PrivilegeCount; + PrivilegeSet->Control = 0; + + if (AccessMask & WRITE_OWNER) + { + PrivilegeSet->Privilege[Index].Luid = SeTakeOwnershipPrivilege; + PrivilegeSet->Privilege[Index].Attributes = SE_PRIVILEGE_USED_FOR_ACCESS; + Index++; + } + + if (AccessMask & ACCESS_SYSTEM_SECURITY) + { + PrivilegeSet->Privilege[Index].Luid = SeSecurityPrivilege; + PrivilegeSet->Privilege[Index].Attributes = SE_PRIVILEGE_USED_FOR_ACCESS; + } + } + else + { + /* No privileges, no structure */ + *OutPrivilegeSet = NULL; + } + } + + return STATUS_SUCCESS; } NTSTATUS

1 0

[bfreisen] 62057: [MSPAINT] change misleading "LGPL version 3" resource strings to just "LGPL" as the header comments in the sources never restricted the version
by bfreisen＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: bfreisen Date: Sat Feb 8 19:22:31 2014 New Revision: 62057 URL: http://svn.reactos.org/svn/reactos?rev=62057&view=rev Log: [MSPAINT] change misleading "LGPL version 3" resource strings to just "LGPL" as the header comments in the sources never restricted the version Modified: trunk/reactos/base/applications/mspaint/lang/bg-BG.rc trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc trunk/reactos/base/applications/mspaint/lang/de-DE.rc trunk/reactos/base/applications/mspaint/lang/en-GB.rc trunk/reactos/base/applications/mspaint/lang/en-US.rc trunk/reactos/base/applications/mspaint/lang/es-ES.rc trunk/reactos/base/applications/mspaint/lang/eu-ES.rc trunk/reactos/base/applications/mspaint/lang/fr-FR.rc trunk/reactos/base/applications/mspaint/lang/he-IL.rc trunk/reactos/base/applications/mspaint/lang/hu-HU.rc trunk/reactos/base/applications/mspaint/lang/it-IT.rc trunk/reactos/base/applications/mspaint/lang/ja-JP.rc trunk/reactos/base/applications/mspaint/lang/nl-NL.rc trunk/reactos/base/applications/mspaint/lang/no-NO.rc trunk/reactos/base/applications/mspaint/lang/pl-PL.rc trunk/reactos/base/applications/mspaint/lang/pt-BR.rc trunk/reactos/base/applications/mspaint/lang/pt-PT.rc trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/lang/ru-RU.rc trunk/reactos/base/applications/mspaint/lang/sk-SK.rc trunk/reactos/base/applications/mspaint/lang/sq-AL.rc trunk/reactos/base/applications/mspaint/lang/sv-SE.rc trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/base/applications/mspaint/lang/uk-UA.rc trunk/reactos/base/applications/mspaint/lang/zh-CN.rc trunk/reactos/base/applications/mspaint/lang/zh-TW.rc Modified: trunk/reactos/base/applications/mspaint/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/bg-BG.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Ð Ð¸ÑÑÐ²Ð°Ð½Ðµ" IDS_WINDOWTITLE "%s - ÑÐ¸ÑÑÐ²Ð°Ð½Ðµ" IDS_INFOTITLE "Ð Ð¸ÑÑÐ²Ð°Ñ (Paint) Ð·Ð° Ð ÐµÐ°ÐºÑÐÐ¡" - IDS_INFOTEXT "Ð Ð¸ÑÑÐ²Ð°Ñ (Paint) Ð·Ð° Ð ÐµÐ°ÐºÑÐÐ¡ Ðµ Ð´Ð¾ÑÑÑÐ¿ÐµÐ½ Ð¿Ð¾Ð´ GNU Lesser General Public License (LGPL) Ð²ÐµÑÑÐ¸Ñ 3 (see www.gnu.org)" + IDS_INFOTEXT "Ð Ð¸ÑÑÐ²Ð°Ñ (Paint) Ð·Ð° Ð ÐµÐ°ÐºÑÐÐ¡ Ðµ Ð´Ð¾ÑÑÑÐ¿ÐµÐ½ Ð¿Ð¾Ð´ GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "ÐÑÐºÐ°ÑÐµ Ð»Ð¸ Ð´Ð° Ð·Ð°Ð¿Ð¸ÑÐµÑÐµ Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ Ð² %s?" IDS_DEFAULTFILENAME "ÐÐµÐ· Ð¸Ð¼Ðµ.bmp" IDS_MINIATURETITLE "ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ð¹ÑÐµ" Modified: trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "MalovÃ¡nÃ" IDS_WINDOWTITLE "%s - MalovÃ¡nÃ" IDS_INFOTITLE "ReactOS MalovÃ¡nÃ" - IDS_INFOTEXT "ReactOS MalovÃ¡nÃ je dostupnÃ© pod licencÃ GNU Lesser General Public License (LGPL) verze 3 (viz. www.gnu.org)" + IDS_INFOTEXT "ReactOS MalovÃ¡nÃ je dostupnÃ© pod licencÃ GNU Lesser General Public License (LGPL, viz. www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uloÅ¾it provedenÃ© zmÄny v %s?" IDS_DEFAULTFILENAME "Bez nÃ¡zvu.bmp" IDS_MINIATURETITLE "Miniatura" Modified: trunk/reactos/base/applications/mspaint/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/de-DE.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint fÃ¼r ReactOS" - IDS_INFOTEXT "Paint fÃ¼r ReactOS steht unter der GNU Lesser General Public License (LGPL) Version 3. (siehe www.gnu.org)" + IDS_INFOTEXT "Paint fÃ¼r ReactOS steht unter der GNU Lesser General Public License (LGPL, siehe www.gnu.org)" IDS_SAVEPROMPTTEXT "MÃ¶chten Sie die Ãnderungen an %s speichern?" IDS_DEFAULTFILENAME "Unbenannt.bmp" IDS_MINIATURETITLE "Miniaturansicht" Modified: trunk/reactos/base/applications/mspaint/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/en-GB.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint for ReactOS" - IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" + IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" IDS_DEFAULTFILENAME "Unnamed.bmp" IDS_MINIATURETITLE "Miniature" Modified: trunk/reactos/base/applications/mspaint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint for ReactOS" - IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" + IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" IDS_DEFAULTFILENAME "Unnamed.bmp" IDS_MINIATURETITLE "Miniature" Modified: trunk/reactos/base/applications/mspaint/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/es-ES.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint para ReactOS" - IDS_INFOTEXT "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (ver www.gnu.org)" + IDS_INFOTEXT "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "Â¿Guardar cambios cambios a %s?" IDS_DEFAULTFILENAME "Sin titulo.bmp" IDS_MINIATURETITLE "Miniatura" Modified: trunk/reactos/base/applications/mspaint/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/eu-ES.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -178,7 +178,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint para ReactOS" - IDS_INFOTEXT "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (ver www.gnu.org)" + IDS_INFOTEXT "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "Â¿Guardar cambios cambios a %s?" IDS_DEFAULTFILENAME "Izegabea.bmp" IDS_MINIATURETITLE "Miniatura" Modified: trunk/reactos/base/applications/mspaint/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -178,7 +178,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint pour ReactOS" - IDS_INFOTEXT "Paint pour ReactOS est mise Ã disposition sous la Licence publique gÃ©nÃ©rale limitÃ©e GNU (LGPL) version 3 (voir www.gnu.org)" + IDS_INFOTEXT "Paint pour ReactOS est mise Ã disposition sous la Licence publique gÃ©nÃ©rale limitÃ©e GNU (LGPL, voir www.gnu.org)" IDS_SAVEPROMPTTEXT "Voulez-vous enregistrer les modifications de %s?" IDS_DEFAULTFILENAME "Sans titre.bmp" IDS_MINIATURETITLE "Miniature" Modified: trunk/reactos/base/applications/mspaint/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/he-IL.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -178,7 +178,7 @@ IDS_PROGRAMNAME "×¦×××¨" IDS_WINDOWTITLE "%s - ×¦×××¨" IDS_INFOTITLE "×¦×××¨ ×¢×××¨ ReactOS" - IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" + IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "××× ××¨×¦×× × ××©×××¨ ××ª ××©×× ×××× ×©× %s?" IDS_DEFAULTFILENAME "××× ×©×.bmp" IDS_MINIATURETITLE "×××××¢×¨" Modified: trunk/reactos/base/applications/mspaint/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/hu-HU.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -178,7 +178,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "ReactOS Paint" - IDS_INFOTEXT "A ReactOS Paint a GNU Lesser General Public License (LGPL) 3-as verziÃ³ja alatt Ã©rhetÃµ el (lÃ¡sd www.gnu.org)" + IDS_INFOTEXT "A ReactOS Paint a GNU Lesser General Public License (LGPL) alatt Ã©rhetÃµ el (lÃ¡sd www.gnu.org)" IDS_SAVEPROMPTTEXT "KÃvÃ¡nja menteni %s vÃ¡ltozÃ¡sait?" IDS_DEFAULTFILENAME "NÃ©vtelen.bmp" IDS_MINIATURETITLE "MiniatÃºra" Modified: trunk/reactos/base/applications/mspaint/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/it-IT.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint per ReactOS" - IDS_INFOTEXT "Paint per ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" + IDS_INFOTEXT "Paint per ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Volete salvare le modifiche a %s?" IDS_DEFAULTFILENAME "SenzaNome.bmp" IDS_MINIATURETITLE "Miniature" Modified: trunk/reactos/base/applications/mspaint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "ãã¤ã³ã" IDS_WINDOWTITLE "%s - ãã¤ã³ã" IDS_INFOTITLE "ReactOS ãã¤ã³ã" - IDS_INFOTEXT "ReactOS ãã¤ã³ãã¯ GNU Lesser General Public License (LGPL) version 3 (è©³ç´°ã¯ www.gnu.org)ã®ä¸ã§å©ç¨å¯è½ã§ãã" + IDS_INFOTEXT "ReactOS ãã¤ã³ãã¯ GNU Lesser General Public License (LGPL, è©³ç´°ã¯ www.gnu.org)ã®ä¸ã§å©ç¨å¯è½ã§ãã" IDS_SAVEPROMPTTEXT "%s ã®å¤æ´åå®¹ãä¿åãã¾ãã?" IDS_DEFAULTFILENAME "ç¡é¡.bmp" IDS_MINIATURETITLE "ç¸®å°å³" Modified: trunk/reactos/base/applications/mspaint/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/nl-NL.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint for ReactOS" - IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" + IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Wilt u de wijzigingen die zijn aangebracht in %s opslaan?" IDS_DEFAULTFILENAME "Naamloos.bmp" IDS_MINIATURETITLE "Miniature" Modified: trunk/reactos/base/applications/mspaint/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/no-NO.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint for ReactOS" - IDS_INFOTEXT "Paint for ReactOS er nÃ¥ tilgjengelig under GNU Lesser General Public License (LGPL) versjon 3 (se http://www.gnu.org/home.nb.html)" + IDS_INFOTEXT "Paint for ReactOS er nÃ¥ tilgjengelig under GNU Lesser General Public License (LGPL, se http://www.gnu.org/home.nb.html)" IDS_SAVEPROMPTTEXT "Vil du lagre endringene til %s?" IDS_DEFAULTFILENAME "Utennavn.bmp" IDS_MINIATURETITLE "Miniature" Modified: trunk/reactos/base/applications/mspaint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/pl-PL.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -187,7 +187,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint dla ReactOS" - IDS_INFOTEXT "Paint dla ReactOS jest dostÄpny na licencji GNU Lesser General Public License (LGPL) wersja 3 (www.gnu.org)" + IDS_INFOTEXT "Paint dla ReactOS jest dostÄpny na licencji GNU Lesser General Public License (LGPL, www.gnu.org)" IDS_SAVEPROMPTTEXT "Czy chcesz zapisaÄ zmiany do %s?" IDS_DEFAULTFILENAME "bez tytuÅu.bmp" IDS_MINIATURETITLE "Miniatura" Modified: trunk/reactos/base/applications/mspaint/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/pt-BR.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint para ReactOS" - IDS_INFOTEXT "Paint para ReactOS estÃ¡ disponÃvel sob a licenÃ§a GNU Lesser General Public License (LGPL) versÃ£o 3 (visite www.gnu.org)" + IDS_INFOTEXT "Paint para ReactOS estÃ¡ disponÃvel sob a licenÃ§a GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Salvar as alteraÃ§Ãµes em %s?" IDS_DEFAULTFILENAME "Imagem.bmp" IDS_MINIATURETITLE "Miniatura" Modified: trunk/reactos/base/applications/mspaint/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/pt-PT.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint para ReactOS" - IDS_INFOTEXT "Paint para ReactOS estÃ¡ disponÃvel sob a licenÃ§a GNU Lesser General Public License (LGPL) versÃ£o 3 (visite www.gnu.org)" + IDS_INFOTEXT "Paint para ReactOS estÃ¡ disponÃvel sob a licenÃ§a GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Pretende guardar as alteraÃ§Ãµes a %s?" IDS_DEFAULTFILENAME "Imagem.bmp" IDS_MINIATURETITLE "Miniature" Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Pictare" IDS_WINDOWTITLE "%s - Pictare" IDS_INFOTITLE "Pictare pentru ReactOS" - IDS_INFOTEXT "Pictare pentru ReactOS este disponibilÄ sub licenÈa GNU Lesser General Public versiunea 3 (vedeÈi www.gnu.org)" + IDS_INFOTEXT "Pictare pentru ReactOS este disponibilÄ sub licenÈa GNU Lesser General Public (vedeÈi www.gnu.org)" IDS_SAVEPROMPTTEXT "DoriÈi pÄstrarea modificÄrilor din %s?" IDS_DEFAULTFILENAME "FÄrÄNume.bmp" IDS_MINIATURETITLE "MiniaturÄ" Modified: trunk/reactos/base/applications/mspaint/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ru-RU.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -178,7 +178,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint Ð´Ð»Ñ ReactOS" - IDS_INFOTEXT "Paint Ð´Ð»Ñ ReactOS ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÑÑÑ Ð¿Ð¾Ð´ Ð»Ð¸ÑÐµÐ½Ð·Ð¸ÐµÐ¹ GNU Lesser General Public License (LGPL) Ð²ÐµÑÑÐ¸Ð¸ 3 (ÑÐ¼. www.gnu.org)" + IDS_INFOTEXT "Paint Ð´Ð»Ñ ReactOS ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÑÑÑ Ð¿Ð¾Ð´ Ð»Ð¸ÑÐµÐ½Ð·Ð¸ÐµÐ¹ GNU Lesser General Public License (LGPL, ÑÐ¼. www.gnu.org)" IDS_SAVEPROMPTTEXT "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² %s?" IDS_DEFAULTFILENAME "ÐÐµÐ·_Ð¸Ð¼ÐµÐ½Ð¸.bmp" IDS_MINIATURETITLE "ÐÑÐºÐ¸Ð·" Modified: trunk/reactos/base/applications/mspaint/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/sk-SK.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -187,7 +187,7 @@ IDS_PROGRAMNAME "SkicÃ¡r" IDS_WINDOWTITLE "%s - SkicÃ¡r" IDS_INFOTITLE "SkicÃ¡r systÃ©mu ReactOS" - IDS_INFOTEXT "SkicÃ¡r systÃ©mu ReactOS je dostupnÃ½ za podmienok GNU Lesser General Public License (LGPL) verzia 3 (viÄ www.gnu.org)" + IDS_INFOTEXT "SkicÃ¡r systÃ©mu ReactOS je dostupnÃ½ za podmienok GNU Lesser General Public License (LGPL, viÄ www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uloÅ¾iÅ¥ vykonanÃ© zmeny do %s?" IDS_DEFAULTFILENAME "Bez nÃ¡zvu.bmp" IDS_MINIATURETITLE "Miniature" Modified: trunk/reactos/base/applications/mspaint/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/sq-AL.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint pÃ«r ReactOS" - IDS_INFOTEXT "Paint pÃ« ReactOS Ã«sht i disponueshem nÃ«n GNU Lesser General Public License (LGPL) versioni 3 (see www.gnu.org)" + IDS_INFOTEXT "Paint pÃ« ReactOS Ã«sht i disponueshem nÃ«n GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "A doni tÃ« ruani ndryshimet tek %s?" IDS_DEFAULTFILENAME "Unnamed.bmp" IDS_MINIATURETITLE "MiniaturÃ«" Modified: trunk/reactos/base/applications/mspaint/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/sv-SE.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -178,7 +178,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint fÃ¶r ReactOS" - IDS_INFOTEXT "Paint fÃ¶r ReactOS Ã¤r tillgÃ¤nglig under GNU Lesser General Public License (LGPL) version 3 (se www.gnu.org)" + IDS_INFOTEXT "Paint fÃ¶r ReactOS Ã¤r tillgÃ¤nglig under GNU Lesser General Public License (LGPL, se www.gnu.org)" IDS_SAVEPROMPTTEXT "Vill du spara Ã¤ndringarna till %s?" IDS_DEFAULTFILENAME "NamnlÃ¶s.bmp" IDS_MINIATURETITLE "Miniatyr" Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "GÃ¶rÃ¼ntÃ¼ DÃ¼zenleyicisi" IDS_WINDOWTITLE "%s - GÃ¶rÃ¼ntÃ¼ DÃ¼zenleyicisi" IDS_INFOTITLE "GÃ¶rÃ¼ntÃ¼ DÃ¼zenleyicisi" - IDS_INFOTEXT "GÃ¶rÃ¼ntÃ¼ DÃ¼zenleyicisi, GNU KÄ±sÄ±tlÄ± UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n (LGPL) 3. sÃ¼rÃ¼mÃ¼yle ruhsatlÄ±dÄ±r. (bkz: www.gnu.org)" + IDS_INFOTEXT "GÃ¶rÃ¼ntÃ¼ DÃ¼zenleyicisi, GNU KÄ±sÄ±tlÄ± UmÃ»mÃ® Kamu RuhsatÄ±'nÄ±n (LGPL). sÃ¼rÃ¼mÃ¼yle ruhsatlÄ±dÄ±r. (bkz: www.gnu.org)" IDS_SAVEPROMPTTEXT "%s iÃ§in yapÄ±lan deÄiÅiklikler kaydedilsin mi?" IDS_DEFAULTFILENAME "AdsÄ±z.bmp" IDS_MINIATURETITLE "KÃ¼Ã§Ã¼ÄÃ¼" Modified: trunk/reactos/base/applications/mspaint/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/uk-UA.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint Ð´Ð»Ñ ReactOS" - IDS_INFOTEXT "Paint Ð´Ð»Ñ ReactOS Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ð¹ Ð·Ð³ÑÐ´Ð½Ð¾ Ð· GNU Lesser General Public License (LGPL) Ð²ÐµÑÑÑÑ 3 (Ð´Ð¸Ð²ÑÑÑÑÑ www.gnu.org)" + IDS_INFOTEXT "Paint Ð´Ð»Ñ ReactOS Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ð¹ Ð·Ð³ÑÐ´Ð½Ð¾ Ð· GNU Lesser General Public License (LGPL, Ð´Ð¸Ð²ÑÑÑÑÑ www.gnu.org)" IDS_SAVEPROMPTTEXT "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ Ð·Ð¼ÑÐ½Ð¸ Ð´Ð¾ %s?" IDS_DEFAULTFILENAME "ÐÐµÐ·_ÑÐ¼ÐµÐ½Ñ.bmp" IDS_MINIATURETITLE "ÐÑÐ½ÑÐ°ÑÑÑÐ°" Modified: trunk/reactos/base/applications/mspaint/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/zh-CN.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "ç»å¾" IDS_WINDOWTITLE "%s - ç»å¾" IDS_INFOTITLE "ReactOS ç»å¾" - IDS_INFOTEXT "ReactOS ç»å¾æ¯å¨ GNU LGPL åè®®çæ¬ 3 ä¸åå¸ç (è¯¦è§ www.gnu.org)" + IDS_INFOTEXT "ReactOS ç»å¾æ¯å¨ GNU LGPL ä¸åå¸ç (è¯¦è§ www.gnu.org)" IDS_SAVEPROMPTTEXT "æ¨æ³ææ¹åä¿åå° %s åï¼" IDS_DEFAULTFILENAME "æªå½å.bmp" IDS_MINIATURETITLE "ç¼©ç¥å¾" Modified: trunk/reactos/base/applications/mspaint/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/zh-TW.rc [iso-8859-1] Sat Feb 8 19:22:31 2014 @@ -186,7 +186,7 @@ IDS_PROGRAMNAME "ç«å" IDS_WINDOWTITLE "%s - ç«å" IDS_INFOTITLE "ReactOS ç«å" - IDS_INFOTEXT "ReactOS ç«åæ¯å¨ GNU LGPL åè°çæ¬ 3 ä¸ç¼ä½ç (è©³è¦ www.gnu.org)" + IDS_INFOTEXT "ReactOS ç«åæ¯å¨ GNU LGPL ä¸ç¼ä½ç (è©³è¦ www.gnu.org)" IDS_SAVEPROMPTTEXT "æ¨æ³ææ¹è®ä¿åå° %s åï¼" IDS_DEFAULTFILENAME "æªå½å.bmp" IDS_MINIATURETITLE "ç¸®å"

1 0

[janderwald] 62056: - implement launching hardware properties dialog
by janderwald＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: janderwald Date: Sat Feb 8 19:10:07 2014 New Revision: 62056 URL: http://svn.reactos.org/svn/reactos?rev=62056&view=rev Log: - implement launching hardware properties dialog Modified: trunk/reactos/dll/win32/netshell/lanconnectui.cpp Modified: trunk/reactos/dll/win32/netshell/lanconnectui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] Sat Feb 8 19:10:07 2014 @@ -2,6 +2,7 @@ #include <netcfgx.h> #include <netcfgn.h> +#include <strsafe.h> /// CLASSID /// {7007ACC5-3202-11D1-AAD2-00805FC1270E} @@ -53,6 +54,7 @@ VOID EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type); VOID InitializeLANPropertiesUIDlg(HWND hwndDlg); VOID ShowNetworkComponentProperties(HWND hwndDlg); + BOOL GetDeviceInstanceID(OUT LPOLESTR *DeviceInstanceID); static INT_PTR CALLBACK LANPropertiesUIDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INetConnection * pCon; @@ -426,8 +428,72 @@ This->ShowNetworkComponentProperties(hwndDlg); return FALSE; } + else if (LOWORD(wParam) == IDC_CONFIGURE) + { + LPOLESTR DeviceInstanceID; + This = (CNetConnectionPropertyUi*)GetWindowLongPtr(hwndDlg, DWLP_USER); + + if (This->GetDeviceInstanceID(&DeviceInstanceID)) + { + WCHAR wszCmd[2*MAX_PATH]; + StringCbPrintfW(wszCmd, sizeof(wszCmd), L"rundll32.exe devmgr.dll,DeviceProperties_RunDLL /DeviceID %s", DeviceInstanceID); + CoTaskMemFree(DeviceInstanceID); + + STARTUPINFOW si; + PROCESS_INFORMATION pi; + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + if (!CreateProcessW(NULL, wszCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + break; + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + } break; } + return FALSE; +} + +BOOL +CNetConnectionPropertyUi::GetDeviceInstanceID( + OUT LPOLESTR *DeviceInstanceID) +{ + LPOLESTR pStr, pResult; + HKEY hKey; + DWORD dwInstanceID; + WCHAR szKeyName[2*MAX_PATH]; + WCHAR szInstanceID[2*MAX_PATH]; + + if (StringFromCLSID(pProperties->guidId, &pStr) != ERROR_SUCCESS) + { + // failed to convert guid to string + return FALSE; + } + + StringCbPrintfW(szKeyName, sizeof(szKeyName), L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection", pStr); + CoTaskMemFree(pStr); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKeyName, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + // failed to open key + return FALSE; + } + + dwInstanceID = sizeof(szInstanceID); + if (RegGetValueW(hKey, NULL, L"PnpInstanceId", RRF_RT_REG_SZ, NULL, (PVOID)szInstanceID, &dwInstanceID) == ERROR_SUCCESS) + { + szInstanceID[MAX_PATH-1] = L'\0'; + pResult = (LPOLESTR)CoTaskMemAlloc((wcslen(szInstanceID) + 1) * sizeof(WCHAR)); + if (pResult != 0) + { + wcscpy(pResult, szInstanceID); + *DeviceInstanceID = pResult; + RegCloseKey(hKey); + return TRUE; + } + } + RegCloseKey(hKey); return FALSE; } @@ -568,6 +634,7 @@ return E_POINTER; this->pCon = pCon; + pCon->AddRef(); return S_OK; }

1 0

[akhaldi] 62055: [SERVICES] * Prepare the CMake scripts for PCH. CORE-7716
by akhaldi＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: akhaldi Date: Sat Feb 8 19:01:04 2014 New Revision: 62055 URL: http://svn.reactos.org/svn/reactos?rev=62055&view=rev Log: [SERVICES] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/base/services/audiosrv/CMakeLists.txt trunk/reactos/base/services/eventlog/CMakeLists.txt trunk/reactos/base/services/rpcss/CMakeLists.txt trunk/reactos/base/services/svchost/CMakeLists.txt trunk/reactos/base/services/tcpsvcs/CMakeLists.txt trunk/reactos/base/services/wlansvc/CMakeLists.txt Modified: trunk/reactos/base/services/audiosrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/CMa… ============================================================================== --- trunk/reactos/base/services/audiosrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/CMakeLists.txt [iso-8859-1] Sat Feb 8 19:01:04 2014 @@ -1,14 +1,15 @@ -add_executable(audiosrv +list(APPEND SOURCE main.c pnp_list_manager.c pnp_list_lock.c pnp.c services.c debug.c - audiosrv.rc) + audiosrv.h) +add_executable(audiosrv ${SOURCE} audiosrv.rc) set_module_type(audiosrv win32cui UNICODE) -add_pch(audiosrv audiosrv.h) add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32) +add_pch(audiosrv audiosrv.h SOURCE) add_cd_file(TARGET audiosrv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/CMa… ============================================================================== --- trunk/reactos/base/services/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/CMakeLists.txt [iso-8859-1] Sat Feb 8 19:01:04 2014 @@ -1,20 +1,20 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/idl ${CMAKE_CURRENT_BINARY_DIR}) add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/eventlogrpc.idl) - list(APPEND SOURCE eventlog.c eventsource.c logport.c - eventlog.rc rpc.c file.c + eventlog.h ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_s.c) -add_executable(eventlog ${SOURCE}) +add_executable(eventlog ${SOURCE} eventlog.rc) if(NOT MSVC) target_link_libraries(eventlog ${PSEH_LIB}) @@ -22,5 +22,5 @@ set_module_type(eventlog win32cui UNICODE) add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_pch(eventlog eventlog.h) +add_pch(eventlog eventlog.h SOURCE) add_cd_file(TARGET eventlog DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/CMakeL… ============================================================================== --- trunk/reactos/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/CMakeLists.txt [iso-8859-1] Sat Feb 8 19:01:04 2014 @@ -9,13 +9,13 @@ irotp.c rpcss_main.c service_main.c - rpcss.rc + rpcss.h ${CMAKE_CURRENT_BINARY_DIR}/epm_s.c ${CMAKE_CURRENT_BINARY_DIR}/irot_s.c) include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) -add_executable(rpcss ${SOURCE}) +add_executable(rpcss ${SOURCE} rpcss.rc) target_link_libraries(rpcss ${PSEH_LIB} @@ -24,4 +24,5 @@ set_module_type(rpcss win32cui UNICODE) add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_pch(rpcss rpcss.h SOURCE) add_cd_file(TARGET rpcss DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/services/svchost/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/CMak… ============================================================================== --- trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] Sat Feb 8 19:01:04 2014 @@ -2,13 +2,18 @@ list(APPEND SOURCE globals.c registry.c - security.cxx rpcsrv.c netbios.c - svchost.c) + svchost.c + svchost.h) -add_executable(svchost ${SOURCE} svchost.rc) +add_executable(svchost + ${SOURCE} + security.cxx + svchost.rc) + target_link_libraries(svchost uuid) set_module_type(svchost win32cui UNICODE) add_importlibs(svchost advapi32 netapi32 rpcrt4 ole32 kernel32 ntdll) +add_pch(svchost svchost.h SOURCE) add_cd_file(TARGET svchost DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/services/tcpsvcs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/CMak… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] Sat Feb 8 19:01:04 2014 @@ -1,4 +1,3 @@ - list(APPEND SOURCE tcpsvcs.c @@ -8,15 +7,12 @@ daytime.c qotd.c chargen.c - tcpsvcs.rc - log.c) + log.c + tcpsvcs.h) -add_executable(tcpsvcs ${SOURCE}) - +add_executable(tcpsvcs ${SOURCE} tcpsvcs.rc) set_module_type(tcpsvcs win32cui UNICODE) add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll) -add_pch(tcpsvcs tcpsvcs.h) - - +add_pch(tcpsvcs tcpsvcs.h SOURCE) add_cd_file(TARGET tcpsvcs DESTINATION reactos/system32 FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/quotes DESTINATION reactos/system32/drivers/etc FOR all) Modified: trunk/reactos/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/CMak… ============================================================================== --- trunk/reactos/base/services/wlansvc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Sat Feb 8 19:01:04 2014 @@ -3,11 +3,13 @@ add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl) - -add_executable(wlansvc +list(APPEND SOURCE wlansvc.c rpcserver.c + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/wlansvc_s.c) + +add_executable(wlansvc ${SOURCE}) if(NOT MSVC) target_link_libraries(wlansvc ${PSEH_LIB}) @@ -15,4 +17,5 @@ set_module_type(wlansvc win32cui UNICODE) add_importlibs(wlansvc advapi32 rpcrt4 iphlpapi msvcrt kernel32 ntdll) +add_pch(wlansvc precomp.h SOURCE) add_cd_file(TARGET wlansvc DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 62054: [APPLICATIONS] * Prepare the CMake scripts for PCH. CORE-7716
by akhaldi＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: akhaldi Date: Sat Feb 8 18:13:52 2014 New Revision: 62054 URL: http://svn.reactos.org/svn/reactos?rev=62054&view=rev Log: [APPLICATIONS] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/base/applications/calc/CMakeLists.txt trunk/reactos/base/applications/charmap/CMakeLists.txt trunk/reactos/base/applications/dxdiag/CMakeLists.txt trunk/reactos/base/applications/fontview/CMakeLists.txt trunk/reactos/base/applications/games/solitaire/CMakeLists.txt trunk/reactos/base/applications/games/spider/CMakeLists.txt trunk/reactos/base/applications/games/winmine/CMakeLists.txt trunk/reactos/base/applications/logoff/CMakeLists.txt trunk/reactos/base/applications/magnify/CMakeLists.txt trunk/reactos/base/applications/mmc/CMakeLists.txt trunk/reactos/base/applications/msconfig/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt trunk/reactos/base/applications/mspaint/CMakeLists.txt trunk/reactos/base/applications/mstsc/CMakeLists.txt trunk/reactos/base/applications/network/finger/CMakeLists.txt trunk/reactos/base/applications/network/ftp/CMakeLists.txt trunk/reactos/base/applications/network/net/CMakeLists.txt trunk/reactos/base/applications/network/nslookup/CMakeLists.txt trunk/reactos/base/applications/network/telnet/CMakeLists.txt trunk/reactos/base/applications/notepad/CMakeLists.txt trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/regedit/CMakeLists.txt trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt trunk/reactos/base/applications/shutdown/CMakeLists.txt trunk/reactos/base/applications/sndrec32/CMakeLists.txt trunk/reactos/base/applications/sndvol32/CMakeLists.txt trunk/reactos/base/applications/taskmgr/CMakeLists.txt trunk/reactos/base/applications/winhlp32/CMakeLists.txt Modified: trunk/reactos/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/CMa… ============================================================================== --- trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -1,19 +1,20 @@ add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1) -add_executable(calc +list(APPEND SOURCE about.c convert.c function.c rpn.c utl.c winmain.c - resource.rc) + calc.h) +add_executable(calc ${SOURCE} resource.rc) set_module_type(calc win32gui UNICODE) add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32) if(MSVC) add_importlibs(calc ntdll) endif() -add_pch(calc calc.h) +add_pch(calc calc.h SOURCE) add_cd_file(TARGET calc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -5,10 +5,10 @@ lrgcell.c map.c settings.c - charmap.rc) + precomp.h) -add_executable(charmap ${SOURCE}) +add_executable(charmap ${SOURCE} charmap.rc) set_module_type(charmap win32gui UNICODE) add_importlibs(charmap advapi32 user32 gdi32 comctl32 msvcrt kernel32) -add_pch(charmap precomp.h) +add_pch(charmap precomp.h SOURCE) add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/C… ============================================================================== --- trunk/reactos/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -8,16 +8,16 @@ network.c help.c dxdiag.c - dxdiag.rc ddtest.c d3dtest.c d3dtest7.c d3dtest8.c - d3dtest9.c) + d3dtest9.c + precomp.h) -add_executable(dxdiag ${SOURCE}) +add_executable(dxdiag ${SOURCE} dxdiag.rc) set_module_type(dxdiag win32gui UNICODE) target_link_libraries(dxdiag dxguid) add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32 ntdll) -add_pch(dxdiag precomp.h) +add_pch(dxdiag precomp.h SOURCE) add_cd_file(TARGET dxdiag DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/fontview/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -1,9 +1,11 @@ -add_executable(fontview +list(APPEND SOURCE display.c fontview.c - fontview.rc) + precomp.h) +add_executable(fontview ${SOURCE} fontview.rc) set_module_type(fontview win32gui) add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32) +add_pch(fontview precomp.h SOURCE) add_cd_file(TARGET fontview DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -3,14 +3,15 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib) -add_executable(sol +list(APPEND SOURCE solcreate.cpp solgame.cpp solitaire.cpp - rsrc.rc) + solitaire.h) +add_executable(sol ${SOURCE} rsrc.rc) target_link_libraries(sol cardlib) -add_pch(sol solitaire.h) set_module_type(sol win32gui UNICODE) add_importlibs(sol advapi32 comctl32 user32 gdi32 msvcrt kernel32) +add_pch(sol solitaire.h SOURCE) add_cd_file(TARGET sol DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/games/spider/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -5,13 +5,14 @@ ${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib ${CMAKE_CURRENT_SOURCE_DIR}) -add_executable(spider +list(APPEND SOURCE spider.cpp spigame.cpp - rsrc.rc) + spider.h) +add_executable(spider ${SOURCE} rsrc.rc) target_link_libraries(spider cardlib) -add_pch(spider spider.h) +add_pch(spider spider.h SOURCE) set_module_type(spider win32gui UNICODE) add_importlibs(spider advapi32 comctl32 user32 gdi32 msvcrt kernel32) add_cd_file(TARGET spider DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/games/winmine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -1,12 +1,14 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -add_executable(winmine +list(APPEND SOURCE main.c dialog.c - rsrc.rc) + main.h) +add_executable(winmine ${SOURCE} rsrc.rc) set_module_type(winmine win32gui) target_link_libraries(winmine wine) add_importlibs(winmine user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll) +add_pch(winmine main.h SOURCE) add_cd_file(TARGET winmine DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/logoff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/C… ============================================================================== --- trunk/reactos/base/applications/logoff/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -2,10 +2,10 @@ list(APPEND SOURCE misc.c logoff.c - logoff.rc) + precomp.h) -add_executable(logoff ${SOURCE}) +add_executable(logoff ${SOURCE} logoff.rc) set_module_type(logoff win32cui) add_importlibs(logoff advapi32 user32 msvcrt kernel32) -add_pch(logoff precomp.h) +add_pch(logoff precomp.h SOURCE) add_cd_file(TARGET logoff DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/magnify/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -1,10 +1,11 @@ -add_executable(magnify +list(APPEND SOURCE magnifier.c settings.c - magnify.rc) + magnifier.h) -add_pch(magnify magnifier.h) +add_executable(magnify ${SOURCE} magnify.rc) set_module_type(magnify win32gui) add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32) +add_pch(magnify magnifier.h SOURCE) add_cd_file(TARGET magnify DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/CMak… ============================================================================== --- trunk/reactos/base/applications/mmc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -3,9 +3,9 @@ console.c misc.c mmc.c - mmc.rc) + precomp.h) -add_executable(mmcclient ${SOURCE}) +add_executable(mmcclient ${SOURCE} mmc.rc) set_module_type(mmcclient win32gui UNICODE) add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32) -add_pch(mmcclient precomp.h) +add_pch(mmcclient precomp.h SOURCE) Modified: trunk/reactos/base/applications/msconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -7,10 +7,10 @@ freeldrpage.c generalpage.c msconfig.c - msconfig.rc) + precomp.h) -add_executable(msconfig ${SOURCE}) +add_executable(msconfig ${SOURCE} msconfig.rc) set_module_type(msconfig win32gui UNICODE) add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32) -add_pch(msconfig precomp.h) +add_pch(msconfig precomp.h SOURCE) add_cd_file(TARGET msconfig DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -5,10 +5,10 @@ enumdevices.c mainwnd.c misc.c - devmgmt.rc) + precomp.h) -add_executable(devmgmt ${SOURCE}) +add_executable(devmgmt ${SOURCE} devmgmt.rc) set_module_type(devmgmt win32gui UNICODE) add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) -add_pch(devmgmt precomp.h) +add_pch(devmgmt precomp.h SOURCE) add_cd_file(TARGET devmgmt DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -19,10 +19,10 @@ start.c stop.c stop_dependencies.c - servman.rc) + precomp.h) -add_executable(servman ${SOURCE}) +add_executable(servman ${SOURCE} servman.rc) set_module_type(servman win32gui UNICODE) add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) -add_pch(servman precomp.h) +add_pch(servman precomp.h SOURCE) add_cd_file(TARGET servman DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -1,5 +1,5 @@ -add_executable(mspaint +list(APPEND SOURCE dialogs.c dib.c drawing.c @@ -12,9 +12,10 @@ sizebox.c toolsettings.c winproc.c - rsrc.rc) + precomp.h) +add_executable(mspaint ${SOURCE} rsrc.rc) set_module_type(mspaint win32gui UNICODE) -add_pch(mspaint precomp.h) add_importlibs(mspaint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) +add_pch(mspaint precomp.h SOURCE) add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/CM… ============================================================================== --- trunk/reactos/base/applications/mstsc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -19,10 +19,10 @@ tcp.c uimain.c win32.c - rdc.rc) + precomp.h) -add_executable(mstsc ${SOURCE}) +add_executable(mstsc ${SOURCE} rdc.rc) set_module_type(mstsc win32gui UNICODE) add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32) -add_pch(mstsc precomp.h) +add_pch(mstsc precomp.h SOURCE) add_cd_file(TARGET mstsc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/finger/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/finger/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/finger/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -1,14 +1,15 @@ add_definitions(-D__USE_W32_SOCKETS) -add_executable(finger +list(APPEND SOURCE finger.c err.c getopt.c net.c - finger.rc) + precomp.h) +add_executable(finger ${SOURCE} finger.rc) set_module_type(finger win32cui) -add_pch(finger precomp.h) add_importlibs(finger ws2_32 msvcrt kernel32) +add_pch(finger precomp.h SOURCE) add_cd_file(TARGET finger DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/ftp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -1,7 +1,7 @@ add_definitions(-Dlint) -add_executable(ftp +list(APPEND SOURCE cmds.c cmdtab.c domacro.c @@ -9,11 +9,12 @@ ftp.c main.c ruserpass.c - ftp.rc) + precomp.h) +add_executable(ftp ${SOURCE} ftp.rc) set_module_type(ftp win32cui) add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32) -add_pch(ftp precomp.h) +add_pch(ftp precomp.h SOURCE) if(MSVC) target_link_libraries(ftp oldnames) Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -8,11 +8,11 @@ cmdHelpMsg.c cmdPause.c cmdContinue.c - help.c) + help.c + net.h) add_executable(net ${SOURCE}) - set_module_type(net win32cui UNICODE) -add_pch(net net.h) add_importlibs(net advapi32 msvcrt kernel32) +add_pch(net net.h SOURCE) add_cd_file(TARGET net DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/nslookup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/nslookup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/nslookup/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -1,10 +1,11 @@ -add_executable(nslookup +list(APPEND SOURCE nslookup.c utility.c - nslookup.rc) + nslookup.h) -add_pch(nslookup nslookup.h) +add_executable(nslookup ${SOURCE} nslookup.rc) set_module_type(nslookup win32cui) add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32) +add_pch(nslookup nslookup.h SOURCE) add_cd_file(TARGET nslookup DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -3,7 +3,7 @@ add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) -add_executable(telnet +list(APPEND SOURCE src/ansiprsr.cpp src/keytrans.cpp src/tcharmap.cpp @@ -23,13 +23,14 @@ src/tscript.cpp src/tscroll.cpp src/ttelhndl.cpp - telnet.rc) - -set_module_type(telnet win32cui) -add_pch(telnet src/precomp.h) -add_importlibs(telnet ws2_32 user32 msvcrt kernel32 ntdll) -add_cd_file(TARGET telnet DESTINATION reactos/system32 FOR all) + precomp.h) if(NOT MSVC) add_compile_flags_language("-Wno-narrowing" "CXX") endif() + +add_executable(telnet ${SOURCE} telnet.rc) +set_module_type(telnet win32cui) +add_importlibs(telnet ws2_32 user32 msvcrt kernel32 ntdll) +add_pch(telnet precomp.h SOURCE) +add_cd_file(TARGET telnet DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/notepad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -4,10 +4,10 @@ main.c settings.c text.c - rsrc.rc) + notepad.h) -add_executable(notepad ${SOURCE}) +add_executable(notepad ${SOURCE} rsrc.rc) set_module_type(notepad win32gui UNICODE) add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32) -add_pch(notepad notepad.h) +add_pch(notepad notepad.h SOURCE) add_cd_file(TARGET notepad DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -15,13 +15,13 @@ toolbar.c treeview.c winmain.c - rapps.rc) + rapps.h) -add_executable(rapps ${SOURCE}) -add_pch(rapps rapps.h) +add_executable(rapps ${SOURCE} rapps.rc) set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps uuid) add_importlibs(rapps advapi32 comctl32 gdi32 urlmon wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) +add_pch(rapps rapps.h SOURCE) add_dependencies(rapps rappsmsg) add_message_headers(ANSI rappsmsg.mc) add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -16,12 +16,12 @@ security.c settings.c treeview.c - regedit.rc) + regedit.h) -add_executable(regedit ${SOURCE}) +add_executable(regedit ${SOURCE} regedit.rc) set_module_type(regedit win32gui UNICODE) target_link_libraries(regedit uuid) add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32) -add_pch(regedit regedit.h) +add_pch(regedit regedit.h SOURCE) add_cd_file(TARGET regedit DESTINATION reactos FOR all) #add_subdirectory(clb) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -10,11 +10,10 @@ sc.c start.c usage.c - sc.rc) + sc.h) -add_executable(sc ${SOURCE}) - +add_executable(sc ${SOURCE} sc.rc) set_module_type(sc win32cui UNICODE) add_importlibs(sc advapi32 msvcrt kernel32) -add_pch(sc sc.h) +add_pch(sc sc.h SOURCE) add_cd_file(TARGET sc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -1,12 +1,13 @@ -add_executable(3dtext +list(APPEND SOURCE 3dtext.c settings.c - rsrc.rc) + 3dtext.h) +add_executable(3dtext ${SOURCE} rsrc.rc) set_module_type(3dtext win32gui UNICODE) -add_pch(3dtext 3dtext.h) set_target_properties(3dtext PROPERTIES SUFFIX ".scr") target_link_libraries(3dtext scrnsave) add_importlibs(3dtext user32 gdi32 opengl32 glu32 advapi32 msvcrt kernel32) +add_pch(3dtext 3dtext.h SOURCE) add_cd_file(TARGET 3dtext DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/shutdown/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -3,10 +3,10 @@ gui.c misc.c shutdown.c - shutdown.rc) + precomp.h) -add_executable(shutdown ${SOURCE}) +add_executable(shutdown ${SOURCE} shutdown.rc) set_module_type(shutdown win32cui UNICODE) add_importlibs(shutdown advapi32 user32 msvcrt powrprof kernel32) -add_pch(shutdown precomp.h) +add_pch(shutdown precomp.h SOURCE) add_cd_file(TARGET shutdown DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -1,7 +1,7 @@ set_cpp(WITH_RUNTIME) -add_executable(sndrec32 +list(APPEND SOURCE audio_format.cpp audio_membuffer.cpp #audio_producer.cpp @@ -10,8 +10,10 @@ audio_wavein.cpp audio_waveout.cpp sndrec32.cpp - rsrc.rc) + stdafx.h) +add_executable(sndrec32 ${SOURCE} rsrc.rc) set_module_type(sndrec32 win32gui UNICODE) add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32 shell32) +add_pch(sndrec32 stdafx.h SOURCE) add_cd_file(TARGET sndrec32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -4,10 +4,10 @@ misc.c mixer.c sndvol32.c - sndvol32.rc) + sndvol32.h) -add_executable(sndvol32 ${SOURCE}) +add_executable(sndvol32 ${SOURCE} sndvol32.rc) set_module_type(sndvol32 win32gui UNICODE) add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll) -add_pch(sndvol32 sndvol32.h) +add_pch(sndvol32 sndvol32.h SOURCE) add_cd_file(TARGET sndvol32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -18,10 +18,10 @@ trayicon.c taskmgr.c graphctl.c - taskmgr.rc) + precomp.h) -add_executable(taskmgr ${SOURCE}) +add_executable(taskmgr ${SOURCE} taskmgr.rc) set_module_type(taskmgr win32gui UNICODE) add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll) -add_pch(taskmgr precomp.h) +add_pch(taskmgr precomp.h SOURCE) add_cd_file(TARGET taskmgr DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Sat Feb 8 18:13:52 2014 @@ -12,11 +12,16 @@ hlpfile.c macro.c macro.lex.yy.c + winhelp.c + winhelp.h) + +add_executable(winhlp32 + ${SOURCE} string.c - winhelp.c) + rsrc.rc) -add_executable(winhlp32 ${SOURCE} rsrc.rc) set_module_type(winhlp32 win32gui) target_link_libraries(winhlp32 wine) add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) +add_pch(winhlp32 winhelp.h SOURCE) add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs