- wine-devel - winehq.org

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

23 Nov '21

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 23 Nov '21

23 Nov '21

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 23 Nov '21

23 Nov '21

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 23 Nov '21

23 Nov '21

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 23 Nov '21

23 Nov '21

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 23 Nov '21

23 Nov '21

1 0

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

22 Nov '21

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 22 Nov '21

22 Nov '21

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

[website] Remove stray file
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] winecoreaudio.drv: Place output message before return statement.
by Andrey Gusev 22 Nov '21

22 Nov '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 1e37a2a9026..c87aff590e2 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2092,8 +2092,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(*ppv) hr = S_OK; else{ - return E_NOINTERFACE; FIXME("stub %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } end: -- 2.33.1

2 1

[PATCH 7/7] winecoreaudio: Move get_mix_format to the unixlib.
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 246 +++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 256 ++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 9 + 3 files changed, 267 insertions(+), 244 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 3ab80efc4e2..208655d20c6 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -703,9 +703,255 @@ static NTSTATUS release_stream( void *args ) return STATUS_SUCCESS; } +static DWORD ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout) +{ + int i; + DWORD mask = 0; + + for (i = 0; i < layout->mNumberChannelDescriptions; ++i) { + switch (layout->mChannelDescriptions[i].mChannelLabel) { + default: FIXME("Unhandled channel 0x%x\n", + (unsigned int)layout->mChannelDescriptions[i].mChannelLabel); break; + case kAudioChannelLabel_Left: mask |= SPEAKER_FRONT_LEFT; break; + case kAudioChannelLabel_Mono: + case kAudioChannelLabel_Center: mask |= SPEAKER_FRONT_CENTER; break; + case kAudioChannelLabel_Right: mask |= SPEAKER_FRONT_RIGHT; break; + case kAudioChannelLabel_LeftSurround: mask |= SPEAKER_BACK_LEFT; break; + case kAudioChannelLabel_CenterSurround: mask |= SPEAKER_BACK_CENTER; break; + case kAudioChannelLabel_RightSurround: mask |= SPEAKER_BACK_RIGHT; break; + case kAudioChannelLabel_LFEScreen: mask |= SPEAKER_LOW_FREQUENCY; break; + case kAudioChannelLabel_LeftSurroundDirect: mask |= SPEAKER_SIDE_LEFT; break; + case kAudioChannelLabel_RightSurroundDirect: mask |= SPEAKER_SIDE_RIGHT; break; + case kAudioChannelLabel_TopCenterSurround: mask |= SPEAKER_TOP_CENTER; break; + case kAudioChannelLabel_VerticalHeightLeft: mask |= SPEAKER_TOP_FRONT_LEFT; break; + case kAudioChannelLabel_VerticalHeightCenter: mask |= SPEAKER_TOP_FRONT_CENTER; break; + case kAudioChannelLabel_VerticalHeightRight: mask |= SPEAKER_TOP_FRONT_RIGHT; break; + case kAudioChannelLabel_TopBackLeft: mask |= SPEAKER_TOP_BACK_LEFT; break; + case kAudioChannelLabel_TopBackCenter: mask |= SPEAKER_TOP_BACK_CENTER; break; + case kAudioChannelLabel_TopBackRight: mask |= SPEAKER_TOP_BACK_RIGHT; break; + case kAudioChannelLabel_LeftCenter: mask |= SPEAKER_FRONT_LEFT_OF_CENTER; break; + case kAudioChannelLabel_RightCenter: mask |= SPEAKER_FRONT_RIGHT_OF_CENTER; break; + } + } + + return mask; +} + +/* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). Here, we find the nearest configuration that Windows + * would report for a given channel layout. */ +static void convert_channel_layout(const AudioChannelLayout *ca_layout, WAVEFORMATEXTENSIBLE *fmt) +{ + DWORD ca_mask = ca_channel_layout_to_channel_mask(ca_layout); + + TRACE("Got channel mask for CA: 0x%x\n", ca_mask); + + if (ca_layout->mNumberChannelDescriptions == 1) + { + fmt->Format.nChannels = 1; + fmt->dwChannelMask = ca_mask; + return; + } + + /* compare against known configurations and find smallest configuration + * which is a superset of the given speakers */ + + if (ca_layout->mNumberChannelDescriptions <= 2 && + (ca_mask & ~KSAUDIO_SPEAKER_STEREO) == 0) + { + fmt->Format.nChannels = 2; + fmt->dwChannelMask = KSAUDIO_SPEAKER_STEREO; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 4 && + (ca_mask & ~KSAUDIO_SPEAKER_QUAD) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_QUAD; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 4 && + (ca_mask & ~KSAUDIO_SPEAKER_SURROUND) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_SURROUND; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 6 && + (ca_mask & ~KSAUDIO_SPEAKER_5POINT1) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 6 && + (ca_mask & ~KSAUDIO_SPEAKER_5POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1_SURROUND; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 8 && + (ca_mask & ~KSAUDIO_SPEAKER_7POINT1) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 8 && + (ca_mask & ~KSAUDIO_SPEAKER_7POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND; + return; + } + + /* oddball format, report truthfully */ + fmt->Format.nChannels = ca_layout->mNumberChannelDescriptions; + fmt->dwChannelMask = ca_mask; +} + +static DWORD get_channel_mask(unsigned int channels) +{ + switch(channels){ + case 0: + return 0; + case 1: + return KSAUDIO_SPEAKER_MONO; + case 2: + return KSAUDIO_SPEAKER_STEREO; + case 3: + return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; + case 4: + return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ + case 5: + return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; + case 6: + return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ + case 7: + return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; + case 8: + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ + } + FIXME("Unknown speaker configuration: %u\n", channels); + return 0; +} + +static NTSTATUS get_mix_format(void *args) +{ + struct get_mix_format_params *params = args; + AudioObjectPropertyAddress addr; + AudioChannelLayout *layout; + AudioBufferList *buffers; + Float64 rate; + UInt32 size; + OSStatus sc; + int i; + + params->fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + + addr.mScope = get_scope(params->flow); + addr.mElement = 0; + addr.mSelector = kAudioDevicePropertyPreferredChannelLayout; + + sc = AudioObjectGetPropertyDataSize(params->dev_id, &addr, 0, NULL, &size); + if(sc == noErr){ + layout = malloc(size); + sc = AudioObjectGetPropertyData(params->dev_id, &addr, 0, NULL, &size, layout); + if(sc == noErr){ + TRACE("Got channel layout: {tag: 0x%x, bitmap: 0x%x, num_descs: %u}\n", + (unsigned int)layout->mChannelLayoutTag, (unsigned int)layout->mChannelBitmap, + (unsigned int)layout->mNumberChannelDescriptions); + + if(layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelDescriptions){ + convert_channel_layout(layout, params->fmt); + }else{ + WARN("Haven't implemented support for this layout tag: 0x%x, guessing at layout\n", + (unsigned int)layout->mChannelLayoutTag); + params->fmt->Format.nChannels = 0; + } + }else{ + TRACE("Unable to get _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); + params->fmt->Format.nChannels = 0; + } + + free(layout); + }else{ + TRACE("Unable to get size for _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); + params->fmt->Format.nChannels = 0; + } + + if(params->fmt->Format.nChannels == 0){ + addr.mScope = get_scope(params->flow); + addr.mElement = 0; + addr.mSelector = kAudioDevicePropertyStreamConfiguration; + + sc = AudioObjectGetPropertyDataSize(params->dev_id, &addr, 0, NULL, &size); + if(sc != noErr){ + WARN("Unable to get size for _StreamConfiguration property: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + buffers = malloc(size); + if(!buffers){ + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + sc = AudioObjectGetPropertyData(params->dev_id, &addr, 0, NULL, &size, buffers); + if(sc != noErr){ + free(buffers); + WARN("Unable to get _StreamConfiguration property: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + for(i = 0; i < buffers->mNumberBuffers; ++i) + params->fmt->Format.nChannels += buffers->mBuffers[i].mNumberChannels; + + free(buffers); + + params->fmt->dwChannelMask = get_channel_mask(params->fmt->Format.nChannels); + } + + addr.mSelector = kAudioDevicePropertyNominalSampleRate; + size = sizeof(Float64); + sc = AudioObjectGetPropertyData(params->dev_id, &addr, 0, NULL, &size, &rate); + if(sc != noErr){ + WARN("Unable to get _NominalSampleRate property: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + params->fmt->Format.nSamplesPerSec = rate; + + params->fmt->Format.wBitsPerSample = 32; + params->fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + + params->fmt->Format.nBlockAlign = (params->fmt->Format.wBitsPerSample * + params->fmt->Format.nChannels) / 8; + params->fmt->Format.nAvgBytesPerSec = params->fmt->Format.nSamplesPerSec * + params->fmt->Format.nBlockAlign; + + params->fmt->Samples.wValidBitsPerSample = params->fmt->Format.wBitsPerSample; + params->fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, create_stream, release_stream, + get_mix_format, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 572126562c6..7ec282c514d 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -689,32 +689,6 @@ static void dump_fmt(const WAVEFORMATEX *fmt) } } -static DWORD get_channel_mask(unsigned int channels) -{ - switch(channels){ - case 0: - return 0; - case 1: - return KSAUDIO_SPEAKER_MONO; - case 2: - return KSAUDIO_SPEAKER_STEREO; - case 3: - return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; - case 4: - return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ - case 5: - return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; - case 6: - return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ - case 7: - return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; - case 8: - return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ - } - FIXME("Unknown speaker configuration: %u\n", channels); - return 0; -} - static HRESULT ca_get_audiodesc(AudioStreamBasicDescription *desc, const WAVEFORMATEX *fmt) { @@ -1395,134 +1369,11 @@ unsupported: return AUDCLNT_E_UNSUPPORTED_FORMAT; } -static DWORD ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout) -{ - int i; - DWORD mask = 0; - - for (i = 0; i < layout->mNumberChannelDescriptions; ++i) { - switch (layout->mChannelDescriptions[i].mChannelLabel) { - default: FIXME("Unhandled channel 0x%x\n", (unsigned int)layout->mChannelDescriptions[i].mChannelLabel); break; - case kAudioChannelLabel_Left: mask |= SPEAKER_FRONT_LEFT; break; - case kAudioChannelLabel_Mono: - case kAudioChannelLabel_Center: mask |= SPEAKER_FRONT_CENTER; break; - case kAudioChannelLabel_Right: mask |= SPEAKER_FRONT_RIGHT; break; - case kAudioChannelLabel_LeftSurround: mask |= SPEAKER_BACK_LEFT; break; - case kAudioChannelLabel_CenterSurround: mask |= SPEAKER_BACK_CENTER; break; - case kAudioChannelLabel_RightSurround: mask |= SPEAKER_BACK_RIGHT; break; - case kAudioChannelLabel_LFEScreen: mask |= SPEAKER_LOW_FREQUENCY; break; - case kAudioChannelLabel_LeftSurroundDirect: mask |= SPEAKER_SIDE_LEFT; break; - case kAudioChannelLabel_RightSurroundDirect: mask |= SPEAKER_SIDE_RIGHT; break; - case kAudioChannelLabel_TopCenterSurround: mask |= SPEAKER_TOP_CENTER; break; - case kAudioChannelLabel_VerticalHeightLeft: mask |= SPEAKER_TOP_FRONT_LEFT; break; - case kAudioChannelLabel_VerticalHeightCenter: mask |= SPEAKER_TOP_FRONT_CENTER; break; - case kAudioChannelLabel_VerticalHeightRight: mask |= SPEAKER_TOP_FRONT_RIGHT; break; - case kAudioChannelLabel_TopBackLeft: mask |= SPEAKER_TOP_BACK_LEFT; break; - case kAudioChannelLabel_TopBackCenter: mask |= SPEAKER_TOP_BACK_CENTER; break; - case kAudioChannelLabel_TopBackRight: mask |= SPEAKER_TOP_BACK_RIGHT; break; - case kAudioChannelLabel_LeftCenter: mask |= SPEAKER_FRONT_LEFT_OF_CENTER; break; - case kAudioChannelLabel_RightCenter: mask |= SPEAKER_FRONT_RIGHT_OF_CENTER; break; - } - } - - return mask; -} - -/* For most hardware on Windows, users must choose a configuration with an even - * number of channels (stereo, quad, 5.1, 7.1). Users can then disable - * channels, but those channels are still reported to applications from - * GetMixFormat! Some applications behave badly if given an odd number of - * channels (e.g. 2.1). Here, we find the nearest configuration that Windows - * would report for a given channel layout. */ -static void convert_channel_layout(const AudioChannelLayout *ca_layout, WAVEFORMATEXTENSIBLE *fmt) -{ - DWORD ca_mask = ca_channel_layout_to_channel_mask(ca_layout); - - TRACE("Got channel mask for CA: 0x%x\n", ca_mask); - - if (ca_layout->mNumberChannelDescriptions == 1) - { - fmt->Format.nChannels = 1; - fmt->dwChannelMask = ca_mask; - return; - } - - /* compare against known configurations and find smallest configuration - * which is a superset of the given speakers */ - - if (ca_layout->mNumberChannelDescriptions <= 2 && - (ca_mask & ~KSAUDIO_SPEAKER_STEREO) == 0) - { - fmt->Format.nChannels = 2; - fmt->dwChannelMask = KSAUDIO_SPEAKER_STEREO; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 4 && - (ca_mask & ~KSAUDIO_SPEAKER_QUAD) == 0) - { - fmt->Format.nChannels = 4; - fmt->dwChannelMask = KSAUDIO_SPEAKER_QUAD; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 4 && - (ca_mask & ~KSAUDIO_SPEAKER_SURROUND) == 0) - { - fmt->Format.nChannels = 4; - fmt->dwChannelMask = KSAUDIO_SPEAKER_SURROUND; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 6 && - (ca_mask & ~KSAUDIO_SPEAKER_5POINT1) == 0) - { - fmt->Format.nChannels = 6; - fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 6 && - (ca_mask & ~KSAUDIO_SPEAKER_5POINT1_SURROUND) == 0) - { - fmt->Format.nChannels = 6; - fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1_SURROUND; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 8 && - (ca_mask & ~KSAUDIO_SPEAKER_7POINT1) == 0) - { - fmt->Format.nChannels = 8; - fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 8 && - (ca_mask & ~KSAUDIO_SPEAKER_7POINT1_SURROUND) == 0) - { - fmt->Format.nChannels = 8; - fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND; - return; - } - - /* oddball format, report truthfully */ - fmt->Format.nChannels = ca_layout->mNumberChannelDescriptions; - fmt->dwChannelMask = ca_mask; -} - static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, WAVEFORMATEX **pwfx) { ACImpl *This = impl_from_IAudioClient3(iface); - WAVEFORMATEXTENSIBLE *fmt; - OSStatus sc; - UInt32 size; - Float64 rate; - AudioBufferList *buffers; - AudioChannelLayout *layout; - AudioObjectPropertyAddress addr; - int i; + struct get_mix_format_params params; TRACE("(%p)->(%p)\n", This, pwfx); @@ -1530,104 +1381,21 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; - fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); - if(!fmt) + params.dev_id = This->adevid; + params.flow = This->dataflow; + params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!params.fmt) return E_OUTOFMEMORY; - fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; - - addr.mScope = This->scope; - addr.mElement = 0; - addr.mSelector = kAudioDevicePropertyPreferredChannelLayout; - - sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); - if(sc == noErr){ - layout = HeapAlloc(GetProcessHeap(), 0, size); - - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, layout); - if(sc == noErr){ - TRACE("Got channel layout: {tag: 0x%x, bitmap: 0x%x, num_descs: %u}\n", - (unsigned int)layout->mChannelLayoutTag, (unsigned int)layout->mChannelBitmap, - (unsigned int)layout->mNumberChannelDescriptions); - - if(layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelDescriptions){ - convert_channel_layout(layout, fmt); - }else{ - WARN("Haven't implemented support for this layout tag: 0x%x, guessing at layout\n", (unsigned int)layout->mChannelLayoutTag); - fmt->Format.nChannels = 0; - } - }else{ - TRACE("Unable to get _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); - fmt->Format.nChannels = 0; - } - - HeapFree(GetProcessHeap(), 0, layout); - }else{ - TRACE("Unable to get size for _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); - fmt->Format.nChannels = 0; - } - - if(fmt->Format.nChannels == 0){ - addr.mScope = This->scope; - addr.mElement = 0; - addr.mSelector = kAudioDevicePropertyStreamConfiguration; - - sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); - if(sc != noErr){ - CoTaskMemFree(fmt); - WARN("Unable to get size for _StreamConfiguration property: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - buffers = HeapAlloc(GetProcessHeap(), 0, size); - if(!buffers){ - CoTaskMemFree(fmt); - return E_OUTOFMEMORY; - } - - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, - &size, buffers); - if(sc != noErr){ - CoTaskMemFree(fmt); - HeapFree(GetProcessHeap(), 0, buffers); - WARN("Unable to get _StreamConfiguration property: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - fmt->Format.nChannels = 0; - for(i = 0; i < buffers->mNumberBuffers; ++i) - fmt->Format.nChannels += buffers->mBuffers[i].mNumberChannels; - - HeapFree(GetProcessHeap(), 0, buffers); - - fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); - } + UNIX_CALL(get_mix_format, &params); - addr.mSelector = kAudioDevicePropertyNominalSampleRate; - size = sizeof(Float64); - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, &rate); - if(sc != noErr){ - CoTaskMemFree(fmt); - WARN("Unable to get _NominalSampleRate property: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - fmt->Format.nSamplesPerSec = rate; - - fmt->Format.wBitsPerSample = 32; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; - - fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample * - fmt->Format.nChannels) / 8; - fmt->Format.nAvgBytesPerSec = fmt->Format.nSamplesPerSec * - fmt->Format.nBlockAlign; - - fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; - fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); - - *pwfx = (WAVEFORMATEX*)fmt; - dump_fmt(*pwfx); + if(SUCCEEDED(params.result)){ + *pwfx = &params.fmt->Format; + dump_fmt(*pwfx); + }else + CoTaskMemFree(params.fmt); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 7ebdc0b7786..e247b789d55 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -75,11 +75,20 @@ struct release_stream_params HRESULT result; }; +struct get_mix_format_params +{ + EDataFlow flow; + DWORD dev_id; + WAVEFORMATEXTENSIBLE *fmt; + HRESULT result; +}; + enum unix_funcs { unix_get_endpoint_ids, unix_create_stream, unix_release_stream, + unix_get_mix_format, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 6/7] winecoreaudio: Move create_stream and release_stream to the unixlib.
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 464 +++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 304 +++---------------- dlls/winecoreaudio.drv/unixlib.h | 20 ++ 3 files changed, 527 insertions(+), 261 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f3af24f80fb..3ab80efc4e2 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -85,6 +85,30 @@ static HRESULT osstatus_to_hresult(OSStatus sc) return E_FAIL; } +/* copied from kernelbase */ +static int muldiv( int a, int b, int c ) +{ + LONGLONG ret; + + if (!c) return -1; + + /* We want to deal with a positive divisor to simplify the logic. */ + if (c < 0) + { + a = -a; + c = -c; + } + + /* If the result is positive, we "add" to round. else, we subtract to round. */ + if ((a < 0 && b < 0) || (a >= 0 && b >= 0)) + ret = (((LONGLONG)a * b) + (c / 2)) / c; + else + ret = (((LONGLONG)a * b) - (c / 2)) / c; + + if (ret > 2147483647 || ret < -2147483647) return -1; + return ret; +} + static AudioObjectPropertyScope get_scope(EDataFlow flow) { return (flow == eRender) ? kAudioDevicePropertyScopeOutput : kAudioDevicePropertyScopeInput; @@ -241,7 +265,447 @@ static NTSTATUS get_endpoint_ids(void *args) return STATUS_SUCCESS; } +static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) +{ + WAVEFORMATEX *ret; + size_t size; + + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + size = sizeof(WAVEFORMATEXTENSIBLE); + else + size = sizeof(WAVEFORMATEX); + + ret = malloc(size); + if(!ret) + return NULL; + + memcpy(ret, fmt, size); + + ret->cbSize = size - sizeof(WAVEFORMATEX); + + return ret; +} + +static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; + if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * stream->fmt->nBlockAlign); + else + memset(buffer, 0, frames * stream->fmt->nBlockAlign); +} + +/* CA is pulling data from us */ +static OSStatus ca_render_cb(void *user, AudioUnitRenderActionFlags *flags, + const AudioTimeStamp *ts, UInt32 bus, UInt32 nframes, + AudioBufferList *data) +{ + struct coreaudio_stream *stream = user; + UINT32 to_copy_bytes, to_copy_frames, chunk_bytes, lcl_offs_bytes; + + OSSpinLockLock(&stream->lock); + + if(stream->playing){ + lcl_offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; + to_copy_frames = min(nframes, stream->held_frames); + to_copy_bytes = to_copy_frames * stream->fmt->nBlockAlign; + + chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * stream->fmt->nBlockAlign; + + if(to_copy_bytes > chunk_bytes){ + memcpy(data->mBuffers[0].mData, stream->local_buffer + lcl_offs_bytes, chunk_bytes); + memcpy(((BYTE *)data->mBuffers[0].mData) + chunk_bytes, stream->local_buffer, to_copy_bytes - chunk_bytes); + }else + memcpy(data->mBuffers[0].mData, stream->local_buffer + lcl_offs_bytes, to_copy_bytes); + + stream->lcl_offs_frames += to_copy_frames; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->held_frames -= to_copy_frames; + }else + to_copy_bytes = to_copy_frames = 0; + + if(nframes > to_copy_frames) + silence_buffer(stream, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); + + OSSpinLockUnlock(&stream->lock); + + return noErr; +} + +static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, + BYTE *src, UINT32 src_bytes) +{ + UINT32 chunk_bytes = dst_bytes - dst_offs; + + if(chunk_bytes < src_bytes){ + memcpy(dst + dst_offs, src, chunk_bytes); + memcpy(dst, src + chunk_bytes, src_bytes - chunk_bytes); + }else + memcpy(dst + dst_offs, src, src_bytes); +} + +/* we need to trigger CA to pull data from the device and give it to us + * + * raw data from CA is stored in cap_buffer, possibly via wrap_buffer + * + * raw data is resampled from cap_buffer into resamp_buffer in period-size + * chunks and copied to local_buffer + */ +static OSStatus ca_capture_cb(void *user, AudioUnitRenderActionFlags *flags, + const AudioTimeStamp *ts, UInt32 bus, UInt32 nframes, + AudioBufferList *data) +{ + struct coreaudio_stream *stream = user; + AudioBufferList list; + OSStatus sc; + UINT32 cap_wri_offs_frames; + + OSSpinLockLock(&stream->lock); + + cap_wri_offs_frames = (stream->cap_offs_frames + stream->cap_held_frames) % stream->cap_bufsize_frames; + + list.mNumberBuffers = 1; + list.mBuffers[0].mNumberChannels = stream->fmt->nChannels; + list.mBuffers[0].mDataByteSize = nframes * stream->fmt->nBlockAlign; + + if(!stream->playing || cap_wri_offs_frames + nframes > stream->cap_bufsize_frames){ + if(stream->wrap_bufsize_frames < nframes){ + free(stream->wrap_buffer); + stream->wrap_buffer = malloc(list.mBuffers[0].mDataByteSize); + stream->wrap_bufsize_frames = nframes; + } + + list.mBuffers[0].mData = stream->wrap_buffer; + }else + list.mBuffers[0].mData = stream->cap_buffer + cap_wri_offs_frames * stream->fmt->nBlockAlign; + + sc = AudioUnitRender(stream->unit, flags, ts, bus, nframes, &list); + if(sc != noErr){ + OSSpinLockUnlock(&stream->lock); + return sc; + } + + if(stream->playing){ + if(list.mBuffers[0].mData == stream->wrap_buffer){ + ca_wrap_buffer(stream->cap_buffer, + cap_wri_offs_frames * stream->fmt->nBlockAlign, + stream->cap_bufsize_frames * stream->fmt->nBlockAlign, + stream->wrap_buffer, list.mBuffers[0].mDataByteSize); + } + + stream->cap_held_frames += list.mBuffers[0].mDataByteSize / stream->fmt->nBlockAlign; + if(stream->cap_held_frames > stream->cap_bufsize_frames){ + stream->cap_offs_frames += stream->cap_held_frames % stream->cap_bufsize_frames; + stream->cap_offs_frames %= stream->cap_bufsize_frames; + stream->cap_held_frames = stream->cap_bufsize_frames; + } + } + + OSSpinLockUnlock(&stream->lock); + return noErr; +} + +static AudioComponentInstance get_audiounit(EDataFlow dataflow, AudioDeviceID adevid) +{ + AudioComponentInstance unit; + AudioComponent comp; + AudioComponentDescription desc; + OSStatus sc; + + memset(&desc, 0, sizeof(desc)); + desc.componentType = kAudioUnitType_Output; + desc.componentSubType = kAudioUnitSubType_HALOutput; + desc.componentManufacturer = kAudioUnitManufacturer_Apple; + + if(!(comp = AudioComponentFindNext(NULL, &desc))){ + WARN("AudioComponentFindNext failed\n"); + return NULL; + } + + sc = AudioComponentInstanceNew(comp, &unit); + if(sc != noErr){ + WARN("AudioComponentInstanceNew failed: %x\n", (int)sc); + return NULL; + } + + if(dataflow == eCapture){ + UInt32 enableio; + + enableio = 1; + sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, + kAudioUnitScope_Input, 1, &enableio, sizeof(enableio)); + if(sc != noErr){ + WARN("Couldn't enable I/O on input element: %x\n", (int)sc); + AudioComponentInstanceDispose(unit); + return NULL; + } + + enableio = 0; + sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, + kAudioUnitScope_Output, 0, &enableio, sizeof(enableio)); + if(sc != noErr){ + WARN("Couldn't disable I/O on output element: %x\n", (int)sc); + AudioComponentInstanceDispose(unit); + return NULL; + } + } + + sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_CurrentDevice, + kAudioUnitScope_Global, 0, &adevid, sizeof(adevid)); + if(sc != noErr){ + WARN("Couldn't set audio unit device\n"); + AudioComponentInstanceDispose(unit); + return NULL; + } + + return unit; +} + +static void dump_adesc(const char *aux, AudioStreamBasicDescription *desc) +{ + TRACE("%s: mSampleRate: %f\n", aux, desc->mSampleRate); + TRACE("%s: mBytesPerPacket: %u\n", aux, (unsigned int)desc->mBytesPerPacket); + TRACE("%s: mFramesPerPacket: %u\n", aux, (unsigned int)desc->mFramesPerPacket); + TRACE("%s: mBytesPerFrame: %u\n", aux, (unsigned int)desc->mBytesPerFrame); + TRACE("%s: mChannelsPerFrame: %u\n", aux, (unsigned int)desc->mChannelsPerFrame); + TRACE("%s: mBitsPerChannel: %u\n", aux, (unsigned int)desc->mBitsPerChannel); +} + +static HRESULT ca_get_audiodesc(AudioStreamBasicDescription *desc, + const WAVEFORMATEX *fmt) +{ + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; + + desc->mFormatFlags = 0; + + if(fmt->wFormatTag == WAVE_FORMAT_PCM || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ + desc->mFormatID = kAudioFormatLinearPCM; + if(fmt->wBitsPerSample > 8) + desc->mFormatFlags = kAudioFormatFlagIsSignedInteger; + }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ + desc->mFormatID = kAudioFormatLinearPCM; + desc->mFormatFlags = kAudioFormatFlagIsFloat; + }else if(fmt->wFormatTag == WAVE_FORMAT_MULAW || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_MULAW))){ + desc->mFormatID = kAudioFormatULaw; + }else if(fmt->wFormatTag == WAVE_FORMAT_ALAW || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_ALAW))){ + desc->mFormatID = kAudioFormatALaw; + }else + return AUDCLNT_E_UNSUPPORTED_FORMAT; + + desc->mSampleRate = fmt->nSamplesPerSec; + desc->mBytesPerPacket = fmt->nBlockAlign; + desc->mFramesPerPacket = 1; + desc->mBytesPerFrame = fmt->nBlockAlign; + desc->mChannelsPerFrame = fmt->nChannels; + desc->mBitsPerChannel = fmt->wBitsPerSample; + desc->mReserved = 0; + + return S_OK; +} + +static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance unit, + const WAVEFORMATEX *fmt, AudioStreamBasicDescription *dev_desc, + AudioConverterRef *converter) +{ + OSStatus sc; + HRESULT hr; + + if(dataflow == eCapture){ + AudioStreamBasicDescription desc; + UInt32 size; + Float64 rate; + fenv_t fenv; + BOOL fenv_stored = TRUE; + + hr = ca_get_audiodesc(&desc, fmt); + if(FAILED(hr)) + return hr; + dump_adesc("requested", &desc); + + /* input-only units can't perform sample rate conversion, so we have to + * set up our own AudioConverter to support arbitrary sample rates. */ + size = sizeof(*dev_desc); + sc = AudioUnitGetProperty(unit, kAudioUnitProperty_StreamFormat, + kAudioUnitScope_Input, 1, dev_desc, &size); + if(sc != noErr){ + WARN("Couldn't get unit format: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + dump_adesc("hardware", dev_desc); + + rate = dev_desc->mSampleRate; + *dev_desc = desc; + dev_desc->mSampleRate = rate; + + dump_adesc("final", dev_desc); + sc = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, + kAudioUnitScope_Output, 1, dev_desc, sizeof(*dev_desc)); + if(sc != noErr){ + WARN("Couldn't set unit format: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + + /* AudioConverterNew requires divide-by-zero SSE exceptions to be masked */ + if(feholdexcept(&fenv)){ + WARN("Failed to store fenv state\n"); + fenv_stored = FALSE; + } + + sc = AudioConverterNew(dev_desc, &desc, converter); + + if(fenv_stored && fesetenv(&fenv)) + WARN("Failed to restore fenv state\n"); + + if(sc != noErr){ + WARN("Couldn't create audio converter: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + }else{ + hr = ca_get_audiodesc(dev_desc, fmt); + if(FAILED(hr)) + return hr; + + dump_adesc("final", dev_desc); + sc = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, + kAudioUnitScope_Input, 0, dev_desc, sizeof(*dev_desc)); + if(sc != noErr){ + WARN("Couldn't set format: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + } + + return S_OK; +} + +static NTSTATUS create_stream(void *args) +{ + struct create_stream_params *params = args; + struct coreaudio_stream *stream = calloc(1, sizeof(*stream)); + AURenderCallbackStruct input; + OSStatus sc; + + if(!stream){ + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + stream->fmt = clone_format(params->fmt); + if(!stream->fmt){ + params->result = E_OUTOFMEMORY; + goto end; + } + + stream->period_ms = params->period / 10000; + stream->period_frames = muldiv(params->period, stream->fmt->nSamplesPerSec, 10000000); + stream->dev_id = params->dev_id; + stream->flow = params->flow; + stream->share = params->share; + + stream->bufsize_frames = muldiv(params->duration, stream->fmt->nSamplesPerSec, 10000000); + if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE) + stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; + + if(!(stream->unit = get_audiounit(stream->flow, stream->dev_id))){ + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + goto end; + } + + params->result = ca_setup_audiounit(stream->flow, stream->unit, stream->fmt, &stream->dev_desc, &stream->converter); + if(FAILED(params->result)) goto end; + + input.inputProcRefCon = stream; + if(stream->flow == eCapture){ + input.inputProc = ca_capture_cb; + sc = AudioUnitSetProperty(stream->unit, kAudioOutputUnitProperty_SetInputCallback, + kAudioUnitScope_Output, 1, &input, sizeof(input)); + }else{ + input.inputProc = ca_render_cb; + sc = AudioUnitSetProperty(stream->unit, kAudioUnitProperty_SetRenderCallback, + kAudioUnitScope_Input, 0, &input, sizeof(input)); + } + if(sc != noErr){ + WARN("Couldn't set callback: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + goto end; + } + + sc = AudioUnitInitialize(stream->unit); + if(sc != noErr){ + WARN("Couldn't initialize: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + goto end; + } + + /* we play audio continuously because AudioOutputUnitStart sometimes takes + * a while to return */ + sc = AudioOutputUnitStart(stream->unit); + if(sc != noErr){ + WARN("Unit failed to start: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + goto end; + } + + stream->local_buffer_size = stream->bufsize_frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &stream->local_buffer_size, + MEM_COMMIT, PAGE_READWRITE)){ + params->result = E_OUTOFMEMORY; + goto end; + } + silence_buffer(stream, stream->local_buffer, stream->bufsize_frames); + + if(stream->flow == eCapture){ + stream->cap_bufsize_frames = muldiv(params->duration, stream->dev_desc.mSampleRate, 10000000); + stream->cap_buffer = malloc(stream->cap_bufsize_frames * stream->fmt->nBlockAlign); + } + params->result = S_OK; + +end: + if(FAILED(params->result)){ + if(stream->converter) AudioConverterDispose(stream->converter); + if(stream->unit) AudioComponentInstanceDispose(stream->unit); + free(stream->fmt); + free(stream); + } else + params->stream = stream; + + return STATUS_SUCCESS; +} + +static NTSTATUS release_stream( void *args ) +{ + struct release_stream_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(stream->unit){ + AudioOutputUnitStop(stream->unit); + AudioComponentInstanceDispose(stream->unit); + } + + if(stream->converter) AudioConverterDispose(stream->converter); + free(stream->wrap_buffer); + free(stream->cap_buffer); + if(stream->local_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, + &stream->local_buffer_size, MEM_RELEASE); + free(stream->fmt); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, + create_stream, + release_stream, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 0abfebfb1a5..572126562c6 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -138,6 +138,10 @@ struct ACImpl { struct coreaudio_stream *stream; struct list entry; + + /* Temporary */ + BYTE *feed_wrap_buffer; + UINT32 feed_wrap_bufsize_frames; }; static const IAudioClient3Vtbl AudioClient3_Vtbl; @@ -613,7 +617,9 @@ static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct release_stream_params params; ULONG ref; + ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ @@ -627,22 +633,13 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) WaitForSingleObject(event, INFINITE); CloseHandle(event); } - if (This->stream){ - AudioOutputUnitStop(This->stream->unit); - AudioComponentInstanceDispose(This->stream->unit); - if(This->stream->converter) - AudioConverterDispose(This->stream->converter); - HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); - if(This->stream->local_buffer) - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, - &This->stream->local_buffer_size, MEM_RELEASE); + if(This->stream){ if(This->stream->tmp_buffer) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, &This->stream->tmp_buffer_size, MEM_RELEASE); - free(This->stream->wrap_buffer); HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); - CoTaskMemFree(This->stream->fmt); - HeapFree(GetProcessHeap(), 0, This->stream); + params.stream = This->stream; + UNIX_CALL(release_stream, &params); } if(This->session){ EnterCriticalSection(&g_sessions_lock); @@ -650,6 +647,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); + free(This->feed_wrap_buffer); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); HeapFree(GetProcessHeap(), 0, This); @@ -717,27 +715,6 @@ static DWORD get_channel_mask(unsigned int channels) return 0; } -static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) -{ - WAVEFORMATEX *ret; - size_t size; - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - size = sizeof(WAVEFORMATEXTENSIBLE); - else - size = sizeof(WAVEFORMATEX); - - ret = CoTaskMemAlloc(size); - if(!ret) - return NULL; - - memcpy(ret, fmt, size); - - ret->cbSize = size - sizeof(WAVEFORMATEX); - - return ret; -} - static HRESULT ca_get_audiodesc(AudioStreamBasicDescription *desc, const WAVEFORMATEX *fmt) { @@ -881,43 +858,6 @@ static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -/* CA is pulling data from us */ -static OSStatus ca_render_cb(void *user, AudioUnitRenderActionFlags *flags, - const AudioTimeStamp *ts, UInt32 bus, UInt32 nframes, - AudioBufferList *data) -{ - ACImpl *This = user; - UINT32 to_copy_bytes, to_copy_frames, chunk_bytes, lcl_offs_bytes; - - OSSpinLockLock(&This->stream->lock); - - if(This->stream->playing){ - lcl_offs_bytes = This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign; - to_copy_frames = min(nframes, This->stream->held_frames); - to_copy_bytes = to_copy_frames * This->stream->fmt->nBlockAlign; - - chunk_bytes = (This->stream->bufsize_frames - This->stream->lcl_offs_frames) * This->stream->fmt->nBlockAlign; - - if(to_copy_bytes > chunk_bytes){ - memcpy(data->mBuffers[0].mData, This->stream->local_buffer + lcl_offs_bytes, chunk_bytes); - memcpy(((BYTE *)data->mBuffers[0].mData) + chunk_bytes, This->stream->local_buffer, to_copy_bytes - chunk_bytes); - }else - memcpy(data->mBuffers[0].mData, This->stream->local_buffer + lcl_offs_bytes, to_copy_bytes); - - This->stream->lcl_offs_frames += to_copy_frames; - This->stream->lcl_offs_frames %= This->stream->bufsize_frames; - This->stream->held_frames -= to_copy_frames; - }else - to_copy_bytes = to_copy_frames = 0; - - if(nframes > to_copy_frames) - silence_buffer(This->stream, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); - - OSSpinLockUnlock(&This->stream->lock); - - return noErr; -} - static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) { if(left <= right) @@ -945,18 +885,18 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe if(This->stream->cap_offs_frames + *nframes > This->stream->cap_bufsize_frames){ UINT32 chunk_frames = This->stream->cap_bufsize_frames - This->stream->cap_offs_frames; - if(This->stream->wrap_bufsize_frames < *nframes){ - free(This->stream->wrap_buffer); - This->stream->wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); - This->stream->wrap_bufsize_frames = *nframes; + if(This->feed_wrap_bufsize_frames < *nframes){ + free(This->feed_wrap_buffer); + This->feed_wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); + This->feed_wrap_bufsize_frames = *nframes; } - memcpy(This->stream->wrap_buffer, This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign, + memcpy(This->feed_wrap_buffer, This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign, chunk_frames * This->stream->fmt->nBlockAlign); - memcpy(This->stream->wrap_buffer + chunk_frames * This->stream->fmt->nBlockAlign, This->stream->cap_buffer, + memcpy(This->feed_wrap_buffer + chunk_frames * This->stream->fmt->nBlockAlign, This->stream->cap_buffer, (*nframes - chunk_frames) * This->stream->fmt->nBlockAlign); - data->mBuffers[0].mData = This->stream->wrap_buffer; + data->mBuffers[0].mData = This->feed_wrap_buffer; }else data->mBuffers[0].mData = This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign; @@ -1017,67 +957,6 @@ static void capture_resample(ACImpl *This) } } -/* we need to trigger CA to pull data from the device and give it to us - * - * raw data from CA is stored in cap_buffer, possibly via wrap_buffer - * - * raw data is resampled from cap_buffer into resamp_buffer in period-size - * chunks and copied to local_buffer - */ -static OSStatus ca_capture_cb(void *user, AudioUnitRenderActionFlags *flags, - const AudioTimeStamp *ts, UInt32 bus, UInt32 nframes, - AudioBufferList *data) -{ - ACImpl *This = user; - AudioBufferList list; - OSStatus sc; - UINT32 cap_wri_offs_frames; - - OSSpinLockLock(&This->stream->lock); - - cap_wri_offs_frames = (This->stream->cap_offs_frames + This->stream->cap_held_frames) % This->stream->cap_bufsize_frames; - - list.mNumberBuffers = 1; - list.mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - list.mBuffers[0].mDataByteSize = nframes * This->stream->fmt->nBlockAlign; - - if(!This->stream->playing || cap_wri_offs_frames + nframes > This->stream->cap_bufsize_frames){ - if(This->stream->wrap_bufsize_frames < nframes){ - free(This->stream->wrap_buffer); - This->stream->wrap_buffer = malloc(list.mBuffers[0].mDataByteSize); - This->stream->wrap_bufsize_frames = nframes; - } - - list.mBuffers[0].mData = This->stream->wrap_buffer; - }else - list.mBuffers[0].mData = This->stream->cap_buffer + cap_wri_offs_frames * This->stream->fmt->nBlockAlign; - - sc = AudioUnitRender(This->stream->unit, flags, ts, bus, nframes, &list); - if(sc != noErr){ - OSSpinLockUnlock(&This->stream->lock); - return sc; - } - - if(This->stream->playing){ - if(list.mBuffers[0].mData == This->stream->wrap_buffer){ - ca_wrap_buffer(This->stream->cap_buffer, - cap_wri_offs_frames * This->stream->fmt->nBlockAlign, - This->stream->cap_bufsize_frames * This->stream->fmt->nBlockAlign, - This->stream->wrap_buffer, list.mBuffers[0].mDataByteSize); - } - - This->stream->cap_held_frames += list.mBuffers[0].mDataByteSize / This->stream->fmt->nBlockAlign; - if(This->stream->cap_held_frames > This->stream->cap_bufsize_frames){ - This->stream->cap_offs_frames += This->stream->cap_held_frames % This->stream->cap_bufsize_frames; - This->stream->cap_offs_frames %= This->stream->cap_bufsize_frames; - This->stream->cap_held_frames = This->stream->cap_bufsize_frames; - } - } - - OSSpinLockUnlock(&This->stream->lock); - return noErr; -} - static void dump_adesc(const char *aux, AudioStreamBasicDescription *desc) { TRACE("%s: mSampleRate: %f\n", aux, desc->mSampleRate); @@ -1168,9 +1047,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); - struct coreaudio_stream *stream; - HRESULT hr; - OSStatus sc; + struct release_stream_params release_params; + struct create_stream_params params; UINT32 i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, @@ -1233,146 +1111,50 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*stream)); - if(!stream){ - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; - } - - stream->fmt = clone_format(fmt); - if(!stream->fmt){ - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; - } - - stream->period_ms = period / 10000; - stream->period_frames = MulDiv(period, stream->fmt->nSamplesPerSec, 10000000); - - stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); - if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; - - if(!(stream->unit = get_audiounit(This->dataflow, This->adevid))){ - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_DEVICE_INVALIDATED; - } - - hr = ca_setup_audiounit(This->dataflow, stream->unit, stream->fmt, &stream->dev_desc, &stream->converter); - if(FAILED(hr)){ - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return hr; - } - - if(This->dataflow == eCapture){ - AURenderCallbackStruct input; - - memset(&input, 0, sizeof(input)); - input.inputProc = &ca_capture_cb; - input.inputProcRefCon = This; - - sc = AudioUnitSetProperty(stream->unit, kAudioOutputUnitProperty_SetInputCallback, - kAudioUnitScope_Output, 1, &input, sizeof(input)); - if(sc != noErr){ - WARN("Couldn't set callback: %x\n", (int)sc); - AudioConverterDispose(stream->converter); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return osstatus_to_hresult(sc); - } - }else{ - AURenderCallbackStruct input; - - memset(&input, 0, sizeof(input)); - input.inputProc = &ca_render_cb; - input.inputProcRefCon = This; - - sc = AudioUnitSetProperty(stream->unit, kAudioUnitProperty_SetRenderCallback, - kAudioUnitScope_Input, 0, &input, sizeof(input)); - if(sc != noErr){ - WARN("Couldn't set callback: %x\n", (int)sc); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return osstatus_to_hresult(sc); - } - } + params.dev_id = This->adevid; + params.flow = This->dataflow; + params.share = mode; + params.duration = duration; + params.period = period; + params.fmt = fmt; - sc = AudioUnitInitialize(stream->unit); - if(sc != noErr){ - WARN("Couldn't initialize: %x\n", (int)sc); - if(stream->converter) - AudioConverterDispose(stream->converter); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return osstatus_to_hresult(sc); - } - - /* we play audio continuously because AudioOutputUnitStart sometimes takes - * a while to return */ - sc = AudioOutputUnitStart(stream->unit); - if(sc != noErr){ - WARN("Unit failed to start: %x\n", (int)sc); - if(stream->converter) - AudioConverterDispose(stream->converter); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return osstatus_to_hresult(sc); - } - - stream->local_buffer_size = stream->bufsize_frames * fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, - &stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); - silence_buffer(stream, stream->local_buffer, stream->bufsize_frames); - - if(This->dataflow == eCapture){ - stream->cap_bufsize_frames = MulDiv(duration, stream->dev_desc.mSampleRate, 10000000); - stream->cap_buffer = HeapAlloc(GetProcessHeap(), 0, stream->cap_bufsize_frames * stream->fmt->nBlockAlign); - } + UNIX_CALL(create_stream, &params); + if(FAILED(params.result)) goto end; - stream->share = mode; This->flags = flags; This->channel_count = fmt->nChannels; This->period_ms = period / 10000; This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; + params.result = E_OUTOFMEMORY; + goto end; } for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, - &This->session); - if(FAILED(hr)){ - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - HeapFree(GetProcessHeap(), 0, This->vols); - This->vols = NULL; - LeaveCriticalSection(&g_sessions_lock); - return E_INVALIDARG; - } + params.result = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); + if(FAILED(params.result)) goto end; list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, stream, -1); + ca_setvol(This, params.stream, -1); - This->stream = stream; +end: + if(FAILED(params.result)){ + if(params.stream){ + release_params.stream = This->stream; + UNIX_CALL(release_stream, &release_params); + } + HeapFree(GetProcessHeap(), 0, This->vols); + This->vols = NULL; + }else + This->stream = params.stream; LeaveCriticalSection(&g_sessions_lock); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 1b773b7f820..7ebdc0b7786 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -57,9 +57,29 @@ struct get_endpoint_ids_params unsigned int default_idx; }; +struct create_stream_params +{ + DWORD dev_id; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + REFERENCE_TIME duration; + REFERENCE_TIME period; + const WAVEFORMATEX *fmt; + HRESULT result; + struct coreaudio_stream *stream; +}; + +struct release_stream_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + enum unix_funcs { unix_get_endpoint_ids, + unix_create_stream, + unix_release_stream, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 5/7] winecoreaudio: Use the presence of stream to indicate the init state.
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 211 +++++++++++++----------------- 1 file changed, 93 insertions(+), 118 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 1e678b08c5b..0abfebfb1a5 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -129,7 +129,6 @@ struct ACImpl { HANDLE event; float *vols; - BOOL initted; AudioDeviceID adevid; AudioObjectPropertyScope scope; HANDLE timer; @@ -541,11 +540,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; - This->stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); - if(!This->stream){ - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; @@ -561,16 +555,12 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient else if(dataflow == eCapture) This->scope = kAudioDevicePropertyScopeInput; else{ - HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); return E_INVALIDARG; } - This->stream->lock = 0; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); return hr; } @@ -637,29 +627,31 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) WaitForSingleObject(event, INFINITE); CloseHandle(event); } - AudioOutputUnitStop(This->stream->unit); - AudioComponentInstanceDispose(This->stream->unit); - if(This->stream->converter) - AudioConverterDispose(This->stream->converter); + if (This->stream){ + AudioOutputUnitStop(This->stream->unit); + AudioComponentInstanceDispose(This->stream->unit); + if(This->stream->converter) + AudioConverterDispose(This->stream->converter); + HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); + if(This->stream->local_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, + &This->stream->local_buffer_size, MEM_RELEASE); + if(This->stream->tmp_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, + &This->stream->tmp_buffer_size, MEM_RELEASE); + free(This->stream->wrap_buffer); + HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); + CoTaskMemFree(This->stream->fmt); + HeapFree(GetProcessHeap(), 0, This->stream); + } if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); - if(This->stream->local_buffer) - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, - &This->stream->local_buffer_size, MEM_RELEASE); - if(This->stream->tmp_buffer) - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, - &This->stream->tmp_buffer_size, MEM_RELEASE); - free(This->stream->wrap_buffer); - HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); - CoTaskMemFree(This->stream->fmt); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); - HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -1176,6 +1168,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); + struct coreaudio_stream *stream; HRESULT hr; OSStatus sc; UINT32 i; @@ -1235,40 +1228,42 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, EnterCriticalSection(&g_sessions_lock); - if(This->initted){ + if(This->stream){ LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; } - OSSpinLockLock(&This->stream->lock); + stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*stream)); + if(!stream){ + LeaveCriticalSection(&g_sessions_lock); + return E_OUTOFMEMORY; + } - This->stream->fmt = clone_format(fmt); - if(!This->stream->fmt){ - OSSpinLockUnlock(&This->stream->lock); + stream->fmt = clone_format(fmt); + if(!stream->fmt){ + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } - This->stream->period_ms = period / 10000; - This->stream->period_frames = MulDiv(period, This->stream->fmt->nSamplesPerSec, 10000000); + stream->period_ms = period / 10000; + stream->period_frames = MulDiv(period, stream->fmt->nSamplesPerSec, 10000000); - This->stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - This->stream->bufsize_frames -= This->stream->bufsize_frames % This->stream->period_frames; + stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; - if(!(This->stream->unit = get_audiounit(This->dataflow, This->adevid))){ - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + if(!(stream->unit = get_audiounit(This->dataflow, This->adevid))){ + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_DEVICE_INVALIDATED; } - hr = ca_setup_audiounit(This->dataflow, This->stream->unit, This->stream->fmt, &This->stream->dev_desc, &This->stream->converter); + hr = ca_setup_audiounit(This->dataflow, stream->unit, stream->fmt, &stream->dev_desc, &stream->converter); if(FAILED(hr)){ - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return hr; } @@ -1280,15 +1275,13 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, input.inputProc = &ca_capture_cb; input.inputProcRefCon = This; - sc = AudioUnitSetProperty(This->stream->unit, kAudioOutputUnitProperty_SetInputCallback, + sc = AudioUnitSetProperty(stream->unit, kAudioOutputUnitProperty_SetInputCallback, kAudioUnitScope_Output, 1, &input, sizeof(input)); if(sc != noErr){ WARN("Couldn't set callback: %x\n", (int)sc); - AudioConverterDispose(This->stream->converter); - This->stream->converter = NULL; - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + AudioConverterDispose(stream->converter); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } @@ -1299,68 +1292,60 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, input.inputProc = &ca_render_cb; input.inputProcRefCon = This; - sc = AudioUnitSetProperty(This->stream->unit, kAudioUnitProperty_SetRenderCallback, + sc = AudioUnitSetProperty(stream->unit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, 0, &input, sizeof(input)); if(sc != noErr){ WARN("Couldn't set callback: %x\n", (int)sc); - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } } - sc = AudioUnitInitialize(This->stream->unit); + sc = AudioUnitInitialize(stream->unit); if(sc != noErr){ WARN("Couldn't initialize: %x\n", (int)sc); - if(This->stream->converter){ - AudioConverterDispose(This->stream->converter); - This->stream->converter = NULL; - } - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + if(stream->converter) + AudioConverterDispose(stream->converter); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } /* we play audio continuously because AudioOutputUnitStart sometimes takes * a while to return */ - sc = AudioOutputUnitStart(This->stream->unit); + sc = AudioOutputUnitStart(stream->unit); if(sc != noErr){ WARN("Unit failed to start: %x\n", (int)sc); - if(This->stream->converter){ - AudioConverterDispose(This->stream->converter); - This->stream->converter = NULL; - } - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + if(stream->converter) + AudioConverterDispose(stream->converter); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } - This->stream->local_buffer_size = This->stream->bufsize_frames * fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, 0, - &This->stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); - silence_buffer(This->stream, This->stream->local_buffer, This->stream->bufsize_frames); + stream->local_buffer_size = stream->bufsize_frames * fmt->nBlockAlign; + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, + &stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); + silence_buffer(stream, stream->local_buffer, stream->bufsize_frames); if(This->dataflow == eCapture){ - This->stream->cap_bufsize_frames = MulDiv(duration, This->stream->dev_desc.mSampleRate, 10000000); - This->stream->cap_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->cap_bufsize_frames * This->stream->fmt->nBlockAlign); + stream->cap_bufsize_frames = MulDiv(duration, stream->dev_desc.mSampleRate, 10000000); + stream->cap_buffer = HeapAlloc(GetProcessHeap(), 0, stream->cap_bufsize_frames * stream->fmt->nBlockAlign); } - This->stream->share = mode; + stream->share = mode; This->flags = flags; This->channel_count = fmt->nChannels; This->period_ms = period / 10000; This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1371,22 +1356,20 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); if(FAILED(hr)){ - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; - OSSpinLockUnlock(&This->stream->lock); LeaveCriticalSection(&g_sessions_lock); return E_INVALIDARG; } list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, This->stream, -1); + ca_setvol(This, stream, -1); - This->initted = TRUE; + This->stream = stream; - OSSpinLockUnlock(&This->stream->lock); LeaveCriticalSection(&g_sessions_lock); return S_OK; @@ -1402,12 +1385,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!frames) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + OSSpinLockLock(&This->stream->lock); *frames = This->stream->bufsize_frames; @@ -1484,12 +1465,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!out) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + OSSpinLockLock(&This->stream->lock); addr.mScope = This->scope; addr.mSelector = kAudioDevicePropertyLatency; @@ -1524,7 +1503,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, UINT32 *numpad) { - if(!This->initted) + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; if(This->dataflow == eCapture) @@ -1546,6 +1525,9 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!numpad) return E_POINTER; + if(!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + OSSpinLockLock(&This->stream->lock); hr = AudioClient_GetCurrentPadding_nolock(This, numpad); @@ -1898,12 +1880,10 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->stream->lock); - - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + OSSpinLockLock(&This->stream->lock); if(This->stream->playing){ OSSpinLockUnlock(&This->stream->lock); @@ -1937,12 +1917,10 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->stream->lock); - - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + OSSpinLockLock(&This->stream->lock); if(!This->stream->playing){ OSSpinLockUnlock(&This->stream->lock); @@ -1962,12 +1940,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->stream->lock); - - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + OSSpinLockLock(&This->stream->lock); if(This->stream->playing){ OSSpinLockUnlock(&This->stream->lock); @@ -2007,11 +1983,12 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!event) return E_INVALIDARG; + if(!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + EnterCriticalSection(&g_sessions_lock); - if(!This->initted) - hr = AUDCLNT_E_NOT_INITIALIZED; - else if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) + if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) hr = AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; else if(This->event){ FIXME("called twice\n"); @@ -2036,12 +2013,10 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - EnterCriticalSection(&g_sessions_lock); + if(!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; - if(!This->initted){ - hr = AUDCLNT_E_NOT_INITIALIZED; - goto end; - } + EnterCriticalSection(&g_sessions_lock); if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ -- 2.23.0

2 1

[PATCH 4/7] winecoreaudio: Pass the stream separately to ca_setvol().
by Huw Davies 22 Nov '21

22 Nov '21

This is a temporary measure that will enable the client volumes to be initialized without having the stream set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index abe77d11ee9..1e678b08c5b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -178,7 +178,7 @@ static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); -static HRESULT ca_setvol(ACImpl *This, UINT32 index); +static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index); static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { @@ -1382,7 +1382,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, -1); + ca_setvol(This, This->stream, -1); This->initted = TRUE; @@ -2978,7 +2978,7 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = }; /* index == -1 means set all channels, otherwise sets only the given channel */ -static HRESULT ca_setvol(ACImpl *This, UINT32 index) +static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index) { Float32 level; OSStatus sc; @@ -2989,7 +2989,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) if(index == (UINT32)-1){ UINT32 i; level = 1.; - for(i = 0; i < This->stream->fmt->nChannels; ++i){ + for(i = 0; i < stream->fmt->nChannels; ++i){ Float32 tmp; tmp = This->session->master_vol * This->session->channel_vols[i] * This->vols[i]; @@ -3000,7 +3000,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) This->session->channel_vols[index] * This->vols[index]; } - sc = AudioUnitSetParameter(This->stream->unit, kHALOutputParam_Volume, + sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, level, 0); if(sc != noErr) WARN("Couldn't set volume: %x\n", (int)sc); @@ -3015,7 +3015,7 @@ static HRESULT ca_session_setvol(AudioSession *session, UINT32 index) LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry){ HRESULT hr; - hr = ca_setvol(client, index); + hr = ca_setvol(client, client->stream, index); if(FAILED(hr)) ret = hr; } @@ -3214,7 +3214,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); - ret = ca_setvol(This, index); + ret = ca_setvol(This, This->stream, index); LeaveCriticalSection(&g_sessions_lock); @@ -3259,7 +3259,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; - ret = ca_setvol(This, -1); + ret = ca_setvol(This, This->stream, -1); LeaveCriticalSection(&g_sessions_lock); -- 2.23.0

