Skip to content

W
wine-winehq
Commit a3502ccf authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Merged setupx.dll into setupapi.dll.

Merged sound.dll into winmm.dll. Merged stress.dll into kernel32.dll.
parent ac3ff1a8
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 275 deletions
Make.rules.in
View file @ a3502ccf
......@@ -134,12 +134,9 @@ DLLS = \
rpcrt4 \
serialui \
setupapi \
setupx \
shell32 \
shfolder \
shlwapi \
sound \
stress \
tapi32 \
ttydrv \
urlmon \
......
configure
View file @ a3502ccf
......@@ -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
......
configure.in
View file @ a3502ccf
......@@ -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
......
dlls/Makefile.in
View file @ a3502ccf
......@@ -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@
......
dlls/kernel/Makefile.in
View file @ a3502ccf
......@@ -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 \
......
dlls/stress/stress_main.c → dlls/kernel/stress.c
View file @ a3502ccf
#include <limits.h>
#include "stress.h"
#include "windef.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(stress);
......
dlls/setupapi/.cvsignore
View file @ a3502ccf
Makefile
libsetupapi.so.1.0
setupapi.spec.c
setupx.spec.c
dlls/setupapi/Makefile.in
View file @ a3502ccf
......@@ -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@
......
dlls/setupx/.cvsignore deleted 100644 → 0
View file @ ac3ff1a8
*.spec.c
*.spec.glue.s
Makefile
libsetupx.so.1.0
dlls/setupx/Makefile.in deleted 100644 → 0
View file @ ac3ff1a8
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = setupx
SOVERSION = 1.0
C_SRCS = \
setupx_main.c
@MAKE_DLL_RULES@
### Dependencies:
dlls/sound/.cvsignore deleted 100644 → 0
View file @ ac3ff1a8
*.spec.c
*.spec.glue.s
Makefile
libsound.so.1.0
dlls/sound/Makefile.in deleted 100644 → 0
View file @ ac3ff1a8
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = sound
SOVERSION = 1.0
C_SRCS = \
sound_main.c
@MAKE_DLL_RULES@
### Dependencies:
dlls/stress/.cvsignore deleted 100644 → 0
View file @ ac3ff1a8
*.spec.c
*.spec.glue.s
Makefile
libstress.so.1.0
dlls/stress/Makefile.in deleted 100644 → 0
View file @ ac3ff1a8
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = stress
SOVERSION = 1.0
C_SRCS = \
stress_main.c
@MAKE_DLL_RULES@
### Dependencies:
dlls/winmm/Makefile.in
View file @ a3502ccf
......@@ -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 \
......
dlls/sound/sound_main.c → dlls/winmm/sound16.c
View file @ a3502ccf
/*
* 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);
......@@ -19,14 +20,6 @@ INT16 WINAPI OpenSound16(void)
}
/***********************************************************************
* OpenSound
*/
void WINAPI OpenSound(void)
{
FIXME("(void): stub\n");
}
/***********************************************************************
* CloseSound16
*/
void WINAPI CloseSound16(void)
......@@ -44,15 +37,6 @@ INT16 WINAPI SetVoiceQueueSize16(INT16 nVoice, INT16 nBytes)
}
/***********************************************************************
* SetVoiceQueueSize
*/
DWORD WINAPI SetVoiceQueueSize(DWORD nVoice, DWORD nBytes)
{
FIXME("(%ld,%ld): stub\n",nVoice,nBytes);
return 0;
}
/***********************************************************************
* SetVoiceNote16
*/
INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength,
......@@ -63,16 +47,6 @@ INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength,
}
/***********************************************************************
* 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
*/
INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume,
......@@ -84,17 +58,6 @@ INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume,
}
/***********************************************************************
* 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
*/
INT16 WINAPI SetVoiceEnvelope16(INT16 nVoice, INT16 nShape, INT16 nRepeat)
......@@ -104,15 +67,6 @@ INT16 WINAPI SetVoiceEnvelope16(INT16 nVoice, INT16 nShape, INT16 nRepeat)
}
/***********************************************************************
* SetVoiceEnvelope
*/
DWORD WINAPI SetVoiceEnvelope(DWORD nVoice, DWORD nShape, DWORD nRepeat)
{
FIXME("(%ld,%ld,%ld): stub\n",nVoice,nShape,nRepeat);
return 0;
}
/***********************************************************************
* SetSoundNoise16
*/
INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration)
......@@ -122,15 +76,6 @@ INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration)
}
/***********************************************************************
* SetSoundNoise
*/
DWORD WINAPI SetSoundNoise(DWORD nSource, DWORD nDuration)
{
FIXME("(%ld,%ld): stub\n",nSource,nDuration);
return 0;
}
/***********************************************************************
* SetVoiceSound16
*/
INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration)
......@@ -140,15 +85,6 @@ INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration)
}
/***********************************************************************
* SetVoiceSound
*/
DWORD WINAPI SetVoiceSound(DWORD nVoice, DWORD lFrequency, DWORD nDuration)
{
FIXME("(%ld, %ld, %ld): stub\n",nVoice,lFrequency, nDuration);
return 0;
}
/***********************************************************************
* StartSound16
*/
INT16 WINAPI StartSound16(void)
......@@ -174,15 +110,6 @@ INT16 WINAPI WaitSoundState16(INT16 x)
}
/***********************************************************************
* WaitSoundState
*/
DWORD WINAPI WaitSoundState(DWORD x)
{
FIXME("(%ld): stub\n", x);
return 0;
}
/***********************************************************************
* SyncAllVoices16
*/
INT16 WINAPI SyncAllVoices16(void)
......@@ -192,15 +119,6 @@ INT16 WINAPI SyncAllVoices16(void)
}
/***********************************************************************
* SyncAllVoices
*/
DWORD WINAPI SyncAllVoices(void)
{
FIXME("(void): stub\n");
return 0;
}
/***********************************************************************
* CountVoiceNotes16
*/
INT16 WINAPI CountVoiceNotes16(INT16 x)
......@@ -210,15 +128,6 @@ INT16 WINAPI CountVoiceNotes16(INT16 x)
}
/***********************************************************************
* CountVoiceNotes
*/
DWORD WINAPI CountVoiceNotes(DWORD x)
{
FIXME("(%ld): stub\n", x);
return 0;
}
/***********************************************************************
* GetThresholdEvent16
*/
LPINT16 WINAPI GetThresholdEvent16(void)
......@@ -228,15 +137,6 @@ LPINT16 WINAPI GetThresholdEvent16(void)
}
/***********************************************************************
* GetThresholdEvent
*/
LPDWORD WINAPI GetThresholdEvent(void)
{
FIXME("(void): stub\n");
return NULL;
}
/***********************************************************************
* GetThresholdStatus16
*/
INT16 WINAPI GetThresholdStatus16(void)
......@@ -246,15 +146,6 @@ INT16 WINAPI GetThresholdStatus16(void)
}
/***********************************************************************
* GetThresholdStatus
*/
DWORD WINAPI GetThresholdStatus(void)
{
FIXME("(void): stub\n");
return 0;
}
/***********************************************************************
* SetVoiceThreshold16
*/
INT16 WINAPI SetVoiceThreshold16(INT16 a, INT16 b)
......@@ -264,15 +155,6 @@ INT16 WINAPI SetVoiceThreshold16(INT16 a, INT16 b)
}
/***********************************************************************
* SetVoiceThreshold
*/
DWORD WINAPI SetVoiceThreshold(DWORD a, DWORD b)
{
FIXME("(%ld,%ld): stub\n", a, b);
return 0;
}
/***********************************************************************
* DoBeep16
*/
void WINAPI DoBeep16(void)
......
include/stress.h deleted 100644 → 0
View file @ ac3ff1a8
#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 */
include/wine/winesound.h deleted 100644 → 0
View file @ ac3ff1a8
#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 */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment