Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[cwittich] 36981: -move ConvertSecurityDescriptorToStringSecurityDescriptorA/W from sec.c to sid.c -import ConvertSecurityDescriptorToStringSecurityDescriptorA from wine
by cwittich＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: cwittich Date: Sun Oct 26 07:16:48 2008 New Revision: 36981 URL: http://svn.reactos.org/svn/reactos?rev=36981&view=rev Log: -move ConvertSecurityDescriptorToStringSecurityDescriptorA/W from sec.c to sid.c -import ConvertSecurityDescriptorToStringSecurityDescriptorA from wine Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] Sun Oct 26 07:16:48 2008 @@ -607,36 +607,4 @@ return ret; } - -/* - * @unimplemented - */ -BOOL WINAPI -ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCRIPTOR pSecurityDescriptor, - DWORD dword, - SECURITY_INFORMATION SecurityInformation, - LPWSTR *lpwstr, - PULONG pulong) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -ConvertSecurityDescriptorToStringSecurityDescriptorA(PSECURITY_DESCRIPTOR pSecurityDescriptor, - DWORD dword, - SECURITY_INFORMATION SecurityInformation, - LPSTR *lpstr, - PULONG pulong) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - /* EOF */ Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Sun Oct 26 07:16:48 2008 @@ -612,6 +612,65 @@ /****************************************************************************** + * ConvertSecurityDescriptorToStringSecurityDescriptorW [ADVAPI32.@] + * @unimplemented + */ +BOOL WINAPI +ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCRIPTOR SecurityDescriptor, + DWORD SDRevision, + SECURITY_INFORMATION SecurityInformation, + LPWSTR *OutputString, + PULONG OutputLen) +{ + if (SDRevision != SDDL_REVISION_1) + { + ERR("Pogram requested unknown SDDL revision %d\n", SDRevision); + SetLastError(ERROR_UNKNOWN_REVISION); + return FALSE; + } + + FIXME("%s() not implemented!\n", __FUNCTION__); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/****************************************************************************** + * ConvertSecurityDescriptorToStringSecurityDescriptorA [ADVAPI32.@] + * @implemented + */ +BOOL WINAPI +ConvertSecurityDescriptorToStringSecurityDescriptorA(PSECURITY_DESCRIPTOR SecurityDescriptor, + DWORD SDRevision, + SECURITY_INFORMATION Information, + LPSTR *OutputString, + PULONG OutputLen) +{ + LPWSTR wstr; + ULONG len; + if (ConvertSecurityDescriptorToStringSecurityDescriptorW(SecurityDescriptor, SDRevision, Information, &wstr, &len)) + { + int lenA; + + lenA = WideCharToMultiByte(CP_ACP, 0, wstr, len, NULL, 0, NULL, NULL); + *OutputString = HeapAlloc(GetProcessHeap(), 0, lenA); + WideCharToMultiByte(CP_ACP, 0, wstr, len, *OutputString, lenA, NULL, NULL); + LocalFree(wstr); + + if (OutputLen != NULL) + *OutputLen = lenA; + return TRUE; + } + else + { + *OutputString = NULL; + if (OutputLen) + *OutputLen = 0; + return FALSE; + } +} + +/****************************************************************************** * ConvertStringSecurityDescriptorToSecurityDescriptorW [ADVAPI32.@] * @implemented */

1 0

[fireball] 36980: - Let's get back to one RTL library for now, because: * 36761 just separated the library, but all hacks remain in the tree. * Real solution needs at least 3 RTL libraries (kernelmode, usermode, bootloader), otherwise we'll still have to have RTL-libsupp library. * I couldn't reach consensuss with developers about either method. * Since the only disadvantages now are the usermode/kernelmode structure differences hack (which was not removed) and additional small support libraries
by fireball＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: fireball Date: Sun Oct 26 07:16:04 2008 New Revision: 36980 URL: http://svn.reactos.org/svn/reactos?rev=36980&view=rev Log: - Let's get back to one RTL library for now, because: * 36761 just separated the library, but all hacks remain in the tree. * Real solution needs at least 3 RTL libraries (kernelmode, usermode, bootloader), otherwise we'll still have to have RTL-libsupp library. * I couldn't reach consensuss with developers about either method. * Since the only disadvantages now are the usermode/kernelmode structure differences hack (which was not removed) and additional small support libraries (which were not removed, including RtlpGetMode, which remained), there is no reason to waste time for compiling RTL twice without benefits. Removed: trunk/reactos/lib/rtl/rtl-common.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Sun Oct 26 07:16:04 2008 @@ -11,7 +11,7 @@ <library>freeldr_main</library> <library>rossym</library> <library>cmlib</library> - <library>rtl_kmode</library> + <library>rtl</library> <library>libcntpr</library> <linkerflag>-static</linkerflag> <linkerflag>-lgcc</linkerflag> Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Sun Oct 26 07:16:04 2008 @@ -9,7 +9,7 @@ <library>setupldr_main</library> <library>rossym</library> <library>cmlib</library> - <library>rtl_kmode</library> + <library>rtl</library> <library>libcntpr</library> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag> Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Sun Oct 26 07:16:04 2008 @@ -11,7 +11,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="_NTOSKRNL_" /> <define name="__NO_CTYPE_INLINES" /> - <library>rtl_umode</library> + <library>rtl</library> <library>ntdllsys</library> <library>libcntpr</library> <library>pseh</library> Removed: trunk/reactos/lib/rtl/rtl-common.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl-common.rbuild?… ============================================================================== --- trunk/reactos/lib/rtl/rtl-common.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl-common.rbuild (removed) @@ -1,98 +1,0 @@ -<?xml version="1.0"?> - -<include base="rtl">.</include> -<define name="_NTOSKRNL_" /> -<define name="__NO_CTYPE_INLINES" /> -<define name="NO_RTL_INLINES" /> -<define name="_NTSYSTEM_" /> -<define name="_NTDLLBUILD_" /> -<if property="ARCH" value="i386"> - <directory name="i386"> - <file>debug_asm.S</file> - <file>except_asm.s</file> - <file>except.c</file> - <file>random_asm.S</file> - <file>rtlswap.S</file> - <file>rtlmem.s</file> - <file>res_asm.s</file> - <file>thread.c</file> - </directory> -</if> -<if property="ARCH" value="powerpc"> -<directory name="powerpc"> - <file>debug.c</file> - <file>except.c</file> - <file>interlocked.c</file> - <file>rtlmem.s</file> - <file>rtlswap.s</file> - <file>thread.c</file> -</directory> -</if> -<if property="ARCH" value="arm"> - <directory name="arm"> - <file>debug_asm.S</file> - </directory> - <file>mem.c</file> - <file>memgen.c</file> -</if> -<directory name="austin"> - <file>avl.c</file> - <file>tree.c</file> -</directory> - -<file>access.c</file> -<file>acl.c</file> -<file>actctx.c</file> -<file>atom.c</file> -<file>bitmap.c</file> -<file>bootdata.c</file> -<file>compress.c</file> -<file>condvar.c</file> -<file>crc32.c</file> -<file>critical.c</file> -<file>dbgbuffer.c</file> -<file>debug.c</file> -<file>dos8dot3.c</file> -<file>encode.c</file> -<file>env.c</file> -<file>error.c</file> -<file>exception.c</file> -<file>generictable.c</file> -<file>handle.c</file> -<file>heap.c</file> -<file>image.c</file> -<file>interlck.c</file> -<file>message.c</file> -<file>largeint.c</file> -<file>luid.c</file> -<file>network.c</file> -<file>nls.c</file> -<file>path.c</file> -<file>ppb.c</file> -<file>process.c</file> -<file>propvar.c</file> -<file>qsort.c</file> -<file>random.c</file> -<file>rangelist.c</file> -<file>registry.c</file> -<file>res.c</file> -<file>resource.c</file> -<file>sd.c</file> -<file>security.c</file> -<file>slist.c</file> -<file>sid.c</file> -<file>sprintf.c</file> -<file>srw.c</file> -<file>swprintf.c</file> -<file>splaytree.c</file> -<file>thread.c</file> -<file>time.c</file> -<file>timezone.c</file> -<file>timerqueue.c</file> -<file>unicode.c</file> -<file>unicodeprefix.c</file> -<file>vectoreh.c</file> -<file>version.c</file> -<file>wait.c</file> -<file>workitem.c</file> -<pch>rtl.h</pch> Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=369… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Sun Oct 26 07:16:04 2008 @@ -1,15 +1,100 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="rtl" type="staticlibrary"> + <define name="_NTOSKRNL_" /> + <define name="__NO_CTYPE_INLINES" /> + <define name="NO_RTL_INLINES" /> + <define name="_NTSYSTEM_" /> + <define name="_NTDLLBUILD_" /> + <include base="rtl">.</include> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>debug_asm.S</file> + <file>except_asm.s</file> + <file>except.c</file> + <file>random_asm.S</file> + <file>rtlswap.S</file> + <file>rtlmem.s</file> + <file>res_asm.s</file> + <file>thread.c</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>debug.c</file> + <file>except.c</file> + <file>interlocked.c</file> + <file>rtlmem.s</file> + <file>rtlswap.s</file> + <file>thread.c</file> + </directory> + </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>debug_asm.S</file> + </directory> + <file>mem.c</file> + <file>memgen.c</file> + </if> + <directory name="austin"> + <file>avl.c</file> + <file>tree.c</file> + </directory> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="rtl_umode" type="staticlibrary"> - <xi:include href="rtl-common.rbuild" /> - </module> - - <module name="rtl_kmode" type="staticlibrary"> - <xi:include href="rtl-common.rbuild" /> - </module> - -  - <module name="rtl" type="staticlibrary" /> -</group> + <file>access.c</file> + <file>acl.c</file> + <file>actctx.c</file> + <file>atom.c</file> + <file>bitmap.c</file> + <file>bootdata.c</file> + <file>compress.c</file> + <file>condvar.c</file> + <file>crc32.c</file> + <file>critical.c</file> + <file>dbgbuffer.c</file> + <file>debug.c</file> + <file>dos8dot3.c</file> + <file>encode.c</file> + <file>env.c</file> + <file>error.c</file> + <file>exception.c</file> + <file>generictable.c</file> + <file>handle.c</file> + <file>heap.c</file> + <file>image.c</file> + <file>interlck.c</file> + <file>message.c</file> + <file>largeint.c</file> + <file>luid.c</file> + <file>network.c</file> + <file>nls.c</file> + <file>path.c</file> + <file>ppb.c</file> + <file>process.c</file> + <file>propvar.c</file> + <file>qsort.c</file> + <file>random.c</file> + <file>rangelist.c</file> + <file>registry.c</file> + <file>res.c</file> + <file>resource.c</file> + <file>sd.c</file> + <file>security.c</file> + <file>slist.c</file> + <file>sid.c</file> + <file>sprintf.c</file> + <file>srw.c</file> + <file>swprintf.c</file> + <file>splaytree.c</file> + <file>thread.c</file> + <file>time.c</file> + <file>timezone.c</file> + <file>timerqueue.c</file> + <file>unicode.c</file> + <file>unicodeprefix.c</file> + <file>vectoreh.c</file> + <file>version.c</file> + <file>wait.c</file> + <file>workitem.c</file> + <pch>rtl.h</pch> +</module> Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Oct 26 07:16:04 2008 @@ -26,7 +26,7 @@ <library>hal</library> <library>pseh</library> <library>cmlib</library> - <library>rtl_kmode</library> + <library>rtl</library> <library>rossym</library> <library>libcntpr</library> <library>kdcom</library>

1 0

[fireball] 36979: Dmitry Gorbachev - Fix a modifier flag in interlocked functions' inlined asm. See detailed explanation in bug 3772. See issue #3772 for more details.
by fireball＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: fireball Date: Sun Oct 26 05:47:07 2008 New Revision: 36979 URL: http://svn.reactos.org/svn/reactos?rev=36979&view=rev Log: Dmitry Gorbachev - Fix a modifier flag in interlocked functions' inlined asm. See detailed explanation in bug 3772. See issue #3772 for more details. Modified: trunk/reactos/include/psdk/intrin_x86.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intrin_x86.h [iso-8859-1] Sun Oct 26 05:47:07 2008 @@ -499,7 +499,7 @@ static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandreset(volatile long * a, const long b) { unsigned char retval; - __asm__("lock; btrl %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "=m" (*a) : [b] "Ir" (b) : "memory"); + __asm__("lock; btrl %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); return retval; } @@ -507,7 +507,7 @@ static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandreset64(volatile long long * a, const long long b) { unsigned char retval; - __asm__("lock; btrq %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "=m" (*a) : [b] "Ir" (b) : "memory"); + __asm__("lock; btrq %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); return retval; } #endif @@ -515,7 +515,7 @@ static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandset(volatile long * a, const long b) { unsigned char retval; - __asm__("lock; btsl %[b], %[a]; setc %b[retval]" : [retval] "=r" (retval), [a] "=m" (*a) : [b] "Ir" (b) : "memory"); + __asm__("lock; btsl %[b], %[a]; setc %b[retval]" : [retval] "=r" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); return retval; } @@ -523,7 +523,7 @@ static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandset64(volatile long long * a, const long long b) { unsigned char retval; - __asm__("lock; btsq %[b], %[a]; setc %b[retval]" : [retval] "=r" (retval), [a] "=m" (*a) : [b] "Ir" (b) : "memory"); + __asm__("lock; btsq %[b], %[a]; setc %b[retval]" : [retval] "=r" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); return retval; } #endif Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Oct 26 05:47:07 2008 @@ -4782,7 +4782,7 @@ __asm__ __volatile__("lock " "btsl %2,%1\n\t" "sbbl %0,%0\n\t" - :"=r" (OldBit),"=m" (*Base) + :"=r" (OldBit),"+m" (*Base) :"Ir" (Bit) : "memory"); return OldBit; @@ -4800,7 +4800,7 @@ __asm__ __volatile__("lock " "btrl %2,%1\n\t" "sbbl %0,%0\n\t" - :"=r" (OldBit),"=m" (*Base) + :"=r" (OldBit),"+m" (*Base) :"Ir" (Bit) : "memory"); return OldBit;