2 1

[PATCH 3/7] winecoreaudio: Pass the stream directly to silence_buffer().
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 56f533f8bc1..abe77d11ee9 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -877,16 +877,16 @@ static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, memcpy(dst + dst_offs, src, src_bytes); } -static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->stream->fmt; - if((This->stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * This->stream->fmt->nBlockAlign); +static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; + if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * stream->fmt->nBlockAlign); else - memset(buffer, 0, frames * This->stream->fmt->nBlockAlign); + memset(buffer, 0, frames * stream->fmt->nBlockAlign); } /* CA is pulling data from us */ @@ -919,7 +919,7 @@ static OSStatus ca_render_cb(void *user, AudioUnitRenderActionFlags *flags, to_copy_bytes = to_copy_frames = 0; if(nframes > to_copy_frames) - silence_buffer(This, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); + silence_buffer(This->stream, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); OSSpinLockUnlock(&This->stream->lock); @@ -1344,7 +1344,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->stream->local_buffer_size = This->stream->bufsize_frames * fmt->nBlockAlign; NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, 0, &This->stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); - silence_buffer(This, This->stream->local_buffer, This->stream->bufsize_frames); + silence_buffer(This->stream, This->stream->local_buffer, This->stream->bufsize_frames); if(This->dataflow == eCapture){ This->stream->cap_bufsize_frames = MulDiv(duration, This->stream->dev_desc.mSampleRate, 10000000); @@ -2318,7 +2318,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->stream->getbuf_last = frames; } - silence_buffer(This, *data, frames); + silence_buffer(This->stream, *data, frames); OSSpinLockUnlock(&This->stream->lock); @@ -2357,7 +2357,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( buffer = This->stream->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This, buffer, frames); + silence_buffer(This->stream, buffer, frames); if(This->stream->getbuf_last < 0) ca_wrap_buffer(This->stream->local_buffer, -- 2.23.0

2 1

[PATCH 2/7] winecoreaudio: Move creation of the audio unit to IAudioClient_Initialize().
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 642610b4b60..56f533f8bc1 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -580,12 +580,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->adevid = adevid; - if(!(This->stream->unit = get_audiounit(This->dataflow, This->adevid))){ - HeapFree(GetProcessHeap(), 0, This->stream); - HeapFree(GetProcessHeap(), 0, This); - return AUDCLNT_E_DEVICE_INVALIDATED; - } - *out = (IAudioClient *)&This->IAudioClient3_iface; IAudioClient3_AddRef(&This->IAudioClient3_iface); @@ -1262,6 +1256,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) This->stream->bufsize_frames -= This->stream->bufsize_frames % This->stream->period_frames; + if(!(This->stream->unit = get_audiounit(This->dataflow, This->adevid))){ + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + hr = ca_setup_audiounit(This->dataflow, This->stream->unit, This->stream->fmt, &This->stream->dev_desc, &This->stream->converter); if(FAILED(hr)){ CoTaskMemFree(This->stream->fmt); -- 2.23.0

2 1

[PATCH 1/7] winecoreaudio: Use NtAllocateVirtualMemory() for local and tmp buffers.
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 28 ++++++++++++++++++++-------- dlls/winecoreaudio.drv/unixlib.h | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 1e37a2a9026..642610b4b60 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -653,9 +653,13 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->stream->tmp_buffer); HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); - HeapFree(GetProcessHeap(), 0, This->stream->local_buffer); + if(This->stream->local_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, + &This->stream->local_buffer_size, MEM_RELEASE); + if(This->stream->tmp_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, + &This->stream->tmp_buffer_size, MEM_RELEASE); free(This->stream->wrap_buffer); HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); CoTaskMemFree(This->stream->fmt); @@ -1335,7 +1339,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return osstatus_to_hresult(sc); } - This->stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->bufsize_frames * fmt->nBlockAlign); + This->stream->local_buffer_size = This->stream->bufsize_frames * fmt->nBlockAlign; + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, 0, + &This->stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); silence_buffer(This, This->stream->local_buffer, This->stream->bufsize_frames); if(This->dataflow == eCapture){ @@ -2292,9 +2298,12 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, if(This->stream->wri_offs_frames + frames > This->stream->bufsize_frames){ if(This->stream->tmp_buffer_frames < frames){ - HeapFree(GetProcessHeap(), 0, This->stream->tmp_buffer); - This->stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, frames * This->stream->fmt->nBlockAlign); - if(!This->stream->tmp_buffer){ + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, + &This->stream->tmp_buffer_size, MEM_RELEASE); + This->stream->tmp_buffer_size = frames * This->stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, + &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ + This->stream->tmp_buffer_frames = 0; OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } @@ -2449,8 +2458,11 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, chunk_frames = This->stream->bufsize_frames - This->stream->lcl_offs_frames; if(chunk_frames < This->stream->period_frames){ chunk_bytes = chunk_frames * This->stream->fmt->nBlockAlign; - if(!This->stream->tmp_buffer) - This->stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->period_frames * This->stream->fmt->nBlockAlign); + if(!This->stream->tmp_buffer){ + This->stream->tmp_buffer_size = This->stream->period_frames * This->stream->fmt->nBlockAlign; + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, + &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); + } *data = This->stream->tmp_buffer; memcpy(*data, This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign, chunk_bytes); memcpy((*data) + chunk_bytes, This->stream->local_buffer, This->stream->period_frames * This->stream->fmt->nBlockAlign - chunk_bytes); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 6a991f1de98..1b773b7f820 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -29,7 +29,6 @@ struct coreaudio_stream /* To be made private */ AUDCLNT_SHAREMODE share; BOOL playing; - SIZE_T local_buffer_size, tmp_buffer_size; UINT32 period_ms, period_frames; UINT32 bufsize_frames, resamp_bufsize_frames; UINT32 lcl_offs_frames, held_frames, wri_offs_frames, tmp_buffer_frames; @@ -39,6 +38,7 @@ struct coreaudio_stream /* To be made private */ INT32 getbuf_last; WAVEFORMATEX *fmt; BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; + SIZE_T local_buffer_size, tmp_buffer_size; }; struct endpoint -- 2.23.0

2 1

[PATCH 1/6] wined3d: Move the "buffer_offset" field to struct wined3d_bo.
by Zebediah Figura 22 Nov '21

22 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 14 +++++++------- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/context_gl.c | 8 ++++---- dlls/wined3d/context_vk.c | 10 +++++----- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 3 +-- 9 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e6f5bf108c7..f9a31265cd3 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1011,7 +1011,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = bo->vk_buffer; - vk_barrier.offset = bo->buffer_offset + (uintptr_t)data->addr; + vk_barrier.offset = bo->b.buffer_offset + (uintptr_t)data->addr; vk_barrier.size = size; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); @@ -1113,8 +1113,8 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, src_access_mask = vk_access_mask_from_buffer_usage(src_bo->usage); dst_access_mask = vk_access_mask_from_buffer_usage(dst_bo->usage); - region.srcOffset = src_bo->buffer_offset + (uintptr_t)src->addr; - region.dstOffset = dst_bo->buffer_offset + (uintptr_t)dst->addr; + region.srcOffset = src_bo->b.buffer_offset + (uintptr_t)src->addr; + region.dstOffset = dst_bo->b.buffer_offset + (uintptr_t)dst->addr; region.size = size; vk_barrier[0].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; @@ -1781,7 +1781,7 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, for (i = 0; i < ARRAY_SIZE(context_vk->vk_so_counters); ++i) { context_vk->vk_so_counters[i] = bo->vk_buffer; - context_vk->vk_so_offsets[i] = bo->buffer_offset + i * sizeof(uint32_t) * 2; + context_vk->vk_so_offsets[i] = bo->b.buffer_offset + i * sizeof(uint32_t) * 2; } } @@ -1805,13 +1805,13 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, { stride = sizeof(VkDrawIndexedIndirectCommand); VK_CALL(vkCmdDrawIndexedIndirect(vk_command_buffer, bo->vk_buffer, - bo->buffer_offset + parameters->u.indirect.offset, size / stride, stride)); + bo->b.buffer_offset + parameters->u.indirect.offset, size / stride, stride)); } else { stride = sizeof(VkDrawIndirectCommand); VK_CALL(vkCmdDrawIndirect(vk_command_buffer, bo->vk_buffer, - bo->buffer_offset + parameters->u.indirect.offset, size / stride, stride)); + bo->b.buffer_offset + parameters->u.indirect.offset, size / stride, stride)); } } else @@ -1871,7 +1871,7 @@ static void adapter_vk_dispatch_compute(struct wined3d_device *device, wined3d_context_vk_reference_bo(context_vk, bo); VK_CALL(vkCmdDispatchIndirect(vk_command_buffer, bo->vk_buffer, - bo->buffer_offset + parameters->u.indirect.offset)); + bo->b.buffer_offset + parameters->u.indirect.offset)); } else { diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 315ea05260e..d3aeb2e76f4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1521,7 +1521,7 @@ const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_b return &buffer_vk->buffer_info; buffer_vk->buffer_info.buffer = bo->vk_buffer; - buffer_vk->buffer_info.offset = bo->buffer_offset; + buffer_vk->buffer_info.offset = bo->b.buffer_offset; buffer_vk->buffer_info.range = buffer_vk->b.resource.size; buffer_vk->b.bo_user.valid = true; @@ -1702,7 +1702,7 @@ void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = bo->vk_buffer; - vk_barrier.offset = bo->buffer_offset; + vk_barrier.offset = bo->b.buffer_offset; vk_barrier.size = buffer_vk->b.resource.size; VK_CALL(vkCmdPipelineBarrier(wined3d_context_vk_get_command_buffer(context_vk), vk_pipeline_stage_mask_from_bind_flags(src_bind_mask), diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2751a4a2182..69eb13f3027 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2922,7 +2922,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei list_init(&bo->b.users); bo->command_fence_id = 0; bo->b.memory_offset = 0; - bo->buffer_offset = 0; + bo->b.buffer_offset = 0; bo->b.map_ptr = NULL; return true; @@ -3789,7 +3789,7 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex if (view_gl->counter_bo.id) GL_EXTCALL(glBindBufferRange(GL_ATOMIC_COUNTER_BUFFER, i, view_gl->counter_bo.id, - view_gl->counter_bo.buffer_offset, view_gl->counter_bo.size)); + view_gl->counter_bo.b.buffer_offset, view_gl->counter_bo.size)); } checkGLcall("Bind unordered access views"); } @@ -4915,7 +4915,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!bo || !stream_info->all_vbo) idx_data = index_buffer->resource.heap_memory; else - idx_data = (void *)wined3d_bo_gl(bo)->buffer_offset; + idx_data = (void *)bo->buffer_offset; idx_data = (const BYTE *)idx_data + state->index_offset; if (state->index_format == WINED3DFMT_R16_UINT) @@ -5077,7 +5077,7 @@ static const void *get_vertex_attrib_pointer(const struct wined3d_stream_info_el const uint8_t *offset = element->data.addr + state->load_base_vertex_index * element->stride; if (element->data.buffer_object) - offset += wined3d_bo_gl(element->data.buffer_object)->buffer_offset; + offset += element->data.buffer_object->buffer_offset; return offset; } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ec3554ddc30..56b2da53060 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -456,8 +456,8 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context *bo = slab->bo; bo->memory = NULL; bo->slab = slab; - bo->buffer_offset = idx * object_size; - bo->b.memory_offset = slab->bo.b.memory_offset + bo->buffer_offset; + bo->b.buffer_offset = idx * object_size; + bo->b.memory_offset = slab->bo.b.memory_offset + bo->b.buffer_offset; bo->size = size; list_init(&bo->b.users); bo->command_buffer_id = 0; @@ -465,7 +465,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context TRACE("Using buffer 0x%s, memory 0x%s, offset 0x%s for bo %p.\n", wine_dbgstr_longlong(bo->vk_buffer), wine_dbgstr_longlong(bo->vk_memory), - wine_dbgstr_longlong(bo->buffer_offset), bo); + wine_dbgstr_longlong(bo->b.buffer_offset), bo); return true; } @@ -534,7 +534,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic } bo->b.map_ptr = NULL; - bo->buffer_offset = 0; + bo->b.buffer_offset = 0; bo->size = size; bo->usage = usage; bo->memory_type = adapter_vk->memory_properties.memoryTypes[memory_type_idx].propertyFlags; @@ -961,7 +961,7 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const if (bo->b.map_ptr) wined3d_bo_slab_vk_unmap(slab_vk, context_vk); object_size = slab_vk->bo.size / 32; - idx = bo->buffer_offset / object_size; + idx = bo->b.buffer_offset / object_size; wined3d_context_vk_destroy_bo_slab_slice(context_vk, slab_vk, idx, bo->command_buffer_id); return; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c5de58c29c9..7fb8a7ec3a6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -657,9 +657,9 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (!wined3d_context_vk_create_bo(context_vk, 16, usage, memory_type, &r->bo)) return false; - VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); + VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.b.buffer_offset, r->bo.size, 0x00000000u)); r->buffer_info.buffer = r->bo.vk_buffer; - r->buffer_info.offset = r->bo.buffer_offset; + r->buffer_info.offset = r->bo.b.buffer_offset; r->buffer_info.range = r->bo.size; if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1, 1)) @@ -735,7 +735,7 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st buffer_create_info.flags = 0; buffer_create_info.buffer = r->bo.vk_buffer; buffer_create_info.format = VK_FORMAT_R32_UINT; - buffer_create_info.offset = r->bo.buffer_offset; + buffer_create_info.offset = r->bo.b.buffer_offset; buffer_create_info.range = r->bo.size; if ((vr = VK_CALL(vkCreateBufferView(device_vk->vk_device, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e0dba8701bc..c76e0c2b604 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4600,7 +4600,7 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state buffer = buffer_state->buffer; bo_gl = wined3d_bo_gl(buffer->buffer_object); GL_EXTCALL(glBindBufferRange(GL_UNIFORM_BUFFER, base + i, - bo_gl->id, bo_gl->buffer_offset + buffer_state->offset, buffer_state->size)); + bo_gl->id, bo_gl->b.buffer_offset + buffer_state->offset, buffer_state->size)); buffer->bo_user.valid = true; } checkGLcall("bind constant buffers"); @@ -4677,7 +4677,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state } size = buffer->resource.size - offset; GL_EXTCALL(glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, i, - bo_gl->id, bo_gl->buffer_offset + offset, size)); + bo_gl->id, bo_gl->b.buffer_offset + offset, size)); buffer->bo_user.valid = true; } checkGLcall("bind transform feedback buffers"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7e2da350f5a..87ae569b549 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4764,7 +4764,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = src_bo->vk_buffer; - vk_barrier.offset = src_bo->buffer_offset + (size_t)src_bo_addr->addr; + vk_barrier.offset = src_bo->b.buffer_offset + (size_t)src_bo_addr->addr; vk_barrier.size = sub_resource->size; src_offset += (size_t)src_bo_addr->addr; @@ -4788,7 +4788,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, dst_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->image.vk_image, &vk_range); - region.bufferOffset = src_bo->buffer_offset + src_offset; + region.bufferOffset = src_bo->b.buffer_offset + src_offset; region.bufferRowLength = (src_row_pitch / src_format->block_byte_count) * src_format->block_width; if (src_row_pitch) region.bufferImageHeight = (src_slice_pitch / src_row_pitch) * src_format->block_height; @@ -4941,7 +4941,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = dst_bo->vk_buffer; - vk_barrier.offset = dst_bo->buffer_offset + (size_t)dst_bo_addr->addr; + vk_barrier.offset = dst_bo->b.buffer_offset + (size_t)dst_bo_addr->addr; vk_barrier.size = sub_resource->size; bo_stage_flags = vk_pipeline_stage_mask_from_buffer_usage(dst_bo->usage); @@ -4964,7 +4964,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, src_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, src_texture_vk->image.vk_image, &vk_range); - region.bufferOffset = dst_bo->buffer_offset + dst_offset; + region.bufferOffset = dst_bo->b.buffer_offset + dst_offset; region.bufferRowLength = 0; region.bufferImageHeight = 0; region.imageSubresource.aspectMask = vk_range.aspectMask; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index b902812aded..b981602f1a2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -685,7 +685,7 @@ static VkBufferView wined3d_view_vk_create_vk_buffer_view(struct wined3d_context create_info.flags = 0; create_info.buffer = bo->vk_buffer; create_info.format = view_format_vk->vk_format; - create_info.offset = bo->buffer_offset + offset; + create_info.offset = bo->b.buffer_offset + offset; create_info.range = size; device_vk = wined3d_device_vk(buffer_vk->b.resource.device); @@ -2101,7 +2101,7 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view buffer_info.buffer = constants_bo.vk_buffer; buffer_info.range = constants_bo.size; - buffer_info.offset = constants_bo.buffer_offset; + buffer_info.offset = constants_bo.b.buffer_offset; vk_info = context_vk->vk_info; @@ -2234,7 +2234,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) wined3d_context_vk_end_current_render_pass(context_vk); VK_CALL(vkCmdFillBuffer(wined3d_context_vk_get_command_buffer(context_vk), - uav_vk->counter_bo.vk_buffer, uav_vk->counter_bo.buffer_offset, sizeof(uint32_t), 0)); + uav_vk->counter_bo.vk_buffer, uav_vk->counter_bo.b.buffer_offset, sizeof(uint32_t), 0)); wined3d_context_vk_reference_bo(context_vk, &uav_vk->counter_bo); create_info.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; @@ -2242,7 +2242,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) create_info.flags = 0; create_info.buffer = uav_vk->counter_bo.vk_buffer; create_info.format = VK_FORMAT_R32_UINT; - create_info.offset = uav_vk->counter_bo.buffer_offset; + create_info.offset = uav_vk->counter_bo.b.buffer_offset; create_info.range = sizeof(uint32_t); if ((vr = VK_CALL(vkCreateBufferView(device_vk->vk_device, &create_info, NULL, &uav_vk->vk_counter_view))) < 0) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79b02c2448d..2fce585c6b1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1597,6 +1597,7 @@ struct wined3d_bo { struct list users; void *map_ptr; + size_t buffer_offset; size_t memory_offset; bool coherent; }; @@ -1606,7 +1607,6 @@ struct wined3d_bo_gl struct wined3d_bo b; GLuint id; - GLsizeiptr buffer_offset; GLsizeiptr size; GLenum binding; GLenum usage; @@ -1641,7 +1641,6 @@ struct wined3d_bo_vk VkDeviceMemory vk_memory; - VkDeviceSize buffer_offset; VkDeviceSize size; VkBufferUsageFlags usage; VkMemoryPropertyFlags memory_type; -- 2.33.0

3 12

[PATCH vkd3d] vkd3d-shader/hlsl: Add Gather methods and tests.
by Francisco Casas 22 Nov '21

22 Nov '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + libs/vkd3d-shader/hlsl.c | 4 ++ libs/vkd3d-shader/hlsl.h | 4 ++ libs/vkd3d-shader/hlsl.y | 78 +++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_sm4.c | 66 ++++++++++++++++++++- tests/hlsl-gather.shader_test | 106 ++++++++++++++++++++++++++++++++++ 6 files changed, 259 insertions(+), 1 deletion(-) create mode 100644 tests/hlsl-gather.shader_test diff --git a/Makefile.am b/Makefile.am index 3e083b0a..1a80152a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,6 +67,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-gather.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -292,6 +293,7 @@ XFAIL_TESTS = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-gather.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1eee4278..74b78f1b 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1250,6 +1250,10 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru { [HLSL_RESOURCE_LOAD] = "load_resource", [HLSL_RESOURCE_SAMPLE] = "sample", + [HLSL_RESOURCE_GATHER_RED] = "gather4r", + [HLSL_RESOURCE_GATHER_GREEN] = "gather4g", + [HLSL_RESOURCE_GATHER_BLUE] = "gather4b", + [HLSL_RESOURCE_GATHER_ALPHA] = "gather4a", }; vkd3d_string_buffer_printf(buffer, "%s(resource = ", type_names[load->load_type]); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 365ef980..891f671a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -377,6 +377,10 @@ enum hlsl_resource_load_type { HLSL_RESOURCE_LOAD, HLSL_RESOURCE_SAMPLE, + HLSL_RESOURCE_GATHER_RED, + HLSL_RESOURCE_GATHER_GREEN, + HLSL_RESOURCE_GATHER_BLUE, + HLSL_RESOURCE_GATHER_ALPHA, }; struct hlsl_ir_resource_load diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b7e0409d..8a2c1dd9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1852,6 +1852,84 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl list_add_tail(instrs, &load->node.entry); return true; } + else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") + || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha")) + { + const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); + enum hlsl_resource_load_type load_type; + const struct hlsl_type *sampler_type; + struct hlsl_ir_resource_load *load; + struct hlsl_ir_load *sampler_load; + struct hlsl_type *result_type; + struct hlsl_ir_node *coords; + int read_channel; + + if(!strcmp(name, "Gather") || !strcmp(name, "GatherRed")){ + load_type = HLSL_RESOURCE_GATHER_RED; + read_channel = 0; + } + else if(!strcmp(name, "GatherGreen")){ + load_type = HLSL_RESOURCE_GATHER_GREEN; + read_channel = 1; + } + else if(!strcmp(name, "GatherBlue")){ + load_type = HLSL_RESOURCE_GATHER_BLUE; + read_channel = 2; + } + else if(!strcmp(name, "GatherAlpha")){ + load_type = HLSL_RESOURCE_GATHER_ALPHA; + read_channel = 3; + } else { + assert(!"Unexpected Gather method."); + } + + if (params->args_count != 3 && params->args_count != 4) + { + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of arguments to method '%s': expected 3 or 4, but got %u.", name, params->args_count); + return false; + } + if (params->args_count >= 3) + FIXME("Ignoring offset parameter.\n"); + if (params->args_count >= 4) + FIXME("Ignoring 'status' output parameter.\n"); + + sampler_type = params->args[0]->data_type; + if (sampler_type->type != HLSL_CLASS_OBJECT || sampler_type->base_type != HLSL_TYPE_SAMPLER + || sampler_type->sampler_dim != HLSL_SAMPLER_DIM_GENERIC) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, sampler_type))) + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument 0 of %s(): expected 'sampler', but got '%s'.", name, string->buffer); + hlsl_release_string_buffer(ctx, string); + return false; + } + + if(read_channel >= object_type->e.resource_format->dimx){ + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Method %s() requires at least %d channels.", name, read_channel+1); + return false; + } + + result_type = hlsl_get_vector_type(ctx, object_type->e.resource_format->base_type, 4); + + /* Only HLSL_IR_LOAD can return an object. */ + sampler_load = hlsl_ir_load(params->args[0]); + + if (!(coords = add_implicit_conversion(ctx, instrs, params->args[1], + hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, sampler_dim), loc))) + coords = params->args[1]; + + if (!(load = hlsl_new_resource_load(ctx, result_type, + load_type, object_load->src.var, object_load->src.offset.node, + sampler_load->src.var, sampler_load->src.offset.node, coords, loc))) + return false; + list_add_tail(instrs, &load->node.entry); + return true; + + } else { struct vkd3d_string_buffer *string; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a95503ee..5f290129 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -753,7 +753,7 @@ struct sm4_instruction struct sm4_register reg; enum vkd3d_sm4_swizzle_type swizzle_type; unsigned int swizzle; - } srcs[2]; + } srcs[3]; unsigned int src_count; uint32_t idx[2]; @@ -1506,6 +1506,61 @@ static void write_sm4_loop(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } + +static void write_sm4_gather(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, + const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords, + enum hlsl_resource_load_type load_type) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_GATHER4; + + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); + instr.dst_count = 1; + + sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, coords); + instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); + + sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, &instr.srcs[1].swizzle_type, + resource, resource_type); + instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); + + sm4_register_from_deref(ctx, &instr.srcs[2].reg, &writemask, NULL, + sampler, sampler->var->data_type); + instr.srcs[2].reg.type = VKD3D_SM4_RT_SAMPLER; + instr.srcs[2].reg.dim = 1; + instr.srcs[2].swizzle_type = VKD3D_SM4_SWIZZLE_VEC4; + + switch (load_type){ + case HLSL_RESOURCE_GATHER_RED: + instr.srcs[2].swizzle = HLSL_SWIZZLE(X, X, X, X); + break; + case HLSL_RESOURCE_GATHER_GREEN: + instr.srcs[2].swizzle = HLSL_SWIZZLE(Y, Y, Y, Y); + break; + case HLSL_RESOURCE_GATHER_BLUE: + instr.srcs[2].swizzle = HLSL_SWIZZLE(Z, Z, Z, Z); + break; + case HLSL_RESOURCE_GATHER_ALPHA: + instr.srcs[2].swizzle = HLSL_SWIZZLE(W, W, W, W); + break; + default: + assert(!"Invalid hlsl_resource_load_type."); + break; + } + instr.src_count = 3; + + write_sm4_instruction(buffer, &instr); +} + + + + + + static void write_sm4_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_resource_load *load) { @@ -1527,6 +1582,15 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, case HLSL_RESOURCE_SAMPLE: hlsl_fixme(ctx, load->node.loc, "Resource sample instruction."); break; + + case HLSL_RESOURCE_GATHER_RED: + case HLSL_RESOURCE_GATHER_GREEN: + case HLSL_RESOURCE_GATHER_BLUE: + case HLSL_RESOURCE_GATHER_ALPHA: + assert(load->sampler.var); + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, load->load_type); + break; } } diff --git a/tests/hlsl-gather.shader_test b/tests/hlsl-gather.shader_test new file mode 100644 index 00000000..6731b77c --- /dev/null +++ b/tests/hlsl-gather.shader_test @@ -0,0 +1,106 @@ +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[texture 0] +size (3, 3) +0.0 0.0 0.0 0.4 0.1 0.0 0.5 0.0 0.2 0.0 0.0 0.4 +0.0 0.1 0.5 0.0 0.1 0.1 0.0 0.4 0.2 0.1 0.5 0.0 +0.0 0.2 0.0 0.4 0.1 0.2 0.5 0.0 0.2 0.2 0.0 0.4 + + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Gather(s, float2(0.2, 0.2), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.0, 0.1, 0.1, 0.0) + + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.8, 0.8), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.2, 0.2, 0.1, 0.1) + + + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherBlue(s, float2(0.2, 0.8), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.0, 0.5, 0.0, 0.5) + + + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherAlpha(s, float2(0.2, 0.8), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.4, 0.0, 0.4, 0.0) + + + + -- 2.25.1

2 1

[PATCH vkd3d v2 1/7] vkd3d-shader/hlsl: Write SM4 integer negation.
by Giovanni Mascellani 22 Nov '21

22 Nov '21

--- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a95503ee..acc11ce9 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1376,6 +1376,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP1_NEG: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_INEG, &expr->node, arg1, 0); + break; + default: hlsl_fixme(ctx, expr->node.loc, "SM4 int \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break; -- 2.34.0

2 15

[RFC, website] Remove stray file
by Julian Rüger 22 Nov '21

22 Nov '21

Good evening to you all! I just noticed there is an empty file "freenode.uP4Y16UYccnE.html" in the top-level of wine-website git. https://source.winehq.org/git/website.git/tree Since freenode is dead and all, can this file be removed? Does anyone know what it's purpose was supposed to be? Best, Julian

2 1

[PATCH] ntdll: Place PEB before first TEB.
by Paul Gofman 22 Nov '21

22 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/wow64.c | 25 +++++++++++++++++++++++++ dlls/ntdll/thread.c | 4 +--- dlls/ntdll/unix/debug.c | 2 +- dlls/ntdll/unix/virtual.c | 15 ++++++++------- 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index be2f2138933..3d2548843be 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -225,6 +225,14 @@ static void test_query_architectures(void) } } +static TEB *test_thread_teb_addr; + +static DWORD WINAPI test_teb_addr_thread(void *ptr) +{ + test_thread_teb_addr = NtCurrentTeb(); + return 0; +} + static void test_peb_teb(void) { PROCESS_BASIC_INFORMATION proc_info; @@ -232,6 +240,7 @@ static void test_peb_teb(void) PROCESS_INFORMATION pi; STARTUPINFOA si = {0}; NTSTATUS status; + HANDLE thread; void *redir; SIZE_T res; TEB teb; @@ -419,6 +428,22 @@ static void test_peb_teb(void) ok( !NtCurrentTeb()->GdiBatchCount, "GdiBatchCount set to %x\n", NtCurrentTeb()->GdiBatchCount ); ok( !NtCurrentTeb()->WowTebOffset || broken( NtCurrentTeb()->WowTebOffset == 1 ), /* vista */ "WowTebOffset set to %x\n", NtCurrentTeb()->WowTebOffset ); + + thread = CreateThread( NULL, 0, test_teb_addr_thread, NULL, 0, NULL ); + WaitForSingleObject( thread, INFINITE ); + if (test_thread_teb_addr > NtCurrentTeb()) + { + if (sizeof(void *) > sizeof(int) || is_wow64) + { + ok( (char *)NtCurrentTeb() - NtCurrentTeb()->WowTebOffset == (char *)NtCurrentTeb()->Peb + 0x1000, + "Got unexpected teb %p, peb %p.\n", NtCurrentTeb(), NtCurrentTeb()->Peb ); + } + } + else + { + /* Before Win10 1607. */ + win_skip( "Old teb placement.\n" ); + } } static void test_selectors(void) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 37dc7c8ab37..dcf226294e8 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -63,9 +63,7 @@ static inline struct debug_info *get_info(void) static void init_options(void) { - unsigned int offset = page_size * (sizeof(void *) / 4); - - debug_options = (struct __wine_debug_channel *)((char *)NtCurrentTeb()->Peb + offset); + debug_options = (struct __wine_debug_channel *)((char *)NtCurrentTeb()->Peb - 3 * page_size); while (debug_options[nb_debug_options].name[0]) nb_debug_options++; } diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 26e7decc059..7744d421f6d 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -324,7 +324,7 @@ void dbg_init(void) if (nb_debug_options == -1) init_options(); - options = (struct __wine_debug_channel *)((char *)peb + (is_win64 ? 2 : 1) * page_size); + options = (struct __wine_debug_channel *)((char *)peb - 3 * page_size); memcpy( options, debug_options, nb_debug_options * sizeof(*options) ); free( debug_options ); debug_options = options; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 5873a3e2335..1dcde261bcf 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2986,6 +2986,7 @@ static TEB *init_teb( void *ptr, BOOL is_wow ) */ TEB *virtual_alloc_first_teb(void) { + static const BOOL is_wow = FALSE; void *ptr; NTSTATUS status; SIZE_T data_size = page_size; @@ -3003,12 +3004,12 @@ TEB *virtual_alloc_first_teb(void) NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, is_win64 ? 0x7fffffff : 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); - teb_block_pos = 30; - ptr = (char *)teb_block + 30 * block_size; + teb_block_pos = 2; + ptr = (char *)teb_block; data_size = 2 * block_size; NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &data_size, MEM_COMMIT, PAGE_READWRITE ); - peb = (PEB *)((char *)teb_block + 31 * block_size + (is_win64 ? 0 : page_size)); - return init_teb( ptr, FALSE ); + peb = (PEB *)((char *)teb_block + block_size - page_size - (is_win64 && is_wow ? page_size : 0)); + return init_teb( (char *)ptr + block_size, is_wow ); } @@ -3033,7 +3034,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) } else { - if (!teb_block_pos) + if (teb_block_pos == 32) { SIZE_T total = 32 * block_size; @@ -3044,9 +3045,9 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) return status; } teb_block = ptr; - teb_block_pos = 32; + teb_block_pos = 0; } - ptr = ((char *)teb_block + --teb_block_pos * block_size); + ptr = ((char *)teb_block + teb_block_pos++ * block_size); NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } -- 2.33.1

1 0

[website] German translation for release 6.22
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for WWN issue 407
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.21
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for WWN issue 406
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.0.2
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.20
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.19
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.18
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.17
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.16
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH v5 01/11] jscript: Support deletion for accessor, builtin and idx props.
by Gabriel Ivăncescu 22 Nov '21

22 Nov '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e64a520..a5b3543 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1630,10 +1630,14 @@ static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) if(prop->type == PROP_JSVAL) { jsval_release(prop->u.val); - prop->type = PROP_DELETED; } - if(prop->type == PROP_ACCESSOR) - FIXME("not supported on accessor property\n"); + if(prop->type == PROP_ACCESSOR) { + if(prop->u.accessor.getter) + jsdisp_release(prop->u.accessor.getter); + if(prop->u.accessor.setter) + jsdisp_release(prop->u.accessor.setter); + } + prop->type = PROP_DELETED; return S_OK; } -- 2.31.1

3 23

[PATCH] msvcp140: Fix time_get<char>::get_monthname spec file entry.
by Piotr Caban 22 Nov '21

22 Nov '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/4] advapi32: Improve perflib provider registration stubs.
by Paul Gofman 22 Nov '21

