[WLDAP32] Sync with Wine Staging 4.18. CORE-16441

[reactos.git] / dll / win32 / wldap32 / error.c

diff --git a/dll/win32/wldap32/error.c b/dll/win32/wldap32/error.c
index 783c878..fbbd124 100644 (file)
--- a/dll/win32/wldap32/error.c
+++ b/dll/win32/wldap32/error.c
@@ -18,26 +18,22 @@
  * 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"
+#include "config.h"
+#include "wine/port.h"
 
+#include <stdarg.h>
 #ifdef HAVE_LDAP_H
 #include <ldap.h>
 #endif
 
-#include "winldap_private.h"
-//#include "wldap32.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
 
-extern HINSTANCE hwldap32;
+#include "winldap_private.h"
+#include "wldap32.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
@@ -307,7 +303,7 @@ ULONG CDECL LdapMapErrorToWin32( ULONG err )
 {
     TRACE( "(0x%08x)\n", err );
 
-    if (err >= sizeof(WLDAP32_errormap)/sizeof(WLDAP32_errormap[0]))
+    if (err >= ARRAY_SIZE( WLDAP32_errormap ))
         return ERROR_DS_GENERIC_ERROR;
     return WLDAP32_errormap[err];
 }