Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 45703: Move more stuff to wdm.h
by akhaldi＠svn.reactos.org 27 Feb '10

27 Feb '10

Author: akhaldi Date: Sat Feb 27 16:47:38 2010 New Revision: 45703 URL: http://svn.reactos.org/svn/reactos?rev=45703&view=rev Log: Move more stuff to wdm.h Modified: branches/header-work/include/ddk/wdm.h branches/header-work/include/ddk/winddk.h Modified: branches/header-work/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r… ============================================================================== --- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Sat Feb 27 16:47:38 2010 @@ -87,6 +87,83 @@ ((*(PLONGLONG)(guid1) == *(PLONGLONG)(guid2)) && (*((PLONGLONG)(guid1) + 1) == *((PLONGLONG)(guid2) + 1))) #endif #endif + +/* +** Forward declarations +*/ + +struct _IRP; +struct _MDL; +struct _KAPC; +struct _KDPC; +struct _FILE_OBJECT; +struct _DMA_ADAPTER; +struct _DEVICE_OBJECT; +struct _DRIVER_OBJECT; +struct _IO_STATUS_BLOCK; +struct _DEVICE_DESCRIPTION; +struct _SCATTER_GATHER_LIST; +struct _DRIVE_LAYOUT_INFORMATION; + +typedef PVOID PSID; + +/* +** Simple structures +*/ + +typedef UCHAR KIRQL, *PKIRQL; + +typedef enum _MODE { + KernelMode, + UserMode, + MaximumMode +} MODE; + +/* Constants */ +#define NtCurrentProcess() ( (HANDLE)(LONG_PTR) -1 ) +#define ZwCurrentProcess() NtCurrentProcess() +#define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) +#define ZwCurrentThread() NtCurrentThread() + +#if (_M_IX86) +#define KIP0PCRADDRESS 0xffdff000 +#endif + +#if defined(_WIN64) +#define MAXIMUM_PROCESSORS 64 +#else +#define MAXIMUM_PROCESSORS 32 +#endif + +#define MAXIMUM_WAIT_OBJECTS 64 + +#define EX_RUNDOWN_ACTIVE 0x1 +#define EX_RUNDOWN_COUNT_SHIFT 0x1 +#define EX_RUNDOWN_COUNT_INC (1 << EX_RUNDOWN_COUNT_SHIFT) + +#define METHOD_BUFFERED 0 +#define METHOD_IN_DIRECT 1 +#define METHOD_OUT_DIRECT 2 +#define METHOD_NEITHER 3 + +#define LOW_PRIORITY 0 +#define LOW_REALTIME_PRIORITY 16 +#define HIGH_PRIORITY 31 +#define MAXIMUM_PRIORITY 32 + +#define MAXIMUM_SUSPEND_COUNT MAXCHAR + +#define MAXIMUM_FILENAME_LENGTH 256 + +#define FILE_SUPERSEDED 0x00000000 +#define FILE_OPENED 0x00000001 +#define FILE_CREATED 0x00000002 +#define FILE_OVERWRITTEN 0x00000003 +#define FILE_EXISTS 0x00000004 +#define FILE_DOES_NOT_EXIST 0x00000005 + +#define FILE_USE_FILE_POINTER_POSITION 0xfffffffe +#define FILE_WRITE_TO_END_OF_FILE 0xffffffff /* Simple types */ typedef UCHAR KPROCESSOR_MODE; Modified: branches/header-work/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.… ============================================================================== --- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Sat Feb 27 16:47:38 2010 @@ -78,25 +78,12 @@ ** Forward declarations */ -struct _IRP; -struct _MDL; -struct _KAPC; -struct _KDPC; struct _KPCR; struct _KPRCB; struct _KTSS; -struct _FILE_OBJECT; -struct _DMA_ADAPTER; -struct _DEVICE_OBJECT; -struct _DRIVER_OBJECT; -struct _IO_STATUS_BLOCK; -struct _DEVICE_DESCRIPTION; -struct _SCATTER_GATHER_LIST; -struct _DRIVE_LAYOUT_INFORMATION; struct _DRIVE_LAYOUT_INFORMATION_EX; struct _LOADER_PARAMETER_BLOCK; -typedef PVOID PSID; #if 1 /* FIXME: Unknown definitions */ @@ -120,38 +107,10 @@ IrpForward // Irp is wmi irp, but targeted at another device object } SYSCTL_IRP_DISPOSITION, *PSYSCTL_IRP_DISPOSITION; -/* -** Routines specific to this DDK -*/ -#define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) - -/* -** Simple structures -*/ - -typedef UCHAR KIRQL, *PKIRQL; - -typedef enum _MODE { - KernelMode, - UserMode, - MaximumMode -} MODE; - // // Forwarder // struct _COMPRESSED_DATA_INFO; - -/* Constants */ -#define NtCurrentProcess() ( (HANDLE)(LONG_PTR) -1 ) -#define ZwCurrentProcess() NtCurrentProcess() -#define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) -#define ZwCurrentThread() NtCurrentThread() - -#if (_M_IX86) -#define KIP0PCRADDRESS 0xffdff000 - -#endif #define KERNEL_STACK_SIZE 12288 #define KERNEL_LARGE_STACK_SIZE 61440 @@ -274,38 +233,6 @@ DPFLTR_WOW64_ID = 102, DPFLTR_ENDOFTABLE_ID } DPFLTR_TYPE; - -#define MAXIMUM_PROCESSORS 32 - -#define MAXIMUM_WAIT_OBJECTS 64 - -#define EX_RUNDOWN_ACTIVE 0x1 -#define EX_RUNDOWN_COUNT_SHIFT 0x1 -#define EX_RUNDOWN_COUNT_INC (1 << EX_RUNDOWN_COUNT_SHIFT) - -#define METHOD_BUFFERED 0 -#define METHOD_IN_DIRECT 1 -#define METHOD_OUT_DIRECT 2 -#define METHOD_NEITHER 3 - -#define LOW_PRIORITY 0 -#define LOW_REALTIME_PRIORITY 16 -#define HIGH_PRIORITY 31 -#define MAXIMUM_PRIORITY 32 - -#define MAXIMUM_SUSPEND_COUNT MAXCHAR - -#define MAXIMUM_FILENAME_LENGTH 256 - -#define FILE_SUPERSEDED 0x00000000 -#define FILE_OPENED 0x00000001 -#define FILE_CREATED 0x00000002 -#define FILE_OVERWRITTEN 0x00000003 -#define FILE_EXISTS 0x00000004 -#define FILE_DOES_NOT_EXIST 0x00000005 - -#define FILE_USE_FILE_POINTER_POSITION 0xfffffffe -#define FILE_WRITE_TO_END_OF_FILE 0xffffffff /* also in winnt.h */ #define FILE_LIST_DIRECTORY 0x00000001

