[WLDAP32]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 1 Jan 2014 22:14:20 +0000 (22:14 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 1 Jan 2014 22:14:20 +0000 (22:14 +0000)
* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
CORE-7716

svn path=/trunk/; revision=61482

41 files changed:
reactos/dll/win32/wldap32/add.c
reactos/dll/win32/wldap32/ber.c
reactos/dll/win32/wldap32/bind.c
reactos/dll/win32/wldap32/compare.c
reactos/dll/win32/wldap32/control.c
reactos/dll/win32/wldap32/delete.c
reactos/dll/win32/wldap32/dn.c
reactos/dll/win32/wldap32/error.c
reactos/dll/win32/wldap32/extended.c
reactos/dll/win32/wldap32/init.c
reactos/dll/win32/wldap32/lang/wldap32_Da.rc
reactos/dll/win32/wldap32/lang/wldap32_De.rc
reactos/dll/win32/wldap32/lang/wldap32_En.rc
reactos/dll/win32/wldap32/lang/wldap32_Es.rc
reactos/dll/win32/wldap32/lang/wldap32_Fr.rc
reactos/dll/win32/wldap32/lang/wldap32_He.rc
reactos/dll/win32/wldap32/lang/wldap32_Hu.rc
reactos/dll/win32/wldap32/lang/wldap32_It.rc
reactos/dll/win32/wldap32/lang/wldap32_Ko.rc
reactos/dll/win32/wldap32/lang/wldap32_Lt.rc
reactos/dll/win32/wldap32/lang/wldap32_Nl.rc
reactos/dll/win32/wldap32/lang/wldap32_No.rc
reactos/dll/win32/wldap32/lang/wldap32_Pl.rc
reactos/dll/win32/wldap32/lang/wldap32_Pt.rc
reactos/dll/win32/wldap32/lang/wldap32_Ro.rc
reactos/dll/win32/wldap32/lang/wldap32_Ru.rc
reactos/dll/win32/wldap32/lang/wldap32_Sv.rc
reactos/dll/win32/wldap32/lang/wldap32_Tr.rc
reactos/dll/win32/wldap32/lang/wldap32_Uk.rc
reactos/dll/win32/wldap32/main.c
reactos/dll/win32/wldap32/misc.c
reactos/dll/win32/wldap32/modify.c
reactos/dll/win32/wldap32/modrdn.c
reactos/dll/win32/wldap32/option.c
reactos/dll/win32/wldap32/page.c
reactos/dll/win32/wldap32/parse.c
reactos/dll/win32/wldap32/rename.c
reactos/dll/win32/wldap32/search.c
reactos/dll/win32/wldap32/value.c
reactos/dll/win32/wldap32/winldap_private.h
reactos/dll/win32/wldap32/wldap32.rc

index 22b7ec6..34bc186 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 #ifdef HAVE_LDAP
 static LDAPMod *nullattrs[] = { NULL };
index d278517..5d3ac64 100644 (file)
 #include <config.h>
 
 #include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
-#include "winldap.h"
-#include <wine/debug.h>
+#include <winldap.h>
 
+#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 #ifndef LBER_ERROR
index b924f4f..057661b 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_bindA     (WLDAP32.@)
index 8713903..c7df577 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_compareA     (WLDAP32.@)
index e98c0e1..c75e31e 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_control_freeA     (WLDAP32.@)
index af4f505..2665455 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_deleteA     (WLDAP32.@)
index 0d59614..49b766d 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_dn2ufnA     (WLDAP32.@)
index 783c878..6149f02 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
+#include "winldap_private.h"
 
-//#include "windef.h"
-#include <winbase.h>
 #include <winuser.h>
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
-#include "winldap_private.h"
-//#include "wldap32.h"
 
 extern HINSTANCE hwldap32;
 
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
-
 ULONG map_error( int error )
 {
     switch (error)
index a9b4819..839d171 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_close_extended_op     (WLDAP32.@)
index 34e2e4b..6a86360 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <stdio.h>
-//#include <stdarg.h>
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
-#include <windef.h>
-//#include "winbase.h"
-//#include "winnls.h"
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-#include <wine/debug.h>
 
 #ifdef HAVE_LDAP
 /* Should eventually be determined by the algorithm documented on MSDN. */
@@ -205,8 +190,6 @@ static char *urlify_hostnames( const char *scheme, char *hostnames, ULONG port )
 }
 #endif
 
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
-
 /***********************************************************************
  *      cldap_openA     (WLDAP32.@)
  *
index 366a213..cff7789 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
index 7739746..2b86eee 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
index 59b2bf4..e08e4eb 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
index 2d344e4..e80f632 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
index d3d4ed0..5085475 100644 (file)
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
index 500d278..469b28f 100644 (file)
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE
index 511ee3e..7dd9e69 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
index c88c0f4..678f33c 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 /*UTF-8*/
 #pragma code_page(65001)
 
index acf830a..9738ab2 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
index 8d7742c..50ddef3 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
index 95e680b..dbf1679 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
index fc26451..2696db8 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE
index 560fc3d..f5a751d 100644 (file)
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
index 68dbf77..e0598df 100644 (file)
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
index 2716cae..a7ae6c4 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
index 26119d1..4232a97 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
index 4ed7341..868e885 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
index fcfa4df..670ad45 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE
index 2023ccf..87907e5 100644 (file)
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
index 3a3cf39..ccd2a9b 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-#include <wine/debug.h>
-//#include <stdarg.h>
-
-//#include "windef.h"
-#include <winbase.h>
+#include "winldap_private.h"
 
 HINSTANCE hwldap32;
 
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
-
 BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 {
     TRACE( "(%p, %d, %p)\n", hinst, reason, reserved );
index 67a931d..db63897 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-#include <stdio.h>
-
-//#include "windef.h"
-#include <winbase.h>
-#include <winnls.h>
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-#include "wldap32.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
+#include <stdio.h>
 
 /***********************************************************************
  *      ldap_abandon     (WLDAP32.@)
index ccccc21..060ce59 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 #ifdef HAVE_LDAP
 static LDAPMod *nullmods[] = { NULL };
index 7996cad..5daebd2 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_modrdnA     (WLDAP32.@)
index 4ebf017..65caa75 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_get_optionA     (WLDAP32.@)
index fb731f1..fe92f8f 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
 
 #ifndef LDAP_MAXINT
 #define LDAP_MAXINT  2147483647
 #endif
 
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
-
 /***********************************************************************
  *      ldap_create_page_controlA     (WLDAP32.@)
  *
index e774f2a..4594b2a 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-#include <winbase.h>
-#include <winnls.h>
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_parse_extended_resultA     (WLDAP32.@)
index eafc34d..cb25373 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_rename_extA     (WLDAP32.@)
index 9b5732a..7680ac7 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-//#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_searchA     (WLDAP32.@)
index 665255a..0a8a23e 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include "wine/port.h"
-#include <wine/debug.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-#include <winbase.h>
-#include <winnls.h>
-
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif
-
 #include "winldap_private.h"
-#include "wldap32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 /***********************************************************************
  *      ldap_count_values_len     (WLDAP32.@)
index a19ceb1..2442014 100644 (file)
  * native headers.
  */
 
+#include <config.h>
+
+#include <stdarg.h>
+
+#ifdef HAVE_LDAP_H
+#include <ldap.h>
+#endif
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <winnls.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
+
+#include "wldap32.h"
+
 typedef enum {
     WLDAP32_LDAP_SUCCESS                 =   0x00,
     WLDAP32_LDAP_UNWILLING_TO_PERFORM    =   0x35,
index 77075d0..fa5f04a 100644 (file)
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
+#include <windef.h>
 
 #ifdef LANGUAGE_DA_DK
     #include "lang/wldap32_Da.rc"