Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gschneider] 42891: Pass a zero instead of dereferencing a null pointer when copying one region
by gschneider＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: gschneider Date: Mon Aug 24 00:47:32 2009 New Revision: 42891 URL: http://svn.reactos.org/svn/reactos?rev=42891&view=rev Log: Pass a zero instead of dereferencing a null pointer when copying one region Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Mon Aug 24 00:47:32 2009 @@ -111,7 +111,7 @@ if (phRgn) phRgn = (HRGN *)hRgnex; else { - CombineRgn(hRgn, hRgnex, *phRgn, RGN_COPY); + CombineRgn(hRgn, hRgnex, 0, RGN_COPY); DeleteObject(hRgnex); } Ret = 1;

1 0

[janderwald] 42890: - Fix KSPROPERTY_TOPOLOGY enumeration
by janderwald＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: janderwald Date: Mon Aug 24 00:31:30 2009 New Revision: 42890 URL: http://svn.reactos.org/svn/reactos?rev=42890&view=rev Log: - Fix KSPROPERTY_TOPOLOGY enumeration Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4289… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Aug 24 00:31:30 2009 @@ -607,15 +607,12 @@ DEFINE_GUIDSTRUCT("720D4AC0-7533-11D0-A5D6-28DB04C10000", KSPROPSETID_Topology); #define KSPROPSETID_Topology DEFINE_GUIDNAMED(KSPROPSETID_Topology) -typedef enum -{ +typedef enum { KSPROPERTY_TOPOLOGY_CATEGORIES, + KSPROPERTY_TOPOLOGY_NODES, KSPROPERTY_TOPOLOGY_CONNECTIONS, - KSPROPERTY_TOPOLOGY_NAME, - KSPROPERTY_TOPOLOGY_NODES + KSPROPERTY_TOPOLOGY_NAME } KSPROPERTY_TOPOLOGY; - - /* =============================================================== Property Sets for audio drivers - TODO @@ -3099,6 +3096,14 @@ /* =============================================================== Event Functions */ + +KSDDKAPI NTSTATUS NTAPI +KsCreatePin( + IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle); + #if defined(_NTDDK_) #define KSPROBE_STREAMREAD 0x00000000 @@ -3214,12 +3219,7 @@ Connectivity Functions */ -KSDDKAPI NTSTATUS NTAPI -KsCreatePin( - IN HANDLE FilterHandle, - IN PKSPIN_CONNECT Connect, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE ConnectionHandle); + KSDDKAPI NTSTATUS NTAPI KsValidateConnectRequest(

1 0

[gschneider] 42889: - Fix two inverted pointer checks, found by Amine Khaldi - Add, correct implemented comment
by gschneider＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: gschneider Date: Sun Aug 23 23:55:24 2009 New Revision: 42889 URL: http://svn.reactos.org/svn/reactos?rev=42889&view=rev Log: - Fix two inverted pointer checks, found by Amine Khaldi - Add, correct implemented comment Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] Sun Aug 23 23:55:24 2009 @@ -38,7 +38,11 @@ return retValue; } -FD_GLYPHSET* WINAPI +/* + * @implemented + */ +FD_GLYPHSET* +WINAPI EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) { FD_GLYPHSET * ntfd_glyphset; @@ -46,13 +50,12 @@ ntfd_glyphset = NtGdiEngComputeGlyphSet(nCodePage,nFirstChar,cChars); - if (!ntfd_glyphset) + if (ntfd_glyphset) { if (ntfd_glyphset->cjThis) { myfd_glyphset = GlobalAlloc(0,ntfd_glyphset->cjThis); - - if (!myfd_glyphset) + if (myfd_glyphset) { if (copy_my_glyphset(myfd_glyphset,ntfd_glyphset,ntfd_glyphset->cjThis) == FALSE) { Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Sun Aug 23 23:55:24 2009 @@ -1700,7 +1700,7 @@ * */ /* - * @unimplemented + * @implemented */ BOOL WINAPI

1 0

[dgorbachev] 42888: A consistent indentation style is the hobgoblin of little minds.
by dgorbachev＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: dgorbachev Date: Sun Aug 23 23:45:41 2009 New Revision: 42888 URL: http://svn.reactos.org/svn/reactos?rev=42888&view=rev Log: A consistent indentation style is the hobgoblin of little minds. Modified: trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=42… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Sun Aug 23 23:45:41 2009 @@ -24,13 +24,13 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </group> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </group> <group linkerset="ld"> <linkerflag>-disable-stdcall-fixup</linkerflag> </group> - + <directory name="base"> <xi:include href="base/base.rbuild" /> </directory>

1 0

[dgorbachev] 42887: - Remove wrong "m" constraints from some places; - relax constraints ("q" -> "r") when possible; - remove "memory" clobbers from __readfsXXX functions, probably shouldn't be there; - no movq instruction on x86_32; - bswap's operand must be a register.
by dgorbachev＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: dgorbachev Date: Sun Aug 23 23:41:05 2009 New Revision: 42887 URL: http://svn.reactos.org/svn/reactos?rev=42887&view=rev Log: - Remove wrong "m" constraints from some places; - relax constraints ("q" -> "r") when possible; - remove "memory" clobbers from __readfsXXX functions, probably shouldn't be there; - no movq instruction on x86_32; - bswap's operand must be a register. Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sun Aug 23 23:41:05 2009 @@ -600,49 +600,49 @@ __INTRIN_INLINE void __writegsbyte(const unsigned long Offset, const unsigned char Data) { - __asm__ __volatile__("movb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __writegsword(const unsigned long Offset, const unsigned short Data) { - __asm__ __volatile__("movw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __writegsdword(const unsigned long Offset, const unsigned long Data) { - __asm__ __volatile__("movl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __writegsqword(const unsigned long Offset, const unsigned __int64 Data) { - __asm__ __volatile__("movq %q[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movq %q[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE unsigned char __readgsbyte(const unsigned long Offset) { unsigned char value; - __asm__ __volatile__("movb %%gs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movb %%gs:%a[Offset], %b[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } __INTRIN_INLINE unsigned short __readgsword(const unsigned long Offset) { unsigned short value; - __asm__ __volatile__("movw %%gs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movw %%gs:%a[Offset], %w[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } __INTRIN_INLINE unsigned long __readgsdword(const unsigned long Offset) { unsigned long value; - __asm__ __volatile__("movl %%gs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movl %%gs:%a[Offset], %k[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } __INTRIN_INLINE unsigned __int64 __readgsqword(const unsigned long Offset) { unsigned __int64 value; - __asm__ __volatile__("movq %%gs:%a[Offset], %q[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movq %%gs:%a[Offset], %q[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } @@ -663,22 +663,22 @@ __INTRIN_INLINE void __addgsbyte(const unsigned long Offset, const unsigned char Data) { - __asm__ __volatile__("addb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("addb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __addgsword(const unsigned long Offset, const unsigned short Data) { - __asm__ __volatile__("addw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("addw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __addgsdword(const unsigned long Offset, const unsigned int Data) { - __asm__ __volatile__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __addgsqword(const unsigned long Offset, const unsigned __int64 Data) { - __asm__ __volatile__("addq %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("addq %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } #else @@ -690,32 +690,32 @@ __INTRIN_INLINE void __writefsword(const unsigned long Offset, const unsigned short Data) { - __asm__ __volatile__("movw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __writefsdword(const unsigned long Offset, const unsigned long Data) { - __asm__ __volatile__("movl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE unsigned char __readfsbyte(const unsigned long Offset) { unsigned char value; - __asm__ __volatile__("movb %%fs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset) : "memory"); + __asm__ __volatile__("movb %%fs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "ir" (Offset)); return value; } __INTRIN_INLINE unsigned short __readfsword(const unsigned long Offset) { unsigned short value; - __asm__ __volatile__("movw %%fs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset) : "memory"); + __asm__ __volatile__("movw %%fs:%a[Offset], %w[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } __INTRIN_INLINE unsigned long __readfsdword(const unsigned long Offset) { unsigned long value; - __asm__ __volatile__("movl %%fs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset) : "memory"); + __asm__ __volatile__("movl %%fs:%a[Offset], %k[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } @@ -924,7 +924,7 @@ __INTRIN_INLINE unsigned long _byteswap_ulong(unsigned long value) { unsigned long retval; - __asm__("bswapl %[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); + __asm__("bswapl %[retval]" : [retval] "=r" (retval) : "[retval]" (value)); return retval; } @@ -932,7 +932,7 @@ __INTRIN_INLINE unsigned __int64 _byteswap_uint64(unsigned __int64 value) { unsigned __int64 retval; - __asm__("bswapq %[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); + __asm__("bswapq %[retval]" : [retval] "=r" (retval) : "[retval]" (value)); return retval; } #else @@ -948,7 +948,7 @@ retval.int64part = value; __asm__("bswapl %[lowpart]\n" "bswapl %[hipart]\n" - : [lowpart] "=rm" (retval.hipart), [hipart] "=rm" (retval.lowpart) : "[lowpart]" (retval.lowpart), "[hipart]" (retval.hipart) ); + : [lowpart] "=r" (retval.hipart), [hipart] "=r" (retval.lowpart) : "[lowpart]" (retval.lowpart), "[hipart]" (retval.hipart) ); return retval.int64part; } #endif @@ -1112,85 +1112,85 @@ __INTRIN_INLINE void __writecr0(const unsigned __int64 Data) { - __asm__("mov %[Data], %%cr0" : : [Data] "q" (Data) : "memory"); + __asm__("mov %[Data], %%cr0" : : [Data] "r" (Data) : "memory"); } __INTRIN_INLINE void __writecr3(const unsigned __int64 Data) { - __asm__("mov %[Data], %%cr3" : : [Data] "q" (Data) : "memory"); + __asm__("mov %[Data], %%cr3" : : [Data] "r" (Data) : "memory"); } __INTRIN_INLINE void __writecr4(const unsigned __int64 Data) { - __asm__("mov %[Data], %%cr4" : : [Data] "q" (Data) : "memory"); + __asm__("mov %[Data], %%cr4" : : [Data] "r" (Data) : "memory"); } #ifdef _M_AMD64 __INTRIN_INLINE void __writecr8(const unsigned __int64 Data) { - __asm__("mov %[Data], %%cr8" : : [Data] "q" (Data) : "memory"); + __asm__("mov %[Data], %%cr8" : : [Data] "r" (Data) : "memory"); } __INTRIN_INLINE unsigned __int64 __readcr0(void) { unsigned __int64 value; - __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned __int64 __readcr2(void) { unsigned __int64 value; - __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned __int64 __readcr3(void) { unsigned __int64 value; - __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned __int64 __readcr4(void) { unsigned __int64 value; - __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned __int64 __readcr8(void) { unsigned __int64 value; - __asm__ __volatile__("movq %%cr8, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%cr8, %q[value]" : [value] "=r" (value)); return value; } #else __INTRIN_INLINE unsigned long __readcr0(void) { unsigned long value; - __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned long __readcr2(void) { unsigned long value; - __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned long __readcr3(void) { unsigned long value; - __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned long __readcr4(void) { unsigned long value; - __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=r" (value)); return value; } #endif @@ -1202,28 +1202,28 @@ switch (reg) { case 0: - __asm__ __volatile__("movq %%dr0, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr0, %q[value]" : [value] "=r" (value)); break; case 1: - __asm__ __volatile__("movq %%dr1, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr1, %q[value]" : [value] "=r" (value)); break; case 2: - __asm__ __volatile__("movq %%dr2, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr2, %q[value]" : [value] "=r" (value)); break; case 3: - __asm__ __volatile__("movq %%dr3, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr3, %q[value]" : [value] "=r" (value)); break; case 4: - __asm__ __volatile__("movq %%dr4, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr4, %q[value]" : [value] "=r" (value)); break; case 5: - __asm__ __volatile__("movq %%dr5, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr5, %q[value]" : [value] "=r" (value)); break; case 6: - __asm__ __volatile__("movq %%dr6, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr6, %q[value]" : [value] "=r" (value)); break; case 7: - __asm__ __volatile__("movq %%dr7, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr7, %q[value]" : [value] "=r" (value)); break; } return value; @@ -1234,28 +1234,28 @@ switch (reg) { case 0: - __asm__("movq %q[value], %%dr0" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr0" : : [value] "r" (value) : "memory"); break; case 1: - __asm__("movq %q[value], %%dr1" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr1" : : [value] "r" (value) : "memory"); break; case 2: - __asm__("movq %q[value], %%dr2" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr2" : : [value] "r" (value) : "memory"); break; case 3: - __asm__("movq %q[value], %%dr3" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr3" : : [value] "r" (value) : "memory"); break; case 4: - __asm__("movq %q[value], %%dr4" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr4" : : [value] "r" (value) : "memory"); break; case 5: - __asm__("movq %q[value], %%dr5" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr5" : : [value] "r" (value) : "memory"); break; case 6: - __asm__("movq %q[value], %%dr6" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr6" : : [value] "r" (value) : "memory"); break; case 7: - __asm__("movq %q[value], %%dr7" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr7" : : [value] "r" (value) : "memory"); break; } } @@ -1266,28 +1266,28 @@ switch (reg) { case 0: - __asm__ __volatile__("movq %%dr0, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr0, %[value]" : [value] "=r" (value)); break; case 1: - __asm__ __volatile__("movq %%dr1, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr1, %[value]" : [value] "=r" (value)); break; case 2: - __asm__ __volatile__("movq %%dr2, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr2, %[value]" : [value] "=r" (value)); break; case 3: - __asm__ __volatile__("movq %%dr3, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr3, %[value]" : [value] "=r" (value)); break; case 4: - __asm__ __volatile__("movq %%dr4, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr4, %[value]" : [value] "=r" (value)); break; case 5: - __asm__ __volatile__("movq %%dr5, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr5, %[value]" : [value] "=r" (value)); break; case 6: - __asm__ __volatile__("movq %%dr6, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr6, %[value]" : [value] "=r" (value)); break; case 7: - __asm__ __volatile__("movq %%dr7, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr7, %[value]" : [value] "=r" (value)); break; } return value; @@ -1298,28 +1298,28 @@ switch (reg) { case 0: - __asm__("movq %q[value], %%dr0" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr0" : : [value] "r" (value) : "memory"); break; case 1: - __asm__("movq %q[value], %%dr1" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr1" : : [value] "r" (value) : "memory"); break; case 2: - __asm__("movq %q[value], %%dr2" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr2" : : [value] "r" (value) : "memory"); break; case 3: - __asm__("movq %q[value], %%dr3" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr3" : : [value] "r" (value) : "memory"); break; case 4: - __asm__("movq %q[value], %%dr4" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr4" : : [value] "r" (value) : "memory"); break; case 5: - __asm__("movq %q[value], %%dr5" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr5" : : [value] "r" (value) : "memory"); break; case 6: - __asm__("movq %q[value], %%dr6" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr6" : : [value] "r" (value) : "memory"); break; case 7: - __asm__("movq %q[value], %%dr7" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr7" : : [value] "r" (value) : "memory"); break; } }

1 0

[gschneider] 42886: Fix multiple threads listings 1/x: Reset receive variables when reaching the block end, continue with the loop as soon as ListEvents were created
by gschneider＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: gschneider Date: Sun Aug 23 23:37:35 2009 New Revision: 42886 URL: http://svn.reactos.org/svn/reactos?rev=42886&view=rev Log: Fix multiple threads listings 1/x: Reset receive variables when reaching the block end, continue with the loop as soon as ListEvents were created Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Sun Aug 23 23:37:35 2009 @@ -257,12 +257,16 @@ if (ProcessListEvent != null) ProcessListEvent(this, new ProcessListEventArgs(ulong.Parse(pidEntryMatch.Groups["pid"].ToString(), NumberStyles.HexNumber), pidEntryMatch.Groups["cur"].Length > 0, pidEntryMatch.Groups["state"].ToString(), pidEntryMatch.Groups["name"].ToString())); + continue; } else { - /* TODO: this is called by far too often, results in several "thread list xx" commands */ if ((mReceivingProcs || cleanedLine.Contains("No processes")) && ProcessListEvent != null) + { ProcessListEvent(this, new ProcessListEventArgs(true)); + mReceivingProcs = false; + continue; + } } } @@ -282,11 +286,16 @@ { if (ThreadListEvent != null) ThreadListEvent(this, new ThreadListEventArgs(ulong.Parse(tidEntryMatch.Groups["tid"].ToString(), NumberStyles.HexNumber), tidEntryMatch.Groups["cur"].Length > 0, ulong.Parse(tidEntryMatch.Groups["eip"].ToString(), NumberStyles.HexNumber))); + continue; } else { if (mReceivingThreads && ThreadListEvent != null) + { ThreadListEvent(this, new ThreadListEventArgs(true)); + mReceivingThreads = false; + continue; + } } } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Sun Aug 23 23:37:35 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.72")] -[assembly: AssemblyFileVersion("1.0.2.72")] +[assembly: AssemblyVersion("1.0.2.73")] +[assembly: AssemblyFileVersion("1.0.2.73")]

