[ros-diffs] [sserapion] 36906: - Fix definitions of CDHOOKPROC, PROC, FARPROC, NEARPROC - Fix definitions of SYSTEM_INFO, COMPAREITEMSTRUCT, COPYDATASTRUCT, DELETEITEMSTRUCT, DRAWITEMSTRUCT, MENUITEMINFOA/W, HELPINFO, MSGBOXPARAMSA/W, MOUSEHOOKSTRUCT, DROPSTRUCT, KBDLLHOOKSTRUCT - Fix definitions of GetProcessAffinityMask, SetProcessAffinityMask, DragObject, InsertMenuA/W, ModifyMenuA/W, WinHelpA/W, RT_GROUP_CURSOR, RT_GROUP_ICON - Fix Treeview in 64bit regedit. - Patch by Daniel Verkamp.

Author: sserapion
Date: Thu Oct 23 09:27:06 2008
New Revision: 36906

URL: http://svn.reactos.org/svn/reactos?rev=36906&view=rev
Log:
- Fix definitions of CDHOOKPROC, PROC, FARPROC, NEARPROC
- Fix definitions of SYSTEM_INFO, COMPAREITEMSTRUCT, COPYDATASTRUCT, DELETEITEMSTRUCT,
DRAWITEMSTRUCT, MENUITEMINFOA/W, HELPINFO, MSGBOXPARAMSA/W, MOUSEHOOKSTRUCT, DROPSTRUCT,
KBDLLHOOKSTRUCT
- Fix definitions of GetProcessAffinityMask, SetProcessAffinityMask, DragObject,
InsertMenuA/W, ModifyMenuA/W, WinHelpA/W, RT_GROUP_CURSOR, RT_GROUP_ICON
- Fix Treeview in 64bit regedit.
- Patch by Daniel Verkamp.

Modified:
    branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h
    branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h
    branches/ros-amd64-bringup/reactos/include/psdk/winbase.h
    branches/ros-amd64-bringup/reactos/include/psdk/windef.h
    branches/ros-amd64-bringup/reactos/include/psdk/winuser.h

Modified: branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] Thu Oct 23
09:27:06 2008
@@ -2412,10 +2412,10 @@
 #define TVIF_INTEGRAL         0x0080
 #define TVIF_DI_SETITEM	      0x1000
 
-#define TVI_ROOT              ((HTREEITEM)0xffff0000)     /* -65536 */
-#define TVI_FIRST             ((HTREEITEM)0xffff0001)     /* -65535 */
-#define TVI_LAST              ((HTREEITEM)0xffff0002)     /* -65534 */
-#define TVI_SORT              ((HTREEITEM)0xffff0003)     /* -65533 */
+#define TVI_ROOT              ((HTREEITEM)(ULONG_PTR)-0x10000)     /* -65536 */
+#define TVI_FIRST             ((HTREEITEM)(ULONG_PTR)-0x0FFFF)     /* -65535 */
+#define TVI_LAST              ((HTREEITEM)(ULONG_PTR)-0x0FFFE)     /* -65534 */
+#define TVI_SORT              ((HTREEITEM)(ULONG_PTR)-0x0FFFD)     /* -65533 */
 
 #define TVIS_FOCUSED          0x0001
 #define TVIS_SELECTED         0x0002

Modified: branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h [iso-8859-1] Thu Oct 23
09:27:06 2008
@@ -216,7 +216,7 @@
 #define CommDlg_OpenSave_HideControl(d,i) ((void)SNDMSG((d),CDM_HIDECONTROL,(i),0))
 #define CommDlg_OpenSave_SetDefExt(d,e) ((void)SNDMSG((d),CDM_SETDEFEXT,0,(LPARAM)(e)))
 
-typedef UINT (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
+typedef UINT_PTR (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
 typedef __CDHOOKPROC LPCCHOOKPROC;
 typedef __CDHOOKPROC LPCFHOOKPROC;
 typedef __CDHOOKPROC LPFRHOOKPROC;

Modified: branches/ros-amd64-bringup/reactos/include/psdk/winbase.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/winbase.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/winbase.h [iso-8859-1] Thu Oct 23
09:27:06 2008
@@ -910,7 +910,7 @@
 	DWORD dwPageSize;
 	PVOID lpMinimumApplicationAddress;
 	PVOID lpMaximumApplicationAddress;
-	DWORD dwActiveProcessorMask;
+	DWORD_PTR dwActiveProcessorMask;
 	DWORD dwNumberOfProcessors;
 	DWORD dwProcessorType;
 	DWORD dwAllocationGranularity;
@@ -1530,7 +1530,7 @@
 BOOL WINAPI GetPrivateProfileStructA(LPCSTR,LPCSTR,LPVOID,UINT,LPCSTR);
 BOOL WINAPI GetPrivateProfileStructW(LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR);
 FARPROC WINAPI GetProcAddress(HINSTANCE,LPCSTR);
-BOOL WINAPI GetProcessAffinityMask(HANDLE,PDWORD,PDWORD);
+BOOL WINAPI GetProcessAffinityMask(HANDLE,PDWORD_PTR,PDWORD_PTR);
 #if (_WIN32_WINNT >= 0x0502)
 BOOL WINAPI GetProcessHandleCount(HANDLE,PDWORD);
 #endif
@@ -2071,7 +2071,7 @@
 BOOL WINAPI SetNamedPipeHandleState(HANDLE,PDWORD,PDWORD,PDWORD);
 BOOL WINAPI SetPriorityClass(HANDLE,DWORD);
 BOOL WINAPI
SetPrivateObjectSecurity(SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR
*,PGENERIC_MAPPING,HANDLE);
-BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD);
+BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD_PTR);
 BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL);
 BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD);
 BOOL WINAPI SetProcessWorkingSetSize(HANDLE,SIZE_T,SIZE_T);