1 0

[dreimer] 45702: Next try. We need some vars to keep cmd working. And PS needs its Path, too.
by dreimer＠svn.reactos.org 27 Feb '10

27 Feb '10

Author: dreimer Date: Sat Feb 27 16:42:55 2010 New Revision: 45702 URL: http://svn.reactos.org/svn/reactos?rev=45702&view=rev Log: Next try. We need some vars to keep cmd working. And PS needs its Path, too. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd 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 Feb 27 16:42:55 2010 @@ -47,7 +47,7 @@ $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" if ("$ENV:_ROSBE_NOSYSPATH" -eq "1") { - $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools" + $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:SystemRoot\system32;$ENV:SystemRoot;$ENV:SystemRoot\System32\Wbem;$ENV:SYSTEMROOT\System32\WindowsPowerShell\v1.0\" } else { $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:PATH" } Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sat Feb 27 16:42:55 2010 @@ -40,8 +40,8 @@ set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% -if "_ROSBE_NOSYSPATH" == "1" ( - set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools +if "%_ROSBE_NOSYSPATH%" == "1" ( + set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem ) else ( set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%PATH% )

1 0

[dreimer] 45701: Readded the old behavior of RosBE to ignore the System PATH Variable. Many ppl will love it as fix for overly stupid installed cygwin and WinAVR Tools. To activate it, make a system Variable named "_ROSBE_NOSYSPATH" and set it to 1.
by dreimer＠svn.reactos.org 27 Feb '10

27 Feb '10

Author: dreimer Date: Sat Feb 27 16:27:36 2010 New Revision: 45701 URL: http://svn.reactos.org/svn/reactos?rev=45701&view=rev Log: Readded the old behavior of RosBE to ignore the System PATH Variable. Many ppl will love it as fix for overly stupid installed cygwin and WinAVR Tools. To activate it, make a system Variable named "_ROSBE_NOSYSPATH" and set it to 1. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd 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 Feb 27 16:27:36 2010 @@ -45,7 +45,12 @@ $global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs" $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" -$global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:PATH" + +if ("$ENV:_ROSBE_NOSYSPATH" -eq "1") { + $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools" +} else { + $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:PATH" +} # Fix Bison package path (just in case RosBE is installed in a path which contains spaces) $ENV:BISON_PKGDATADIR = ((New-Object -ComObject Scripting.FileSystemObject).GetFolder("$_ROSBE_HOST_MINGWPATH\share\bison")).ShortPath Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sat Feb 27 16:27:36 2010 @@ -39,7 +39,12 @@ set _ROSBE_SHOWVERSION=0 set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% -set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%PATH% + +if "_ROSBE_NOSYSPATH" == "1" ( + set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools +) else ( + set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%PATH% +) :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison

1 0

[akhaldi] 45700: Move GUID comparison macro to wdm.h
by akhaldi＠svn.reactos.org 27 Feb '10

27 Feb '10

Author: akhaldi Date: Sat Feb 27 16:09:59 2010 New Revision: 45700 URL: http://svn.reactos.org/svn/reactos?rev=45700&view=rev Log: Move GUID comparison macro to wdm.h Modified: branches/header-work/include/ddk/wdm.h branches/header-work/include/ddk/winddk.h Modified: branches/header-work/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r… ============================================================================== --- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Sat Feb 27 16:09:59 2010 @@ -71,6 +71,22 @@ #define ALIGN_UP_POINTER(p, t) \ (ALIGN_DOWN_POINTER(((ULONG_PTR)(p) + sizeof(t) - 1), t)) +/* + * GUID Comparison + */ + +#ifndef __IID_ALIGNED__ + #define __IID_ALIGNED__ + #ifdef __cplusplus + inline int IsEqualGUIDAligned(REFGUID guid1, REFGUID guid2) + { + return ((*(PLONGLONG)(&guid1) == *(PLONGLONG)(&guid2)) && (*((PLONGLONG)(&guid1) + 1) == *((PLONGLONG)(&guid2) + 1))); + } + #else + #define IsEqualGUIDAligned(guid1, guid2) \ + ((*(PLONGLONG)(guid1) == *(PLONGLONG)(guid2)) && (*((PLONGLONG)(guid1) + 1) == *((PLONGLONG)(guid2) + 1))) + #endif +#endif /* Simple types */ typedef UCHAR KPROCESSOR_MODE; Modified: branches/header-work/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.… ============================================================================== --- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Sat Feb 27 16:09:59 2010 @@ -72,23 +72,6 @@ #else # define _DDK_DUMMYUNION_MEMBER(name) name # define _DDK_DUMMYUNION_N_MEMBER(n, name) name -#endif - -/* - * GUID Comparison - */ - -#ifndef __IID_ALIGNED__ - #define __IID_ALIGNED__ - #ifdef __cplusplus - inline int IsEqualGUIDAligned(REFGUID guid1, REFGUID guid2) - { - return ((*(PLONGLONG)(&guid1) == *(PLONGLONG)(&guid2)) && (*((PLONGLONG)(&guid1) + 1) == *((PLONGLONG)(&guid2) + 1))); - } - #else - #define IsEqualGUIDAligned(guid1, guid2) \ - ((*(PLONGLONG)(guid1) == *(PLONGLONG)(guid2)) && (*((PLONGLONG)(guid1) + 1) == *((PLONGLONG)(guid2) + 1))) - #endif #endif /*

