system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 19:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged setupx.dll into setupapi.dll.

Browse source 
Merged sound.dll into winmm.dll.
Merged stress.dll into kernel32.dll.
This commit is contained in:
Alexandre Julliard 2000-07-26 19:51:37 +00:00
parent ac3ff1a82e
commit a3502ccf93
22 changed files with 18 additions and 275 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Make.rules.in
View file

@ -134,12 +134,9 @@ DLLS = \
rpcrt4 \
serialui \
setupapi \
setupx \
shell32 \
shfolder \
shlwapi \
sound \
stress \
tapi32 \
ttydrv \
urlmon \

6
configure vendored
View file

@ -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

3
configure.in
View file

@ -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

24
dlls/Makefile.in
View file

@ -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@

3
dlls/kernel/Makefile.in
View file

@ -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 \

2
dlls/stress/stress_main.c → dlls/kernel/stress.c
View file

@ -1,5 +1,5 @@
#include <limits.h>
#include "stress.h"
#include "windef.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(stress);

0
dlls/stress/stress.spec → dlls/kernel/stress.spec
View file

1
dlls/setupapi/.cvsignore
View file

@ -1,3 +1,4 @@
Makefile
libsetupapi.so.1.0
setupapi.spec.c
setupx.spec.c

5
dlls/setupapi/Makefile.in
View file

@ -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@

0
dlls/setupx/setupx.spec → dlls/setupapi/setupx.spec
View file

0
dlls/setupx/setupx_main.c → dlls/setupapi/setupx_main.c
View file

4
dlls/setupx/.cvsignore
View file

@ -1,4 +0,0 @@
*.spec.c
*.spec.glue.s
Makefile
libsetupx.so.1.0

13
dlls/setupx/Makefile.in
View file

@ -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:

4
dlls/sound/.cvsignore
View file

@ -1,4 +0,0 @@
*.spec.c
*.spec.glue.s
Makefile
libsound.so.1.0

14
dlls/sound/Makefile.in
View file

@ -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:

4
dlls/stress/.cvsignore
View file

@ -1,4 +0,0 @@
*.spec.c
*.spec.glue.s
Makefile
libstress.so.1.0

14
dlls/stress/Makefile.in
View file

@ -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:

3
dlls/winmm/Makefile.in
View file

@ -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 \

0
dlls/sound/sound.spec → dlls/winmm/sound.spec
View file

122
dlls/sound/sound_main.c → dlls/winmm/sound16.c
View file

@ -1,10 +1,11 @@
/*
* 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
*/

30
include/stress.h
View file

@ -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 */

38
include/wine/winesound.h
View file

@ -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 */