Alexandre Julliard : include: Moved VWIN32 ioctl definitions out of winioctl.h.
Alexandre Julliard
julliard at winehq.org
Mon Feb 9 10:29:27 CST 2009
Module: wine
Branch: master
Commit: 6ae7b1f3e0e1f0d12a7a7c45df6c79daf11506dc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae7b1f3e0e1f0d12a7a7c45df6c79daf11506dc
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Feb 9 12:57:39 2009 +0100
include: Moved VWIN32 ioctl definitions out of winioctl.h.
---
dlls/vwin32.vxd/vwin32.c | 26 ++++++++++++++++++++++++++
include/winioctl.h | 36 ------------------------------------
2 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/dlls/vwin32.vxd/vwin32.c b/dlls/vwin32.vxd/vwin32.c
index fdd5998..0ac3e26 100644
--- a/dlls/vwin32.vxd/vwin32.c
+++ b/dlls/vwin32.vxd/vwin32.c
@@ -29,6 +29,32 @@
WINE_DEFAULT_DEBUG_CHANNEL(vxd);
+typedef struct tagDIOCRegs {
+ DWORD reg_EBX;
+ DWORD reg_EDX;
+ DWORD reg_ECX;
+ DWORD reg_EAX;
+ DWORD reg_EDI;
+ DWORD reg_ESI;
+ DWORD reg_Flags;
+} DIOC_REGISTERS, *PDIOC_REGISTERS;
+
+#define VWIN32_DIOC_DOS_IOCTL 1 /* This is the specified MS-DOS device I/O ctl - Interrupt 21h Function 4400h - 4411h */
+#define VWIN32_DIOC_DOS_INT25 2 /* This is the Absolute Disk Read command - Interrupt 25h */
+#define VWIN32_DIOC_DOS_INT26 3 /* This is the Absolute Disk Write command - Interrupt 25h */
+#define VWIN32_DIOC_DOS_INT13 4 /* This is Interrupt 13h commands */
+#define VWIN32_DIOC_SIMCTRLC 5 /* Simulate Ctrl-C */
+#define VWIN32_DIOC_DOS_DRIVEINFO 6 /* This is Interrupt 21h Function 730X commands */
+
+#include <pshpack1.h>
+typedef struct tagMID {
+ WORD midInfoLevel;
+ DWORD midSerialNum;
+ BYTE midVolLabel[11];
+ BYTE midFileSysType[8];
+} MID, *PMID;
+#include <poppack.h>
+
extern void WINAPI CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ); /* from winedos */
/* Pop a DWORD from the 32-bit stack */
diff --git a/include/winioctl.h b/include/winioctl.h
index 8b99f10..8765cdf 100644
--- a/include/winioctl.h
+++ b/include/winioctl.h
@@ -378,42 +378,6 @@ typedef struct _VOLUME_DISK_EXTENTS {
/* End: _WIN32_WINNT >= 0x0400 */
-/* Device Io Stuff - Most VxD support.
- * NOTE: All VxD messages seem to start with a hiword or 0
- */
-typedef struct tagDIOCRegs {
- DWORD reg_EBX;
- DWORD reg_EDX;
- DWORD reg_ECX;
- DWORD reg_EAX;
- DWORD reg_EDI;
- DWORD reg_ESI;
- DWORD reg_Flags;
-} DIOC_REGISTERS, *PDIOC_REGISTERS;
-
-/* Start VWIN32 information:
- * VWIN32 is a VxD which supports the MSDOS Io routines.
- */
-#define VWIN32_DIOC_DOS_IOCTL 1 /* This is the specified MS-DOS device I/O ctl - Interrupt 21h Function 4400h - 4411h */
-#define VWIN32_DIOC_DOS_INT25 2 /* This is the Absolute Disk Read command - Interrupt 25h */
-#define VWIN32_DIOC_DOS_INT26 3 /* This is the Absolute Disk Write command - Interrupt 25h */
-#define VWIN32_DIOC_DOS_INT13 4 /* This is Interrupt 13h commands */
-#define VWIN32_DIOC_SIMCTRLC 5 /* Simulate Ctrl-C */
-#define VWIN32_DIOC_DOS_DRIVEINFO 6 /* This is Interrupt 21h Function 730X commands */
-
-/* Important: All MS_DOS data structures must be packed on a one-byte boundary - good old 16 bit. */
-
-#include <pshpack1.h>
-typedef struct tagMID {
- WORD midInfoLevel;
- DWORD midSerialNum;
- BYTE midVolLabel[11];
- BYTE midFileSysType[8];
-} MID, *PMID;
-#include <poppack.h>
-
-/* End VWIN32 information */
-
/*
* NT I/O-Manager
*/
More information about the wine-cvs
mailing list