Skip to content

W
wine-cw
Commit 7a1cb65c authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Moved 16-bit definitions out of mmddk.h into mmsystem16.h.

parent 9376fb30
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 90 deletions
dlls/msvideo/mciwnd.c
View file @ 7a1cb65c
......@@ -26,7 +26,6 @@
#include "wingdi.h"
#include "winuser.h"
#include "vfw.h"
#include "wine/mmsystem16.h"
#include "digitalv.h"
#include "commctrl.h"
#include "wine/debug.h"
......
dlls/winmm/mcianim/mcianim.c
View file @ 7a1cb65c
......@@ -35,17 +35,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(mcianim);
#define SECONDS_PERMIN 60
typedef struct {
UINT16 wDevID;
UINT wDevID;
int nUseCount; /* Incremented for each shared open */
BOOL16 fShareable; /* TRUE if first open was shareable */
BOOL fShareable; /* TRUE if first open was shareable */
WORD wNotifyDeviceID; /* MCI device ID with a pending notification */
HANDLE16 hCallback; /* Callback handle for pending notification */
MCI_OPEN_PARMSA openParms;
DWORD dwTimeFormat;
int mode;
UINT16 nCurTrack;
UINT nCurTrack;
DWORD dwCurFrame;
UINT16 nTracks;
UINT nTracks;
DWORD dwTotalLen;
LPDWORD lpdwTrackLen;
LPDWORD lpdwTrackPos;
......
dlls/winmm/mciavi/private_mciavi.h
View file @ 7a1cb65c
......@@ -41,8 +41,7 @@ struct MMIOPos {
typedef struct {
UINT wDevID;
int nUseCount; /* Incremented for each shared open */
BOOL16 fShareable; /* TRUE if first open was shareable */
HANDLE16 hCallback; /* Callback handle for pending notification */
BOOL fShareable; /* TRUE if first open was shareable */
WORD wCommandTable; /* custom MCI command table */
volatile DWORD dwStatus; /* One of MCI_MODE_XXX */
MCI_OPEN_PARMSA openParms;
......
dlls/winmm/mmsystem.c
View file @ 7a1cb65c
......@@ -35,7 +35,6 @@
#include "mmsystem.h"
#include "winbase.h"
#include "wine/mmsystem16.h"
#include "wine/winuser16.h"
#include "winemm.h"
#include "heap.h"
......
dlls/winmm/winemm.h
View file @ 7a1cb65c
......@@ -23,6 +23,7 @@
*/
#include "mmddk.h"
#include "wine/mmsystem16.h"
#include "wownt32.h"
typedef DWORD (WINAPI *MessageProc16)(UINT16 wDevID, UINT16 wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
......
include/mmddk.h
View file @ 7a1cb65c
......@@ -28,7 +28,6 @@
#include "mmsystem.h"
#include "winbase.h"
#include "wine/mmsystem16.h"
#define MAX_MIDIINDRV (16)
/* For now I'm making 16 the maximum number of midi devices one can
......@@ -369,25 +368,9 @@ typedef struct {
DWORD dwInstance;
HMIDIOUT hMidi;
DWORD dwFlags;
} PORTALLOC16, *LPPORTALLOC16;
typedef struct {
DWORD dwCallback;
DWORD dwInstance;
HMIDIOUT hMidi;
DWORD dwFlags;
} PORTALLOC, *LPPORTALLOC;
typedef struct {
HWAVE16 hWave;
LPWAVEFORMATEX lpFormat;
DWORD dwCallback;
DWORD dwInstance;
UINT16 uMappedDeviceID;
DWORD dnDevNode;
} WAVEOPENDESC16, *LPWAVEOPENDESC16;
typedef struct {
HWAVE hWave;
LPWAVEFORMATEX lpFormat;
DWORD dwCallback;
......@@ -402,16 +385,6 @@ typedef struct {
} MIDIOPENSTRMID;
typedef struct {
HMIDI16 hMidi;
DWORD dwCallback;
DWORD dwInstance;
UINT16 reserved;
DWORD dnDevNode;
DWORD cIds;
MIDIOPENSTRMID rgIds;
} MIDIOPENDESC16, *LPMIDIOPENDESC16;
typedef struct {
HMIDI hMidi;
DWORD dwCallback;
DWORD dwInstance;
......@@ -420,24 +393,6 @@ typedef struct {
MIDIOPENSTRMID rgIds;
} MIDIOPENDESC, *LPMIDIOPENDESC;
#if 0
typedef struct {
UINT16 wDelay;
UINT16 wResolution;
LPTIMECALLBACK16 lpFunction;
DWORD dwUser;
UINT16 wFlags;
} TIMEREVENT, *LPTIMEREVENT;
#endif
typedef struct tMIXEROPENDESC16
{
HMIXEROBJ16 hmx;
LPVOID pReserved0;
DWORD dwCallback;
DWORD dwInstance;
} MIXEROPENDESC16, *LPMIXEROPENDESC16;
typedef struct tMIXEROPENDESC
{
HMIXEROBJ hmx;
......@@ -447,14 +402,6 @@ typedef struct tMIXEROPENDESC
} MIXEROPENDESC, *LPMIXEROPENDESC;
typedef struct {
UINT16 wDeviceID; /* device ID */
SEGPTR lpstrParams; /* parameter string for entry in SYSTEM.INI */
UINT16 wCustomCommandTable; /* custom command table (0xFFFF if none)
* filled in by the driver */
UINT16 wType; /* driver type (filled in by the driver) */
} MCI_OPEN_DRIVER_PARMS16, *LPMCI_OPEN_DRIVER_PARMS16;
typedef struct {
UINT wDeviceID; /* device ID */
LPSTR lpstrParams; /* parameter string for entry in SYSTEM.INI */
UINT wCustomCommandTable; /* custom command table (0xFFFF if none) * filled in by the driver */
......@@ -470,41 +417,15 @@ typedef struct {
DECL_WINELIB_TYPE_AW(MCI_OPEN_DRIVER_PARMS)
DECL_WINELIB_TYPE_AW(LPMCI_OPEN_DRIVER_PARMS)
DWORD WINAPI mciGetDriverData16(UINT16 uDeviceID);
DWORD WINAPI mciGetDriverData(UINT uDeviceID);
BOOL16 WINAPI mciSetDriverData16(UINT16 uDeviceID, DWORD dwData);
BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD dwData);
UINT16 WINAPI mciDriverYield16(UINT16 uDeviceID);
UINT WINAPI mciDriverYield(UINT uDeviceID);
BOOL16 WINAPI mciDriverNotify16(HWND16 hwndCallback, UINT16 uDeviceID,
UINT16 uStatus);
BOOL WINAPI mciDriverNotify(HWND hwndCallback, UINT uDeviceID,
UINT uStatus);
UINT16 WINAPI mciLoadCommandResource16(HINSTANCE16 hInstance,
LPCSTR lpResName, UINT16 uType);
UINT WINAPI mciLoadCommandResource(HINSTANCE hInstance,
LPCWSTR lpResName, UINT uType);
BOOL16 WINAPI mciFreeCommandResource16(UINT16 uTable);
BOOL WINAPI mciFreeCommandResource(UINT uTable);
HINSTANCE16 WINAPI mmTaskCreate16(SEGPTR spProc, HINSTANCE16 *lphMmTask, DWORD dwPmt);
void WINAPI mmTaskBlock16(HINSTANCE16 hInst);
LRESULT WINAPI mmTaskSignal16(HTASK16 ht);
void WINAPI mmTaskYield16(void);
LRESULT WINAPI mmThreadCreate16(FARPROC16 fpThreadAddr, LPHANDLE16 lpHndl,
DWORD dwPmt, DWORD dwFlags);
void WINAPI mmThreadSignal16(HANDLE16 hndl);
void WINAPI mmThreadBlock16(HANDLE16 hndl);
HANDLE16 WINAPI mmThreadGetTask16(HANDLE16 hndl);
BOOL16 WINAPI mmThreadIsValid16(HANDLE16 hndl);
BOOL16 WINAPI mmThreadIsCurrent16(HANDLE16 hndl);
#define DCB_NULL 0x0000
#define DCB_WINDOW 0x0001 /* dwCallback is a HWND */
#define DCB_TASK 0x0002 /* dwCallback is a HTASK */
......@@ -513,8 +434,6 @@ BOOL16 WINAPI mmThreadIsCurrent16(HANDLE16 hndl);
#define DCB_TYPEMASK 0x0007
#define DCB_NOSWITCH 0x0008 /* don't switch stacks for callback */
BOOL16 WINAPI DriverCallback16(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev,
WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev,
UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
......
include/wine/mmsystem16.h
View file @ 7a1cb65c
......@@ -23,6 +23,7 @@
#include "windef.h"
#include "wine/windef16.h"
#include "mmddk.h"
#include "pshpack1.h"
......@@ -101,6 +102,15 @@ typedef struct {
WORD wChannels; /* number of channels supported */
} WAVEINCAPS16, *LPWAVEINCAPS16;
typedef struct {
HWAVE16 hWave;
LPWAVEFORMATEX lpFormat;
DWORD dwCallback;
DWORD dwInstance;
UINT16 uMappedDeviceID;
DWORD dnDevNode;
} WAVEOPENDESC16, *LPWAVEOPENDESC16;
UINT16 WINAPI waveOutGetNumDevs16(void);
UINT16 WINAPI waveOutGetDevCaps16(UINT16,LPWAVEOUTCAPS16,UINT16);
UINT16 WINAPI waveOutGetVolume16(UINT16,DWORD*);
......@@ -169,6 +179,16 @@ typedef struct midihdr16_tag {
DWORD reserved; /* reserved for driver */
} MIDIHDR16, *LPMIDIHDR16;
typedef struct {
HMIDI16 hMidi;
DWORD dwCallback;
DWORD dwInstance;
UINT16 reserved;
DWORD dnDevNode;
DWORD cIds;
MIDIOPENSTRMID rgIds;
} MIDIOPENDESC16, *LPMIDIOPENDESC16;
UINT16 WINAPI midiOutGetNumDevs16(void);
UINT16 WINAPI midiOutGetDevCaps16(UINT16,LPMIDIOUTCAPS16,UINT16);
UINT16 WINAPI midiOutGetVolume16(UINT16,DWORD*);
......@@ -267,6 +287,14 @@ typedef struct {
DWORD cDestinations; /* count of destinations */
} MIXERCAPS16,*LPMIXERCAPS16;
typedef struct tMIXEROPENDESC16
{
HMIXEROBJ16 hmx;
LPVOID pReserved0;
DWORD dwCallback;
DWORD dwInstance;
} MIXEROPENDESC16, *LPMIXEROPENDESC16;
typedef struct {
DWORD cbStruct; /* size of MIXERLINE structure */
DWORD dwDestination; /* zero based destination index */
......@@ -427,6 +455,29 @@ BOOL16 WINAPI mciGetErrorString16 (DWORD,LPSTR,UINT16);
BOOL16 WINAPI mciSetYieldProc16(UINT16,YIELDPROC16,DWORD);
HTASK16 WINAPI mciGetCreatorTask16(UINT16);
YIELDPROC16 WINAPI mciGetYieldProc16(UINT16,DWORD*);
DWORD WINAPI mciGetDriverData16(UINT16 uDeviceID);
BOOL16 WINAPI mciSetDriverData16(UINT16 uDeviceID, DWORD dwData);
UINT16 WINAPI mciDriverYield16(UINT16 uDeviceID);
BOOL16 WINAPI mciDriverNotify16(HWND16 hwndCallback, UINT16 uDeviceID,
UINT16 uStatus);
UINT16 WINAPI mciLoadCommandResource16(HINSTANCE16 hInstance,
LPCSTR lpResName, UINT16 uType);
BOOL16 WINAPI mciFreeCommandResource16(UINT16 uTable);
HINSTANCE16 WINAPI mmTaskCreate16(SEGPTR spProc, HINSTANCE16 *lphMmTask, DWORD dwPmt);
void WINAPI mmTaskBlock16(HINSTANCE16 hInst);
LRESULT WINAPI mmTaskSignal16(HTASK16 ht);
void WINAPI mmTaskYield16(void);
LRESULT WINAPI mmThreadCreate16(FARPROC16 fpThreadAddr, LPHANDLE16 lpHndl,
DWORD dwPmt, DWORD dwFlags);
void WINAPI mmThreadSignal16(HANDLE16 hndl);
void WINAPI mmThreadBlock16(HANDLE16 hndl);
HANDLE16 WINAPI mmThreadGetTask16(HANDLE16 hndl);
BOOL16 WINAPI mmThreadIsValid16(HANDLE16 hndl);
BOOL16 WINAPI mmThreadIsCurrent16(HANDLE16 hndl);
BOOL16 WINAPI DriverCallback16(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev,
WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
typedef struct {
DWORD dwCallback;
......@@ -471,6 +522,14 @@ typedef struct {
} MCI_VD_ESCAPE_PARMS16, *LPMCI_VD_ESCAPE_PARMS16;
typedef struct {
UINT16 wDeviceID; /* device ID */
SEGPTR lpstrParams; /* parameter string for entry in SYSTEM.INI */
UINT16 wCustomCommandTable; /* custom command table (0xFFFF if none)
* filled in by the driver */
UINT16 wType; /* driver type (filled in by the driver) */
} MCI_OPEN_DRIVER_PARMS16, *LPMCI_OPEN_DRIVER_PARMS16;
typedef struct {
DWORD dwCallback;
MCIDEVICEID16 wDeviceID;
WORD wReserved0;
......
windows/driver.c
View file @ 7a1cb65c
......@@ -29,6 +29,7 @@
#include "wingdi.h"
#include "winuser.h"
#include "mmddk.h"
#include "wine/mmsystem16.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(driver);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment