diff --git a/reactos/lib/winmm/Makefile b/reactos/lib/winmm/Makefile index 6f092c63109..ff60c6ff741 100644 --- a/reactos/lib/winmm/Makefile +++ b/reactos/lib/winmm/Makefile @@ -8,7 +8,7 @@ TARGET_NAME = winmm TARGET_BASE = 0x777c0000 -TARGET_CFLAGS = -D__WINE_FOR_REACTOS__ +TARGET_CFLAGS = # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -D_DISABLE_TIDENTS @@ -16,9 +16,7 @@ TARGET_CFLAGS += -D_DISABLE_TIDENTS TARGET_SDKLIBS = ntdll.a kernel32.a TARGET_OBJECTS = \ - winmm.o \ - lolvldrv.o \ - driver.o + stubs.o include $(PATH_TO_TOP)/rules.mak diff --git a/reactos/lib/winmm/stubs.c b/reactos/lib/winmm/stubs.c new file mode 100644 index 00000000000..b04a302e8d5 --- /dev/null +++ b/reactos/lib/winmm/stubs.c @@ -0,0 +1,40 @@ +/* + AG: These are just temporary stubs for comctl32.dll - I am working on + porting WinMM over, offline. Once it compiles and links, I will commit + it. +*/ + + +#include +typedef UINT *LPUINT; +#include + +MMRESULT WINAPI mmioAscend(HMMIO hmmio, LPMMCKINFO lpck, UINT wFlags) +{ + return MMSYSERR_NOERROR; +} + +MMRESULT WINAPI mmioClose(HMMIO hmmio, UINT wFlags) +{ + return MMSYSERR_NOERROR; +} + +MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, const MMCKINFO* lpckParent, UINT wFlags) +{ + return MMSYSERR_NOERROR; +} + +HMMIO WINAPI mmioOpenA(LPSTR szFilename, LPMMIOINFO lpmmioinfo, DWORD dwOpenFlags) +{ + return 12345; +} + +LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch) +{ + return 0; +} + +LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, int iOrigin) +{ + return 0; +} diff --git a/reactos/lib/winmm/winmm.edf b/reactos/lib/winmm/winmm.edf index e6b65bc9912..b295e83ada2 100644 --- a/reactos/lib/winmm/winmm.edf +++ b/reactos/lib/winmm/winmm.edf @@ -1,23 +1,23 @@ LIBRARY WINMM.DLL EXPORTS -joyGetDevCapsA=joyGetDevCapsA@12 -joyGetNumDevs=joyGetNumDevs@0 -joyGetPosEx=joyGetPosEx@8 -mciSendCommandA=mciSendCommandA@16 -midiOutReset=midiOutReset@4 -midiOutClose=midiOutClose@4 -midiOutUnprepareHeader=midiOutUnprepareHeader@12 -sndPlaySoundA=sndPlaySoundA@8 -sndPlaySoundW=sndPlaySoundW@8 -waveOutReset=waveOutReset@4 -waveOutWrite=waveOutWrite@12 -waveOutPrepareHeader=waveOutPrepareHeader@12 -waveOutGetErrorTextA=waveOutGetErrorTextA@12 -waveOutOpen=waveOutOpen@24 -waveOutClose=waveOutClose@4 -waveOutUnprepareHeader=waveOutUnprepareHeader@12 -midiOutPrepareHeader=midiOutPrepareHeader@12 -midiOutLongMsg=midiOutLongMsg@12 -timeBeginPeriod=timeBeginPeriod@4 -timeEndPeriod=timeEndPeriod@4 -timeGetTime=timeGetTime@0 \ No newline at end of file +;joyGetDevCapsA=joyGetDevCapsA@12 +;joyGetNumDevs=joyGetNumDevs@0 +;joyGetPosEx=joyGetPosEx@8 +;mciSendCommandA=mciSendCommandA@16 +;midiOutReset=midiOutReset@4 +;midiOutClose=midiOutClose@4 +;midiOutUnprepareHeader=midiOutUnprepareHeader@12 +;sndPlaySoundA=sndPlaySoundA@8 +;sndPlaySoundW=sndPlaySoundW@8 +;waveOutReset=waveOutReset@4 +;waveOutWrite=waveOutWrite@12 +;waveOutPrepareHeader=waveOutPrepareHeader@12 +;waveOutGetErrorTextA=waveOutGetErrorTextA@12 +;waveOutOpen=waveOutOpen@24 +;waveOutClose=waveOutClose@4 +;waveOutUnprepareHeader=waveOutUnprepareHeader@12 +;midiOutPrepareHeader=midiOutPrepareHeader@12 +;midiOutLongMsg=midiOutLongMsg@12 +;timeBeginPeriod=timeBeginPeriod@4 +;timeEndPeriod=timeEndPeriod@4 +;timeGetTime=timeGetTime@0