keeping on splitting 16/32 bit code in winmm

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



this patch fixes some includes digitalv.h (removing all 16 bit
structures and putting them into include/wine/mmsystem16.h)
A+
Name:          mm1632_4
ChangeLog:     moved 16 bit digital structs to include/wine/mmsystem16.h
License:       X11
GenDate:       2002/10/22 17:56:37 UTC
ModifiedFiles: include/digitalv.h include/wine/mmsystem16.h
AddedFiles:    
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/include/digitalv.h,v
retrieving revision 1.4
diff -u -u -r1.4 digitalv.h
--- include/digitalv.h	10 Mar 2002 00:02:34 -0000	1.4
+++ include/digitalv.h	20 Oct 2002 19:42:57 -0000
@@ -463,11 +463,6 @@
 
 typedef struct {
     DWORD   dwCallback;
-    RECT16  rc;
-} MCI_DGV_RECT_PARMS16, *LPMCI_DGV_RECT_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
     RECT    rc;
 } MCI_DGV_RECT_PARMS, *LPMCI_DGV_RECT_PARMS;
 
@@ -476,12 +471,6 @@
 typedef struct {
     DWORD   dwCallback;
     LPSTR   lpstrFileName;
-    RECT16  rc;
-} MCI_DGV_CAPTURE_PARMS16, *LPMCI_DGV_CAPTURE_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    LPSTR   lpstrFileName;
     RECT    rc;
 } MCI_DGV_CAPTURE_PARMSA, *LPMCI_DGV_CAPTURE_PARMSA;
 
@@ -504,15 +493,6 @@
     DWORD   dwCallback;
     DWORD   dwFrom;
     DWORD   dwTo;
-    RECT16  rc;
-    DWORD   dwAudioStream;
-    DWORD   dwVideoStream;
-} MCI_DGV_COPY_PARMS16, *LPMCI_DGV_COPY_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    DWORD   dwFrom;
-    DWORD   dwTo;
     RECT    rc;
     DWORD   dwAudioStream;
     DWORD   dwVideoStream;
@@ -531,15 +511,6 @@
     DWORD   dwCallback;
     DWORD   dwFrom;
     DWORD   dwTo;
-    RECT16  rc;
-    DWORD   dwAudioStream;
-    DWORD   dwVideoStream;
-} MCI_DGV_CUT_PARMS16, * LPMCI_DGV_CUT_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    DWORD   dwFrom;
-    DWORD   dwTo;
     RECT    rc;
     DWORD   dwAudioStream;
     DWORD   dwVideoStream;
@@ -551,15 +522,6 @@
     DWORD   dwCallback;
     DWORD   dwFrom;
     DWORD   dwTo;
-    RECT16  rc;
-    DWORD   dwAudioStream;
-    DWORD   dwVideoStream;
-} MCI_DGV_DELETE_PARMS16, * LPMCI_DGV_DELETE_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    DWORD   dwFrom;
-    DWORD   dwTo;
     RECT    rc;
     DWORD   dwAudioStream;
     DWORD   dwVideoStream;
@@ -567,7 +529,6 @@
 
 /* parameter block for MCI_FREEZE command message */
 
-typedef MCI_DGV_RECT_PARMS16 MCI_DGV_FREEZE_PARMS16, * LPMCI_DGV_FREEZE_PARMS16;
 typedef MCI_DGV_RECT_PARMS MCI_DGV_FREEZE_PARMS, * LPMCI_DGV_FREEZE_PARMS;
 
 /* parameter block for MCI_INFO command message */
@@ -577,13 +538,6 @@
     LPSTR   lpstrReturn;
     DWORD   dwRetSize;
     DWORD   dwItem;
-} MCI_DGV_INFO_PARMS16, * LPMCI_DGV_INFO_PARMS16;
-
-typedef struct  {
-    DWORD   dwCallback;
-    LPSTR   lpstrReturn;
-    DWORD   dwRetSize;
-    DWORD   dwItem;
 } MCI_DGV_INFO_PARMSA, * LPMCI_DGV_INFO_PARMSA;
 
 typedef struct  {
@@ -605,15 +559,6 @@
     DWORD   dwNumber;
     DWORD   dwItem;
     LPSTR   lpstrAlgorithm;
-} MCI_DGV_LIST_PARMS16, *LPMCI_DGV_LIST_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    LPSTR   lpstrReturn;
-    DWORD   dwLength;
-    DWORD   dwNumber;
-    DWORD   dwItem;
-    LPSTR   lpstrAlgorithm;
 } MCI_DGV_LIST_PARMSA, *LPMCI_DGV_LIST_PARMSA;
 
 typedef struct {
@@ -630,7 +575,6 @@
 
 /* parameter block for MCI_LOAD command message */
 
-typedef MCI_LOAD_PARMS16  MCI_DGV_LOAD_PARMS16 , * LPMCI_DGV_LOAD_PARMS16;
 typedef MCI_LOAD_PARMSA MCI_DGV_LOAD_PARMSA, * LPMCI_DGV_LOAD_PARMSA;
 typedef MCI_LOAD_PARMSW MCI_DGV_LOAD_PARMSW, * LPMCI_DGV_LOAD_PARMSW;
 
@@ -649,18 +593,6 @@
 
 typedef struct {
     DWORD   dwCallback;
-    UINT16  wDeviceID;
-    UINT16  wReserved0;
-    LPSTR   lpstrDeviceType;
-    LPSTR   lpstrElementName;
-    LPSTR   lpstrAlias;
-    DWORD   dwStyle;
-    HWND16  hWndParent;
-    UINT16  wReserved1;
-} MCI_DGV_OPEN_PARMS16, *LPMCI_DGV_OPEN_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
     UINT    wDeviceID;
     LPSTR   lpstrDeviceType;
     LPSTR   lpstrElementName;
@@ -691,14 +623,6 @@
 typedef struct {
     DWORD   dwCallback;
     DWORD   dwTo;
-    RECT16  rc;
-    DWORD   dwAudioStream;
-    DWORD   dwVideoStream;
-} MCI_DGV_PASTE_PARMS16, * LPMCI_DGV_PASTE_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    DWORD   dwTo;
     RECT    rc;
     DWORD   dwAudioStream;
     DWORD   dwVideoStream;
@@ -710,7 +634,6 @@
 
 /* parameter block for MCI_PUT command message */
 
-typedef MCI_DGV_RECT_PARMS16 MCI_DGV_PUT_PARMS16, * LPMCI_DGV_PUT_PARMS16;
 typedef MCI_DGV_RECT_PARMS MCI_DGV_PUT_PARMS, * LPMCI_DGV_PUT_PARMS;
 
 /* parameter block for MCI_QUALITY command message */
@@ -721,14 +644,6 @@
     LPSTR       lpstrName;
     DWORD       lpstrAlgorithm;
     DWORD       dwHandle;
-} MCI_DGV_QUALITY_PARMS16, *LPMCI_DGV_QUALITY_PARMS16;
-
-typedef struct {
-    DWORD       dwCallback;
-    DWORD       dwItem;
-    LPSTR       lpstrName;
-    DWORD       lpstrAlgorithm;
-    DWORD       dwHandle;
 } MCI_DGV_QUALITY_PARMSA, *LPMCI_DGV_QUALITY_PARMSA;
 
 typedef struct {
@@ -752,15 +667,6 @@
     DWORD   dwCallback;
     DWORD   dwFrom;
     DWORD   dwTo;
-    RECT16  rc;
-    DWORD   dwAudioStream;
-    DWORD   dwVideoStream;
-} MCI_DGV_RECORD_PARMS16, * LPMCI_DGV_RECORD_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    DWORD   dwFrom;
-    DWORD   dwTo;
     RECT    rc;
     DWORD   dwAudioStream;
     DWORD   dwVideoStream;
@@ -772,12 +678,6 @@
     DWORD   dwCallback;
     LPSTR   lpstrPath;
     DWORD   dwSize;
-} MCI_DGV_RESERVE_PARMS16, *LPMCI_DGV_RESERVE_PARMS16A;
-
-typedef struct {
-    DWORD   dwCallback;
-    LPSTR   lpstrPath;
-    DWORD   dwSize;
 } MCI_DGV_RESERVE_PARMSA, *LPMCI_DGV_RESERVE_PARMSA;
 
 typedef struct {
@@ -794,12 +694,6 @@
 typedef struct {
     DWORD   dwCallback;
     LPSTR   lpstrFileName;
-    RECT16  rc;
-} MCI_DGV_RESTORE_PARMS16, *LPMCI_DGV_RESTORE_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    LPSTR   lpstrFileName;
     RECT    rc;
 } MCI_DGV_RESTORE_PARMSA, *LPMCI_DGV_RESTORE_PARMSA;
 
@@ -821,12 +715,6 @@
 typedef struct {
     DWORD   dwCallback;
     LPSTR   lpstrFileName;
-    RECT16  rc;
-} MCI_DGV_SAVE_PARMS16, *LPMCI_DGV_SAVE_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    LPSTR   lpstrFileName;
     RECT    rc;
 } MCI_DGV_SAVE_PARMSA, *LPMCI_DGV_SAVE_PARMSA;
 
@@ -858,15 +746,6 @@
     DWORD   dwOver;
     LPSTR   lpstrAlgorithm;
     LPSTR   lpstrQuality;
-} MCI_DGV_SETAUDIO_PARMS16, *LPMCI_DGV_SETAUDIO_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    DWORD   dwItem;
-    DWORD   dwValue;
-    DWORD   dwOver;
-    LPSTR   lpstrAlgorithm;
-    LPSTR   lpstrQuality;
 } MCI_DGV_SETAUDIO_PARMSA, *LPMCI_DGV_SETAUDIO_PARMSA;
 
 typedef struct {
@@ -900,16 +779,6 @@
     LPSTR   lpstrAlgorithm;
     LPSTR   lpstrQuality;
     DWORD   dwSourceNumber;
-} MCI_DGV_SETVIDEO_PARMS16, *LPMCI_DGV_SETVIDEO_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    DWORD   dwItem;
-    DWORD   dwValue;
-    DWORD   dwOver;
-    LPSTR   lpstrAlgorithm;
-    LPSTR   lpstrQuality;
-    DWORD   dwSourceNumber;
 } MCI_DGV_SETVIDEO_PARMSA, *LPMCI_DGV_SETVIDEO_PARMSA;
 
 typedef struct {
@@ -932,15 +801,6 @@
     DWORD   dwReturn;
     DWORD   dwItem;
     DWORD   dwTrack;
-    SEGPTR  lpstrDrive;
-    DWORD   dwReference;
-} MCI_DGV_STATUS_PARMS16, *LPMCI_DGV_STATUS_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
-    DWORD   dwReturn;
-    DWORD   dwItem;
-    DWORD   dwTrack;
     LPSTR   lpstrDrive;
     DWORD   dwReference;
 } MCI_DGV_STATUS_PARMSA, *LPMCI_DGV_STATUS_PARMSA;
@@ -970,39 +830,21 @@
 
 /* parameter block for MCI_UNFREEZE command message */
 
-typedef MCI_DGV_RECT_PARMS16 MCI_DGV_UNFREEZE_PARMS16, * LPMCI_DGV_UNFREEZE_PARMS16;
 typedef MCI_DGV_RECT_PARMS MCI_DGV_UNFREEZE_PARMS, * LPMCI_DGV_UNFREEZE_PARMS;
 
 /* parameter block for MCI_UPDATE command message */
 
 typedef struct {
     DWORD   dwCallback;
-    RECT16  rc;
-    HDC16   hDC;
-    UINT16  wReserved0;
-} MCI_DGV_UPDATE_PARMS16, * LPMCI_DGV_UPDATE_PARMS16;
-
-typedef struct {
-    DWORD   dwCallback;
     RECT    rc;
     HDC     hDC;
 } MCI_DGV_UPDATE_PARMS, * LPMCI_DGV_UPDATE_PARMS;
 
 /* parameter block for MCI_WHERE command message */
 
-typedef MCI_DGV_RECT_PARMS16 MCI_DGV_WHERE_PARMS16, * LPMCI_DGV_WHERE_PARMS16;
 typedef MCI_DGV_RECT_PARMS MCI_DGV_WHERE_PARMS, * LPMCI_DGV_WHERE_PARMS;
 
 /* parameter block for MCI_WINDOW command message */
-
-typedef struct {
-    DWORD   dwCallback;
-    HWND16  hWnd;
-    UINT16  wReserved1;
-    UINT16  nCmdShow;
-    UINT16  wReserved2;
-    LPSTR   lpstrText;
-} MCI_DGV_WINDOW_PARMS16, *LPMCI_DGV_WINDOW_PARMS16;
 
 typedef struct {
     DWORD   dwCallback;
Index: include/wine/mmsystem16.h
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/include/wine/mmsystem16.h,v
retrieving revision 1.6
diff -u -u -r1.6 mmsystem16.h
--- include/wine/mmsystem16.h	10 Mar 2002 00:02:38 -0000	1.6
+++ include/wine/mmsystem16.h	20 Oct 2002 19:42:52 -0000
@@ -580,6 +580,170 @@
     RECT16	rc;
 } MCI_OVLY_LOAD_PARMS16, *LPMCI_OVLY_LOAD_PARMS16;
 
+/* from digitalv / 16 bit */
+typedef struct {
+    DWORD   dwCallback;
+    RECT16  rc;
+} MCI_DGV_RECT_PARMS16, *LPMCI_DGV_RECT_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    LPSTR   lpstrFileName;
+    RECT16  rc;
+} MCI_DGV_CAPTURE_PARMS16, *LPMCI_DGV_CAPTURE_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    DWORD   dwFrom;
+    DWORD   dwTo;
+    RECT16  rc;
+    DWORD   dwAudioStream;
+    DWORD   dwVideoStream;
+} MCI_DGV_COPY_PARMS16, *LPMCI_DGV_COPY_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    DWORD   dwFrom;
+    DWORD   dwTo;
+    RECT16  rc;
+    DWORD   dwAudioStream;
+    DWORD   dwVideoStream;
+} MCI_DGV_CUT_PARMS16, * LPMCI_DGV_CUT_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    DWORD   dwFrom;
+    DWORD   dwTo;
+    RECT16  rc;
+    DWORD   dwAudioStream;
+    DWORD   dwVideoStream;
+} MCI_DGV_DELETE_PARMS16, * LPMCI_DGV_DELETE_PARMS16;
+
+typedef MCI_DGV_RECT_PARMS16 MCI_DGV_FREEZE_PARMS16, * LPMCI_DGV_FREEZE_PARMS16;
+
+typedef struct  {
+    DWORD   dwCallback;
+    LPSTR   lpstrReturn;
+    DWORD   dwRetSize;
+    DWORD   dwItem;
+} MCI_DGV_INFO_PARMS16, * LPMCI_DGV_INFO_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    LPSTR   lpstrReturn;
+    DWORD   dwLength;
+    DWORD   dwNumber;
+    DWORD   dwItem;
+    LPSTR   lpstrAlgorithm;
+} MCI_DGV_LIST_PARMS16, *LPMCI_DGV_LIST_PARMS16;
+
+typedef MCI_LOAD_PARMS16  MCI_DGV_LOAD_PARMS16 , * LPMCI_DGV_LOAD_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    UINT16  wDeviceID;
+    UINT16  wReserved0;
+    LPSTR   lpstrDeviceType;
+    LPSTR   lpstrElementName;
+    LPSTR   lpstrAlias;
+    DWORD   dwStyle;
+    HWND16  hWndParent;
+    UINT16  wReserved1;
+} MCI_DGV_OPEN_PARMS16, *LPMCI_DGV_OPEN_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    DWORD   dwTo;
+    RECT16  rc;
+    DWORD   dwAudioStream;
+    DWORD   dwVideoStream;
+} MCI_DGV_PASTE_PARMS16, * LPMCI_DGV_PASTE_PARMS16;
+
+typedef MCI_DGV_RECT_PARMS16 MCI_DGV_PUT_PARMS16, * LPMCI_DGV_PUT_PARMS16;
+
+typedef struct {
+    DWORD       dwCallback;
+    DWORD       dwItem;
+    LPSTR       lpstrName;
+    DWORD       lpstrAlgorithm;
+    DWORD       dwHandle;
+} MCI_DGV_QUALITY_PARMS16, *LPMCI_DGV_QUALITY_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    DWORD   dwFrom;
+    DWORD   dwTo;
+    RECT16  rc;
+    DWORD   dwAudioStream;
+    DWORD   dwVideoStream;
+} MCI_DGV_RECORD_PARMS16, * LPMCI_DGV_RECORD_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    LPSTR   lpstrPath;
+    DWORD   dwSize;
+} MCI_DGV_RESERVE_PARMS16, *LPMCI_DGV_RESERVE_PARMS16A;
+
+typedef struct {
+    DWORD   dwCallback;
+    LPSTR   lpstrFileName;
+    RECT16  rc;
+} MCI_DGV_RESTORE_PARMS16, *LPMCI_DGV_RESTORE_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    LPSTR   lpstrFileName;
+    RECT16  rc;
+} MCI_DGV_SAVE_PARMS16, *LPMCI_DGV_SAVE_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    DWORD   dwItem;
+    DWORD   dwValue;
+    DWORD   dwOver;
+    LPSTR   lpstrAlgorithm;
+    LPSTR   lpstrQuality;
+} MCI_DGV_SETAUDIO_PARMS16, *LPMCI_DGV_SETAUDIO_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    DWORD   dwItem;
+    DWORD   dwValue;
+    DWORD   dwOver;
+    LPSTR   lpstrAlgorithm;
+    LPSTR   lpstrQuality;
+    DWORD   dwSourceNumber;
+} MCI_DGV_SETVIDEO_PARMS16, *LPMCI_DGV_SETVIDEO_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    DWORD   dwReturn;
+    DWORD   dwItem;
+    DWORD   dwTrack;
+    SEGPTR  lpstrDrive;
+    DWORD   dwReference;
+} MCI_DGV_STATUS_PARMS16, *LPMCI_DGV_STATUS_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    RECT16  rc;
+    HDC16   hDC;
+    UINT16  wReserved0;
+} MCI_DGV_UPDATE_PARMS16, * LPMCI_DGV_UPDATE_PARMS16;
+
+typedef MCI_DGV_RECT_PARMS16 MCI_DGV_UNFREEZE_PARMS16, * LPMCI_DGV_UNFREEZE_PARMS16;
+
+typedef MCI_DGV_RECT_PARMS16 MCI_DGV_WHERE_PARMS16, * LPMCI_DGV_WHERE_PARMS16;
+
+typedef struct {
+    DWORD   dwCallback;
+    HWND16  hWnd;
+    UINT16  wReserved1;
+    UINT16  nCmdShow;
+    UINT16  wReserved2;
+    LPSTR   lpstrText;
+} MCI_DGV_WINDOW_PARMS16, *LPMCI_DGV_WINDOW_PARMS16;
+
 #include "poppack.h"
 
 #endif  /* __WINE_WINE_MMSYSTEM16_H */

[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux