- wine-devel - winehq.org

[PATCH 3/3] msdasql: Implement IColumnsRowset GetAvailableColumns
by Alistair Leslie-Hughes 18 Nov '21

18 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. 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 f9538e5d4d9..7ce19b5ad73 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -819,8 +819,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 2/3] msdasql: Implement ICommandProperties SetProperties.
by Alistair Leslie-Hughes 18 Nov '21

18 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 9cd41eedfd8..f9538e5d4d9 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1098,7 +1098,29 @@ 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].id == propertyset[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property 0x%08x\n", command->properties[k].id); + if (command->properties[k].readonly) + WARN("Attempting to set Readonly property\n"); + else + VariantCopy(&command->properties[k].value, &propertyset[i].rgProperties[j].vValue); + break; + } + } + } + } return S_OK; } -- 2.33.0

1 0

[PATCH 1/3] msdasql: Implement ICommandProperties GetProperties
by Alistair Leslie-Hughes 18 Nov '21

18 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 1 + dlls/msdasql/session.c | 242 +++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 146 ++++++++++++++++++++ 3 files changed, 387 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..9cd41eedfd8 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -35,6 +35,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); +static DWORD propsid[79] = { + 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, + 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 +}; + struct msdasql_session { IUnknown session_iface; @@ -294,6 +317,13 @@ static ULONG WINAPI createcommand_Release(IDBCreateCommand *iface) return IUnknown_Release(&session->session_iface); } +struct command_props +{ + DWORD id; + BOOL readonly; + VARIANT value; +}; + struct command { ICommandText ICommandText_iface; @@ -305,6 +335,8 @@ struct command LONG refs; WCHAR *query; IUnknown *session; + + struct command_props properties[79]; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -933,8 +965,133 @@ 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; + + 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 + }; + + 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 = ARRAY_SIZE(row_props); + 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 = row_props[j]; + + for(k = 0; k < ARRAY_SIZE(command->properties); k++) + { + if (command->properties[k].id == row_props[j]) + { + V_VT(&propset[0].rgProperties[j].vValue) = VT_EMPTY; + VariantCopy(&propset[0].rgProperties[j].vValue, &command->properties[k].value); + break; + } + } + } + + propset[1].guidPropertySet = DBPROPSET_PROVIDERROWSET; + + propset[1].cProperties = ARRAY_SIZE(prov_props); + propset[1].rgProperties = CoTaskMemAlloc(propset[1].cProperties * sizeof(DBPROP)); + if (!propset[1].rgProperties) + { + CoTaskMemFree(propset[0].rgProperties); + CoTaskMemFree(propset); + return E_OUTOFMEMORY; + } + for (j=0; j < propset[1].cProperties; j++) + { + propset[1].rgProperties[j].dwPropertyID = prov_props[j]; + + for(k = 0; k < ARRAY_SIZE(command->properties); k++) + { + if (command->properties[k].id == prov_props[j]) + { + V_VT(&propset[1].rgProperties[j].vValue) = VT_EMPTY; + VariantCopy(&propset[1].rgProperties[j].vValue, &command->properties[k].value); + break; + } + } + } + + *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].id == propertyidsets[i].rgPropertyIDs[j]) + { + V_VT(&propset[i].rgProperties[j].vValue) = VT_EMPTY; + VariantCopy(&propset[i].rgProperties[j].vValue, &command->properties[k].value); + break; + } + } + } + + + } + + *sets_cnt = count; + } + + *propertyset = propset; + + return S_OK; } static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULONG count, @@ -1129,6 +1286,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); struct command *command; HRESULT hr; + int i; TRACE("%p, %p, %s, %p\n", session, outer, debugstr_guid(riid), out); @@ -1148,6 +1306,86 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->refs = 1; command->query = NULL; + for(i = 0; i < ARRAY_SIZE(command->properties); i++) + { + command->properties[i].id = propsid[i]; + VariantInit(&command->properties[i].value); + + switch(propsid[i]) + { + case DBPROP_BOOKMARKTYPE: + case DBPROP_NOTIFICATIONGRANULARITY: + case DBPROP_ACCESSORDER: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 1; + break; + case DBPROP_MAXOPENROWS: + case DBPROP_MAXPENDINGROWS: + case DBPROP_MAXROWS: + case DBPROP_UPDATABILITY: + case DBPROP_BOOKMARKINFO: + case DBPROP_AUTH_ENCRYPT_PASSWORD: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 0; + break; + case DBPROP_FINDCOMPAREOPS: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 27; + break; + case DBPROP_NOTIFICATIONPHASES: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 31; + break; + case DBPROP_ROWTHREADMODEL: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 2; + 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: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 3; + break; + case DBPROP_IAccessor: + case DBPROP_IColumnsInfo: + case DBPROP_IColumnsRowset: + case DBPROP_IRowset: + case DBPROP_IRowsetInfo: + case DBPROP_ISupportErrorInfo: + case DBPROP_IConvertType: + case DBPROP_IRowsetScroll: + case DBPROP_IRowsetRefresh: + command->properties[i].readonly = TRUE; + /* Fall through */ + case DBPROP_BLOCKINGSTORAGEOBJECTS: + case DBPROP_IMMOBILEROWS: + case DBPROP_LITERALIDENTITY: + case DBPROP_REENTRANTEVENTS: + case DBPROP_CHANGEINSERTEDROWS: + case DBPROP_ORDEREDBOOKMARKS: + case DBPROP_CLIENTCURSOR: + V_VT(&command->properties[i].value) = VT_BOOL; + V_BOOL(&command->properties[i].value) = VARIANT_TRUE; + break; + case DBPROP_AUTH_INTEGRATED: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 14; + break; + default: + V_VT(&command->properties[i].value) = VT_BOOL; + V_BOOL(&command->properties[i].value) = VARIANT_FALSE; + break; + } + } + 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..c40f92a273b 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -34,9 +34,11 @@ 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); + static BOOL db_created; static char mdbpath[MAX_PATH]; @@ -183,6 +185,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)); + todo_wine 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 +343,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 vkd3d v2] vkd3d-shader/hlsl: Add cross() intrinsic function and test.
by Francisco Casas 18 Nov '21

18 Nov '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + libs/vkd3d-shader/hlsl.y | 79 ++++++++++++++++++++++++++++++++++++++++ tests/cross.shader_test | 13 +++++++ 3 files changed, 94 insertions(+) create mode 100644 tests/cross.shader_test diff --git a/Makefile.am b/Makefile.am index d6e14cf1..307c32a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,7 @@ vkd3d_shader_tests = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ + tests/cross.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ @@ -285,6 +286,7 @@ XFAIL_TESTS = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ + tests/cross.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-comma.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2120b26f..e04b9ef0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1611,6 +1611,84 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, return true; } +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; + int wrong_arg = -1; + + if (arg2->data_type->type != HLSL_CLASS_VECTOR) + wrong_arg = 1; + if(arg2->data_type->dimx != 3 && arg2->data_type->dimx != 4) + wrong_arg = 1; + + if (arg1->data_type->type != HLSL_CLASS_VECTOR) + wrong_arg = 0; + if (arg1->data_type->dimx != 3 && arg1->data_type->dimx != 4) + wrong_arg = 0; + + if (wrong_arg != -1) + { + struct vkd3d_string_buffer *string; + if ((string = hlsl_type_to_string(ctx, params->args[wrong_arg]->data_type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument %d of 'cross': '%s'.", wrong_arg, string->buffer); + hlsl_release_string_buffer(ctx, string); + return false; + } + + 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; + } + base = expr_common_base_type(base, arg1->data_type->base_type); + base = expr_common_base_type(base, arg2->data_type->base_type); + + 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_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1628,6 +1706,7 @@ intrinsic_functions[] = { {"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}, {"saturate", 1, true, intrinsic_saturate}, diff --git a/tests/cross.shader_test b/tests/cross.shader_test new file mode 100644 index 00000000..59197db0 --- /dev/null +++ b/tests/cross.shader_test @@ -0,0 +1,13 @@ +[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) -- 2.25.1

2 1

[PATCH 1/4] ntdll: Implement NtAlertThreadByThreadId and NtWaitForAlertByThreadId.
by Zebediah Figura 18 Nov '21

18 Nov '21

These will be used to implement RtlWaitOnAddress() and other in-process synchronization primitives, as they are on Windows. These patches went through quite a few revisions in order to ensure that they had sufficient performance and correctness compared to the current implementation. I am particularly grateful to Etienne Juvigny and Dmitry Skvortsov for performing extensive testing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 4 ++ dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unix/sync.c | 93 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64/sync.c | 23 ++++++++++ dlls/wow64/syscall.h | 2 + include/winternl.h | 2 + 6 files changed, 126 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e7c1fa1dcf3..e5a49ba1a1f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -140,6 +140,7 @@ @ stdcall -syscall NtAdjustPrivilegesToken(long long ptr long ptr ptr) @ stdcall -syscall NtAlertResumeThread(long ptr) @ stdcall -syscall NtAlertThread(long) +@ stdcall -syscall NtAlertThreadByThreadId(ptr) @ stdcall -syscall NtAllocateLocallyUniqueId(ptr) # @ stub NtAllocateUserPhysicalPages @ stdcall -syscall NtAllocateUuids(ptr ptr ptr ptr) @@ -424,6 +425,7 @@ @ stdcall -syscall NtUnmapViewOfSection(long ptr) # @ stub NtVdmControl # @ stub NtW32Call +@ stdcall -syscall NtWaitForAlertByThreadId(ptr ptr) @ stdcall -syscall NtWaitForDebugEvent(long long ptr ptr) @ stdcall -syscall NtWaitForKeyedEvent(long ptr long ptr) @ stdcall -syscall NtWaitForMultipleObjects(long ptr long long ptr) @@ -1161,6 +1163,7 @@ @ stdcall -private -syscall ZwAdjustPrivilegesToken(long long ptr long ptr ptr) NtAdjustPrivilegesToken @ stdcall -private -syscall ZwAlertResumeThread(long ptr) NtAlertResumeThread @ stdcall -private -syscall ZwAlertThread(long) NtAlertThread +@ stdcall -private -syscall ZwAlertThreadByThreadId(ptr) NtAlertThreadByThreadId @ stdcall -private -syscall ZwAllocateLocallyUniqueId(ptr) NtAllocateLocallyUniqueId # @ stub ZwAllocateUserPhysicalPages @ stdcall -private -syscall ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @@ -1443,6 +1446,7 @@ @ stdcall -private -syscall ZwUnmapViewOfSection(long ptr) NtUnmapViewOfSection # @ stub ZwVdmControl # @ stub ZwW32Call +@ stdcall -private -syscall ZwWaitForAlertByThreadId(ptr ptr) NtWaitForAlertByThreadId @ stdcall -private -syscall ZwWaitForDebugEvent(long long ptr ptr) NtWaitForDebugEvent @ stdcall -private -syscall ZwWaitForKeyedEvent(long ptr long ptr) NtWaitForKeyedEvent @ stdcall -private -syscall ZwWaitForMultipleObjects(long ptr long long ptr) NtWaitForMultipleObjects diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 426d18e52d6..a411b01a389 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -133,6 +133,7 @@ static void * const syscalls[] = NtAdjustPrivilegesToken, NtAlertResumeThread, NtAlertThread, + NtAlertThreadByThreadId, NtAllocateLocallyUniqueId, NtAllocateUuids, NtAllocateVirtualMemory, @@ -335,6 +336,7 @@ static void * const syscalls[] = NtUnlockFile, NtUnlockVirtualMemory, NtUnmapViewOfSection, + NtWaitForAlertByThreadId, NtWaitForDebugEvent, NtWaitForKeyedEvent, NtWaitForMultipleObjects, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 964458a28a2..e58f3bd9261 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -33,6 +33,9 @@ #include <limits.h> #include <signal.h> #include <sys/types.h> +#ifdef HAVE_SYS_MMAN_H +#include <sys/mman.h> +#endif #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif @@ -75,6 +78,12 @@ static const LARGE_INTEGER zero_timeout; static pthread_mutex_t addr_mutex = PTHREAD_MUTEX_INITIALIZER; +static const char *debugstr_timeout( const LARGE_INTEGER *timeout ) +{ + if (!timeout) return "(infinite)"; + return wine_dbgstr_longlong( timeout->QuadPart ); +} + /* return a monotonic time counter, in Win32 ticks */ static inline ULONGLONG monotonic_counter(void) { @@ -2388,6 +2397,90 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl } +union tid_alert_entry +{ + HANDLE event; +}; + +#define TID_ALERT_BLOCK_SIZE (65536 / sizeof(union tid_alert_entry)) +static union tid_alert_entry *tid_alert_blocks[4096]; + +static unsigned int handle_to_index( HANDLE handle, unsigned int *block_idx ) +{ + unsigned int idx = (wine_server_obj_handle(handle) >> 2) - 1; + *block_idx = idx / TID_ALERT_BLOCK_SIZE; + return idx % TID_ALERT_BLOCK_SIZE; +} + +static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) +{ + unsigned int block_idx, idx = handle_to_index( tid, &block_idx ); + union tid_alert_entry *entry; + + if (block_idx > ARRAY_SIZE(tid_alert_blocks)) + { + FIXME( "tid %p is too high\n", tid ); + return NULL; + } + + if (!tid_alert_blocks[block_idx]) + { + static const size_t size = TID_ALERT_BLOCK_SIZE * sizeof(union tid_alert_entry); + void *ptr = anon_mmap_alloc( size, PROT_READ | PROT_WRITE ); + if (ptr == MAP_FAILED) return NULL; + if (InterlockedCompareExchangePointer( (void **)&tid_alert_blocks[block_idx], ptr, NULL )) + munmap( ptr, size ); /* someone beat us to it */ + } + + entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; + + if (!entry->event) + { + HANDLE event; + + if (NtCreateEvent( &event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE )) + return NULL; + if (InterlockedCompareExchangePointer( &entry->event, event, NULL )) + NtClose( event ); + } + + return entry; +} + + +/*********************************************************************** + * NtAlertThreadByThreadId (NTDLL.@) + */ +NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) +{ + union tid_alert_entry *entry = get_tid_alert_entry( tid ); + + TRACE( "%p\n", tid ); + + if (!entry) return STATUS_INVALID_CID; + + return NtSetEvent( entry->event, NULL ); +} + + +/*********************************************************************** + * NtWaitForAlertByThreadId (NTDLL.@) + */ +NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) +{ + union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); + NTSTATUS status; + + TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); + + if (!entry) return STATUS_INVALID_CID; + + status = NtWaitForSingleObject( entry->event, FALSE, timeout ); + if (!status) return STATUS_ALERTED; + return status; +} + + #ifdef __linux__ NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index e2e9468a727..fbd039f644c 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -1587,3 +1587,26 @@ NTSTATUS WINAPI wow64_NtYieldExecution( UINT *args ) { return NtYieldExecution(); } + + +/********************************************************************** + * wow64_NtAlertThreadByThreadId + */ +NTSTATUS WINAPI wow64_NtAlertThreadByThreadId( UINT *args ) +{ + HANDLE tid = get_handle( &args ); + + return NtAlertThreadByThreadId( tid ); +} + + +/********************************************************************** + * wow64_NtWaitForAlertByThreadId + */ +NTSTATUS WINAPI wow64_NtWaitForAlertByThreadId( UINT *args ) +{ + const void *address = get_ptr( &args ); + const LARGE_INTEGER *timeout = get_ptr( &args ); + + return NtWaitForAlertByThreadId( address, timeout ); +} diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index bc403dd6d31..112711875f7 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -30,6 +30,7 @@ SYSCALL_ENTRY( NtAdjustPrivilegesToken ) \ SYSCALL_ENTRY( NtAlertResumeThread ) \ SYSCALL_ENTRY( NtAlertThread ) \ + SYSCALL_ENTRY( NtAlertThreadByThreadId ) \ SYSCALL_ENTRY( NtAllocateLocallyUniqueId ) \ SYSCALL_ENTRY( NtAllocateUuids ) \ SYSCALL_ENTRY( NtAllocateVirtualMemory ) \ @@ -231,6 +232,7 @@ SYSCALL_ENTRY( NtUnlockFile ) \ SYSCALL_ENTRY( NtUnlockVirtualMemory ) \ SYSCALL_ENTRY( NtUnmapViewOfSection ) \ + SYSCALL_ENTRY( NtWaitForAlertByThreadId ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ SYSCALL_ENTRY( NtWaitForKeyedEvent ) \ SYSCALL_ENTRY( NtWaitForMultipleObjects ) \ diff --git a/include/winternl.h b/include/winternl.h index eea97f1238b..cfd83f16337 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3858,6 +3858,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); NTSYSAPI NTSTATUS WINAPI NtAlertResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); +NTSYSAPI NTSTATUS WINAPI NtAlertThreadByThreadId(HANDLE); NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG_PTR,SIZE_T*,ULONG,ULONG); @@ -4097,6 +4098,7 @@ NTSYSAPI NTSTATUS WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PL NTSYSAPI NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI NtVdmControl(ULONG,PVOID); +NTSYSAPI NTSTATUS WINAPI NtWaitForAlertByThreadId(const void*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitForDebugEvent(HANDLE,BOOLEAN,LARGE_INTEGER*,DBGUI_WAIT_STATE_CHANGE*); NTSYSAPI NTSTATUS WINAPI NtWaitForKeyedEvent(HANDLE,const void*,BOOLEAN,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitForSingleObject(HANDLE,BOOLEAN,const LARGE_INTEGER*); -- 2.33.0

3 10

[PATCH 1/5] ntdll: Implement thread-ID alerts using Mach semaphores on Mac.
by Zebediah Figura 18 Nov '21

18 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/sync.c | 75 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 59fe6bea8f5..cdc63c8a6ef 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2341,10 +2341,14 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl union tid_alert_entry { +#ifdef __APPLE__ + semaphore_t sem; +#else HANDLE event; #ifdef __linux__ int futex; #endif +#endif }; #define TID_ALERT_BLOCK_SIZE (65536 / sizeof(union tid_alert_entry)) @@ -2379,6 +2383,17 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; +#ifdef __APPLE__ + if (!entry->sem) + { + semaphore_t sem; + + if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) + return NULL; + if (InterlockedCompareExchange( (int *)&entry->sem, sem, NULL )) + semaphore_destroy( mach_task_self(), sem ); + } +#else #ifdef __linux__ if (use_futexes()) return entry; @@ -2393,6 +2408,7 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) if (InterlockedCompareExchangePointer( &entry->event, event, NULL )) NtClose( event ); } +#endif return entry; } @@ -2409,6 +2425,10 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) if (!entry) return STATUS_INVALID_CID; +#ifdef __APPLE__ + semaphore_signal( entry->sem ); + return STATUS_SUCCESS; +#else #ifdef __linux__ if (use_futexes()) { @@ -2420,10 +2440,11 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) #endif return NtSetEvent( entry->event, NULL ); +#endif } -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) static LONGLONG get_absolute_timeout( const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2446,6 +2467,57 @@ static LONGLONG update_timeout( ULONGLONG end ) #endif +#ifdef __APPLE__ + +/*********************************************************************** + * NtWaitForAlertByThreadId (NTDLL.@) + */ +NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) +{ + union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); + semaphore_t sem; + ULONGLONG end; + kern_return_t ret; + + TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); + + if (!entry) return STATUS_INVALID_CID; + sem = entry->sem; + + if (timeout) + { + if (timeout->QuadPart == TIMEOUT_INFINITE) + timeout = NULL; + else + end = get_absolute_timeout( timeout ); + } + + for (;;) + { + if (timeout) + { + LONGLONG timeleft = update_timeout( end ); + mach_timespec_t timespec; + + timespec.tv_sec = timeleft / (ULONGLONG)TICKSPERSEC; + timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; + ret = semaphore_timedwait( sem, timespec ); + } + else + ret = semaphore_wait( sem ); + + switch (ret) + { + case KERN_SUCCESS: return STATUS_ALERTED; + case KERN_ABORTED: continue; + case KERN_OPERATION_TIMED_OUT: return STATUS_TIMEOUT; + default: return STATUS_INVALID_HANDLE; + } + } +} + +#else + /*********************************************************************** * NtWaitForAlertByThreadId (NTDLL.@) */ @@ -2498,6 +2570,7 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG return status; } +#endif #ifdef __linux__ -- 2.33.0

1 4

[PATCH] include: Add wine/unixlib.h to the list of public includes.
by Dmitry Timoshkov 17 Nov '21

17 Nov '21

To allow creating 3rd party modules that use wine unix call interface. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/include/Makefile.in b/include/Makefile.in index df049fd284f..c722ac79562 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -787,6 +787,7 @@ SOURCES = \ wine/itss.idl \ wine/orpc.idl \ wine/svcctl.idl \ + wine/unixlib.h \ wine/winedxgi.idl \ winerror.h \ winevt.h \ -- 2.33.1

2 1

[PATCH] crypt32: Avoid truncating unicode chars.
by Dmitry Timoshkov 17 Nov '21

17 Nov '21

So that strings containing Cyrillic Capital Letter ER (0x420) won't be quoted when not needed. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/str.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 0ab4c7c6e85..0e75a674b55 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -156,7 +156,7 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, return ret; } -static inline BOOL is_quotable_char(char c) +static inline BOOL is_quotable_char(WCHAR c) { switch(c) { -- 2.33.1

2 1

[PATCH v2 01/12] mshtml: Clear the string dprop associated with the builtin attribute when removing it.
by Gabriel Ivăncescu 17 Nov '21

17 Nov '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 13 ++++--- dlls/mshtml/tests/documentmode.js | 56 +++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 96a776d..4605fda 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1463,13 +1463,18 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) *success = VARIANT_TRUE; return S_OK; } + *success = VARIANT_TRUE; V_VT(&var) = VT_EMPTY; hres = builtin_propput(This, func, &dp, NULL); - if(FAILED(hres)) - return hres; - - *success = VARIANT_TRUE; + if(FAILED(hres)) { + VARIANT *ref; + hres = dispex_get_dprop_ref(This, func->name, FALSE, &ref); + if(FAILED(hres) || V_VT(ref) != VT_BSTR) + *success = VARIANT_FALSE; + else + VariantClear(ref); + } return S_OK; } default: diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d566223..9db1b4f 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1087,6 +1087,62 @@ sync_test("elem_attr", function() { ok(r === "cls2", "class attr = " + r); r = elem.getAttribute("className"); ok(r === "cls3", "className attr = " + r); + + var func = function() { }; + elem.onclick = func; + ok(elem.onclick === func, "onclick = " + elem.onclick); + r = elem.getAttribute("onclick"); + ok(r === (v < 8 ? func : null), "onclick attr = " + r); + r = elem.removeAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 9 ? false : undefined), "removeAttribute returned " + r); + todo_wine_if(v === 8). + ok(elem.onclick === (v != 8 ? func : null), "removed onclick = " + elem.onclick); + + elem.onclick_test = func; + ok(elem.onclick_test === func, "onclick_test = " + elem.onclick_test); + r = elem.getAttribute("onclick_test"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? func : (v < 9 ? func.toString() : null)), "onclick_test attr = " + r); + + elem.setAttribute("onclick", "test"); + r = elem.getAttribute("onclick"); + ok(r === "test", "onclick attr after setAttribute = " + r); + r = elem.removeAttribute("onclick"); + ok(r === (v < 9 ? true : undefined), "removeAttribute after setAttribute returned " + r); + + /* IE11 returns an empty function, which we can't check directly */ + todo_wine_if(v >= 8). + ok((v < 11) ? (elem.onclick === null) : (elem.onclick !== func), "removed onclick after setAttribute = " + elem.onclick); + + r = Object.prototype.toString.call(elem.onclick); + todo_wine_if(v >= 8 && v < 11). + ok(r === (v < 9 ? "[object Object]" : (v < 11 ? "[object Null]" : "[object Function]")), + "removed onclick after setAttribute Object.toString returned " + r); + + elem.setAttribute("onclick", "string"); + r = elem.getAttribute("onclick"); + ok(r === "string", "onclick attr after setAttribute = " + r); + elem.onclick = func; + ok(elem.onclick === func, "onclick = " + elem.onclick); + r = elem.getAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? func : (v < 9 ? null : "string")), "onclick attr = " + r); + elem.onclick = "test"; + r = elem.getAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 9 ? "test" : "string"), "onclick attr = " + r); + r = elem.removeAttribute("onclick"); + ok(r === (v < 9 ? true : undefined), "removeAttribute returned " + r); + todo_wine_if(v >= 8). + ok(elem.onclick === null, "removed onclick = " + elem.onclick); + + elem.setAttribute("ondblclick", "string"); + r = elem.getAttribute("ondblclick"); + ok(r === "string", "ondblclick string = " + r); + r = elem.removeAttribute("ondblclick"); + ok(r === (v < 9 ? true : undefined), "ondblclick string removeAttribute returned " + r); + ok(elem.ondblclick === null, "removed ondblclick string = " + elem.ondblclick); }); sync_test("__proto__", function() { -- 2.31.1

3 23

[PATCH] avicap32: Fix typo in comment
by André Zwing 17 Nov '21

17 Nov '21

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/avicap32/v4l.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c index ef41b7e281b..4b285d94c3c 100644 --- a/dlls/avicap32/v4l.c +++ b/dlls/avicap32/v4l.c @@ -143,4 +143,4 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = #endif /* _WIN64 */ -#endif /* HAVE_LINUX_VIDEODEV_2 */ +#endif /* HAVE_LINUX_VIDEODEV2_H */ -- 2.25.1

1 0

[PATCH] avicap32: Fix typo in comment
by André Zwing 17 Nov '21

17 Nov '21

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/avicap32/v4l.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c index ef41b7e281b..4b285d94c3c 100644 --- a/dlls/avicap32/v4l.c +++ b/dlls/avicap32/v4l.c @@ -143,4 +143,4 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = #endif /* _WIN64 */ -#endif /* HAVE_LINUX_VIDEODEV_2 */ +#endif /* HAVE_LINUX_VIDEODEV2_H */ -- 2.25.1

2 1

[PATCH v2] winecfg: Add the command line options to the man page.
by Floris Renaud 17 Nov '21

17 Nov '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- programs/winecfg/winecfg.man.in | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/winecfg.man.in b/programs/winecfg/winecfg.man.in index 522d2a0e812..fc624504388 100644 --- a/programs/winecfg/winecfg.man.in +++ b/programs/winecfg/winecfg.man.in @@ -1,14 +1,32 @@ -.TH WINECFG 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.TH WINECFG 1 "November 2021" "@PACKAGE_STRING@" "Wine Programs" .SH NAME winecfg \- Wine Configuration Editor .SH SYNOPSIS -.BR "winecfg" +.B winecfg +.RI [ options ] .SH DESCRIPTION .B winecfg is the Wine configuration editor. It allows you to change several settings, such as DLL load order (native versus builtin), enable a virtual desktop, setup disk drives, and change the Wine audio driver, among others. Many of these settings can be made on a per application basis, for example, preferring native riched20.dll for wordpad.exe, but not for notepad.exe. + +If no option is given launch the graphical version of +.BR winecfg . +.SH OPTIONS +.TP +\fB\-v \fR[\fIversion\fR], \fB/v \fR[\fB\fIversion\fR] +Set global Windows version to +.I version +and exit. +If +.I version +is not specified, display the current global Windows version and exit. +.TP +.BR \-? ", " /? +Display help, valid versions for +.I version +and exit. .SH BUGS Bugs can be reported on the .UR https://bugs.winehq.org -- 2.33.1

1 0

[PATCH v2] dsound: Correctly report hardware audio buffers as unsupported.
by Eduard Permyakov 17 Nov '21

17 Nov '21

Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/dsound/dsound.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 3085d86e5b5..bcff0d8642a 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -373,12 +373,12 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU device->drvcaps.dwPrimaryBuffers = 1; device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; - device->drvcaps.dwMaxHwMixingAllBuffers = 16; + device->drvcaps.dwMaxHwMixingAllBuffers = 1; device->drvcaps.dwMaxHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; device->drvcaps.dwMaxHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; - device->drvcaps.dwFreeHwMixingAllBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; - device->drvcaps.dwFreeHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingStaticBuffers; - device->drvcaps.dwFreeHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingStreamingBuffers; + device->drvcaps.dwFreeHwMixingAllBuffers = 0; + device->drvcaps.dwFreeHwMixingStaticBuffers = 0; + device->drvcaps.dwFreeHwMixingStreamingBuffers = 0; ZeroMemory(&device->volpan, sizeof(device->volpan)); @@ -435,11 +435,10 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( } if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER) && - dsbd->dwFlags & DSBCAPS_LOCHARDWARE && - device->drvcaps.dwFreeHwMixingAllBuffers == 0) + dsbd->dwFlags & DSBCAPS_LOCHARDWARE) { - WARN("ran out of emulated hardware buffers\n"); - return DSERR_ALLOCATED; + WARN("unable to create hardware buffer\n"); + return DSERR_UNSUPPORTED; } if (dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER) { -- 2.25.1

3 2

[PATCH v2 6/6] winecoreaudio: Store the channel count and period_ms directly in the audio client.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 41 +++++++++++++++++-------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index ebab18df75b..1e37a2a9026 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -124,6 +124,7 @@ struct ACImpl { IUnknown *pUnkFTMarshal; EDataFlow dataflow; + UINT32 channel_count, period_ms; DWORD flags; HANDLE event; float *vols; @@ -1179,7 +1180,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); HRESULT hr; OSStatus sc; - int i; + UINT32 i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -1342,20 +1343,22 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->stream->cap_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->cap_bufsize_frames * This->stream->fmt->nBlockAlign); } - This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); - if(!This->vols){ - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; - } - - for(i = 0; i < fmt->nChannels; ++i) - This->vols[i] = 1.f; - This->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); + LeaveCriticalSection(&g_sessions_lock); + return E_OUTOFMEMORY; + } + + for(i = 0; i < This->channel_count; ++i) + This->vols[i] = 1.f; hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); @@ -1906,7 +1909,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) if(This->event && !This->timer) if(!CreateTimerQueueTimer(&This->timer, g_timer_q, ca_period_cb, - This, 0, This->stream->period_ms, WT_EXECUTEINTIMERTHREAD)){ + This, 0, This->period_ms, WT_EXECUTEINTIMERTHREAD)){ This->timer = NULL; OSSpinLockUnlock(&This->stream->lock); WARN("Unable to create timer: %u\n", GetLastError()); @@ -3173,7 +3176,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if(!out) return E_POINTER; - *out = This->stream->fmt->nChannels; + *out = This->channel_count; return S_OK; } @@ -3189,7 +3192,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(level < 0.f || level > 1.f) return E_INVALIDARG; - if(index >= This->stream->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; EnterCriticalSection(&g_sessions_lock); @@ -3214,7 +3217,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if(!level) return E_POINTER; - if(index >= This->stream->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; *level = This->vols[index]; @@ -3234,7 +3237,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(!levels) return E_POINTER; - if(count != This->stream->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&g_sessions_lock); @@ -3260,7 +3263,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(!levels) return E_POINTER; - if(count != This->stream->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&g_sessions_lock); -- 2.33.1

1 0

[PATCH v2 5/6] winecoreaudio: Use the global lock to protect the audio client.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 115 +++++++++++++++--------------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index e82962db1ba..ebab18df75b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1234,16 +1234,19 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); if(This->initted){ - OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; } + OSSpinLockLock(&This->stream->lock); + This->stream->fmt = clone_format(fmt); if(!This->stream->fmt){ OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1259,6 +1262,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return hr; } @@ -1278,6 +1282,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } }else{ @@ -1294,6 +1299,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } } @@ -1308,6 +1314,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } @@ -1323,6 +1330,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } @@ -1339,6 +1347,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1348,29 +1357,26 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->stream->share = mode; This->flags = flags; - EnterCriticalSection(&g_sessions_lock); - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); if(FAILED(hr)){ - LeaveCriticalSection(&g_sessions_lock); CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; 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); - LeaveCriticalSection(&g_sessions_lock); - ca_setvol(This, -1); This->initted = TRUE; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -1983,41 +1989,35 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, HANDLE event) { ACImpl *This = impl_from_IAudioClient3(iface); + HRESULT hr = S_OK; TRACE("(%p)->(%p)\n", This, event); if(!event) return E_INVALIDARG; - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_NOT_INITIALIZED; - } - - if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; - } - - if (This->event){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->initted) + hr = AUDCLNT_E_NOT_INITIALIZED; + else if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) + hr = AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; + else if(This->event){ FIXME("called twice\n"); - return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - } + hr = HRESULT_FROM_WIN32(ERROR_INVALID_NAME); + }else + This->event = event; - This->event = event; + LeaveCriticalSection(&g_sessions_lock); - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + return hr; } static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, void **ppv) { ACImpl *This = impl_from_IAudioClient3(iface); + HRESULT hr; TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); @@ -2025,24 +2025,24 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_NOT_INITIALIZED; + hr = AUDCLNT_E_NOT_INITIALIZED; + goto end; } if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; + hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; + goto end; } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; + hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; + goto end; } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); *ppv = &This->IAudioCaptureClient_iface; @@ -2056,8 +2056,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->stream->lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto end; } }else IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); @@ -2067,8 +2067,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->stream->lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto end; } }else IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); @@ -2078,8 +2078,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->stream->lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto end; } }else ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); @@ -2087,15 +2087,15 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; } - if(*ppv){ - OSSpinLockUnlock(&This->stream->lock); - return S_OK; + if(*ppv) hr = S_OK; + else{ + return E_NOINTERFACE; + FIXME("stub %s\n", debugstr_guid(riid)); } - OSSpinLockUnlock(&This->stream->lock); - - FIXME("stub %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; +end: + LeaveCriticalSection(&g_sessions_lock); + return hr; } static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient3 *iface, @@ -2749,17 +2749,20 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); ULONG ref; + + EnterCriticalSection(&g_sessions_lock); + ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ if(This->client){ - OSSpinLockLock(&This->client->stream->lock); This->client->session_wrapper = NULL; - OSSpinLockUnlock(&This->client->stream->lock); AudioClient_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); } + + LeaveCriticalSection(&g_sessions_lock); return ref; } @@ -3189,14 +3192,14 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(index >= This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); ret = ca_setvol(This, index); - OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return ret; } @@ -3223,7 +3226,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( IAudioStreamVolume *iface, UINT32 count, const float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + UINT32 i; HRESULT ret; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3234,14 +3237,14 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(count != This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; ret = ca_setvol(This, -1); - OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return ret; } @@ -3250,7 +3253,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( IAudioStreamVolume *iface, UINT32 count, float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + UINT32 i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3260,12 +3263,12 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(count != This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } -- 2.33.1

1 0

[PATCH v2 4/6] winecoreaudio: Use the global lock to lock the session.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Mainly just for simplicity. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 11be188d110..e82962db1ba 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -96,8 +96,6 @@ typedef struct _AudioSession { float *channel_vols; BOOL mute; - CRITICAL_SECTION lock; - struct list entry; } AudioSession; @@ -827,9 +825,6 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); - InitializeCriticalSection(&ret->lock); - ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); - session_init_vols(ret, num_channels); ret->master_vol = 1.f; @@ -3056,13 +3051,13 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->master_vol = level; ret = ca_session_setvol(session, -1); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return ret; } @@ -3094,13 +3089,13 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->mute = mute; ca_session_setvol(session, -1); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3356,14 +3351,14 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->channel_vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); ret = ca_session_setvol(session, index); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return ret; } @@ -3408,14 +3403,14 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; ret = ca_session_setvol(session, -1); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return ret; } -- 2.33.1

1 0

