diff --git a/if1632/mmsystem.spec b/if1632/mmsystem.spec
index 414d21afbf5344048879bfe4a9fce9863c09204e..7dc84f55d0b07015d7d728404a40f693b9b2d6c9 100644
--- a/if1632/mmsystem.spec
+++ b/if1632/mmsystem.spec
@@ -38,14 +38,14 @@ type	win16
 214    pascal  midiOutCacheDrumPatches(word word ptr word) midiOutCacheDrumPatches16
 215    pascal  midiOutGetID(word ptr) midiOutGetID16
 216    pascal  midiOutMessage(word word long long) midiOutMessage16
-250    stub    MIDISTREAMPROPERTY
-251    stub    MIDISTREAMOPEN
-252    stub    MIDISTREAMCLOSE
-253    stub    MIDISTREAMPOSITION
-254    stub    MIDISTREAMOUT
-255    stub    MIDISTREAMPAUSE
-256    stub    MIDISTREAMRESTART
-257    stub    MIDISTREAMSTOP
+250    pascal  midiStreamProperty(word ptr long) midiStreamProperty16
+251    pascal  midiStreamOpen(ptr ptr long long long long) midiStreamOpen16
+252    pascal  midiStreamClose(word) midiStreamClose16
+253    pascal  midiStreamPosition(word ptr word) midiStreamPosition16
+254    pascal  midiStreamOut(word ptr word) midiStreamOut16
+255    pascal  midiStreamPause(word) midiStreamPause16
+256    pascal  midiStreamRestart(word) midiStreamRestart16
+257    pascal  midiStreamStop(word) midiStreamStop16
 301    pascal  midiInGetNumDevs() midiInGetNumDevs16
 302    pascal  midiInGetDevCaps(word ptr word) midiInGetDevCaps16
 303    pascal  midiInGetErrorText(word ptr word) midiInGetErrorText16
@@ -106,21 +106,21 @@ type	win16
 605    pascal  timeBeginPeriod(word) timeBeginPeriod16
 606    pascal  timeEndPeriod(word) timeEndPeriod16
 607    pascal  timeGetTime() timeGetTime
-701    pascal  MCISENDCOMMAND(word word long long) mciSendCommand
-702    pascal  MCISENDSTRING(str ptr word word) mciSendString
-703    pascal  mciGetDeviceID(ptr) mciGetDeviceID
+701    pascal  mciSendCommand(word word long long) mciSendCommand16
+702    pascal  mciSendString(str ptr word word) mciSendString16
+703    pascal  mciGetDeviceID(ptr) mciGetDeviceID16
 705    pascal  mciLoadCommandResource(word str word) mciLoadCommandResource16
 706    pascal  mciGetErrorString(long ptr word) mciGetErrorString16
 707    pascal  mciSetDriverData(word long) mciSetDriverData16
 708    pascal  mciGetDriverData(word) mciGetDriverData16
-710    stub    MCIDRIVERYIELD
-711    stub    MCIDRIVERNOTIFY
+710    pascal  mciDriverYield(word) mciDriverYield16
+711    pascal  mciDriverNotify(word word word) mciDriverNotify16
 712    stub    MCIEXECUTE
-713    stub    MCIFREECOMMANDRESOURCE
-714    stub    MCISETYIELDPROC
-715    stub    MCIGETDEVICEIDFROMELEMENTID
-716    stub    MCIGETYIELDPROC
-717    stub    MCIGETCREATORTASK
+713    pascal  mciFreeCommandResource(word) mciFreeCommandResource16
+714    pascal  mciSetYieldProc(word ptr long) mciSetYieldProc16
+715    pascal  mciGetDeviceIDFromElementID(long ptr) mciGetDeviceIDFromElementID16
+716    pascal  mciGetYieldProc(word ptr) mciGetYieldProc16
+717    pascal  mciGetCreatorTask(word) mciGetCreatorTask16
 800    pascal  mixerGetNumDevs() mixerGetNumDevs16
 801    pascal  mixerGetDevCaps(word ptr long) mixerGetDevCaps16
 802    pascal  mixerOpen(ptr word long long) mixerOpen16
@@ -155,8 +155,8 @@ type	win16
 1213   pascal  mmioWrite(word ptr long) mmioWrite16
 1214   pascal  mmioSeek(word long word) mmioSeek16
 1215   pascal  mmioGetInfo(word ptr word) mmioGetInfo16
-1216   pascal  MMIOSETINFO(word ptr word) mmioSetInfo16
-1217   pascal  MMIOSETBUFFER(word ptr long word) mmioSetBuffer16
+1216   pascal  mmioSetInfo(word ptr word) mmioSetInfo16
+1217   pascal  mmioSetBuffer(word ptr long word) mmioSetBuffer16
 1218   pascal  mmioFlush(word word) mmioFlush16
 1219   pascal  mmioAdvance(word ptr word) mmioAdvance16
 1220   pascal  mmioStringToFOURCC(str word) mmioStringToFOURCC16
@@ -164,8 +164,8 @@ type	win16
 1222   pascal  MMIOSENDMESSAGE(word word long long) mmioSendMessage
 1223   pascal  MMIODESCEND(word ptr ptr word) mmioDescend
 1224   pascal  mmioAscend(word ptr word) mmioAscend16
-1225   pascal  MMIOCREATECHUNK(word ptr word) mmioCreateChunk
-1226   pascal  MMIORENAME(ptr ptr ptr long) mmioRename
+1225   pascal  mmioCreateChunk(word ptr word) mmioCreateChunk16
+1226   pascal  mmioRename(ptr ptr ptr long) mmioRename16
 
 #2000   stub    WINMMF_THUNKDATA16
 #2001   stub    RING3_DEVLOADER
diff --git a/relay32/winmm.spec b/relay32/winmm.spec
index c6ef16c1c80e350de912a3809134a407913137a1..58ab8a2ff0fa1a3553d0aa0d4e00456cbdbe8f14 100644
--- a/relay32/winmm.spec
+++ b/relay32/winmm.spec
@@ -36,25 +36,25 @@ type win32
  33 stub joyReleaseCapture
  34 stub joySetCapture
  35 stdcall joySetThreshold(long long) joySetThreshold32
- 36 stub mciDriverNotify
- 37 stub mciDriverYield
+ 36 stdcall mciDriverNotify(long long long) mciDriverNotify32
+ 37 stdcall mciDriverYield(long) mciDriverYield32
  38 stub mciExecute
- 39 stub mciFreeCommandResource
- 40 stub mciGetCreatorTask
- 41 stub mciGetDeviceIDA
- 42 stub mciGetDeviceIDFromElementIDW
- 43 stub mciGetDeviceIDW
- 44 stub mciGetDriverData
+ 39 stdcall mciFreeCommandResource(long) mciFreeCommandResource32
+ 40 stdcall mciGetCreatorTask(long) mciGetCreatorTask32
+ 41 stdcall mciGetDeviceIDA(str) mciGetDeviceID32A
+ 42 stdcall mciGetDeviceIDFromElementIDW(long str) mciGetDeviceIDFromElementID32W
+ 43 stdcall mciGetDeviceIDW(str) mciGetDeviceID32W
+ 44 stdcall mciGetDriverData(long long) mciGetDriverData32
  45 stdcall mciGetErrorStringA(long ptr long) mciGetErrorString32A
  46 stdcall mciGetErrorStringW(long ptr long) mciGetErrorString32W
- 47 stub mciGetYieldProc
- 48 stub mciLoadCommandResource
+ 47 stdcall mciGetYieldProc(long ptr) mciGetYieldProc32
+ 48 stdcall mciLoadCommandResource(long str long) mciLoadCommandResource32 
  49 stdcall mciSendCommandA(long long long long) mciSendCommand32A
- 50 stub mciSendCommandW
- 51 stdcall mciSendStringA(str ptr long long) mciSendString
- 52 stub mciSendStringW
- 53 stub mciSetDriverData
- 54 stub mciSetYieldProc
+ 50 stdcall mciSendCommandW(long long long long) mciSendCommand32W
+ 51 stdcall mciSendStringA(str ptr long long) mciSendString32A
+ 52 stdcall mciSendStringW(str ptr long long) mciSendString32W
+ 53 stdcall mciSetDriverData(long long) mciSetDriverData32
+ 54 stdcall mciSetYieldProc(ptr) mciSetYieldProc32
  55 stub midiConnect
  56 stub midiDisconnect
  57 stdcall midiInAddBuffer(long ptr long) midiInAddBuffer32
@@ -90,14 +90,14 @@ type win32
  87 stdcall midiOutSetVolume(long ptr) midiOutSetVolume32
  88 stdcall midiOutShortMsg(long long) midiOutShortMsg32
  89 stdcall midiOutUnprepareHeader(long ptr long) midiOutUnprepareHeader32
- 90 stub midiStreamClose
+ 90 stdcall midiStreamClose(long) midiStreamClose32
  91 stdcall midiStreamOpen(ptr ptr long long long long) midiStreamOpen32
- 92 stub midiStreamOut
- 93 stub midiStreamPause
- 94 stub midiStreamPosition
- 95 stub midiStreamProperty
- 96 stub midiStreamRestart
- 97 stub midiStreamStop
+ 92 stdcall midiStreamOut(long ptr long) midiStreamOut32
+ 93 stdcall midiStreamPause(long) midiStreamPause32
+ 94 stdcall midiStreamPosition(long ptr long) midiStreamPosition32
+ 95 stdcall midiStreamProperty(long ptr long) midiStreamProperty32
+ 96 stdcall midiStreamRestart(long) midiStreamRestart32
+ 97 stdcall midiStreamStop(long) midiStreamStop32
  98 stdcall mixerClose(long) mixerClose32
  99 stdcall mixerGetControlDetailsA(long ptr long) mixerGetControlDetails32A
 100 stdcall mixerGetControlDetailsW(long ptr long) mixerGetControlDetails32W
@@ -115,7 +115,7 @@ type win32
 112 stdcall mmioAdvance(long ptr long) mmioAdvance32
 113 stdcall mmioAscend(long ptr long) mmioAscend32
 114 stdcall mmioClose(long long) mmioClose32
-115 stub mmioCreateChunk
+115 stdcall mmioCreateChunk(long ptr long) mmioCreateChunk32
 116 stdcall mmioDescend(long ptr ptr long) mmioDescend
 117 stdcall mmioFlush(long long) mmioFlush32
 118 stdcall mmioGetInfo(long ptr long) mmioGetInfo32
@@ -125,8 +125,8 @@ type win32
 122 stdcall mmioOpenA(str ptr long) mmioOpen32A
 123 stdcall mmioOpenW(wstr ptr long) mmioOpen32W
 124 stdcall mmioRead(long ptr long) mmioRead32
-125 stub mmioRenameA
-126 stub mmioRenameW
+125 stdcall mmioRenameA(ptr ptr ptr long) mmioRename32A
+126 stdcall mmioRenameW(ptr ptr ptr long) mmioRename32W
 127 stdcall mmioSeek(long long long) mmioSeek32
 128 stdcall mmioSendMessage(long long long long) mmioSendMessage
 129 stdcall mmioSetBuffer(long ptr long long) mmioSetBuffer32