July 2024 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Allow external properties to have arbitrary names.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 321526713442f94afab1a9d72f47b69ab106cdf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/321526713442f94afab1a9d72f47b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 8 11:54:59 2024 +0200 mshtml: Allow external properties to have arbitrary names. --- dlls/jscript/dispex.c | 20 ++++++++++++++------ dlls/jscript/engine.c | 2 +- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsdisp.idl | 2 ++ dlls/jscript/string.c | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 895e72e041d..911b3ab1d73 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -276,12 +276,13 @@ static HRESULT find_external_prop(jsdisp_t *This, const WCHAR *name, BOOL case_i struct property_info desc; HRESULT hres; - hres = This->builtin_info->lookup_prop(This, name, &desc); + hres = This->builtin_info->lookup_prop(This, name, + case_insens ? fdexNameCaseInsensitive : fdexNameCaseSensitive, &desc); if(hres != DISP_E_UNKNOWNNAME) { if(FAILED(hres)) return hres; - prop = alloc_prop(This, name, PROP_EXTERN, desc.flags); + prop = alloc_prop(This, desc.name ? desc.name : name, PROP_EXTERN, desc.flags); if(!prop) return E_OUTOFMEMORY; @@ -424,6 +425,8 @@ HRESULT jsdisp_index_lookup(jsdisp_t *obj, const WCHAR *name, unsigned length, s desc->flags = PROPF_ENUMERABLE; if(obj->builtin_info->prop_put) desc->flags |= PROPF_WRITABLE; + desc->name = NULL; + desc->index = idx; return S_OK; } @@ -435,6 +438,8 @@ HRESULT jsdisp_next_index(jsdisp_t *obj, unsigned length, unsigned id, struct pr desc->flags = PROPF_ENUMERABLE; if(obj->builtin_info->prop_put) desc->flags |= PROPF_WRITABLE; + desc->name = NULL; + desc->index = desc->id; return S_OK; } @@ -664,7 +669,7 @@ static HRESULT fill_props(jsdisp_t *obj) if(obj->builtin_info->next_prop) { struct property_info desc; unsigned id = ~0; - WCHAR name[12]; + WCHAR buf[12]; for(;;) { hres = obj->builtin_info->next_prop(obj, id, &desc); @@ -673,11 +678,14 @@ static HRESULT fill_props(jsdisp_t *obj) if(hres == S_FALSE) break; - swprintf(name, ARRAYSIZE(name), L"%u", desc.id); + if(!desc.name) { + swprintf(buf, ARRAYSIZE(buf), L"%u", desc.index); + desc.name = buf; + } - prop = lookup_dispex_prop(obj, string_hash(name), name, FALSE); + prop = lookup_dispex_prop(obj, string_hash(desc.name), desc.name, FALSE); if(!prop) { - prop = alloc_prop(obj, name, PROP_EXTERN, desc.flags); + prop = alloc_prop(obj, desc.name, PROP_EXTERN, desc.flags); if(!prop) return E_OUTOFMEMORY; prop->u.id = desc.id; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e84d2f9b2d8..2be22a9b526 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -478,7 +478,7 @@ static void scope_destructor(jsdisp_t *dispex) IDispatch_Release(scope->obj); } -static HRESULT scope_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, struct property_info *desc) +static HRESULT scope_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, unsigned flags, struct property_info *desc) { scope_chain_t *scope = scope_from_dispex(jsdisp); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 654bf12c7e9..27678fc167c 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -117,7 +117,7 @@ static void Arguments_destructor(jsdisp_t *jsdisp) scope_release(arguments->scope); } -static HRESULT Arguments_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, struct property_info *desc) +static HRESULT Arguments_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, unsigned flags, struct property_info *desc) { ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp); return jsdisp_index_lookup(&arguments->jsdisp, name, arguments->argc, desc); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 3113c0d5a8c..9454d9e3beb 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -185,7 +185,7 @@ typedef struct { ULONG (*addref)(jsdisp_t*); ULONG (*release)(jsdisp_t*); void (*on_put)(jsdisp_t*,const WCHAR*); - HRESULT (*lookup_prop)(jsdisp_t*,const WCHAR*,struct property_info*); + HRESULT (*lookup_prop)(jsdisp_t*,const WCHAR*,unsigned,struct property_info*); HRESULT (*next_prop)(jsdisp_t*,unsigned,struct property_info*); HRESULT (*prop_get)(jsdisp_t*,unsigned,jsval_t*); HRESULT (*prop_put)(jsdisp_t*,unsigned,jsval_t); diff --git a/dlls/jscript/jsdisp.idl b/dlls/jscript/jsdisp.idl index b7cb27a585b..f053149c144 100644 --- a/dlls/jscript/jsdisp.idl +++ b/dlls/jscript/jsdisp.idl @@ -25,6 +25,8 @@ struct property_info { UINT32 id; UINT32 flags; + const WCHAR *name; + UINT32 index; }; const unsigned int PROPF_ENUMERABLE = 0x0400; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 3cad5c55a79..968b74f9602 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1501,7 +1501,7 @@ static void String_destructor(jsdisp_t *dispex) jsstr_release(This->str); } -static HRESULT String_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, struct property_info *desc) +static HRESULT String_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, unsigned flags, struct property_info *desc) { StringInstance *string = string_from_jsdisp(jsdisp);

1 0

Jacek Caban : jscript: Introduce HostObject implementation.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 909943a6ccc2e20e3925b91388a97e39a839117b URL: https://gitlab.winehq.org/wine/wine/-/commit/909943a6ccc2e20e3925b91388a97e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 20:38:18 2024 +0200 jscript: Introduce HostObject implementation. --- dlls/jscript/dispex.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.c | 42 ++++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jscript_main.c | 1 + dlls/jscript/jsdisp.idl | 25 +++++++++++ 5 files changed, 173 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 911b3ab1d73..b684b9edd99 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -3273,3 +3273,107 @@ HRESULT jsdisp_get_prop_name(jsdisp_t *obj, DISPID id, jsstr_t **r) *r = jsstr_alloc(prop->name); return *r ? S_OK : E_OUTOFMEMORY; } + +typedef struct { + jsdisp_t jsdisp; + IWineJSDispatchHost *host_iface; +} HostObject; + +static inline HostObject *HostObject_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, HostObject, jsdisp); +} + +static ULONG HostObject_addref(jsdisp_t *jsdisp) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + return IWineJSDispatchHost_AddRef(This->host_iface); +} + +static ULONG HostObject_release(jsdisp_t *jsdisp) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + return IWineJSDispatchHost_Release(This->host_iface); +} + +static HRESULT HostObject_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, unsigned flags, struct property_info *desc) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + + return IWineJSDispatchHost_LookupProperty(This->host_iface, name, flags, desc); +} + +static HRESULT HostObject_prop_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + EXCEPINFO ei = { 0 }; + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_EMPTY; + hres = IWineJSDispatchHost_GetProperty(This->host_iface, idx, jsdisp->ctx->lcid, &v, &ei, + &jsdisp->ctx->jscaller->IServiceProvider_iface); + if(hres == DISP_E_EXCEPTION) + handle_dispatch_exception(jsdisp->ctx, &ei); + if(FAILED(hres)) + return hres; + + hres = variant_to_jsval(jsdisp->ctx, &v, r); + VariantClear(&v); + return hres; +} + +static HRESULT HostObject_prop_put(jsdisp_t *jsdisp, unsigned idx, jsval_t v) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + EXCEPINFO ei = { 0 }; + VARIANT var; + HRESULT hres; + + hres = jsval_to_variant(v, &var); + if(FAILED(hres)) + return hres; + + hres = IWineJSDispatchHost_SetProperty(This->host_iface, idx, jsdisp->ctx->lcid, &var, &ei, + &jsdisp->ctx->jscaller->IServiceProvider_iface); + if(hres == DISP_E_EXCEPTION) + handle_dispatch_exception(jsdisp->ctx, &ei); + VariantClear(&var); + return hres; +} + +static HRESULT HostObject_next_prop(jsdisp_t *jsdisp, unsigned id, struct property_info *desc) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + + return IWineJSDispatchHost_NextProperty(This->host_iface, id, desc); +} + +static const builtin_info_t HostObject_info = { + .class = JSCLASS_OBJECT, + .addref = HostObject_addref, + .release = HostObject_release, + .lookup_prop = HostObject_lookup_prop, + .prop_get = HostObject_prop_get, + .prop_put = HostObject_prop_put, + .next_prop = HostObject_next_prop, +}; + +HRESULT init_host_object(script_ctx_t *ctx, IWineJSDispatchHost *host_iface, IWineJSDispatch **ret) +{ + HostObject *host_obj; + HRESULT hres; + + if(!(host_obj = calloc(1, sizeof(*host_obj)))) + return E_OUTOFMEMORY; + + hres = init_dispex(&host_obj->jsdisp, ctx, &HostObject_info, ctx->object_prototype); + if(FAILED(hres)) { + free(host_obj); + return hres; + } + + host_obj->host_iface = host_iface; + *ret = &host_obj->jsdisp.IWineJSDispatch_iface; + return S_OK; +} diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index fc07c818edf..4d53e8a6832 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -47,6 +47,7 @@ typedef struct { IActiveScriptProperty IActiveScriptProperty_iface; IObjectSafety IObjectSafety_iface; IVariantChangeType IVariantChangeType_iface; + IWineJScript IWineJScript_iface; LONG ref; @@ -669,6 +670,9 @@ static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IVariantChangeType)) { TRACE("(%p)->(IID_IVariantChangeType %p)\n", This, ppv); *ppv = &This->IVariantChangeType_iface; + }else if(IsEqualGUID(riid, &IID_IWineJScript)) { + TRACE("(%p)->(IID_IWineJScript %p)\n", This, ppv); + *ppv = &This->IWineJScript_iface; } if(*ppv) { @@ -1424,6 +1428,43 @@ static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { VariantChangeType_ChangeType }; +static inline JScript *impl_from_IWineJScript(IWineJScript *iface) +{ + return CONTAINING_RECORD(iface, JScript, IWineJScript_iface); +} + +static HRESULT WINAPI WineJScript_QueryInterface(IWineJScript *iface, REFIID riid, void **ppv) +{ + JScript *This = impl_from_IWineJScript(iface); + return IActiveScript_QueryInterface(&This->IActiveScript_iface, riid, ppv); +} + +static ULONG WINAPI WineJScript_AddRef(IWineJScript *iface) +{ + JScript *This = impl_from_IWineJScript(iface); + return IActiveScript_AddRef(&This->IActiveScript_iface); +} + +static ULONG WINAPI WineJScript_Release(IWineJScript *iface) +{ + JScript *This = impl_from_IWineJScript(iface); + return IActiveScript_Release(&This->IActiveScript_iface); +} + +static HRESULT WINAPI WineJScript_InitHostObject(IWineJScript *iface, IWineJSDispatchHost *host_obj, + IWineJSDispatch **ret) +{ + JScript *This = impl_from_IWineJScript(iface); + return init_host_object(This->ctx, host_obj, ret); +} + +static const IWineJScriptVtbl WineJScriptVtbl = { + WineJScript_QueryInterface, + WineJScript_AddRef, + WineJScript_Release, + WineJScript_InitHostObject, +}; + HRESULT create_jscript_object(BOOL is_encode, REFIID riid, void **ppv) { JScript *ret; @@ -1441,6 +1482,7 @@ HRESULT create_jscript_object(BOOL is_encode, REFIID riid, void **ppv) ret->IActiveScriptProperty_iface.lpVtbl = &JScriptPropertyVtbl; ret->IObjectSafety_iface.lpVtbl = &JScriptSafetyVtbl; ret->IVariantChangeType_iface.lpVtbl = &VariantChangeTypeVtbl; + ret->IWineJScript_iface.lpVtbl = &WineJScriptVtbl; ret->ref = 1; ret->safeopt = INTERFACE_USES_DISPEX; ret->is_encode = is_encode; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9454d9e3beb..29dec3297ca 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -237,6 +237,7 @@ enum jsdisp_enum_type { HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**); HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*); HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*); +HRESULT init_host_object(script_ctx_t*,IWineJSDispatchHost*,IWineJSDispatch**); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,unsigned,jsval_t*,jsval_t*); HRESULT disp_call_name(script_ctx_t*,IDispatch*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*); diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index ecbb5a713ab..6ccab362051 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -27,6 +27,7 @@ #include "mshtmhst.h" #include "rpcproxy.h" #include "jscript_classes.h" +#include "jsdisp.h" #include "wine/debug.h" diff --git a/dlls/jscript/jsdisp.idl b/dlls/jscript/jsdisp.idl index f053149c144..a794dbebe67 100644 --- a/dlls/jscript/jsdisp.idl +++ b/dlls/jscript/jsdisp.idl @@ -42,3 +42,28 @@ interface IWineJSDispatch : IDispatchEx { void Free(); } + +[ + object, + uuid(b1ebc544-6644-40c6-97f6-ccd9cc32bfba), + local +] +interface IWineJSDispatchHost : IDispatchEx +{ + HRESULT GetJSDispatch(IWineJSDispatch **ret); + HRESULT LookupProperty(const WCHAR *name, DWORD flags, struct property_info *desc); + HRESULT NextProperty(DISPID id, struct property_info *desc); + HRESULT GetProperty(DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, IServiceProvider *caller); + HRESULT SetProperty(DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller); + HRESULT CallFunction(DISPID id, UINT32 iid, DISPPARAMS *dp, VARIANT *ret, EXCEPINFO *ei, IServiceProvider *caller); +} + +[ + object, + uuid(d359f2fe-5531-741b-a41a-5cf92edc971d), + local +] +interface IWineJScript : IUnknown +{ + HRESULT InitHostObject(IWineJSDispatchHost *host_obj, IWineJSDispatch **ret); +}

1 0

Jacek Caban : jscript: Support converting host objects to string.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: a3d2ad1c2ea138a04f890b3a5864f3e8306884ca URL: https://gitlab.winehq.org/wine/wine/-/commit/a3d2ad1c2ea138a04f890b3a5864f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 8 13:39:38 2024 +0200 jscript: Support converting host objects to string. --- dlls/jscript/dispex.c | 16 ++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jsdisp.idl | 1 + dlls/jscript/object.c | 16 +++++++++++----- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b684b9edd99..8c499fbd37b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -3349,6 +3349,21 @@ static HRESULT HostObject_next_prop(jsdisp_t *jsdisp, unsigned id, struct proper return IWineJSDispatchHost_NextProperty(This->host_iface, id, desc); } +static HRESULT HostObject_to_string(jsdisp_t *jsdisp, jsstr_t **ret) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + BSTR str; + HRESULT hres; + + hres = IWineJSDispatchHost_ToString(This->host_iface, &str); + if(FAILED(hres)) + return hres; + + *ret = jsstr_alloc(str); + SysFreeString(str); + return *ret ? S_OK : E_OUTOFMEMORY; +} + static const builtin_info_t HostObject_info = { .class = JSCLASS_OBJECT, .addref = HostObject_addref, @@ -3357,6 +3372,7 @@ static const builtin_info_t HostObject_info = { .prop_get = HostObject_prop_get, .prop_put = HostObject_prop_put, .next_prop = HostObject_next_prop, + .to_string = HostObject_to_string, }; HRESULT init_host_object(script_ctx_t *ctx, IWineJSDispatchHost *host_iface, IWineJSDispatch **ret) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 29dec3297ca..a36291204b6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -189,6 +189,7 @@ typedef struct { HRESULT (*next_prop)(jsdisp_t*,unsigned,struct property_info*); HRESULT (*prop_get)(jsdisp_t*,unsigned,jsval_t*); HRESULT (*prop_put)(jsdisp_t*,unsigned,jsval_t); + HRESULT (*to_string)(jsdisp_t*,jsstr_t**); HRESULT (*gc_traverse)(struct gc_ctx*,enum gc_traverse_op,jsdisp_t*); } builtin_info_t; diff --git a/dlls/jscript/jsdisp.idl b/dlls/jscript/jsdisp.idl index a794dbebe67..533677f6cad 100644 --- a/dlls/jscript/jsdisp.idl +++ b/dlls/jscript/jsdisp.idl @@ -56,6 +56,7 @@ interface IWineJSDispatchHost : IDispatchEx HRESULT GetProperty(DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, IServiceProvider *caller); HRESULT SetProperty(DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller); HRESULT CallFunction(DISPID id, UINT32 iid, DISPPARAMS *dp, VARIANT *ret, EXCEPINFO *ei, IServiceProvider *caller); + HRESULT ToString(BSTR *str); } [ diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 382f4107c45..da544c6b1c3 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -27,8 +27,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + const WCHAR *str = NULL; + jsstr_t *ret = NULL; jsdisp_t *jsdisp; - const WCHAR *str; IDispatch *disp; HRESULT hres; @@ -74,6 +75,8 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns jsdisp = to_jsdisp(disp); if(!jsdisp) { str = L"[object Object]"; + }else if(jsdisp->builtin_info->to_string) { + hres = jsdisp->builtin_info->to_string(jsdisp, &ret); }else if(names[jsdisp->builtin_info->class]) { str = names[jsdisp->builtin_info->class]; }else { @@ -87,11 +90,14 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns set_output: if(r) { - jsstr_t *ret; - ret = jsstr_alloc(str); - if(!ret) - return E_OUTOFMEMORY; + if(!ret) { + ret = jsstr_alloc(str); + if(!ret) + return E_OUTOFMEMORY; + } *r = jsval_string(ret); + }else if(ret) { + jsstr_release(ret); } return S_OK;

1 0

Hans Leidekker : odbc32: Turn SQLBindParam() into a stub.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 5b510de672baaa57f624457e2c3501b61f3cd070 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b510de672baaa57f624457e2c3501… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 13:56:41 2024 +0200 odbc32: Turn SQLBindParam() into a stub. This function is not exported by current Windows drivers. --- dlls/odbc32/proxyodbc.c | 66 +++------------------------------------------- dlls/odbc32/tests/odbc32.c | 35 ------------------------ dlls/odbc32/unixlib.c | 39 --------------------------- dlls/odbc32/unixlib.h | 24 ----------------- 4 files changed, 3 insertions(+), 161 deletions(-)

1 0

Hans Leidekker : odbc32: Replicate Unix data sources to the ODBC Data Sources key.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: f3ac9b1448e1706af75016262dc6323067850fd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3ac9b1448e1706af75016262dc632… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 14:46:13 2024 +0200 odbc32: Replicate Unix data sources to the ODBC Data Sources key. --- dlls/odbc32/unixlib.c | 340 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 225 insertions(+), 115 deletions(-)

1 0

Hans Leidekker : odbc32: Reimplement SQLDrivers() using registry functions.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 948299bc1f30ea5782db9387bc43ba28fb43a084 URL: https://gitlab.winehq.org/wine/wine/-/commit/948299bc1f30ea5782db9387bc43ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 15:11:19 2024 +0200 odbc32: Reimplement SQLDrivers() using registry functions. --- dlls/odbc32/proxyodbc.c | 99 +++++++++++++++++++++++++++++++++++++++------- dlls/odbc32/tests/odbc32.c | 3 +- dlls/odbc32/unixlib.h | 2 + 3 files changed, 87 insertions(+), 17 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index e295f052ee7..03ef72c780c 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -43,7 +43,6 @@ #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(odbc); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #define ODBC_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) @@ -1934,6 +1933,14 @@ SQLRETURN WINAPI SQLTablePrivileges(SQLHSTMT StatementHandle, SQLCHAR *CatalogNa return ret; } +static HKEY open_drivers_key( void ) +{ + static const WCHAR driversW[] = L"Software\\ODBC\\ODBCINST.INI\\ODBC Drivers"; + HKEY key; + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, driversW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL )) return key; + return NULL; +} + /************************************************************************* * SQLDrivers [ODBC32.071] */ @@ -1942,10 +1949,10 @@ SQLRETURN WINAPI SQLDrivers(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, S SQLCHAR *DriverAttributes, SQLSMALLINT BufferLength2, SQLSMALLINT *AttributesLength) { - struct SQLDrivers_params params = { 0, Direction, DriverDescription, BufferLength1, DescriptionLength, - DriverAttributes, BufferLength2, AttributesLength }; struct handle *handle = EnvironmentHandle; - SQLRETURN ret; + DWORD len_desc = BufferLength1; + SQLRETURN ret = SQL_ERROR; + LONG res; TRACE("(EnvironmentHandle %p, Direction %d, DriverDescription %p, BufferLength1 %d, DescriptionLength %p," " DriverAttributes %p, BufferLength2 %d, AttributesLength %p)\n", EnvironmentHandle, Direction, @@ -1953,12 +1960,43 @@ SQLRETURN WINAPI SQLDrivers(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, S if (!handle) return SQL_INVALID_HANDLE; - params.EnvironmentHandle = handle->unix_handle; - ret = ODBC_CALL( SQLDrivers, &params ); + if (Direction == SQL_FETCH_FIRST) + { + handle->drivers_idx = 0; + RegCloseKey( handle->drivers_key ); + if (!(handle->drivers_key = open_drivers_key())) return SQL_ERROR; + } + + res = RegEnumValueA( handle->drivers_key, handle->drivers_idx, (char *)DriverDescription, &len_desc, + NULL, NULL, NULL, NULL ); + if (res == ERROR_NO_MORE_ITEMS) + { + ret = SQL_NO_DATA; + goto done; + } + else if (res == ERROR_SUCCESS) + { + if (DescriptionLength) *DescriptionLength = len_desc; + + handle->drivers_idx++; + ret = SQL_SUCCESS; + } + else goto done; - if (ret == SQL_NO_DATA && Direction == SQL_FETCH_FIRST) - ERR_(winediag)("No ODBC drivers could be found. Check the settings for your libodbc provider.\n"); + if (DriverAttributes) + { + FIXME( "read attributes from registry\n" ); + if (BufferLength2 >= 2) memset( DriverAttributes, 0, 2 ); + } + if (AttributesLength) *AttributesLength = 2; +done: + if (ret) + { + RegCloseKey( handle->drivers_key ); + handle->drivers_key = NULL; + handle->drivers_idx = 0; + } TRACE("Returning %d\n", ret); return ret; } @@ -2940,10 +2978,10 @@ SQLRETURN WINAPI SQLDriversW(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLSMALLINT BufferLength1, SQLSMALLINT *DescriptionLength, SQLWCHAR *DriverAttributes, SQLSMALLINT BufferLength2, SQLSMALLINT *AttributesLength) { - struct SQLDriversW_params params = { 0, Direction, DriverDescription, BufferLength1, DescriptionLength, - DriverAttributes, BufferLength2, AttributesLength }; struct handle *handle = EnvironmentHandle; - SQLRETURN ret; + DWORD len_desc = BufferLength1; + SQLRETURN ret = SQL_ERROR; + LONG res; TRACE("(EnvironmentHandle %p, Direction %d, DriverDescription %p, BufferLength1 %d, DescriptionLength %p," " DriverAttributes %p, BufferLength2 %d, AttributesLength %p)\n", EnvironmentHandle, Direction, @@ -2951,12 +2989,43 @@ SQLRETURN WINAPI SQLDriversW(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, if (!handle) return SQL_INVALID_HANDLE; - params.EnvironmentHandle = handle->unix_handle; - ret = ODBC_CALL( SQLDriversW, &params ); + if (Direction == SQL_FETCH_FIRST) + { + handle->drivers_idx = 0; + RegCloseKey( handle->drivers_key ); + if (!(handle->drivers_key = open_drivers_key())) return SQL_ERROR; + } - if (ret == SQL_NO_DATA && Direction == SQL_FETCH_FIRST) - ERR_(winediag)("No ODBC drivers could be found. Check the settings for your libodbc provider.\n"); + res = RegEnumValueW( handle->drivers_key, handle->drivers_idx, DriverDescription, &len_desc, + NULL, NULL, NULL, NULL ); + if (res == ERROR_NO_MORE_ITEMS) + { + ret = SQL_NO_DATA; + goto done; + } + else if (res == ERROR_SUCCESS) + { + if (DescriptionLength) *DescriptionLength = len_desc; + handle->drivers_idx++; + ret = SQL_SUCCESS; + } + else goto done; + + if (DriverAttributes) + { + FIXME( "read attributes from registry\n" ); + if (BufferLength2 >= 2) memset( DriverAttributes, 0, 2 * sizeof(WCHAR) ); + } + if (AttributesLength) *AttributesLength = 2; + +done: + if (ret) + { + RegCloseKey( handle->drivers_key ); + handle->drivers_key = NULL; + handle->drivers_idx = 0; + } TRACE("Returning %d\n", ret); return ret; } diff --git a/dlls/odbc32/tests/odbc32.c b/dlls/odbc32/tests/odbc32.c index fafc63003b7..5a3b0c6f817 100644 --- a/dlls/odbc32/tests/odbc32.c +++ b/dlls/odbc32/tests/odbc32.c @@ -184,8 +184,7 @@ static void test_SQLDrivers( void ) ok( len, "unexpected len\n" ); ok( len2, "unexpected len\n" ); ok( desc[0], "empty string\n" ); - ok( attrs[0], "empty string\n" ); - trace( "desc %s len %d attrs %s len %d\n", desc, len, attrs, len2 ); + trace( "desc %s len %d\n", desc, len ); } ret = SQLFreeEnv( env ); diff --git a/dlls/odbc32/unixlib.h b/dlls/odbc32/unixlib.h index 7cb245c52f3..5e4d799b509 100644 --- a/dlls/odbc32/unixlib.h +++ b/dlls/odbc32/unixlib.h @@ -190,6 +190,8 @@ struct param_binding struct handle { UINT64 unix_handle; + UINT32 drivers_idx; + void *drivers_key; struct param_binding bind_col; struct param_binding bind_parameter; UINT32 row_count; /* number of rows returned by SQLFetch() */

1 0

Hans Leidekker : odbc32: Reimplement SQLDataSources() using registry functions.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 58a23e1939271eceb3e42daa11f8dde3c3da8c53 URL: https://gitlab.winehq.org/wine/wine/-/commit/58a23e1939271eceb3e42daa11f8dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 15:29:20 2024 +0200 odbc32: Reimplement SQLDataSources() using registry functions. --- dlls/odbc32/proxyodbc.c | 120 ++++++++++++++++++++++++++++++------- dlls/odbc32/unixlib.c | 156 ------------------------------------------------ dlls/odbc32/unixlib.h | 58 ++---------------- 3 files changed, 105 insertions(+), 229 deletions(-)

1 0

Hans Leidekker : odbc32: Introduce a Windows driver loader and forward a couple of functions.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 56554cd72b4f4c6bf450218e390fc5838fef4db8 URL: https://gitlab.winehq.org/wine/wine/-/commit/56554cd72b4f4c6bf450218e390fc5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 16:15:10 2024 +0200 odbc32: Introduce a Windows driver loader and forward a couple of functions. Forwarding is decided by looking at the driver filename. If the data source specifies a driver filename ending in .dll, assume it's a Windows driver, otherwise assume it's a Unix driver. --- dlls/odbc32/proxyodbc.c | 664 ++++++++++++++++++++++++++++++++++++++++++------ dlls/odbc32/unixlib.c | 10 +- dlls/odbc32/unixlib.h | 25 +- 3 files changed, 600 insertions(+), 99 deletions(-)

1 0

Hans Leidekker : odbc32: Forward more functions to the Windows driver.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 7f3a8f4276bccbd6f50c9ebe76e1efafc3581e60 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f3a8f4276bccbd6f50c9ebe76e1ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 17:07:02 2024 +0200 odbc32: Forward more functions to the Windows driver. --- dlls/odbc32/proxyodbc.c | 271 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 183 insertions(+), 88 deletions(-)

1 0

Hans Leidekker : odbc32: Forward yet more functions to the Windows driver.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: a39f26d52ad3892aede6caeec0d7ac8407863a71 URL: https://gitlab.winehq.org/wine/wine/-/commit/a39f26d52ad3892aede6caeec0d7ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 17:19:59 2024 +0200 odbc32: Forward yet more functions to the Windows driver. --- dlls/odbc32/proxyodbc.c | 991 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 736 insertions(+), 255 deletions(-)

1 0