[DSOUND_NEW] Add CMakeLists.txt + mostly fix gcc compilation

This commit is contained in:
Oleg Dubinskiy 2019-06-20 12:37:00 +03:00 committed by Timo Kreuzer
parent 9590cd15f4
commit 25e98eb0da
9 changed files with 57 additions and 24 deletions

View file

@ -0,0 +1,30 @@
spec2def(dsound.dll dsound.spec ADD_IMPORTLIB)
list(APPEND SOURCE
capture.c
capturebuffer.c
classfactory.c
devicelist.c
directsound.c
dsound.c
enum.c
misc.c
notify.c
primary.c
property.c
regsvr.c
secondary.c
stubs.c
precomp.h
resource.h)
add_library(dsound MODULE
${SOURCE}
version.rc)
set_module_type(dsound win32dll)
target_link_libraries(dsound dxguid uuid)
add_importlibs(dsound winmm advapi32 msvcrt kernel32 ntdll)
add_pch(dsound precomp.h SOURCE)
add_cd_file(TARGET dsound DESTINATION reactos/system32 FOR all)

View file

@ -641,7 +641,7 @@ IDirectSoundCaptureBufferImpl_GetObjectInPath(
REFGUID rguidInterface, REFGUID rguidInterface,
LPVOID* ppObject ) LPVOID* ppObject )
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
@ -652,7 +652,7 @@ IDirectSoundCaptureBufferImpl_GetFXStatus(
DWORD dwFXCount, DWORD dwFXCount,
LPDWORD pdwFXStatus ) LPDWORD pdwFXStatus )
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }

View file

@ -26,15 +26,12 @@ PerformChannelConversion(
ULONG ResultLength, ULONG ResultLength,
PULONG BytesWritten) PULONG BytesWritten)
{ {
DWORD Samples;
DWORD NewIndex, OldIndex; DWORD NewIndex, OldIndex;
DWORD NewLength, Skip; DWORD NewLength, Skip;
Samples = BufferLength / (BitsPerSample / 8) / OldChannels;
if (NewChannels > OldChannels) if (NewChannels > OldChannels)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
ASSERT(0); ASSERT(0);
} }
@ -546,7 +543,7 @@ CreateCompatiblePin(
{ {
if (AudioRange->DataRange.FormatSize != sizeof(KSDATARANGE_AUDIO)) if (AudioRange->DataRange.FormatSize != sizeof(KSDATARANGE_AUDIO))
{ {
UNIMPLEMENTED UNIMPLEMENTED;
AudioRange = (PKSDATARANGE_AUDIO)((PUCHAR)AudioRange + AudioRange->DataRange.FormatSize); AudioRange = (PKSDATARANGE_AUDIO)((PUCHAR)AudioRange + AudioRange->DataRange.FormatSize);
continue; continue;
} }

View file

@ -1,4 +1,5 @@
#pragma once #ifndef PRECOMP_H
#define PRECOMP_H
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION #define NONAMELESSUNION
@ -266,3 +267,5 @@ NewDirectSoundNotify(
BOOL bMix, BOOL bMix,
HANDLE hPin, HANDLE hPin,
DWORD BufferSize); DWORD BufferSize);
#endif

View file

@ -312,7 +312,7 @@ PrimaryDirectSoundBuffer8Impl_fnLock(
LPDWORD pdwAudioBytes2, LPDWORD pdwAudioBytes2,
DWORD dwFlags) DWORD dwFlags)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
@ -500,7 +500,7 @@ PrimaryDirectSoundBuffer8Impl_fnUnlock(
LPVOID pvAudioPtr2, LPVOID pvAudioPtr2,
DWORD dwAudioBytes2) DWORD dwAudioBytes2)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
@ -510,7 +510,7 @@ WINAPI
PrimaryDirectSoundBuffer8Impl_fnRestore( PrimaryDirectSoundBuffer8Impl_fnRestore(
LPDIRECTSOUNDBUFFER8 iface) LPDIRECTSOUNDBUFFER8 iface)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
@ -523,7 +523,7 @@ PrimaryDirectSoundBuffer8Impl_fnSetFX(
LPDSEFFECTDESC pDSFXDesc, LPDSEFFECTDESC pDSFXDesc,
LPDWORD pdwResultCodes) LPDWORD pdwResultCodes)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
@ -535,7 +535,7 @@ PrimaryDirectSoundBuffer8Impl_fnAcquireResources(
DWORD dwEffectsCount, DWORD dwEffectsCount,
LPDWORD pdwResultCodes) LPDWORD pdwResultCodes)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
@ -548,7 +548,7 @@ PrimaryDirectSoundBuffer8Impl_fnGetObjectInPath(
REFGUID rguidInterface, REFGUID rguidInterface,
LPVOID *ppObject) LPVOID *ppObject)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }

View file

@ -196,7 +196,7 @@ KSPropertySetImpl_Get(
} }
UNIMPLEMENTED UNIMPLEMENTED;
return E_PROP_ID_UNSUPPORTED; return E_PROP_ID_UNSUPPORTED;
} }
@ -211,7 +211,7 @@ KSPropertySetImpl_Set(
LPVOID pPropData, LPVOID pPropData,
ULONG cbPropData ) ULONG cbPropData )
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return E_PROP_ID_UNSUPPORTED; return E_PROP_ID_UNSUPPORTED;
} }
@ -223,7 +223,7 @@ KSPropertySetImpl_QuerySupport(
ULONG dwPropID, ULONG dwPropID,
PULONG pTypeSupport ) PULONG pTypeSupport )
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return E_PROP_ID_UNSUPPORTED; return E_PROP_ID_UNSUPPORTED;
} }

View file

@ -1,4 +1,7 @@
#pragma once #ifndef RESOURCE_H
#define RESOURCE_H
#define IDS_PRIMARY_PLAYBACK_DEVICE 100 #define IDS_PRIMARY_PLAYBACK_DEVICE 100
#define IDS_PRIMARY_RECORD_DEVICE 101 #define IDS_PRIMARY_RECORD_DEVICE 101
#endif

View file

@ -316,7 +316,7 @@ SecondaryDirectSoundBuffer8Impl_fnLock(
} }
else if (dwFlags == DSBLOCK_FROMWRITECURSOR) else if (dwFlags == DSBLOCK_FROMWRITECURSOR)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_UNSUPPORTED; return DSERR_UNSUPPORTED;
} }
else else
@ -534,7 +534,7 @@ WINAPI
SecondaryDirectSoundBuffer8Impl_fnRestore( SecondaryDirectSoundBuffer8Impl_fnRestore(
LPDIRECTSOUNDBUFFER8 iface) LPDIRECTSOUNDBUFFER8 iface)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
@ -547,7 +547,7 @@ SecondaryDirectSoundBuffer8Impl_fnSetFX(
LPDSEFFECTDESC pDSFXDesc, LPDSEFFECTDESC pDSFXDesc,
LPDWORD pdwResultCodes) LPDWORD pdwResultCodes)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
@ -559,7 +559,7 @@ SecondaryDirectSoundBuffer8Impl_fnAcquireResources(
DWORD dwEffectsCount, DWORD dwEffectsCount,
LPDWORD pdwResultCodes) LPDWORD pdwResultCodes)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
@ -572,7 +572,7 @@ SecondaryDirectSoundBuffer8Impl_fnGetObjectInPath(
REFGUID rguidInterface, REFGUID rguidInterface,
LPVOID *ppObject) LPVOID *ppObject)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }

View file

@ -23,7 +23,7 @@ DirectSoundFullDuplexCreate(
LPDIRECTSOUNDBUFFER8 *ppDSBuffer8, LPDIRECTSOUNDBUFFER8 *ppDSBuffer8,
LPUNKNOWN pUnkOuter) LPUNKNOWN pUnkOuter)
{ {
UNIMPLEMENTED UNIMPLEMENTED;
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }