shell32: Remove unused variables.

This commit is contained in:
Andrew Talbot 2008-04-24 21:43:56 +01:00 committed by Alexandre Julliard
parent 649c7aeb7c
commit f692f19531
2 changed files with 4 additions and 8 deletions

View File

@ -1002,7 +1002,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles)
{ {
LPCWSTR ptr = szFiles; LPCWSTR ptr = szFiles;
WCHAR szCurFile[MAX_PATH]; WCHAR szCurFile[MAX_PATH];
DWORD i = 0, dwDirLen; DWORD i = 0;
if (!szFiles) if (!szFiles)
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
@ -1027,7 +1027,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles)
/* change relative to absolute path */ /* change relative to absolute path */
if (PathIsRelativeW(ptr)) if (PathIsRelativeW(ptr))
{ {
dwDirLen = GetCurrentDirectoryW(MAX_PATH, szCurFile) + 1; GetCurrentDirectoryW(MAX_PATH, szCurFile);
PathCombineW(szCurFile, szCurFile, ptr); PathCombineW(szCurFile, szCurFile, ptr);
flList->feFiles[i].bFromRelative = TRUE; flList->feFiles[i].bFromRelative = TRUE;
} }

View File

@ -132,7 +132,7 @@ static LPFMINFO FM_SetMenuParameter(
static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl)
{ IShellFolder *lpsf, *lpsf2; { IShellFolder *lpsf, *lpsf2;
ULONG ulItemAttr = SFGAO_FOLDER; ULONG ulItemAttr = SFGAO_FOLDER;
UINT uID, uFlags, uEnumFlags; UINT uID, uEnumFlags;
LPFNFMCALLBACK lpfnCallback; LPFNFMCALLBACK lpfnCallback;
LPCITEMIDLIST pidl; LPCITEMIDLIST pidl;
WCHAR sTemp[MAX_PATH]; WCHAR sTemp[MAX_PATH];
@ -164,7 +164,6 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl)
return 0; return 0;
uID = menudata->uID; uID = menudata->uID;
uFlags = menudata->uFlags;
uEnumFlags = menudata->uEnumFlags; uEnumFlags = menudata->uEnumFlags;
lpfnCallback = menudata->lpfnCallback; lpfnCallback = menudata->lpfnCallback;
menudata->bInitialized = FALSE; menudata->bInitialized = FALSE;
@ -593,7 +592,7 @@ LRESULT WINAPI FileMenu_DrawItem(
COLORREF clrPrevText, clrPrevBkgnd; COLORREF clrPrevText, clrPrevBkgnd;
int xi,yi,xt,yt; int xi,yi,xt,yt;
HIMAGELIST hImageList; HIMAGELIST hImageList;
RECT TextRect, BorderRect; RECT TextRect;
LPFMINFO menuinfo; LPFMINFO menuinfo;
TRACE("%p %p %s\n", hWnd, lpdis, debugstr_w(pMyItem->szItemText)); TRACE("%p %p %s\n", hWnd, lpdis, debugstr_w(pMyItem->szItemText));
@ -616,9 +615,6 @@ LRESULT WINAPI FileMenu_DrawItem(
if (menuinfo->nBorderWidth) if (menuinfo->nBorderWidth)
TextRect.left += menuinfo->nBorderWidth; TextRect.left += menuinfo->nBorderWidth;
BorderRect.right = menuinfo->nBorderWidth;
/* FillRect(lpdis->hDC, &BorderRect, CreateSolidBrush( menuinfo->crBorderColor));
*/
TextRect.left += FM_LEFTBORDER; TextRect.left += FM_LEFTBORDER;
xi = TextRect.left + FM_SPACE1; xi = TextRect.left + FM_SPACE1;
yi = TextRect.top + FM_Y_SPACE/2; yi = TextRect.top + FM_Y_SPACE/2;