22 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Avoids crash in Edge Webview embedded in Forza Horizon 5. Technically it is enough just to fake success from these stubs but PerfCreateInstance returns a documented (albeit wrongly) structure and it looks better to return correcly layed out data. dlls/advapi32/tests/Makefile.in | 1 + dlls/advapi32/tests/perf.c | 100 ++++++++++++++++++++++++++++++++ dlls/kernelbase/main.c | 49 +++++++++++++--- include/perflib.h | 4 ++ 4 files changed, 146 insertions(+), 8 deletions(-) create mode 100644 dlls/advapi32/tests/perf.c diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index 12583e59f57..2e9b007a91f 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ crypt_sha.c \ eventlog.c \ lsa.c \ + perf.c \ registry.c \ security.c \ service.c diff --git a/dlls/advapi32/tests/perf.c b/dlls/advapi32/tests/perf.c new file mode 100644 index 00000000000..34fedd2b645 --- /dev/null +++ b/dlls/advapi32/tests/perf.c @@ -0,0 +1,100 @@ +/* + * Unit tests for Perflib functions + * + * Copyright (c) 2021 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "perflib.h" + +#include "wine/test.h" + +static ULONG WINAPI test_provider_callback(ULONG code, void *buffer, ULONG size) +{ + ok(0, "Provider callback called.\n"); + return ERROR_SUCCESS; +} + +void test_provider_init(void) +{ + static GUID test_guid = {0xdeadbeef, 0x0001, 0x0002, {0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00 ,0x0a}}; + PERF_PROVIDER_CONTEXT prov_context; + HANDLE prov, prov2; + ULONG ret; + BOOL bret; + + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProvider(NULL, test_provider_callback, &prov); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + ok(prov == (HANDLE)0xdeadbeef, "Got unexpected prov %p.\n", prov); + + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProvider(&test_guid, test_provider_callback, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + ok(prov == (HANDLE)0xdeadbeef, "Got unexpected prov %p.\n", prov); + + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProvider(&test_guid, test_provider_callback, &prov); + ok(!ret, "Got unexpected ret %u.\n", ret); + ok(prov != (HANDLE)0xdeadbeef, "Provider handle is not set.\n"); + + prov2 = prov; + ret = PerfStartProvider(&test_guid, test_provider_callback, &prov2); + ok(!ret, "Got unexpected ret %u.\n", ret); + ok(prov2 != prov, "Got the same provider handle.\n"); + + ret = PerfStopProvider(prov2); + ok(!ret, "Got unexpected ret %u.\n", ret); + + if (0) + { + /* Access violation on Windows. */ + PerfStopProvider(prov2); + } + + /* Provider handle is a pointer and not a kernel object handle. */ + bret = DuplicateHandle(GetCurrentProcess(), prov, GetCurrentProcess(), &prov2, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(!bret && GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected bret %d, err %u.\n", bret, GetLastError()); + bret = IsBadWritePtr(prov, 8); + ok(!bret, "Handle does not point to the data.\n"); + + ret = PerfStopProvider(prov); + ok(!ret, "Got unexpected ret %u.\n", ret); + + memset( &prov_context, 0, sizeof(prov_context) ); + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProviderEx( &test_guid, &prov_context, &prov ); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + ok(prov == (HANDLE)0xdeadbeef, "Got unexpected prov %p.\n", prov); + + prov_context.ContextSize = sizeof(prov_context) + 1; + ret = PerfStartProviderEx( &test_guid, &prov_context, &prov ); + ok(!ret, "Got unexpected ret %u.\n", ret); + ok(prov != (HANDLE)0xdeadbeef, "Provider handle is not set.\n"); + + ret = PerfStopProvider(prov); + ok(!ret, "Got unexpected ret %u.\n", ret); +} + +START_TEST(perf) +{ + test_provider_init(); +} diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index e6cf892a4dc..d468c84f619 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -154,6 +154,17 @@ LONG WINAPI AppPolicyGetWindowingModel(HANDLE token, AppPolicyWindowingModel *po return ERROR_SUCCESS; } +struct perf_provider +{ + GUID guid; + PERFLIBREQUEST callback; +}; + +static struct perf_provider *perf_provider_from_handle(HANDLE prov) +{ + return (struct perf_provider *)prov; +} + /*********************************************************************** * PerfCreateInstance (KERNELBASE.@) */ @@ -195,19 +206,37 @@ ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE i /*********************************************************************** * PerfStartProvider (KERNELBASE.@) */ -ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) +ULONG WINAPI PerfStartProvider( GUID *guid, PERFLIBREQUEST callback, HANDLE *provider ) { - FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); - return ERROR_CALL_NOT_IMPLEMENTED; + PERF_PROVIDER_CONTEXT ctx; + + FIXME( "guid %s, callback %p, provider %p semi-stub.\n", debugstr_guid(guid), callback, provider ); + + memset( &ctx, 0, sizeof(ctx) ); + ctx.ContextSize = sizeof(ctx); + ctx.ControlCallback = callback; + + return PerfStartProviderEx( guid, &ctx, provider ); } /*********************************************************************** * PerfStartProviderEx (KERNELBASE.@) */ -ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) +ULONG WINAPI PerfStartProviderEx( GUID *guid, PERF_PROVIDER_CONTEXT *context, HANDLE *provider ) { - FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); - return ERROR_CALL_NOT_IMPLEMENTED; + struct perf_provider *prov; + + FIXME( "guid %s, context %p, provider %p semi-stub.\n", debugstr_guid(guid), context, provider ); + + if (!guid || !context || !provider) return ERROR_INVALID_PARAMETER; + if (context->ContextSize < sizeof(*context)) return ERROR_INVALID_PARAMETER; + + if (!(prov = heap_alloc_zero( sizeof(*prov) ))) return ERROR_OUTOFMEMORY; + memcpy( &prov->guid, guid, sizeof(prov->guid) ); + prov->callback = context->ControlCallback; + *provider = prov; + + return STATUS_SUCCESS; } /*********************************************************************** @@ -215,8 +244,12 @@ ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HAN */ ULONG WINAPI PerfStopProvider(HANDLE handle) { - FIXME("%p: stub\n", handle); - return ERROR_CALL_NOT_IMPLEMENTED; + struct perf_provider *prov = perf_provider_from_handle( handle ); + + TRACE( "handle %p.\n", handle ); + + heap_free( prov ); + return STATUS_SUCCESS; } /*********************************************************************** diff --git a/include/perflib.h b/include/perflib.h index 2d3f6efb419..47bc0716541 100644 --- a/include/perflib.h +++ b/include/perflib.h @@ -51,6 +51,10 @@ typedef struct _PROVIDER_CONTEXT { LPVOID pMemContext; } PERF_PROVIDER_CONTEXT, * PPERF_PROVIDER_CONTEXT; +ULONG WINAPI PerfStartProvider(GUID *, PERFLIBREQUEST, HANDLE *); +ULONG WINAPI PerfStartProviderEx(GUID *, PERF_PROVIDER_CONTEXT *, HANDLE *); +ULONG WINAPI PerfStopProvider(HANDLE); + #ifdef __cplusplus } /* extern "C" */ #endif -- 2.33.1

2 4

[PATCH vkd3d 1/7] vkd3d-shader/hlsl: Write SM4 integer negation.
by Giovanni Mascellani 22 Nov '21

22 Nov '21

--- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a95503ee..acc11ce9 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1376,6 +1376,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP1_NEG: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_INEG, &expr->node, arg1, 0); + break; + default: hlsl_fixme(ctx, expr->node.loc, "SM4 int \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break; -- 2.34.0

2 8

[PATCH] ntdll: Save status from attaching dependencies in process_attach().
by Jan Sikorski 22 Nov '21

22 Nov '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- I don't know for sure if that's an actual bug, but it looks like it was changed accidentally in 0dd37b02f99f5090dd855343fcd8a99496047f3e. --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a754579bf54..5bae44f175d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1552,7 +1552,7 @@ static NTSTATUS process_attach( LDR_DDAG_NODE *node, LPVOID lpReserved ) if (wm->ldr.ActivationContext) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); /* Recursively attach all DLLs this one depends on */ - walk_node_dependencies( node, lpReserved, process_attach ); + status = walk_node_dependencies( node, lpReserved, process_attach ); if (!wm->ldr.InInitializationOrderLinks.Flink) InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList, -- 2.32.0

2 1

[PATCH vkd3d] vkd3d-shader/hlsl: Allocate samplers.
by Matteo Bruni 22 Nov '21

22 Nov '21

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v3: Get rid of struct object_type_info name field. --- libs/vkd3d-shader/hlsl_codegen.c | 62 ++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 7ff68b84..8b0eb9b3 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1223,60 +1223,91 @@ static void allocate_buffers(struct hlsl_ctx *ctx) } } -static const struct hlsl_ir_var *get_reserved_texture(struct hlsl_ctx *ctx, uint32_t index) +static const struct hlsl_ir_var *get_reserved_object(struct hlsl_ctx *ctx, char type, uint32_t index) { const struct hlsl_ir_var *var; LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) { - if (var->last_read && var->reg_reservation.type == 't' && var->reg_reservation.index == index) + if (var->last_read && var->reg_reservation.type == type && var->reg_reservation.index == index) return var; } return NULL; } -static void allocate_textures(struct hlsl_ctx *ctx) +static const struct object_type_info { + enum hlsl_base_type type; + char reg_name; +} +object_types[] = +{ + { HLSL_TYPE_SAMPLER, 's' }, + { HLSL_TYPE_TEXTURE, 't' }, +}; + +static const struct object_type_info *get_object_type_info(enum hlsl_base_type type) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(object_types); ++i) + if (type == object_types[i].type) + return &object_types[i]; + + WARN("No type info for object type %u.\n", type); + return NULL; +} + +static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) +{ + const struct object_type_info *type_info = get_object_type_info(type); struct hlsl_ir_var *var; uint32_t index = 0; LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (!var->last_read || var->data_type->type != HLSL_CLASS_OBJECT - || var->data_type->base_type != HLSL_TYPE_TEXTURE) + || var->data_type->base_type != type) continue; - if (var->reg_reservation.type == 't') + if (var->reg_reservation.type == type_info->reg_name) { - const struct hlsl_ir_var *reserved_texture = get_reserved_texture(ctx, var->reg_reservation.index); + const struct hlsl_ir_var *reserved_object = get_reserved_object(ctx, type_info->reg_name, + var->reg_reservation.index); - if (reserved_texture && reserved_texture != var) + if (reserved_object && reserved_object != var) { hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, - "Multiple textures bound to t%u.", var->reg_reservation.index); - hlsl_note(ctx, reserved_texture->loc, VKD3D_SHADER_LOG_ERROR, - "Texture '%s' is already bound to t%u.", reserved_texture->name, + "Multiple objects bound to %c%u.", type_info->reg_name, var->reg_reservation.index); + hlsl_note(ctx, reserved_object->loc, VKD3D_SHADER_LOG_ERROR, + "Object '%s' is already bound to %c%u.", reserved_object->name, + type_info->reg_name, var->reg_reservation.index); } var->reg.id = var->reg_reservation.index; var->reg.allocated = true; - TRACE("Allocated reserved %s to t%u.\n", var->name, var->reg_reservation.index); + TRACE("Allocated reserved %s to %c%u.\n", var->name, type_info->reg_name, var->reg_reservation.index); } else if (!var->reg_reservation.type) { - while (get_reserved_texture(ctx, index)) + while (get_reserved_object(ctx, type_info->reg_name, index)) ++index; var->reg.id = index; var->reg.allocated = true; - TRACE("Allocated %s to t%u.\n", var->name, index); + TRACE("Allocated object to %c%u.\n", type_info->reg_name, index); ++index; } else { + struct vkd3d_string_buffer *type_string; + + type_string = hlsl_type_to_string(ctx, var->data_type); hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, - "Textures must be bound to register type 't'."); + "Object of type '%s' must be bound to register type '%c'.", + type_string->buffer, type_info->reg_name); + hlsl_release_string_buffer(ctx, type_string); } } } @@ -1413,9 +1444,10 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun else { allocate_buffers(ctx); - allocate_textures(ctx); + allocate_objects(ctx, HLSL_TYPE_TEXTURE); } allocate_semantic_registers(ctx); + allocate_objects(ctx, HLSL_TYPE_SAMPLER); if (ctx->result) return ctx->result; -- 2.26.3

4 3

[PATCH 1/5] d3dx9/tests: Clean up GetMatrixTransposePointerArray() tests.
by Matteo Bruni 22 Nov '21

22 Nov '21

Inspired by a patch from Eric Pouech <eric.pouech(a)gmail.com>. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/effect.c | 42 +++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a13dc708726..ea90299f936 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1475,16 +1475,16 @@ static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_ float f[sizeof(D3DXMATRIX) / sizeof(float)]; D3DXMATRIX m; } fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE * sizeof(float) / sizeof(D3DXMATRIX)]; + D3DXMATRIX *matrix_pointer_array[ARRAY_SIZE(fvalue)]; const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; - HRESULT hr; - D3DXMATRIX *matrix_pointer_array[ARRAY_SIZE(fvalue)]; UINT l, k, m, element, err = 0; union { DWORD d; float f; } cmp = {0xabababab}; + HRESULT hr; for (element = 0; element <= res_desc->Elements + 1; ++element) { @@ -1670,20 +1670,28 @@ static void test_effect_parameter_value_GetMatrixTransposeArray(const struct tes static void test_effect_parameter_value_GetMatrixTransposePointerArray(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) { + union + { + float f[sizeof(D3DXMATRIX) / sizeof(float)]; + D3DXMATRIX m; + } fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE * sizeof(float) / sizeof(D3DXMATRIX)]; + D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)]; const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; - HRESULT hr; - DWORD cmp = 0xabababab; - FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; - D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; UINT l, k, m, element, err = 0; + union + { + DWORD d; + float f; + } cmp = {0xabababab}; + HRESULT hr; for (element = 0; element <= res_desc->Elements + 1; ++element) { memset(fvalue, 0xab, sizeof(fvalue)); for (l = 0; l < element; ++l) { - matrix_pointer_array[l] = (D3DXMATRIX *)&fvalue[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; + matrix_pointer_array[l] = &fvalue[l].m; } hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, parameter, matrix_pointer_array, element); if (!element) @@ -1691,7 +1699,10 @@ static void test_effect_parameter_value_GetMatrixTransposePointerArray(const str ok(hr == D3D_OK, "%u - %s[%u]: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3D_OK); - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else if (element <= res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) { @@ -1706,23 +1717,30 @@ static void test_effect_parameter_value_GetMatrixTransposePointerArray(const str { if (k < res_desc->Columns && l < res_desc->Rows) { - if (!compare_float(fvalue[m * 16 + l + k * 4], get_float(res_desc->Type, + if (!compare_float(fvalue[m].m.m[k][l], get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512)) ++err; } - else if (fvalue[m * 16 + l + k * 4] != 0.0f) ++err; + else if (fvalue[m].m.m[k][l] != 0.0f) + ++err; } } } - for (l = element * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = element; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else { ok(hr == D3DERR_INVALIDCALL, "%u - %s[%u]: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3DERR_INVALIDCALL); - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } ok(!err, "%u - %s[%u]: GetMatrixTransposePointerArray failed with %u errors\n", i, res_full_name, element, err); } -- 2.26.3

2 5

[PATCH v6 vkd3d] vkd3d-shader/hlsl: Implement cross() intrinsic function.
by Matteo Bruni 22 Nov '21

22 Nov '21

From: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v6: Recover the lost tests... Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.y | 55 ++++++++++++++++++++++++++++++++++++ tests/hlsl-cross.shader_test | 28 ++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 tests/hlsl-cross.shader_test diff --git a/Makefile.am b/Makefile.am index 6d392e1d..be3d8ec1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,6 +64,7 @@ vkd3d_shader_tests = \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-cross.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ @@ -290,6 +291,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-cross.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index abf5da91..ff35c09e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1586,6 +1586,60 @@ static bool intrinsic_clamp(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MIN, &max->node, params->args[2], &loc); } +static bool intrinsic_cross(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_swizzle *arg1_swzl1, *arg1_swzl2, *arg2_swzl1, *arg2_swzl2; + struct hlsl_ir_node *arg1 = params->args[0], *arg2 = params->args[1]; + struct hlsl_ir_node *arg1_cast, *arg2_cast, *mul1_neg; + struct hlsl_ir_expr *mul1, *mul2; + struct hlsl_type *cast_type; + enum hlsl_base_type base; + + if (arg1->data_type->base_type == HLSL_TYPE_HALF && arg2->data_type->base_type == HLSL_TYPE_HALF) + base = HLSL_TYPE_HALF; + else + base = HLSL_TYPE_FLOAT; + + cast_type = hlsl_get_vector_type(ctx, base, 3); + + if (!(arg1_cast = add_implicit_conversion(ctx, params->instrs, arg1, cast_type, &loc))) + return false; + + if (!(arg2_cast = add_implicit_conversion(ctx, params->instrs, arg2, cast_type, &loc))) + return false; + + if (!(arg1_swzl1 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Z, X, Y, Z), 3, arg1_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg1_swzl1->node.entry); + + if (!(arg2_swzl1 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Y, Z, X, Y), 3, arg2_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg2_swzl1->node.entry); + + if (!(mul1 = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, + &arg1_swzl1->node, &arg2_swzl1->node, &loc))) + return false; + + if (!(mul1_neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, &mul1->node, loc))) + return false; + list_add_tail(params->instrs, &mul1_neg->entry); + + if (!(arg1_swzl2 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Y, Z, X, Y), 3, arg1_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg1_swzl2->node.entry); + + if (!(arg2_swzl2 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Z, X, Y, Z), 3, arg2_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg2_swzl2->node.entry); + + if (!(mul2 = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, + &arg1_swzl2->node, &arg2_swzl2->node, &loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, &mul2->node, mul1_neg, &loc); +} + static bool intrinsic_max(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1635,6 +1689,7 @@ intrinsic_functions[] = /* Note: these entries should be kept in alphabetical order. */ {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, + {"cross", 2, true, intrinsic_cross}, {"max", 2, true, intrinsic_max}, {"pow", 2, true, intrinsic_pow}, {"round", 1, true, intrinsic_round}, diff --git a/tests/hlsl-cross.shader_test b/tests/hlsl-cross.shader_test new file mode 100644 index 00000000..101db607 --- /dev/null +++ b/tests/hlsl-cross.shader_test @@ -0,0 +1,28 @@ +[pixel shader] +float4 main(uniform float4 u, uniform float4 v) : sv_target +{ + float4 res = float4(0, 0, 0, 0); + res.xyz = cross(u, v); + return res; +} + +[test] +uniform 0 float4 1 -2 3 4 +uniform 4 float4 10 100 1000 10000 +draw quad +probe all rgba (-2300, -970, 120, 0) + + + +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + float4 res = float4(0, 0, 0, 3.5); + res.xyz = cross(u, 4); + return res; +} + +[test] +uniform 0 float4 1 -2 3 4 +draw quad +probe all rgba (-20, 8, 12, 3.5) -- 2.26.3

3 2

[PATCH vkd3d v5 1/2] vkd3d-shader/hlsl: Implement round() intrinsic function in SM4.
by Matteo Bruni 22 Nov '21

22 Nov '21

From: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 ++++++++ libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ tests/round.shader_test | 26 ++++++++++++++++++++++++++ 6 files changed, 41 insertions(+) create mode 100644 tests/round.shader_test diff --git a/Makefile.am b/Makefile.am index 3e083b0a..6d392e1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -91,6 +91,7 @@ vkd3d_shader_tests = \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/preproc-misc.shader_test \ + tests/round.shader_test \ tests/sampler.shader_test \ tests/saturate.shader_test \ tests/swizzle-0.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1eee4278..9824c56d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1156,6 +1156,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP1_NEG] = "-", [HLSL_OP1_NRM] = "nrm", [HLSL_OP1_RCP] = "rcp", + [HLSL_OP1_ROUND] = "round", [HLSL_OP1_RSQ] = "rsq", [HLSL_OP1_SAT] = "sat", [HLSL_OP1_SIGN] = "sign", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 365ef980..e7bdb45e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -299,6 +299,7 @@ enum hlsl_ir_expr_op HLSL_OP1_NEG, HLSL_OP1_NRM, HLSL_OP1_RCP, + HLSL_OP1_ROUND, HLSL_OP1_RSQ, HLSL_OP1_SAT, HLSL_OP1_SIGN, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b7e0409d..abf5da91 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1611,6 +1611,12 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_round(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, params->args[0], &loc); +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1626,10 +1632,12 @@ static const struct intrinsic_function } intrinsic_functions[] = { + /* Note: these entries should be kept in alphabetical order. */ {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, {"pow", 2, true, intrinsic_pow}, + {"round", 1, true, intrinsic_round}, {"saturate", 1, true, intrinsic_saturate}, }; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a95503ee..c0c26f80 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1305,6 +1305,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); break; + case HLSL_OP1_ROUND: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_ROUND_NE, &expr->node, arg1, 0); + break; + case HLSL_OP1_SAT: write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV | (VKD3D_SM4_INSTRUCTION_FLAG_SATURATE << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT), diff --git a/tests/round.shader_test b/tests/round.shader_test new file mode 100644 index 00000000..d8eb11b7 --- /dev/null +++ b/tests/round.shader_test @@ -0,0 +1,26 @@ +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + return round(u); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (0.0, 6.0, 8.0, 3.0) 4 + + + +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + float a = round(u.r); + int2 b = round(u.gb); + float4 res = float4(b, a, u.a); + return round(res); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (6.0, 8.0, 0.0, 3.0) 4 -- 2.26.3

5 6

[PATCH vkd3d] vkd3d-shader/hlsl: Fix texture reservation trace.
by Matteo Bruni 22 Nov '21

22 Nov '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 24b8205c..0bf18c2b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1240,7 +1240,7 @@ static void allocate_textures(struct hlsl_ctx *ctx) var->reg.id = var->reg_reservation.index; var->reg.allocated = true; - TRACE("Allocated reserved %s to t%u.\n", var->name, index); + TRACE("Allocated reserved %s to t%u.\n", var->name, var->reg_reservation.index); } else if (!var->reg_reservation.type) { -- 2.26.3

4 3

[PATCH 1/7] winebus.sys: Initialize last_report length and buffer.
by Rémi Bernon 22 Nov '21

22 Nov '21

Fixes a regression from e9c3c494fd2f388acd046c95ac6b121c0830bb46 where although we use the last report length, it was only initialized after the first corresponding report was received. Calling HidD_GetInputReport before that could cause a buffer overlow and report invalid data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52068 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index d805f887a6f..111953c3bae 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -444,8 +444,6 @@ static void process_hid_report(DEVICE_OBJECT *device, BYTE *report_buf, DWORD re if (!ext->collection_desc.ReportIDs[0].ReportID) last_report = ext->last_reports[0]; else last_report = ext->last_reports[report_buf[0]]; - - last_report->length = report_len; memcpy(last_report->buffer, report_buf, report_len); if ((irp = pop_pending_read(ext))) @@ -861,7 +859,13 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { if (!(size = reports[i].InputLength)) continue; size = offsetof( struct hid_report, buffer[size] ); - if (!(ext->last_reports[reports[i].ReportID] = RtlAllocateHeap(GetProcessHeap(), 0, size))) status = STATUS_NO_MEMORY; + if (!(report = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, size))) status = STATUS_NO_MEMORY; + else + { + report->length = reports[i].InputLength; + report->buffer[0] = reports[i].ReportID; + ext->last_reports[reports[i].ReportID] = report; + } } if (!status) ext->state = DEVICE_STATE_STARTED; } -- 2.33.1

1 6

[PATCH v2] user32: Add exception handler to GetWindowText. (Resend).
by Dmitry Timoshkov 22 Nov '21