Modified: branches/ros-amd64-bringup/reactos/include/psdk/windef.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] Thu Oct 23
09:27:06 2008
@@ -348,9 +348,9 @@
 typedef int HFILE;
 typedef HICON HCURSOR;
 typedef DWORD COLORREF;
-typedef int (WINAPI *FARPROC)();
-typedef int (WINAPI *NEARPROC)();
-typedef int (WINAPI *PROC)();
+typedef INT_PTR (WINAPI *FARPROC)();
+typedef INT_PTR (WINAPI *NEARPROC)();
+typedef INT_PTR (WINAPI *PROC)();
 typedef struct tagRECT {
 	LONG left;
 	LONG top;

Modified: branches/ros-amd64-bringup/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] Thu Oct 23
09:27:06 2008
@@ -615,8 +615,8 @@
 #define RT_RCDATA MAKEINTRESOURCE(10)
 #define RT_MESSAGETABLE MAKEINTRESOURCE(11)
 #define DIFFERENCE 11
-#define RT_GROUP_CURSOR MAKEINTRESOURCE((DWORD)RT_CURSOR+DIFFERENCE)
-#define RT_GROUP_ICON MAKEINTRESOURCE((DWORD)RT_ICON+DIFFERENCE)
+#define RT_GROUP_CURSOR MAKEINTRESOURCE((ULONG_PTR)RT_CURSOR+DIFFERENCE)
+#define RT_GROUP_ICON MAKEINTRESOURCE((ULONG_PTR)RT_ICON+DIFFERENCE)
 #define RT_VERSION MAKEINTRESOURCE(16)
 #define RT_DLGINCLUDE MAKEINTRESOURCE(17)
 #define RT_PLUGPLAY MAKEINTRESOURCE(19)
@@ -2804,13 +2804,13 @@
 	UINT	CtlID;
 	HWND	hwndItem;
 	UINT	itemID1;
-	DWORD	itemData1;
+	ULONG_PTR	itemData1;
 	UINT	itemID2;
-	DWORD	itemData2;
+	ULONG_PTR	itemData2;
 	DWORD	dwLocaleId;
 } COMPAREITEMSTRUCT,*LPCOMPAREITEMSTRUCT;
 typedef struct tagCOPYDATASTRUCT {
-	DWORD dwData;
+	ULONG_PTR dwData;
 	DWORD cbData;
 	PVOID lpData;
 } COPYDATASTRUCT,*PCOPYDATASTRUCT;
@@ -2848,7 +2848,7 @@
 	UINT CtlID;
 	UINT itemID;
 	HWND hwndItem;
-	UINT itemData;
+	ULONG_PTR itemData;
 } DELETEITEMSTRUCT,*PDELETEITEMSTRUCT,*LPDELETEITEMSTRUCT;
 #pragma pack(push,2)
 typedef struct {
@@ -2887,7 +2887,7 @@
 	HWND hwndItem;
 	HDC	hDC;
 	RECT rcItem;
-	DWORD itemData;
+	ULONG_PTR itemData;
 } DRAWITEMSTRUCT,*LPDRAWITEMSTRUCT,*PDRAWITEMSTRUCT;
 typedef struct {
 	UINT cbSize;
@@ -2985,7 +2985,7 @@
 	HMENU hSubMenu;
 	HBITMAP hbmpChecked;
 	HBITMAP hbmpUnchecked;
-	DWORD dwItemData;
+	ULONG_PTR dwItemData;
 	LPSTR dwTypeData;
 	UINT cch;
 #if (_WIN32_WINNT >= 0x0500)
@@ -3002,7 +3002,7 @@
 	HMENU hSubMenu;
 	HBITMAP hbmpChecked;
 	HBITMAP hbmpUnchecked;
-	DWORD dwItemData;
+	ULONG_PTR dwItemData;
 	LPWSTR dwTypeData;
 	UINT cch;
 #if (_WIN32_WINNT >= 0x0500)
@@ -3043,7 +3043,7 @@
 	int iContextType;
 	int iCtrlId;
 	HANDLE hItemHandle;
-	DWORD dwContextId;
+	DWORD_PTR dwContextId;
 	POINT MousePos;
 } HELPINFO,*LPHELPINFO;
 typedef void(CALLBACK *MSGBOXCALLBACK)(LPHELPINFO);