[PATCH v2 3/6] winecoreaudio: Introduce a stream structure.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 633 +++++++++++++++--------------- dlls/winecoreaudio.drv/unixlib.h | 23 ++ 2 files changed, 337 insertions(+), 319 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f8b538971f2..11be188d110 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -125,35 +125,21 @@ struct ACImpl { IMMDevice *parent; IUnknown *pUnkFTMarshal; - WAVEFORMATEX *fmt; - EDataFlow dataflow; DWORD flags; - AUDCLNT_SHAREMODE share; HANDLE event; float *vols; BOOL initted; AudioDeviceID adevid; AudioObjectPropertyScope scope; - AudioConverterRef converter; - AudioComponentInstance unit; - AudioStreamBasicDescription dev_desc; /* audio unit format, not necessarily the same as fmt */ HANDLE timer; - UINT32 period_ms, bufsize_frames, period_frames; - UINT64 written_frames; - UINT32 lcl_offs_frames, wri_offs_frames, held_frames, tmp_buffer_frames; - UINT32 cap_bufsize_frames, cap_offs_frames, cap_held_frames, wrap_bufsize_frames, resamp_bufsize_frames; - INT32 getbuf_last; - BOOL playing; - BYTE *cap_buffer, *wrap_buffer, *resamp_buffer, *local_buffer, *tmp_buffer; AudioSession *session; AudioSessionWrapper *session_wrapper; + struct coreaudio_stream *stream; struct list entry; - - OSSpinLock lock; }; static const IAudioClient3Vtbl AudioClient3_Vtbl; @@ -556,6 +542,11 @@ 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; @@ -571,14 +562,16 @@ 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->lock = 0; + 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; } @@ -588,7 +581,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->adevid = adevid; - if(!(This->unit = get_audiounit(This->dataflow, This->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; } @@ -650,24 +644,25 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) WaitForSingleObject(event, INFINITE); CloseHandle(event); } - AudioOutputUnitStop(This->unit); - AudioComponentInstanceDispose(This->unit); - if(This->converter) - AudioConverterDispose(This->converter); + AudioOutputUnitStop(This->stream->unit); + AudioComponentInstanceDispose(This->stream->unit); + if(This->stream->converter) + AudioConverterDispose(This->stream->converter); if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - HeapFree(GetProcessHeap(), 0, This->cap_buffer); - HeapFree(GetProcessHeap(), 0, This->local_buffer); - free(This->wrap_buffer); - HeapFree(GetProcessHeap(), 0, This->resamp_buffer); - CoTaskMemFree(This->fmt); + HeapFree(GetProcessHeap(), 0, This->stream->tmp_buffer); + HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); + HeapFree(GetProcessHeap(), 0, This->stream->local_buffer); + 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; @@ -890,14 +885,14 @@ static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) { - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; - if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + 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->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * This->fmt->nBlockAlign); + This->stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * This->stream->fmt->nBlockAlign); else - memset(buffer, 0, frames * This->fmt->nBlockAlign); + memset(buffer, 0, frames * This->stream->fmt->nBlockAlign); } /* CA is pulling data from us */ @@ -908,31 +903,31 @@ static OSStatus ca_render_cb(void *user, AudioUnitRenderActionFlags *flags, ACImpl *This = user; UINT32 to_copy_bytes, to_copy_frames, chunk_bytes, lcl_offs_bytes; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - if(This->playing){ - lcl_offs_bytes = This->lcl_offs_frames * This->fmt->nBlockAlign; - to_copy_frames = min(nframes, This->held_frames); - to_copy_bytes = to_copy_frames * This->fmt->nBlockAlign; + 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->bufsize_frames - This->lcl_offs_frames) * This->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->local_buffer + lcl_offs_bytes, chunk_bytes); - memcpy(((BYTE *)data->mBuffers[0].mData) + chunk_bytes, This->local_buffer, 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->local_buffer + lcl_offs_bytes, to_copy_bytes); + memcpy(data->mBuffers[0].mData, This->stream->local_buffer + lcl_offs_bytes, to_copy_bytes); - This->lcl_offs_frames += to_copy_frames; - This->lcl_offs_frames %= This->bufsize_frames; - This->held_frames -= to_copy_frames; + 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, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return noErr; } @@ -950,38 +945,38 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe { ACImpl *This = user; - *nframes = min(*nframes, This->cap_held_frames); + *nframes = min(*nframes, This->stream->cap_held_frames); if(!*nframes){ data->mBuffers[0].mData = NULL; data->mBuffers[0].mDataByteSize = 0; - data->mBuffers[0].mNumberChannels = This->fmt->nChannels; + data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; return noErr; } - data->mBuffers[0].mDataByteSize = *nframes * This->fmt->nBlockAlign; - data->mBuffers[0].mNumberChannels = This->fmt->nChannels; + data->mBuffers[0].mDataByteSize = *nframes * This->stream->fmt->nBlockAlign; + data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - if(This->cap_offs_frames + *nframes > This->cap_bufsize_frames){ - UINT32 chunk_frames = This->cap_bufsize_frames - This->cap_offs_frames; + 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->wrap_bufsize_frames < *nframes){ - free(This->wrap_buffer); - This->wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); - This->wrap_bufsize_frames = *nframes; + 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; } - memcpy(This->wrap_buffer, This->cap_buffer + This->cap_offs_frames * This->fmt->nBlockAlign, - chunk_frames * This->fmt->nBlockAlign); - memcpy(This->wrap_buffer + chunk_frames * This->fmt->nBlockAlign, This->cap_buffer, - (*nframes - chunk_frames) * This->fmt->nBlockAlign); + memcpy(This->stream->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, + (*nframes - chunk_frames) * This->stream->fmt->nBlockAlign); - data->mBuffers[0].mData = This->wrap_buffer; + data->mBuffers[0].mData = This->stream->wrap_buffer; }else - data->mBuffers[0].mData = This->cap_buffer + This->cap_offs_frames * This->fmt->nBlockAlign; + data->mBuffers[0].mData = This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign; - This->cap_offs_frames += *nframes; - This->cap_offs_frames %= This->cap_bufsize_frames; - This->cap_held_frames -= *nframes; + This->stream->cap_offs_frames += *nframes; + This->stream->cap_offs_frames %= This->stream->cap_bufsize_frames; + This->stream->cap_held_frames -= *nframes; if(packets) *packets = NULL; @@ -991,48 +986,48 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe static void capture_resample(ACImpl *This) { - UINT32 resamp_period_frames = MulDiv(This->period_frames, This->dev_desc.mSampleRate, This->fmt->nSamplesPerSec); + UINT32 resamp_period_frames = MulDiv(This->stream->period_frames, This->stream->dev_desc.mSampleRate, This->stream->fmt->nSamplesPerSec); OSStatus sc; /* the resampling process often needs more source frames than we'd * guess from a straight conversion using the sample rate ratio. so * only convert if we have extra source data. */ - while(This->cap_held_frames > resamp_period_frames * 2){ + while(This->stream->cap_held_frames > resamp_period_frames * 2){ AudioBufferList converted_list; - UInt32 wanted_frames = This->period_frames; + UInt32 wanted_frames = This->stream->period_frames; converted_list.mNumberBuffers = 1; - converted_list.mBuffers[0].mNumberChannels = This->fmt->nChannels; - converted_list.mBuffers[0].mDataByteSize = wanted_frames * This->fmt->nBlockAlign; + converted_list.mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; + converted_list.mBuffers[0].mDataByteSize = wanted_frames * This->stream->fmt->nBlockAlign; - if(This->resamp_bufsize_frames < wanted_frames){ - HeapFree(GetProcessHeap(), 0, This->resamp_buffer); - This->resamp_buffer = HeapAlloc(GetProcessHeap(), 0, converted_list.mBuffers[0].mDataByteSize); - This->resamp_bufsize_frames = wanted_frames; + if(This->stream->resamp_bufsize_frames < wanted_frames){ + HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); + This->stream->resamp_buffer = HeapAlloc(GetProcessHeap(), 0, converted_list.mBuffers[0].mDataByteSize); + This->stream->resamp_bufsize_frames = wanted_frames; } - converted_list.mBuffers[0].mData = This->resamp_buffer; + converted_list.mBuffers[0].mData = This->stream->resamp_buffer; - sc = AudioConverterFillComplexBuffer(This->converter, feed_cb, + sc = AudioConverterFillComplexBuffer(This->stream->converter, feed_cb, This, &wanted_frames, &converted_list, NULL); if(sc != noErr){ WARN("AudioConverterFillComplexBuffer failed: %x\n", (int)sc); break; } - ca_wrap_buffer(This->local_buffer, - This->wri_offs_frames * This->fmt->nBlockAlign, - This->bufsize_frames * This->fmt->nBlockAlign, - This->resamp_buffer, wanted_frames * This->fmt->nBlockAlign); + ca_wrap_buffer(This->stream->local_buffer, + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, + This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, + This->stream->resamp_buffer, wanted_frames * This->stream->fmt->nBlockAlign); - This->wri_offs_frames += wanted_frames; - This->wri_offs_frames %= This->bufsize_frames; - if(This->held_frames + wanted_frames > This->bufsize_frames){ - This->lcl_offs_frames += buf_ptr_diff(This->lcl_offs_frames, - This->wri_offs_frames, This->bufsize_frames); - This->held_frames = This->bufsize_frames; + This->stream->wri_offs_frames += wanted_frames; + This->stream->wri_offs_frames %= This->stream->bufsize_frames; + if(This->stream->held_frames + wanted_frames > This->stream->bufsize_frames){ + This->stream->lcl_offs_frames += buf_ptr_diff(This->stream->lcl_offs_frames, + This->stream->wri_offs_frames, This->stream->bufsize_frames); + This->stream->held_frames = This->stream->bufsize_frames; }else - This->held_frames += wanted_frames; + This->stream->held_frames += wanted_frames; } } @@ -1052,48 +1047,48 @@ static OSStatus ca_capture_cb(void *user, AudioUnitRenderActionFlags *flags, OSStatus sc; UINT32 cap_wri_offs_frames; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - cap_wri_offs_frames = (This->cap_offs_frames + This->cap_held_frames) % This->cap_bufsize_frames; + 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->fmt->nChannels; - list.mBuffers[0].mDataByteSize = nframes * This->fmt->nBlockAlign; + list.mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; + list.mBuffers[0].mDataByteSize = nframes * This->stream->fmt->nBlockAlign; - if(!This->playing || cap_wri_offs_frames + nframes > This->cap_bufsize_frames){ - if(This->wrap_bufsize_frames < nframes){ - free(This->wrap_buffer); - This->wrap_buffer = malloc(list.mBuffers[0].mDataByteSize); - This->wrap_bufsize_frames = nframes; + 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->wrap_buffer; + list.mBuffers[0].mData = This->stream->wrap_buffer; }else - list.mBuffers[0].mData = This->cap_buffer + cap_wri_offs_frames * This->fmt->nBlockAlign; + list.mBuffers[0].mData = This->stream->cap_buffer + cap_wri_offs_frames * This->stream->fmt->nBlockAlign; - sc = AudioUnitRender(This->unit, flags, ts, bus, nframes, &list); + sc = AudioUnitRender(This->stream->unit, flags, ts, bus, nframes, &list); if(sc != noErr){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return sc; } - if(This->playing){ - if(list.mBuffers[0].mData == This->wrap_buffer){ - ca_wrap_buffer(This->cap_buffer, - cap_wri_offs_frames * This->fmt->nBlockAlign, - This->cap_bufsize_frames * This->fmt->nBlockAlign, - This->wrap_buffer, list.mBuffers[0].mDataByteSize); + 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->cap_held_frames += list.mBuffers[0].mDataByteSize / This->fmt->nBlockAlign; - if(This->cap_held_frames > This->cap_bufsize_frames){ - This->cap_offs_frames += This->cap_held_frames % This->cap_bufsize_frames; - This->cap_offs_frames %= This->cap_bufsize_frames; - This->cap_held_frames = This->cap_bufsize_frames; + 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->lock); + OSSpinLockUnlock(&This->stream->lock); return noErr; } @@ -1244,31 +1239,31 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_ALREADY_INITIALIZED; } - This->fmt = clone_format(fmt); - if(!This->fmt){ - OSSpinLockUnlock(&This->lock); + This->stream->fmt = clone_format(fmt); + if(!This->stream->fmt){ + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } - This->period_ms = period / 10000; - This->period_frames = MulDiv(period, This->fmt->nSamplesPerSec, 10000000); + This->stream->period_ms = period / 10000; + This->stream->period_frames = MulDiv(period, This->stream->fmt->nSamplesPerSec, 10000000); - This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + This->stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - This->bufsize_frames -= This->bufsize_frames % This->period_frames; + This->stream->bufsize_frames -= This->stream->bufsize_frames % This->stream->period_frames; - hr = ca_setup_audiounit(This->dataflow, This->unit, This->fmt, &This->dev_desc, &This->converter); + hr = ca_setup_audiounit(This->dataflow, This->stream->unit, This->stream->fmt, &This->stream->dev_desc, &This->stream->converter); if(FAILED(hr)){ - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return hr; } @@ -1279,15 +1274,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, input.inputProc = &ca_capture_cb; input.inputProcRefCon = This; - sc = AudioUnitSetProperty(This->unit, kAudioOutputUnitProperty_SetInputCallback, + sc = AudioUnitSetProperty(This->stream->unit, kAudioOutputUnitProperty_SetInputCallback, kAudioUnitScope_Output, 1, &input, sizeof(input)); if(sc != noErr){ WARN("Couldn't set callback: %x\n", (int)sc); - AudioConverterDispose(This->converter); - This->converter = NULL; - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + AudioConverterDispose(This->stream->converter); + This->stream->converter = NULL; + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } }else{ @@ -1297,65 +1292,65 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, input.inputProc = &ca_render_cb; input.inputProcRefCon = This; - sc = AudioUnitSetProperty(This->unit, kAudioUnitProperty_SetRenderCallback, + sc = AudioUnitSetProperty(This->stream->unit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, 0, &input, sizeof(input)); if(sc != noErr){ WARN("Couldn't set callback: %x\n", (int)sc); - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } } - sc = AudioUnitInitialize(This->unit); + sc = AudioUnitInitialize(This->stream->unit); if(sc != noErr){ WARN("Couldn't initialize: %x\n", (int)sc); - if(This->converter){ - AudioConverterDispose(This->converter); - This->converter = NULL; + if(This->stream->converter){ + AudioConverterDispose(This->stream->converter); + This->stream->converter = NULL; } - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } /* we play audio continuously because AudioOutputUnitStart sometimes takes * a while to return */ - sc = AudioOutputUnitStart(This->unit); + sc = AudioOutputUnitStart(This->stream->unit); if(sc != noErr){ WARN("Unit failed to start: %x\n", (int)sc); - if(This->converter){ - AudioConverterDispose(This->converter); - This->converter = NULL; + if(This->stream->converter){ + AudioConverterDispose(This->stream->converter); + This->stream->converter = NULL; } - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } - This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign); - silence_buffer(This, This->local_buffer, This->bufsize_frames); + This->stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->bufsize_frames * fmt->nBlockAlign); + silence_buffer(This, This->stream->local_buffer, This->stream->bufsize_frames); if(This->dataflow == eCapture){ - This->cap_bufsize_frames = MulDiv(duration, This->dev_desc.mSampleRate, 10000000); - This->cap_buffer = HeapAlloc(GetProcessHeap(), 0, This->cap_bufsize_frames * This->fmt->nBlockAlign); + 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); } This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); if(!This->vols){ - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } for(i = 0; i < fmt->nChannels; ++i) This->vols[i] = 1.f; - This->share = mode; + This->stream->share = mode; This->flags = flags; EnterCriticalSection(&g_sessions_lock); @@ -1364,11 +1359,11 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, &This->session); if(FAILED(hr)){ LeaveCriticalSection(&g_sessions_lock); - CoTaskMemFree(This->fmt); - This->fmt = NULL; + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_INVALIDARG; } @@ -1380,7 +1375,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->initted = TRUE; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1395,16 +1390,16 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!frames) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - *frames = This->bufsize_frames; + *frames = This->stream->bufsize_frames; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1477,10 +1472,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!out) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1493,23 +1488,23 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, &size, &latency); if(sc != noErr){ WARN("Couldn't get _Latency property: %x\n", (int)sc); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } hr = ca_get_max_stream_latency(This, &stream_latency); if(FAILED(hr)){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } latency += stream_latency; /* pretend we process audio in Period chunks, so max latency includes * the period time */ - *out = MulDiv(latency, 10000000, This->fmt->nSamplesPerSec) - + This->period_ms * 10000; + *out = MulDiv(latency, 10000000, This->stream->fmt->nSamplesPerSec) + + This->stream->period_ms * 10000; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1523,7 +1518,7 @@ static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, if(This->dataflow == eCapture) capture_resample(This); - *numpad = This->held_frames; + *numpad = This->stream->held_frames; return S_OK; } @@ -1539,11 +1534,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!numpad) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); hr = AudioClient_GetCurrentPadding_nolock(This, numpad); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } @@ -1891,35 +1886,35 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - if(This->playing){ - OSSpinLockUnlock(&This->lock); + if(This->stream->playing){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_STOPPED; } if((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_EVENTHANDLE_NOT_SET; } if(This->event && !This->timer) if(!CreateTimerQueueTimer(&This->timer, g_timer_q, ca_period_cb, - This, 0, This->period_ms, WT_EXECUTEINTIMERTHREAD)){ + This, 0, This->stream->period_ms, WT_EXECUTEINTIMERTHREAD)){ This->timer = NULL; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); WARN("Unable to create timer: %u\n", GetLastError()); return E_OUTOFMEMORY; } - This->playing = TRUE; + This->stream->playing = TRUE; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1930,21 +1925,21 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - if(!This->playing){ - OSSpinLockUnlock(&This->lock); + if(!This->stream->playing){ + OSSpinLockUnlock(&This->stream->lock); return S_FALSE; } - This->playing = FALSE; + This->stream->playing = FALSE; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1955,36 +1950,36 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - if(This->playing){ - OSSpinLockUnlock(&This->lock); + if(This->stream->playing){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_STOPPED; } - if(This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } if(This->dataflow == eRender){ - This->written_frames = 0; + This->stream->written_frames = 0; }else{ - This->written_frames += This->held_frames; + This->stream->written_frames += This->stream->held_frames; } - This->held_frames = 0; - This->lcl_offs_frames = 0; - This->wri_offs_frames = 0; - This->cap_offs_frames = 0; - This->cap_held_frames = 0; + This->stream->held_frames = 0; + This->stream->lcl_offs_frames = 0; + This->stream->wri_offs_frames = 0; + This->stream->cap_offs_frames = 0; + This->stream->cap_held_frames = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1999,27 +1994,27 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!event) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; } if (This->event){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); FIXME("called twice\n"); return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); } This->event = event; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2035,23 +2030,23 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); @@ -2066,7 +2061,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } }else @@ -2077,7 +2072,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } }else @@ -2088,7 +2083,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } }else @@ -2098,11 +2093,11 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, } if(*ppv){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); FIXME("stub %s\n", debugstr_guid(riid)); return E_NOINTERFACE; @@ -2274,49 +2269,49 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return E_POINTER; *data = NULL; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - if(This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } if(!frames){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } hr = AudioClient_GetCurrentPadding_nolock(This, &pad); if(FAILED(hr)){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } - if(pad + frames > This->bufsize_frames){ - OSSpinLockUnlock(&This->lock); + if(pad + frames > This->stream->bufsize_frames){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_BUFFER_TOO_LARGE; } - if(This->wri_offs_frames + frames > This->bufsize_frames){ - if(This->tmp_buffer_frames < frames){ - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, frames * This->fmt->nBlockAlign); - if(!This->tmp_buffer){ - OSSpinLockUnlock(&This->lock); + 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){ + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } - This->tmp_buffer_frames = frames; + This->stream->tmp_buffer_frames = frames; } - *data = This->tmp_buffer; - This->getbuf_last = -frames; + *data = This->stream->tmp_buffer; + This->stream->getbuf_last = -frames; }else{ - *data = This->local_buffer + This->wri_offs_frames * This->fmt->nBlockAlign; - This->getbuf_last = frames; + *data = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; + This->stream->getbuf_last = frames; } silence_buffer(This, *data, frames); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2329,46 +2324,46 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( TRACE("(%p)->(%u, %x)\n", This, frames, flags); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!frames){ - This->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + This->stream->getbuf_last = 0; + OSSpinLockUnlock(&This->stream->lock); return S_OK; } - if(!This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(!This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } - if(frames > (This->getbuf_last >= 0 ? This->getbuf_last : -This->getbuf_last)){ - OSSpinLockUnlock(&This->lock); + if(frames > (This->stream->getbuf_last >= 0 ? This->stream->getbuf_last : -This->stream->getbuf_last)){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_INVALID_SIZE; } - if(This->getbuf_last >= 0) - buffer = This->local_buffer + This->wri_offs_frames * This->fmt->nBlockAlign; + if(This->stream->getbuf_last >= 0) + buffer = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; else - buffer = This->tmp_buffer; + buffer = This->stream->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT) silence_buffer(This, buffer, frames); - if(This->getbuf_last < 0) - ca_wrap_buffer(This->local_buffer, - This->wri_offs_frames * This->fmt->nBlockAlign, - This->bufsize_frames * This->fmt->nBlockAlign, - buffer, frames * This->fmt->nBlockAlign); + if(This->stream->getbuf_last < 0) + ca_wrap_buffer(This->stream->local_buffer, + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, + This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, + buffer, frames * This->stream->fmt->nBlockAlign); - This->wri_offs_frames += frames; - This->wri_offs_frames %= This->bufsize_frames; - This->held_frames += frames; - This->written_frames += frames; - This->getbuf_last = 0; + This->stream->wri_offs_frames += frames; + This->stream->wri_offs_frames %= This->stream->bufsize_frames; + This->stream->held_frames += frames; + This->stream->written_frames += frames; + This->stream->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2436,38 +2431,38 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - if(This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } capture_resample(This); - if(This->held_frames < This->period_frames){ + if(This->stream->held_frames < This->stream->period_frames){ *frames = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_S_BUFFER_EMPTY; } *flags = 0; - chunk_frames = This->bufsize_frames - This->lcl_offs_frames; - if(chunk_frames < This->period_frames){ - chunk_bytes = chunk_frames * This->fmt->nBlockAlign; - if(!This->tmp_buffer) - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, This->period_frames * This->fmt->nBlockAlign); - *data = This->tmp_buffer; - memcpy(*data, This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign, chunk_bytes); - memcpy((*data) + chunk_bytes, This->local_buffer, This->period_frames * This->fmt->nBlockAlign - chunk_bytes); + 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); + *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); }else - *data = This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign; + *data = This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign; - This->getbuf_last = *frames = This->period_frames; + This->stream->getbuf_last = *frames = This->stream->period_frames; if(devpos) - *devpos = This->written_frames; + *devpos = This->stream->written_frames; if(qpcpos){ /* fixme: qpc of recording time */ LARGE_INTEGER stamp, freq; QueryPerformanceCounter(&stamp); @@ -2475,7 +2470,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; } - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2487,31 +2482,31 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( TRACE("(%p)->(%u)\n", This, done); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!done){ - This->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + This->stream->getbuf_last = 0; + OSSpinLockUnlock(&This->stream->lock); return S_OK; } - if(!This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(!This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } - if(This->getbuf_last != done){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last != done){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_INVALID_SIZE; } - This->written_frames += done; - This->held_frames -= done; - This->lcl_offs_frames += done; - This->lcl_offs_frames %= This->bufsize_frames; - This->getbuf_last = 0; + This->stream->written_frames += done; + This->stream->held_frames -= done; + This->stream->lcl_offs_frames += done; + This->stream->lcl_offs_frames %= This->stream->bufsize_frames; + This->stream->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2526,16 +2521,16 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( if(!frames) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); capture_resample(This); - if(This->held_frames >= This->period_frames) - *frames = This->period_frames; + if(This->stream->held_frames >= This->stream->period_frames) + *frames = This->stream->period_frames; else *frames = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2592,10 +2587,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); - if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) + *freq = (UINT64)This->stream->fmt->nSamplesPerSec * This->stream->fmt->nBlockAlign; else - *freq = This->fmt->nSamplesPerSec; + *freq = This->stream->fmt->nSamplesPerSec; return S_OK; } @@ -2603,10 +2598,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, UINT64 *pos, UINT64 *qpctime) { - *pos = This->written_frames - This->held_frames; + *pos = This->stream->written_frames - This->stream->held_frames; - if(This->share == AUDCLNT_SHAREMODE_SHARED) - *pos *= This->fmt->nBlockAlign; + if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) + *pos *= This->stream->fmt->nBlockAlign; if(qpctime){ LARGE_INTEGER stamp, freq; @@ -2629,11 +2624,11 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, if(!pos) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); hr = AudioClock_GetPosition_nolock(This, pos, qpctime); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } @@ -2763,9 +2758,9 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ if(This->client){ - OSSpinLockLock(&This->client->lock); + OSSpinLockLock(&This->client->stream->lock); This->client->session_wrapper = NULL; - OSSpinLockUnlock(&This->client->lock); + OSSpinLockUnlock(&This->client->stream->lock); AudioClient_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); @@ -2793,14 +2788,14 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - OSSpinLockLock(&client->lock); - if(client->playing){ + OSSpinLockLock(&client->stream->lock); + if(client->stream->playing){ *state = AudioSessionStateActive; - OSSpinLockUnlock(&client->lock); + OSSpinLockUnlock(&client->stream->lock); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - OSSpinLockUnlock(&client->lock); + OSSpinLockUnlock(&client->stream->lock); } LeaveCriticalSection(&g_sessions_lock); @@ -2979,7 +2974,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) if(index == (UINT32)-1){ UINT32 i; level = 1.; - for(i = 0; i < This->fmt->nChannels; ++i){ + for(i = 0; i < This->stream->fmt->nChannels; ++i){ Float32 tmp; tmp = This->session->master_vol * This->session->channel_vols[i] * This->vols[i]; @@ -2990,7 +2985,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) This->session->channel_vols[index] * This->vols[index]; } - sc = AudioUnitSetParameter(This->unit, kHALOutputParam_Volume, + sc = AudioUnitSetParameter(This->stream->unit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, level, 0); if(sc != noErr) WARN("Couldn't set volume: %x\n", (int)sc); @@ -3180,7 +3175,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if(!out) return E_POINTER; - *out = This->fmt->nChannels; + *out = This->stream->fmt->nChannels; return S_OK; } @@ -3196,17 +3191,17 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(level < 0.f || level > 1.f) return E_INVALIDARG; - if(index >= This->fmt->nChannels) + if(index >= This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); ret = ca_setvol(This, index); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return ret; } @@ -3221,7 +3216,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if(!level) return E_POINTER; - if(index >= This->fmt->nChannels) + if(index >= This->stream->fmt->nChannels) return E_INVALIDARG; *level = This->vols[index]; @@ -3241,17 +3236,17 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; ret = ca_setvol(This, -1); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return ret; } @@ -3267,15 +3262,15 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 7c1200464b9..6a991f1de98 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -18,6 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +struct coreaudio_stream /* To be made private */ +{ + OSSpinLock lock; + AudioComponentInstance unit; + AudioConverterRef converter; + AudioStreamBasicDescription dev_desc; /* audio unit format, not necessarily the same as fmt */ + AudioDeviceID dev_id; + EDataFlow flow; + 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; + UINT32 cap_bufsize_frames, cap_offs_frames, cap_held_frames; + UINT32 wrap_bufsize_frames; + UINT64 written_frames; + INT32 getbuf_last; + WAVEFORMATEX *fmt; + BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; +}; + struct endpoint { WCHAR *name; -- 2.33.1

1 0

[PATCH v2 2/6] winecoreaudio: Move get_endpoint_ids to a unixlib.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/Makefile.in | 1 + dlls/winecoreaudio.drv/coreaudio.c | 229 ++++++++++++++++++++++++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 211 ++++++++------------------ dlls/winecoreaudio.drv/unixlib.h | 44 ++++++ 4 files changed, 326 insertions(+), 159 deletions(-) create mode 100644 dlls/winecoreaudio.drv/unixlib.h diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index afbc50c7148..b6bf5bd4587 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -1,4 +1,5 @@ MODULE = winecoreaudio.drv +UNIXLIB = winecoreaudio.so IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(COREAUDIO_LIBS) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 1f222367bed..f3af24f80fb 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1,5 +1,8 @@ /* - * Wine Driver for CoreAudio + * Unixlib for winecoreaudio driver. + * + * Copyright 2011 Andrew Eikum for CodeWeavers + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,16 +18,230 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - +#if 0 +#pragma makedep unix +#endif #include "config.h" +#define LoadResource __carbon_LoadResource +#define CompareString __carbon_CompareString +#define GetCurrentThread __carbon_GetCurrentThread +#define GetCurrentProcess __carbon_GetCurrentProcess + #include <stdarg.h> +#include <errno.h> +#include <limits.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/ioctl.h> +#include <fcntl.h> +#include <fenv.h> +#include <unistd.h> + +#include <libkern/OSAtomic.h> +#include <CoreAudio/CoreAudio.h> +#include <AudioToolbox/AudioFormat.h> +#include <AudioToolbox/AudioConverter.h> +#include <AudioUnit/AudioUnit.h> + +#undef LoadResource +#undef CompareString +#undef GetCurrentThread +#undef GetCurrentProcess +#undef _CDECL + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" -#include "coreaudio.h" +#include "winnls.h" +#include "winreg.h" +#include "mmdeviceapi.h" +#include "initguid.h" +#include "audioclient.h" #include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/unixlib.h" + +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); + +static HRESULT osstatus_to_hresult(OSStatus sc) +{ + switch(sc){ + case kAudioFormatUnsupportedDataFormatError: + case kAudioFormatUnknownFormatError: + case kAudioDeviceUnsupportedFormatError: + return AUDCLNT_E_UNSUPPORTED_FORMAT; + case kAudioHardwareBadDeviceError: + return AUDCLNT_E_DEVICE_INVALIDATED; + } + return E_FAIL; +} + +static AudioObjectPropertyScope get_scope(EDataFlow flow) +{ + return (flow == eRender) ? kAudioDevicePropertyScopeOutput : kAudioDevicePropertyScopeInput; +} + +static BOOL device_has_channels(AudioDeviceID device, EDataFlow flow) +{ + AudioObjectPropertyAddress addr; + AudioBufferList *buffers; + BOOL ret = FALSE; + OSStatus sc; + UInt32 size; + int i; + + addr.mSelector = kAudioDevicePropertyStreamConfiguration; + addr.mScope = get_scope(flow); + addr.mElement = 0; + + sc = AudioObjectGetPropertyDataSize(device, &addr, 0, NULL, &size); + if(sc != noErr){ + WARN("Unable to get _StreamConfiguration property size for device %u: %x\n", + (unsigned int)device, (int)sc); + return FALSE; + } + + buffers = malloc(size); + if(!buffers) return FALSE; + + sc = AudioObjectGetPropertyData(device, &addr, 0, NULL, &size, buffers); + if(sc != noErr){ + WARN("Unable to get _StreamConfiguration property for device %u: %x\n", + (unsigned int)device, (int)sc); + free(buffers); + return FALSE; + } + + for(i = 0; i < buffers->mNumberBuffers; i++){ + if(buffers->mBuffers[i].mNumberChannels > 0){ + ret = TRUE; + break; + } + } + free(buffers); + return ret; +} + +static NTSTATUS get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + unsigned int num_devices, i, needed; + AudioDeviceID *devices, default_id; + AudioObjectPropertyAddress addr; + struct endpoint *endpoint; + UInt32 devsize, size; + struct endpoint_info + { + CFStringRef name; + AudioDeviceID id; + } *info; + OSStatus sc; + WCHAR *ptr; + + params->num = 0; + params->default_idx = 0; + + addr.mScope = kAudioObjectPropertyScopeGlobal; + addr.mElement = kAudioObjectPropertyElementMaster; + if(params->flow == eRender) addr.mSelector = kAudioHardwarePropertyDefaultOutputDevice; + else if(params->flow == eCapture) addr.mSelector = kAudioHardwarePropertyDefaultInputDevice; + else{ + params->result = E_INVALIDARG; + return STATUS_SUCCESS; + } + + size = sizeof(default_id); + sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, &size, &default_id); + if(sc != noErr){ + WARN("Getting _DefaultInputDevice property failed: %x\n", (int)sc); + default_id = -1; + } + + addr.mSelector = kAudioHardwarePropertyDevices; + sc = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &addr, 0, NULL, &devsize); + if(sc != noErr){ + WARN("Getting _Devices property size failed: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + num_devices = devsize / sizeof(AudioDeviceID); + devices = malloc(devsize); + info = malloc(num_devices * sizeof(*info)); + if(!devices || !info){ + free(info); + free(devices); + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, &devsize, devices); + if(sc != noErr){ + WARN("Getting _Devices property failed: %x\n", (int)sc); + free(info); + free(devices); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + addr.mSelector = kAudioObjectPropertyName; + addr.mScope = get_scope(params->flow); + addr.mElement = 0; + + for(i = 0; i < num_devices; i++){ + if(!device_has_channels(devices[i], params->flow)) continue; + + size = sizeof(CFStringRef); + sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, &size, &info[params->num].name); + if(sc != noErr){ + WARN("Unable to get _Name property for device %u: %x\n", + (unsigned int)devices[i], (int)sc); + continue; + } + info[params->num++].id = devices[i]; + } + free(devices); + + needed = sizeof(*endpoint) * params->num; + endpoint = params->endpoints; + ptr = (WCHAR *)(endpoint + params->num); + + for(i = 0; i < params->num; i++){ + SIZE_T len = CFStringGetLength(info[i].name); + needed += (len + 1) * sizeof(WCHAR); + + if(needed <= params->size){ + endpoint->name = ptr; + CFStringGetCharacters(info[i].name, CFRangeMake(0, len), (UniChar*)endpoint->name); + ptr[len] = 0; + endpoint->id = info[i].id; + endpoint++; + ptr += len + 1; + } + CFRelease(info[i].name); + if(info[i].id == default_id) params->default_idx = i; + } + free(info); + + if(needed > params->size){ + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + else params->result = S_OK; + + return STATUS_SUCCESS; +} + +unixlib_entry_t __wine_unix_call_funcs[] = +{ + get_endpoint_ids, +}; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f07f4bae5fb..f8b538971f2 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -56,8 +56,10 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wine/list.h" +#include "wine/unixlib.h" #include "ole2.h" #include "mmdeviceapi.h" @@ -69,9 +71,12 @@ #include "endpointvolume.h" #include "audioclient.h" #include "audiopolicy.h" +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); +unixlib_handle_t coreaudio_handle = 0; + #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; @@ -245,6 +250,9 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: + if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, + &coreaudio_handle, sizeof(coreaudio_handle), NULL)) + return FALSE; g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; @@ -319,7 +327,7 @@ exit: RegCloseKey(drv_key); } -static void get_device_guid(EDataFlow flow, AudioDeviceID device, GUID *guid) +static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) { HKEY key = NULL, dev_key; DWORD type, size = sizeof(*guid); @@ -333,7 +341,7 @@ static void get_device_guid(EDataFlow flow, AudioDeviceID device, GUID *guid) key_name[0] = '0'; key_name[1] = ','; - sprintfW(key_name + 2, key_fmt, device); + sprintfW(key_name + 2, key_fmt, device_id); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ @@ -359,164 +367,61 @@ static void get_device_guid(EDataFlow flow, AudioDeviceID device, GUID *guid) RegCloseKey(key); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, - GUID **guids, UINT *num, UINT *def_index) +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, + GUID **guids_out, UINT *num, UINT *def_index) { - UInt32 devsize, size; - AudioDeviceID *devices; - AudioDeviceID default_id; - AudioObjectPropertyAddress addr; - OSStatus sc; - int i, ndevices; - - TRACE("%d %p %p %p\n", flow, ids, num, def_index); - - addr.mScope = kAudioObjectPropertyScopeGlobal; - addr.mElement = kAudioObjectPropertyElementMaster; - if(flow == eRender) - addr.mSelector = kAudioHardwarePropertyDefaultOutputDevice; - else if(flow == eCapture) - addr.mSelector = kAudioHardwarePropertyDefaultInputDevice; - else - return E_INVALIDARG; - - size = sizeof(default_id); - sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, - NULL, &size, &default_id); - if(sc != noErr){ - WARN("Getting _DefaultInputDevice property failed: %x\n", (int)sc); - default_id = -1; - } - - addr.mSelector = kAudioHardwarePropertyDevices; - sc = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &addr, 0, - NULL, &devsize); - if(sc != noErr){ - WARN("Getting _Devices property size failed: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - devices = HeapAlloc(GetProcessHeap(), 0, devsize); - if(!devices) - return E_OUTOFMEMORY; - - sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, - &devsize, devices); - if(sc != noErr){ - WARN("Getting _Devices property failed: %x\n", (int)sc); - HeapFree(GetProcessHeap(), 0, devices); - return osstatus_to_hresult(sc); + struct get_endpoint_ids_params params; + unsigned int i; + GUID *guids; + WCHAR **ids; + + TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); + + params.flow = flow; + params.size = 1000; + params.endpoints = NULL; + do{ + heap_free(params.endpoints); + params.endpoints = heap_alloc(params.size); + UNIX_CALL(get_endpoint_ids, &params); + }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if(FAILED(params.result)) goto end; + + ids = heap_alloc_zero(params.num * sizeof(*ids)); + guids = heap_alloc(params.num * sizeof(*guids)); + if(!ids || !guids){ + params.result = E_OUTOFMEMORY; + goto end; } - ndevices = devsize / sizeof(AudioDeviceID); - - *ids = HeapAlloc(GetProcessHeap(), 0, ndevices * sizeof(WCHAR *)); - if(!*ids){ - HeapFree(GetProcessHeap(), 0, devices); - return E_OUTOFMEMORY; - } - - *guids = HeapAlloc(GetProcessHeap(), 0, ndevices * sizeof(GUID)); - if(!*guids){ - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, devices); - return E_OUTOFMEMORY; - } - - *num = 0; - *def_index = (UINT)-1; - for(i = 0; i < ndevices; ++i){ - AudioBufferList *buffers; - CFStringRef name; - SIZE_T len; - int j; - - addr.mSelector = kAudioDevicePropertyStreamConfiguration; - if(flow == eRender) - addr.mScope = kAudioDevicePropertyScopeOutput; - else - addr.mScope = kAudioDevicePropertyScopeInput; - addr.mElement = 0; - sc = AudioObjectGetPropertyDataSize(devices[i], &addr, 0, NULL, &size); - if(sc != noErr){ - WARN("Unable to get _StreamConfiguration property size for " - "device %u: %x\n", (unsigned int)devices[i], (int)sc); - continue; - } - - buffers = HeapAlloc(GetProcessHeap(), 0, size); - if(!buffers){ - HeapFree(GetProcessHeap(), 0, devices); - for(j = 0; j < *num; ++j) - HeapFree(GetProcessHeap(), 0, (*ids)[j]); - HeapFree(GetProcessHeap(), 0, *guids); - HeapFree(GetProcessHeap(), 0, *ids); - return E_OUTOFMEMORY; + for(i = 0; i < params.num; i++){ + int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + ids[i] = heap_alloc(size); + if(!ids[i]){ + params.result = E_OUTOFMEMORY; + goto end; } - - sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, - &size, buffers); - if(sc != noErr){ - WARN("Unable to get _StreamConfiguration property for " - "device %u: %x\n", (unsigned int)devices[i], (int)sc); - HeapFree(GetProcessHeap(), 0, buffers); - continue; - } - - /* check that there's at least one channel in this device before - * we claim it as usable */ - for(j = 0; j < buffers->mNumberBuffers; ++j) - if(buffers->mBuffers[j].mNumberChannels > 0) - break; - if(j >= buffers->mNumberBuffers){ - HeapFree(GetProcessHeap(), 0, buffers); - continue; - } - - HeapFree(GetProcessHeap(), 0, buffers); - - size = sizeof(name); - addr.mSelector = kAudioObjectPropertyName; - sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, - &size, &name); - if(sc != noErr){ - WARN("Unable to get _Name property for device %u: %x\n", - (unsigned int)devices[i], (int)sc); - continue; - } - - len = CFStringGetLength(name) + 1; - (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if(!(*ids)[*num]){ - CFRelease(name); - HeapFree(GetProcessHeap(), 0, devices); - for(j = 0; j < *num; ++j) - HeapFree(GetProcessHeap(), 0, (*ids)[j]); - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *guids); - return E_OUTOFMEMORY; + memcpy(ids[i], params.endpoints[i].name, size); + get_device_guid(flow, params.endpoints[i].id, guids + i); + } + *def_index = params.default_idx; + +end: + heap_free(params.endpoints); + if(FAILED(params.result)){ + heap_free(guids); + if(ids){ + for(i = 0; i < params.num; i++) heap_free(ids[i]); + heap_free(ids); } - CFStringGetCharacters(name, CFRangeMake(0, len - 1), (UniChar*)(*ids)[*num]); - ((*ids)[*num])[len - 1] = 0; - CFRelease(name); - - get_device_guid(flow, devices[i], &(*guids)[*num]); - - if(*def_index == (UINT)-1 && devices[i] == default_id) - *def_index = *num; - - TRACE("device %u: id %s key %u%s\n", *num, debugstr_w((*ids)[*num]), - (unsigned int)devices[i], (*def_index == *num) ? " (default)" : ""); - - (*num)++; + }else{ + *ids_out = ids; + *guids_out = guids; + *num = params.num; } - if(*def_index == (UINT)-1) - *def_index = 0; - - HeapFree(GetProcessHeap(), 0, devices); - - return S_OK; + return params.result; } static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h new file mode 100644 index 00000000000..7c1200464b9 --- /dev/null +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -0,0 +1,44 @@ +/* + * Unixlib header file for winecoreaudio driver. + * + * Copyright 2021 Huw Davies + * + * 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 + */ + +struct endpoint +{ + WCHAR *name; + DWORD id; +}; + +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + +enum unix_funcs +{ + unix_get_endpoint_ids, +}; + +extern unixlib_handle_t coreaudio_handle; + +#define UNIX_CALL( func, params ) __wine_unix_call( coreaudio_handle, unix_ ## func, params ) -- 2.33.1

1 0

[PATCH v2 1/6] winecoreaudio: Move DriverProc to midi.c.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Fix copyright date typo. dlls/winecoreaudio.drv/coreaudio.c | 81 ------------------------------ dlls/winecoreaudio.drv/coreaudio.h | 9 ---- dlls/winecoreaudio.drv/midi.c | 78 +++++++++++++++++++++++++++- 3 files changed, 77 insertions(+), 91 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 321c24b477c..1f222367bed 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1,8 +1,6 @@ /* * Wine Driver for CoreAudio * - * Copyright 2005 Emmanuel Maillard - * * 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 @@ -30,82 +28,3 @@ #include "mmddk.h" #include "coreaudio.h" #include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); - - -/************************************************************************** - * CoreAudio_drvLoad [internal] - */ -static LRESULT CoreAudio_drvLoad(void) -{ - TRACE("()\n"); - - if (CoreAudio_MIDIInit() != DRV_SUCCESS) - return DRV_FAILURE; - - return DRV_SUCCESS; -} - -/************************************************************************** - * CoreAudio_drvFree [internal] - */ -static LRESULT CoreAudio_drvFree(void) -{ - TRACE("()\n"); - CoreAudio_MIDIRelease(); - return DRV_SUCCESS; -} - -/************************************************************************** - * CoreAudio_drvOpen [internal] - */ -static LRESULT CoreAudio_drvOpen(LPSTR str) -{ - TRACE("(%s)\n", str); - return 1; -} - -/************************************************************************** - * CoreAudio_drvClose [internal] - */ -static DWORD CoreAudio_drvClose(DWORD dwDevID) -{ - TRACE("(%08x)\n", dwDevID); - return 1; -} - -/************************************************************************** - * DriverProc (WINECOREAUDIO.1) - */ -LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", - dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : - wMsg == DRV_FREE ? "DRV_FREE" : - wMsg == DRV_OPEN ? "DRV_OPEN" : - wMsg == DRV_CLOSE ? "DRV_CLOSE" : - wMsg == DRV_ENABLE ? "DRV_ENABLE" : - wMsg == DRV_DISABLE ? "DRV_DISABLE" : - wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : - wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : - wMsg == DRV_INSTALL ? "DRV_INSTALL" : - wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", - wMsg, dwParam1, dwParam2); - - switch(wMsg) { - case DRV_LOAD: return CoreAudio_drvLoad(); - case DRV_FREE: return CoreAudio_drvFree(); - case DRV_OPEN: return CoreAudio_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: return CoreAudio_drvClose(dwDevID); - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: return 1; - case DRV_CONFIGURE: MessageBoxA(0, "CoreAudio driver!", "CoreAudio driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; - default: - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); - } -} diff --git a/dlls/winecoreaudio.drv/coreaudio.h b/dlls/winecoreaudio.drv/coreaudio.h index 68b52502333..e04043c4010 100644 --- a/dlls/winecoreaudio.drv/coreaudio.h +++ b/dlls/winecoreaudio.drv/coreaudio.h @@ -22,15 +22,6 @@ #include "wine/debug.h" -extern LONG CoreAudio_WaveInit(void); -extern void CoreAudio_WaveRelease(void); - -extern LONG CoreAudio_MIDIInit(void); -extern LONG CoreAudio_MIDIRelease(void); - -extern LONG CoreAudio_MixerInit(void); -extern void CoreAudio_MixerRelease(void); - /* fourcc is in native order, where MSB is the first character. */ static inline const char* wine_dbgstr_fourcc(INT32 fourcc) { diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index c299d116f12..64fc3618f61 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -8,7 +8,7 @@ * current support is limited to MIDI ports of OSS systems * 98/9 rewriting MCI code for MIDI * 98/11 split in midi.c and mcimidi.c - * Copyright 2006 Emmanuel Maillard + * Copyright 2005, 2006 Emmanuel Maillard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1033,3 +1033,79 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw } return MMSYSERR_NOTSUPPORTED; } + +/************************************************************************** + * CoreAudio_drvLoad [internal] + */ +static LRESULT CoreAudio_drvLoad(void) +{ + TRACE("()\n"); + + if (CoreAudio_MIDIInit() != DRV_SUCCESS) + return DRV_FAILURE; + + return DRV_SUCCESS; +} + +/************************************************************************** + * CoreAudio_drvFree [internal] + */ +static LRESULT CoreAudio_drvFree(void) +{ + TRACE("()\n"); + CoreAudio_MIDIRelease(); + return DRV_SUCCESS; +} + +/************************************************************************** + * CoreAudio_drvOpen [internal] + */ +static LRESULT CoreAudio_drvOpen(LPSTR str) +{ + TRACE("(%s)\n", str); + return 1; +} + +/************************************************************************** + * CoreAudio_drvClose [internal] + */ +static DWORD CoreAudio_drvClose(DWORD dwDevID) +{ + TRACE("(%08x)\n", dwDevID); + return 1; +} + +/************************************************************************** + * DriverProc (WINECOREAUDIO.1) + */ +LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) +{ + TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", + dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : + wMsg == DRV_FREE ? "DRV_FREE" : + wMsg == DRV_OPEN ? "DRV_OPEN" : + wMsg == DRV_CLOSE ? "DRV_CLOSE" : + wMsg == DRV_ENABLE ? "DRV_ENABLE" : + wMsg == DRV_DISABLE ? "DRV_DISABLE" : + wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : + wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : + wMsg == DRV_INSTALL ? "DRV_INSTALL" : + wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", + wMsg, dwParam1, dwParam2); + + switch(wMsg) { + case DRV_LOAD: return CoreAudio_drvLoad(); + case DRV_FREE: return CoreAudio_drvFree(); + case DRV_OPEN: return CoreAudio_drvOpen((LPSTR)dwParam1); + case DRV_CLOSE: return CoreAudio_drvClose(dwDevID); + case DRV_ENABLE: return 1; + case DRV_DISABLE: return 1; + case DRV_QUERYCONFIGURE: return 1; + case DRV_CONFIGURE: MessageBoxA(0, "CoreAudio driver!", "CoreAudio driver", MB_OK); return 1; + case DRV_INSTALL: return DRVCNF_RESTART; + case DRV_REMOVE: return DRVCNF_RESTART; + default: + return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + } +} -- 2.33.1

1 0

[PATCH 1/9] Revert "makefiles: Use static importlibs on all platforms."
by Rémi Bernon 17 Nov '21

17 Nov '21

This reverts commit a9b5bb326a1514e2c4185633ab34b22c9bbc9863. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This first patch is only there so that the testbot can run the tests without failing spuriously. The change broke graphics drivers, although I don't know precisely how and it should probably be fixed instead of reverting it. tools/makedep.c | 78 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ea46aed8d8..d5412eccfa4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2189,10 +2189,19 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra for (j = 0; j < subdirs.count; j++) { if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) - lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); - else - lib = get_static_lib( submakes[j], name ); - if (lib) break; + { + if (is_cross || !*dll_ext || submakes[j]->staticimplib) + lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); + else + { + strarray_add_uniq( deps, strmake( "%s/lib%s.def", submakes[j]->obj_dir, name )); + if (needs_implib_symlink( submakes[j] )) + strarray_add_uniq( deps, strmake( "dlls/lib%s.def", name )); + } + break; + } + + if ((lib = get_static_lib( submakes[j], name ))) break; } if (lib) @@ -2579,8 +2588,12 @@ static void output_uninstall_rules( struct makefile *make ) static struct strarray output_importlib_symlinks( const struct makefile *make ) { struct strarray ret = empty_strarray; - const char *lib, *dst, *ext[2] = { "a", "cross.a" }; - int i, count = 1 + !!crosstarget; + const char *lib, *dst, *ext[4]; + int i, count = 0; + + ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; + if (crosstarget) ext[count++] = "cross.a"; + if (needs_delay_lib( make )) ext[count++] = "delay.a"; for (i = 0; i < count; i++) { @@ -3307,27 +3320,42 @@ static void output_module( struct makefile *make ) if (spec_file && make->importlib) { char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); - - strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); - if (!*dll_ext && needs_delay_lib( make )) + if (*dll_ext && !make->implib_objs.count) { - strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); - output( "%s.delay.a ", importlib_path ); + strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); + output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output( "\t%s%s -w --def -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.def", make->importlib ), + strmake( "d%s/lib%s.def", so_dir, make->importlib )); + } + else + { + strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); + if (!*dll_ext && needs_delay_lib( make )) + { + strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); + output( "%s.delay.a ", importlib_path ); + } + output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.a", make->importlib ), + strmake( "d%s/lib%s.a", so_dir, make->importlib )); } - output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - output_filenames( target_flags ); - if (make->is_win16) output_filename( "-m16" ); - output_filename( "--export" ); - output_filename( spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - add_install_rule( make, make->importlib, - strmake( "lib%s.a", make->importlib ), - strmake( "d%s/lib%s.a", so_dir, make->importlib )); - if (crosstarget) { struct strarray cross_files = strarray_replace_extension( &make->implib_objs, ".o", ".cross.o" ); -- 2.33.1

3 13

[PATCH 1/3] d3d10core/tests: Add a test for DXGI_FORMAT_R8G8_UINT support in vertex buffers.
by Nikolay Sivov 17 Nov '21

17 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b8338152bb7..73151f2296c 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -13645,6 +13645,10 @@ static void test_format_support(void) {DXGI_FORMAT_R32_UINT}, {DXGI_FORMAT_R16_UINT}, }; + static const struct format_support vertex_buffers[] = + { + {DXGI_FORMAT_R8G8_UINT}, + }; if (!(device = create_device())) { @@ -13685,6 +13689,9 @@ static void test_format_support(void) check_format_support(format_support, index_buffers, ARRAY_SIZE(index_buffers), D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); + check_format_support(format_support, vertex_buffers, ARRAY_SIZE(vertex_buffers), + D3D10_FORMAT_SUPPORT_IA_VERTEX_BUFFER, "vertex buffer"); + check_format_support(format_support, display_format_support, ARRAY_SIZE(display_format_support), D3D10_FORMAT_SUPPORT_DISPLAY, "display"); -- 2.33.0

3 7

[PATCH 6/6] win32u: Move NtUserScrollDC implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

3 2

[PATCH 5/6] win32u: Move NtUserGetMouseMovePointsEx implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/input.c | 67 ----------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/input.c | 64 +++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 +++++++ 7 files changed, 79 insertions(+), 69 deletions(-)

3 2

[PATCH 4/6] win32u: Move NtUserUnregisterHotKey implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/input.c | 28 ---------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 +++++ 8 files changed, 43 insertions(+), 30 deletions(-)

3 2

[PATCH 3/6] win32u: Move NtUserGetKeyboardLayoutList implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 7 +--- dlls/user32/input.c | 51 -------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 70 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 47 ++++++++++++++++++++++++ dlls/win32u/wrappers.c | 5 +++ 9 files changed, 132 insertions(+), 59 deletions(-)

3 2

[PATCH 2/6] win32u: Move NtUserActivateKeyboardLayout implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

3 2

[PATCH 1/6] win32u: Move NtUserToUnicodeEx implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

3 2

[PATCH v3] kernel32/tests: Add SetCurrentConsoleFontEx tests for the current window size
by Hugh McMaster 17 Nov '21

17 Nov '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in v3: - Drop font selection loop. - Drop nFont comparisons. dlls/kernel32/tests/console.c | 187 +++++++++++++++++++++++++++++++++- 1 file changed, 185 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8b5abfa2da9..bf9bf158267 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3554,10 +3554,17 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; HANDLE pipe1, pipe2; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + unsigned int cp, font_family; + const WCHAR *face_name = L"Courier New"; + + font_family = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + + /* Save current console font information */ + cp = GetConsoleOutputCP(); orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); @@ -3651,17 +3658,193 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) ok(!ret, "got %d, expected 0\n", ret); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + /* Try setting console font information for the current window size */ + SetConsoleOutputCP(CP_UTF8); + + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + cfix.FontFamily = font_family; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, face_name); + + tmp.cbSize = sizeof(tmp); + + /* Courier New is available in the console by default from Windows 10 build 1607 */ + SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + + if (lstrcmpW(tmp.FaceName, face_name)) + { + SetConsoleOutputCP(cp); + skip("%s not available. Skipping SetCurrentConsoleFontEx tests.\n", wine_dbgstr_w(face_name)); + return; + } + + /* Test font size 8x16 */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20 */ + cfix.dwFontSize.X = 10; + cfix.dwFontSize.Y = 20; SetLastError(0xdeadbeef); - ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 5x12. We pass in 10x12. */ + cfix.dwFontSize.Y = 12; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20. Font height is 20. All other metrics are zero. */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 20; + cfix.FontFamily = 0; + cfix.FontWeight = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 10, "got %u, expected font width of 10\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 20, "got %u, expected font height of 20\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == font_family, "got %u, expected %u\n", tmp.FontFamily, font_family); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test font size 7x14. We pass in 7x0. */ + cfix = tmp; + cfix.dwFontSize.X = 7; + cfix.dwFontSize.Y = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size with width and height set to 0x0. */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test with invalid font face name */ + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + lstrcpyW(cfix.FaceName, L"MissingFont"); + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with no font face name */ + cfix.FaceName[0] = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + /* Restore original console font parameters */ + SetConsoleOutputCP(cp); + SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); -- 2.33.1

2 1

[PATCH vkd3d 6/6] vkd3d-shader/spirv: Shift the private variable destination mask instead of the source mask.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Otherwise if the input is located above position 0 in the private array it will be swizzled incorrectly, e.g. a.yz instead of a.xy in test_domain_shader_inputs(). Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 ++-- tests/d3d12.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5a7e561f..b7e7428a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4672,8 +4672,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, - vkd3d_write_mask_from_component_count(input_component_count) << component_idx, - VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_SHADER_NO_SWIZZLE, dst->write_mask); + vkd3d_write_mask_from_component_count(input_component_count), + VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_SHADER_NO_SWIZZLE, dst->write_mask >> component_idx); vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst_reg, dst->write_mask, val_id); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 670fbf4a..3b0c4242 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29506,7 +29506,6 @@ static void test_domain_shader_inputs(void) {1.0f, 2.0f, 0.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, {1.0f, 2.0f, 1.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, }; - static const unsigned int is_todo[] = {0x00110000, 0x00110000, 0x00110000, 0x00110000}; static const unsigned int stride = sizeof(*reference); memset(&desc, 0, sizeof(desc)); @@ -29556,9 +29555,8 @@ static void test_domain_shader_inputs(void) const float *elems = get_readback_data(&rb, y, 0, 0, stride); for (x = 0; x < ARRAY_SIZE(*reference); ++x) { - todo_if(is_todo[y] & (1u << (x * 4))) - ok(compare_float(reference[y][x], elems[x], 0), - "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); + ok(compare_float(reference[y][x], elems[x], 0), + "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); } } release_resource_readback(&rb); -- 2.20.1

1 0

[PATCH vkd3d 5/6] vkd3d-shader/spirv: Fix the outer tessellation level indices for isoline tessellation.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> For isoline tessellation, "density" is specified by OL0, and "detail" by OL1. Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 ++-- tests/d3d12.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e1a7dd37..5a7e561f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4084,8 +4084,8 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_TRIANGLE_W_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 2}}, {VKD3D_SIV_TRIANGLE_INNER_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelInner, NULL, 2, 0}}, - {VKD3D_SIV_LINE_DETAIL_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 0}}, - {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 1}}, + {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 0}}, + {VKD3D_SIV_LINE_DETAIL_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 1}}, }; static const struct vkd3d_spirv_builtin vkd3d_pixel_shader_position_builtin = { diff --git a/tests/d3d12.c b/tests/d3d12.c index f5a1723a..670fbf4a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29506,7 +29506,7 @@ static void test_domain_shader_inputs(void) {1.0f, 2.0f, 0.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, {1.0f, 2.0f, 1.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, }; - static const unsigned int is_todo[] = {0x00110000, 0x00110100, 0x00111100, 0x00111000}; + static const unsigned int is_todo[] = {0x00110000, 0x00110000, 0x00110000, 0x00110000}; static const unsigned int stride = sizeof(*reference); memset(&desc, 0, sizeof(desc)); -- 2.20.1

1 0

[PATCH vkd3d 4/6] tests: Add tests for a domain shader using a single patch constant input value.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> This specifically tests the case where "count" would end up being one for arrayed builtins in needs_private_io_variable(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9b0a91f7..f5a1723a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29567,6 +29567,180 @@ static void test_domain_shader_inputs(void) destroy_test_context(&context); } +static void test_domain_shader_one_patch_constant_input(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12Resource *so_buffer; + ID3D12CommandQueue *queue; + unsigned int x, y; + HRESULT hr; + +#if 0 + struct data + { + float4 position : SV_Position; + }; + + data vs_main() + { + data d; + d.position = float4(1.0f, 2.0f, 3.0f, 4.0f); + return d; + } + + struct patch_constant_data + { + float tess_factor[2] : SV_TessFactor; + }; + + void patch_constant(OutputPatch<data, 1> control_points, + uint prim_id : SV_PrimitiveID, + out patch_constant_data output) + { + output.tess_factor[0] = 2.0f; + output.tess_factor[1] = 1.0f; + } + + [domain("isoline")] + [outputcontrolpoints(1)] + [partitioning("integer")] + [outputtopology("line")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 1> input) + { + return input[0]; + } + + [domain("isoline")] + void ds_main(float tess_factor[2] : SV_TessFactor, + const OutputPatch<data, 1> patch, + out float4 position : SV_Position) + { + position = float4(patch[0].position.xyz, tess_factor[1]); + } +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0xcb24c840, 0x8a22891b, 0xcf0dbe1d, 0x7b0a4fdb, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000040, 0x00010050, 0x00000010, + 0x0100086a, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x40000000, 0x40400000, 0x40800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD hs_code[] = + { + 0x43425844, 0x36132cb6, 0x45a8f125, 0x2ff97810, 0xf60e439e, 0x00000001, 0x000001f4, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x000000e8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x00000048, + 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000010, 0x00000003, 0x00000000, 0x00000e01, + 0x00000038, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, 0x00000e01, 0x545f5653, 0x46737365, + 0x6f746361, 0xabab0072, 0x58454853, 0x00000104, 0x00030050, 0x00000041, 0x01000071, 0x01000893, + 0x01000894, 0x01000895, 0x01000896, 0x01001097, 0x0100086a, 0x00001835, 0x0000000a, 0x40000000, + 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x01000072, + 0x0400005f, 0x002010f2, 0x00000001, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, + 0x00000002, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000016, 0x04000067, + 0x00102012, 0x00000001, 0x00000015, 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000000, + 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, 0x00902012, 0x0010000a, + 0x00000000, 0x0090900a, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0x3ac40533, 0x2aa65785, 0x41df1859, 0xb3b2294b, 0x00000001, 0x00000164, 0x00000004, + 0x00000030, 0x00000064, 0x000000b4, 0x000000e8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000070f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x00000048, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000010, + 0x00000003, 0x00000000, 0x00000001, 0x00000038, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, + 0x00000101, 0x545f5653, 0x46737365, 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x58454853, 0x00000074, 0x00040050, 0x0000001d, 0x01000893, 0x01000895, + 0x0100086a, 0x04000061, 0x0011b012, 0x00000001, 0x00000015, 0x0400005f, 0x00219072, 0x00000001, + 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x06000036, 0x00102072, 0x00000000, + 0x00219246, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x0011b00a, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_POSITION", 0, 0, 4, 0}, + }; + static const float reference[][4] = + { + {1.0f, 2.0f, 3.0f, 1.0f}, + {1.0f, 2.0f, 3.0f, 1.0f}, + {1.0f, 2.0f, 3.0f, 1.0f}, + {1.0f, 2.0f, 3.0f, 1.0f}, + }; + static const unsigned int stride = sizeof(*reference); + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + memset(&input_layout, 0, sizeof(input_layout)); + + init_pipeline_state_desc(&pso_desc, context.root_signature, DXGI_FORMAT_UNKNOWN, &vs, NULL, &input_layout); + pso_desc.HS = hs; + pso_desc.DS = ds; + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = &stride; + pso_desc.StreamOutput.NumStrides = 1; + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + so_buffer = create_default_buffer(context.device, 1024, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (y = 0; y < ARRAY_SIZE(reference); ++y) + { + const float *elems = get_readback_data(&rb, y, 0, 0, stride); + for (x = 0; x < ARRAY_SIZE(*reference); ++x) + { + ok(compare_float(reference[y][x], elems[x], 0), + "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); + } + } + release_resource_readback(&rb); + + ID3D12Resource_Release(so_buffer); + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -35970,6 +36144,7 @@ START_TEST(d3d12) run_test(test_line_tessellation); run_test(test_tessellation_primitive_id); run_test(test_domain_shader_inputs); + run_test(test_domain_shader_one_patch_constant_input); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.20.1

1 0

[PATCH vkd3d 3/6] tests: Add tests for domain shader patch constant inputs.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8071faf0..9b0a91f7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29360,6 +29360,213 @@ static void test_tessellation_primitive_id(void) destroy_test_context(&context); } +static void test_domain_shader_inputs(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12Resource *so_buffer; + ID3D12CommandQueue *queue; + unsigned int x, y; + HRESULT hr; + +#if 0 + struct data + { + float4 position : SV_Position; + }; + + data vs_main() + { + data d; + d.position = float4(1.0f, 2.0f, 3.0f, 4.0f); + return d; + } + + struct patch_constant_data + { + float tess_factor[2] : SV_TessFactor; + float3 a : A; + float3 b : B; + }; + + void patch_constant(OutputPatch<data, 1> control_points, + uint prim_id : SV_PrimitiveID, + out patch_constant_data output) + { + output.tess_factor[0] = 2.0f; + output.tess_factor[1] = 1.0f; + output.a = float3(2.0f, 4.0f, 10.0f); + output.b = float3(3.0f, 3.0f, 12.0f); + } + + [domain("isoline")] + [outputcontrolpoints(1)] + [partitioning("integer")] + [outputtopology("line")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 1> input) + { + return input[0]; + } + + [domain("isoline")] + void ds_main(float tess_factor[2] : SV_TessFactor, + float2 tess_coord : SV_DomainLocation, + float3 a : A, + float3 b : B, + const OutputPatch<data, 1> patch, + out float4 position : SV_Position, + out float4 out_color : COLOR) + { + position = float4(patch[0].position.xy, tess_coord); + out_color = float4(0.5f * (a.xy + b.yz), tess_factor[0], tess_factor[1]); + } +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0xcb24c840, 0x8a22891b, 0xcf0dbe1d, 0x7b0a4fdb, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000040, 0x00010050, 0x00000010, + 0x0100086a, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x40000000, 0x40400000, 0x40800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD hs_code[] = + { + 0x43425844, 0x67db9c59, 0xff2c4d5e, 0xc2a4d15b, 0x0f71495f, 0x00000001, 0x00000384, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000011c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000007c, + 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000010, 0x00000003, 0x00000000, 0x00000e01, + 0x00000076, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000010e, 0x00000068, 0x00000001, + 0x0000000f, 0x00000003, 0x00000001, 0x00000e01, 0x00000078, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x0000010e, 0x545f5653, 0x46737365, 0x6f746361, 0x00410072, 0xabab0042, 0x58454853, + 0x00000260, 0x00030050, 0x00000098, 0x01000071, 0x01000893, 0x01000894, 0x01000895, 0x01000896, + 0x01001097, 0x0100086a, 0x00001835, 0x0000000a, 0x41200000, 0x40800000, 0x40000000, 0x40000000, + 0x41400000, 0x40400000, 0x40400000, 0x3f800000, 0x01000072, 0x0400005f, 0x002010f2, 0x00000001, + 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, + 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, 0x00017000, + 0x04000067, 0x00102012, 0x00000000, 0x00000016, 0x04000067, 0x00102012, 0x00000001, 0x00000015, + 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000002, 0x04000036, 0x00100012, + 0x00000000, 0x0001700a, 0x07000036, 0x00902012, 0x0010000a, 0x00000000, 0x0090903a, 0x0010000a, + 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, 0x00017000, 0x03000065, + 0x00102022, 0x00000000, 0x03000065, 0x00102022, 0x00000001, 0x02000068, 0x00000001, 0x0400005b, + 0x00102022, 0x00000000, 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, + 0x00902022, 0x0010000a, 0x00000000, 0x0090902a, 0x0010000a, 0x00000000, 0x0100003e, 0x01000073, + 0x02000099, 0x00000002, 0x0200005f, 0x00017000, 0x03000065, 0x00102042, 0x00000000, 0x03000065, + 0x00102042, 0x00000001, 0x02000068, 0x00000001, 0x0400005b, 0x00102042, 0x00000000, 0x00000002, + 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, 0x00902042, 0x0010000a, 0x00000000, + 0x0090901a, 0x0010000a, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, + 0x00017000, 0x03000065, 0x00102082, 0x00000000, 0x03000065, 0x00102082, 0x00000001, 0x02000068, + 0x00000001, 0x0400005b, 0x00102082, 0x00000000, 0x00000002, 0x04000036, 0x00100012, 0x00000000, + 0x0001700a, 0x07000036, 0x00902082, 0x0010000a, 0x00000000, 0x0090900a, 0x0010000a, 0x00000000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0xef67f8be, 0x1be137b6, 0x0e4a6b01, 0xf0cd92d8, 0x00000001, 0x00000264, 0x00000004, + 0x00000030, 0x00000064, 0x000000e8, 0x0000013c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000010, + 0x00000003, 0x00000000, 0x00000101, 0x00000076, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000060e, 0x00000068, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, 0x00000101, 0x00000078, + 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c0e, 0x545f5653, 0x46737365, 0x6f746361, + 0x00410072, 0xabab0042, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, + 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x58454853, + 0x00000120, 0x00040050, 0x00000048, 0x01000893, 0x01000895, 0x0100086a, 0x04000061, 0x0011b012, + 0x00000000, 0x00000016, 0x0300005f, 0x0011b062, 0x00000000, 0x04000061, 0x0011b012, 0x00000001, + 0x00000015, 0x0300005f, 0x0011b0c2, 0x00000001, 0x0200005f, 0x0001c032, 0x0400005f, 0x00219032, + 0x00000001, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000001, 0x02000068, 0x00000001, 0x06000036, 0x00102032, 0x00000000, 0x00219046, 0x00000000, + 0x00000000, 0x04000036, 0x001020c2, 0x00000000, 0x0001c406, 0x07000000, 0x00100032, 0x00000000, + 0x0011b596, 0x00000000, 0x0011bae6, 0x00000001, 0x0a000038, 0x00102032, 0x00000001, 0x00100046, + 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x05000036, 0x00102042, + 0x00000001, 0x0011b00a, 0x00000000, 0x05000036, 0x00102082, 0x00000001, 0x0011b00a, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_POSITION", 0, 0, 4, 0}, + {0, "COLOR", 0, 0, 4, 0}, + }; + static const float reference[][8] = + { + {1.0f, 2.0f, 0.0f, 0.0f, 2.5f, 8.0f, 2.0f, 1.0f}, + {1.0f, 2.0f, 1.0f, 0.0f, 2.5f, 8.0f, 2.0f, 1.0f}, + {1.0f, 2.0f, 0.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, + {1.0f, 2.0f, 1.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, + }; + static const unsigned int is_todo[] = {0x00110000, 0x00110100, 0x00111100, 0x00111000}; + static const unsigned int stride = sizeof(*reference); + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + memset(&input_layout, 0, sizeof(input_layout)); + + init_pipeline_state_desc(&pso_desc, context.root_signature, DXGI_FORMAT_UNKNOWN, &vs, NULL, &input_layout); + pso_desc.HS = hs; + pso_desc.DS = ds; + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = &stride; + pso_desc.StreamOutput.NumStrides = 1; + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + so_buffer = create_default_buffer(context.device, 1024, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (y = 0; y < ARRAY_SIZE(reference); ++y) + { + const float *elems = get_readback_data(&rb, y, 0, 0, stride); + for (x = 0; x < ARRAY_SIZE(*reference); ++x) + { + todo_if(is_todo[y] & (1u << (x * 4))) + ok(compare_float(reference[y][x], elems[x], 0), + "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); + } + } + release_resource_readback(&rb); + + ID3D12Resource_Release(so_buffer); + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -35762,6 +35969,7 @@ START_TEST(d3d12) run_test(test_hull_shader_fork_phase); run_test(test_line_tessellation); run_test(test_tessellation_primitive_id); + run_test(test_domain_shader_inputs); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.20.1

1 0

[PATCH vkd3d 2/6] vkd3d-shader/spirv: Handle arrayed builtin inputs.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Fixes invalid SPIR-V being generated in Monster Hunter: World. Based on vkd3d-proton patches by Hans-Kristian Arntzen and Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This is triggered by the tests in patch 3/6 and 4/6 in this series. libs/vkd3d-shader/spirv.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8827c431..e1a7dd37 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4416,6 +4416,13 @@ static bool needs_private_io_variable(const struct vkd3d_shader_signature *signa bool have_sysval = false; unsigned int i, count; + /* Always use private variables for arrayed builtins. These are generally + * scalars on the D3D side, so would need extra array indices when + * accessing them. It may be feasible to insert those indices at the point + * where the builtins are used, but it's not clear it's worth the effort. */ + if (builtin && (builtin->spirv_array_size || builtin->fixup_pfn)) + return true; + if (*component_count == VKD3D_VEC4_SIZE) return false; @@ -4519,8 +4526,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi component_idx = vkd3d_write_mask_get_component_idx(signature_element->mask); } - if (!(use_private_var = builtin && builtin->fixup_pfn) - && needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask) + if (needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask) && (compiler->shader_type != VKD3D_SHADER_TYPE_HULL || (reg->type != VKD3DSPR_INCONTROLPOINT && reg->type != VKD3DSPR_PATCHCONST))) use_private_var = true; @@ -4644,6 +4650,16 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi val_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, input_id, index); dst_reg.idx[0].offset = i; } + else if (builtin && builtin->spirv_array_size) + { + /* The D3D builtin is not an array, but the SPIR-V builtin is, + * so we'll need to index into the SPIR-V builtin when loading + * it. This happens when reading TessLevel in domain shaders. */ + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, type_id); + index = vkd3d_dxbc_compiler_get_constant_uint(compiler, builtin->member_idx); + val_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, input_id, index); + dst_reg.idx[0].offset = reg_idx + i; + } val_id = vkd3d_spirv_build_op_load(builder, type_id, val_id, SpvMemoryAccessMaskNone); if (builtin && builtin->fixup_pfn) @@ -4947,11 +4963,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler const struct vkd3d_spirv_builtin *builtin; const struct vkd3d_shader_phase *phase; struct vkd3d_symbol *symbol = NULL; + bool use_private_variable = false; struct vkd3d_symbol reg_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; unsigned int signature_idx; - bool use_private_variable; unsigned int write_mask; unsigned int array_size; bool is_patch_constant; @@ -4991,11 +5007,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class = SpvStorageClassOutput; - if (!(use_private_variable = builtin && builtin->spirv_array_size) - && (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE + if (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE || needs_private_io_variable(shader_signature, signature_element->register_index, builtin, &output_component_count, &write_mask) - || is_patch_constant)) + || is_patch_constant) use_private_variable = true; else component_idx = vkd3d_write_mask_get_component_idx(write_mask); -- 2.20.1

1 0

[PATCH vkd3d 1/6] vkd3d-shader/spirv: Apply 'Patch' decorations to builtin patch constant inputs.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Prevents a crash in radv when such inputs are present. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This is triggered by the tests in patch 3/6 and 4/6 in this series. libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 698c3054..8827c431 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4582,6 +4582,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if (builtin) { input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); + if (reg->type == VKD3DSPR_PATCHCONST) + vkd3d_spirv_build_op_decorate(builder, input_id, SpvDecorationPatch, NULL, 0); } else { -- 2.20.1

1 0

[PATCH v2 01/10] Revert "makefiles: Use static importlibs on all platforms."
by Rémi Bernon 17 Nov '21

17 Nov '21

This reverts commit a9b5bb326a1514e2c4185633ab34b22c9bbc9863. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Add a win32u fix for a random explorer.exe crash on startup, although maybe unrelated to the issues seen before. Fix call to CancelIoEx / GetOverlappedResult which didn't previously wait on Wine, causing 32bit segmentation fault after the result was later overwritten on the stack. PATCH 1 is still only there for the tests to run. tools/makedep.c | 78 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ea46aed8d8..d5412eccfa4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2189,10 +2189,19 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra for (j = 0; j < subdirs.count; j++) { if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) - lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); - else - lib = get_static_lib( submakes[j], name ); - if (lib) break; + { + if (is_cross || !*dll_ext || submakes[j]->staticimplib) + lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); + else + { + strarray_add_uniq( deps, strmake( "%s/lib%s.def", submakes[j]->obj_dir, name )); + if (needs_implib_symlink( submakes[j] )) + strarray_add_uniq( deps, strmake( "dlls/lib%s.def", name )); + } + break; + } + + if ((lib = get_static_lib( submakes[j], name ))) break; } if (lib) @@ -2579,8 +2588,12 @@ static void output_uninstall_rules( struct makefile *make ) static struct strarray output_importlib_symlinks( const struct makefile *make ) { struct strarray ret = empty_strarray; - const char *lib, *dst, *ext[2] = { "a", "cross.a" }; - int i, count = 1 + !!crosstarget; + const char *lib, *dst, *ext[4]; + int i, count = 0; + + ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; + if (crosstarget) ext[count++] = "cross.a"; + if (needs_delay_lib( make )) ext[count++] = "delay.a"; for (i = 0; i < count; i++) { @@ -3307,27 +3320,42 @@ static void output_module( struct makefile *make ) if (spec_file && make->importlib) { char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); - - strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); - if (!*dll_ext && needs_delay_lib( make )) + if (*dll_ext && !make->implib_objs.count) { - strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); - output( "%s.delay.a ", importlib_path ); + strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); + output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output( "\t%s%s -w --def -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.def", make->importlib ), + strmake( "d%s/lib%s.def", so_dir, make->importlib )); + } + else + { + strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); + if (!*dll_ext && needs_delay_lib( make )) + { + strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); + output( "%s.delay.a ", importlib_path ); + } + output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.a", make->importlib ), + strmake( "d%s/lib%s.a", so_dir, make->importlib )); } - output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - output_filenames( target_flags ); - if (make->is_win16) output_filename( "-m16" ); - output_filename( "--export" ); - output_filename( spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - add_install_rule( make, make->importlib, - strmake( "lib%s.a", make->importlib ), - strmake( "d%s/lib%s.a", so_dir, make->importlib )); - if (crosstarget) { struct strarray cross_files = strarray_replace_extension( &make->implib_objs, ".o", ".cross.o" ); -- 2.33.1

1 10

[PATCH v2 3/3] msdasql: Implement IGetDataSource GetDataSource
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 2 +- dlls/msdasql/msdasql_private.h | 2 +- dlls/msdasql/session.c | 15 ++++++++++++--- dlls/msdasql/tests/provider.c | 7 ++++++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index e98945b9777..bc208a74cc5 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -559,7 +559,7 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou if (outer) FIXME("outer currently not supported.\n"); - hr = create_db_session(riid, (void**)session); + hr = create_db_session(riid, &provider->MSDASQL_iface, (void**)session); return hr; } diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index a3d73498fe9..7d7f67c2c78 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,4 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, void **unk) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 44f36f0e591..b4239c59037 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -43,6 +43,8 @@ struct msdasql_session ISessionProperties ISessionProperties_iface; IDBCreateCommand IDBCreateCommand_iface; LONG refs; + + IUnknown *datasource; }; static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) @@ -139,6 +141,8 @@ static ULONG WINAPI session_Release(IUnknown *iface) if (!refs) { TRACE( "destroying %p\n", session ); + + IUnknown_Release(session->datasource); heap_free( session ); } return refs; @@ -173,9 +177,13 @@ ULONG WINAPI datasource_Release(IGetDataSource *iface) HRESULT WINAPI datasource_GetDataSource(IGetDataSource *iface, REFIID riid, IUnknown **datasource) { struct msdasql_session *session = impl_from_IGetDataSource( iface ); - FIXME("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); - return E_NOTIMPL; + TRACE("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); + + if (!datasource) + return E_INVALIDARG; + + return IUnknown_QueryInterface(session->datasource, riid, (void**)datasource); } static const IGetDataSourceVtbl datasourceVtbl = @@ -1155,7 +1163,7 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; -HRESULT create_db_session(REFIID riid, void **unk) +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) { struct msdasql_session *session; HRESULT hr; @@ -1169,6 +1177,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; + IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index a0b11194f2b..b520b127d67 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -399,7 +399,7 @@ static void test_command_rowset(IUnknown *cmd) static void test_sessions(void) { - IDBProperties *props; + IDBProperties *props, *dsource = NULL; IDBInitialize *dbinit = NULL; IDataInitialize *datainit; IDBCreateSession *dbsession = NULL; @@ -456,6 +456,11 @@ static void test_sessions(void) hr = IUnknown_QueryInterface(session, &IID_IGetDataSource, (void**)&datasource); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IGetDataSource_GetDataSource(datasource, &IID_IDBProperties, (IUnknown**)&dsource); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dsource == props, "different pointers\n"); + IDBProperties_Release(dsource); IGetDataSource_Release(datasource); hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); -- 2.33.0

2 1

[PATCH v2 2/3] msdasql: Move ICommandWithParameters to the correct interface
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 126 ++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index df394264bf7..44f36f0e591 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -293,6 +293,7 @@ struct command IColumnsInfo IColumnsInfo_iface; IConvertType IConvertType_iface; ICommandPrepare ICommandPrepare_iface; + ICommandWithParameters ICommandWithParameters_iface; LONG refs; WCHAR *query; IUnknown *session; @@ -323,6 +324,11 @@ static inline struct command *impl_from_ICommandPrepare( ICommandPrepare *iface return CONTAINING_RECORD( iface, struct command, ICommandPrepare_iface ); } +static inline struct command *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandWithParameters_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -352,6 +358,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandPrepare_iface; } + else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) + { + *ppv = &command->ICommandWithParameters_iface; + } if(*ppv) { @@ -426,7 +436,6 @@ struct msdasql_rowset IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; IColumnsRowset IColumnsRowset_iface; - ICommandWithParameters ICommandWithParameters_iface; IUnknown *caller; LONG refs; }; @@ -456,11 +465,6 @@ static inline struct msdasql_rowset *impl_from_IColumnsRowset ( IColumnsRowset * return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsRowset_iface ); } -static inline struct msdasql_rowset *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) -{ - return CONTAINING_RECORD( iface, struct msdasql_rowset, ICommandWithParameters_iface ); -} - static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -489,10 +493,6 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } - else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) - { - *ppv = &rowset->ICommandWithParameters_iface; - } else if (IsEqualGUID(&IID_IRowsetChange, riid)) { TRACE("IID_IRowsetChange not supported\n"); @@ -801,58 +801,6 @@ struct IColumnsRowsetVtbl columnrs_rs_vtbl = column_rs_GetColumnsRowset }; -static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); -} - -static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_AddRef(&rowset->IRowset_iface); -} - -static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_Release(&rowset->IRowset_iface); -} - -static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, - DBPARAMINFO **info, OLECHAR **buffer) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %p, %p, %p\n", rowset, uparams, info, buffer); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, - LPCWSTR names[], DB_LPARAMS ordinals[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, names, ordinals); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, - const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, ordinals, bindinfo); - return E_NOTIMPL; -} - -struct ICommandWithParametersVtbl command_with_params_vtbl = -{ - cmd_with_params_QueryInterface, - cmd_with_params_AddRef, - cmd_with_params_Release, - cmd_with_params_GetParameterInfo, - cmd_with_params_MapParameterNames, - cmd_with_params_SetParameterInfo -}; - static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -871,7 +819,6 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; - msrowset->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; msrowset->refs = 1; ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); @@ -1116,6 +1063,58 @@ struct ICommandPrepareVtbl commandprepareVtbl = commandprepare_Unprepare }; +static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, + DBPARAMINFO **info, OLECHAR **buffer) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %p, %p, %p\n", command, uparams, info, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, + LPCWSTR names[], DB_LPARAMS ordinals[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, names, ordinals); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, + const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, ordinals, bindinfo); + return E_NOTIMPL; +} + +struct ICommandWithParametersVtbl command_with_params_vtbl = +{ + cmd_with_params_QueryInterface, + cmd_with_params_AddRef, + cmd_with_params_Release, + cmd_with_params_GetParameterInfo, + cmd_with_params_MapParameterNames, + cmd_with_params_SetParameterInfo +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -1137,6 +1136,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; + command->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; command->refs = 1; command->query = NULL; -- 2.33.0

2 1

[PATCH v2 1/3] msdasql: ICommandPrepare Un/Prepare return S_OK
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

These functions are to attempt to optimize the query that is about to be run. We can safely ignore these calls. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 196fd1c6b81..df394264bf7 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1096,15 +1096,15 @@ static ULONG WINAPI commandprepare_Release(ICommandPrepare *iface) static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) { struct command *command = impl_from_ICommandPrepare( iface ); - FIXME("%p, %u\n", command, runs); - return E_NOTIMPL; + TRACE("%p, %u\n", command, runs); + return S_OK; } static HRESULT WINAPI commandprepare_Unprepare(ICommandPrepare *iface) { struct command *command = impl_from_ICommandPrepare( iface ); - FIXME("%p\n", command); - return E_NOTIMPL; + TRACE("%p\n", command); + return S_OK; } struct ICommandPrepareVtbl commandprepareVtbl = -- 2.33.0

2 1

[PATCH v3 0/9] winedbg(gdbproxy): don't misbehave on module names w/ special characters; modernise
by Jinoh Kang 17 Nov '21

17 Nov '21

Changelog: v1 -> v2: address review comments so far v2 -> v3: - Change cover letter subject - Capitalise subject - Split qXfer cache patch into two Jinoh Kang (9): winedbg: Crash when allocation fails in packet_realloc(). winedbg: Free buffer and return NULL if size==0 in packet_realloc(). winedbg: Generalise packet_realloc(), rename to buffer_realloc(). winedbg: Use unsigned int for offset/length in GDB qXfer handler. winedbg: Escape special characters in GDB packet reply. winedbg: Buffer and escape output of GDB qXfer commands. winedbg: Define table for GDB qXfer command handlers. winedbg: Cache GDB qXfer command result for chunked fetching. winedbg: Implement GDB qXfer object exec-file. programs/winedbg/gdbproxy.c | 565 ++++++++++++++++++++++++++++-------- 1 file changed, 452 insertions(+), 113 deletions(-) -- 2.31.1

2 25

[PATCH 1/3] uxtheme: Support more progress bar parts.
by Zhiyi Zhang 17 Nov '21

17 Nov '21

These parts are available on Vista+. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index c9a23429511..afeda659a36 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -526,6 +526,26 @@ static const MSSTYLES_CLASS_MAP classProgress[] = { {PP_BARVERT, 0, L"BARVERT"}, {PP_CHUNK, 0, L"CHUNK"}, {PP_CHUNKVERT, 0, L"CHUNKVERT"}, + {PP_FILL, 0, L"FILL"}, + {PP_FILL, PBFS_NORMAL, L"NORMAL"}, + {PP_FILL, PBFS_ERROR, L"ERROR"}, + {PP_FILL, PBFS_PAUSED, L"PAUSED"}, + {PP_FILL, PBFS_PARTIAL, L"PARTIAL"}, + {PP_FILLVERT, 0, L"FILLVERT"}, + {PP_FILLVERT, PBFVS_NORMAL, L"NORMAL"}, + {PP_FILLVERT, PBFVS_ERROR, L"ERROR"}, + {PP_FILLVERT, PBFVS_PAUSED, L"PAUSED"}, + {PP_FILLVERT, PBFVS_PARTIAL, L"PARTIAL"}, + {PP_PULSEOVERLAY, 0, L"PULSEOVERLAY"}, + {PP_MOVEOVERLAY, 0, L"MOVEOVERLAY"}, + {PP_PULSEOVERLAYVERT, 0, L"PULSEOVERLAYVERT"}, + {PP_MOVEOVERLAYVERT, 0, L"MOVEOVERLAYVERT"}, + {PP_TRANSPARENTBAR, 0, L"TRANSPARENTBAR"}, + {PP_TRANSPARENTBAR, PBBS_NORMAL, L"NORMAL"}, + {PP_TRANSPARENTBAR, PBBS_PARTIAL, L"PARTIAL"}, + {PP_TRANSPARENTBARVERT, 0, L"TRANSPARENTBARVERT"}, + {PP_TRANSPARENTBARVERT, PBBVS_NORMAL, L"NORMAL"}, + {PP_TRANSPARENTBARVERT, PBBVS_PARTIAL, L"PARTIAL"}, {0, 0, L""} }; -- 2.32.0

2 1

[PATCH 3/3] light.msstyles: Add more progress bar parts.
by Zhiyi Zhang 17 Nov '21

17 Nov '21

Fix Nokia SDK 2.0 for Java installer showing artifacts on its progress bar. The application queries for these Vista+ progress bar parts because Wine's default system version is set to Windows 7. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 49 ++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 87b5c26e617..ba27c9461bc 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -486,6 +486,55 @@ BLUE_INI TEXTFILE "SizingMargins = 1, 1, 1, 1\r\n" "SizingType = Stretch\r\n" +"[Progress.Fill]\r\n" +"FillColor = 48 150 250\r\n" + +"[Progress.FillVert]\r\n" +"FillColor = 48 150 250\r\n" + +"[Progress.Fill(Error)]\r\n" +"FillColor = 213 0 0\r\n" + +"[Progress.FillVert(Error)]\r\n" +"FillColor = 213 0 0\r\n" + +"[Progress.Fill(Paused)]\r\n" +"FillColor = 255 238 88\r\n" + +"[Progress.FillVert(Paused)]\r\n" +"FillColor = 255 238 88\r\n" + +"[Progress.Fill(Partial)]\r\n" +"FillColor = 189 189 189\r\n" + +"[Progress.FillVert(Partial)]\r\n" +"FillColor = 189 189 189\r\n" + +"[Progress.PulseOverlay]\r\n" +"BgType = None\r\n" + +"[Progress.MoveOverlay]\r\n" +"BgType = None\r\n" + +"[Progress.PulseOverlayVert]\r\n" +"BgType = None\r\n" + +"[Progress.MoveOverlayVert]\r\n" +"BgType = None\r\n" + +"[Progress.TransparentBar]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_horizontal.bmp\r\n" +"MinSize = 10, 10\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.TransparentBarVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_vertical.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + "\r\n; Rebar\r\n" "[Rebar]\r\n" "BgType = ImageFile\r\n" -- 2.32.0

1 0

[PATCH 2/3] light.msstyles: Fix incorrect progress bar chunk color.
by Zhiyi Zhang 17 Nov '21

17 Nov '21

Fix Nokia SDK 2.0 for Java installer not showing progress chunks. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index aad8aa51d09..87b5c26e617 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -457,7 +457,7 @@ BLUE_INI TEXTFILE "ProgressSpaceSize = 0\r\n" "BgType = BorderFill\r\n" "FillType = Solid\r\n" -"FillColor = 255 255 255\r\n" +"FillColor = 48 150 250\r\n" "BorderSize = 1\r\n" "BorderColor = 174 174 174\r\n" -- 2.32.0

1 0

[PATCH 3/3] msdasql: Implement IGetDataSource GetDataSource
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 2 +- dlls/msdasql/msdasql_private.h | 2 +- dlls/msdasql/session.c | 15 ++++++++++++--- dlls/msdasql/tests/provider.c | 7 ++++++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index e98945b9777..bc208a74cc5 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -559,7 +559,7 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou if (outer) FIXME("outer currently not supported.\n"); - hr = create_db_session(riid, (void**)session); + hr = create_db_session(riid, &provider->MSDASQL_iface, (void**)session); return hr; } diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index a3d73498fe9..7d7f67c2c78 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,4 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, void **unk) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 44f36f0e591..b4239c59037 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -43,6 +43,8 @@ struct msdasql_session ISessionProperties ISessionProperties_iface; IDBCreateCommand IDBCreateCommand_iface; LONG refs; + + IUnknown *datasource; }; static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) @@ -139,6 +141,8 @@ static ULONG WINAPI session_Release(IUnknown *iface) if (!refs) { TRACE( "destroying %p\n", session ); + + IUnknown_Release(session->datasource); heap_free( session ); } return refs; @@ -173,9 +177,13 @@ ULONG WINAPI datasource_Release(IGetDataSource *iface) HRESULT WINAPI datasource_GetDataSource(IGetDataSource *iface, REFIID riid, IUnknown **datasource) { struct msdasql_session *session = impl_from_IGetDataSource( iface ); - FIXME("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); - return E_NOTIMPL; + TRACE("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); + + if (!datasource) + return E_INVALIDARG; + + return IUnknown_QueryInterface(session->datasource, riid, (void**)datasource); } static const IGetDataSourceVtbl datasourceVtbl = @@ -1155,7 +1163,7 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; -HRESULT create_db_session(REFIID riid, void **unk) +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) { struct msdasql_session *session; HRESULT hr; @@ -1169,6 +1177,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; + IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index a0b11194f2b..f385f499b84 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -399,7 +399,7 @@ static void test_command_rowset(IUnknown *cmd) static void test_sessions(void) { - IDBProperties *props; + IDBProperties *props, *dsource = NULL; IDBInitialize *dbinit = NULL; IDataInitialize *datainit; IDBCreateSession *dbsession = NULL; @@ -456,6 +456,11 @@ static void test_sessions(void) hr = IUnknown_QueryInterface(session, &IID_IGetDataSource, (void**)&datasource); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IGetDataSource_GetDataSource(datasource, &IID_IDBProperties, (IUnknown**)&dsource); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dsource != props, "different pointers\n"); + IDBProperties_Release(dsource); IGetDataSource_Release(datasource); hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); -- 2.33.0

2 1

[PATCH 2/3] msdasql: Move ICommandWithParameters to the correct interface
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 126 ++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index df394264bf7..44f36f0e591 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -293,6 +293,7 @@ struct command IColumnsInfo IColumnsInfo_iface; IConvertType IConvertType_iface; ICommandPrepare ICommandPrepare_iface; + ICommandWithParameters ICommandWithParameters_iface; LONG refs; WCHAR *query; IUnknown *session; @@ -323,6 +324,11 @@ static inline struct command *impl_from_ICommandPrepare( ICommandPrepare *iface return CONTAINING_RECORD( iface, struct command, ICommandPrepare_iface ); } +static inline struct command *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandWithParameters_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -352,6 +358,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandPrepare_iface; } + else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) + { + *ppv = &command->ICommandWithParameters_iface; + } if(*ppv) { @@ -426,7 +436,6 @@ struct msdasql_rowset IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; IColumnsRowset IColumnsRowset_iface; - ICommandWithParameters ICommandWithParameters_iface; IUnknown *caller; LONG refs; }; @@ -456,11 +465,6 @@ static inline struct msdasql_rowset *impl_from_IColumnsRowset ( IColumnsRowset * return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsRowset_iface ); } -static inline struct msdasql_rowset *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) -{ - return CONTAINING_RECORD( iface, struct msdasql_rowset, ICommandWithParameters_iface ); -} - static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -489,10 +493,6 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } - else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) - { - *ppv = &rowset->ICommandWithParameters_iface; - } else if (IsEqualGUID(&IID_IRowsetChange, riid)) { TRACE("IID_IRowsetChange not supported\n"); @@ -801,58 +801,6 @@ struct IColumnsRowsetVtbl columnrs_rs_vtbl = column_rs_GetColumnsRowset }; -static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); -} - -static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_AddRef(&rowset->IRowset_iface); -} - -static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_Release(&rowset->IRowset_iface); -} - -static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, - DBPARAMINFO **info, OLECHAR **buffer) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %p, %p, %p\n", rowset, uparams, info, buffer); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, - LPCWSTR names[], DB_LPARAMS ordinals[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, names, ordinals); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, - const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, ordinals, bindinfo); - return E_NOTIMPL; -} - -struct ICommandWithParametersVtbl command_with_params_vtbl = -{ - cmd_with_params_QueryInterface, - cmd_with_params_AddRef, - cmd_with_params_Release, - cmd_with_params_GetParameterInfo, - cmd_with_params_MapParameterNames, - cmd_with_params_SetParameterInfo -}; - static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -871,7 +819,6 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; - msrowset->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; msrowset->refs = 1; ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); @@ -1116,6 +1063,58 @@ struct ICommandPrepareVtbl commandprepareVtbl = commandprepare_Unprepare }; +static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, + DBPARAMINFO **info, OLECHAR **buffer) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %p, %p, %p\n", command, uparams, info, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, + LPCWSTR names[], DB_LPARAMS ordinals[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, names, ordinals); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, + const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, ordinals, bindinfo); + return E_NOTIMPL; +} + +struct ICommandWithParametersVtbl command_with_params_vtbl = +{ + cmd_with_params_QueryInterface, + cmd_with_params_AddRef, + cmd_with_params_Release, + cmd_with_params_GetParameterInfo, + cmd_with_params_MapParameterNames, + cmd_with_params_SetParameterInfo +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -1137,6 +1136,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; + command->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; command->refs = 1; command->query = NULL; -- 2.33.0

2 1

[PATCH 1/3] msdasql: ICommandPrepare Un/Prepare return S_OK
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

These functions are to attempt to optimize the query that is about to be run. We can safely ignore these calls. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 196fd1c6b81..df394264bf7 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1096,15 +1096,15 @@ static ULONG WINAPI commandprepare_Release(ICommandPrepare *iface) static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) { struct command *command = impl_from_ICommandPrepare( iface ); - FIXME("%p, %u\n", command, runs); - return E_NOTIMPL; + TRACE("%p, %u\n", command, runs); + return S_OK; } static HRESULT WINAPI commandprepare_Unprepare(ICommandPrepare *iface) { struct command *command = impl_from_ICommandPrepare( iface ); - FIXME("%p\n", command); - return E_NOTIMPL; + TRACE("%p\n", command); + return S_OK; } struct ICommandPrepareVtbl commandprepareVtbl = -- 2.33.0

2 1

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

