April 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : wldap32: Added a wrapper for ber_scanf.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: ec9af18e96385a861de2b98a06d572d991ff7b61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec9af18e96385a861de2b98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 20:41:03 2006 +0200 wldap32: Added a wrapper for ber_scanf. --- dlls/wldap32/ber.c | 85 ++++++++++++++++++++++++++++++++++++++++++--- dlls/wldap32/wldap32.spec | 2 + 2 files changed, 81 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 8110a07..78fc39f 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -248,11 +248,86 @@ INT WLDAP32_ber_printf( BerElement *bere } -#ifndef HAVE_LDAP - -INT ber_scanf( BerElement *berelement, PCHAR fmt, ... ) +/*********************************************************************** + * ber_scanf (WLDAP32.@) + */ +INT WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) { +#ifdef HAVE_LDAP + va_list list; + int ret = 0; + char new_fmt[2]; + + new_fmt[1] = 0; + va_start( list, fmt ); + while (*fmt) + { + new_fmt[0] = *fmt++; + switch(new_fmt[0]) + { + case 'a': + { + char **ptr = va_arg( list, char ** ); + ret = ber_scanf( berelement, new_fmt, ptr ); + break; + } + case 'b': + case 'e': + case 'i': + { + int *i = va_arg( list, int * ); + ret = ber_scanf( berelement, new_fmt, i ); + break; + } + case 't': + { + unsigned int *tag = va_arg( list, unsigned int * ); + ret = ber_scanf( berelement, new_fmt, tag ); + break; + } + case 'v': + { + char ***array = va_arg( list, char *** ); + ret = ber_scanf( berelement, new_fmt, array ); + break; + } + case 'B': + { + char **str = va_arg( list, char ** ); + int *len = va_arg( list, int * ); + ret = ber_scanf( berelement, new_fmt, str, len ); + break; + } + case 'O': + { + struct berval **ptr = va_arg( list, struct berval ** ); + ret = ber_scanf( berelement, new_fmt, ptr ); + break; + } + case 'V': + { + struct berval ***array = va_arg( list, struct berval *** ); + ret = ber_scanf( berelement, new_fmt, array ); + break; + } + case 'n': + case 'x': + case '{': + case '}': + case '[': + case ']': + ret = ber_scanf( berelement, new_fmt ); + break; + default: + FIXME( "Unknown format '%c'\n", new_fmt[0] ); + ret = -1; + break; + } + if (ret == -1) break; + } + va_end( list ); + return ret; +#else return LBER_ERROR; +#endif } - -#endif /* HAVE_LDAP */ diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index 1c3a68a..048defe 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -226,7 +226,7 @@ 308 cdecl ber_next_element(ptr ptr ptr) WLDAP32_ber_next_element 309 cdecl ber_flatten(ptr ptr) WLDAP32_ber_flatten 310 varargs ber_printf(ptr str) WLDAP32_ber_printf -311 varargs ber_scanf(ptr str) +311 varargs ber_scanf(ptr str) WLDAP32_ber_scanf 312 cdecl ldap_conn_from_msg(ptr ptr) 313 cdecl ldap_sasl_bindW(ptr wstr wstr ptr ptr ptr ptr) 314 cdecl ldap_sasl_bind_sW(ptr wstr wstr ptr ptr ptr ptr)

1 0

Alexandre Julliard : wldap32: Added a wrapper for ber_printf.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 7a1fb2ecb40921eb4f6302ffd3e10d78a50cc208 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a1fb2ecb40921eb4f6302f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 20:40:40 2006 +0200 wldap32: Added a wrapper for ber_printf. --- dlls/wldap32/ber.c | 83 +++++++++++++++++++++++++++++++++++++++++++-- dlls/wldap32/wldap32.spec | 2 + 2 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 5353498..8110a07 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -24,6 +24,9 @@ #include "windef.h" #include "winbase.h" #include "winldap.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wldap32); #ifndef LBER_ERROR # define LBER_ERROR (~0U) @@ -166,13 +169,87 @@ ULONG WLDAP32_ber_skip_tag( BerElement * } -#ifndef HAVE_LDAP - -INT ber_printf( BerElement *berelement, PCHAR fmt, ... ) +/*********************************************************************** + * ber_printf (WLDAP32.@) + */ +INT WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) { +#ifdef HAVE_LDAP + va_list list; + int ret = 0; + char new_fmt[2]; + + new_fmt[1] = 0; + va_start( list, fmt ); + while (*fmt) + { + new_fmt[0] = *fmt++; + switch(new_fmt[0]) + { + case 'b': + case 'e': + case 'i': + { + int i = va_arg( list, int ); + ret = ber_printf( berelement, new_fmt, i ); + break; + } + case 'o': + case 's': + { + char *str = va_arg( list, char * ); + ret = ber_printf( berelement, new_fmt, str ); + break; + } + case 't': + { + unsigned int tag = va_arg( list, unsigned int ); + ret = ber_printf( berelement, new_fmt, tag ); + break; + } + case 'v': + { + char **array = va_arg( list, char ** ); + ret = ber_printf( berelement, new_fmt, array ); + break; + } + case 'V': + { + struct berval **array = va_arg( list, struct berval ** ); + ret = ber_printf( berelement, new_fmt, array ); + break; + } + case 'X': + { + char *str = va_arg( list, char * ); + int len = va_arg( list, int ); + ret = ber_printf( berelement, "B" /* 'X' is deprecated */, str, len ); + break; + } + case 'n': + case '{': + case '}': + case '[': + case ']': + ret = ber_printf( berelement, new_fmt ); + break; + default: + FIXME( "Unknown format '%c'\n", new_fmt[0] ); + ret = -1; + break; + } + if (ret == -1) break; + } + va_end( list ); + return ret; +#else return LBER_ERROR; +#endif } + +#ifndef HAVE_LDAP + INT ber_scanf( BerElement *berelement, PCHAR fmt, ... ) { return LBER_ERROR; diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index 93d4b18..1c3a68a 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -225,7 +225,7 @@ 307 cdecl ber_first_element(ptr ptr ptr) WLDAP32_ber_first_element 308 cdecl ber_next_element(ptr ptr ptr) WLDAP32_ber_next_element 309 cdecl ber_flatten(ptr ptr) WLDAP32_ber_flatten -310 varargs ber_printf(ptr str) +310 varargs ber_printf(ptr str) WLDAP32_ber_printf 311 varargs ber_scanf(ptr str) 312 cdecl ldap_conn_from_msg(ptr ptr) 313 cdecl ldap_sasl_bindW(ptr wstr wstr ptr ptr ptr ptr)

1 0

