[ros-diffs] [sserapion] 38072: revert CryptReleaseContext "fix", WINE headers made a fool out of me... need sleep. fix FARPROC, NEARPROC, PROC definitions, for real this time

Author: sserapion
Date: Sun Dec 14 00:17:16 2008
New Revision: 38072

URL: http://svn.reactos.org/svn/reactos?rev=38072&view=rev
Log:
revert CryptReleaseContext "fix", WINE headers made a fool out of me... need
sleep.
fix FARPROC, NEARPROC, PROC definitions, for real this time


Modified:
    branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h
    branches/ros-amd64-bringup/reactos/include/psdk/windef.h

Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] Sun Dec 14
00:17:16 2008
@@ -3788,7 +3788,7 @@
 WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD);
 WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD);
 WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD,
HCRYPTKEY *);
-WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR);
+WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD);
 WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD);
 WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD);
 WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD);

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] Sun Dec 14
00:17:16 2008
@@ -358,9 +358,15 @@
 typedef int HFILE;
 typedef HICON HCURSOR;
 typedef DWORD COLORREF;
-typedef INT_PTR (WINAPI *FARPROC)();
-typedef INT_PTR (WINAPI *NEARPROC)();
+#ifdef _WIN64
+typedef INT_PTR (FAR WINAPI *FARPROC)();
+typedef INT_PTR (NEAR WINAPI *NEARPROC)();
 typedef INT_PTR (WINAPI *PROC)();
+#else
+typedef int (FAR WINAPI *FARPROC)();
+typedef int (NEAR WINAPI *NEARPROC)();
+typedef int (WINAPI *PROC)();
+#endif
 typedef struct tagRECT {
 	LONG left;
 	LONG top;