ChangeSet ID:	15012
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard@wine.codeweavers.com	2004/12/23 12:24:50

Modified files:
	dlls/commdlg   : printdlg.c fontdlg16.c fontdlg.c filedlg31.c 
	                 filedlg.c 
	dlls/comctl32  : toolbar.c syslink.c animate.c 
	dlls/advapi32  : service.c security.c registry.c 

Log message:
	Michael Stefaniuc <mstefani@redhat.de>
	Do not check for non NULL pointer before HeapFree'ing it. It's
	redundant.

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

Old revision  New revision  Changes     Path
 1.84          1.85          +12 -20     wine/dlls/commdlg/printdlg.c
 1.14          1.15          +2 -4       wine/dlls/commdlg/fontdlg16.c
 1.73          1.74          +1 -2       wine/dlls/commdlg/fontdlg.c
 1.2           1.3           +6 -6       wine/dlls/commdlg/filedlg31.c
 1.91          1.92          +1 -4       wine/dlls/commdlg/filedlg.c
 1.203         1.204         +3 -7       wine/dlls/comctl32/toolbar.c
 1.7           1.8           +2 -8       wine/dlls/comctl32/syslink.c
 1.59          1.60          +8 -20      wine/dlls/comctl32/animate.c
 1.75          1.76          +1 -1       wine/dlls/advapi32/service.c
 1.89          1.90          +4 -8       wine/dlls/advapi32/security.c
 1.68          1.69          +1 -1       wine/dlls/advapi32/registry.c

Index: wine/dlls/commdlg/printdlg.c
diff -u -p wine/dlls/commdlg/printdlg.c:1.84 wine/dlls/commdlg/printdlg.c:1.85
--- wine/dlls/commdlg/printdlg.c:1.84	Wed May 22 11:05:28 2013
+++ wine/dlls/commdlg/printdlg.c	Wed May 22 11:05:28 2013
@@ -479,8 +479,8 @@ static BOOL PRINTDLG_PaperSizeA(
 out:
     GlobalUnlock(pdlga->hDevNames);
     GlobalUnlock(pdlga->hDevMode);
-    if (Names) HeapFree(GetProcessHeap(),0,Names);
-    if (points) HeapFree(GetProcessHeap(),0,points);
+    HeapFree(GetProcessHeap(),0,Names);
+    HeapFree(GetProcessHeap(),0,points);
     return retval;
 }
 
@@ -537,8 +537,8 @@ static BOOL PRINTDLG_PaperSizeW(
 out:
     GlobalUnlock(pdlga->hDevNames);
     GlobalUnlock(pdlga->hDevMode);
-    if (Names) HeapFree(GetProcessHeap(),0,Names);
-    if (points) HeapFree(GetProcessHeap(),0,points);
+    HeapFree(GetProcessHeap(),0,Names);
+    HeapFree(GetProcessHeap(),0,points);
     return retval;
 }
 
@@ -860,10 +860,8 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg,
     DWORD needed;
     HANDLE hprn;
 
-    if(PrintStructures->lpPrinterInfo)
-        HeapFree(GetProcessHeap(),0, PrintStructures->lpPrinterInfo);
-    if(PrintStructures->lpDriverInfo)
-        HeapFree(GetProcessHeap(),0, PrintStructures->lpDriverInfo);
+    HeapFree(GetProcessHeap(),0, PrintStructures->lpPrinterInfo);
+    HeapFree(GetProcessHeap(),0, PrintStructures->lpDriverInfo);
     if(!OpenPrinterA(name, &hprn, NULL)) {
         ERR("Can't open printer %s\n", name);
 	return FALSE;
@@ -883,10 +881,8 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg,
 
     PRINTDLG_UpdatePrinterInfoTextsA(hDlg, PrintStructures->lpPrinterInfo);
 
-    if(PrintStructures->lpDevMode) {
-        HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode);
-	PrintStructures->lpDevMode = NULL;
-    }
+    HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode);
+    PrintStructures->lpDevMode = NULL;
 
     dmSize = DocumentPropertiesA(0, 0, name, NULL, NULL, 0);
     if(dmSize == -1) {
@@ -1013,10 +1009,8 @@ static BOOL PRINTDLG_ChangePrinterW(HWND
     DWORD needed;
     HANDLE hprn;
 
-    if(PrintStructures->lpPrinterInfo)
-        HeapFree(GetProcessHeap(),0, PrintStructures->lpPrinterInfo);
-    if(PrintStructures->lpDriverInfo)
-        HeapFree(GetProcessHeap(),0, PrintStructures->lpDriverInfo);
+    HeapFree(GetProcessHeap(),0, PrintStructures->lpPrinterInfo);
+    HeapFree(GetProcessHeap(),0, PrintStructures->lpDriverInfo);
     if(!OpenPrinterW(name, &hprn, NULL)) {
         ERR("Can't open printer %s\n", debugstr_w(name));
 	return FALSE;
@@ -1036,10 +1030,8 @@ static BOOL PRINTDLG_ChangePrinterW(HWND
 
     PRINTDLG_UpdatePrinterInfoTextsW(hDlg, PrintStructures->lpPrinterInfo);
 
-    if(PrintStructures->lpDevMode) {
-        HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode);
-	PrintStructures->lpDevMode = NULL;
-    }
+    HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode);
+    PrintStructures->lpDevMode = NULL;
 
     dmSize = DocumentPropertiesW(0, 0, name, NULL, NULL, 0);
     if(dmSize == -1) {

Index: wine/dlls/commdlg/fontdlg16.c
diff -u -p wine/dlls/commdlg/fontdlg16.c:1.14 wine/dlls/commdlg/fontdlg16.c:1.15
--- wine/dlls/commdlg/fontdlg16.c:1.14	Wed May 22 11:05:28 2013
+++ wine/dlls/commdlg/fontdlg16.c	Wed May 22 11:05:28 2013
@@ -280,10 +280,8 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT1
     WideCharToMultiByte(CP_ACP, 0, cf32w.lpLogFont->lfFaceName,
                           LF_FACESIZE, font16->lfFaceName, LF_FACESIZE, 0, 0);
 
-    if(cf32w.lpTemplateName)
-        HeapFree(GetProcessHeap(), 0, (LPBYTE)cf32w.lpTemplateName);
-    if(cf32w.lpszStyle)
-        HeapFree(GetProcessHeap(), 0, cf32w.lpszStyle);
+    HeapFree(GetProcessHeap(), 0, (LPBYTE)cf32w.lpTemplateName);
+    HeapFree(GetProcessHeap(), 0, cf32w.lpszStyle);
 
     return bRet;
 }

Index: wine/dlls/commdlg/fontdlg.c
diff -u -p wine/dlls/commdlg/fontdlg.c:1.73 wine/dlls/commdlg/fontdlg.c:1.74
--- wine/dlls/commdlg/fontdlg.c:1.73	Wed May 22 11:05:28 2013
+++ wine/dlls/commdlg/fontdlg.c	Wed May 22 11:05:28 2013
@@ -1045,8 +1045,7 @@ LRESULT CFn_WMDestroy(HWND hwnd, WPARAM
         HeapFree(GetProcessHeap(), 0, lpcfw->lpszStyle);
     }
 
-    if(lpcfw->lpTemplateName)
-        HeapFree(GetProcessHeap(), 0, (LPBYTE)lpcfw->lpTemplateName);
+    HeapFree(GetProcessHeap(), 0, (LPBYTE)lpcfw->lpTemplateName);
     HeapFree(GetProcessHeap(), 0, lpcfw->lpLogFont);
     HeapFree(GetProcessHeap(), 0, lpcfw);
 

Index: wine/dlls/commdlg/filedlg31.c
diff -u -p wine/dlls/commdlg/filedlg31.c:1.2 wine/dlls/commdlg/filedlg31.c:1.3
--- wine/dlls/commdlg/filedlg31.c:1.2	Wed May 22 11:05:28 2013
+++ wine/dlls/commdlg/filedlg31.c	Wed May 22 11:05:28 2013
@@ -757,12 +757,12 @@ void FD31_MapOfnStructA(LPOPENFILENAMEA
  */
 void FD31_FreeOfnW(LPOPENFILENAMEW ofnW)
 {
-   if (ofnW->lpstrFilter) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter);
-   if (ofnW->lpstrCustomFilter) HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter);
-   if (ofnW->lpstrFile) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFile);
-   if (ofnW->lpstrFileTitle) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle);
-   if (ofnW->lpstrInitialDir) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir);
-   if (ofnW->lpstrTitle) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle);
+   HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter);
+   HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter);
+   HeapFree(GetProcessHeap(), 0, ofnW->lpstrFile);
+   HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle);
+   HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir);
+   HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle);
    if ((ofnW->lpTemplateName) && (HIWORD(ofnW->lpTemplateName)))
        HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpTemplateName);
 }

Index: wine/dlls/commdlg/filedlg.c
diff -u -p wine/dlls/commdlg/filedlg.c:1.91 wine/dlls/commdlg/filedlg.c:1.92
--- wine/dlls/commdlg/filedlg.c:1.91	Wed May 22 11:05:28 2013
+++ wine/dlls/commdlg/filedlg.c	Wed May 22 11:05:28 2013
@@ -3358,10 +3358,7 @@ static void *MemAlloc(UINT size)
 
 static void MemFree(void *mem)
 {
-    if(mem)
-    {
-        HeapFree(GetProcessHeap(),0,mem);
-    }
+    HeapFree(GetProcessHeap(),0,mem);
 }
 
 /*

Index: wine/dlls/comctl32/toolbar.c
diff -u -p wine/dlls/comctl32/toolbar.c:1.203 wine/dlls/comctl32/toolbar.c:1.204
--- wine/dlls/comctl32/toolbar.c:1.203	Wed May 22 11:05:29 2013
+++ wine/dlls/comctl32/toolbar.c	Wed May 22 11:05:29 2013
@@ -5522,8 +5522,7 @@ TOOLBAR_Destroy (HWND hwnd, WPARAM wPara
 	DestroyWindow (infoPtr->hwndToolTip);
 
     /* delete temporary buffer for tooltip text */
-    if (infoPtr->pszTooltipText)
-        HeapFree(GetProcessHeap(), 0, infoPtr->pszTooltipText);
+    HeapFree(GetProcessHeap(), 0, infoPtr->pszTooltipText);
 
     /* delete button data */
     if (infoPtr->buttons)
@@ -6275,11 +6274,8 @@ static LRESULT TOOLBAR_TTGetDispInfo (TO
 
     TRACE("button index = %d\n", index);
 
-    if (infoPtr->pszTooltipText)
-    {
-        HeapFree(GetProcessHeap(), 0, infoPtr->pszTooltipText);
-        infoPtr->pszTooltipText = NULL;
-    }
+    HeapFree(GetProcessHeap(), 0, infoPtr->pszTooltipText);
+    infoPtr->pszTooltipText = NULL;
 
     if (index < 0)
         return 0;

Index: wine/dlls/comctl32/syslink.c
diff -u -p wine/dlls/comctl32/syslink.c:1.7 wine/dlls/comctl32/syslink.c:1.8
--- wine/dlls/comctl32/syslink.c:1.7	Wed May 22 11:05:29 2013
+++ wine/dlls/comctl32/syslink.c	Wed May 22 11:05:29 2013
@@ -115,14 +115,8 @@ static VOID SYSLINK_FreeDocItem (PDOC_IT
 {
     if(DocItem->Type == slLink)
     {
-        if(DocItem->u.Link.szID != NULL)
-        {
-            SYSLINK_Free(DocItem->u.Link.szID);
-        }
-        if(DocItem->u.Link.szUrl != NULL)
-        {
-            SYSLINK_Free(DocItem->u.Link.szUrl);
-        }
+        SYSLINK_Free(DocItem->u.Link.szID);
+        SYSLINK_Free(DocItem->u.Link.szUrl);
     }
 
     if(DocItem->Type == slLink && DocItem->u.Link.hRgn != NULL)

Index: wine/dlls/comctl32/animate.c
diff -u -p wine/dlls/comctl32/animate.c:1.59 wine/dlls/comctl32/animate.c:1.60
--- wine/dlls/comctl32/animate.c:1.59	Wed May 22 11:05:29 2013
+++ wine/dlls/comctl32/animate.c	Wed May 22 11:05:29 2013
@@ -187,32 +187,20 @@ static void ANIMATE_Free(ANIMATE_INFO *i
  	    FreeResource(infoPtr->hRes);
 	    infoPtr->hRes = 0;
 	}
-	if (infoPtr->lpIndex) {
-	    HeapFree(GetProcessHeap(), 0, infoPtr->lpIndex);
-	    infoPtr->lpIndex = NULL;
-	}
+        HeapFree(GetProcessHeap(), 0, infoPtr->lpIndex);
+        infoPtr->lpIndex = NULL;
 	if (infoPtr->hic) {
 	    fnIC.fnICClose(infoPtr->hic);
 	    infoPtr->hic = 0;
 	}
-	if (infoPtr->inbih) {
-	    HeapFree(GetProcessHeap(), 0, infoPtr->inbih);
-	    infoPtr->inbih = NULL;
-	}
-	if (infoPtr->outbih) {
-	    HeapFree(GetProcessHeap(), 0, infoPtr->outbih);
-	    infoPtr->outbih = NULL;
-	}
-        if( infoPtr->indata )
-        {
+        HeapFree(GetProcessHeap(), 0, infoPtr->inbih);
+        infoPtr->inbih = NULL;
+        HeapFree(GetProcessHeap(), 0, infoPtr->outbih);
+        infoPtr->outbih = NULL;
 	HeapFree(GetProcessHeap(), 0, infoPtr->indata);
-            infoPtr->indata = NULL;
-        }
-    	if( infoPtr->outdata )
-        {
+        infoPtr->indata = NULL;
 	HeapFree(GetProcessHeap(), 0, infoPtr->outdata);
-            infoPtr->outdata = NULL;
-        }
+        infoPtr->outdata = NULL;
     	if( infoPtr->hbmPrevFrame )
         {
 	    DeleteObject(infoPtr->hbmPrevFrame);

Index: wine/dlls/advapi32/service.c
diff -u -p wine/dlls/advapi32/service.c:1.75 wine/dlls/advapi32/service.c:1.76
--- wine/dlls/advapi32/service.c:1.75	Wed May 22 11:05:29 2013
+++ wine/dlls/advapi32/service.c	Wed May 22 11:05:29 2013
@@ -358,7 +358,7 @@ static void dispose_service_thread_data(
 {
     if( thread_data->mutex ) CloseHandle( thread_data->mutex );
     if( thread_data->ack_event ) CloseHandle( thread_data->ack_event );
-    if( thread_data->argv ) HeapFree( GetProcessHeap(), 0, thread_data->argv );
+    HeapFree( GetProcessHeap(), 0, thread_data->argv );
     if( thread_data->seb ) UnmapViewOfFile( thread_data->seb );
     if( thread_data->hServiceShmem ) CloseHandle( thread_data->hServiceShmem );
     HeapFree( GetProcessHeap(), 0, thread_data );

Index: wine/dlls/advapi32/security.c
diff -u -p wine/dlls/advapi32/security.c:1.89 wine/dlls/advapi32/security.c:1.90
--- wine/dlls/advapi32/security.c:1.89	Wed May 22 11:05:29 2013
+++ wine/dlls/advapi32/security.c	Wed May 22 11:05:29 2013
@@ -1215,8 +1215,7 @@ GetFileSecurityA( LPCSTR lpFileName,
 
     r = GetFileSecurityW( name, RequestedInformation, pSecurityDescriptor,
                           nLength, lpnLengthNeeded );
-    if( name )
-        HeapFree( GetProcessHeap(), 0, name );
+    HeapFree( GetProcessHeap(), 0, name );
 
     return r;
 }
@@ -1332,8 +1331,7 @@ BOOL WINAPI SetFileSecurityA( LPCSTR lpF
     }
 
     r = SetFileSecurityW( name, RequestedInformation, pSecurityDescriptor );
-    if( name )
-        HeapFree( GetProcessHeap(), 0, name );
+    HeapFree( GetProcessHeap(), 0, name );
 
     return r;
 }
@@ -2017,8 +2015,7 @@ DWORD WINAPI SetNamedSecurityInfoA(LPSTR
     r = SetNamedSecurityInfoW( wstr, ObjectType, SecurityInfo, psidOwner,
                            psidGroup, pDacl, pSacl );
 
-    if( wstr )
-        HeapFree( GetProcessHeap(), 0, wstr );
+    HeapFree( GetProcessHeap(), 0, wstr );
 
     return r;
 }
@@ -2946,8 +2943,7 @@ DWORD WINAPI GetNamedSecurityInfoA(LPSTR
     r = GetNamedSecurityInfoW( wstr, ObjectType, SecurityInfo, ppsidOwner,
                            ppsidGroup, ppDacl, ppSacl, ppSecurityDescriptor );
 
-    if( wstr )
-        HeapFree( GetProcessHeap(), 0, wstr );
+    HeapFree( GetProcessHeap(), 0, wstr );
 
     return r;
 }

Index: wine/dlls/advapi32/registry.c
diff -u -p wine/dlls/advapi32/registry.c:1.68 wine/dlls/advapi32/registry.c:1.69
--- wine/dlls/advapi32/registry.c:1.68	Wed May 22 11:05:29 2013
+++ wine/dlls/advapi32/registry.c	Wed May 22 11:05:29 2013
@@ -1006,7 +1006,7 @@ DWORD WINAPI RegSetValueExA( HKEY hkey,
     {
         status = NtSetValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString, 0, type, data, count );
     }
-    if (dataW) HeapFree( GetProcessHeap(), 0, dataW );
+    HeapFree( GetProcessHeap(), 0, dataW );
     return RtlNtStatusToDosError( status );
 }