Andrew Talbot : shlwapi: Remove unused variables.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: af3055e2e1bb7be0bdcaa70c7efbf9353aee1525
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=af3055e2e1bb7be0bdcaa70c7e...

Author: Andrew Talbot 
Date:   Mon Apr 28 22:17:14 2008 +0100

shlwapi: Remove unused variables.

---

dlls/shlwapi/ordinal.c |    4 ++--
 dlls/shlwapi/reg.c     |   14 ++++++--------
 dlls/shlwapi/url.c     |    6 ++----
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 5786c94..d1668a6 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -1492,11 +1492,11 @@ HRESULT WINAPI IUnknown_QueryService(IUnknown* lpUnknown, REFGUID sid, REFIID ri
  */
 BOOL WINAPI SHLoadMenuPopup(HINSTANCE hInst, LPCWSTR szName)
 {
-  HMENU hMenu, hSubMenu;
+  HMENU hMenu;

if ((hMenu = LoadMenuW(hInst, szName)))
   {
-    if ((hSubMenu = GetSubMenu(hMenu, 0)))
+    if (GetSubMenu(hMenu, 0))
       RemoveMenu(hMenu, 0, MF_BYPOSITION);

DestroyMenu(hMenu);
diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index 52908e9..9239824 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -626,7 +626,6 @@ BOOL WINAPI SHRegGetBoolUSValueA(
    BOOL fIgnoreHKCU, /* [I] TRUE=Don't check HKEY_CURRENT_USER */
    BOOL fDefault) /* [I] Default value to use if pszValue is not present */
 {
-	LONG retvalue;
    DWORD type, datalen, work;
    BOOL ret = fDefault;
    CHAR data[10];
@@ -636,9 +635,9 @@ BOOL WINAPI SHRegGetBoolUSValueA(
          (fIgnoreHKCU) ? "Ignoring HKCU" : "Tries HKCU then HKLM");

datalen = sizeof(data)-1;
-	if (!(retvalue = SHRegGetUSValueA( pszSubKey, pszValue, &type,
-					   data, &datalen,
-					   fIgnoreHKCU, 0, 0))) {
+	if (!SHRegGetUSValueA( pszSubKey, pszValue, &type,
+			       data, &datalen,
+			       fIgnoreHKCU, 0, 0)) {
        /* process returned data via type into bool */
        switch (type) {
        case REG_SZ:
@@ -687,7 +686,6 @@ BOOL WINAPI SHRegGetBoolUSValueW(
    static const WCHAR wTRUE[]= {'T','R','U','E','\0'};
    static const WCHAR wNO[]=   {'N','O','\0'};
    static const WCHAR wFALSE[]={'F','A','L','S','E','\0'};
-	LONG retvalue;
    DWORD type, datalen, work;
    BOOL ret = fDefault;
    WCHAR data[10];
@@ -697,9 +695,9 @@ BOOL WINAPI SHRegGetBoolUSValueW(
          (fIgnoreHKCU) ? "Ignoring HKCU" : "Tries HKCU then HKLM");

datalen = (sizeof(data)-1) * sizeof(WCHAR);
-	if (!(retvalue = SHRegGetUSValueW( pszSubKey, pszValue, &type,
-					   data, &datalen,
-					   fIgnoreHKCU, 0, 0))) {
+	if (!SHRegGetUSValueW( pszSubKey, pszValue, &type,
+			       data, &datalen,
+			       fIgnoreHKCU, 0, 0)) {
        /* process returned data via type into bool */
        switch (type) {
        case REG_SZ:
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index 1ff4312..2593f96 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -2153,7 +2153,6 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut,
 BOOL WINAPI PathIsURLA(LPCSTR lpstrPath)
 {
     PARSEDURLA base;
-    DWORD res1;

TRACE("%s\n", debugstr_a(lpstrPath));

@@ -2161,7 +2160,7 @@ BOOL WINAPI PathIsURLA(LPCSTR lpstrPath)

/* get protocol        */
     base.cbSize = sizeof(base);
-    res1 = ParseURLA(lpstrPath, &base);
+    ParseURLA(lpstrPath, &base);
     return (base.nScheme != URL_SCHEME_INVALID);
 }

@@ -2173,7 +2172,6 @@ BOOL WINAPI PathIsURLA(LPCSTR lpstrPath)
 BOOL WINAPI PathIsURLW(LPCWSTR lpstrPath)
 {
     PARSEDURLW base;
-    DWORD res1;

TRACE("%s\n", debugstr_w(lpstrPath));

@@ -2181,7 +2179,7 @@ BOOL WINAPI PathIsURLW(LPCWSTR lpstrPath)

/* get protocol        */
     base.cbSize = sizeof(base);
-    res1 = ParseURLW(lpstrPath, &base);
+    ParseURLW(lpstrPath, &base);
     return (base.nScheme != URL_SCHEME_INVALID);
 }