[SHELL32]

 - Fix a GCC warning.

svn path=/trunk/; revision=61296

diff --git a/reactos/dll/win32/shell32/classes.cpp b/reactos/dll/win32/shell32/classes.cpp
index ab31416..5b232a2 100644 (file)
--- a/reactos/dll/win32/shell32/classes.cpp
+++ b/reactos/dll/win32/shell32/classes.cpp
@@ -206,7 +206,7 @@ static BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey)
 *
 * Gets the icon for a filetype, szName can be NULL, in which case the default icon is loaded
 */
-static BOOL HCR_RegGetIconW(HKEY hkey, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx)
+static BOOL HCR_RegGetIconW(HKEY hkey, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx)
 {
     DWORD dwType;
     WCHAR sTemp[MAX_PATH];
@@ -230,7 +230,7 @@ static BOOL HCR_RegGetIconW(HKEY hkey, LPWSTR szDest, LPWSTR szName, DWORD len,
     return FALSE;
 }
 
-static BOOL HCR_RegGetIconA(HKEY hkey, LPSTR szDest, LPSTR szName, DWORD len, int* picon_idx)
+static BOOL HCR_RegGetIconA(HKEY hkey, LPSTR szDest, LPCSTR szName, DWORD len, int* picon_idx)
 {
     DWORD dwType;
     char sTemp[MAX_PATH];
@@ -254,7 +254,7 @@ static BOOL HCR_RegGetIconA(HKEY hkey, LPSTR szDest, LPSTR szName, DWORD len, in
     return FALSE;
 }
 
-BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx)
+BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx)
 {
     static const WCHAR swDefaultIcon[] = L"\\DefaultIcon";
     HKEY hKey;
@@ -280,7 +280,7 @@ BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPWSTR szName, DWORD len, int*
     return ret;
 }
 
-BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPSTR szName, DWORD len, int* picon_idx)
+BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPCSTR szName, DWORD len, int* picon_idx)
 {
     HKEY hKey;
     char sTemp[MAX_PATH];

diff --git a/reactos/dll/win32/shell32/folders.cpp b/reactos/dll/win32/shell32/folders.cpp
index 62f9e8b..1450164 100644 (file)
--- a/reactos/dll/win32/shell32/folders.cpp
+++ b/reactos/dll/win32/shell32/folders.cpp
@@ -224,9 +224,11 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl)
                  riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3],
                  riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]);
 
-        WCHAR* iconname = NULL;
+        const WCHAR* iconname = NULL;
         if (_ILIsBitBucket(pSimplePidl))
         {
+            static const WCHAR szFull[] = {'F','u','l','l',0};
+            static const WCHAR szEmpty[] = {'E','m','p','t','y',0};
             IEnumIDList *EnumIDList = NULL;
             CoInitialize(NULL);
 
@@ -244,9 +246,9 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl)
             if (SUCCEEDED(hr) && (hr = EnumIDList->Next(1, &pidl, &itemcount)) == S_OK)
             {
                 CoTaskMemFree(pidl);
-                iconname = L"Full";
+                iconname = szFull;
             } else {
-                iconname = L"Empty";
+                iconname = szEmpty;
             }
 
             if (psfDesktop)

diff --git a/reactos/dll/win32/shell32/shell32_main.h b/reactos/dll/win32/shell32/shell32_main.h
index 0a3d823..bb0a148 100644 (file)
--- a/reactos/dll/win32/shell32/shell32_main.h
+++ b/reactos/dll/win32/shell32/shell32_main.h
@@ -46,13 +46,13 @@ INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags );
 BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL bPrependDot);
 BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len );
 BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len );
-BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx);
+BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx);
 BOOL HCR_GetIconFromGUIDW(REFIID riid, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx);
 BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len);
 
 /* ANSI versions of above functions, supposed to go away as soon as they are not used anymore */
 BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bPrependDot);
-BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPSTR sName, DWORD len, int* picon_idx);
+BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPCSTR sName, DWORD len, int* picon_idx);
 BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len);
 
 BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD dwAttributes);