Started putting all 16 bit code in separate files.

dlls/winmm/Makefile.in

@@ -16,10 +16,12 @@ C_SRCS = \
 	lolvldrv.c \
 	mci.c \
 	mmio.c \
-	mmsystem.c \
-	time.c
+	playsound.c \
+	time.c \
+	winmm.c
 
 C_SRCS16 = \
+	mmsystem.c \
 	sound16.c
 
 RC_SRCS = winmm_res.rc

dlls/winmm/mci.c

@@ -2318,14 +2318,14 @@ static	DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSA lpParms)
     TRACE("wDevID=%04X wDeviceID=%d dwRet=%ld\n", wmd->wDeviceID, lpParms->wDeviceID, dwRet);
 
     if (dwParam & MCI_NOTIFY)
-	mciDriverNotify16(lpParms->dwCallback, wmd->wDeviceID, MCI_NOTIFY_SUCCESSFUL);
+	mciDriverNotify(lpParms->dwCallback, wmd->wDeviceID, MCI_NOTIFY_SUCCESSFUL);
 
     return 0;
 errCleanUp:
     if (wmd) MCI_UnLoadMciDriver(iData, wmd);
 
     if (dwParam & MCI_NOTIFY)
-	mciDriverNotify16(lpParms->dwCallback, 0, MCI_NOTIFY_FAILURE);
+	mciDriverNotify(lpParms->dwCallback, 0, MCI_NOTIFY_FAILURE);
     return dwRet;
 }
 
@@ -2366,8 +2366,8 @@ static	DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms
     MCI_UnLoadMciDriver(iData, wmd);
 
     if (dwParam & MCI_NOTIFY)
-	mciDriverNotify16(lpParms->dwCallback, wDevID,
-			  (dwRet == 0) ? MCI_NOTIFY_SUCCESSFUL : MCI_NOTIFY_FAILURE);
+	mciDriverNotify(lpParms->dwCallback, wDevID,
+                        (dwRet == 0) ? MCI_NOTIFY_SUCCESSFUL : MCI_NOTIFY_FAILURE);
 
     return dwRet;
 }
@@ -2490,8 +2490,8 @@ static	DWORD MCI_Break(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms)
     if (lpParms == NULL)	return MCIERR_NULL_PARAMETER_BLOCK;
 
     if (dwFlags & MCI_NOTIFY)
-	mciDriverNotify16(lpParms->dwCallback, wDevID,
-			  (dwRet == 0) ? MCI_NOTIFY_SUCCESSFUL : MCI_NOTIFY_FAILURE);
+	mciDriverNotify(lpParms->dwCallback, wDevID,
+                        (dwRet == 0) ? MCI_NOTIFY_SUCCESSFUL : MCI_NOTIFY_FAILURE);
 
     return dwRet;
 }

dlls/winmm/winemm.h

@@ -221,8 +221,22 @@ void		CALLBACK	WINE_mmThreadEntryPoint(DWORD _pmt);
 void 				MMSYSTEM_MMTIME16to32(LPMMTIME mmt32, const MMTIME16* mmt16);
 void 				MMSYSTEM_MMTIME32to16(LPMMTIME16 mmt16, const MMTIME* mmt32);
 
+UINT                            MMSYSTEM_mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD dwCallback,
+                                                   DWORD dwInstance, DWORD fdwOpen, BOOL bFrom32);
+UINT                            MMSYSTEM_midiOutOpen(HMIDIOUT* lphMidiOut, UINT uDeviceID, DWORD dwCallback,
+                                                     DWORD dwInstance, DWORD dwFlags, BOOL bFrom32);
+UINT                            MMSYSTEM_midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD dwCallback,
+                                                    DWORD dwInstance, DWORD dwFlags, BOOL bFrom32);
+MMRESULT                        MMSYSTEM_MidiStream_Open(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID,
+                                                         DWORD cMidi, DWORD dwCallback,
+                                                         DWORD dwInstance, DWORD fdwOpen, BOOL bFrom32);
+UINT                            MMSYSTEM_waveOpen(HANDLE* lphndl, UINT uDeviceID, UINT uType,
+                                                  const LPWAVEFORMATEX lpFormat, DWORD dwCallback, 
+                                                  DWORD dwInstance, DWORD dwFlags, BOOL bFrom32);
+
 BOOL				MULTIMEDIA_MciInit(void);
 LPWINE_MM_IDATA			MULTIMEDIA_GetIData(void);
+BOOL                            MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSound, BOOL bUnicode);
 
 LPWINE_MM_IDATA			TIME_MMTimeStart(void);
 void				TIME_MMTimeStop(void);