From 7f80d8e0c9e7838a6976b9fd753d5f1ddccc96f4 Mon Sep 17 00:00:00 2001
From: Andrew Talbot <andrew.talbot@talbotville.com>
Date: Mon, 14 Jul 2008 18:44:17 +0100
Subject: [PATCH] shell32: Remove unneeded address-of operators from array
 names.

---
 dlls/shell32/control.c      |  2 +-
 dlls/shell32/cpanelfolder.c |  4 ++--
 dlls/shell32/debughlp.c     | 10 +++++-----
 dlls/shell32/pidl.c         | 10 +++++-----
 dlls/shell32/shellord.c     |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c
index 2a58f67928c..dbebbd2716a 100644
--- a/dlls/shell32/control.c
+++ b/dlls/shell32/control.c
@@ -335,7 +335,7 @@ static void Control_RegisterRegistryApplets(HWND hWnd, CPanel *panel, HKEY hkey_
             DWORD nameLen = MAX_PATH;
             DWORD valueLen = MAX_PATH;
 
-            if (RegEnumValueW(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS)
+            if (RegEnumValueW(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)value, &valueLen) != ERROR_SUCCESS)
                 break;
 
             Control_LoadApplet(hWnd, value, panel);
diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c
index e3f9ffbcd89..93a79c5c50f 100644
--- a/dlls/shell32/cpanelfolder.c
+++ b/dlls/shell32/cpanelfolder.c
@@ -241,7 +241,7 @@ static LPITEMIDLIST _ILCreateCPanelApplet(LPCSTR name, LPCSTR displayName,
     PIDLCPanelStruct *p;
     LPITEMIDLIST pidl;
     PIDLDATA tmp;
-    int size0 = (char*)&tmp.u.cpanel.szName-(char*)&tmp.u.cpanel;
+    int size0 = (char*)tmp.u.cpanel.szName-(char*)&tmp.u.cpanel;
     int size = size0;
     int l;
 
@@ -356,7 +356,7 @@ static int SHELL_RegisterRegistryCPanelApps(IEnumIDList* list, HKEY hkey_root, L
             DWORD nameLen = MAX_PATH;
             DWORD valueLen = MAX_PATH;
 
-            if (RegEnumValueA(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS)
+            if (RegEnumValueA(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)value, &valueLen) != ERROR_SUCCESS)
                 break;
 
             if (SHELL_RegisterCPanelApp(list, value))
diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c
index 50bf0dc48f2..32238398dd8 100644
--- a/dlls/shell32/debughlp.c
+++ b/dlls/shell32/debughlp.c
@@ -60,7 +60,7 @@ static
 LPPIDLDATA _dbg_ILGetDataPointer(LPCITEMIDLIST pidl)
 {
 	if(pidl && pidl->mkid.cb != 0x00)
-	  return (LPPIDLDATA) &(pidl->mkid.abID);
+	  return (LPPIDLDATA)pidl->mkid.abID;
 	return NULL;
 }
 
@@ -82,21 +82,21 @@ LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl)
 	    case PT_DRIVE1:
 	    case PT_DRIVE2:
 	    case PT_DRIVE3:
-	      return (LPSTR)&(pdata->u.drive.szDriveName);
+	      return (LPSTR)pdata->u.drive.szDriveName;
 
 	    case PT_FOLDER:
 	    case PT_FOLDER1:
 	    case PT_VALUE:
 	    case PT_IESPECIAL1:
 	    case PT_IESPECIAL2:
-	      return (LPSTR)&(pdata->u.file.szNames);
+	      return (LPSTR)pdata->u.file.szNames;
 
 	    case PT_WORKGRP:
 	    case PT_COMP:
 	    case PT_NETWORK:
 	    case PT_NETPROVIDER:
 	    case PT_SHARE:
-	      return (LPSTR)&(pdata->u.network.szNames);
+	      return (LPSTR)pdata->u.network.szNames;
 	  }
 	}
 	return NULL;
@@ -140,7 +140,7 @@ LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl)
 	      return NULL;
 
 	    case PT_VALUEW:
-	      return (LPWSTR)&(pdata->u.file.szNames);
+	      return (LPWSTR)pdata->u.file.szNames;
 	  }
 	}
 	return NULL;
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index a97106733e9..9a9218e3781 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1886,7 +1886,7 @@ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize)
 LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl)
 {
     if(pidl && pidl->mkid.cb != 0x00)
-        return (LPPIDLDATA) &(pidl->mkid.abID);
+        return (LPPIDLDATA)pidl->mkid.abID;
     return NULL;
 }
 
@@ -1934,7 +1934,7 @@ LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl)
         return NULL;
 
     case PT_VALUEW:
-        return (LPWSTR)&(pdata->u.file.szNames);
+        return (LPWSTR)pdata->u.file.szNames;
     }
     return NULL;
 }
@@ -1964,21 +1964,21 @@ LPSTR _ILGetTextPointer(LPCITEMIDLIST pidl)
     case PT_DRIVE1:
     case PT_DRIVE2:
     case PT_DRIVE3:
-        return (LPSTR)&(pdata->u.drive.szDriveName);
+        return (LPSTR)pdata->u.drive.szDriveName;
 
     case PT_FOLDER:
     case PT_FOLDER1:
     case PT_VALUE:
     case PT_IESPECIAL1:
     case PT_IESPECIAL2:
-        return (LPSTR)&(pdata->u.file.szNames);
+        return (LPSTR)pdata->u.file.szNames;
 
     case PT_WORKGRP:
     case PT_COMP:
     case PT_NETWORK:
     case PT_NETPROVIDER:
     case PT_SHARE:
-        return (LPSTR)&(pdata->u.network.szNames);
+        return (LPSTR)pdata->u.network.szNames;
     }
     return NULL;
 }
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 5d1666b58ed..0905bf9ba1e 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -718,7 +718,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
     /* See if we need to do anything.
      */
     datalen = 64;
-    ret=SHADD_get_policy( "NoRecentDocsHistory", &type, &data, &datalen);
+    ret=SHADD_get_policy( "NoRecentDocsHistory", &type, data, &datalen);
     if ((ret > 0) && (ret != ERROR_FILE_NOT_FOUND)) {
 	ERR("Error %d getting policy \"NoRecentDocsHistory\"\n", ret);
 	return;