[ros-diffs] [sserapion] 37786: - Fix build. - Exclude uniata from build. - Compile more drivers. - Make cdrom driver compile. - Fix TDI spec file. - Exclude C_ASSERT thats only relevant to some i386 asm. - Link to libgcc_eh for C++ apps.
sserapion at svn.reactos.org
sserapion at svn.reactos.org
Mon Dec 1 03:47:27 CET 2008
Author: sserapion
Date: Sun Nov 30 20:47:26 2008
New Revision: 37786
URL: http://svn.reactos.org/svn/reactos?rev=37786&view=rev
Log:
- Fix build.
- Exclude uniata from build.
- Compile more drivers.
- Make cdrom driver compile.
- Fix TDI spec file.
- Exclude C_ASSERT thats only relevant to some i386 asm.
- Link to libgcc_eh for C++ apps.
Modified:
branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild
branches/ros-amd64-bringup/reactos/drivers/network/tdi/misc/tdi.spec
branches/ros-amd64-bringup/reactos/drivers/storage/class/cdrom/cdrom.c
branches/ros-amd64-bringup/reactos/drivers/storage/ide/directory.rbuild
branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h
branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild
branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp
Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild?rev=37786&r1=37785&r2=37786&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sun Nov 30 20:47:26 2008
@@ -42,7 +42,6 @@
<compilerflag>-mpreferred-stack-boundary=4</compilerflag>
<compilerflag>-fno-strict-aliasing</compilerflag>
<compilerflag>-Wno-strict-aliasing</compilerflag>
- <compilerflag>-fno-ira</compilerflag>
<compilerflag>-Wpointer-arith</compilerflag>
<linkerflag>-disable-stdcall-fixup</linkerflag>
<linkerflag>-static</linkerflag>
@@ -141,30 +140,59 @@
</directory -->
<directory name="drivers">
+ <directory name="bus">
+ <directory name="pci">
+ <xi:include href="drivers/bus/pci/pci.rbuild" />
+ </directory>
+ </directory>
+
+ <!-- directory name="directx">
+ <xi:include href="drivers/directx/directory.rbuild" />
+ </directory -->
+
+ <!-- directory name="ksfilter">
+ <xi:include href="drivers/ksfilter/directory.rbuild" />
+ </directory -->
+
+ <!-- directory name="multimedia">
+ <xi:include href="drivers/multimedia/directory.rbuild" />
+ </directory -->
+
+ <directory name="parallel">
+ <xi:include href="drivers/parallel/directory.rbuild" />
+ </directory>
+
+ <directory name="serial">
+ <xi:include href="drivers/serial/directory.rbuild" />
+ </directory>
+
+ <!--directory name="usb">
+ <xi:include href="drivers/usb/directory.rbuild" />
+ </directory-->
+
+ <!--directory name="video">
+ <xi:include href="drivers/video/directory.rbuild" />
+ </directory-->
+
+ <!-- directory name="wdm">
+ <xi:include href="drivers/wdm/wdm.rbuild" />
+ </directory -->
+
+ <directory name="wmi">
+ <xi:include href="drivers/wmi/wmilib.rbuild" />
+ </directory>
+
<directory name="base">
<xi:include href="drivers/base/directory.rbuild" />
</directory>
<directory name="filesystems">
- <directory name="cdfs">
- <xi:include href="drivers/filesystems/cdfs/cdfs.rbuild" />
- </directory>
- <directory name="fastfat">
- <xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" />
- </directory>
- <directory name="ext2">
- <!-- xi:include href="drivers/filesystems/ext2/ext2.rbuild" / -->
- </directory>
+ <xi:include href="drivers/filesystems/directory.rbuild" />
</directory>
<directory name="input">
<xi:include href="drivers/input/directory.rbuild" />
</directory>
<directory name="network">
- <directory name="ndis">
- <xi:include href="drivers/network/ndis/ndis.rbuild" />
- </directory>
- <directory name="tcpip">
- <xi:include href="drivers/network/tcpip/tcpip.rbuild" />
- </directory>
+ <xi:include href="drivers/network/directory.rbuild" />
</directory>
<directory name="setup">
<xi:include href="drivers/setup/directory.rbuild" />
@@ -205,8 +233,82 @@
<directory name="include">
<xi:include href="include/directory.rbuild" />
</directory>
+
<directory name="lib">
- <xi:include href="lib/lib.rbuild" />
+ <directory name="3rdparty">
+ <directory name="adns">
+ <xi:include href="lib/3rdparty/adns/adns.rbuild" />
+ </directory>
+ <directory name="bzip2">
+ <xi:include href="lib/3rdparty/bzip2/bzip2.rbuild" />
+ </directory>
+ <directory name="expat">
+ <xi:include href="lib/3rdparty/expat/expat.rbuild" />
+ </directory>
+ <directory name="icu4ros">
+ <xi:include href="lib/3rdparty/icu4ros/icu4ros.rbuild" />
+ </directory>
+ <directory name="libwine">
+ <xi:include href="lib/3rdparty/libwine/libwine.rbuild" />
+ </directory>
+ <directory name="libxml2">
+ <xi:include href="lib/3rdparty/libxml2/libxml2.rbuild" />
+ </directory>
+ <!--directory name="mingw">
+ <xi:include href="lib/3rdparty/mingw/mingw.rbuild" />
+ </directory-->
+ <directory name="zlib">
+ <xi:include href="lib/3rdparty/zlib/zlib.rbuild" />
+ </directory>
+ </directory>
+ <directory name="sdk">
+ <xi:include href="lib/sdk/sdk.rbuild" />
+ </directory>
+ <directory name="cmlib">
+ <xi:include href="lib/cmlib/cmlib.rbuild" />
+ </directory>
+ <directory name="debugsup">
+ <xi:include href="lib/debugsup/debugsup.rbuild" />
+ </directory>
+ <directory name="drivers">
+ <xi:include href="lib/drivers/directory.rbuild" />
+ </directory>
+ <directory name="epsapi">
+ <xi:include href="lib/epsapi/epsapi.rbuild" />
+ </directory>
+ <directory name="fslib">
+ <xi:include href="lib/fslib/directory.rbuild" />
+ </directory>
+ <directory name="host">
+ <xi:include href="lib/host/directory.rbuild" />
+ </directory>
+ <directory name="inflib">
+ <xi:include href="lib/inflib/inflib.rbuild" />
+ </directory>
+ <directory name="nls">
+ <xi:include href="lib/nls/nls.rbuild" />
+ </directory>
+ <directory name="ntdllsys">
+ <xi:include href="lib/ntdllsys/ntdllsys.rbuild" />
+ </directory>
+ <directory name="pseh">
+ <xi:include href="lib/pseh/pseh.rbuild" />
+ </directory>
+ <directory name="recyclebin">
+ <xi:include href="lib/recyclebin/recyclebin.rbuild" />
+ </directory>
+ <directory name="rossym">
+ <xi:include href="lib/rossym/rossym.rbuild" />
+ </directory>
+ <directory name="rtl">
+ <xi:include href="lib/rtl/rtl.rbuild" />
+ </directory>
+ <directory name="smlib">
+ <xi:include href="lib/smlib/smlib.rbuild" />
+ </directory>
+ <directory name="win32ksys">
+ <xi:include href="lib/win32ksys/win32ksys.rbuild" />
+ </directory>
</directory>
<directory name="media">
Modified: branches/ros-amd64-bringup/reactos/drivers/network/tdi/misc/tdi.spec
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/network/tdi/misc/tdi.spec?rev=37786&r1=37785&r2=37786&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/network/tdi/misc/tdi.spec [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/network/tdi/misc/tdi.spec [iso-8859-1] Sun Nov 30 20:47:26 2008
@@ -1,6 +1,6 @@
@ stdcall CTEAllocateString(long long)
@ stdcall CTEBlock(long)
- @ stdcall CTEInitEvent(long)
+ @ stdcall CTEInitEvent(long long)
@ stdcall CTEInitString(long long)
@ stdcall CTEInitTimer(long)
@ stdcall CTEInitialize()
@@ -9,7 +9,7 @@
@ stdcall CTESignal(long long)
@ stdcall CTEStartTimer(long long long long)
@ stdcall CTESystemUpTime()
- @ stdcall TdiBuildNetbiosAddress(str long)
+ @ stdcall TdiBuildNetbiosAddress(str long ptr)
@ stdcall TdiBuildNetbiosAddressEa(str long str)
@ stdcall TdiCopyBufferToMdl(ptr long long ptr long ptr)
@ stdcall TdiCopyMdlToBuffer(ptr long long ptr long ptr)
Modified: branches/ros-amd64-bringup/reactos/drivers/storage/class/cdrom/cdrom.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/storage/class/cdrom/cdrom.c?rev=37786&r1=37785&r2=37786&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Sun Nov 30 20:47:26 2008
@@ -2913,7 +2913,7 @@
srb,
irpStack->MajorFunction,
irpStack->Parameters.DeviceIoControl.IoControlCode,
- MAXIMUM_RETRIES - ((ULONG)realIrpNextStack->Parameters.Others.Argument1),
+ MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1),
&status);
DebugPrint((2, "CdRomDeviceControlCompletion: IRP will %sbe retried\n",
@@ -2972,10 +2972,10 @@
}
- if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (ULONG)realIrpNextStack->Parameters.Others.Argument1-1)) {
-
-
- if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) {
+ if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (ULONG_PTR*)realIrpNextStack->Parameters.Others.Argument1-1)) {
+
+
+ if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) {
//
// Retry request.
@@ -3477,7 +3477,7 @@
srb,
irpStack->MajorFunction,
irpStack->Parameters.DeviceIoControl.IoControlCode,
- MAXIMUM_RETRIES - ((ULONG)realIrpNextStack->Parameters.Others.Argument1),
+ MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1),
&status);
if (status == STATUS_DATA_OVERRUN) {
@@ -3497,9 +3497,9 @@
retry = TRUE;
}
- if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (ULONG)realIrpNextStack->Parameters.Others.Argument1-1)) {
-
- if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) {
+ if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PULONG)realIrpNextStack->Parameters.Others.Argument1-1)) {
+
+ if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) {
//
// Retry request.
@@ -3808,7 +3808,7 @@
srb,
irpStack->MajorFunction,
irpStack->Parameters.DeviceIoControl.IoControlCode,
- MAXIMUM_RETRIES - ((ULONG)realIrpNextStack->Parameters.Others.Argument1),
+ MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1),
&status);
//
@@ -3823,9 +3823,9 @@
retry = TRUE;
}
- if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (ULONG)realIrpNextStack->Parameters.Others.Argument1-1)) {
-
- if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) {
+ if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PULONG)realIrpNextStack->Parameters.Others.Argument1-1)) {
+
+ if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) {
//
// Retry request.
@@ -4184,7 +4184,7 @@
srb,
irpStack->MajorFunction,
irpStack->MajorFunction == IRP_MJ_DEVICE_CONTROL ? irpStack->Parameters.DeviceIoControl.IoControlCode : 0,
- MAXIMUM_RETRIES - ((ULONG)irpNextStack->Parameters.Others.Argument1),
+ MAXIMUM_RETRIES - ((ULONG_PTR)irpNextStack->Parameters.Others.Argument1),
&status);
//
@@ -4199,9 +4199,9 @@
retry = TRUE;
}
- if (retry && (irpNextStack->Parameters.Others.Argument1 = (ULONG)irpNextStack->Parameters.Others.Argument1-1)) {
-
- if (((ULONG)irpNextStack->Parameters.Others.Argument1)) {
+ if (retry && (irpNextStack->Parameters.Others.Argument1 = (PULONG)irpNextStack->Parameters.Others.Argument1-1)) {
+
+ if (((ULONG_PTR)irpNextStack->Parameters.Others.Argument1)) {
//
// Retry request.
@@ -5125,7 +5125,7 @@
// The data buffer must be aligned.
//
- srb->DataBuffer = (PVOID) (((ULONG) (context + 1) + (alignment - 1)) &
+ srb->DataBuffer = (PVOID) (((ULONG_PTR) (context + 1) + (alignment - 1)) &
~(alignment - 1));
@@ -5875,13 +5875,13 @@
irpStack = IoGetCurrentIrpStackLocation(irp);
if (irpStack->Parameters.Others.Argument3) {
- ULONG count;
+ ULONG_PTR count;
//
// Decrement the countdown timer and put the IRP back in the list.
//
- count = (ULONG) irpStack->Parameters.Others.Argument3;
+ count = (ULONG_PTR)irpStack->Parameters.Others.Argument3;
count--;
irpStack->Parameters.Others.Argument3 = (PVOID) count;
@@ -6495,7 +6495,7 @@
PIO_STACK_LOCATION irpStack;
NTSTATUS status;
BOOLEAN retry;
- ULONG retryCount;
+ ULONG_PTR retryCount;
ULONG lastSector;
PIRP originalIrp;
PCDROM_DATA cddata;
@@ -6505,7 +6505,7 @@
//
irpStack = IoGetCurrentIrpStackLocation(Irp);
- retryCount = (ULONG) irpStack->Parameters.Others.Argument1;
+ retryCount = (ULONG_PTR) irpStack->Parameters.Others.Argument1;
originalIrp = (PIRP) irpStack->Parameters.Others.Argument2;
if (!DeviceObject) {
Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/storage/ide/directory.rbuild?rev=37786&r1=37785&r2=37786&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/storage/ide/directory.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/storage/ide/directory.rbuild [iso-8859-1] Sun Nov 30 20:47:26 2008
@@ -10,7 +10,7 @@
<directory name="pciidex">
<xi:include href="pciidex/pciidex.rbuild" />
</directory>
- <directory name="uniata">
+ <!-- directory name="uniata">
<xi:include href="uniata/uniata.rbuild" />
- </directory>
+ </directory -->
</group>
Modified: branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h?rev=37786&r1=37785&r2=37786&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Nov 30 20:47:26 2008
@@ -375,7 +375,9 @@
} CLIENTINFO, *PCLIENTINFO;
/* Make sure it fits exactly into the TEB */
+#ifdef __i386__
C_ASSERT(sizeof(CLIENTINFO) == FIELD_OFFSET(TEB, glDispatchTable) - FIELD_OFFSET(TEB, Win32ClientInfo));
+#endif
#define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo))
Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild?rev=37786&r1=37785&r2=37786&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Sun Nov 30 20:47:26 2008
@@ -4,7 +4,7 @@
<module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true" crt="dll">
<importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" />
<include base="mingw_common">include</include>
- <!-- library>kernel32</library -->
+ <library>kernel32</library>
<file>_newmode.c</file>
<file>_wgetopt.c</file>
<file>argv.c</file>
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp?rev=37786&r1=37785&r2=37786&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Nov 30 20:47:26 2008
@@ -533,6 +533,10 @@
fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" );
fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () );
fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)' '$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)'\n" );
+ /* hack to get libgcc_eh.a, should check mingw version or something */
+ fprintf ( fMakefile, "ifeq ($(ARCH),amd64)\n" );
+ fprintf ( fMakefile, "PROJECT_LPPFLAGS += '$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)'\n" );
+ fprintf ( fMakefile, "endif\n" );
fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" );
More information about the Ros-diffs
mailing list