From a1b02fb88c57ad3e399ebcc55819270dee0a905e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 1 Jan 2014 22:14:20 +0000 Subject: [PATCH] [WLDAP32] * 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 --- reactos/dll/win32/wldap32/add.c | 18 ----------------- reactos/dll/win32/wldap32/ber.c | 5 +++-- reactos/dll/win32/wldap32/bind.c | 18 ----------------- reactos/dll/win32/wldap32/compare.c | 18 ----------------- reactos/dll/win32/wldap32/control.c | 18 ----------------- reactos/dll/win32/wldap32/delete.c | 18 ----------------- reactos/dll/win32/wldap32/dn.c | 18 ----------------- reactos/dll/win32/wldap32/error.c | 19 +----------------- reactos/dll/win32/wldap32/extended.c | 18 ----------------- reactos/dll/win32/wldap32/init.c | 17 ---------------- reactos/dll/win32/wldap32/lang/wldap32_Da.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_De.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_En.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Es.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Fr.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_He.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Hu.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_It.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Ko.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Lt.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Nl.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_No.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Pl.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Pt.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Ro.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Ru.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Sv.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Tr.rc | 2 -- reactos/dll/win32/wldap32/lang/wldap32_Uk.rc | 2 -- reactos/dll/win32/wldap32/main.c | 10 +--------- reactos/dll/win32/wldap32/misc.c | 19 +----------------- reactos/dll/win32/wldap32/modify.c | 18 ----------------- reactos/dll/win32/wldap32/modrdn.c | 18 ----------------- reactos/dll/win32/wldap32/option.c | 18 ----------------- reactos/dll/win32/wldap32/page.c | 18 ----------------- reactos/dll/win32/wldap32/parse.c | 18 ----------------- reactos/dll/win32/wldap32/rename.c | 18 ----------------- reactos/dll/win32/wldap32/search.c | 18 ----------------- reactos/dll/win32/wldap32/value.c | 18 ----------------- reactos/dll/win32/wldap32/winldap_private.h | 21 ++++++++++++++++++++ reactos/dll/win32/wldap32/wldap32.rc | 4 +--- 41 files changed, 28 insertions(+), 375 deletions(-) diff --git a/reactos/dll/win32/wldap32/add.c b/reactos/dll/win32/wldap32/add.c index 22b7ec6f5bd..34bc186fe9e 100644 --- a/reactos/dll/win32/wldap32/add.c +++ b/reactos/dll/win32/wldap32/add.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); #ifdef HAVE_LDAP static LDAPMod *nullattrs[] = { NULL }; diff --git a/reactos/dll/win32/wldap32/ber.c b/reactos/dll/win32/wldap32/ber.c index d278517eee0..5d3ac648d40 100644 --- a/reactos/dll/win32/wldap32/ber.c +++ b/reactos/dll/win32/wldap32/ber.c @@ -21,11 +21,12 @@ #include #include + #include #include -#include "winldap.h" -#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(wldap32); #ifndef LBER_ERROR diff --git a/reactos/dll/win32/wldap32/bind.c b/reactos/dll/win32/wldap32/bind.c index b924f4fd3c7..057661b7fd7 100644 --- a/reactos/dll/win32/wldap32/bind.c +++ b/reactos/dll/win32/wldap32/bind.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_bindA (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/compare.c b/reactos/dll/win32/wldap32/compare.c index 8713903b090..c7df577c6d1 100644 --- a/reactos/dll/win32/wldap32/compare.c +++ b/reactos/dll/win32/wldap32/compare.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_compareA (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/control.c b/reactos/dll/win32/wldap32/control.c index e98c0e1fd04..c75e31e07ac 100644 --- a/reactos/dll/win32/wldap32/control.c +++ b/reactos/dll/win32/wldap32/control.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_control_freeA (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/delete.c b/reactos/dll/win32/wldap32/delete.c index af4f50511fa..2665455e558 100644 --- a/reactos/dll/win32/wldap32/delete.c +++ b/reactos/dll/win32/wldap32/delete.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_deleteA (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/dn.c b/reactos/dll/win32/wldap32/dn.c index 0d59614ea23..49b766d9c7f 100644 --- a/reactos/dll/win32/wldap32/dn.c +++ b/reactos/dll/win32/wldap32/dn.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_dn2ufnA (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/error.c b/reactos/dll/win32/wldap32/error.c index 783c8788580..6149f022d91 100644 --- a/reactos/dll/win32/wldap32/error.c +++ b/reactos/dll/win32/wldap32/error.c @@ -18,29 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include +#include "winldap_private.h" -//#include "windef.h" -#include #include -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - -#include "winldap_private.h" -//#include "wldap32.h" extern HINSTANCE hwldap32; -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); - ULONG map_error( int error ) { switch (error) diff --git a/reactos/dll/win32/wldap32/extended.c b/reactos/dll/win32/wldap32/extended.c index a9b48198f85..839d17118d4 100644 --- a/reactos/dll/win32/wldap32/extended.c +++ b/reactos/dll/win32/wldap32/extended.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_close_extended_op (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/init.c b/reactos/dll/win32/wldap32/init.c index 34e2e4b6357..6a863604ea0 100644 --- a/reactos/dll/win32/wldap32/init.c +++ b/reactos/dll/win32/wldap32/init.c @@ -18,22 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -//#include "wine/port.h" - -//#include -//#include -#ifdef HAVE_LDAP_H -#include -#endif - -#include -//#include "winbase.h" -//#include "winnls.h" - #include "winldap_private.h" -//#include "wldap32.h" -#include #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.@) * diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Da.rc b/reactos/dll/win32/wldap32/lang/wldap32_Da.rc index 366a2134fb5..cff77890905 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Da.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Da.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_De.rc b/reactos/dll/win32/wldap32/lang/wldap32_De.rc index 7739746eebd..2b86eee4ffa 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_De.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_De.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_En.rc b/reactos/dll/win32/wldap32/lang/wldap32_En.rc index 59b2bf4c3c7..e08e4eb64cb 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_En.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_En.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Es.rc b/reactos/dll/win32/wldap32/lang/wldap32_Es.rc index 2d344e445cd..e80f632840a 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Es.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Es.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc b/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc index d3d4ed006b2..50854758daa 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc @@ -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) diff --git a/reactos/dll/win32/wldap32/lang/wldap32_He.rc b/reactos/dll/win32/wldap32/lang/wldap32_He.rc index 500d2780f8e..469b28feafc 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_He.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_He.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc b/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc index 511ee3e2880..7dd9e69069a 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc @@ -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) diff --git a/reactos/dll/win32/wldap32/lang/wldap32_It.rc b/reactos/dll/win32/wldap32/lang/wldap32_It.rc index c88c0f4877c..678f33cd495 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_It.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_It.rc @@ -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) diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc b/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc index acf830afc55..9738ab2abeb 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc b/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc index 8d7742c2d85..50ddef3ad37 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc @@ -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) diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc b/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc index 95e680b70a8..dbf1679999e 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_No.rc b/reactos/dll/win32/wldap32/lang/wldap32_No.rc index fc26451f1a6..2696db8ba0f 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_No.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_No.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc b/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc index 560fc3dfff4..f5a751d7f60 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc b/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc index 68dbf77e79b..e0598df704b 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc b/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc index 2716caef586..a7ae6c47e1a 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc @@ -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) diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc b/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc index 26119d19f67..4232a97c683 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc @@ -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) diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc b/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc index 4ed73410c5e..868e885b5cd 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc b/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc index fcfa4df80c4..670ad45c19a 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc @@ -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 diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc b/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc index 2023ccfaf70..87907e53b4a 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc @@ -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) diff --git a/reactos/dll/win32/wldap32/main.c b/reactos/dll/win32/wldap32/main.c index 3a3cf392acb..ccd2a9b1815 100644 --- a/reactos/dll/win32/wldap32/main.c +++ b/reactos/dll/win32/wldap32/main.c @@ -18,18 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -#include -//#include - -//#include "windef.h" -#include +#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 ); diff --git a/reactos/dll/win32/wldap32/misc.c b/reactos/dll/win32/wldap32/misc.c index 67a931d6616..db63897c7e8 100644 --- a/reactos/dll/win32/wldap32/misc.c +++ b/reactos/dll/win32/wldap32/misc.c @@ -18,26 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include -#include - -//#include "windef.h" -#include -#include - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -#include "wldap32.h" -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#include /*********************************************************************** * ldap_abandon (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/modify.c b/reactos/dll/win32/wldap32/modify.c index ccccc21f15f..060ce59f61b 100644 --- a/reactos/dll/win32/wldap32/modify.c +++ b/reactos/dll/win32/wldap32/modify.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); #ifdef HAVE_LDAP static LDAPMod *nullmods[] = { NULL }; diff --git a/reactos/dll/win32/wldap32/modrdn.c b/reactos/dll/win32/wldap32/modrdn.c index 7996cad1bed..5daebd22be5 100644 --- a/reactos/dll/win32/wldap32/modrdn.c +++ b/reactos/dll/win32/wldap32/modrdn.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_modrdnA (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/option.c b/reactos/dll/win32/wldap32/option.c index 4ebf017dcd3..65caa75f568 100644 --- a/reactos/dll/win32/wldap32/option.c +++ b/reactos/dll/win32/wldap32/option.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_get_optionA (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/page.c b/reactos/dll/win32/wldap32/page.c index fb731f171bb..fe92f8f9388 100644 --- a/reactos/dll/win32/wldap32/page.c +++ b/reactos/dll/win32/wldap32/page.c @@ -18,30 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#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.@) * diff --git a/reactos/dll/win32/wldap32/parse.c b/reactos/dll/win32/wldap32/parse.c index e774f2a4c08..4594b2a04e3 100644 --- a/reactos/dll/win32/wldap32/parse.c +++ b/reactos/dll/win32/wldap32/parse.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -#include -#include - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_parse_extended_resultA (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/rename.c b/reactos/dll/win32/wldap32/rename.c index eafc34d348b..cb253736648 100644 --- a/reactos/dll/win32/wldap32/rename.c +++ b/reactos/dll/win32/wldap32/rename.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_rename_extA (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/search.c b/reactos/dll/win32/wldap32/search.c index 9b5732a8712..7680ac7b3c7 100644 --- a/reactos/dll/win32/wldap32/search.c +++ b/reactos/dll/win32/wldap32/search.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_searchA (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/value.c b/reactos/dll/win32/wldap32/value.c index 665255afe22..0a8a23e6331 100644 --- a/reactos/dll/win32/wldap32/value.c +++ b/reactos/dll/win32/wldap32/value.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -//#include "wine/port.h" -#include - -//#include - -//#include "windef.h" -#include -#include - -#ifdef HAVE_LDAP_H -#include -#endif - #include "winldap_private.h" -#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_count_values_len (WLDAP32.@) diff --git a/reactos/dll/win32/wldap32/winldap_private.h b/reactos/dll/win32/wldap32/winldap_private.h index a19ceb1b353..2442014dd9b 100644 --- a/reactos/dll/win32/wldap32/winldap_private.h +++ b/reactos/dll/win32/wldap32/winldap_private.h @@ -22,6 +22,27 @@ * native headers. */ +#include + +#include + +#ifdef HAVE_LDAP_H +#include +#endif + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include +#include + +#include +WINE_DEFAULT_DEBUG_CHANNEL(wldap32); + +#include "wldap32.h" + typedef enum { WLDAP32_LDAP_SUCCESS = 0x00, WLDAP32_LDAP_UNWILLING_TO_PERFORM = 0x35, diff --git a/reactos/dll/win32/wldap32/wldap32.rc b/reactos/dll/win32/wldap32/wldap32.rc index 77075d06e22..fa5f04a4649 100644 --- a/reactos/dll/win32/wldap32/wldap32.rc +++ b/reactos/dll/win32/wldap32/wldap32.rc @@ -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 #ifdef LANGUAGE_DA_DK #include "lang/wldap32_Da.rc" -- 2.17.1