Ros-diffs October 2012

ros-diffs@reactos.org

14 participants
211 discussions

[hbelusca] 57570: [NTDLL/KERNEL32/CSRSRV/WIN32K/USER32/WIN32CSR] - Use the new messaging structures and the new macros, plus the new CSR_API function's signature (--> and rename some variables). - ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 17 23:10:40 2012 New Revision: 57570 URL: http://svn.reactos.org/svn/reactos?rev=57570&view=rev Log: [NTDLL/KERNEL32/CSRSRV/WIN32K/USER32/WIN32CSR] - Use the new messaging structures and the new macros, plus the new CSR_API function's signature (--> and rename some variables). - Code cleaning & formatting. [CSRSS/NDK] - Reorganize all the header files in logical units (server.h for server-side of CSR, client.h for client-side, and msg.h for messaging), removing duplicated definitions. - Code cleaning & formatting. The next step would be to activate the code of server-dll loading inside csrsrv, then moving all the console-related APIs from win32csr to winsrv, the latter built with the same structure as csrsrv's. Added: branches/ros-csrss/include/reactos/subsys/csrss/client.h (with props) branches/ros-csrss/include/reactos/subsys/csrss/csrcons.h (with props) branches/ros-csrss/include/reactos/subsys/csrss/msg.h (with props) branches/ros-csrss/include/reactos/subsys/csrss/server.h (contents, props changed) - copied, changed from r57561, branches/ros-csrss/include/reactos/subsys/csr/server.h Removed: branches/ros-csrss/include/reactos/subsys/csr/ Modified: branches/ros-csrss/dll/ntdll/csr/api.c branches/ros-csrss/dll/ntdll/csr/connect.c branches/ros-csrss/dll/ntdll/include/ntdll.h branches/ros-csrss/dll/ntdll/include/ntdllp.h branches/ros-csrss/dll/win32/kernel32/CMakeLists.txt branches/ros-csrss/dll/win32/kernel32/client/dllmain.c branches/ros-csrss/dll/win32/kernel32/client/dosdev.c branches/ros-csrss/dll/win32/kernel32/client/file/console.c branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c branches/ros-csrss/dll/win32/kernel32/client/file/filename.c branches/ros-csrss/dll/win32/kernel32/client/proc.c branches/ros-csrss/dll/win32/kernel32/client/vdm.c branches/ros-csrss/dll/win32/kernel32/client/vista.c branches/ros-csrss/dll/win32/kernel32/k32.h branches/ros-csrss/include/ndk/umfuncs.h branches/ros-csrss/include/ndk/umtypes.h branches/ros-csrss/include/reactos/subsys/csrss/csrss.h (contents, props changed) branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/process.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/user.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/wapi.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/server.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/thredsup.c branches/ros-csrss/subsystems/win32/csrss/include/api.h branches/ros-csrss/win32ss/pch.h branches/ros-csrss/win32ss/user/ntuser/csr.c branches/ros-csrss/win32ss/user/ntuser/desktop.c branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/user32/include/user32.h branches/ros-csrss/win32ss/user/user32/include/user_x.h branches/ros-csrss/win32ss/user/user32/misc/exit.c branches/ros-csrss/win32ss/user/user32/misc/misc.c branches/ros-csrss/win32ss/user/win32csr/alias.c branches/ros-csrss/win32ss/user/win32csr/coninput.c branches/ros-csrss/win32ss/user/win32csr/conoutput.c branches/ros-csrss/win32ss/user/win32csr/console.c branches/ros-csrss/win32ss/user/win32csr/desktopbg.c branches/ros-csrss/win32ss/user/win32csr/exitros.c branches/ros-csrss/win32ss/user/win32csr/file.c branches/ros-csrss/win32ss/user/win32csr/handle.c branches/ros-csrss/win32ss/user/win32csr/lineinput.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/api.c?r… Modified: branches/ros-csrss/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect… Modified: branches/ros-csrss/dll/ntdll/include/ntdll.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/include/ntd… Modified: branches/ros-csrss/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/include/ntd… Modified: branches/ros-csrss/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/CM… Modified: branches/ros-csrss/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/file/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/k3… Modified: branches/ros-csrss/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ndk/umfuncs.h… Modified: branches/ros-csrss/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ndk/umtypes.h… Added: branches/ros-csrss/include/reactos/subsys/csrss/client.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Added: branches/ros-csrss/include/reactos/subsys/csrss/csrcons.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Modified: branches/ros-csrss/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Added: branches/ros-csrss/include/reactos/subsys/csrss/msg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Copied: branches/ros-csrss/include/reactos/subsys/csrss/server.h (from r57561, branches/ros-csrss/include/reactos/subsys/csr/server.h) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/user.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/pch.h?rev=575… Modified: branches/ros-csrss/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/d… Modified: branches/ros-csrss/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s… Modified: branches/ros-csrss/win32ss/user/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/i… Modified: branches/ros-csrss/win32ss/user/user32/include/user_x.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/i… Modified: branches/ros-csrss/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… Modified: branches/ros-csrss/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… Modified: branches/ros-csrss/win32ss/user/win32csr/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… Modified: branches/ros-csrss/win32ss/user/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… Modified: branches/ros-csrss/win32ss/user/win32csr/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… Modified: branches/ros-csrss/win32ss/user/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… Modified: branches/ros-csrss/win32ss/user/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… Modified: branches/ros-csrss/win32ss/user/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… Modified: branches/ros-csrss/win32ss/user/win32csr/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… Modified: branches/ros-csrss/win32ss/user/win32csr/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… Modified: branches/ros-csrss/win32ss/user/win32csr/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…

12 years, 2 months

[hbelusca] 57569: [BOOTDATA] Revert r57562; it is better to perform tests...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 17 22:19:29 2012 New Revision: 57569 URL: http://svn.reactos.org/svn/reactos?rev=57569&view=rev Log: [BOOTDATA] Revert r57562; it is better to perform tests... Modified: branches/ros-csrss/base/CMakeLists.txt branches/ros-csrss/base/shell/CMakeLists.txt branches/ros-csrss/boot/bootdata/hivedef_amd64.inf branches/ros-csrss/boot/bootdata/hivedef_arm.inf branches/ros-csrss/boot/bootdata/hivedef_i386.inf branches/ros-csrss/boot/bootdata/hivesft_amd64.inf branches/ros-csrss/boot/bootdata/hivesft_arm.inf branches/ros-csrss/boot/bootdata/hivesft_i386.inf Modified: branches/ros-csrss/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/CMakeLists.txt?r… ============================================================================== --- branches/ros-csrss/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/base/CMakeLists.txt [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1,5 +1,5 @@ -#add_subdirectory(applications) +add_subdirectory(applications) add_subdirectory(services) add_subdirectory(setup) add_subdirectory(shell) Modified: branches/ros-csrss/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/CMakeLists… ============================================================================== --- branches/ros-csrss/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/base/shell/CMakeLists.txt [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1,7 +1,7 @@ add_subdirectory(cmd) -#if(NOT MSVC) -#add_subdirectory(explorer) -#endif() -#add_subdirectory(explorer-new) +if(NOT MSVC) +add_subdirectory(explorer) +endif() +add_subdirectory(explorer-new) Modified: branches/ros-csrss/boot/bootdata/hivedef_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivedef_amd64.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_amd64.inf [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1649,7 +1649,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012 Modified: branches/ros-csrss/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_arm.inf [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1453,7 +1453,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKCU,"SOFTWARE\Microsoft\Windows NT",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion",,0x00000012 Modified: branches/ros-csrss/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_i386.inf [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1649,7 +1649,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012 Modified: branches/ros-csrss/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesft… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1023,7 +1023,7 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" Modified: branches/ros-csrss/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesft… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesft_arm.inf [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -948,7 +948,7 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" Modified: branches/ros-csrss/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesft… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesft_i386.inf [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1059,7 +1059,7 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe"

12 years, 2 months

[ekohl] 57568: [LSASRV] - Add well-known account names "LOCALSERVICE" and "NETWORKSERVICE" as aliases of "LOCAL SERVICE" and "NETWORKSERVICE". They can be found on a german Windows XP. - Remove a p...

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Oct 17 20:16:06 2012 New Revision: 57568 URL: http://svn.reactos.org/svn/reactos?rev=57568&view=rev Log: [LSASRV] - Add well-known account names "LOCALSERVICE" and "NETWORKSERVICE" as aliases of "LOCAL SERVICE" and "NETWORKSERVICE". They can be found on a german Windows XP. - Remove a part LsaLookupSids that returned "UNKNOWN\Test" for unknown SIDs. Was used for tests only. Modified: trunk/reactos/dll/win32/lsasrv/sids.c Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Wed Oct 17 20:16:06 2012 @@ -472,12 +472,26 @@ L"NT AUTHORITY", SidTypeWellKnownGroup); + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"LOCALSERVICE", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + /* Network Service Sid */ SubAuthorities[0] = SECURITY_NETWORK_SERVICE_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, L"NETWORK SERVICE", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"NETWORKSERVICE", L"NT AUTHORITY", SidTypeWellKnownGroup); @@ -2062,82 +2076,6 @@ } -static NTSTATUS -LsapLookupUnknownSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, - PLSAPR_TRANSLATED_NAME_EX NamesBuffer, - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, - PULONG Mapped) -{ - SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; - static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"UNKNOWN"); - static const UNICODE_STRING AdminName = RTL_CONSTANT_STRING(L"Test"); - PSID AdminsSid = NULL; - LPWSTR SidString = NULL; - ULONG SidLength; - ULONG DomainIndex; - ULONG i; - NTSTATUS Status; - - Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, - &AdminsSid); - if (!NT_SUCCESS(Status)) - goto done; - - SidLength = RtlLengthSid(AdminsSid); - - for (i = 0; i < SidEnumBuffer->Entries; i++) - { - /* Ignore SIDs which are already mapped */ - if (NamesBuffer[i].Use != SidTypeUnknown) - continue; - - - ConvertSidToStringSidW(SidEnumBuffer->SidInfo[i].Sid, &SidString); - TRACE("Mapping SID: %S\n", SidString); - LocalFree(SidString); - SidString = NULL; - - - /* Hack: Map the SID to the Admin Account if it is not a well-known SID */ - NamesBuffer[i].Use = SidTypeUser; - NamesBuffer[i].Flags = 0; - NamesBuffer[i].Name.Length = AdminName.Length; - NamesBuffer[i].Name.MaximumLength = AdminName.MaximumLength; - NamesBuffer[i].Name.Buffer = MIDL_user_allocate(AdminName.MaximumLength); - if (NamesBuffer[i].Name.Buffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - RtlCopyMemory(NamesBuffer[i].Name.Buffer, AdminName.Buffer, AdminName.MaximumLength); - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - (PUNICODE_STRING)&DomainName, - AdminsSid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - NamesBuffer[i].DomainIndex = DomainIndex; - - TRACE("Mapped to: %wZ\n", &NamesBuffer[i].Name); - - (*Mapped)++; - } - -done: - if (AdminsSid != NULL) - RtlFreeSid(AdminsSid); - - return Status; -} - - NTSTATUS LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -2229,16 +2167,6 @@ if (Mapped == SidEnumBuffer->Entries) goto done; - /* Map unknown SIDs */ - Status = LsapLookupUnknownSids(SidEnumBuffer, - NamesBuffer, - DomainsBuffer, - &Mapped); - if (!NT_SUCCESS(Status) && - Status != STATUS_NONE_MAPPED && - Status != STATUS_SOME_NOT_MAPPED) - goto done; - done: TRACE("done Status: %lx Mapped: %lu\n", Status, Mapped);

12 years, 2 months

[jgardou] 57567: [SHELL32] - Beautify some code, plug icons leak and improve error handling

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 16 14:28:08 2012 New Revision: 57567 URL: http://svn.reactos.org/svn/reactos?rev=57567&view=rev Log: [SHELL32] - Beautify some code, plug icons leak and improve error handling Modified: trunk/reactos/dll/win32/shell32/iconcache.cpp Modified: trunk/reactos/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] Tue Oct 16 14:28:08 2012 @@ -367,6 +367,7 @@ LeaveCriticalSection(&SHELL32_SicCS); return ret; } + /***************************************************************************** * SIC_Initialize [internal] */ @@ -378,6 +379,7 @@ HDC hDC; INT bpp; DWORD ilMask; + BOOL result = FALSE; TRACE("Entered SIC_Initialize\n"); @@ -397,11 +399,11 @@ if (!hDC) { ERR("Failed to create information context (error %d)\n", GetLastError()); - return FALSE; + goto end; } bpp = GetDeviceCaps(hDC, BITSPIXEL); - ReleaseDC(NULL, hDC); + DeleteDC(hDC); if (bpp <= 4) ilMask = ILC_COLOR4; @@ -428,61 +430,83 @@ ilMask, 100, 100); + if (!ShellSmallIconList) + { + ERR("Failed to create the small icon list.\n"); + goto end; + } ShellBigIconList = ImageList_Create(cx_large, cy_large, ilMask, 100, 100); - if (ShellSmallIconList) - { - /* Load the document icon, which is used as the default if an icon isn't found. */ - hSm = (HICON)LoadImageW(shell32_hInstance, - MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), - IMAGE_ICON, - cx_small, - cy_small, - LR_SHARED | LR_DEFAULTCOLOR); - if (!hSm) - { - ERR("Failed to load IDI_SHELL_DOCUMENT icon1!\n"); - return FALSE; - } - } - else - { - ERR("Failed to load ShellSmallIconList\n"); - return FALSE; - } - - if (ShellBigIconList) - { - hLg = (HICON)LoadImageW(shell32_hInstance, - MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), - IMAGE_ICON, - cx_large, - cy_large, - LR_SHARED | LR_DEFAULTCOLOR); - if (!hLg) - { - ERR("Failed to load IDI_SHELL_DOCUMENT icon2!\n"); - DestroyIcon(hSm); - return FALSE; - } - } - else - { - ERR("Failed to load ShellBigIconList\n"); - return FALSE; - } - - SIC_IconAppend(swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); - SIC_IconAppend(swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); + if (!ShellBigIconList) + { + ERR("Failed to create the big icon list.\n"); + goto end; + } + + /* Load the document icon, which is used as the default if an icon isn't found. */ + hSm = (HICON)LoadImageW(shell32_hInstance, + MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), + IMAGE_ICON, + cx_small, + cy_small, + LR_SHARED | LR_DEFAULTCOLOR); + if (!hSm) + { + ERR("Failed to load small IDI_SHELL_DOCUMENT icon!\n"); + goto end; + } + + hLg = (HICON)LoadImageW(shell32_hInstance, + MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), + IMAGE_ICON, + cx_large, + cy_large, + LR_SHARED | LR_DEFAULTCOLOR); + if (!hLg) + { + ERR("Failed to load large IDI_SHELL_DOCUMENT icon!\n"); + goto end; + } + + if(SIC_IconAppend(swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0) == INVALID_INDEX) + { + ERR("Failed to add IDI_SHELL_DOCUMENT icon to cache.\n"); + goto end; + } + if(SIC_IconAppend(swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0) == INVALID_INDEX) + { + ERR("Failed to add IDI_SHELL_DOCUMENT icon to cache.\n"); + goto end; + } + + /* Everything went fine */ + result = TRUE; + +end: + /* The image list keeps a copy of the icons, we must destroy them */ + if(hSm) DestroyIcon(hSm); + if(hLg) DestroyIcon(hLg); + + /* Clean everything if something went wrong */ + if(!result) + { + if(sic_hdpa) DPA_Destroy(sic_hdpa); + if(ShellSmallIconList) ImageList_Destroy(ShellSmallIconList); + if(ShellBigIconList) ImageList_Destroy(ShellSmallIconList); + sic_hdpa = NULL; + ShellSmallIconList = NULL; + ShellBigIconList = NULL; + } TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList); - return TRUE; -} + return result; +} + /************************************************************************* * SIC_Destroy *

12 years, 2 months

[tfaber] 57566: [WIDL] - Forward-declare coclasses as 'class' in C++ to fix MSVC warnings. Already applied upstream. CORE-6587 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Oct 16 06:43:32 2012 New Revision: 57566 URL: http://svn.reactos.org/svn/reactos?rev=57566&view=rev Log: [WIDL] - Forward-declare coclasses as 'class' in C++ to fix MSVC warnings. Already applied upstream. CORE-6587 #resolve Modified: trunk/reactos/tools/widl/header.c Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=57… ============================================================================== --- trunk/reactos/tools/widl/header.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.c [iso-8859-1] Tue Oct 16 06:43:32 2012 @@ -1300,7 +1300,11 @@ { fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", cocl->name); fprintf(header, "#define __%s_FWD_DEFINED__\n", cocl->name); + fprintf(header, "#ifdef __cplusplus\n"); + fprintf(header, "typedef class %s %s;\n", cocl->name, cocl->name); + fprintf(header, "#else\n"); fprintf(header, "typedef struct %s %s;\n", cocl->name, cocl->name); + fprintf(header, "#endif /* defined __cplusplus */\n"); fprintf(header, "#endif /* defined __%s_FWD_DEFINED__ */\n\n", cocl->name ); }

12 years, 2 months