Alexandre Julliard : wldap32: Add wrappers for the ber_* functions.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: e048a204c1d81a8569d1025da66dec5c3af647df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e048a204c1d81a8569d1025… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 20:38:43 2006 +0200 wldap32: Add wrappers for the ber_* functions. --- dlls/wldap32/ber.c | 121 +++++++++++++++++++++++++++++++++++++++------ dlls/wldap32/wldap32.spec | 22 ++++---- 2 files changed, 115 insertions(+), 28 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index e99202b..5353498 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -20,68 +20,155 @@ #include "config.h" -#ifndef HAVE_LDAP - #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winldap.h" -#define LBER_ERROR (~0U) - -BerElement *ber_alloc_t( INT options ) -{ +#ifndef LBER_ERROR +# define LBER_ERROR (~0U) +#endif + +/*********************************************************************** + * ber_alloc_t (WLDAP32.@) + */ +BerElement *WLDAP32_ber_alloc_t( INT options ) +{ +#ifdef HAVE_LDAP + return ber_alloc_t( options ); +#else return NULL; +#endif } -BERVAL *ber_bvdup( BERVAL *berval ) + +/*********************************************************************** + * ber_bvdup (WLDAP32.@) + */ +BERVAL *WLDAP32_ber_bvdup( BERVAL *berval ) { +#ifdef HAVE_LDAP + return ber_bvdup( berval ); +#else return NULL; +#endif } -void ber_bvecfree( PBERVAL *berval ) + +/*********************************************************************** + * ber_bvecfree (WLDAP32.@) + */ +void WLDAP32_ber_bvecfree( PBERVAL *berval ) { +#ifdef HAVE_LDAP + ber_bvecfree( berval ); +#endif } -void ber_bvfree( BERVAL *berval ) + +/*********************************************************************** + * ber_bvfree (WLDAP32.@) + */ +void WLDAP32_ber_bvfree( BERVAL *berval ) { +#ifdef HAVE_LDAP + ber_bvfree( berval ); +#endif } -ULONG ber_first_element( BerElement *berelement, ULONG *len, CHAR **opaque ) + +/*********************************************************************** + * ber_first_element (WLDAP32.@) + */ +ULONG WLDAP32_ber_first_element( BerElement *berelement, ULONG *len, CHAR **opaque ) { +#ifdef HAVE_LDAP + return ber_first_element( berelement, len, opaque ); +#else return LBER_ERROR; +#endif } -INT ber_flatten( BerElement *berelement, PBERVAL *berval ) + +/*********************************************************************** + * ber_flatten (WLDAP32.@) + */ +INT WLDAP32_ber_flatten( BerElement *berelement, PBERVAL *berval ) { +#ifdef HAVE_LDAP + return ber_flatten( berelement, berval ); +#else return LBER_ERROR; +#endif } -void ber_free( BerElement *berelement, INT buf ) + +/*********************************************************************** + * ber_free (WLDAP32.@) + */ +void WLDAP32_ber_free( BerElement *berelement, INT buf ) { +#ifdef HAVE_LDAP + ber_free( berelement, buf ); +#endif } -BerElement *ber_init( BERVAL *berval ) + +/*********************************************************************** + * ber_init (WLDAP32.@) + */ +BerElement *WLDAP32_ber_init( BERVAL *berval ) { +#ifdef HAVE_LDAP + return ber_init( berval ); +#else return NULL; +#endif } -ULONG ber_next_element( BerElement *berelement, ULONG *len, CHAR *opaque ) + +/*********************************************************************** + * ber_next_element (WLDAP32.@) + */ +ULONG WLDAP32_ber_next_element( BerElement *berelement, ULONG *len, CHAR *opaque ) { +#ifdef HAVE_LDAP + return ber_next_element( berelement, len, opaque ); +#else return LBER_ERROR; +#endif } -ULONG ber_peek_tag( BerElement *berelement, ULONG *len ) + +/*********************************************************************** + * ber_peek_tag (WLDAP32.@) + */ +ULONG WLDAP32_ber_peek_tag( BerElement *berelement, ULONG *len ) { +#ifdef HAVE_LDAP + return ber_peek_tag( berelement, len ); +#else return LBER_ERROR; +#endif } -INT ber_printf( BerElement *berelement, PCHAR fmt, ... ) + +/*********************************************************************** + * ber_skip_tag (WLDAP32.@) + */ +ULONG WLDAP32_ber_skip_tag( BerElement *berelement, ULONG *len ) { +#ifdef HAVE_LDAP + return ber_skip_tag( berelement, len ); +#else return LBER_ERROR; +#endif } -ULONG ber_skip_tag( BerElement *berelement, ULONG *len ) + +#ifndef HAVE_LDAP + +INT ber_printf( BerElement *berelement, PCHAR fmt, ... ) { return LBER_ERROR; } diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index 180c444..93d4b18 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -41,7 +41,7 @@ 51 cdecl ldap_search_st(ptr str long str ptr long ptr ptr) ldap_search_stA 52 cdecl ldap_compare_s(ptr str str str) ldap_compare_sA 53 cdecl LdapUnicodeToUTF8(wstr long ptr long) - 54 cdecl ber_bvfree(ptr) + 54 cdecl ber_bvfree(ptr) WLDAP32_ber_bvfree 55 cdecl cldap_openA(str long) 56 cdecl ldap_addA(ptr str ptr) 57 cdecl ldap_add_ext(ptr str ptr ptr ptr ptr) ldap_add_extA @@ -215,16 +215,16 @@ 230 cdecl ldap_check_filterA(ptr str) 231 cdecl ldap_check_filterW(ptr wstr) 232 cdecl ldap_dn2ufnA(str) -300 cdecl ber_init(ptr) -301 cdecl ber_free(ptr long) -302 cdecl ber_bvecfree(ptr) -303 cdecl ber_bvdup(ptr) -304 cdecl ber_alloc_t(long) -305 cdecl ber_skip_tag(ptr ptr) -306 cdecl ber_peek_tag(ptr ptr) -307 cdecl ber_first_element(ptr ptr ptr) -308 cdecl ber_next_element(ptr ptr ptr) -309 cdecl ber_flatten(ptr ptr) +300 cdecl ber_init(ptr) WLDAP32_ber_init +301 cdecl ber_free(ptr long) WLDAP32_ber_free +302 cdecl ber_bvecfree(ptr) WLDAP32_ber_bvecfree +303 cdecl ber_bvdup(ptr) WLDAP32_ber_bvdup +304 cdecl ber_alloc_t(long) WLDAP32_ber_alloc_t +305 cdecl ber_skip_tag(ptr ptr) WLDAP32_ber_skip_tag +306 cdecl ber_peek_tag(ptr ptr) WLDAP32_ber_peek_tag +307 cdecl ber_first_element(ptr ptr ptr) WLDAP32_ber_first_element +308 cdecl ber_next_element(ptr ptr ptr) WLDAP32_ber_next_element +309 cdecl ber_flatten(ptr ptr) WLDAP32_ber_flatten 310 varargs ber_printf(ptr str) 311 varargs ber_scanf(ptr str) 312 cdecl ldap_conn_from_msg(ptr ptr)

1 0

Alexandre Julliard : ntdll: Add wrappers for the remaining math functions.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: d340bd003a42368fb051db2b4a643531ee8cda5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d340bd003a42368fb051db2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 20:31:41 2006 +0200 ntdll: Add wrappers for the remaining math functions. --- dlls/ntdll/misc.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 24 ++++++------ 2 files changed, 109 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 4633263..f54d4ed 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -136,3 +136,100 @@ double __cdecl NTDLL__CIpow(double x,dou return pow(x,y); } #endif /* !defined(__i386__) */ + + +/********************************************************************* + * abs (NTDLL.@) + */ +int NTDLL_abs( int i ) +{ + return abs( i ); +} + +/********************************************************************* + * labs (NTDLL.@) + */ +long int NTDLL_labs( long int i ) +{ + return labs( i ); +} + +/********************************************************************* + * atan (NTDLL.@) + */ +double NTDLL_atan( double d ) +{ + return atan( d ); +} + +/********************************************************************* + * ceil (NTDLL.@) + */ +double NTDLL_ceil( double d ) +{ + return ceil( d ); +} + +/********************************************************************* + * cos (NTDLL.@) + */ +double NTDLL_cos( double d ) +{ + return cos( d ); +} + +/********************************************************************* + * fabs (NTDLL.@) + */ +double NTDLL_fabs( double d ) +{ + return fabs( d ); +} + +/********************************************************************* + * floor (NTDLL.@) + */ +double NTDLL_floor( double d ) +{ + return floor( d ); +} + +/********************************************************************* + * log (NTDLL.@) + */ +double NTDLL_log( double d ) +{ + return log( d ); +} + +/********************************************************************* + * pow (NTDLL.@) + */ +double NTDLL_pow( double x, double y ) +{ + return pow( x, y ); +} + +/********************************************************************* + * sin (NTDLL.@) + */ +double NTDLL_sin( double d ) +{ + return sin( d ); +} + +/********************************************************************* + * sqrt (NTDLL.@) + */ +double NTDLL_sqrt( double d ) +{ + return sqrt( d ); +} + +/********************************************************************* + * tan (NTDLL.@) + */ +double NTDLL_tan( double d ) +{ + return tan( d ); +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e5ec40d..9a6de16 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1277,15 +1277,15 @@ @ cdecl -private _wtoi(wstr) @ cdecl -private _wtoi64(wstr) @ cdecl -private _wtol(wstr) -@ cdecl -private abs(long) -@ cdecl -private atan(double) +@ cdecl -private abs(long) NTDLL_abs +@ cdecl -private atan(double) NTDLL_atan @ cdecl -private atoi(str) NTDLL_atoi @ cdecl -private atol(str) NTDLL_atol @ cdecl -private bsearch(ptr ptr long long ptr) NTDLL_bsearch -@ cdecl -private ceil(double) -@ cdecl -private cos(double) -@ cdecl -private fabs(double) -@ cdecl -private floor(double) +@ cdecl -private ceil(double) NTDLL_ceil +@ cdecl -private cos(double) NTDLL_cos +@ cdecl -private fabs(double) NTDLL_fabs +@ cdecl -private floor(double) NTDLL_floor @ cdecl -private isalnum(long) NTDLL_isalnum @ cdecl -private isalpha(long) NTDLL_isalpha @ cdecl -private iscntrl(long) NTDLL_iscntrl @@ -1303,19 +1303,19 @@ @ cdecl -private iswspace(long) NTDLL_iswspace @ cdecl -private iswxdigit(long) NTDLL_iswxdigit @ cdecl -private isxdigit(long) NTDLL_isxdigit -@ cdecl -private labs(long) -@ cdecl -private log(double) +@ cdecl -private labs(long) NTDLL_labs +@ cdecl -private log(double) NTDLL_log @ cdecl -private mbstowcs(ptr str long) NTDLL_mbstowcs @ cdecl -private memchr(ptr long long) NTDLL_memchr @ cdecl -private memcmp(ptr ptr long) NTDLL_memcmp @ cdecl -private memcpy(ptr ptr long) NTDLL_memcpy @ cdecl -private memmove(ptr ptr long) NTDLL_memmove @ cdecl -private memset(ptr long long) NTDLL_memset -@ cdecl -private pow(double double) +@ cdecl -private pow(double double) NTDLL_pow @ cdecl -private qsort(ptr long long ptr) NTDLL_qsort -@ cdecl -private sin(double) +@ cdecl -private sin(double) NTDLL_sin @ varargs -private sprintf(str str) NTDLL_sprintf -@ cdecl -private sqrt(double) +@ cdecl -private sqrt(double) NTDLL_sqrt @ varargs -private sscanf(str str) NTDLL_sscanf @ cdecl -private strcat(str str) NTDLL_strcat @ cdecl -private strchr(str long) NTDLL_strchr @@ -1333,7 +1333,7 @@ @ cdecl -private strtol(str ptr long) NTDLL_strtol @ cdecl -private strtoul(str ptr long) NTDLL_strtoul @ varargs -private swprintf(wstr wstr) NTDLL_swprintf -@ cdecl -private tan(double) +@ cdecl -private tan(double) NTDLL_tan @ cdecl -private tolower(long) NTDLL_tolower @ cdecl -private toupper(long) NTDLL_toupper @ cdecl -private towlower(long) NTDLL_towlower

1 0

Alexandre Julliard : ntdll: Add wrappers for the string functions.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 473fbcb781a2d42dd93d05680dfdef88999349fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=473fbcb781a2d42dd93d056… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 20:30:43 2006 +0200 ntdll: Add wrappers for the string functions. --- dlls/ntdll/ntdll.spec | 96 +++++------ dlls/ntdll/string.c | 441 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/wcstring.c | 9 + 3 files changed, 491 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=473fbcb781a2d42dd93…

1 0

Alexandre Julliard : configure: Added check to catch old versions of the dbus library.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: b18b9f3753f9e61c670e8dbe5601b5183ffafa30 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b18b9f3753f9e61c670e8db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 19:10:59 2006 +0200 configure: Added check to catch old versions of the dbus library. --- configure | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- configure.ac | 8 ++++-- 2 files changed, 80 insertions(+), 6 deletions(-) diff --git a/configure b/configure index a89eb51..104f08f 100755 --- a/configure +++ b/configure @@ -9577,13 +9577,20 @@ if test `eval echo '${'$as_ac_Header'}'` cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - echo "$as_me:$LINENO: checking for libhal_ctx_new in -lhal" >&5 + +fi + +done + + if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes" + then + echo "$as_me:$LINENO: checking for libhal_ctx_new in -lhal" >&5 echo $ECHO_N "checking for libhal_ctx_new in -lhal... $ECHO_C" >&6 if test "${ac_cv_lib_hal_libhal_ctx_new+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lhal $ac_hal_libs $LIBS" +LIBS="-lhal $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9641,6 +9648,70 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_hal_libhal_ctx_new" >&5 echo "${ECHO_T}$ac_cv_lib_hal_libhal_ctx_new" >&6 if test $ac_cv_lib_hal_libhal_ctx_new = yes; then + echo "$as_me:$LINENO: checking for dbus_connection_close in -ldbus-1" >&5 +echo $ECHO_N "checking for dbus_connection_close in -ldbus-1... $ECHO_C" >&6 +if test "${ac_cv_lib_dbus_1_dbus_connection_close+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldbus-1 $ac_hal_libs $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dbus_connection_close (); +int +main () +{ +dbus_connection_close (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dbus_1_dbus_connection_close=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dbus_1_dbus_connection_close=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dbus_1_dbus_connection_close" >&5 +echo "${ECHO_T}$ac_cv_lib_dbus_1_dbus_connection_close" >&6 +if test $ac_cv_lib_dbus_1_dbus_connection_close = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_LIBHAL 1 @@ -9651,8 +9722,7 @@ fi fi -done - + fi CPPFLAGS="$ac_save_CPPFLAGS" fi diff --git a/configure.ac b/configure.ac index c61e554..a4103c4 100644 --- a/configure.ac +++ b/configure.ac @@ -513,10 +513,14 @@ then ac_hal_libs="`$PKG_CONFIG --libs hal`" ac_hal_cflags="`$PKG_CONFIG --cflags hal`" CPPFLAGS="$CPPFLAGS $ac_hal_cflags" - AC_CHECK_HEADERS([dbus/dbus.h hal/libhal.h], - [AC_CHECK_LIB(hal, libhal_ctx_new, + AC_CHECK_HEADERS([dbus/dbus.h hal/libhal.h]) + if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes" + then + AC_CHECK_LIB(hal, libhal_ctx_new, + [AC_CHECK_LIB(dbus-1, dbus_connection_close, [AC_DEFINE(HAVE_LIBHAL, 1, [Define if you have the hal library]) HALINCL="$ac_hal_cflags"],,$ac_hal_libs)]) + fi CPPFLAGS="$ac_save_CPPFLAGS" fi

1 0

Mike McCormack : msi: Simplify create_component_advertise_string() a little .
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 6607180f64bc78c4d767970949dc0b67900ddaca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6607180f64bc78c4d767970… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 18 20:06:52 2006 +0900 msi: Simplify create_component_advertise_string() a little. --- dlls/msi/helpers.c | 52 +++++++++++++++++++--------------------------------- 1 files changed, 19 insertions(+), 33 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index ffbde9f..9eadcfd 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -869,49 +869,35 @@ void reduce_to_shortfilename(WCHAR* file LPWSTR create_component_advertise_string(MSIPACKAGE* package, MSICOMPONENT* component, LPCWSTR feature) { - GUID clsid; - WCHAR productid_85[21]; - WCHAR component_85[21]; - /* - * I have a fair bit of confusion as to when a < is used and when a > is - * used. I do not think i have it right... - * - * Ok it appears that the > is used if there is a guid for the compoenent - * and the < is used if not. - */ - static const WCHAR fmt1[] = {'%','s','%','s','<',0,0}; - static const WCHAR fmt2[] = {'%','s','%','s','>','%','s',0,0}; + static const WCHAR fmt[] = {'%','s','%','s','%','c','%','s',0}; + WCHAR productid_85[21], component_85[21]; LPWSTR output = NULL; DWORD sz = 0; + GUID clsid; + + /* > is used if there is a component GUID and < if not. */ - memset(productid_85,0,sizeof(productid_85)); - memset(component_85,0,sizeof(component_85)); + productid_85[0] = 0; + component_85[0] = 0; CLSIDFromString(package->ProductCode, &clsid); - - encode_base85_guid(&clsid,productid_85); + encode_base85_guid(&clsid, productid_85); - CLSIDFromString(component->ComponentId, &clsid); - encode_base85_guid(&clsid,component_85); + if (component) + { + CLSIDFromString(component->ComponentId, &clsid); + encode_base85_guid(&clsid, component_85); + } - TRACE("Doing something with this... %s %s %s\n", - debugstr_w(productid_85), debugstr_w(feature), - debugstr_w(component_85)); + TRACE("prod=%s feat=%s comp=%s\n", debugstr_w(productid_85), + debugstr_w(feature), debugstr_w(component_85)); - sz = lstrlenW(productid_85) + lstrlenW(feature); - if (component) - sz += lstrlenW(component_85); + sz = 20 + lstrlenW(feature) + 20 + 3; - sz+=3; - sz *= sizeof(WCHAR); - - output = msi_alloc(sz); - memset(output,0,sz); + output = msi_alloc_zero(sz*sizeof(WCHAR)); - if (component) - sprintfW(output,fmt2,productid_85,feature,component_85); - else - sprintfW(output,fmt1,productid_85,feature); + sprintfW(output, fmt, productid_85, feature, + component?'>':'<', component_85); return output; }

1 0

Robert Shearman : oleaut32: Initialise BSTR pointer to NULL in VARIANT_UserUnmarshal.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: a963fd62854d66af4c1626836934b6c229eff64f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a963fd62854d66af4c16268… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Apr 18 11:56:14 2006 +0100 oleaut32: Initialise BSTR pointer to NULL in VARIANT_UserUnmarshal. Initialise BSTR pointer to NULL before calling BSTR_UserUnmarshal, otherwise BSTR_UserUnmarshal will try to use the memory in the pointer. --- dlls/oleaut32/usrmarshal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 961304f..4374348 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -462,11 +462,12 @@ unsigned char * WINAPI VARIANT_UserUnmar switch (var->vt) { case VT_BSTR: + V_BSTR(pvar) = NULL; Pos = BSTR_UserUnmarshal(pFlags, Pos, &V_BSTR(pvar)); break; case VT_BSTR | VT_BYREF: pvar->n1.n2.n3.byref = CoTaskMemAlloc(sizeof(BSTR)); - *(BSTR*)pvar->n1.n2.n3.byref = NULL; + *(BSTR*)V_BYREF(pvar) = NULL; Pos = BSTR_UserUnmarshal(pFlags, Pos, V_BSTRREF(pvar)); break; case VT_VARIANT | VT_BYREF:

1 0

Robert Shearman : oleaut32: Fix differences between the size returned in sizing the
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 50a9c208c62d4f7e2538018825c74451a529bafa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50a9c208c62d4f7e2538018… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Apr 18 11:57:12 2006 +0100 oleaut32: Fix differences between the size returned in sizing the buffer for interfaces and the buffer actually used. --- dlls/oleaut32/usrmarshal.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 4374348..4c765a2 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -287,14 +287,14 @@ static unsigned char* interface_variant_ working_memlocked = GlobalLock(working_mem); memcpy(Buffer, &size, sizeof(ULONG)); /* copy the buffersize */ - Buffer += sizeof(ULONG); - memcpy(Buffer, working_memlocked, size); + memcpy(Buffer + sizeof(ULONG), working_memlocked, size); GlobalUnlock(working_mem); IStream_Release(working); - TRACE("done, size=%ld\n", sizeof(ULONG) + size); - return Buffer + sizeof(ULONG) + size; + /* size includes the ULONG for the size written above */ + TRACE("done, size=%ld\n", size); + return Buffer + size; } /* helper: called for VT_DISPATCH / VT_UNKNOWN variants to unmarshal the buffer. returns Buffer on failure, new position otherwise */ @@ -314,8 +314,7 @@ static unsigned char *interface_variant_ /* get the buffersize */ memcpy(&size, Buffer, sizeof(ULONG)); TRACE("buffersize=%ld\n", size); - Buffer += sizeof(ULONG); - + working_mem = GlobalAlloc(0, size); if (!working_mem) return oldpos; @@ -328,7 +327,7 @@ static unsigned char *interface_variant_ working_memlocked = GlobalLock(working_mem); /* now we copy the contents of the marshalling buffer to working_memlocked, unlock it, and demarshal the stream */ - memcpy(working_memlocked, Buffer, size); + memcpy(working_memlocked, Buffer + sizeof(ULONG), size); GlobalUnlock(working_mem); hr = CoUnmarshalInterface(working, riid, (void**)&V_UNKNOWN(pvar)); @@ -339,8 +338,9 @@ static unsigned char *interface_variant_ IStream_Release(working); /* this also frees the underlying hglobal */ - TRACE("done, processed=%ld bytes\n", sizeof(ULONG) + size); - return Buffer + sizeof(ULONG) + size; + /* size includes the ULONG for the size written above */ + TRACE("done, processed=%ld bytes\n", size); + return Buffer + size; }

1 0

Robert Shearman : widl: Ignore [object] attribute on interfaces written to a typelib.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 7ca82cd6d27a509510c1b092474863bcb17c41c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ca82cd6d27a509510c1b09… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Apr 18 11:55:31 2006 +0100 widl: Ignore [object] attribute on interfaces written to a typelib. --- tools/widl/typelib.c | 1 + tools/widl/write_msft.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index a3eee2c..fe32c8f 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -268,6 +268,7 @@ void add_typedef(type_t *tdef, var_t *na typelib_entry_t *entry; if (!typelib) return; + chat("add typedef: %s\n", name->name); entry = xmalloc(sizeof(*entry)); entry->kind = TKIND_ALIAS; entry->u.tdef = xmalloc(sizeof(*entry->u.tdef)); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 0305160..ea48a9a 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1730,6 +1730,9 @@ static msft_typeinfo_t *create_msft_type typeinfo->flags |= 0x80; /* TYPEFLAG_FNONEXTENSIBLE */ break; + case ATTR_OBJECT: + break; + case ATTR_ODL: break;

1 0