November 2021 - Wine-Devel - list.winehq.org

[PATCH 1/3] kernel32/tests: Test whether every element of the CPINFO.LeadByte array is NUL
by Hugh McMaster Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/tests/locale.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index fa0ec374d34..4fb30eb5318 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3962,6 +3962,7 @@ static void test_GetCPInfo(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + memset(cpinfo.LeadByte, '-', ARRAY_SIZE(cpinfo.LeadByte)); SetLastError(0xdeadbeef); ret = GetCPInfo(CP_UTF7, &cpinfo); if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) @@ -3970,14 +3971,19 @@ static void test_GetCPInfo(void) } else { + unsigned int i; + ok(ret, "GetCPInfo(CP_UTF7) error %u\n", GetLastError()); ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); + for (i = 2; i < sizeof(cpinfo.LeadByte); i++) + todo_wine ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); ok(cpinfo.MaxCharSize == 5, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); } + memset(cpinfo.LeadByte, '-', ARRAY_SIZE(cpinfo.LeadByte)); SetLastError(0xdeadbeef); ret = GetCPInfo(CP_UTF8, &cpinfo); if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) @@ -3986,11 +3992,15 @@ static void test_GetCPInfo(void) } else { + unsigned int i; + ok(ret, "GetCPInfo(CP_UTF8) error %u\n", GetLastError()); ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); + for (i = 2; i < sizeof(cpinfo.LeadByte); i++) + todo_wine ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); ok(cpinfo.MaxCharSize == 4 || broken(cpinfo.MaxCharSize == 3) /* win9x */, "expected 4, got %u\n", cpinfo.MaxCharSize); } -- 2.34.0

2 4

[PATCH 00/12] winecoreaudio: Move more mmdevapi calls to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

This series is longer than I'd normally send but: i. It's mainly just moving blocks of code around. ii. It would be nice to get winecoreaudio converted to PE before the code-freeze. After this series there are eight patches to finish the mmdevapi move and a further 24 patches to move the midi stuff. Huw D. M. Davies (12): winecoreaudio: Move is_format_supported to the unixlib. winecoreaudio: Add a temporary capture_resample syscall. winecoreaudio: Move get_buffer_size to the unixlib. winecoreaudio: Move get_latency to the unixlib. winecoreaudio: Move get_current_padding to the unixlib. winecoreaudio: Move start to the unixlib. winecoreaudio: Move stop to the unixlib. winecoreaudio: Move reset to the unixlib. winecoreaudio: Move get_render_buffer to the unixlib. winecoreaudio: Move release_render_buffer to the unixlib. winecoreaudio: Move get_capture_buffer to the unixlib. winecoreaudio: Move release_capture_buffer to the unixlib. dlls/winecoreaudio.drv/coreaudio.c | 550 +++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 820 +++-------------------------- dlls/winecoreaudio.drv/unixlib.h | 96 ++++ 3 files changed, 730 insertions(+), 736 deletions(-) -- 2.23.0

1 0

[PATCH resend 1/2] winemenubuilder: Skip desktop integration for certain associations
by Alex Henrie Nov. 23, 2021

Nov. 23, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- loader/wine.inf.in | 6 +++ programs/winemenubuilder/winemenubuilder.c | 43 +++++++++++++++++++--- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 49f45e6eed3..75c22288547 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -507,6 +507,12 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1 HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8 HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9 +HKCU,Software\Wine\FileOpenNoIntegration,"ieframe",,"ieframe.dll" +HKCU,Software\Wine\FileOpenNoIntegration,"iexplore",,"iexplore.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"notepad",,"notepad.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"winebrowser",,"winebrowser.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"wordpad",,"wordpad.exe" + [ContentIndex] HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,"" diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 16dc32a8859..a88cec1d76c 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1956,6 +1956,35 @@ static BOOL is_extension_banned(LPCWSTR extension) return FALSE; } +static BOOL on_exclude_list(const WCHAR *command) +{ + static const WCHAR FileOpenNoIntegrationW[] = L"Software\\Wine\\FileOpenNoIntegration"; + HKEY key; + WCHAR program_name[MAX_PATH], *pattern_to_exclude; + DWORD len = ARRAY_SIZE(program_name); + DWORD i = 0; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, FileOpenNoIntegrationW, 0, KEY_QUERY_VALUE, &key) != ERROR_SUCCESS) + return FALSE; + + while (RegEnumValueW(key, i, program_name, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + pattern_to_exclude = reg_get_valW(HKEY_CURRENT_USER, FileOpenNoIntegrationW, program_name); + if (wcsstr(command, pattern_to_exclude)) + { + heap_free(pattern_to_exclude); + RegCloseKey(key); + return TRUE; + } + heap_free(pattern_to_exclude); + len = ARRAY_SIZE(program_name); + i++; + } + + RegCloseKey(key); + return FALSE; +} + static WCHAR *get_special_mime_type(LPCWSTR extension) { if (!wcsicmp(extension, L".lnk")) @@ -2036,6 +2065,15 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic WCHAR *mimeProgId = NULL; struct rb_string_entry *entry; + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + if (on_exclude_list(commandW)) + /* command is on the exclude list => desktop integration is not desirable */ + goto end; + wcslwr(extensionW); friendlyDocNameW = assoc_query(ASSOCSTR_FRIENDLYDOCNAME, extensionW, NULL); @@ -2075,11 +2113,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic hasChanged = TRUE; } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); - if (commandW == NULL) - /* no command => no application is associated */ - goto end; - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, L"open"); if (executableW) openWithIcon = compute_native_identifier(0, executableW, NULL); -- 2.34.0

1 1

[PATCH v2 3/3] msdasql: Implement IColumnsRowset GetAvailableColumns
by Alistair Leslie-Hughes Nov. 22, 2021

Nov. 22, 2021

The functions returns a series of custom columns to make a row unique. For us, it's safe to return no extra columns at this stage. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 533cb6ae28a..98b2b4e6c5d 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -886,8 +886,16 @@ static ULONG WINAPI column_rs_Release(IColumnsRowset *iface) static HRESULT WINAPI column_rs_GetAvailableColumns(IColumnsRowset *iface, DBORDINAL *count, DBID **columns) { struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); - FIXME("%p, %p, %p\n", rowset, count, columns); - return E_NOTIMPL; + + TRACE("%p, %p, %p\n", rowset, count, columns); + + if (!count || !columns) + return E_INVALIDARG; + + *count = 0; + *columns = NULL; + + return S_OK; } static HRESULT WINAPI column_rs_GetColumnsRowset(IColumnsRowset *iface, IUnknown *outer, DBORDINAL count, -- 2.33.0

1 0

[PATCH v2 2/3] msdasql: Implement ICommandProperties SetProperties.
by Alistair Leslie-Hughes Nov. 22, 2021

Nov. 22, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 9ef29d6b29e..533cb6ae28a 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1152,7 +1152,41 @@ static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULON DBPROPSET propertyset[]) { struct command *command = impl_from_ICommandProperties( iface ); - FIXME("%p %p\n", command, propertyset); + int i, j, k; + + TRACE("%p %d, %p\n", command, count, propertyset); + + for(i=0; i < count; i++) + { + TRACE("set %s, count %d\n", debugstr_guid(&propertyset[i].guidPropertySet), propertyset[i].cProperties); + for(j=0; j < propertyset[i].cProperties; j++) + { + for(k=0; k < ARRAY_SIZE(command->properties); k++) + { + if (command->properties[k].property_id == propertyset[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property 0x%08x\n", command->properties[k].property_id); + if (command->properties[k].flags & DBPROPFLAGS_WRITE) + { + if (command->properties[k].vartype == VT_BOOL) + { + command->properties[k].bool_val = V_BOOL(&propertyset[i].rgProperties[j].vValue); + } + else if (command->properties[k].vartype == VT_I4) + { + command->properties[k].long_val = V_I4(&propertyset[i].rgProperties[j].vValue); + } + else + ERR("Unknown variant type %d\n", command->properties[j].vartype); + } + else + WARN("Attempting to set Readonly property\n"); + + break; + } + } + } + } return S_OK; } -- 2.33.0

1 0

[PATCH v2 1/3] msdasql: Implement ICommandProperties GetProperties
by Alistair Leslie-Hughes Nov. 22, 2021

Nov. 22, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 1 + dlls/msdasql/session.c | 217 +++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 145 +++++++++++++++++++++++ 3 files changed, 361 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index bc208a74cc5..84afdb06145 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 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); +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index b4239c59037..9ef29d6b29e 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -35,6 +35,103 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); +struct msdasql_prop +{ + DBPROPID property_id; + DBPROPFLAGS flags; + VARTYPE vartype; + + VARIANT_BOOL bool_val; + LONG_PTR long_val; +}; + +static struct msdasql_prop msdasql_init_props[] = +{ + { DBPROP_ABORTPRESERVE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_DATASOURCEINFO, VT_BOOL, VARIANT_FALSE }, + { DBPROP_BLOCKINGSTORAGEOBJECTS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_BOOKMARKS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_BOOKMARKSKIPPED, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_BOOKMARKTYPE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 1 }, + { DBPROP_CANFETCHBACKWARDS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_CANHOLDROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_CANSCROLLBACKWARDS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_COLUMNRESTRICT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_COMMITPRESERVE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_DELAYSTORAGEOBJECTS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IMMOBILEROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_LITERALBOOKMARKS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_LITERALIDENTITY, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_MAXOPENROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_MAXPENDINGROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_MAXROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_NOTIFICATIONPHASES, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 31 }, + { DBPROP_OTHERUPDATEDELETE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_OWNINSERT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_OWNUPDATEDELETE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_QUICKRESTART , DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_REENTRANTEVENTS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_REMOVEDELETED, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_REPORTMULTIPLECHANGES, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ROWRESTRICT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ROWTHREADMODEL, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 2 }, + { DBPROP_TRANSACTEDOBJECT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_UPDATABILITY, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_STRONGIDENTITY, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IAccessor, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IColumnsInfo, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IColumnsRowset, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IConnectionPointContainer, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowset, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IRowsetChange, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetIdentity, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetInfo, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IRowsetLocate, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetResynch, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetUpdate, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ISupportErrorInfo, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_ISequentialStream, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_NOTIFYCOLUMNSET, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWDELETE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWFIRSTCHANGE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWINSERT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWRESYNCH, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWSETRELEASE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWSETFETCHPOSITIONCHANGE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWUNDOCHANGE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWUNDODELETE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWUNDOINSERT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWUPDATE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_CHANGEINSERTEDROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_RETURNPENDINGINSERTS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IConvertType, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_NOTIFICATIONGRANULARITY, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 1 }, + { DBPROP_IMultipleResults, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ACCESSORDER, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, 0, 1 }, + { DBPROP_BOOKMARKINFO, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_UNIQUEROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetFind, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetScroll, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IRowsetRefresh, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_FINDCOMPAREOPS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 27 }, + { DBPROP_ORDEREDBOOKMARKS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_CLIENTCURSOR, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_ABORTPRESERVE, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ACTIVESESSIONS, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ASYNCTXNCOMMIT, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_CACHE_AUTHINFO, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_AUTH_INTEGRATED, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 14 }, + { DBPROP_AUTH_MASK_PASSWORD, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_PASSWORD, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_USERID, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_BLOCKINGSTORAGEOBJECTS, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, +}; + +#define ROWSET_PROP_COUNT 68 +#define DATASOURCE_PROP_COUNT 12 + struct msdasql_session { IUnknown session_iface; @@ -305,6 +402,8 @@ struct command LONG refs; WCHAR *query; IUnknown *session; + + struct msdasql_prop properties[80]; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -933,8 +1032,120 @@ static HRESULT WINAPI command_prop_GetProperties(ICommandProperties *iface, ULON const DBPROPIDSET propertyidsets[], ULONG *sets_cnt, DBPROPSET **propertyset) { struct command *command = impl_from_ICommandProperties( iface ); - FIXME("%p %d %p %p %p\n", command, count, propertyidsets, sets_cnt, propertyset); - return E_NOTIMPL; + DBPROPSET *propset = NULL; + int i, j, k; + + TRACE("%p %d %p %p %p\n", command, count, propertyidsets, sets_cnt, propertyset); + + /* All Properties */ + if (count == 0) + { + propset = CoTaskMemAlloc(2 * sizeof(DBPROPSET)); + if (!propset) + return E_OUTOFMEMORY; + + propset[0].guidPropertySet = DBPROPSET_ROWSET; + propset[0].cProperties = ROWSET_PROP_COUNT; + propset[0].rgProperties = CoTaskMemAlloc(propset[0].cProperties * sizeof(DBPROP)); + if (!propset[0].rgProperties) + { + CoTaskMemFree(propset); + return E_OUTOFMEMORY; + } + + for (j=0; j < propset[0].cProperties; j++) + { + propset[0].rgProperties[j].dwPropertyID = command->properties[j].property_id; + + V_VT(&propset[0].rgProperties[j].vValue) = command->properties[j].vartype; + if (command->properties[j].vartype == VT_BOOL) + { + V_BOOL(&propset[0].rgProperties[j].vValue) = command->properties[j].bool_val; + } + else if (command->properties[j].vartype == VT_I4) + { + V_I4(&propset[0].rgProperties[j].vValue) = command->properties[j].long_val; + } + else + ERR("Unknown variant type %d\n", command->properties[j].vartype); + } + + propset[1].guidPropertySet = DBPROPSET_PROVIDERROWSET; + propset[1].cProperties = DATASOURCE_PROP_COUNT; + propset[1].rgProperties = CoTaskMemAlloc(propset[1].cProperties * sizeof(DBPROP)); + if (!propset[1].rgProperties) + { + CoTaskMemFree(propset[0].rgProperties); + CoTaskMemFree(propset); + return E_OUTOFMEMORY; + } + + i=0; + for (j=ROWSET_PROP_COUNT; j < ROWSET_PROP_COUNT+propset[1].cProperties; j++) + { + propset[1].rgProperties[i].dwPropertyID = command->properties[j].property_id; + + V_VT(&propset[1].rgProperties[i].vValue) = command->properties[j].vartype; + if (command->properties[j].vartype == VT_BOOL) + { + V_BOOL(&propset[1].rgProperties[i].vValue) = command->properties[j].bool_val; + } + else if (command->properties[j].vartype == VT_I4) + { + V_I4(&propset[1].rgProperties[i].vValue) = command->properties[j].long_val; + } + else + ERR("Unknown variant type %d\n", command->properties[j].vartype); + i++; + } + + *sets_cnt = 2; + } + else + { + propset = CoTaskMemAlloc(count * sizeof(DBPROPSET)); + if (!propset) + return E_OUTOFMEMORY; + + for (i=0; i < count; i++) + { + TRACE("Property id %d (count %d, set %s)\n", i, propertyidsets[i].cPropertyIDs, + debugstr_guid(&propertyidsets[i].guidPropertySet)); + + propset[i].cProperties = propertyidsets[i].cPropertyIDs; + propset[i].rgProperties = CoTaskMemAlloc(propset[i].cProperties * sizeof(DBPROP)); + + for (j=0; j < propset[i].cProperties; j++) + { + propset[i].rgProperties[j].dwPropertyID = propertyidsets[i].rgPropertyIDs[j]; + + for(k = 0; k < ARRAY_SIZE(command->properties); k++) + { + if (command->properties[k].property_id == propertyidsets[i].rgPropertyIDs[j]) + { + V_VT(&propset[i].rgProperties[i].vValue) = command->properties[j].vartype; + if (command->properties[j].vartype == VT_BOOL) + { + V_BOOL(&propset[i].rgProperties[i].vValue) = command->properties[j].bool_val; + } + else if (command->properties[j].vartype == VT_I4) + { + V_I4(&propset[i].rgProperties[i].vValue) = command->properties[j].long_val; + } + else + ERR("Unknown variant type %d\n", command->properties[j].vartype); + break; + } + } + } + } + + *sets_cnt = count; + } + + *propertyset = propset; + + return S_OK; } static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULONG count, @@ -1148,6 +1359,8 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->refs = 1; command->query = NULL; + memcpy(command->properties, msdasql_init_props, sizeof(msdasql_init_props)); + IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index b520b127d67..211116dc382 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -34,6 +34,7 @@ DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); 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); +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); @@ -183,6 +184,149 @@ static void test_Properties(void) IDBProperties_Release(props); } +static void test_command_properties(ICommandProperties *props) +{ + HRESULT hr; + ULONG count; + DBPROPSET *propset; + int i; + + DWORD row_props[68] = { + DBPROP_ABORTPRESERVE, DBPROP_BLOCKINGSTORAGEOBJECTS, DBPROP_BOOKMARKS, DBPROP_BOOKMARKSKIPPED, + DBPROP_BOOKMARKTYPE, DBPROP_CANFETCHBACKWARDS, DBPROP_CANHOLDROWS, DBPROP_CANSCROLLBACKWARDS, + DBPROP_COLUMNRESTRICT, DBPROP_COMMITPRESERVE, DBPROP_DELAYSTORAGEOBJECTS, DBPROP_IMMOBILEROWS, + DBPROP_LITERALBOOKMARKS, DBPROP_LITERALIDENTITY, DBPROP_MAXOPENROWS, DBPROP_MAXPENDINGROWS, + DBPROP_MAXROWS, DBPROP_NOTIFICATIONPHASES, DBPROP_OTHERUPDATEDELETE, DBPROP_OWNINSERT, + DBPROP_OWNUPDATEDELETE, DBPROP_QUICKRESTART, DBPROP_REENTRANTEVENTS, DBPROP_REMOVEDELETED, + DBPROP_REPORTMULTIPLECHANGES, DBPROP_ROWRESTRICT, DBPROP_ROWTHREADMODEL, DBPROP_TRANSACTEDOBJECT, + DBPROP_UPDATABILITY, DBPROP_STRONGIDENTITY, DBPROP_IAccessor, DBPROP_IColumnsInfo, + DBPROP_IColumnsRowset, DBPROP_IConnectionPointContainer, DBPROP_IRowset, DBPROP_IRowsetChange, + DBPROP_IRowsetIdentity, DBPROP_IRowsetInfo, DBPROP_IRowsetLocate, DBPROP_IRowsetResynch, + DBPROP_IRowsetUpdate, DBPROP_ISupportErrorInfo, DBPROP_ISequentialStream, DBPROP_NOTIFYCOLUMNSET, + DBPROP_NOTIFYROWDELETE, DBPROP_NOTIFYROWFIRSTCHANGE, DBPROP_NOTIFYROWINSERT, DBPROP_NOTIFYROWRESYNCH, + DBPROP_NOTIFYROWSETRELEASE, DBPROP_NOTIFYROWSETFETCHPOSITIONCHANGE, DBPROP_NOTIFYROWUNDOCHANGE, DBPROP_NOTIFYROWUNDODELETE, + DBPROP_NOTIFYROWUNDOINSERT, DBPROP_NOTIFYROWUPDATE, DBPROP_CHANGEINSERTEDROWS, DBPROP_RETURNPENDINGINSERTS, + DBPROP_IConvertType, DBPROP_NOTIFICATIONGRANULARITY, DBPROP_IMultipleResults, DBPROP_ACCESSORDER, + DBPROP_BOOKMARKINFO, DBPROP_UNIQUEROWS, DBPROP_IRowsetFind, DBPROP_IRowsetScroll, + DBPROP_IRowsetRefresh, DBPROP_FINDCOMPAREOPS, DBPROP_ORDEREDBOOKMARKS, DBPROP_CLIENTCURSOR + }; + + DWORD prov_props[12] = { + DBPROP_ABORTPRESERVE, DBPROP_ACTIVESESSIONS, DBPROP_ASYNCTXNCOMMIT, DBPROP_AUTH_CACHE_AUTHINFO, + DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROP_AUTH_INTEGRATED, DBPROP_AUTH_MASK_PASSWORD, DBPROP_AUTH_PASSWORD, + DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, DBPROP_BLOCKINGSTORAGEOBJECTS + }; + + hr = ICommandProperties_GetProperties(props, 0, NULL, &count, &propset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 2, "got %d\n", count); + ok(propset[0].cProperties == 68, "got %d\n", propset[0].cProperties); + ok(propset[1].cProperties == 12, "got %d\n", propset[1].cProperties); + + ok(IsEqualGUID(&DBPROPSET_ROWSET, &propset[0].guidPropertySet), "got %s\n", + debugstr_guid(&propset[0].guidPropertySet)); + for (i = 0; i < propset[0].cProperties; i++) + { + ok(propset[0].rgProperties[i].dwPropertyID == row_props[i], "%d: got 0x%08x\n", i, propset[0].rgProperties[i].dwPropertyID); + + switch(propset[0].rgProperties[i].dwPropertyID ) + { + case DBPROP_BOOKMARKTYPE: + case DBPROP_NOTIFICATIONGRANULARITY: + case DBPROP_ACCESSORDER: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 1, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_MAXOPENROWS: + case DBPROP_MAXPENDINGROWS: + case DBPROP_MAXROWS: + case DBPROP_UPDATABILITY: + case DBPROP_BOOKMARKINFO: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 0, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_FINDCOMPAREOPS: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 27, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_NOTIFICATIONPHASES: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 31, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_ROWTHREADMODEL: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 2, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_NOTIFYCOLUMNSET: + case DBPROP_NOTIFYROWDELETE: + case DBPROP_NOTIFYROWFIRSTCHANGE: + case DBPROP_NOTIFYROWINSERT: + case DBPROP_NOTIFYROWRESYNCH: + case DBPROP_NOTIFYROWSETRELEASE: + case DBPROP_NOTIFYROWSETFETCHPOSITIONCHANGE: + case DBPROP_NOTIFYROWUNDOCHANGE: + case DBPROP_NOTIFYROWUNDODELETE: + case DBPROP_NOTIFYROWUNDOINSERT: + case DBPROP_NOTIFYROWUPDATE: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 3, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_BLOCKINGSTORAGEOBJECTS: + case DBPROP_IMMOBILEROWS: + case DBPROP_LITERALIDENTITY: + case DBPROP_REENTRANTEVENTS: + case DBPROP_IAccessor: + case DBPROP_IColumnsInfo: + case DBPROP_IColumnsRowset: + case DBPROP_IRowset: + case DBPROP_IRowsetInfo: + case DBPROP_ISupportErrorInfo: + case DBPROP_CHANGEINSERTEDROWS: + case DBPROP_IConvertType: + case DBPROP_IRowsetScroll: + case DBPROP_IRowsetRefresh: + case DBPROP_ORDEREDBOOKMARKS: + case DBPROP_CLIENTCURSOR: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_BOOL(&propset[0].rgProperties[i].vValue) == VARIANT_TRUE, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + default: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_BOOL(&propset[0].rgProperties[i].vValue) == VARIANT_FALSE, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + } + } + + ok(IsEqualGUID(&DBPROPSET_PROVIDERROWSET, &propset[1].guidPropertySet), "got %s\n", + debugstr_guid(&propset[1].guidPropertySet)); + for (i = 0; i < propset[1].cProperties; i++) + { + ok(propset[1].rgProperties[i].dwPropertyID == prov_props[i], "%d: got 0x%08x\n", i, propset[1].rgProperties[i].dwPropertyID); + + switch(propset[1].rgProperties[i].dwPropertyID ) + { + case DBPROP_AUTH_ENCRYPT_PASSWORD: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + ok(V_I4(&propset[1].rgProperties[i].vValue) == 0, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + case DBPROP_AUTH_INTEGRATED: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + ok(V_I4(&propset[1].rgProperties[i].vValue) == 14, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + case DBPROP_BLOCKINGSTORAGEOBJECTS: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + ok(V_BOOL(&propset[1].rgProperties[i].vValue) == VARIANT_FALSE, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + default: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + ok(V_BOOL(&propset[1].rgProperties[i].vValue) == VARIANT_FALSE, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + } + } + + CoTaskMemFree(propset); +} + static void test_command_interfaces(IUnknown *cmd) { HRESULT hr; @@ -198,6 +342,7 @@ static void test_command_interfaces(IUnknown *cmd) hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); ok(hr == S_OK, "got 0x%08x\n", hr); + test_command_properties(commandProp); ICommandProperties_Release(commandProp); hr = IUnknown_QueryInterface(cmd, &IID_ICommandWithParameters, (void**)&cmdwithparams); -- 2.33.0

1 0

[PATCH resend] ws2_32: Support setting SO_ERROR
by Alex Henrie Nov. 22, 2021

Nov. 22, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This patch was previously assigned to Zeb Figura, but dropped off the patches list without review. --- dlls/ws2_32/socket.c | 4 +--- dlls/ws2_32/tests/sock.c | 10 ++++++++-- include/wine/afd.h | 1 + server/sock.c | 38 +++++++++++++++++++++++++++----------- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..2c2eabc09fa 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2750,9 +2750,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int } case SO_ERROR: - FIXME( "SO_ERROR, stub!\n" ); - SetLastError( WSAENOPROTOOPT ); - return -1; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_ERROR, optval, optlen ); case SO_KEEPALIVE: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02713a7c625..76f4f1ef8a2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1289,7 +1289,6 @@ static void test_set_getsockopt(void) SetLastError(0xdeadbeef); i = 1234; err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); -todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); @@ -1300,7 +1299,14 @@ todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); -todo_wine + ok (i == 1234, "got %d (expected 1234)\n", i); + + SetLastError(0xdeadbeef); + i = 4321; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); ok (i == 1234, "got %d (expected 1234)\n", i); /* Test invalid optlen */ diff --git a/include/wine/afd.h b/include/wine/afd.h index 3b8bdcb9e5d..9382e2acf2f 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -238,6 +238,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_RECVTTL WINE_AFD_IOC(294) #define IOCTL_AFD_WINE_GET_IP_RECVTOS WINE_AFD_IOC(295) #define IOCTL_AFD_WINE_SET_IP_RECVTOS WINE_AFD_IOC(296) +#define IOCTL_AFD_WINE_SET_SO_ERROR WINE_AFD_IOC(297) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index c9b71137c4c..cfb65e0b54c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -191,6 +191,7 @@ struct sock unsigned int message; /* message to send */ obj_handle_t wparam; /* message wparam (socket handle) */ int errors[AFD_POLL_BIT_COUNT]; /* event errors */ + unsigned int last_error; /* most recent error code */ timeout_t connect_time;/* time the socket was connected */ struct sock *deferred; /* socket that waits for a deferred accept */ struct async_queue read_q; /* queue for asynchronous reads */ @@ -963,6 +964,7 @@ static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, i sock->pending_events |= event; sock->reported_events |= event; sock->errors[event_bit] = error; + sock->last_error = sock_get_error( error ); } } @@ -978,6 +980,7 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs { post_socket_event( sock, AFD_POLL_BIT_CONNECT, 0 ); sock->errors[AFD_POLL_BIT_CONNECT_ERR] = 0; + sock->last_error = 0; } if (event & (POLLERR | POLLHUP)) post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, error ); @@ -1441,6 +1444,7 @@ static struct sock *create_socket(void) init_async_queue( &sock->connect_q ); init_async_queue( &sock->poll_q ); memset( sock->errors, 0, sizeof(sock->errors) ); + sock->last_error = 0; list_init( &sock->accept_list ); return sock; } @@ -2675,7 +2679,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { int error; socklen_t len = sizeof(error); - unsigned int i; if (get_reply_max_size() < sizeof(error)) { @@ -2689,19 +2692,32 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } - if (!error) + if (error) + sock->last_error = sock_get_error( error ); + + set_reply_data( &sock->last_error, sizeof(sock->last_error) ); + return; + } + + case IOCTL_AFD_WINE_SET_SO_ERROR: + { + int error; + socklen_t len = sizeof(error); + + if (get_req_data_size() < sizeof(sock->last_error)) { - for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i) - { - if (sock->errors[i]) - { - error = sock_get_error( sock->errors[i] ); - break; - } - } + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + /* clear the native error, if any */ + if (getsockopt( unix_fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len ) < 0) + { + set_error( sock_get_ntstatus( errno ) ); + return; } - set_reply_data( &error, sizeof(error) ); + sock->last_error = *(unsigned int *)get_req_data(); return; } -- 2.34.0

