From a3502ccf930c0464da602f87f3b67341890d455a Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 26 Jul 2000 19:51:37 +0000 Subject: [PATCH] Merged setupx.dll into setupapi.dll. Merged sound.dll into winmm.dll. Merged stress.dll into kernel32.dll. --- Make.rules.in | 3 - configure | 6 - configure.in | 3 - dlls/Makefile.in | 24 +--- dlls/kernel/Makefile.in | 3 +- .../{stress/stress_main.c => kernel/stress.c} | 2 +- dlls/{stress => kernel}/stress.spec | 0 dlls/setupapi/.cvsignore | 1 + dlls/setupapi/Makefile.in | 5 +- dlls/{setupx => setupapi}/setupx.spec | 0 dlls/{setupx => setupapi}/setupx_main.c | 0 dlls/setupx/.cvsignore | 4 - dlls/setupx/Makefile.in | 13 -- dlls/sound/.cvsignore | 4 - dlls/sound/Makefile.in | 14 -- dlls/stress/.cvsignore | 4 - dlls/stress/Makefile.in | 14 -- dlls/winmm/Makefile.in | 3 +- dlls/{sound => winmm}/sound.spec | 0 dlls/{sound/sound_main.c => winmm/sound16.c} | 122 +----------------- include/stress.h | 30 ----- include/wine/winesound.h | 38 ------ 22 files changed, 18 insertions(+), 275 deletions(-) rename dlls/{stress/stress_main.c => kernel/stress.c} (99%) rename dlls/{stress => kernel}/stress.spec (100%) rename dlls/{setupx => setupapi}/setupx.spec (100%) rename dlls/{setupx => setupapi}/setupx_main.c (100%) delete mode 100644 dlls/setupx/.cvsignore delete mode 100644 dlls/setupx/Makefile.in delete mode 100644 dlls/sound/.cvsignore delete mode 100644 dlls/sound/Makefile.in delete mode 100644 dlls/stress/.cvsignore delete mode 100644 dlls/stress/Makefile.in rename dlls/{sound => winmm}/sound.spec (100%) rename dlls/{sound/sound_main.c => winmm/sound16.c} (55%) delete mode 100644 include/stress.h delete mode 100644 include/wine/winesound.h diff --git a/Make.rules.in b/Make.rules.in index 6a279578c55..b4dec290bb8 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -134,12 +134,9 @@ DLLS = \ rpcrt4 \ serialui \ setupapi \ - setupx \ shell32 \ shfolder \ shlwapi \ - sound \ - stress \ tapi32 \ ttydrv \ urlmon \ diff --git a/configure b/configure index c182e46b547..0ceeed461ed 100755 --- a/configure +++ b/configure @@ -6277,12 +6277,9 @@ dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile -dlls/setupx/Makefile dlls/shell32/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile -dlls/sound/Makefile -dlls/stress/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/ttydrv/Makefile @@ -6516,12 +6513,9 @@ dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile -dlls/setupx/Makefile dlls/shell32/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile -dlls/sound/Makefile -dlls/stress/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/ttydrv/Makefile diff --git a/configure.in b/configure.in index 57113e42f08..5547261138c 100644 --- a/configure.in +++ b/configure.in @@ -1021,12 +1021,9 @@ dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile -dlls/setupx/Makefile dlls/shell32/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile -dlls/sound/Makefile -dlls/stress/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/ttydrv/Makefile diff --git a/dlls/Makefile.in b/dlls/Makefile.in index ac0533be86d..53ae5a915dc 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -45,13 +45,10 @@ DLLFILES = \ richedit/libriched32.@LIBEXT@ \ rpcrt4/librpcrt4.@LIBEXT@ \ serialui/libserialui.@LIBEXT@ \ - setupx/libsetupx.@LIBEXT@ \ setupapi/libsetupapi.@LIBEXT@ \ shell32/libshell32.@LIBEXT@ \ shfolder/libshfolder.@LIBEXT@ \ shlwapi/libshlwapi.@LIBEXT@ \ - sound/libsound.@LIBEXT@ \ - stress/libstress.@LIBEXT@ \ tapi32/libtapi32.@LIBEXT@ \ ttydrv/libttydrv.@LIBEXT@ \ urlmon/liburlmon.@LIBEXT@ \ @@ -102,8 +99,11 @@ EXTRADLLNAMES = \ olecli \ olesvr \ rasapi16 \ + setupx \ shell \ + sound \ storage \ + stress \ system \ toolhelp \ typelib \ @@ -154,12 +154,9 @@ SUBDIRS = \ rpcrt4 \ serialui \ setupapi \ - setupx \ shell32 \ shfolder \ shlwapi \ - sound \ - stress \ tapi32 \ ttydrv \ urlmon \ @@ -228,7 +225,7 @@ libimm32.@LIBEXT@: imm32/libimm32.@LIBEXT@ $(RM) $@ && $(LN_S) imm32/libimm32.@LIBEXT@ $@ libkernel32.@LIBEXT@ libcomm.@LIBEXT@ libkernel.@LIBEXT@ libsystem.@LIBEXT@ \ - libtoolhelp.@LIBEXT@ libwin87em.@LIBEXT@ libwindebug.@LIBEXT@ \ + libstress.@LIBEXT@ libtoolhelp.@LIBEXT@ libwin87em.@LIBEXT@ libwindebug.@LIBEXT@ \ libwprocs.@LIBEXT@: kernel/libkernel32.@LIBEXT@ $(RM) $@ && $(LN_S) kernel/libkernel32.@LIBEXT@ $@ @@ -310,12 +307,9 @@ librpcrt4.@LIBEXT@: rpcrt4/librpcrt4.@LIBEXT@ libserialui.@LIBEXT@: serialui/libserialui.@LIBEXT@ $(RM) $@ && $(LN_S) serialui/libserialui.@LIBEXT@ $@ -libsetupapi.@LIBEXT@: setupapi/libsetupapi.@LIBEXT@ +libsetupapi.@LIBEXT@ libsetupx.@LIBEXT@: setupapi/libsetupapi.@LIBEXT@ $(RM) $@ && $(LN_S) setupapi/libsetupapi.@LIBEXT@ $@ -libsetupx.@LIBEXT@: setupx/libsetupx.@LIBEXT@ - $(RM) $@ && $(LN_S) setupx/libsetupx.@LIBEXT@ $@ - libshell32.@LIBEXT@ libshell.@LIBEXT@: shell32/libshell32.@LIBEXT@ $(RM) $@ && $(LN_S) shell32/libshell32.@LIBEXT@ $@ @@ -325,12 +319,6 @@ libshfolder.@LIBEXT@: shfolder/libshfolder.@LIBEXT@ libshlwapi.@LIBEXT@: shlwapi/libshlwapi.@LIBEXT@ $(RM) $@ && $(LN_S) shlwapi/libshlwapi.@LIBEXT@ $@ -libsound.@LIBEXT@: sound/libsound.@LIBEXT@ - $(RM) $@ && $(LN_S) sound/libsound.@LIBEXT@ $@ - -libstress.@LIBEXT@: stress/libstress.@LIBEXT@ - $(RM) $@ && $(LN_S) stress/libstress.@LIBEXT@ $@ - libtapi32.@LIBEXT@: tapi32/libtapi32.@LIBEXT@ $(RM) $@ && $(LN_S) tapi32/libtapi32.@LIBEXT@ $@ @@ -358,7 +346,7 @@ libwineps.@LIBEXT@: wineps/libwineps.@LIBEXT@ libwininet.@LIBEXT@: wininet/libwininet.@LIBEXT@ $(RM) $@ && $(LN_S) wininet/libwininet.@LIBEXT@ $@ -libwinmm.@LIBEXT@ libmmsystem.@LIBEXT@: winmm/libwinmm.@LIBEXT@ +libwinmm.@LIBEXT@ libmmsystem.@LIBEXT@ libsound.@LIBEXT@: winmm/libwinmm.@LIBEXT@ $(RM) $@ && $(LN_S) winmm/libwinmm.@LIBEXT@ $@ libwinspool.drv.@LIBEXT@: winspool/libwinspool.drv.@LIBEXT@ diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in index 3fdfce6cd68..a68ced754b7 100644 --- a/dlls/kernel/Makefile.in +++ b/dlls/kernel/Makefile.in @@ -4,11 +4,12 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = kernel32 SOVERSION = 1.0 -ALTNAMES = comm kernel system toolhelp windebug win87em wprocs +ALTNAMES = comm kernel stress system toolhelp windebug win87em wprocs C_SRCS = \ format_msg.c \ kernel_main.c \ + stress.c \ thunk.c \ utthunk.c \ win87em.c \ diff --git a/dlls/stress/stress_main.c b/dlls/kernel/stress.c similarity index 99% rename from dlls/stress/stress_main.c rename to dlls/kernel/stress.c index 6430956d9d6..fd762fc120c 100644 --- a/dlls/stress/stress_main.c +++ b/dlls/kernel/stress.c @@ -1,5 +1,5 @@ #include -#include "stress.h" +#include "windef.h" #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(stress); diff --git a/dlls/stress/stress.spec b/dlls/kernel/stress.spec similarity index 100% rename from dlls/stress/stress.spec rename to dlls/kernel/stress.spec diff --git a/dlls/setupapi/.cvsignore b/dlls/setupapi/.cvsignore index 37ae76a69f2..f1c36356f7d 100644 --- a/dlls/setupapi/.cvsignore +++ b/dlls/setupapi/.cvsignore @@ -1,3 +1,4 @@ Makefile libsetupapi.so.1.0 setupapi.spec.c +setupx.spec.c diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index ace24a47fec..90a0428ad44 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -4,8 +4,11 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = setupapi SOVERSION = 1.0 +ALTNAMES = setupx -C_SRCS = stubs.c +C_SRCS = \ + setupx_main.c \ + stubs.c @MAKE_DLL_RULES@ diff --git a/dlls/setupx/setupx.spec b/dlls/setupapi/setupx.spec similarity index 100% rename from dlls/setupx/setupx.spec rename to dlls/setupapi/setupx.spec diff --git a/dlls/setupx/setupx_main.c b/dlls/setupapi/setupx_main.c similarity index 100% rename from dlls/setupx/setupx_main.c rename to dlls/setupapi/setupx_main.c diff --git a/dlls/setupx/.cvsignore b/dlls/setupx/.cvsignore deleted file mode 100644 index ffff87836c0..00000000000 --- a/dlls/setupx/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -*.spec.c -*.spec.glue.s -Makefile -libsetupx.so.1.0 diff --git a/dlls/setupx/Makefile.in b/dlls/setupx/Makefile.in deleted file mode 100644 index ca2d6a3234d..00000000000 --- a/dlls/setupx/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = setupx -SOVERSION = 1.0 - -C_SRCS = \ - setupx_main.c - -@MAKE_DLL_RULES@ - -### Dependencies: diff --git a/dlls/sound/.cvsignore b/dlls/sound/.cvsignore deleted file mode 100644 index bf7fa35186a..00000000000 --- a/dlls/sound/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -*.spec.c -*.spec.glue.s -Makefile -libsound.so.1.0 diff --git a/dlls/sound/Makefile.in b/dlls/sound/Makefile.in deleted file mode 100644 index 3a66b258f99..00000000000 --- a/dlls/sound/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = sound -SOVERSION = 1.0 - -C_SRCS = \ - sound_main.c - -@MAKE_DLL_RULES@ - -### Dependencies: - diff --git a/dlls/stress/.cvsignore b/dlls/stress/.cvsignore deleted file mode 100644 index 75aa39e70e1..00000000000 --- a/dlls/stress/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -*.spec.c -*.spec.glue.s -Makefile -libstress.so.1.0 diff --git a/dlls/stress/Makefile.in b/dlls/stress/Makefile.in deleted file mode 100644 index 8c834f5b65f..00000000000 --- a/dlls/stress/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = stress -SOVERSION = 1.0 - -C_SRCS = \ - stress_main.c - -@MAKE_DLL_RULES@ - -### Dependencies: - diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index a12a250cbad..4c145edf742 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winmm SOVERSION = 1.0 -ALTNAMES = mmsystem +ALTNAMES = mmsystem sound C_SRCS = \ joystick.c \ @@ -12,6 +12,7 @@ C_SRCS = \ mci.c \ mmio.c \ mmsystem.c \ + sound16.c \ time.c GLUE = lolvldrv.c \ diff --git a/dlls/sound/sound.spec b/dlls/winmm/sound.spec similarity index 100% rename from dlls/sound/sound.spec rename to dlls/winmm/sound.spec diff --git a/dlls/sound/sound_main.c b/dlls/winmm/sound16.c similarity index 55% rename from dlls/sound/sound_main.c rename to dlls/winmm/sound16.c index 6212412421b..5ad9aa1406e 100644 --- a/dlls/sound/sound_main.c +++ b/dlls/winmm/sound16.c @@ -1,10 +1,11 @@ /* + * 16-bit sound support + * * Copyright Robert J. Amstadt, 1993 */ #include #include "windef.h" -#include "wine/winesound.h" #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(sound); @@ -18,14 +19,6 @@ INT16 WINAPI OpenSound16(void) return -1; } -/*********************************************************************** - * OpenSound - */ -void WINAPI OpenSound(void) -{ - FIXME("(void): stub\n"); -} - /*********************************************************************** * CloseSound16 */ @@ -43,15 +36,6 @@ INT16 WINAPI SetVoiceQueueSize16(INT16 nVoice, INT16 nBytes) return 0; } -/*********************************************************************** - * SetVoiceQueueSize - */ -DWORD WINAPI SetVoiceQueueSize(DWORD nVoice, DWORD nBytes) -{ - FIXME("(%ld,%ld): stub\n",nVoice,nBytes); - return 0; -} - /*********************************************************************** * SetVoiceNote16 */ @@ -62,16 +46,6 @@ INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength, return 0; } -/*********************************************************************** - * SetVoiceNote - */ -DWORD WINAPI SetVoiceNote(DWORD nVoice, DWORD nValue, DWORD nLength, - DWORD nCdots) -{ - FIXME("(%ld,%ld,%ld,%ld): stub\n",nVoice,nValue,nLength,nCdots); - return 0; -} - /*********************************************************************** * SetVoiceAccent16 */ @@ -83,17 +57,6 @@ INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume, return 0; } -/*********************************************************************** - * SetVoiceAccent - */ -DWORD WINAPI SetVoiceAccent(DWORD nVoice, DWORD nTempo, DWORD nVolume, - DWORD nMode, DWORD nPitch) -{ - FIXME("(%ld,%ld,%ld,%ld,%ld): stub\n", nVoice, nTempo, - nVolume, nMode, nPitch); - return 0; -} - /*********************************************************************** * SetVoiceEnvelope16 */ @@ -103,15 +66,6 @@ INT16 WINAPI SetVoiceEnvelope16(INT16 nVoice, INT16 nShape, INT16 nRepeat) return 0; } -/*********************************************************************** - * SetVoiceEnvelope - */ -DWORD WINAPI SetVoiceEnvelope(DWORD nVoice, DWORD nShape, DWORD nRepeat) -{ - FIXME("(%ld,%ld,%ld): stub\n",nVoice,nShape,nRepeat); - return 0; -} - /*********************************************************************** * SetSoundNoise16 */ @@ -121,15 +75,6 @@ INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration) return 0; } -/*********************************************************************** - * SetSoundNoise - */ -DWORD WINAPI SetSoundNoise(DWORD nSource, DWORD nDuration) -{ - FIXME("(%ld,%ld): stub\n",nSource,nDuration); - return 0; -} - /*********************************************************************** * SetVoiceSound16 */ @@ -139,15 +84,6 @@ INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration) return 0; } -/*********************************************************************** - * SetVoiceSound - */ -DWORD WINAPI SetVoiceSound(DWORD nVoice, DWORD lFrequency, DWORD nDuration) -{ - FIXME("(%ld, %ld, %ld): stub\n",nVoice,lFrequency, nDuration); - return 0; -} - /*********************************************************************** * StartSound16 */ @@ -173,15 +109,6 @@ INT16 WINAPI WaitSoundState16(INT16 x) return 0; } -/*********************************************************************** - * WaitSoundState - */ -DWORD WINAPI WaitSoundState(DWORD x) -{ - FIXME("(%ld): stub\n", x); - return 0; -} - /*********************************************************************** * SyncAllVoices16 */ @@ -191,15 +118,6 @@ INT16 WINAPI SyncAllVoices16(void) return 0; } -/*********************************************************************** - * SyncAllVoices - */ -DWORD WINAPI SyncAllVoices(void) -{ - FIXME("(void): stub\n"); - return 0; -} - /*********************************************************************** * CountVoiceNotes16 */ @@ -209,15 +127,6 @@ INT16 WINAPI CountVoiceNotes16(INT16 x) return 0; } -/*********************************************************************** - * CountVoiceNotes - */ -DWORD WINAPI CountVoiceNotes(DWORD x) -{ - FIXME("(%ld): stub\n", x); - return 0; -} - /*********************************************************************** * GetThresholdEvent16 */ @@ -227,15 +136,6 @@ LPINT16 WINAPI GetThresholdEvent16(void) return NULL; } -/*********************************************************************** - * GetThresholdEvent - */ -LPDWORD WINAPI GetThresholdEvent(void) -{ - FIXME("(void): stub\n"); - return NULL; -} - /*********************************************************************** * GetThresholdStatus16 */ @@ -245,15 +145,6 @@ INT16 WINAPI GetThresholdStatus16(void) return 0; } -/*********************************************************************** - * GetThresholdStatus - */ -DWORD WINAPI GetThresholdStatus(void) -{ - FIXME("(void): stub\n"); - return 0; -} - /*********************************************************************** * SetVoiceThreshold16 */ @@ -263,15 +154,6 @@ INT16 WINAPI SetVoiceThreshold16(INT16 a, INT16 b) return 0; } -/*********************************************************************** - * SetVoiceThreshold - */ -DWORD WINAPI SetVoiceThreshold(DWORD a, DWORD b) -{ - FIXME("(%ld,%ld): stub\n", a, b); - return 0; -} - /*********************************************************************** * DoBeep16 */ diff --git a/include/stress.h b/include/stress.h deleted file mode 100644 index 61b6a96a9ac..00000000000 --- a/include/stress.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef __WINE_STRESS_H -#define __WINE_STRESS_H - -#include "windef.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define EDS_WIN 1 -#define EDS_CUR 2 -#define EDS_TEMP 3 - -BOOL16 WINAPI AllocGDIMem(UINT16); -BOOL16 WINAPI AllocMem(DWORD); -BOOL16 WINAPI AllocUserMem(UINT16); -INT16 WINAPI AllocDiskSpace(LONG, UINT16); -INT16 WINAPI AllocFileHandles(INT16); -INT16 WINAPI GetFreeFileHandles(void); -void WINAPI FreeAllGDIMem(void); -void WINAPI FreeAllMem(void); -void WINAPI FreeAllUserMem(void); -void WINAPI UnAllocDiskSpace(UINT16); -void WINAPI UnAllocFileHandles(void); - -#ifdef __cplusplus -} -#endif - -#endif /* __WINE_STRESS_H */ diff --git a/include/wine/winesound.h b/include/wine/winesound.h deleted file mode 100644 index 950eaf4d294..00000000000 --- a/include/wine/winesound.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef __WINE_WINE_WINESOUND_H -#define __WINE_WINE_WINESOUND_H - -#include "windef.h" - -VOID WINAPI CloseSound16(VOID); -INT16 WINAPI CountVoiceNotes16(INT16); -DWORD WINAPI CountVoiceNotes(DWORD); -LPINT16 WINAPI GetThresholdEvent16(void); -LPDWORD WINAPI GetThresholdEvent(void); -INT16 WINAPI GetThresholdStatus16(void); -DWORD WINAPI GetThresholdStatus(void); -INT16 WINAPI OpenSound16(void); -VOID WINAPI OpenSound(void); -INT16 WINAPI SetSoundNoise16(INT16,INT16); -DWORD WINAPI SetSoundNoise(DWORD,DWORD); -INT16 WINAPI SetVoiceAccent16(INT16,INT16,INT16,INT16,INT16); -DWORD WINAPI SetVoiceAccent(DWORD,DWORD,DWORD,DWORD,DWORD); -INT16 WINAPI SetVoiceEnvelope16(INT16,INT16,INT16); -DWORD WINAPI SetVoiceEnvelope(DWORD,DWORD,DWORD); -INT16 WINAPI SetVoiceNote16(INT16,INT16,INT16,INT16); -DWORD WINAPI SetVoiceNote(DWORD,DWORD,DWORD,DWORD); -INT16 WINAPI SetVoiceQueueSize16(INT16,INT16); -DWORD WINAPI SetVoiceQueueSize(DWORD,DWORD); -INT16 WINAPI SetVoiceSound16(INT16,DWORD,INT16); -DWORD WINAPI SetVoiceSound(DWORD,DWORD,DWORD); -INT16 WINAPI SetVoiceThreshold16(INT16,INT16); -DWORD WINAPI SetVoiceThreshold(DWORD,DWORD); -INT16 WINAPI StartSound16(void); -VOID WINAPI StartSound(void); -INT16 WINAPI StopSound16(void); -VOID WINAPI StopSound(void); -INT16 WINAPI SyncAllVoices16(void); -DWORD WINAPI SyncAllVoices(void); -INT16 WINAPI WaitSoundState16(INT16); -DWORD WINAPI WaitSoundState(DWORD); - -#endif /* __WINE_WINE_WINESOUND_H */