Author: akhaldi Date: Wed Jan 1 22:14:20 2014 New Revision: 61482
URL: http://svn.reactos.org/svn/reactos?rev=61482&view=rev Log: [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
Modified: trunk/reactos/dll/win32/wldap32/add.c trunk/reactos/dll/win32/wldap32/ber.c trunk/reactos/dll/win32/wldap32/bind.c trunk/reactos/dll/win32/wldap32/compare.c trunk/reactos/dll/win32/wldap32/control.c trunk/reactos/dll/win32/wldap32/delete.c trunk/reactos/dll/win32/wldap32/dn.c trunk/reactos/dll/win32/wldap32/error.c trunk/reactos/dll/win32/wldap32/extended.c trunk/reactos/dll/win32/wldap32/init.c trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc trunk/reactos/dll/win32/wldap32/main.c trunk/reactos/dll/win32/wldap32/misc.c trunk/reactos/dll/win32/wldap32/modify.c trunk/reactos/dll/win32/wldap32/modrdn.c trunk/reactos/dll/win32/wldap32/option.c trunk/reactos/dll/win32/wldap32/page.c trunk/reactos/dll/win32/wldap32/parse.c trunk/reactos/dll/win32/wldap32/rename.c trunk/reactos/dll/win32/wldap32/search.c trunk/reactos/dll/win32/wldap32/value.c trunk/reactos/dll/win32/wldap32/winldap_private.h trunk/reactos/dll/win32/wldap32/wldap32.rc
Modified: trunk/reactos/dll/win32/wldap32/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/add.c?rev... ============================================================================== --- trunk/reactos/dll/win32/wldap32/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/add.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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 };
Modified: trunk/reactos/dll/win32/wldap32/ber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/ber.c?rev... ============================================================================== --- trunk/reactos/dll/win32/wldap32/ber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/ber.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -21,11 +21,12 @@ #include <config.h>
#include <stdarg.h> + #include <windef.h> #include <winbase.h> -#include "winldap.h" +#include <winldap.h> + #include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
#ifndef LBER_ERROR
Modified: trunk/reactos/dll/win32/wldap32/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/bind.c?re... ============================================================================== --- trunk/reactos/dll/win32/wldap32/bind.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/bind.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/compare.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/compare.c... ============================================================================== --- trunk/reactos/dll/win32/wldap32/compare.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/compare.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/control.c... ============================================================================== --- trunk/reactos/dll/win32/wldap32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/control.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/delete.c?... ============================================================================== --- trunk/reactos/dll/win32/wldap32/delete.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/delete.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/dn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/dn.c?rev=... ============================================================================== --- trunk/reactos/dll/win32/wldap32/dn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/dn.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/error.c?r... ============================================================================== --- trunk/reactos/dll/win32/wldap32/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/error.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,28 +18,11 @@ * 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 "winldap_private.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 ) {
Modified: trunk/reactos/dll/win32/wldap32/extended.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/extended.... ============================================================================== --- trunk/reactos/dll/win32/wldap32/extended.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/extended.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/init.c?re... ============================================================================== --- trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,22 +18,7 @@ * 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 @@ } #endif
-WINE_DEFAULT_DEBUG_CHANNEL(wldap32); - /*********************************************************************** * cldap_openA (WLDAP32.@) *
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
#pragma code_page(65001)
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
/*UTF-8*/ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
#pragma code_page(65001)
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "windef.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/wldap32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/main.c?re... ============================================================================== --- trunk/reactos/dll/win32/wldap32/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/main.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,17 +18,9 @@ * 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 ) {
Modified: trunk/reactos/dll/win32/wldap32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/misc.c?re... ============================================================================== --- trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,26 +18,9 @@ * 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 <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);
/*********************************************************************** * ldap_abandon (WLDAP32.@)
Modified: trunk/reactos/dll/win32/wldap32/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/modify.c?... ============================================================================== --- trunk/reactos/dll/win32/wldap32/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/modify.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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 };
Modified: trunk/reactos/dll/win32/wldap32/modrdn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/modrdn.c?... ============================================================================== --- trunk/reactos/dll/win32/wldap32/modrdn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/modrdn.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/option.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/option.c?... ============================================================================== --- trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/page.c?re... ============================================================================== --- trunk/reactos/dll/win32/wldap32/page.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/page.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,29 +18,11 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/parse.c?r... ============================================================================== --- trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/rename.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/rename.c?... ============================================================================== --- trunk/reactos/dll/win32/wldap32/rename.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/rename.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/search.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/search.c?... ============================================================================== --- trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/value.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/value.c?r... ============================================================================== --- trunk/reactos/dll/win32/wldap32/value.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/value.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * 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.@)
Modified: trunk/reactos/dll/win32/wldap32/winldap_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/winldap_p... ============================================================================== --- trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -21,6 +21,27 @@ * functions are prefixed with WLDAP32_ whenever they conflict with * 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,
Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.r... ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -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"