Author: sginsberg
Date: Fri Aug 21 19:39:37 2009
New Revision: 42831
URL: http://svn.reactos.org/svn/reactos?rev=42831&view=rev
Log:
- Fix EXT2 IFS for msvc:
- Fix SEH for MSVC
- Disable C4003 (caused by the try_return mess)
- Add missing NTAPI to Ext2GetCurrentTime
Modified:
trunk/reactos/drivers/filesystems/ext2/ext2.rbuild
trunk/reactos/drivers/filesystems/ext2/inc/struct.h
trunk/reactos/drivers/filesystems/ext2/src/misc.c
Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/ext2.rbuild?rev=42831&r1=42830&r2=42831&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] Fri Aug 21
19:39:37 2009
@@ -3,6 +3,7 @@
<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers"
installname="ext2.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<include base="ext2fs">inc</include>
+ <compilerflag compilerset="msc">/wd4003</compilerflag>
<library>ntoskrnl</library>
<library>hal</library>
<directory name="src">
Modified: trunk/reactos/drivers/filesystems/ext2/inc/struct.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/inc/struct.h?rev=42831&r1=42830&r2=42831&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/inc/struct.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/inc/struct.h [iso-8859-1] Fri Aug 21
19:39:37 2009
@@ -31,11 +31,21 @@
typedef PVOID PBCB;
+//
+// This is a huge hack that will create a broken driver for GCC.
+// The driver should use PSEH2.
+//
+#ifdef _MSC_VER
+#define try __try
+#define except __except
+#define finally __finally
+#else
#define try if (1)
#define except(x) if (0 && (x))
#define finally if (1)
#define GetExceptionInformation() 0
#define GetExceptionCode() 0
+#endif
// we will use the LARGE_INTEGER structure as defined by NT
Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/src/misc.c?rev=42831&r1=42830&r2=42831&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] Fri Aug 21
19:39:37 2009
@@ -2111,7 +2111,7 @@
}
-ULONG Ext2GetCurrentTime()
+ULONG NTAPI Ext2GetCurrentTime()
{
LARGE_INTEGER CurrentTime;
ULONG Time;