17 Nov '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- v2: Added back missing '\n'. To reviewers: Give yourself sufficient time to review the translations. po/zh_TW.po | 1356 +++++++++++++++++++++++---------------------------- 1 file changed, 598 insertions(+), 758 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index b72bc2b836a..566ea11a761 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-10-30 18:53+0800\n" +"PO-Revision-Date: 2021-11-06 18:33+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -4558,7 +4558,7 @@ msgstr "自動資料區段超出 64k。\n" #: dlls/kernel32/winerror.mc:793 msgid "Ring 2 segment must be movable.\n" -msgstr "環 2 資料段必須可被移動。\n" +msgstr "環形第 2 資料段必須可被移動。\n" #: dlls/kernel32/winerror.mc:798 msgid "Relocation chain exceeds segment limit in %1.\n" @@ -4582,11 +4582,11 @@ msgstr "檔案名稱過長。\n" #: dlls/kernel32/winerror.mc:823 msgid "Ring 2 stack in use.\n" -msgstr "環 2 堆疊使用中。\n" +msgstr "環形第 2 堆疊現正使用中。\n" #: dlls/kernel32/winerror.mc:828 msgid "Error in use of filename wildcards.\n" -msgstr "使用檔名萬用字元時發生錯誤。\n" +msgstr "使用檔案名稱萬用字元時發生錯誤。\n" #: dlls/kernel32/winerror.mc:833 msgid "Invalid signal number.\n" @@ -6866,7 +6866,7 @@ msgstr "無法存取檔案。\n" #: dlls/kernel32/winerror.mc:3693 msgid "The filename cannot be resolved.\n" -msgstr "無法解析檔名。\n" +msgstr "無法解析檔案名稱。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" @@ -12257,7 +12257,7 @@ msgstr "驅動程式未啟用。" msgid "" "The specified device is already in use. Wait until it is free, and then try " "again." -msgstr "指定的裝置已在使用中。請等候該裝置不再使用，然後再試一次。" +msgstr "指定的裝置已在使用中。請等待該裝置空出來，然後再試一次。" #: dlls/winmm/winmm.rc:37 msgid "The specified device handle is invalid." @@ -12430,7 +12430,7 @@ msgstr "您正在使用的多媒體控制介面裝置不支援指定的命令。 #: dlls/winmm/winmm.rc:76 msgid "" "Cannot find the specified file. Make sure the path and filename are correct." -msgstr "找不到指定的檔案。請確定路徑和檔名正確。" +msgstr "找不到指定的檔案。請確定路徑和檔案名稱正確。" #: dlls/winmm/winmm.rc:77 msgid "The device driver is not ready." @@ -12623,15 +12623,15 @@ msgid "" "All wave devices that can play files in the current format are in use. Wait " "until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置不" -"再使用，然後再試一次。" +"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置" +"空出來，然後再試一次。" #: dlls/winmm/winmm.rc:113 msgid "" "Cannot set the current wave device for play back because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"目前的 wave 裝置正在使用中，所以無法設定它來播放。請等待該裝置不再使用，再試" +"目前的 wave 裝置正在使用中，所以無法設定它來播放。請等待該裝置空出來，然後再試" "一次。" #: dlls/winmm/winmm.rc:114 @@ -12639,15 +12639,15 @@ msgid "" "All wave devices that can record files in the current format are in use. " "Wait until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置不" -"再使用，然後再試一次。" +"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置" +"空出來，然後再試一次。" #: dlls/winmm/winmm.rc:115 msgid "" "Cannot set the current wave device for recording because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等待該裝置不再使用，然後" +"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等待該裝置空出來，然後" "再試一次。" #: dlls/winmm/winmm.rc:116 @@ -12696,7 +12696,7 @@ msgstr "「歌曲指標」的時間格式和 SMPTE 彼此互斥。您無法一 msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." -msgstr "指定的 MIDI 連接埠已在使用中。請等待它不再使用，然後再試一次。" +msgstr "指定的 MIDI 連接埠已在使用中。請等待該連接埠空出來，然後再試一次。" #: dlls/winmm/winmm.rc:131 msgid "" @@ -13057,11 +13057,11 @@ msgid "" msgstr "" "ATTRIB - 顯示或變更檔案屬性。\n" "\n" -"語法：\n" -"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [儲存裝置:][路徑][檔名]\n" +"語法:\n" +"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [儲存裝置:][路徑][檔案名稱]\n" " [/S [/D]]\n" "\n" -"其中：\n" +"其中:\n" "\n" " + 設定一個屬性。\n" " - 清空一個屬性。\n" @@ -13069,7 +13069,7 @@ msgstr "" " A 封存檔案屬性。\n" " S 系統檔案屬性。\n" " H 隱藏檔案屬性。\n" -" [儲存裝置:][路徑][檔名]\n" +" [儲存裝置:][路徑][檔案名稱]\n" " 指定 attrib 要處理的一個或多個檔案。\n" " /S 處理在目前資料夾和所有子資料夾中的匹配檔案。\n" " /D 同樣處理資料夾。\n" @@ -13114,15 +13114,6 @@ msgid "Clock" msgstr "時鐘" #: programs/cmd/cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CALL <batchfilename> is used within a batch file to execute commands\n" -#| "from another batch file. When the batch file exits, control returns to\n" -#| "the file which called it. The CALL command may supply parameters to the\n" -#| "called procedure.\n" -#| "\n" -#| "Changes to default directory, environment variables etc made within a\n" -#| "called procedure are inherited by the caller.\n" msgid "" "CALL <batchfilename> is used within a batch file to execute commands from\n" "another batch file. When the batch file exits, control returns to the file\n" @@ -13132,7 +13123,7 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <批次檔名> 是使用在批次檔之內以執行其他\n" +"CALL <批次檔名稱> 是使用在批次檔之內以執行其他\n" "批次檔中的指令。從其他的批次檔離開時，控制權會\n" "回到呼叫它的檔案。CALL 命令可以提供參數給\n" "被呼叫的程序。\n" @@ -13141,10 +13132,6 @@ msgstr "" "將會由呼叫者所繼承。\n" #: programs/cmd/cmd.rc:44 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -13153,8 +13140,6 @@ msgstr "" "預設目錄。\n" #: programs/cmd/cmd.rc:47 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <目錄> 變更目前的預設目錄。\n" @@ -13164,7 +13149,7 @@ msgstr "CLS 清空主控臺螢幕。\n" #: programs/cmd/cmd.rc:53 msgid "COPY <filename> copies a file.\n" -msgstr "COPY <檔名> 複製檔案。\n" +msgstr "COPY <檔案名稱> 複製檔案。\n" #: programs/cmd/cmd.rc:56 msgid "CTTY changes the input/output device.\n" @@ -13176,23 +13161,13 @@ msgstr "DATE 顯示或變更系統日期。\n" #: programs/cmd/cmd.rc:62 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "DEL <檔名> 刪除檔案或一組檔案。\n" +msgstr "DEL <檔案名稱> 刪除檔案或一組檔案。\n" #: programs/cmd/cmd.rc:65 msgid "DIR lists the contents of a directory.\n" msgstr "DIR 列出目錄的內容。\n" #: programs/cmd/cmd.rc:75 -#, fuzzy -#| msgid "" -#| "ECHO <string> displays <string> on the current terminal device.\n" -#| "\n" -#| "ECHO ON causes all subsequent commands in a batch file to be displayed\n" -#| "on the terminal device before they are executed.\n" -#| "\n" -#| "ECHO OFF reverses the effect of a previous ECHO ON (ECHO is OFF by\n" -#| "default). The ECHO OFF command can be prevented from displaying by\n" -#| "preceding it with an @ sign.\n" msgid "" "ECHO <string> displays <string> on the current terminal device.\n" "\n" @@ -13214,14 +13189,9 @@ msgstr "" #: programs/cmd/cmd.rc:78 msgid "ERASE <filename> deletes a file or set of files.\n" -msgstr "ERASE <檔名> 刪除一個檔案或一組檔案。\n" +msgstr "ERASE <檔案名稱> 刪除一個檔案或一組檔案。\n" #: programs/cmd/cmd.rc:85 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -13231,21 +13201,11 @@ msgid "" msgstr "" "FOR 命令用來向檔案集合中的每一個檔案執行命令。\n" "\n" -"語法：FOR %變數 IN (集合) DO 命令\n" +"語法: FOR %變數 IN (集合) DO 命令\n" +"\n" +"當在批次檔裡使用 FOR 的時候，必須使用兩個 % 符號。\n" #: programs/cmd/cmd.rc:97 -#, fuzzy -#| msgid "" -#| "The GOTO command transfers execution to another statement within a\n" -#| "batch file.\n" -#| "\n" -#| "The label which is the target of a GOTO may be up to 255 characters\n" -#| "long but may not include spaces (this is different from other operating\n" -#| "systems). If two or more identical labels exist in a batch file the\n" -#| "first one will always be executed. Attempting to GOTO a nonexistent\n" -#| "label terminates the batch file execution.\n" -#| "\n" -#| "GOTO has no effect when used interactively.\n" msgid "" "The GOTO command transfers execution to another statement within a batch\n" "file.\n" @@ -13290,7 +13250,7 @@ msgid "" msgstr "" "IF 用於有條件地執行命令。\n" "\n" -"語法：IF [NOT] EXIST 檔名命令\n" +"語法: IF [NOT] EXIST 檔名命令\n" " IF [NOT] 字串一==字串二命令\n" " IF [NOT] ERRORLEVEL 數字命令\n" "\n" @@ -13305,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" -"命令將向您提示詢問新的卷冊標貼用於給定的儲存裝置。\n" -"您可以利用 VOL 命令來顯示磁碟卷冊標貼。\n" +"語法: LABEL [裝置代號:]\n" +"命令將向您提示詢問要讓給定的儲存裝置使用的磁碟區標籤。\n" +"您可以利用 VOL 命令來顯示磁碟的磁碟區標籤。\n" #: programs/cmd/cmd.rc:121 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" @@ -13320,17 +13280,6 @@ msgid "MKDIR <name> creates a subdirectory.\n" msgstr "MKDIR <名稱> 建立子目錄。\n" #: programs/cmd/cmd.rc:131 -#, fuzzy -#| msgid "" -#| "MOVE relocates a file or directory to a new point within the file " -#| "system.\n" -#| "\n" -#| "If the item being moved is a directory then all the files and " -#| "subdirectories\n" -#| "below the item are moved as well.\n" -#| "\n" -#| "MOVE fails if the old and new locations are on different DOS drive " -#| "letters.\n" msgid "" "MOVE relocates a file or directory to a new point within the file system.\n" "\n" @@ -13347,17 +13296,6 @@ msgstr "" "如果舊的和新的位置在不同的 DOS 儲存裝置代號之上，MOVE 將會失敗。\n" #: programs/cmd/cmd.rc:142 -#, fuzzy -#| msgid "" -#| "PATH displays or changes the cmd search path.\n" -#| "\n" -#| "Entering PATH will display the current PATH setting (initially taken\n" -#| "from the registry). To change the setting follow the\n" -#| "PATH command with the new value.\n" -#| "\n" -#| "It is also possible to modify the PATH by using the PATH environment\n" -#| "variable, for example:\n" -#| "PATH %PATH%;c:\\temp\n" msgid "" "PATH displays or changes the cmd search path.\n" "\n" @@ -13376,16 +13314,10 @@ msgstr "" "PATH 命令之後緊接新的值。\n" "\n" "也可以藉由 PATH 環境變數來修改 PATH，\n" -"舉例來說：\n" +"舉例來說:\n" "PATH %PATH%;c:\\temp\n" #: programs/cmd/cmd.rc:148 -#, fuzzy -#| msgid "" -#| "PAUSE displays a message on the screen asking the user to press a key.\n" -#| "\n" -#| "It is mainly useful in batch files to allow the user to read the output\n" -#| "of a previous command before it scrolls off the screen.\n" msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" @@ -13398,30 +13330,6 @@ msgstr "" "輸出捲動離開螢幕之前能夠去讀取它。\n" #: programs/cmd/cmd.rc:169 -#, fuzzy -#| msgid "" -#| "PROMPT sets the command-line prompt.\n" -#| "\n" -#| "The string following the PROMPT command (and the space immediately " -#| "after)\n" -#| "appears at the beginning of the line when cmd is waiting for input.\n" -#| "\n" -#| "The following character strings have the special meaning shown:\n" -#| "\n" -#| "$$ Dollar sign $_ Linefeed $b Pipe sign (|)\n" -#| "$d Current date $e Escape $g > sign\n" -#| "$l < sign $n Current drive $p Current path\n" -#| "$q Equal sign $t Current time $v cmd version\n" -#| "\n" -#| "Note that entering the PROMPT command without a prompt-string resets the\n" -#| "prompt to the default, which is the current directory (which includes " -#| "the\n" -#| "current drive letter) followed by a greater-than (>) sign.\n" -#| "(like a command PROMPT $p$g).\n" -#| "\n" -#| "The prompt can also be changed by altering the PROMPT environment " -#| "variable,\n" -#| "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgid "" "PROMPT sets the command-line prompt.\n" "\n" @@ -13448,7 +13356,7 @@ msgstr "" "跟隨著 PROMPT 命令的字串 (以及緊接於後的空格)\n" "將會在 cmd 等待輸入時出現於一列的起始部分。\n" "\n" -"下列字元串有特殊平均顯示：\n" +"下列字元串有特殊平均顯示:\n" "\n" "$$ 錢幣符號 $_ 送列鍵 $b 管線符號 (|)\n" "$d 目前日期 $e 退出 $g > 符號\n" @@ -13463,56 +13371,30 @@ msgstr "" "因此命令 SET PROMPT=text 與 PROMPT text 具有相同的效果。\n" #: programs/cmd/cmd.rc:173 -#, fuzzy -#| msgid "" -#| "A command line beginning with REM (followed by a space) performs no\n" -#| "action, and can therefore be used as a comment in a batch file.\n" msgid "" "A command line beginning with REM (followed by a space) performs no action,\n" "and can therefore be used as a comment in a batch file.\n" msgstr "" -"以 REM 起始的命令列 (之後緊接空格) 不會進行任何\n" -"動作，因而可以做為批次檔中的註釋。\n" +"以 REM 起始的命令列 (之後緊接空格) 不會進行任何動作，\n" +"因而可以做為批次檔中的註釋。\n" #: programs/cmd/cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" -msgstr "REN <檔名> 是 RENAME 的簡短版本。它會重新命名檔案。\n" +msgstr "REN <檔案名稱> 是 RENAME 的簡短版本。它會重新命名檔案。\n" #: programs/cmd/cmd.rc:178 msgid "RENAME <filename> renames a file.\n" -msgstr "RENAME <檔名> 重新命名檔案。\n" +msgstr "RENAME <檔案名稱> 重新命名檔案。\n" #: programs/cmd/cmd.rc:181 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "RD <目錄> 是 RMDIR 的簡短版本。它會刪除子目錄。\n" +msgstr "RD <目錄> 是 RMDIR 的簡短版本。它會刪除目錄。\n" #: programs/cmd/cmd.rc:183 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <目錄> 刪除子目錄。\n" +msgstr "RMDIR <目錄> 刪除目錄。\n" #: programs/cmd/cmd.rc:229 -#, fuzzy -#| msgid "" -#| "SET displays or changes the cmd environment variables.\n" -#| "\n" -#| "SET without parameters shows all of the current environment.\n" -#| "\n" -#| "To create or modify an environment variable the syntax is:\n" -#| "\n" -#| "SET <variable>=<value>\n" -#| "\n" -#| "where <variable> and <value> are character strings. There must be no\n" -#| "space before the equals sign, nor can the variable name\n" -#| "have embedded spaces.\n" -#| "\n" -#| "Under Wine, the environment of the underlying operating system is\n" -#| "included into the Win32 environment, there will generally therefore be\n" -#| "many more values than in a native Win32 implementation. Note that it is\n" -#| "not possible to affect the operating system environment from within cmd.\n" msgid "" "SET displays or changes the cmd environment variables.\n" "\n" @@ -13534,24 +13416,18 @@ msgstr "" "\n" "不接參數的 SET 將顯示目前的全部環境。\n" "\n" -"要建立或修改環境變數的語法是：\n" +"要建立或修改環境變數的語法是:\n" "\n" "SET <變數名稱>=<變數值>\n" "\n" -"其中 <變數名稱> 和 <變數值> 都是字串。在等號之前必須沒有\n" -"空格，而變數名稱也不可以嵌入空格。\n" +"其中 <變數名稱> 和 <變數值> 都是字串。在等號之前必須沒有空格，\n" +"而變數名稱也不可以嵌入空格。\n" "\n" -"在 Wine 之下，下層的作業系統環境也被\n" -"包含於 Win32 環境之中，因此通常會比在原生的 Win32 實作中\n" -"還要多出更多變數值。要注意的是，從 cmd 之中是不可能\n" -"去影響作業系統的環境。\n" +"在 Wine 之下，下層的作業系統環境也被包含於 Win32 環境之中，\n" +"因此通常會比在原生的 Win32 實作中還要多出更多變數值。\n" +"要注意的是，從 cmd 之中是不可能去影響作業系統的環境。\n" #: programs/cmd/cmd.rc:234 -#, fuzzy -#| msgid "" -#| "SHIFT is used in a batch file to remove one parameter from the head of\n" -#| "the list, so parameter 2 becomes parameter 1 and so on. It has no effect\n" -#| "if called from the command line.\n" msgid "" "SHIFT is used in a batch file to remove one parameter from the head of the\n" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" @@ -13562,35 +13438,6 @@ msgstr "" "將不會有任何效果。\n" #: programs/cmd/cmd.rc:212 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with its " -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows " -#| "explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -13620,30 +13467,30 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"啟始一個程式，或是利用關聯該檔案字尾的程式來開啟文件。\n" -"用法：\n" +"啟動程式，或根據檔案的後綴，使用一般用於開啟該後綴的程式來開啟文件。\n" +"用法:\n" "start [選項] 程式檔案名稱 [...]\n" "start [選項] 文件檔案名稱\n" "\n" -"選項：\n" -"「標題」指定子視窗的標題。\n" -"/d 目錄在指定的目錄中啟始程式。\n" -"/b 無法為程式建立新的主控臺。\n" -"/i 以新的環境變數啟始程式。\n" -"/min 啟始程式時縮到最小。\n" -"/max 啟始程式時放到最大。\n" -"/low 在閒置優先權類別中啟始程式。\n" -"/normal 在一般優先權類別中啟始程式。\n" -"/high 在高優先權類別中啟始程式。\n" -"/realtime 在即時優先權類別中啟始程式。\n" -"/abovenormal 在正常之上優先權類別中啟始程式。\n" -"/belownormal 在正常之下優先權類別中啟始程式。\n" -"/node n 在指定的 NUMA 節點之上啟始程式。\n" -"/affinity 遮罩以指定的近似遮罩啟始程式。\n" -"/wait 等待啟始的程式直到完成，然後以它的離開代碼離開。\n" -"/unix 使用 Unix 檔名並如同 Windows 檔案總管來啟始檔案。\n" -"/ProgIDOpen 使用指定的 progID 開啟文件。\n" -"/? 顯示這份說明然後離開。\n" +"選項:\n" +"\"標題\" 指定子視窗的標題。\n" +"/d 目錄於指定的目錄開啟程式。\n" +"/b 不要為程式建立新的主控臺。\n" +"/i 使用新的環境變數來啟動程式。\n" +"/min 啟動程式時將視窗最小化。\n" +"/max 啟動程式時將視窗最大化。\n" +"/low 在 Idle 優先類別中啟動程式。\n" +"/normal 在 Normal 優先類別中啟動程式。\n" +"/high 在 High 優先類別中啟動程式。\n" +"/realtime 在 Realtime 優先類別中啟動程式。\n" +"/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" +"/belownormal 在 Belownormal 優先類別中啟動程式。\n" +"/node n 以指定的 NUMA 節點啟動程式。\n" +"/affinity 遮罩以指定的親和性遮罩啟動程式。\n" +"/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" +"/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" +"/ProgIDOpen 使用指定的 progID 開啟檔案。\n" +"/? 顯示這個說明並結束。\n" #: programs/cmd/cmd.rc:237 msgid "TIME sets or shows the current system time.\n" @@ -13654,15 +13501,11 @@ msgid "TITLE <string> sets the window title for the cmd window.\n" msgstr "TITLE <字串> 設定 cmd 視窗的視窗標題。\n" #: programs/cmd/cmd.rc:244 -#, fuzzy -#| msgid "" -#| "TYPE <filename> copies <filename> to the console device (or elsewhere\n" -#| "if redirected). No check is made that the file is readable text.\n" msgid "" "TYPE <filename> copies <filename> to the console device (or elsewhere if\n" "redirected). No check is made that the file is readable text.\n" msgstr "" -"TYPE <檔名> 將 <檔名> 的內容複製到主控臺裝置 (或是其他被\n" +"TYPE <檔案名稱> 將 <檔案名稱> 的內容複製到主控臺裝置 (或是其他被\n" "重新導向的地方)。不會檢查該檔案是否為可讀的文字。\n" #: programs/cmd/cmd.rc:253 @@ -13675,7 +13518,7 @@ msgid "" "\n" "The verify flag has no function in Wine.\n" msgstr "" -"VERIFY 用來設定、清空或測試驗證旗標。有效的形式包括：\n" +"VERIFY 用來設定、清空或測試驗證旗標。有效的形式包括:\n" "\n" "VERIFY ON\t設定旗標。\n" "VERIFY OFF\t清空旗標。\n" @@ -13689,13 +13532,9 @@ 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 -#, fuzzy -#| msgid "" -#| "ENDLOCAL ends localization of environment changes in a batch file\n" -#| "which were introduced by a preceding SETLOCAL.\n" msgid "" "ENDLOCAL ends localization of environment changes in a batch file which\n" "were introduced by a preceding SETLOCAL.\n" @@ -13716,36 +13555,22 @@ msgstr "" "\n" "SETLOCAL 之後完成的環境變更對於批次檔而言為本地，\n" "並被保留直到遇到下一個 ENDLOCAL (或是檔案\n" -"的結束，取決於誰先出現)，前一個環境的設定值\n" +"的結尾，取決於誰先出現)，前一個環境的設定值\n" "則於該點被儲存。\n" #: programs/cmd/cmd.rc:275 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a stack, and then\n" "changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <目錄名> 儲存目前的目錄到\n" -"堆疊中，然後變更現行目錄到所給定的目錄。\n" +"PUSHD <目錄> 儲存目前的目錄到堆疊中，\n" +"然後變更現行目錄到所給定的目錄。\n" #: programs/cmd/cmd.rc:278 msgid "POPD changes current directory to the last one saved with PUSHD.\n" msgstr "POPD 變更現行目錄到上一個利用 PUSHD 儲存的目錄。\n" #: programs/cmd/cmd.rc:288 -#, fuzzy -#| msgid "" -#| "ASSOC shows or modifies file extension associations.\n" -#| "\n" -#| "Syntax: ASSOC [.ext[=[fileType]]]\n" -#| "\n" -#| "ASSOC without parameters displays current file associations.\n" -#| "If used with only a file extension, displays the current association.\n" -#| "Specifying no file type after the equal sign removes the current " -#| "association, if any.\n" msgid "" "ASSOC shows or modifies file extension associations.\n" "\n" @@ -13758,25 +13583,13 @@ msgid "" msgstr "" "ASSOC 顯示或修改副檔名的關聯。\n" "\n" -"語法：ASSOC [.ext[=[檔案型態]]]\n" +"語法: ASSOC [.ext[=[檔案型態]]]\n" "\n" "ASSOC 不加參數將顯示目前的檔案關聯。\n" "如果只使用副檔名，則顯示它目前的關聯。\n" "在等號之號如果沒有指定檔案類型就移除目前的任何關聯。\n" #: programs/cmd/cmd.rc:300 -#, fuzzy -#| msgid "" -#| "FTYPE shows or modifies open commands associated with file types.\n" -#| "\n" -#| "Syntax: FTYPE [fileType[=[openCommand]]]\n" -#| "\n" -#| "Without parameters, shows the file types for which open command strings " -#| "are currently defined.\n" -#| "If used with only a file type, displays the associated open command " -#| "string, if any.\n" -#| "Specifying no open command after the equal sign removes the command " -#| "string associated to the specified file type.\n" msgid "" "FTYPE shows or modifies open commands associated with file types.\n" "\n" @@ -13791,22 +13604,18 @@ msgid "" msgstr "" "FTYPE 顯示或修改開啟命令所關聯的檔案類型。\n" "\n" -"語法：FTYPE [檔案型態[=[開啟命令]]]\n" +"語法: FTYPE [檔案型態[=[開啟命令]]]\n" "\n" "如果不加參數，則顯示開啟命令目前所定義的檔案型態。\n" "如果只使用檔案類型，則顯示關聯的任何開啟命令字串。\n" -"在等號之號如果沒有指定檔案類型就移除對於給定檔案型態的任何關聯命令字串。\n" +"在等號之號如果沒有指定檔案類型就移除對於給定檔案型態的\n" +"任何關聯命令字串。\n" #: programs/cmd/cmd.rc:303 msgid "MORE displays output of files or piped input in pages.\n" msgstr "MORE 以分頁的方式顯示檔案的輸出或管線的輸入。\n" #: programs/cmd/cmd.rc:308 -#, fuzzy -#| msgid "" -#| "CHOICE displays a text and waits, until the User\n" -#| "presses an allowed Key from a selectable list.\n" -#| "CHOICE is mainly used to build a menu selection in a batch file.\n" msgid "" "CHOICE displays a text and waits, until the User presses an allowed Key\n" "from a selectable list.\n" @@ -13829,61 +13638,26 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"建立符號連結。\n" +"\n" +"語法: MKLINK [選項] 連結名稱目標\n" +"\n" +"選項:\n" +"/d 建立目錄符號連結。\n" +"/h 建立永久連結。\n" +"/j 建立目錄連接。\n" +"連結名稱為新的符號連結的名稱。\n" +"目標為連結名稱指向的路徑。\n" #: programs/cmd/cmd.rc:312 -#, fuzzy -#| msgid "" -#| "EXIT terminates the current command session and returns\n" -#| "to the operating system or shell from which you invoked cmd.\n" msgid "" "EXIT terminates the current command session and returns to the operating\n" "system or shell from which you invoked cmd.\n" msgstr "" -"EXIT 終止目前的命令作業階段並回到\n" -"您從其調用 cmd 的作業系統或命令殼。\n" +"EXIT 終止目前的命令作業階段並回到您從其調用 cmd 的\n" +"作業系統或命令殼。\n" #: programs/cmd/cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -13925,10 +13699,10 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"CMD 內建命令包括：\n" +"CMD 內建命令包括:\n" "ASSOC\t\t顯示或修改副檔名關聯\n" "ATTRIB\t\t顯示或變更 DOS 檔案屬性\n" -"CALL\t\t從另一個批次檔內部調用\n" +"CALL\t\t在批次檔中呼叫另一個批次檔\n" "CD (CHDIR)\t變更目前的預設目錄\n" "CHOICE\t\t從可選清單等待按鍵\n" "CLS\t\t清空主控臺螢幕\n" @@ -13942,13 +13716,14 @@ msgstr "" "FTYPE\t\t顯示或修改與檔案類型關聯的開啟命令\n" "HELP\t\t顯示主題的簡潔說明\n" "MD (MKDIR)\t建立子目錄\n" +"MKLINK\t建立符號連結\n" "MORE\t\t分頁顯示輸出\n" "MOVE\t\t移動一個檔案、一組檔案或樹狀目錄\n" "PATH\t\t設定或顯示搜尋路徑\n" "PAUSE\t\t懸置執行中的批次檔\n" "POPD\t\t還原到上一次以 PUSHD 儲存的目錄\n" "PROMPT\t\t變更指令提示符號\n" -"PUSHD\t\t變更為新的目錄並儲存目前的\n" +"PUSHD\t\t變更為新的目錄並儲存目前的目錄\n" "REN (RENAME)\t重新命名檔案\n" "RD (RMDIR)\t刪除子目錄\n" "SET\t\t設定或顯示環境變數\n" @@ -13958,15 +13733,15 @@ 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" -"輸入 HELP <命令> 以獲得關於以上任何命令的進一步資訊。\n" +"輸入 HELP <命令> 以取得關於以上任何命令的進一步資訊。\n" #: programs/cmd/cmd.rc:365 msgid "Are you sure?" -msgstr "您確定嗎？" +msgstr "您確定嗎?" #: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" @@ -13980,15 +13755,15 @@ msgstr "N" #: programs/cmd/cmd.rc:368 msgid "File association missing for extension %1\n" -msgstr "缺少用於延伸檔名 %1 的檔案關聯\n" +msgstr "找不到副檔名 %1 的檔案關聯\n" #: programs/cmd/cmd.rc:369 msgid "No open command associated with file type '%1'\n" -msgstr "沒有與檔案類型 %1 相關聯的開啟命令\n" +msgstr "沒有與檔案類型 '%1' 相關聯的開啟命令\n" #: programs/cmd/cmd.rc:370 msgid "Overwrite %1?" -msgstr "覆寫 %1？" +msgstr "覆寫 %1?" #: programs/cmd/cmd.rc:371 msgid "More..." @@ -13996,7 +13771,7 @@ msgstr "更多..." #: programs/cmd/cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "命令列於批次處理時可能會被截斷。使用：\n" +msgstr "命令列於批次處理時可能會被截斷。使用:\n" #: programs/cmd/cmd.rc:374 msgid "Argument missing\n" @@ -14024,11 +13799,11 @@ msgstr "現在時間是 %1\n" #: programs/cmd/cmd.rc:381 msgid "Enter new date: " -msgstr "輸入新日期：" +msgstr "輸入新日期: " #: programs/cmd/cmd.rc:382 msgid "Enter new time: " -msgstr "輸入新時間：" +msgstr "輸入新時間: " #: programs/cmd/cmd.rc:383 msgid "Environment variable %1 not defined\n" @@ -14040,7 +13815,7 @@ msgstr "開啟 %1 失敗\n" #: programs/cmd/cmd.rc:385 msgid "Cannot call batch label outside of a batch script\n" -msgstr "無法呼叫批次命令稿外部的批次標貼\n" +msgstr "無法呼叫批次命令指令碼外部的批次標貼\n" #: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" @@ -14049,7 +13824,7 @@ msgstr "A" #: programs/cmd/cmd.rc:387 msgid "Delete %1?" -msgstr "刪除 %1？" +msgstr "刪除 %1?" #: programs/cmd/cmd.rc:388 msgid "Echo is %1\n" @@ -14072,12 +13847,12 @@ msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"卷冊序號是 %1!04x!-%2!04x!\n" +"磁碟區序號是 %1!04x!-%2!04x!\n" "\n" #: programs/cmd/cmd.rc:393 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "卷冊標貼 (11 個字元，<Enter> 表示沒有)？" +msgstr "磁碟區標籤 (11 個字元，<Enter> 表示沒有)?" #: programs/cmd/cmd.rc:394 msgid "PATH not found\n" @@ -14085,19 +13860,19 @@ msgstr "找不到 PATH\n" #: programs/cmd/cmd.rc:395 msgid "Press any key to continue... " -msgstr "按下任何鍵繼續... " +msgstr "按下任意鍵繼續... " #: programs/cmd/cmd.rc:396 msgid "Wine Command Prompt" -msgstr "Wine 命令提示符號" +msgstr "Wine 命令提示字元" #: programs/cmd/cmd.rc:397 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: programs/cmd/cmd.rc:398 msgid "More? " -msgstr "更多？" +msgstr "更多? " #: programs/cmd/cmd.rc:399 msgid "The input line is too long.\n" @@ -14105,26 +13880,24 @@ msgstr "輸入列太長。\n" #: programs/cmd/cmd.rc:400 msgid "Volume in drive %1!c! is %2\n" -msgstr "位於儲存裝置 %1!c! 的卷冊為 %2\n" +msgstr "位於儲存裝置 %1!c! 的磁碟區為 %2\n" #: programs/cmd/cmd.rc:401 msgid "Volume in drive %1!c! has no label.\n" -msgstr "位於儲存裝置 %1!c! 的卷冊沒有任何標貼。\n" +msgstr "位於儲存裝置 %1!c! 的磁碟區沒有任何標籤。\n" #: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 -#, fuzzy msgid " (Yes|No)" -msgstr " (是|否)" +msgstr " (Yes|No)" #: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 -#, fuzzy msgid " (Yes|No|All)" -msgstr " (是|否|全部)" +msgstr " (Yes|No|All)" #: programs/cmd/cmd.rc:404 msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" -msgstr "無法識別 %1 為內部、外部命令或是批次命令稿。\n" +msgstr "無法識別 %1 為內部、外部命令或是批次命令指令碼。\n" #: programs/cmd/cmd.rc:405 msgid "Division by zero error.\n" @@ -14140,14 +13913,14 @@ msgstr "預期為一個運算子。\n" #: programs/cmd/cmd.rc:408 msgid "Mismatch in parentheses.\n" -msgstr "小括號不匹配。\n" +msgstr "小括號不相符。\n" #: programs/cmd/cmd.rc:409 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" -"不當的數字形式 - 必須是十進位 (12)、\n" +"錯誤的數字形式 - 必須是十進位 (12)、\n" " 十六進位 (0x34) 或八進位 (056) 之一。\n" #: programs/conhost/conhost.rc:54 @@ -14168,23 +13941,19 @@ msgstr "大(&L)" #: programs/conhost/conhost.rc:59 msgid "Command history" -msgstr "指令歷程" +msgstr "命令歷程記錄" #: programs/conhost/conhost.rc:60 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "緩衝區域" +msgstr "緩衝大小(&B):" #: programs/conhost/conhost.rc:63 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "刪除連續相同的指令(&R)" +msgstr "移除重複(&R)" #: programs/conhost/conhost.rc:65 msgid "Popup menu" -msgstr "彈出功能表" +msgstr "快顯功能表" #: programs/conhost/conhost.rc:66 msgid "&Control" @@ -14195,22 +13964,16 @@ msgid "S&hift" msgstr "S&hift" #: programs/conhost/conhost.rc:69 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "關閉虛擬終端(&C)" +msgstr "主控臺" #: programs/conhost/conhost.rc:70 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "快速編輯" +msgstr "快速編輯模式(&Q)" #: programs/conhost/conhost.rc:71 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "專家模式(&E)" +msgstr "插入模式(&I)" #: programs/conhost/conhost.rc:79 msgid "&Font" @@ -14222,7 +13985,7 @@ msgstr "顏色(&C)" #: programs/conhost/conhost.rc:92 msgid "Configuration" -msgstr "組態" +msgstr "設定" #: programs/conhost/conhost.rc:95 msgid "Buffer zone" @@ -14230,11 +13993,11 @@ msgstr "緩衝區域" #: programs/conhost/conhost.rc:96 msgid "&Width:" -msgstr "寬度(&W)：" +msgstr "寬度(&W):" #: programs/conhost/conhost.rc:99 msgid "&Height:" -msgstr "高度(&H)：" +msgstr "高度(&H):" #: programs/conhost/conhost.rc:103 msgid "Window size" @@ -14242,11 +14005,11 @@ msgstr "視窗大小" #: programs/conhost/conhost.rc:104 msgid "W&idth:" -msgstr "寬度(&I)：" +msgstr "寬度(&I):" #: programs/conhost/conhost.rc:107 msgid "H&eight:" -msgstr "高度(&E)：" +msgstr "高度(&E):" #: programs/conhost/conhost.rc:111 msgid "End of program" @@ -14254,19 +14017,19 @@ msgstr "當程式結束後" #: programs/conhost/conhost.rc:112 msgid "&Close console" -msgstr "關閉虛擬終端(&C)" +msgstr "關閉主控臺(&C)" #: programs/conhost/conhost.rc:114 msgid "Edition" -msgstr "Edition" +msgstr "版本" #: programs/conhost/conhost.rc:120 msgid "Console parameters" -msgstr "虛擬終端執行參數" +msgstr "主控臺執行參數" #: programs/conhost/conhost.rc:123 msgid "Retain these settings for later sessions" -msgstr "保留當前配置以便下次使用" +msgstr "保留目前設定以便下次使用" #: programs/conhost/conhost.rc:124 msgid "Modify only current session" @@ -14311,8 +14074,6 @@ msgid "Configuration error" msgstr "組態錯誤" #: programs/conhost/conhost.rc:46 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." @@ -14332,17 +14093,15 @@ msgstr "DirectX 診斷工具" #: programs/dxdiag/dxdiag.rc:31 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "用法：dxdiag [/whql:off | /whql:on] [/t 檔名 | /x 檔名]" +msgstr "用法: dxdiag [/whql:off | /whql:on] [/t 檔案名稱 | /x 檔案名稱]" #: programs/explorer/explorer.rc:32 msgid "Wine Explorer" msgstr "Wine 檔案總管" #: programs/explorer/explorer.rc:34 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "啟動" +msgstr "開始" #: programs/explorer/explorer.rc:35 programs/winefile/winefile.rc:36 msgid "&Run..." @@ -14354,6 +14113,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- 支援的命令 -\n" +"\n" +"hardlink 永久連結管理\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -14361,38 +14123,39 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - 支援的命令 -\n" +"\n" +"create 建立永久連結\n" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "語法: fsutil hardlink create <new> <existing>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" -msgstr "用法：主機名稱\n" +msgstr "用法: 主機名稱\n" #: programs/hostname/hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "錯誤：無效的選項 %c。\n" +msgstr "錯誤: 無效的選項 '%c'。\n" #: programs/hostname/hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "錯誤：找不到行程 %1。\n" +msgstr "錯誤: 無法取得主機名稱: %u。\n" #: programs/hostname/hostname.rc:33 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" -msgstr "錯誤：不能利用主機名稱公用程式來設定系統主機名稱。\n" +msgstr "錯誤: 無法使用 hostname 工具設定系統的主機名稱。\n" #: programs/ipconfig/ipconfig.rc:30 msgid "Usage: ipconfig [ /? | /all ]\n" -msgstr "用法：ipconfig [ /? | /all ]\n" +msgstr "用法: ipconfig [ /? | /all ]\n" #: programs/ipconfig/ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" -msgstr "錯誤：指定了不明或無效的命令列參數\n" +msgstr "錯誤: 指定了不明或無效的命令列參數\n" #: programs/ipconfig/ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -14455,10 +14218,8 @@ msgid "IPv6 address" msgstr "IPv6 位址" #: programs/msinfo32/msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "系統設定" +msgstr "系統資訊" #: programs/net/net.rc:30 msgid "" @@ -14470,7 +14231,7 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET command [引數]\n" " 或\n" @@ -14487,12 +14248,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET START [service]\n" "\n" -"如果 service 被省略，就顯示執行中服務的清單，否則 service 表示要啟動的服務名" -"稱。\n" +"如果 'service' 被省略，就顯示執行中服務的清單，否則 'service' 表示要啟動的" +"服務名稱。\n" #: programs/net/net.rc:32 msgid "" @@ -14502,7 +14263,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET STOP service\n" "\n" @@ -14510,7 +14271,7 @@ msgstr "" #: programs/net/net.rc:33 msgid "Stopping dependent service: %1\n" -msgstr "正在停止附屬服務：%1\n" +msgstr "正在停止附屬服務: %1\n" #: programs/net/net.rc:34 msgid "Could not stop service %1\n" @@ -14518,27 +14279,27 @@ msgstr "無法停止服務 %1。\n" #: programs/net/net.rc:35 msgid "Could not get handle to service control manager.\n" -msgstr "無法獲得服務控制管理員控柄。\n" +msgstr "無法取得服務控制管理員的控制代碼。\n" #: programs/net/net.rc:36 msgid "Could not get handle to service.\n" -msgstr "無法獲得服務控柄。\n" +msgstr "無法取得服務的控制代碼。\n" #: programs/net/net.rc:37 msgid "The %1 service is starting.\n" -msgstr "%1 服務正在開始。\n" +msgstr "正在啟動 %1 服務。\n" #: programs/net/net.rc:38 msgid "The %1 service was started successfully.\n" -msgstr "%1 服務已成功開始。\n" +msgstr "%1 服務已成功啟動。\n" #: programs/net/net.rc:39 msgid "The %1 service failed to start.\n" -msgstr "%1 服務無法開始。\n" +msgstr "無法啟動 %1 服務。\n" #: programs/net/net.rc:40 msgid "The %1 service is stopping.\n" -msgstr "%1 服務正在停止。\n" +msgstr "正在停止 %1 服務。\n" #: programs/net/net.rc:41 msgid "The %1 service was stopped successfully.\n" @@ -14546,11 +14307,11 @@ msgstr "%1 服務已成功停止。\n" #: programs/net/net.rc:42 msgid "The %1 service failed to stop.\n" -msgstr "%1 服務無法停止。\n" +msgstr "無法停止 %1 服務。\n" #: programs/net/net.rc:44 msgid "There are no entries in the list.\n" -msgstr "在清單中沒有條目。\n" +msgstr "在清單中沒有項目。\n" #: programs/net/net.rc:45 msgid "" @@ -14559,12 +14320,12 @@ msgid "" "---------------------------------------------------------------\n" msgstr "" "\n" -"狀態本地遠端\n" +"狀態本機遠端\n" "---------------------------------------------------------------\n" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 開啟資源：%4!u!\n" +msgstr "%1 %2 %3 開啟資源: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -14580,7 +14341,7 @@ msgstr "網路發生了錯誤" #: programs/net/net.rc:51 msgid "Connection is being made" -msgstr "正在進行連接" +msgstr "正在連線" #: programs/net/net.rc:52 msgid "Reconnecting" @@ -14588,7 +14349,7 @@ msgstr "正在重新連線" #: programs/net/net.rc:43 msgid "The following services are running:\n" -msgstr "下列服務正在執行：\n" +msgstr "下列服務正在執行:\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -14725,7 +14486,7 @@ msgstr "版面設定(&T)..." #: programs/notepad/notepad.rc:37 msgid "P&rinter Setup..." -msgstr "列印設定(&R)..." +msgstr "印表機設定(&R)..." #: programs/notepad/notepad.rc:42 programs/wordpad/wordpad.rc:44 msgid "&Undo\tCtrl+Z" @@ -14755,11 +14516,11 @@ msgstr "全選(&A)\tCtrl+A" #: programs/notepad/notepad.rc:50 msgid "&Time/Date\tF5" -msgstr "插入日期時間(&T)\tF5" +msgstr "插入日期/時間(&T)\tF5" #: programs/notepad/notepad.rc:52 msgid "&Wrap long lines" -msgstr "自動換列(&W)" +msgstr "自動換行(&W)" #: programs/notepad/notepad.rc:56 msgid "&Search...\tCtrl+F" @@ -14894,9 +14655,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"檔案 %s 不存在\n" +"檔案 '%s' 不存在。\n" "\n" -"您想新增一個檔案嗎？" +"您要建立一個新檔案嗎?" #: programs/notepad/notepad.rc:82 msgid "" @@ -14904,25 +14665,25 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"檔案 %s 正文已更改\n" +"檔案 '%s' 的內容已更改。\n" "\n" -"是否儲存更改？" +"您要儲存更改嗎?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." -msgstr "找不到 %s。" +msgstr "找不到 '%s'。" #: programs/notepad/notepad.rc:85 msgid "Unicode (UTF-16)" -msgstr "萬國碼 (UTF-16)" +msgstr "Unicode (UTF-16)" #: programs/notepad/notepad.rc:86 msgid "Unicode (UTF-16 big-endian)" -msgstr "萬國碼 (UTF-16 大尾序)" +msgstr "Unicode (UTF-16 big-endian)" #: programs/notepad/notepad.rc:87 msgid "Unicode (UTF-8)" -msgstr "萬國碼 (UTF-8)" +msgstr "Unicode (UTF-8)" #: programs/notepad/notepad.rc:94 msgid "" @@ -14934,11 +14695,11 @@ msgid "" "Continue?" msgstr "" "%1\n" -"這個檔案含有萬國碼字元，如果以 %2 編碼\n" -"儲存這個檔案，您將會失去它們。\n" -"要保留這些字元，請按一下取消，然後在編碼\n" -"的下拉選單中選取一個萬國碼選項。\n" -"要繼續嗎？" +"這個檔案含有 Unicode 字元，如果以 %2 編碼儲存這個檔案，\n" +"這些字符將會丟失。\n" +"要保留這些字元，請按一下 [取消]，\n" +"然後在 [編碼] 下拉選單中選取一個 Unicode 選項。\n" +"您要繼續嗎?" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..." @@ -14946,7 +14707,7 @@ msgstr "檔案綁定(&B)..." #: programs/oleview/oleview.rc:33 msgid "&View TypeLib..." -msgstr "查看 &TypeLib..." +msgstr "查看 TypeLib(&V)..." #: programs/oleview/oleview.rc:35 msgid "&System Configuration" @@ -14958,15 +14719,15 @@ msgstr "執行註冊表編輯器(&R)" #: programs/oleview/oleview.rc:42 msgid "&CoCreateInstance Flag" -msgstr "&CoCreateInstance 參數" +msgstr "CoCreateInstance 旗標(&C)" #: programs/oleview/oleview.rc:44 msgid "&In-process server" -msgstr "同行程伺服器(&I)" +msgstr "同處理序伺服程式(&I)" #: programs/oleview/oleview.rc:45 msgid "In-process &handler" -msgstr "同行程處理常式(&H)" +msgstr "同處理序處理常式(&H)" #: programs/oleview/oleview.rc:46 msgid "&Local server" @@ -15031,7 +14792,7 @@ msgstr "關於 OleView(&A)" #: programs/oleview/oleview.rc:82 msgid "&Save as..." -msgstr "另存為(&S)..." +msgstr "另存新檔(&S)..." #: programs/oleview/oleview.rc:87 msgid "&Group by type kind" @@ -15059,7 +14820,7 @@ msgstr "啟用分散式 COM(&E)" #: programs/oleview/oleview.rc:172 msgid "Enable &Remote Connections (Win95 only)" -msgstr "啟用遠端連線(&R)(限 Win95)" +msgstr "啟用遠端連線 (限 Win95)(&R)" #: programs/oleview/oleview.rc:173 msgid "" @@ -15119,7 +14880,7 @@ msgstr "TypeLib 檔案 (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: programs/oleview/oleview.rc:105 msgid "Bind to file via a File Moniker" -msgstr "通過檔案綽號綁定到檔案" +msgstr "通過 File Moniker 綁定到檔案" #: programs/oleview/oleview.rc:106 msgid "Open a TypeLib file and view the contents" @@ -15127,7 +14888,7 @@ msgstr "開啟 TypeLib 檔案並查看內容" #: programs/oleview/oleview.rc:107 msgid "Change machine wide Distributed COM settings" -msgstr "修改本機分散式 COM 設定" +msgstr "變更本機分散式 COM 設定" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" @@ -15135,7 +14896,7 @@ msgstr "執行 Wine 註冊表編輯器" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" -msgstr "結束程式。提示儲存" +msgstr "結束程式。提示儲存" #: programs/oleview/oleview.rc:110 msgid "Create an instance of the selected object" @@ -15143,19 +14904,19 @@ msgstr "建立目前選擇的物件實例" #: programs/oleview/oleview.rc:111 msgid "Create an instance of the selected object on a specific machine" -msgstr "建立當前選定物件在指定電腦的實例" +msgstr "建立目前選定物件在指定電腦的實例" #: programs/oleview/oleview.rc:112 msgid "Release the currently selected object instance" -msgstr "釋放當前選定物件實例" +msgstr "釋放目前選定物件實例" #: programs/oleview/oleview.rc:113 msgid "Copy the GUID of the currently selected item to the clipboard" -msgstr "將當前選定項目的 GUID 複製到剪貼簿" +msgstr "將目前選定項目的 GUID 複製到剪貼簿" #: programs/oleview/oleview.rc:114 msgid "Display the viewer for the selected item" -msgstr "顯示選定項目的查看器" +msgstr "顯示選定項目的檢視器" #: programs/oleview/oleview.rc:119 msgid "Toggle between expert and novice display mode" @@ -15180,15 +14941,15 @@ msgstr "重新整理所有清單" #: programs/oleview/oleview.rc:124 msgid "Display program information, version number and copyright" -msgstr "顯示程式資訊、版本號及版權" +msgstr "顯示程式資訊、版本號及著作權" #: programs/oleview/oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "呼叫 CoGetClassObject 時要求一個同行程伺服器" +msgstr "呼叫 CoGetClassObject 時要求一個同處理序伺服程式" #: programs/oleview/oleview.rc:116 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "呼叫 CoGetClassObject 時要求一個同行程處理常式" +msgstr "呼叫 CoGetClassObject 時要求一個同處理序處理常式" #: programs/oleview/oleview.rc:117 msgid "Ask for a local server when calling CoGetClassObject" @@ -15220,7 +14981,7 @@ msgstr "所有物件" #: programs/oleview/oleview.rc:135 msgid "Application IDs" -msgstr "應用程式 IDs" +msgstr "應用程式識別碼" #: programs/oleview/oleview.rc:136 msgid "Type Libraries" @@ -15252,7 +15013,7 @@ msgstr "CoGetClassObject 失敗。" #: programs/oleview/oleview.rc:145 msgid "Unknown error" -msgstr "未知錯誤" +msgstr "不明錯誤" #: programs/oleview/oleview.rc:148 msgid "bytes" @@ -15268,7 +15029,7 @@ msgstr "繼承介面" #: programs/oleview/oleview.rc:126 msgid "Save as an .IDL or .H file" -msgstr "存為 .IDL 或 .H 檔案" +msgstr "儲存為 .IDL 或 .H 檔案" #: programs/oleview/oleview.rc:127 msgid "Close window" @@ -15296,7 +15057,7 @@ msgstr "複製(&C)...\tF8" #: programs/progman/progman.rc:38 msgid "&Properties\tAlt+Enter" -msgstr "屬性(&P)\tAlt+Enter" +msgstr "內容(&P)\tAlt+Enter" #: programs/progman/progman.rc:40 msgid "&Execute..." @@ -15414,11 +15175,11 @@ msgstr "變更圖示" #: programs/progman/progman.rc:194 msgid "&Filename:" -msgstr "檔案名(&F):" +msgstr "檔案名稱(&F):" #: programs/progman/progman.rc:196 msgid "Current &icon:" -msgstr "當前圖示(&I):" +msgstr "目前圖示(&I):" #: programs/progman/progman.rc:210 msgid "Execute Program" @@ -15438,11 +15199,11 @@ msgstr "資訊" #: programs/progman/progman.rc:68 msgid "Delete group `%s'?" -msgstr "是否刪除程式群組 %s？" +msgstr "是否刪除程式群組 `%s'?" #: programs/progman/progman.rc:69 msgid "Delete program `%s'?" -msgstr "是否刪除程式 %s？" +msgstr "是否刪除程式 `%s'?" #: programs/progman/progman.rc:70 msgid "Not implemented" @@ -15450,19 +15211,19 @@ msgstr "未實作" #: programs/progman/progman.rc:71 msgid "Error reading `%s'." -msgstr "讀取檔案 %s 時發生錯誤。" +msgstr "讀取檔案 `%s' 時發生錯誤。" #: programs/progman/progman.rc:72 msgid "Error writing `%s'." -msgstr "寫入檔案 %s 時發生錯誤。" +msgstr "寫入檔案 `%s' 時發生錯誤。" #: programs/progman/progman.rc:75 msgid "" "The group file `%s' cannot be opened.\n" "Should it be tried further on?" msgstr "" -"無法開啟群組檔案 %s。\n" -"是否繼續嘗試？" +"無法開啟群組檔案 `%s'。\n" +"是否繼續嘗試開啟?" #: programs/progman/progman.rc:77 msgid "Help not available." @@ -15470,15 +15231,15 @@ msgstr "沒有可用的說明資訊。" #: programs/progman/progman.rc:78 msgid "Unknown feature in %s" -msgstr "在 %s 中發現未知特性" +msgstr "在 %s 中發現不明功能" #: programs/progman/progman.rc:79 msgid "File `%s' exists. Not overwritten." -msgstr "檔案 %s 已經存在。不覆蓋已有檔案。" +msgstr "檔案 `%s' 已經存在。不覆寫已有檔案。" #: programs/progman/progman.rc:80 msgid "Save group as `%s' to prevent overwriting original files." -msgstr "將程式組儲存為 %s 可以避免復蓋已有的檔案。" +msgstr "將程式組儲存為 `%s' 可以避免覆寫已有的檔案。" #: programs/progman/progman.rc:84 msgid "Libraries (*.dll)" @@ -15493,47 +15254,32 @@ msgid "Icons (*.ico)" msgstr "圖示 (*.ico)" #: programs/reg/reg.rc:139 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的語法。 " #: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "輸入 \"REG %1 /?\" 以取得說明。\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 無法存取或建立指定的註冊表鍵\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "作業已成功完成\n" +msgstr "reg: 操作完成\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" -msgstr "作業被使用者取消。\n" +msgstr "reg: 註冊表操作已經取消\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 找不到指定的登錄機碼\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 找不到指定的登錄值\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15541,7 +15287,7 @@ msgstr "(預設)" #: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "輸入 \"REG /?\" 以取得說明。\n" #: programs/reg/reg.rc:35 msgid "" @@ -15555,6 +15301,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"用法:\n" +" REG [操作] [參數]\n" +"\n" +"支援的操作:\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" +"\n" +"要取得指定操作的說明，請輸入:\n" +" REG [操作] /?\n" +"\n" #: programs/reg/reg.rc:67 msgid "" @@ -15605,6 +15360,52 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <機碼> [/v 值名稱 | /ve] [/t 類型] [/s 分隔符號] [/d 資料] [/f]\n" +"\n" +" 新增一個機碼到註冊表，或新增值到給定的登錄機碼。\n" +"\n" +" <機碼>\n" +" 要新增的機碼，如果指定了 [/v] 或 [/ve]，\n" +" 則會在該機碼新增登錄資料。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要新增的登錄值的名稱。\n" +"\n" +" /ve\n" +" 新增未命名的登錄值。這個選項會修改 (預設) 的\n" +" 登錄值。\n" +"\n" +" /t <類型>\n" +" 要新增到註冊表的資料類型。如果指定了 [/t]，\n" +" <類型> 必須是下列的其中一個:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" 如果未指定 [/t]，資料類型將預設為 REG_SZ。\n" +"\n" +" /s <分隔符號>\n" +" 指定一個用於分隔 REG_MULTI_SZ 資料字串的字元。\n" +" 如果未指定 [/s]，分隔符號會預設為 \\0。\n" +"\n" +" /d <資料>\n" +" 要新增給新的登錄值的資料。\n" +"\n" +" /f\n" +" 修改登錄項目而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:202 msgid "" @@ -15640,6 +15441,35 @@ msgid "" "<key2>.\n" "\n" msgstr "" +"REG COPY <機碼1> <機碼2> [/s] [/f]\n" +"\n" +" 複製指定登錄機碼的內容到另一個位置。\n" +" 預設情況下，這個操作只會複製登錄值。\n" +" 使用 [/s] 來遞迴複製所有子機碼和值。\n" +"\n" +" <機碼1>, <機碼2>\n" +" 指定登錄機碼的來源 (<機碼1>) 和目標 (<機碼2>) 資料。\n" +" 如果 <機碼2> 不存在，系統將會建立它。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /s\n" +" 從 <機碼1> 複製所有子機碼和值到 <機碼2>。\n" +"\n" +" /f\n" +" 覆寫 <機碼2> 內所有的登錄資料而不需確認提示。\n" +" 這個選項不會修改只在 <機碼2> 存在的子機碼和值。\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -15679,6 +15509,41 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <機碼> [/v 值名稱 | /ve | /va] [/f]\n" +"\n" +" 刪除一個登錄機碼 (所有子機碼和值)，\n" +" 或從給定的登錄機碼刪除一個或多個值。\n" +"\n" +" <機碼>\n" +" 要刪除的登錄機碼。如果指定了 [/v]、[/ve] 或 [/va]，\n" +" 則可刪除登錄機碼內的一個或多個值。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要刪除的登錄值的名稱。\n" +"\n" +" /ve\n" +" 刪除未命名的登錄值。這個選項會刪除 (預設) 的\n" +" 登錄值。\n" +"\n" +" /va\n" +" 刪除登錄機碼的所有值。\n" +"\n" +" /f\n" +" 刪除一個登錄機碼 (包括所有子機碼和值)\n" +" 而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:170 msgid "" @@ -15710,6 +15575,33 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <機碼> <檔案> [/y]\n" +"\n" +" 將指定的登錄機碼 (包括所有子機碼和值)\n" +" 匯出到一個檔案。\n" +"\n" +" <機碼>\n" +" 要匯出的登錄機碼。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" <檔案>\n" +" 要建立的登錄檔案的名稱和路徑。\n" +" 檔案必須是 .reg 的副檔名。\n" +"\n" +" /y\n" +" 覆寫 <檔案> 而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:148 msgid "" @@ -15721,6 +15613,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <檔案>\n" +"\n" +" 從給定的檔案匯入機碼、值和資料到註冊表。\n" +"\n" +" <檔案>\n" +" 要匯入的登錄檔案的名稱和路徑。\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -15756,6 +15655,37 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <機碼> [/v 值名稱 | /ve] [/s]\n" +"\n" +" 查詢指定的登錄機碼，並列出該機碼中的所有即時子機碼、值和資料。\n" +" 使用 [/s] 來遞迴查詢每個子機碼。\n" +"\n" +" <機碼>\n" +" 要查詢的登錄機碼。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要查詢的登錄值的名稱。如果未指定 [/v] 或 [/ve]，\n" +" 則會列出 <機碼> 下所有的值。\n" +"\n" +" /ve\n" +" 查詢未命名的登錄值。這個選項會查詢 (預設) 的\n" +" 登錄值。\n" +"\n" +" /s\n" +" 列出 <機碼> 及其子機碼的所有登錄項目。\n" +"\n" #: programs/reg/reg.rc:180 msgid "" @@ -15766,122 +15696,98 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" 使用 32 位元登錄檢視來存取機碼。\n" +"\n" +" /reg:64\n" +" 使用 64 位元登錄檢視來存取機碼。\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的登錄機碼\n" #: programs/reg/reg.rc:119 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法存取遠端機器\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的系統金鑰\n" #: programs/reg/reg.rc:140 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " -msgstr "錯誤：無效的選項 %c。\n" +msgstr "reg: 無效的選項 [%1]。 " #: programs/reg/reg.rc:122 msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的數字值\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的十六進制值\n" #: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的字串\n" #: programs/reg/reg.rc:124 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: 未處理的登錄資料類型 [/t 0x%1!x!, /d %2]\n" #: programs/reg/reg.rc:121 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "不受支援的型態。\n" +msgstr "reg: 不支援的登錄資料類型 [%1]\n" #: programs/reg/reg.rc:125 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "登錄值 '%1' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:118 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "錯誤：無效的命令列參數\n" +msgstr "reg: 無效的命令列參數\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: 來源和目標機碼不可以相同\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "目標機碼內的值 '%1\\%2' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:133 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確定要刪除登錄值 '%1' 嗎?" #: programs/reg/reg.rc:134 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "您確認要刪除這個數值 %s 嗎？" +msgstr "您確定要刪除 '%1' 下的所有登錄值嗎?" #: programs/reg/reg.rc:135 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "確定要刪除 %1？" +msgstr "您確定要刪除登錄機碼 '%1' 嗎?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法刪除所有在 '%1' 下的登錄值\n" #: programs/reg/reg.rc:173 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案 '%1' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "reg: 無法辨識的逸出序列 [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法匯入登錄機碼 '%1'\n" #: programs/reg/reg.rc:150 -#, fuzzy -#| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" -msgstr "沒有任何命令被指定。" +msgstr "reg: 無法找到檔案 '%1'。\n" #: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" @@ -15889,7 +15795,7 @@ msgstr "(沒有設值)" #: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "搜尋完成。相符項目的數目: %1!d!\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" @@ -15897,16 +15803,16 @@ msgstr "註冊表(&R)" #: programs/regedit/regedit.rc:36 msgid "&Import Registry File..." -msgstr "匯入註冊表檔案(&I)..." +msgstr "匯入登錄檔案(&I)..." #: programs/regedit/regedit.rc:37 msgid "&Export Registry File..." -msgstr "匯出註冊表檔案(&E)..." +msgstr "匯出登錄檔案(&E)..." #: programs/regedit/regedit.rc:47 programs/regedit/regedit.rc:99 #: programs/regedit/regedit.rc:121 msgid "&Key" -msgstr "索引鍵(&K)" +msgstr "機碼(&K)" #: programs/regedit/regedit.rc:49 programs/regedit/regedit.rc:101 #: programs/regedit/regedit.rc:123 @@ -15916,12 +15822,12 @@ msgstr "字串值(&S)" #: programs/regedit/regedit.rc:50 programs/regedit/regedit.rc:102 #: programs/regedit/regedit.rc:124 msgid "&Binary Value" -msgstr "二進位值(&B)" +msgstr "二進制值(&B)" #: programs/regedit/regedit.rc:51 programs/regedit/regedit.rc:103 #: programs/regedit/regedit.rc:125 msgid "&DWORD Value" -msgstr "雙字組值(&D)" +msgstr "DWORD 值(&D)" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:104 #: programs/regedit/regedit.rc:126 @@ -15940,7 +15846,7 @@ msgstr "重新命名(&R)\tF2" #: programs/regedit/regedit.rc:59 programs/regedit/regedit.rc:114 msgid "&Copy Key Name" -msgstr "複製索引鍵名稱(&C)" +msgstr "複製機碼名稱(&C)" #: programs/regedit/regedit.rc:61 programs/regedit/regedit.rc:107 #: programs/wordpad/wordpad.rc:53 @@ -15970,13 +15876,11 @@ msgstr "關於註冊表編輯器(&A)" #: programs/regedit/regedit.rc:89 programs/regedit/regedit.rc:96 #: programs/regedit/regedit.rc:230 msgid "Expand" -msgstr "" +msgstr "展開" #: programs/regedit/regedit.rc:134 programs/regedit/regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "修改二進位資料..." +msgstr "修改二進位資料(&B)..." #: programs/regedit/regedit.rc:267 msgid "Export registry" @@ -15984,31 +15888,31 @@ msgstr "匯出註冊表" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" -msgstr "指定分支(&E)：" +msgstr "指定分支(&E):" #: programs/regedit/regedit.rc:278 msgid "Find:" -msgstr "搜尋：" +msgstr "尋找:" #: programs/regedit/regedit.rc:280 msgid "Find in:" -msgstr "在這找：" +msgstr "在這找:" #: programs/regedit/regedit.rc:281 msgid "Keys" -msgstr "索引鍵" +msgstr "機碼" #: programs/regedit/regedit.rc:282 msgid "Value names" -msgstr "數值名稱" +msgstr "值名稱" #: programs/regedit/regedit.rc:283 msgid "Value content" -msgstr "數值內容" +msgstr "值內容" #: programs/regedit/regedit.rc:284 msgid "Whole string only" -msgstr "整詞匹配" +msgstr "字串須完全相符" #: programs/regedit/regedit.rc:291 msgid "Add Favorite" @@ -16029,20 +15933,20 @@ msgstr "編輯字串" #: programs/regedit/regedit.rc:316 programs/regedit/regedit.rc:329 #: programs/regedit/regedit.rc:345 programs/regedit/regedit.rc:358 msgid "Value name:" -msgstr "數值名稱:" +msgstr "值名稱:" #: programs/regedit/regedit.rc:318 programs/regedit/regedit.rc:331 #: programs/regedit/regedit.rc:347 programs/regedit/regedit.rc:360 msgid "Value data:" -msgstr "數值資料:" +msgstr "值資料:" #: programs/regedit/regedit.rc:326 msgid "Edit DWORD" -msgstr "編輯雙字組" +msgstr "編輯 DWORD" #: programs/regedit/regedit.rc:333 msgid "Base" -msgstr "進位制" +msgstr "Base" #: programs/regedit/regedit.rc:334 msgid "Hexadecimal" @@ -16054,7 +15958,7 @@ msgstr "十進位" #: programs/regedit/regedit.rc:342 msgid "Edit Binary" -msgstr "編輯二進位資料" +msgstr "編輯二進位" #: programs/regedit/regedit.rc:355 msgid "Edit Multi-String" @@ -16077,13 +15981,9 @@ msgid "Contains commands for accessing frequently used keys" msgstr "含有與使用常用索引鍵有關的全部指令" #: programs/regedit/regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "含有與說明資訊有關的全部指令" +msgstr "含有顯示登錄編輯程式說明及資訊的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -16099,87 +15999,76 @@ msgstr "註冊表編輯器" #: programs/regedit/regedit.rc:221 msgid "Import Registry File" -msgstr "匯入註冊表檔案" +msgstr "匯入登錄檔案" #: programs/regedit/regedit.rc:222 msgid "Export Registry File" -msgstr "匯出註冊表檔案" +msgstr "匯出登錄檔案" #: programs/regedit/regedit.rc:223 msgid "Registry files (*.reg)" -msgstr "註冊表檔案 (*.reg)" +msgstr "登錄檔案 (*.reg)" #: programs/regedit/regedit.rc:224 msgid "Win9x/NT4 Registry files (REGEDIT4)" -msgstr "Win9x/NT4 註冊表檔案 (REGEDIT4)" +msgstr "Win9x/NT4 登錄檔案 (REGEDIT4)" #: programs/regedit/regedit.rc:241 msgid "(cannot display value)" -msgstr "(不能顯示值)" +msgstr "(無法顯示值)" #: programs/regedit/regedit.rc:242 msgid "(unknown %d)" -msgstr "(未知 %d)" +msgstr "(不明 %d)" #: programs/regedit/regedit.rc:247 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to modify the selected registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法編輯選定的登錄值。" #: programs/regedit/regedit.rc:248 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法建立新的登錄機碼。" #: programs/regedit/regedit.rc:249 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法建立新的登錄值。" #: programs/regedit/regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"無法重新命名機碼 '%1'。\n" +"指定的機碼名稱已經存在。" #: programs/regedit/regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"無法重新命名值 '%1'。\n" +"指定的值名稱已經存在。" #: programs/regedit/regedit.rc:252 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to delete the selected registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法刪除選定的登錄機碼。" #: programs/regedit/regedit.rc:253 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法重新命名選定的登錄機碼。" #: programs/regedit/regedit.rc:254 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法重新命名選定的登錄值" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "%1 所包含的機碼和值已成功新增至註冊表。" #: programs/regedit/regedit.rc:256 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "無法匯入 %1。指定的檔案不是有效的登錄檔案。" #: programs/regedit/regedit.rc:408 msgid "" @@ -16211,151 +16100,144 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" msgstr "" +"用法:\n" +" regedit [選項] [檔案名稱] [登錄機碼]\n" +"\n" +"選項:\n" +" [no option] 啟動本程式的圖形介面。\n" +" /L:system.dat 要修改的 system.dat 檔案位置。\n" +" 與任何其他切換參數相容。已略過。\n" +" /R:user.dat 要修改的 user.dat 檔案位置。\n" +" 與任何其他切換參數相容。已略過。\n" +" /C 匯入登錄檔案的內容。\n" +" /D 刪除指定的登錄機碼。\n" +" /E 匯出指定的登錄機碼內容到檔案。\n" +" 如果沒有指定機碼，則會匯出整個註冊表。\n" +" /S 靜音模式。不會顯示訊息。\n" +" /V 以進階模式啟動圖形介面。已略過。\n" +" /? 顯示這個資訊並結束。\n" +" [檔案名稱] 要匯入的註冊表資訊檔案的位置。\n" +" 當與 [/E] 一起使用時，這個選項會指定\n" +" 註冊表資訊檔案的匯出位置。\n" +" [登錄機碼] 要修改的登錄機碼。\n" +"\n" +"使用範例:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" +msgstr "regedit: 無效或無法辨識的切換參數 [%1]\n" #: programs/regedit/regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" -msgstr "" +msgstr "輸入 \"regedit /?\" 以取得說明。\n" #: programs/regedit/regedit.rc:411 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 未指定檔案名稱。\n" #: programs/regedit/regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: 未指定要移除的登錄機碼。\n" #: programs/regedit/regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" -msgstr "" +msgstr "regedit: 找不到檔案 '%1'。\n" #: programs/regedit/regedit.rc:414 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法開啟檔案 '%1'。\n" #: programs/regedit/regedit.rc:415 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "無效的控柄作業。\n" +msgstr "regedit: 未處理的操作。\n" #: programs/regedit/regedit.rc:416 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: 記憶體不足! (%1!S!, line %2!u!)\n" #: programs/regedit/regedit.rc:417 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "regedit: 錯誤的十六進位值。\n" #: programs/regedit/regedit.rc:418 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: 無法轉換十六進位資料。在 '%1' 遇到錯誤的值。\n" #: programs/regedit/regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "regedit: 無法辨識的逸出序列 [\\%1!c!]\n" #: programs/regedit/regedit.rc:420 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "不受支援的型態。\n" +msgstr "regedit: 不支援的登錄資料類型 [0x%1!x!]\n" #: programs/regedit/regedit.rc:421 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 在 '%1' 發現意外的結尾。\n" #: programs/regedit/regedit.rc:422 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line '%1' was not recognized.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 無法辨識列 '%1'。\n" #: programs/regedit/regedit.rc:423 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法從 '%1' 新增登錄值到 '%2'。\n" #: programs/regedit/regedit.rc:424 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法開啟登錄機碼 '%1'。\n" #: programs/regedit/regedit.rc:425 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "不受支援的型態。\n" +msgstr "regedit: 在 '%2' 遇到不支援的登錄資料類型 [0x%1!x!]。\n" #: programs/regedit/regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "" +msgstr "regedit: 登錄值 '%1' 將以二進位資料匯出。\n" #: programs/regedit/regedit.rc:427 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "regedit: 錯誤的系統金鑰 [%1]\n" #: programs/regedit/regedit.rc:428 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "regedit: 無法匯出 '%1'。找不到指定的登錄機碼。\n" #: programs/regedit/regedit.rc:429 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法刪除登錄機碼 '%1'。\n" #: programs/regedit/regedit.rc:431 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line contains invalid syntax.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 該列有錯誤的語法。\n" #: programs/regedit/regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "結束註冊表編輯器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" -msgstr "將索引鍵新增到我的最愛" +msgstr "將機碼新增到我的最愛" #: programs/regedit/regedit.rc:189 msgid "Removes keys from the favorites list" -msgstr "從我的最愛中刪除索引鍵" +msgstr "從我的最愛中刪除機碼" #: programs/regedit/regedit.rc:190 msgid "Shows or hides the status bar" msgstr "顯示或隱藏狀態列" #: programs/regedit/regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "改變兩個窗格之間的分隔線位置" +msgstr "變更兩個窗格之間的分隔線位置" #: programs/regedit/regedit.rc:192 msgid "Refreshes the window" @@ -16363,19 +16245,19 @@ msgstr "重新整理視窗" #: programs/regedit/regedit.rc:193 msgid "Deletes the selection" -msgstr "刪除選擇項目" +msgstr "刪除已選項目" #: programs/regedit/regedit.rc:194 msgid "Renames the selection" -msgstr "重新命名選擇項目" +msgstr "重新命名已選項目" #: programs/regedit/regedit.rc:195 msgid "Copies the name of the selected key to the clipboard" -msgstr "將索引鍵的名稱複製到剪貼簿" +msgstr "將機碼的名稱複製到剪貼簿" #: programs/regedit/regedit.rc:196 msgid "Finds a text string in a key, value or data" -msgstr "在索引鍵、值或資料中找字串" +msgstr "在機碼、值或資料中尋找字串" #: programs/regedit/regedit.rc:197 msgid "Finds next occurrence of text specified in previous search" @@ -16387,7 +16269,7 @@ msgstr "修改值的資料" #: programs/regedit/regedit.rc:171 msgid "Adds a new key" -msgstr "新增一個新的索引鍵" +msgstr "新增一個新的機碼" #: programs/regedit/regedit.rc:172 msgid "Adds a new string value" @@ -16398,10 +16280,8 @@ msgid "Adds a new binary value" msgstr "新增一個新的二進制值" #: programs/regedit/regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "新增一個新的二進制值" +msgstr "新增一個新的 32 位元值" #: programs/regedit/regedit.rc:177 msgid "Imports a text file into the registry" @@ -16409,118 +16289,92 @@ msgstr "將純文字檔案匯入註冊表" #: programs/regedit/regedit.rc:179 msgid "Exports all or part of the registry to a text file" -msgstr "將註冊表導出到純文字檔案" +msgstr "將註冊表匯出到純文字檔案" #: programs/regedit/regedit.rc:180 msgid "Prints all or part of the registry" msgstr "列印註冊表的全部或部分" #: programs/regedit/regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "註冊表編輯器" +msgstr "開啟註冊表編輯器的說明" #: programs/regedit/regedit.rc:182 msgid "Displays program information, version number and copyright" -msgstr "顯示程式資訊、版本號及版權" +msgstr "顯示程式資訊、版本號及著作權" #: programs/regedit/regedit.rc:206 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry value '%1'." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法查詢登錄值 '%1'。" #: programs/regedit/regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "無法編輯這類型的索引鍵 (%u)" +msgstr "無法編輯這種類型的登錄機碼 (%1!u!)。" #: programs/regedit/regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "數值太大 (%u)" +msgstr "登錄值太大 (%1!u!)。" #: programs/regedit/regedit.rc:209 msgid "Confirm Value Delete" -msgstr "確認刪除數值" +msgstr "確認刪除登錄值" #: programs/regedit/regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確認要刪除已選取的登錄值嗎?" #: programs/regedit/regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "找不到搜尋的字串 %s" +msgstr "搜尋完成。找不到字串 '%1'。" #: programs/regedit/regedit.rc:211 msgid "Are you sure you want to delete these values?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確認要刪除這些登錄值嗎?" #: programs/regedit/regedit.rc:214 msgid "New Key #%d" -msgstr "索引鍵 #%d" +msgstr "新機碼 #%d" #: programs/regedit/regedit.rc:215 msgid "New Value #%d" -msgstr "新索引鍵 #%d" +msgstr "新登錄值 #%d" #: programs/regedit/regedit.rc:205 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry key '%1'." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法查詢登錄機碼 '%1'。" #: programs/regedit/regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "修改值的資料" +msgstr "以二進位修改登錄值的資料" #: programs/regedit/regedit.rc:175 msgid "Adds a new multi-string value" -msgstr "新增一個多字串值" +msgstr "新增一個新的多字串值" #: programs/regedit/regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" -msgstr "匯出註冊表的所選分支到文字檔" +msgstr "匯出註冊表中已選取的分支到文字檔案" #: programs/regedit/regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "新增一個新的字串值" +msgstr "新增一個新的可擴充字串值" #: programs/regedit/regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "確認刪除數值" +msgstr "確認刪除機碼" #: programs/regedit/regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "確定要刪除 %1？" +msgstr "您確認要刪除這個登錄機碼及其所有的子機碼嗎?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "展開或摺疊已選取的節點" #: programs/regedit/regedit.rc:231 -#, fuzzy -#| msgid "C&ollate" msgid "Collapse" -msgstr "自動分頁(&O)" +msgstr "摺疊" #: programs/regsvr32/regsvr32.rc:33 msgid "" @@ -16529,6 +16383,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Wine DLL 註冊工具\n" +"\n" +"提供 DLL 註冊服務。\n" +"\n" #: programs/regsvr32/regsvr32.rc:41 msgid "" @@ -16543,85 +16401,66 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"用法:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] Dll名稱\n" +"\n" +"選項:\n" +" [/u] 取消註冊伺服器。\n" +" [/s] 靜音模式 (不會顯示訊息)。\n" +" [/i] 呼叫 DllInstall，並將選項傳給它 [cmdline]。\n" +"\t在與 [/u] 一起使用時，會以解除安裝模式呼叫 DllInstall。\n" +" [/n] 不要呼叫 DllRegisterServer。這個選項必須與 [/i] 一起使用。\n" +"\n" #: programs/regsvr32/regsvr32.rc:42 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regedit: 無效或無法辨識的切換參數 [%1]\n" +"\n" #: programs/regsvr32/regsvr32.rc:43 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "開啟 %1 失敗\n" +msgstr "regsvr32: 無法載入 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:44 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: '%1!S!' 尚未於 DLL '%2' 實作\n" #: programs/regsvr32/regsvr32.rc:45 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:46 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:47 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法解除註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:48 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功解除註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:49 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:50 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:51 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法解除安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:52 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功解除安裝 DLL '%1'\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with its " -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows " -#| "explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16652,30 +16491,31 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"啟始一個程式，或是利用關聯該檔案字尾的程式來開啟文件。\n" -"用法：\n" +"啟動程式，或根據檔案的後綴，使用一般用於開啟該後綴的程式來開啟文件。\n" +"用法:\n" "start [選項] 程式檔案名稱 [...]\n" "start [選項] 文件檔案名稱\n" "\n" -"選項：\n" -"「標題」指定子視窗的標題。\n" -"/d 目錄在指定的目錄中啟始程式。\n" -"/b 無法為程式建立新的主控臺。\n" -"/i 以新的環境變數啟始程式。\n" -"/min 啟始程式時縮到最小。\n" -"/max 啟始程式時放到最大。\n" -"/low 在閒置優先權類別中啟始程式。\n" -"/normal 在一般優先權類別中啟始程式。\n" -"/high 在高優先權類別中啟始程式。\n" -"/realtime 在即時優先權類別中啟始程式。\n" -"/abovenormal 在正常之上優先權類別中啟始程式。\n" -"/belownormal 在正常之下優先權類別中啟始程式。\n" -"/node n 在指定的 NUMA 節點之上啟始程式。\n" -"/affinity 遮罩以指定的近似遮罩啟始程式。\n" -"/wait 等待啟始的程式直到完成，然後以它的離開代碼離開。\n" -"/unix 使用 Unix 檔名並如同 Windows 檔案總管來啟始檔案。\n" -"/ProgIDOpen 使用指定的 progID 開啟文件。\n" -"/? 顯示這份說明然後離開。\n" +"選項:\n" +"\"標題\" 指定子視窗的標題。\n" +"/d 目錄於指定的目錄開啟程式。\n" +"/b 不要為程式建立新的主控臺。\n" +"/i 使用新的環境變數來啟動程式。\n" +"/min 啟動程式時將視窗最小化。\n" +"/max 啟動程式時將視窗最大化。\n" +"/low 在 Idle 優先類別中啟動程式。\n" +"/normal 在 Normal 優先類別中啟動程式。\n" +"/high 在 High 優先類別中啟動程式。\n" +"/realtime 在 Realtime 優先類別中啟動程式。\n" +"/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" +"/belownormal 在 Belownormal 優先類別中啟動程式。\n" +"/node n 以指定的 NUMA 節點啟動程式。\n" +"/affinity mask 以指定的親和性遮罩啟動程式。\n" +"/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" +"/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" +"/exec 對指定檔案進行 Exec (在 Wine 內部使用)。\n" +"/ProgIDOpen 使用指定的 progID 來開啟檔案。\n" +"/? 顯示這個說明並結束。\n" #: programs/start/start.rc:59 msgid "" @@ -16683,12 +16523,12 @@ msgid "" "specified file.\n" "ShellExecuteEx failed" msgstr "" -"無法啟始應用程式，或是沒有與指定檔案關聯的應用程式。\n" +"無法啟動應用程式，或是沒有與指定檔案關聯的應用程式。\n" "ShellExecuteEx 失敗" #: programs/start/start.rc:61 msgid "Could not translate the specified Unix filename to a DOS filename." -msgstr "無法翻譯指定的 Unix 檔名到 DOS 檔名。" +msgstr "無法翻譯指定的 Unix 檔案名稱到 DOS 檔案名稱。" #: programs/taskkill/taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -- 2.33.0.windows.2

2 1

[PATCH] po: Update Traditional Chinese translation.
by Jactry Zeng 17 Nov '21

17 Nov '21

From: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- Superseded patch 218912. --- po/zh_TW.po | 1352 +++++++++++++++++++++++---------------------------- 1 file changed, 597 insertions(+), 755 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a4fe8ba9ef6..b6c33378538 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-10-30 18:53+0800\n" +"PO-Revision-Date: 2021-11-06 18:33+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -4558,7 +4558,7 @@ msgstr "自動資料區段超出 64k。\n" #: dlls/kernel32/winerror.mc:793 msgid "Ring 2 segment must be movable.\n" -msgstr "環 2 資料段必須可被移動。\n" +msgstr "環形第 2 資料段必須可被移動。\n" #: dlls/kernel32/winerror.mc:798 msgid "Relocation chain exceeds segment limit in %1.\n" @@ -4582,11 +4582,11 @@ msgstr "檔案名稱過長。\n" #: dlls/kernel32/winerror.mc:823 msgid "Ring 2 stack in use.\n" -msgstr "環 2 堆疊使用中。\n" +msgstr "環形第 2 堆疊現正使用中。\n" #: dlls/kernel32/winerror.mc:828 msgid "Error in use of filename wildcards.\n" -msgstr "使用檔名萬用字元時發生錯誤。\n" +msgstr "使用檔案名稱萬用字元時發生錯誤。\n" #: dlls/kernel32/winerror.mc:833 msgid "Invalid signal number.\n" @@ -6866,7 +6866,7 @@ msgstr "無法存取檔案。\n" #: dlls/kernel32/winerror.mc:3693 msgid "The filename cannot be resolved.\n" -msgstr "無法解析檔名。\n" +msgstr "無法解析檔案名稱。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" @@ -12257,7 +12257,7 @@ msgstr "驅動程式未啟用。" msgid "" "The specified device is already in use. Wait until it is free, and then try " "again." -msgstr "指定的裝置已在使用中。請等候該裝置不再使用，然後再試一次。" +msgstr "指定的裝置已在使用中。請等待該裝置空出來，然後再試一次。" #: dlls/winmm/winmm.rc:37 msgid "The specified device handle is invalid." @@ -12430,7 +12430,7 @@ msgstr "您正在使用的多媒體控制介面裝置不支援指定的命令。 #: dlls/winmm/winmm.rc:76 msgid "" "Cannot find the specified file. Make sure the path and filename are correct." -msgstr "找不到指定的檔案。請確定路徑和檔名正確。" +msgstr "找不到指定的檔案。請確定路徑和檔案名稱正確。" #: dlls/winmm/winmm.rc:77 msgid "The device driver is not ready." @@ -12623,15 +12623,15 @@ msgid "" "All wave devices that can play files in the current format are in use. Wait " "until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置不" -"再使用，然後再試一次。" +"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置" +"空出來，然後再試一次。" #: dlls/winmm/winmm.rc:113 msgid "" "Cannot set the current wave device for play back because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"目前的 wave 裝置正在使用中，所以無法設定它來播放。請等待該裝置不再使用，再試" +"目前的 wave 裝置正在使用中，所以無法設定它來播放。請等待該裝置空出來，然後再試" "一次。" #: dlls/winmm/winmm.rc:114 @@ -12639,15 +12639,15 @@ msgid "" "All wave devices that can record files in the current format are in use. " "Wait until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置不" -"再使用，然後再試一次。" +"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置" +"空出來，然後再試一次。" #: dlls/winmm/winmm.rc:115 msgid "" "Cannot set the current wave device for recording because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等待該裝置不再使用，然後" +"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等待該裝置空出來，然後" "再試一次。" #: dlls/winmm/winmm.rc:116 @@ -12696,7 +12696,7 @@ msgstr "「歌曲指標」的時間格式和 SMPTE 彼此互斥。您無法一 msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." -msgstr "指定的 MIDI 連接埠已在使用中。請等待它不再使用，然後再試一次。" +msgstr "指定的 MIDI 連接埠已在使用中。請等待該連接埠空出來，然後再試一次。" #: dlls/winmm/winmm.rc:131 msgid "" @@ -13057,11 +13057,11 @@ msgid "" msgstr "" "ATTRIB - 顯示或變更檔案屬性。\n" "\n" -"語法：\n" -"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [儲存裝置:][路徑][檔名]\n" +"語法:\n" +"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [儲存裝置:][路徑][檔案名稱]\n" " [/S [/D]]\n" "\n" -"其中：\n" +"其中:\n" "\n" " + 設定一個屬性。\n" " - 清空一個屬性。\n" @@ -13069,7 +13069,7 @@ msgstr "" " A 封存檔案屬性。\n" " S 系統檔案屬性。\n" " H 隱藏檔案屬性。\n" -" [儲存裝置:][路徑][檔名]\n" +" [儲存裝置:][路徑][檔案名稱]\n" " 指定 attrib 要處理的一個或多個檔案。\n" " /S 處理在目前資料夾和所有子資料夾中的匹配檔案。\n" " /D 同樣處理資料夾。\n" @@ -13114,15 +13114,6 @@ msgid "Clock" msgstr "時鐘" #: programs/cmd/cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CALL <batchfilename> is used within a batch file to execute commands\n" -#| "from another batch file. When the batch file exits, control returns to\n" -#| "the file which called it. The CALL command may supply parameters to the\n" -#| "called procedure.\n" -#| "\n" -#| "Changes to default directory, environment variables etc made within a\n" -#| "called procedure are inherited by the caller.\n" msgid "" "CALL <batchfilename> is used within a batch file to execute commands from\n" "another batch file. When the batch file exits, control returns to the file\n" @@ -13132,7 +13123,7 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <批次檔名> 是使用在批次檔之內以執行其他\n" +"CALL <批次檔名稱> 是使用在批次檔之內以執行其他\n" "批次檔中的指令。從其他的批次檔離開時，控制權會\n" "回到呼叫它的檔案。CALL 命令可以提供參數給\n" "被呼叫的程序。\n" @@ -13141,10 +13132,6 @@ msgstr "" "將會由呼叫者所繼承。\n" #: programs/cmd/cmd.rc:44 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -13153,8 +13140,6 @@ msgstr "" "預設目錄。\n" #: programs/cmd/cmd.rc:47 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <目錄> 變更目前的預設目錄。\n" @@ -13164,7 +13149,7 @@ msgstr "CLS 清空主控臺螢幕。\n" #: programs/cmd/cmd.rc:53 msgid "COPY <filename> copies a file.\n" -msgstr "COPY <檔名> 複製檔案。\n" +msgstr "COPY <檔案名稱> 複製檔案。\n" #: programs/cmd/cmd.rc:56 msgid "CTTY changes the input/output device.\n" @@ -13176,23 +13161,13 @@ msgstr "DATE 顯示或變更系統日期。\n" #: programs/cmd/cmd.rc:62 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "DEL <檔名> 刪除檔案或一組檔案。\n" +msgstr "DEL <檔案名稱> 刪除檔案或一組檔案。\n" #: programs/cmd/cmd.rc:65 msgid "DIR lists the contents of a directory.\n" msgstr "DIR 列出目錄的內容。\n" #: programs/cmd/cmd.rc:75 -#, fuzzy -#| msgid "" -#| "ECHO <string> displays <string> on the current terminal device.\n" -#| "\n" -#| "ECHO ON causes all subsequent commands in a batch file to be displayed\n" -#| "on the terminal device before they are executed.\n" -#| "\n" -#| "ECHO OFF reverses the effect of a previous ECHO ON (ECHO is OFF by\n" -#| "default). The ECHO OFF command can be prevented from displaying by\n" -#| "preceding it with an @ sign.\n" msgid "" "ECHO <string> displays <string> on the current terminal device.\n" "\n" @@ -13214,14 +13189,9 @@ msgstr "" #: programs/cmd/cmd.rc:78 msgid "ERASE <filename> deletes a file or set of files.\n" -msgstr "ERASE <檔名> 刪除一個檔案或一組檔案。\n" +msgstr "ERASE <檔案名稱> 刪除一個檔案或一組檔案。\n" #: programs/cmd/cmd.rc:85 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -13231,21 +13201,11 @@ msgid "" msgstr "" "FOR 命令用來向檔案集合中的每一個檔案執行命令。\n" "\n" -"語法：FOR %變數 IN (集合) DO 命令\n" +"語法: FOR %變數 IN (集合) DO 命令\n" +"\n" +"當在批次檔裡使用 FOR 的時候，必須使用兩個 % 符號。\n" #: programs/cmd/cmd.rc:97 -#, fuzzy -#| msgid "" -#| "The GOTO command transfers execution to another statement within a\n" -#| "batch file.\n" -#| "\n" -#| "The label which is the target of a GOTO may be up to 255 characters\n" -#| "long but may not include spaces (this is different from other operating\n" -#| "systems). If two or more identical labels exist in a batch file the\n" -#| "first one will always be executed. Attempting to GOTO a nonexistent\n" -#| "label terminates the batch file execution.\n" -#| "\n" -#| "GOTO has no effect when used interactively.\n" msgid "" "The GOTO command transfers execution to another statement within a batch\n" "file.\n" @@ -13290,7 +13250,7 @@ msgid "" msgstr "" "IF 用於有條件地執行命令。\n" "\n" -"語法：IF [NOT] EXIST 檔名命令\n" +"語法: IF [NOT] EXIST 檔名命令\n" " IF [NOT] 字串一==字串二命令\n" " IF [NOT] ERRORLEVEL 數字命令\n" "\n" @@ -13305,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" -"命令將向您提示詢問新的卷冊標貼用於給定的儲存裝置。\n" -"您可以利用 VOL 命令來顯示磁碟卷冊標貼。\n" +"語法: LABEL [裝置代號:]\n" +"命令將向您提示詢問要讓給定的儲存裝置使用的磁碟區標籤。\n" +"您可以利用 VOL 命令來顯示磁碟的磁碟區標籤。\n" #: programs/cmd/cmd.rc:121 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" @@ -13320,17 +13280,6 @@ msgid "MKDIR <name> creates a subdirectory.\n" msgstr "MKDIR <名稱> 建立子目錄。\n" #: programs/cmd/cmd.rc:131 -#, fuzzy -#| msgid "" -#| "MOVE relocates a file or directory to a new point within the file " -#| "system.\n" -#| "\n" -#| "If the item being moved is a directory then all the files and " -#| "subdirectories\n" -#| "below the item are moved as well.\n" -#| "\n" -#| "MOVE fails if the old and new locations are on different DOS drive " -#| "letters.\n" msgid "" "MOVE relocates a file or directory to a new point within the file system.\n" "\n" @@ -13347,17 +13296,6 @@ msgstr "" "如果舊的和新的位置在不同的 DOS 儲存裝置代號之上，MOVE 將會失敗。\n" #: programs/cmd/cmd.rc:142 -#, fuzzy -#| msgid "" -#| "PATH displays or changes the cmd search path.\n" -#| "\n" -#| "Entering PATH will display the current PATH setting (initially taken\n" -#| "from the registry). To change the setting follow the\n" -#| "PATH command with the new value.\n" -#| "\n" -#| "It is also possible to modify the PATH by using the PATH environment\n" -#| "variable, for example:\n" -#| "PATH %PATH%;c:\\temp\n" msgid "" "PATH displays or changes the cmd search path.\n" "\n" @@ -13376,16 +13314,10 @@ msgstr "" "PATH 命令之後緊接新的值。\n" "\n" "也可以藉由 PATH 環境變數來修改 PATH，\n" -"舉例來說：\n" +"舉例來說:\n" "PATH %PATH%;c:\\temp\n" #: programs/cmd/cmd.rc:148 -#, fuzzy -#| msgid "" -#| "PAUSE displays a message on the screen asking the user to press a key.\n" -#| "\n" -#| "It is mainly useful in batch files to allow the user to read the output\n" -#| "of a previous command before it scrolls off the screen.\n" msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" @@ -13398,30 +13330,6 @@ msgstr "" "輸出捲動離開螢幕之前能夠去讀取它。\n" #: programs/cmd/cmd.rc:169 -#, fuzzy -#| msgid "" -#| "PROMPT sets the command-line prompt.\n" -#| "\n" -#| "The string following the PROMPT command (and the space immediately " -#| "after)\n" -#| "appears at the beginning of the line when cmd is waiting for input.\n" -#| "\n" -#| "The following character strings have the special meaning shown:\n" -#| "\n" -#| "$$ Dollar sign $_ Linefeed $b Pipe sign (|)\n" -#| "$d Current date $e Escape $g > sign\n" -#| "$l < sign $n Current drive $p Current path\n" -#| "$q Equal sign $t Current time $v cmd version\n" -#| "\n" -#| "Note that entering the PROMPT command without a prompt-string resets the\n" -#| "prompt to the default, which is the current directory (which includes " -#| "the\n" -#| "current drive letter) followed by a greater-than (>) sign.\n" -#| "(like a command PROMPT $p$g).\n" -#| "\n" -#| "The prompt can also be changed by altering the PROMPT environment " -#| "variable,\n" -#| "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgid "" "PROMPT sets the command-line prompt.\n" "\n" @@ -13448,7 +13356,7 @@ msgstr "" "跟隨著 PROMPT 命令的字串 (以及緊接於後的空格)\n" "將會在 cmd 等待輸入時出現於一列的起始部分。\n" "\n" -"下列字元串有特殊平均顯示：\n" +"下列字元串有特殊平均顯示:\n" "\n" "$$ 錢幣符號 $_ 送列鍵 $b 管線符號 (|)\n" "$d 目前日期 $e 退出 $g > 符號\n" @@ -13463,56 +13371,30 @@ msgstr "" "因此命令 SET PROMPT=text 與 PROMPT text 具有相同的效果。\n" #: programs/cmd/cmd.rc:173 -#, fuzzy -#| msgid "" -#| "A command line beginning with REM (followed by a space) performs no\n" -#| "action, and can therefore be used as a comment in a batch file.\n" msgid "" "A command line beginning with REM (followed by a space) performs no action,\n" "and can therefore be used as a comment in a batch file.\n" msgstr "" -"以 REM 起始的命令列 (之後緊接空格) 不會進行任何\n" -"動作，因而可以做為批次檔中的註釋。\n" +"以 REM 起始的命令列 (之後緊接空格) 不會進行任何動作，\n" +"因而可以做為批次檔中的註釋。\n" #: programs/cmd/cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" -msgstr "REN <檔名> 是 RENAME 的簡短版本。它會重新命名檔案。\n" +msgstr "REN <檔案名稱> 是 RENAME 的簡短版本。它會重新命名檔案。\n" #: programs/cmd/cmd.rc:178 msgid "RENAME <filename> renames a file.\n" -msgstr "RENAME <檔名> 重新命名檔案。\n" +msgstr "RENAME <檔案名稱> 重新命名檔案。\n" #: programs/cmd/cmd.rc:181 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "RD <目錄> 是 RMDIR 的簡短版本。它會刪除子目錄。\n" +msgstr "RD <目錄> 是 RMDIR 的簡短版本。它會刪除目錄。\n" #: programs/cmd/cmd.rc:183 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <目錄> 刪除子目錄。\n" +msgstr "RMDIR <目錄> 刪除目錄。\n" #: programs/cmd/cmd.rc:229 -#, fuzzy -#| msgid "" -#| "SET displays or changes the cmd environment variables.\n" -#| "\n" -#| "SET without parameters shows all of the current environment.\n" -#| "\n" -#| "To create or modify an environment variable the syntax is:\n" -#| "\n" -#| "SET <variable>=<value>\n" -#| "\n" -#| "where <variable> and <value> are character strings. There must be no\n" -#| "space before the equals sign, nor can the variable name\n" -#| "have embedded spaces.\n" -#| "\n" -#| "Under Wine, the environment of the underlying operating system is\n" -#| "included into the Win32 environment, there will generally therefore be\n" -#| "many more values than in a native Win32 implementation. Note that it is\n" -#| "not possible to affect the operating system environment from within cmd.\n" msgid "" "SET displays or changes the cmd environment variables.\n" "\n" @@ -13534,24 +13416,18 @@ msgstr "" "\n" "不接參數的 SET 將顯示目前的全部環境。\n" "\n" -"要建立或修改環境變數的語法是：\n" +"要建立或修改環境變數的語法是:\n" "\n" "SET <變數名稱>=<變數值>\n" "\n" -"其中 <變數名稱> 和 <變數值> 都是字串。在等號之前必須沒有\n" -"空格，而變數名稱也不可以嵌入空格。\n" +"其中 <變數名稱> 和 <變數值> 都是字串。在等號之前必須沒有空格，\n" +"而變數名稱也不可以嵌入空格。\n" "\n" -"在 Wine 之下，下層的作業系統環境也被\n" -"包含於 Win32 環境之中，因此通常會比在原生的 Win32 實作中\n" -"還要多出更多變數值。要注意的是，從 cmd 之中是不可能\n" -"去影響作業系統的環境。\n" +"在 Wine 之下，下層的作業系統環境也被包含於 Win32 環境之中，\n" +"因此通常會比在原生的 Win32 實作中還要多出更多變數值。\n" +"要注意的是，從 cmd 之中是不可能去影響作業系統的環境。\n" #: programs/cmd/cmd.rc:234 -#, fuzzy -#| msgid "" -#| "SHIFT is used in a batch file to remove one parameter from the head of\n" -#| "the list, so parameter 2 becomes parameter 1 and so on. It has no effect\n" -#| "if called from the command line.\n" msgid "" "SHIFT is used in a batch file to remove one parameter from the head of the\n" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" @@ -13562,35 +13438,6 @@ msgstr "" "將不會有任何效果。\n" #: programs/cmd/cmd.rc:212 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with its " -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows " -#| "explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -13620,30 +13467,30 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"啟始一個程式，或是利用關聯該檔案字尾的程式來開啟文件。\n" -"用法：\n" +"啟動程式，或根據檔案的後綴，使用一般用於開啟該後綴的程式來開啟文件。\n" +"用法:\n" "start [選項] 程式檔案名稱 [...]\n" "start [選項] 文件檔案名稱\n" "\n" -"選項：\n" -"「標題」指定子視窗的標題。\n" -"/d 目錄在指定的目錄中啟始程式。\n" -"/b 無法為程式建立新的主控臺。\n" -"/i 以新的環境變數啟始程式。\n" -"/min 啟始程式時縮到最小。\n" -"/max 啟始程式時放到最大。\n" -"/low 在閒置優先權類別中啟始程式。\n" -"/normal 在一般優先權類別中啟始程式。\n" -"/high 在高優先權類別中啟始程式。\n" -"/realtime 在即時優先權類別中啟始程式。\n" -"/abovenormal 在正常之上優先權類別中啟始程式。\n" -"/belownormal 在正常之下優先權類別中啟始程式。\n" -"/node n 在指定的 NUMA 節點之上啟始程式。\n" -"/affinity 遮罩以指定的近似遮罩啟始程式。\n" -"/wait 等待啟始的程式直到完成，然後以它的離開代碼離開。\n" -"/unix 使用 Unix 檔名並如同 Windows 檔案總管來啟始檔案。\n" -"/ProgIDOpen 使用指定的 progID 開啟文件。\n" -"/? 顯示這份說明然後離開。\n" +"選項:\n" +"\"標題\" 指定子視窗的標題。\n" +"/d 目錄於指定的目錄開啟程式。\n" +"/b 不要為程式建立新的主控臺。\n" +"/i 使用新的環境變數來啟動程式。\n" +"/min 啟動程式時將視窗最小化。\n" +"/max 啟動程式時將視窗最大化。\n" +"/low 在 Idle 優先類別中啟動程式。\n" +"/normal 在 Normal 優先類別中啟動程式。\n" +"/high 在 High 優先類別中啟動程式。\n" +"/realtime 在 Realtime 優先類別中啟動程式。\n" +"/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" +"/belownormal 在 Belownormal 優先類別中啟動程式。\n" +"/node n 以指定的 NUMA 節點啟動程式。\n" +"/affinity 遮罩以指定的親和性遮罩啟動程式。\n" +"/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" +"/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" +"/ProgIDOpen 使用指定的 progID 開啟檔案。\n" +"/? 顯示這個說明並結束。\n" #: programs/cmd/cmd.rc:237 msgid "TIME sets or shows the current system time.\n" @@ -13654,15 +13501,11 @@ msgid "TITLE <string> sets the window title for the cmd window.\n" msgstr "TITLE <字串> 設定 cmd 視窗的視窗標題。\n" #: programs/cmd/cmd.rc:244 -#, fuzzy -#| msgid "" -#| "TYPE <filename> copies <filename> to the console device (or elsewhere\n" -#| "if redirected). No check is made that the file is readable text.\n" msgid "" "TYPE <filename> copies <filename> to the console device (or elsewhere if\n" "redirected). No check is made that the file is readable text.\n" msgstr "" -"TYPE <檔名> 將 <檔名> 的內容複製到主控臺裝置 (或是其他被\n" +"TYPE <檔案名稱> 將 <檔案名稱> 的內容複製到主控臺裝置 (或是其他被\n" "重新導向的地方)。不會檢查該檔案是否為可讀的文字。\n" #: programs/cmd/cmd.rc:253 @@ -13675,7 +13518,7 @@ msgid "" "\n" "The verify flag has no function in Wine.\n" msgstr "" -"VERIFY 用來設定、清空或測試驗證旗標。有效的形式包括：\n" +"VERIFY 用來設定、清空或測試驗證旗標。有效的形式包括:\n" "\n" "VERIFY ON\t設定旗標。\n" "VERIFY OFF\t清空旗標。\n" @@ -13689,13 +13532,9 @@ 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 -#, fuzzy -#| msgid "" -#| "ENDLOCAL ends localization of environment changes in a batch file\n" -#| "which were introduced by a preceding SETLOCAL.\n" msgid "" "ENDLOCAL ends localization of environment changes in a batch file which\n" "were introduced by a preceding SETLOCAL.\n" @@ -13716,36 +13555,22 @@ msgstr "" "\n" "SETLOCAL 之後完成的環境變更對於批次檔而言為本地，\n" "並被保留直到遇到下一個 ENDLOCAL (或是檔案\n" -"的結束，取決於誰先出現)，前一個環境的設定值\n" +"的結尾，取決於誰先出現)，前一個環境的設定值\n" "則於該點被儲存。\n" #: programs/cmd/cmd.rc:275 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a stack, and then\n" "changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <目錄名> 儲存目前的目錄到\n" -"堆疊中，然後變更現行目錄到所給定的目錄。\n" +"PUSHD <目錄> 儲存目前的目錄到堆疊中，\n" +"然後變更現行目錄到所給定的目錄。\n" #: programs/cmd/cmd.rc:278 msgid "POPD changes current directory to the last one saved with PUSHD.\n" msgstr "POPD 變更現行目錄到上一個利用 PUSHD 儲存的目錄。\n" #: programs/cmd/cmd.rc:288 -#, fuzzy -#| msgid "" -#| "ASSOC shows or modifies file extension associations.\n" -#| "\n" -#| "Syntax: ASSOC [.ext[=[fileType]]]\n" -#| "\n" -#| "ASSOC without parameters displays current file associations.\n" -#| "If used with only a file extension, displays the current association.\n" -#| "Specifying no file type after the equal sign removes the current " -#| "association, if any.\n" msgid "" "ASSOC shows or modifies file extension associations.\n" "\n" @@ -13758,25 +13583,13 @@ msgid "" msgstr "" "ASSOC 顯示或修改副檔名的關聯。\n" "\n" -"語法：ASSOC [.ext[=[檔案型態]]]\n" +"語法: ASSOC [.ext[=[檔案型態]]]\n" "\n" "ASSOC 不加參數將顯示目前的檔案關聯。\n" "如果只使用副檔名，則顯示它目前的關聯。\n" "在等號之號如果沒有指定檔案類型就移除目前的任何關聯。\n" #: programs/cmd/cmd.rc:300 -#, fuzzy -#| msgid "" -#| "FTYPE shows or modifies open commands associated with file types.\n" -#| "\n" -#| "Syntax: FTYPE [fileType[=[openCommand]]]\n" -#| "\n" -#| "Without parameters, shows the file types for which open command strings " -#| "are currently defined.\n" -#| "If used with only a file type, displays the associated open command " -#| "string, if any.\n" -#| "Specifying no open command after the equal sign removes the command " -#| "string associated to the specified file type.\n" msgid "" "FTYPE shows or modifies open commands associated with file types.\n" "\n" @@ -13791,22 +13604,18 @@ msgid "" msgstr "" "FTYPE 顯示或修改開啟命令所關聯的檔案類型。\n" "\n" -"語法：FTYPE [檔案型態[=[開啟命令]]]\n" +"語法: FTYPE [檔案型態[=[開啟命令]]]\n" "\n" "如果不加參數，則顯示開啟命令目前所定義的檔案型態。\n" "如果只使用檔案類型，則顯示關聯的任何開啟命令字串。\n" -"在等號之號如果沒有指定檔案類型就移除對於給定檔案型態的任何關聯命令字串。\n" +"在等號之號如果沒有指定檔案類型就移除對於給定檔案型態的\n" +"任何關聯命令字串。\n" #: programs/cmd/cmd.rc:303 msgid "MORE displays output of files or piped input in pages.\n" msgstr "MORE 以分頁的方式顯示檔案的輸出或管線的輸入。\n" #: programs/cmd/cmd.rc:308 -#, fuzzy -#| msgid "" -#| "CHOICE displays a text and waits, until the User\n" -#| "presses an allowed Key from a selectable list.\n" -#| "CHOICE is mainly used to build a menu selection in a batch file.\n" msgid "" "CHOICE displays a text and waits, until the User presses an allowed Key\n" "from a selectable list.\n" @@ -13829,61 +13638,26 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"建立符號連結。\n" +"\n" +"語法: MKLINK [選項] 連結名稱目標\n" +"\n" +"選項:\n" +"/d 建立目錄符號連結。\n" +"/h 建立永久連結。\n" +"/j 建立目錄連接。\n" +"連結名稱為新的符號連結的名稱。\n" +"目標為連結名稱指向的路徑。\n" #: programs/cmd/cmd.rc:312 -#, fuzzy -#| msgid "" -#| "EXIT terminates the current command session and returns\n" -#| "to the operating system or shell from which you invoked cmd.\n" msgid "" "EXIT terminates the current command session and returns to the operating\n" "system or shell from which you invoked cmd.\n" msgstr "" -"EXIT 終止目前的命令作業階段並回到\n" -"您從其調用 cmd 的作業系統或命令殼。\n" +"EXIT 終止目前的命令作業階段並回到您從其調用 cmd 的\n" +"作業系統或命令殼。\n" #: programs/cmd/cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -13925,10 +13699,10 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"CMD 內建命令包括：\n" +"CMD 內建命令包括:\n" "ASSOC\t\t顯示或修改副檔名關聯\n" "ATTRIB\t\t顯示或變更 DOS 檔案屬性\n" -"CALL\t\t從另一個批次檔內部調用\n" +"CALL\t\t在批次檔中呼叫另一個批次檔\n" "CD (CHDIR)\t變更目前的預設目錄\n" "CHOICE\t\t從可選清單等待按鍵\n" "CLS\t\t清空主控臺螢幕\n" @@ -13942,13 +13716,14 @@ msgstr "" "FTYPE\t\t顯示或修改與檔案類型關聯的開啟命令\n" "HELP\t\t顯示主題的簡潔說明\n" "MD (MKDIR)\t建立子目錄\n" +"MKLINK\t建立符號連結\n" "MORE\t\t分頁顯示輸出\n" "MOVE\t\t移動一個檔案、一組檔案或樹狀目錄\n" "PATH\t\t設定或顯示搜尋路徑\n" "PAUSE\t\t懸置執行中的批次檔\n" "POPD\t\t還原到上一次以 PUSHD 儲存的目錄\n" "PROMPT\t\t變更指令提示符號\n" -"PUSHD\t\t變更為新的目錄並儲存目前的\n" +"PUSHD\t\t變更為新的目錄並儲存目前的目錄\n" "REN (RENAME)\t重新命名檔案\n" "RD (RMDIR)\t刪除子目錄\n" "SET\t\t設定或顯示環境變數\n" @@ -13958,15 +13733,15 @@ 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" -"輸入 HELP <命令> 以獲得關於以上任何命令的進一步資訊。\n" +"輸入 HELP <命令> 以取得關於以上任何命令的進一步資訊。\n" #: programs/cmd/cmd.rc:365 msgid "Are you sure?" -msgstr "您確定嗎？" +msgstr "您確定嗎?" #: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" @@ -13980,15 +13755,15 @@ msgstr "N" #: programs/cmd/cmd.rc:368 msgid "File association missing for extension %1\n" -msgstr "缺少用於延伸檔名 %1 的檔案關聯\n" +msgstr "找不到副檔名 %1 的檔案關聯\n" #: programs/cmd/cmd.rc:369 msgid "No open command associated with file type '%1'\n" -msgstr "沒有與檔案類型 %1 相關聯的開啟命令\n" +msgstr "沒有與檔案類型 '%1' 相關聯的開啟命令\n" #: programs/cmd/cmd.rc:370 msgid "Overwrite %1?" -msgstr "覆寫 %1？" +msgstr "覆寫 %1?" #: programs/cmd/cmd.rc:371 msgid "More..." @@ -13996,7 +13771,7 @@ msgstr "更多..." #: programs/cmd/cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "命令列於批次處理時可能會被截斷。使用：\n" +msgstr "命令列於批次處理時可能會被截斷。使用:\n" #: programs/cmd/cmd.rc:374 msgid "Argument missing\n" @@ -14024,11 +13799,11 @@ msgstr "現在時間是 %1\n" #: programs/cmd/cmd.rc:381 msgid "Enter new date: " -msgstr "輸入新日期：" +msgstr "輸入新日期: " #: programs/cmd/cmd.rc:382 msgid "Enter new time: " -msgstr "輸入新時間：" +msgstr "輸入新時間: " #: programs/cmd/cmd.rc:383 msgid "Environment variable %1 not defined\n" @@ -14040,7 +13815,7 @@ msgstr "開啟 %1 失敗\n" #: programs/cmd/cmd.rc:385 msgid "Cannot call batch label outside of a batch script\n" -msgstr "無法呼叫批次命令稿外部的批次標貼\n" +msgstr "無法呼叫批次命令指令碼外部的批次標貼\n" #: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" @@ -14049,7 +13824,7 @@ msgstr "A" #: programs/cmd/cmd.rc:387 msgid "Delete %1?" -msgstr "刪除 %1？" +msgstr "刪除 %1?" #: programs/cmd/cmd.rc:388 msgid "Echo is %1\n" @@ -14072,12 +13847,12 @@ msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"卷冊序號是 %1!04x!-%2!04x!\n" +"磁碟區序號是 %1!04x!-%2!04x!\n" "\n" #: programs/cmd/cmd.rc:393 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "卷冊標貼 (11 個字元，<Enter> 表示沒有)？" +msgstr "磁碟區標籤 (11 個字元，<Enter> 表示沒有)?" #: programs/cmd/cmd.rc:394 msgid "PATH not found\n" @@ -14085,19 +13860,19 @@ msgstr "找不到 PATH\n" #: programs/cmd/cmd.rc:395 msgid "Press any key to continue... " -msgstr "按下任何鍵繼續... " +msgstr "按下任意鍵繼續... " #: programs/cmd/cmd.rc:396 msgid "Wine Command Prompt" -msgstr "Wine 命令提示符號" +msgstr "Wine 命令提示字元" #: programs/cmd/cmd.rc:397 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: programs/cmd/cmd.rc:398 msgid "More? " -msgstr "更多？" +msgstr "更多? " #: programs/cmd/cmd.rc:399 msgid "The input line is too long.\n" @@ -14105,26 +13880,24 @@ msgstr "輸入列太長。\n" #: programs/cmd/cmd.rc:400 msgid "Volume in drive %1!c! is %2\n" -msgstr "位於儲存裝置 %1!c! 的卷冊為 %2\n" +msgstr "位於儲存裝置 %1!c! 的磁碟區為 %2\n" #: programs/cmd/cmd.rc:401 msgid "Volume in drive %1!c! has no label.\n" -msgstr "位於儲存裝置 %1!c! 的卷冊沒有任何標貼。\n" +msgstr "位於儲存裝置 %1!c! 的磁碟區沒有任何標籤。\n" #: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 -#, fuzzy msgid " (Yes|No)" -msgstr " (是|否)" +msgstr " (Yes|No)" #: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 -#, fuzzy msgid " (Yes|No|All)" -msgstr " (是|否|全部)" +msgstr " (Yes|No|All)" #: programs/cmd/cmd.rc:404 msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" -msgstr "無法識別 %1 為內部、外部命令或是批次命令稿。\n" +msgstr "無法識別 %1 為內部、外部命令或是批次命令指令碼。\n" #: programs/cmd/cmd.rc:405 msgid "Division by zero error.\n" @@ -14140,14 +13913,14 @@ msgstr "預期為一個運算子。\n" #: programs/cmd/cmd.rc:408 msgid "Mismatch in parentheses.\n" -msgstr "小括號不匹配。\n" +msgstr "小括號不相符。\n" #: programs/cmd/cmd.rc:409 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" -"不當的數字形式 - 必須是十進位 (12)、\n" +"錯誤的數字形式 - 必須是十進位 (12)、\n" " 十六進位 (0x34) 或八進位 (056) 之一。\n" #: programs/conhost/conhost.rc:54 @@ -14168,23 +13941,19 @@ msgstr "大(&L)" #: programs/conhost/conhost.rc:59 msgid "Command history" -msgstr "指令歷程" +msgstr "命令歷程記錄" #: programs/conhost/conhost.rc:60 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "緩衝區域" +msgstr "緩衝大小(&B):" #: programs/conhost/conhost.rc:63 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "刪除連續相同的指令(&R)" +msgstr "移除重複(&R)" #: programs/conhost/conhost.rc:65 msgid "Popup menu" -msgstr "彈出功能表" +msgstr "快顯功能表" #: programs/conhost/conhost.rc:66 msgid "&Control" @@ -14195,22 +13964,16 @@ msgid "S&hift" msgstr "S&hift" #: programs/conhost/conhost.rc:69 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "關閉虛擬終端(&C)" +msgstr "主控臺" #: programs/conhost/conhost.rc:70 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "快速編輯" +msgstr "快速編輯模式(&Q)" #: programs/conhost/conhost.rc:71 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "專家模式(&E)" +msgstr "插入模式(&I)" #: programs/conhost/conhost.rc:79 msgid "&Font" @@ -14222,7 +13985,7 @@ msgstr "顏色(&C)" #: programs/conhost/conhost.rc:92 msgid "Configuration" -msgstr "組態" +msgstr "設定" #: programs/conhost/conhost.rc:95 msgid "Buffer zone" @@ -14230,11 +13993,11 @@ msgstr "緩衝區域" #: programs/conhost/conhost.rc:96 msgid "&Width:" -msgstr "寬度(&W)：" +msgstr "寬度(&W):" #: programs/conhost/conhost.rc:99 msgid "&Height:" -msgstr "高度(&H)：" +msgstr "高度(&H):" #: programs/conhost/conhost.rc:103 msgid "Window size" @@ -14242,11 +14005,11 @@ msgstr "視窗大小" #: programs/conhost/conhost.rc:104 msgid "W&idth:" -msgstr "寬度(&I)：" +msgstr "寬度(&I):" #: programs/conhost/conhost.rc:107 msgid "H&eight:" -msgstr "高度(&E)：" +msgstr "高度(&E):" #: programs/conhost/conhost.rc:111 msgid "End of program" @@ -14254,19 +14017,19 @@ msgstr "當程式結束後" #: programs/conhost/conhost.rc:112 msgid "&Close console" -msgstr "關閉虛擬終端(&C)" +msgstr "關閉主控臺(&C)" #: programs/conhost/conhost.rc:114 msgid "Edition" -msgstr "Edition" +msgstr "版本" #: programs/conhost/conhost.rc:120 msgid "Console parameters" -msgstr "虛擬終端執行參數" +msgstr "主控臺執行參數" #: programs/conhost/conhost.rc:123 msgid "Retain these settings for later sessions" -msgstr "保留當前配置以便下次使用" +msgstr "保留目前設定以便下次使用" #: programs/conhost/conhost.rc:124 msgid "Modify only current session" @@ -14311,8 +14074,6 @@ msgid "Configuration error" msgstr "組態錯誤" #: programs/conhost/conhost.rc:46 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." @@ -14332,17 +14093,15 @@ msgstr "DirectX 診斷工具" #: programs/dxdiag/dxdiag.rc:31 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "用法：dxdiag [/whql:off | /whql:on] [/t 檔名 | /x 檔名]" +msgstr "用法: dxdiag [/whql:off | /whql:on] [/t 檔案名稱 | /x 檔案名稱]" #: programs/explorer/explorer.rc:32 msgid "Wine Explorer" msgstr "Wine 檔案總管" #: programs/explorer/explorer.rc:34 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "啟動" +msgstr "開始" #: programs/explorer/explorer.rc:35 programs/winefile/winefile.rc:36 msgid "&Run..." @@ -14354,6 +14113,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- 支援的命令 -\n" +"\n" +"hardlink 永久連結管理\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -14361,38 +14123,39 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - 支援的命令 -\n" +"\n" +"create 建立永久連結\n" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "語法: fsutil hardlink create <new> <existing>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" -msgstr "用法：主機名稱\n" +msgstr "用法: 主機名稱\n" #: programs/hostname/hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "錯誤：無效的選項 %c。\n" +msgstr "錯誤: 無效的選項 '%c'。\n" #: programs/hostname/hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "錯誤：找不到行程 %1。\n" +msgstr "錯誤: 無法取得主機名稱: %u。\n" #: programs/hostname/hostname.rc:33 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" -msgstr "錯誤：不能利用主機名稱公用程式來設定系統主機名稱。\n" +msgstr "錯誤: 無法使用 hostname 工具設定系統的主機名稱。\n" #: programs/ipconfig/ipconfig.rc:30 msgid "Usage: ipconfig [ /? | /all ]\n" -msgstr "用法：ipconfig [ /? | /all ]\n" +msgstr "用法: ipconfig [ /? | /all ]\n" #: programs/ipconfig/ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" -msgstr "錯誤：指定了不明或無效的命令列參數\n" +msgstr "錯誤: 指定了不明或無效的命令列參數\n" #: programs/ipconfig/ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -14474,7 +14237,7 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET command [引數]\n" " 或\n" @@ -14491,12 +14254,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET START [service]\n" "\n" -"如果 service 被省略，就顯示執行中服務的清單，否則 service 表示要啟動的服務名" -"稱。\n" +"如果 'service' 被省略，就顯示執行中服務的清單，否則 'service' 表示要啟動的" +"服務名稱。\n" #: programs/net/net.rc:32 msgid "" @@ -14506,7 +14269,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET STOP service\n" "\n" @@ -14514,7 +14277,7 @@ msgstr "" #: programs/net/net.rc:33 msgid "Stopping dependent service: %1\n" -msgstr "正在停止附屬服務：%1\n" +msgstr "正在停止附屬服務: %1\n" #: programs/net/net.rc:34 msgid "Could not stop service %1\n" @@ -14522,27 +14285,27 @@ msgstr "無法停止服務 %1。\n" #: programs/net/net.rc:35 msgid "Could not get handle to service control manager.\n" -msgstr "無法獲得服務控制管理員控柄。\n" +msgstr "無法取得服務控制管理員的控制代碼。\n" #: programs/net/net.rc:36 msgid "Could not get handle to service.\n" -msgstr "無法獲得服務控柄。\n" +msgstr "無法取得服務的控制代碼。\n" #: programs/net/net.rc:37 msgid "The %1 service is starting.\n" -msgstr "%1 服務正在開始。\n" +msgstr "正在啟動 %1 服務。\n" #: programs/net/net.rc:38 msgid "The %1 service was started successfully.\n" -msgstr "%1 服務已成功開始。\n" +msgstr "%1 服務已成功啟動。\n" #: programs/net/net.rc:39 msgid "The %1 service failed to start.\n" -msgstr "%1 服務無法開始。\n" +msgstr "無法啟動 %1 服務。\n" #: programs/net/net.rc:40 msgid "The %1 service is stopping.\n" -msgstr "%1 服務正在停止。\n" +msgstr "正在停止 %1 服務。\n" #: programs/net/net.rc:41 msgid "The %1 service was stopped successfully.\n" @@ -14550,11 +14313,11 @@ msgstr "%1 服務已成功停止。\n" #: programs/net/net.rc:42 msgid "The %1 service failed to stop.\n" -msgstr "%1 服務無法停止。\n" +msgstr "無法停止 %1 服務。\n" #: programs/net/net.rc:44 msgid "There are no entries in the list.\n" -msgstr "在清單中沒有條目。\n" +msgstr "在清單中沒有項目。\n" #: programs/net/net.rc:45 msgid "" @@ -14563,12 +14326,12 @@ msgid "" "---------------------------------------------------------------\n" msgstr "" "\n" -"狀態本地遠端\n" +"狀態本機遠端\n" "---------------------------------------------------------------\n" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 開啟資源：%4!u!\n" +msgstr "%1 %2 %3 開啟資源: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -14584,7 +14347,7 @@ msgstr "網路發生了錯誤" #: programs/net/net.rc:51 msgid "Connection is being made" -msgstr "正在進行連接" +msgstr "正在連線" #: programs/net/net.rc:52 msgid "Reconnecting" @@ -14592,7 +14355,7 @@ msgstr "正在重新連線" #: programs/net/net.rc:43 msgid "The following services are running:\n" -msgstr "下列服務正在執行：\n" +msgstr "下列服務正在執行:\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -14729,7 +14492,7 @@ msgstr "版面設定(&T)..." #: programs/notepad/notepad.rc:37 msgid "P&rinter Setup..." -msgstr "列印設定(&R)..." +msgstr "印表機設定(&R)..." #: programs/notepad/notepad.rc:42 programs/wordpad/wordpad.rc:44 msgid "&Undo\tCtrl+Z" @@ -14759,11 +14522,11 @@ msgstr "全選(&A)\tCtrl+A" #: programs/notepad/notepad.rc:50 msgid "&Time/Date\tF5" -msgstr "插入日期時間(&T)\tF5" +msgstr "插入日期/時間(&T)\tF5" #: programs/notepad/notepad.rc:52 msgid "&Wrap long lines" -msgstr "自動換列(&W)" +msgstr "自動換行(&W)" #: programs/notepad/notepad.rc:56 msgid "&Search...\tCtrl+F" @@ -14898,9 +14661,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"檔案 %s 不存在\n" +"檔案 '%s' 不存在。\n" "\n" -"您想新增一個檔案嗎？" +"您要建立一個新檔案嗎?" #: programs/notepad/notepad.rc:82 msgid "" @@ -14908,25 +14671,25 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"檔案 %s 正文已更改\n" +"檔案 '%s' 的內容已更改。\n" "\n" -"是否儲存更改？" +"您要儲存更改嗎?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." -msgstr "找不到 %s。" +msgstr "找不到 '%s'。" #: programs/notepad/notepad.rc:85 msgid "Unicode (UTF-16)" -msgstr "萬國碼 (UTF-16)" +msgstr "Unicode (UTF-16)" #: programs/notepad/notepad.rc:86 msgid "Unicode (UTF-16 big-endian)" -msgstr "萬國碼 (UTF-16 大尾序)" +msgstr "Unicode (UTF-16 big-endian)" #: programs/notepad/notepad.rc:87 msgid "Unicode (UTF-8)" -msgstr "萬國碼 (UTF-8)" +msgstr "Unicode (UTF-8)" #: programs/notepad/notepad.rc:94 msgid "" @@ -14938,11 +14701,11 @@ msgid "" "Continue?" msgstr "" "%1\n" -"這個檔案含有萬國碼字元，如果以 %2 編碼\n" -"儲存這個檔案，您將會失去它們。\n" -"要保留這些字元，請按一下取消，然後在編碼\n" -"的下拉選單中選取一個萬國碼選項。\n" -"要繼續嗎？" +"這個檔案含有 Unicode 字元，如果以 %2 編碼儲存這個檔案，\n" +"這些字符將會丟失。\n" +"要保留這些字元，請按一下 [取消]，\n" +"然後在 [編碼] 下拉選單中選取一個 Unicode 選項。\n" +"您要繼續嗎?" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..." @@ -14950,7 +14713,7 @@ msgstr "檔案綁定(&B)..." #: programs/oleview/oleview.rc:33 msgid "&View TypeLib..." -msgstr "查看 &TypeLib..." +msgstr "查看 TypeLib(&V)..." #: programs/oleview/oleview.rc:35 msgid "&System Configuration" @@ -14962,15 +14725,15 @@ msgstr "執行註冊表編輯器(&R)" #: programs/oleview/oleview.rc:42 msgid "&CoCreateInstance Flag" -msgstr "&CoCreateInstance 參數" +msgstr "CoCreateInstance 旗標(&C)" #: programs/oleview/oleview.rc:44 msgid "&In-process server" -msgstr "同行程伺服器(&I)" +msgstr "同處理序伺服程式(&I)" #: programs/oleview/oleview.rc:45 msgid "In-process &handler" -msgstr "同行程處理常式(&H)" +msgstr "同處理序處理常式(&H)" #: programs/oleview/oleview.rc:46 msgid "&Local server" @@ -15035,7 +14798,7 @@ msgstr "關於 OleView(&A)" #: programs/oleview/oleview.rc:82 msgid "&Save as..." -msgstr "另存為(&S)..." +msgstr "另存新檔(&S)..." #: programs/oleview/oleview.rc:87 msgid "&Group by type kind" @@ -15063,7 +14826,7 @@ msgstr "啟用分散式 COM(&E)" #: programs/oleview/oleview.rc:172 msgid "Enable &Remote Connections (Win95 only)" -msgstr "啟用遠端連線(&R)(限 Win95)" +msgstr "啟用遠端連線 (限 Win95)(&R)" #: programs/oleview/oleview.rc:173 msgid "" @@ -15123,7 +14886,7 @@ msgstr "TypeLib 檔案 (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: programs/oleview/oleview.rc:105 msgid "Bind to file via a File Moniker" -msgstr "通過檔案綽號綁定到檔案" +msgstr "通過 File Moniker 綁定到檔案" #: programs/oleview/oleview.rc:106 msgid "Open a TypeLib file and view the contents" @@ -15131,7 +14894,7 @@ msgstr "開啟 TypeLib 檔案並查看內容" #: programs/oleview/oleview.rc:107 msgid "Change machine wide Distributed COM settings" -msgstr "修改本機分散式 COM 設定" +msgstr "變更本機分散式 COM 設定" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" @@ -15139,7 +14902,7 @@ msgstr "執行 Wine 註冊表編輯器" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" -msgstr "結束程式。提示儲存" +msgstr "結束程式。提示儲存" #: programs/oleview/oleview.rc:110 msgid "Create an instance of the selected object" @@ -15147,19 +14910,19 @@ msgstr "建立目前選擇的物件實例" #: programs/oleview/oleview.rc:111 msgid "Create an instance of the selected object on a specific machine" -msgstr "建立當前選定物件在指定電腦的實例" +msgstr "建立目前選定物件在指定電腦的實例" #: programs/oleview/oleview.rc:112 msgid "Release the currently selected object instance" -msgstr "釋放當前選定物件實例" +msgstr "釋放目前選定物件實例" #: programs/oleview/oleview.rc:113 msgid "Copy the GUID of the currently selected item to the clipboard" -msgstr "將當前選定項目的 GUID 複製到剪貼簿" +msgstr "將目前選定項目的 GUID 複製到剪貼簿" #: programs/oleview/oleview.rc:114 msgid "Display the viewer for the selected item" -msgstr "顯示選定項目的查看器" +msgstr "顯示選定項目的檢視器" #: programs/oleview/oleview.rc:119 msgid "Toggle between expert and novice display mode" @@ -15184,15 +14947,15 @@ msgstr "重新整理所有清單" #: programs/oleview/oleview.rc:124 msgid "Display program information, version number and copyright" -msgstr "顯示程式資訊、版本號及版權" +msgstr "顯示程式資訊、版本號及著作權" #: programs/oleview/oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "呼叫 CoGetClassObject 時要求一個同行程伺服器" +msgstr "呼叫 CoGetClassObject 時要求一個同處理序伺服程式" #: programs/oleview/oleview.rc:116 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "呼叫 CoGetClassObject 時要求一個同行程處理常式" +msgstr "呼叫 CoGetClassObject 時要求一個同處理序處理常式" #: programs/oleview/oleview.rc:117 msgid "Ask for a local server when calling CoGetClassObject" @@ -15224,7 +14987,7 @@ msgstr "所有物件" #: programs/oleview/oleview.rc:135 msgid "Application IDs" -msgstr "應用程式 IDs" +msgstr "應用程式識別碼" #: programs/oleview/oleview.rc:136 msgid "Type Libraries" @@ -15256,7 +15019,7 @@ msgstr "CoGetClassObject 失敗。" #: programs/oleview/oleview.rc:145 msgid "Unknown error" -msgstr "未知錯誤" +msgstr "不明錯誤" #: programs/oleview/oleview.rc:148 msgid "bytes" @@ -15272,7 +15035,7 @@ msgstr "繼承介面" #: programs/oleview/oleview.rc:126 msgid "Save as an .IDL or .H file" -msgstr "存為 .IDL 或 .H 檔案" +msgstr "儲存為 .IDL 或 .H 檔案" #: programs/oleview/oleview.rc:127 msgid "Close window" @@ -15300,7 +15063,7 @@ msgstr "複製(&C)...\tF8" #: programs/progman/progman.rc:38 msgid "&Properties\tAlt+Enter" -msgstr "屬性(&P)\tAlt+Enter" +msgstr "內容(&P)\tAlt+Enter" #: programs/progman/progman.rc:40 msgid "&Execute..." @@ -15418,11 +15181,11 @@ msgstr "變更圖示" #: programs/progman/progman.rc:194 msgid "&Filename:" -msgstr "檔案名(&F):" +msgstr "檔案名稱(&F):" #: programs/progman/progman.rc:196 msgid "Current &icon:" -msgstr "當前圖示(&I):" +msgstr "目前圖示(&I):" #: programs/progman/progman.rc:210 msgid "Execute Program" @@ -15442,11 +15205,11 @@ msgstr "資訊" #: programs/progman/progman.rc:68 msgid "Delete group `%s'?" -msgstr "是否刪除程式群組 %s？" +msgstr "是否刪除程式群組 `%s'?" #: programs/progman/progman.rc:69 msgid "Delete program `%s'?" -msgstr "是否刪除程式 %s？" +msgstr "是否刪除程式 `%s'?" #: programs/progman/progman.rc:70 msgid "Not implemented" @@ -15454,19 +15217,19 @@ msgstr "未實作" #: programs/progman/progman.rc:71 msgid "Error reading `%s'." -msgstr "讀取檔案 %s 時發生錯誤。" +msgstr "讀取檔案 `%s' 時發生錯誤。" #: programs/progman/progman.rc:72 msgid "Error writing `%s'." -msgstr "寫入檔案 %s 時發生錯誤。" +msgstr "寫入檔案 `%s' 時發生錯誤。" #: programs/progman/progman.rc:75 msgid "" "The group file `%s' cannot be opened.\n" "Should it be tried further on?" msgstr "" -"無法開啟群組檔案 %s。\n" -"是否繼續嘗試？" +"無法開啟群組檔案 `%s'。\n" +"是否繼續嘗試開啟?" #: programs/progman/progman.rc:77 msgid "Help not available." @@ -15474,15 +15237,15 @@ msgstr "沒有可用的說明資訊。" #: programs/progman/progman.rc:78 msgid "Unknown feature in %s" -msgstr "在 %s 中發現未知特性" +msgstr "在 %s 中發現不明功能" #: programs/progman/progman.rc:79 msgid "File `%s' exists. Not overwritten." -msgstr "檔案 %s 已經存在。不覆蓋已有檔案。" +msgstr "檔案 `%s' 已經存在。不覆寫已有檔案。" #: programs/progman/progman.rc:80 msgid "Save group as `%s' to prevent overwriting original files." -msgstr "將程式組儲存為 %s 可以避免復蓋已有的檔案。" +msgstr "將程式組儲存為 `%s' 可以避免覆寫已有的檔案。" #: programs/progman/progman.rc:84 msgid "Libraries (*.dll)" @@ -15497,47 +15260,32 @@ msgid "Icons (*.ico)" msgstr "圖示 (*.ico)" #: programs/reg/reg.rc:139 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的語法。 " #: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "輸入 \"REG %1 /?\" 以取得說明。\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 無法存取或建立指定的註冊表鍵\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "作業已成功完成\n" +msgstr "reg: 操作成功完成\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" -msgstr "作業被使用者取消。\n" +msgstr "reg: 註冊表操作已經取消\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 找不到指定的登錄機碼\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 找不到指定的登錄值\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15545,7 +15293,7 @@ msgstr "(預設)" #: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "輸入 \"REG /?\" 以取得說明。\n" #: programs/reg/reg.rc:35 msgid "" @@ -15559,6 +15307,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"用法:\n" +" REG [操作] [參數]\n" +"\n" +"支援的操作:\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" +"\n" +"要取得指定操作的說明，請輸入:\n" +" REG [操作] /?\n" +"\n" #: programs/reg/reg.rc:67 msgid "" @@ -15609,6 +15366,52 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <機碼> [/v 值名稱 | /ve] [/t 類型] [/s 分隔符號] [/d 資料] [/f]\n" +"\n" +" 新增一個機碼到註冊表，或新增值到給定的登錄機碼。\n" +"\n" +" <機碼>\n" +" 要新增的機碼，如果指定了 [/v] 或 [/ve]，\n" +" 則會在該機碼新增登錄資料。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要新增的登錄值的名稱。\n" +"\n" +" /ve\n" +" 新增未命名的登錄值。這個選項會修改 (預設) 的\n" +" 登錄值。\n" +"\n" +" /t <類型>\n" +" 要新增到註冊表的資料類型。如果指定了 [/t]，\n" +" <類型> 必須是下列的其中一個:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" 如果未指定 [/t]，資料類型將預設為 REG_SZ。\n" +"\n" +" /s <分隔符號>\n" +" 指定一個用於分隔 REG_MULTI_SZ 資料字串的字元。\n" +" 如果未指定 [/s]，分隔符號會預設為 \\0。\n" +"\n" +" /d <資料>\n" +" 要新增給新的登錄值的資料。\n" +"\n" +" /f\n" +" 修改登錄項目而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:202 msgid "" @@ -15644,6 +15447,35 @@ msgid "" "<key2>.\n" "\n" msgstr "" +"REG COPY <機碼1> <機碼2> [/s] [/f]\n" +"\n" +" 複製指定登錄機碼的內容到另一個位置。\n" +" 預設情況下，這個操作只會複製登錄值。\n" +" 使用 [/s] 來遞迴複製所有子機碼和值。\n" +"\n" +" <機碼1>, <機碼2>\n" +" 指定登錄機碼的來源 (<機碼1>) 和目標 (<機碼2>) 資料。\n" +" 如果 <機碼2> 不存在，系統將會建立它。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /s\n" +" 從 <機碼1> 複製所有子機碼和值到 <機碼2>。\n" +"\n" +" /f\n" +" 覆寫 <機碼2> 內所有的登錄資料而不需確認提示。\n" +" 這個選項不會修改只在 <機碼2> 存在的子機碼和值。\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -15683,6 +15515,41 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <機碼> [/v 值名稱 | /ve | /va] [/f]\n" +"\n" +" 刪除一個登錄機碼 (所有子機碼和值)，\n" +" 或從給定的登錄機碼刪除一個或多個值。\n" +"\n" +" <機碼>\n" +" 要刪除的登錄機碼。如果指定了 [/v]、[/ve] 或 [/va]，\n" +" 則可刪除登錄機碼內的一個或多個值。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要刪除的登錄值的名稱。\n" +"\n" +" /ve\n" +" 刪除未命名的登錄值。這個選項會刪除 (預設) 的\n" +" 登錄值。\n" +"\n" +" /va\n" +" 刪除登錄機碼的所有值。\n" +"\n" +" /f\n" +" 刪除一個登錄機碼 (包括所有子機碼和值)\n" +" 而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:170 msgid "" @@ -15714,6 +15581,33 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <機碼> <檔案> [/y]\n" +"\n" +" 將指定的登錄機碼 (包括所有子機碼和值)\n" +" 匯出到一個檔案。\n" +"\n" +" <機碼>\n" +" 要匯出的登錄機碼。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" <檔案>\n" +" 要建立的登錄檔案的名稱和路徑。\n" +" 檔案必須是 .reg 的副檔名。\n" +"\n" +" /y\n" +" 覆寫 <檔案> 而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:148 msgid "" @@ -15725,6 +15619,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <檔案>\n" +"\n" +" 從給定的檔案匯入機碼、值和資料到註冊表。\n" +"\n" +" <檔案>\n" +" 要匯入的登錄檔案的名稱和路徑。\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -15760,6 +15661,37 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <機碼> [/v 值名稱 | /ve] [/s]\n" +"\n" +" 查詢指定的登錄機碼，並列出該機碼中的所有即時子機碼、值和資料。\n" +" 使用 [/s] 來遞迴查詢每個子機碼。\n" +"\n" +" <機碼>\n" +" 要查詢的登錄機碼。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要查詢的登錄值的名稱。如果未指定 [/v] 或 [/ve]，\n" +" 則會列出 <機碼> 下所有的值。\n" +"\n" +" /ve\n" +" 查詢未命名的登錄值。這個選項會查詢 (預設) 的\n" +" 登錄值。\n" +"\n" +" /s\n" +" 列出 <機碼> 及其子機碼的所有登錄項目。\n" +"\n" #: programs/reg/reg.rc:180 msgid "" @@ -15770,122 +15702,98 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" 使用 32 位元登錄檢視來存取機碼。\n" +"\n" +" /reg:64\n" +" 使用 64 位元登錄檢視來存取機碼。\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的登錄機碼\n" #: programs/reg/reg.rc:119 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法存取遠端機器\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的系統金鑰\n" #: programs/reg/reg.rc:140 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " -msgstr "錯誤：無效的選項 %c。\n" +msgstr "reg: 無效的選項 [%1]。 " #: programs/reg/reg.rc:122 msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的數字值\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的十六進制值\n" #: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的字串\n" #: programs/reg/reg.rc:124 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: 未處理的登錄資料類型 [/t 0x%1!x!, /d %2]\n" #: programs/reg/reg.rc:121 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "不受支援的型態。\n" +msgstr "reg: 不支援的登錄資料類型 [%1]\n" #: programs/reg/reg.rc:125 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "登錄值 '%1' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:118 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "錯誤：無效的命令列參數\n" +msgstr "reg: 無效的命令列參數\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: 來源和目標機碼不可以相同\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "目標機碼內的值 '%1\\%2' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:133 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確定要刪除登錄值 '%1' 嗎?" #: programs/reg/reg.rc:134 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "您確認要刪除這個數值 %s 嗎？" +msgstr "您確定要刪除 '%1' 下的所有登錄值嗎?" #: programs/reg/reg.rc:135 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "確定要刪除 %1？" +msgstr "您確定要刪除登錄機碼 '%1' 嗎?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法刪除所有在 '%1' 下的登錄值\n" #: programs/reg/reg.rc:173 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案 '%1' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "reg: 無法辨識的逸出序列 [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法匯入登錄機碼 '%1'\n" #: programs/reg/reg.rc:150 -#, fuzzy -#| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" -msgstr "沒有任何命令被指定。" +msgstr "reg: 無法找到檔案 '%1'。\n" #: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" @@ -15893,7 +15801,7 @@ msgstr "(沒有設值)" #: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "搜尋完成。相符項目的數目: %1!d!\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" @@ -15901,16 +15809,16 @@ msgstr "註冊表(&R)" #: programs/regedit/regedit.rc:36 msgid "&Import Registry File..." -msgstr "匯入註冊表檔案(&I)..." +msgstr "匯入登錄檔案(&I)..." #: programs/regedit/regedit.rc:37 msgid "&Export Registry File..." -msgstr "匯出註冊表檔案(&E)..." +msgstr "匯出登錄檔案(&E)..." #: programs/regedit/regedit.rc:47 programs/regedit/regedit.rc:99 #: programs/regedit/regedit.rc:121 msgid "&Key" -msgstr "索引鍵(&K)" +msgstr "機碼(&K)" #: programs/regedit/regedit.rc:49 programs/regedit/regedit.rc:101 #: programs/regedit/regedit.rc:123 @@ -15920,12 +15828,12 @@ msgstr "字串值(&S)" #: programs/regedit/regedit.rc:50 programs/regedit/regedit.rc:102 #: programs/regedit/regedit.rc:124 msgid "&Binary Value" -msgstr "二進位值(&B)" +msgstr "二進制值(&B)" #: programs/regedit/regedit.rc:51 programs/regedit/regedit.rc:103 #: programs/regedit/regedit.rc:125 msgid "&DWORD Value" -msgstr "雙字組值(&D)" +msgstr "DWORD 值(&D)" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:104 #: programs/regedit/regedit.rc:126 @@ -15944,7 +15852,7 @@ msgstr "重新命名(&R)\tF2" #: programs/regedit/regedit.rc:59 programs/regedit/regedit.rc:114 msgid "&Copy Key Name" -msgstr "複製索引鍵名稱(&C)" +msgstr "複製機碼名稱(&C)" #: programs/regedit/regedit.rc:61 programs/regedit/regedit.rc:107 #: programs/wordpad/wordpad.rc:53 @@ -15974,13 +15882,11 @@ msgstr "關於註冊表編輯器(&A)" #: programs/regedit/regedit.rc:89 programs/regedit/regedit.rc:96 #: programs/regedit/regedit.rc:230 msgid "Expand" -msgstr "" +msgstr "展開" #: programs/regedit/regedit.rc:134 programs/regedit/regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "修改二進位資料..." +msgstr "修改二進位資料(&B)..." #: programs/regedit/regedit.rc:267 msgid "Export registry" @@ -15988,31 +15894,31 @@ msgstr "匯出註冊表" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" -msgstr "指定分支(&E)：" +msgstr "指定分支(&E):" #: programs/regedit/regedit.rc:278 msgid "Find:" -msgstr "搜尋：" +msgstr "尋找:" #: programs/regedit/regedit.rc:280 msgid "Find in:" -msgstr "在這找：" +msgstr "在這找:" #: programs/regedit/regedit.rc:281 msgid "Keys" -msgstr "索引鍵" +msgstr "機碼" #: programs/regedit/regedit.rc:282 msgid "Value names" -msgstr "數值名稱" +msgstr "值名稱" #: programs/regedit/regedit.rc:283 msgid "Value content" -msgstr "數值內容" +msgstr "值內容" #: programs/regedit/regedit.rc:284 msgid "Whole string only" -msgstr "整詞匹配" +msgstr "字串須完全相符" #: programs/regedit/regedit.rc:291 msgid "Add Favorite" @@ -16033,20 +15939,20 @@ msgstr "編輯字串" #: programs/regedit/regedit.rc:316 programs/regedit/regedit.rc:329 #: programs/regedit/regedit.rc:345 programs/regedit/regedit.rc:358 msgid "Value name:" -msgstr "數值名稱:" +msgstr "值名稱:" #: programs/regedit/regedit.rc:318 programs/regedit/regedit.rc:331 #: programs/regedit/regedit.rc:347 programs/regedit/regedit.rc:360 msgid "Value data:" -msgstr "數值資料:" +msgstr "值資料:" #: programs/regedit/regedit.rc:326 msgid "Edit DWORD" -msgstr "編輯雙字組" +msgstr "編輯 DWORD" #: programs/regedit/regedit.rc:333 msgid "Base" -msgstr "進位制" +msgstr "Base" #: programs/regedit/regedit.rc:334 msgid "Hexadecimal" @@ -16058,7 +15964,7 @@ msgstr "十進位" #: programs/regedit/regedit.rc:342 msgid "Edit Binary" -msgstr "編輯二進位資料" +msgstr "編輯二進位" #: programs/regedit/regedit.rc:355 msgid "Edit Multi-String" @@ -16081,13 +15987,9 @@ msgid "Contains commands for accessing frequently used keys" msgstr "含有與使用常用索引鍵有關的全部指令" #: programs/regedit/regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "含有與說明資訊有關的全部指令" +msgstr "含有顯示登錄編輯程式說明及資訊的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -16103,87 +16005,76 @@ msgstr "註冊表編輯器" #: programs/regedit/regedit.rc:221 msgid "Import Registry File" -msgstr "匯入註冊表檔案" +msgstr "匯入登錄檔案" #: programs/regedit/regedit.rc:222 msgid "Export Registry File" -msgstr "匯出註冊表檔案" +msgstr "匯出登錄檔案" #: programs/regedit/regedit.rc:223 msgid "Registry files (*.reg)" -msgstr "註冊表檔案 (*.reg)" +msgstr "登錄檔案 (*.reg)" #: programs/regedit/regedit.rc:224 msgid "Win9x/NT4 Registry files (REGEDIT4)" -msgstr "Win9x/NT4 註冊表檔案 (REGEDIT4)" +msgstr "Win9x/NT4 登錄檔案 (REGEDIT4)" #: programs/regedit/regedit.rc:241 msgid "(cannot display value)" -msgstr "(不能顯示值)" +msgstr "(無法顯示值)" #: programs/regedit/regedit.rc:242 msgid "(unknown %d)" -msgstr "(未知 %d)" +msgstr "(不明 %d)" #: programs/regedit/regedit.rc:247 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to modify the selected registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法編輯選定的登錄值。" #: programs/regedit/regedit.rc:248 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法建立新的登錄機碼。" #: programs/regedit/regedit.rc:249 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法建立新的登錄值。" #: programs/regedit/regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"無法重新命名機碼 '%1'。\n" +"指定的機碼名稱已經存在。" #: programs/regedit/regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"無法重新命名值 '%1'。\n" +"指定的值名稱已經存在。" #: programs/regedit/regedit.rc:252 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to delete the selected registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法刪除選定的登錄機碼。" #: programs/regedit/regedit.rc:253 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法重新命名選定的登錄機碼。" #: programs/regedit/regedit.rc:254 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法重新命名選定的登錄值" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "%1 所包含的機碼和值已成功新增至註冊表。" #: programs/regedit/regedit.rc:256 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "無法匯入 %1。指定的檔案不是有效的登錄檔案。" #: programs/regedit/regedit.rc:408 msgid "" @@ -16215,151 +16106,144 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" msgstr "" +"用法:\n" +" regedit [選項] [檔案名稱] [登錄機碼]\n" +"\n" +"選項:\n" +" [no option] 啟動本程式的圖形介面。\n" +" /L:system.dat 要修改的 system.dat 檔案位置。\n" +" 與任何其他切換參數相容。已略過。\n" +" /R:user.dat 要修改的 user.dat 檔案位置。\n" +" 與任何其他切換參數相容。已略過。\n" +" /C 匯入登錄檔案的內容。\n" +" /D 刪除指定的登錄機碼。\n" +" /E 匯出指定的登錄機碼內容到檔案。\n" +" 如果沒有指定機碼，則會匯出整個註冊表。\n" +" /S 靜音模式。不會顯示訊息。\n" +" /V 以進階模式啟動圖形介面。已略過。\n" +" /? 顯示這個資訊並結束。\n" +" [檔案名稱] 要匯入的註冊表資訊檔案的位置。\n" +" 當與 [/E] 一起使用時，這個選項會指定\n" +" 註冊表資訊檔案的匯出位置。\n" +" [登錄機碼] 要修改的登錄機碼。\n" +"\n" +"使用範例:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" +msgstr "regedit: 無效或無法辨識的切換參數 [%1]\n" #: programs/regedit/regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" -msgstr "" +msgstr "輸入 \"regedit /?\" 以取得說明。\n" #: programs/regedit/regedit.rc:411 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 未指定檔案名稱。\n" #: programs/regedit/regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: 未指定要移除的登錄機碼。\n" #: programs/regedit/regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" -msgstr "" +msgstr "regedit: 找不到檔案 '%1'。\n" #: programs/regedit/regedit.rc:414 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法開啟檔案 '%1'。\n" #: programs/regedit/regedit.rc:415 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "無效的控柄作業。\n" +msgstr "regedit: 未處理的操作。\n" #: programs/regedit/regedit.rc:416 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: 記憶體不足! (%1!S!, line %2!u!)\n" #: programs/regedit/regedit.rc:417 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "regedit: 錯誤的十六進位值。\n" #: programs/regedit/regedit.rc:418 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: 無法轉換十六進位資料。在 '%1' 遇到錯誤的值。\n" #: programs/regedit/regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "regedit: 無法辨識的逸出序列 [\\%1!c!]\n" #: programs/regedit/regedit.rc:420 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "不受支援的型態。\n" +msgstr "regedit: 不支援的登錄資料類型 [0x%1!x!]\n" #: programs/regedit/regedit.rc:421 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 在 '%1' 發現意外的結尾。\n" #: programs/regedit/regedit.rc:422 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line '%1' was not recognized.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 無法辨識列 '%1'。\n" #: programs/regedit/regedit.rc:423 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法從 '%1' 新增登錄值到 '%2'。\n" #: programs/regedit/regedit.rc:424 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法開啟登錄機碼 '%1'。\n" #: programs/regedit/regedit.rc:425 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "不受支援的型態。\n" +msgstr "regedit: 在 '%2' 遇到不支援的登錄資料類型 [0x%1!x!]。\n" #: programs/regedit/regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "" +msgstr "regedit: 登錄值 '%1' 將以二進位資料匯出。\n" #: programs/regedit/regedit.rc:427 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "regedit: 錯誤的系統金鑰 [%1]\n" #: programs/regedit/regedit.rc:428 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "regedit: 無法匯出 '%1'。找不到指定的登錄機碼。\n" #: programs/regedit/regedit.rc:429 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法刪除登錄機碼 '%1'。\n" #: programs/regedit/regedit.rc:431 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line contains invalid syntax.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 該列有錯誤的語法。\n" #: programs/regedit/regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "結束註冊表編輯器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" -msgstr "將索引鍵新增到我的最愛" +msgstr "將機碼新增到我的最愛" #: programs/regedit/regedit.rc:189 msgid "Removes keys from the favorites list" -msgstr "從我的最愛中刪除索引鍵" +msgstr "從我的最愛中刪除機碼" #: programs/regedit/regedit.rc:190 msgid "Shows or hides the status bar" msgstr "顯示或隱藏狀態列" #: programs/regedit/regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "改變兩個窗格之間的分隔線位置" +msgstr "變更兩個窗格之間的分隔線位置" #: programs/regedit/regedit.rc:192 msgid "Refreshes the window" @@ -16367,19 +16251,19 @@ msgstr "重新整理視窗" #: programs/regedit/regedit.rc:193 msgid "Deletes the selection" -msgstr "刪除選擇項目" +msgstr "刪除已選項目" #: programs/regedit/regedit.rc:194 msgid "Renames the selection" -msgstr "重新命名選擇項目" +msgstr "重新命名已選項目" #: programs/regedit/regedit.rc:195 msgid "Copies the name of the selected key to the clipboard" -msgstr "將索引鍵的名稱複製到剪貼簿" +msgstr "將機碼的名稱複製到剪貼簿" #: programs/regedit/regedit.rc:196 msgid "Finds a text string in a key, value or data" -msgstr "在索引鍵、值或資料中找字串" +msgstr "在機碼、值或資料中尋找字串" #: programs/regedit/regedit.rc:197 msgid "Finds next occurrence of text specified in previous search" @@ -16391,7 +16275,7 @@ msgstr "修改值的資料" #: programs/regedit/regedit.rc:171 msgid "Adds a new key" -msgstr "新增一個新的索引鍵" +msgstr "新增一個新的機碼" #: programs/regedit/regedit.rc:172 msgid "Adds a new string value" @@ -16402,10 +16286,8 @@ msgid "Adds a new binary value" msgstr "新增一個新的二進制值" #: programs/regedit/regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "新增一個新的二進制值" +msgstr "新增一個新的 32 位元值" #: programs/regedit/regedit.rc:177 msgid "Imports a text file into the registry" @@ -16413,118 +16295,92 @@ msgstr "將純文字檔案匯入註冊表" #: programs/regedit/regedit.rc:179 msgid "Exports all or part of the registry to a text file" -msgstr "將註冊表導出到純文字檔案" +msgstr "將註冊表匯出到純文字檔案" #: programs/regedit/regedit.rc:180 msgid "Prints all or part of the registry" msgstr "列印註冊表的全部或部分" #: programs/regedit/regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "註冊表編輯器" +msgstr "開啟註冊表編輯器的說明" #: programs/regedit/regedit.rc:182 msgid "Displays program information, version number and copyright" -msgstr "顯示程式資訊、版本號及版權" +msgstr "顯示程式資訊、版本號及著作權" #: programs/regedit/regedit.rc:206 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry value '%1'." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法查詢登錄值 '%1'。" #: programs/regedit/regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "無法編輯這類型的索引鍵 (%u)" +msgstr "無法編輯這種類型的登錄機碼 (%1!u!)。" #: programs/regedit/regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "數值太大 (%u)" +msgstr "登錄值太大 (%1!u!)。" #: programs/regedit/regedit.rc:209 msgid "Confirm Value Delete" -msgstr "確認刪除數值" +msgstr "確認刪除登錄值" #: programs/regedit/regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確認要刪除已選取的登錄值嗎?" #: programs/regedit/regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "找不到搜尋的字串 %s" +msgstr "搜尋完成。找不到字串 '%1'。" #: programs/regedit/regedit.rc:211 msgid "Are you sure you want to delete these values?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確認要刪除這些登錄值嗎?" #: programs/regedit/regedit.rc:214 msgid "New Key #%d" -msgstr "索引鍵 #%d" +msgstr "新機碼 #%d" #: programs/regedit/regedit.rc:215 msgid "New Value #%d" -msgstr "新索引鍵 #%d" +msgstr "新登錄值 #%d" #: programs/regedit/regedit.rc:205 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry key '%1'." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法查詢登錄機碼 '%1'。" #: programs/regedit/regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "修改值的資料" +msgstr "以二進位修改登錄值的資料" #: programs/regedit/regedit.rc:175 msgid "Adds a new multi-string value" -msgstr "新增一個多字串值" +msgstr "新增一個新的多字串值" #: programs/regedit/regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" -msgstr "匯出註冊表的所選分支到文字檔" +msgstr "匯出註冊表中已選取的分支到文字檔案" #: programs/regedit/regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "新增一個新的字串值" +msgstr "新增一個新的可擴充字串值" #: programs/regedit/regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "確認刪除數值" +msgstr "確認刪除機碼" #: programs/regedit/regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "確定要刪除 %1？" +msgstr "您確認要刪除這個登錄機碼及其所有的子機碼嗎?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "展開或摺疊已選取的節點" #: programs/regedit/regedit.rc:231 -#, fuzzy -#| msgid "C&ollate" msgid "Collapse" -msgstr "自動分頁(&O)" +msgstr "摺疊" #: programs/regsvr32/regsvr32.rc:33 msgid "" @@ -16533,6 +16389,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Wine DLL 註冊工具\n" +"\n" +"提供 DLL 註冊服務。\n" +"\n" #: programs/regsvr32/regsvr32.rc:41 msgid "" @@ -16547,85 +16407,66 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"用法:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] Dll名稱\n" +"\n" +"選項:\n" +" [/u] 取消註冊伺服器。\n" +" [/s] 靜音模式 (不會顯示訊息)。\n" +" [/i] 呼叫 DllInstall，並將選項傳給它 [cmdline]。\n" +"\t在與 [/u] 一起使用時，會以解除安裝模式呼叫 DllInstall。\n" +" [/n] 不要呼叫 DllRegisterServer。這個選項必須與 [/i] 一起使用。\n" +"\n" #: programs/regsvr32/regsvr32.rc:42 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regedit: 無效或無法辨識的切換參數 [%1]\n" +"\n" #: programs/regsvr32/regsvr32.rc:43 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "開啟 %1 失敗\n" +msgstr "regsvr32: 無法載入 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:44 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: '%1!S!' 尚未於 DLL '%2' 實作\n" #: programs/regsvr32/regsvr32.rc:45 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:46 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:47 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法解除註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:48 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功解除註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:49 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:50 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:51 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法解除安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:52 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功解除安裝 DLL '%1'\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with its " -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows " -#| "explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16656,30 +16497,31 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"啟始一個程式，或是利用關聯該檔案字尾的程式來開啟文件。\n" -"用法：\n" +"啟動程式，或根據檔案的後綴，使用一般用於開啟該後綴的程式來開啟文件。\n" +"用法:\n" "start [選項] 程式檔案名稱 [...]\n" "start [選項] 文件檔案名稱\n" "\n" -"選項：\n" -"「標題」指定子視窗的標題。\n" -"/d 目錄在指定的目錄中啟始程式。\n" -"/b 無法為程式建立新的主控臺。\n" -"/i 以新的環境變數啟始程式。\n" -"/min 啟始程式時縮到最小。\n" -"/max 啟始程式時放到最大。\n" -"/low 在閒置優先權類別中啟始程式。\n" -"/normal 在一般優先權類別中啟始程式。\n" -"/high 在高優先權類別中啟始程式。\n" -"/realtime 在即時優先權類別中啟始程式。\n" -"/abovenormal 在正常之上優先權類別中啟始程式。\n" -"/belownormal 在正常之下優先權類別中啟始程式。\n" -"/node n 在指定的 NUMA 節點之上啟始程式。\n" -"/affinity 遮罩以指定的近似遮罩啟始程式。\n" -"/wait 等待啟始的程式直到完成，然後以它的離開代碼離開。\n" -"/unix 使用 Unix 檔名並如同 Windows 檔案總管來啟始檔案。\n" -"/ProgIDOpen 使用指定的 progID 開啟文件。\n" -"/? 顯示這份說明然後離開。\n" +"選項:\n" +"\"標題\" 指定子視窗的標題。\n" +"/d 目錄於指定的目錄開啟程式。\n" +"/b 不要為程式建立新的主控臺。\n" +"/i 使用新的環境變數來啟動程式。\n" +"/min 啟動程式時將視窗最小化。\n" +"/max 啟動程式時將視窗最大化。\n" +"/low 在 Idle 優先類別中啟動程式。\n" +"/normal 在 Normal 優先類別中啟動程式。\n" +"/high 在 High 優先類別中啟動程式。\n" +"/realtime 在 Realtime 優先類別中啟動程式。\n" +"/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" +"/belownormal 在 Belownormal 優先類別中啟動程式。\n" +"/node n 以指定的 NUMA 節點啟動程式。\n" +"/affinity mask 以指定的親和性遮罩啟動程式。\n" +"/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" +"/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" +"/exec 對指定檔案進行 Exec (在 Wine 內部使用)。\n" +"/ProgIDOpen 使用指定的 progID 來開啟檔案。\n" +"/? 顯示這個說明並結束。\n" #: programs/start/start.rc:59 msgid "" @@ -16687,12 +16529,12 @@ msgid "" "specified file.\n" "ShellExecuteEx failed" msgstr "" -"無法啟始應用程式，或是沒有與指定檔案關聯的應用程式。\n" +"無法啟動應用程式，或是沒有與指定檔案關聯的應用程式。\n" "ShellExecuteEx 失敗" #: programs/start/start.rc:61 msgid "Could not translate the specified Unix filename to a DOS filename." -msgstr "無法翻譯指定的 Unix 檔名到 DOS 檔名。" +msgstr "無法翻譯指定的 Unix 檔案名稱到 DOS 檔案名稱。" #: programs/taskkill/taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -- 2.33.0

1 0

[PATCH 01/14] mshtml: Retry with VT_NULL when removing an attribute.
by Gabriel Ivăncescu 17 Nov '21

17 Nov '21

set_event_handler fails with "attempt to set to VT_EMPTY in quirks mode" intentionally. But it shouldn't throw when removing the builtin attribute. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 5 ++++ dlls/mshtml/tests/documentmode.js | 40 +++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 96a776d..bddb0e3 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1466,6 +1466,11 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) V_VT(&var) = VT_EMPTY; hres = builtin_propput(This, func, &dp, NULL); + if(hres == E_NOTIMPL) { + /* Setting event handlers to VT_EMPTY fails in quirks mode */ + V_VT(&var) = VT_NULL; + hres = builtin_propput(This, func, &dp, NULL); + } if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d566223..c197f9b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1087,6 +1087,46 @@ sync_test("elem_attr", function() { ok(r === "cls2", "class attr = " + r); r = elem.getAttribute("className"); ok(r === "cls3", "className attr = " + r); + + var func = function() { }; + elem.onclick = func; + ok(elem.onclick === func, "onclick = " + elem.onclick); + r = elem.getAttribute("onclick"); + ok(r === (v < 8 ? func : null), "onclick attr = " + r); + r = elem.removeAttribute("onclick"); + todo_wine_if(v < 9). + ok(r === (v < 9 ? false : undefined), "removeAttribute returned " + r); + todo_wine_if(v < 9). + ok(elem.onclick === (v != 8 ? func : null), "removed onclick = " + elem.onclick); + + elem.onclick_test = func; + ok(elem.onclick_test === func, "onclick_test = " + elem.onclick_test); + r = elem.getAttribute("onclick_test"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? func : (v < 9 ? func.toString() : null)), "onclick_test attr = " + r); + + elem.setAttribute("onclick", "test"); + r = elem.getAttribute("onclick"); + ok(r === "test", "onclick attr after setAttribute = " + r); + r = elem.removeAttribute("onclick"); + ok(r === (v < 9 ? true : undefined), "removeAttribute after setAttribute returned " + r); + + elem.setAttribute("onclick", "string"); + r = elem.getAttribute("onclick"); + ok(r === "string", "onclick attr after setAttribute = " + r); + elem.onclick = func; + ok(elem.onclick === func, "onclick = " + elem.onclick); + r = elem.getAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? func : (v < 9 ? null : "string")), "onclick attr = " + r); + elem.onclick = "test"; + r = elem.getAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 9 ? "test" : "string"), "onclick attr = " + r); + r = elem.removeAttribute("onclick"); + ok(r === (v < 9 ? true : undefined), "removeAttribute returned " + r); + todo_wine_if(v >= 8). + ok(elem.onclick === null, "removed onclick = " + elem.onclick); }); sync_test("__proto__", function() { -- 2.31.1