1 0

[janderwald] 42885: - Add SetupDiGetDeviceInterfaceAlias, SetupDiOpenDeviceInterfaceRegKey stubs
by janderwald＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: janderwald Date: Sun Aug 23 20:14:39 2009 New Revision: 42885 URL: http://svn.reactos.org/svn/reactos?rev=42885&view=rev Log: - Add SetupDiGetDeviceInterfaceAlias, SetupDiOpenDeviceInterfaceRegKey stubs Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Aug 23 20:14:39 2009 @@ -325,7 +325,7 @@ @ stdcall SetupDiGetDeviceInstallParamsW(ptr ptr ptr) @ stdcall SetupDiGetDeviceInstanceIdA(ptr ptr str long ptr) @ stdcall SetupDiGetDeviceInstanceIdW(ptr ptr wstr long ptr) -@ stub SetupDiGetDeviceInterfaceAlias +@ stdcall SetupDiGetDeviceInterfaceAlias(ptr ptr ptr ptr) @ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr) @ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr) @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr) @@ -363,7 +363,7 @@ @ stdcall SetupDiOpenDeviceInfoA(ptr str long long ptr) @ stdcall SetupDiOpenDeviceInfoW(ptr wstr long long ptr) @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) -@ stub SetupDiOpenDeviceInterfaceRegKey +@ stdcall SetupDiOpenDeviceInterfaceRegKey(ptr ptr long long) @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) @ stdcall SetupDiRegisterCoDeviceInstallers(ptr ptr) @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Sun Aug 23 20:14:39 2009 @@ -233,3 +233,16 @@ FIXME("%p %p %s 0x%08x %p: stub\n", len, class, debugstr_w(id), flags, machine); return CR_FAILURE; } + +WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfaceAlias(IN HDEVINFO DeviceInfoSet, IN PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IN CONST GUID *AliasInterfaceClassGuid, OUT PSP_DEVICE_INTERFACE_DATA AliasDeviceInterfaceData) +{ + FIXME("%p %p %p %p %p stub\n", DeviceInfoSet, DeviceInterfaceData, AliasInterfaceClassGuid, AliasDeviceInterfaceData); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + +HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(IN HDEVINFO DeviceInfoSet, IN PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IN DWORD Reserved, IN REGSAM samDesired) +{ + FIXME("%p %p %p 0x%08x 0x%08x: stub\n", DeviceInfoSet, DeviceInterfaceData, Reserved, samDesired); + return INVALID_HANDLE_VALUE; +}

