March 2020 - Wine-commits - list.winehq.org

Francois Gouget : shell32/tests: Fix some wording issues in shlexec comments.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 1ac9bf9e45beccbfa8ca3ce7a081aa5ef82f969e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ac9bf9e45beccbfa8ca3ce7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 15 14:30:32 2020 +0100 shell32/tests: Fix some wording issues in shlexec comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 030ab54525..0bc7eab0cd 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1105,12 +1105,12 @@ static void test_lpFile_parsed(void) return; } - /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on Wine */ sprintf(fileA, "%s\\drawback_file.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc); - /* if quoted, existing "drawback_file.noassoc" not prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + /* if quoted, existing "drawback_file.noassoc" does not prevent finding "drawback_file.noassoc foo.shlexec" on Wine */ sprintf(fileA, "\"%s\\drawback_file.noassoc foo.shlexec\"", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, @@ -1127,7 +1127,7 @@ static void test_lpFile_parsed(void) todo_wine okShell(rc > 32 || broken(rc == SE_ERR_FNF) /* Win9x/2000 */, "failed: rc=%lu\n", rc); - /* nonexisting "drawback_nonexist.noassoc" not prevents finding "drawback_nonexist.noassoc foo.shlexec" on wine */ + /* nonexistent "drawback_nonexist.noassoc" does not prevent finding "drawback_nonexist.noassoc foo.shlexec" on Wine */ sprintf(fileA, "%s\\drawback_nonexist.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc);

1 0

Zebediah Figura : winegstreamer: Also use GST_QOS_TYPE_OVERFLOW for samples that arrive on time.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 38c50751fe0a5ca104ca17728a3db95d95900243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c50751fe0a5ca104ca1772… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 21:28:25 2020 -0500 winegstreamer: Also use GST_QOS_TYPE_OVERFLOW for samples that arrive on time. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9d7f85b82d..2e3fbd2925 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1964,6 +1964,7 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { struct gstdemux_source *pin = impl_from_IQualityControl(iface); + GstQOSType type = GST_QOS_TYPE_OVERFLOW; GstEvent *evt; TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, @@ -1976,8 +1977,13 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil if (qm.Type == Flood) qm.Late = 0; - evt = gst_event_new_qos(qm.Type == Famine ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - qm.Proportion / 1000., qm.Late * 100, qm.TimeStamp * 100); + /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but + * DirectShow filters might use Famine, so check that there actually is an + * underrun. */ + if (qm.Type == Famine && qm.Proportion > 1000) + type = GST_QOS_TYPE_UNDERFLOW; + + evt = gst_event_new_qos(type, qm.Proportion / 1000.0, qm.Late * 100, qm.TimeStamp * 100); if (!evt) { WARN("Failed to create QOS event\n");

1 0

Zebediah Figura : winegstreamer: Clamp both timestamp and timestamp + diff to 0.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 5ca1d28e8df7e3e87e5b9f3ff51445b07dfcc2fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ca1d28e8df7e3e87e5b9f3f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 21:28:26 2020 -0500 winegstreamer: Clamp both timestamp and timestamp + diff to 0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2e3fbd2925..d2f5072235 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1965,6 +1965,8 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil { struct gstdemux_source *pin = impl_from_IQualityControl(iface); GstQOSType type = GST_QOS_TYPE_OVERFLOW; + GstClockTime timestamp; + GstClockTimeDiff diff; GstEvent *evt; TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, @@ -1974,16 +1976,23 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil mark_wine_thread(); - if (qm.Type == Flood) - qm.Late = 0; - /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but * DirectShow filters might use Famine, so check that there actually is an * underrun. */ if (qm.Type == Famine && qm.Proportion > 1000) type = GST_QOS_TYPE_UNDERFLOW; - evt = gst_event_new_qos(type, qm.Proportion / 1000.0, qm.Late * 100, qm.TimeStamp * 100); + /* DirectShow filters sometimes pass negative timestamps (Audiosurf uses the + * current time instead of the time of the last buffer). GstClockTime is + * unsigned, so clamp it to 0. */ + timestamp = max(qm.TimeStamp * 100, 0); + + /* The documentation specifies that timestamp + diff must be nonnegative. */ + diff = qm.Late * 100; + if (timestamp < -diff) + diff = -timestamp; + + evt = gst_event_new_qos(type, qm.Proportion / 1000.0, diff, timestamp); if (!evt) { WARN("Failed to create QOS event\n");

1 0

Dmitry Timoshkov : wldap32/tests: Add ldap_bind_s test.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 56c1590dfe6f8202c5fdb8c338b258a4ab74530e URL: https://source.winehq.org/git/wine.git/?a=commit;h=56c1590dfe6f8202c5fdb8c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 10 15:41:41 2020 +0800 wldap32/tests: Add ldap_bind_s test. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/tests/parse.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index c4c97e1157..d96ae654bf 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -2,6 +2,7 @@ * test parsing functions * * Copyright 2008 Hans Leidekker for CodeWeavers + * Copyright 2020 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,10 @@ #include "wine/test.h" +#ifndef LDAP_AUTH_SIMPLE +#define LDAP_AUTH_SIMPLE 0x80 +#endif + static void test_ldap_parse_sort_control( LDAP *ld ) { ULONG ret, result; @@ -132,10 +137,39 @@ static void test_ldap_get_optionW( LDAP *ld ) ok( version == LDAP_VERSION3, "got %u\n", version ); } +static void test_ldap_bind_sA( void ) +{ + LDAP *ld; + ULONG ret; + int version; + + ld = ldap_initA( (char *)"ldap.forumsys.com", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + + version = LDAP_VERSION3; + ret = ldap_set_optionW( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) + { + skip( "test server can't be reached\n" ); + ldap_unbind( ld ); + return; + } + + ret = ldap_connect( ld, NULL ); + ok( !ret, "ldap_connect failed 0x%08x\n", ret ); + + ret = ldap_bind_sA( ld, (char *)"CN=read-only-admin,DC=example,DC=com", (char *)"password", LDAP_AUTH_SIMPLE ); + ok( !ret, "ldap_bind_s failed 0x%08x\n", ret ); + + ldap_unbind( ld ); +} + START_TEST (parse) { LDAP *ld; + test_ldap_bind_sA(); + ld = ldap_initA((char *)"ldap.itd.umich.edu", 389 ); ok( ld != NULL, "ldap_init failed\n" );

1 0

Serge Gautherie : rpcrt4/tests: Remove now useless forced 0x0500 API versions.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 57f08ba5259e56ae681bab1e61f86d6e8ab96f37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57f08ba5259e56ae681bab1e… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Mar 14 18:06:14 2020 +0100 rpcrt4/tests: Remove now useless forced 0x0500 API versions. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index e4a4c6a727..b206c37b23 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0500 -#define NTDDI_WIN2K 0x05000000 -#define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ #define COBJMACROS #include <stdarg.h>

1 0

Serge Gautherie : shell32/tests: Remove now useless forced 0x0501 API versions.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 8fc0b7d525ae5e85b5a796eaf6572d22591e02c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fc0b7d525ae5e85b5a796ea… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Mar 14 18:06:33 2020 +0100 shell32/tests: Remove now useless forced 0x0501 API versions. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0bc7eab0cd..eec1a63d38 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -30,11 +30,6 @@ * we could check */ -/* Needed to get SEE_MASK_NOZONECHECKS with the PSDK */ -#define NTDDI_WINXPSP1 0x05010100 -#define NTDDI_VERSION NTDDI_WINXPSP1 -#define _WIN32_WINNT 0x0501 - #include <stdio.h> #include <assert.h>

1 0

Serge Gautherie : include: Remove comment about now old NTDDI_VERSION.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: a48211a2b79d58f756c9220cb935bfec0a8a8e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a48211a2b79d58f756c9220c… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Mar 14 18:06:51 2020 +0100 include: Remove comment about now old NTDDI_VERSION. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mssip.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/mssip.h b/include/mssip.h index c14f02de5f..ee225f1cbe 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -157,7 +157,6 @@ typedef struct SIP_ADD_NEWPROVIDER_ WCHAR *pwszIsFunctionNameFmt2; - /* NTDDI_VERSION >= NTDDI_WIN8 */ WCHAR *pwszGetCapFuncName; } SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER; #include <poppack.h>

1 0

Serge Gautherie : psapi/tests: NtQueryVirtualMemory() 3rd parameter is MEMORY_INFORMATION_CLASS, not ULONG.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: fbda6efe95064114aaeb92df97f4e2a293598bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbda6efe95064114aaeb92df… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sun Mar 15 01:45:10 2020 +0100 psapi/tests: NtQueryVirtualMemory() 3rd parameter is MEMORY_INFORMATION_CLASS, not ULONG. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 0df247e9bf..0ea1b1f6f1 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -39,7 +39,7 @@ #include "wine/test.h" static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); -static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); +static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, MEMORY_INFORMATION_CLASS, PVOID, SIZE_T, SIZE_T *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *);

1 0

Alistair Leslie-Hughes : include: Add msdasql.h.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 65a15589d56d73001eed2e3520febafef61d801b URL: https://source.winehq.org/git/wine.git/?a=commit;h=65a15589d56d73001eed2e35… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 15 06:26:34 2020 +0000 include: Add msdasql.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msdasql.h | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index adcd173a14..a3b8774dc0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -407,6 +407,7 @@ SOURCES = \ msdadc.idl \ msdaguid.h \ msdasc.idl \ + msdasql.h \ mshtmcid.h \ mshtmdid.h \ mshtmhst.idl \ diff --git a/include/msdasql.h b/include/msdasql.h new file mode 100644 index 0000000000..8093420a40 --- /dev/null +++ b/include/msdasql.h @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _MSDASQL_H_ +#define _MSDASQL_H_ + +DEFINE_GUID(IID_ISQLRequestDiagFields, 0x228972f0, 0xb5ff, 0x11d0, 0x8a, 0x80, 0x00, 0xc0, 0x4f, 0xd6, 0x11, 0xcd); +DEFINE_GUID(IID_ISQLGetDiagField, 0x228972f1, 0xb5ff, 0x11d0, 0x8a, 0x80, 0x00, 0xc0, 0x4f, 0xd6, 0x11, 0xcd); + +DEFINE_GUID(IID_IRowsetChangeExtInfo, 0x0c733a8f, 0x2a1c, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_GUID(CLSID_MSDASQL, 0xc8b522cb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(CLSID_MSDASQL_ENUMERATOR, 0xc8b522cd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_GUID(DBPROPSET_PROVIDERDATASOURCEINFO, 0x497c60e0, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERROWSET, 0x497c60e1, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERDBINIT, 0x497c60e2, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERSTMTATTR, 0x497c60e3, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERCONNATTR, 0x497c60e4, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); + +#define KAGPROP_QUERYBASEDUPDATES 2 +#define KAGPROP_MARSHALLABLE 3 +#define KAGPROP_POSITIONONNEWROW 4 +#define KAGPROP_IRowsetChangeExtInfo 5 +#define KAGPROP_CURSOR 6 +#define KAGPROP_CONCURRENCY 7 +#define KAGPROP_BLOBSONFOCURSOR 8 +#define KAGPROP_INCLUDENONEXACT 9 +#define KAGPROP_FORCESSFIREHOSEMODE 10 +#define KAGPROP_FORCENOPARAMETERREBIND 11 +#define KAGPROP_FORCENOPREPARE 12 +#define KAGPROP_FORCENOREEXECUTE 13 + +#define KAGPROP_ACCESSIBLEPROCEDURES 2 +#define KAGPROP_ACCESSIBLETABLES 3 +#define KAGPROP_ODBCSQLOPTIEF 4 +#define KAGPROP_OJCAPABILITY 5 +#define KAGPROP_PROCEDURES 6 +#define KAGPROP_DRIVERNAME 7 +#define KAGPROP_DRIVERVER 8 +#define KAGPROP_DRIVERODBCVER 9 +#define KAGPROP_LIKEESCAPECLAUSE 10 +#define KAGPROP_SPECIALCHARACTERS 11 +#define KAGPROP_MAXCOLUMNSINGROUPBY 12 +#define KAGPROP_MAXCOLUMNSININDEX 13 +#define KAGPROP_MAXCOLUMNSINORDERBY 14 +#define KAGPROP_MAXCOLUMNSINSELECT 15 +#define KAGPROP_MAXCOLUMNSINTABLE 16 +#define KAGPROP_NUMERICFUNCTIONS 17 +#define KAGPROP_ODBCSQLCONFORMANCE 18 +#define KAGPROP_OUTERJOINS 19 +#define KAGPROP_STRINGFUNCTIONS 20 +#define KAGPROP_SYSTEMFUNCTIONS 21 +#define KAGPROP_TIMEDATEFUNCTIONS 22 +#define KAGPROP_FILEUSAGE 23 +#define KAGPROP_ACTIVESTATEMENTS 24 + +#define KAGPROP_AUTH_TRUSTEDCONNECTION 2 +#define KAGPROP_AUTH_SERVERINTEGRATED 3 + +#define KAGPROPVAL_CONCUR_ROWVER 0x00000001 +#define KAGPROPVAL_CONCUR_VALUES 0x00000002 +#define KAGPROPVAL_CONCUR_LOCK 0x00000004 +#define KAGPROPVAL_CONCUR_READ_ONLY 0x00000008 + +#endif

1 0

Alistair Leslie-Hughes : oledb32/tests: Add ODBC provider tests.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 639e97388b38691f9af7a4d33b81c3cfe8615cde URL: https://source.winehq.org/git/wine.git/?a=commit;h=639e97388b38691f9af7a4d3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 15 06:26:36 2020 +0000 oledb32/tests: Add ODBC provider tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/database.c | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 83a4767b90..d9811043a8 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -32,6 +32,7 @@ #include "initguid.h" #include "oledb.h" #include "oledberr.h" +#include "msdasql.h" #include "wine/test.h" @@ -967,6 +968,87 @@ static void test_dslocator(void) } } +static void test_odbc_provider(void) +{ + HRESULT hr; + IDBProperties *props; + DBPROPIDSET propidset; + ULONG infocount; + DBPROPINFOSET *propinfoset; + WCHAR *desc; + DBPROPID properties[14] = + { + DBPROP_AUTH_PASSWORD, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, + DBPROP_INIT_DATASOURCE, DBPROP_INIT_HWND, DBPROP_INIT_LOCATION, + DBPROP_INIT_MODE, DBPROP_INIT_PROMPT, DBPROP_INIT_TIMEOUT, + DBPROP_INIT_PROVIDERSTRING, DBPROP_INIT_LCID, DBPROP_INIT_CATALOG, + DBPROP_INIT_OLEDBSERVICES, DBPROP_INIT_GENERALTIMEOUT + }; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); + todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + propidset.rgPropertyIDs = NULL; + propidset.cPropertyIDs = 0; + propidset.guidPropertySet = DBPROPSET_DBINITALL; + + infocount = 0; + hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + ULONG i; + DBPROPIDSET propidlist; + ULONG propcnt; + DBPROPSET *propset; + + ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", + debugstr_guid(&propinfoset->guidPropertySet)); + ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); + + propidlist.guidPropertySet = DBPROPSET_DBINIT; + propidlist.cPropertyIDs = propinfoset->cPropertyInfos; + propidlist.rgPropertyIDs = CoTaskMemAlloc(propinfoset->cPropertyInfos * sizeof(DBPROP)); + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + { + ok(properties[i] == propinfoset->rgPropertyInfos[i].dwPropertyID, "%d, got %d\n", i, + propinfoset->rgPropertyInfos[i].dwPropertyID); + ok(propinfoset->rgPropertyInfos[i].vtType != VT_EMPTY, "%d, got %d\n", i, + propinfoset->rgPropertyInfos[i].vtType); + + propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; + } + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + VariantClear(&propinfoset->rgPropertyInfos[i].vValues); + + CoTaskMemFree(propinfoset->rgPropertyInfos); + CoTaskMemFree(propinfoset); + + hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); + + for (i = 0; i < propidlist.cPropertyIDs; i++) + { + ok(properties[i] == propidlist.rgPropertyIDs[i], "%d, got %d\n", i, + propidlist.rgPropertyIDs[i]); + + propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; + } + + CoTaskMemFree(propidlist.rgPropertyIDs); + CoTaskMemFree(propset); + } + + IDBProperties_Release(props); +} + START_TEST(database) { OleInitialize(NULL); @@ -975,6 +1057,7 @@ START_TEST(database) test_errorinfo(); test_initializationstring(); test_dslocator(); + test_odbc_provider(); /* row position */ test_rowposition();

1 0