Author: fireball
Date: Mon Oct 13 10:53:58 2014
New Revision: 64713

URL: http://svn.reactos.org/svn/reactos?rev=64713&view=rev
Log:
[PSDK] and [NDK]
- Since NTSTATUS definition is returned into bcrypt.h, then let's define 
PNTSTATUS too. Otherwise it makes no sense and errors out.
- Handle BCRYPT_H and __WINE_BCRYPT_H in ndk/umtypes.h. Thomas said that 
BCRYPT_H is not an option - but our NDK should be compatible with ReactOS PSDK 
too. If I am wrong, please feel free to change __WINE_BCRYPT_H to BCRYPT_H in 
psdk/bcrypt.h, fix related probelms and revert my change. Thanks!

Modified:
    trunk/reactos/include/ndk/umtypes.h
    trunk/reactos/include/psdk/bcrypt.h

Modified: trunk/reactos/include/ndk/umtypes.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umtypes.h?rev=64713&r1=64712&r2=64713&view=diff
==============================================================================
--- trunk/reactos/include/ndk/umtypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/umtypes.h [iso-8859-1] Mon Oct 13 10:53:58 2014
@@ -129,7 +129,7 @@
 //
 #if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) && !defined(_NTSECAPI_)
 
-#ifndef __BCRYPT_H__
+#if !defined(__BCRYPT_H__) && !defined(__WINE_BCRYPT_H)
 typedef _Return_type_success_(return >= 0) long NTSTATUS, *PNTSTATUS;
 #endif
 

Modified: trunk/reactos/include/psdk/bcrypt.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=64713&r1=64712&r2=64713&view=diff
==============================================================================
--- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Mon Oct 13 10:53:58 2014
@@ -37,6 +37,7 @@
 
 #ifndef _NTDEF_
 typedef _Return_type_success_(return >= 0) LONG NTSTATUS;
+typedef NTSTATUS *PNTSTATUS;
 #endif
 
 typedef struct _BCRYPT_ALGORITHM_IDENTIFIER


Reply via email to