[ros-diffs] [cfinck] 34073: Get shell32 to compile warning-free Patch by Stefan Ginsberg with minor modifications by me

Author: cfinck
Date: Tue Jun 24 09:37:50 2008
New Revision: 34073

URL: http://svn.reactos.org/svn/reactos?rev=34073&view=rev
Log:
Get shell32 to compile warning-free
Patch by Stefan Ginsberg with minor modifications by me

Modified:
    trunk/reactos/dll/win32/shell32/dataobject.c
    trunk/reactos/dll/win32/shell32/extracticon.c
    trunk/reactos/dll/win32/shell32/fprop.c
    trunk/reactos/dll/win32/shell32/shell32.rbuild
    trunk/reactos/dll/win32/shell32/shell32_main.h
    trunk/reactos/dll/win32/shell32/shfldr_printers.c
    trunk/reactos/dll/win32/shell32/shlfileop.c
    trunk/reactos/dll/win32/shell32/shlview.c
    trunk/reactos/dll/win32/shell32/shv_item_cmenu.c
    trunk/reactos/dll/win32/shell32/undocshell.h
    trunk/reactos/include/psdk/shlobj.h

Modified: trunk/reactos/dll/win32/shell32/dataobject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dataobje…
==============================================================================
--- trunk/reactos/dll/win32/shell32/dataobject.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/dataobject.c [iso-8859-1] Tue Jun 24 09:37:50 2008
@@ -461,7 +461,7 @@
 {
     if (IsEqualIID(riid, &IID_IDataObject))
     {
-        return CIDLData_CreateFromIDArray(pidlFolder, cidl, apidl, ppv);
+        return CIDLData_CreateFromIDArray(pidlFolder, cidl, apidl, (IDataObject**)ppv);
     }
     return E_FAIL;
 }

Modified: trunk/reactos/dll/win32/shell32/extracticon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/extracti…
==============================================================================
--- trunk/reactos/dll/win32/shell32/extracticon.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/extracticon.c [iso-8859-1] Tue Jun 24 09:37:50 2008
@@ -22,7 +22,7 @@
 
 struct IconExtraction
 {
-    ULONG ref;
+    LONG ref;
     IDefaultExtractIconInit defaultExtractIconInitImpl;
     IExtractIconW extractIconWImpl;
     IExtractIconA extractIconAImpl;
@@ -92,7 +92,7 @@
     IDefaultExtractIconInit *This)
 {
     struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction,
defaultExtractIconInitImpl);
-    ULONG refCount = InterlockedIncrement((PLONG)&s->ref);
+    ULONG refCount = InterlockedIncrement(&s->ref);
     TRACE("(%p)\n", This);
     return refCount;
 }
@@ -106,7 +106,7 @@
 
     TRACE("(%p)\n", This);
 
-    refCount = InterlockedDecrement((PLONG)&s->ref);
+    refCount = InterlockedDecrement(&s->ref);
     if (refCount == 0)
     {
         if (s->defaultIcon.file) CoTaskMemFree(s->defaultIcon.file);

Modified: trunk/reactos/dll/win32/shell32/fprop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?…
==============================================================================
--- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Tue Jun 24 09:37:50 2008
@@ -614,7 +614,7 @@
  */
 
 BOOL
-SH_ShowPropertiesDialog(WCHAR * lpf)
+SH_ShowPropertiesDialog(PCWSTR lpf)
 {
     PROPSHEETHEADERW pinfo;
     HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE];
@@ -635,7 +635,7 @@
     if (lpf[0] == '"')
     {
         /* remove quotes from lpf */
-        LPWSTR src = lpf + 1;
+        LPCWSTR src = lpf + 1;
         LPWSTR dst = wFileName;
 
         while(*src && *src!='"')

Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Tue Jun 24 09:37:50 2008
@@ -1,4 +1,4 @@
-<module name="shell32" type="win32dll"
baseaddress="${BASEADDRESS_SHELL32}" installbase="system32"
installname="shell32.dll" allowwarnings="true">
+<module name="shell32" type="win32dll"
baseaddress="${BASEADDRESS_SHELL32}" installbase="system32"
installname="shell32.dll">
 	<autoregister infsection="OleControlDlls" type="Both" />
 	<importlibrary definition="shell32.spec.def" />
 	<include base="shell32">.</include>

Modified: trunk/reactos/dll/win32/shell32/shell32_main.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Tue Jun 24 09:37:50 2008
@@ -246,5 +246,5 @@
 HPROPSHEETPAGE SH_CreatePropertySheetPage(LPSTR resname, DLGPROC dlgproc, LPARAM lParam,
LPWSTR szTitle);
 BOOL SH_ShowDriveProperties(WCHAR * drive);
 BOOL SH_ShowRecycleBinProperties(WCHAR sDrive);
-BOOL SH_ShowPropertiesDialog(WCHAR * lpf);
+BOOL SH_ShowPropertiesDialog(PCWSTR lpf);
 #endif

Modified: trunk/reactos/dll/win32/shell32/shfldr_printers.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] Tue Jun 24 09:37:50
2008
@@ -309,7 +309,7 @@
     IShellFolder2Vtbl *lpVtbl;
     IPersistFolder2Vtbl *lpVtblPersistFolder2;
 
-    DWORD ref;
+    LONG ref;
 
     CLSID *pclsid;
 

Modified: trunk/reactos/dll/win32/shell32/shlfileop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] Tue Jun 24 09:37:50 2008
@@ -255,14 +255,12 @@
             ids->text_resource_id  = IDS_DELETESELECTED_TEXT;
             return TRUE;
 	  case ASK_OVERWRITE_FILE:
-            ids->hIconInstance = NULL;
-            ids->icon_resource_id = IDI_WARNING;
+            ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE;
 	    ids->caption_resource_id  = IDS_OVERWRITEFILE_CAPTION;
 	    ids->text_resource_id  = IDS_OVERWRITEFILE_TEXT;
             return TRUE;
 	  case ASK_OVERWRITE_FOLDER:
-            ids->hIconInstance = NULL;
-            ids->icon_resource_id = IDI_WARNING;
+            ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE;
             ids->caption_resource_id  = IDS_OVERWRITEFILE_CAPTION;
             ids->text_resource_id  = IDS_OVERWRITEFOLDER_TEXT;
             return TRUE;

Modified: trunk/reactos/dll/win32/shell32/shlview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Tue Jun 24 09:37:50 2008
@@ -1669,7 +1669,7 @@
 	      return 1;
 	    break;
       case CWM_GETISHELLBROWSER:
-          return pThis->pShellBrowser;
+          return (LRESULT)pThis->pShellBrowser;
 	}
 	return DefWindowProcW(hWnd, uMessage, wParam, lParam);
 }

Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c [iso-8859-1] Tue Jun 24 09:37:50
2008
@@ -122,7 +122,7 @@
 	    HRESULT hr;
 	    IShellFolder_AddRef(pSFParent);
 	    cm->rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANMOVE | SFGAO_CANDELETE |
SFGAO_CANRENAME | SFGAO_HASPROPSHEET;
-	    hr = IShellFolder_GetAttributesOf(pSFParent, cidl, apidl, &cm->rfg);
+	    hr = IShellFolder_GetAttributesOf(pSFParent, cidl, (LPCITEMIDLIST *)apidl,
&cm->rfg);
 	    if (!SUCCEEDED(hr))
 	        cm->rfg = 0; /* No action available */
 	}
@@ -615,7 +615,7 @@
     indexMenu = SH_AddStaticEntryToMenu(hmenu, indexMenu, This);
 
     SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION);
-    pDataObj = IDataObject_Constructor(NULL, This->pidl, This->apidl,
This->cidl);
+    pDataObj = IDataObject_Constructor(NULL, This->pidl, (LPCITEMIDLIST
*)This->apidl, This->cidl);
     if (pDataObj)
     {
         indexMenu = SH_LoadContextMenuHandlers(This, pDataObj, hmenu, indexMenu);
@@ -733,7 +733,7 @@
      PathAddBackslashW(szPath);
      IPersistFolder2_Release(psf);
 
-     szTarget = build_paths_list(szPath, This->cidl, This->apidl);
+     szTarget = build_paths_list(szPath, This->cidl, (LPCITEMIDLIST
*)This->apidl);
 
      if (pidl)
      {

Modified: trunk/reactos/dll/win32/shell32/undocshell.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe…
==============================================================================
--- trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] Tue Jun 24 09:37:50 2008
@@ -71,15 +71,6 @@
 BOOL WINAPI StrRetToStrNA(LPSTR,DWORD,LPSTRRET,const ITEMIDLIST*);
 BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*);
 
-
-/****************************************************************************
-* SHChangeNotifyRegister API
-*/
-#define SHCNRF_InterruptLevel		0x0001
-#define SHCNRF_ShellLevel		0x0002
-#define SHCNRF_RecursiveInterrupt	0x1000	/* Must be combined with SHCNRF_InterruptLevel
*/
-#define SHCNRF_NewDelivery		0x8000	/* Messages use shared memory */
-
 /****************************************************************************
  * Shell Common Dialogs
  */

Modified: trunk/reactos/include/psdk/shlobj.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Tue Jun 24 09:37:50 2008
@@ -133,7 +133,7 @@
 #define CFSTR_SHELLURL         "UniformResourceLocator"
 #endif
 
-#define CFSTR_FILENAMEW         L"FileNameW"
+#define CFSTR_FILENAMEW         "FileNameW"
 #define CFSTR_FILENAMEA         "FileName"
 #define CFSTR_FILENAMEMAPA      "FileNameMap"             /* CF_FILENAMEMAPA
*/
 #define CFSTR_FILENAMEMAPW      "FileNameMapW"            /* CF_FILENAMEMAPW
*/