1 0

[akhaldi] 45699: Move alignment macros to wdm.h
by akhaldi＠svn.reactos.org 27 Feb '10

27 Feb '10

Author: akhaldi Date: Sat Feb 27 15:59:20 2010 New Revision: 45699 URL: http://svn.reactos.org/svn/reactos?rev=45699&view=rev Log: Move alignment macros to wdm.h Modified: branches/header-work/include/ddk/wdm.h branches/header-work/include/ddk/winddk.h Modified: branches/header-work/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r… ============================================================================== --- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Sat Feb 27 15:59:20 2010 @@ -54,6 +54,22 @@ #endif #endif + + +/* + * Alignment Macros + */ +#define ALIGN_DOWN(s, t) \ + ((ULONG)(s) & ~(sizeof(t) - 1)) + +#define ALIGN_UP(s, t) \ + (ALIGN_DOWN(((ULONG)(s) + sizeof(t) - 1), t)) + +#define ALIGN_DOWN_POINTER(p, t) \ + ((PVOID)((ULONG_PTR)(p) & ~((ULONG_PTR)sizeof(t) - 1))) + +#define ALIGN_UP_POINTER(p, t) \ + (ALIGN_DOWN_POINTER(((ULONG_PTR)(p) + sizeof(t) - 1), t)) /* Simple types */ Modified: branches/header-work/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.… ============================================================================== --- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Sat Feb 27 15:59:20 2010 @@ -73,21 +73,6 @@ # define _DDK_DUMMYUNION_MEMBER(name) name # define _DDK_DUMMYUNION_N_MEMBER(n, name) name #endif - -/* - * Alignment Macros - */ -#define ALIGN_DOWN(s, t) \ - ((ULONG)(s) & ~(sizeof(t) - 1)) - -#define ALIGN_UP(s, t) \ - (ALIGN_DOWN(((ULONG)(s) + sizeof(t) - 1), t)) - -#define ALIGN_DOWN_POINTER(p, t) \ - ((PVOID)((ULONG_PTR)(p) & ~((ULONG_PTR)sizeof(t) - 1))) - -#define ALIGN_UP_POINTER(p, t) \ - (ALIGN_DOWN_POINTER(((ULONG_PTR)(p) + sizeof(t) - 1), t)) /* * GUID Comparison

1 0

[ktietz] 45698: Guard ANONYMOUS defines by __ANONYMOUS_DEFINED guard to prevent double definitions. Additional synchronize amount of DUMMYSTRUCTNAME defines.
by ktietz＠svn.reactos.org 27 Feb '10

27 Feb '10

Author: ktietz Date: Sat Feb 27 15:43:32 2010 New Revision: 45698 URL: http://svn.reactos.org/svn/reactos?rev=45698&view=rev Log: Guard ANONYMOUS defines by __ANONYMOUS_DEFINED guard to prevent double definitions. Additional synchronize amount of DUMMYSTRUCTNAME defines. Modified: branches/header-work/include/ddk/ntdef.h branches/header-work/include/psdk/windef.h Modified: branches/header-work/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntdef.h… ============================================================================== --- branches/header-work/include/ddk/ntdef.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntdef.h [iso-8859-1] Sat Feb 27 15:43:32 2010 @@ -93,6 +93,9 @@ // We should use the -fms-extensions compiler flag for gcc, // and clean up the mess. // +#ifndef __ANONYMOUS_DEFINED +#define __ANONYMOUS_DEFINED + #ifndef NONAMELESSUNION #ifdef __GNUC__ #define _ANONYMOUS_UNION __GNU_EXTENSION @@ -132,14 +135,18 @@ #define DUMMYSTRUCTNAME s #define DUMMYSTRUCTNAME2 s2 #define DUMMYSTRUCTNAME3 s3 +#define DUMMYSTRUCTNAME4 s4 +#define DUMMYSTRUCTNAME5 s5 #else #define _STRUCT_NAME(x) #define DUMMYSTRUCTNAME #define DUMMYSTRUCTNAME2 #define DUMMYSTRUCTNAME3 -#endif - - +#define DUMMYSTRUCTNAME4 +#define DUMMYSTRUCTNAME5 +#endif + +#endif /* __ANONYMOUS_DEFINED */ // FIXME #undef UNALIGNED Modified: branches/header-work/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/windef… ============================================================================== --- branches/header-work/include/psdk/windef.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/windef.h [iso-8859-1] Sat Feb 27 15:43:32 2010 @@ -204,16 +204,13 @@ #define DBG_UNREFERENCED_PARAMETER(P) #define DBG_UNREFERENCED_LOCAL_VARIABLE(L) +#ifndef __ANONYMOUS_DEFINED +#define __ANONYMOUS_DEFINED + #ifndef NONAMELESSUNION #ifdef __GNUC__ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_STRUCT __extension__ -#else -#if defined(__cplusplus) -#define _ANONYMOUS_UNION __extension__ -#endif /* __cplusplus */ -#endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */ #elif defined(__WATCOMC__) || defined(_MSC_VER) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT @@ -262,6 +259,8 @@ #define DUMMYSTRUCTNAME4 #define DUMMYSTRUCTNAME5 #endif + +#endif /* __ANONYMOUS_DEFINED */ #ifndef NO_STRICT #ifndef STRICT

1 0

[akhaldi] 45697: * Disable compiling usermode components for now.
by akhaldi＠svn.reactos.org 27 Feb '10

27 Feb '10

Author: akhaldi Date: Sat Feb 27 15:22:19 2010 New Revision: 45697 URL: http://svn.reactos.org/svn/reactos?rev=45697&view=rev Log: * Disable compiling usermode components for now. Modified: branches/header-work/ReactOS-i386.rbuild branches/header-work/config.template.rbuild branches/header-work/drivers/wdm/audio/backpln/directory.rbuild branches/header-work/lib/3rdparty/3rdparty.rbuild branches/header-work/lib/3rdparty/mingw/mingw.rbuild branches/header-work/lib/tdilib/tdilib.rbuild branches/header-work/subsystems/subsystems.rbuild branches/header-work/subsystems/win32/win32.rbuild Modified: branches/header-work/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/ReactOS-i386.rbuild… ============================================================================== --- branches/header-work/ReactOS-i386.rbuild [iso-8859-1] (original) +++ branches/header-work/ReactOS-i386.rbuild [iso-8859-1] Sat Feb 27 15:22:19 2010 @@ -36,14 +36,17 @@ <linkerflag>-section-alignment=0x1000</linkerflag> </group> - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> + <if property="USERMODE" value="1"> + <directory name="base"> + <xi:include href="base/base.rbuild" /> + </directory> + <directory name="dll"> + <xi:include href="dll/dll.rbuild" /> + </directory> + </if> + <directory name="boot"> <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="dll"> - <xi:include href="dll/dll.rbuild" /> </directory> <directory name="drivers"> <xi:include href="drivers/drivers.rbuild" /> Modified: branches/header-work/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/config.template.rbu… ============================================================================== --- branches/header-work/config.template.rbuild [iso-8859-1] (original) +++ branches/header-work/config.template.rbuild [iso-8859-1] Sat Feb 27 15:22:19 2010 @@ -99,4 +99,10 @@ --> <property name="BUILD_MP" value="1" /> + +<property name="USERMODE" value="0" /> + </group> Modified: branches/header-work/drivers/wdm/audio/backpln/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/wdm/audio/b… ============================================================================== --- branches/header-work/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] (original) +++ branches/header-work/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] Sat Feb 27 15:22:19 2010 @@ -1,9 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="audio_test"> - <xi:include href="audio_test/audio_test.rbuild" /> - </directory> + + <if property="USERMODE" value="1"> + <directory name="audio_test"> + <xi:include href="audio_test/audio_test.rbuild" /> + </directory> + </if> <directory name="portcls"> <xi:include href="portcls/portcls.rbuild" /> </directory> Modified: branches/header-work/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/3rdpar… ============================================================================== --- branches/header-work/lib/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/3rdparty.rbuild [iso-8859-1] Sat Feb 27 15:22:19 2010 @@ -7,9 +7,13 @@ <directory name="bzip2"> <xi:include href="bzip2/bzip2.rbuild" /> </directory> - <directory name="cardlib"> - <xi:include href="cardlib/cardlib.rbuild" /> - </directory> + + <if property="USERMODE" value="1"> + <directory name="cardlib"> + <xi:include href="cardlib/cardlib.rbuild" /> + </directory> + </if> + <directory name="expat"> <xi:include href="expat/expat.rbuild" /> </directory> Modified: branches/header-work/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/mingw/… ============================================================================== --- branches/header-work/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Sat Feb 27 15:22:19 2010 @@ -4,7 +4,9 @@ <module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll"> <define name="_CRTBLD" /> <include base="ReactOS">include/reactos/mingw-w64</include> - <library>kernel32</library> + <if property="USERMODE" value="1"> + <library>kernel32</library> + </if> <file>_newmode.c</file> <file>atonexit.c</file> <file>charmax.c</file> Modified: branches/header-work/lib/tdilib/tdilib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/tdilib/tdilib.r… ============================================================================== --- branches/header-work/lib/tdilib/tdilib.rbuild [iso-8859-1] (original) +++ branches/header-work/lib/tdilib/tdilib.rbuild [iso-8859-1] Sat Feb 27 15:22:19 2010 @@ -1,9 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="tdilib" type="staticlibrary"> - <include base="iphlpapi">.</include> - <include base="tdilib">.</include> - <library>ntdll</library> - <file>enum.c</file> - <file>handle.c</file> -</module> +<if property="USERMODE" value="1"> + <module name="tdilib" type="staticlibrary"> + <include base="iphlpapi">.</include> + <include base="tdilib">.</include> + <library>ntdll</library> + <file>enum.c</file> + <file>handle.c</file> + </module> +</if> Modified: branches/header-work/subsystems/subsystems.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/subsyste… ============================================================================== --- branches/header-work/subsystems/subsystems.rbuild [iso-8859-1] (original) +++ branches/header-work/subsystems/subsystems.rbuild [iso-8859-1] Sat Feb 27 15:22:19 2010 @@ -1,9 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<directory name="ntvdm"> - <xi:include href="ntvdm/ntvdm.rbuild" /> -</directory> +<if property="USERMODE" value="1"> + <directory name="ntvdm"> + <xi:include href="ntvdm/ntvdm.rbuild" /> + </directory> +</if> <directory name="win32"> <xi:include href="win32/win32.rbuild" /> </directory> Modified: branches/header-work/subsystems/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… ============================================================================== --- branches/header-work/subsystems/win32/win32.rbuild [iso-8859-1] (original) +++ branches/header-work/subsystems/win32/win32.rbuild [iso-8859-1] Sat Feb 27 15:22:19 2010 @@ -1,9 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<directory name="csrss"> - <xi:include href="csrss/csrss.rbuild" /> -</directory> +<if property="USERMODE" value="1"> + <directory name="csrss"> + <xi:include href="csrss/csrss.rbuild" /> + </directory> +</if> <directory name="win32k"> <xi:include href="win32k/win32k.rbuild" /> </directory>

1 0

[ktietz] 45696: Drop special treating of gcc version < 2.95.
by ktietz＠svn.reactos.org 27 Feb '10

27 Feb '10

Author: ktietz Date: Sat Feb 27 15:15:11 2010 New Revision: 45696 URL: http://svn.reactos.org/svn/reactos?rev=45696&view=rev Log: Drop special treating of gcc version < 2.95. Modified: branches/header-work/include/ddk/ntdef.h Modified: branches/header-work/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntdef.h… ============================================================================== --- branches/header-work/include/ddk/ntdef.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntdef.h [iso-8859-1] Sat Feb 27 15:15:11 2010 @@ -95,10 +95,8 @@ // #ifndef NONAMELESSUNION #ifdef __GNUC__ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || defined (__cplusplus) #define _ANONYMOUS_UNION __GNU_EXTENSION #define _ANONYMOUS_STRUCT __GNU_EXTENSION -#endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || defined (__cplusplus) */ #elif defined(__WATCOMC__) || defined(_MSC_VER) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT

1 0

[ktietz] 45695: Make sure that __int64 is getting prefix by __GCC_EXTENSION to avoid warnings for x64 gcc and the use of long long type in ISO-C/C++.
by ktietz＠svn.reactos.org 27 Feb '10

27 Feb '10

Author: ktietz Date: Sat Feb 27 15:01:48 2010 New Revision: 45695 URL: http://svn.reactos.org/svn/reactos?rev=45695&view=rev Log: Make sure that __int64 is getting prefix by __GCC_EXTENSION to avoid warnings for x64 gcc and the use of long long type in ISO-C/C++. Modified: branches/header-work/include/ddk/ntdef.h branches/header-work/include/ddk/strmini.h Modified: branches/header-work/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntdef.h… ============================================================================== --- branches/header-work/include/ddk/ntdef.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntdef.h [iso-8859-1] Sat Feb 27 15:01:48 2010 @@ -13,6 +13,14 @@ #include <stdarg.h> #include <string.h> +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif typedef unsigned long POINTER_64; // FIXME! HACK!!! @@ -87,14 +95,10 @@ // #ifndef NONAMELESSUNION #ifdef __GNUC__ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -#define _ANONYMOUS_UNION __extension__ -#define _ANONYMOUS_STRUCT __extension__ -#else -#if defined(__cplusplus) -#define _ANONYMOUS_UNION __extension__ -#endif /* __cplusplus */ -#endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */ +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || defined (__cplusplus) +#define _ANONYMOUS_UNION __GNU_EXTENSION +#define _ANONYMOUS_STRUCT __GNU_EXTENSION +#endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || defined (__cplusplus) */ #elif defined(__WATCOMC__) || defined(_MSC_VER) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT @@ -332,7 +336,7 @@ { _ANONYMOUS_UNION union { - __int64 UseThisFieldToCopy; + __GNU_EXTENSION __int64 UseThisFieldToCopy; double DoNotUseThisField; }; } QUAD, *PQUAD, UQUAD, *PUQUAD; @@ -374,8 +378,8 @@ // // 64-bit types // -typedef __int64 LONGLONG, *PLONGLONG; -typedef unsigned __int64 ULONGLONG, *PULONGLONG; +__GNU_EXTENSION typedef __int64 LONGLONG, *PLONGLONG; +__GNU_EXTENSION typedef unsigned __int64 ULONGLONG, *PULONGLONG; typedef ULONGLONG DWORDLONG, *PDWORDLONG; // Modified: branches/header-work/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/strmini… ============================================================================== --- branches/header-work/include/ddk/strmini.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/strmini.h [iso-8859-1] Sat Feb 27 15:01:48 2010 @@ -46,8 +46,8 @@ #endif typedef PHYSICAL_ADDRESS STREAM_PHYSICAL_ADDRESS, *PSTREAM_PHYSICAL_ADDRESS; -typedef unsigned __int64 STREAM_SYSTEM_TIME, *PSTREAM_SYSTEM_TIME; -typedef unsigned __int64 STREAM_TIMESTAMP, *PSTREAM_TIMESTAMP; +__GNU_EXTENSION typedef unsigned __int64 STREAM_SYSTEM_TIME, *PSTREAM_SYSTEM_TIME; +__GNU_EXTENSION typedef unsigned __int64 STREAM_TIMESTAMP, *PSTREAM_TIMESTAMP; typedef enum {

1 0

[ktietz] 45694: Make sure that unnamed union/struct are prefix by __GCC_EXTENSION.
by ktietz＠svn.reactos.org 27 Feb '10

27 Feb '10

Author: ktietz Date: Sat Feb 27 14:53:12 2010 New Revision: 45694 URL: http://svn.reactos.org/svn/reactos?rev=45694&view=rev Log: Make sure that unnamed union/struct are prefix by __GCC_EXTENSION. Modified: branches/header-work/include/ddk/bdasup.h branches/header-work/include/ddk/d3dhal.h branches/header-work/include/ddk/d3dnthal.h branches/header-work/include/ddk/ddkmapi.h branches/header-work/include/ddk/ddrawi.h branches/header-work/include/ddk/ddrawint.h branches/header-work/include/ddk/dmemmgr.h branches/header-work/include/ddk/ide.h branches/header-work/include/ddk/minitape.h branches/header-work/include/ddk/ndis.h branches/header-work/include/ddk/ntdddisk.h branches/header-work/include/ddk/ntifs.h branches/header-work/include/ddk/stdunk.h branches/header-work/include/ddk/strmini.h branches/header-work/include/ddk/usb.h branches/header-work/include/ddk/usb200.h branches/header-work/include/ddk/usbdi.h branches/header-work/include/ddk/winddk.h Modified: branches/header-work/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/bdasup.… ============================================================================== --- branches/header-work/include/ddk/bdasup.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/bdasup.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -1,5 +1,14 @@ #if defined(__cplusplus) extern "C" { +#endif + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif #endif #define STDMETHODCALLTYPE __stdcall @@ -30,7 +39,7 @@ typedef struct _KSM_PIN { KSMETHOD Method; - union + __GNU_EXTENSION union { ULONG PinId; ULONG PinType; Modified: branches/header-work/include/ddk/d3dhal.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/d3dhal.… ============================================================================== --- branches/header-work/include/ddk/d3dhal.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/d3dhal.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -21,6 +21,15 @@ #ifndef _D3DHAL_H_ #define _D3DHAL_H_ + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #ifdef __cplusplus extern "C" { @@ -787,7 +796,7 @@ typedef struct _DD_GETD3DQUERYDATA { DD_GETDRIVERINFO2DATA gdi2; - union + __GNU_EXTENSION union { DWORD dwQueryIndex; D3DQUERYTYPE QueryType; Modified: branches/header-work/include/ddk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/d3dntha… ============================================================================== --- branches/header-work/include/ddk/d3dnthal.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/d3dnthal.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -8,6 +8,15 @@ #include <ddrawint.h> #include <d3dtypes.h> #include <d3dcaps.h> + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #ifdef __cplusplus extern "C" { @@ -22,17 +31,17 @@ typedef struct _D3DNTHAL_CONTEXTCREATEDATA { - union + __GNU_EXTENSION union { PDD_DIRECTDRAW_GLOBAL lpDDGbl; PDD_DIRECTDRAW_LOCAL lpDDLcl; }; - union + __GNU_EXTENSION union { PDD_SURFACE_LOCAL lpDDS; PDD_SURFACE_LOCAL lpDDSLcl; }; - union + __GNU_EXTENSION union { PDD_SURFACE_LOCAL lpDDSZ; PDD_SURFACE_LOCAL lpDDSZLcl; @@ -223,7 +232,7 @@ PDD_SURFACE_LOCAL lpDDCommands; DWORD dwCommandOffset; DWORD dwCommandLength; - union + __GNU_EXTENSION union { PDD_SURFACE_LOCAL lpDDVertex; LPVOID lpVertices; @@ -233,7 +242,7 @@ DWORD dwReqVertexBufSize; DWORD dwReqCommandBufSize; LPDWORD lpdwRStates; - union + __GNU_EXTENSION union { DWORD dwVertexSize; HRESULT ddrval; Modified: branches/header-work/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ddkmapi… ============================================================================== --- branches/header-work/include/ddk/ddkmapi.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ddkmapi.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -21,6 +21,14 @@ #ifndef __DDKMAPI_INCLUDED__ #define __DDKMAPI_INCLUDED__ +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #if defined(_DXAPI_) #define DXAPI @@ -219,17 +227,17 @@ DWORD dwFormatFlags; DWORD dwFormatFourCC; DWORD dwFormatBitCount; - union + __GNU_EXTENSION union { DWORD dwRBitMask; DWORD dwYBitMask; }; - union + __GNU_EXTENSION union { DWORD dwGBitMask; DWORD dwUBitMask; }; - union + __GNU_EXTENSION union { DWORD dwBBitMask; DWORD dwVBitMask; Modified: branches/header-work/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ddrawi.… ============================================================================== --- branches/header-work/include/ddk/ddrawi.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ddrawi.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -21,6 +21,15 @@ #ifndef __DDRAWI_INCLUDED__ #define __DDRAWI_INCLUDED__ + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #ifdef __cplusplus extern "C" { @@ -203,13 +212,13 @@ typedef struct _VIDMEM { DWORD dwFlags; FLATPTR fpStart; - union { + __GNU_EXTENSION union { FLATPTR fpEnd; DWORD dwWidth; }; DDSCAPS ddsCaps; DDSCAPS ddsCapsAlt; - union { + __GNU_EXTENSION union { LPVMEMHEAP lpHeap; DWORD dwHeight; }; @@ -1404,21 +1413,21 @@ typedef struct _DDRAWI_DDRAWSURFACE_GBL { DWORD dwRefCnt; DWORD dwGlobalFlags; - union { + __GNU_EXTENSION union { LPACCESSRECTLIST lpRectList; DWORD dwBlockSizeY; LONG lSlicePitch; }; - union { + __GNU_EXTENSION union { LPVMEMHEAP lpVidMemHeap; DWORD dwBlockSizeX; }; - union { + __GNU_EXTENSION union { LPDDRAWI_DIRECTDRAW_GBL lpDD; LPVOID lpDDHandle; }; FLATPTR fpVidMem; - union { + __GNU_EXTENSION union { LONG lPitch; DWORD dwLinearSize; }; @@ -1454,7 +1463,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE { DWORD dwSize; - union { + __GNU_EXTENSION union { DWORD dwPhysicalPageTable; FLATPTR fpPhysicalVidMem; }; @@ -1551,15 +1560,15 @@ DWORD dwProcessId; DWORD dwFlags; DDSCAPS ddsCaps; - union + __GNU_EXTENSION union { - LPDDRAWI_DDRAWPALETTE_INT lpDDPalette; + LPDDRAWI_DDRAWPALETTE_INT lpDDPalette; LPDDRAWI_DDRAWPALETTE_INT lp16DDPalette; - }; - union + }; + __GNU_EXTENSION union { - LPDDRAWI_DDRAWCLIPPER_LCL lpDDClipper; - LPDDRAWI_DDRAWCLIPPER_INT lp16DDClipper; + LPDDRAWI_DDRAWCLIPPER_LCL lpDDClipper; + LPDDRAWI_DDRAWCLIPPER_INT lp16DDClipper; }; DWORD dwModeCreatedIn; DWORD dwBackBufferCount; @@ -1628,7 +1637,7 @@ LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; DWORD dwProcessId; LPPALETTEENTRY lpColorTable; - union { + __GNU_EXTENSION union { ULONG_PTR dwReserved1; HPALETTE hHELGDIPalette; }; @@ -1762,7 +1771,7 @@ typedef struct _DDHAL_GETDRIVERSTATEDATA { DWORD dwFlags; - union + __GNU_EXTENSION union { ULONG_PTR dwhContext; }; Modified: branches/header-work/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ddrawin… ============================================================================== --- branches/header-work/include/ddk/ddrawint.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ddrawint.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -5,6 +5,14 @@ #ifndef __DD_INCLUDED__ #define __DD_INCLUDED__ +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif DEFINE_GUID( GUID_MiscellaneousCallbacks, 0xEFD60CC0, 0x49e7, 0x11d0, 0x88, 0x9d, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x6a); DEFINE_GUID( GUID_Miscellaneous2Callbacks, 0x406B2F00, 0x3E5A, 0x11D1, 0xB6, 0x40, 0x00, 0xAA, 0x00, 0xA1, 0xF9, 0x6A); @@ -81,14 +89,14 @@ { DWORD dwFlags; FLATPTR fpStart; - union + __GNU_EXTENSION union { FLATPTR fpEnd; DWORD dwWidth; }; DDSCAPS ddsCaps; DDSCAPS ddsCapsAlt; - union + __GNU_EXTENSION union { struct _VMEMHEAP *lpHeap; DWORD dwHeight; @@ -128,13 +136,13 @@ typedef struct _DD_SURFACE_GLOBAL { - union + __GNU_EXTENSION union { DWORD dwBlockSizeY; LONG lSlicePitch; }; - union + __GNU_EXTENSION union { PVIDEOMEMORY lpVidMemHeap; DWORD dwBlockSizeX; @@ -142,7 +150,7 @@ }; FLATPTR fpVidMem; - union + __GNU_EXTENSION union { LONG lPitch; DWORD dwLinearSize; @@ -174,12 +182,12 @@ DWORD dwFlags; DDSCAPS ddsCaps; ULONG_PTR dwReserved1; - union + __GNU_EXTENSION union { DDCOLORKEY ddckCKSrcOverlay; DDCOLORKEY ddckCKSrcBlt; }; - union + __GNU_EXTENSION union { DDCOLORKEY ddckCKDestOverlay; DDCOLORKEY ddckCKDestBlt; @@ -591,7 +599,7 @@ typedef struct _DD_GETDRIVERSTATEDATA { DWORD dwFlags; - union + __GNU_EXTENSION union { PDD_DIRECTDRAW_GLOBAL lpDD; DWORD_PTR dwhContext; Modified: branches/header-work/include/ddk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/dmemmgr… ============================================================================== --- branches/header-work/include/ddk/dmemmgr.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/dmemmgr.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -11,6 +11,15 @@ #ifndef __DMEMMGR_INCLUDED__ #define __DMEMMGR_INCLUDED__ + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #ifdef __cplusplus extern "C" { @@ -70,7 +79,7 @@ typedef struct _SURFACEALIGNMENT { - union + __GNU_EXTENSION union { struct { Modified: branches/header-work/include/ddk/ide.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ide.h?r… ============================================================================== --- branches/header-work/include/ddk/ide.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ide.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -22,6 +22,15 @@ #ifndef __IDE_H #define __IDE_H + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #ifdef __cplusplus extern "C" { @@ -104,7 +113,7 @@ USHORT UnformattedBytesPerTrack; /* 08 */ USHORT UnformattedBytesPerSector; /* 10 */ USHORT NumSectorsPerTrack; /* 12 */ - union + __GNU_EXTENSION union { USHORT VendorUnique1[3]; /* 14 */ struct Modified: branches/header-work/include/ddk/minitape.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/minitap… ============================================================================== --- branches/header-work/include/ddk/minitape.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/minitape.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -21,6 +21,15 @@ */ #ifndef __MINITAPE_H #define __MINITAPE_H + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #ifdef __cplusplus extern "C" { @@ -77,9 +86,9 @@ UCHAR DeviceTypeQualifier : 3; UCHAR DeviceTypeModifier : 7; UCHAR RemovableMedia : 1; - union { + __GNU_EXTENSION union { UCHAR Versions; - struct { + __GNU_EXTENSION struct { UCHAR ANSIVersion : 3; UCHAR ECMAVersion : 3; UCHAR ISOVersion : 2; Modified: branches/header-work/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ndis.h?… ============================================================================== --- branches/header-work/include/ddk/ndis.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ndis.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -31,6 +31,15 @@ #ifndef __NDIS_H #define __NDIS_H + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #include "ntddk.h" #include "ntddndis.h" @@ -238,8 +247,8 @@ } NDIS_RW_LOCK_REFCOUNT; typedef struct _NDIS_RW_LOCK { - union { - struct { + __GNU_EXTENSION union { + __GNU_EXTENSION struct { KSPIN_LOCK SpinLock; PVOID Context; }; @@ -380,16 +389,16 @@ typedef struct _NDIS_PACKET { NDIS_PACKET_PRIVATE Private; - union { - struct { + __GNU_EXTENSION union { + __GNU_EXTENSION struct { UCHAR MiniportReserved[2 * sizeof(PVOID)]; UCHAR WrapperReserved[2 * sizeof(PVOID)]; }; - struct { + __GNU_EXTENSION struct { UCHAR MiniportReservedEx[3 * sizeof(PVOID)]; UCHAR WrapperReservedEx[sizeof(PVOID)]; }; - struct { + __GNU_EXTENSION struct { UCHAR MacReserved[4 * sizeof(PVOID)]; }; }; @@ -474,7 +483,7 @@ } DATA; #if (defined(NDIS50) || defined(NDIS51)) UCHAR NdisReserved[9 * sizeof(PVOID)]; - union { + __GNU_EXTENSION union { UCHAR CallMgrReserved[2 * sizeof(PVOID)]; UCHAR ProtocolReserved[2 * sizeof(PVOID)]; }; Modified: branches/header-work/include/ddk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntdddis… ============================================================================== --- branches/header-work/include/ddk/ntdddisk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntdddisk.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -22,6 +22,15 @@ #ifndef __NTDDDISK_H #define __NTDDDISK_H + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #include "ntddstor.h" @@ -394,7 +403,7 @@ typedef struct _DRIVE_LAYOUT_INFORMATION_EX { ULONG PartitionStyle; ULONG PartitionCount; - union { + __GNU_EXTENSION union { DRIVE_LAYOUT_INFORMATION_MBR Mbr; DRIVE_LAYOUT_INFORMATION_GPT Gpt; }; Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -23,6 +23,15 @@ #ifndef _NTIFS_ #define _NTIFS_ #define _GNU_NTIFS_ + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #define NTKERNELAPI DECLSPEC_IMPORT @@ -962,7 +971,7 @@ ULONG ReparseTag; USHORT ReparseDataLength; USHORT Reserved; - union { + __GNU_EXTENSION union { struct { USHORT SubstituteNameOffset; USHORT SubstituteNameLength; @@ -1351,11 +1360,11 @@ LONGLONG FileReference; UCHAR ObjectId[16]; _ANONYMOUS_UNION union { - struct { + __GNU_EXTENSION struct { UCHAR BirthVolumeId[16]; UCHAR BirthObjectId[16]; UCHAR DomainId[16]; - } ; + }; UCHAR ExtendedInfo[48]; } DUMMYUNIONNAME; } FILE_OBJECTID_INFORMATION, *PFILE_OBJECTID_INFORMATION; @@ -1985,13 +1994,13 @@ } s2; ULONG ZeroInit; } u2; - union + __GNU_EXTENSION union { LPC_CLIENT_ID ClientId; double DoNotUseThisField; }; ULONG MessageId; - union + __GNU_EXTENSION union { LPC_SIZE_T ClientViewSize; ULONG CallbackId; Modified: branches/header-work/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/stdunk.… ============================================================================== --- branches/header-work/include/ddk/stdunk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/stdunk.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -12,6 +12,15 @@ #define STDUNK_H #include <punknown.h> + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif /* =============================================================== INonDelegatingUnknown interface @@ -110,7 +119,7 @@ typedef struct CUnknown { - union + __GNU_EXTENSION union { IUnknown IUnknown; INonDelegatingUnknown INonDelegatingUnknown; Modified: branches/header-work/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/strmini… ============================================================================== --- branches/header-work/include/ddk/strmini.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/strmini.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -4,6 +4,15 @@ #include <ntddk.h> #include <windef.h> #include <ks.h> + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #define STREAMAPI __stdcall #define STREAM_SYSTEM_TIME_MASK ((STREAM_SYSTEM_TIME)0x00000001FFFFFFFF) @@ -61,7 +70,7 @@ BOOLEAN Enable; PKSEVENT_ENTRY EventEntry; PKSEVENTDATA EventData; - union + __GNU_EXTENSION union { struct _HW_STREAM_OBJECT * StreamObject; struct _HW_DEVICE_EXTENSION *DeviceExtension; @@ -285,7 +294,7 @@ ULONG Flags; PVOID HwInstanceExtension; - union + __GNU_EXTENSION union { ULONG NumberOfBytesToTransfer; ULONG ActualBytesTransferred; @@ -376,11 +385,11 @@ typedef struct _HW_INITIALIZATION_DATA { #if (NTDDI_VERSION >= NTDDI_WINXP) - union + __GNU_EXTENSION union + { + ULONG HwInitializationDataSize; + __GNU_EXTENSION struct { - ULONG HwInitializationDataSize; - struct - { USHORT SizeOfThisPacket; USHORT StreamClassVersion; }; Modified: branches/header-work/include/ddk/usb.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/usb.h?r… ============================================================================== --- branches/header-work/include/ddk/usb.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/usb.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -2,6 +2,15 @@ #ifndef __USB_H__ #define __USB_H__ + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #ifdef __USBDI_H__ error @@ -323,7 +332,7 @@ typedef struct _URB { - union + __GNU_EXTENSION union { struct _URB_HEADER UrbHeader; Modified: branches/header-work/include/ddk/usb200.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/usb200.… ============================================================================== --- branches/header-work/include/ddk/usb200.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/usb200.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -1,5 +1,14 @@ #ifndef __USB200_H__ #define __USB200_H__ + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #include "usb100.h" @@ -37,7 +46,7 @@ UCHAR bRequest; union _wValue { - struct + __GNU_EXTENSION struct { UCHAR LowByte; UCHAR HiByte; @@ -46,7 +55,7 @@ } wValue; union _wIndex { - struct + __GNU_EXTENSION struct { UCHAR LowByte; UCHAR HiByte; Modified: branches/header-work/include/ddk/usbdi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/usbdi.h… ============================================================================== --- branches/header-work/include/ddk/usbdi.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/usbdi.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -22,6 +22,15 @@ #ifndef __USBDI_H #define __USBDI_H + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #ifdef __USB_H #error usb.h cannot be included with usbdi.h @@ -372,7 +381,7 @@ } USBD_VERSION_INFORMATION, *PUSBD_VERSION_INFORMATION; typedef struct _URB { - union { + __GNU_EXTENSION union { struct _URB_HEADER UrbHeader; struct _URB_SELECT_INTERFACE UrbSelectInterface; struct _URB_SELECT_CONFIGURATION UrbSelectConfiguration; Modified: branches/header-work/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.… ============================================================================== --- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Sat Feb 27 14:53:12 2010 @@ -22,6 +22,15 @@ #ifndef __WINDDK_H #define __WINDDK_H + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif #ifdef __cplusplus extern "C" { @@ -556,7 +565,7 @@ ULONG SystemCall; ULONG SystemCallReturn; ULONGLONG SystemCallPad[3]; - union { + __GNU_EXTENSION union { volatile KSYSTEM_TIME TickCount; volatile ULONG64 TickCountQuad; }; @@ -569,10 +578,10 @@ USHORT UserModeGlobalLogger[8]; ULONG HeapTracingPid[2]; ULONG CritSecTracingPid[2]; - union + __GNU_EXTENSION union { ULONG SharedDataFlags; - struct + __GNU_EXTENSION struct { ULONG DbgErrorPortPresent:1; ULONG DbgElevationEnabled:1; @@ -1276,9 +1285,9 @@ PKTHREAD Owner; ULONG Contention; KGATE Gate; - union + __GNU_EXTENSION union { - struct + __GNU_EXTENSION struct { SHORT KernelApcDisable; SHORT SpecialApcDisable; @@ -4591,7 +4600,7 @@ ULONG StackBase; ULONG StackLimit; ULONG SubSystemTib; - union { + __GNU_EXTENSION union { ULONG FiberData; ULONG Version; }; @@ -4604,7 +4613,7 @@ ULONG64 StackBase; ULONG64 StackLimit; ULONG64 SubSystemTib; - union { + __GNU_EXTENSION union { ULONG64 FiberData; ULONG Version; }; @@ -4705,7 +4714,7 @@ typedef struct _PROCESS_DEVICEMAP_INFORMATION { - union + __GNU_EXTENSION union { struct { @@ -5382,10 +5391,10 @@ typedef struct _KPCR { - union + __GNU_EXTENSION union { NT_TIB NtTib; - struct + __GNU_EXTENSION struct { union _KGDTENTRY64 *GdtBase; struct _KTSS64 *TssBase;

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