commit 852a37bc64b47bfd26ba8312284a3c3f657b194c
author Duane Clark <dclark@akamail.com> Thu Aug 07 20:11:45 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Aug 07 20:11:45 2003 +0000
tree 16aa0989fbb9a6afb646cacb0563207d919685ad
parent a2f937f7f57a752091d5757c457888d4dc10db05

Move declarations to compile with older compilers.

dlls/dsound/propset.c

diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index 6e46a9b..f6630cf 100644
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -514,14 +514,15 @@
 		    if (err == DS_OK) {
 			err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDGUID,(DWORD)&guid,0));
 			if (err == DS_OK) {
-			    memset(&data, 0, sizeof(data));
-			    data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
-			    data.WaveDeviceId = wod;
-			    data.DeviceId = guid;
 			    /* FIXME: this is a memory leak */
 			    WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200);
 			    WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200);
 			    WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,0x200);
+			    
+			    memset(&data, 0, sizeof(data));
+			    data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
+			    data.WaveDeviceId = wod;
+			    data.DeviceId = guid;
 
 			    MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100  );
 			    MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, wModule, 0x100 );
@@ -542,14 +543,15 @@
 		    if (err == DS_OK) {
 			err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDGUID,(DWORD)&guid,0));
 			if (err == DS_OK) {
-			    memset(&data, 0, sizeof(data));
-			    data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
-			    data.WaveDeviceId = wid;
-			    data.DeviceId = guid;
 			    /* FIXME: this is a memory leak */
 			    WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200);
 			    WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200);
 			    WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,0x200);
+			    
+			    memset(&data, 0, sizeof(data));
+			    data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
+			    data.WaveDeviceId = wid;
+			    data.DeviceId = guid;
 
 			    MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100  );
 			    MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, wModule, 0x100 );