22 Nov '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 29 ++++++++++++++++---- dlls/user32/win.c | 59 ++++++++++++++++++++++++++++++----------- 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 88989f4064b..0156987f529 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7923,17 +7923,36 @@ static void test_gettext(void) if (0) { r = SendMessageA( hwnd, WM_GETTEXT, 0x10, 0x1000); - ok( r == 0, "settext should return zero\n"); + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); r = SendMessageA( hwnd, WM_GETTEXT, 0x10000, 0); - ok( r == 0, "settext should return zero (%ld)\n", r); + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); r = SendMessageA( hwnd, WM_GETTEXT, 0xff000000, 0x1000); - ok( r == 0, "settext should return zero (%ld)\n", r); + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); r = SendMessageA( hwnd, WM_GETTEXT, 0x1000, 0xff000000); - ok( r == 0, "settext should return zero (%ld)\n", r); - } + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); + } + + /* GetWindowText doesn't crash */ + r = GetWindowTextA( hwnd, (LPSTR)0x10, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextA( hwnd, (LPSTR)0x10000, 0 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextA( hwnd, (LPSTR)0xff000000, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextA( hwnd, (LPSTR)0x1000, 0xff000000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + + r = GetWindowTextW( hwnd, (LPWSTR)0x10, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextW( hwnd, (LPWSTR)0x10000, 0 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextW( hwnd, (LPWSTR)0xff000000, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextW( hwnd, (LPWSTR)0x1000, 0xff000000); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); DestroyWindow(hwnd); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 221607b3169..735478c16e4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -31,6 +31,7 @@ #include "win.h" #include "controls.h" #include "winerror.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); @@ -2999,22 +3000,34 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongW( INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) { WCHAR *buffer; + int ret = 0; if (!lpString || nMaxCount <= 0) return 0; - if (WIN_IsCurrentProcess( hwnd )) + __TRY { - lpString[0] = 0; - return (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + if (WIN_IsCurrentProcess( hwnd )) + { + lpString[0] = 0; + ret = (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } + else if ((buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) + { + /* when window belongs to other process, don't send a message */ + get_server_window_text( hwnd, buffer, nMaxCount ); + if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) + lpString[nMaxCount-1] = 0; + HeapFree( GetProcessHeap(), 0, buffer ); + ret = strlen(lpString); + } + } + __EXCEPT_ALL + { + ret = 0; } + __ENDTRY - /* when window belongs to other process, don't send a message */ - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) return 0; - get_server_window_text( hwnd, buffer, nMaxCount ); - if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) - lpString[nMaxCount-1] = 0; - HeapFree( GetProcessHeap(), 0, buffer ); - return strlen(lpString); + return ret; } @@ -3047,17 +3060,31 @@ INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount ) */ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) { + int ret; + if (!lpString || nMaxCount <= 0) return 0; - if (WIN_IsCurrentProcess( hwnd )) + __TRY { - lpString[0] = 0; - return (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + if (WIN_IsCurrentProcess( hwnd )) + { + lpString[0] = 0; + ret = (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } + else + { + /* when window belongs to other process, don't send a message */ + get_server_window_text( hwnd, lpString, nMaxCount ); + ret = lstrlenW(lpString); + } } + __EXCEPT_ALL + { + ret = 0; + } + __ENDTRY - /* when window belongs to other process, don't send a message */ - get_server_window_text( hwnd, lpString, nMaxCount ); - return lstrlenW(lpString); + return ret; } -- 2.33.1

2 1

[PATCH 1/2] include: Add mfd3d12.idl.
by Nikolay Sivov 22 Nov '21

22 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/mfd3d12.idl | 63 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 include/mfd3d12.idl diff --git a/include/Makefile.in b/include/Makefile.in index df049fd284f..756e25dcc82 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -408,6 +408,7 @@ SOURCES = \ mediaobj.idl \ metahost.idl \ mfapi.h \ + mfd3d12.idl \ mferror.h \ mfidl.idl \ mfmediaengine.idl \ diff --git a/include/mfd3d12.idl b/include/mfd3d12.idl new file mode 100644 index 00000000000..2098e6d405a --- /dev/null +++ b/include/mfd3d12.idl @@ -0,0 +1,63 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "mfidl.idl"; +import "d3d12.idl"; + +[ + object, + uuid(09d0f835-92ff-4e53-8efa-40faa551f233), + local +] +interface IMFD3D12SynchronizationObjectCommands : IUnknown +{ + HRESULT EnqueueResourceReady([in] ID3D12CommandQueue *producer_queue); + HRESULT EnqueueResourceReadyWait([in] ID3D12CommandQueue *consumer_queue); + HRESULT SignalEventOnResourceReady(HANDLE event); + HRESULT EnqueueResourceRelease([in] ID3D12CommandQueue *consumer_queue); +} + +[ + object, + uuid(802302b0-82de-45e1-b421-f19ee5bdaf23), + local +] +interface IMFD3D12SynchronizationObject : IUnknown +{ + HRESULT SignalEventOnFinalResourceRelease(HANDLE hEvent); +} + +typedef enum MF_MT_D3D_RESOURCE_VERSION_ENUM +{ + MF_D3D11_RESOURCE, + MF_D3D12_RESOURCE +} MF_MT_D3D_RESOURCE_VERSION_ENUM; + +cpp_quote("EXTERN_GUID(MF_D3D12_SYNCHRONIZATION_OBJECT, 0x2a7c8d6a, 0x85a6, 0x494d, 0xa0, 0x46, 0x06, 0xea, 0x1a, 0x13, 0x8f, 0x4b);") +cpp_quote("EXTERN_GUID(MF_MT_D3D_RESOURCE_VERSION, 0x174f1e85, 0xfe26, 0x453d, 0xb5, 0x2e, 0x5b, 0xdd, 0x4e, 0x55, 0xb9, 0x44);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_CPU_READBACK, 0x28ee9fe3, 0xd481, 0x46a6, 0xb9, 0x8a, 0x7f, 0x69, 0xd5, 0x28, 0xe, 0x82);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_TEXTURE_LAYOUT, 0x97c85caa, 0xbeb, 0x4ee1, 0x97, 0x15, 0xf2, 0x2f, 0xad, 0x8c, 0x10, 0xf5);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET, 0xeeac2585, 0x3430, 0x498c, 0x84, 0xa2, 0x77, 0xb1, 0xbb, 0xa5, 0x70, 0xf6);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL, 0xb1138dc3, 0x01d5, 0x4c14, 0x9b, 0xdc, 0xcd, 0xc9, 0x33, 0x6f, 0x55, 0xb9);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, 0x82c85647, 0x5057, 0x4960, 0x95, 0x59, 0xf4, 0x5b, 0x8e, 0x27, 0x14, 0x27);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE, 0xba06bfac, 0xffe3, 0x474a, 0xab, 0x55, 0x16, 0x1e, 0xe4, 0x41, 0x7a, 0x2e);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER, 0xa6a1e439, 0x2f96, 0x4ab5, 0x98, 0xdc, 0xad, 0xf7, 0x49, 0x73, 0x50, 0x5d);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS, 0xa4940b2, 0xcfd6, 0x4738, 0x9d, 0x02, 0x98, 0x11, 0x37, 0x34, 0x01, 0x5a);") +cpp_quote("EXTERN_GUID(MF_SA_D3D12_HEAP_FLAGS, 0x496b3266, 0xd28f, 0x4f8c, 0x93, 0xa7, 0x4a, 0x59, 0x6b, 0x1a, 0x31, 0xa1);") +cpp_quote("EXTERN_GUID(MF_SA_D3D12_HEAP_TYPE, 0x56f26a76, 0xbbc1, 0x4ce0, 0xbb, 0x11, 0xe2, 0x23, 0x68, 0xd8, 0x74, 0xed);") +cpp_quote("EXTERN_GUID(MF_SA_D3D12_CLEAR_VALUE, 0x86ba9a39, 0x526, 0x495d, 0x9a, 0xb5, 0x54, 0xec, 0x9f, 0xad, 0x6f, 0xc3);") -- 2.33.0

1 1

[PATCH 1/3] include: Add featurestagingapi.h
by Alex Henrie 22 Nov '21

22 Nov '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/featurestagingapi.h | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 include/featurestagingapi.h diff --git a/include/featurestagingapi.h b/include/featurestagingapi.h new file mode 100644 index 00000000000..d0220b210f0 --- /dev/null +++ b/include/featurestagingapi.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _FEATURESTAGINGAPI_H_ +#define _FEATURESTAGINGAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(FEATURE_STATE_CHANGE_SUBSCRIPTION); + +typedef void WINAPI FEATURE_STATE_CHANGE_CALLBACK(void*); + +typedef enum FEATURE_CHANGE_TIME +{ + FEATURE_CHANGE_TIME_READ = 0, + FEATURE_CHANGE_TIME_MODULE_RELOAD = 1, + FEATURE_CHANGE_TIME_SESSION = 2, + FEATURE_CHANGE_TIME_REBOOT = 3 +} FEATURE_CHANGE_TIME; + +typedef enum FEATURE_ENABLED_STATE +{ + FEATURE_ENABLED_STATE_DEFAULT = 0, + FEATURE_ENABLED_STATE_DISABLED = 1, + FEATURE_ENABLED_STATE_ENABLED = 2 +} FEATURE_ENABLED_STATE; + +#ifdef __cplusplus +} +#endif + +#endif -- 2.34.0

1 2

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan 22 Nov '21

22 Nov '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- po/zh_TW.po | 568 ++++++++++++++++++++++++---------------------------- 1 file changed, 259 insertions(+), 309 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index f7589eac26d..2fb5e3069dd 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-11-06 18:33+0800\n" +"PO-Revision-Date: 2021-11-20 21:33+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -1402,7 +1402,7 @@ msgstr "CRL 原因編碼" #: dlls/crypt32/crypt32.rc:40 msgid "CRL Distribution Points" -msgstr "CRL 發佈點" +msgstr "CRL 發布點" #: dlls/crypt32/crypt32.rc:41 msgid "Enhanced Key Usage" @@ -1619,7 +1619,7 @@ msgstr "Delta CRL 指示器" #: dlls/crypt32/crypt32.rc:94 msgid "Issuing Distribution Point" -msgstr "發行發佈點" +msgstr "發行發布點" #: dlls/crypt32/crypt32.rc:95 msgid "Freshest CRL" @@ -1639,7 +1639,7 @@ msgstr "原則條件約束" #: dlls/crypt32/crypt32.rc:99 msgid "Cross-Certificate Distribution Points" -msgstr "交叉憑證發佈點" +msgstr "交叉憑證發布點" #: dlls/crypt32/crypt32.rc:100 msgid "Application Policies" @@ -1711,7 +1711,7 @@ msgstr "虛擬基本 CRL 數目" #: dlls/crypt32/crypt32.rc:117 msgid "Next CRL Publish" -msgstr "下一個 CRL 發佈" +msgstr "下一個 CRL 發布" #: dlls/crypt32/crypt32.rc:118 msgid "CA Encryption Certificate" @@ -1911,7 +1911,7 @@ msgstr "永久簽署" #: dlls/crypt32/crypt32.rc:167 msgid "All issuance policies" -msgstr "所有發佈原則" +msgstr "所有發布原則" #: dlls/crypt32/crypt32.rc:172 msgid "Trusted Root Certification Authorities" @@ -2038,11 +2038,11 @@ msgstr "替代名稱" #: dlls/crypt32/crypt32.rc:206 msgid "CRL Distribution Point" -msgstr "CRL 發佈點" +msgstr "CRL 發布點" #: dlls/crypt32/crypt32.rc:207 msgid "Distribution Point Name" -msgstr "發佈點名稱" +msgstr "發布點名稱" #: dlls/crypt32/crypt32.rc:208 msgid "Full Name" @@ -4090,7 +4090,7 @@ msgstr "鎖定違規。\n" #: dlls/kernel32/winerror.mc:198 msgid "Wrong disk.\n" -msgstr "錯誤磁碟。\n" +msgstr "錯誤的磁碟。\n" #: dlls/kernel32/winerror.mc:203 msgid "Sharing buffer exceeded.\n" @@ -6642,7 +6642,7 @@ msgstr "無效的分隔符號檔案。\n" #: dlls/kernel32/winerror.mc:3413 msgid "Invalid priority.\n" -msgstr "無效的優先權。\n" +msgstr "無效的優先順序。\n" #: dlls/kernel32/winerror.mc:3418 msgid "Invalid printer name.\n" @@ -8096,11 +8096,11 @@ msgstr "正在移動檔案" #: dlls/msi/msi.rc:112 msgid "Publishing assembly information" -msgstr "正在發佈組合資訊" +msgstr "正在發布組合資訊" #: dlls/msi/msi.rc:113 msgid "Unpublishing assembly information" -msgstr "正在解除發佈組合資訊" +msgstr "正在解除發布組合資訊" #: dlls/msi/msi.rc:114 msgid "Patching files" @@ -8112,15 +8112,15 @@ msgstr "正在更新元件登錄" #: dlls/msi/msi.rc:116 msgid "Publishing Qualified Components" -msgstr "正在發佈合格的元件" +msgstr "正在發布合格的元件" #: dlls/msi/msi.rc:117 msgid "Publishing Product Features" -msgstr "正在發佈產品功能" +msgstr "正在發布產品功能" #: dlls/msi/msi.rc:118 msgid "Publishing product information" -msgstr "正在發佈產品資訊" +msgstr "正在發布產品資訊" #: dlls/msi/msi.rc:119 msgid "Registering Class servers" @@ -8216,15 +8216,15 @@ msgstr "正在停止服務" #: dlls/msi/msi.rc:143 msgid "Unpublishing Qualified Components" -msgstr "正在解除發佈合格的元件" +msgstr "正在解除發布合格的元件" #: dlls/msi/msi.rc:144 msgid "Unpublishing Product Features" -msgstr "正在解除發佈產品功能" +msgstr "正在解除發布產品功能" #: dlls/msi/msi.rc:145 msgid "Unpublishing product information" -msgstr "正在解除發佈產品資訊" +msgstr "正在解除發布產品資訊" #: dlls/msi/msi.rc:146 msgid "Unregister Class servers" @@ -12603,7 +12603,7 @@ msgstr "無法存取指定的檔案或多媒體控制介面裝置，因為應用 msgid "" "Cannot access specified file or MCI device because the application cannot " "change drives." -msgstr "無法存取指定的檔案或多媒體控制介面裝置，因為應用程式無法變更磁碟。" +msgstr "無法存取指定的檔案或多媒體控制介面裝置，因為應用程式無法變更儲存裝置。" #: dlls/winmm/winmm.rc:109 msgid "Specify a device or driver name that is less than 79 characters." @@ -13265,11 +13265,11 @@ msgid "" "The command will prompt you for the new volume label for the given drive.\n" "You can display the disk volume label with the VOL command.\n" msgstr "" -"LABEL 用於設定磁碟的磁碟區標籤。\n" +"LABEL 用於設定儲存裝置的磁碟區標籤。\n" "\n" -"語法: LABEL [裝置代號:]\n" +"語法: LABEL [磁碟機代號:]\n" "命令將向您提示詢問要讓給定的儲存裝置使用的磁碟區標籤。\n" -"您可以利用 VOL 命令來顯示磁碟的磁碟區標籤。\n" +"您可以利用 VOL 命令來顯示磁碟機的磁碟區標籤。\n" #: programs/cmd/cmd.rc:121 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" @@ -13532,7 +13532,7 @@ msgstr "VER 顯示您正在執行的 cmd 版本。\n" #: programs/cmd/cmd.rc:259 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL 顯示磁碟裝置的磁碟區標籤。\n" +msgstr "VOL 顯示儲存裝置的磁碟區標籤。\n" #: programs/cmd/cmd.rc:263 msgid "" @@ -13733,7 +13733,7 @@ msgstr "" "TITLE\t\t設定用於 CMD 作業階段的視窗標題\n" "TYPE\t\t印出文字檔的內容\n" "VER\t\t顯示目前的 CMD 版本\n" -"VOL\t\t顯示磁碟裝置的磁碟區標籤\n" +"VOL\t\t顯示儲存裝置的磁碟區標籤\n" "XCOPY\t\t複製來源檔案或樹狀目錄到目的地\n" "EXIT\t\t關閉 CMD\n" "\n" @@ -14219,13 +14219,11 @@ msgstr "IPv6 位址" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "主要 DNS 字尾" #: programs/msinfo32/msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "系統設定" +msgstr "系統資訊" #: programs/net/net.rc:30 msgid "" @@ -16515,7 +16513,7 @@ msgstr "" "/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" "/belownormal 在 Belownormal 優先類別中啟動程式。\n" "/node n 以指定的 NUMA 節點啟動程式。\n" -"/affinity mask 以指定的親和性遮罩啟動程式。\n" +"/affinity 遮罩以指定的親和性遮罩啟動程式。\n" "/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" "/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" "/exec 對指定檔案進行 Exec (在 Wine 內部使用)。\n" @@ -16594,7 +16592,7 @@ msgstr "錯誤：不允許行程自我終止。\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" -msgstr "新工作(&N)..." +msgstr "執行新工作(&N)..." #: programs/taskmgr/taskmgr.rc:39 msgid "E&xit Task Manager" @@ -16638,19 +16636,19 @@ msgstr "暫停(&P)" #: programs/taskmgr/taskmgr.rc:68 programs/taskmgr/taskmgr.rc:256 msgid "&Select Columns..." -msgstr "選擇行(&S)..." +msgstr "選擇欄(&S)..." #: programs/taskmgr/taskmgr.rc:69 programs/taskmgr/taskmgr.rc:258 msgid "&CPU History" -msgstr "&CPU 歷程" +msgstr "CPU 歷程記錄(&C)" #: programs/taskmgr/taskmgr.rc:71 programs/taskmgr/taskmgr.rc:259 msgid "&One Graph, All CPUs" -msgstr "在一張圖中顯示所有的 CPU(&O)" +msgstr "所有 CPU 處理為一個圖形(&O)" #: programs/taskmgr/taskmgr.rc:73 programs/taskmgr/taskmgr.rc:260 msgid "One Graph &Per CPU" -msgstr "每一個 C&PU 各一張圖" +msgstr "每個 CPU 各一個圖形(&P)" #: programs/taskmgr/taskmgr.rc:76 programs/taskmgr/taskmgr.rc:261 msgid "&Show Kernel Times" @@ -16695,15 +16693,15 @@ msgstr "結束工作(&E)" #: programs/taskmgr/taskmgr.rc:130 msgid "&Go To Process" -msgstr "跳到行程(&G)" +msgstr "跳到處理程序(&G)" #: programs/taskmgr/taskmgr.rc:149 programs/taskmgr/taskmgr.rc:363 msgid "&End Process" -msgstr "結束行程(&E)" +msgstr "結束處理程序(&E)" #: programs/taskmgr/taskmgr.rc:150 msgid "End Process &Tree" -msgstr "結束行程樹(&T)" +msgstr "結束處理程序樹(&T)" #: programs/taskmgr/taskmgr.rc:152 programs/winedbg/winedbg.rc:32 msgid "&Debug" @@ -16711,7 +16709,7 @@ msgstr "除錯(&D)" #: programs/taskmgr/taskmgr.rc:154 msgid "Set &Priority" -msgstr "設定優先權(&P)" +msgstr "設定優先順序(&P)" #: programs/taskmgr/taskmgr.rc:156 msgid "&Realtime" @@ -16719,15 +16717,15 @@ msgstr "即時(&R)" #: programs/taskmgr/taskmgr.rc:160 msgid "&Above Normal" -msgstr "正常以上(&A)" +msgstr "中等以上(&A)" #: programs/taskmgr/taskmgr.rc:164 msgid "&Below Normal" -msgstr "正常以下(&B)" +msgstr "中等以下(&B)" #: programs/taskmgr/taskmgr.rc:169 msgid "Set &Affinity..." -msgstr "設定親和度(&A)..." +msgstr "設定親和性(&A)..." #: programs/taskmgr/taskmgr.rc:170 msgid "Edit Debug &Channels..." @@ -16744,7 +16742,7 @@ msgstr "新工作(&N)..." #: programs/taskmgr/taskmgr.rc:364 msgid "&Show processes from all users" -msgstr "顯示所有使用者的行程(&S)" +msgstr "顯示所有使用者的處理程序(&S)" #: programs/taskmgr/taskmgr.rc:372 msgid "CPU usage" @@ -16764,11 +16762,11 @@ msgstr "使用中(K)" #: programs/taskmgr/taskmgr.rc:376 msgid "Physical memory (K)" -msgstr "實體記憶體(K)" +msgstr "實體記憶體 (K)" #: programs/taskmgr/taskmgr.rc:377 msgid "Kernel memory (K)" -msgstr "內核記憶體(K)" +msgstr "核心記憶體 (K)" #: programs/taskmgr/taskmgr.rc:378 programs/taskmgr/taskmgr.rc:290 msgid "Handles" @@ -16780,7 +16778,7 @@ msgstr "執行緒" #: programs/taskmgr/taskmgr.rc:380 programs/taskmgr/taskmgr.rc:263 msgid "Processes" -msgstr "行程" +msgstr "處理程序" #: programs/taskmgr/taskmgr.rc:387 programs/taskmgr/taskmgr.rc:396 #: programs/taskmgr/taskmgr.rc:405 @@ -16801,19 +16799,19 @@ msgstr "系統快取" #: programs/taskmgr/taskmgr.rc:406 msgid "Paged" -msgstr "置換頁" +msgstr "分頁" #: programs/taskmgr/taskmgr.rc:407 msgid "Nonpaged" -msgstr "非置換頁" +msgstr "非分頁" #: programs/taskmgr/taskmgr.rc:414 msgid "CPU usage history" -msgstr "CPU 使用歷程" +msgstr "CPU 使用歷程記錄" #: programs/taskmgr/taskmgr.rc:415 msgid "Memory usage history" -msgstr "記憶體使用歷程" +msgstr "記憶體使用歷程記錄" #: programs/taskmgr/taskmgr.rc:428 programs/taskmgr/taskmgr.rc:327 msgid "Debug Channels" @@ -16821,13 +16819,13 @@ msgstr "除錯通道" #: programs/taskmgr/taskmgr.rc:439 msgid "Processor Affinity" -msgstr "處理器親和度" +msgstr "處理器親和性" #: programs/taskmgr/taskmgr.rc:444 msgid "" "The Processor Affinity setting controls which CPUs the process will be " "allowed to execute on." -msgstr "處理器親和度設定控制各行程使用 CPU 分配情況。" +msgstr "處理器親和性設定控制各處理程序使用 CPU 分配情況。" #: programs/taskmgr/taskmgr.rc:446 msgid "CPU 0" @@ -16959,24 +16957,24 @@ msgstr "CPU 31" #: programs/taskmgr/taskmgr.rc:514 msgid "Select Columns" -msgstr "選擇顯示行" +msgstr "選擇顯示欄" #: programs/taskmgr/taskmgr.rc:519 msgid "" "Select the columns that will appear on the Process page of the Task Manager." -msgstr "請選擇工作管理員中行程分頁的顯示行。" +msgstr "請選擇工作管理員中處理程序分頁的顯示欄。" #: programs/taskmgr/taskmgr.rc:521 msgid "&Image Name" -msgstr "程式名稱(&I)" +msgstr "影像名稱(&I)" #: programs/taskmgr/taskmgr.rc:523 msgid "&PID (Process Identifier)" -msgstr "&PID (行程編號)" +msgstr "PID (處理程序編號)(&P)" #: programs/taskmgr/taskmgr.rc:525 msgid "&CPU Usage" -msgstr "&CPU 用量" +msgstr "CPU 用量(&C)" #: programs/taskmgr/taskmgr.rc:527 msgid "CPU Tim&e" @@ -17028,23 +17026,23 @@ msgstr "虛擬記憶體大小(&V)" #: programs/taskmgr/taskmgr.rc:551 msgid "Pa&ged Pool" -msgstr "置換頁池(&G)" +msgstr "分頁集區(&G)" #: programs/taskmgr/taskmgr.rc:553 msgid "N&on-paged Pool" -msgstr "非置換頁池(&O)" +msgstr "非分頁集區(&O)" #: programs/taskmgr/taskmgr.rc:555 msgid "Base P&riority" -msgstr "基本優先權(&R)" +msgstr "基本優先順序(&R)" #: programs/taskmgr/taskmgr.rc:557 msgid "&Handle Count" -msgstr "控制代碼(&H)" +msgstr "控制代碼計數(&H)" #: programs/taskmgr/taskmgr.rc:559 msgid "&Thread Count" -msgstr "執行緒(&T)" +msgstr "執行緒計數(&T)" #: programs/taskmgr/taskmgr.rc:561 programs/taskmgr/taskmgr.rc:292 msgid "GDI Objects" @@ -17080,7 +17078,7 @@ msgstr "工作管理員總是在其他視窗的最上面，除非是最小化" #: programs/taskmgr/taskmgr.rc:190 msgid "Task Manager is minimized when a SwitchTo operation is performed" -msgstr "工作管理員使用時最小化" +msgstr "當 SwitchTo 操作進行時將工作管理員最小化" #: programs/taskmgr/taskmgr.rc:191 msgid "Hide the Task Manager when it is minimized" @@ -17148,7 +17146,7 @@ msgstr "顯示工作管理員說明主題" #: programs/taskmgr/taskmgr.rc:212 msgid "Displays program information, version number, and copyright" -msgstr "顯示本程式資訊，版本及版權" +msgstr "顯示本程式資訊，版本及著作權" #: programs/taskmgr/taskmgr.rc:213 msgid "Exits the Task Manager application" @@ -17156,11 +17154,11 @@ msgstr "結束工作管理員" #: programs/taskmgr/taskmgr.rc:215 msgid "Shows 16-bit tasks under the associated ntvdm.exe" -msgstr "顯示 16 位元工作及有關的 ntvdm.exe" +msgstr "顯示與 ntvdm.exe 關聯的 16 位元工作" #: programs/taskmgr/taskmgr.rc:216 msgid "Select which columns will be visible on the Process page" -msgstr "選擇在行程分頁的顯示行" +msgstr "選擇在處理程序分頁的顯示欄" #: programs/taskmgr/taskmgr.rc:217 msgid "Displays kernel time in the performance graphs" @@ -17168,11 +17166,11 @@ msgstr "在效能圖表上顯示核心使用時間" #: programs/taskmgr/taskmgr.rc:219 msgid "A single history graph shows total CPU usage" -msgstr "在一張歷程圖表顯示所有 CPU 用量" +msgstr "在一張歷程記錄圖表顯示所有 CPU 用量" #: programs/taskmgr/taskmgr.rc:220 msgid "Each CPU has its own history graph" -msgstr "每一個 CPU 有自己的歷程圖表" +msgstr "每一個 CPU 有自己的歷程記錄圖表" #: programs/taskmgr/taskmgr.rc:222 msgid "Brings a task to the foreground, switch focus to that task" @@ -17180,7 +17178,7 @@ msgstr "將工作設為前景，並且切換至該工作" #: programs/taskmgr/taskmgr.rc:227 msgid "Tells the selected tasks to close" -msgstr "通知關閉選擇的工作" +msgstr "通知關閉已選取的工作" #: programs/taskmgr/taskmgr.rc:228 msgid "Switches the focus to the process of the selected task" @@ -17192,47 +17190,47 @@ msgstr "取消工作管理員隱藏狀態" #: programs/taskmgr/taskmgr.rc:230 msgid "Removes the process from the system" -msgstr "將行程從系統中移除" +msgstr "將處理程序從系統中移除" #: programs/taskmgr/taskmgr.rc:232 msgid "Removes this process and all descendants from the system" -msgstr "將行程及其附屬行程從系統中移除" +msgstr "將處理程序及其附屬處理程序從系統中移除" #: programs/taskmgr/taskmgr.rc:233 msgid "Attaches the debugger to this process" -msgstr "將除錯器接到本行程" +msgstr "將除錯器附加到這個處理程序" #: programs/taskmgr/taskmgr.rc:235 msgid "Controls which processors the process will be allowed to run on" -msgstr "控制各行程使用那個處理器" +msgstr "控制各處理程序可使用的處理器" #: programs/taskmgr/taskmgr.rc:237 msgid "Sets process to the REALTIME priority class" -msgstr "將行程設為即時優先等級" +msgstr "將處理程序的優先類別設為即時" #: programs/taskmgr/taskmgr.rc:238 msgid "Sets process to the HIGH priority class" -msgstr "將行程設為高優先級" +msgstr "將處理程序的優先類別設為高" #: programs/taskmgr/taskmgr.rc:240 msgid "Sets process to the ABOVE NORMAL priority class" -msgstr "將行程設為中等以上優先級" +msgstr "將處理程序的優先類別設為中等以上" #: programs/taskmgr/taskmgr.rc:242 msgid "Sets process to the NORMAL priority class" -msgstr "將行程設為中等優先級" +msgstr "將處理程序的優先類別設為中等" #: programs/taskmgr/taskmgr.rc:244 msgid "Sets process to the BELOW NORMAL priority class" -msgstr "將行程設為中等以下優先級" +msgstr "將處理程序的優先類別設為中等以下" #: programs/taskmgr/taskmgr.rc:245 msgid "Sets process to the LOW priority class" -msgstr "將行程設為低優先級" +msgstr "將處理程序的優先類別設為低" #: programs/taskmgr/taskmgr.rc:247 msgid "Controls Debug Channels" -msgstr "控制項除錯頻道" +msgstr "除錯頻道控制項" #: programs/taskmgr/taskmgr.rc:264 msgid "Performance" @@ -17244,7 +17242,7 @@ msgstr "CPU 使用率: %3d%%" #: programs/taskmgr/taskmgr.rc:266 msgid "Processes: %d" -msgstr "行程：%d" +msgstr "處理程序: %d" #: programs/taskmgr/taskmgr.rc:267 msgid "Mem Usage: %1!u!kB / %2!u!kB" @@ -17304,15 +17302,15 @@ msgstr "虛擬機器大小" #: programs/taskmgr/taskmgr.rc:287 msgid "Paged Pool" -msgstr "置換頁池" +msgstr "分頁集區" #: programs/taskmgr/taskmgr.rc:288 msgid "NP Pool" -msgstr "非置換頁池" +msgstr "非分頁集區" #: programs/taskmgr/taskmgr.rc:289 msgid "Base Pri" -msgstr "基底優先權" +msgstr "基本優先順序" #: programs/taskmgr/taskmgr.rc:301 msgid "Task Manager Warning" @@ -17324,13 +17322,13 @@ msgid "" "cause undesired results including system instability. Are you\n" "sure you want to change the priority class?" msgstr "" -"警告：變更這個行程的優先權類別也許會\n" -"造成預料之外的結果像是系統的不穩定。\n" -"您確定要變更優先權類別嗎？" +"警告: 變更這個處理程序的優先類別可能會\n" +"造成預料之外的結果，像是系統變得不穩定。\n" +"您確定要變更優先類別嗎?" #: programs/taskmgr/taskmgr.rc:305 msgid "Unable to Change Priority" -msgstr "無法變更優先權" +msgstr "無法變更優先順序" #: programs/taskmgr/taskmgr.rc:310 msgid "" @@ -17340,30 +17338,30 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"警告：終止行程可能造成預料之外的\n" -"結果像是資料的漏失與系統的不穩定。\n" -"行程將無法有機會於終止之前能夠儲存\n" -"它的狀態或資料。您確定要終止行程嗎？" +"警告: 終止處理程序可能造成預料之外的結果，\n" +"像是資料遺失和系統的不穩定。\n" +"處理程序可能無法在終止前儲存它的狀態或資料。\n" +"您確定要終止處理程序嗎?" #: programs/taskmgr/taskmgr.rc:311 msgid "Unable to Terminate Process" -msgstr "無法終止行程" +msgstr "無法終止處理程序" #: programs/taskmgr/taskmgr.rc:313 msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"警告：對這個行程偵錯也許會導致資料失真。\n" -"您確定希望要附加除錯程式？" +"警告：對這個處理程序進行除錯可能會導致資料遺失。\n" +"您確定要附加除錯程式嗎?" #: programs/taskmgr/taskmgr.rc:314 msgid "Unable to Debug Process" -msgstr "無法對行程進行除錯" +msgstr "無法對處理程序進行除錯" #: programs/taskmgr/taskmgr.rc:315 msgid "The process must have affinity with at least one processor" -msgstr "行程必須有具備至少一個處理器的近似者" +msgstr "處理程序必須至少有一個或處理器的親和性設定" #: programs/taskmgr/taskmgr.rc:316 msgid "Invalid Option" @@ -17371,11 +17369,11 @@ msgstr "無效的選項" #: programs/taskmgr/taskmgr.rc:317 msgid "Unable to Access or Set Process Affinity" -msgstr "無法存取或設定行程近似者" +msgstr "無法存取或設定處理器親和性" #: programs/taskmgr/taskmgr.rc:322 msgid "System Idle Process" -msgstr "系統閒置" +msgstr "系統閒置處理程序" #: programs/taskmgr/taskmgr.rc:323 msgid "Not Responding" @@ -17399,23 +17397,21 @@ msgid "" "executable.\n" "Do you want to remove the uninstall entry from the registry?" msgstr "" -"移除指令執行 %s 失敗，可能是找不到可執行程式。\n" -"您要將這項移除指令從註冊表中刪除嗎？" +"移除命令 '%s' 執行失敗，可能是找不到可執行程式。\n" +"您要將這項移除命令從註冊表中移除嗎?" #: programs/uninstaller/uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller: 找不到 GUID 為 '%1' 的應用程式\n" #: programs/uninstaller/uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" -msgstr "" +msgstr "uninstaller: 選項 '--remove' 以後必須接著一個應用程式 GUID\n" #: programs/uninstaller/uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "錯誤：無效的選項 %c。\n" +msgstr "uninstaller: 無效的選項 [%1]\n" #: programs/uninstaller/uninstaller.rc:35 msgid "" @@ -17424,6 +17420,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Wine 應用程式解除安裝程式\n" +"\n" +"從目前的 Wine prefix 移除應用程式。\n" +"\n" #: programs/uninstaller/uninstaller.rc:43 msgid "" @@ -17438,6 +17438,16 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"用法:\n" +" uninstaller [選項]\n" +"選項:\n" +"\n" +" --help\t 顯示這個資訊。\n" +" --list\t 列出安裝在這個 Wine prefix 中的所有應用程式。\n" +" --remove {GUID} 解除安裝指定的應用程式。\n" +"\t\t 使用 '--list' 來取得應用程式的 GUID。\n" +" [沒有選項] 啟動本程式的圖形界面。\n" +"\n" #: programs/view/view.rc:36 msgid "&Pan" @@ -17461,15 +17471,15 @@ msgstr "普通 Metafile 閱讀器" #: programs/view/view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafile (*.wmf, *.emf)" #: programs/wineboot/wineboot.rc:31 msgid "Waiting for Program" -msgstr "等候程式" +msgstr "正在等候程式" #: programs/wineboot/wineboot.rc:35 msgid "Terminate Process" -msgstr "中斷" +msgstr "終止處理程序" #: programs/wineboot/wineboot.rc:36 msgid "" @@ -17480,7 +17490,7 @@ msgid "" msgstr "" "正在模擬關機，但此程式沒有反應。\n" "\n" -"如果您中斷行程，可能會遺失尚未儲存的資料。" +"如果您中斷處理程序，可能會遺失尚未儲存的資料。" #: programs/wineboot/wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." @@ -17493,8 +17503,8 @@ msgid "" "Free Software Foundation; either version 2.1 of the License, or (at your " "option) any later version." msgstr "" -"這個程式是自由軟體；您可以遵照自由軟體基金會所制定的 GNU LGPL 2.1 版或者更新" -"版本的許可條款，來修改和重新散布這個程式。" +"這個程式是自由軟體; 您可以遵照自由軟體基金會所制定的 GNU LGPL 2.1 版或者更新" +"版本的許可條款，來修改和重新散布這個程式。" #: programs/winecfg/winecfg.rc:142 msgid "Windows registration information" @@ -17502,11 +17512,11 @@ msgstr "Windows 註冊資訊" #: programs/winecfg/winecfg.rc:143 msgid "&Owner:" -msgstr "姓名(&O)：" +msgstr "姓名(&O):" #: programs/winecfg/winecfg.rc:145 msgid "Organi&zation:" -msgstr "組織(&Z)：" +msgstr "組織(&Z):" #: programs/winecfg/winecfg.rc:153 msgid "Application settings" @@ -17518,20 +17528,21 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine 可以對不同程式偽裝成不同版本的 Windows。「函式庫」與「顯示」分頁將連結" -"到這個分頁，除了調整預設設定，也能調整個別程式的設定。" +"針對不同程式，Wine 可以模仿為不同版本的 Windows。" +"「函式庫」與「顯示」分頁將連結到這個分頁，除了調整預設設定，" +"也能調整個別程式的設定。" #: programs/winecfg/winecfg.rc:158 msgid "Add appli&cation..." -msgstr "新增程式設定(&C)..." +msgstr "新增程式(&C)..." #: programs/winecfg/winecfg.rc:159 msgid "&Remove application" -msgstr "移除程式設定(&R)" +msgstr "移除程式(&R)" #: programs/winecfg/winecfg.rc:160 msgid "&Windows Version:" -msgstr "&Windows 版本：" +msgstr "Windows 版本(&W):" #: programs/winecfg/winecfg.rc:168 msgid "Window settings" @@ -17555,7 +17566,7 @@ msgstr "模擬一個虛擬桌面(&E)" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" -msgstr "桌面大小(&S)：" +msgstr "桌面大小(&S):" #: programs/winecfg/winecfg.rc:179 msgid "Screen resolution" @@ -17567,7 +17578,7 @@ msgstr "這是使用 10 點 Tahoma 字型的範例文字" #: programs/winecfg/winecfg.rc:190 msgid "DLL overrides" -msgstr "DLL 覆載" +msgstr "DLL 覆寫" #: programs/winecfg/winecfg.rc:191 msgid "" @@ -17575,12 +17586,12 @@ msgid "" "(provided by Wine) or native (taken from Windows or provided by the " "application)." msgstr "" -"動態連結函式庫可以個別設定，來指定要使用 Wine 提供的內建版本，還是使用取自 " -"Windows 或程式所提供的原生版本。" +"動態連結函式庫可以個別設定，來指定要使用 Wine 提供的內建版本，" +"還是使用取自 Windows 或程式所提供的原生版本。" #: programs/winecfg/winecfg.rc:193 msgid "&New override for library:" -msgstr "新增函式庫覆載(&N)：" +msgstr "新增函式庫覆寫(&N):" #: programs/winecfg/winecfg.rc:195 msgid "A&dd" @@ -17588,7 +17599,7 @@ msgstr "新增(&D)" #: programs/winecfg/winecfg.rc:196 msgid "Existing &overrides:" -msgstr "已有的函式庫覆載(&O)：" +msgstr "已有的函式庫覆寫(&O):" #: programs/winecfg/winecfg.rc:198 msgid "&Edit..." @@ -17596,7 +17607,7 @@ msgstr "編輯(&E)..." #: programs/winecfg/winecfg.rc:204 msgid "Edit Override" -msgstr "編輯覆載設定" +msgstr "編輯覆寫設定" #: programs/winecfg/winecfg.rc:207 msgid "Load order" @@ -17604,11 +17615,11 @@ msgstr "載入順序" #: programs/winecfg/winecfg.rc:208 msgid "&Builtin (Wine)" -msgstr "內建(Wine)(&B)" +msgstr "內建 (Wine)(&B)" #: programs/winecfg/winecfg.rc:209 msgid "&Native (Windows)" -msgstr "原生(Windows)(&N)" +msgstr "原生 (Windows)(&N)" #: programs/winecfg/winecfg.rc:210 msgid "Buil&tin then Native" @@ -17623,28 +17634,22 @@ msgid "Select Drive Letter" msgstr "選擇儲存裝置代號" #: programs/winecfg/winecfg.rc:231 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Wine 設定" +msgstr "儲存裝置設定" #: programs/winecfg/winecfg.rc:232 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." -msgstr "連線到掛載管理員時失敗，無法編輯磁碟組態。" +msgstr "連線到掛載管理員時失敗; 無法編輯儲存裝置設定。" #: programs/winecfg/winecfg.rc:235 msgid "A&dd..." -msgstr "加入(&D)..." +msgstr "新增(&D)..." #: programs/winecfg/winecfg.rc:239 msgid "&Path:" -msgstr "路徑(&P)：" +msgstr "路徑(&P):" #: programs/winecfg/winecfg.rc:246 programs/winecfg/winecfg.rc:37 msgid "Show Advan&ced" @@ -17652,7 +17657,7 @@ msgstr "顯示進階選項(&C)" #: programs/winecfg/winecfg.rc:247 msgid "De&vice:" -msgstr "裝置(&V)：" +msgstr "裝置(&V):" #: programs/winecfg/winecfg.rc:249 msgid "Bro&wse..." @@ -17660,15 +17665,15 @@ msgstr "瀏覽(&W)..." #: programs/winecfg/winecfg.rc:251 msgid "&Label:" -msgstr "標貼(&L)：" +msgstr "標籤(&L):" #: programs/winecfg/winecfg.rc:253 msgid "S&erial:" -msgstr "序號(&E)：" +msgstr "序號(&E):" #: programs/winecfg/winecfg.rc:256 msgid "&Show dot files" -msgstr "顯示隱藏檔案(&S)" +msgstr "顯示點檔案(&S)" #: programs/winecfg/winecfg.rc:263 msgid "Driver diagnostics" @@ -17680,33 +17685,31 @@ msgstr "預設" #: programs/winecfg/winecfg.rc:266 msgid "Output device:" -msgstr "輸出裝置：" +msgstr "輸出裝置:" #: programs/winecfg/winecfg.rc:267 msgid "Voice output device:" -msgstr "語音輸出裝置：" +msgstr "語音輸出裝置:" #: programs/winecfg/winecfg.rc:268 msgid "Input device:" -msgstr "輸入裝置：" +msgstr "輸入裝置:" #: programs/winecfg/winecfg.rc:269 msgid "Voice input device:" -msgstr "語音輸入裝置：" +msgstr "語音輸入裝置:" #: programs/winecfg/winecfg.rc:274 msgid "&Test Sound" -msgstr "測試音效(&T)" +msgstr "測試音效(&T):" #: programs/winecfg/winecfg.rc:275 programs/winecfg/winecfg.rc:89 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Wine 設定" +msgstr "喇叭設定" #: programs/winecfg/winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "喇叭:" #: programs/winecfg/winecfg.rc:286 msgid "Appearance" @@ -17714,27 +17717,27 @@ msgstr "外觀" #: programs/winecfg/winecfg.rc:287 msgid "&Theme:" -msgstr "布景主題(&T)：" +msgstr "主題(&T):" #: programs/winecfg/winecfg.rc:289 msgid "&Install theme..." -msgstr "安裝布景主題(&I)..." +msgstr "安裝主題(&I)..." #: programs/winecfg/winecfg.rc:294 msgid "It&em:" -msgstr "項目(&E)：" +msgstr "項目(&E):" #: programs/winecfg/winecfg.rc:296 msgid "C&olor:" -msgstr "顏色(&O)：" +msgstr "顏色(&O):" #: programs/winecfg/winecfg.rc:302 msgid "MIME types" -msgstr "" +msgstr "MIME 類型" #: programs/winecfg/winecfg.rc:303 msgid "Manage file &associations" -msgstr "" +msgstr "管理檔案關聯(&A)" #: programs/winecfg/winecfg.rc:306 msgid "Folders" @@ -17742,7 +17745,7 @@ msgstr "資料夾" #: programs/winecfg/winecfg.rc:309 msgid "&Link to:" -msgstr "連結至(&L)：" +msgstr "連結至(&L):" #: programs/winecfg/winecfg.rc:33 msgid "Libraries" @@ -17762,7 +17765,7 @@ msgstr "隱藏進階選項(&C)" #: programs/winecfg/winecfg.rc:38 msgid "(No Theme)" -msgstr "(無布景主題)" +msgstr "(無主題)" #: programs/winecfg/winecfg.rc:39 msgid "Graphics" @@ -17786,15 +17789,15 @@ msgstr "Wine 設定" #: programs/winecfg/winecfg.rc:45 msgid "Theme files (*.msstyles; *.theme)" -msgstr "布景主題檔案 (*.msstyles; *.theme)" +msgstr "主題檔案 (*.msstyles; *.theme)" #: programs/winecfg/winecfg.rc:46 msgid "Select a theme file" -msgstr "選擇一個布景主題檔案" +msgstr "選擇一個主題檔案" #: programs/winecfg/winecfg.rc:47 msgid "Folder" -msgstr "特殊資料夾" +msgstr "資料夾" #: programs/winecfg/winecfg.rc:48 msgid "Links to" @@ -17806,7 +17809,7 @@ msgstr "Wine 於 %s 的設定" #: programs/winecfg/winecfg.rc:83 msgid "Selected driver: %s" -msgstr "選擇的驅動程式：%s" +msgstr "選擇的驅動程式: %s" #: programs/winecfg/winecfg.rc:84 msgid "(None)" @@ -17814,7 +17817,7 @@ msgstr "(無)" #: programs/winecfg/winecfg.rc:85 msgid "Audio test failed!" -msgstr "音效測試失敗！" +msgstr "音效測試失敗!" #: programs/winecfg/winecfg.rc:87 msgid "(System default)" @@ -17822,33 +17825,31 @@ msgstr "(系統預設值)" #: programs/winecfg/winecfg.rc:90 msgid "5.1 Surround" -msgstr "" +msgstr "5.1 環場音效" #: programs/winecfg/winecfg.rc:91 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "圖形" +msgstr "四聲道" #: programs/winecfg/winecfg.rc:92 msgid "Stereo" -msgstr "" +msgstr "雙聲道" #: programs/winecfg/winecfg.rc:93 msgid "Mono" -msgstr "" +msgstr "單聲道" #: programs/winecfg/winecfg.rc:53 msgid "" "Changing the load order of this library is not recommended.\n" "Are you sure you want to do this?" msgstr "" -"不建議對這個函式庫更改載入順序。\n" -"您確定要如此嗎？" +"不建議更改這個函式庫的載入順序。\n" +"您確定要如此做嗎?" #: programs/winecfg/winecfg.rc:54 msgid "Warning: system library" -msgstr "警告：系統函式庫" +msgstr "警告: 系統函式庫" #: programs/winecfg/winecfg.rc:55 msgid "native" @@ -17864,7 +17865,7 @@ msgstr "原生，內建" #: programs/winecfg/winecfg.rc:58 msgid "builtin, native" -msgstr "內建、原生" +msgstr "內建，原生" #: programs/winecfg/winecfg.rc:59 msgid "disabled" @@ -17872,7 +17873,7 @@ msgstr "停用" #: programs/winecfg/winecfg.rc:60 msgid "Default Settings" -msgstr "預設組態" +msgstr "預設設定" #: programs/winecfg/winecfg.rc:61 msgid "Wine Programs (*.exe; *.exe.so)" @@ -17884,7 +17885,7 @@ msgstr "使用全域設定" #: programs/winecfg/winecfg.rc:63 msgid "Select an executable file" -msgstr "選擇一個可執行檔" +msgstr "選擇一個可執行檔案" #: programs/winecfg/winecfg.rc:68 msgid "Autodetect" @@ -17900,7 +17901,7 @@ msgstr "網路分享" #: programs/winecfg/winecfg.rc:71 msgid "Floppy disk" -msgstr "軟碟機" +msgstr "軟碟" #: programs/winecfg/winecfg.rc:72 msgid "CD-ROM" @@ -17914,30 +17915,23 @@ msgid "" msgstr "" "您無法再增加任何儲存裝置。\n" "\n" -"每個儲存裝置必須要有一個從 A 到 Z 之間的英文字母，所以您無法擁有超過 26 個裝" -"置。" +"每個儲存裝置必須有一個從 A 到 Z 之間的英文字母，所以您無法擁有超過 26 個裝置。" #: programs/winecfg/winecfg.rc:74 msgid "System drive" msgstr "系統儲存裝置" #: programs/winecfg/winecfg.rc:75 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" "Most Windows applications expect drive C to exist, and will die messily if " "it doesn't. If you proceed, remember to recreate it!" msgstr "" -"您確定要刪除 C 槽嗎？\n" +"您確定要刪除磁碟機 C 嗎?\n" "\n" -"大部分的 Windows 程式都假定 C 槽存在，而沒有 C 槽時就會死得很嚴重。如果您刪除" -"了它，請記得重新建立一個！" +"大部分的 Windows 應用程式都假定磁碟機 C 存在，而沒有磁碟機 C 時就會死得很嚴重。" +"如果您刪除了它，請記得重新建立一個!" #: programs/winecfg/winecfg.rc:76 msgctxt "Drive letter" @@ -17945,10 +17939,8 @@ msgid "Letter" msgstr "代號" #: programs/winecfg/winecfg.rc:77 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "新資料夾" +msgstr "目標資料夾" #: programs/winecfg/winecfg.rc:78 msgid "" @@ -17956,9 +17948,9 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"您沒有 C 槽。這不是件好事。\n" +"您沒有磁碟機 C。這不是件好事。\n" "\n" -"請記得點選「儲存裝置」分頁的「加入」來建立一個新磁碟！\n" +"請記得按「儲存裝置」分頁的 [加入] 按鈕來建立一個新儲存裝置!\n" #: programs/winecfg/winecfg.rc:98 msgid "Controls Background" @@ -18066,7 +18058,7 @@ msgstr "按鈕替換背景" #: programs/winecfg/winecfg.rc:125 msgid "Hot Tracked Item" -msgstr "熱門軌段的項目" +msgstr "熱點追蹤項目" #: programs/winecfg/winecfg.rc:126 msgid "Active Title Bar Gradient" @@ -18089,7 +18081,7 @@ msgid "" "wineconsole: Starting program %s failed.\n" "The command is invalid.\n" msgstr "" -"wineconsole：啟始程式 %s 時失敗。\n" +"wineconsole: 啟動程式 %s 時失敗。\n" "命令無效。\n" #: programs/winedbg/winedbg.rc:50 programs/winedbg/winedbg.rc:38 @@ -18100,7 +18092,7 @@ msgstr "程式錯誤" msgid "" "The program %s has encountered a serious problem and needs to close. We are " "sorry for the inconvenience." -msgstr "程式 %s 遇到了嚴重的問題而需要關閉。我們對於造成的不便感到抱歉。" +msgstr "程式 %s 遇到了嚴重問題而需要關閉。我們對於造成的不便感到抱歉。" #: programs/winedbg/winedbg.rc:59 msgid "" @@ -18108,8 +18100,9 @@ msgid "" "may want to check the <a href=\"https://appdb.winehq.org\">Application " "Database</a> for tips about running this application." msgstr "" -"這個可能是由 Wine 中的程式問題或缺失所造成。您可能要檢查<a href=\"https://" -"appdb.winehq.org\">應用程式資料庫</a>以獲得關於執行這個應用程式的祕訣。" +"這個可能是由 Wine 中的程式問題或缺失所造成。" +"您可能要檢查<a href=\"https://appdb.winehq.org\">應用程式資料庫</a>" +"以取得關於執行這個應用程式的提示。" #: programs/winedbg/winedbg.rc:62 msgid "Show &Details" @@ -18126,19 +18119,21 @@ msgid "" "button, then <a href=\"https://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" -"如果這個問題在 Windows 之下不會出現且未曾被報告，您可以使用「另存新檔」按鈕" -"將詳細的資訊儲存到檔案，然後<a href=\"https://wiki.winehq.org/Bugs\">發送錯誤" -"報告</a>並附加該檔案到報告中。" +"如果這個問題在 Windows 之下不會出現且未曾被報告，" +"您可以使用 [另存新檔] 按鈕將相關的詳細資訊儲存到檔案，" +"然後<a href=\"https://wiki.winehq.org/Bugs\">發送錯誤報告</a>" +"並附加該檔案到報告中。" #: programs/winedbg/winedbg.rc:40 msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"您的系統的程式崩潰了，但 WineDbg 無法附加到處理程序以取得回溯。" #: programs/winedbg/winedbg.rc:41 msgid "(unidentified)" -msgstr "(未經識別的)" +msgstr "(未識別)" #: programs/winedbg/winedbg.rc:44 msgid "Saving failed" @@ -18146,7 +18141,7 @@ msgstr "儲存失敗" #: programs/winedbg/winedbg.rc:45 msgid "Loading detailed information, please wait..." -msgstr "正在載入詳細資訊，請稍待..." +msgstr "正在載入詳細資訊，請稍候..." #: programs/winefile/winefile.rc:29 msgid "&Open\tEnter" @@ -18158,7 +18153,7 @@ msgstr "重新命名(&N)..." #: programs/winefile/winefile.rc:34 msgid "Propert&ies\tAlt+Enter" -msgstr "屬性(&I)\tAlt+Enter" +msgstr "內容(&I)\tAlt+Enter" #: programs/winefile/winefile.rc:38 msgid "Cr&eate Directory..." @@ -18178,7 +18173,7 @@ msgstr "從網路儲存裝置離線(&D)" #: programs/winefile/winefile.rc:51 msgid "&Name" -msgstr "檔案名稱(&N)" +msgstr "名稱(&N)" #: programs/winefile/winefile.rc:52 msgid "&All File Details" @@ -18262,19 +18257,19 @@ msgstr "顯示隱藏或系統檔(&S)" #: programs/winefile/winefile.rc:159 msgid "&File Name:" -msgstr "檔案名稱(&F)：" +msgstr "檔案名稱(&F):" #: programs/winefile/winefile.rc:161 msgid "Full &Path:" -msgstr "完整路徑(&P)：" +msgstr "完整路徑(&P):" #: programs/winefile/winefile.rc:163 msgid "Last Change:" -msgstr "最後修改：" +msgstr "最後修改:" #: programs/winefile/winefile.rc:167 msgid "Cop&yright:" -msgstr "著作權(&Y)：" +msgstr "著作權(&Y):" #: programs/winefile/winefile.rc:175 msgid "&System" @@ -18295,7 +18290,7 @@ msgstr "S" #: programs/winefile/winefile.rc:90 msgid "Applying font settings" -msgstr "字型設定套用中" +msgstr "正在套用字型設定" #: programs/winefile/winefile.rc:91 msgid "Error while selecting new font." @@ -18350,10 +18345,8 @@ msgid "&Beginner" msgstr "初學者(&B)" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "介面" +msgstr "中級(&I)" #: programs/winemine/winemine.rc:46 msgid "&Expert" @@ -18384,24 +18377,20 @@ msgid "Beginner" msgstr "初學者" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "介面" +msgstr "中級" #: programs/winemine/winemine.rc:66 msgid "Expert" msgstr "專家" #: programs/winemine/winemine.rc:74 programs/winemine/winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "結果" +msgstr "重設成績" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" -msgstr "恭喜！" +msgstr "恭喜!" #: programs/winemine/winemine.rc:82 msgid "Please enter your name" @@ -18425,7 +18414,7 @@ msgstr "地雷" #: programs/winemine/winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "所有成績都會消失。您確定嗎?" #: programs/winemine/winemine.rc:30 msgid "WineMine" @@ -18473,7 +18462,7 @@ msgstr "大" #: programs/winhlp32/winhlp32.rc:58 msgid "&Help on help\tF1" -msgstr "如何使用說明(&H)" +msgstr "如何使用說明(&H)\tF1" #: programs/winhlp32/winhlp32.rc:59 msgid "&About Wine Help" @@ -18501,7 +18490,7 @@ msgstr "Wine 說明" #: programs/winhlp32/winhlp32.rc:86 msgid "Error while reading the help file `%s'" -msgstr "載入說明檔案 %s 時發生錯誤" +msgstr "載入說明檔案 `%s' 時發生錯誤" #: programs/winhlp32/winhlp32.rc:88 msgid "Summary" @@ -18517,33 +18506,31 @@ msgstr "說明檔案 (*.hlp)" #: programs/winhlp32/winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "無法開啟檔案 %s。您想要自己搜尋這個檔案嗎？" +msgstr "無法開啟檔案 '%s'。您要自己搜尋這個檔案嗎?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" -msgstr "找不到 richedit... 終止" +msgstr "找不到 richedit 實作... 正在終止" #: programs/winhlp32/winhlp32.rc:94 msgid "Help topics: " -msgstr "說明主題：" +msgstr "說明主題:" #: programs/wmic/wmic.rc:28 msgid "Error: Command line not supported\n" -msgstr "錯誤：不支援命令列\n" +msgstr "錯誤: 不支援命令列\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "錯誤：找不到別名\n" +msgstr "錯誤: 找不到別名\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "錯誤：無效的查詢\n" +msgstr "錯誤: 無效的查詢\n" #: programs/wmic/wmic.rc:31 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid syntax for PATH\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "錯誤: 無效的 PATH 語法\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -18571,7 +18558,7 @@ msgstr "唯讀(&O)" #: programs/wordpad/wordpad.rc:58 msgid "&Modified" -msgstr "已變更(&M)" +msgstr "已修改(&M)" #: programs/wordpad/wordpad.rc:60 msgid "E&xtras" @@ -18587,7 +18574,7 @@ msgstr "文字格式(&F)" #: programs/wordpad/wordpad.rc:64 msgid "&Def. char format" -msgstr "預設格式(&D)" +msgstr "預設文字格式(&D)" #: programs/wordpad/wordpad.rc:65 msgid "Paragrap&h format" @@ -18611,15 +18598,13 @@ msgstr "插入(&I)" #: programs/wordpad/wordpad.rc:80 msgid "&Date and time..." -msgstr "日期時間(&D)..." +msgstr "日期和時間(&D)..." #: programs/wordpad/wordpad.rc:82 msgid "F&ormat" msgstr "格式(&O)" #: programs/wordpad/wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" msgstr "清單(&L)" @@ -18628,26 +18613,24 @@ msgid "&Bullet points" msgstr "項目符號(&B)" #: programs/wordpad/wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "CRL 數字" +msgstr "數字" #: programs/wordpad/wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "字母 - 小寫" #: programs/wordpad/wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "字母 - 大寫" #: programs/wordpad/wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "羅馬數字 - 小寫" #: programs/wordpad/wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "羅馬數字 - 大寫" #: programs/wordpad/wordpad.rc:94 programs/wordpad/wordpad.rc:117 msgid "&Paragraph..." @@ -18683,7 +18666,7 @@ msgstr "日期和時間" #: programs/wordpad/wordpad.rc:213 msgid "Available formats" -msgstr "可用格式" +msgstr "可用的格式" #: programs/wordpad/wordpad.rc:224 msgid "New document type" @@ -18719,7 +18702,7 @@ msgstr "分頁" #: programs/wordpad/wordpad.rc:253 msgid "Tab stops" -msgstr "定位停點" +msgstr "定位停駐點" #: programs/wordpad/wordpad.rc:255 msgid "&Add" @@ -18793,18 +18776,16 @@ msgid "Text documents (*.txt)" msgstr "純文字文件 (*.txt)" #: programs/wordpad/wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "萬國碼文字文件 (*.txt)" +msgstr "Unicode 文字文件 (*.txt)" #: programs/wordpad/wordpad.rc:150 msgid "Rich text format (*.rtf)" -msgstr "豐富文字格式 (*.rtf)" +msgstr "富文字格式 (*.rtf)" #: programs/wordpad/wordpad.rc:151 msgid "Rich text document" -msgstr "豐富文字格式檔案" +msgstr "富文字格式文件" #: programs/wordpad/wordpad.rc:152 msgid "Text document" @@ -18812,7 +18793,7 @@ msgstr "純文字文件" #: programs/wordpad/wordpad.rc:153 msgid "Unicode text document" -msgstr "萬國碼文字文件" +msgstr "Unicode 文字文件" #: programs/wordpad/wordpad.rc:154 msgid "Printer files (*.prn)" @@ -18828,7 +18809,7 @@ msgstr "純文字" #: programs/wordpad/wordpad.rc:168 msgid "Rich text" -msgstr "豐富格式文字" +msgstr "RTF 文字" #: programs/wordpad/wordpad.rc:174 msgid "Next page" @@ -18887,29 +18868,31 @@ msgstr "文件" #: programs/wordpad/wordpad.rc:192 msgid "Save changes to '%s'?" -msgstr "儲存變更到 %s？" +msgstr "儲存變更到 '%s'?" #: programs/wordpad/wordpad.rc:193 msgid "Finished searching the document." -msgstr "檔案搜尋結束。" +msgstr "檔案搜尋完成。" #: programs/wordpad/wordpad.rc:194 msgid "Failed to load the RichEdit library." -msgstr "RichEdit 載入失敗。" +msgstr "RichEdit 庫載入失敗。" #: programs/wordpad/wordpad.rc:195 msgid "" "You have chosen to save in plain text format, which will cause all " "formatting to be lost. Are you sure that you wish to do this?" -msgstr "您已經選擇儲存為純文字格式, 這可能導致格式遺失。您確定要這麼做嗎？" +msgstr "" +"您已經選擇儲存為純文字格式, 這可能導致格式遺失。" +"您確定要這麼做嗎?" #: programs/wordpad/wordpad.rc:198 msgid "Invalid number format." -msgstr "無效的數字格式。" +msgstr "錯誤的數字格式。" #: programs/wordpad/wordpad.rc:199 msgid "OLE storage documents are not supported." -msgstr "OLE 儲存體文件未被支援。" +msgstr "不支援 OLE 儲存體文件。" #: programs/wordpad/wordpad.rc:200 msgid "Could not save the file." @@ -18937,7 +18920,7 @@ msgstr "無法加入超過 32 個定位停駐點。" #: programs/write/write.rc:30 msgid "Starting Wordpad failed" -msgstr "啟動 Wordpad 時失敗" +msgstr "Wordpad 啟動失敗" #: programs/xcopy/xcopy.rc:30 msgid "Invalid number of parameters - Use xcopy /? for help\n" @@ -18945,7 +18928,7 @@ msgstr "無效的參數數量 - 使用 xcopy /? 以獲得說明\n" #: programs/xcopy/xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "無效的參數 %1 - 使用 xcopy /? 以獲得說明\n" +msgstr "無效的參數 '%1' - 使用 xcopy /? 以獲得說明\n" #: programs/xcopy/xcopy.rc:32 msgid "Press <Enter> to begin copying\n" @@ -18965,25 +18948,25 @@ msgid "" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"%1 是一個在目標上的\n" -"檔名或目錄？\n" +"%1 是目標上的\n" +"一個檔案名稱還是目錄?\n" "(F - 檔案，D - 目錄)\n" #: programs/xcopy/xcopy.rc:38 msgid "%1? (Yes|No)\n" -msgstr "%1？ (Yes|No)\n" +msgstr "%1? (Yes|No)\n" #: programs/xcopy/xcopy.rc:39 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "是否覆蓋 %1？ (Yes|No|All)\n" +msgstr "是否覆寫 %1? (Yes|No|All)\n" #: programs/xcopy/xcopy.rc:40 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "將 %1 複製到 %2 時失敗並獲得 r/c %3!d!\n" +msgstr "將 '%1' 複製到 '%2' 時失敗，並獲得 r/c %3!d!\n" #: programs/xcopy/xcopy.rc:42 msgid "Failed during reading of '%1'\n" -msgstr "在讀取 %1 的期間發生了失敗\n" +msgstr "在讀取 '%1' 時發生了失敗\n" #: programs/xcopy/xcopy.rc:46 msgctxt "File key" @@ -18996,41 +18979,6 @@ msgid "D" msgstr "D" #: programs/xcopy/xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -19066,20 +19014,20 @@ msgid "" "\t\tthan source.\n" "\n" msgstr "" -"XCOPY - 將來源檔案或樹狀目錄複製到目的。\n" +"XCOPY - 將來源檔案或樹狀目錄複製到目的地。\n" "\n" -"語法：\n" -"XCOPY 來源 [目的] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" +"語法:\n" +"XCOPY 來源 [目的地] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" "\n" -"位置：\n" +"位置:\n" "\n" "[/I] 如果目的不存在且複製兩個或更多檔案時，\n" "\t將目的假設為目錄。\n" "[/S] 複製目錄和子目錄。\n" -"[/E] 複製目錄和子目錄，包含任何空目錄。\n" -"[/Q] 在複製期間不列出名稱，亦即安靜模式。\n" -"[/F] 在複製期間顯示完整的來源和目的名稱。\n" +"[/E] 複製目錄和子目錄，包括任何空目錄。\n" +"[/Q] 安靜模式，在複製期間不列出名稱。\n" +"[/F] 在複製期間顯示完整的來源和目的地名稱。\n" "[/L] 模擬操作，顯示會被複製的名稱。\n" "[/W] 在開始複製操作之前進行提示。\n" "[/T] 建立空的目錄結構但是不複製檔案。\n" @@ -19094,6 +19042,8 @@ msgstr "" "[/A] 只複製具有封存屬性的檔案。\n" "[/M] 只複製具有封存屬性的檔案，\n" "\t但會移除封存屬性。\n" +"[/K] 複製檔案的屬性; 不指定這個引數則不會儲存屬性。\n" "[/D | /D:m-d-y] 複製新檔案或是於給定日期之後修改的檔案。\n" -"\t\t如果沒有給定日期，只有當目的比來源舊時才複製。\n" +"\t\t如果沒有給定日期，則只有目的地檔案\n" +"\t\t比來源檔案舊時才複製。\n" "\n" -- 2.33.0.windows.2

2 1

[PATCH resend 1/2] wininet/tests: Test adding HTTP header with empty value.
by Ziqing Hui 22 Nov '21

22 Nov '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- Resend: Please take a look at this patch set. Don't ignore it for the test failure. I think the test failure is not caused by this patch. See HTTP tests with a empty patch: https://testbot.winehq.org/JobDetails.pl?Key=101700 https://testbot.winehq.org/JobDetails.pl?Key=101701 dlls/wininet/tests/http.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3b8f16a9fb2..c3f33b4e0b7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2063,6 +2063,32 @@ static void HttpHeaders_test(void) "header still present\n"); ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "got %u\n", GetLastError()); + /* Adding header with empty value should cause a failure */ + todo_wine + { + SetLastError(0xdeadbeef); + ok(!HttpAddRequestHeadersA(hRequest, "EmptyTest1:", -1, HTTP_ADDREQ_FLAG_ADD), "Empty header should not be added.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error code %u.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ok(!HttpAddRequestHeadersA(hRequest, "EmptyTest2:\r\n", -1, HTTP_ADDREQ_FLAG_ADD), "Empty header should not be added.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error code %u.\n", GetLastError()); + + len = sizeof(buffer); + strcpy(buffer, "EmptyTest1"); + SetLastError(0xdeadbeef); + ok(!HttpQueryInfoA(hRequest, HTTP_QUERY_CUSTOM | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, NULL), + "Header with empty value is present.\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "Got unexpected error code %u.\n", GetLastError()); + + len = sizeof(buffer); + strcpy(buffer, "EmptyTest2"); + SetLastError(0xdeadbeef); + ok(!HttpQueryInfoA(hRequest, HTTP_QUERY_CUSTOM | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, NULL), + "Header with empty value is present.\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "Got unexpected error code %u.\n", GetLastError()); + } + ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n"); -- 2.25.1

2 3

[PATCH] mf/tests: Attempt to fix test crashes on some test boxes.
by Nikolay Sivov 21 Nov '21

21 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index eb681a8b9a7..0d4cb05711a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4498,15 +4498,18 @@ todo_wine { hr = IMFMediaSink_AddStreamSink(sink, 1, NULL, &stream_sink2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = MFGetService((IUnknown *)stream_sink2, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, - (void **)&allocator); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFVideoSampleAllocator_Release(allocator); + if (SUCCEEDED(hr)) + { + hr = MFGetService((IUnknown *)stream_sink2, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, + (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFVideoSampleAllocator_Release(allocator); - hr = IMFMediaSink_RemoveStreamSink(sink, 1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_RemoveStreamSink(sink, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFStreamSink_Release(stream_sink2); + IMFStreamSink_Release(stream_sink2); + } hr = IMFMediaSink_GetCharacteristics(sink, &flags); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.33.0

2 1

[PATCH] ucrtbase/tests: Don't test functions directly when reporting GetLastError()
by André Zwing 21 Nov '21

21 Nov '21

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/ucrtbase/tests/thread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c index 7693304e612..940db8e4dbf 100644 --- a/dlls/ucrtbase/tests/thread.c +++ b/dlls/ucrtbase/tests/thread.c @@ -105,7 +105,8 @@ static void test_thread_library_reference(char *thread_dll, ok(thread_handle != -1 && thread_handle != 0, "Failed to begin thread: %u\n", errno); - ok(FreeLibrary(dll), "Failed to free the library: %u\n", GetLastError()); + ret = FreeLibrary(dll); + ok(ret, "Failed to free the library: %u\n", GetLastError()); ret = WaitForSingleObject(args.confirm_running, 200); ok(ret == WAIT_OBJECT_0, "Event was not signaled, ret: %u, err: %u\n", ret, GetLastError()); @@ -113,7 +114,8 @@ static void test_thread_library_reference(char *thread_dll, ret = WaitForSingleObject(detach_event, 0); ok(ret == WAIT_TIMEOUT, "Thread detach happened unexpectedly signaling an event, ret: %d, err: %u\n", ret, GetLastError()); - ok(SetEvent(args.past_free), "Failed to signal event: %d\n", GetLastError()); + ret = SetEvent(args.past_free); + ok(ret, "Failed to signal event: %d\n", GetLastError()); if (beginthread_method == use_beginthreadex) { -- 2.25.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel