wldap32: Explicitly specify CDECL calling convention on exported functions.

dlls/wldap32/add.c

@@ -51,7 +51,7 @@ static LDAPMod *nullattrs[] = { NULL };
  *
  * See ldap_addW.
  */
-ULONG ldap_addA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[] )
+ULONG CDECL ldap_addA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[] )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -103,7 +103,7 @@ exit:
  *  the operation. Cancel the operation by calling ldap_abandon
  *  with the message ID.
  */
-ULONG ldap_addW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] )
+ULONG CDECL ldap_addW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -146,7 +146,7 @@ exit:
  *
  * See ldap_add_extW.
  */
-ULONG ldap_add_extA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[],
+ULONG CDECL ldap_add_extA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[],
     PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -214,7 +214,7 @@ exit:
  *  the operation. The serverctrls and clientctrls parameters are
  *  optional and should be set to NULL if not used.
  */
-ULONG ldap_add_extW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[],
+ULONG CDECL ldap_add_extW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[],
     PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -266,7 +266,7 @@ exit:
  *
  * See ldap_add_ext_sW.
  */
-ULONG ldap_add_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[],
+ULONG CDECL ldap_add_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[],
     PLDAPControlA *serverctrls, PLDAPControlA *clientctrls )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -332,7 +332,7 @@ exit:
  *  The serverctrls and clientctrls parameters are optional and
  *  should be set to NULL if not used.
  */
-ULONG ldap_add_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[],
+ULONG CDECL ldap_add_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[],
     PLDAPControlW *serverctrls, PLDAPControlW *clientctrls )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -383,7 +383,7 @@ exit:
  *
  * See ldap_add_sW.
  */
-ULONG ldap_add_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[] )
+ULONG CDECL ldap_add_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[] )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -430,7 +430,7 @@ exit:
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG ldap_add_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] )
+ULONG CDECL ldap_add_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP

dlls/wldap32/ber.c

@@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 /***********************************************************************
  *      ber_alloc_t     (WLDAP32.@)
  */
-BerElement *WLDAP32_ber_alloc_t( INT options )
+BerElement * CDECL WLDAP32_ber_alloc_t( INT options )
 {
 #ifdef HAVE_LDAP
     return ber_alloc_t( options );
@@ -48,7 +48,7 @@ BerElement *WLDAP32_ber_alloc_t( INT options )
 /***********************************************************************
  *      ber_bvdup     (WLDAP32.@)
  */
-BERVAL *WLDAP32_ber_bvdup( BERVAL *berval )
+BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL *berval )
 {
 #ifdef HAVE_LDAP
     return ber_bvdup( berval );
@@ -61,7 +61,7 @@ BERVAL *WLDAP32_ber_bvdup( BERVAL *berval )
 /***********************************************************************
  *      ber_bvecfree     (WLDAP32.@)
  */
-void WLDAP32_ber_bvecfree( PBERVAL *berval )
+void CDECL WLDAP32_ber_bvecfree( PBERVAL *berval )
 {
 #ifdef HAVE_LDAP
     ber_bvecfree( berval );
@@ -72,7 +72,7 @@ void WLDAP32_ber_bvecfree( PBERVAL *berval )
 /***********************************************************************
  *      ber_bvfree     (WLDAP32.@)
  */
-void WLDAP32_ber_bvfree( BERVAL *berval )
+void CDECL WLDAP32_ber_bvfree( BERVAL *berval )
 {
 #ifdef HAVE_LDAP
     ber_bvfree( berval );
@@ -83,7 +83,7 @@ void WLDAP32_ber_bvfree( BERVAL *berval )
 /***********************************************************************
  *      ber_first_element     (WLDAP32.@)
  */
-ULONG WLDAP32_ber_first_element( BerElement *berelement, ULONG *len, CHAR **opaque )
+ULONG CDECL WLDAP32_ber_first_element( BerElement *berelement, ULONG *len, CHAR **opaque )
 {
 #ifdef HAVE_LDAP
     return ber_first_element( berelement, len, opaque );
@@ -96,7 +96,7 @@ ULONG WLDAP32_ber_first_element( BerElement *berelement, ULONG *len, CHAR **opaq
 /***********************************************************************
  *      ber_flatten     (WLDAP32.@)
  */
-INT WLDAP32_ber_flatten( BerElement *berelement, PBERVAL *berval )
+INT CDECL WLDAP32_ber_flatten( BerElement *berelement, PBERVAL *berval )
 {
 #ifdef HAVE_LDAP
     return ber_flatten( berelement, berval );
@@ -109,7 +109,7 @@ INT WLDAP32_ber_flatten( BerElement *berelement, PBERVAL *berval )
 /***********************************************************************
  *      ber_free     (WLDAP32.@)
  */
-void WLDAP32_ber_free( BerElement *berelement, INT buf )
+void CDECL WLDAP32_ber_free( BerElement *berelement, INT buf )
 {
 #ifdef HAVE_LDAP
     ber_free( berelement, buf );
@@ -120,7 +120,7 @@ void WLDAP32_ber_free( BerElement *berelement, INT buf )
 /***********************************************************************
  *      ber_init     (WLDAP32.@)
  */
-BerElement *WLDAP32_ber_init( BERVAL *berval )
+BerElement * CDECL WLDAP32_ber_init( BERVAL *berval )
 {
 #ifdef HAVE_LDAP
     return ber_init( berval );
@@ -133,7 +133,7 @@ BerElement *WLDAP32_ber_init( BERVAL *berval )
 /***********************************************************************
  *      ber_next_element     (WLDAP32.@)
  */
-ULONG WLDAP32_ber_next_element( BerElement *berelement, ULONG *len, CHAR *opaque )
+ULONG CDECL WLDAP32_ber_next_element( BerElement *berelement, ULONG *len, CHAR *opaque )
 {
 #ifdef HAVE_LDAP
     return ber_next_element( berelement, len, opaque );
@@ -146,7 +146,7 @@ ULONG WLDAP32_ber_next_element( BerElement *berelement, ULONG *len, CHAR *opaque
 /***********************************************************************
  *      ber_peek_tag     (WLDAP32.@)
  */
-ULONG WLDAP32_ber_peek_tag( BerElement *berelement, ULONG *len )
+ULONG CDECL WLDAP32_ber_peek_tag( BerElement *berelement, ULONG *len )
 {
 #ifdef HAVE_LDAP
     return ber_peek_tag( berelement, len );
@@ -159,7 +159,7 @@ ULONG WLDAP32_ber_peek_tag( BerElement *berelement, ULONG *len )
 /***********************************************************************
  *      ber_skip_tag     (WLDAP32.@)
  */
-ULONG WLDAP32_ber_skip_tag( BerElement *berelement, ULONG *len )
+ULONG CDECL WLDAP32_ber_skip_tag( BerElement *berelement, ULONG *len )
 {
 #ifdef HAVE_LDAP
     return ber_skip_tag( berelement, len );
@@ -172,7 +172,7 @@ ULONG WLDAP32_ber_skip_tag( BerElement *berelement, ULONG *len )
 /***********************************************************************
  *      ber_printf     (WLDAP32.@)
  */
-INT WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... )
+INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... )
 {
 #ifdef HAVE_LDAP
     va_list list;
@@ -251,7 +251,7 @@ INT WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... )
 /***********************************************************************
  *      ber_scanf     (WLDAP32.@)
  */
-INT WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... )
+INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... )
 {
 #ifdef HAVE_LDAP
     va_list list;

dlls/wldap32/bind.c

@@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *
  * See ldap_bindW.
  */
-ULONG ldap_bindA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method )
+ULONG CDECL ldap_bindA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -95,7 +95,7 @@ exit:
  * NOTES
  *  Only LDAP_AUTH_SIMPLE is supported (just like native).
  */
-ULONG ldap_bindW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method )
+ULONG CDECL ldap_bindW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -142,7 +142,7 @@ exit:
  *
  * See ldap_bind_sW.
  */
-ULONG ldap_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method )
+ULONG CDECL ldap_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -188,7 +188,7 @@ exit:
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method )
+ULONG CDECL ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -229,7 +229,7 @@ exit:
  *
  * See ldap_sasl_bindW.
  */
-ULONG ldap_sasl_bindA( WLDAP32_LDAP *ld, const PCHAR dn,
+ULONG CDECL ldap_sasl_bindA( WLDAP32_LDAP *ld, const PCHAR dn,
     const PCHAR mechanism, const BERVAL *cred, PLDAPControlA *serverctrls,
     PLDAPControlA *clientctrls, int *message )
 {
@@ -295,7 +295,7 @@ exit:
  *  The serverctrls and clientctrls parameters are optional and should
  *  be set to NULL if not used.
  */
-ULONG ldap_sasl_bindW( WLDAP32_LDAP *ld, const PWCHAR dn,
+ULONG CDECL ldap_sasl_bindW( WLDAP32_LDAP *ld, const PWCHAR dn,
     const PWCHAR mechanism, const BERVAL *cred, PLDAPControlW *serverctrls,
     PLDAPControlW *clientctrls, int *message )
 {
@@ -345,7 +345,7 @@ exit:
  *
  * See ldap_sasl_bind_sW.
  */
-ULONG ldap_sasl_bind_sA( WLDAP32_LDAP *ld, const PCHAR dn,
+ULONG CDECL ldap_sasl_bind_sA( WLDAP32_LDAP *ld, const PCHAR dn,
     const PCHAR mechanism, const BERVAL *cred, PLDAPControlA *serverctrls,
     PLDAPControlA *clientctrls, PBERVAL *serverdata )
 {
@@ -411,7 +411,7 @@ exit:
  *  The serverctrls and clientctrls parameters are optional and should
  *  be set to NULL if not used.
  */
-ULONG ldap_sasl_bind_sW( WLDAP32_LDAP *ld, const PWCHAR dn,
+ULONG CDECL ldap_sasl_bind_sW( WLDAP32_LDAP *ld, const PWCHAR dn,
     const PWCHAR mechanism, const BERVAL *cred, PLDAPControlW *serverctrls,
     PLDAPControlW *clientctrls, PBERVAL *serverdata )
 {
@@ -461,7 +461,7 @@ exit:
  *
  * See ldap_simple_bindW.
  */
-ULONG ldap_simple_bindA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR passwd )
+ULONG CDECL ldap_simple_bindA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR passwd )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -509,7 +509,7 @@ exit:
  * NOTES
  *  Set dn and passwd to NULL to bind as an anonymous user. 
  */
-ULONG ldap_simple_bindW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR passwd )
+ULONG CDECL ldap_simple_bindW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR passwd )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -555,7 +555,7 @@ exit:
  *
  * See ldap_simple_bind_sW.
  */
-ULONG ldap_simple_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR passwd )
+ULONG CDECL ldap_simple_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR passwd )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -603,7 +603,7 @@ exit:
  * NOTES
  *  Set dn and passwd to NULL to bind as an anonymous user. 
  */
-ULONG ldap_simple_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR passwd )
+ULONG CDECL ldap_simple_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR passwd )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -650,7 +650,7 @@ exit:
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG WLDAP32_ldap_unbind( WLDAP32_LDAP *ld )
+ULONG CDECL WLDAP32_ldap_unbind( WLDAP32_LDAP *ld )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -678,7 +678,7 @@ ULONG WLDAP32_ldap_unbind( WLDAP32_LDAP *ld )
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG WLDAP32_ldap_unbind_s( WLDAP32_LDAP *ld )
+ULONG CDECL WLDAP32_ldap_unbind_s( WLDAP32_LDAP *ld )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP

dlls/wldap32/compare.c

@@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *
  * See ldap_compareW.
  */
-ULONG ldap_compareA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value )
+ULONG CDECL ldap_compareA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -97,7 +97,7 @@ exit:
  *  Success: Message ID of the compare operation.
  *  Failure: An LDAP error code.
  */
-ULONG ldap_compareW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value )
+ULONG CDECL ldap_compareW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -149,7 +149,7 @@ exit:
  *
  * See ldap_compare_extW.
  */
-ULONG ldap_compare_extA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value,
+ULONG CDECL ldap_compare_extA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value,
     struct WLDAP32_berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls,
     ULONG *message )
 {
@@ -225,7 +225,7 @@ exit:
  *  both are non-NULL, data will be used. The serverctrls and clientctrls
  *  parameters are optional and should be set to NULL if not used.
  */
-ULONG ldap_compare_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value,
+ULONG CDECL ldap_compare_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value,
     struct WLDAP32_berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls,
     ULONG *message )
 {
@@ -289,7 +289,7 @@ exit:
  *
  * See ldap_compare_ext_sW.
  */
-ULONG ldap_compare_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value,
+ULONG CDECL ldap_compare_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value,
     struct WLDAP32_berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -363,7 +363,7 @@ exit:
  *  both are non-NULL, data will be used. The serverctrls and clientctrls
  *  parameters are optional and should be set to NULL if not used.
  */
-ULONG ldap_compare_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value,
+ULONG CDECL ldap_compare_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value,
     struct WLDAP32_berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -426,7 +426,7 @@ exit:
  *
  * See ldap_compare_sW.
  */
-ULONG ldap_compare_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value )
+ULONG CDECL ldap_compare_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -478,7 +478,7 @@ exit:
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG ldap_compare_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value )
+ULONG CDECL ldap_compare_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP

dlls/wldap32/control.c

@@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *
  * See ldap_control_freeW.
  */
-ULONG ldap_control_freeA( LDAPControlA *control )
+ULONG CDECL ldap_control_freeA( LDAPControlA *control )
 {
     ULONG ret = LDAP_SUCCESS;
 #ifdef HAVE_LDAP
@@ -69,7 +69,7 @@ ULONG ldap_control_freeA( LDAPControlA *control )
  * RETURNS
  *  LDAP_SUCCESS
  */
-ULONG ldap_control_freeW( LDAPControlW *control )
+ULONG CDECL ldap_control_freeW( LDAPControlW *control )
 {
     ULONG ret = LDAP_SUCCESS;
 #ifdef HAVE_LDAP
@@ -86,7 +86,7 @@ ULONG ldap_control_freeW( LDAPControlW *control )
  *
  * See ldap_controls_freeW.
  */
-ULONG ldap_controls_freeA( LDAPControlA **controls )
+ULONG CDECL ldap_controls_freeA( LDAPControlA **controls )
 {
     ULONG ret = LDAP_SUCCESS;
 #ifdef HAVE_LDAP
@@ -109,7 +109,7 @@ ULONG ldap_controls_freeA( LDAPControlA **controls )
  * RETURNS
  *  LDAP_SUCCESS
  */
-ULONG ldap_controls_freeW( LDAPControlW **controls )
+ULONG CDECL ldap_controls_freeW( LDAPControlW **controls )
 {
     ULONG ret = LDAP_SUCCESS;
 #ifdef HAVE_LDAP
@@ -126,7 +126,7 @@ ULONG ldap_controls_freeW( LDAPControlW **controls )
  *
  * See ldap_create_sort_controlW.
  */
-ULONG ldap_create_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkey,
+ULONG CDECL ldap_create_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkey,
     UCHAR critical, PLDAPControlA *control )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -176,7 +176,7 @@ ULONG ldap_create_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkey,
  *  Pass the created control as a server control in subsequent calls
  *  to ldap_search_ext(_s) to obtain sorted search results.
  */
-ULONG ldap_create_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkey,
+ULONG CDECL ldap_create_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkey,
     UCHAR critical, PLDAPControlW *control )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -209,7 +209,7 @@ ULONG ldap_create_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkey,
  *
  * See ldap_create_vlv_controlW.
  */
-INT ldap_create_vlv_controlA( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info,
+INT CDECL ldap_create_vlv_controlA( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info,
     UCHAR critical, LDAPControlA **control )
 {
     INT ret = LDAP_NOT_SUPPORTED;
@@ -255,7 +255,7 @@ INT ldap_create_vlv_controlA( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info,
  *  server will then return a sorted, contiguous subset of results
  *  that meets the criteria specified in the LDAPVLVInfo structure.
  */
-INT ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info,
+INT CDECL ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info,
     UCHAR critical, LDAPControlW **control )
 {
     INT ret = LDAP_NOT_SUPPORTED;
@@ -284,7 +284,7 @@ INT ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info,
  *
  * See ldap_encode_sort_controlW.
  */
-ULONG ldap_encode_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkeys,
+ULONG CDECL ldap_encode_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkeys,
     PLDAPControlA control, BOOLEAN critical )
 {
     return ldap_create_sort_controlA( ld, sortkeys, critical, &control );
@@ -312,7 +312,7 @@ ULONG ldap_encode_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkeys,
  *  This function is obsolete. Use its equivalent
  *  ldap_create_sort_control instead.
  */
-ULONG ldap_encode_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkeys,
+ULONG CDECL ldap_encode_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkeys,
     PLDAPControlW control, BOOLEAN critical )
 {
     return ldap_create_sort_controlW( ld, sortkeys, critical, &control );
@@ -323,7 +323,7 @@ ULONG ldap_encode_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkeys,
  *
  * See ldap_free_controlsW.
  */
-ULONG ldap_free_controlsA( LDAPControlA **controls )
+ULONG CDECL ldap_free_controlsA( LDAPControlA **controls )
 {
     return ldap_controls_freeA( controls );
 }
@@ -342,7 +342,7 @@ ULONG ldap_free_controlsA( LDAPControlA **controls )
  * NOTES
  *  Obsolete, use ldap_controls_freeW.
  */
-ULONG ldap_free_controlsW( LDAPControlW **controls )
+ULONG CDECL ldap_free_controlsW( LDAPControlW **controls )
 {
     return ldap_controls_freeW( controls );
 }

dlls/wldap32/delete.c

@@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *
  * See ldap_deleteW.
  */
-ULONG ldap_deleteA( WLDAP32_LDAP *ld, PCHAR dn )
+ULONG CDECL ldap_deleteA( WLDAP32_LDAP *ld, PCHAR dn )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -85,7 +85,7 @@ ULONG ldap_deleteA( WLDAP32_LDAP *ld, PCHAR dn )
  *  the operation. Cancel the operation by calling ldap_abandon
  *  with the message ID.
  */
-ULONG ldap_deleteW( WLDAP32_LDAP *ld, PWCHAR dn )
+ULONG CDECL ldap_deleteW( WLDAP32_LDAP *ld, PWCHAR dn )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -119,7 +119,7 @@ ULONG ldap_deleteW( WLDAP32_LDAP *ld, PWCHAR dn )
  *
  * See ldap_delete_extW.
  */
-ULONG ldap_delete_extA( WLDAP32_LDAP *ld, PCHAR dn, PLDAPControlA *serverctrls,
+ULONG CDECL ldap_delete_extA( WLDAP32_LDAP *ld, PCHAR dn, PLDAPControlA *serverctrls,
     PLDAPControlA *clientctrls, ULONG *message )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -179,7 +179,7 @@ exit:
  *  the operation. The serverctrls and clientctrls parameters are
  *  optional and should be set to NULL if not used.
  */
-ULONG ldap_delete_extW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *serverctrls,
+ULONG CDECL ldap_delete_extW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *serverctrls,
     PLDAPControlW *clientctrls, ULONG *message )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -225,7 +225,7 @@ exit:
  *
  * See ldap_delete_ext_sW.
  */
-ULONG ldap_delete_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PLDAPControlA *serverctrls,
+ULONG CDECL ldap_delete_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PLDAPControlA *serverctrls,
     PLDAPControlA *clientctrls )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -281,7 +281,7 @@ exit:
  *  The serverctrls and clientctrls parameters are optional and
  *  should be set to NULL if not used.
  */
-ULONG ldap_delete_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *serverctrls,
+ULONG CDECL ldap_delete_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *serverctrls,
     PLDAPControlW *clientctrls )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -323,7 +323,7 @@ exit:
  *
  * See ldap_delete_sW.
  */
-ULONG ldap_delete_sA( WLDAP32_LDAP *ld, PCHAR dn )
+ULONG CDECL ldap_delete_sA( WLDAP32_LDAP *ld, PCHAR dn )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -358,7 +358,7 @@ ULONG ldap_delete_sA( WLDAP32_LDAP *ld, PCHAR dn )
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG ldap_delete_sW( WLDAP32_LDAP *ld, PWCHAR dn )
+ULONG CDECL ldap_delete_sW( WLDAP32_LDAP *ld, PWCHAR dn )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP

dlls/wldap32/dn.c

@@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *
  * See ldap_dn2ufnW.
  */
-PCHAR ldap_dn2ufnA( PCHAR dn )
+PCHAR CDECL ldap_dn2ufnA( PCHAR dn )
 {
     PCHAR ret = NULL;
 #ifdef HAVE_LDAP
@@ -81,7 +81,7 @@ PCHAR ldap_dn2ufnA( PCHAR dn )
  * NOTES
  *  Free the string with ldap_memfree.
  */
-PWCHAR ldap_dn2ufnW( PWCHAR dn )
+PWCHAR CDECL ldap_dn2ufnW( PWCHAR dn )
 {
     PWCHAR ret = NULL;
 #ifdef HAVE_LDAP
@@ -107,7 +107,7 @@ PWCHAR ldap_dn2ufnW( PWCHAR dn )
  *
  * See ldap_explode_dnW.
  */
-PCHAR *ldap_explode_dnA( PCHAR dn, ULONG notypes )
+PCHAR * CDECL ldap_explode_dnA( PCHAR dn, ULONG notypes )
 {
     PCHAR *ret = NULL;
 #ifdef HAVE_LDAP
@@ -145,7 +145,7 @@ PCHAR *ldap_explode_dnA( PCHAR dn, ULONG notypes )
  * NOTES
  *  Free the string array with ldap_value_free.
  */
-PWCHAR *ldap_explode_dnW( PWCHAR dn, ULONG notypes )
+PWCHAR * CDECL ldap_explode_dnW( PWCHAR dn, ULONG notypes )
 {
     PWCHAR *ret = NULL;
 #ifdef HAVE_LDAP
@@ -171,7 +171,7 @@ PWCHAR *ldap_explode_dnW( PWCHAR dn, ULONG notypes )
  *
  * See ldap_get_dnW.
  */
-PCHAR ldap_get_dnA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry )
+PCHAR CDECL ldap_get_dnA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry )
 {
     PCHAR ret = NULL;
 #ifdef HAVE_LDAP
@@ -206,7 +206,7 @@ PCHAR ldap_get_dnA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry )
  * NOTES
  *  Free the string with ldap_memfree.
  */
-PWCHAR ldap_get_dnW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry )
+PWCHAR CDECL ldap_get_dnW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry )
 {
     PWCHAR ret = NULL;
 #ifdef HAVE_LDAP
@@ -230,7 +230,7 @@ PWCHAR ldap_get_dnW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry )
  *
  * See ldap_ufn2dnW.
  */
-ULONG ldap_ufn2dnA( PCHAR ufn, PCHAR *dn )
+ULONG CDECL ldap_ufn2dnA( PCHAR ufn, PCHAR *dn )
 {
     ULONG ret = LDAP_SUCCESS;
 #ifdef HAVE_LDAP
@@ -277,7 +277,7 @@ ULONG ldap_ufn2dnA( PCHAR ufn, PCHAR *dn )
  * NOTES
  *  Free the string with ldap_memfree.
  */
-ULONG ldap_ufn2dnW( PWCHAR ufn, PWCHAR *dn )
+ULONG CDECL ldap_ufn2dnW( PWCHAR ufn, PWCHAR *dn )
 {
     ULONG ret = LDAP_SUCCESS;
 #ifdef HAVE_LDAP

dlls/wldap32/error.c

@@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *
  * See ldap_err2stringW.
  */
-PCHAR ldap_err2stringA( ULONG err )
+PCHAR CDECL ldap_err2stringA( ULONG err )
 {
     static char buf[256] = "";
 
@@ -79,7 +79,7 @@ PCHAR ldap_err2stringA( ULONG err )
  *  The returned string is statically allocated, you must not
  *  free this string.
  */
-PWCHAR ldap_err2stringW( ULONG err )
+PWCHAR CDECL ldap_err2stringW( ULONG err )
 {
     static WCHAR buf[256] = { 0 };
 
@@ -108,7 +108,7 @@ PWCHAR ldap_err2stringW( ULONG err )
  * NOTES
  *  Like native, this function does nothing.
  */
-void WLDAP32_ldap_perror( WLDAP32_LDAP *ld, const PCHAR msg )
+void CDECL WLDAP32_ldap_perror( WLDAP32_LDAP *ld, const PCHAR msg )
 {
     TRACE( "(%p, %s)\n", ld, debugstr_a(msg) );
 }
@@ -130,7 +130,7 @@ void WLDAP32_ldap_perror( WLDAP32_LDAP *ld, const PCHAR msg )
  * NOTES
  *  If not asked for, use ldap_msgfree to free the LDAPMessage.
  */
-ULONG WLDAP32_ldap_result2error( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res, ULONG free )
+ULONG CDECL WLDAP32_ldap_result2error( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res, ULONG free )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -162,7 +162,7 @@ ULONG WLDAP32_ldap_result2error( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res, ULO
  * RETURNS
  *  An LDAP error code.
  */
-ULONG LdapGetLastError( void )
+ULONG CDECL LdapGetLastError( void )
 {
     TRACE( "\n" );
     return GetLastError();
@@ -280,7 +280,7 @@ static const ULONG WLDAP32_errormap[] = {
  * RETURNS
  *  A Win32 error code.
  */
-ULONG LdapMapErrorToWin32( ULONG err )
+ULONG CDECL LdapMapErrorToWin32( ULONG err )
 {
     TRACE( "(0x%08lx)\n", err );
 

dlls/wldap32/extended.c

@@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *  Contrary to native, OpenLDAP does not require us to close
  *  extended operations, so this is a no-op.
  */
-ULONG ldap_close_extended_op( WLDAP32_LDAP *ld, ULONG msgid )
+ULONG CDECL ldap_close_extended_op( WLDAP32_LDAP *ld, ULONG msgid )
 {
     TRACE( "(%p, 0x%08lx)\n", ld, msgid );
 
@@ -71,7 +71,7 @@ ULONG ldap_close_extended_op( WLDAP32_LDAP *ld, ULONG msgid )
  *
  * See ldap_extended_operationW.
  */
-ULONG ldap_extended_operationA( WLDAP32_LDAP *ld, PCHAR oid, struct WLDAP32_berval *data,
+ULONG CDECL ldap_extended_operationA( WLDAP32_LDAP *ld, PCHAR oid, struct WLDAP32_berval *data,
     PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -135,7 +135,7 @@ exit:
  *  are optional and should be set to NULL if not used. Call
  *  ldap_close_extended_op to close the operation.
  */
-ULONG ldap_extended_operationW( WLDAP32_LDAP *ld, PWCHAR oid, struct WLDAP32_berval *data,
+ULONG CDECL ldap_extended_operationW( WLDAP32_LDAP *ld, PWCHAR oid, struct WLDAP32_berval *data,
     PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -180,7 +180,7 @@ exit:
  *
  * See ldap_extended_operation_sW.
  */
-ULONG ldap_extended_operation_sA( WLDAP32_LDAP *ld, PCHAR oid, struct WLDAP32_berval *data,
+ULONG CDECL ldap_extended_operation_sA( WLDAP32_LDAP *ld, PCHAR oid, struct WLDAP32_berval *data,
     PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, PCHAR *retoid,
     struct WLDAP32_berval **retdata )
 {
@@ -251,7 +251,7 @@ exit:
  *  and retdata parameters are also optional. Set to NULL if not
  *  used. Free retoid and retdata after use with ldap_memfree.
  */
-ULONG ldap_extended_operation_sW( WLDAP32_LDAP *ld, PWCHAR oid, struct WLDAP32_berval *data,
+ULONG CDECL ldap_extended_operation_sW( WLDAP32_LDAP *ld, PWCHAR oid, struct WLDAP32_berval *data,
     PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, PWCHAR *retoid,
     struct WLDAP32_berval **retdata )
 {

dlls/wldap32/init.c

@@ -218,7 +218,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *
  * See cldap_openW.
  */
-WLDAP32_LDAP *cldap_openA( PCHAR hostname, ULONG portnumber )
+WLDAP32_LDAP * CDECL cldap_openA( PCHAR hostname, ULONG portnumber )
 {
 #ifdef HAVE_LDAP
     WLDAP32_LDAP *ld = NULL;
@@ -262,7 +262,7 @@ exit:
  *  will take precedence over the portnumber supplied as a parameter
  *  to this function.
  */
-WLDAP32_LDAP *cldap_openW( PWCHAR hostname, ULONG portnumber )
+WLDAP32_LDAP * CDECL cldap_openW( PWCHAR hostname, ULONG portnumber )
 {
 #ifdef HAVE_LDAP
     LDAP *ld = NULL;
@@ -311,7 +311,7 @@ exit:
  *  The timeout parameter may be NULL in which case a default timeout
  *  value will be used.
  */
-ULONG ldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout )
+ULONG CDECL ldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout )
 {
     TRACE( "(%p, %p)\n", ld, timeout );
 
@@ -324,7 +324,7 @@ ULONG ldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout )
  *
  * See ldap_initW.
  */
-WLDAP32_LDAP *ldap_initA( PCHAR hostname, ULONG portnumber )
+WLDAP32_LDAP *  CDECL ldap_initA( PCHAR hostname, ULONG portnumber )
 {
 #ifdef HAVE_LDAP
     WLDAP32_LDAP *ld = NULL;
@@ -369,7 +369,7 @@ exit:
  *  to this function. The connection will not be made until the first
  *  LDAP function that needs it is called.
  */
-WLDAP32_LDAP *ldap_initW( PWCHAR hostname, ULONG portnumber )
+WLDAP32_LDAP * CDECL ldap_initW( PWCHAR hostname, ULONG portnumber )
 {
 #ifdef HAVE_LDAP
     LDAP *ld = NULL;
@@ -405,7 +405,7 @@ exit:
  *
  * See ldap_openW.
  */
-WLDAP32_LDAP *ldap_openA( PCHAR hostname, ULONG portnumber )
+WLDAP32_LDAP * CDECL ldap_openA( PCHAR hostname, ULONG portnumber )
 {
 #ifdef HAVE_LDAP
     WLDAP32_LDAP *ld = NULL;
@@ -449,7 +449,7 @@ exit:
  *  will take precedence over the portnumber supplied as a parameter
  *  to this function.
  */
-WLDAP32_LDAP *ldap_openW( PWCHAR hostname, ULONG portnumber )
+WLDAP32_LDAP * CDECL ldap_openW( PWCHAR hostname, ULONG portnumber )
 {
 #ifdef HAVE_LDAP
     LDAP *ld = NULL;
@@ -485,7 +485,7 @@ exit:
  *
  * See ldap_sslinitW.
  */
-WLDAP32_LDAP *ldap_sslinitA( PCHAR hostname, ULONG portnumber, int secure )
+WLDAP32_LDAP * CDECL ldap_sslinitA( PCHAR hostname, ULONG portnumber, int secure )
 {
 #ifdef HAVE_LDAP
     WLDAP32_LDAP *ld;
@@ -530,7 +530,7 @@ WLDAP32_LDAP *ldap_sslinitA( PCHAR hostname, ULONG portnumber, int secure )
  *  to this function. The connection will not be made until the first
  *  LDAP function that needs it is called.
  */
-WLDAP32_LDAP *ldap_sslinitW( PWCHAR hostname, ULONG portnumber, int secure )
+WLDAP32_LDAP * CDECL ldap_sslinitW( PWCHAR hostname, ULONG portnumber, int secure )
 {
 #ifdef HAVE_LDAP
     WLDAP32_LDAP *ld = NULL;
@@ -569,7 +569,7 @@ exit:
  *
  * See ldap_start_tls_sW.
  */
-ULONG ldap_start_tls_sA( WLDAP32_LDAP *ld, PULONG retval, WLDAP32_LDAPMessage **result,
+ULONG CDECL ldap_start_tls_sA( WLDAP32_LDAP *ld, PULONG retval, WLDAP32_LDAPMessage **result,
     PLDAPControlA *serverctrls, PLDAPControlA *clientctrls )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -620,7 +620,7 @@ exit:
  * NOTES
  *  LDAP function that needs it is called.
  */
-ULONG ldap_start_tls_sW( WLDAP32_LDAP *ld, PULONG retval, WLDAP32_LDAPMessage **result,
+ULONG CDECL ldap_start_tls_sW( WLDAP32_LDAP *ld, PULONG retval, WLDAP32_LDAPMessage **result,
     PLDAPControlW *serverctrls, PLDAPControlW *clientctrls )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -655,7 +655,7 @@ exit:
 /***********************************************************************
  *      ldap_startup     (WLDAP32.@)
  */
-ULONG ldap_startup( PLDAP_VERSION_INFO version, HANDLE *instance )
+ULONG CDECL ldap_startup( PLDAP_VERSION_INFO version, HANDLE *instance )
 {
     TRACE( "(%p, %p)\n", version, instance );
     return LDAP_SUCCESS;
@@ -673,7 +673,7 @@ ULONG ldap_startup( PLDAP_VERSION_INFO version, HANDLE *instance )
  *  Success: TRUE
  *  Failure: FALSE
  */
-BOOLEAN ldap_stop_tls_s( WLDAP32_LDAP *ld )
+BOOLEAN CDECL ldap_stop_tls_s( WLDAP32_LDAP *ld )
 {
     TRACE( "(%p)\n", ld );
     return TRUE; /* FIXME: find a way to stop tls on a connection */

dlls/wldap32/misc.c

@@ -55,7 +55,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG WLDAP32_ldap_abandon( WLDAP32_LDAP *ld, ULONG msgid )
+ULONG CDECL WLDAP32_ldap_abandon( WLDAP32_LDAP *ld, ULONG msgid )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -74,7 +74,7 @@ ULONG WLDAP32_ldap_abandon( WLDAP32_LDAP *ld, ULONG msgid )
  *
  * See ldap_check_filterW.
  */
-ULONG ldap_check_filterA( WLDAP32_LDAP *ld, PCHAR filter )
+ULONG CDECL ldap_check_filterA( WLDAP32_LDAP *ld, PCHAR filter )
 {
     ULONG ret;
     WCHAR *filterW = NULL;
@@ -107,7 +107,7 @@ ULONG ldap_check_filterA( WLDAP32_LDAP *ld, PCHAR filter )
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG ldap_check_filterW( WLDAP32_LDAP *ld, PWCHAR filter )
+ULONG CDECL ldap_check_filterW( WLDAP32_LDAP *ld, PWCHAR filter )
 {
     TRACE( "(%p, %s)\n", ld, debugstr_w(filter) );
 
@@ -118,7 +118,7 @@ ULONG ldap_check_filterW( WLDAP32_LDAP *ld, PWCHAR filter )
 /***********************************************************************
  *      ldap_cleanup     (WLDAP32.@)
  */
-ULONG ldap_cleanup( HANDLE instance )
+ULONG CDECL ldap_cleanup( HANDLE instance )
 {
     TRACE( "(%p)\n", instance );
     return LDAP_SUCCESS;
@@ -137,7 +137,7 @@ ULONG ldap_cleanup( HANDLE instance )
  *  Success: Pointer to an LDAP context.
  *  Failure: NULL
  */
-WLDAP32_LDAP *ldap_conn_from_msg( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
+WLDAP32_LDAP * CDECL ldap_conn_from_msg( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
 {
     TRACE( "(%p, %p)\n", ld, res );
 
@@ -158,7 +158,7 @@ WLDAP32_LDAP *ldap_conn_from_msg( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
  *  Success: The number of entries.
  *  Failure: ~0UL
  */
-ULONG WLDAP32_ldap_count_entries( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
+ULONG CDECL WLDAP32_ldap_count_entries( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -185,7 +185,7 @@ ULONG WLDAP32_ldap_count_entries( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
  *  Success: The number of references.
  *  Failure: ~0UL
  */
-ULONG WLDAP32_ldap_count_references( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
+ULONG CDECL WLDAP32_ldap_count_references( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP_COUNT_REFERENCES
@@ -244,7 +244,7 @@ static void escape_filter_element( PCHAR src, ULONG srclen, PCHAR dst )
  *
  * See ldap_escape_filter_elementW.
  */
-ULONG ldap_escape_filter_elementA( PCHAR src, ULONG srclen, PCHAR dst, ULONG dstlen )
+ULONG CDECL ldap_escape_filter_elementA( PCHAR src, ULONG srclen, PCHAR dst, ULONG dstlen )
 {
     ULONG len;
 
@@ -277,7 +277,7 @@ ULONG ldap_escape_filter_elementA( PCHAR src, ULONG srclen, PCHAR dst, ULONG dst
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG ldap_escape_filter_elementW( PCHAR src, ULONG srclen, PWCHAR dst, ULONG dstlen )
+ULONG CDECL ldap_escape_filter_elementW( PCHAR src, ULONG srclen, PWCHAR dst, ULONG dstlen )
 {
     ULONG len;
 
@@ -295,7 +295,7 @@ ULONG ldap_escape_filter_elementW( PCHAR src, ULONG srclen, PWCHAR dst, ULONG ds
  *
  * See ldap_first_attributeW.
  */
-PCHAR ldap_first_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
+PCHAR CDECL ldap_first_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
     WLDAP32_BerElement** ptr )
 {
     PCHAR ret = NULL;
@@ -331,7 +331,7 @@ PCHAR ldap_first_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
  * NOTES
  *  Use ldap_memfree to free the returned string.
  */
-PWCHAR ldap_first_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
+PWCHAR CDECL ldap_first_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
     WLDAP32_BerElement** ptr )
 {
     PWCHAR ret = NULL;
@@ -366,7 +366,7 @@ PWCHAR ldap_first_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
  * NOTES
  *  The returned entry will be freed when the message is freed. 
  */
-WLDAP32_LDAPMessage *WLDAP32_ldap_first_entry( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
+WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_entry( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
 {
 #ifdef HAVE_LDAP
 
@@ -392,7 +392,7 @@ WLDAP32_LDAPMessage *WLDAP32_ldap_first_entry( WLDAP32_LDAP *ld, WLDAP32_LDAPMes
  *  Success: The first reference.
  *  Failure: NULL
  */
-WLDAP32_LDAPMessage *WLDAP32_ldap_first_reference( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
+WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_reference( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
 {
 #ifdef HAVE_LDAP_FIRST_REFERENCE
 
@@ -410,7 +410,7 @@ WLDAP32_LDAPMessage *WLDAP32_ldap_first_reference( WLDAP32_LDAP *ld, WLDAP32_LDA
  *
  * See ldap_memfreeW.
  */
-void ldap_memfreeA( PCHAR block )
+void CDECL ldap_memfreeA( PCHAR block )
 {
     TRACE( "(%p)\n", block );
     strfreeA( block );
@@ -424,7 +424,7 @@ void ldap_memfreeA( PCHAR block )
  * PARAMS
  *  block [I] Pointer to memory block to be freed.
  */
-void ldap_memfreeW( PWCHAR block )
+void CDECL ldap_memfreeW( PWCHAR block )
 {
     TRACE( "(%p)\n", block );
     strfreeW( block );
@@ -438,7 +438,7 @@ void ldap_memfreeW( PWCHAR block )
  * PARAMS
  *  res [I] Message to be freed.
  */
-ULONG WLDAP32_ldap_msgfree( WLDAP32_LDAPMessage *res )
+ULONG CDECL WLDAP32_ldap_msgfree( WLDAP32_LDAPMessage *res )
 {
     ULONG ret = LDAP_SUCCESS;
 #ifdef HAVE_LDAP
@@ -455,7 +455,7 @@ ULONG WLDAP32_ldap_msgfree( WLDAP32_LDAPMessage *res )
  *
  * See ldap_next_attributeW.
  */
-PCHAR ldap_next_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
+PCHAR CDECL ldap_next_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
     WLDAP32_BerElement *ptr )
 {
     PCHAR ret = NULL;
@@ -492,7 +492,7 @@ PCHAR ldap_next_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
  *  Free the returned string after each iteration with ldap_memfree.
  *  When done iterating and when ptr != NULL, call ber_free( ptr, 0 ).
  */
-PWCHAR ldap_next_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
+PWCHAR CDECL ldap_next_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
     WLDAP32_BerElement *ptr )
 {
     PWCHAR ret = NULL;
@@ -527,7 +527,7 @@ PWCHAR ldap_next_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
  * NOTES
  *  The returned entry will be freed when the message is freed.
  */
-WLDAP32_LDAPMessage *WLDAP32_ldap_next_entry( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry )
+WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_entry( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry )
 {
 #ifdef HAVE_LDAP
 
@@ -556,7 +556,7 @@ WLDAP32_LDAPMessage *WLDAP32_ldap_next_entry( WLDAP32_LDAP *ld, WLDAP32_LDAPMess
  * NOTES
  *  The returned entry will be freed when the message is freed.
  */
-WLDAP32_LDAPMessage *WLDAP32_ldap_next_reference( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry )
+WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_reference( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry )
 {
 #ifdef HAVE_LDAP_NEXT_REFERENCE
 
@@ -605,7 +605,7 @@ WLDAP32_LDAPMessage *WLDAP32_ldap_next_reference( WLDAP32_LDAP *ld, WLDAP32_LDAP
  *  to immediately return any available results. Free returned results
  *  with ldap_msgfree.
  */
-ULONG WLDAP32_ldap_result( WLDAP32_LDAP *ld, ULONG msgid, ULONG all,
+ULONG CDECL WLDAP32_ldap_result( WLDAP32_LDAP *ld, ULONG msgid, ULONG all,
     struct l_timeval *timeout, WLDAP32_LDAPMessage **res )
 {
     ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
@@ -637,7 +637,7 @@ ULONG WLDAP32_ldap_result( WLDAP32_LDAP *ld, ULONG msgid, ULONG all,
  * NOTES
  *  Set dstlen to zero to ask for the required buffer size.
  */
-int LdapUnicodeToUTF8( LPCWSTR src, int srclen, LPSTR dst, int dstlen )
+int CDECL LdapUnicodeToUTF8( LPCWSTR src, int srclen, LPSTR dst, int dstlen )
 {
     return WideCharToMultiByte( CP_UTF8, 0, src, srclen, dst, dstlen, NULL, NULL );
 }
@@ -659,7 +659,7 @@ int LdapUnicodeToUTF8( LPCWSTR src, int srclen, LPSTR dst, int dstlen )
  * NOTES
  *  Set dstlen to zero to ask for the required buffer size.
  */
-int LdapUTF8ToUnicode( LPCSTR src, int srclen, LPWSTR dst, int dstlen )
+int CDECL LdapUTF8ToUnicode( LPCSTR src, int srclen, LPWSTR dst, int dstlen )
 {
     return MultiByteToWideChar( CP_UTF8, 0, src, srclen, dst, dstlen );
 }

dlls/wldap32/modify.c

@@ -51,7 +51,7 @@ static LDAPMod *nullmods[] = { NULL };
  *
  * See ldap_modifyW.
  */
-ULONG ldap_modifyA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[] )
+ULONG CDECL ldap_modifyA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[] )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -103,7 +103,7 @@ exit:
  *  the operation. Cancel the operation by calling ldap_abandon
  *  with the message ID.
  */
-ULONG ldap_modifyW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[] )
+ULONG CDECL ldap_modifyW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[] )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -147,7 +147,7 @@ exit:
  *
  * See ldap_modify_extW.
  */
-ULONG ldap_modify_extA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[],
+ULONG CDECL ldap_modify_extA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[],
     PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -215,7 +215,7 @@ exit:
  *  the operation. The serverctrls and clientctrls parameters are
  *  optional and should be set to NULL if not used.
  */
-ULONG ldap_modify_extW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[],
+ULONG CDECL ldap_modify_extW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[],
     PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -267,7 +267,7 @@ exit:
  *
  * See ldap_modify_ext_sW.
  */
-ULONG ldap_modify_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[],
+ULONG CDECL ldap_modify_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[],
     PLDAPControlA *serverctrls, PLDAPControlA *clientctrls )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -333,7 +333,7 @@ exit:
  *  The serverctrls and clientctrls parameters are optional and
  *  should be set to NULL if not used.
  */
-ULONG ldap_modify_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[],
+ULONG CDECL ldap_modify_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[],
     PLDAPControlW *serverctrls, PLDAPControlW *clientctrls )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -384,7 +384,7 @@ exit:
  *
  * See ldap_modify_sW.
  */
-ULONG ldap_modify_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[] )
+ULONG CDECL ldap_modify_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[] )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -431,7 +431,7 @@ exit:
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG ldap_modify_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[] )
+ULONG CDECL ldap_modify_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[] )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP

dlls/wldap32/modrdn.c

@@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *
  * See ldap_modrdnW.
  */
-ULONG ldap_modrdnA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn )
+ULONG CDECL ldap_modrdnA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -94,7 +94,7 @@ exit:
  *  the operation. Cancel the operation by calling ldap_abandon
  *  with the message ID.
  */
-ULONG ldap_modrdnW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn )
+ULONG CDECL ldap_modrdnW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -135,7 +135,7 @@ exit:
  *
  * See ldap_modrdn2W.
  */
-ULONG ldap_modrdn2A( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn, INT delete )
+ULONG CDECL ldap_modrdn2A( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn, INT delete )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -185,7 +185,7 @@ exit:
  *  the operation. Cancel the operation by calling ldap_abandon
  *  with the message ID.
  */
-ULONG ldap_modrdn2W( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn, INT delete )
+ULONG CDECL ldap_modrdn2W( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn, INT delete )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -226,7 +226,7 @@ exit:
  *
  * See ldap_modrdn2_sW.
  */
-ULONG ldap_modrdn2_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn, INT delete )
+ULONG CDECL ldap_modrdn2_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn, INT delete )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -271,7 +271,7 @@ exit:
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG ldap_modrdn2_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn, INT delete )
+ULONG CDECL ldap_modrdn2_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn, INT delete )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -306,7 +306,7 @@ exit:
  *
  * See ldap_modrdn_sW.
  */
-ULONG ldap_modrdn_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn )
+ULONG CDECL ldap_modrdn_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -350,7 +350,7 @@ exit:
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG ldap_modrdn_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn )
+ULONG CDECL ldap_modrdn_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP

dlls/wldap32/option.c

@@ -40,7 +40,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
-ULONG ldap_get_optionA( WLDAP32_LDAP *ld, int option, void *value )
+ULONG CDECL ldap_get_optionA( WLDAP32_LDAP *ld, int option, void *value )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -164,7 +164,7 @@ ULONG ldap_get_optionA( WLDAP32_LDAP *ld, int option, void *value )
     return ret;
 }
 
-ULONG ldap_get_optionW( WLDAP32_LDAP *ld, int option, void *value )
+ULONG CDECL ldap_get_optionW( WLDAP32_LDAP *ld, int option, void *value )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -288,7 +288,7 @@ ULONG ldap_get_optionW( WLDAP32_LDAP *ld, int option, void *value )
     return ret;
 }
 
-ULONG ldap_set_optionA( WLDAP32_LDAP *ld, int option, void *value )
+ULONG CDECL ldap_set_optionA( WLDAP32_LDAP *ld, int option, void *value )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -363,7 +363,7 @@ ULONG ldap_set_optionA( WLDAP32_LDAP *ld, int option, void *value )
     return ret;
 }
 
-ULONG ldap_set_optionW( WLDAP32_LDAP *ld, int option, void *value )
+ULONG CDECL ldap_set_optionW( WLDAP32_LDAP *ld, int option, void *value )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP

dlls/wldap32/page.c

@@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *
  * See ldap_create_page_controlW.
  */
-ULONG ldap_create_page_controlA( WLDAP32_LDAP *ld, ULONG pagesize,
+ULONG CDECL ldap_create_page_controlA( WLDAP32_LDAP *ld, ULONG pagesize,
     struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlA *control )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -146,7 +146,7 @@ static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie,
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize,
+ULONG CDECL ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize,
     struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlW *control )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -164,7 +164,7 @@ ULONG ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize,
     return ret;
 }
 
-ULONG ldap_get_next_page( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG pagesize,
+ULONG CDECL ldap_get_next_page( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG pagesize,
     ULONG *message )
 {
     FIXME( "(%p, %p, 0x%08lx, %p)\n", ld, search, pagesize, message );
@@ -173,7 +173,7 @@ ULONG ldap_get_next_page( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG pagesize,
     return LDAP_NOT_SUPPORTED;
 }
 
-ULONG ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search,
+ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search,
     struct l_timeval *timeout, ULONG pagesize, ULONG *count,
     WLDAP32_LDAPMessage **results )
 {
@@ -184,7 +184,7 @@ ULONG ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search,
     return LDAP_NOT_SUPPORTED;
 }
 
-ULONG ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search,
+ULONG CDECL ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search,
     ULONG *count, WLDAP32_LDAPMessage *results )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -201,7 +201,7 @@ ULONG ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search,
 /***********************************************************************
  *      ldap_parse_page_controlA      (WLDAP32.@)
  */
-ULONG ldap_parse_page_controlA( WLDAP32_LDAP *ld, PLDAPControlA *ctrls,
+ULONG CDECL ldap_parse_page_controlA( WLDAP32_LDAP *ld, PLDAPControlA *ctrls,
     ULONG *count, struct WLDAP32_berval **cookie )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -226,7 +226,7 @@ ULONG ldap_parse_page_controlA( WLDAP32_LDAP *ld, PLDAPControlA *ctrls,
 /***********************************************************************
  *      ldap_parse_page_controlW      (WLDAP32.@)
  */
-ULONG ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls,
+ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls,
     ULONG *count, struct WLDAP32_berval **cookie )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -266,7 +266,7 @@ ULONG ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls,
     return ret;
 }
 
-ULONG ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search )
+ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search )
 {
     FIXME( "(%p, %p)\n", ld, search );
 
@@ -274,7 +274,7 @@ ULONG ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search )
     return LDAP_SUCCESS;
 }
 
-PLDAPSearch ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scope,
+PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scope,
     PCHAR filter, PCHAR attrs[], ULONG attrsonly, PLDAPControlA *serverctrls,
     PLDAPControlA *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyA *sortkeys )
 {
@@ -283,7 +283,7 @@ PLDAPSearch ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scope,
     return NULL;
 }
 
-PLDAPSearch ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG scope,
+PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG scope,
     PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls,
     PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys )
 {

dlls/wldap32/parse.c

@@ -40,7 +40,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
-ULONG ldap_parse_extended_resultA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
+ULONG CDECL ldap_parse_extended_resultA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
     PCHAR *oid, struct WLDAP32_berval **data, BOOLEAN free )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -64,7 +64,7 @@ ULONG ldap_parse_extended_resultA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result
     return ret;
 }
 
-ULONG ldap_parse_extended_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
+ULONG CDECL ldap_parse_extended_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
     PWCHAR *oid, struct WLDAP32_berval **data, BOOLEAN free )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -88,7 +88,7 @@ ULONG ldap_parse_extended_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result
     return ret;
 }
 
-ULONG ldap_parse_referenceA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message,
+ULONG CDECL ldap_parse_referenceA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message,
     PCHAR **referrals )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -108,7 +108,7 @@ ULONG ldap_parse_referenceA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message,
     return ret;
 }
 
-ULONG ldap_parse_referenceW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message,
+ULONG CDECL ldap_parse_referenceW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message,
     PWCHAR **referrals )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -128,7 +128,7 @@ ULONG ldap_parse_referenceW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message,
     return ret;
 }
 
-ULONG ldap_parse_resultA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
+ULONG CDECL ldap_parse_resultA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
     ULONG *retcode, PCHAR *matched, PCHAR *error, PCHAR **referrals,
     PLDAPControlA **serverctrls, BOOLEAN free )
 {
@@ -160,7 +160,7 @@ ULONG ldap_parse_resultA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
     return ret;
 }
 
-ULONG ldap_parse_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
+ULONG CDECL ldap_parse_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
     ULONG *retcode, PWCHAR *matched, PWCHAR *error, PWCHAR **referrals,
     PLDAPControlW **serverctrls, BOOLEAN free )
 {
@@ -192,7 +192,7 @@ ULONG ldap_parse_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
     return ret;
 }
 
-ULONG ldap_parse_sort_controlA( WLDAP32_LDAP *ld, PLDAPControlA *control,
+ULONG CDECL ldap_parse_sort_controlA( WLDAP32_LDAP *ld, PLDAPControlA *control,
     ULONG *result, PCHAR *attr )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -218,7 +218,7 @@ ULONG ldap_parse_sort_controlA( WLDAP32_LDAP *ld, PLDAPControlA *control,
     return ret;
 }
 
-ULONG ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
+ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
     ULONG *result, PWCHAR *attr )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -244,7 +244,7 @@ ULONG ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
     return ret;
 }
 
-INT ldap_parse_vlv_controlA( WLDAP32_LDAP *ld, PLDAPControlA *control,
+INT CDECL ldap_parse_vlv_controlA( WLDAP32_LDAP *ld, PLDAPControlA *control,
     PULONG targetpos, PULONG listcount,
     struct WLDAP32_berval **context, PINT errcode )
 {
@@ -271,7 +271,7 @@ INT ldap_parse_vlv_controlA( WLDAP32_LDAP *ld, PLDAPControlA *control,
     return ret;
 }
 
-INT ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
+INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
     PULONG targetpos, PULONG listcount,
     struct WLDAP32_berval **context, PINT errcode )
 {

dlls/wldap32/rename.c

@@ -40,7 +40,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
-ULONG ldap_rename_extA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newrdn,
+ULONG CDECL ldap_rename_extA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newrdn,
     PCHAR newparent, INT delete, PLDAPControlA *serverctrls,
     PLDAPControlA *clientctrls, ULONG *message )
 {
@@ -92,7 +92,7 @@ exit:
     return ret;
 }
 
-ULONG ldap_rename_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newrdn,
+ULONG CDECL ldap_rename_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newrdn,
     PWCHAR newparent, INT delete, PLDAPControlW *serverctrls,
     PLDAPControlW *clientctrls, ULONG *message )
 {
@@ -144,7 +144,7 @@ exit:
     return ret;
 }
 
-ULONG ldap_rename_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newrdn,
+ULONG CDECL ldap_rename_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newrdn,
     PCHAR newparent, INT delete, PLDAPControlA *serverctrls,
     PLDAPControlA *clientctrls )
 {
@@ -196,7 +196,7 @@ exit:
     return ret;
 }
 
-ULONG ldap_rename_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newrdn,
+ULONG CDECL ldap_rename_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newrdn,
     PWCHAR newparent, INT delete, PLDAPControlW *serverctrls,
     PLDAPControlW *clientctrls )
 {

dlls/wldap32/search.c

@@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *
  * See ldap_searchW.
  */
-ULONG ldap_searchA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter,
+ULONG CDECL ldap_searchA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter,
     PCHAR attrs[], ULONG attrsonly )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -107,7 +107,7 @@ exit:
  *  the operation. Cancel the operation by calling ldap_abandon
  *  with the message ID.
  */
-ULONG ldap_searchW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter,
+ULONG CDECL ldap_searchW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter,
     PWCHAR attrs[], ULONG attrsonly )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -157,7 +157,7 @@ exit:
  *
  * See ldap_search_extW.
  */
-ULONG ldap_search_extA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope,
+ULONG CDECL ldap_search_extA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope,
     PCHAR filter, PCHAR attrs[], ULONG attrsonly, PLDAPControlA *serverctrls,
     PLDAPControlA *clientctrls, ULONG timelimit, ULONG sizelimit, ULONG *message )
 {
@@ -238,7 +238,7 @@ exit:
  *  the operation. Cancel the operation by calling ldap_abandon
  *  with the message ID.
  */
-ULONG ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
+ULONG CDECL ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
     PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls,
     PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, ULONG *message )
 {
@@ -299,7 +299,7 @@ exit:
  *
  * See ldap_search_ext_sW.
  */
-ULONG ldap_search_ext_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope,
+ULONG CDECL ldap_search_ext_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope,
     PCHAR filter, PCHAR attrs[], ULONG attrsonly, PLDAPControlA *serverctrls,
     PLDAPControlA *clientctrls, struct l_timeval* timeout, ULONG sizelimit, WLDAP32_LDAPMessage **res )
 {
@@ -377,7 +377,7 @@ exit:
  * NOTES
  *  Call ldap_msgfree to free the results.
  */
-ULONG ldap_search_ext_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
+ULONG CDECL ldap_search_ext_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
     PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls,
     PLDAPControlW *clientctrls, struct l_timeval* timeout, ULONG sizelimit, WLDAP32_LDAPMessage **res )
 {
@@ -434,7 +434,7 @@ exit:
  *
  * See ldap_search_sW.
  */
-ULONG ldap_search_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter,
+ULONG CDECL ldap_search_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter,
     PCHAR attrs[], ULONG attrsonly, WLDAP32_LDAPMessage **res )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -494,7 +494,7 @@ exit:
  * NOTES
  *  Call ldap_msgfree to free the results.
  */
-ULONG ldap_search_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter,
+ULONG CDECL ldap_search_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter,
     PWCHAR attrs[], ULONG attrsonly, WLDAP32_LDAPMessage **res )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
@@ -538,7 +538,7 @@ exit:
  *
  * See ldap_search_stW.
  */
-ULONG ldap_search_stA( WLDAP32_LDAP *ld, const PCHAR base, ULONG scope,
+ULONG CDECL ldap_search_stA( WLDAP32_LDAP *ld, const PCHAR base, ULONG scope,
     const PCHAR filter, PCHAR attrs[], ULONG attrsonly,
     struct l_timeval *timeout, WLDAP32_LDAPMessage **res )
 {
@@ -602,7 +602,7 @@ exit:
  * NOTES
  *  Call ldap_msgfree to free the results.
  */
-ULONG ldap_search_stW( WLDAP32_LDAP *ld, const PWCHAR base, ULONG scope,
+ULONG CDECL ldap_search_stW( WLDAP32_LDAP *ld, const PWCHAR base, ULONG scope,
     const PWCHAR filter, PWCHAR attrs[], ULONG attrsonly,
     struct l_timeval *timeout, WLDAP32_LDAPMessage **res )
 {

dlls/wldap32/value.c

@@ -57,7 +57,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  *  Call ldap_count_values_len with the result of a call to
  *  ldap_get_values_len.
  */
-ULONG WLDAP32_ldap_count_values_len( struct WLDAP32_berval **vals )
+ULONG CDECL WLDAP32_ldap_count_values_len( struct WLDAP32_berval **vals )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -74,7 +74,7 @@ ULONG WLDAP32_ldap_count_values_len( struct WLDAP32_berval **vals )
  *
  * See ldap_count_valuesW.
  */
-ULONG ldap_count_valuesA( PCHAR *vals )
+ULONG CDECL ldap_count_valuesA( PCHAR *vals )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -110,7 +110,7 @@ ULONG ldap_count_valuesA( PCHAR *vals )
  *  Call ldap_count_valuesW with the result of a call to
  *  ldap_get_valuesW.
  */
-ULONG ldap_count_valuesW( PWCHAR *vals )
+ULONG CDECL ldap_count_valuesW( PWCHAR *vals )
 {
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
@@ -132,7 +132,7 @@ ULONG ldap_count_valuesW( PWCHAR *vals )
  *
  * See ldap_get_valuesW.
  */
-PCHAR *ldap_get_valuesA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, PCHAR attr )
+PCHAR * CDECL ldap_get_valuesA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, PCHAR attr )
 {
     PCHAR *ret = NULL;
 #ifdef HAVE_LDAP
@@ -223,7 +223,7 @@ static char **bv2str_array( struct berval **bv )
  *  ldap_first_entry or ldap_next_entry. Free the returned
  *  array with a call to ldap_value_freeW.
  */
-PWCHAR *ldap_get_valuesW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, PWCHAR attr )
+PWCHAR * CDECL ldap_get_valuesW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, PWCHAR attr )
 {
     PWCHAR *ret = NULL;
 #ifdef HAVE_LDAP
@@ -255,7 +255,7 @@ PWCHAR *ldap_get_valuesW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, PWCHAR a
  *
  * See ldap_get_values_lenW.
  */
-struct WLDAP32_berval **ldap_get_values_lenA( WLDAP32_LDAP *ld,
+struct WLDAP32_berval ** CDECL ldap_get_values_lenA( WLDAP32_LDAP *ld,
     WLDAP32_LDAPMessage *message, PCHAR attr )
 {
 #ifdef HAVE_LDAP
@@ -297,7 +297,7 @@ struct WLDAP32_berval **ldap_get_values_lenA( WLDAP32_LDAP *ld,
  *  ldap_first_entry or ldap_next_entry. Free the returned
  *  array with a call to ldap_value_free_len.
  */
-struct WLDAP32_berval **ldap_get_values_lenW( WLDAP32_LDAP *ld,
+struct WLDAP32_berval ** CDECL ldap_get_values_lenW( WLDAP32_LDAP *ld,
     WLDAP32_LDAPMessage *message, PWCHAR attr )
 {
 #ifdef HAVE_LDAP
@@ -332,7 +332,7 @@ struct WLDAP32_berval **ldap_get_values_lenW( WLDAP32_LDAP *ld,
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG WLDAP32_ldap_value_free_len( struct WLDAP32_berval **vals )
+ULONG CDECL WLDAP32_ldap_value_free_len( struct WLDAP32_berval **vals )
 {
 #ifdef HAVE_LDAP
 
@@ -348,7 +348,7 @@ ULONG WLDAP32_ldap_value_free_len( struct WLDAP32_berval **vals )
  *
  * See ldap_value_freeW.
  */
-ULONG ldap_value_freeA( PCHAR *vals )
+ULONG CDECL ldap_value_freeA( PCHAR *vals )
 {
     TRACE( "(%p)\n", vals );
 
@@ -368,7 +368,7 @@ ULONG ldap_value_freeA( PCHAR *vals )
  *  Success: LDAP_SUCCESS
  *  Failure: An LDAP error code.
  */
-ULONG ldap_value_freeW( PWCHAR *vals )
+ULONG CDECL ldap_value_freeW( PWCHAR *vals )
 {
     TRACE( "(%p)\n", vals );