Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[spetreolle] 43830: silence debug
by spetreolle＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: spetreolle Date: Thu Oct 29 19:28:27 2009 New Revision: 43830 URL: http://svn.reactos.org/svn/reactos?rev=43830&view=rev Log: silence debug Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Thu Oct 29 19:28:27 2009 @@ -810,7 +810,7 @@ HandleType != ExpectedType) || HandleType == 0 ) { - DPRINT1("Attempted to lock object 0x%x of wrong type (Handle: 0x%x, requested: 0x%x)\n", + DPRINT("Attempted to lock object 0x%x of wrong type (Handle: 0x%x, requested: 0x%x)\n", hObj, HandleType, ExpectedType); GDIDBG_TRACECALLER(); GDIDBG_TRACEALLOCATOR(hObj);

1 0

[sginsberg] 43829: - Re-enable some debug prints for unsupported hardware features and make them consistent.
by sginsberg＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: sginsberg Date: Thu Oct 29 19:26:22 2009 New Revision: 43829 URL: http://svn.reactos.org/svn/reactos?rev=43829&view=rev Log: - Re-enable some debug prints for unsupported hardware features and make them consistent. Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/mtrr.c trunk/reactos/ntoskrnl/ke/i386/patpge.c trunk/reactos/ntoskrnl/vdm/vdmmain.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Thu Oct 29 19:26:22 2009 @@ -40,7 +40,7 @@ if (KeFeatureBits & KF_LARGE_PAGE) { /* FIXME: Support this */ - DPRINT("Large Page support detected but not yet taken advantage of!\n"); + DPRINT1("Large Page support detected but not yet taken advantage of\n"); } /* Check for global page support */ Modified: trunk/reactos/ntoskrnl/ke/i386/mtrr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/mtrr.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/mtrr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/mtrr.c [iso-8859-1] Thu Oct 29 19:26:22 2009 @@ -21,7 +21,7 @@ KiInitializeMTRR(IN BOOLEAN FinalCpu) { /* FIXME: Support this */ - DPRINT("Your machine supports MTRR but ReactOS doesn't yet.\n"); + DPRINT1("MTRR support detected but not yet taken advantage of\n"); } VOID @@ -29,5 +29,5 @@ KiAmdK6InitializeMTRR(VOID) { /* FIXME: Support this */ - DPRINT("Your machine supports AMD MTRR but ReactOS doesn't yet.\n"); + DPRINT1("AMD MTRR support detected but not yet taken advantage of\n"); } Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Thu Oct 29 19:26:22 2009 @@ -59,5 +59,5 @@ KiInitializePAT(VOID) { /* FIXME: Support this */ - DPRINT("Advanced Memory features detected but not yet taken advantage of.\n"); + DPRINT1("PAT support detected but not yet taken advantage of\n"); } Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] Thu Oct 29 19:26:22 2009 @@ -22,7 +22,8 @@ NTAPI Ki386VdmEnablePentiumExtentions(VOID) { - DPRINT("VME detected but not yet supported\n"); + /* FIXME: Support this */ + DPRINT1("VME support detected but not yet taken advantage of\n"); } VOID

1 0

[lsuggs] 43828: Making it closer to building properly.
by lsuggs＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: lsuggs Date: Thu Oct 29 19:01:27 2009 New Revision: 43828 URL: http://svn.reactos.org/svn/reactos?rev=43828&view=rev Log: Making it closer to building properly. Added: branches/nslookup/dll/3rdparty/bind9/bind9.rbuild (with props) branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild (with props) branches/nslookup/dll/3rdparty/lwres/lwres.rbuild (with props) Modified: branches/nslookup/dll/3rdparty/3rdparty.rbuild branches/nslookup/dll/3rdparty/dns/dns.rbuild branches/nslookup/dll/3rdparty/isc/include/config.h branches/nslookup/dll/3rdparty/isc/include/isc/log.h branches/nslookup/dll/3rdparty/isc/include/versions.h branches/nslookup/dll/3rdparty/isc/isc.rbuild branches/nslookup/dll/3rdparty/isc/win32/include/isc/platform.h branches/nslookup/dll/3rdparty/isc/win32/net.c branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h Modified: branches/nslookup/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/3rdparty.… ============================================================================== --- branches/nslookup/dll/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/3rdparty.rbuild [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -3,9 +3,6 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="isc"> <xi:include href="isc/isc.rbuild" /> - </directory> - <directory name="dns"> - <xi:include href="dns/dns.rbuild" /> </directory> <directory name="mesa32"> <xi:include href="mesa32/mesa32.rbuild" /> Added: branches/nslookup/dll/3rdparty/bind9/bind9.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/bind9/bin… ============================================================================== --- branches/nslookup/dll/3rdparty/bind9/bind9.rbuild (added) +++ branches/nslookup/dll/3rdparty/bind9/bind9.rbuild [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -1,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<module name="bind9" type="win32dll" installbase="system32" installname="libbind9.dll" allowwarnings="true"> + <include base="ReactOS">dll/3rdparty/isc/include</include> + <include base="ReactOS">dll/3rdparty/isc/win32</include> + <include base="ReactOS">dll/3rdparty/isc/win32/include</include> + <include base="ReactOS">dll/3rdparty/isc/noatomic/include</include> + <include base="ReactOS">dll/3rdparty/dns/include</include> + <include base="ReactOS">dll/3rdparty/isccfg/include</include> + <include base="ReactOS">dll/3rdparty/bind9/include</include> + <include base="ReactOS">dll/3rdparty/bind9/win32/include</include> + <define name="WIN32" /> + <define name="USE_MD5" /> + <define name="LIBBIND9_EXPORTS" /> + <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> + <define name="ISC_PLATFORM_USEGCCASM" /> + <file>check.c</file> + <file>getaddresses.c</file> + <directory name="win32"> + <file>DLLMain.c</file> + <file>version.c</file> + </directory> +</module> Propchange: branches/nslookup/dll/3rdparty/bind9/bind9.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/nslookup/dll/3rdparty/dns/dns.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/dns.r… ============================================================================== --- branches/nslookup/dll/3rdparty/dns/dns.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/dns/dns.rbuild [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -2,9 +2,11 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <module name="dns" type="win32dll" installbase="system32" installname="libdns.dll" allowwarnings="true"> <include base="ReactOS">dll/3rdparty/dns/include</include> + <include base="ReactOS">dll/3rdparty/dns/win32/include</include> <include base="ReactOS">dll/3rdparty/isc/include</include> + <include base="ReactOS">dll/3rdparty/isc/win32</include> <include base="ReactOS">dll/3rdparty/isc/win32/include</include> - <include base="ReactOS">dll/3rdparty/isc/x86_32/include</include> + <include base="ReactOS">dll/3rdparty/isc/noatomic/include</include> <define name="WIN32" /> <define name="USE_MD5" /> <define name="LIBDNS_EXPORTS" /> Modified: branches/nslookup/dll/3rdparty/isc/include/config.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/include/config.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/include/config.h [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -56,8 +56,9 @@ * Windows NT and 2K only */ #ifndef __REACTOS__ -#define _WIN32_WINNT 0x0400 -#endif +#define _WIN32_WINNT 0x0520 +#endif + /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 Modified: branches/nslookup/dll/3rdparty/isc/include/isc/log.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/include/isc/log.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/include/isc/log.h [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -24,10 +24,7 @@ #include <stdio.h> #include <stdarg.h> - -#ifndef __REACTOS__ #include <syslog.h> /* XXXDCL NT */ -#endif #include <isc/formatcheck.h> #include <isc/lang.h> Modified: branches/nslookup/dll/3rdparty/isc/include/versions.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/include/versions.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/include/versions.h [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -36,4 +36,22 @@ #define LIBAGE 2 #endif /* LIBDNS_EXPORTS */ +#ifdef LIBLWRES_EXPORTS +#define LIBINTERFACE 50 +#define LIBREVISION 2 +#define LIBAGE 0 +#endif /* LIBLWRES_EXPORTS */ + +#ifdef LIBBIND9_EXPORTS +#define LIBINTERFACE 50 +#define LIBREVISION 3 +#define LIBAGE 0 +#endif /* LIBBIND9_EXPORTS */ + +#ifdef LIBISCCFG_EXPORTS +#define LIBINTERFACE 50 +#define LIBREVISION 0 +#define LIBAGE 0 +#endif /* LIBISCCFG_EXPORTS */ + #endif /* VERSIONS_H */ Modified: branches/nslookup/dll/3rdparty/isc/isc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/isc.r… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/isc.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/isc.rbuild [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -2,13 +2,12 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <module name="isc" type="win32dll" installbase="system32" installname="libisc.dll" allowwarnings="true"> <include base="ReactOS">dll/3rdparty/isc/include</include> + <include base="ReactOS">dll/3rdparty/isc/win32</include> <include base="ReactOS">dll/3rdparty/isc/win32/include</include> - <include base="ReactOS">dll/3rdparty/isc/x86_32/include</include> + <include base="ReactOS">dll/3rdparty/isc/noatomic/include</include> + <include base="ReactOS">dll/3rdparty/isccfg/include</include> <define name="WIN32" /> - <define name="USE_MD5" /> <define name="LIBISC_EXPORTS" /> - <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> - <define name="ISC_PLATFORM_USEGCCASM" /> <file>assertions.c</file> <file>base32.c</file> <file>base64.c</file> @@ -32,6 +31,7 @@ <file>lex.c</file> <file>lfsr.c</file> <file>lib.c</file> + <file>log.c</file> <file>md5.c</file> <file>mem.c</file> <file>mutexblock.c</file> @@ -75,7 +75,6 @@ <file>ipv6.c</file> <file>keyboard.c</file> <file>net.c</file> - <file>ntgroups.c</file> <file>ntpaths.c</file> <file>once.c</file> <file>os.c</file> Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/platform.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/include/isc/platform.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/include/isc/platform.h [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -30,7 +30,10 @@ *** Network. ***/ +#ifndef __REACTOS__ #define ISC_PLATFORM_HAVEIPV6 +#endif + #if _MSC_VER > 1200 #define ISC_PLATFORM_HAVEIN6PKTINFO #endif Modified: branches/nslookup/dll/3rdparty/isc/win32/net.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/net.c [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/net.c [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -197,7 +197,7 @@ ipv6only_result = ISC_R_SUCCESS; close: - closeocket(s); + closesocket(s); return; #endif /* IPV6_V6ONLY */ } Added: branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isccfg/is… ============================================================================== --- branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild (added) +++ branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -1,0 +1,26 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<module name="isccfg" type="win32dll" installbase="system32" installname="libisccfg.dll" allowwarnings="true"> + <include base="ReactOS">dll/3rdparty/isc/include</include> + <include base="ReactOS">dll/3rdparty/isc/win32</include> + <include base="ReactOS">dll/3rdparty/isc/win32/include</include> + <include base="ReactOS">dll/3rdparty/isc/noatomic/include</include> + <include base="ReactOS">dll/3rdparty/dns/include</include> + <include base="ReactOS">dll/3rdparty/dns/win32/include</include> + <include base="ReactOS">dll/3rdparty/dns/sec/openssl/include</include> + <include base="ReactOS">dll/3rdparty/isccfg/include</include> + <include base="ReactOS">dll/3rdparty/isccfg/win32/include</include> + <define name="WIN32" /> + <define name="USE_MD5" /> + <define name="LIBISCCFG_EXPORTS" /> + <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> + <define name="ISC_PLATFORM_USEGCCASM" /> + <file>aclconf.c</file> + <file>log.c</file> + <file>namedconf.c</file> + <file>parser.c</file> + <directory name="win32"> + <file>DLLMain.c</file> + <file>version.c</file> + </directory> +</module> Propchange: branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nslookup/dll/3rdparty/lwres/lwres.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/lwres/lwr… ============================================================================== --- branches/nslookup/dll/3rdparty/lwres/lwres.rbuild (added) +++ branches/nslookup/dll/3rdparty/lwres/lwres.rbuild [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -1,0 +1,41 @@ +<module name="lwres" type="win32dll" installbase="system32" installname="liblwres.dll" allowwarnings="true"> + <include base="ReactOS">dll/3rdparty/isc/include</include> + <include base="ReactOS">dll/3rdparty/isc/win32</include> + <include base="ReactOS">dll/3rdparty/isc/win32/include</include> + <include base="ReactOS">dll/3rdparty/isc/noatomic/include</include> + <include base="ReactOS">dll/3rdparty/lwres/win32/include/lwres</include> + <include base="ReactOS">dll/3rdparty/lwres/include</include> + <include base="ReactOS">dll/3rdparty/lwres/win32/include</include> + <include base="ReactOS">dll/3rdparty/dns/include</include> + <include base="ReactOS">dll/3rdparty/dns/win32/include</include> + <include base="ReactOS">dll/3rdparty/dns/sec/openssl/include</include> + <define name="WIN32" /> + <define name="USE_MD5" /> + <define name="LIBLWRES_EXPORTS" /> + <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> + <define name="ISC_PLATFORM_USEGCCASM" /> + <file>context.c</file> + <file>gai_strerror.c</file> + <file>getaddrinfo.c</file> + <file>gethost.c</file> + <file>getipnode.c</file> + <file>getnameinfo.c</file> + <file>getrrset.c</file> + <file>herror.c</file> + <file>lwbuffer.c</file> + <file>lwinetaton.c</file> + <file>lwinetntop.c</file> + <file>lwinetpton.c</file> + <file>lwpacket.c</file> + <file>lwres_gabn.c</file> + <file>lwres_gnba.c</file> + <file>lwres_grbn.c</file> + <file>lwres_noop.c</file> + <file>lwresutil.c</file> + <directory name="win32"> + <file>lwconfig.c</file> + <file>DLLMain.c</file> + <file>version.c</file> + <file>socket.c</file> + </directory> +</module> Propchange: branches/nslookup/dll/3rdparty/lwres/lwres.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/lwres/win… ============================================================================== --- branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h [iso-8859-1] Thu Oct 29 19:01:27 2009 @@ -31,7 +31,9 @@ /* * Define if <netdb.h> does not declare struct addrinfo. */ +#ifndef __REACTOS__ #define ISC_LWRES_NEEDADDRINFO 1 +#endif #ifdef ISC_LWRES_NEEDADDRINFO struct addrinfo {

