janitorial: Removed the rest of the redundant NULL checks before HeapFree.

dlls/ddraw/main.c

@@ -313,7 +313,7 @@ err_out:
     /* Let's hope we never need this ;) */
     if(wineD3DDevice) IWineD3DDevice_Release(wineD3DDevice);
     if(wineD3D) IWineD3D_Release(wineD3D);
-    if(This) HeapFree(GetProcessHeap(), 0, This);
+    HeapFree(GetProcessHeap(), 0, This);
     return hr;
 }
 

dlls/gdi/font.c

@@ -1243,7 +1243,7 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count,
     if (lpnFit)
 	*lpnFit = nFit;
 
-    if (dxs && ! alpDx)
+    if (! alpDx)
         HeapFree(GetProcessHeap(), 0, dxs);
 
     GDI_ReleaseObj( hdc );

dlls/setupapi/misc.c

@@ -767,8 +767,7 @@ DWORD WINAPI TakeOwnershipOfFile(LPCWSTR lpFileName)
 fail:;
     dwError = GetLastError();
 
-    if (pOwner != NULL)
-        MyFree(pOwner);
+    MyFree(pOwner);
 
     if (hToken != NULL)
         CloseHandle(hToken);

dlls/setupapi/stringtable.c

@@ -172,18 +172,12 @@ StringTableDestroy(HSTRING_TABLE hStringTable)
     {
         for (i = 0; i < pStringTable->dwMaxSlots; i++)
         {
-            if (pStringTable->pSlots[i].pString != NULL)
-            {
-                MyFree(pStringTable->pSlots[i].pString);
-                pStringTable->pSlots[i].pString = NULL;
-            }
+            MyFree(pStringTable->pSlots[i].pString);
+            pStringTable->pSlots[i].pString = NULL;
 
-            if (pStringTable->pSlots[i].pData != NULL)
-            {
-                MyFree(pStringTable->pSlots[i].pData);
-                pStringTable->pSlots[i].pData = NULL;
-                pStringTable->pSlots[i].dwSize = 0;
-            }
+            MyFree(pStringTable->pSlots[i].pData);
+            pStringTable->pSlots[i].pData = NULL;
+            pStringTable->pSlots[i].dwSize = 0;
         }
 
         MyFree(pStringTable->pSlots);