Propset compile fix

Duane Clark dclark at akamail.com
Thu Aug 7 13:00:04 CDT 2003


Needed for 2.96* compilers.

Changelog:
	Move declarations to compile with older compilers.

-------------- next part --------------
Index: dlls/dsound/propset.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/propset.c,v
retrieving revision 1.8
diff -u -r1.8 propset.c
--- dlls/dsound/propset.c	6 Aug 2003 22:57:24 -0000	1.8
+++ dlls/dsound/propset.c	7 Aug 2003 17:57:07 -0000
@@ -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 );


More information about the wine-patches mailing list