Alexandre Julliard : msi: Don't include msvcrt headers.

Alexandre Julliard julliard at winehq.org
Fri Dec 12 07:04:07 CST 2008


Module: wine
Branch: master
Commit: 0b99af82b230a46c2d633ee333ebdbcff7208cb5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0b99af82b230a46c2d633ee333ebdbcff7208cb5

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Dec 11 22:27:54 2008 +0100

msi: Don't include msvcrt headers.

---

 dlls/msi/files.c |    1 -
 dlls/msi/media.c |   18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index f9311c8..5036efd 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -39,7 +39,6 @@
 #include "fdi.h"
 #include "msi.h"
 #include "msidefs.h"
-#include "msvcrt/fcntl.h"
 #include "msipriv.h"
 #include "winuser.h"
 #include "winreg.h"
diff --git a/dlls/msi/media.c b/dlls/msi/media.c
index bac801d..a236eba 100644
--- a/dlls/msi/media.c
+++ b/dlls/msi/media.c
@@ -24,7 +24,6 @@
 #include "winerror.h"
 #include "wine/debug.h"
 #include "fdi.h"
-#include "msvcrt/fcntl.h"
 #include "msipriv.h"
 #include "winuser.h"
 #include "winreg.h"
@@ -33,6 +32,23 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
+/* from msvcrt/fcntl.h */
+#define _O_RDONLY      0
+#define _O_WRONLY      1
+#define _O_RDWR        2
+#define _O_ACCMODE     (_O_RDONLY|_O_WRONLY|_O_RDWR)
+#define _O_APPEND      0x0008
+#define _O_RANDOM      0x0010
+#define _O_SEQUENTIAL  0x0020
+#define _O_TEMPORARY   0x0040
+#define _O_NOINHERIT   0x0080
+#define _O_CREAT       0x0100
+#define _O_TRUNC       0x0200
+#define _O_EXCL        0x0400
+#define _O_SHORT_LIVED 0x1000
+#define _O_TEXT        0x4000
+#define _O_BINARY      0x8000
+
 static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPWSTR source_root)
 {
     WCHAR volume_name[MAX_PATH + 1];




More information about the wine-cvs mailing list