May 2023 - Wine-Commits - list.winehq.org

Rémi Bernon : winemac: Delay ime_set_text until ImeToAsciiEx requests it.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 4071f49fb2dd963d6446ac7b86973c83a482cf7f URL: https://gitlab.winehq.org/wine/wine/-/commit/4071f49fb2dd963d6446ac7b86973c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 2 11:55:46 2023 +0200 winemac: Delay ime_set_text until ImeToAsciiEx requests it. --- dlls/winemac.drv/event.c | 47 ++++++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/ime.c | 12 ++++++++--- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 2 ++ dlls/winemac.drv/unixlib.h | 1 + 5 files changed, 58 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 03c49b34bae..cc8aa4681c6 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -32,6 +32,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(event); WINE_DECLARE_DEBUG_CHANNEL(imm); +struct ime_update +{ + struct ime_set_text_params *comp_params; + DWORD comp_size; + struct ime_set_text_params *result_params; + DWORD result_size; +}; +static struct ime_update ime_update; /* return the name of an Mac event */ static const char *dbgstr_event(int type) @@ -170,7 +178,20 @@ static void macdrv_im_set_text(const macdrv_event *event) if (length) CFStringGetCharacters(event->im_set_text.text, CFRangeMake(0, length), params->text); - macdrv_client_func(client_func_ime_set_text, params, size); + free(ime_update.comp_params); + ime_update.comp_params = NULL; + + if (params->complete) + { + free(ime_update.result_params); + ime_update.result_params = params; + ime_update.result_size = size; + } + else + { + ime_update.comp_params = params; + ime_update.comp_size = size; + } } /*********************************************************************** @@ -179,7 +200,29 @@ static void macdrv_im_set_text(const macdrv_event *event) static void macdrv_sent_text_input(const macdrv_event *event) { TRACE_(imm)("handled: %s\n", event->sent_text_input.handled ? "TRUE" : "FALSE"); - *event->sent_text_input.done = event->sent_text_input.handled ? 1 : -1; + *event->sent_text_input.done = event->sent_text_input.handled || ime_update.result_params ? 1 : -1; +} + + +/*********************************************************************** + * macdrv_ime_get_text_input + */ +NTSTATUS macdrv_ime_get_text_input(void *arg) +{ + if (ime_update.result_params) + { + macdrv_client_func(client_func_ime_set_text, ime_update.result_params, ime_update.result_size); + free(ime_update.result_params); + ime_update.result_params = NULL; + } + if (ime_update.comp_params) + { + macdrv_client_func(client_func_ime_set_text, ime_update.comp_params, ime_update.comp_size); + free(ime_update.comp_params); + ime_update.comp_params = NULL; + } + + return 0; } diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 059a5c443f3..351eb28ff98 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -679,10 +679,16 @@ UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, return msgs; } - else if ((lpIMC = LockRealIMC(hIMC))) + else { - UpdateDataInDefaultIMEWindow( lpIMC, hwnd, FALSE ); - UnlockRealIMC(hIMC); + /* trigger the pending client_func_ime_set_text call */ + MACDRV_CALL(ime_get_text_input, NULL); + + if ((lpIMC = LockRealIMC(hIMC))) + { + UpdateDataInDefaultIMEWindow( lpIMC, hwnd, FALSE ); + UnlockRealIMC(hIMC); + } } return 0; } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 281d49c1e9a..b77e62f75db 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -277,6 +277,7 @@ extern NTSTATUS macdrv_dnd_have_format(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_dnd_release(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_dnd_retain(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_ime_process_text_input(void *arg) DECLSPEC_HIDDEN; +extern NTSTATUS macdrv_ime_get_text_input(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_notify_icon(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *params, diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index a4b280283ee..bf03ab6f5fe 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -635,6 +635,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = macdrv_dnd_retain, macdrv_ime_clear, macdrv_ime_process_text_input, + macdrv_ime_get_text_input, macdrv_ime_using_input_method, macdrv_init, macdrv_notify_icon, @@ -761,6 +762,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = macdrv_dnd_retain, macdrv_ime_clear, wow64_ime_process_text_input, + macdrv_ime_get_text_input, macdrv_ime_using_input_method, wow64_init, wow64_notify_icon, diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index ca5115f4982..b3f45291904 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -28,6 +28,7 @@ enum macdrv_funcs unix_dnd_retain, unix_ime_clear, unix_ime_process_text_input, + unix_ime_get_text_input, unix_ime_using_input_method, unix_init, unix_notify_icon,

1 0

Zhiyi Zhang : oledb32: Support converting DBTYPE_VARIANT to DBTYPE_GUID.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 6a58b25bb4dbb4983a5149b3e0e4b1878914edb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a58b25bb4dbb4983a5149b3e0e4b1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 8 22:42:57 2023 +0800 oledb32: Support converting DBTYPE_VARIANT to DBTYPE_GUID. --- dlls/oledb32/convert.c | 11 +++++++++++ dlls/oledb32/tests/convert.c | 7 ------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 4ed9f0d8cc6..bb427e0cb54 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -855,6 +855,17 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, { case DBTYPE_EMPTY: *d = GUID_NULL; hr = S_OK; break; case DBTYPE_GUID: *d = *(GUID*)src; hr = S_OK; break; + case DBTYPE_VARIANT: + if (V_VT((VARIANT *)src) == VT_BSTR) + { + hr = CLSIDFromString(V_BSTR((VARIANT *)src), d); + if (FAILED(hr)) + { + *dst_len = sizeof(GUID); + *dst_status = DBSTATUS_E_CANTCONVERTVALUE; + } + break; + } default: FIXME("Unimplemented conversion %04x -> GUID\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 019e8c96d93..aea2e40473c 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2686,13 +2686,9 @@ static void test_converttoguid(void) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocStringLen(L"{0c733a8d-2a1c-11ce-ade5-00aa0044773d}", 38); hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_GUID, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08lx\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); - todo_wine ok(dst_len == sizeof(GUID), "got %Id\n", dst_len); - todo_wine ok(IsEqualGUID(&dst, &IID_IDataConvert), "didn't get IID_IDataConvert\n"); SysFreeString(V_BSTR(&v)); @@ -2700,11 +2696,8 @@ static void test_converttoguid(void) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocStringLen(L"{invalid0-0000-0000-0000-000000000000}", 38); hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_GUID, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == CO_E_CLASSSTRING, "got %08lx\n", hr); - todo_wine ok(dst_status == DBSTATUS_E_CANTCONVERTVALUE, "got %08lx\n", dst_status); - todo_wine ok(dst_len == sizeof(GUID), "got %Id\n", dst_len); SysFreeString(V_BSTR(&v)); }

1 0

Zhiyi Zhang : oledb32/tests: Test converting DBTYPE_VARIANT to DBTYPE_GUID.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 90124d54e6a81a568dd698506af8101db24c315f URL: https://gitlab.winehq.org/wine/wine/-/commit/90124d54e6a81a568dd698506af810… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 9 11:20:44 2023 +0800 oledb32/tests: Test converting DBTYPE_VARIANT to DBTYPE_GUID. --- dlls/oledb32/tests/convert.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 2d5f898e0df..019e8c96d93 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2680,6 +2680,33 @@ static void test_converttoguid(void) ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08lx\n", dst_status); ok(dst_len == 44, "got %Id\n", dst_len); + + dst_len = 0x1234; + dst = IID_IDCInfo; + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocStringLen(L"{0c733a8d-2a1c-11ce-ade5-00aa0044773d}", 38); + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_GUID, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine + ok(hr == S_OK, "got %08lx\n", hr); + todo_wine + ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); + todo_wine + ok(dst_len == sizeof(GUID), "got %Id\n", dst_len); + todo_wine + ok(IsEqualGUID(&dst, &IID_IDataConvert), "didn't get IID_IDataConvert\n"); + SysFreeString(V_BSTR(&v)); + + dst_len = 0x1234; + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocStringLen(L"{invalid0-0000-0000-0000-000000000000}", 38); + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_GUID, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine + ok(hr == CO_E_CLASSSTRING, "got %08lx\n", hr); + todo_wine + ok(dst_status == DBSTATUS_E_CANTCONVERTVALUE, "got %08lx\n", dst_status); + todo_wine + ok(dst_len == sizeof(GUID), "got %Id\n", dst_len); + SysFreeString(V_BSTR(&v)); } static void test_converttofiletime(void)

1 0

Zhiyi Zhang : oledb32: Support converting DBTYPE_VARIANT to DBTYPE_UI8.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 0dc1c6ac00df458809f7dc9e11d000bf5f1a6841 URL: https://gitlab.winehq.org/wine/wine/-/commit/0dc1c6ac00df458809f7dc9e11d000… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 8 22:32:16 2023 +0800 oledb32: Support converting DBTYPE_VARIANT to DBTYPE_UI8. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index b8db8f06d8b..4ed9f0d8cc6 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -826,6 +826,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_UI4: hr = VarUI8FromUI4(*(DWORD*)src, d); break; case DBTYPE_I8: hr = VarUI8FromI8(*(LONGLONG*)src, d); break; case DBTYPE_UI8: *d = *(ULONGLONG*)src; hr = S_OK; break; + case DBTYPE_VARIANT: + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, src, 0, VT_UI8)) == S_OK) + *d = V_UI8(&tmp); + break; default: FIXME("Unimplemented conversion %04x -> UI8\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index f70562f8e79..2d5f898e0df 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3082,13 +3082,9 @@ static void test_converttoui8(void) V_UI8(&v) = 4321; dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_UI8, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08lx\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); - todo_wine ok(dst_len == sizeof(dst), "got %Id\n", dst_len); - todo_wine ok(dst.QuadPart == 4321, "got %d\n", (int)dst.QuadPart); }

1 0

Zhiyi Zhang : oledb32/tests: Test converting DBTYPE_VARIANT to DBTYPE_UI8.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: c29b7db3395ab6989a24597b8c9941ea09488615 URL: https://gitlab.winehq.org/wine/wine/-/commit/c29b7db3395ab6989a24597b8c9941… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 9 11:07:50 2023 +0800 oledb32/tests: Test converting DBTYPE_VARIANT to DBTYPE_UI8. --- dlls/oledb32/tests/convert.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 85911808a16..f70562f8e79 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3077,6 +3077,19 @@ static void test_converttoui8(void) ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08lx\n", dst_status); ok(dst_len == 44, "got %Id\n", dst_len); + + V_VT(&v) = VT_UI8; + V_UI8(&v) = 4321; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_UI8, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine + ok(hr == S_OK, "got %08lx\n", hr); + todo_wine + ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); + todo_wine + ok(dst_len == sizeof(dst), "got %Id\n", dst_len); + todo_wine + ok(dst.QuadPart == 4321, "got %d\n", (int)dst.QuadPart); } static void test_getconversionsize(void)

1 0

Zhiyi Zhang : oledb32: Put provider initialization properties in a single DBPROP_INIT_PROVIDERSTRING.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 3d514933b9810004a0891c24dd65b2e974a884b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d514933b9810004a0891c24dd65b2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 8 22:15:10 2023 +0800 oledb32: Put provider initialization properties in a single DBPROP_INIT_PROVIDERSTRING. Put provider initialization properties in a single DBPROP_INIT_PROVIDERSTRING for IDBProperties::SetProperties(). Otherwise, according to MSDN for IDBProperties::SetProperties(), if the same property is specified more than once, the value used is provider-specific. So it won't be consider as an initialization property. Fix PowerPivot for Excel not connecting to embedded data sources. --- dlls/oledb32/datainit.c | 52 ++++++++++++++++++++++++++++--------------- dlls/oledb32/tests/database.c | 1 - 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 87a05638ffe..325de558584 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -518,6 +518,7 @@ static const struct dbproperty *get_known_dprop_descr(BSTR name) static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **propset) { + BSTR provider_string = NULL; struct dbprop_pair *pair; int i = 0; HRESULT hr; @@ -535,6 +536,7 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr } (*propset)->cProperties = 0; + (*propset)->guidPropertySet = DBPROPSET_DBINIT; LIST_FOR_EACH_ENTRY(pair, &props->props, struct dbprop_pair, entry) { const struct dbproperty *descr = get_known_dprop_descr(pair->name); @@ -542,25 +544,26 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr if (!descr) { - BSTR str; int len; - /* provider specific property is always VT_BSTR */ - len = SysStringLen(pair->name) + SysStringLen(pair->value) + 1 /* for '=' */; - str = SysAllocStringLen(NULL, len); - lstrcpyW(str, pair->name); - lstrcatW(str, L"="); - lstrcatW(str, pair->value); - - (*propset)->cProperties++; - (*propset)->guidPropertySet = DBPROPSET_DBINIT; - (*propset)->rgProperties[i].dwPropertyID = DBPROP_INIT_PROVIDERSTRING; - (*propset)->rgProperties[i].dwOptions = DBPROPOPTIONS_REQUIRED; - (*propset)->rgProperties[i].dwStatus = 0; - memset(&(*propset)->rgProperties[i].colid, 0, sizeof(DBID)); - V_VT(&(*propset)->rgProperties[i].vValue) = VT_BSTR; - V_BSTR(&(*propset)->rgProperties[i].vValue) = str; - i++; + len = SysStringLen(pair->name) + SysStringLen(pair->value) + 1; /* for '=' */ + if (!provider_string) + { + provider_string = SysAllocStringLen(NULL, len); + } + else + { + BSTR old_string = provider_string; + + len += SysStringLen(provider_string) + 1; /* for ';' separator */ + provider_string = SysAllocStringLen(NULL, len); + lstrcpyW(provider_string, old_string); + lstrcatW(provider_string, L";"); + SysFreeString(old_string); + } + lstrcatW(provider_string, pair->name); + lstrcatW(provider_string, L"="); + lstrcatW(provider_string, pair->value); continue; } @@ -581,7 +584,6 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr } (*propset)->cProperties++; - (*propset)->guidPropertySet = DBPROPSET_DBINIT; (*propset)->rgProperties[i].dwPropertyID = descr->id; (*propset)->rgProperties[i].dwOptions = descr->options; (*propset)->rgProperties[i].dwStatus = 0; @@ -590,6 +592,20 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr i++; } + /* Provider specific property is always VT_BSTR */ + /* DBPROP_INIT_PROVIDERSTRING should be specified only once. Otherwise, it will be considered as + * provider-specific rather than an initialization property */ + if (provider_string) + { + (*propset)->cProperties++; + (*propset)->rgProperties[i].dwPropertyID = DBPROP_INIT_PROVIDERSTRING; + (*propset)->rgProperties[i].dwOptions = DBPROPOPTIONS_REQUIRED; + (*propset)->rgProperties[i].dwStatus = 0; + memset(&(*propset)->rgProperties[i].colid, 0, sizeof(DBID)); + V_VT(&(*propset)->rgProperties[i].vValue) = VT_BSTR; + V_BSTR(&(*propset)->rgProperties[i].vValue) = provider_string; + } + return S_OK; } diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 1da4e41ab54..c0a4fbd4005 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -150,7 +150,6 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG set_coun ok(set_count == 1, "got %lu\n", set_count); ok(IsEqualIID(&propsets->guidPropertySet, &DBPROPSET_DBINIT), "set guid %s\n", wine_dbgstr_guid(&propsets->guidPropertySet)); - todo_wine_if(!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"provider_prop_test")) ok(propsets->cProperties == 2, "got propcount %lu\n", propsets->cProperties); if (propsets->cProperties == 2) {

1 0

Zhiyi Zhang : oledb32/tests: Test provider string with multiple provider specific properties.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 4085cca75046d54c8952a855ea3b52e96af4c825 URL: https://gitlab.winehq.org/wine/wine/-/commit/4085cca75046d54c8952a855ea3b52… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 9 15:40:45 2023 +0800 oledb32/tests: Test provider string with multiple provider specific properties. --- dlls/oledb32/tests/database.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 12b11dd1bdc..1da4e41ab54 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -150,6 +150,7 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG set_coun ok(set_count == 1, "got %lu\n", set_count); ok(IsEqualIID(&propsets->guidPropertySet, &DBPROPSET_DBINIT), "set guid %s\n", wine_dbgstr_guid(&propsets->guidPropertySet)); + todo_wine_if(!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"provider_prop_test")) ok(propsets->cProperties == 2, "got propcount %lu\n", propsets->cProperties); if (propsets->cProperties == 2) { @@ -174,6 +175,15 @@ if (propsets->cProperties == 2) { ok(!wcscmp(V_BSTR(&propsets->rgProperties[1].vValue), L"dummy_catalog"), "got initial catalog %s\n", wine_dbgstr_variant(&propsets->rgProperties[1].vValue)); } + else if (!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"provider_prop_test")) + { + ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_PROVIDERSTRING, "got propid[1] %lu\n", propsets->rgProperties[1].dwPropertyID); + ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %lu\n", propsets->rgProperties[1].dwOptions); + ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %lu\n", propsets->rgProperties[1].dwStatus); + ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue)); + ok(!wcscmp(V_BSTR(&propsets->rgProperties[1].vValue), L"a=1;b=2;c=3"), "got provider string %s\n", + wine_dbgstr_variant(&propsets->rgProperties[1].vValue)); + } } return S_OK; } @@ -313,6 +323,9 @@ static void test_database(void) ' ','W','i','n','e',' ','O','D','B','C',' ','d','r','i','v','e','r',';','U','I','D','=','w','i','n','e',';','\"',';',0}; static WCHAR extended_prop2[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','\'','d','u','m','m','y','\'',';', 'c','u','s','t','o','m','p','r','o','p','=','\'','1','2','3','.','4','\'',';',0}; + static WCHAR multi_provider_prop_test[] = {'D','a','t','a',' ','S','o','u','r','c','e','=', + 'p','r','o','v','i','d','e','r','_','p','r','o','p','_','t','e','s','t',';', + 'a','=','1',';','b','=','2',';','c','=','3',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -332,6 +345,7 @@ static void test_database(void) test_GetDataSource2(initial_catalog_prop); test_GetDataSource2(extended_prop); test_GetDataSource2(extended_prop2); + test_GetDataSource2(multi_provider_prop_test); } static void free_dispparams(DISPPARAMS *params)

1 0

Zhiyi Zhang : oledb32: Use the correct property for initial catalog.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: e9c8de2300b88a1a0f64154217ef1f47e7f6c346 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9c8de2300b88a1a0f64154217ef1f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 8 17:33:30 2023 +0800 oledb32: Use the correct property for initial catalog. "Initial Catalog" should use property DBPROP_INIT_CATALOG instead of DBPROP_CATALOGLOCATION. Fix PowerPivot for Excel not able to query embedded data sources. --- dlls/oledb32/datainit.c | 2 +- dlls/oledb32/tests/database.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 4281e5f9e1c..87a05638ffe 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -360,7 +360,7 @@ static const struct dbproperty dbproperties[] = { L"Encrypt Password", DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROPOPTIONS_REQUIRED, VT_BOOL }, { L"General Timeout", DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { L"Impersonation Level", DBPROP_INIT_IMPERSONATION_LEVEL, DBPROPOPTIONS_OPTIONAL, VT_I4 }, - { L"Initial Catalog", DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Initial Catalog", DBPROP_INIT_CATALOG, DBPROPOPTIONS_REQUIRED, VT_BSTR }, { L"Integrated Security", DBPROP_AUTH_INTEGRATED, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { L"Locale Identifier", DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { L"Location", DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d5bea2a67d7..12b11dd1bdc 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -167,9 +167,7 @@ if (propsets->cProperties == 2) { } else if (!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"initial_catalog_test")) { - todo_wine ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_CATALOG, "got propid[1] %lu\n", propsets->rgProperties[1].dwPropertyID); - todo_wine ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %lu\n", propsets->rgProperties[1].dwOptions); ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %lu\n", propsets->rgProperties[1].dwStatus); ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue));

1 0

Zhiyi Zhang : oledb32/tests: Test initial catalog property.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: e00dfd2064f84359a8c0404b700f9db7a8b86cab URL: https://gitlab.winehq.org/wine/wine/-/commit/e00dfd2064f84359a8c0404b700f9d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 9 16:05:51 2023 +0800 oledb32/tests: Test initial catalog property. --- dlls/oledb32/tests/database.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 26e3ebf2186..d5bea2a67d7 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -158,10 +158,24 @@ if (propsets->cProperties == 2) { ok(propsets->rgProperties[0].dwStatus == 0, "got status[0] %lu\n", propsets->rgProperties[0].dwStatus); ok(V_VT(&propsets->rgProperties[0].vValue) == VT_BSTR, "got vartype[0] %u\n", V_VT(&propsets->rgProperties[0].vValue)); - ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_PROVIDERSTRING, "got propid[1] %lu\n", propsets->rgProperties[1].dwPropertyID); - ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %lu\n", propsets->rgProperties[1].dwOptions); - ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %lu\n", propsets->rgProperties[1].dwStatus); - ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue)); + if (!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"dummy")) + { + ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_PROVIDERSTRING, "got propid[1] %lu\n", propsets->rgProperties[1].dwPropertyID); + ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %lu\n", propsets->rgProperties[1].dwOptions); + ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %lu\n", propsets->rgProperties[1].dwStatus); + ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue)); + } + else if (!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"initial_catalog_test")) + { + todo_wine + ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_CATALOG, "got propid[1] %lu\n", propsets->rgProperties[1].dwPropertyID); + todo_wine + ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %lu\n", propsets->rgProperties[1].dwOptions); + ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %lu\n", propsets->rgProperties[1].dwStatus); + ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue)); + ok(!wcscmp(V_BSTR(&propsets->rgProperties[1].vValue), L"dummy_catalog"), "got initial catalog %s\n", + wine_dbgstr_variant(&propsets->rgProperties[1].vValue)); + } } return S_OK; } @@ -293,6 +307,9 @@ static void test_database(void) static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; static WCHAR customprop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', 'c','u','s','t','o','m','p','r','o','p','=','1','2','3','.','4',';',0}; + static WCHAR initial_catalog_prop[] = {'D','a','t','a',' ','S','o','u','r','c','e','=', + 'i','n','i','t','i','a','l','_','c','a','t','a','l','o','g','_','t','e','s','t',';', + 'I','n','i','t','i','a','l',' ','C','a','t','a','l','o','g','=','d','u','m','m','y','_','c','a','t','a','l','o','g',0}; static WCHAR extended_prop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', 'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s','=','\"','D','R','I','V','E','R','=','A', ' ','W','i','n','e',' ','O','D','B','C',' ','d','r','i','v','e','r',';','U','I','D','=','w','i','n','e',';','\"',';',0}; @@ -314,6 +331,7 @@ static void test_database(void) test_GetDataSource(initstring_default); test_GetDataSource(initstring_lower); test_GetDataSource2(customprop); + test_GetDataSource2(initial_catalog_prop); test_GetDataSource2(extended_prop); test_GetDataSource2(extended_prop2); }

1 0

Gerald Pfeifer : webservices: Avoid uninitialized variable warning in format_double.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 358ead7ab474b74640ac578e503a7166a4e29fd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/358ead7ab474b74640ac578e503a71… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 18 15:21:41 2023 +0100 webservices: Avoid uninitialized variable warning in format_double. GCC 13 was going to diagnose dlls/webservices/writer.c:960:18: warning: 'mag2' may be used uninitialized --- dlls/webservices/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index a4cfc94f08e..6923035f00c 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -896,7 +896,7 @@ static ULONG format_double( const double *ptr, unsigned char *buf ) static const double precision = 0.0000000000000001; unsigned char *p = buf; double val = *ptr; - int neg, mag, mag2, use_exp; + int neg, mag, mag2 = 0, use_exp; if (isnan( val )) {

1 0