1 0

[sginsberg] 43827: - Implement the ThreadDescriptorTableEntry case for NtQueryInformationThread. This is required for the GetThreadSelectorEntry routine used by user mode debuggers. - #if out some x86-only LDT code from PS and move it to psldt.c.
by sginsberg＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: sginsberg Date: Thu Oct 29 11:04:15 2009 New Revision: 43827 URL: http://svn.reactos.org/svn/reactos?rev=43827&view=rev Log: - Implement the ThreadDescriptorTableEntry case for NtQueryInformationThread. This is required for the GetThreadSelectorEntry routine used by user mode debuggers. - #if out some x86-only LDT code from PS and move it to psldt.c. Added: trunk/reactos/ntoskrnl/ps/i386/psldt.c (with props) Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ke/i386/ldt.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Thu Oct 29 11:04:15 2009 @@ -651,28 +651,32 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI GetThreadSelectorEntry(IN HANDLE hThread, - IN DWORD dwSelector, - OUT LPLDT_ENTRY lpSelectorEntry) -{ - DESCRIPTOR_TABLE_ENTRY DescriptionTableEntry; - NTSTATUS Status; - - DescriptionTableEntry.Selector = dwSelector; - Status = NtQueryInformationThread(hThread, - ThreadDescriptorTableEntry, - &DescriptionTableEntry, - sizeof(DESCRIPTOR_TABLE_ENTRY), - NULL); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - *lpSelectorEntry = DescriptionTableEntry.Descriptor; - return TRUE; + IN DWORD dwSelector, + OUT LPLDT_ENTRY lpSelectorEntry) +{ + DESCRIPTOR_TABLE_ENTRY DescriptionTableEntry; + NTSTATUS Status; + + /* Set the selector and do the query */ + DescriptionTableEntry.Selector = dwSelector; + Status = NtQueryInformationThread(hThread, + ThreadDescriptorTableEntry, + &DescriptionTableEntry, + sizeof(DESCRIPTOR_TABLE_ENTRY), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Success, return the selector */ + *lpSelectorEntry = DescriptionTableEntry.Descriptor; + return TRUE; } /* Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Thu Oct 29 11:04:15 2009 @@ -65,6 +65,11 @@ #define KGDT_LDT 0x48 #define KGDT_DF_TSS 0x50 #define KGDT_NMI_TSS 0x58 + +// +// Define the number of GDTs that can be queried by user mode +// +#define KGDT_NUMBER 10 // // CR4 Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Thu Oct 29 11:04:15 2009 @@ -88,6 +88,14 @@ KTRAP_FRAME TrapFrame); #endif +NTSTATUS +NTAPI +Ke386GetGdtEntryThread( + IN PKTHREAD Thread, + IN ULONG Offset, + IN PKGDTENTRY Descriptor +); + #endif #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H */ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Thu Oct 29 11:04:15 2009 @@ -300,8 +300,9 @@ IN PEPROCESS Process ); -// -// VDM Support +#if defined(_X86_) +// +// VDM and LDT Support // NTSTATUS NTAPI @@ -314,6 +315,16 @@ PspDeleteVdmObjects( IN PEPROCESS Process ); + +NTSTATUS +NTAPI +PspQueryDescriptorThread( + IN PETHREAD Thread, + IN PVOID ThreadInformation, + IN ULONG ThreadInformationLength, + OUT PULONG ReturnLength OPTIONAL +); +#endif // // Job Routines Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] Thu Oct 29 11:04:15 2009 @@ -5,6 +5,7 @@ * PURPOSE: LDT managment * * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * Stefan Ginsberg (stefan.ginsberg(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -19,6 +20,55 @@ static KSPIN_LOCK GdtLock; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +Ke386GetGdtEntryThread(IN PKTHREAD Thread, + IN ULONG Offset, + IN PKGDTENTRY Descriptor) +{ + /* Make sure the offset is inside the allowed range */ + if (!((Offset) < (KGDT_NUMBER * sizeof(KGDTENTRY)))) + { + /* It isn't, fail */ + return STATUS_ACCESS_VIOLATION; + } + + /* Check if this is the LDT selector */ + if (Offset == KGDT_LDT) + { + /* Get it from the thread's process */ + RtlCopyMemory(Descriptor, + &Thread->Process->LdtDescriptor, + sizeof(KGDTENTRY)); + } + else + { + /* Get the descriptor entry from the GDT */ + RtlCopyMemory(Descriptor, + (PCHAR)((PKIPCR)KeGetPcr()->GDT) + Offset, + sizeof(KGDTENTRY)); + + /* Check if this is the TEB selector */ + if (Offset == KGDT_R3_TEB) + { + /* + * Make sure we set the correct base for this thread. This is per + * process and is set in the GDT on context switch, so it might not + * be correct for the thread specified. + */ + Descriptor->BaseLow = + (USHORT)((ULONG_PTR)(Thread->Teb) & 0xFFFF); + Descriptor->HighWord.Bytes.BaseMid = + (UCHAR)((ULONG_PTR)(Thread->Teb) >> 16); + Descriptor->HighWord.Bytes.BaseHi = + (UCHAR)((ULONG_PTR)(Thread->Teb) >> 24); + } + } + + /* Success */ + return STATUS_SUCCESS; +} VOID KeSetBaseGdtSelector(ULONG Entry, 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] Thu Oct 29 11:04:15 2009 @@ -444,6 +444,7 @@ <if property="ARCH" value="i386"> <directory name="i386"> <file>psctx.c</file> + <file>psldt.c</file> </directory> </if> <if property="ARCH" value="arm"> Added: trunk/reactos/ntoskrnl/ps/i386/psldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/i386/psldt.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ps/i386/psldt.c (added) +++ trunk/reactos/ntoskrnl/ps/i386/psldt.c [iso-8859-1] Thu Oct 29 11:04:15 2009 @@ -1,0 +1,105 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ps/i386/psldt.c + * PURPOSE: LDT support for x86 + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +PspDeleteLdt(PEPROCESS Process) +{ + /* FIXME */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PspDeleteVdmObjects(PEPROCESS Process) +{ + /* FIXME */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PspQueryDescriptorThread(IN PETHREAD Thread, + IN PVOID ThreadInformation, + IN ULONG ThreadInformationLength, + OUT PULONG ReturnLength OPTIONAL) +{ + DESCRIPTOR_TABLE_ENTRY DescriptorEntry; + LDT_ENTRY Descriptor; + NTSTATUS Status; + PAGED_CODE(); + + /* Verify the size */ + if (ThreadInformationLength != sizeof(DESCRIPTOR_TABLE_ENTRY)) + { + /* Fail */ + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Enter SEH for the copy */ + _SEH2_TRY + { + /* Get the descriptor */ + RtlCopyMemory(&DescriptorEntry, + ThreadInformation, + sizeof(DESCRIPTOR_TABLE_ENTRY)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Check if this is a GDT selector */ + if (!(DescriptorEntry.Selector & 0x4)) + { + /* Get the GDT entry */ + Status = Ke386GetGdtEntryThread(&Thread->Tcb, + DescriptorEntry.Selector & 0xFFFFFFF8, + (PKGDTENTRY)&Descriptor); + if (!NT_SUCCESS(Status)) return Status; + + /* Enter SEH for the copy */ + _SEH2_TRY + { + /* Copy the GDT entry to caller */ + RtlCopyMemory(&((PDESCRIPTOR_TABLE_ENTRY)ThreadInformation)-> + Descriptor, + &Descriptor, + sizeof(LDT_ENTRY)); + if (ReturnLength) *ReturnLength = sizeof(LDT_ENTRY); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Success */ + Status = STATUS_SUCCESS; + } + else + { + /* This is only supported for VDM, which we don't implement */ + ASSERT(Thread->ThreadsProcess->LdtInformation == NULL); + Status = STATUS_NO_LDT; + } + + /* Return status to caller */ + return Status; +} Propchange: trunk/reactos/ntoskrnl/ps/i386/psldt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=438… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Thu Oct 29 11:04:15 2009 @@ -270,9 +270,11 @@ Process->SectionObject = NULL; } - /* Clean LDT and VDM_OBJECTS */ +#if defined(_X86_) + /* Clean Ldt and Vdm objects */ PspDeleteLdt(Process); PspDeleteVdmObjects(Process); +#endif /* Delete the Object Table */ if (Process->ObjectTable) Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Thu Oct 29 11:04:15 2009 @@ -69,22 +69,6 @@ }; /* PRIVATE FUNCTIONS *********************************************************/ - -NTSTATUS -NTAPI -PspDeleteLdt(PEPROCESS Process) -{ - /* FIXME */ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -PspDeleteVdmObjects(PEPROCESS Process) -{ - /* FIXME */ - return STATUS_SUCCESS; -} PETHREAD NTAPI Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Thu Oct 29 11:04:15 2009 @@ -1819,9 +1819,19 @@ KeLowerIrql(OldIrql); break; + /* LDT and GDT information */ case ThreadDescriptorTableEntry: - DPRINT1("NtQueryInformationThread(): case ThreadDescriptorTableEntry not implemented!\n"); + +#if defined(_X86_) + /* Call the worker routine */ + Status = PspQueryDescriptorThread(Thread, + ThreadInformation, + ThreadInformationLength, + ReturnLength); +#else + /* Only implemented on x86 */ Status = STATUS_NOT_IMPLEMENTED; +#endif break; case ThreadPriorityBoost:

1 0

[janderwald] 43826: - Silence debug garbage
by janderwald＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: janderwald Date: Thu Oct 29 09:28:03 2009 New Revision: 43826 URL: http://svn.reactos.org/svn/reactos?rev=43826&view=rev Log: - Silence debug garbage Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Thu Oct 29 09:28:03 2009 @@ -161,7 +161,7 @@ AcquireEntrypointMutex(MIXER_DEVICE_TYPE); - SND_TRACE(L"mxdMessage - Message type %d\n", Message); + //SND_TRACE(L"mxdMessage - Message type %d\n", Message); switch ( Message ) { @@ -258,7 +258,7 @@ } - SND_TRACE(L"mxdMessage returning MMRESULT %d\n", Result); + //SND_TRACE(L"mxdMessage returning MMRESULT %d\n", Result); ReleaseEntrypointMutex(MIXER_DEVICE_TYPE);

1 0

[lsuggs] 43825: libbind9, liblwres and libisccfg are required as well
by lsuggs＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: lsuggs Date: Thu Oct 29 06:51:06 2009 New Revision: 43825 URL: http://svn.reactos.org/svn/reactos?rev=43825&view=rev Log: libbind9, liblwres and libisccfg are required as well Added: branches/nslookup/dll/3rdparty/bind9/ - copied from r43730, vendor/BIND/lib/bind9/ branches/nslookup/dll/3rdparty/isccfg/ - copied from r43730, vendor/BIND/lib/isccfg/ branches/nslookup/dll/3rdparty/lwres/ - copied from r43730, vendor/BIND/lib/lwres/

1 0

[tkreuzer] 43824: Partly implement KiDebugTrapOrFault. Single stepping now works.
by tkreuzer＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: tkreuzer Date: Thu Oct 29 00:54:07 2009 New Revision: 43824 URL: http://svn.reactos.org/svn/reactos?rev=43824&view=rev Log: Partly implement KiDebugTrapOrFault. Single stepping now works. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Thu Oct 29 00:54:07 2009 @@ -242,9 +242,22 @@ push 0 .allocstack 0x8 - UNIMPLEMENTED KiDebugTrapOrFault - - jmp $ + ENTER_TRAP_FRAME (SIZE_EXCEPTION_RECORD + 0x28), 0 + + /* Check if the frame was from kernelmode */ + test word ptr [rbp + KTRAP_FRAME_SegCs], 3 + jz KiDebugTrapOrFaultKMode + + /* Enable interrupts for user-mode */ + sti + +KiDebugTrapOrFaultKMode: + + DISPATCH_EXCEPTION STATUS_SINGLE_STEP, 0, 0, 0, 0 + + /* Return */ + LEAVE_TRAP_FRAME + iretq .endproc .proc KiNmiInterrupt

1 0

[dgorbachev] 43823: Remove byte order mark.
by dgorbachev＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: dgorbachev Date: Thu Oct 29 00:53:50 2009 New Revision: 43823 URL: http://svn.reactos.org/svn/reactos?rev=43823&view=rev Log: Remove byte order mark. Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] Thu Oct 29 00:53:50 2009 @@ -1,4 +1,4 @@ -ï»¿LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001)