1 0

[dreimer] 36978: Baaad, but working Hack, realized together with Jaykul from #powershell. Now Powershell Version does build ROS again. Somehow GCC has a strange way to output console stdout and stderr, so the previous idea always returned vars with $null in it. Updated Russian Translation by tower
by dreimer＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: dreimer Date: Sat Oct 25 20:22:48 2008 New Revision: 36978 URL: http://svn.reactos.org/svn/reactos?rev=36978&view=rev Log: Baaad, but working Hack, realized together with Jaykul from #powershell. Now Powershell Version does build ROS again. Somehow GCC has a strange way to output console stdout and stderr, so the previous idea always returned vars with $null in it. Updated Russian Translation by tower Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Sat Oct 25 20:22:48 2008 @@ -46,17 +46,21 @@ # $ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" $global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" -#$global:_ROSBE_GCCVERSION = $null -#$global:_ROSBE_GCCTARGET = $null if ($ENV:ROS_ARCH -ne $null) { - $global:_ROSBE_GCCVERSION = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|\.)+).*",'$1' - $global:_ROSBE_GCCTARGET = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' + & "$ENV:ROS_PREFIX-gcc" -v 2> v.txt + $global:_ROSBE_GCCVERSION = (select-string -path .\v.txt "gcc version") -replace ".*version ((\d|\.)+).*",'$1' + $global:_ROSBE_GCCTARGET = (select-string -path .\v.txt "target=") -replace ".*--target=(.+?)\b.*",'$1' + rm v.txt } else { - $global:_ROSBE_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|\.)+).*",'$1' - $global:_ROSBE_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' + gcc -v 2> v.txt + $global:_ROSBE_GCCVERSION = (select-string -path .\v.txt "gcc version") -replace ".*version ((\d|\.)+).*",'$1' + $global:_ROSBE_GCCTARGET = (select-string -path .\v.txt "target=") -replace ".*--target=(.+?)\b.*",'$1' + rm v.txt } -$global:_ROSBE_HOST_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|\.)+).*",'$1' -$global:_ROSBE_HOST_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' +gcc -v 2> v.txt +$global:_ROSBE_HOST_GCCVERSION = (select-string -path .\v.txt "gcc version") -replace ".*version ((\d|\.)+).*",'$1' +$global:_ROSBE_HOST_GCCTARGET = (select-string -path .\v.txt "target=") -replace ".*--target=(.+?)\b.*",'$1' +rm v.txt if ($_ROSBE_MODE -eq "MinGW") { $ENV:C_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" @@ -72,11 +76,15 @@ # Display the current version of GCC, NASM, ld and make. # if ($ENV:ROS_ARCH -ne $null) { -& "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-gcc" -v 2>&1 | select-string "gcc version" +& "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-gcc" -v 2> v.txt +(select-string -path .\v.txt "gcc version") -replace ".*: (.+?)\b",'$1' +rm v.txt "gcc target - $_ROSBE_GCCTARGET" & "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-ld" -v } else { -& gcc -v 2>&1 | select-string "gcc version" +gcc -v 2> v.txt +(select-string -path .\v.txt "gcc version" ) -replace ".*: (.+?)\b",'$1' +rm v.txt "gcc target - $_ROSBE_GCCTARGET" & ld -v } Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] Sat Oct 25 20:22:48 2008 @@ -15,7 +15,7 @@ CONTROL "Îòîáðàæàòü âðåìÿ êîìïèëÿöèè", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 CONTROL "Èñïîëüçîâàòü êåøèðîâàíèå", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 CONTROL "Âûðåçàòü ïóñòîé êîä ïðè êîìïèë.", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 - CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 + CONTROL "Îñòàâëÿòü â ôàéëàõ èíôîðìàöèþ äëÿ âîçìîæíîñòè ðàáîòû äåáàãåðà", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", -1, 10, 107, 100, 15 EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP @@ -75,5 +75,5 @@ HLP_SAVEBUTTON, "Àêòèâíîå ñîñòîÿíèå êíîïêè óêàçûâàåò íà âîçìîæíîñòü ñîõðàíåíèÿ èçìåíåííûõ íàñòðîåê" HLP_QUITBUTTON, "Ýòî êëàâèøà ïîçâîëÿåò âûéòè áåç ñîõðàíåíèÿ èçìåíåíèé" HLP_DEFAULTMSG, "Ïîìîùü ïî èçíà÷àëüíûì ïàðàìåòðàì" - HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." + HLP_NOSTRIP, "Êîìïèëÿöèÿ ôàéëîâ ReactOS'à ñ ñîçäàíèåì èíôîðìàöèè äëÿ äåáàãåðà." END

1 0

[jimtabor] 36977: - Update user connect structure.
by jimtabor＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: jimtabor Date: Sat Oct 25 19:50:16 2008 New Revision: 36977 URL: http://svn.reactos.org/svn/reactos?rev=36977&view=rev Log: - Update user connect structure. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Oct 25 19:50:16 2008 @@ -433,10 +433,10 @@ typedef struct _USERCONNECT { - DWORD Unknown0; - DWORD Unknown1; - DWORD Unknown2; - SHAREDINFO ShareInfo; + ULONG ulVersion; + ULONG ulCurrentVersion; + DWORD dwDispatchCount; + SHAREDINFO siClient; } USERCONNECT, *PUSERCONNECT; //

1 0

[dreimer] 36976: Almost done. Only two Variables are still making problems.
by dreimer＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: dreimer Date: Sat Oct 25 19:08:28 2008 New Revision: 36976 URL: http://svn.reactos.org/svn/reactos?rev=36976&view=rev Log: Almost done. Only two Variables are still making problems. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Sat Oct 25 19:08:28 2008 @@ -42,7 +42,7 @@ # Small Security Check to prevent useless apps. if ($ENV:ROS_LEAN_AND_MEAN -eq "yes") { if ($ENV:ROS_BUILDNOSTRIP -eq "yes") { -! cls + cls "Selecting Stripping and removing Debug Symbols together will most likely cause useless apps. Please deselect one of them." exit } @@ -68,7 +68,7 @@ $ENV:TARGET_CC = "ccache x86_64-pc-mingw32-gcc" $ENV:TARGET_CPP = "ccache x86_64-pc-mingw32-g++" } - if $ENV:ROS_ARCH -eq "ppc") { + if ($ENV:ROS_ARCH -eq "ppc") { $ENV:TARGET_CC = "ccache ppc-pc-mingw32-gcc" $ENV:TARGET_CPP = "ccache ppc-pc-mingw32-g++" } @@ -90,7 +90,7 @@ $ENV:TARGET_CC = "x86_64-pc-mingw32-gcc" $ENV:TARGET_CPP = "x86_64-pc-mingw32-g++" } - if $ENV:ROS_ARCH -eq "ppc") { + if ($ENV:ROS_ARCH -eq "ppc") { $ENV:TARGET_CC = "ppc-pc-mingw32-gcc" $ENV:TARGET_CPP = "ppc-pc-mingw32-g++" } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Sat Oct 25 19:08:28 2008 @@ -68,7 +68,7 @@ } if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { - " update [OPTIONS] - Updates RosBE to the most recent files. + " update [OPTIONS] - Updates RosBE to the most recent files." } "" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sat Oct 25 19:08:28 2008 @@ -131,8 +131,20 @@ if ($args -eq "oldmode") { cls $_ROSBE_MODE = "MinGW" - - } else { + } + elseif ($args -eq "arm") { + cls + $_ROSBE_ARCH = 1 + } + elseif ($args -eq "ppc") { + cls + $_ROSBE_ARCH = 2 + } + elseif ($args -eq "amd64") { + cls + $_ROSBE_ARCH = 3 + } + elseif ($args -ne $null) { cls "Unknown parameter specified. Exiting." exit Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Sat Oct 25 19:08:28 2008 @@ -11,10 +11,10 @@ # Check if we are running within the RosBE, and if not initialize GCC for the # current directory. # -if ($ENV:_ROSBE_MINGWPATH -eq $null) { - $ENV:_ROSBE_MODE = "MinGW" - $ENV:_ROSBE_MINGWPATH = "$pwd" - $ENV:_ROSBE_ORIGINALPATH = "$PATH" +if ($_ROSBE_HOST_MINGWPATH -eq $null) { + $_ROSBE_MODE = "MinGW" + $_ROSBE_HOST_MINGWPATH = "$pwd" + $_ROSBE_ORIGINALPATH = "$PATH" } @@ -44,10 +44,10 @@ # # Set up the GCC 4.x.x build environment. # -$ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin; $_ROSBE_ORIGINALPATH" -$global:_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe" -$global:_ROSBE_GCCVERSION = $null -$global:_ROSBE_GCCTARGET = $null +$ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" +$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" +#$global:_ROSBE_GCCVERSION = $null +#$global:_ROSBE_GCCTARGET = $null if ($ENV:ROS_ARCH -ne $null) { $global:_ROSBE_GCCVERSION = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|\.)+).*",'$1' $global:_ROSBE_GCCTARGET = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' @@ -80,10 +80,10 @@ "gcc target - $_ROSBE_GCCTARGET" & ld -v } -if (Test-Path "$_ROSBE_MINGWPATH\bin\nasm.exe") { +if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\nasm.exe") { & nasm -v } else { - if (Test-Path "$_ROSBE_MINGWPATH\bin\yasm.exe") { + if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\yasm.exe") { & yasm --version | select-string "yasm 0" } else { if ($_ROSBE_MODE -eq "RosBE") { @@ -91,14 +91,14 @@ } } } -if (Test-Path "$_ROSBE_MINGWPATH\bin\bison.exe") { +if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\bison.exe") { & bison --version | find "GNU Bison" } else { if ($_ROSBE_MODE -eq "RosBE") { "WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC." } } -if (Test-Path "$_ROSBE_MINGWPATH\bin\flex.exe") { +if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\flex.exe") { $fver = (& flex --version) -replace ".*version ((\d|\.)+).*",'$1' "flex $fver" } else {

1 0

[sginsberg] 36975: - Add missing EngPlgBlt export
by sginsberg＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: sginsberg Date: Sat Oct 25 18:46:56 2008 New Revision: 36975 URL: http://svn.reactos.org/svn/reactos?rev=36975&view=rev Log: - Add missing EngPlgBlt export Modified: trunk/reactos/subsystems/win32/win32k/win32k.def Modified: trunk/reactos/subsystems/win32/win32k/win32k.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.def [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.def [iso-8859-1] Sat Oct 25 18:46:56 2008 @@ -108,6 +108,7 @@ EngMultiByteToWideChar@20 EngNineGrid@36 EngPaint@20 +EngPlgBlt@44 EngProbeForRead(a)12=NTOSKRNL.ProbeForRead EngProbeForReadAndWrite(a)12=NTOSKRNL.ProbeForWrite EngQueryDeviceAttribute@24

1 0

[cgutman] 36974: - Merge aicom-network-fixes up to r36973
by cgutman＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: cgutman Date: Sat Oct 25 18:44:41 2008 New Revision: 36974 URL: http://svn.reactos.org/svn/reactos?rev=36974&view=rev Log: - Merge aicom-network-fixes up to r36973 Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Oct 25 18:44:41 2008 @@ -221,10 +221,6 @@ ExFreePool( FCB->LocalAddress ); if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); - if( FCB->ListenIrp.ConnectionReturnInfo ) - ExFreePool( FCB->ListenIrp.ConnectionReturnInfo ); - if( FCB->ListenIrp.ConnectionCallInfo ) - ExFreePool( FCB->ListenIrp.ConnectionCallInfo ); if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer); Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sat Oct 25 18:44:41 2008 @@ -628,6 +628,11 @@ ("Called( NdisPacket %x, Offset %d, Adapter %x )\n", NdisPacket, Offset, Adapter)); + if (Adapter->State != LAN_STATE_STARTED) { + ProtocolSendComplete(Context, NdisPacket, NDIS_STATUS_NOT_ACCEPTED); + return; + } + TI_DbgPrint(DEBUG_DATALINK, ("Adapter Address [%02x %02x %02x %02x %02x %02x]\n", Adapter->HWAddress[0] & 0xff, @@ -643,7 +648,6 @@ LanChainCompletion( Adapter, NdisPacket ); - if (Adapter->State == LAN_STATE_STARTED) { switch (Adapter->Media) { case NdisMedium802_3: EHeader = (PETH_HEADER)Data; @@ -713,9 +717,6 @@ * the situation with IRPs. */ if (NdisStatus != NDIS_STATUS_PENDING) ProtocolSendComplete((NDIS_HANDLE)Context, NdisPacket, NdisStatus); - } else { - ProtocolSendComplete((NDIS_HANDLE)Context, NdisPacket, NDIS_STATUS_CLOSED); - } } static NTSTATUS Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sat Oct 25 18:44:41 2008 @@ -28,6 +28,9 @@ VOID NBSendPackets( PNEIGHBOR_CACHE_ENTRY NCE ) { PLIST_ENTRY PacketEntry; PNEIGHBOR_PACKET Packet; + + if(!(NCE->State & NUD_CONNECTED)) + return; /* Send any waiting packets */ PacketEntry = ExInterlockedRemoveHeadList(&NCE->PacketQueue, Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sat Oct 25 18:44:41 2008 @@ -87,13 +87,13 @@ TI_DbgPrint(DEBUG_TCP,("AddressToBind - %x:%x\n", AddressToBind.sin_addr, AddressToBind.sin_port)); - OskitTCPBind( Connection->SocketContext, - Connection, - &AddressToBind, - sizeof(AddressToBind) ); + Status = TCPTranslateError( OskitTCPBind( Connection->SocketContext, + Connection, + &AddressToBind, + sizeof(AddressToBind) ) ); - Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext, - Backlog ) ); + if (NT_SUCCESS(Status)) + Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext, Backlog ) ); TcpipRecursiveMutexLeave( &TCPLock ); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Oct 25 18:44:41 2008 @@ -577,21 +577,24 @@ AddressToConnect.sin_family = AF_INET; AddressToBind = AddressToConnect; - OskitTCPBind( Connection->SocketContext, + Status = TCPTranslateError + ( OskitTCPBind( Connection->SocketContext, Connection, &AddressToBind, - sizeof(AddressToBind) ); - - memcpy( &AddressToConnect.sin_addr, - &RemoteAddress.Address.IPv4Address, - sizeof(AddressToConnect.sin_addr) ); - AddressToConnect.sin_port = RemotePort; - - Status = TCPTranslateError - ( OskitTCPConnect( Connection->SocketContext, - Connection, - &AddressToConnect, - sizeof(AddressToConnect) ) ); + sizeof(AddressToBind) ) ); + + if (NT_SUCCESS(Status)) { + memcpy( &AddressToConnect.sin_addr, + &RemoteAddress.Address.IPv4Address, + sizeof(AddressToConnect.sin_addr) ); + AddressToConnect.sin_port = RemotePort; + + Status = TCPTranslateError + ( OskitTCPConnect( Connection->SocketContext, + Connection, + &AddressToConnect, + sizeof(AddressToConnect) ) ); + } TcpipRecursiveMutexLeave( &TCPLock );

1 0

[cgutman] 36973: - Don't free ConnectionReturnInfo and ConnectionCallInfo because they get freed in the completion routine - Fixes Abyss Web Server regression
by cgutman＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: cgutman Date: Sat Oct 25 18:02:07 2008 New Revision: 36973 URL: http://svn.reactos.org/svn/reactos?rev=36973&view=rev Log: - Don't free ConnectionReturnInfo and ConnectionCallInfo because they get freed in the completion routine - Fixes Abyss Web Server regression Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Sat Oct 25 18:02:07 2008 @@ -221,10 +221,6 @@ ExFreePool( FCB->LocalAddress ); if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); - if( FCB->ListenIrp.ConnectionReturnInfo ) - ExFreePool( FCB->ListenIrp.ConnectionReturnInfo ); - if( FCB->ListenIrp.ConnectionCallInfo ) - ExFreePool( FCB->ListenIrp.ConnectionCallInfo ); if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer);

1 0

[sginsberg] 36972: - When doing pointer arithmetic, ULONG_PTR is your friend
by sginsberg＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: sginsberg Date: Sat Oct 25 17:57:16 2008 New Revision: 36972 URL: http://svn.reactos.org/svn/reactos?rev=36972&view=rev Log: - When doing pointer arithmetic, ULONG_PTR is your friend Modified: branches/ros-amd64-bringup/reactos/drivers/video/displays/vga/main/enable.c Modified: branches/ros-amd64-bringup/reactos/drivers/video/displays/vga/main/enable.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/displays/vga/main/enable.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/displays/vga/main/enable.c [iso-8859-1] Sat Oct 25 17:57:16 2008 @@ -562,7 +562,7 @@ /* next DEVMODE entry */ OutputModes--; - DM = (PDEVMODEW) ( ((ULONG)DM) + sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE); + DM = (PDEVMODEW) ( ((ULONG_PTR)DM) + sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE); OutputSize += (sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE); }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008