Split between 16 / 32 bit code.

dlls/msvideo/Makefile.in

@@ -17,7 +17,7 @@ C_SRCS = \
 C_SRCS16 = \
 	msvideo16.c
 
-EXTRA_OBJS = $(MODULE).glue.o
+EXTRA_OBJS16 = $(MODULE).glue.o
 
 @MAKE_DLL_RULES@
 

dlls/msvideo/drawdib.c

@@ -28,7 +28,7 @@
 #include "wine/winbase16.h"
 #include "wine/debug.h"
 #include "vfw.h"
-#include "vfw16.h"
+#include "msvideo_private.h"
 #include "windef.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msvideo);

dlls/msvideo/msvideo.spec

 2 pascal VideoForWindowsVersion() VideoForWindowsVersion
 20 stub VIDEOGETNUMDEVS
 21 stub VIDEOGETERRORTEXT
-22 pascal VideoCapDriverDescAndVer(word ptr word ptr word) VideoCapDriverDescAndVer
+22 pascal VideoCapDriverDescAndVer(word ptr word ptr word) VideoCapDriverDescAndVer16
 28 stub VIDEOOPEN
 29 stub VIDEOCLOSE
 30 stub VIDEODIALOG
@@ -64,3 +64,5 @@
 251 stub _MCIWNDREGISTERCLASS
 252 stub GETOPENFILENAMEPREVIEW
 253 stub GETSAVEFILENAMEPREVIEW
+
+300 pascal DllEntryPoint(long word word word long word) VIDEO_LibMain

dlls/msvideo/msvideo_private.h

+/*
+ * Copyright 1999 Marcus Meissner
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __WINE_MSVIDEO_PRIVATE_H
+#define __WINE_MSVIDEO_PRIVATE_H
+
+/* HIC struct (same layout as Win95 one) */
+typedef struct tagWINE_HIC {
+	DWORD		magic;		/* 00: 'Smag' */
+	HANDLE		curthread;	/* 04: */
+	DWORD		type;		/* 08: */
+	DWORD		handler;	/* 0C: */
+	HDRVR		hdrv;		/* 10: */
+	DWORD		private;	/* 14:(handled by SendDriverMessage)*/
+	DRIVERPROC	driverproc;	/* 18:(handled by SendDriverMessage)*/
+	DWORD		x1;		/* 1c: name? */
+	WORD		x2;		/* 20: */
+	DWORD		x3;		/* 22: */
+					/* 26: */
+        DRIVERPROC16    driverproc16;   /* Wine specific flags */
+} WINE_HIC;
+
+HIC     MSVIDEO_OpenFunction(DWORD, DWORD, UINT, DRIVERPROC, DRIVERPROC16);
+LRESULT MSVIDEO_SendMessage(HIC, UINT, DWORD, DWORD);
+
+extern LRESULT  (CALLBACK *pFnCallTo16)(HDRVR, HIC, UINT, LPARAM, LPARAM);
+
+/* handle16 --> handle conversions */
+#define HDRAWDIB_32(h16)	((HDRAWDIB)(ULONG_PTR)(h16))
+#define HIC_32(h16)		((HIC)(ULONG_PTR)(h16))
+
+/* handle --> handle16 conversions */
+#define HDRVR_16(h32)		(LOWORD(h32))
+#define HDRAWDIB_16(h32)	(LOWORD(h32))
+#define HIC_16(h32)		(LOWORD(h32))
+
+#endif  /* __WINE_MSVIDEO_PRIVATE_H */

dlls/msvideo/vfw16.h

@@ -118,14 +118,6 @@ HIC16   VFWAPI  ICOpen16(DWORD,DWORD,UINT16);
 HIC16   VFWAPI  ICOpenFunction16(DWORD,DWORD,UINT16,FARPROC16);
 LRESULT VFWAPI  ICSendMessage16(HIC16,UINT16,DWORD,DWORD);
 
-/* handle16 --> handle conversions */
-#define HDRAWDIB_32(h16)	((HDRAWDIB)(ULONG_PTR)(h16))
-#define HIC_32(h16)		((HIC)(ULONG_PTR)(h16))
-
-/* handle --> handle16 conversions */
-#define HDRAWDIB_16(h32)	(LOWORD(h32))
-#define HIC_16(h32)		(LOWORD(h32))
-
 #ifdef __cplusplus
 }
 #endif  /* __cplusplus */

include/vfw.h

@@ -47,23 +47,6 @@ typedef struct IGetFrame IGetFrame,*PGETFRAME;
 
 DECLARE_HANDLE(HIC);
 
-#ifdef __WINE__
-/* HIC struct (same layout as Win95 one) */
-typedef struct tagWINE_HIC {
-	DWORD		magic;		/* 00: 'Smag' */
-	HANDLE		curthread;	/* 04: */
-	DWORD		type;		/* 08: */
-	DWORD		handler;	/* 0C: */
-	HDRVR		hdrv;		/* 10: */
-	DWORD		private;	/* 14:(handled by SendDriverMessage)*/
-	FARPROC		driverproc;	/* 18:(handled by SendDriverMessage)*/
-	DWORD		x1;		/* 1c: name? */
-	WORD		x2;		/* 20: */
-	DWORD		x3;		/* 22: */
-					/* 26: */
-} WINE_HIC;
-#endif
-
 /* error return codes */
 #define	ICERR_OK		0
 #define	ICERR_DONTDRAW		1