1 0

[sginsberg] 42884: - copy.c, view.c: malloc.h now properly implements alloca/_alloca, so remove #ifdef hacks - main.c: Change bogus #ifdef _MSC_VER to #if 0 -- it seems this is another instance of "MSVC = MS' headers". The code compiles fine with our headers now and should probably be enabled. - debug.h: Define non-NDEBUG DPRINT the same way for GCC and MSVC. The MSVC version was never inlined because the function has a variable argument list. The GCC version works fine under MSVC so use it inst
by sginsberg＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: sginsberg Date: Sun Aug 23 17:49:43 2009 New Revision: 42884 URL: http://svn.reactos.org/svn/reactos?rev=42884&view=rev Log: - copy.c, view.c: malloc.h now properly implements alloca/_alloca, so remove #ifdef hacks - main.c: Change bogus #ifdef _MSC_VER to #if 0 -- it seems this is another instance of "MSVC = MS' headers". The code compiles fine with our headers now and should probably be enabled. - debug.h: Define non-NDEBUG DPRINT the same way for GCC and MSVC. The MSVC version was never inlined because the function has a variable argument list. The GCC version works fine under MSVC so use it instead. Results in neater code in object files. Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/include/reactos/debug.h trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Sun Aug 23 17:49:43 2009 @@ -48,7 +48,7 @@ * DumpData = Pointer to dump data for the log entry */ { -#ifdef _MSC_VER +#if 0 PIO_ERROR_LOG_PACKET LogEntry; UCHAR EntrySize; ULONG StringSize; @@ -481,7 +481,7 @@ Irp->IoStatus.Information = 0; -#ifdef _MSC_VER +#if 0 Status = TdiMapUserRequest(DeviceObject, Irp, IrpSp); if (NT_SUCCESS(Status)) { TiDispatchInternal(DeviceObject, Irp); Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Sun Aug 23 17:49:43 2009 @@ -90,14 +90,9 @@ #define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint #else - #ifdef _MSC_VER - static __inline void DPRINT ( const char* fmt, ... ) - { - UNREFERENCED_PARAMETER(fmt); - } - #else - #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) - #endif + + #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #endif #define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=428… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sun Aug 23 17:49:43 2009 @@ -19,15 +19,6 @@ #define MAX_ZERO_LENGTH (256 * 1024) #define MAX_RW_LENGTH (256 * 1024) - -#if defined(__GNUC__) -/* void * alloca(size_t size); */ -#elif defined(_MSC_VER) -void* _alloca(size_t size); -#define alloca _alloca -#else -#error Unknown compiler for alloca intrinsic stack allocation "function" -#endif ULONG CcFastMdlReadWait; ULONG CcFastMdlReadNotPossible; @@ -73,7 +64,7 @@ KEVENT Event; PMDL Mdl; - Mdl = alloca(MmSizeOfMdl(NULL, MAX_RW_LENGTH)); + Mdl = _alloca(MmSizeOfMdl(NULL, MAX_RW_LENGTH)); Status = CcRosGetCacheSegmentChain(Bcb, ReadOffset, Length, &head); if (!NT_SUCCESS(Status)) @@ -205,7 +196,7 @@ { Size = CacheSeg->Bcb->CacheSegmentSize; } - Mdl = alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); + Mdl = _alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size); MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; @@ -259,7 +250,7 @@ MmGetPfnForProcess(NULL, (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i << PAGE_SHIFT))); } while (++i < (Size >> PAGE_SHIFT)); } - Mdl = alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); + Mdl = _alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size); MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; @@ -612,7 +603,7 @@ { /* File is not cached */ - Mdl = alloca(MmSizeOfMdl(NULL, MAX_ZERO_LENGTH)); + Mdl = _alloca(MmSizeOfMdl(NULL, MAX_ZERO_LENGTH)); while (Length > 0) { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=428… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Aug 23 17:49:43 2009 @@ -69,15 +69,6 @@ NPAGED_LOOKASIDE_LIST iBcbLookasideList; static NPAGED_LOOKASIDE_LIST BcbLookasideList; static NPAGED_LOOKASIDE_LIST CacheSegLookasideList; - - -#if defined(__GNUC__) -/* void * alloca(size_t size); */ -#elif defined(_MSC_VER) -void* _alloca(size_t size); -#else -#error Unknown compiler for alloca intrinsic stack allocation "function" -#endif #if DBG || defined(KDBG) static void CcRosCacheSegmentIncRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line ) @@ -737,15 +728,8 @@ Length = ROUND_UP(Length, Bcb->CacheSegmentSize); -#if defined(__GNUC__) - CacheSegList = alloca(sizeof(PCACHE_SEGMENT) * - (Length / Bcb->CacheSegmentSize)); -#elif defined(_MSC_VER) CacheSegList = _alloca(sizeof(PCACHE_SEGMENT) * (Length / Bcb->CacheSegmentSize)); -#else -#error Unknown compiler for alloca intrinsic stack allocation "function" -#endif /* * Look for a cache segment already mapping the same data.

1 0

[sginsberg] 42883: - wdm.h: Define ALLOC_PRAGMA and ALLOC_DATA_PRAGMA for MSVC. - marea.c: MmInitMemoryAreas doesn't exist anymore so don't try to put it in .INIT.
by sginsberg＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: sginsberg Date: Sun Aug 23 17:14:13 2009 New Revision: 42883 URL: http://svn.reactos.org/svn/reactos?rev=42883&view=rev Log: - wdm.h: Define ALLOC_PRAGMA and ALLOC_DATA_PRAGMA for MSVC. - marea.c: MmInitMemoryAreas doesn't exist anymore so don't try to put it in .INIT. Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4288… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Aug 23 17:14:13 2009 @@ -25,6 +25,25 @@ #define PORT_MAXIMUM_MESSAGE_LENGTH 512 #else #define PORT_MAXIMUM_MESSAGE_LENGTH 256 +#endif + + +#if defined(_MSC_VER) + +// +// Indicate if #pragma alloc_text() is supported +// +#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) +#define ALLOC_PRAGMA 1 +#endif + +// +// Indicate if #pragma data_seg() is supported +// +#if defined(_M_IX86) || defined(_M_AMD64) +#define ALLOC_DATA_PRAGMA 1 +#endif + #endif Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun Aug 23 17:14:13 2009 @@ -44,10 +44,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitMemoryAreas) -#endif MEMORY_AREA MiStaticMemoryAreas[MI_STATIC_MEMORY_AREAS]; ULONG MiStaticMemoryAreaCount;

1 0

