#include <winreg.h>
#include <rpcproxy.h>
-struct list DSOUND_renderers = LIST_INIT(DSOUND_renderers);
-CRITICAL_SECTION DSOUND_renderers_lock;
-static CRITICAL_SECTION_DEBUG DSOUND_renderers_lock_debug =
-{
- 0, 0, &DSOUND_renderers_lock,
- { &DSOUND_renderers_lock_debug.ProcessLocksList, &DSOUND_renderers_lock_debug.ProcessLocksList },
- 0, 0, { (DWORD_PTR)(__FILE__ ": DSOUND_renderers_lock") }
-};
-CRITICAL_SECTION DSOUND_renderers_lock = { &DSOUND_renderers_lock_debug, -1, 0, 0, 0, 0 };
-
-struct list DSOUND_capturers = LIST_INIT(DSOUND_capturers);
-CRITICAL_SECTION DSOUND_capturers_lock;
-static CRITICAL_SECTION_DEBUG DSOUND_capturers_lock_debug =
-{
- 0, 0, &DSOUND_capturers_lock,
- { &DSOUND_capturers_lock_debug.ProcessLocksList, &DSOUND_capturers_lock_debug.ProcessLocksList },
- 0, 0, { (DWORD_PTR)(__FILE__ ": DSOUND_capturers_lock") }
-};
-CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, 0, 0, 0 };
-
+DirectSoundDevice* DSOUND_renderer[MAXWAVEDRIVERS];
GUID DSOUND_renderer_guids[MAXWAVEDRIVERS];
GUID DSOUND_capture_guids[MAXWAVEDRIVERS];
-WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 };
+HRESULT mmErr(UINT err)
+{
+ switch(err) {
+ case MMSYSERR_NOERROR:
+ return DS_OK;
+ case MMSYSERR_ALLOCATED:
+ return DSERR_ALLOCATED;
+ case MMSYSERR_ERROR:
+ case MMSYSERR_INVALHANDLE:
+ case WAVERR_STILLPLAYING:
+ return DSERR_GENERIC; /* FIXME */
+ case MMSYSERR_NODRIVER:
+ return DSERR_NODRIVER;
+ case MMSYSERR_NOMEM:
+ return DSERR_OUTOFMEMORY;
+ case MMSYSERR_INVALPARAM:
+ case WAVERR_BADFORMAT:
+ case WAVERR_UNPREPARED:
+ return DSERR_INVALIDPARAM;
+ case MMSYSERR_NOTSUPPORTED:
+ return DSERR_UNSUPPORTED;
+ default:
+ FIXME("Unknown MMSYS error %d\n",err);
+ return DSERR_GENERIC;
+ }
+}
/* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */
+int ds_emuldriver = 0;
int ds_hel_buflen = 32768 * 2;
int ds_snd_queue_max = 10;
+int ds_snd_queue_min = 6;
+int ds_snd_shadow_maxsize = 2;
+int ds_hw_accel = DS_HW_ACCEL_FULL;
+int ds_default_sample_rate = 44100;
+int ds_default_bits_per_sample = 16;
+static int ds_default_playback;
+static int ds_default_capture;
static HINSTANCE instance;
/*
/* get options */
+ if (!get_config_key( hkey, appkey, "EmulDriver", buffer, MAX_PATH ))
+ ds_emuldriver = strcmp(buffer, "N");
+
if (!get_config_key( hkey, appkey, "HelBuflen", buffer, MAX_PATH ))
ds_hel_buflen = atoi(buffer);
if (!get_config_key( hkey, appkey, "SndQueueMax", buffer, MAX_PATH ))
ds_snd_queue_max = atoi(buffer);
+ if (!get_config_key( hkey, appkey, "SndQueueMin", buffer, MAX_PATH ))
+ ds_snd_queue_min = atoi(buffer);
+
+ if (!get_config_key( hkey, appkey, "HardwareAcceleration", buffer, MAX_PATH )) {
+ if (strcmp(buffer, "Full") == 0)
+ ds_hw_accel = DS_HW_ACCEL_FULL;
+ else if (strcmp(buffer, "Standard") == 0)
+ ds_hw_accel = DS_HW_ACCEL_STANDARD;
+ else if (strcmp(buffer, "Basic") == 0)
+ ds_hw_accel = DS_HW_ACCEL_BASIC;
+ else if (strcmp(buffer, "Emulation") == 0)
+ ds_hw_accel = DS_HW_ACCEL_EMULATION;
+ }
+
+ if (!get_config_key( hkey, appkey, "DefaultPlayback", buffer, MAX_PATH ))
+ ds_default_playback = atoi(buffer);
+
+ if (!get_config_key( hkey, appkey, "MaxShadowSize", buffer, MAX_PATH ))
+ ds_snd_shadow_maxsize = atoi(buffer);
+
+ if (!get_config_key( hkey, appkey, "DefaultCapture", buffer, MAX_PATH ))
+ ds_default_capture = atoi(buffer);
+
+ if (!get_config_key( hkey, appkey, "DefaultSampleRate", buffer, MAX_PATH ))
+ ds_default_sample_rate = atoi(buffer);
+
+ if (!get_config_key( hkey, appkey, "DefaultBitsPerSample", buffer, MAX_PATH ))
+ ds_default_bits_per_sample = atoi(buffer);
if (appkey) RegCloseKey( appkey );
if (hkey) RegCloseKey( hkey );
+ TRACE("ds_emuldriver = %d\n", ds_emuldriver);
TRACE("ds_hel_buflen = %d\n", ds_hel_buflen);
TRACE("ds_snd_queue_max = %d\n", ds_snd_queue_max);
+ TRACE("ds_snd_queue_min = %d\n", ds_snd_queue_min);
+ TRACE("ds_hw_accel = %s\n",
+ ds_hw_accel==DS_HW_ACCEL_FULL ? "Full" :
+ ds_hw_accel==DS_HW_ACCEL_STANDARD ? "Standard" :
+ ds_hw_accel==DS_HW_ACCEL_BASIC ? "Basic" :
+ ds_hw_accel==DS_HW_ACCEL_EMULATION ? "Emulation" :
+ "Unknown");
+ TRACE("ds_default_playback = %d\n", ds_default_playback);
+ TRACE("ds_default_capture = %d\n", ds_default_playback);
+ TRACE("ds_default_sample_rate = %d\n", ds_default_sample_rate);
+ TRACE("ds_default_bits_per_sample = %d\n", ds_default_bits_per_sample);
+ TRACE("ds_snd_shadow_maxsize = %d\n", ds_snd_shadow_maxsize);
}
static const char * get_device_id(LPCGUID pGuid)
return debugstr_guid(pGuid);
}
-static HRESULT get_mmdevenum(IMMDeviceEnumerator **devenum)
-{
- HRESULT hr, init_hr;
-
- init_hr = CoInitialize(NULL);
-
- hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL,
- CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)devenum);
- if(FAILED(hr)){
- if(SUCCEEDED(init_hr))
- CoUninitialize();
- *devenum = NULL;
- ERR("CoCreateInstance failed: %08x\n", hr);
- return hr;
- }
-
- return init_hr;
-}
-
-static void release_mmdevenum(IMMDeviceEnumerator *devenum, HRESULT init_hr)
-{
- IMMDeviceEnumerator_Release(devenum);
- if(SUCCEEDED(init_hr))
- CoUninitialize();
-}
-
-static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps,
- GUID *guid)
-{
- PROPVARIANT pv;
- HRESULT hr;
-
- if(!ps){
- hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps);
- if(FAILED(hr)){
- WARN("OpenPropertyStore failed: %08x\n", hr);
- return hr;
- }
- }else
- IPropertyStore_AddRef(ps);
-
- PropVariantInit(&pv);
-
- hr = IPropertyStore_GetValue(ps, &PKEY_AudioEndpoint_GUID, &pv);
- if(FAILED(hr)){
- IPropertyStore_Release(ps);
- WARN("GetValue(GUID) failed: %08x\n", hr);
- return hr;
- }
-
- CLSIDFromString(pv.u.pwszVal, guid);
-
- PropVariantClear(&pv);
- IPropertyStore_Release(ps);
-
- return S_OK;
-}
-
/***************************************************************************
* GetDeviceID [DSOUND.9]
*
*/
HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest)
{
- IMMDeviceEnumerator *devenum;
- EDataFlow flow = (EDataFlow)-1;
- ERole role = (ERole)-1;
- HRESULT hr, init_hr;
-
TRACE("(%s,%p)\n", get_device_id(pGuidSrc),pGuidDest);
- if(!pGuidSrc || !pGuidDest)
- return DSERR_INVALIDPARAM;
-
- init_hr = get_mmdevenum(&devenum);
- if(!devenum)
- return init_hr;
-
- if(IsEqualGUID(&DSDEVID_DefaultPlayback, pGuidSrc)){
- role = eMultimedia;
- flow = eRender;
- }else if(IsEqualGUID(&DSDEVID_DefaultVoicePlayback, pGuidSrc)){
- role = eCommunications;
- flow = eRender;
- }else if(IsEqualGUID(&DSDEVID_DefaultCapture, pGuidSrc)){
- role = eMultimedia;
- flow = eCapture;
- }else if(IsEqualGUID(&DSDEVID_DefaultVoiceCapture, pGuidSrc)){
- role = eCommunications;
- flow = eCapture;
+ if ( pGuidSrc == NULL) {
+ WARN("invalid parameter: pGuidSrc == NULL\n");
+ return DSERR_INVALIDPARAM;
}
- if(role != (ERole)-1 && flow != (EDataFlow)-1){
- IMMDevice *device;
-
- hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum,
- flow, role, &device);
- if(FAILED(hr)){
- WARN("GetDefaultAudioEndpoint failed: %08x\n", hr);
- release_mmdevenum(devenum, init_hr);
- return DSERR_NODRIVER;
- }
-
- hr = get_mmdevice_guid(device, NULL, pGuidDest);
- IMMDevice_Release(device);
-
- release_mmdevenum(devenum, init_hr);
+ if ( pGuidDest == NULL ) {
+ WARN("invalid parameter: pGuidDest == NULL\n");
+ return DSERR_INVALIDPARAM;
+ }
- return (hr == S_OK) ? DS_OK : hr;
+ if ( IsEqualGUID( &DSDEVID_DefaultPlayback, pGuidSrc ) ||
+ IsEqualGUID( &DSDEVID_DefaultVoicePlayback, pGuidSrc ) ) {
+ *pGuidDest = DSOUND_renderer_guids[ds_default_playback];
+ TRACE("returns %s\n", get_device_id(pGuidDest));
+ return DS_OK;
}
- release_mmdevenum(devenum, init_hr);
+ if ( IsEqualGUID( &DSDEVID_DefaultCapture, pGuidSrc ) ||
+ IsEqualGUID( &DSDEVID_DefaultVoiceCapture, pGuidSrc ) ) {
+ *pGuidDest = DSOUND_capture_guids[ds_default_capture];
+ TRACE("returns %s\n", get_device_id(pGuidDest));
+ return DS_OK;
+ }
*pGuidDest = *pGuidSrc;
+ TRACE("returns %s\n", get_device_id(pGuidDest));
return DS_OK;
}
return DirectSoundEnumerateW(a_to_w_callback, &context);
}
-HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device)
-{
- IMMDeviceEnumerator *devenum;
- IMMDeviceCollection *coll;
- UINT count, i;
- HRESULT hr, init_hr;
-
- init_hr = get_mmdevenum(&devenum);
- if(!devenum)
- return init_hr;
-
- hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow,
- DEVICE_STATE_ACTIVE, &coll);
- if(FAILED(hr)){
- WARN("EnumAudioEndpoints failed: %08x\n", hr);
- release_mmdevenum(devenum, init_hr);
- return hr;
- }
-
- hr = IMMDeviceCollection_GetCount(coll, &count);
- if(FAILED(hr)){
- IMMDeviceCollection_Release(coll);
- release_mmdevenum(devenum, init_hr);
- WARN("GetCount failed: %08x\n", hr);
- return hr;
- }
-
- for(i = 0; i < count; ++i){
- GUID guid;
-
- hr = IMMDeviceCollection_Item(coll, i, device);
- if(FAILED(hr))
- continue;
-
- hr = get_mmdevice_guid(*device, NULL, &guid);
- if(FAILED(hr)){
- IMMDevice_Release(*device);
- continue;
- }
-
- if(IsEqualGUID(&guid, tgt)){
- IMMDeviceCollection_Release(coll);
- release_mmdevenum(devenum, init_hr);
- return DS_OK;
- }
-
- IMMDevice_Release(*device);
- }
-
- WARN("No device with GUID %s found!\n", wine_dbgstr_guid(tgt));
-
- IMMDeviceCollection_Release(coll);
- release_mmdevenum(devenum, init_hr);
-
- return DSERR_INVALIDPARAM;
-}
-
-static BOOL send_device(IMMDevice *device, GUID *guid,
- LPDSENUMCALLBACKW cb, void *user)
-{
- IPropertyStore *ps;
- PROPVARIANT pv;
- BOOL keep_going;
- HRESULT hr;
-
- PropVariantInit(&pv);
-
- hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps);
- if(FAILED(hr)){
- WARN("OpenPropertyStore failed: %08x\n", hr);
- return TRUE;
- }
-
- hr = get_mmdevice_guid(device, ps, guid);
- if(FAILED(hr)){
- IPropertyStore_Release(ps);
- return TRUE;
- }
-
- hr = IPropertyStore_GetValue(ps,
- (const PROPERTYKEY *)&DEVPKEY_Device_FriendlyName, &pv);
- if(FAILED(hr)){
- IPropertyStore_Release(ps);
- WARN("GetValue(FriendlyName) failed: %08x\n", hr);
- return TRUE;
- }
-
- TRACE("Calling back with %s (%s)\n", wine_dbgstr_guid(guid),
- wine_dbgstr_w(pv.u.pwszVal));
-
- keep_going = cb(guid, pv.u.pwszVal, wine_vxd_drv, user);
-
- PropVariantClear(&pv);
- IPropertyStore_Release(ps);
-
- return keep_going;
-}
-
-/* S_FALSE means the callback returned FALSE at some point
- * S_OK means the callback always returned TRUE */
-HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids,
- LPDSENUMCALLBACKW cb, void *user)
-{
- IMMDeviceEnumerator *devenum;
- IMMDeviceCollection *coll;
- IMMDevice *defdev = NULL;
- UINT count, i, n;
- BOOL keep_going;
- HRESULT hr, init_hr;
-
- static const WCHAR primary_desc[] = {'P','r','i','m','a','r','y',' ',
- 'S','o','u','n','d',' ','D','r','i','v','e','r',0};
- static const WCHAR empty_drv[] = {0};
-
- init_hr = get_mmdevenum(&devenum);
- if(!devenum)
- return init_hr;
-
- hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow,
- DEVICE_STATE_ACTIVE, &coll);
- if(FAILED(hr)){
- release_mmdevenum(devenum, init_hr);
- WARN("EnumAudioEndpoints failed: %08x\n", hr);
- return DS_OK;
- }
-
- hr = IMMDeviceCollection_GetCount(coll, &count);
- if(FAILED(hr)){
- IMMDeviceCollection_Release(coll);
- release_mmdevenum(devenum, init_hr);
- WARN("GetCount failed: %08x\n", hr);
- return DS_OK;
- }
-
- if(count == 0){
- release_mmdevenum(devenum, init_hr);
- return DS_OK;
- }
-
- TRACE("Calling back with NULL (%s)\n", wine_dbgstr_w(primary_desc));
- keep_going = cb(NULL, primary_desc, empty_drv, user);
-
- /* always send the default device first */
- if(keep_going){
- hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, flow,
- eMultimedia, &defdev);
- if(FAILED(hr)){
- defdev = NULL;
- n = 0;
- }else{
- keep_going = send_device(defdev, &guids[0], cb, user);
- n = 1;
- }
- }
-
- for(i = 0; keep_going && i < count; ++i){
- IMMDevice *device;
-
- hr = IMMDeviceCollection_Item(coll, i, &device);
- if(FAILED(hr)){
- WARN("Item failed: %08x\n", hr);
- continue;
- }
-
- if(device != defdev){
- send_device(device, &guids[n], cb, user);
- ++n;
- }
-
- IMMDevice_Release(device);
- }
-
- if(defdev)
- IMMDevice_Release(defdev);
- IMMDeviceCollection_Release(coll);
-
- release_mmdevenum(devenum, init_hr);
-
- return (keep_going == TRUE) ? S_OK : S_FALSE;
-}
-
/***************************************************************************
* DirectSoundEnumerateW [DSOUND.3]
*
LPDSENUMCALLBACKW lpDSEnumCallback,
LPVOID lpContext )
{
- HRESULT hr;
+ unsigned devs, wod;
+ DSDRIVERDESC desc;
+ GUID guid;
+ int err;
+ WCHAR wDesc[MAXPNAMELEN];
+ WCHAR wName[MAXPNAMELEN];
- TRACE("(%p,%p)\n", lpDSEnumCallback, lpContext);
+ TRACE("lpDSEnumCallback = %p, lpContext = %p\n",
+ lpDSEnumCallback, lpContext);
if (lpDSEnumCallback == NULL) {
- WARN("invalid parameter: lpDSEnumCallback == NULL\n");
- return DSERR_INVALIDPARAM;
+ WARN("invalid parameter: lpDSEnumCallback == NULL\n");
+ return DSERR_INVALIDPARAM;
}
setup_dsound_options();
- hr = enumerate_mmdevices(eRender, DSOUND_renderer_guids,
- lpDSEnumCallback, lpContext);
- return SUCCEEDED(hr) ? DS_OK : hr;
+ devs = waveOutGetNumDevs();
+ if (devs > 0) {
+ if (GetDeviceID(&DSDEVID_DefaultPlayback, &guid) == DS_OK) {
+ static const WCHAR empty[] = { 0 };
+ for (wod = 0; wod < devs; ++wod) {
+ if (IsEqualGUID( &guid, &DSOUND_renderer_guids[wod] ) ) {
+ err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,ds_hw_accel));
+ if (err == DS_OK) {
+ TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n",
+ "Primary Sound Driver",desc.szDrvname,lpContext);
+ MultiByteToWideChar( CP_ACP, 0, "Primary Sound Driver", -1,
+ wDesc, sizeof(wDesc)/sizeof(WCHAR) );
+ if (lpDSEnumCallback(NULL, wDesc, empty, lpContext) == FALSE)
+ return DS_OK;
+ }
+ }
+ }
+ }
+ }
+
+ for (wod = 0; wod < devs; ++wod) {
+ err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,ds_hw_accel));
+ if (err == DS_OK) {
+ TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n",
+ debugstr_guid(&DSOUND_renderer_guids[wod]),desc.szDesc,desc.szDrvname,lpContext);
+ MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1,
+ wDesc, sizeof(wDesc)/sizeof(WCHAR) );
+ wDesc[(sizeof(wDesc)/sizeof(WCHAR)) - 1] = '\0';
+
+ MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1,
+ wName, sizeof(wName)/sizeof(WCHAR) );
+ wName[(sizeof(wName)/sizeof(WCHAR)) - 1] = '\0';
+
+ if (lpDSEnumCallback(&DSOUND_renderer_guids[wod], wDesc, wName, lpContext) == FALSE)
+ return DS_OK;
+ }
+ }
+ return DS_OK;
}
/***************************************************************************
LPDSENUMCALLBACKW lpDSEnumCallback,
LPVOID lpContext)
{
- HRESULT hr;
+ unsigned devs, wid;
+ DSDRIVERDESC desc;
+ GUID guid;
+ int err;
+ WCHAR wDesc[MAXPNAMELEN];
+ WCHAR wName[MAXPNAMELEN];
TRACE("(%p,%p)\n", lpDSEnumCallback, lpContext );
if (lpDSEnumCallback == NULL) {
- WARN("invalid parameter: lpDSEnumCallback == NULL\n");
+ WARN("invalid parameter: lpDSEnumCallback == NULL\n");
return DSERR_INVALIDPARAM;
}
setup_dsound_options();
- hr = enumerate_mmdevices(eCapture, DSOUND_capture_guids,
- lpDSEnumCallback, lpContext);
- return SUCCEEDED(hr) ? DS_OK : hr;
+ devs = waveInGetNumDevs();
+ if (devs > 0) {
+ if (GetDeviceID(&DSDEVID_DefaultCapture, &guid) == DS_OK) {
+ for (wid = 0; wid < devs; ++wid) {
+ if (IsEqualGUID( &guid, &DSOUND_capture_guids[wid] ) ) {
+ err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,ds_hw_accel));
+ if (err == DS_OK) {
+ TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n",
+ "Primary Sound Capture Driver",desc.szDrvname,lpContext);
+ MultiByteToWideChar( CP_ACP, 0, "Primary Sound Capture Driver", -1,
+ wDesc, sizeof(wDesc)/sizeof(WCHAR) );
+ MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1,
+ wName, sizeof(wName)/sizeof(WCHAR) );
+ wName[(sizeof(wName)/sizeof(WCHAR)) - 1] = '\0';
+
+ if (lpDSEnumCallback(NULL, wDesc, wName, lpContext) == FALSE)
+ return DS_OK;
+ }
+ }
+ }
+ }
+ }
+
+ for (wid = 0; wid < devs; ++wid) {
+ err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,ds_hw_accel));
+ if (err == DS_OK) {
+ TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n",
+ debugstr_guid(&DSOUND_capture_guids[wid]),desc.szDesc,desc.szDrvname,lpContext);
+ MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1,
+ wDesc, sizeof(wDesc)/sizeof(WCHAR) );
+ wDesc[(sizeof(wDesc)/sizeof(WCHAR)) - 1] = '\0';
+
+ MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1,
+ wName, sizeof(wName)/sizeof(WCHAR) );
+ wName[(sizeof(wName)/sizeof(WCHAR)) - 1] = '\0';
+
+ if (lpDSEnumCallback(&DSOUND_capture_guids[wid], wDesc, wName, lpContext) == FALSE)
+ return DS_OK;
+ }
+ }
+
+ return DS_OK;
}
/*******************************************************************************
}
static HRESULT WINAPI
-DSCF_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppobj)
+DSCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj)
{
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj);
IsEqualIID(riid, &IID_IClassFactory))
{
*ppobj = iface;
- IClassFactory_AddRef(iface);
+ IUnknown_AddRef(iface);
return S_OK;
}
*ppobj = NULL;
};
static IClassFactoryImpl DSOUND_CF[] = {
- { { &DSCF_Vtbl }, &CLSID_DirectSound, DSOUND_Create },
- { { &DSCF_Vtbl }, &CLSID_DirectSound8, DSOUND_Create8 },
- { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture, DSOUND_CaptureCreate },
- { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture8, DSOUND_CaptureCreate8 },
- { { &DSCF_Vtbl }, &CLSID_DirectSoundFullDuplex, DSOUND_FullDuplexCreate },
- { { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, IKsPrivatePropertySetImpl_Create },
+ { { &DSCF_Vtbl }, &CLSID_DirectSound, (FnCreateInstance)DSOUND_Create },
+ { { &DSCF_Vtbl }, &CLSID_DirectSound8, (FnCreateInstance)DSOUND_Create8 },
+ { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture, (FnCreateInstance)DSOUND_CaptureCreate },
+ { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture8, (FnCreateInstance)DSOUND_CaptureCreate8 },
+ { { &DSCF_Vtbl }, &CLSID_DirectSoundFullDuplex, (FnCreateInstance)DSOUND_FullDuplexCreate },
+ { { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create },
{ { NULL }, NULL, NULL }
};
*/
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
+ int i;
TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpvReserved);
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
TRACE("DLL_PROCESS_ATTACH\n");
+ for (i = 0; i < MAXWAVEDRIVERS; i++) {
+ DSOUND_renderer[i] = NULL;
+ DSOUND_capture[i] = NULL;
+ INIT_GUID(DSOUND_renderer_guids[i], 0xbd6dd71a, 0x3deb, 0x11d1, 0xb1, 0x71, 0x00, 0xc0, 0x4f, 0xc2, 0x00, 0x00 + i);
+ INIT_GUID(DSOUND_capture_guids[i], 0xbd6dd71b, 0x3deb, 0x11d1, 0xb1, 0x71, 0x00, 0xc0, 0x4f, 0xc2, 0x00, 0x00 + i);
+ }
instance = hInstDLL;
DisableThreadLibraryCalls(hInstDLL);
/* Increase refcount on dsound by 1 */
break;
case DLL_PROCESS_DETACH:
TRACE("DLL_PROCESS_DETACH\n");
- DeleteCriticalSection(&DSOUND_renderers_lock);
- DeleteCriticalSection(&DSOUND_capturers_lock);
break;
default:
TRACE("UNKNOWN REASON\n");
projects / reactos.git / blobdiff