[fireball] 57565: - Update diff to trunk. - Now it all builds with consistent version (and that, in fact, fixed at least a couple of bugs).

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 15 14:30:55 2012 New Revision: 57565 URL: http://svn.reactos.org/svn/reactos?rev=57565&view=rev Log: - Update diff to trunk. - Now it all builds with consistent version (and that, in fact, fixed at least a couple of bugs). Modified: branches/arwinss/trunk.diff Modified: branches/arwinss/trunk.diff URL: http://svn.reactos.org/svn/reactos/branches/arwinss/trunk.diff?rev=57565&r1… ============================================================================== --- branches/arwinss/trunk.diff [iso-8859-1] (original) +++ branches/arwinss/trunk.diff [iso-8859-1] Mon Oct 15 14:30:55 2012 @@ -1,6 +1,6 @@ Index: base/shell/explorer/desktop/desktop.cpp =================================================================== ---- base/shell/explorer/desktop/desktop.cpp (revision 57368) +--- base/shell/explorer/desktop/desktop.cpp (revision 57501) +++ base/shell/explorer/desktop/desktop.cpp (working copy) @@ -327,8 +327,8 @@ HWND DesktopWindow::Create() @@ -15,7 +15,7 @@ int height = GetSystemMetrics(SM_CYSCREEN); Index: cmake/baseaddress.cmake =================================================================== ---- cmake/baseaddress.cmake (revision 57368) +--- cmake/baseaddress.cmake (revision 57501) +++ cmake/baseaddress.cmake (working copy) @@ -1,7 +1,7 @@ set(baseaddress_ntdll 0x77f20000) @@ -33,7 +33,7 @@ +set(baseaddress_freetypd 0x709b0000) Index: cmake/config.cmake =================================================================== ---- cmake/config.cmake (revision 57368) +--- cmake/config.cmake (revision 57501) +++ cmake/config.cmake (working copy) @@ -26,7 +26,7 @@ @@ -54,33 +54,11 @@ set(NSWPAT FALSE CACHE BOOL "Whether to compile apps/libs with features covered software patents or not. If you live in a country where software patents are valid/apply, don't -Index: cmake/gcc.cmake -=================================================================== ---- cmake/gcc.cmake (revision 57368) -+++ cmake/gcc.cmake (working copy) -@@ -171,7 +171,7 @@ - - SET(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") - SET(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} <CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") --set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") -+set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I\"${REACTOS_SOURCE_DIR}/include/asm\" -I\"${REACTOS_BINARY_DIR}/include/asm\" <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") - - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>") - set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"${MINGW_TOOLCHAIN_PREFIX}gcc -E -xc-header -MMD -MF <DEPFILE> -MT <OBJECT>\" ") -@@ -353,7 +353,7 @@ - - add_custom_command( - OUTPUT ${_object_file} -- COMMAND ${CMAKE_ASM_COMPILER} -x assembler-with-cpp -o ${_object_file} -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm -D__ASM__ -c ${_asm_file} -+ COMMAND ${CMAKE_ASM_COMPILER} -x assembler-with-cpp -o ${_object_file} -I\"${REACTOS_SOURCE_DIR}/include/asm\" -I\"${REACTOS_BINARY_DIR}/include/asm\" -D__ASM__ -c ${_asm_file} - DEPENDS ${_asm_file}) - - add_custom_command( Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt (revision 57368) +--- CMakeLists.txt (revision 57501) +++ CMakeLists.txt (working copy) -@@ -126,16 +126,20 @@ +@@ -126,6 +126,10 @@ add_definitions(-D_WINKD_=1) endif() @@ -91,20 +69,6 @@ if(USE_PSEH3) add_definitions(-D_USE_PSEH3=1) endif() - - # Version Options -- add_definitions(-DWINVER=0x502 -+ add_definitions(-DWINVER=0x600 - -D_WIN32_IE=0x600 -- -D_WIN32_WINNT=0x502 -- -D_WIN32_WINDOWS=0x502 -- -D_SETUPAPI_VER=0x502) -+ -D_WIN32_WINNT=0x600 -+ -D_WIN32_WINDOWS=0x600 -+ -D_SETUPAPI_VER=0x600) - - # Arch Options - if(ARCH STREQUAL "i386") @@ -245,6 +249,9 @@ add_subdirectory(ntoskrnl) add_subdirectory(subsystems) @@ -117,9 +81,9 @@ Index: drivers/filesystems/npfs/create.c =================================================================== ---- drivers/filesystems/npfs/create.c (revision 57368) +--- drivers/filesystems/npfs/create.c (revision 57501) +++ drivers/filesystems/npfs/create.c (working copy) -@@ -226,6 +226,9 @@ +@@ -227,6 +227,9 @@ } Ccb->FileObject = FileObject; @@ -131,7 +95,7 @@ FileObject->FsContext2 = Ccb; Index: include/asm/syscalls.inc =================================================================== ---- include/asm/syscalls.inc (revision 57368) +--- include/asm/syscalls.inc (revision 57501) +++ include/asm/syscalls.inc (working copy) @@ -95,6 +95,7 @@ @@ -151,9 +115,9 @@ .ENDP Index: include/psdk/winddi.h =================================================================== ---- include/psdk/winddi.h (revision 57368) +--- include/psdk/winddi.h (revision 57501) +++ include/psdk/winddi.h (working copy) -@@ -2665,7 +2665,7 @@ +@@ -2666,7 +2666,7 @@ _In_ ULONG cjSize, _Out_bytecap_(cjSize) FONTINFO *pfi); @@ -164,7 +128,7 @@ FONTOBJ_pGetGammaTables( Index: include/psdk/winuser.h =================================================================== ---- include/psdk/winuser.h (revision 57368) +--- include/psdk/winuser.h (revision 57501) +++ include/psdk/winuser.h (working copy) @@ -2818,8 +2818,8 @@ typedef LRESULT(CALLBACK *HOOKPROC)(int,WPARAM,LPARAM); @@ -179,7 +143,7 @@ typedef LRESULT(CALLBACK *WNDPROC)(HWND,UINT,WPARAM,LPARAM); Index: include/reactos/wine/config.h =================================================================== ---- include/reactos/wine/config.h (revision 57368) +--- include/reactos/wine/config.h (revision 57501) +++ include/reactos/wine/config.h (working copy) @@ -1,3 +1,5 @@ +#include "reactos/buildno.h" @@ -189,7 +153,7 @@ /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ Index: lib/3rdparty/CMakeLists.txt =================================================================== ---- lib/3rdparty/CMakeLists.txt (revision 57368) +--- lib/3rdparty/CMakeLists.txt (revision 57501) +++ lib/3rdparty/CMakeLists.txt (working copy) @@ -3,7 +3,9 @@ add_subdirectory(bzip2) @@ -203,7 +167,7 @@ add_subdirectory(libsamplerate) Index: lib/3rdparty/freetype/CMakeLists.txt =================================================================== ---- lib/3rdparty/freetype/CMakeLists.txt (revision 57368) +--- lib/3rdparty/freetype/CMakeLists.txt (revision 57501) +++ lib/3rdparty/freetype/CMakeLists.txt (working copy) @@ -11,7 +11,9 @@ src/base/ftbbox.c @@ -217,7 +181,7 @@ src/base/ftgxval.c Index: win32ss/CMakeLists.txt =================================================================== ---- win32ss/CMakeLists.txt (revision 57368) +--- win32ss/CMakeLists.txt (revision 57501) +++ win32ss/CMakeLists.txt (working copy) @@ -10,10 +10,12 @@ add_subdirectory(gdi/diblib) @@ -242,7 +206,7 @@ \ No newline at end of file Index: win32ss/drivers/CMakeLists.txt =================================================================== ---- win32ss/drivers/CMakeLists.txt (revision 57368) +--- win32ss/drivers/CMakeLists.txt (revision 57501) +++ win32ss/drivers/CMakeLists.txt (working copy) @@ -1,5 +1,7 @@ @@ -254,7 +218,7 @@ add_subdirectory(videoprt) Index: win32ss/include/ntgdihdl.h =================================================================== ---- win32ss/include/ntgdihdl.h (revision 57368) +--- win32ss/include/ntgdihdl.h (revision 57501) +++ win32ss/include/ntgdihdl.h (working copy) @@ -270,6 +270,7 @@ DWORD dwCFCount; @@ -286,7 +250,7 @@ FLONG AttrFlags; Index: win32ss/user/win32csr/CMakeLists.txt =================================================================== ---- win32ss/user/win32csr/CMakeLists.txt (revision 57368) +--- win32ss/user/win32csr/CMakeLists.txt (revision 57501) +++ win32ss/user/win32csr/CMakeLists.txt (working copy) @@ -22,6 +22,7 @@ file.c @@ -298,7 +262,7 @@ tuiconsole.c Index: win32ss/user/win32csr/desktopbg.c =================================================================== ---- win32ss/user/win32csr/desktopbg.c (revision 57368) +--- win32ss/user/win32csr/desktopbg.c (revision 57501) +++ win32ss/user/win32csr/desktopbg.c (working copy) @@ -53,7 +53,9 @@ @@ -423,7 +387,7 @@ Index: win32ss/user/win32csr/dllmain.c =================================================================== ---- win32ss/user/win32csr/dllmain.c (revision 57368) +--- win32ss/user/win32csr/dllmain.c (revision 57501) +++ win32ss/user/win32csr/dllmain.c (working copy) @@ -16,6 +16,9 @@ extern VOID WINAPI PrivateCsrssManualGuiCheck(LONG Check);

12 years, 2 months

[fireball] 57564: - Get rid of version redefines. It turned out the 6.0+ stuff could be easily isolated.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 15 14:14:28 2012 New Revision: 57564 URL: http://svn.reactos.org/svn/reactos?rev=57564&view=rev Log: - Get rid of version redefines. It turned out the 6.0+ stuff could be easily isolated. Modified: branches/arwinss/arwinss/client/user32/CMakeLists.txt branches/arwinss/arwinss/client/user32/sysparams.c Modified: branches/arwinss/arwinss/client/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/C… ============================================================================== --- branches/arwinss/arwinss/client/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/CMakeLists.txt [iso-8859-1] Mon Oct 15 14:14:28 2012 @@ -1,15 +1,5 @@ add_definitions(-D__WINESRC__ -D_WINE) - -remove_definitions(-DWINVER=0x502 - -D_WIN32_WINNT=0x502 - -D_WIN32_WINDOWS=0x502 - -D_SETUPAPI_VER=0x502) - -add_definitions(-DWINVER=0x0600 - -D_WIN32_WINNT=0x0600 - -D_WIN32_WINDOWS=0x600 - -D_SETUPAPI_VER=0x600) spec2def(user32.dll user32.spec ADD_IMPORTLIB) Modified: branches/arwinss/arwinss/client/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/s… ============================================================================== --- branches/arwinss/arwinss/client/user32/sysparams.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/sysparams.c [iso-8859-1] Mon Oct 15 14:14:28 2012 @@ -316,7 +316,9 @@ static UINT mouse_hover_width = 4; static UINT mouse_hover_height = 4; static UINT mouse_hover_time = 400; +#if (_WIN32_WINNT >= 0x0600) static UINT mouse_scroll_chars = 3; +#endif static UINT mouse_scroll_lines = 3; static UINT menu_show_delay = 400; static UINT menu_drop_alignment = 0; @@ -2141,7 +2143,7 @@ SPI_SETMENUSHOWDELAY_VALNAME, &menu_show_delay, uiParam, fWinIni ); break; - +#if (_WIN32_WINNT >= 0x0600) case SPI_GETWHEELSCROLLCHARS: /* 108 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ ret = get_uint_param( SPI_SETMOUSESCROLLCHARS_IDX, SPI_SETMOUSESCROLLCHARS_REGKEY, @@ -2155,7 +2157,7 @@ SPI_SETMOUSESCROLLCHARS_VALNAME, &mouse_scroll_chars, uiParam, fWinIni ); break; - +#endif WINE_SPI_FIXME(SPI_GETSHOWIMEUI); /* 110 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETSHOWIMEUI); /* 111 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ @@ -2331,6 +2333,7 @@ ret = set_user_pref_param( 3, 0x80, PtrToUlong(pvParam), fWinIni ); break; +#if (_WIN32_WINNT >= 0x0600) /* _WIN32_WINNT >= 0x600 */ WINE_SPI_FIXME(SPI_GETDISABLEOVERLAPPEDCONTENT); WINE_SPI_FIXME(SPI_SETDISABLEOVERLAPPEDCONTENT); @@ -2340,7 +2343,7 @@ WINE_SPI_FIXME(SPI_SETCLEARTYPE); WINE_SPI_FIXME(SPI_GETSPEECHRECOGNITION); WINE_SPI_FIXME(SPI_SETSPEECHRECOGNITION); - +#endif case SPI_GETFOREGROUNDLOCKTIMEOUT: /* 0x2000 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ ret = get_uint_param( SPI_SETFOREGROUNDLOCKTIMEOUT_IDX, SPI_SETFOREGROUNDLOCKTIMEOUT_REGKEY,

12 years, 2 months

[hbelusca] 57563: Enable widl to read .idl files when they are in another disk drive. (This enable the ReactOS' source code to be placed e.g. in C:\ros_src, and to be compiled into G:\rosbuild)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 14 14:03:51 2012 New Revision: 57563 URL: http://svn.reactos.org/svn/reactos?rev=57563&view=rev Log: Enable widl to read .idl files when they are in another disk drive. (This enable the ReactOS' source code to be placed e.g. in C:\ros_src, and to be compiled into G:\rosbuild) Modified: branches/ros-csrss/tools/wpp/preproc.c Modified: branches/ros-csrss/tools/wpp/preproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/wpp/preproc.c?r… ============================================================================== --- branches/ros-csrss/tools/wpp/preproc.c [iso-8859-1] (original) +++ branches/ros-csrss/tools/wpp/preproc.c [iso-8859-1] Sun Oct 14 14:03:51 2012 @@ -447,7 +447,12 @@ * Include management *------------------------------------------------------------------------- */ -#if defined(_Windows) || defined(__MSDOS__) +#if ( defined(_Windows) || defined(_WINDOWS) || defined(WIN32) || \ + defined(_WIN32) || defined(__WIN32__) || defined(__MSDOS__) ) +/* + * Windows system uses ':' as part of its path. + * Therefore use another separator character. + */ #define INCLUDESEPARATOR ";" #else #define INCLUDESEPARATOR ":"

12 years, 2 months

[hbelusca] 57562: - Use only the cmd.exe as a shell. - Deactivate compilation of the (optional) applications and of explorer(_new).exe

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 14 13:53:59 2012 New Revision: 57562 URL: http://svn.reactos.org/svn/reactos?rev=57562&view=rev Log: - Use only the cmd.exe as a shell. - Deactivate compilation of the (optional) applications and of explorer(_new).exe Modified: branches/ros-csrss/base/CMakeLists.txt branches/ros-csrss/base/shell/CMakeLists.txt branches/ros-csrss/boot/bootdata/hivedef_amd64.inf branches/ros-csrss/boot/bootdata/hivedef_arm.inf branches/ros-csrss/boot/bootdata/hivedef_i386.inf branches/ros-csrss/boot/bootdata/hivesft_amd64.inf branches/ros-csrss/boot/bootdata/hivesft_arm.inf branches/ros-csrss/boot/bootdata/hivesft_i386.inf Modified: branches/ros-csrss/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/CMakeLists.txt?r… ============================================================================== --- branches/ros-csrss/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/base/CMakeLists.txt [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1,5 +1,5 @@ -add_subdirectory(applications) +#add_subdirectory(applications) add_subdirectory(services) add_subdirectory(setup) add_subdirectory(shell) Modified: branches/ros-csrss/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/CMakeLists… ============================================================================== --- branches/ros-csrss/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/base/shell/CMakeLists.txt [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1,7 +1,7 @@ add_subdirectory(cmd) -if(NOT MSVC) -add_subdirectory(explorer) -endif() -add_subdirectory(explorer-new) +#if(NOT MSVC) +#add_subdirectory(explorer) +#endif() +#add_subdirectory(explorer-new) Modified: branches/ros-csrss/boot/bootdata/hivedef_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivedef_amd64.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_amd64.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1649,7 +1649,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012 Modified: branches/ros-csrss/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_arm.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1453,7 +1453,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKCU,"SOFTWARE\Microsoft\Windows NT",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion",,0x00000012 Modified: branches/ros-csrss/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1649,7 +1649,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012 Modified: branches/ros-csrss/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesft… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1023,7 +1023,7 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" Modified: branches/ros-csrss/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesft… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesft_arm.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -948,7 +948,7 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" Modified: branches/ros-csrss/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesft… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesft_i386.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1059,7 +1059,7 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe"

12 years, 2 months

[hbelusca] 57561: Create a branch for working on csrss and co.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 14 13:04:31 2012 New Revision: 57561 URL: http://svn.reactos.org/svn/reactos?rev=57561&view=rev Log: Create a branch for working on csrss and co. Added: branches/ros-csrss/ (props changed) - copied from r57560, trunk/reactos/ Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Oct 14 13:04:31 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Oct 14 13:04:31 2012 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Oct 14 13:04:31 2012 @@ -1,0 +1,15 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup:54809-54998 Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

12 years, 2 months

← Newer
1
...
7
8
9
10
11
12
13
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2012