shell32: Remove unused variables
Andrew Talbot
andrew.talbot at talbotville.com
Thu Apr 24 15:43:56 CDT 2008
Changelog:
shell32: Remove unused variables.
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index 76f1309..7c10588 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -1002,7 +1002,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles)
{
LPCWSTR ptr = szFiles;
WCHAR szCurFile[MAX_PATH];
- DWORD i = 0, dwDirLen;
+ DWORD i = 0;
if (!szFiles)
return ERROR_INVALID_PARAMETER;
@@ -1027,7 +1027,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles)
/* change relative to absolute path */
if (PathIsRelativeW(ptr))
{
- dwDirLen = GetCurrentDirectoryW(MAX_PATH, szCurFile) + 1;
+ GetCurrentDirectoryW(MAX_PATH, szCurFile);
PathCombineW(szCurFile, szCurFile, ptr);
flList->feFiles[i].bFromRelative = TRUE;
}
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index cdd08c9..c44f8c1 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -132,7 +132,7 @@ static LPFMINFO FM_SetMenuParameter(
static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl)
{ IShellFolder *lpsf, *lpsf2;
ULONG ulItemAttr = SFGAO_FOLDER;
- UINT uID, uFlags, uEnumFlags;
+ UINT uID, uEnumFlags;
LPFNFMCALLBACK lpfnCallback;
LPCITEMIDLIST pidl;
WCHAR sTemp[MAX_PATH];
@@ -164,7 +164,6 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl)
return 0;
uID = menudata->uID;
- uFlags = menudata->uFlags;
uEnumFlags = menudata->uEnumFlags;
lpfnCallback = menudata->lpfnCallback;
menudata->bInitialized = FALSE;
@@ -593,7 +592,7 @@ LRESULT WINAPI FileMenu_DrawItem(
COLORREF clrPrevText, clrPrevBkgnd;
int xi,yi,xt,yt;
HIMAGELIST hImageList;
- RECT TextRect, BorderRect;
+ RECT TextRect;
LPFMINFO menuinfo;
TRACE("%p %p %s\n", hWnd, lpdis, debugstr_w(pMyItem->szItemText));
@@ -616,9 +615,6 @@ LRESULT WINAPI FileMenu_DrawItem(
if (menuinfo->nBorderWidth)
TextRect.left += menuinfo->nBorderWidth;
- BorderRect.right = menuinfo->nBorderWidth;
-/* FillRect(lpdis->hDC, &BorderRect, CreateSolidBrush( menuinfo->crBorderColor));
-*/
TextRect.left += FM_LEFTBORDER;
xi = TextRect.left + FM_SPACE1;
yi = TextRect.top + FM_Y_SPACE/2;
More information about the wine-patches
mailing list