January 2018 - Wine-Commits

Alex Henrie : msvcrt: Don' t include MSVC 8.0+ environment functions in SOs for older DLLs.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: wine Branch: master Commit: 00fe56a7369eaeb5b8f5c1c69dfccceda63baa3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=00fe56a7369eaeb5b8f5c1c6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 01:11:44 2018 -0700 msvcrt: Don't include MSVC 8.0+ environment functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 4 ++++ dlls/msvcrt/environ.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 5a02418..06e16a8 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -626,6 +626,8 @@ void CDECL MSVCRT___set_app_type(int app_type) MSVCRT_app_type = app_type; } +#if _MSVCR_VER>=140 + /********************************************************************* * _get_initial_narrow_environment (UCRTBASE.@) */ @@ -732,6 +734,8 @@ MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void) return wide_command_line = s; } +#endif /* _MSVCR_VER>=140 */ + /********************************************************************* * _get_winmajor (MSVCRT.@) */ diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 1370fbb..f48eabf 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -207,8 +207,10 @@ int CDECL _wputenv_s(const MSVCRT_wchar_t *name, const MSVCRT_wchar_t *value) return ret; } +#if _MSVCR_VER>=80 + /****************************************************************** - * _dupenv_s (MSVCRT.@) + * _dupenv_s (MSVCR80.@) */ int CDECL _dupenv_s(char **buffer, MSVCRT_size_t *numberOfElements, const char *varname) { @@ -232,7 +234,7 @@ int CDECL _dupenv_s(char **buffer, MSVCRT_size_t *numberOfElements, const char * } /****************************************************************** - * _wdupenv_s (MSVCRT.@) + * _wdupenv_s (MSVCR80.@) */ int CDECL _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements, const MSVCRT_wchar_t *varname) @@ -256,6 +258,8 @@ int CDECL _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements, return 0; } +#endif /* _MSVCR_VER>=80 */ + /****************************************************************** * getenv_s (MSVCRT.@) */

1 0

Alex Henrie : d3dx9/tests: Use true spherical light values and relax expectations.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: wine Branch: master Commit: 07f7022fccc1c51eb4ccb4b6735e76f6a5ec13b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07f7022fccc1c51eb4ccb4b6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 1 21:50:32 2018 -0700 d3dx9/tests: Use true spherical light values and relax expectations. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 126 ++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07f7022fccc1c51eb4cc…

1 0

Andrew Eikum : advapi: Fix return value for QueryServiceConfig2W.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: wine Branch: master Commit: 9c95bfcc30b9623e9ef9f721364bc8cca702ce90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c95bfcc30b9623e9ef9f721… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 3 13:57:58 2018 -0600 advapi: Fix return value for QueryServiceConfig2W. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 3f2fb93..ddd6a21 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1607,7 +1607,11 @@ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe switch (dwLevel) { case SERVICE_CONFIG_DESCRIPTION: - if (!(bufptr = heap_alloc( size ))) return ERROR_OUTOFMEMORY; + if (!(bufptr = heap_alloc( size ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } break; case SERVICE_CONFIG_PRESHUTDOWN_INFO:

1 0

Alex Henrie : msvcrt: Don' t include MSVC 14.0 console functions in SOs for older DLLs.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: wine Branch: master Commit: 160175a881d22516d4373cb26a8bfc8d6c200bae URL: https://source.winehq.org/git/wine.git/?a=commit;h=160175a881d22516d4373cb2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 01:07:41 2018 -0700 msvcrt: Don't include MSVC 14.0 console functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 39b4880..75e95eb 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -561,8 +561,10 @@ int WINAPIV _cwprintf(const MSVCRT_wchar_t* format, ...) return retval; } +#if _MSVCR_VER>=140 + /********************************************************************* - * __conio_common_vcprintf (MSVCRT.@) + * __conio_common_vcprintf (UCRTBASE.@) */ int CDECL MSVCRT__conio_common_vcprintf(unsigned __int64 options, const char* format, MSVCRT__locale_t locale, __ms_va_list valist) @@ -574,7 +576,7 @@ int CDECL MSVCRT__conio_common_vcprintf(unsigned __int64 options, const char* fo } /********************************************************************* - * __conio_common_vcwprintf (MSVCRT.@) + * __conio_common_vcwprintf (UCRTBASE.@) */ int CDECL MSVCRT__conio_common_vcwprintf(unsigned __int64 options, const MSVCRT_wchar_t* format, MSVCRT__locale_t locale, __ms_va_list valist) @@ -584,3 +586,5 @@ int CDECL MSVCRT__conio_common_vcwprintf(unsigned __int64 options, const MSVCRT_ return pf_printf_w(puts_clbk_console_w, NULL, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); } + +#endif /* _MSVCR_VER>=140 */

1 0

Alex Henrie : msvcrt: Fix _wcstod_l specfile entries.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: wine Branch: master Commit: c5fbeb5f0ea2f14ed1e912c7d103f1534f35d137 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5fbeb5f0ea2f14ed1e912c7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 01:07:40 2018 -0700 msvcrt: Fix _wcstod_l specfile entries. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index e055c21..bb9a677 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -50,7 +50,7 @@ @ cdecl _ultoa_s(long ptr long long) ucrtbase._ultoa_s @ cdecl _ultow(long ptr long) ucrtbase._ultow @ cdecl _ultow_s(long ptr long long) ucrtbase._ultow_s -@ cdecl _wcstod_l(wstr ptr) ucrtbase._wcstod_l +@ cdecl _wcstod_l(wstr ptr long) ucrtbase._wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) ucrtbase._wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) ucrtbase._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) ucrtbase._wcstoi64_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 685e11b..557ae59 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1511,7 +1511,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ae86678..7171067 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1869,7 +1869,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 969451f..2463b15 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1887,7 +1887,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 8c3d96e..c513f52 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1580,7 +1580,7 @@ @ cdecl _wcsrev(wstr) msvcr120._wcsrev @ cdecl _wcsset(wstr long) msvcr120._wcsset @ cdecl _wcsset_s(wstr long long) msvcr120._wcsset_s -@ cdecl _wcstod_l(wstr ptr) msvcr120._wcstod_l +@ cdecl _wcstod_l(wstr ptr long) msvcr120._wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) msvcr120._wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) msvcr120._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcr120._wcstoi64_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5aa93e5..73832c1 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1190,7 +1190,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4f67f14..d962479 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1166,7 +1166,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7878acb..b142a17 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2036,7 +2036,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l