@@ -3055,7 +3055,7 @@
 	LPCSTR lpszCaption;
 	DWORD dwStyle;
 	LPCSTR lpszIcon;
-	DWORD dwContextHelpId;
+	DWORD_PTR dwContextHelpId;
 	MSGBOXCALLBACK lpfnMsgBoxCallback;
 	DWORD dwLanguageId;
 } MSGBOXPARAMSA,*PMSGBOXPARAMSA,*LPMSGBOXPARAMSA;
@@ -3067,7 +3067,7 @@
 	LPCWSTR lpszCaption;
 	DWORD dwStyle;
 	LPCWSTR lpszIcon;
-	DWORD dwContextHelpId;
+	DWORD_PTR dwContextHelpId;
 	MSGBOXCALLBACK lpfnMsgBoxCallback;
 	DWORD dwLanguageId;
 } MSGBOXPARAMSW,*PMSGBOXPARAMSW,*LPMSGBOXPARAMSW;
@@ -3220,7 +3220,7 @@
 	POINT pt;
 	HWND hwnd;
 	UINT wHitTestCode;
-	DWORD dwExtraInfo;
+	ULONG_PTR dwExtraInfo;
 } MOUSEHOOKSTRUCT,*LPMOUSEHOOKSTRUCT,*PMOUSEHOOKSTRUCT;
 #if ( _WIN32_WINNT >= 0x0500 )
 #ifdef __cplusplus
@@ -3306,13 +3306,13 @@
 	UINT itemID;
 	UINT itemWidth;
 	UINT itemHeight;
-	DWORD itemData;
+	ULONG_PTR itemData;
 } MEASUREITEMSTRUCT,*PMEASUREITEMSTRUCT,*LPMEASUREITEMSTRUCT;
 typedef struct tagDROPSTRUCT {
 	HWND hwndSource;
 	HWND hwndSink;
 	DWORD wFmt;
-	DWORD dwData;
+	ULONG_PTR dwData;
 	POINT ptDrop;
 	DWORD dwControlData;
 } DROPSTRUCT,*PDROPSTRUCT,*LPDROPSTRUCT;
@@ -3451,7 +3451,7 @@
 	DWORD scanCode;
 	DWORD flags;
 	DWORD time;
-	DWORD dwExtraInfo;
+	ULONG_PTR dwExtraInfo;
 } KBDLLHOOKSTRUCT,*LPKBDLLHOOKSTRUCT,*PKBDLLHOOKSTRUCT;
 typedef struct tagMSLLHOOKSTRUCT
 {
@@ -3750,7 +3750,7 @@
 BOOL WINAPI DlgDirSelectExA(HWND,LPSTR,int,int);
 BOOL WINAPI DlgDirSelectExW(HWND,LPWSTR,int,int);
 BOOL WINAPI DragDetect(HWND,POINT);
-DWORD WINAPI DragObject(HWND,HWND,UINT,DWORD,HCURSOR);
+DWORD WINAPI DragObject(HWND,HWND,UINT,ULONG_PTR,HCURSOR);
 BOOL WINAPI DrawAnimatedRects(HWND,int,LPCRECT,LPCRECT);
 BOOL WINAPI DrawCaption(HWND,HDC,LPCRECT,UINT);
 BOOL WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT);
@@ -3988,8 +3988,8 @@
 #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
 DWORD WINAPI InSendMessageEx(LPVOID);
 #endif
-BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
-BOOL WINAPI InsertMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
+BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
+BOOL WINAPI InsertMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
 BOOL WINAPI InsertMenuItemA(HMENU,UINT,BOOL,LPCMENUITEMINFOA);
 BOOL WINAPI InsertMenuItemW(HMENU,UINT,BOOL,LPCMENUITEMINFOW);
 INT WINAPI InternalGetWindowText(HWND,LPWSTR,INT);
@@ -4069,8 +4069,8 @@
 int WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD);
 int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*);
 int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*);
-BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
-BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
+BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
+BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
 HMONITOR WINAPI MonitorFromPoint(POINT,DWORD);
 HMONITOR WINAPI MonitorFromRect(LPCRECT,DWORD);
 HMONITOR WINAPI MonitorFromWindow(HWND,DWORD);
@@ -4284,8 +4284,8 @@
 HWND WINAPI WindowFromDC(HDC hDC);
 HWND WINAPI WindowFromPoint(POINT);
 UINT WINAPI WinExec(LPCSTR,UINT);
-BOOL WINAPI WinHelpA(HWND,LPCSTR,UINT,DWORD);
-BOOL WINAPI WinHelpW(HWND,LPCWSTR,UINT,DWORD);
+BOOL WINAPI WinHelpA(HWND,LPCSTR,UINT,ULONG_PTR);
+BOOL WINAPI WinHelpW(HWND,LPCWSTR,UINT,ULONG_PTR);
 int WINAPIV wsprintfA(LPSTR,LPCSTR,...);
 int WINAPIV wsprintfW(LPWSTR,LPCWSTR,...);
 int WINAPI wvsprintfA(LPSTR,LPCSTR,va_list arglist);