Skip to content
Snippets Groups Projects
Commit a3502ccf authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

Merged setupx.dll into setupapi.dll.

Merged sound.dll into winmm.dll.
Merged stress.dll into kernel32.dll.
parent ac3ff1a8
No related branches found
No related tags found
No related merge requests found
Showing
with 18 additions and 207 deletions
......@@ -134,12 +134,9 @@ DLLS = \
rpcrt4 \
serialui \
setupapi \
setupx \
shell32 \
shfolder \
shlwapi \
sound \
stress \
tapi32 \
ttydrv \
urlmon \
......
......@@ -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
......
......@@ -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
......
......@@ -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@
......
......@@ -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 \
......
#include <limits.h>
#include "stress.h"
#include "windef.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(stress);
......
File moved
Makefile
libsetupapi.so.1.0
setupapi.spec.c
setupx.spec.c
......@@ -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@
......
File moved
File moved
*.spec.c
*.spec.glue.s
Makefile
libsetupx.so.1.0
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = setupx
SOVERSION = 1.0
C_SRCS = \
setupx_main.c
@MAKE_DLL_RULES@
### Dependencies:
*.spec.c
*.spec.glue.s
Makefile
libsound.so.1.0
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = sound
SOVERSION = 1.0
C_SRCS = \
sound_main.c
@MAKE_DLL_RULES@
### Dependencies:
*.spec.c
*.spec.glue.s
Makefile
libstress.so.1.0
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = stress
SOVERSION = 1.0
C_SRCS = \
stress_main.c
@MAKE_DLL_RULES@
### Dependencies:
......@@ -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 \
......
File moved
/*
* 16-bit sound support
*
* Copyright Robert J. Amstadt, 1993
*/
#include <stdlib.h>
#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
*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment