[PATCH 11/12] dsound: Move DirectSoundCaptureEnumerate to dsound_main.c
Maarten Lankhorst (none)
mlankhorst at patser.
Sat Nov 14 07:29:07 CST 2009
---
dlls/dsound/capture.c | 130 ---------------------------------------------
dlls/dsound/dsound_main.c | 130 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index 95b38af..93c711d 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -254,136 +254,6 @@ HRESULT WINAPI DirectSoundCaptureCreate8(
return hr;
}
-/***************************************************************************
- * DirectSoundCaptureEnumerateA [DSOUND.7]
- *
- * Enumerate all DirectSound drivers installed in the system.
- *
- * PARAMS
- * lpDSEnumCallback [I] Address of callback function.
- * lpContext [I] Address of user defined context passed to callback function.
- *
- * RETURNS
- * Success: DS_OK
- * Failure: DSERR_INVALIDPARAM
- */
-HRESULT WINAPI
-DirectSoundCaptureEnumerateA(
- LPDSENUMCALLBACKA lpDSEnumCallback,
- LPVOID lpContext)
-{
- unsigned devs, wid;
- DSDRIVERDESC desc;
- GUID guid;
- int err;
-
- TRACE("(%p,%p)\n", lpDSEnumCallback, lpContext );
-
- if (lpDSEnumCallback == NULL) {
- WARN("invalid parameter: lpDSEnumCallback == NULL\n");
- return DSERR_INVALIDPARAM;
- }
-
- 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,0));
- if (err == DS_OK) {
- TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n",
- "Primary Sound Capture Driver",desc.szDrvname,lpContext);
- if (lpDSEnumCallback(NULL, "Primary Sound Capture Driver", desc.szDrvname, lpContext) == FALSE)
- return DS_OK;
- }
- }
- }
- }
- }
-
- for (wid = 0; wid < devs; ++wid) {
- err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n",
- debugstr_guid(&DSOUND_capture_guids[wid]),desc.szDesc,desc.szDrvname,lpContext);
- if (lpDSEnumCallback(&DSOUND_capture_guids[wid], desc.szDesc, desc.szDrvname, lpContext) == FALSE)
- return DS_OK;
- }
- }
-
- return DS_OK;
-}
-
-/***************************************************************************
- * DirectSoundCaptureEnumerateW [DSOUND.8]
- *
- * Enumerate all DirectSound drivers installed in the system.
- *
- * PARAMS
- * lpDSEnumCallback [I] Address of callback function.
- * lpContext [I] Address of user defined context passed to callback function.
- *
- * RETURNS
- * Success: DS_OK
- * Failure: DSERR_INVALIDPARAM
- */
-HRESULT WINAPI
-DirectSoundCaptureEnumerateW(
- LPDSENUMCALLBACKW lpDSEnumCallback,
- LPVOID lpContext)
-{
- 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");
- return DSERR_INVALIDPARAM;
- }
-
- 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,0));
- 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) );
- 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,0));
- 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) );
- MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1,
- wName, sizeof(wName)/sizeof(WCHAR) );
- if (lpDSEnumCallback(&DSOUND_capture_guids[wid], wDesc, wName, lpContext) == FALSE)
- return DS_OK;
- }
- }
-
- return DS_OK;
-}
-
static void capture_CheckNotify(IDirectSoundCaptureBufferImpl *This, DWORD from, DWORD len)
{
int i;
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 5b0770a..202ca40 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -387,6 +387,136 @@ HRESULT WINAPI DirectSoundEnumerateW(
return DS_OK;
}
+/***************************************************************************
+ * DirectSoundCaptureEnumerateA [DSOUND.7]
+ *
+ * Enumerate all DirectSound drivers installed in the system.
+ *
+ * PARAMS
+ * lpDSEnumCallback [I] Address of callback function.
+ * lpContext [I] Address of user defined context passed to callback function.
+ *
+ * RETURNS
+ * Success: DS_OK
+ * Failure: DSERR_INVALIDPARAM
+ */
+HRESULT WINAPI
+DirectSoundCaptureEnumerateA(
+ LPDSENUMCALLBACKA lpDSEnumCallback,
+ LPVOID lpContext)
+{
+ unsigned devs, wid;
+ DSDRIVERDESC desc;
+ GUID guid;
+ int err;
+
+ TRACE("(%p,%p)\n", lpDSEnumCallback, lpContext );
+
+ if (lpDSEnumCallback == NULL) {
+ WARN("invalid parameter: lpDSEnumCallback == NULL\n");
+ return DSERR_INVALIDPARAM;
+ }
+
+ 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,0));
+ if (err == DS_OK) {
+ TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n",
+ "Primary Sound Capture Driver",desc.szDrvname,lpContext);
+ if (lpDSEnumCallback(NULL, "Primary Sound Capture Driver", desc.szDrvname, lpContext) == FALSE)
+ return DS_OK;
+ }
+ }
+ }
+ }
+ }
+
+ for (wid = 0; wid < devs; ++wid) {
+ err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
+ if (err == DS_OK) {
+ TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n",
+ debugstr_guid(&DSOUND_capture_guids[wid]),desc.szDesc,desc.szDrvname,lpContext);
+ if (lpDSEnumCallback(&DSOUND_capture_guids[wid], desc.szDesc, desc.szDrvname, lpContext) == FALSE)
+ return DS_OK;
+ }
+ }
+
+ return DS_OK;
+}
+
+/***************************************************************************
+ * DirectSoundCaptureEnumerateW [DSOUND.8]
+ *
+ * Enumerate all DirectSound drivers installed in the system.
+ *
+ * PARAMS
+ * lpDSEnumCallback [I] Address of callback function.
+ * lpContext [I] Address of user defined context passed to callback function.
+ *
+ * RETURNS
+ * Success: DS_OK
+ * Failure: DSERR_INVALIDPARAM
+ */
+HRESULT WINAPI
+DirectSoundCaptureEnumerateW(
+ LPDSENUMCALLBACKW lpDSEnumCallback,
+ LPVOID lpContext)
+{
+ 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");
+ return DSERR_INVALIDPARAM;
+ }
+
+ 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,0));
+ 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) );
+ 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,0));
+ 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) );
+ MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1,
+ wName, sizeof(wName)/sizeof(WCHAR) );
+ if (lpDSEnumCallback(&DSOUND_capture_guids[wid], wDesc, wName, lpContext) == FALSE)
+ return DS_OK;
+ }
+ }
+
+ return DS_OK;
+}
+
/*******************************************************************************
* DirectSound ClassFactory
*/
--
1.6.5.2
--------------010702070003060401030807--
More information about the wine-patches
mailing list