August 2009 - Wine-commits - list.winehq.org

Chris Robinson : winemp3.acm: Fix reading/decoding loop.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 3dc677cc631038c924a7bda511bce94f4fc3e0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc677cc631038c924a7bda51… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Aug 25 23:27:57 2009 -0700 winemp3.acm: Fix reading/decoding loop. --- dlls/winemp3.acm/mpegl3.c | 49 +++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index eb97e75..2d291cf 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -151,39 +151,40 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, DWORD dpos = 0; - ret = mpg123_feed(amd->mh, src, *nsrc); - if (ret != MPG123_OK) + if (*nsrc > 0) { - ERR("Error feeding data\n"); - *ndst = *nsrc = 0; - return; - } - - ret = mpg123_read(amd->mh, NULL, 0, &size); - if (ret == MPG123_NEW_FORMAT) - { - if TRACE_ON(mpeg3) + ret = mpg123_feed(amd->mh, src, *nsrc); + if (ret != MPG123_OK) { - long rate; - int channels, enc; - mpg123_getformat(amd->mh, &rate, &channels, &enc); - TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc); + ERR("Error feeding data\n"); + *ndst = *nsrc = 0; + return; } } - else if (ret == MPG123_ERR) - { - FIXME("Error occurred during decoding!\n"); - *ndst = *nsrc = 0; - return; - } do { - dpos += size; - if (*ndst - dpos < 4608) break; + size = 0; ret = mpg123_read(amd->mh, dst + dpos, *ndst - dpos, &size); + if (ret == MPG123_ERR) + { + FIXME("Error occurred during decoding!\n"); + *ndst = *nsrc = 0; + return; + } + + if (ret == MPG123_NEW_FORMAT) + { + if TRACE_ON(mpeg3) + { + long rate; + int channels, enc; + mpg123_getformat(amd->mh, &rate, &channels, &enc); + TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc); + } + } + dpos += size; } while (ret == MPG123_OK); *ndst = dpos; - *nsrc = 0; } /***********************************************************************

1 0

Andrew Eikum : user32/tests: Fix input test failures on NT4.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 7fe9e693a759571e9d0262c00b626cfd65874d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe9e693a759571e9d0262c00… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 25 16:25:41 2009 -0500 user32/tests: Fix input test failures on NT4. --- dlls/user32/tests/input.c | 70 ++++++++++++++++++++++++++++---------------- 1 files changed, 44 insertions(+), 26 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1a834aa..8e085bd 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -72,6 +72,7 @@ static struct { LONG last_hook_syskey_down; LONG last_hook_syskey_up; BOOL expect_alt; + BOOL sendinput_broken; } key_status; static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); @@ -950,6 +951,7 @@ static void reset_key_status(void) key_status.last_hook_syskey_down = -1; key_status.last_hook_syskey_up = -1; key_status.expect_alt = FALSE; + key_status.sendinput_broken = FALSE; } static void test_unicode_keys(HWND hwnd, HHOOK hook) @@ -975,13 +977,15 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) } DispatchMessageW(&msg); } - ok(key_status.last_key_down == VK_PACKET, - "Last keydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_down); - ok(key_status.last_char == 0x3c0, - "Last char msg wparam should have been 0x3c0 (was: 0x%x)\n", key_status.last_char); - if(hook) - ok(key_status.last_hook_down == 0x3c0, - "Last hookdown msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_down); + if(!key_status.sendinput_broken){ + ok(key_status.last_key_down == VK_PACKET, + "Last keydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_down); + ok(key_status.last_char == 0x3c0, + "Last char msg wparam should have been 0x3c0 (was: 0x%x)\n", key_status.last_char); + if(hook) + ok(key_status.last_hook_down == 0x3c0, + "Last hookdown msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_down); + } inputs[1].u.ki.wVk = 0; inputs[1].u.ki.wScan = 0x3c0; @@ -995,11 +999,13 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) } DispatchMessageW(&msg); } - ok(key_status.last_key_up == VK_PACKET, - "Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up); - if(hook) - ok(key_status.last_hook_up == 0x3c0, - "Last hookup msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_up); + if(!key_status.sendinput_broken){ + ok(key_status.last_key_up == VK_PACKET, + "Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up); + if(hook) + ok(key_status.last_hook_up == 0x3c0, + "Last hookup msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_up); + } /* holding alt, pressing & releasing a unicode character, releasing alt */ inputs[0].u.ki.wVk = VK_LMENU; @@ -1019,13 +1025,15 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) } DispatchMessageW(&msg); } - ok(key_status.last_syskey_down == VK_PACKET, - "Last syskeydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_syskey_down); - ok(key_status.last_syschar == 0x3041, - "Last syschar msg should have been 0x3041 (was: 0x%x)\n", key_status.last_syschar); - if(hook) - ok(key_status.last_hook_syskey_down == 0x3041, - "Last hooksysdown msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_syskey_down); + if(!key_status.sendinput_broken){ + ok(key_status.last_syskey_down == VK_PACKET, + "Last syskeydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_syskey_down); + ok(key_status.last_syschar == 0x3041, + "Last syschar msg should have been 0x3041 (was: 0x%x)\n", key_status.last_syschar); + if(hook) + ok(key_status.last_hook_syskey_down == 0x3041, + "Last hooksysdown msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_syskey_down); + } inputs[1].u.ki.wVk = 0; inputs[1].u.ki.wScan = 0x3041; @@ -1044,11 +1052,13 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) } DispatchMessageW(&msg); } - ok(key_status.last_key_up == VK_PACKET, - "Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up); - if(hook) - ok(key_status.last_hook_up == 0x3041, - "Last hook up msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_up); + if(!key_status.sendinput_broken){ + ok(key_status.last_key_up == VK_PACKET, + "Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up); + if(hook) + ok(key_status.last_hook_up == 0x3041, + "Last hook up msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_up); + } } static LRESULT CALLBACK unicode_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, @@ -1081,8 +1091,16 @@ static LRESULT CALLBACK llkbd_unicode_hook(int nCode, WPARAM wParam, LPARAM lPar { if(nCode == HC_ACTION){ LPKBDLLHOOKSTRUCT info = (LPKBDLLHOOKSTRUCT)lParam; - ok(info->vkCode == VK_PACKET || (key_status.expect_alt && info->vkCode == VK_LMENU), "vkCode should have been VK_PACKET[%04x], was: %04x\n", VK_PACKET, info->vkCode); - key_status.expect_alt = FALSE; + if(!info->vkCode){ + key_status.sendinput_broken = TRUE; + win_skip("SendInput doesn't support unicode on this platform\n"); + }else{ + if(key_status.expect_alt){ + ok(info->vkCode == VK_LMENU, "vkCode should have been VK_LMENU[0x%04x], was: 0x%x\n", VK_LMENU, info->vkCode); + key_status.expect_alt = FALSE; + }else + ok(info->vkCode == VK_PACKET, "vkCode should have been VK_PACKET[0x%04x], was: 0x%x\n", VK_PACKET, info->vkCode); + } switch(wParam){ case WM_KEYDOWN: key_status.last_hook_down = info->scanCode;

1 0

Austin English : dnsapi: Add a stub for DnsFlushResolverCache.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 5b21d90f5fab0e2bf630fa31225b9c955c2386a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b21d90f5fab0e2bf630fa312… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Aug 25 15:22:47 2009 -0500 dnsapi: Add a stub for DnsFlushResolverCache. --- dlls/dnsapi/dnsapi.spec | 2 +- dlls/dnsapi/main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index bdc340a..bb14f4b 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -31,7 +31,7 @@ @ stdcall DnsExtractRecordsFromMessage_UTF8(ptr long ptr) @ stdcall DnsExtractRecordsFromMessage_W(ptr long ptr) @ stub DnsFindAuthoritativeZone -@ stub DnsFlushResolverCache +@ stdcall DnsFlushResolverCache() @ stub DnsFlushResolverCacheEntry_A @ stub DnsFlushResolverCacheEntry_UTF8 @ stub DnsFlushResolverCacheEntry_W diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 0c5020a..1889552 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -90,6 +90,16 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_W( DWORD flags, PVOID cred, } /****************************************************************************** + * DnsFlushResolverCache [DNSAPI.@] + * + */ +VOID WINAPI DnsFlushResolverCache(void) +{ + FIXME(": stub\n"); +} + + +/****************************************************************************** * DnsReleaseContextHandle [DNSAPI.@] * */

1 0

Vincent Povirk : wininet: Allow +.- characters in url scheme.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 980bb171ee73a6c3c250b679123ae4d754c1e84e URL: http://source.winehq.org/git/wine.git/?a=commit;h=980bb171ee73a6c3c250b6791… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 25 15:37:12 2009 -0500 wininet: Allow +.- characters in url scheme. According to RFC 1738, the plus, period, and hyphen characters are allowed in URL schemes. --- dlls/wininet/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e51c964..1a77fd8 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1402,7 +1402,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR /* Determine if the URI is absolute. */ while (lpszap - lpszUrl < dwUrlLength) { - if (isalnumW(*lpszap)) + if (isalnumW(*lpszap) || *lpszap == '+' || *lpszap == '.' || *lpszap == '-') { lpszap++; continue;

1 0

Eric Pouech : configure: Check for large filesystems support.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: bc56c4eab3694008f3ebd639f50824fa16a9d25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc56c4eab3694008f3ebd639f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Aug 25 19:33:28 2009 +0200 configure: Check for large filesystems support. --- configure | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 + include/config.h.in | 6 ++ include/wine/port.h | 1 - 4 files changed, 209 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 14a5d93..1c42c9e 100755 --- a/configure +++ b/configure @@ -810,6 +810,7 @@ with_xslt with_xxf86vm with_wine_tools with_wine64 +enable_largefile with_x ' ac_precious_vars='build_alias @@ -1449,6 +1450,7 @@ Optional Features: --disable-tests do not build the regression tests --enable-maintainer-mode enable maintainer-specific build rules + --disable-largefile omit support for large files Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -5174,6 +5176,205 @@ OPENGL_LIBS="" +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; +fi + +if test "$enable_largefile" != no; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if test "${ac_cv_sys_largefile_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + break +fi +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_largefile_CC=' -n32'; break +fi +rm -f core conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test "${ac_cv_sys_file_offset_bits+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=64; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if test "${ac_cv_sys_large_files+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=1; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF +;; +esac +rm -rf conftest* + fi +fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/configure.ac b/configure.ac index 015f6ba..39eea85 100644 --- a/configure.ac +++ b/configure.ac @@ -290,6 +290,8 @@ AC_SUBST(OPENGL_LIBS,"") dnl **** Check for header files **** +AC_SYS_LARGEFILE() + AC_CHECK_HEADERS(\ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ diff --git a/include/config.h.in b/include/config.h.in index d54e4d1..5eb84c3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1209,6 +1209,12 @@ /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + /* Define to a macro to output a .cfi assembly pseudo-op */ #undef __ASM_CFI diff --git a/include/wine/port.h b/include/wine/port.h index 0a63168..0fc877c 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -29,7 +29,6 @@ # error You must include port.h before all other headers #endif -#define _FILE_OFFSET_BITS 64 #define _GNU_SOURCE /* for pread/pwrite */ #include <fcntl.h> #include <math.h>

1 0

Vincent Povirk : oleaut32: Make ITypeInfo2:: GetCustData succeed when data is not found.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 80c870251fd0341b519f8351ac736bdf1b7142fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c870251fd0341b519f8351a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 25 15:09:50 2009 -0500 oleaut32: Make ITypeInfo2::GetCustData succeed when data is not found. --- dlls/oleaut32/tests/typelib.c | 22 ++++++++++++++++++++++ dlls/oleaut32/typelib.c | 11 +++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 2748ed0..9834d10 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -449,6 +449,7 @@ static void test_TypeInfo(void) { ITypeLib *pTypeLib; ITypeInfo *pTypeInfo; + ITypeInfo2 *pTypeInfo2; HRESULT hr; static WCHAR wszBogus[] = { 'b','o','g','u','s',0 }; static WCHAR wszGetTypeInfo[] = { 'G','e','t','T','y','p','e','I','n','f','o',0 }; @@ -458,6 +459,8 @@ static void test_TypeInfo(void) OLECHAR* pwszClone = wszClone; DISPID dispidMember; DISPPARAMS dispparams; + GUID bogusguid = {0x806afb4f,0x13f7,0x42d2,{0x89,0x2c,0x6c,0x97,0xc3,0x6a,0x36,0xc1}}; + VARIANT var; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -503,6 +506,25 @@ static void test_TypeInfo(void) hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &pwszGetTypeInfo, 1, &dispidMember); ok_ole_success(hr, ITypeInfo_GetIDsOfNames); + hr = ITypeInfo_QueryInterface(pTypeInfo, &IID_ITypeInfo2, (void**)&pTypeInfo2); + ok_ole_success(hr, ITypeInfo_QueryInterface); + + if (SUCCEEDED(hr)) + { + VariantInit(&var); + + V_VT(&var) = VT_I4; + + /* test unknown guid passed to GetCustData */ + hr = ITypeInfo2_GetCustData(pTypeInfo2, &bogusguid, &var); + ok_ole_success(hr, ITypeInfo_GetCustData); + ok(V_VT(&var) == VT_EMPTY, "got %i, expected VT_EMPTY\n", V_VT(&var)); + + ITypeInfo2_Release(pTypeInfo2); + + VariantClear(&var); + } + /* test invoking a method with a [restricted] keyword */ hr = ITypeInfo_Invoke(pTypeInfo, NULL, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); todo_wine { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e87095b..b86109c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7047,13 +7047,12 @@ static HRESULT WINAPI ITypeInfo2_fnGetCustData( TRACE("(%p) guid %s %s found!x)\n", This, debugstr_guid(guid), pCData? "" : "NOT"); - if(pCData) - { - VariantInit( pVarVal); + VariantInit( pVarVal); + if (pCData) VariantCopy( pVarVal, &pCData->data); - return S_OK; - } - return E_INVALIDARG; /* FIXME: correct? */ + else + VariantClear( pVarVal ); + return S_OK; } /* ITypeInfo2::GetFuncCustData

1 0

Alexandre Julliard : ntdll/tests: Make sure buffer alignment is correct.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 86e4830040d79337eb30349ae019fbc19a97cf8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e4830040d79337eb30349ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 26 11:52:39 2009 +0200 ntdll/tests: Make sure buffer alignment is correct. --- dlls/ntdll/tests/info.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f09acc9..ff61a2b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -121,25 +121,23 @@ static void test_query_cpu(void) static void test_query_performance(void) { NTSTATUS status; - ULONG FullLength; ULONG ReturnLength; - SYSTEM_PERFORMANCE_INFORMATION spi; - struct SPI_PLUS_EXTRA - { - SYSTEM_PERFORMANCE_INFORMATION spi; - BYTE extra[2]; - } spi_plus_extra; + ULONGLONG buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION)/sizeof(ULONGLONG) + 1]; - status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi, 0, &FullLength); + status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi, sizeof(spi), &ReturnLength); + status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, + sizeof(SYSTEM_PERFORMANCE_INFORMATION), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(spi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(SYSTEM_PERFORMANCE_INFORMATION), "Inconsistent length %d\n", ReturnLength); - status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi_plus_extra, sizeof(spi_plus_extra), &ReturnLength); + status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, + sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 2, &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( ReturnLength == min(FullLength, sizeof(spi_plus_extra)), "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(SYSTEM_PERFORMANCE_INFORMATION) || + ReturnLength == sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 2, + "Inconsistent length %d\n", ReturnLength); /* Not return values yet, as struct members are unknown */ }

1 0

Jeff Zaroyko : kernel32: sLanguage is LOCALE_SABBREVLANGNAME.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 8274786fa87678508006351fad91bc0fce22062b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8274786fa87678508006351fa… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Tue Aug 25 21:02:14 2009 +1000 kernel32: sLanguage is LOCALE_SABBREVLANGNAME. --- dlls/kernel32/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index fa17689..9071ff9 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -673,7 +673,7 @@ void LOCALE_InitRegistry(void) { maccpW, LOCALE_IDEFAULTMACCODEPAGE } }; static const LCTYPE lc_messages_values[] = { - LOCALE_SLANGUAGE, + LOCALE_SABBREVLANGNAME, LOCALE_SCOUNTRY, LOCALE_SLIST }; static const LCTYPE lc_monetary_values[] = { @@ -1051,7 +1051,7 @@ static const WCHAR *get_locale_value_name( DWORD lctype ) case LOCALE_ILDATE: return iLDateW; case LOCALE_ITLZERO: return iTLZeroW; case LOCALE_SCOUNTRY: return sCountryW; - case LOCALE_SLANGUAGE: return sLanguageW; + case LOCALE_SABBREVLANGNAME: return sLanguageW; /* The following are used in XP and later */ case LOCALE_IDIGITSUBSTITUTION: return NumShapeW;

1 0

Huw Davies : msdaps: Implement IBindResource_Bind proxy and stub.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: c77ff19e663a2577a01c5bc577ddca7401d2d26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77ff19e663a2577a01c5bc57… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 25 13:36:31 2009 +0100 msdaps: Implement IBindResource_Bind proxy and stub. --- dlls/msdaps/usrmarshal.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index cc4803c..b113667 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -383,18 +383,36 @@ HRESULT CALLBACK IBindResource_Bind_Proxy(IBindResource* This, IUnknown *pUnkOut REFGUID rguid, REFIID riid, IAuthenticate *pAuthenticate, DBIMPLICITSESSION *pImplSession, DBBINDURLSTATUS *pdwBindStatus, IUnknown **ppUnk) { - FIXME("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, + HRESULT hr; + + TRACE("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p)\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, debugstr_guid(rguid), debugstr_guid(riid), pAuthenticate, pImplSession, pdwBindStatus, ppUnk); - return E_NOTIMPL; + + hr = IBindResource_RemoteBind_Proxy(This, pUnkOuter, pwszURL, dwBindURLFlags, rguid, riid, pAuthenticate, + pImplSession ? pImplSession->pUnkOuter : NULL, pImplSession ? pImplSession->piid : NULL, + pImplSession ? &pImplSession->pSession : NULL, pdwBindStatus, ppUnk); + return hr; } HRESULT __RPC_STUB IBindResource_Bind_Stub(IBindResource* This, IUnknown *pUnkOuter, LPCOLESTR pwszURL, DBBINDURLFLAG dwBindURLFlags, REFGUID rguid, REFIID riid, IAuthenticate *pAuthenticate, IUnknown *pSessionUnkOuter, IID *piid, IUnknown **ppSession, DBBINDURLSTATUS *pdwBindStatus, IUnknown **ppUnk) { - FIXME("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, + HRESULT hr; + DBIMPLICITSESSION impl_session; + + TRACE("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p, %p, %p)\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, debugstr_guid(rguid), debugstr_guid(riid), pAuthenticate, pSessionUnkOuter, piid, ppSession, pdwBindStatus, ppUnk); - return E_NOTIMPL; + + impl_session.pUnkOuter = pSessionUnkOuter; + impl_session.piid = piid; + impl_session.pSession = NULL; + + hr = IBindResource_Bind(This, pUnkOuter, pwszURL, dwBindURLFlags, rguid, riid, pAuthenticate, + ppSession ? &impl_session : NULL, pdwBindStatus, ppUnk); + + if(ppSession) *ppSession = impl_session.pSession; + return hr; } HRESULT CALLBACK ICreateRow_CreateRow_Proxy(ICreateRow* This, IUnknown *pUnkOuter, LPCOLESTR pwszURL, DBBINDURLFLAG dwBindURLFlags,

1 0

Huw Davies : msdaps: Implement IDBCreateCommand_CreateCommand proxy and stub.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 5a946240558d4c0be99a110c074f147e8a43890c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a946240558d4c0be99a110c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 25 13:36:10 2009 +0100 msdaps: Implement IDBCreateCommand_CreateCommand proxy and stub. --- dlls/msdaps/usrmarshal.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 9712c26..cc4803c 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -40,18 +40,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); HRESULT CALLBACK IDBCreateCommand_CreateCommand_Proxy(IDBCreateCommand* This, IUnknown *pUnkOuter, REFIID riid, IUnknown **ppCommand) { - FIXME("(%p, %p, %s, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), - ppCommand); - return E_NOTIMPL; + HRESULT hr; + IErrorInfo *error; + + TRACE("(%p, %p, %s, %p)\n", This, pUnkOuter, debugstr_guid(riid), ppCommand); + hr = IDBCreateCommand_RemoteCreateCommand_Proxy(This, pUnkOuter, riid, ppCommand, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; } HRESULT __RPC_STUB IDBCreateCommand_CreateCommand_Stub(IDBCreateCommand* This, IUnknown *pUnkOuter, REFIID riid, IUnknown **ppCommand, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p, %p, %s, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), - ppCommand, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p, %p, %s, %p, %p)\n", This, pUnkOuter, debugstr_guid(riid), ppCommand, ppErrorInfoRem); + *ppErrorInfoRem = NULL; + hr = IDBCreateCommand_CreateCommand(This, pUnkOuter, riid, ppCommand); + if(FAILED(hr)) GetErrorInfo(0, ppErrorInfoRem); + + return hr; } HRESULT CALLBACK IDBCreateSession_CreateSession_Proxy(IDBCreateSession* This, IUnknown *pUnkOuter,

1 0