wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Huw Davies : winspool: Move the unix job schedulers to cups.c.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 8ecd220c8e87cbe2d3f0659dcea93fb03297fcf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ecd220c8e87cbe2d3f0659d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 27 08:14:45 2021 +0100 winspool: Move the unix job schedulers to cups.c. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/cups.c | 269 ++++++++++++++++++++++++++++++++++- dlls/winspool.drv/info.c | 344 ++++----------------------------------------- dlls/winspool.drv/wspool.h | 9 ++ 3 files changed, 301 insertions(+), 321 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ecd220c8e87cbe2d3f0…

1 0

Alistair Leslie-Hughes : msdasql: Add IPersist interface support.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 097bde4691585c73d80f28568b75c66e1a74dc4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=097bde4691585c73d80f2856… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 27 17:17:54 2021 +1100 msdasql: Add IPersist interface support. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 50 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 27 +++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 58fc8e378e0..79feacb83aa 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -176,6 +176,7 @@ struct msdasql IDBProperties IDBProperties_iface; IDBInitialize IDBInitialize_iface; IDBCreateSession IDBCreateSession_iface; + IPersist IPersist_iface; LONG ref; }; @@ -200,6 +201,11 @@ static inline struct msdasql *impl_from_IDBCreateSession(IDBCreateSession *iface return CONTAINING_RECORD(iface, struct msdasql, IDBCreateSession_iface); } +static inline struct msdasql *impl_from_IPersist( IPersist *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql, IPersist_iface ); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -223,6 +229,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBCreateSession_iface; } + else if(IsEqualGUID(&IID_IPersist, riid)) + { + *out = &provider->IPersist_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -455,6 +465,45 @@ static const struct IDBCreateSessionVtbl dbsess_vtbl = dbsess_CreateSession }; +static HRESULT WINAPI persist_QueryInterface(IPersist *iface, REFIID riid, void **ppv) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); +} + +static ULONG WINAPI persist_AddRef(IPersist *iface) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI persist_Release(IPersist *iface) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI persist_GetClassID(IPersist *iface, CLSID *classid) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + + TRACE("(%p)->(%p)\n", provider, classid); + + if(!classid) + return E_INVALIDARG; + + *classid = CLSID_MSDASQL; + return S_OK; + +} + +static const IPersistVtbl persistVtbl = { + persist_QueryInterface, + persist_AddRef, + persist_Release, + persist_GetClassID +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -468,6 +517,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; provider->IDBCreateSession_iface.lpVtbl = &dbsess_vtbl; + provider->IPersist_iface.lpVtbl = &persistVtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 2e90d2f848d..4cab6a24daf 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -38,6 +38,32 @@ static char mdbpath[MAX_PATH]; static const VARTYPE intptr_vartype = (sizeof(void *) == 8 ? VT_I8 : VT_I4); +static void test_msdasql(void) +{ + HRESULT hr; + IUnknown *unk; + IPersist *persist; + CLSID classid; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + hr = IUnknown_QueryInterface(unk, &IID_IPersist, (void**)&persist); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IPersist_GetClassID(persist, &classid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&classid, &CLSID_MSDASQL), "got %s\n", debugstr_guid(&classid)); + + IPersist_Release(persist); + + IUnknown_Release(unk); +} + static void test_Properties(void) { HRESULT hr; @@ -275,6 +301,7 @@ START_TEST(provider) setup_database(); + test_msdasql(); test_Properties(); test_sessions();

1 0

Alistair Leslie-Hughes : msdasql: Implement IDBCreateSession CreateSession.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 00b0c5779851cc08d29072c8ecce31d0dd12165c URL: https://source.winehq.org/git/wine.git/?a=commit;h=00b0c5779851cc08d29072c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 27 17:17:53 2021 +1100 msdasql: Implement IDBCreateSession CreateSession. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/Makefile.in | 3 +- dlls/msdasql/msdasql_main.c | 12 ++++- dlls/msdasql/msdasql_private.h | 19 +++++++ dlls/msdasql/session.c | 114 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 04d9cb29f2a..ee8fa672623 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -4,7 +4,8 @@ IMPORTS = uuid ole32 oleaut32 EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ - msdasql_main.c + msdasql_main.c \ + session.c RC_SRCS = msdasql.rc diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 0a9421df12a..58fc8e378e0 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -30,6 +30,8 @@ #include "initguid.h" #include "msdasql.h" +#include "msdasql_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(msdasql); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); @@ -433,10 +435,16 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou IUnknown **session) { struct msdasql *provider = impl_from_IDBCreateSession(iface); + HRESULT hr; - FIXME("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); + TRACE("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); - return E_FAIL; + if (outer) + FIXME("outer currently not supported.\n"); + + hr = create_db_session(riid, (void**)session); + + return hr; } static const struct IDBCreateSessionVtbl dbsess_vtbl = diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h new file mode 100644 index 00000000000..a3d73498fe9 --- /dev/null +++ b/dlls/msdasql/msdasql_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 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 + */ + +HRESULT create_db_session(REFIID riid, void **unk) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c new file mode 100644 index 00000000000..57174be40f8 --- /dev/null +++ b/dlls/msdasql/session.c @@ -0,0 +1,114 @@ +/* + * Copyright 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "msdasc.h" +#include "wine/heap.h" +#include "wine/debug.h" + +#include "msdasql.h" + +#include "msdasql_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdasql); + +struct msdasql_session +{ + IUnknown session_iface; + LONG refs; +}; + +static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, session_iface ); +} + +static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), ppv ); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) + { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = &session->session_iface; + } + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI session_AddRef(IUnknown *iface) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + LONG refs = InterlockedIncrement( &session->refs ); + TRACE( "%p new refcount %d\n", session, refs ); + return refs; +} + +static ULONG WINAPI session_Release(IUnknown *iface) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + LONG refs = InterlockedDecrement( &session->refs ); + TRACE( "%p new refcount %d\n", session, refs ); + if (!refs) + { + TRACE( "destroying %p\n", session ); + heap_free( session ); + } + return refs; +} + +static const IUnknownVtbl unkfactoryVtbl = +{ + session_QueryInterface, + session_AddRef, + session_Release, +}; + +HRESULT create_db_session(REFIID riid, void **unk) +{ + struct msdasql_session *session; + HRESULT hr; + + session = heap_alloc(sizeof(*session)); + if (!session) + return E_OUTOFMEMORY; + + session->session_iface.lpVtbl = &unkfactoryVtbl; + session->refs = 1; + + hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); + IUnknown_Release(&session->session_iface); + return hr; +}

1 0

Alistair Leslie-Hughes : msdasql: Add IDBCreateSession support.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: c135984172d223ff844c1ff6f2e4f7285f92df33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c135984172d223ff844c1ff6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 27 17:17:52 2021 +1100 msdasql: Add IDBCreateSession support. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 7e78caa8f24..0a9421df12a 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -173,6 +173,7 @@ struct msdasql IUnknown MSDASQL_iface; IDBProperties IDBProperties_iface; IDBInitialize IDBInitialize_iface; + IDBCreateSession IDBCreateSession_iface; LONG ref; }; @@ -192,6 +193,11 @@ static inline struct msdasql *impl_from_IDBInitialize(IDBInitialize *iface) return CONTAINING_RECORD(iface, struct msdasql, IDBInitialize_iface); } +static inline struct msdasql *impl_from_IDBCreateSession(IDBCreateSession *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBCreateSession_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -211,6 +217,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBInitialize_iface; } + else if (IsEqualGUID(riid, &IID_IDBCreateSession)) + { + *out = &provider->IDBCreateSession_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -398,6 +408,45 @@ static const struct IDBInitializeVtbl dbinit_vtbl = dbinit_Uninitialize }; +static HRESULT WINAPI dbsess_QueryInterface(IDBCreateSession *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbsess_AddRef(IDBCreateSession *iface) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbsess_Release(IDBCreateSession *iface) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *outer, REFIID riid, + IUnknown **session) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + FIXME("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); + + return E_FAIL; +} + +static const struct IDBCreateSessionVtbl dbsess_vtbl = +{ + dbsess_QueryInterface, + dbsess_AddRef, + dbsess_Release, + dbsess_CreateSession +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -410,6 +459,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; + provider->IDBCreateSession_iface.lpVtbl = &dbsess_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv);

1 0

Alistair Leslie-Hughes : msdasql: Implement IDBProperties GetPropertyInfo.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 5bd1de641e5a1cbbd81c80f98a97c0abd0a5ac22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bd1de641e5a1cbbd81c80f9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 27 17:17:51 2021 +1100 msdasql: Implement IDBProperties GetPropertyInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/Makefile.in | 2 +- dlls/msdasql/msdasql_main.c | 104 +++++++++++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 11 ++++- dlls/oledb32/tests/database.c | 8 ++-- 4 files changed, 118 insertions(+), 7 deletions(-) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 8c99c8ea6f0..04d9cb29f2a 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -1,5 +1,5 @@ MODULE = msdasql.dll -IMPORTS = uuid +IMPORTS = uuid ole32 oleaut32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 00dbcec6780..7e78caa8f24 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -100,6 +102,72 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) return CLASS_E_CLASSNOTAVAILABLE; } +struct dbproperty +{ + const WCHAR *name; + DBPROPID id; + DBPROPOPTIONS options; + VARTYPE type; + HRESULT (*convert_dbproperty)(const WCHAR *src, VARIANT *dest); +}; + +struct mode_propval +{ + const WCHAR *name; + DWORD value; +}; + +static int __cdecl dbmodeprop_compare(const void *a, const void *b) +{ + const WCHAR *src = a; + const struct mode_propval *propval = b; + return wcsicmp(src, propval->name); +} + +static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) +{ + struct mode_propval mode_propvals[] = + { + { L"Read", DB_MODE_READ }, + { L"ReadWrite", DB_MODE_READWRITE }, + { L"Share Deny None", DB_MODE_SHARE_DENY_NONE }, + { L"Share Deny Read", DB_MODE_SHARE_DENY_READ }, + { L"Share Deny Write", DB_MODE_SHARE_DENY_WRITE }, + { L"Share Exclusive", DB_MODE_SHARE_EXCLUSIVE }, + { L"Write", DB_MODE_WRITE }, + }; + struct mode_propval *prop; + + if ((prop = bsearch(src, mode_propvals, ARRAY_SIZE(mode_propvals), + sizeof(struct mode_propval), dbmodeprop_compare))) + { + V_VT(dest) = VT_I4; + V_I4(dest) = prop->value; + TRACE("%s = %#x\n", debugstr_w(src), prop->value); + return S_OK; + } + + return E_FAIL; +} + +static const struct dbproperty dbproperties[] = +{ + { L"Password", DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Persist Security Info", DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { L"User ID", DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Data Source", DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { L"Window Handle", DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, sizeof(void *) == 8 ? VT_I8 : VT_I4 }, + { L"Location", DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Mode", DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4, convert_dbproperty_mode }, + { L"Prompt", DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, + { L"Connect Timeout", DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Extended Properties", DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { L"Locale Identifier", DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Initial Catalog", DBPROP_INIT_CATALOG, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"OLE DB Services", DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"General Timeout", DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, +}; + struct msdasql { IUnknown MSDASQL_iface; @@ -222,11 +290,43 @@ static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPrope DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i; + DBPROPINFOSET *infoset; + int size = 1; + OLECHAR *ptr; - FIXME("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + TRACE("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, prgPropertyInfoSets, ppDescBuffer); - return E_NOTIMPL; + infoset = CoTaskMemAlloc(sizeof(DBPROPINFOSET)); + memcpy(&infoset->guidPropertySet, &DBPROPSET_DBINIT, sizeof(GUID)); + infoset->cPropertyInfos = ARRAY_SIZE(dbproperties); + infoset->rgPropertyInfos = CoTaskMemAlloc(sizeof(DBPROPINFO) * ARRAY_SIZE(dbproperties)); + + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + size += lstrlenW(dbproperties[i].name) + 1; + } + + ptr = *ppDescBuffer = CoTaskMemAlloc(size * sizeof(WCHAR)); + memset(*ppDescBuffer, 0, size * sizeof(WCHAR)); + + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + lstrcpyW(ptr, dbproperties[i].name); + infoset->rgPropertyInfos[i].pwszDescription = ptr; + infoset->rgPropertyInfos[i].dwPropertyID = dbproperties[i].id; + infoset->rgPropertyInfos[i].dwFlags = DBPROPFLAGS_DBINIT | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE; + infoset->rgPropertyInfos[i].vtType = dbproperties[i].type; + V_VT(&infoset->rgPropertyInfos[i].vValues) = VT_EMPTY; + + ptr += lstrlenW(dbproperties[i].name) + 1; + } + + *pcPropertyInfoSets = 1; + *prgPropertyInfoSets = infoset; + + return S_OK; } static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets, diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 96d33f6bd10..2e90d2f848d 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -22,6 +22,7 @@ #include "msdasc.h" #include "oledb.h" #include "odbcinst.h" +#include "wtypes.h" #include "initguid.h" @@ -30,10 +31,13 @@ #include "wine/test.h" DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); static BOOL db_created; static char mdbpath[MAX_PATH]; +static const VARTYPE intptr_vartype = (sizeof(void *) == 8 ? VT_I8 : VT_I4); + static void test_Properties(void) { HRESULT hr; @@ -52,16 +56,21 @@ static void test_Properties(void) infocount = 0; hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ULONG i; + VARTYPE types[14] = { VT_BSTR, VT_BOOL, VT_BSTR, VT_BSTR, intptr_vartype, VT_BSTR, VT_I4, VT_I2 , VT_I4, VT_BSTR, VT_I4, VT_BSTR, VT_I4, VT_I4 }; + ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", debugstr_guid(&propinfoset->guidPropertySet)); ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); for (i = 0; i < propinfoset->cPropertyInfos; i++) { trace("%d: pwszDescription: %s\n", i, debugstr_w(propinfoset->rgPropertyInfos[i].pwszDescription) ); + ok(propinfoset->rgPropertyInfos[i].vtType == types[i], "got %d\n", propinfoset->rgPropertyInfos[i].vtType); + ok(propinfoset->rgPropertyInfos[i].dwFlags == (DBPROPFLAGS_DBINIT | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE), + "got %d\n", propinfoset->rgPropertyInfos[i].dwFlags); } for (i = 0; i < propinfoset->cPropertyInfos; i++) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 3baa91b87a4..775da0f7b61 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -82,7 +82,7 @@ static void test_GetDataSource(WCHAR *initstring) EXPECT_REF(dbinit, 2); EXPECT_REF(props, 2); hr = IDBProperties_GetPropertyInfo(props, 0, NULL, &cnt, &pInfoset, &ary); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); if(hr == S_OK) { ULONG i; @@ -1006,7 +1006,7 @@ static void test_odbc_provider(void) infocount = 0; hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ULONG i; @@ -1039,7 +1039,8 @@ static void test_odbc_provider(void) CoTaskMemFree(propinfoset); hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); - ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { /* Remove if, once _GetProperties is implemented */ ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); for (i = 0; i < propidlist.cPropertyIDs; i++) @@ -1049,6 +1050,7 @@ static void test_odbc_provider(void) propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; } + } CoTaskMemFree(propidlist.rgPropertyIDs); CoTaskMemFree(propset);

1 0

Alistair Leslie-Hughes : msdasql/tests: Remove DSN on cleanup.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 157466da4209f73fc5dc6a6a75fdde84e5c2de74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=157466da4209f73fc5dc6a6a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 27 17:17:50 2021 +1100 msdasql/tests: Remove DSN on cleanup. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/tests/provider.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 951ab2a7387..96d33f6bd10 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -241,9 +241,22 @@ static void setup_database(void) static void cleanup_database(void) { + BOOL ret; + if (winetest_interactive) return; + ret = SQLConfigDataSource(NULL, ODBC_REMOVE_DSN, "Microsoft Access Driver (*.mdb)", "DSN=wine_test\0\0"); + if (!ret) + { + DWORD code; + char buffer[1024]; + WORD size; + + SQLInstallerError(1, &code, buffer, sizeof(buffer), &size); + trace("code %d, buffer %s, size %d\n", code, debugstr_a(buffer), size); + } + DeleteFileA(mdbpath); }

1 0

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 7267a2294cc8e069b39815ecb42dec239a9f8817 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7267a2294cc8e069b39815ec… Author: Chilung Chan <eason066(a)gmail.com> Date: Wed Oct 27 12:10:37 2021 +0800 po: Update Traditional Chinese translation. Signed-off-by: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_TW.po | 1288 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 603 insertions(+), 685 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7267a2294cc8e069b398…

1 0

Zebediah Figura : winegstreamer: Implement IWMSyncReader::GetStreamNumberForOutput().
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: d5154e7eea70a19fe528f0de6ebac0186651e0f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5154e7eea70a19fe528f0de… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 26 22:22:08 2021 -0500 winegstreamer: Implement IWMSyncReader::GetStreamNumberForOutput(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_syncreader.c | 10 +++++++--- dlls/wmvcore/tests/wmvcore.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index da18b4c9a2f..cb2e61a25bc 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -145,10 +145,14 @@ static HRESULT WINAPI WMSyncReader_GetReadStreamSamples(IWMSyncReader2 *iface, W return E_NOTIMPL; } -static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader2 *iface, DWORD output, WORD *stream_num) +static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader2 *iface, + DWORD output, WORD *stream_number) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %p): stub!\n", This, output, stream_num); + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, output %u, stream_number %p.\n", reader, output, stream_number); + + *stream_number = output + 1; return S_OK; } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 51fa3ae3b1b..385cda74aba 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -721,7 +721,7 @@ static void test_sync_reader_types(void) stream_number2 = 0xdead; hr = IWMSyncReader_GetStreamNumberForOutput(reader, output_number, &stream_number2); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(stream_number2 == stream_number, "Expected stream number %u, got %u.\n", stream_number, stream_number2); + ok(stream_number2 == stream_number, "Expected stream number %u, got %u.\n", stream_number, stream_number2); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : winegstreamer: Implement IWMSyncReader::GetOutputNumberForStream().
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: d39747f450ad4356868f46cfda9a870347cce9dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d39747f450ad4356868f46cf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 26 22:22:07 2021 -0500 winegstreamer: Implement IWMSyncReader::GetOutputNumberForStream(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_syncreader.c | 12 ++++++++---- dlls/wmvcore/tests/wmvcore.c | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 32b668f68c6..da18b4c9a2f 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -112,11 +112,15 @@ static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader2 *iface, D return E_NOTIMPL; } -static HRESULT WINAPI WMSyncReader_GetOutputNumberForStream(IWMSyncReader2 *iface, WORD stream_num, DWORD *output_num) +static HRESULT WINAPI WMSyncReader_GetOutputNumberForStream(IWMSyncReader2 *iface, + WORD stream_number, DWORD *output) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %p): stub!\n", This, stream_num, output_num); - return E_NOTIMPL; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, stream_number %u, output %p.\n", reader, stream_number, output); + + *output = stream_number - 1; + return S_OK; } static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps **output) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 247b03564f1..51fa3ae3b1b 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -715,7 +715,7 @@ static void test_sync_reader_types(void) output_number = 0xdeadbeef; hr = IWMSyncReader_GetOutputNumberForStream(reader, stream_number, &output_number); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); todo_wine ok(output_number == 1 - i, "Got output number %u.\n", output_number); stream_number2 = 0xdead;

1 0

Zebediah Figura : winegstreamer: Implement IWMStreamConfig::GetStreamNumber().
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 250f86b02389b2148471ad67bcc0775ff3b2c6ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=250f86b02389b2148471ad67… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 26 22:22:06 2021 -0500 winegstreamer: Implement IWMStreamConfig::GetStreamNumber(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_reader.c | 9 +++++++-- dlls/wmvcore/tests/wmvcore.c | 10 +++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 063f01e5524..8b5183a95ee 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -117,6 +117,7 @@ struct wm_stream { struct wm_reader *reader; struct wg_parser_stream *wg_stream; + WORD index; }; struct wm_reader diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index f649a5cc518..682f9a2ae50 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -86,8 +86,12 @@ static HRESULT WINAPI stream_config_GetStreamType(IWMStreamConfig *iface, GUID * static HRESULT WINAPI stream_config_GetStreamNumber(IWMStreamConfig *iface, WORD *number) { - FIXME("iface %p, number %p, stub!\n", iface, number); - return E_NOTIMPL; + struct stream_config *config = impl_from_IWMStreamConfig(iface); + + TRACE("config %p, number %p.\n", config, number); + + *number = config->stream->index + 1; + return S_OK; } static HRESULT WINAPI stream_config_SetStreamNumber(IWMStreamConfig *iface, WORD number) @@ -1042,6 +1046,7 @@ HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream) stream->wg_stream = wg_parser_get_stream(reader->wg_parser, i); stream->reader = reader; + stream->index = i; } LeaveCriticalSection(&reader->cs); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 8bd477dba65..247b03564f1 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -479,8 +479,8 @@ static void test_sync_reader_streaming(void) stream_numbers[i] = 0xdead; hr = IWMStreamConfig_GetStreamNumber(config, &stream_numbers[i]); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(stream_numbers[i] == i + 1, "Got stream number %u.\n", stream_numbers[i]); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream_numbers[i] == i + 1, "Got stream number %u.\n", stream_numbers[i]); ref = IWMStreamConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -700,8 +700,8 @@ static void test_sync_reader_types(void) stream_number = 0xdead; hr = IWMStreamConfig_GetStreamNumber(config, &stream_number); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(stream_number == i + 1, "Got stream number %u.\n", stream_number); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream_number == i + 1, "Got stream number %u.\n", stream_number); hr = IWMStreamConfig_GetStreamType(config, &majortype); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -721,7 +721,7 @@ static void test_sync_reader_types(void) stream_number2 = 0xdead; hr = IWMSyncReader_GetStreamNumberForOutput(reader, output_number, &stream_number2); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream_number2 == stream_number, "Expected stream number %u, got %u.\n", stream_number, stream_number2); + todo_wine ok(stream_number2 == stream_number, "Expected stream number %u, got %u.\n", stream_number, stream_number2); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021