Commit 4c37e23e authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

Now using the same structs for low-level drivers as Windows do.

parent 22d333d8
...@@ -213,12 +213,6 @@ typedef struct { ...@@ -213,12 +213,6 @@ typedef struct {
DWORD dwFlags; DWORD dwFlags;
} PORTALLOC, *LPPORTALLOC; } PORTALLOC, *LPPORTALLOC;
#if 0
/* FIXME: the ???OPENDESC structs will be fixed when low
* level driver loading is available
* for now comment them out, and use non corrrect ones in winemm.h
* to be uncommented ASAP
*/
typedef struct { typedef struct {
HWAVE16 hWave; HWAVE16 hWave;
LPWAVEFORMATEX lpFormat; LPWAVEFORMATEX lpFormat;
...@@ -286,45 +280,6 @@ typedef struct tMIXEROPENDESC ...@@ -286,45 +280,6 @@ typedef struct tMIXEROPENDESC
DWORD dwCallback; DWORD dwCallback;
DWORD dwInstance; DWORD dwInstance;
} MIXEROPENDESC, *LPMIXEROPENDESC; } MIXEROPENDESC, *LPMIXEROPENDESC;
#else
/* those definitions are still wine tainted
* keep them in a temporary phase
*/
typedef struct {
HWAVE16 hWave;
LPWAVEFORMAT lpFormat;
DWORD dwCallBack;
DWORD dwInstance;
UINT16 uDeviceID;
} WAVEOPENDESC, *LPWAVEOPENDESC;
typedef struct {
DWORD dwStreamID;
WORD wDeviceID;
} MIDIOPENSTRMID;
/* FIXME: this structure has a different mapping in 16 & 32 bit mode
* Since, I don't plan to add support for native 16 bit low level
* multimedia drivers, it'll do.
*/
typedef struct {
HMIDI16 hMidi;
DWORD dwCallback;
DWORD dwInstance;
UINT16 wDevID;
DWORD dnDevNode;
DWORD cIds;
MIDIOPENSTRMID rgIds;
} MIDIOPENDESC, *LPMIDIOPENDESC;
typedef struct tMIXEROPENDESC
{
HMIXEROBJ16 hmx;
DWORD dwCallback;
DWORD dwInstance;
UINT16 uDeviceID;
} MIXEROPENDESC,*LPMIXEROPENDESC;
#endif
typedef struct { typedef struct {
UINT16 wDeviceID; /* device ID */ UINT16 wDeviceID; /* device ID */
......
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