Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-31 15:08:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WLDAP32]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2014-01-01 22:14:20 +00:00
parent e58adb9843
commit a1b02fb88c
41 changed files with 29 additions and 376 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/dll/win32/wldap32/add.c
View file

@ -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 };

5
reactos/dll/win32/wldap32/ber.c
View file

@ -21,11 +21,12 @@
#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

18
reactos/dll/win32/wldap32/bind.c
View file

@ -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.@)

18
reactos/dll/win32/wldap32/compare.c
View file

@ -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.@)

18
reactos/dll/win32/wldap32/control.c
View file

@ -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.@)

18
reactos/dll/win32/wldap32/delete.c
View file

@ -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.@)

18
reactos/dll/win32/wldap32/dn.c
View file

@ -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.@)

21
reactos/dll/win32/wldap32/error.c
View file

@ -18,29 +18,12 @@
* 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 <winuser.h>
//#include "winnls.h"
#ifdef HAVE_LDAP_H
#include <ldap.h>
#endif
#include "winldap_private.h"
//#include "wldap32.h"
#include <winuser.h>
extern HINSTANCE hwldap32;
WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
ULONG map_error( int error )
{
switch (error)

18
reactos/dll/win32/wldap32/extended.c
View file

@ -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.@)

17
reactos/dll/win32/wldap32/init.c
View file

@ -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 @@ static char *urlify_hostnames( const char *scheme, char *hostnames, ULONG port )
}
#endif
WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
/***********************************************************************
* cldap_openA (WLDAP32.@)
*

2
reactos/dll/win32/wldap32/lang/wldap32_Da.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_De.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_En.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_Es.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_Fr.rc
View 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)

2
reactos/dll/win32/wldap32/lang/wldap32_He.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_Hu.rc
View 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)

2
reactos/dll/win32/wldap32/lang/wldap32_It.rc
View 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)

2
reactos/dll/win32/wldap32/lang/wldap32_Ko.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_Lt.rc
View 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)

2
reactos/dll/win32/wldap32/lang/wldap32_Nl.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_No.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_Pl.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_Pt.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_Ro.rc
View 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)

2
reactos/dll/win32/wldap32/lang/wldap32_Ru.rc
View 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)

2
reactos/dll/win32/wldap32/lang/wldap32_Sv.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_Tr.rc
View 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

2
reactos/dll/win32/wldap32/lang/wldap32_Uk.rc
View 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)

10
reactos/dll/win32/wldap32/main.c
View file

@ -18,18 +18,10 @@
* 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 );

19
reactos/dll/win32/wldap32/misc.c
View file

@ -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 <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.@)

18
reactos/dll/win32/wldap32/modify.c
View file

@ -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 };

18
reactos/dll/win32/wldap32/modrdn.c
View file

@ -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.@)

18
reactos/dll/win32/wldap32/option.c
View file

@ -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.@)

18
reactos/dll/win32/wldap32/page.c
View file

@ -18,30 +18,12 @@
* 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.@)
*

18
reactos/dll/win32/wldap32/parse.c
View file

@ -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.@)

18
reactos/dll/win32/wldap32/rename.c
View file

@ -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.@)

18
reactos/dll/win32/wldap32/search.c
View file

@ -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.@)

18
reactos/dll/win32/wldap32/value.c
View file

@ -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.@)

21
reactos/dll/win32/wldap32/winldap_private.h
View file

@ -22,6 +22,27 @@
* 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,

4
reactos/dll/win32/wldap32/wldap32.rc
View 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"