1 0

Alex Henrie : vbscript/tests: Fix first-day-of-week test on mixed locales.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: wine Branch: master Commit: e04a1c4210d0cb6f927c2dcb2d9465e92a91f084 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e04a1c4210d0cb6f927c2dcb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 31 19:20:53 2017 -0700 vbscript/tests: Fix first-day-of-week test on mixed locales. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 7c97db2..ee811c6 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -219,8 +219,7 @@ static void detect_locale(void) PRIMARYLANGID(GetUserDefaultUILanguage()) == LANG_ENGLISH && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH); - GetLocaleInfoA(pGetThreadUILanguage ? pGetThreadUILanguage() : GetUserDefaultUILanguage(), - LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, + GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, (void*)&first_day_of_week, sizeof(first_day_of_week)); first_day_of_week = 1 + (first_day_of_week + 1) % 7; }

1 0

Andrey Gusev : user32/tests: Fix resource leak.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: wine Branch: master Commit: daa46639809a6ff677242f16a3a4b89ab7421557 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa46639809a6ff677242f16… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 3 17:36:03 2018 +0200 user32/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 030592b..e52f7d2 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2055,6 +2055,7 @@ static void test_Input_mouse(void) } SetEvent(thread_data.end_event); WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); ok(!got_button_down, "unexpected WM_RBUTTONDOWN message\n"); ok(!got_button_up, "unexpected WM_RBUTTONUP message\n");

1 0

Andrey Gusev : kernel32/tests: Fix resource leak.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: wine Branch: master Commit: 027e2add2eabc9807c51a9c901f647ff80ac237b URL: https://source.winehq.org/git/wine.git/?a=commit;h=027e2add2eabc9807c51a9c9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 3 17:35:17 2018 +0200 kernel32/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 5918a58..5fb19f0 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1653,6 +1653,7 @@ static WORD get_thread_fpu_cw(void) res = CloseHandle(ctx.finished); ok(!!res, "Failed to close event handle, last error %#x.\n", GetLastError()); + CloseHandle(thread); return ctx.cw; }

1 0

Andrey Gusev : winhttp/tests: Remove redundant comparison.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: wine Branch: master Commit: 4c8cb197087bdf5a5e28c7d4775bc30d3ab7655d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c8cb197087bdf5a5e28c7d4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 26 13:09:42 2017 +0200 winhttp/tests: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4fc9c2c..e06661c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -996,7 +996,7 @@ static void test_secure_connection(void) protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); err = GetLastError(); - ok(ret || (!ret && err == ERROR_INVALID_PARAMETER) /* < win7 */, "failed to set protocols %u\n", err); + ok(ret || err == ERROR_INVALID_PARAMETER /* < win7 */, "failed to set protocols %u\n", err); con = WinHttpConnect(ses, test_winehq, 443, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError());

1 0

Alistair Leslie-Hughes : oledb32: Coerce Variant to VT_DATE when converting data.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: wine Branch: master Commit: 4ee4d4e2ad242174f0a180d285b387364c80544a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ee4d4e2ad242174f0a180d2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 2 23:49:32 2018 +0000 oledb32: Coerce Variant to VT_DATE when converting data. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 8 ++++++-- dlls/oledb32/tests/convert.c | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 267de1b..22609ae 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -475,10 +475,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; case DBTYPE_VARIANT: - if( V_VT((VARIANT*)src) == VT_DATE) + { + VariantInit(&tmp); + + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_DATE)) == S_OK) { SYSTEMTIME st; - hr = (VariantTimeToSystemTime( V_DATE((VARIANT*)src), &st) ? S_OK : E_FAIL); + hr = (VariantTimeToSystemTime( V_DATE(&tmp), &st) ? S_OK : E_FAIL); d->year = st.wYear; d->month = st.wMonth; d->day = st.wDay; @@ -489,6 +492,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return E_NOTIMPL; } break; + } default: FIXME("Unimplemented conversion %04x -> DBDATE\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 1d55e7f..6b0dd55 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3357,6 +3357,25 @@ static void test_converttodbdate(void) ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + V_VT(&var) = VT_R8; + V_R8(&var) = 41408.086250; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBDATE, sizeof(var), &dst_len, &var, &dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBDATE, sizeof(var), &dst_len, &var, &dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + VariantClear(&var); + dst_len = 0; bstr = SysAllocString(strW); hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBDATE, 0, &dst_len, &bstr, &dst, 2, 0, &dst_status, 0, 0, 0);

1 0