[sginsberg] 42882: - Remove deprecated _NTDDK_ hacks from winnt.h -- these are no longer needed as ntddk.h no longer includes winnt.h. Also fix the way the PowerPC version of NtCurrentTeb was defined -- it was only defined if ntddk.h was included prior to winnt.h.
by sginsberg＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: sginsberg Date: Sun Aug 23 16:46:41 2009 New Revision: 42882 URL: http://svn.reactos.org/svn/reactos?rev=42882&view=rev Log: - Remove deprecated _NTDDK_ hacks from winnt.h -- these are no longer needed as ntddk.h no longer includes winnt.h. Also fix the way the PowerPC version of NtCurrentTeb was defined -- it was only defined if ntddk.h was included prior to winnt.h. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Aug 23 16:46:41 2009 @@ -472,12 +472,9 @@ #define FILE_SUPPORTS_ENCRYPTION 0x00020000 #define FILE_NAMED_STREAMS 0x00040000 -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define IO_COMPLETION_QUERY_STATE 0x0001 #define IO_COMPLETION_MODIFY_STATE 0x0002 #define IO_COMPLETION_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) -#endif /* end ntifs.h */ /* also in ddk/winddk.h */ @@ -487,8 +484,6 @@ #define MAILSLOT_NO_MESSAGE ((DWORD)-1) #define MAILSLOT_WAIT_FOREVER ((DWORD)-1) -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define PROCESS_TERMINATE 1 #define PROCESS_CREATE_THREAD 2 #define PROCESS_SET_SESSIONID 4 @@ -502,23 +497,17 @@ #define PROCESS_SUSPEND_RESUME 2048 #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 #define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xFFF) -#endif #define PROCESS_DUP_HANDLE 64 #define THREAD_TERMINATE 1 #define THREAD_SUSPEND_RESUME 2 #define THREAD_GET_CONTEXT 8 #define THREAD_SET_CONTEXT 16 #define THREAD_SET_INFORMATION 32 -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define THREAD_QUERY_INFORMATION 64 #define THREAD_SET_THREAD_TOKEN 128 #define THREAD_IMPERSONATE 256 #define THREAD_DIRECT_IMPERSONATION 0x200 -#endif #define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3FF) -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define MUTANT_QUERY_STATE 0x0001 #define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|MUTANT_QUERY_STATE) #define TIMER_QUERY_STATE 0x0001 @@ -528,7 +517,6 @@ #define THREAD_BASE_PRIORITY_MAX 2 #define THREAD_BASE_PRIORITY_MIN (-2) #define THREAD_BASE_PRIORITY_IDLE (-15) -#endif /* * To prevent gcc compiler warnings, bracket these defines when initialising * a SID_IDENTIFIER_AUTHORITY, eg. @@ -746,8 +734,6 @@ #define SE_CHANGE_NOTIFY_NAME TEXT("SeChangeNotifyPrivilege") #define SE_REMOTE_SHUTDOWN_NAME TEXT("SeRemoteShutdownPrivilege") #define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege") -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define SE_GROUP_MANDATORY 1 #define SE_GROUP_ENABLED_BY_DEFAULT 2 #define SE_GROUP_ENABLED 4 @@ -755,7 +741,6 @@ #define SE_GROUP_USE_FOR_DENY_ONLY 16 #define SE_GROUP_LOGON_ID 3221225472U #define SE_GROUP_RESOURCE 536870912 -#endif #define LANG_NEUTRAL 0x00 #define LANG_INVARIANT 0x7f #define LANG_AFRIKAANS 0x36 @@ -1277,8 +1262,6 @@ #define MEM_WRITE_WATCH 0x200000 /* 98/Me */ #define MEM_PHYSICAL 0x400000 #define MEM_4MB_PAGES 0x80000000 -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define MEM_IMAGE SEC_IMAGE #define SEC_NO_CHANGE 0x00400000 #define SEC_FILE 0x00800000 @@ -1287,7 +1270,6 @@ #define SEC_RESERVE 0x04000000 #define SEC_COMMIT 0x08000000 #define SEC_NOCACHE 0x10000000 -#endif #define SECTION_EXTEND_SIZE 16 #define SECTION_MAP_READ 4 #define SECTION_MAP_WRITE 2 @@ -1295,9 +1277,7 @@ #define SECTION_MAP_EXECUTE 8 #define SECTION_ALL_ACCESS 0xf001f #define WRITE_WATCH_FLAG_RESET 0x01 -#ifndef _NTDDK_ #define MESSAGE_RESOURCE_UNICODE 1 -#endif #define RTL_CRITSECT_TYPE 0 #define RTL_RESOURCE_TYPE 1 /* Also in winddk.h */ @@ -1927,8 +1907,6 @@ ACCESS_MASK GenericExecute; ACCESS_MASK GenericAll; } GENERIC_MAPPING, *PGENERIC_MAPPING; -/* Sigh..when will they learn... */ -#ifndef _NTDDK_ typedef struct _ACE_HEADER { BYTE AceType; BYTE AceFlags; @@ -2049,7 +2027,6 @@ GUID InheritedObjectType; DWORD SidStart; } SYSTEM_ALARM_CALLBACK_OBJECT_ACE, *PSYSTEM_ALARM_CALLBACK_OBJECT_ACE; -#endif typedef struct _ACL { BYTE AclRevision; BYTE Sbz1; @@ -3003,8 +2980,6 @@ BOOLEAN EffectiveOnly; SECURITY_IMPERSONATION_LEVEL Level; } SE_IMPERSONATION_STATE,*PSE_IMPERSONATION_STATE; -/* Steven you are my hero when you fix the w32api ddk! */ -#if !defined(_NTDDK_) typedef struct _SID_IDENTIFIER_AUTHORITY { BYTE Value[6]; } SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY; @@ -3146,7 +3121,6 @@ MaxTokenInfoClass } TOKEN_INFORMATION_CLASS; -#endif typedef enum _SID_NAME_USE { SidTypeUser=1,SidTypeGroup,SidTypeDomain,SidTypeAlias, SidTypeWellKnownGroup,SidTypeDeletedAccount,SidTypeInvalid, @@ -3233,8 +3207,6 @@ DWORD Count; DWORD Size; } TAPE_CREATE_PARTITION,*PTAPE_CREATE_PARTITION; -/* Sigh..when will they learn... */ -#ifndef _NTDDK_ typedef struct _MEMORY_BASIC_INFORMATION { PVOID BaseAddress; PVOID AllocationBase; @@ -3258,7 +3230,6 @@ DWORD NumberOfBlocks; MESSAGE_RESOURCE_BLOCK Blocks[1]; } MESSAGE_RESOURCE_DATA,*PMESSAGE_RESOURCE_DATA; -#endif typedef struct _LIST_ENTRY { struct _LIST_ENTRY *Flink; struct _LIST_ENTRY *Blink; @@ -3325,8 +3296,6 @@ IN PSLIST_HEADER ListHead ); -/* FIXME: Please oh please stop including winnt.h from the DDK... */ -#ifndef _NTDDK_ typedef struct _RTL_CRITICAL_SECTION_DEBUG { WORD Type; WORD CreatorBackTraceIndex; @@ -3346,7 +3315,6 @@ HANDLE LockSemaphore; ULONG_PTR SpinCount; } RTL_CRITICAL_SECTION,*PRTL_CRITICAL_SECTION; -#endif NTSYSAPI WORD @@ -4217,8 +4185,6 @@ #define JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT 9 #define JOB_OBJECT_MSG_JOB_MEMORY_LIMIT 10 -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define JOB_OBJECT_ASSIGN_PROCESS 1 #define JOB_OBJECT_SET_ATTRIBUTES 2 #define JOB_OBJECT_QUERY 4 @@ -4246,7 +4212,6 @@ DWORD MemberLevel; DWORD Flags; } JOB_SET_ARRAY, *PJOB_SET_ARRAY; -#endif typedef struct _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION { LARGE_INTEGER TotalUserTime; @@ -4280,8 +4245,6 @@ DWORD UIRestrictionsClass; } JOBOBJECT_BASIC_UI_RESTRICTIONS,*PJOBOBJECT_BASIC_UI_RESTRICTIONS; -/* Steven you are my hero when you fix the w32api ddk! */ -#ifndef _NTDDK_ typedef struct _JOBOBJECT_SECURITY_LIMIT_INFORMATION { DWORD SecurityLimitFlags; HANDLE JobToken; @@ -4289,7 +4252,6 @@ PTOKEN_PRIVILEGES PrivilegesToDelete; PTOKEN_GROUPS RestrictedSids; } JOBOBJECT_SECURITY_LIMIT_INFORMATION,*PJOBOBJECT_SECURITY_LIMIT_INFORMATION; -#endif typedef struct _JOBOBJECT_END_OF_JOB_TIME_INFORMATION { DWORD EndOfJobTimeAction; @@ -4485,7 +4447,6 @@ ULONG DefaultAlert2; } SYSTEM_BATTERY_STATE, *PSYSTEM_BATTERY_STATE; -#ifndef _NTDDK_ /* HACK!!! ntddk.h shouldn't include winnt.h! */ typedef struct _PROCESSOR_POWER_INFORMATION { ULONG Number; ULONG MaxMhz; @@ -4494,7 +4455,6 @@ ULONG MaxIdleState; ULONG CurrentIdleState; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; -#endif typedef DWORD EXECUTION_STATE; typedef enum _POWER_INFORMATION_LEVEL { @@ -4833,9 +4793,7 @@ } #endif -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ -#ifdef _M_IX86 +#if defined(_M_IX86) static __inline__ struct _TEB * NtCurrentTeb(void) { struct _TEB *ret; @@ -4848,25 +4806,24 @@ return ret; } -#elif _M_ARM +#elif defined(_M_ARM) // // NT-ARM is not documented // #include <armddk.h> -#elif defined (_M_AMD64) +#elif defined(_M_AMD64) FORCEINLINE struct _TEB * NtCurrentTeb(VOID) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } -#else +#elif defined(_M_PPC) static __inline__ struct _TEB * NtCurrentTeb(void) { return __readfsdword_winnt(0x18); } -#endif -#elif defined(_M_PPC) +#else static __inline__ struct _TEB * NtCurrentTeb(void) { return __readfsdword_winnt(0x18);

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