[ros-diffs] [akhaldi] 53225: [ADVAPI32] * Use consistent debugging macros (Wine's). * Include NDK headers on-demand. * Improve the PCH.

Author: akhaldi
Date: Sun Aug 14 11:31:23 2011
New Revision: 53225

URL: http://svn.reactos.org/svn/reactos?rev=53225&view=rev
Log:
[ADVAPI32]
* Use consistent debugging macros (Wine's).
* Include NDK headers on-demand.
* Improve the PCH.

Modified:
    trunk/reactos/dll/win32/advapi32/advapi32.h
    trunk/reactos/dll/win32/advapi32/crypt/crypt.c
    trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c
    trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c
    trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c
    trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c
    trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c
    trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c
    trunk/reactos/dll/win32/advapi32/misc/dllmain.c
    trunk/reactos/dll/win32/advapi32/misc/efs.c
    trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c
    trunk/reactos/dll/win32/advapi32/misc/logon.c
    trunk/reactos/dll/win32/advapi32/misc/msi.c
    trunk/reactos/dll/win32/advapi32/misc/shutdown.c
    trunk/reactos/dll/win32/advapi32/misc/sysfunc.c
    trunk/reactos/dll/win32/advapi32/misc/trace.c
    trunk/reactos/dll/win32/advapi32/reg/reg.c
    trunk/reactos/dll/win32/advapi32/sec/ac.c
    trunk/reactos/dll/win32/advapi32/sec/audit.c
    trunk/reactos/dll/win32/advapi32/sec/cred.c
    trunk/reactos/dll/win32/advapi32/sec/lsa.c
    trunk/reactos/dll/win32/advapi32/sec/misc.c
    trunk/reactos/dll/win32/advapi32/sec/sec.c
    trunk/reactos/dll/win32/advapi32/sec/sid.c
    trunk/reactos/dll/win32/advapi32/sec/trustee.c
    trunk/reactos/dll/win32/advapi32/service/eventlog.c
    trunk/reactos/dll/win32/advapi32/service/scm.c
    trunk/reactos/dll/win32/advapi32/service/sctrl.c
    trunk/reactos/dll/win32/advapi32/token/token.c

Modified: trunk/reactos/dll/win32/advapi32/advapi32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -25,7 +25,14 @@
 #include <winsafer.h>
 #include <sddl.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/exfuncs.h>
+#include <ndk/iofuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/setypes.h>
+#include <ndk/sefuncs.h>
 
 /* this has to go after the NDK when being used with the NDK */
 #include <ntsecapi.h>
@@ -34,6 +41,13 @@
 #include "svcctl_c.h"
 #include "lsa_c.h"
 #include "eventlogrpc_c.h"
+
+#include <rpc.h>
+
+#include "crypt/crypt.h"
+#include <wine/debug.h>
+#include <wine/unicode.h>
+#include <wincred.h>
 
 #ifndef HAS_FN_PROGRESSW
 #define FN_PROGRESSW FN_PROGRESS

Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -25,10 +25,6 @@
   */
 
 #include <advapi32.h>
-#include "crypt.h"
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 
 

Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c [iso-8859-1] Sun Aug 14 11:31:23
2011
@@ -20,9 +20,6 @@
 /* http://cryptopp.sourceforge.net/docs/ref521/arc4_8cpp-source.html */
 
 #include <advapi32.h>
-
-#include "crypt.h"
-
 
 void arc4_init(arc4_info *a4i, const BYTE *key, unsigned int keyLen)
 {

Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c [iso-8859-1] Sun Aug 14 11:31:23
2011
@@ -22,7 +22,6 @@
  */
 
 #include <advapi32.h>
-#include "crypt.h"
 
 static const unsigned char InitialPermuteMap[64] =
 {

Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c [iso-8859-1] Sun Aug 14 11:31:23
2011
@@ -21,8 +21,6 @@
  */
 
 #include <advapi32.h>
-#include "crypt.h"
-
 
 static const unsigned char CRYPT_LMhash_Magic[8] =
     { 'K', 'G', 'S', '!', '@', '#',
'$', '%' };

Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c [iso-8859-1] Sun Aug 14 11:31:23
2011
@@ -34,8 +34,6 @@
  */
 
 #include <advapi32.h>
-#include "crypt.h"
-
 
 /* The three core functions */
 

Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c [iso-8859-1] Sun Aug 14 11:31:23
2011
@@ -34,8 +34,6 @@
  */
 
 #include <advapi32.h>
-#include "crypt.h"
-
 
 typedef struct
 {

Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c [iso-8859-1] Sun Aug 14 11:31:23
2011
@@ -18,7 +18,6 @@
  */
 
 #include <advapi32.h>
-#include "crypt.h"
 
 /* SHA Context Structure Declaration */
 

Modified: trunk/reactos/dll/win32/advapi32/misc/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/dl…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -10,8 +10,7 @@
  */
 
 #include <advapi32.h>
-#define NDEBUG
-#include <debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 extern BOOL RegInitialize(VOID);
 extern BOOL RegCleanup(VOID);

Modified: trunk/reactos/dll/win32/advapi32/misc/efs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/ef…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -7,8 +7,6 @@
  */
 
 #include <advapi32.h>
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 

Modified: trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/hw…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c [iso-8859-1] Sun Aug 14 11:31:23
2011
@@ -8,8 +8,6 @@
  */
 
 #include <advapi32.h>
-#include <rpc.h>
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /******************************************************************************

Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -7,8 +7,6 @@
  */
 
 #include <advapi32.h>
-
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 

Modified: trunk/reactos/dll/win32/advapi32/misc/msi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/ms…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/misc/msi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/misc/msi.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -9,7 +9,6 @@
 
 #include <advapi32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 #ifndef _UNICODE
 #define debugstr_aw debugstr_a

Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sh…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] Sun Aug 14 11:31:23
2011
@@ -11,7 +11,7 @@
  */
 
 #include <advapi32.h>
-#include <debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 #define USZ {0,0,0}
 

Modified: trunk/reactos/dll/win32/advapi32/misc/sysfunc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sy…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -12,7 +12,6 @@
  */
 
 #include <advapi32.h>
-#include <crypt/crypt.h>
 
 static const unsigned char CRYPT_LMhash_Magic[8] =
     { 'K', 'G', 'S', '!', '@', '#',
'$', '%' };

Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -3,10 +3,6 @@
  */
 
 #include <advapi32.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 /*
  * @unimplemented

Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -14,8 +14,6 @@
 /* INCLUDES *****************************************************************/
 
 #include <advapi32.h>
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(reg);
 
 /* DEFINES ******************************************************************/

Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -7,8 +7,6 @@
  */
 
 #include <advapi32.h>
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /* --- ACL --- */

Modified: trunk/reactos/dll/win32/advapi32/sec/audit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/aud…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/audit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/audit.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -12,8 +12,6 @@
 /* INCLUDES *****************************************************************/
 
 #include <advapi32.h>
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /* FUNCTIONS ****************************************************************/

Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/cre…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -18,19 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <time.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "wincred.h"
-#include "winternl.h"
-#include "../crypt/crypt.h"
-
-#include "wine/unicode.h"
-#include "wine/debug.h"
-
+#include <advapi32.h>
 WINE_DEFAULT_DEBUG_CHANNEL(cred);
 
 /* the size of the ARC4 key used to encrypt the password data */

Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -11,9 +11,6 @@
  *
  */
 #include <advapi32.h>
-#include "wine/debug.h"
-#include "wine/unicode.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 

Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -11,9 +11,6 @@
  */
 
 #include <advapi32.h>
-#include "wine/unicode.h"
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 

Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -12,8 +12,6 @@
  */
 
 #include <advapi32.h>
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /*

Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -12,10 +12,6 @@
  */
 
 #include <advapi32.h>
-#include <sddl.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 #define MAX_GUID_STRING_LEN 39

Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/tru…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/trustee.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/trustee.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -7,9 +7,6 @@
  */
 
 #include <advapi32.h>
-
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 

Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Sun Aug 14 11:31:23
2011
@@ -22,8 +22,6 @@
  */
 
 #include <advapi32.h>
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 static RPC_UNICODE_STRING EmptyStringU = { 0, 0, L"" };

Modified: trunk/reactos/dll/win32/advapi32/service/scm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -13,9 +13,6 @@
 /* INCLUDES ******************************************************************/
 
 #include <advapi32.h>
-
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 

Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Aug 14 11:31:23
2011
@@ -13,8 +13,6 @@
 /* INCLUDES ******************************************************************/
 
 #include <advapi32.h>
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 

Modified: trunk/reactos/dll/win32/advapi32/token/token.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] Sun Aug 14 11:31:23 2011
@@ -9,8 +9,6 @@
  */
 
 #include <advapi32.h>
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /*