[ros-diffs] [tkreuzer] 37926: - fix *HOOKPROC definition - add 64 bit BitTest functions

Author: tkreuzer
Date: Mon Dec  8 01:37:16 2008
New Revision: 37926

URL: http://svn.reactos.org/svn/reactos?rev=37926&view=rev
Log:
- fix *HOOKPROC definition
- add 64 bit BitTest functions

Modified:
    branches/ros-amd64-bringup/reactos/include/ddk/wdm.h
    branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h

Modified: branches/ros-amd64-bringup/reactos/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ddk/wdm.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ddk/wdm.h [iso-8859-1] Mon Dec  8 01:37:16
2008
@@ -181,9 +181,14 @@
 #endif
 }
 
+#endif
+
 #define BitScanForward _BitScanForward
 #define BitScanReverse _BitScanReverse
 
+#ifdef _M_AMD64
+#define InterlockedBitTestAndSet64 _interlockedbittestandset64
+#define InterlockedBitTestAndReset64 _interlockedbittestandreset64
 #endif
 
 

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] Mon Dec  8
01:37:16 2008
@@ -213,7 +213,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_PTR (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
+typedef UINT_PTR (CALLBACK *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
 typedef __CDHOOKPROC LPCCHOOKPROC;
 typedef __CDHOOKPROC LPCFHOOKPROC;
 typedef __CDHOOKPROC LPFRHOOKPROC;