Hi,
Modified files: dlls/wldap32 : control.c init.c winldap_private.h include : winldap.h tools/winapi : win32.api
Log message: Francois Gouget fgouget@free.fr winldap.h should include windeh.f and schnlsp.h. Enclose the API definitions in an extern "C" section and define LDAPAPI. Better stick to the types defined by the PSDK. Fix the ldap_create_vlv_control*() prototypes. Update win32.api.
Is causing compile failure:
|make[2]: Entering directory `/usr/home/projects/wine/mywine/dlls/wldap32' |ccache gcc-3.4 -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wdeclaration-after-statement -Wpointer-arith -g -O2 -o ber.o ber.c |In file included from ../../include/schannel.h:21, | from ../../include/schnlsp.h:21, | from ../../include/winldap.h:23, | from ber.c:26: |../../include/wincrypt.h:152: error: parse error before "FILETIME" |../../include/wincrypt.h:152: warning: no semicolon at end of struct or union |../../include/wincrypt.h:153: warning: type defaults to `int' in declaration of `NotAfter' |../../include/wincrypt.h:153: warning: data definition has no type or storage class |../../include/wincrypt.h:160: error: parse error before '}' token |../../include/wincrypt.h:160: warning: type defaults to `int' in declaration of `CERT_INFO' |../../include/wincrypt.h:160: warning: type defaults to `int' in declaration of `PCERT_INFO' |../../include/wincrypt.h:160: warning: data definition has no type or storage class |../../include/wincrypt.h:195: error: parse error before "FILETIME" |../../include/wincrypt.h:195: warning: no semicolon at end of struct or union |../../include/wincrypt.h:196: warning: type defaults to `int' in declaration of `NotAfter' |../../include/wincrypt.h:196: warning: data definition has no type or storage class |../../include/wincrypt.h:197: warning: type defaults to `int' in declaration of `CERT_PRIVATE_KEY_VALIDITY' |../../include/wincrypt.h:197: warning: type defaults to `int' in declaration of `PCERT_PRIVATE_KEY_VALIDITY' |../../include/wincrypt.h:197: warning: data definition has no type or storage class |../../include/wincrypt.h:202: error: parse error before "PCERT_PRIVATE_KEY_VALIDITY" |../../include/wincrypt.h:202: warning: no semicolon at end of struct or union |../../include/wincrypt.h:203: warning: type defaults to `int' in declaration of `CERT_KEY_ATTRIBUTES_INFO' |../../include/wincrypt.h:203: warning: type defaults to `int' in declaration of `PCERT_KEY_ATTRIBUTES_INFO' |../../include/wincrypt.h:203: warning: data definition has no type or storage class |../../include/wincrypt.h:384: error: parse error before "PCERT_INFO" |../../include/wincrypt.h:384: warning: no semicolon at end of struct or union |../../include/wincrypt.h:386: error: parse error before '}' token |../../include/wincrypt.h:386: warning: type defaults to `int' in declaration of `CERT_CONTEXT' |../../include/wincrypt.h:386: warning: type defaults to `int' in declaration of `PCERT_CONTEXT' |../../include/wincrypt.h:386: warning: data definition has no type or storage class
[ snipped quite a few lines]
|../../include/wincrypt.h:2434: error: parse error before "CertCreateCTLContext" |../../include/wincrypt.h:2437: error: parse error before "pCertContext" |../../include/wincrypt.h:2439: error: parse error before "pCrlContext" |../../include/wincrypt.h:2441: error: parse error before "pCtlContext" |../../include/wincrypt.h:2443: warning: type defaults to `int' in declaration of `PCCERT_CONTEXT' |../../include/wincrypt.h:2443: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2443: error: parse error before "CertDuplicateCertificateContext" |../../include/wincrypt.h:2446: warning: type defaults to `int' in declaration of `PCCRL_CONTEXT' |../../include/wincrypt.h:2446: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2446: error: parse error before "CertDuplicateCRLContext" |../../include/wincrypt.h:2448: warning: type defaults to `int' in declaration of `PCCTL_CONTEXT' |../../include/wincrypt.h:2448: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2448: error: parse error before "CertDuplicateCTLContext" |../../include/wincrypt.h:2450: warning: type defaults to `int' in declaration of `PCCERT_CONTEXT' |../../include/wincrypt.h:2450: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2450: error: parse error before "CertFindCertificateInStore" |../../include/wincrypt.h:2454: warning: type defaults to `int' in declaration of `PCCRL_CONTEXT' |../../include/wincrypt.h:2454: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2454: error: parse error before "CertFindCRLInStore" |../../include/wincrypt.h:2458: warning: type defaults to `int' in declaration of `PCCTL_CONTEXT' |../../include/wincrypt.h:2458: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2458: error: parse error before "CertFindCTLInStore" |../../include/wincrypt.h:2462: error: parse error before "pCertContext" |../../include/wincrypt.h:2465: error: parse error before "pCrlContext" |../../include/wincrypt.h:2468: error: parse error before "pCtlContext" |../../include/wincrypt.h:2516: error: parse error before "pTimeToVerify" |In file included from ../../include/schnlsp.h:21, | from ../../include/winldap.h:23, | from ber.c:26: |../../include/schannel.h:157: error: parse error before "PCCERT_CONTEXT" |../../include/schannel.h:157: warning: no semicolon at end of struct or union |../../include/schannel.h:169: error: parse error before '}' token |../../include/schannel.h:169: warning: type defaults to `int' in declaration of `SCHANNEL_CRED' |../../include/schannel.h:169: warning: type defaults to `int' in declaration of `PSCHANNEL_CRED' |../../include/schannel.h:169: warning: data definition has no type or storage class |make[2]: *** [ber.o] Error 1 |make[2]: Leaving directory `/usr/home/projects/wine/mywine/dlls/wldap32'
Any idea?
Rein.
On Thu, 24 Nov 2005, Rein Klazes wrote: [...]
Log message: Francois Gouget fgouget@free.fr winldap.h should include windeh.f and schnlsp.h. Enclose the API definitions in an extern "C" section and define LDAPAPI. Better stick to the types defined by the PSDK. Fix the ldap_create_vlv_control*() prototypes. Update win32.api.
Is causing compile failure:
This is fixed by the patch Mike McCormack sent this morning:
diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 1e4039c..e99202b 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -22,7 +22,9 @@
#ifndef HAVE_LDAP
+#include <stdarg.h> #include "windef.h" +#include "winbase.h" #include "winldap.h"
#define LBER_ERROR (~0U)
Yet another wldap32 build problem. Such fun. :) Fortunately, Mike McCormack sent a patch to wine-patches that fixes it: http://www.winehq.org/pipermail/wine-patches/2005-November/022350.html
Hope this helps, James
On Thu, 2005-11-24 at 19:15 +0100, Rein Klazes wrote:
Hi,
Modified files: dlls/wldap32 : control.c init.c winldap_private.h include : winldap.h tools/winapi : win32.api
Log message: Francois Gouget fgouget@free.fr winldap.h should include windeh.f and schnlsp.h. Enclose the API definitions in an extern "C" section and define LDAPAPI. Better stick to the types defined by the PSDK. Fix the ldap_create_vlv_control*() prototypes. Update win32.api.
Is causing compile failure:
|make[2]: Entering directory `/usr/home/projects/wine/mywine/dlls/wldap32' |ccache gcc-3.4 -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wdeclaration-after-statement -Wpointer-arith -g -O2 -o ber.o ber.c |In file included from ../../include/schannel.h:21, | from ../../include/schnlsp.h:21, | from ../../include/winldap.h:23, | from ber.c:26: |../../include/wincrypt.h:152: error: parse error before "FILETIME" |../../include/wincrypt.h:152: warning: no semicolon at end of struct or union |../../include/wincrypt.h:153: warning: type defaults to `int' in declaration of `NotAfter' |../../include/wincrypt.h:153: warning: data definition has no type or storage class |../../include/wincrypt.h:160: error: parse error before '}' token |../../include/wincrypt.h:160: warning: type defaults to `int' in declaration of `CERT_INFO' |../../include/wincrypt.h:160: warning: type defaults to `int' in declaration of `PCERT_INFO' |../../include/wincrypt.h:160: warning: data definition has no type or storage class |../../include/wincrypt.h:195: error: parse error before "FILETIME" |../../include/wincrypt.h:195: warning: no semicolon at end of struct or union |../../include/wincrypt.h:196: warning: type defaults to `int' in declaration of `NotAfter' |../../include/wincrypt.h:196: warning: data definition has no type or storage class |../../include/wincrypt.h:197: warning: type defaults to `int' in declaration of `CERT_PRIVATE_KEY_VALIDITY' |../../include/wincrypt.h:197: warning: type defaults to `int' in declaration of `PCERT_PRIVATE_KEY_VALIDITY' |../../include/wincrypt.h:197: warning: data definition has no type or storage class |../../include/wincrypt.h:202: error: parse error before "PCERT_PRIVATE_KEY_VALIDITY" |../../include/wincrypt.h:202: warning: no semicolon at end of struct or union |../../include/wincrypt.h:203: warning: type defaults to `int' in declaration of `CERT_KEY_ATTRIBUTES_INFO' |../../include/wincrypt.h:203: warning: type defaults to `int' in declaration of `PCERT_KEY_ATTRIBUTES_INFO' |../../include/wincrypt.h:203: warning: data definition has no type or storage class |../../include/wincrypt.h:384: error: parse error before "PCERT_INFO" |../../include/wincrypt.h:384: warning: no semicolon at end of struct or union |../../include/wincrypt.h:386: error: parse error before '}' token |../../include/wincrypt.h:386: warning: type defaults to `int' in declaration of `CERT_CONTEXT' |../../include/wincrypt.h:386: warning: type defaults to `int' in declaration of `PCERT_CONTEXT' |../../include/wincrypt.h:386: warning: data definition has no type or storage class
[ snipped quite a few lines]
|../../include/wincrypt.h:2434: error: parse error before "CertCreateCTLContext" |../../include/wincrypt.h:2437: error: parse error before "pCertContext" |../../include/wincrypt.h:2439: error: parse error before "pCrlContext" |../../include/wincrypt.h:2441: error: parse error before "pCtlContext" |../../include/wincrypt.h:2443: warning: type defaults to `int' in declaration of `PCCERT_CONTEXT' |../../include/wincrypt.h:2443: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2443: error: parse error before "CertDuplicateCertificateContext" |../../include/wincrypt.h:2446: warning: type defaults to `int' in declaration of `PCCRL_CONTEXT' |../../include/wincrypt.h:2446: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2446: error: parse error before "CertDuplicateCRLContext" |../../include/wincrypt.h:2448: warning: type defaults to `int' in declaration of `PCCTL_CONTEXT' |../../include/wincrypt.h:2448: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2448: error: parse error before "CertDuplicateCTLContext" |../../include/wincrypt.h:2450: warning: type defaults to `int' in declaration of `PCCERT_CONTEXT' |../../include/wincrypt.h:2450: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2450: error: parse error before "CertFindCertificateInStore" |../../include/wincrypt.h:2454: warning: type defaults to `int' in declaration of `PCCRL_CONTEXT' |../../include/wincrypt.h:2454: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2454: error: parse error before "CertFindCRLInStore" |../../include/wincrypt.h:2458: warning: type defaults to `int' in declaration of `PCCTL_CONTEXT' |../../include/wincrypt.h:2458: warning: `__stdcall__' attribute only applies to function types |../../include/wincrypt.h:2458: error: parse error before "CertFindCTLInStore" |../../include/wincrypt.h:2462: error: parse error before "pCertContext" |../../include/wincrypt.h:2465: error: parse error before "pCrlContext" |../../include/wincrypt.h:2468: error: parse error before "pCtlContext" |../../include/wincrypt.h:2516: error: parse error before "pTimeToVerify" |In file included from ../../include/schnlsp.h:21, | from ../../include/winldap.h:23, | from ber.c:26: |../../include/schannel.h:157: error: parse error before "PCCERT_CONTEXT" |../../include/schannel.h:157: warning: no semicolon at end of struct or union |../../include/schannel.h:169: error: parse error before '}' token |../../include/schannel.h:169: warning: type defaults to `int' in declaration of `SCHANNEL_CRED' |../../include/schannel.h:169: warning: type defaults to `int' in declaration of `PSCHANNEL_CRED' |../../include/schannel.h:169: warning: data definition has no type or storage class |make[2]: *** [ber.o] Error 1 |make[2]: Leaving directory `/usr/home/projects/wine/mywine/dlls/wldap32'
Any idea?
Rein.
-
Francois Gouget -
James Liggett -
Rein Klazes