Alexandre Julliard : Fix position of CDECL qualifier for functions that return pointers.

Alexandre Julliard julliard at winehq.org
Fri Feb 6 09:56:08 CST 2009


Module: wine
Branch: master
Commit: fb04bcf638b0466529f96a267117421a61727dab
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fb04bcf638b0466529f96a267117421a61727dab

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Feb  6 13:56:09 2009 +0100

Fix position of CDECL qualifier for functions that return pointers.

---

 dlls/kernel32/path.c           |    4 ++--
 dlls/msi/media.c               |    2 +-
 dlls/wldap32/winldap_private.h |   38 +++++++++++++++++++-------------------
 include/winbase.h              |    4 ++--
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index 6ac919a..2633d90 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -1603,7 +1603,7 @@ BOOL WINAPI NeedCurrentDirectoryForExePathA( LPCSTR name )
  * Return the full Unix file name for a given path.
  * Returned buffer must be freed by caller.
  */
-char CDECL *wine_get_unix_file_name( LPCWSTR dosW )
+char * CDECL wine_get_unix_file_name( LPCWSTR dosW )
 {
     UNICODE_STRING nt_name;
     ANSI_STRING unix_name;
@@ -1627,7 +1627,7 @@ char CDECL *wine_get_unix_file_name( LPCWSTR dosW )
  * Return the full DOS file name for a given Unix path.
  * Returned buffer must be freed by caller.
  */
-WCHAR CDECL *wine_get_dos_file_name( LPCSTR str )
+WCHAR * CDECL wine_get_dos_file_name( LPCSTR str )
 {
     UNICODE_STRING nt_name;
     ANSI_STRING unix_name;
diff --git a/dlls/msi/media.c b/dlls/msi/media.c
index d5f1a1d..2de3252 100644
--- a/dlls/msi/media.c
+++ b/dlls/msi/media.c
@@ -145,7 +145,7 @@ end:
     return rc;
 }
 
-static void CDECL *cabinet_alloc(ULONG cb)
+static void * CDECL cabinet_alloc(ULONG cb)
 {
     return msi_alloc(cb);
 }
diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h
index ac1c739..a19ceb1 100644
--- a/dlls/wldap32/winldap_private.h
+++ b/dlls/wldap32/winldap_private.h
@@ -276,8 +276,8 @@ typedef struct ldap_apifeature_infoW
     int ldapaif_version;
 } LDAPAPIFeatureInfoW;
 
-WLDAP32_LDAP CDECL *cldap_openA(PCHAR,ULONG);
-WLDAP32_LDAP CDECL *cldap_openW(PWCHAR,ULONG);
+WLDAP32_LDAP * CDECL cldap_openA(PCHAR,ULONG);
+WLDAP32_LDAP * CDECL cldap_openW(PWCHAR,ULONG);
 ULONG CDECL WLDAP32_ldap_abandon(WLDAP32_LDAP*,ULONG);
 ULONG CDECL ldap_addA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
 ULONG CDECL ldap_addW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]);
@@ -304,7 +304,7 @@ ULONG CDECL ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP3
 ULONG CDECL ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR);
 ULONG CDECL ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR);
 ULONG CDECL ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*);
-WLDAP32_LDAP CDECL *ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAP * CDECL ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
 ULONG CDECL ldap_control_freeA(LDAPControlA*);
 ULONG CDECL ldap_control_freeW(LDAPControlW*);
 ULONG CDECL ldap_controls_freeA(LDAPControlA**);
@@ -336,8 +336,8 @@ PCHAR CDECL ldap_err2stringA(ULONG);
 PWCHAR CDECL ldap_err2stringW(ULONG);
 ULONG CDECL ldap_escape_filter_elementA(PCHAR,ULONG,PCHAR,ULONG);
 ULONG CDECL ldap_escape_filter_elementW(PCHAR,ULONG,PWCHAR,ULONG);
-PCHAR CDECL *ldap_explode_dnA(PCHAR,ULONG);
-PWCHAR CDECL *ldap_explode_dnW(PWCHAR,ULONG);
+PCHAR * CDECL ldap_explode_dnA(PCHAR,ULONG);
+PWCHAR * CDECL ldap_explode_dnW(PWCHAR,ULONG);
 ULONG CDECL ldap_extended_operationA(WLDAP32_LDAP*,PCHAR,struct WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*);
 ULONG CDECL ldap_extended_operationW(WLDAP32_LDAP*,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*);
 ULONG CDECL ldap_extended_operation_sA(WLDAP32_LDAP*,PCHAR,struct WLDAP32_berval*,PLDAPControlA*, PLDAPControlA*,
@@ -346,8 +346,8 @@ ULONG CDECL ldap_extended_operation_sW(WLDAP32_LDAP*,PWCHAR,struct WLDAP32_berva
     PWCHAR*,struct WLDAP32_berval**);
 PCHAR CDECL ldap_first_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**);
 PWCHAR CDECL ldap_first_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**);
-WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_first_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_first_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
 ULONG CDECL ldap_free_controlsA(LDAPControlA**);
 ULONG CDECL ldap_free_controlsW(LDAPControlW**);
 PCHAR CDECL ldap_get_dnA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
@@ -357,12 +357,12 @@ ULONG CDECL ldap_get_next_page_s(WLDAP32_LDAP*,PLDAPSearch,struct l_timeval*,ULO
 ULONG CDECL ldap_get_optionA(WLDAP32_LDAP*,int,void*);
 ULONG CDECL ldap_get_optionW(WLDAP32_LDAP*,int,void*);
 ULONG CDECL ldap_get_paged_count(WLDAP32_LDAP*,PLDAPSearch,ULONG*,WLDAP32_LDAPMessage*);
-PCHAR CDECL *ldap_get_valuesA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
-PWCHAR CDECL *ldap_get_valuesW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
-PBERVAL CDECL *ldap_get_values_lenA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
-PBERVAL CDECL *ldap_get_values_lenW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
-WLDAP32_LDAP CDECL *ldap_initA(const PCHAR,ULONG);
-WLDAP32_LDAP CDECL *ldap_initW(const PWCHAR,ULONG);
+PCHAR * CDECL ldap_get_valuesA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
+PWCHAR * CDECL ldap_get_valuesW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
+PBERVAL * CDECL ldap_get_values_lenA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
+PBERVAL * CDECL ldap_get_values_lenW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
+WLDAP32_LDAP * CDECL ldap_initA(const PCHAR,ULONG);
+WLDAP32_LDAP * CDECL ldap_initW(const PWCHAR,ULONG);
 void CDECL ldap_memfreeA(PCHAR);
 void CDECL ldap_memfreeW(PWCHAR);
 ULONG CDECL ldap_modifyA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
@@ -384,10 +384,10 @@ ULONG CDECL ldap_modrdn_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
 ULONG CDECL WLDAP32_ldap_msgfree(WLDAP32_LDAPMessage*);
 PCHAR CDECL ldap_next_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*);
 PWCHAR CDECL ldap_next_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*);
-WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_next_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_next_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-WLDAP32_LDAP CDECL *ldap_openA(PCHAR,ULONG);
-WLDAP32_LDAP CDECL *ldap_openW(PWCHAR,ULONG);
+WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAP * CDECL ldap_openA(PCHAR,ULONG);
+WLDAP32_LDAP * CDECL ldap_openW(PWCHAR,ULONG);
 ULONG CDECL ldap_parse_extended_resultA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR*,struct WLDAP32_berval**,BOOLEAN);
 ULONG CDECL ldap_parse_extended_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR*,struct WLDAP32_berval**,BOOLEAN);
 ULONG CDECL ldap_parse_page_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,struct WLDAP32_berval**);
@@ -438,8 +438,8 @@ ULONG CDECL ldap_simple_bindA(WLDAP32_LDAP*,PCHAR,PCHAR);
 ULONG CDECL ldap_simple_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
 ULONG CDECL ldap_simple_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR);
 ULONG CDECL ldap_simple_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
-WLDAP32_LDAP CDECL *ldap_sslinitA(PCHAR,ULONG,int);
-WLDAP32_LDAP CDECL *ldap_sslinitW(PWCHAR,ULONG,int);
+WLDAP32_LDAP * CDECL ldap_sslinitA(PCHAR,ULONG,int);
+WLDAP32_LDAP * CDECL ldap_sslinitW(PWCHAR,ULONG,int);
 ULONG CDECL ldap_start_tls_sA(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlA*,PLDAPControlA*);
 ULONG CDECL ldap_start_tls_sW(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlW*,PLDAPControlW*);
 ULONG CDECL ldap_startup(PLDAP_VERSION_INFO,HANDLE*);
diff --git a/include/winbase.h b/include/winbase.h
index f7a2854..3f0a24e 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -2312,8 +2312,8 @@ WINBASEAPI VOID        WINAPI _LeaveSysLevel(SYSLEVEL*);
 
 /* Wine internal functions */
 
-extern char CDECL *wine_get_unix_file_name( LPCWSTR dos );
-extern WCHAR CDECL *wine_get_dos_file_name( LPCSTR str );
+extern char * CDECL wine_get_unix_file_name( LPCWSTR dos );
+extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str );
 
 
 /* Interlocked functions */




More information about the wine-cvs mailing list