1 0

[tkreuzer] 43822: Comment out __ldmxcsr in KiRestoreProcessorControlState, as it results in a GPF. Continuing now works again.
by tkreuzer＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: tkreuzer Date: Thu Oct 29 00:21:13 2009 New Revision: 43822 URL: http://svn.reactos.org/svn/reactos?rev=43822&view=rev Log: Comment out __ldmxcsr in KiRestoreProcessorControlState, as it results in a GPF. Continuing now works again. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Thu Oct 29 00:21:13 2009 @@ -472,7 +472,7 @@ // __ltr(&ProcessorState->SpecialRegisters.Tr); __lidt(&ProcessorState->SpecialRegisters.Idtr.Limit); - __ldmxcsr(&ProcessorState->SpecialRegisters.MxCsr); +// __ldmxcsr(&ProcessorState->SpecialRegisters.MxCsr); // FIXME // ProcessorState->SpecialRegisters.DebugControl // ProcessorState->SpecialRegisters.LastBranchToRip // ProcessorState->SpecialRegisters.LastBranchFromRip

1 0

[dgorbachev] 43821: Patch for Regional Settings applet by Viliam Lejcik (lejcik/at/gmail/com) with some changes. Bug #4898.
by dgorbachev＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: dgorbachev Date: Thu Oct 29 00:20:28 2009 New Revision: 43821 URL: http://svn.reactos.org/svn/reactos?rev=43821&view=rev Log: Patch for Regional Settings applet by Viliam Lejcik (lejcik/at/gmail/com) with some changes. Bug #4898. Modified: trunk/reactos/dll/cpl/intl/currency.c trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/lang/bg-BG.rc trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/es-ES.rc trunk/reactos/dll/cpl/intl/lang/fr-FR.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/no-NO.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/sk-SK.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/lang/zh-CN.rc trunk/reactos/dll/cpl/intl/numbers.c trunk/reactos/dll/cpl/intl/time.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=43… Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=43… Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/bg-BG.rc… Modified: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc… Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc… Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… Modified: trunk/reactos/dll/cpl/intl/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/no-NO.rc… Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/intl/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sk-SK.rc… Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/intl/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-CN.rc… Modified: trunk/reactos/dll/cpl/intl/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev… Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=43…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
65
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 2009