1 0

Re: Attn Packagers: Dependency change from gstreamer-0.10 to gstreamer >= 1.0
by Koko Firstlove Nov. 22, 2021

Nov. 22, 2021

1 0

[PATCH website] website: Remove links to www.linuxforums.org
by Floris Renaud Nov. 22, 2021

Nov. 22, 2021

Since May 2020, the website has been offline. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- templates/en/forums.template | 2 -- templates/fr/forums.template | 2 -- templates/ko/forums.template | 2 -- templates/pl/forums.template | 2 -- templates/pt/forums.template | 2 -- templates/tr/forums.template | 2 -- templates/zh-cn/forums.template | 2 -- 7 files changed, 14 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 61b4531e..85d7a1e2 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -10,8 +10,6 @@ Here are the most useful ones for users: <li>Ubuntu users may also want to visit the <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a> - <li>Users might also want to visit the <a href="http://www.linuxforums.org/forum/wine/">Wine area at Linux Forums</a> - <li>If you want to be notified about new releases, subscribe to the <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce mailing list</a></li> </ul> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index a1ffa884..8786ee78 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -11,8 +11,6 @@ Voici les plus utiles pour les utilisateurs : <li>Les utilisateurs Ubuntu peuvent également visiter l'<a href="http://ubuntuforums.org/forumdisplay.php?f=313">espace Wine des forums Ubuntu</a> - <li>Les utilisateurs peuvent également visiter l'<a href="http://www.linuxforums.org/forum/wine/">espace Wine sur Linux Forums</a> - <li>Si vous voulez être prévenu(e) des nouvelles versions, inscrivez-vous à la <a href="//www.winehq.org/mailman/listinfo/wine-announce">liste de diffusion Wine-Announce</a></li> </ul> diff --git a/templates/ko/forums.template b/templates/ko/forums.template index e932580b..c67f1c1a 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -10,8 +10,6 @@ <li>우분투 사용자라면 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">우분투 포럼의 Wine 게시판</a>을 확인해 보는 것도 추천합니다. - <li><a href="http://www.linuxforums.org/forum/wine/">리눅스 포럼의 Wine 게시판</a>을 확인해 볼 수도 있습니다. - <li>새 릴리스 알림을 받으려면 <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce 메일링 리스트</a>를 구독하십시오.</li> </ul> diff --git a/templates/pl/forums.template b/templates/pl/forums.template index 142b90c7..20f073c0 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -11,8 +11,6 @@ Tutaj wymieniono najbardziej użyteczne dla użytkowników: <li>Użytkownicy Ubuntu mogą takżę odwiedzić <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Dział Wine na forum Ubuntu</a> - <li>Użytkownicy mogą także odwiedzić <a href="http://www.linuxforums.org/forum/wine/">Dział Wine na forum Linuksa</a> - <li>Jeżeli chcesz być powiadamiany o nowych wydaniach, zapisz się do <a href="//www.winehq.org/mailman/listinfo/wine-announce">Zawiadamiająca lista mailingowa Wine</a></li> </ul> diff --git a/templates/pt/forums.template b/templates/pt/forums.template index bd618868..2f9f3c6e 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -12,8 +12,6 @@ Aqui estão as mais úteis para os usuários: <li>Usuários do Ubuntu talvez queiram visitar a <a href="http://ubuntuforums.org/forumdisplay.php?f=313">sessão do Wine nos Fóruns do Ubuntu</a> - <li>Usuários talvez também queiram visitar a <a href="http://www.linuxforums.org/forum/wine/">sessão do Wine nos Fóruns de Linux</a> - <li>Caso você queira ser notificado dos novos lançamentos, inscreva-se na <a href="//www.winehq.org/mailman/listinfo/wine-announce">Lista de anúncios do Wine</a></li> </ul> diff --git a/templates/tr/forums.template b/templates/tr/forums.template index ee8bf648..bf4bbd40 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -10,8 +10,6 @@ <li>Ubuntu kullanıcıları ayrıca <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu Forumları Wine Alanı</a> sayfasını ziyaret etmek isteyebilirler.</li> - <li>Kullanıcılar ayrıca <a href="http://www.linuxforums.org/forum/wine/">Linux Forumları Wine Alanı</a> sayfasını ziyaret etmek isteyebilirler.</li> - <li>Eğer yeni sürümlerden haberdar olmak isterseniz <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine Haber posta listesi</a>ne abone olun.</li> </ul> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 66c56778..8aeab902 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -9,8 +9,6 @@ <li>Ubuntu 用户也许还想去 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu 论坛 Wine 板块</a> - <li>或许您还想去 <a href="http://www.linuxforums.org/forum/wine/">Linux Forums 的 Wine 板块</a> - <li>如果你想被告知最新的发布，请订阅 <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce 邮件列表 </a></li> </ul> -- 2.34.0

1 0

[PATCH website 1/3] website: Add the news button to the Dutch website.
by Floris Renaud Nov. 22, 2021

Nov. 22, 2021

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- templates/nl/home.template | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/templates/nl/home.template b/templates/nl/home.template index ea998c7f..b93cdb9e 100644 --- a/templates/nl/home.template +++ b/templates/nl/home.template @@ -114,6 +114,16 @@ </a> <div class="clear"></div> + <a class="winehq_menu_item appdb" href="{$root}/news"> + + + + + Nieuws + Wat is er laatst gebeurd? + </a> + <div class="clear"></div> + <a class="winehq_menu_item appdb" href="https://appdb.winehq.org"> @@ -166,6 +176,10 @@  - <a href="{$root}/news" class="btn btn-default"> meer nieuws...</a> + + <a href="{$root}/news" class="btn btn-default"> Nieuwsarchief</a> +   + <a href="{$root}/wwn" class="btn btn-default"> World Wine Nieuws</a> + </div> -- 2.34.0

1 2