Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbirr] 20897: - Allocated the initial stacks page aligned.
by hbirr＠svn.reactos.org 15 Jan '06

15 Jan '06

- Allocated the initial stacks page aligned. - Add a guard page for the initial stacks. - Fixed the size of the initial stacks. Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S --- trunk/reactos/ntoskrnl/ke/i386/main_asm.S 2006-01-15 18:21:43 UTC (rev 20896) +++ trunk/reactos/ntoskrnl/ke/i386/main_asm.S 2006-01-15 18:28:40 UTC (rev 20897) @@ -3,8 +3,33 @@ #define AP_MAGIC (0x12481020) +.global _kernel_stack +.global _kernel_stack_top +.global _kernel_trap_stack +.global _kernel_trap_stack_top + .globl _NtProcessStartup +.bss +.align 4096 + + +/* guard page for the kernel stack */ +.fill 4096, 1, 0 + +_kernel_stack: +.fill 3*4096, 1, 0 +_kernel_stack_top: + +/* guard page for the trap stack */ +.fill 4096, 1, 0 + +_kernel_trap_stack: +.fill 3*4096, 1, 0 +_kernel_trap_stack_top: + +.text + _NtProcessStartup: /* FIXME: Application processors should have their own GDT/IDT */ @@ -34,13 +59,12 @@ .m1: /* Load the initial kernel stack */ - lea _kernel_stack, %eax - add $0x2000, %eax - and $0xFFFFE000, %eax - add $(0x3000 - SIZEOF_FX_SAVE_AREA), %eax + lea _kernel_stack_top, %eax + sub $(SIZEOF_FX_SAVE_AREA), %eax movl %eax, %esp /* Call the main kernel initialization */ pushl %edx pushl %ecx call __main + _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2006-01-15 18:21:43 UTC (rev 20896) +++ trunk/reactos/ntoskrnl/ke/main.c 2006-01-15 18:28:40 UTC (rev 20897) @@ -48,15 +48,17 @@ ULONG KeLargestCacheLine = 0x40; /* FIXME: Arch-specific */ -/* We allocate 5 pages, but we only use 4. The 5th is to guarantee page alignment */ -ULONG kernel_stack[5120]; -ULONG double_trap_stack[5120]; +/* the initial stacks are declared in main_asm.S */ +extern ULONG kernel_stack; +extern ULONG kernel_stack_top; +extern ULONG kernel_trap_stack; +extern ULONG kernel_trap_stack_top; /* These point to the aligned 3 pages */ -ULONG init_stack; -ULONG init_stack_top; -ULONG trap_stack; -ULONG trap_stack_top; +ULONG init_stack = (ULONG)&kernel_stack; +ULONG init_stack_top = (ULONG)&kernel_stack_top; +ULONG trap_stack = (ULONG)&kernel_trap_stack; +ULONG trap_stack_top = (ULONG)&kernel_trap_stack_top; /* Cached modules from the loader block */ PLOADER_MODULE CachedModules[MaximumCachedModuleType]; @@ -155,13 +157,6 @@ PIMAGE_OPTIONAL_HEADER OptHead; CHAR* s; - /* Set up the Stacks (Initial Kernel Stack and Double Trap Stack) - and save a page for the fx savings area */ - trap_stack = PAGE_ROUND_UP(&double_trap_stack) + PAGE_SIZE; - trap_stack_top = trap_stack + 3 * PAGE_SIZE; - init_stack = PAGE_ROUND_UP(&kernel_stack) + PAGE_SIZE; - init_stack_top = init_stack + 3 * PAGE_SIZE; - /* Copy the Loader Block Data locally since Low-Memory will be wiped */ memcpy(&KeLoaderBlock, _LoaderBlock, sizeof(LOADER_PARAMETER_BLOCK)); memcpy(&KeLoaderModules[1], _____ Modified: trunk/reactos/ntoskrnl/mm/mminit.c --- trunk/reactos/ntoskrnl/mm/mminit.c 2006-01-15 18:21:43 UTC (rev 20896) +++ trunk/reactos/ntoskrnl/mm/mminit.c 2006-01-15 18:28:40 UTC (rev 20897) @@ -38,6 +38,7 @@ extern ULONG init_stack; extern ULONG init_stack_top; +extern ULONG trap_stack; VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength); @@ -394,6 +395,10 @@ AddressRangeCount); kernel_len = LastKrnlPhysAddr - FirstKrnlPhysAddr; + /* Unmap the guard pages from the initial stacks */ + MmDeleteVirtualMapping(NULL, (PVOID)(init_stack - PAGE_SIZE), FALSE, NULL, NULL); + MmDeleteVirtualMapping(NULL, (PVOID)(trap_stack - PAGE_SIZE), FALSE, NULL, NULL); + /* * Unmap low memory */

1 0

[hbirr] 20896: Fixed the stack for the first thread.
by hbirr＠svn.reactos.org 15 Jan '06

15 Jan '06

Fixed the stack for the first thread. Modified: trunk/reactos/ntoskrnl/ps/idle.c _____ Modified: trunk/reactos/ntoskrnl/ps/idle.c --- trunk/reactos/ntoskrnl/ps/idle.c 2006-01-15 16:47:18 UTC (rev 20895) +++ trunk/reactos/ntoskrnl/ps/idle.c 2006-01-15 18:21:43 UTC (rev 20896) @@ -64,14 +64,14 @@ { PETHREAD Thread; ULONG_PTR KernelStack; - extern unsigned int init_stack; + extern unsigned int init_stack_top; Thread = ExAllocatePool(NonPagedPool, sizeof(ETHREAD)); RtlZeroMemory(Thread, sizeof(ETHREAD)); Thread->ThreadsProcess = Process; if (First) { - KernelStack = init_stack; + KernelStack = init_stack_top; } else {

1 0

[gedmurphy] 20895: Change toolbars from 16 to 15 pixels high
by gedmurphy＠svn.reactos.org 15 Jan '06

15 Jan '06

Change toolbars from 16 to 15 pixels high Modified: trunk/reactos/subsys/system/explorer/res/toolbar.bmp Modified: trunk/reactos/subsys/system/ibrowser/res/toolbar.bmp _____ Modified: trunk/reactos/subsys/system/explorer/res/toolbar.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/ibrowser/res/toolbar.bmp (Binary files differ)

1 0

[weiden] 20894: implemented LsaDelete() (client only)
by weiden＠svn.reactos.org 15 Jan '06

15 Jan '06

implemented LsaDelete() (client only) Modified: trunk/reactos/include/idl/lsa.idl Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/sec/lsa.c Modified: trunk/reactos/lib/lsasrv/lsarpc.c _____ Modified: trunk/reactos/include/idl/lsa.idl --- trunk/reactos/include/idl/lsa.idl 2006-01-15 14:18:43 UTC (rev 20893) +++ trunk/reactos/include/idl/lsa.idl 2006-01-15 14:34:58 UTC (rev 20894) @@ -39,4 +39,8 @@ /* Function 0 */ NTSTATUS LsarClose(handle_t BindingHandle, [in] LSA_HANDLE ObjectHandle); + + /* Function 1 */ + NTSTATUS LsarDelete(handle_t BindingHandle, + [in] LSA_HANDLE ObjectHandle); } _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2006-01-15 14:18:43 UTC (rev 20893) +++ trunk/reactos/lib/advapi32/advapi32.def 2006-01-15 14:34:58 UTC (rev 20894) @@ -351,7 +351,7 @@ ;LsaCreateSecret@16 ;LsaCreateTrustedDomain@16 ;LsaCreateTrustedDomainEx -;LsaDelete@4 +LsaDelete@4 ;LsaDeleteTrustedDomain@8 LsaEnumerateAccountRights@16 ;LsaEnumerateAccounts@20 _____ Modified: trunk/reactos/lib/advapi32/sec/lsa.c --- trunk/reactos/lib/advapi32/sec/lsa.c 2006-01-15 14:18:43 UTC (rev 20893) +++ trunk/reactos/lib/advapi32/sec/lsa.c 2006-01-15 14:34:58 UTC (rev 20894) @@ -92,7 +92,23 @@ (unsigned long)ObjectHandle); } + /* + * @implemented + */ +NTSTATUS STDCALL +LsaDelete(LSA_HANDLE ObjectHandle) +{ + DPRINT("LsaDelete(0x%p) called\n", ObjectHandle); + + LSAHandleBind(); + + return LsarDelete(LSABindingHandle, + (unsigned long)ObjectHandle); +} + + +/* * @unimplemented */ NTSTATUS _____ Modified: trunk/reactos/lib/lsasrv/lsarpc.c --- trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 14:18:43 UTC (rev 20893) +++ trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 14:34:58 UTC (rev 20894) @@ -144,4 +144,13 @@ return Status; } +/* Function 1 */ +unsigned int +LsarDelete(IN handle_t BindingHandle, + IN unsigned long ObjectHandle) +{ + DPRINT1("LsarDelete(0x%p) UNIMPLEMENTED!\n", ObjectHandle); + return STATUS_ACCESS_DENIED; +} + /* EOF */

1 0

[weiden] 20893: implemented LsarClose()
by weiden＠svn.reactos.org 15 Jan '06

15 Jan '06

implemented LsarClose() Modified: trunk/reactos/lib/lsasrv/lsarpc.c _____ Modified: trunk/reactos/lib/lsasrv/lsarpc.c --- trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 13:44:14 UTC (rev 20892) +++ trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 14:18:43 UTC (rev 20893) @@ -11,19 +11,85 @@ #define NDEBUG #include <debug.h> +#define POLICY_DELETE (RTL_HANDLE_VALID << 1) +typedef struct _LSAR_POLICY_HANDLE +{ + ULONG Flags; + LONG RefCount; + ACCESS_MASK AccessGranted; +} LSAR_POLICY_HANDLE, *PLSAR_POLICY_HANDLE; -/* GLOBALS *****************************************************************/ +static RTL_CRITICAL_SECTION PolicyHandleTableLock; +static RTL_HANDLE_TABLE PolicyHandleTable; -/* VARIABLES ***************************************************************/ +/* FUNCTIONS ***************************************************************/ +static NTSTATUS +ReferencePolicyHandle(IN LSA_HANDLE ObjectHandle, + IN ACCESS_MASK DesiredAccess, + OUT PLSAR_POLICY_HANDLE *Policy) +{ + PLSAR_POLICY_HANDLE ReferencedPolicy; + NTSTATUS Status = STATUS_SUCCESS; -/* FUNCTIONS ***************************************************************/ + RtlEnterCriticalSection(&PolicyHandleTableLock); + if (RtlIsValidIndexHandle(&PolicyHandleTable, + (ULONG)ObjectHandle, + (PRTL_HANDLE_TABLE_ENTRY*)&ReferencedPolicy) && + !(ReferencedPolicy->Flags & POLICY_DELETE)) + { + if (RtlAreAllAccessesGranted(ReferencedPolicy->AccessGranted, + DesiredAccess)) + { + ReferencedPolicy->RefCount++; + *Policy = ReferencedPolicy; + } + else + Status = STATUS_ACCESS_DENIED; + } + else + Status = STATUS_INVALID_HANDLE; + + RtlLeaveCriticalSection(&PolicyHandleTableLock); + + return Status; +} + +static VOID +DereferencePolicyHandle(IN OUT PLSAR_POLICY_HANDLE Policy, + IN BOOLEAN Delete) +{ + RtlEnterCriticalSection(&PolicyHandleTableLock); + + if (Delete) + { + Policy->Flags |= POLICY_DELETE; + Policy->RefCount--; + + ASSERT(Policy->RefCount != 0); + } + + if (--Policy->RefCount == 0) + { + ASSERT(Policy->Flags & POLICY_DELETE); + RtlFreeHandle(&PolicyHandleTable, + (PRTL_HANDLE_TABLE_ENTRY)Policy); + } + + RtlLeaveCriticalSection(&PolicyHandleTableLock); +} + VOID LsarStartRpcServer(VOID) { RPC_STATUS Status; + RtlInitializeCriticalSection(&PolicyHandleTableLock); + RtlInitializeHandleTable(0x1000, + sizeof(LSAR_POLICY_HANDLE), + &PolicyHandleTable); + DPRINT("LsarStartRpcServer() called"); Status = RpcServerUseProtseqEpW(L"ncacn_np", @@ -60,8 +126,22 @@ LsarClose(IN handle_t BindingHandle, IN unsigned long ObjectHandle) { + PLSAR_POLICY_HANDLE Policy = NULL; + NTSTATUS Status; + DPRINT1("LsarClose(0x%p) called!\n", ObjectHandle); - return STATUS_INVALID_HANDLE; + + Status = ReferencePolicyHandle((LSA_HANDLE)ObjectHandle, + 0, + &Policy); + if (NT_SUCCESS(Status)) + { + /* delete the handle */ + DereferencePolicyHandle(Policy, + TRUE); + } + + return Status; } /* EOF */

1 0

[mf] 20892: Explorer: sort drives by path name; ignore hidden attribute of NTFS volumes
by mf＠svn.reactos.org 15 Jan '06

15 Jan '06

Explorer: sort drives by path name; ignore hidden attribute of NTFS volumes This resolves Bugzilla issue 1236 Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-15 13:25:50 UTC (rev 20891) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-15 13:44:14 UTC (rev 20892) @@ -170,12 +170,12 @@ // sort order for different directory/file types enum TYPE_ORDER { - TO_DIR = 0, - TO_DOT = 1, - TO_DOTDOT = 2, - TO_OTHER_DIR= 3, - TO_FILE = 4, - TO_VIRTUAL = 8 + TO_DIR, + TO_DOT, + TO_DOTDOT, + TO_OTHER_DIR, + TO_VIRTUAL_FOLDER, + TO_FILE }; // distinguish between ".", ".." and any other directory names @@ -198,21 +198,21 @@ const WIN32_FIND_DATA* fd1 = &entry1->_data; const WIN32_FIND_DATA* fd2 = &entry2->_data; - int order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; - int order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; + TYPE_ORDER order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; + TYPE_ORDER order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; // Handle "." and ".." as special case and move them at the very first beginning. if (order1==TO_DIR && order2==TO_DIR) { order1 = TypeOrderFromDirname(fd1->cFileName); order2 = TypeOrderFromDirname(fd2->cFileName); - } - // Move virtual folders after physical folders - if (!(entry1->_shell_attribs & SFGAO_FILESYSTEM)) - order1 |= TO_VIRTUAL; + // Move virtual folders after physical folders + if (!(entry1->_shell_attribs & SFGAO_FILESYSTEM)) + order1 = TO_VIRTUAL_FOLDER; - if (!(entry2->_shell_attribs & SFGAO_FILESYSTEM)) - order2 |= TO_VIRTUAL; + if (!(entry2->_shell_attribs & SFGAO_FILESYSTEM)) + order2 = TO_VIRTUAL_FOLDER; + } return order2==order1? 0: order1<order2? -1: 1; } _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp --- trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2006-01-15 13:25:50 UTC (rev 20891) +++ trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2006-01-15 13:44:14 UTC (rev 20892) @@ -72,8 +72,15 @@ pw32fdata->ftLastWriteTime = fad.ftLastWriteTime; if (!(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { + // copy file size pw32fdata->nFileSizeLow = fad.nFileSizeLow; pw32fdata->nFileSizeHigh = fad.nFileSizeHigh; + } else { + // ignore FILE_ATTRIBUTE_HIDDEN attribute of NTFS drives - this would hide those drives in ShellBrowser + if (pw32fdata->dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) { + if (path[1]==':' && path[2]=='\\' && !path[3]) // Is it a drive path? + pw32fdata->dwFileAttributes &= ~FILE_ATTRIBUTE_HIDDEN; + } } } @@ -355,6 +362,7 @@ ShellItemEnumerator enumerator(_folder, SHCONTF_FOLDERS|SHCONTF_NONFOLDERS|SHCONTF_INCLUDEHIDDEN|SHCONTF_SHAREAB LE|SHCONTF_STORAGE); TCHAR name[MAX_PATH]; + TCHAR path[MAX_PATH]; HRESULT hr_next = S_OK; do { @@ -423,6 +431,11 @@ if (bhfi_valid) memcpy(&entry->_bhfi, &bhfi, sizeof(BY_HANDLE_FILE_INFORMATION)); + // store path in entry->_data.cFileName in case fill_w32fdata_shell() didn't already fill it + if (!entry->_data.cFileName[0]) + if (SUCCEEDED(path_from_pidl(_folder, pidls[n], path, COUNTOF(path)))) + _tcscpy(entry->_data.cFileName, path); + if (SUCCEEDED(name_from_pidl(_folder, pidls[n], name, COUNTOF(name), SHGDN_INFOLDER|0x2000/*0x2000=SHGDN_INCLUDE_NONFILESYS*/))) { if (!entry->_data.cFileName[0]) _tcscpy(entry->_data.cFileName, name);

1 0

[weiden] 20891: disable starting lsass.exe for now
by weiden＠svn.reactos.org 15 Jan '06

15 Jan '06

disable starting lsass.exe for now Modified: trunk/reactos/bootdata/hivesft.inf _____ Modified: trunk/reactos/bootdata/hivesft.inf --- trunk/reactos/bootdata/hivesft.inf 2006-01-15 13:19:57 UTC (rev 20890) +++ trunk/reactos/bootdata/hivesft.inf 2006-01-15 13:25:50 UTC (rev 20891) @@ -737,7 +737,7 @@ ;HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cm d.exe" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.ex e" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 +HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartGUI",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32 \userinit.exe"

1 0

[weiden] 20890: - use RPC for communication with lsass
by weiden＠svn.reactos.org 15 Jan '06

15 Jan '06

- use RPC for communication with lsass - start lsass.exe on startup Modified: trunk/reactos/bootdata/hivesft.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/include/idl/idl.xml Added: trunk/reactos/include/idl/lsa.idl Modified: trunk/reactos/lib/advapi32/advapi32.h Modified: trunk/reactos/lib/advapi32/advapi32.xml Modified: trunk/reactos/lib/advapi32/sec/lsa.c Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/lib/advapi32/service/sctrl.c Deleted: trunk/reactos/lib/lsasrv/lsaport.c Added: trunk/reactos/lib/lsasrv/lsarpc.c Modified: trunk/reactos/lib/lsasrv/lsasrv.c Modified: trunk/reactos/lib/lsasrv/lsasrv.xml Modified: trunk/reactos/subsys/system/winlogon/winlogon.c _____ Modified: trunk/reactos/bootdata/hivesft.inf --- trunk/reactos/bootdata/hivesft.inf 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/bootdata/hivesft.inf 2006-01-15 13:19:57 UTC (rev 20890) @@ -737,6 +737,7 @@ ;HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cm d.exe" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.ex e" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 +HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartGUI",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32 \userinit.exe" _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/bootdata/packages/reactos.dff 2006-01-15 13:19:57 UTC (rev 20890) @@ -193,6 +193,7 @@ subsys\system\explorer\notifyhook\notifyhook.dll 1 subsys\system\format\format.exe 1 subsys\system\ibrowser\ibrowser.exe 1 +subsys\system\lsass\lsass.exe 1 subsys\system\msconfig\msconfig.exe 1 subsys\system\msiexec\msiexec.exe 1 subsys\system\notepad\notepad.exe 1 _____ Modified: trunk/reactos/include/idl/idl.xml --- trunk/reactos/include/idl/idl.xml 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/include/idl/idl.xml 2006-01-15 13:19:57 UTC (rev 20890) @@ -35,4 +35,16 @@ <define name="_X86_" /> <file switches="--oldnames">eventlogrpc.idl</file> </module> +<module name="lsa_server" type="rpcserver"> + <include base="ReactOS">.</include> + <include base="ReactOS">w32api/include</include> + <define name="_X86_" /> + <file switches="--oldnames">lsa.idl</file> +</module> +<module name="lsa_client" type="rpcclient"> + <include base="ReactOS">.</include> + <include base="ReactOS">w32api/include</include> + <define name="_X86_" /> + <file switches="--oldnames">lsa.idl</file> +</module> </group> _____ Added: trunk/reactos/include/idl/lsa.idl --- trunk/reactos/include/idl/lsa.idl 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/include/idl/lsa.idl 2006-01-15 13:19:57 UTC (rev 20890) @@ -0,0 +1,42 @@ +/* + * Local Security Authority interface definition + */ + +#define BYTE unsigned char +#define DWORD unsigned int +#define BOOL unsigned long +#define LPBYTE unsigned char* +#define LPDWORD unsigned long* +#define LSA_HANDLE unsigned long +#define NTSTATUS unsigned int + +[ + uuid(12345778-1234-abcd-ef00-0123456789ab), + version(0.0), + pointer_default(unique), + explicit_handle +] +interface lsarpc +{ +/* + cpp_quote("#if 0") + typedef [handle, unique] wchar_t *LPWSTR; + typedef [handle, unique] char *LPSTR; + cpp_quote("#endif") + typedef [context_handle] void *LSA_HANDLE; + typedef LSA_HANDLE *PLSA_HANDLE; + typedef unsigned int NTSTATUS; +*/ + + cpp_quote("#if 0") + typedef struct _LSA_UNICODE_STRING { + unsigned short Length; + unsigned short MaximumLength; + [size_is(MaximumLength)] wchar_t *Buffer; + } LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; + cpp_quote("#endif") + + /* Function 0 */ + NTSTATUS LsarClose(handle_t BindingHandle, + [in] LSA_HANDLE ObjectHandle); +} Property changes on: trunk/reactos/include/idl/lsa.idl ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/advapi32/advapi32.h --- trunk/reactos/lib/advapi32/advapi32.h 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/advapi32/advapi32.h 2006-01-15 13:19:57 UTC (rev 20890) @@ -24,6 +24,10 @@ /* this has to go after the NDK when being used with the NDK */ #include <ntsecapi.h> +#include <services/services.h> +#include "svcctl_c.h" +#include "lsa_c.h" + #ifndef HAS_FN_PROGRESSW #define FN_PROGRESSW FN_PROGRESS #endif _____ Modified: trunk/reactos/lib/advapi32/advapi32.xml --- trunk/reactos/lib/advapi32/advapi32.xml 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/advapi32/advapi32.xml 2006-01-15 13:19:57 UTC (rev 20890) @@ -2,11 +2,13 @@ <importlibrary definition="advapi32.def" /> <include base="advapi32">.</include> <include base="scm_client">.</include> + <include base="lsa_client">.</include> <define name="__USE_W32API" /> <define name="WINVER">0x600</define> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <library>scm_client</library> + <library>lsa_client</library> <library>ntdll</library> <library>kernel32</library> <library>rpcrt4</library> _____ Modified: trunk/reactos/lib/advapi32/sec/lsa.c --- trunk/reactos/lib/advapi32/sec/lsa.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/advapi32/sec/lsa.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -16,24 +16,80 @@ #define NDEBUG #include <debug.h> +static handle_t LSABindingHandle = NULL; -#ifndef SID_REVISION /* FIXME - Winnt.h */ -#define SID_REVISION (1) /* Current revision */ -#endif +static VOID +LSAHandleUnbind(handle_t *Handle) +{ + RPC_STATUS status; + if (*Handle == NULL) + return; + status = RpcBindingFree(Handle); + if (status) + { + DPRINT1("RpcBindingFree returned 0x%x\n", status); + } +} + +static VOID +LSAHandleBind(VOID) +{ + LPWSTR pszStringBinding; + RPC_STATUS status; + handle_t Handle; + + if (LSABindingHandle != NULL) + return; + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + NULL, + L"\\pipe\\lsarpc", + NULL, + &pszStringBinding); + if (status) + { + DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); + return; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &Handle); + if (status) + { + DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { + DPRINT1("RpcStringFree returned 0x%x\n", status); + } + + if (InterlockedCompareExchangePointer(&LSABindingHandle, + (PVOID)Handle, + NULL) != NULL) + { + LSAHandleUnbind(&Handle); + } +} + + /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL LsaClose(LSA_HANDLE ObjectHandle) { - static int count = 0; - if (count++ < 20) - { - DPRINT1("(%p):LsaClose stub\n",ObjectHandle); - } - return 0xc0000000; + DPRINT("LsaClose(0x%p) called\n", ObjectHandle); + + LSAHandleBind(); + + return LsarClose(LSABindingHandle, + (unsigned long)ObjectHandle); } /* @@ -187,7 +243,7 @@ PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, PLSA_TRANSLATED_NAME *Names) { - return STATUS_NOT_IMPLEMENTED; + return STATUS_NONE_MAPPED; } /*********************************************************************** ******* _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/advapi32/service/scm.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -13,7 +13,6 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> -#include "svcctl_c.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/advapi32/service/sctrl.c --- trunk/reactos/lib/advapi32/service/sctrl.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/advapi32/service/sctrl.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -13,7 +13,6 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> -#include <services/services.h> #define NDEBUG #include <debug.h> _____ Deleted: trunk/reactos/lib/lsasrv/lsaport.c --- trunk/reactos/lib/lsasrv/lsaport.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/lsasrv/lsaport.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -1,179 +0,0 @@ -/* - */ - -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - -//#define NDEBUG -#include <debug.h> - - -HANDLE PortThreadHandle = NULL; -HANDLE ConnectPortHandle = NULL; -HANDLE MessagePortHandle = NULL; - - -static NTSTATUS -InitializeLsaPort(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING PortName; - PORT_MESSAGE Request; - NTSTATUS Status; - - ConnectPortHandle = NULL; - MessagePortHandle = NULL; - - RtlInitUnicodeString(&PortName, - L"\\SeLsaCommandPort"); - - InitializeObjectAttributes(&ObjectAttributes, - &PortName, - 0, - NULL, - NULL); - - Status = NtCreatePort(&ConnectPortHandle, - &ObjectAttributes, - 0, - 0x100, - 0x2000); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreatePort() failed (Status %lx)\n", Status); - goto ByeBye; - } - - Status = NtListenPort(ConnectPortHandle, - &Request); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtListenPort() failed (Status %lx)\n", Status); - goto ByeBye; - } - - Status = NtAcceptConnectPort(&MessagePortHandle, - ConnectPortHandle, - NULL, - TRUE, - NULL, - NULL); - if (!NT_SUCCESS (Status)) - { - DPRINT1("NtAcceptConnectPort() failed (Status %lx)\n", Status); - goto ByeBye; - } - - Status = NtCompleteConnectPort (MessagePortHandle); - if (!NT_SUCCESS (Status)) - { - DPRINT1("NtCompleteConnectPort() failed (Status %lx)\n", Status); - goto ByeBye; - } - -ByeBye: - if (!NT_SUCCESS (Status)) - { - if (ConnectPortHandle != NULL) - NtClose (ConnectPortHandle); - - if (MessagePortHandle != NULL) - NtClose (MessagePortHandle); - } - - return Status; -} - - -static NTSTATUS -ProcessPortMessage(VOID) -{ - PORT_MESSAGE Request; -// LPC_MAX_MESSAGE Reply; - NTSTATUS Status; - - - DPRINT1("ProcessPortMessage() called\n"); - - Status = STATUS_SUCCESS; - - for (;;) - { - Status = NtReplyWaitReceivePort(MessagePortHandle, - 0, - NULL, - &Request); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtReplyWaitReceivePort() failed (Status %lx)\n", Status); - break; - } - - DPRINT("Received message\n"); - - if (Request.u2.s2.Type == LPC_PORT_CLOSED) - { - DPRINT("Port closed\n"); - -// return STATUS_UNSUCCESSFUL; - } - if (Request.u2.s2.Type == LPC_REQUEST) - { - DPRINT("Received request\n"); - - } - else if (Request.u2.s2.Type == LPC_DATAGRAM) - { - DPRINT("Received datagram\n"); - -// Message = (PIO_ERROR_LOG_MESSAGE)&Request.Data; - - } - } - - return Status; -} - - -static NTSTATUS STDCALL -PortThreadRoutine(PVOID Param) -{ - NTSTATUS Status = STATUS_SUCCESS; - - Status = InitializeLsaPort(); - if (!NT_SUCCESS(Status)) - return Status; - - while (NT_SUCCESS(Status)) - { - Status = ProcessPortMessage(); - } - - if (ConnectPortHandle != NULL) - NtClose (ConnectPortHandle); - - if (MessagePortHandle != NULL) - NtClose (MessagePortHandle); - - return Status; -} - - -BOOLEAN -StartLsaPortThread(VOID) -{ - DWORD ThreadId; - - PortThreadHandle = CreateThread(NULL, - 0x1000, - (LPTHREAD_START_ROUTINE)PortThreadRoutine, - NULL, - 0, - &ThreadId); - - return (PortThreadHandle != NULL); -} - -/* EOF */ _____ Added: trunk/reactos/lib/lsasrv/lsarpc.c --- trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -0,0 +1,67 @@ +/* INCLUDES ****************************************************************/ + +#define WIN32_NO_STATUS +#include <windows.h> +#include <ntsecapi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +#include "lsa_s.h" + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS *****************************************************************/ + +/* VARIABLES ***************************************************************/ + + +/* FUNCTIONS ***************************************************************/ + +VOID +LsarStartRpcServer(VOID) +{ + RPC_STATUS Status; + + DPRINT("LsarStartRpcServer() called"); + + Status = RpcServerUseProtseqEpW(L"ncacn_np", + 10, + L"\\pipe\\lsarpc", + NULL); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return; + } + + Status = RpcServerRegisterIf(lsarpc_ServerIfHandle, + NULL, + NULL); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return; + } + + Status = RpcServerListen(1, 20, TRUE); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerListen() failed (Status %lx)\n", Status); + return; + } + + DPRINT("LsarStartRpcServer() done"); +} + +/* Function 0 */ +unsigned int +LsarClose(IN handle_t BindingHandle, + IN unsigned long ObjectHandle) +{ + DPRINT1("LsarClose(0x%p) called!\n", ObjectHandle); + return STATUS_INVALID_HANDLE; +} + +/* EOF */ Property changes on: trunk/reactos/lib/lsasrv/lsarpc.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/lsasrv/lsasrv.c --- trunk/reactos/lib/lsasrv/lsasrv.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/lsasrv/lsasrv.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -3,22 +3,42 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <lsass/lsasrv.h> - #define NDEBUG #include <debug.h> -VOID StartLsaPortThread(VOID); +VOID LsarStartRpcServer(VOID); NTSTATUS STDCALL LsapInitLsa(VOID) { - DPRINT1("LsapInitLsa() called\n"); + HANDLE hEvent; - StartLsaPortThread(); + DPRINT1("LsapInitLsa() called\n"); - return STATUS_SUCCESS; + LsarStartRpcServer(); + + hEvent = OpenEventW(EVENT_MODIFY_STATE, + FALSE, + L"\\SECURITY_SERVICES_STARTED"); + if (hEvent != NULL) + { + SetEvent(hEvent); + CloseHandle(hEvent); + } + return STATUS_SUCCESS; } +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) +{ + return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + RtlFreeHeap(RtlGetProcessHeap(), 0, ptr); +} + + /* EOF */ _____ Modified: trunk/reactos/lib/lsasrv/lsasrv.xml --- trunk/reactos/lib/lsasrv/lsasrv.xml 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/lsasrv/lsasrv.xml 2006-01-15 13:19:57 UTC (rev 20890) @@ -1,14 +1,19 @@ <module name="lsasrv" type="win32dll" baseaddress="${BASEADDRESS_LSASRV}" entrypoint="0" installbase="system32" installname="lsasrv.dll"> <importlibrary definition="lsasrv.def" /> <include base="lsasrv">.</include> + <include base="lsa_server">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__USE_W32API" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x0600</define> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag> + <library>lsa_server</library> <library>ntdll</library> <library>kernel32</library> - <file>lsaport.c</file> + <library>rpcrt4</library> + <file>lsarpc.c</file> <file>lsasrv.c</file> <file>lsasrv.rc</file> </module> _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.c --- trunk/reactos/subsys/system/winlogon/winlogon.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/subsys/system/winlogon/winlogon.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -16,7 +16,7 @@ #include <debug.h> #define SUPPORT_CONSOLESTART 1 -#define START_LSASS 0 +#define START_LSASS 1 /* GLOBALS ******************************************************************/ @@ -161,11 +161,12 @@ BOOLEAN Result; STARTUPINFO StartupInfo; PROCESS_INFORMATION ProcessInformation; + WCHAR ServiceString[] = L"lsass.exe"; LsassInitEvent = CreateEvent(NULL, TRUE, FALSE, - L"\\LsassInitDone"); + L"\\SECURITY_SERVICES_STARTED"); if (LsassInitEvent == NULL) { @@ -183,10 +184,10 @@ StartupInfo.cbReserved2 = 0; StartupInfo.lpReserved2 = 0; - Result = CreateProcess(L"lsass.exe", + Result = CreateProcess(NULL, + ServiceString, NULL, NULL, - NULL, FALSE, DETACHED_PROCESS, NULL, @@ -199,7 +200,6 @@ return(FALSE); } - DPRINT("WL: Waiting for lsass\n"); WaitForSingleObject(LsassInitEvent, INFINITE); CloseHandle(LsassInitEvent);

1 0

[mf] 20889: change explorer sort order so that virtual folders are moved after physical folders
by mf＠svn.reactos.org 15 Jan '06

15 Jan '06

change explorer sort order so that virtual folders are moved after physical folders Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-15 10:17:35 UTC (rev 20888) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-15 12:30:17 UTC (rev 20889) @@ -59,6 +59,7 @@ _bhfi_valid = false; _level = 0; _icon_id = ICID_UNKNOWN; + _shell_attribs = 0; _display_name = _data.cFileName; _type_name = NULL; _content = NULL; @@ -167,19 +168,53 @@ } + // sort order for different directory/file types +enum TYPE_ORDER { + TO_DIR = 0, + TO_DOT = 1, + TO_DOTDOT = 2, + TO_OTHER_DIR= 3, + TO_FILE = 4, + TO_VIRTUAL = 8 +}; + + // distinguish between ".", ".." and any other directory names +static TYPE_ORDER TypeOrderFromDirname(LPCTSTR name) +{ + if (name[0] == '.') { + if (name[1] == '\0') + return TO_DOT; // "." + + if (name[1]=='.' && name[2]=='\0') + return TO_DOTDOT; // ".." + } + + return TO_OTHER_DIR; // any other directory +} + // directories first... -static int compareType(const WIN32_FIND_DATA* fd1, const WIN32_FIND_DATA* fd2) +static int compareType(const Entry* entry1, const Entry* entry2) { - int order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; - int order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; + const WIN32_FIND_DATA* fd1 = &entry1->_data; + const WIN32_FIND_DATA* fd2 = &entry2->_data; - /* Handle "." and ".." as special case and move them at the very first beginning. */ - if (order1 && order2) { - order1 = fd1->cFileName[0]!='.'? 1: fd1->cFileName[1]=='.'? 2: fd1->cFileName[1]=='\0'? 3: 1; - order2 = fd2->cFileName[0]!='.'? 1: fd2->cFileName[1]=='.'? 2: fd2->cFileName[1]=='\0'? 3: 1; + int order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; + int order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; + + // Handle "." and ".." as special case and move them at the very first beginning. + if (order1==TO_DIR && order2==TO_DIR) { + order1 = TypeOrderFromDirname(fd1->cFileName); + order2 = TypeOrderFromDirname(fd2->cFileName); } - return order2==order1? 0: order2<order1? -1: 1; + // Move virtual folders after physical folders + if (!(entry1->_shell_attribs & SFGAO_FILESYSTEM)) + order1 |= TO_VIRTUAL; + + if (!(entry2->_shell_attribs & SFGAO_FILESYSTEM)) + order2 |= TO_VIRTUAL; + + return order2==order1? 0: order1<order2? -1: 1; } @@ -190,28 +225,28 @@ static int compareName(const void* arg1, const void* arg2) { - const WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->_data; - const WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->_data; + const Entry* entry1 = *(const Entry**)arg1; + const Entry* entry2 = *(const Entry**)arg2; - int cmp = compareType(fd1, fd2); + int cmp = compareType(entry1, entry2); if (cmp) return cmp; - return lstrcmpi(fd1->cFileName, fd2->cFileName); + return lstrcmpi(entry1->_data.cFileName, entry2->_data.cFileName); } static int compareExt(const void* arg1, const void* arg2) { - const WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->_data; - const WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->_data; + const Entry* entry1 = *(const Entry**)arg1; + const Entry* entry2 = *(const Entry**)arg2; const TCHAR *name1, *name2, *ext1, *ext2; - int cmp = compareType(fd1, fd2); + int cmp = compareType(entry1, entry2); if (cmp) return cmp; - name1 = fd1->cFileName; - name2 = fd2->cFileName; + name1 = entry1->_data.cFileName; + name2 = entry2->_data.cFileName; ext1 = _tcsrchr(name1, TEXT('.')); ext2 = _tcsrchr(name2, TEXT('.')); @@ -235,35 +270,35 @@ static int compareSize(const void* arg1, const void* arg2) { - WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->_data; - WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->_data; + const Entry* entry1 = *(const Entry**)arg1; + const Entry* entry2 = *(const Entry**)arg2; - int cmp = compareType(fd1, fd2); + int cmp = compareType(entry1, entry2); if (cmp) return cmp; - cmp = fd2->nFileSizeHigh - fd1->nFileSizeHigh; + cmp = entry2->_data.nFileSizeHigh - entry1->_data.nFileSizeHigh; if (cmp < 0) return -1; else if (cmp > 0) return 1; - cmp = fd2->nFileSizeLow - fd1->nFileSizeLow; + cmp = entry2->_data.nFileSizeLow - entry1->_data.nFileSizeLow; return cmp<0? -1: cmp>0? 1: 0; } static int compareDate(const void* arg1, const void* arg2) { - WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->_data; - WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->_data; + const Entry* entry1 = *(const Entry**)arg1; + const Entry* entry2 = *(const Entry**)arg2; - int cmp = compareType(fd1, fd2); + int cmp = compareType(entry1, entry2); if (cmp) return cmp; - return CompareFileTime(&fd2->ftLastWriteTime, &fd1->ftLastWriteTime); + return CompareFileTime(&entry2->_data.ftLastWriteTime, &entry1->_data.ftLastWriteTime); }

1 0

[hbirr] 20888: Fix the smp build.
by hbirr＠svn.reactos.org 15 Jan '06

15 Jan '06

Fix the smp build. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-15 09:23:55 UTC (rev 20887) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-15 10:17:35 UTC (rev 20888) @@ -139,7 +139,7 @@ mov dword ptr [ebx+KPCR_NPX_THREAD], 0 test byte ptr [edi+KTHREAD_NPX_STATE], NPX_STATE_DIRTY jz 3f - cmp dword ptr _FxsrSupport, 0 + cmp dword ptr _KeI386FxsrPresent, 0 je 1f fxsave [eax-SIZEOF_FX_SAVE_AREA] jmp 2f

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