ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comdlg32: Remove redundant NULL checks before MemFree.

This commit is contained in:
Michael Stefaniuc 2006-08-09 01:17:00 +02:00 committed by Alexandre Julliard
parent 43a23b00a7
commit 125e310ed3
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/comdlg32/filedlg.c
View File

@ -430,19 +430,12 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
MemFree(lpstrSavDir);
}
if(title)
MemFree(title);
if(defext)
MemFree(defext);
if(filter)
MemFree(filter);
if(customfilter)
MemFree(customfilter);
if(fodInfos.initdir)
MemFree(fodInfos.initdir);
if(fodInfos.filename)
MemFree(fodInfos.filename);
MemFree(title);
MemFree(defext);
MemFree(filter);
MemFree(customfilter);
MemFree(fodInfos.initdir);
MemFree(fodInfos.filename);
TRACE("selected file: %s\n",ofn->lpstrFile);
@ -1304,8 +1297,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit);
if (result) {
*nameBit = 0x00;
if (fodInfos->initdir)
MemFree(fodInfos->initdir);
MemFree(fodInfos->initdir);
fodInfos->initdir = MemAlloc((strlenW(tmpBuf2) + 1)*sizeof(WCHAR));
strcpyW(fodInfos->initdir, tmpBuf2);
handledPath = TRUE;
@ -1342,8 +1334,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
*nameBit = 0x00;
len = strlenW(tmpBuf);
if(fodInfos->initdir)
MemFree(fodInfos->initdir);
MemFree(fodInfos->initdir);
fodInfos->initdir = MemAlloc((len+1)*sizeof(WCHAR));
strcpyW(fodInfos->initdir, tmpBuf);
@ -1384,8 +1375,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
} else {
searchMore = FALSE;
if(fodInfos->initdir)
MemFree(fodInfos->initdir);
MemFree(fodInfos->initdir);
fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR));
GetCurrentDirectoryW(MAX_PATH, fodInfos->initdir);
@ -2000,8 +1990,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
DWORD len;
/* replace the current filter */
if(fodInfos->ShellInfos.lpstrCurrentFilter)
MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
len = strlenW(lpszTemp)+1;
fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc(len * sizeof(WCHAR));
strcpyW( fodInfos->ShellInfos.lpstrCurrentFilter, lpszTemp);
@ -2472,8 +2461,7 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode)
(fodInfos->customfilter == NULL ? 1 : 0);
/* Set the current filter with the current selection */
if(fodInfos->ShellInfos.lpstrCurrentFilter)
MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
iItem);
@ -2538,8 +2526,7 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd)
}
}
/* Current filter */
if(fodInfos->ShellInfos.lpstrCurrentFilter)
MemFree(fodInfos->ShellInfos.lpstrCurrentFilter);
MemFree(fodInfos->ShellInfos.lpstrCurrentFilter);
}