[ros-diffs] [tkreuzer] 41048: Shel32: - DialogProc returns INT_PTR and not BOOL - Don't cast a pointer to LONG - Use INT_PTR instead of int for pointer math

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Sat May 23 03:56:31 2009
New Revision: 41048

URL: http://svn.reactos.org/svn/reactos?rev=41048&view=rev
Log:
Shel32:
- DialogProc returns INT_PTR and not BOOL
- Don't cast a pointer to LONG
- Use INT_PTR instead of int for pointer math

Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c
    branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c
    branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c
    branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c
    branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c
    branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c
    branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c

Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sat May 23 03:56:31 2009
@@ -1164,7 +1164,7 @@
 }
 
 
-BOOL 
+INT_PTR 
 CALLBACK 
 FormatDriveDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {

Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sat May 23 03:56:31 2009
@@ -536,7 +536,7 @@
     SH_FileVersionQuerySetListText(hwndDlg, pBuf, wOriginalFilename, &str, lang, code);
     SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductName, &str, lang, code);
     SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductVersion, &str, lang, code);
-    SetWindowLongPtr(hwndDlg, DWL_USER, (LONG)pBuf);
+    SetWindowLongPtr(hwndDlg, DWL_USER, (LONG_PTR)pBuf);
 
     /* select first item */
     hDlgCtrl = GetDlgItem(hwndDlg, 14009);

Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Sat May 23 03:56:31 2009
@@ -623,7 +623,7 @@
 }
 
 
-static BOOL CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     LPMEASUREITEMSTRUCT lpmis; 
     LPDRAWITEMSTRUCT lpdis; 

Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c [iso-8859-1] Sat May 23 03:56:31 2009
@@ -61,7 +61,7 @@
 #define AdminToolsHELLVIEWCOLUMNS (4)
 
 
-#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
+#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
 #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
 
 #define _IUnknown_(This)    (IShellFolder*)&(This->lpVtbl)

Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Sat May 23 03:56:31 2009
@@ -41,9 +41,9 @@
 static const IPersistFolder2Vtbl vt_NP_PersistFolder2;
 static const IContextMenu2Vtbl vt_ContextMenu2FontItem;
 
-#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
+#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
 #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
-#define _IContextMenuFontItem_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblContextMenuFontItem)))
+#define _IContextMenuFontItem_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblContextMenuFontItem)))
 #define _ICOM_THIS_From_IContextMenu2FontItem(class, name) class* This = (class*)(((char*)name)-_IContextMenuFontItem_Offset);
 
 #define _IUnknown_(This)	(IUnknown*)&(This->lpVtbl)

Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c [iso-8859-1] Sat May 23 03:56:31 2009
@@ -41,7 +41,7 @@
 static const IPersistFolder2Vtbl vt_NP_PersistFolder2;
 
 
-#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
+#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
 #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
 
 #define _IUnknown_(This)	(IUnknown*)&(This->lpVtbl)

Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] Sat May 23 03:56:31 2009
@@ -35,7 +35,7 @@
     LPITEMIDLIST       pidl;
 } IExtractIconWImpl;
 
-#define _IExtractIconA_Offset ((int)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA)))
+#define _IExtractIconA_Offset ((INT_PTR)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA)))
 #define _ICOM_THIS_From_IExtractIconA(class, name) class* This = (class*)(((char*)name)-_IExtractIconA_Offset);
 
 static shvheader PrinterSFHeader[] = {
@@ -305,7 +305,7 @@
     int dwAttributes;        /* attributes returned by GetAttributesOf FIXME: use it */
 } IGenericSFImpl;
 
-#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
+#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
 #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
 
 #define _IUnknown_(This)    (IShellFolder*)&(This->lpVtbl)