ChangeSet ID:	16625
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard@wine.codeweavers.com	2005/03/15 13:31:55

Modified files:
	dlls/dsound    : propset.c 

Log message:
	Robert Reif <reif@earthlink.net>
	Unconditionally free memory. Should make smatch happy.

Patch: http://cvs.winehq.org/patch.py?id=16625

Old revision  New revision  Changes     Path
 1.35          1.36          +10 -12     wine/dlls/dsound/propset.c

Index: wine/dlls/dsound/propset.c
diff -u -p wine/dlls/dsound/propset.c:1.35 wine/dlls/dsound/propset.c:1.36
--- wine/dlls/dsound/propset.c:1.35	Tue Feb  9 17:15:42 2010
+++ wine/dlls/dsound/propset.c	Tue Feb  9 17:15:42 2010
@@ -1092,12 +1092,11 @@ static HRESULT WINAPI DSPROPERTY_Enumera
 
                                         TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
                                         (ppd->Callback)(&data, ppd->Context);
-
-                                        HeapFree(GetProcessHeap(),0,szInterface);
                                     }
+                                    HeapFree(GetProcessHeap(),0,szInterface);
                                 }
-                                HeapFree(GetProcessHeap(),0,nameW);
 			    }
+                            HeapFree(GetProcessHeap(),0,nameW);
 			}
 		    }
 		}
@@ -1126,12 +1125,11 @@ static HRESULT WINAPI DSPROPERTY_Enumera
 
                                         TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
                                         (ppd->Callback)(&data, ppd->Context);
-
-                                        HeapFree(GetProcessHeap(),0,szInterface);
                                     }
+                                    HeapFree(GetProcessHeap(),0,szInterface);
                                 }
-                                HeapFree(GetProcessHeap(),0,nameW);
 			    }
+                            HeapFree(GetProcessHeap(),0,nameW);
 			}
 		    }
 		}
@@ -1198,12 +1196,12 @@ static HRESULT WINAPI DSPROPERTY_Enumera
                                         TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
                                         (ppd->Callback)(&data, ppd->Context);
                             	    }
-                                    HeapFree(GetProcessHeap(),0,wInterface);
                                 }
+                                HeapFree(GetProcessHeap(),0,wInterface);
 			    }
-                            HeapFree(GetProcessHeap(),0,wDescription);
-                            HeapFree(GetProcessHeap(),0,wModule);
 			}
+                        HeapFree(GetProcessHeap(),0,wDescription);
+                        HeapFree(GetProcessHeap(),0,wModule);
 		    }
 		}
 
@@ -1235,12 +1233,12 @@ static HRESULT WINAPI DSPROPERTY_Enumera
                                         TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
                                         (ppd->Callback)(&data, ppd->Context);
                                     }
-                                    HeapFree(GetProcessHeap(),0,wInterface);
                                 }
+                                HeapFree(GetProcessHeap(),0,wInterface);
 			    }
-                            HeapFree(GetProcessHeap(),0,wDescription);
-                            HeapFree(GetProcessHeap(),0,wModule);
 			}
+                        HeapFree(GetProcessHeap(),0,wDescription);
+                        HeapFree(GetProcessHeap(),0,wModule);
 		    }
 		}