3 30

[PATCH vkd3d v5 1/6] vkd3d-shader/hlsl: Remove trivial swizzles.
by Giovanni Mascellani 16 Nov '21

16 Nov '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 24b8205c..f8b977b0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -475,6 +475,27 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_swizzle *swizzle; + unsigned int i; + + if (instr->type != HLSL_IR_SWIZZLE) + return false; + swizzle = hlsl_ir_swizzle(instr); + + if (instr->data_type->dimx != swizzle->val.node->data_type->dimx) + return false; + + for (i = 0; i < instr->data_type->dimx; ++i) + if (((swizzle->swizzle >> (2 * i)) & 3) != i) + return false; + + replace_node(instr, swizzle->val.node); + + return true; +} + /* Lower DIV to RCP + MUL. */ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -1355,6 +1376,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun } while (progress); while (transform_ir(ctx, fold_constants, body, NULL)); + transform_ir(ctx, remove_trivial_swizzles, body, NULL); if (ctx->profile->major_version < 4) transform_ir(ctx, lower_division, body, NULL); -- 2.33.1

3 11

[PATCH 0/6] Improvements around module handling in dbghelp
by Eric Pouech 16 Nov '21

16 Nov '21

The following series implements: - a couple of bug fixes related to module management - a change in collision detection while loading modules: + logic based on module base address (rather than name) + allow loading several modules with same module names (either multiple times the same module, or different modules with same module name) A+ --- Eric Pouech (6): dbghelp: fix module name construction dbghelp: always search current directory when loading PE modules dbghelp: allow 32bit dbghelp to handle 64 addresses dbghelp: move debug info loading out of image backends into SymLoadModuleEx() dbghelp: detect collision by looking at module's base address in SymLoadModuleEx() dbghelp: improve collision handling in SymLoadModuleEx() dlls/dbghelp/elf_module.c | 7 +- dlls/dbghelp/macho_module.c | 4 - dlls/dbghelp/module.c | 169 +++++++++++++++++++----------------- dlls/dbghelp/pe_module.c | 12 +-- 4 files changed, 95 insertions(+), 97 deletions(-)

1 6

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