- wine-devel - winehq.org

[PATCH] winetest: Don't truncate oversize reports before sending them.
by Francois Gouget 28 Oct '21

28 Oct '21

test.winehq.org already sets $CGI::POST_MAX to reject oversize reports. Furthermore truncated reports are rejected anyway. So avoid the code duplication and inconsistencies between the winetest and test.winehq.org (or other site) size limits. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/winetest/send.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/programs/winetest/send.c b/programs/winetest/send.c index 4b575e11a34..2416faa3192 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -162,15 +162,9 @@ send_file_direct (const char * url, const char *name) report (R_WARNING, "Can't open file '%s': %u", name, GetLastError()); goto abort1; } - filesize = GetFileSize( file, NULL ); - if (filesize > 1.5*1024*1024) { - report (R_WARNING, - "File too big (%.1f MB > 1.5 MB); submitting partial report.", - filesize/1024.0/1024); - filesize = (DWORD) 1.5*1024*1024; - } report (R_STATUS, "Sending header"); + filesize = GetFileSize( file, NULL ); str = strmake (&total, body1, name); ret = send_str (s, head, filesize + total + sizeof body2 - 1) || send_buf (s, str, total); @@ -339,14 +333,6 @@ send_file_wininet (const char *url, const char *name) goto done; } - filesize = GetFileSize( file, NULL ); - if (filesize > 1.5*1024*1024) { - report (R_WARNING, - "File too big (%.1f MB > 1.5 MB); submitting partial report.", - filesize/1024.0/1024); - filesize = 1.5*1024*1024; - } - report (R_STATUS, "Opening %s connection to %s:%d", (uc.nScheme == INTERNET_SCHEME_HTTP ? "http" : "https"), uc.lpszHostName, uc.nPort); @@ -369,6 +355,7 @@ send_file_wininet (const char *url, const char *name) } report (R_STATUS, "Sending request"); + filesize = GetFileSize( file, NULL ); str = strmake (&total, body1, name); memset(&buffers_in, 0, sizeof(INTERNET_BUFFERSA)); buffers_in.dwStructSize = sizeof(INTERNET_BUFFERSA); -- 2.30.2

1 1

[PATCH v2 1/5] dinput: Reduce data format trace verbosity.
by Rémi Bernon 28 Oct '21

28 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Try fixing some possible spurious failures from PATCH 2 dlls/dinput/device.c | 63 +++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 040a97eb06b..5b96002ea4a 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -67,6 +67,20 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl( struct dinpu return &This->IDirectInputDevice8W_iface; } +static inline const char *debugstr_didataformat( const DIDATAFORMAT *data ) +{ + if (!data) return "(null)"; + return wine_dbg_sprintf( "%p dwSize %u, dwObjsize %u, dwFlags %#x, dwDataSize %u, dwNumObjs %u, rgodf %p", + data, data->dwSize, data->dwObjSize, data->dwFlags, data->dwDataSize, data->dwNumObjs, data->rgodf ); +} + +static inline const char *debugstr_diobjectdataformat( const DIOBJECTDATAFORMAT *data ) +{ + if (!data) return "(null)"; + return wine_dbg_sprintf( "%p pguid %s, dwOfs %#x, dwType %#x, dwFlags %#x", data, + debugstr_guid( data->pguid ), data->dwOfs, data->dwType, data->dwFlags ); +} + /****************************************************************************** * Various debugging tools */ @@ -225,40 +239,6 @@ static const char *_dump_dinput_GUID( const GUID *guid ) return debugstr_guid(guid); } -static void _dump_DIDATAFORMAT( const DIDATAFORMAT *df ) -{ - unsigned int i; - - TRACE("Dumping DIDATAFORMAT structure:\n"); - TRACE(" - dwSize: %d\n", df->dwSize); - if (df->dwSize != sizeof(DIDATAFORMAT)) { - WARN("Non-standard DIDATAFORMAT structure size %d\n", df->dwSize); - } - TRACE(" - dwObjsize: %d\n", df->dwObjSize); - if (df->dwObjSize != sizeof(DIOBJECTDATAFORMAT)) { - WARN("Non-standard DIOBJECTDATAFORMAT structure size %d\n", df->dwObjSize); - } - TRACE(" - dwFlags: 0x%08x (", df->dwFlags); - switch (df->dwFlags) { - case DIDF_ABSAXIS: TRACE("DIDF_ABSAXIS"); break; - case DIDF_RELAXIS: TRACE("DIDF_RELAXIS"); break; - default: TRACE("unknown"); break; - } - TRACE(")\n"); - TRACE(" - dwDataSize: %d\n", df->dwDataSize); - TRACE(" - dwNumObjs: %d\n", df->dwNumObjs); - - for (i = 0; i < df->dwNumObjs; i++) { - TRACE(" - Object %d:\n", i); - TRACE(" * GUID: %s ('%s')\n", debugstr_guid(df->rgodf[i].pguid), _dump_dinput_GUID(df->rgodf[i].pguid)); - TRACE(" * dwOfs: %d\n", df->rgodf[i].dwOfs); - TRACE(" * dwType: 0x%08x\n", df->rgodf[i].dwType); - TRACE(" "); _dump_EnumObjects_flags(df->rgodf[i].dwType); TRACE("\n"); - TRACE(" * dwFlags: 0x%08x\n", df->rgodf[i].dwFlags); - TRACE(" "); _dump_ObjectDataFormat_flags(df->rgodf[i].dwFlags); TRACE("\n"); - } -} - /****************************************************************************** * Get the default and the app-specific config keys. */ @@ -933,11 +913,16 @@ static HRESULT WINAPI dinput_device_SetDataFormat( IDirectInputDevice8W *iface, { struct dinput_device *This = impl_from_IDirectInputDevice8W( iface ); HRESULT res = DI_OK; + ULONG i; TRACE( "iface %p, format %p.\n", iface, format ); if (!format) return E_POINTER; - _dump_DIDATAFORMAT( format ); + if (TRACE_ON( dinput )) + { + TRACE( "user format %s\n", debugstr_didataformat( format ) ); + for (i = 0; i < format->dwNumObjs; ++i) TRACE( " %u: object %s\n", i, debugstr_diobjectdataformat( format->rgodf + i ) ); + } if (format->dwSize != sizeof(DIDATAFORMAT)) return DIERR_INVALIDPARAM; if (format->dwObjSize != sizeof(DIOBJECTDATAFORMAT)) return DIERR_INVALIDPARAM; @@ -2182,7 +2167,7 @@ HRESULT dinput_device_init( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); DIDATAFORMAT *format = impl->data_format.wine_df; - ULONG size; + ULONG i, size; IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); if (format->dwDataSize > DEVICE_STATE_MAX_SIZE) @@ -2199,5 +2184,11 @@ HRESULT dinput_device_init( IDirectInputDevice8W *iface ) format->dwNumObjs = 0; IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); + if (TRACE_ON( dinput )) + { + TRACE( "device format %s\n", debugstr_didataformat( format ) ); + for (i = 0; i < format->dwNumObjs; ++i) TRACE( " %u: object %s\n", i, debugstr_diobjectdataformat( format->rgodf + i ) ); + } + return DI_OK; } -- 2.33.0

1 4

[PATCH 1/3] mfreadwrite/reader: Add recognition of ftypeMSNV mp4 header.
by Rémi Bernon 28 Oct '21

28 Oct '21

Needed by Greedfall intro videos. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index d26778dad36..7bcb52eaaa6 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2395,6 +2395,7 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) static const unsigned char wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; static const unsigned char wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; static const unsigned char isommagic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'i', 's', 'o', 'm',0x00,0x00,0x00,0x00}; + static const unsigned char mp4_magic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'M', 'S', 'N', 'V',0x00,0x00,0x00,0x00}; static const unsigned char mp42magic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'm', 'p', '4', '2',0x00,0x00,0x00,0x00}; static const unsigned char mp4mask[] = {0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00}; static const struct stream_content_url_hint @@ -2409,6 +2410,7 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { wavmagic, L".wav", wavmask }, { isommagic, L".mp4", mp4mask }, { mp42magic, L".mp4", mp4mask }, + { mp4_magic, L".mp4", mp4mask }, }; unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)]; unsigned int i, j, length = 0, caps = 0; -- 2.33.0

3 8

[PATCH 1/5] dinput: Reduce data format trace verbosity.
by Rémi Bernon 28 Oct '21

28 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 63 +++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 040a97eb06b..3e398f11dad 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -67,6 +67,20 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl( struct dinpu return &This->IDirectInputDevice8W_iface; } +static inline const char *debugstr_didataformat( const DIDATAFORMAT *data ) +{ + if (!data) return "(null)"; + return wine_dbg_sprintf( "%p dwSize %u, dwObjsize %u, dwFlags %#x, dwDataSize %u, dwNumObjs %u, rgodf %p", + data, data->dwSize, data->dwObjSize, data->dwFlags, data->dwDataSize, data->dwNumObjs, data->rgodf ); +} + +static inline const char *debugstr_diobjectdataformat( const DIOBJECTDATAFORMAT *data ) +{ + if (!data) return "(null)"; + return wine_dbg_sprintf( "%p, pguid %s, dwOfs %#x, dwType %#x, dwFlags %#x", data, + debugstr_guid( data->pguid ), data->dwOfs, data->dwType, data->dwFlags ); +} + /****************************************************************************** * Various debugging tools */ @@ -225,40 +239,6 @@ static const char *_dump_dinput_GUID( const GUID *guid ) return debugstr_guid(guid); } -static void _dump_DIDATAFORMAT( const DIDATAFORMAT *df ) -{ - unsigned int i; - - TRACE("Dumping DIDATAFORMAT structure:\n"); - TRACE(" - dwSize: %d\n", df->dwSize); - if (df->dwSize != sizeof(DIDATAFORMAT)) { - WARN("Non-standard DIDATAFORMAT structure size %d\n", df->dwSize); - } - TRACE(" - dwObjsize: %d\n", df->dwObjSize); - if (df->dwObjSize != sizeof(DIOBJECTDATAFORMAT)) { - WARN("Non-standard DIOBJECTDATAFORMAT structure size %d\n", df->dwObjSize); - } - TRACE(" - dwFlags: 0x%08x (", df->dwFlags); - switch (df->dwFlags) { - case DIDF_ABSAXIS: TRACE("DIDF_ABSAXIS"); break; - case DIDF_RELAXIS: TRACE("DIDF_RELAXIS"); break; - default: TRACE("unknown"); break; - } - TRACE(")\n"); - TRACE(" - dwDataSize: %d\n", df->dwDataSize); - TRACE(" - dwNumObjs: %d\n", df->dwNumObjs); - - for (i = 0; i < df->dwNumObjs; i++) { - TRACE(" - Object %d:\n", i); - TRACE(" * GUID: %s ('%s')\n", debugstr_guid(df->rgodf[i].pguid), _dump_dinput_GUID(df->rgodf[i].pguid)); - TRACE(" * dwOfs: %d\n", df->rgodf[i].dwOfs); - TRACE(" * dwType: 0x%08x\n", df->rgodf[i].dwType); - TRACE(" "); _dump_EnumObjects_flags(df->rgodf[i].dwType); TRACE("\n"); - TRACE(" * dwFlags: 0x%08x\n", df->rgodf[i].dwFlags); - TRACE(" "); _dump_ObjectDataFormat_flags(df->rgodf[i].dwFlags); TRACE("\n"); - } -} - /****************************************************************************** * Get the default and the app-specific config keys. */ @@ -933,11 +913,16 @@ static HRESULT WINAPI dinput_device_SetDataFormat( IDirectInputDevice8W *iface, { struct dinput_device *This = impl_from_IDirectInputDevice8W( iface ); HRESULT res = DI_OK; + ULONG i; TRACE( "iface %p, format %p.\n", iface, format ); if (!format) return E_POINTER; - _dump_DIDATAFORMAT( format ); + if (TRACE_ON( dinput )) + { + TRACE( "user format %s\n", debugstr_didataformat( format ) ); + for (i = 0; i < format->dwNumObjs; ++i) TRACE( " %u: object %s\n", i, debugstr_diobjectdataformat( format->rgodf + i ) ); + } if (format->dwSize != sizeof(DIDATAFORMAT)) return DIERR_INVALIDPARAM; if (format->dwObjSize != sizeof(DIOBJECTDATAFORMAT)) return DIERR_INVALIDPARAM; @@ -2182,7 +2167,7 @@ HRESULT dinput_device_init( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); DIDATAFORMAT *format = impl->data_format.wine_df; - ULONG size; + ULONG i, size; IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); if (format->dwDataSize > DEVICE_STATE_MAX_SIZE) @@ -2199,5 +2184,11 @@ HRESULT dinput_device_init( IDirectInputDevice8W *iface ) format->dwNumObjs = 0; IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); + if (TRACE_ON( dinput )) + { + TRACE( "device format %s\n", debugstr_didataformat( format ) ); + for (i = 0; i < format->dwNumObjs; ++i) TRACE( " %u: object %s\n", i, debugstr_diobjectdataformat( format->rgodf + i ) ); + } + return DI_OK; } -- 2.33.0

2 5

[PATCH 0/7] Inlined frames support in dbghelp
by Eric Pouech 28 Oct '21

28 Oct '21

The following series implements the stack walking and symbol functions for inlined frames for dwarf. v3: - reorder to avoid dead code - remaimaing of the inlined frames support --- Eric Pouech (7): dbghelp: introduce symt_inlinesite (SymTagInlineSite) to support inline sites dbghelp/dwarf: add current block as a field in dwarf2_subprogram_t dbghelp/dwarf: generate proper inline function dbghelp/dwarf: store each subrange for an inlined function dbghelp: implement StackWalkEx for inlined frames dbghelp: implement SymFromInlineContext when frame is inlined dbghelp: implement the SymSetScopeFromInlineContex() for inlined frame dlls/dbghelp/dbghelp.c | 12 ++ dlls/dbghelp/dbghelp_private.h | 88 +++++++++++++- dlls/dbghelp/dwarf.c | 185 ++++++++++++++++++++-------- dlls/dbghelp/msc.c | 4 +- dlls/dbghelp/stack.c | 38 ++++-- dlls/dbghelp/symbol.c | 213 +++++++++++++++++++++++++++++---- dlls/dbghelp/type.c | 16 +++ 7 files changed, 466 insertions(+), 90 deletions(-)

1 7

[PATCH 4/4] msdasql: Add IDBCreateCommand to session
by Alistair Leslie-Hughes 28 Oct '21

28 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index d4d55f76c3c..e01dcf7ab7e 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -40,6 +40,7 @@ struct msdasql_session IGetDataSource IGetDataSource_iface; IOpenRowset IOpenRowset_iface; ISessionProperties ISessionProperties_iface; + IDBCreateCommand IDBCreateCommand_iface; LONG refs; }; @@ -63,6 +64,11 @@ static inline struct msdasql_session *impl_from_ISessionProperties( ISessionProp return CONTAINING_RECORD( iface, struct msdasql_session, ISessionProperties_iface ); } +static inline struct msdasql_session *impl_from_IDBCreateCommand( IDBCreateCommand *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, IDBCreateCommand_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -90,6 +96,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IID_ISessionProperties %p)\n", iface, ppv); *ppv = &session->ISessionProperties_iface; } + else if(IsEqualGUID(&IID_IDBCreateCommand, riid)) + { + TRACE("(%p)->(IDBCreateCommand_iface %p)\n", iface, ppv); + *ppv = &session->IDBCreateCommand_iface; + } if(*ppv) { @@ -246,6 +257,41 @@ static const ISessionPropertiesVtbl propertiesVtbl = properties_SetProperties }; +static HRESULT WINAPI createcommand_QueryInterface(IDBCreateCommand *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +static ULONG WINAPI createcommand_AddRef(IDBCreateCommand *iface) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +static ULONG WINAPI createcommand_Release(IDBCreateCommand *iface) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + return IUnknown_Release(&session->session_iface); +} + +static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, + IUnknown **out) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + FIXME("%p, %p, %s, %p\n", session, outer, debugstr_guid(riid), out); + + return E_NOTIMPL; +} + +static const IDBCreateCommandVtbl createcommandVtbl = +{ + createcommand_QueryInterface, + createcommand_AddRef, + createcommand_Release, + createcommand_CreateCommand +}; + HRESULT create_db_session(REFIID riid, void **unk) { struct msdasql_session *session; @@ -259,6 +305,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->IGetDataSource_iface.lpVtbl = &datasourceVtbl; session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; + session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); -- 2.33.0

1 0

[PATCH 3/4] msdasql: Add ISessionProperties to session
by Alistair Leslie-Hughes 28 Oct '21

28 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 58 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 +++ 2 files changed, 63 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 465a89d199a..d4d55f76c3c 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -39,6 +39,7 @@ struct msdasql_session IUnknown session_iface; IGetDataSource IGetDataSource_iface; IOpenRowset IOpenRowset_iface; + ISessionProperties ISessionProperties_iface; LONG refs; }; @@ -57,6 +58,11 @@ static inline struct msdasql_session *impl_from_IOpenRowset( IOpenRowset *iface return CONTAINING_RECORD( iface, struct msdasql_session, IOpenRowset_iface ); } +static inline struct msdasql_session *impl_from_ISessionProperties( ISessionProperties *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, ISessionProperties_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -79,6 +85,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IID_IOpenRowset %p)\n", iface, ppv); *ppv = &session->IOpenRowset_iface; } + else if(IsEqualGUID(&IID_ISessionProperties, riid)) + { + TRACE("(%p)->(IID_ISessionProperties %p)\n", iface, ppv); + *ppv = &session->ISessionProperties_iface; + } if(*ppv) { @@ -189,6 +200,52 @@ static const IOpenRowsetVtbl openrowsetVtbl = openrowset_OpenRowset }; +static HRESULT WINAPI properties_QueryInterface(ISessionProperties *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +static ULONG WINAPI properties_AddRef(ISessionProperties *iface) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +static ULONG WINAPI properties_Release(ISessionProperties *iface) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + return IUnknown_Release(&session->session_iface); +} + + +static HRESULT WINAPI properties_GetProperties(ISessionProperties *iface, ULONG set_count, + const DBPROPIDSET id_sets[], ULONG *count, DBPROPSET **sets) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + FIXME("%p %d %p %p %p\n", session, set_count, id_sets, count, sets); + + return E_NOTIMPL; +} + +static HRESULT WINAPI properties_SetProperties(ISessionProperties *iface, ULONG count, + DBPROPSET sets[]) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + FIXME("%p %d %p\n", session, count, sets); + + return S_OK; +} + +static const ISessionPropertiesVtbl propertiesVtbl = +{ + properties_QueryInterface, + properties_AddRef, + properties_Release, + properties_GetProperties, + properties_SetProperties +}; + HRESULT create_db_session(REFIID riid, void **unk) { struct msdasql_session *session; @@ -201,6 +258,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->session_iface.lpVtbl = &unkfactoryVtbl; session->IGetDataSource_iface.lpVtbl = &datasourceVtbl; session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; + session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; 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 4eaf6c07355..0d9630070b3 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -160,6 +160,7 @@ static void test_sessions(void) IOpenRowset *openrowset = NULL; IDBCreateCommand *create_command = NULL; IGetDataSource *datasource = NULL; + ISessionProperties *session_props = NULL; IUnknown *cmd = NULL; HRESULT hr; BSTR connect_str; @@ -208,6 +209,10 @@ static void test_sessions(void) ok(hr == S_OK, "got 0x%08x\n", hr); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ISessionProperties, (void**)&session_props); + ok(hr == S_OK, "got 0x%08x\n", hr); + ISessionProperties_Release(session_props); + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.33.0

1 0

[PATCH 2/4] msdasql: Add IOpenRowset support to session
by Alistair Leslie-Hughes 28 Oct '21

28 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index b79a80389ff..465a89d199a 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -38,6 +38,7 @@ struct msdasql_session { IUnknown session_iface; IGetDataSource IGetDataSource_iface; + IOpenRowset IOpenRowset_iface; LONG refs; }; @@ -51,6 +52,11 @@ static inline struct msdasql_session *impl_from_IGetDataSource( IGetDataSource * return CONTAINING_RECORD( iface, struct msdasql_session, IGetDataSource_iface ); } +static inline struct msdasql_session *impl_from_IOpenRowset( IOpenRowset *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, IOpenRowset_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -68,6 +74,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IID_IGetDataSource %p)\n", iface, ppv); *ppv = &session->IGetDataSource_iface; } + else if(IsEqualGUID(&IID_IOpenRowset, riid)) + { + TRACE("(%p)->(IID_IOpenRowset %p)\n", iface, ppv); + *ppv = &session->IOpenRowset_iface; + } if(*ppv) { @@ -142,6 +153,42 @@ static const IGetDataSourceVtbl datasourceVtbl = datasource_GetDataSource }; +HRESULT WINAPI openrowset_QueryInterface(IOpenRowset *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_IOpenRowset( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +ULONG WINAPI openrowset_AddRef(IOpenRowset *iface) +{ + struct msdasql_session *session = impl_from_IOpenRowset( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +ULONG WINAPI openrowset_Release(IOpenRowset *iface) +{ + struct msdasql_session *session = impl_from_IOpenRowset( iface ); + return IUnknown_Release(&session->session_iface); +} + +HRESULT WINAPI openrowset_OpenRowset(IOpenRowset *iface, IUnknown *pUnkOuter, DBID *table, + DBID *index, REFIID riid, ULONG count, DBPROPSET propertysets[], IUnknown **rowset) +{ + struct msdasql_session *session = impl_from_IOpenRowset( iface ); + FIXME("%p, %p, %p %p %s, %d %p %p stub\n", session, pUnkOuter, table, index, debugstr_guid(riid), + count, propertysets, rowset); + + return E_NOTIMPL; +} + +static const IOpenRowsetVtbl openrowsetVtbl = +{ + openrowset_QueryInterface, + openrowset_AddRef, + openrowset_Release, + openrowset_OpenRowset +}; + HRESULT create_db_session(REFIID riid, void **unk) { struct msdasql_session *session; @@ -153,6 +200,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->session_iface.lpVtbl = &unkfactoryVtbl; session->IGetDataSource_iface.lpVtbl = &datasourceVtbl; + session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); -- 2.33.0

1 0

[PATCH 1/4] msdasql: Add IGetDataSource support to session
by Alistair Leslie-Hughes 28 Oct '21

28 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 47 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 52 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 57174be40f8..b79a80389ff 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); struct msdasql_session { IUnknown session_iface; + IGetDataSource IGetDataSource_iface; LONG refs; }; @@ -45,6 +46,11 @@ static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) return CONTAINING_RECORD( iface, struct msdasql_session, session_iface ); } +static inline struct msdasql_session *impl_from_IGetDataSource( IGetDataSource *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, IGetDataSource_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -57,6 +63,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); *ppv = &session->session_iface; } + else if(IsEqualGUID(&IID_IGetDataSource, riid)) + { + TRACE("(%p)->(IID_IGetDataSource %p)\n", iface, ppv); + *ppv = &session->IGetDataSource_iface; + } if(*ppv) { @@ -96,6 +107,41 @@ static const IUnknownVtbl unkfactoryVtbl = session_Release, }; + +HRESULT WINAPI datasource_QueryInterface(IGetDataSource *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_IGetDataSource( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +ULONG WINAPI datasource_AddRef(IGetDataSource *iface) +{ + struct msdasql_session *session = impl_from_IGetDataSource( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +ULONG WINAPI datasource_Release(IGetDataSource *iface) +{ + struct msdasql_session *session = impl_from_IGetDataSource( iface ); + return IUnknown_Release(&session->session_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; +} + +static const IGetDataSourceVtbl datasourceVtbl = +{ + datasource_QueryInterface, + datasource_AddRef, + datasource_Release, + datasource_GetDataSource +}; + HRESULT create_db_session(REFIID riid, void **unk) { struct msdasql_session *session; @@ -106,6 +152,7 @@ HRESULT create_db_session(REFIID riid, void **unk) return E_OUTOFMEMORY; session->session_iface.lpVtbl = &unkfactoryVtbl; + session->IGetDataSource_iface.lpVtbl = &datasourceVtbl; 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 4cab6a24daf..4eaf6c07355 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -159,6 +159,7 @@ static void test_sessions(void) IUnknown *session = NULL; IOpenRowset *openrowset = NULL; IDBCreateCommand *create_command = NULL; + IGetDataSource *datasource = NULL; IUnknown *cmd = NULL; HRESULT hr; BSTR connect_str; @@ -203,6 +204,10 @@ static void test_sessions(void) hr = IDBCreateSession_CreateSession( dbsession, NULL, &IID_IUnknown, &session ); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(session, &IID_IGetDataSource, (void**)&datasource); + ok(hr == S_OK, "got 0x%08x\n", hr); + IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.33.0

1 0

[PATCH] dwrite/tests: Add more tests for GetSystemFontCollection.
by Daniel Lehman 27 Oct '21

27 Oct '21

1 0

[PATCH 1/3] uiautomationcore: Implement UiaGetReservedNotSupportedValue.
by Connor McAdams 27 Oct '21

27 Oct '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 196 +++++++++++++++++++++++++++++- 2 files changed, 195 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 71ea7b99c94..5a72ea144c4 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +IMPORTS = uuid ole32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2dada95af80..e51a4b4d555 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,12 +16,199 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "uiautomation.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); +struct uia_rsrv_ftmarshaler +{ + IMarshal IMarshal_iface; + + IUnknown *inner_unk; + IMarshal *marshal; +}; + +/* + * Create a custom proxy IMarshal, so that IMarshal::Release actually releases + * the interface. + */ +static struct uia_rsrv_ftmarshaler *impl_uia_rsrv_ft_from_IMarshal(IMarshal *iface) +{ + return CONTAINING_RECORD(iface, struct uia_rsrv_ftmarshaler, IMarshal_iface); +} + +static HRESULT WINAPI uia_rsrv_ftmarshaler_QueryInterface(IMarshal *iface, REFIID riid, void **obj) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ft_from_IMarshal(iface); + + TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), obj); + + return IMarshal_QueryInterface(marshaler->marshal, riid, obj); +} + +static ULONG WINAPI uia_rsrv_ftmarshaler_AddRef(IMarshal *iface) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ft_from_IMarshal(iface); + ULONG ref = IUnknown_AddRef(marshaler->inner_unk); + + TRACE("%p, ref %d\n", iface, ref); + + return ref; +} + +static ULONG WINAPI uia_rsrv_ftmarshaler_Release(IMarshal *iface) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ft_from_IMarshal(iface); + ULONG ref = IUnknown_Release(marshaler->inner_unk); + + TRACE("%p, ref %d\n", iface, ref); + + if (!ref) + heap_free(marshaler); + + return ref; +} + +static HRESULT WINAPI uia_rsrv_ftmarshaler_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, + DWORD dest_context, void *pvDestContext, DWORD mshlflags, CLSID *clsid) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ft_from_IMarshal(iface); + TRACE("%s, %p, %#x, %p, %#x, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, clsid); + return IMarshal_GetUnmarshalClass(marshaler->marshal, riid, pv, dest_context, pvDestContext, mshlflags, clsid); +} + +static HRESULT WINAPI uia_rsrv_ftmarshaler_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv, + DWORD dest_context, void *pvDestContext, DWORD mshlflags, DWORD *size) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ft_from_IMarshal(iface); + TRACE("%s, %p, %#x, %p, %#x, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, size); + return IMarshal_GetMarshalSizeMax(marshaler->marshal, riid, pv, dest_context, pvDestContext, mshlflags, size); +} + +static HRESULT WINAPI uia_rsrv_ftmarshaler_MarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, + void *pv, DWORD dest_context, void *pvDestContext, DWORD mshlflags) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ft_from_IMarshal(iface); + TRACE("%p, %s, %p, %#x, %p, %#x\n", stream, debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags); + return IMarshal_MarshalInterface(marshaler->marshal, stream, riid, pv, dest_context, pvDestContext, mshlflags); +} + +static HRESULT WINAPI uia_rsrv_ftmarshaler_UnmarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, void **ppv) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ft_from_IMarshal(iface); + TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), ppv); + return IMarshal_UnmarshalInterface(marshaler->marshal, stream, riid, ppv); +} + +static HRESULT WINAPI uia_rsrv_ftmarshaler_ReleaseMarshalData(IMarshal *iface, IStream *stream) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ft_from_IMarshal(iface); + TRACE("%p\n", stream); + return IMarshal_ReleaseMarshalData(marshaler->marshal, stream); +} + +static HRESULT WINAPI uia_rsrv_ftmarshaler_DisconnectObject(IMarshal *iface, DWORD reserved) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ft_from_IMarshal(iface); + TRACE("\n"); + return IMarshal_DisconnectObject(marshaler->marshal, reserved); +} + +static const IMarshalVtbl uia_rsrv_ftmarshaler_vtbl = +{ + uia_rsrv_ftmarshaler_QueryInterface, + uia_rsrv_ftmarshaler_AddRef, + uia_rsrv_ftmarshaler_Release, + uia_rsrv_ftmarshaler_GetUnmarshalClass, + uia_rsrv_ftmarshaler_GetMarshalSizeMax, + uia_rsrv_ftmarshaler_MarshalInterface, + uia_rsrv_ftmarshaler_UnmarshalInterface, + uia_rsrv_ftmarshaler_ReleaseMarshalData, + uia_rsrv_ftmarshaler_DisconnectObject +}; + +/* + * When passing the ReservedNotSupportedValue/ReservedMixedAttributeValue + * interface pointers across apartments within the same process, use the + * free threaded marshaler to preserve the pointer value. Wrap the IMarshal + * interface received by CoCreateFreeThreadedMarshaler so that we can maintain + * our own reference count and release the object when it hits 0. + */ +static HRESULT uia_reserved_val_create_ftm(IUnknown *outer, IMarshal **marshaler) +{ + struct uia_rsrv_ftmarshaler *object; + IUnknown *ftm_unk; + HRESULT hr; + + TRACE("%p, %p\n", outer, marshaler); + + hr = CoCreateFreeThreadedMarshaler(outer, &ftm_unk); + if (FAILED(hr)) return hr; + + object = heap_alloc(sizeof(*object)); + if (!object) + { + IUnknown_Release(ftm_unk); + return E_OUTOFMEMORY; + } + + object->IMarshal_iface.lpVtbl = &uia_rsrv_ftmarshaler_vtbl; + object->inner_unk = ftm_unk; + hr = IUnknown_QueryInterface(ftm_unk, &IID_IMarshal, (void **)&object->marshal); + if (FAILED(hr)) + FIXME("Failed to QI for IMarshal.\n"); + + *marshaler = &object->IMarshal_iface; + + return S_OK; +} + +/* + * UiaReservedNotSupported object. + */ +static HRESULT WINAPI uia_reserved_ns_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) + { + IMarshal *ftm; + + if (FAILED(uia_reserved_val_create_ftm(iface, &ftm))) + return E_NOINTERFACE; + *ppv = ftm; + } + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI uia_reserved_ns_AddRef(IUnknown *iface) +{ + return 1; +} + +static ULONG WINAPI uia_reserved_ns_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl uia_reserved_ns_vtbl = { + uia_reserved_ns_QueryInterface, + uia_reserved_ns_AddRef, + uia_reserved_ns_Release, +}; + +static IUnknown uia_reserved_ns_iface = {&uia_reserved_ns_vtbl}; + /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) */ @@ -46,8 +233,13 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value) */ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value) { - FIXME("(%p) stub!\n", value); - *value = NULL; + TRACE("(%p)\n", value); + + if (!value) + return E_INVALIDARG; + + *value = &uia_reserved_ns_iface; + return S_OK; } -- 2.25.1

2 7

[PATCH v2] include: Add async_uuid for IBackgroundCopyCallback in bits.idl
by Biswapriyo Nath 27 Oct '21

27 Oct '21

3 2

[PATCH] configure: Simplify flag checks for Mac preloader.
by Brendan Shanks 27 Oct '21

27 Oct '21

Always build the Mac preloader with '-mmacosx-version-min=10.7', which works with all supported toolchains. Fixes bug when building with Xcode 9 where preloader flags would be added to EXTRACFLAGS and cause build failures on 32-bit. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index b8356679e63..ef0d09e974d 100644 --- a/configure.ac +++ b/configure.ac @@ -739,14 +739,12 @@ case $host_os in WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" - WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],, - [WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], - [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], - [wine_can_build_preloader=no])])], - [WINE_TRY_CFLAGS([-nostartfiles -nodefaultlibs],, - [WINE_TRY_CFLAGS([-mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], - [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], - [wine_can_build_preloader=no])])]) + WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], + [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], + [wine_can_build_preloader=no])], + [WINE_TRY_CFLAGS([-mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], + [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], + [wine_can_build_preloader=no])]) if test "$wine_can_build_preloader" = "yes" then WINE_TRY_CFLAGS([-Wl,-no_pie], -- 2.30.1 (Apple Git-130)

1 0

Re: Porting/Compiling assistance
by Fabian Maurer 27 Oct '21

27 Oct '21

Hello Brent, Seems to work fine for me using your Makefile after fixing a few casing issues, undefined functions and creating the Debug folder. Are you working on a Linux filesystem where you have enough permissions? There seems to be something very weird with your setup. Your not running under WSL or have some other uncommon setup, right? Regards, Fabian Maurer

2 1

Porting/Compiling assistance
by Brent Burkholder 27 Oct '21

27 Oct '21

I'm not sure if this mailing list is the correct place to ask for porting help, as it seems to be solely dedicated to improving WINE, but the forums on the web site seem mostly for using WINE to run programs directly, not using it for porting. If there is a better place for this query, please let me know. So... the wine wrapper seems to run our application GUI just fine, however we need to marry the Win32 GUI code to system-level accesses so that we can port the application to Linux. I was having some luck using version 5.0, but had to do some weird linking shenanigans and using pipes to channel data from the linux side to the windows side and vice versa... it was too cumbersome and slow for our purposes, so we walked away. Hearing of version 6, we thought this new architecture might solve our problems so threw together an exploratory project simply to show that it could work. Unfortunately, I've been having some issues and having a hard time determining where they are. If I leave out the resources and compile with the -v option, this is the build/linking step (the .onlx is a gcc direct-compiled .o file... I've also tried it as an actual .o file in case that is confusing winebuild... same result.) winegcc -o Debug/winetest.exe -v -mwindows Debug/WINETEST.o Debug/SERVICE.o Debug/USERCODE.o Debug/CLIENT.o Debug/linux.olnx /opt/wine-devel/bin/winebuild -v -fno-asynchronous-unwind-tables "--cc-cmd=/usr/bin/gcc -m64" --ld-cmd=/usr/bin/ld -fPIC --exe -o winetest.exe-61799713.spec.o -F winetest.exe --subsystem windows -L/opt/wine-devel/bin/../lib64/wine/x86_64-unix -L/opt/wine-devel/bin/../lib64 -- Debug/WINETEST.o Debug/SERVICE.o Debug/USERCODE.o Debug/CLIENT.o /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libshell32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libcomdlg32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libgdi32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libadvapi32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libuser32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libwinecrt0.a /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libkernel32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libntdll.def winebuild: Unable to create output file 'winetest.exe-61799713.spec-61799714.s' winegcc: /opt/wine-devel/bin/winebuild failed make: *** [Makefile:90: all] Error 2 So, one of these subprocesses is trying to create a .s file on the way to creating the .o file, and having issues? I note a few problems that seem to exist... one, the folder for the EXE doesn't seem to be getting passed to winebuild (-F winetest.exe instead of -F Debug/winetest.exe) and the -o winetest.exe-61799713.spec.o is similarly not specifying a folder. However adding a Debug in front of them manually doesn't do anything so I don't think that's the basic problem. /opt/wine-devel/bin/winebuild -v -fno-asynchronous-unwind-tables "--cc-cmd=/usr/bin/gcc -m64" --ld-cmd=/usr/bin/ld -fPIC --exe -o Debug/winetest.exe-61799713.spec.o -F Debug/winetest.exe --subsystem windows -L/opt/wine-devel/bin/../lib64/wine/x86_64-unix -L/opt/wine-devel/bin/../lib64 -- Debug/WINETEST.o Debug/SERVICE.o Debug/USERCODE.o Debug/CLIENT.o /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libshell32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libcomdlg32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libgdi32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libadvapi32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libuser32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libwinecrt0.a /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libkernel32.def /opt/wine-devel/bin/../lib64/wine/x86_64-unix/libntdll.def winebuild: Unable to create output file 'winetest.exe-61799713.spec-61799cc7.s' Any ideas on what I'm doing wrong? Bad environmental variables or other flags that need to be added? Attached is a copy of my makefile, designed so that I can pull from multiple source folders, keep track of Win32 vs linux source files, etc. It has various dummy targets to more easily experiment with different things or dump variable lists. Attaching the var_o and tar_c outputs as well, just to demonstrate the input values I also experimented with trying to do things with gcc and ld, but didn't come across any breakthroughs. In a similar vein, and probably related, I can't get WRC to work either. If I comment in RCflags to get debug level 31, I get the output in rc_debug31.txt in the same folder as my Makefile (ie. Writable folder) The error output normally seems pretty non-sensical as the .res file should be an output? wrc -foDebug/WINETEST.res WINETEST.RC Error: Could not open Debug/WINETEST.res-61799fb9 for input : Permission denied make: *** [Makefile:144: Debug/WINETEST.res] Error 2 This is a much simpler test program than our actual program to port, and I can't even seem to get this one to compile... it's frustrating. I'd love to be able to use WINE to support Linux servers, etc, but I'm stuck. Any pointers people could offer would be greatly appreciated. Thank you, Brent

3 3

[PATCH v2 1/2] ntdll/tests: Move some tests to a new sync.c file.
by Zebediah Figura 27 Oct '21

27 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/om.c | 574 ------------------------------- dlls/ntdll/tests/sync.c | 631 +++++++++++++++++++++++++++++++++++ 3 files changed, 632 insertions(+), 574 deletions(-) create mode 100644 dlls/ntdll/tests/sync.c diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 7ad39e0992c..8c6a86fb965 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -21,6 +21,7 @@ C_SRCS = \ rtlbitmap.c \ rtlstr.c \ string.c \ + sync.c \ threadpool.c \ time.c \ virtual.c \ diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index af5e014f069..77eb58a23b5 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -30,10 +30,6 @@ static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, EVENT_TYPE, BOOLEAN); static NTSTATUS (WINAPI *pNtOpenEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES); -static NTSTATUS (WINAPI *pNtPulseEvent) ( HANDLE, PLONG ); -static NTSTATUS (WINAPI *pNtQueryEvent) ( HANDLE, EVENT_INFORMATION_CLASS, PVOID, ULONG, PULONG ); -static NTSTATUS (WINAPI *pNtResetEvent) ( HANDLE, LONG* ); -static NTSTATUS (WINAPI *pNtSetEvent) ( HANDLE, LONG* ); static NTSTATUS (WINAPI *pNtCreateJobObject)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtOpenJobObject)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtCreateKey)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG, @@ -44,11 +40,8 @@ static NTSTATUS (WINAPI *pNtCreateMailslotFile)( PHANDLE, ACCESS_MASK, POBJECT_A ULONG, ULONG, ULONG, PLARGE_INTEGER ); static NTSTATUS (WINAPI *pNtCreateMutant)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN ); static NTSTATUS (WINAPI *pNtOpenMutant) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); -static NTSTATUS (WINAPI *pNtQueryMutant) ( HANDLE, MUTANT_INFORMATION_CLASS, PVOID, ULONG, PULONG ); -static NTSTATUS (WINAPI *pNtReleaseMutant)( HANDLE, PLONG ); static NTSTATUS (WINAPI *pNtCreateSemaphore)( PHANDLE, ACCESS_MASK,const POBJECT_ATTRIBUTES,LONG,LONG ); static NTSTATUS (WINAPI *pNtOpenSemaphore)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); -static NTSTATUS (WINAPI *pNtQuerySemaphore)( PHANDLE, SEMAPHORE_INFORMATION_CLASS, PVOID, ULONG, PULONG ); static NTSTATUS (WINAPI *pNtCreateTimer) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, TIMER_TYPE ); static NTSTATUS (WINAPI *pNtOpenTimer)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtCreateSection)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, const PLARGE_INTEGER, @@ -67,15 +60,9 @@ static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,U static NTSTATUS (WINAPI *pNtReleaseSemaphore)(HANDLE, ULONG, PULONG); static NTSTATUS (WINAPI *pNtCreateKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, ULONG ); static NTSTATUS (WINAPI *pNtOpenKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * ); -static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); -static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI *pNtOpenIoCompletion)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, void *, ULONG, FILE_INFORMATION_CLASS); -static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); -static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); -static void (WINAPI *pRtlWakeAddressAll)( const void * ); -static void (WINAPI *pRtlWakeAddressSingle)( const void * ); static NTSTATUS (WINAPI *pNtOpenProcess)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID * ); static NTSTATUS (WINAPI *pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); static NTSTATUS (WINAPI *pNtGetNextThread)(HANDLE process, HANDLE thread, ACCESS_MASK access, ULONG attributes, @@ -1939,286 +1926,6 @@ static void test_type_mismatch(void) pNtClose( h ); } -static void test_event(void) -{ - HANDLE Event; - HANDLE Event2; - LONG prev_state = 0xdeadbeef; - NTSTATUS status; - UNICODE_STRING str; - OBJECT_ATTRIBUTES attr; - EVENT_BASIC_INFORMATION info; - - pRtlInitUnicodeString( &str, L"\\BaseNamedObjects\\testEvent" ); - InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, 2, 0); - ok( status == STATUS_INVALID_PARAMETER, "NtCreateEvent failed %08x\n", status ); - - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, 0); - ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == NotificationEvent && info.EventState == 0, - "NtQueryEvent failed, expected 0 0, got %d %d\n", info.EventType, info.EventState ); - pNtClose(Event); - - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, SynchronizationEvent, 0); - ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); - - status = pNtPulseEvent(Event, &prev_state); - ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == SynchronizationEvent && info.EventState == 0, - "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); - - status = pNtOpenEvent(&Event2, GENERIC_ALL, &attr); - ok( status == STATUS_SUCCESS, "NtOpenEvent failed %08x\n", status ); - - pNtClose(Event); - Event = Event2; - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == SynchronizationEvent && info.EventState == 0, - "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); - - status = pNtSetEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == SynchronizationEvent && info.EventState == 1, - "NtQueryEvent failed, expected 1 1, got %d %d\n", info.EventType, info.EventState ); - - status = pNtSetEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( prev_state == 1, "prev_state = %x\n", prev_state ); - - status = pNtResetEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( prev_state == 1, "prev_state = %x\n", prev_state ); - - status = pNtResetEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); - - status = pNtPulseEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); - - status = pNtSetEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); - - status = pNtPulseEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); - ok( prev_state == 1, "prev_state = %x\n", prev_state ); - - pNtClose(Event); -} - -static const WCHAR keyed_nameW[] = L"\\BaseNamedObjects\\WineTestEvent"; - -static DWORD WINAPI keyed_event_thread( void *arg ) -{ - HANDLE handle; - NTSTATUS status; - LARGE_INTEGER timeout; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING str; - ULONG_PTR i; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &str; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &str, keyed_nameW ); - - status = pNtOpenKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr ); - ok( !status, "NtOpenKeyedEvent failed %x\n", status ); - - for (i = 0; i < 20; i++) - { - if (i & 1) - status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); - else - status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); - ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); - Sleep( 20 - i ); - } - - status = pNtReleaseKeyedEvent( handle, (void *)0x1234, 0, NULL ); - ok( status == STATUS_SUCCESS, "NtReleaseKeyedEvent %x\n", status ); - - timeout.QuadPart = -10000; - status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - - NtClose( handle ); - return 0; -} - -static void test_keyed_events(void) -{ - OBJECT_ATTRIBUTES attr; - UNICODE_STRING str; - HANDLE handle, event, thread; - NTSTATUS status; - LARGE_INTEGER timeout; - ULONG_PTR i; - - if (!pNtCreateKeyedEvent) - { - win_skip( "Keyed events not supported\n" ); - return; - } - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &str; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &str, keyed_nameW ); - - status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS | SYNCHRONIZE, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - - status = WaitForSingleObject( handle, 1000 ); - ok( status == 0, "WaitForSingleObject %x\n", status ); - - timeout.QuadPart = -100000; - status = pNtWaitForKeyedEvent( handle, (void *)255, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)255, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); - - status = pNtWaitForKeyedEvent( handle, (void *)254, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)254, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - - status = pNtWaitForKeyedEvent( handle, NULL, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, NULL, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - - status = pNtWaitForKeyedEvent( NULL, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ - "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( NULL, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ - "NtReleaseKeyedEvent %x\n", status ); - - status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); - - status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); - ok( status == STATUS_INVALID_HANDLE, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); - ok( status == STATUS_INVALID_HANDLE, "NtReleaseKeyedEvent %x\n", status ); - - thread = CreateThread( NULL, 0, keyed_event_thread, 0, 0, NULL ); - for (i = 0; i < 20; i++) - { - if (i & 1) - status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); - else - status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); - ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); - Sleep( i ); - } - status = pNtWaitForKeyedEvent( handle, (void *)0x1234, 0, &timeout ); - ok( status == STATUS_SUCCESS, "NtWaitForKeyedEvent %x\n", status ); - status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - - ok( WaitForSingleObject( thread, 30000 ) == 0, "wait failed\n" ); - - NtClose( handle ); - - /* test access rights */ - - status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAIT, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); - NtClose( handle ); - - status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAKE, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - NtClose( handle ); - - status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - status = WaitForSingleObject( handle, 1000 ); - ok( status == WAIT_FAILED && GetLastError() == ERROR_ACCESS_DENIED, - "WaitForSingleObject %x err %u\n", status, GetLastError() ); - status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - NtClose( handle ); - - /* GENERIC_READ gives wait access */ - status = pNtCreateKeyedEvent( &handle, GENERIC_READ, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); - NtClose( handle ); - - /* GENERIC_WRITE gives wake access */ - status = pNtCreateKeyedEvent( &handle, GENERIC_WRITE, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - - /* it's not an event */ - status = pNtPulseEvent( handle, NULL ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); - - status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); - ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* 7+ */, - "CreateEvent %x\n", status ); - - NtClose( handle ); - - status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); - ok( status == 0, "CreateEvent %x\n", status ); - status = pNtWaitForKeyedEvent( event, (void *)8, 0, &timeout ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( event, (void *)8, 0, &timeout ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtReleaseKeyedEvent %x\n", status ); - NtClose( event ); -} - static void test_null_device(void) { OBJECT_ATTRIBUTES attr; @@ -2292,269 +1999,6 @@ static void test_null_device(void) CloseHandle(ov.hEvent); } -static DWORD WINAPI mutant_thread( void *arg ) -{ - MUTANT_BASIC_INFORMATION info; - NTSTATUS status; - HANDLE mutant; - DWORD ret; - - mutant = arg; - ret = WaitForSingleObject( mutant, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); - /* abandon mutant */ - - return 0; -} - -static void test_mutant(void) -{ - MUTANT_BASIC_INFORMATION info; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING str; - NTSTATUS status; - HANDLE mutant; - HANDLE thread; - DWORD ret; - ULONG len; - LONG prev; - - pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test_mutant"); - InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtCreateMutant(&mutant, GENERIC_ALL, &attr, TRUE); - ok( status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status ); - - /* bogus */ - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, 0, NULL); - ok( status == STATUS_INFO_LENGTH_MISMATCH, - "Failed to NtQueryMutant, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); - status = pNtQueryMutant(mutant, 0x42, &info, sizeof(info), NULL); - ok( status == STATUS_INVALID_INFO_CLASS || broken(status == STATUS_NOT_IMPLEMENTED), /* 32-bit on Vista/2k8 */ - "Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); - status = pNtQueryMutant((HANDLE)0xdeadbeef, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_INVALID_HANDLE, - "Failed to NtQueryMutant, expected STATUS_INVALID_HANDLE, got %08x\n", status ); - - /* new */ - len = -1; - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), &len); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); - ok( len == sizeof(info), "got %u\n", len ); - - ret = WaitForSingleObject( mutant, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == -1, "expected -1, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); - - prev = 0xdeadbeef; - status = pNtReleaseMutant(mutant, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); - ok( prev == -1, "NtReleaseMutant failed, expected -1, got %d\n", prev ); - - prev = 0xdeadbeef; - status = pNtReleaseMutant(mutant, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); - ok( prev == 0, "NtReleaseMutant failed, expected 0, got %d\n", prev ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == FALSE, "expected FALSE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); - - /* abandoned */ - thread = CreateThread( NULL, 0, mutant_thread, mutant, 0, NULL ); - ret = WaitForSingleObject( thread, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); - CloseHandle( thread ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 1, "expected 0, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == FALSE, "expected FALSE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == TRUE, "expected TRUE, got %d\n", info.AbandonedState ); - - ret = WaitForSingleObject( mutant, 1000 ); - ok( ret == WAIT_ABANDONED_0, "WaitForSingleObject failed %08x\n", ret ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); - - NtClose( mutant ); -} - -static void test_semaphore(void) -{ - SEMAPHORE_BASIC_INFORMATION info; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING str; - NTSTATUS status; - HANDLE semaphore; - ULONG prev; - ULONG len; - DWORD ret; - - pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test_semaphore"); - InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - - status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 2, 1); - ok( status == STATUS_INVALID_PARAMETER, "Failed to create Semaphore(%08x)\n", status ); - status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 1, 2); - ok( status == STATUS_SUCCESS, "Failed to create Semaphore(%08x)\n", status ); - - /* bogus */ - status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, 0, NULL); - ok( status == STATUS_INFO_LENGTH_MISMATCH, - "Failed to NtQuerySemaphore, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); - status = pNtQuerySemaphore(semaphore, 0x42, &info, sizeof(info), NULL); - ok( status == STATUS_INVALID_INFO_CLASS, - "Failed to NtQuerySemaphore, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); - status = pNtQuerySemaphore((HANDLE)0xdeadbeef, SemaphoreBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_INVALID_HANDLE, - "Failed to NtQuerySemaphore, expected STATUS_INVALID_HANDLE, got %08x\n", status ); - - len = -1; - memset(&info, 0xcc, sizeof(info)); - status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), &len); - ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); - ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); - ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); - ok( len == sizeof(info), "got %u\n", len ); - - ret = WaitForSingleObject( semaphore, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); - ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); - - prev = 0xdeadbeef; - status = pNtReleaseSemaphore(semaphore, 3, &prev); - ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); - - prev = 0xdeadbeef; - status = pNtReleaseSemaphore(semaphore, 1, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 0, "NtReleaseSemaphore failed, expected 0, got %d\n", prev ); - - prev = 0xdeadbeef; - status = pNtReleaseSemaphore(semaphore, 1, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 1, "NtReleaseSemaphore failed, expected 1, got %d\n", prev ); - - prev = 0xdeadbeef; - status = pNtReleaseSemaphore(semaphore, 1, &prev); - ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); - ok( info.CurrentCount == 2, "expected 2, got %d\n", info.CurrentCount ); - ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); - - NtClose( semaphore ); -} - -static void test_wait_on_address(void) -{ - SIZE_T size; - NTSTATUS status; - LARGE_INTEGER start, end, timeout; - DWORD elapsed; - LONG64 address, compare; - - if (!pRtlWaitOnAddress) - { - win_skip("RtlWaitOnAddress not supported, skipping test\n"); - return; - } - - if (0) /* crash on Windows */ - { - pRtlWaitOnAddress(&address, NULL, 8, NULL); - pRtlWaitOnAddress(NULL, &compare, 8, NULL); - pRtlWaitOnAddress(NULL, NULL, 8, NULL); - } - - /* don't crash */ - pRtlWakeAddressSingle(NULL); - pRtlWakeAddressAll(NULL); - - /* invalid values */ - address = 0; - compare = 0; - status = pRtlWaitOnAddress(&address, &compare, 5, NULL); - ok(status == STATUS_INVALID_PARAMETER, "got %x\n", status); - - /* values match */ - address = 0; - compare = 0; - pNtQuerySystemTime(&start); - timeout.QuadPart = start.QuadPart + 100 * 10000; - status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); - pNtQuerySystemTime(&end); - ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - elapsed = (end.QuadPart - start.QuadPart) / 10000; - ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); - ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); - ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); - - /* different address size */ - for (size = 1; size <= 4; size <<= 1) - { - compare = ~0; - compare <<= size * 8; - - pNtQuerySystemTime(&start); - timeout.QuadPart = -100 * 10000; - status = pRtlWaitOnAddress(&address, &compare, size, &timeout); - pNtQuerySystemTime(&end); - ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - elapsed = (end.QuadPart - start.QuadPart) / 10000; - ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); - - status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); - ok(!status, "got 0x%08x\n", status); - } - address = 0; - compare = 1; - status = pRtlWaitOnAddress(&address, &compare, 8, NULL); - ok(!status, "got 0x%08x\n", status); - - /* no waiters */ - address = 0; - pRtlWakeAddressSingle(&address); - ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); - pRtlWakeAddressAll(&address); - ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); -} - static void test_process(void) { OBJECT_ATTRIBUTES attr; @@ -2957,13 +2401,7 @@ START_TEST(om) pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile"); pNtCreateMutant = (void *)GetProcAddress(hntdll, "NtCreateMutant"); pNtOpenEvent = (void *)GetProcAddress(hntdll, "NtOpenEvent"); - pNtQueryEvent = (void *)GetProcAddress(hntdll, "NtQueryEvent"); - pNtPulseEvent = (void *)GetProcAddress(hntdll, "NtPulseEvent"); - pNtResetEvent = (void *)GetProcAddress(hntdll, "NtResetEvent"); - pNtSetEvent = (void *)GetProcAddress(hntdll, "NtSetEvent"); pNtOpenMutant = (void *)GetProcAddress(hntdll, "NtOpenMutant"); - pNtQueryMutant = (void *)GetProcAddress(hntdll, "NtQueryMutant"); - pNtReleaseMutant = (void *)GetProcAddress(hntdll, "NtReleaseMutant"); pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile"); pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); @@ -2975,7 +2413,6 @@ START_TEST(om) pNtQuerySymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtQuerySymbolicLinkObject"); pNtCreateSemaphore = (void *)GetProcAddress(hntdll, "NtCreateSemaphore"); pNtOpenSemaphore = (void *)GetProcAddress(hntdll, "NtOpenSemaphore"); - pNtQuerySemaphore = (void *)GetProcAddress(hntdll, "NtQuerySemaphore"); pNtCreateTimer = (void *)GetProcAddress(hntdll, "NtCreateTimer"); pNtOpenTimer = (void *)GetProcAddress(hntdll, "NtOpenTimer"); pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection"); @@ -2984,15 +2421,9 @@ START_TEST(om) pNtReleaseSemaphore = (void *)GetProcAddress(hntdll, "NtReleaseSemaphore"); pNtCreateKeyedEvent = (void *)GetProcAddress(hntdll, "NtCreateKeyedEvent"); pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent"); - pNtWaitForKeyedEvent = (void *)GetProcAddress(hntdll, "NtWaitForKeyedEvent"); - pNtReleaseKeyedEvent = (void *)GetProcAddress(hntdll, "NtReleaseKeyedEvent"); pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); pNtOpenIoCompletion = (void *)GetProcAddress(hntdll, "NtOpenIoCompletion"); pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); - pNtQuerySystemTime = (void *)GetProcAddress(hntdll, "NtQuerySystemTime"); - pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); - pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); - pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess"); pNtCreateDebugObject = (void *)GetProcAddress(hntdll, "NtCreateDebugObject"); pNtGetNextThread = (void *)GetProcAddress(hntdll, "NtGetNextThread"); @@ -3009,12 +2440,7 @@ START_TEST(om) test_symboliclink(); test_query_object(); test_type_mismatch(); - test_event(); - test_mutant(); - test_semaphore(); - test_keyed_events(); test_null_device(); - test_wait_on_address(); test_process(); test_token(); test_duplicate_object(); diff --git a/dlls/ntdll/tests/sync.c b/dlls/ntdll/tests/sync.c new file mode 100644 index 00000000000..7e389c9762b --- /dev/null +++ b/dlls/ntdll/tests/sync.c @@ -0,0 +1,631 @@ +/* + * Unit tests for NT synchronization objects + * + * Copyright 2020 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "wine/test.h" + +static NTSTATUS (WINAPI *pNtClose)( HANDLE ); +static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const OBJECT_ATTRIBUTES *, EVENT_TYPE, BOOLEAN); +static NTSTATUS (WINAPI *pNtCreateKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, ULONG ); +static NTSTATUS (WINAPI *pNtCreateMutant)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, BOOLEAN ); +static NTSTATUS (WINAPI *pNtCreateSemaphore)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, LONG, LONG ); +static NTSTATUS (WINAPI *pNtOpenEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * ); +static NTSTATUS (WINAPI *pNtOpenKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * ); +static NTSTATUS (WINAPI *pNtPulseEvent)( HANDLE, LONG * ); +static NTSTATUS (WINAPI *pNtQueryEvent)( HANDLE, EVENT_INFORMATION_CLASS, void *, ULONG, ULONG * ); +static NTSTATUS (WINAPI *pNtQueryMutant)( HANDLE, MUTANT_INFORMATION_CLASS, void *, ULONG, ULONG * ); +static NTSTATUS (WINAPI *pNtQuerySemaphore)( HANDLE, SEMAPHORE_INFORMATION_CLASS, void *, ULONG, ULONG * ); +static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); +static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); +static NTSTATUS (WINAPI *pNtReleaseMutant)( HANDLE, LONG * ); +static NTSTATUS (WINAPI *pNtReleaseSemaphore)( HANDLE, ULONG, ULONG * ); +static NTSTATUS (WINAPI *pNtResetEvent)( HANDLE, LONG * ); +static NTSTATUS (WINAPI *pNtSetEvent)( HANDLE, LONG * ); +static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); +static void (WINAPI *pRtlInitUnicodeString)( UNICODE_STRING *, const WCHAR * ); +static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); +static void (WINAPI *pRtlWakeAddressAll)( const void * ); +static void (WINAPI *pRtlWakeAddressSingle)( const void * ); + +#define KEYEDEVENT_WAIT 0x0001 +#define KEYEDEVENT_WAKE 0x0002 +#define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) + +static void test_event(void) +{ + HANDLE event; + HANDLE event2; + LONG prev_state = 0xdeadbeef; + NTSTATUS status; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + EVENT_BASIC_INFORMATION info; + + pRtlInitUnicodeString( &str, L"\\BaseNamedObjects\\testEvent" ); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + + status = pNtCreateEvent(&event, GENERIC_ALL, &attr, 2, 0); + ok( status == STATUS_INVALID_PARAMETER, "NtCreateEvent failed %08x\n", status ); + + status = pNtCreateEvent(&event, GENERIC_ALL, &attr, NotificationEvent, 0); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == NotificationEvent && info.EventState == 0, + "NtQueryEvent failed, expected 0 0, got %d %d\n", info.EventType, info.EventState ); + pNtClose(event); + + status = pNtCreateEvent(&event, GENERIC_ALL, &attr, SynchronizationEvent, 0); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); + + status = pNtPulseEvent(event, &prev_state); + ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); + ok( !prev_state, "prev_state = %x\n", prev_state ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == SynchronizationEvent && info.EventState == 0, + "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); + + status = pNtOpenEvent(&event2, GENERIC_ALL, &attr); + ok( status == STATUS_SUCCESS, "NtOpenEvent failed %08x\n", status ); + + pNtClose(event); + event = event2; + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == SynchronizationEvent && info.EventState == 0, + "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); + + status = pNtSetEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); + ok( !prev_state, "prev_state = %x\n", prev_state ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == SynchronizationEvent && info.EventState == 1, + "NtQueryEvent failed, expected 1 1, got %d %d\n", info.EventType, info.EventState ); + + status = pNtSetEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); + ok( prev_state == 1, "prev_state = %x\n", prev_state ); + + status = pNtResetEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); + ok( prev_state == 1, "prev_state = %x\n", prev_state ); + + status = pNtResetEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); + ok( !prev_state, "prev_state = %x\n", prev_state ); + + status = pNtPulseEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); + ok( !prev_state, "prev_state = %x\n", prev_state ); + + status = pNtSetEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); + ok( !prev_state, "prev_state = %x\n", prev_state ); + + status = pNtPulseEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); + ok( prev_state == 1, "prev_state = %x\n", prev_state ); + + pNtClose(event); +} + +static const WCHAR keyed_nameW[] = L"\\BaseNamedObjects\\WineTestEvent"; + +static DWORD WINAPI keyed_event_thread( void *arg ) +{ + HANDLE handle; + NTSTATUS status; + LARGE_INTEGER timeout; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + ULONG_PTR i; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &str; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &str, keyed_nameW ); + + status = pNtOpenKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr ); + ok( !status, "NtOpenKeyedEvent failed %x\n", status ); + + for (i = 0; i < 20; i++) + { + if (i & 1) + status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + else + status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); + Sleep( 20 - i ); + } + + status = pNtReleaseKeyedEvent( handle, (void *)0x1234, 0, NULL ); + ok( status == STATUS_SUCCESS, "NtReleaseKeyedEvent %x\n", status ); + + timeout.QuadPart = -10000; + status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + NtClose( handle ); + return 0; +} + +static void test_keyed_events(void) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + HANDLE handle, event, thread; + NTSTATUS status; + LARGE_INTEGER timeout; + ULONG_PTR i; + + if (!pNtCreateKeyedEvent) + { + win_skip( "Keyed events not supported\n" ); + return; + } + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &str; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &str, keyed_nameW ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS | SYNCHRONIZE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + + status = WaitForSingleObject( handle, 1000 ); + ok( status == 0, "WaitForSingleObject %x\n", status ); + + timeout.QuadPart = -100000; + status = pNtWaitForKeyedEvent( handle, (void *)255, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)255, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( handle, (void *)254, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)254, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( handle, NULL, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, NULL, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( NULL, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( NULL, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); + ok( status == STATUS_INVALID_HANDLE, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); + ok( status == STATUS_INVALID_HANDLE, "NtReleaseKeyedEvent %x\n", status ); + + thread = CreateThread( NULL, 0, keyed_event_thread, 0, 0, NULL ); + for (i = 0; i < 20; i++) + { + if (i & 1) + status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + else + status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); + Sleep( i ); + } + status = pNtWaitForKeyedEvent( handle, (void *)0x1234, 0, &timeout ); + ok( status == STATUS_SUCCESS, "NtWaitForKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + ok( WaitForSingleObject( thread, 30000 ) == 0, "wait failed\n" ); + + NtClose( handle ); + + /* test access rights */ + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAIT, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAKE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = WaitForSingleObject( handle, 1000 ); + ok( status == WAIT_FAILED && GetLastError() == ERROR_ACCESS_DENIED, + "WaitForSingleObject %x err %u\n", status, GetLastError() ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + /* GENERIC_READ gives wait access */ + status = pNtCreateKeyedEvent( &handle, GENERIC_READ, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + /* GENERIC_WRITE gives wake access */ + status = pNtCreateKeyedEvent( &handle, GENERIC_WRITE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + /* it's not an event */ + status = pNtPulseEvent( handle, NULL ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); + + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); + ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* 7+ */, + "CreateEvent %x\n", status ); + + NtClose( handle ); + + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); + ok( status == 0, "CreateEvent %x\n", status ); + status = pNtWaitForKeyedEvent( event, (void *)8, 0, &timeout ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( event, (void *)8, 0, &timeout ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtReleaseKeyedEvent %x\n", status ); + NtClose( event ); +} + +static DWORD WINAPI mutant_thread( void *arg ) +{ + MUTANT_BASIC_INFORMATION info; + NTSTATUS status; + HANDLE mutant; + DWORD ret; + + mutant = arg; + ret = WaitForSingleObject( mutant, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); + /* abandon mutant */ + + return 0; +} + +static void test_mutant(void) +{ + MUTANT_BASIC_INFORMATION info; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + NTSTATUS status; + HANDLE mutant; + HANDLE thread; + DWORD ret; + ULONG len; + LONG prev; + + pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test_mutant"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtCreateMutant(&mutant, GENERIC_ALL, &attr, TRUE); + ok( status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status ); + + /* bogus */ + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, 0, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, + "Failed to NtQueryMutant, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtQueryMutant(mutant, 0x42, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_INFO_CLASS || broken(status == STATUS_NOT_IMPLEMENTED), /* 32-bit on Vista/2k8 */ + "Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + status = pNtQueryMutant((HANDLE)0xdeadbeef, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_HANDLE, + "Failed to NtQueryMutant, expected STATUS_INVALID_HANDLE, got %08x\n", status ); + + /* new */ + len = -1; + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), &len); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); + ok( len == sizeof(info), "got %u\n", len ); + + ret = WaitForSingleObject( mutant, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == -1, "expected -1, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); + + prev = 0xdeadbeef; + status = pNtReleaseMutant(mutant, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); + ok( prev == -1, "NtReleaseMutant failed, expected -1, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseMutant(mutant, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); + ok( prev == 0, "NtReleaseMutant failed, expected 0, got %d\n", prev ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == FALSE, "expected FALSE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); + + /* abandoned */ + thread = CreateThread( NULL, 0, mutant_thread, mutant, 0, NULL ); + ret = WaitForSingleObject( thread, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + CloseHandle( thread ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == 1, "expected 0, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == FALSE, "expected FALSE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == TRUE, "expected TRUE, got %d\n", info.AbandonedState ); + + ret = WaitForSingleObject( mutant, 1000 ); + ok( ret == WAIT_ABANDONED_0, "WaitForSingleObject failed %08x\n", ret ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); + + NtClose( mutant ); +} + +static void test_semaphore(void) +{ + SEMAPHORE_BASIC_INFORMATION info; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + NTSTATUS status; + HANDLE semaphore; + ULONG prev; + ULONG len; + DWORD ret; + + pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test_semaphore"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + + status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 2, 1); + ok( status == STATUS_INVALID_PARAMETER, "Failed to create Semaphore(%08x)\n", status ); + status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 1, 2); + ok( status == STATUS_SUCCESS, "Failed to create Semaphore(%08x)\n", status ); + + /* bogus */ + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, 0, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, + "Failed to NtQuerySemaphore, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtQuerySemaphore(semaphore, 0x42, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_INFO_CLASS, + "Failed to NtQuerySemaphore, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + status = pNtQuerySemaphore((HANDLE)0xdeadbeef, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_HANDLE, + "Failed to NtQuerySemaphore, expected STATUS_INVALID_HANDLE, got %08x\n", status ); + + len = -1; + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), &len); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + ok( len == sizeof(info), "got %u\n", len ); + + ret = WaitForSingleObject( semaphore, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 3, &prev); + ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0, "NtReleaseSemaphore failed, expected 0, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 1, "NtReleaseSemaphore failed, expected 1, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 2, "expected 2, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + + NtClose( semaphore ); +} + +static void test_wait_on_address(void) +{ + SIZE_T size; + NTSTATUS status; + LARGE_INTEGER start, end, timeout; + DWORD elapsed; + LONG64 address, compare; + + if (!pRtlWaitOnAddress) + { + win_skip("RtlWaitOnAddress not supported, skipping test\n"); + return; + } + + if (0) /* crash on Windows */ + { + pRtlWaitOnAddress(&address, NULL, 8, NULL); + pRtlWaitOnAddress(NULL, &compare, 8, NULL); + pRtlWaitOnAddress(NULL, NULL, 8, NULL); + } + + /* don't crash */ + pRtlWakeAddressSingle(NULL); + pRtlWakeAddressAll(NULL); + + /* invalid values */ + address = 0; + compare = 0; + status = pRtlWaitOnAddress(&address, &compare, 5, NULL); + ok(status == STATUS_INVALID_PARAMETER, "got %x\n", status); + + /* values match */ + address = 0; + compare = 0; + pNtQuerySystemTime(&start); + timeout.QuadPart = start.QuadPart + 100 * 10000; + status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); + pNtQuerySystemTime(&end); + ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + elapsed = (end.QuadPart - start.QuadPart) / 10000; + ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); + ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); + ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); + + /* different address size */ + for (size = 1; size <= 4; size <<= 1) + { + compare = ~0; + compare <<= size * 8; + + pNtQuerySystemTime(&start); + timeout.QuadPart = -100 * 10000; + status = pRtlWaitOnAddress(&address, &compare, size, &timeout); + pNtQuerySystemTime(&end); + ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + elapsed = (end.QuadPart - start.QuadPart) / 10000; + ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); + + status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); + ok(!status, "got 0x%08x\n", status); + } + address = 0; + compare = 1; + status = pRtlWaitOnAddress(&address, &compare, 8, NULL); + ok(!status, "got 0x%08x\n", status); + + /* no waiters */ + address = 0; + pRtlWakeAddressSingle(&address); + ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); + pRtlWakeAddressAll(&address); + ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); +} + +START_TEST(sync) +{ + HMODULE module = GetModuleHandleA("ntdll.dll"); + + pNtClose = (void *)GetProcAddress(module, "NtClose"); + pNtCreateEvent = (void *)GetProcAddress(module, "NtCreateEvent"); + pNtCreateKeyedEvent = (void *)GetProcAddress(module, "NtCreateKeyedEvent"); + pNtCreateMutant = (void *)GetProcAddress(module, "NtCreateMutant"); + pNtCreateSemaphore = (void *)GetProcAddress(module, "NtCreateSemaphore"); + pNtOpenEvent = (void *)GetProcAddress(module, "NtOpenEvent"); + pNtOpenKeyedEvent = (void *)GetProcAddress(module, "NtOpenKeyedEvent"); + pNtPulseEvent = (void *)GetProcAddress(module, "NtPulseEvent"); + pNtQueryEvent = (void *)GetProcAddress(module, "NtQueryEvent"); + pNtQueryMutant = (void *)GetProcAddress(module, "NtQueryMutant"); + pNtQuerySemaphore = (void *)GetProcAddress(module, "NtQuerySemaphore"); + pNtQuerySystemTime = (void *)GetProcAddress(module, "NtQuerySystemTime"); + pNtReleaseKeyedEvent = (void *)GetProcAddress(module, "NtReleaseKeyedEvent"); + pNtReleaseMutant = (void *)GetProcAddress(module, "NtReleaseMutant"); + pNtReleaseSemaphore = (void *)GetProcAddress(module, "NtReleaseSemaphore"); + pNtResetEvent = (void *)GetProcAddress(module, "NtResetEvent"); + pNtSetEvent = (void *)GetProcAddress(module, "NtSetEvent"); + pNtWaitForKeyedEvent = (void *)GetProcAddress(module, "NtWaitForKeyedEvent"); + pRtlInitUnicodeString = (void *)GetProcAddress(module, "RtlInitUnicodeString"); + pRtlWaitOnAddress = (void *)GetProcAddress(module, "RtlWaitOnAddress"); + pRtlWakeAddressAll = (void *)GetProcAddress(module, "RtlWakeAddressAll"); + pRtlWakeAddressSingle = (void *)GetProcAddress(module, "RtlWakeAddressSingle"); + + test_wait_on_address(); + test_event(); + test_mutant(); + test_semaphore(); + test_keyed_events(); +} -- 2.33.0

2 2

[PATCH 1/2] winebus.sys: Drop the hid_report channel.
by Rémi Bernon 27 Oct '21

27 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Maybe we could merge hid with plugplay too, but it may end up being a bit too much verbose, I'm not completely sure yet. dlls/winebus.sys/bus_sdl.c | 4 +--- dlls/winebus.sys/bus_udev.c | 22 ++++++++++------------ dlls/winebus.sys/main.c | 7 +++---- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index fe3a960649c..d172d5382fd 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -59,8 +59,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); #ifdef SONAME_LIBSDL2 -WINE_DECLARE_DEBUG_CHANNEL(hid_report); - static pthread_mutex_t sdl_cs = PTHREAD_MUTEX_INITIALIZER; static struct sdl_bus_options options; @@ -847,7 +845,7 @@ static void process_device_event(SDL_Event *event) struct sdl_device *impl; SDL_JoystickID id; - TRACE_(hid_report)("Received action %x\n", event->type); + TRACE("Received action %x\n", event->type); pthread_mutex_lock(&sdl_cs); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 4c00fe6ad39..780af549916 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -101,8 +101,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); #ifdef HAVE_UDEV -WINE_DECLARE_DEBUG_CHANNEL(hid_report); - static pthread_mutex_t udev_cs = PTHREAD_MUTEX_INITIALIZER; static struct udev *udev_context = NULL; @@ -344,9 +342,9 @@ static void hidraw_device_read_report(struct unix_device *iface) int size = read(impl->base.device_fd, report_buffer, sizeof(report_buffer)); if (size == -1) - TRACE_(hid_report)("Read failed. Likely an unplugged device %d %s\n", errno, strerror(errno)); + TRACE("Read failed. Likely an unplugged device %d %s\n", errno, strerror(errno)); else if (size == 0) - TRACE_(hid_report)("Failed to read report\n"); + TRACE("Failed to read report\n"); else { /* As described in the Linux kernel driver, when connected over bluetooth, DS4 controllers @@ -380,7 +378,7 @@ static void hidraw_device_set_output_report(struct unix_device *iface, HID_XFER_ if ((buffer[0] = packet->reportId)) count = write(impl->base.device_fd, packet->reportBuffer, length); else if (length > sizeof(buffer) - 1) - ERR_(hid_report)("id %d length %u >= 8192, cannot write\n", packet->reportId, length); + ERR("id %d length %u >= 8192, cannot write\n", packet->reportId, length); else { memcpy(buffer + 1, packet->reportBuffer, length); @@ -394,7 +392,7 @@ static void hidraw_device_set_output_report(struct unix_device *iface, HID_XFER_ } else { - ERR_(hid_report)("id %d write failed error: %d %s\n", packet->reportId, errno, strerror(errno)); + ERR("id %d write failed error: %d %s\n", packet->reportId, errno, strerror(errno)); io->Information = 0; io->Status = STATUS_UNSUCCESSFUL; } @@ -412,7 +410,7 @@ static void hidraw_device_get_feature_report(struct unix_device *iface, HID_XFER if ((buffer[0] = packet->reportId) && length <= 0x1fff) count = ioctl(impl->base.device_fd, HIDIOCGFEATURE(length), packet->reportBuffer); else if (length > sizeof(buffer) - 1) - ERR_(hid_report)("id %d length %u >= 8192, cannot read\n", packet->reportId, length); + ERR("id %d length %u >= 8192, cannot read\n", packet->reportId, length); else { count = ioctl(impl->base.device_fd, HIDIOCGFEATURE(length + 1), buffer); @@ -426,7 +424,7 @@ static void hidraw_device_get_feature_report(struct unix_device *iface, HID_XFER } else { - ERR_(hid_report)("id %d read failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); + ERR("id %d read failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); io->Information = 0; io->Status = STATUS_UNSUCCESSFUL; } @@ -448,7 +446,7 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER if ((buffer[0] = packet->reportId) && length <= 0x1fff) count = ioctl(impl->base.device_fd, HIDIOCSFEATURE(length), packet->reportBuffer); else if (length > sizeof(buffer) - 1) - ERR_(hid_report)("id %d length %u >= 8192, cannot write\n", packet->reportId, length); + ERR("id %d length %u >= 8192, cannot write\n", packet->reportId, length); else { memcpy(buffer + 1, packet->reportBuffer, length); @@ -462,7 +460,7 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER } else { - ERR_(hid_report)("id %d write failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); + ERR("id %d write failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); io->Information = 0; io->Status = STATUS_UNSUCCESSFUL; } @@ -802,9 +800,9 @@ static void lnxev_device_read_report(struct unix_device *iface) size = read(impl->base.device_fd, &ie, sizeof(ie)); if (size == -1) - TRACE_(hid_report)("Read failed. Likely an unplugged device\n"); + TRACE("Read failed. Likely an unplugged device\n"); else if (size == 0) - TRACE_(hid_report)("Failed to read report\n"); + TRACE("Failed to read report\n"); else if (set_report_from_event(iface, &ie)) bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 433963b44d4..1353df7d000 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -41,7 +41,6 @@ #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); -WINE_DECLARE_DEBUG_CHANNEL(hid_report); static DRIVER_OBJECT *driver_obj; @@ -1045,21 +1044,21 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_WRITE_REPORT: { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE_(hid_report)("IOCTL_HID_WRITE_REPORT / IOCTL_HID_SET_OUTPUT_REPORT\n"); + TRACE("IOCTL_HID_WRITE_REPORT / IOCTL_HID_SET_OUTPUT_REPORT\n"); unix_device_set_output_report(device, packet, &irp->IoStatus); break; } case IOCTL_HID_GET_FEATURE: { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE_(hid_report)("IOCTL_HID_GET_FEATURE\n"); + TRACE("IOCTL_HID_GET_FEATURE\n"); unix_device_get_feature_report(device, packet, &irp->IoStatus); break; } case IOCTL_HID_SET_FEATURE: { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE_(hid_report)("IOCTL_HID_SET_FEATURE\n"); + TRACE("IOCTL_HID_SET_FEATURE\n"); unix_device_set_feature_report(device, packet, &irp->IoStatus); break; } -- 2.33.0

2 3

[PATCH 1/4] evr/mixer: Improve output type candidates attributes configuration.
by Nikolay Sivov 27 Oct '21

27 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 35 +++++++++++++++++++++++---- dlls/evr/tests/evr.c | 56 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index f821dc7e6d9..1db2fd3a9f4 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -675,14 +675,27 @@ static unsigned int video_mixer_get_interlace_mode_from_video_desc(const DXVA2_V } } +static void mf_get_attribute_uint32(IMFMediaType *media_type, const GUID *key, UINT32 *value, + UINT32 default_value) +{ + if (FAILED(IMFMediaType_GetUINT32(media_type, key, value))) + *value = default_value; +} + +static void mf_get_attribute_uint64(IMFMediaType *media_type, const GUID *key, UINT64 *value, + UINT64 default_value) +{ + if (FAILED(IMFMediaType_GetUINT64(media_type, key, value))) + *value = default_value; +} + static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, IMFMediaType *media_type, IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) { - unsigned int i, j, format_count, count, interlace_mode; struct rt_format *rt_formats = NULL, *ptr; + unsigned int i, j, format_count, count; HRESULT hr = MF_E_INVALIDMEDIATYPE; - MFVideoArea aperture; D3DFORMAT *formats; GUID subtype; @@ -710,6 +723,10 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const if (count && !(flags & MFT_SET_TYPE_TEST_ONLY)) { + UINT32 fixed_samples, interlace_mode; + MFVideoArea aperture; + UINT64 par; + if (!(mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) { free(rt_formats); @@ -718,9 +735,16 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); memset(&aperture, 0, sizeof(aperture)); - aperture.Area.cx = video_desc->SampleWidth; - aperture.Area.cy = video_desc->SampleHeight; + if (FAILED(IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, + sizeof(aperture), NULL))) + { + aperture.Area.cx = video_desc->SampleWidth; + aperture.Area.cy = video_desc->SampleHeight; + } interlace_mode = video_mixer_get_interlace_mode_from_video_desc(video_desc); + mf_get_attribute_uint64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &par, (UINT64)1 << 32 | 1); + mf_get_attribute_uint32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, &fixed_samples, 1); + for (i = 0; i < count; ++i) { IMFMediaType *rt_media_type; @@ -731,9 +755,12 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const MFCreateMediaType(&rt_media_type); IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)rt_media_type); IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); + IMFMediaType_SetUINT64(rt_media_type, &MF_MT_FRAME_SIZE, (UINT64)aperture.Area.cx << 32 | aperture.Area.cy); IMFMediaType_SetBlob(rt_media_type, &MF_MT_GEOMETRIC_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); IMFMediaType_SetBlob(rt_media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); IMFMediaType_SetUINT32(rt_media_type, &MF_MT_INTERLACE_MODE, interlace_mode); + IMFMediaType_SetUINT64(rt_media_type, &MF_MT_PIXEL_ASPECT_RATIO, par); + IMFMediaType_SetUINT32(rt_media_type, &MF_MT_FIXED_SIZE_SAMPLES, fixed_samples); mixer->output.rt_formats[i].media_type = rt_media_type; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5bf03fa49f8..818731e1e55 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -946,6 +946,7 @@ static void test_default_mixer_type_negotiation(void) IDirect3DDevice9 *device; IMFMediaType *video_type; IMFTransform *transform; + MFVideoArea aperture; DWORD index, count; IUnknown *unk; HWND window; @@ -1020,10 +1021,19 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + memset(&aperture, 0, sizeof(aperture)); + aperture.Area.cx = 100; aperture.Area.cy = 200; + hr = IMFMediaType_SetBlob(video_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFTransform_SetInputType(transform, 0, video_type, MFT_SET_TYPE_TEST_ONLY); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); @@ -1040,25 +1050,69 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type); IMFMediaType_Release(media_type2); + /* Modified after type was set. */ + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_PIXEL_ASPECT_RATIO, (UINT64)56 << 32 | 55); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Check attributes on available output types. */ index = 0; while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) { - UINT64 frame_size; + UINT64 frame_size, ratio; + MFVideoArea aperture; GUID subtype, major; UINT32 value; hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &major); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&major, &MFMediaType_Video), "Unexpected major type.\n"); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(frame_size == ((UINT64)100 << 32 | 200), "Unexpected frame size %s.\n", wine_dbgstr_longlong(frame_size)); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(value == MFVideoInterlace_Progressive, "Unexpected interlace mode.\n"); + /* Ratio from input type */ + hr = IMFMediaType_GetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(ratio == ((UINT64)1 << 32 | 1), "Unexpected PAR %s.\n", wine_dbgstr_longlong(ratio)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(aperture.Area.cx == 100 && aperture.Area.cy == 200, "Unexpected aperture area.\n"); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (UINT8 *)&aperture, sizeof(aperture), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(aperture.Area.cx == 100 && aperture.Area.cy == 200, "Unexpected aperture area.\n"); + hr = IMFMediaType_GetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 2, "Unexpected value %u.\n", value); + + IMFMediaType_Release(media_type); + } + ok(index > 1, "Unexpected number of available types.\n"); + + hr = IMFMediaType_DeleteItem(video_type, &MF_MT_FIXED_SIZE_SAMPLES); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + index = 0; + while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) + { + UINT32 value; + UINT64 ratio; + + hr = IMFMediaType_GetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(ratio == ((UINT64)56 << 32 | 55), "Unexpected PAR %s.\n", wine_dbgstr_longlong(ratio)); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 1, "Unexpected value %u.\n", value); IMFMediaType_Release(media_type); } -- 2.33.0

1 3

[PATCH 2/2] gdi32: Do not sign extend 64-bit gdi handles.
by Francisco Casas 27 Oct '21

27 Oct '21

Testing on Windows shows typically handles are not sign extended, however sometimes they are. It's not clear what triggers the change in behaviour. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- dlls/gdi32/objects.c | 2 +- dlls/win32u/gdiobj.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 196cea9ba92..04b91cfd60f 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -102,7 +102,7 @@ static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) static HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { unsigned int idx = entry - get_gdi_shared()->Handles; - return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); + return ULongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); } static DWORD get_object_type( HGDIOBJ obj ) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index a661cefe0bd..06bade61a56 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -55,7 +55,7 @@ const struct user_callbacks *user_callbacks = NULL; static inline HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { unsigned int idx = entry - gdi_shared->Handles; - return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); + return ULongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); } static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) -- 2.25.1

2 1

[PATCH 1/2] gdi32: Avoid integer overflow in the obj map compare fn.
by Francisco Casas 27 Oct '21

27 Oct '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- dlls/gdi32/objects.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4b390aa0160..196cea9ba92 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -178,7 +178,11 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle ) static int obj_map_cmp( const void *key, const struct wine_rb_entry *entry ) { struct obj_map_entry *obj_entry = WINE_RB_ENTRY_VALUE( entry, struct obj_map_entry, entry ); - return HandleToLong( key ) - HandleToLong( obj_entry->obj ); + UINT_PTR a = (UINT_PTR)key; + UINT_PTR b = (UINT_PTR)obj_entry->obj; + if (a > b) return 1; + if (a < b) return -1; + return 0; }; struct wine_rb_tree obj_map = { obj_map_cmp }; -- 2.25.1

2 1

[PATCH 1/4] dinput: Trace device entry points calls consistently.
by Rémi Bernon 27 Oct '21

27 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 150 ++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 81 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 705aec2baca..679f907f2de 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -929,17 +929,18 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_Unacquire( IDirectInputDevice8W * * IDirectInputDeviceA */ -static HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat( IDirectInputDevice8W *iface, LPCDIDATAFORMAT df ) +static HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat( IDirectInputDevice8W *iface, const DIDATAFORMAT *format ) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res = DI_OK; - if (!df) return E_POINTER; - TRACE("(%p) %p\n", This, df); - _dump_DIDATAFORMAT(df); + TRACE( "iface %p, format %p.\n", iface, format ); - if (df->dwSize != sizeof(DIDATAFORMAT)) return DIERR_INVALIDPARAM; - if (df->dwObjSize != sizeof(DIOBJECTDATAFORMAT)) return DIERR_INVALIDPARAM; + if (!format) return E_POINTER; + _dump_DIDATAFORMAT( format ); + + if (format->dwSize != sizeof(DIDATAFORMAT)) return DIERR_INVALIDPARAM; + if (format->dwObjSize != sizeof(DIOBJECTDATAFORMAT)) return DIERR_INVALIDPARAM; if (This->acquired) return DIERR_ACQUIRED; EnterCriticalSection(&This->crit); @@ -949,7 +950,7 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat( IDirectInputDevice This->num_actions = 0; release_DataFormat(&This->data_format); - res = create_DataFormat(df, &This->data_format); + res = create_DataFormat( format, &This->data_format ); LeaveCriticalSection(&This->crit); return res; @@ -961,32 +962,31 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat( IDirectInputDevice * Set cooperative level and the source window for the events. */ static HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel( IDirectInputDevice8W *iface, - HWND hwnd, DWORD dwflags ) + HWND hwnd, DWORD flags ) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT hr; - TRACE("(%p) %p,0x%08x\n", This, hwnd, dwflags); - _dump_cooperativelevel_DI(dwflags); + TRACE( "iface %p, hwnd %p, flags %#x.\n", iface, hwnd, flags ); + + _dump_cooperativelevel_DI( flags ); - if ((dwflags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == 0 || - (dwflags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE) || - (dwflags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == 0 || - (dwflags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == (DISCL_FOREGROUND | DISCL_BACKGROUND)) + if ((flags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == 0 || + (flags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE) || + (flags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == 0 || + (flags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == (DISCL_FOREGROUND | DISCL_BACKGROUND)) return DIERR_INVALIDPARAM; if (hwnd && GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) return E_HANDLE; - if (!hwnd && dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) - hwnd = GetDesktopWindow(); + if (!hwnd && flags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) hwnd = GetDesktopWindow(); if (!IsWindow(hwnd)) return E_HANDLE; /* For security reasons native does not allow exclusive background level for mouse and keyboard only */ - if (dwflags & DISCL_EXCLUSIVE && dwflags & DISCL_BACKGROUND && - (IsEqualGUID(&This->guid, &GUID_SysMouse) || - IsEqualGUID(&This->guid, &GUID_SysKeyboard))) + if (flags & DISCL_EXCLUSIVE && flags & DISCL_BACKGROUND && + (IsEqualGUID( &This->guid, &GUID_SysMouse ) || IsEqualGUID( &This->guid, &GUID_SysKeyboard ))) return DIERR_UNSUPPORTED; /* Store the window which asks for the mouse */ @@ -995,7 +995,7 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel( IDirectInput else { This->win = hwnd; - This->dwCoopLevel = dwflags; + This->dwCoopLevel = flags; hr = DI_OK; } LeaveCriticalSection(&This->crit); @@ -1029,7 +1029,7 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_SetEventNotification( IDirectInpu { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p) %p\n", This, event); + TRACE( "iface %p, event %p.\n", iface, event ); EnterCriticalSection(&This->crit); This->hEvent = event; @@ -1100,34 +1100,34 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_GetCapabilities( IDirectInputDevi } static HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface( IDirectInputDevice8W *iface, - REFIID riid, LPVOID *ppobj ) + const GUID *iid, void **out ) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppobj); + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); - if (IsEqualGUID(&IID_IDirectInputDeviceA, riid) || - IsEqualGUID(&IID_IDirectInputDevice2A, riid) || - IsEqualGUID(&IID_IDirectInputDevice7A, riid) || - IsEqualGUID(&IID_IDirectInputDevice8A, riid)) + if (IsEqualGUID( &IID_IDirectInputDeviceA, iid ) || + IsEqualGUID( &IID_IDirectInputDevice2A, iid ) || + IsEqualGUID( &IID_IDirectInputDevice7A, iid ) || + IsEqualGUID( &IID_IDirectInputDevice8A, iid )) { IDirectInputDevice2_AddRef(iface); - *ppobj = IDirectInputDevice8A_from_impl(This); + *out = IDirectInputDevice8A_from_impl( This ); return DI_OK; } - if (IsEqualGUID(&IID_IUnknown, riid) || - IsEqualGUID(&IID_IDirectInputDeviceW, riid) || - IsEqualGUID(&IID_IDirectInputDevice2W, riid) || - IsEqualGUID(&IID_IDirectInputDevice7W, riid) || - IsEqualGUID(&IID_IDirectInputDevice8W, riid)) + if (IsEqualGUID( &IID_IUnknown, iid ) || + IsEqualGUID( &IID_IDirectInputDeviceW, iid ) || + IsEqualGUID( &IID_IDirectInputDevice2W, iid ) || + IsEqualGUID( &IID_IDirectInputDevice7W, iid ) || + IsEqualGUID( &IID_IDirectInputDevice8W, iid )) { IDirectInputDevice2_AddRef(iface); - *ppobj = IDirectInputDevice8W_from_impl(This); + *out = IDirectInputDevice8W_from_impl( This ); return DI_OK; } - WARN("Unsupported interface!\n"); + WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); return E_NOINTERFACE; } @@ -1564,18 +1564,16 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceState( IDirectInputDevic return hr; } -static HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData( IDirectInputDevice8W *iface, - DWORD dodsize, LPDIDEVICEOBJECTDATA dod, - LPDWORD entries, DWORD flags ) +static HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData( IDirectInputDevice8W *iface, DWORD size, + DIDEVICEOBJECTDATA *data, DWORD *count, DWORD flags ) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT ret = DI_OK; int len; - TRACE("(%p) %p -> %p(%d) x%d, 0x%08x\n", - This, dod, entries, entries ? *entries : 0, dodsize, flags); + TRACE( "iface %p, size %u, data %p, count %p, flags %#x.\n", iface, size, data, count, flags ); - if (This->dinput->dwVersion == 0x0800 || dodsize == sizeof(DIDEVICEOBJECTDATA_DX3)) + if (This->dinput->dwVersion == 0x0800 || size == sizeof(DIDEVICEOBJECTDATA_DX3)) { if (!This->queue_len) return DIERR_NOTBUFFERED; if (!This->acquired) return DIERR_NOTACQUIRED; @@ -1583,8 +1581,7 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData( IDirectInputDevice if (!This->queue_len) return DI_OK; - if (dodsize < sizeof(DIDEVICEOBJECTDATA_DX3)) - return DIERR_INVALIDPARAM; + if (size < sizeof(DIDEVICEOBJECTDATA_DX3)) return DIERR_INVALIDPARAM; IDirectInputDevice2_Poll(iface); EnterCriticalSection(&This->crit); @@ -1592,18 +1589,18 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData( IDirectInputDevice len = This->queue_head - This->queue_tail; if (len < 0) len += This->queue_len; - if ((*entries != INFINITE) && (len > *entries)) len = *entries; + if ((*count != INFINITE) && (len > *count)) len = *count; - if (dod) + if (data) { int i; for (i = 0; i < len; i++) { int n = (This->queue_tail + i) % This->queue_len; - memcpy((char *)dod + dodsize * i, This->data_queue + n, dodsize); + memcpy( (char *)data + size * i, This->data_queue + n, size ); } } - *entries = len; + *count = len; if (This->overflow && This->dinput->dwVersion == 0x0800) ret = DI_BUFFEROVERFLOW; @@ -1617,24 +1614,21 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData( IDirectInputDevice LeaveCriticalSection(&This->crit); - TRACE("Returning %d events queued\n", *entries); + TRACE( "Returning %d events queued\n", *count ); return ret; } -static HRESULT WINAPI IDirectInputDevice2WImpl_RunControlPanel( IDirectInputDevice8W *iface, - HWND hwndOwner, DWORD dwFlags ) +static HRESULT WINAPI IDirectInputDevice2WImpl_RunControlPanel( IDirectInputDevice8W *iface, HWND hwnd, DWORD flags ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("%p)->(%p,0x%08x): stub!\n", This, hwndOwner, dwFlags); - + FIXME( "iface %p, hwnd %p, flags %#x stub!\n", iface, hwnd, flags ); return DI_OK; } -static HRESULT WINAPI IDirectInputDevice2WImpl_Initialize( IDirectInputDevice8W *iface, HINSTANCE hinst, - DWORD dwVersion, REFGUID rguid ) +static HRESULT WINAPI IDirectInputDevice2WImpl_Initialize( IDirectInputDevice8W *iface, HINSTANCE instance, + DWORD version, const GUID *guid ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p,%d,%s): stub!\n", This, hinst, dwVersion, debugstr_guid(rguid)); + FIXME( "iface %p, instance %p, version %#x, guid %s stub!\n", iface, instance, version, + debugstr_guid( guid ) ); return DI_OK; } @@ -1809,10 +1803,9 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_EnumCreatedEffectObjects( IDirect return impl->vtbl->enum_created_effect_objects( iface, callback, context, flags ); } -static HRESULT WINAPI IDirectInputDevice2WImpl_Escape( IDirectInputDevice8W *iface, LPDIEFFESCAPE lpDIEEsc ) +static HRESULT WINAPI IDirectInputDevice2WImpl_Escape( IDirectInputDevice8W *iface, DIEFFESCAPE *escape ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p): stub!\n", This, lpDIEEsc); + FIXME( "iface %p, escape %p stub!\n", iface, escape ); return DI_OK; } @@ -1830,33 +1823,30 @@ static HRESULT WINAPI IDirectInputDevice2WImpl_Poll( IDirectInputDevice8W *iface return DI_OK; } -static HRESULT WINAPI IDirectInputDevice2WImpl_SendDeviceData( IDirectInputDevice8W *iface, DWORD cbObjectData, - LPCDIDEVICEOBJECTDATA rgdod, - LPDWORD pdwInOut, DWORD dwFlags ) +static HRESULT WINAPI IDirectInputDevice2WImpl_SendDeviceData( IDirectInputDevice8W *iface, DWORD size, + const DIDEVICEOBJECTDATA *data, + DWORD *count, DWORD flags ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(0x%08x,%p,%p,0x%08x): stub!\n", This, cbObjectData, rgdod, pdwInOut, dwFlags); - + FIXME( "iface %p, size %u, data %p, count %p, flags %#x stub!\n", iface, size, data, count, flags ); return DI_OK; } -static HRESULT WINAPI IDirectInputDevice7WImpl_EnumEffectsInFile( IDirectInputDevice8W *iface, LPCWSTR lpszFileName, - LPDIENUMEFFECTSINFILECALLBACK pec, - LPVOID pvRef, DWORD dwFlags ) +static HRESULT WINAPI IDirectInputDevice7WImpl_EnumEffectsInFile( IDirectInputDevice8W *iface, + const WCHAR *filename, + LPDIENUMEFFECTSINFILECALLBACK callback, + void *context, DWORD flags ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", This, debugstr_w(lpszFileName), pec, pvRef, dwFlags); - + FIXME( "iface %p, filename %s, callback %p, context %p, flags %#x stub!\n", iface, + debugstr_w(filename), callback, context, flags ); return DI_OK; } static HRESULT WINAPI IDirectInputDevice7WImpl_WriteEffectToFile( IDirectInputDevice8W *iface, - LPCWSTR lpszFileName, DWORD dwEntries, - LPDIFILEEFFECT rgDiFileEft, DWORD dwFlags ) + const WCHAR *filename, DWORD count, + DIFILEEFFECT *effects, DWORD flags ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", This, debugstr_w(lpszFileName), dwEntries, rgDiFileEft, dwFlags); - + FIXME( "iface %p, filename %s, count %u, effects %p, flags %#x stub!\n", iface, + debugstr_w(filename), count, effects, flags ); return DI_OK; } @@ -2072,11 +2062,9 @@ static HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap( IDirectInputDevice8 } static HRESULT WINAPI IDirectInputDevice8WImpl_GetImageInfo( IDirectInputDevice8W *iface, - LPDIDEVICEIMAGEINFOHEADERW lpdiDevImageInfoHeader ) + DIDEVICEIMAGEINFOHEADERW *header ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p): stub !\n", This, lpdiDevImageInfoHeader); - + FIXME( "iface %p, header %p stub!\n", iface, header ); return DI_OK; } -- 2.33.0

1 3

[PATCH 4/4] winspool: Use wide character string literals.
by Huw Davies 27 Oct '21

27 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/info.c | 424 +++++++++++++++++---------------------- 1 file changed, 189 insertions(+), 235 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9bc5c5e7a8c..1748a092d8e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -126,76 +126,7 @@ static opened_printer_t **printer_handles; static UINT nb_printer_handles; static LONG next_job_id = 1; -static WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; -static const WCHAR envname_x64W[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; -static WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; -static const WCHAR envname_armW[] = {'W','i','n','d','o','w','s',' ','A','R','M',0}; -static const WCHAR envname_arm64W[] = {'W','i','n','d','o','w','s',' ','A','R','M','6','4',0}; -static const WCHAR subdir_win40W[] = {'w','i','n','4','0',0}; -static const WCHAR subdir_x64W[] = {'x','6','4',0}; -static const WCHAR subdir_x86W[] = {'w','3','2','x','8','6',0}; -static const WCHAR subdir_armW[] = {'a','r','m',0}; -static const WCHAR subdir_arm64W[] = {'a','r','m','6','4',0}; -static const WCHAR Version0_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; -static const WCHAR Version0_SubdirW[] = {'\\','0',0}; -static const WCHAR Version3_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; -static const WCHAR Version3_SubdirW[] = {'\\','3',0}; - -static const WCHAR AttributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; -static const WCHAR backslashW[] = {'\\',0}; -static const WCHAR Configuration_FileW[] = {'C','o','n','f','i','g','u','r','a','t', - 'i','o','n',' ','F','i','l','e',0}; -static const WCHAR DatatypeW[] = {'D','a','t','a','t','y','p','e',0}; -static const WCHAR Data_FileW[] = {'D','a','t','a',' ','F','i','l','e',0}; -static const WCHAR Default_DevModeW[] = {'D','e','f','a','u','l','t',' ','D','e','v','M','o','d','e',0}; -static const WCHAR Default_PriorityW[] = {'D','e','f','a','u','l','t',' ','P','r','i','o','r','i','t','y',0}; -static const WCHAR Dependent_FilesW[] = {'D','e','p','e','n','d','e','n','t',' ','F','i','l','e','s',0}; -static const WCHAR DescriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; -static const WCHAR dnsTimeoutW[] = {'d','n','s','T','i','m','e','o','u','t',0}; -static const WCHAR DriverW[] = {'D','r','i','v','e','r',0}; -static const WCHAR HardwareIDW[] = {'H','a','r','d','w','a','r','e','I','D',0}; -static const WCHAR Help_FileW[] = {'H','e','l','p',' ','F','i','l','e',0}; -static const WCHAR LocationW[] = {'L','o','c','a','t','i','o','n',0}; -static const WCHAR ManufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; -static const WCHAR MonitorW[] = {'M','o','n','i','t','o','r',0}; -static const WCHAR NameW[] = {'N','a','m','e',0}; -static const WCHAR ObjectGUIDW[] = {'O','b','j','e','c','t','G','U','I','D',0}; -static const WCHAR OEM_UrlW[] = {'O','E','M',' ','U','r','l',0}; -static const WCHAR ParametersW[] = {'P','a','r','a','m','e','t','e','r','s',0}; -static const WCHAR PortW[] = {'P','o','r','t',0}; -static const WCHAR Previous_NamesW[] = {'P','r','e','v','i','o','u','s',' ','N','a','m','e','s',0}; -static const WCHAR Print_ProcessorW[] = {'P','r','i','n','t',' ','P','r','o','c','e','s','s','o','r',0}; -static const WCHAR Printer_DriverW[] = {'P','r','i','n','t','e','r',' ','D','r','i','v','e','r',0}; -static const WCHAR PrinterDriverDataW[] = {'P','r','i','n','t','e','r','D','r','i','v','e','r','D','a','t','a',0}; -static const WCHAR PriorityW[] = {'P','r','i','o','r','i','t','y',0}; -static const WCHAR ProviderW[] = {'P','r','o','v','i','d','e','r',0}; -static const WCHAR Separator_FileW[] = {'S','e','p','a','r','a','t','o','r',' ','F','i','l','e',0}; -static const WCHAR Share_NameW[] = {'S','h','a','r','e',' ','N','a','m','e',0}; -static const WCHAR StartTimeW[] = {'S','t','a','r','t','T','i','m','e',0}; -static const WCHAR StatusW[] = {'S','t','a','t','u','s',0}; -static const WCHAR txTimeoutW[] = {'t','x','T','i','m','e','o','u','t',0}; -static const WCHAR UntilTimeW[] = {'U','n','t','i','l','T','i','m','e',0}; -static WCHAR WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; -static const WCHAR deviceW[] = {'d','e','v','i','c','e',0}; -static const WCHAR windowsW[] = {'w','i','n','d','o','w','s',0}; -static WCHAR rawW[] = {'R','A','W',0}; -static WCHAR driver_9x[] = {'w','i','n','e','p','s','1','6','.','d','r','v',0}; -static WCHAR driver_nt[] = {'w','i','n','e','p','s','.','d','r','v',0}; -static const WCHAR timeout_15_45[] = {',','1','5',',','4','5',0}; -static const WCHAR commaW[] = {',',0}; -static WCHAR emptyStringW[] = {0}; - -static const WCHAR May_Delete_Value[] = {'W','i','n','e','M','a','y','D','e','l','e','t','e','M','e',0}; - -static const WCHAR CUPS_Port[] = {'C','U','P','S',':',0}; -static const WCHAR FILE_Port[] = {'F','I','L','E',':',0}; -static const WCHAR LPR_Port[] = {'L','P','R',':',0}; - -static const WCHAR default_doc_title[] = {'L','o','c','a','l',' ','D','o','w','n','l','e','v','e','l',' ', - 'D','o','c','u','m','e','n','t',0}; - -static const WCHAR PPD_Overrides[] = {'P','P','D',' ','O','v','e','r','r','i','d','e','s',0}; -static const WCHAR DefaultPageSize[] = {'D','e','f','a','u','l','t','P','a','g','e','S','i','z','e',0}; +static const WCHAR * const May_Delete_Value = L"WineMayDeleteMe"; static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W), sizeof(DRIVER_INFO_3W), sizeof(DRIVER_INFO_4W), @@ -209,13 +140,13 @@ static const DWORD pi_sizeof[] = {0, sizeof(PRINTER_INFO_1W), sizeof(PRINTER_INF sizeof(PRINTER_INFO_7W), sizeof(PRINTER_INFO_8W), sizeof(PRINTER_INFO_9W)}; -static const printenv_t env_x64 = {envname_x64W, subdir_x64W, 3, Version3_RegPathW, Version3_SubdirW}; -static const printenv_t env_x86 = {envname_x86W, subdir_x86W, 3, Version3_RegPathW, Version3_SubdirW}; -static const printenv_t env_arm = {envname_armW, subdir_armW, 3, Version3_RegPathW, Version3_SubdirW}; -static const printenv_t env_arm64 = {envname_arm64W, subdir_arm64W, 3, Version3_RegPathW, Version3_SubdirW}; -static const printenv_t env_win40 = {envname_win40W, subdir_win40W, 0, Version0_RegPathW, Version0_SubdirW}; +static const printenv_t env_x64 = { L"Windows x64", L"x64", 3, L"\\Version-3", L"\\3" }; +static const printenv_t env_x86 = { L"Windows NT x86", L"w32x86", 3, L"\\Version-3", L"\\3" }; +static const printenv_t env_arm = { L"Windows ARM", L"arm", 3, L"\\Version-3", L"\\3" }; +static const printenv_t env_arm64 = { L"Windows ARM64", L"arm64", 3, L"\\Version-3", L"\\3" }; +static const printenv_t env_win40 = { L"Windows 4.0", L"win40", 0, L"\\Version-0", L"\\0" }; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_arm, &env_arm64, &env_win40}; +static const printenv_t * const all_printenv[] = { &env_x86, &env_x64, &env_arm, &env_arm64, &env_win40 }; #ifdef __i386__ #define env_arch env_x86 @@ -504,8 +435,8 @@ static config_module_t *get_config_module(const WCHAR *device, BOOL grab) driver[len++] = '3'; driver[len++] = '\\'; size = sizeof(driver) - len * sizeof(WCHAR); - res = RegQueryValueExW(device_key, Configuration_FileW, NULL, &type, - (BYTE *)(driver + len), &size); + res = RegQueryValueExW( device_key, L"Configuration File", NULL, &type, + (BYTE *)(driver + len), &size ); RegCloseKey(device_key); if (res || type != REG_SZ) { WARN("no configuration file: %u\n", res); @@ -675,13 +606,11 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) static BOOL get_internal_fallback_ppd( const WCHAR *ppd ) { - static const WCHAR typeW[] = {'P','P','D','F','I','L','E',0}; - char *ptr, *end; DWORD size, written; HANDLE file; BOOL ret; - HRSRC res = FindResourceW( WINSPOOL_hInstance, MAKEINTRESOURCEW(1), typeW ); + HRSRC res = FindResourceW( WINSPOOL_hInstance, MAKEINTRESOURCEW(1), L"PPDFILE" ); if (!res || !(ptr = LoadResource( WINSPOOL_hInstance, res ))) return FALSE; size = SizeofResource( WINSPOOL_hInstance, res ); @@ -698,8 +627,8 @@ static BOOL get_internal_fallback_ppd( const WCHAR *ppd ) static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) { - static const WCHAR dot_ppd[] = {'.','p','p','d',0}; - static const WCHAR invalid_chars[] = {'*','?','<','>','|','"','/','\\',0}; + static const WCHAR dot_ppd[] = L".ppd"; + static const WCHAR invalid_chars[] = L"*?<>|\"/\\"; int dir_len = wcslen( dir ), file_len = wcslen( file_name ); int len = (dir_len + file_len + ARRAY_SIZE( dot_ppd )) * sizeof(WCHAR); WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ), *p; @@ -723,6 +652,7 @@ static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir ) DRIVER_INFO_3W di3; unsigned int i; BOOL res = FALSE; + WCHAR raw[] = L"RAW", driver_nt[] = L"wineps.drv"; if (!ppd) return FALSE; RtlInitUnicodeString( &nt_ppd, NULL ); @@ -739,13 +669,14 @@ static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir ) di3.pDriverPath = driver_nt; di3.pDataFile = ppd; di3.pConfigFile = driver_nt; - di3.pDefaultDataType = rawW; + di3.pDefaultDataType = raw; for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { di3.pEnvironment = (WCHAR *)all_printenv[i]->envname; - if (all_printenv[i]->envname == envname_win40W) + if (all_printenv[i]->driverversion == 0) { + WCHAR driver_9x[] = L"wineps16.drv"; /* We use wineps16.drv as driver for 16 bit */ di3.pDriverPath = driver_9x; di3.pConfigFile = driver_9x; @@ -772,7 +703,7 @@ end: static WCHAR *get_ppd_dir( void ) { - static const WCHAR wine_ppds[] = {'w','i','n','e','_','p','p','d','s','\\',0}; + static const WCHAR wine_ppds[] = L"wine_ppds\\"; DWORD len; WCHAR *dir, tmp_path[MAX_PATH]; BOOL res; @@ -802,6 +733,7 @@ static BOOL init_unix_printers( void ) HANDLE added_printer; PRINTER_INFO_2W pi2; NTSTATUS status; + WCHAR raw[] = L"RAW", winprint[] = L"WinPrint", empty[] = L""; int i; if (create_printers_reg_key( system_printers_key, &printers_key )) @@ -828,13 +760,13 @@ static BOOL init_unix_printers( void ) if (RegOpenKeyW( printers_key, printer->name, &printer_key ) == ERROR_SUCCESS) { - DWORD status = get_dword_from_reg( printer_key, StatusW ); + DWORD status = get_dword_from_reg( printer_key, L"Status" ); /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ TRACE("Printer already exists\n"); RegDeleteValueW( printer_key, May_Delete_Value ); /* flag that the PPD file should be checked for an update */ - set_reg_DWORD( printer_key, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); + set_reg_DWORD( printer_key, L"Status", status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); RegCloseKey( printer_key ); } else @@ -842,21 +774,21 @@ static BOOL init_unix_printers( void ) if (!ppd_dir && !(ppd_dir = get_ppd_dir())) break; if (!add_printer_driver( printer->name, ppd_dir )) continue; - port = heap_alloc( sizeof(CUPS_Port) + wcslen( printer->name ) * sizeof(WCHAR) ); - wcscpy( port, CUPS_Port ); + port = heap_alloc( sizeof(L"CUPS:") + wcslen( printer->name ) * sizeof(WCHAR) ); + wcscpy( port, L"CUPS:" ); wcscat( port, printer->name ); memset( &pi2, 0, sizeof(PRINTER_INFO_2W) ); pi2.pPrinterName = printer->name; - pi2.pDatatype = rawW; - pi2.pPrintProcessor = WinPrintW; + pi2.pDatatype = raw; + pi2.pPrintProcessor = winprint; pi2.pDriverName = printer->name; pi2.pComment = printer->comment; pi2.pLocation = printer->location; pi2.pPortName = port; - pi2.pParameters = emptyStringW; - pi2.pShareName = emptyStringW; - pi2.pSepFile = emptyStringW; + pi2.pParameters = empty; + pi2.pShareName = empty; + pi2.pSepFile = empty; added_printer = AddPrinterW( NULL, 2, (BYTE *)&pi2 ); if (added_printer) ClosePrinter( added_printer ); @@ -896,7 +828,7 @@ static void set_ppd_overrides( HANDLE printer ) params.name = heap_alloc( params.name_size ); if (!params.name) break; } - if (!status) SetPrinterDataExW( printer, PPD_Overrides, DefaultPageSize, REG_SZ, (BYTE*)params.name, params.name_size ); + if (!status) SetPrinterDataExW( printer, L"PPD Overrides", L"DefaultPageSize", REG_SZ, (BYTE*)params.name, params.name_size ); if (params.name != buffer) heap_free( params.name ); } @@ -1163,8 +1095,8 @@ static void old_printer_check( BOOL delete_phase ) { if (!pi[i].pPortName) continue; - if (wcsncmp( pi[i].pPortName, CUPS_Port, wcslen( CUPS_Port ) ) && - wcsncmp( pi[i].pPortName, LPR_Port, wcslen( LPR_Port ) )) + if (wcsncmp( pi[i].pPortName, L"CUPS:", ARRAY_SIZE(L"CUPS:") - 1 ) && + wcsncmp( pi[i].pPortName, L"LPR:", ARRAY_SIZE(L"LPR:") - 1 )) continue; if (open_printer_reg_key( pi[i].pPrinterName, &key )) continue; @@ -1195,8 +1127,6 @@ static void old_printer_check( BOOL delete_phase ) HeapFree(GetProcessHeap(), 0, pi); } -static const WCHAR winspool_mutex_name[] = {'_','_','W','I','N','E','_','W','I','N','S','P','O','O','L','_', - 'M','U','T','E','X','_','_','\0'}; static HANDLE init_mutex; void WINSPOOL_LoadSystemPrinters(void) @@ -1206,7 +1136,7 @@ void WINSPOOL_LoadSystemPrinters(void) WCHAR PrinterName[256]; /* FIXME: The init code should be moved to spoolsv.exe */ - init_mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); + init_mutex = CreateMutexW( NULL, TRUE, L"__WINE_WINSPOOL_MUTEX__" ); if (!init_mutex) { ERR( "Failed to create mutex\n" ); @@ -1230,8 +1160,8 @@ void WINSPOOL_LoadSystemPrinters(void) if (!RegEnumKeyW( printers_key, i, PrinterName, ARRAY_SIZE(PrinterName) )) if (!RegOpenKeyW( printers_key, PrinterName, &printer_key )) { - if (RegQueryValueExW( printer_key, NameW, 0, 0, 0, &needed ) == ERROR_FILE_NOT_FOUND) - set_reg_szW( printer_key, NameW, PrinterName ); + if (RegQueryValueExW( printer_key, L"Name", 0, 0, 0, &needed ) == ERROR_FILE_NOT_FOUND) + set_reg_szW( printer_key, L"Name", PrinterName ); RegCloseKey( printer_key ); } RegCloseKey( printers_key ); @@ -2135,8 +2065,8 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU DWORD status; RegQueryValueExW( key, May_Delete_Value, NULL, &type, (LPBYTE)&deleting, &size ); WaitForSingleObject( init_mutex, INFINITE ); - status = get_dword_from_reg( key, StatusW ); - set_reg_DWORD( key, StatusW, status & ~PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); + status = get_dword_from_reg( key, L"Status" ); + set_reg_DWORD( key, L"Status", status & ~PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); ReleaseMutex( init_mutex ); if (!deleting && (status & PRINTER_STATUS_DRIVER_UPDATE_NEEDED)) update_driver( *phPrinter ); @@ -2502,8 +2432,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD opened_printer_t *printer; job_t *job; BOOL ret = FALSE; - static const WCHAR spool_path[] = {'s','p','o','o','l','\\','P','R','I','N','T','E','R','S','\\',0}; - static const WCHAR fmtW[] = {'%','s','%','0','5','d','.','S','P','L',0}; + static const WCHAR spool_path[] = L"spool\\PRINTERS\\"; WCHAR path[MAX_PATH], filename[MAX_PATH]; DWORD len; ADDJOB_INFO_1W *addjob; @@ -2534,14 +2463,14 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD if(path[len - 1] != '\\') path[len++] = '\\'; memcpy( path + len, spool_path, sizeof(spool_path) ); - swprintf( filename, ARRAY_SIZE(filename), fmtW, path, job->job_id ); + swprintf( filename, ARRAY_SIZE(filename), L"%s%05d.SPL", path, job->job_id ); len = wcslen( filename ); job->filename = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); memcpy(job->filename, filename, (len + 1) * sizeof(WCHAR)); job->portname = NULL; - job->document_title = strdupW(default_doc_title); - job->printer_name = strdupW(printer->name); + job->document_title = strdupW( L"Local Downlevel Document" ); + job->printer_name = strdupW( printer->name ); job->devmode = dup_devmode( printer->devmode ); list_add_tail(&printer->queue->jobs, &job->entry); @@ -2680,11 +2609,10 @@ static void set_devices_and_printerports(PRINTER_INFO_2W *pi) TRACE("(%p) %s\n", pi, debugstr_w(pi->pPrinterName)); /* FIXME: the driver must change to "winspool" */ - devline = HeapAlloc(GetProcessHeap(), 0, sizeof(driver_nt) + portlen + sizeof(timeout_15_45)); + devline = HeapAlloc( GetProcessHeap(), 0, sizeof(L"wineps.drv") + portlen + sizeof(L",15,45") ); if (devline) { - wcscpy( devline, driver_nt ); - wcscat( devline, commaW ); + wcscpy( devline, L"wineps.drv," ); wcscat( devline, pi->pPortName ); TRACE("using %s\n", debugstr_w(devline)); @@ -2695,7 +2623,7 @@ static void set_devices_and_printerports(PRINTER_INFO_2W *pi) RegCloseKey( key ); } - wcscat( devline, timeout_15_45 ); + wcscat( devline, L",15,45" ); if (!create_printers_reg_key( user_ports_key, &key )) { RegSetValueExW( key, pi->pPrinterName, 0, REG_SZ, (BYTE *)devline, @@ -2714,7 +2642,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) PRINTER_INFO_2W *pi = (PRINTER_INFO_2W *) pPrinter; LPDEVMODEW dm; HANDLE retval; - HKEY hkeyPrinter, printers_key, hkeyDriver, hkeyDrivers; + HKEY printer_key, printers_key, hkeyDriver, hkeyDrivers; LONG size; TRACE("(%s,%d,%p)\n", debugstr_w(pName), Level, pPrinter); @@ -2738,15 +2666,16 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) ERR("Can't create Printers key\n"); return 0; } - if (!RegOpenKeyW( printers_key, pi->pPrinterName, &hkeyPrinter )) + if (!RegOpenKeyW( printers_key, pi->pPrinterName, &printer_key )) { - if (!RegQueryValueW(hkeyPrinter, AttributesW, NULL, NULL)) { + if (!RegQueryValueW( printer_key, L"Attributes", NULL, NULL )) + { SetLastError(ERROR_PRINTER_ALREADY_EXISTS); - RegCloseKey(hkeyPrinter); + RegCloseKey( printer_key ); RegCloseKey( printers_key ); return 0; } - RegCloseKey(hkeyPrinter); + RegCloseKey( printer_key ); } hkeyDrivers = WINSPOOL_OpenDriverReg(NULL); if(!hkeyDrivers) { @@ -2765,7 +2694,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) RegCloseKey(hkeyDriver); RegCloseKey(hkeyDrivers); - if(wcsicmp( pi->pPrintProcessor, WinPrintW )) + if (wcsicmp( pi->pPrintProcessor, L"WinPrint" )) { FIXME("Can't find processor %s\n", debugstr_w(pi->pPrintProcessor)); SetLastError(ERROR_UNKNOWN_PRINTPROCESSOR); @@ -2773,7 +2702,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) return 0; } - if (RegCreateKeyW( printers_key, pi->pPrinterName, &hkeyPrinter )) + if (RegCreateKeyW( printers_key, pi->pPrinterName, &printer_key )) { FIXME("Can't create printer %s\n", debugstr_w(pi->pPrinterName)); SetLastError(ERROR_INVALID_PRINTER_NAME); @@ -2783,24 +2712,24 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) set_devices_and_printerports(pi); - set_reg_DWORD(hkeyPrinter, AttributesW, pi->Attributes); - set_reg_szW(hkeyPrinter, DatatypeW, pi->pDatatype); - set_reg_DWORD(hkeyPrinter, Default_PriorityW, pi->DefaultPriority); - set_reg_szW(hkeyPrinter, DescriptionW, pi->pComment); - set_reg_DWORD(hkeyPrinter, dnsTimeoutW, 0); - set_reg_szW(hkeyPrinter, LocationW, pi->pLocation); - set_reg_szW(hkeyPrinter, NameW, pi->pPrinterName); - set_reg_szW(hkeyPrinter, ParametersW, pi->pParameters); - set_reg_szW(hkeyPrinter, PortW, pi->pPortName); - set_reg_szW(hkeyPrinter, Print_ProcessorW, pi->pPrintProcessor); - set_reg_szW(hkeyPrinter, Printer_DriverW, pi->pDriverName); - set_reg_DWORD(hkeyPrinter, PriorityW, pi->Priority); - set_reg_szW(hkeyPrinter, Separator_FileW, pi->pSepFile); - set_reg_szW(hkeyPrinter, Share_NameW, pi->pShareName); - set_reg_DWORD(hkeyPrinter, StartTimeW, pi->StartTime); - set_reg_DWORD(hkeyPrinter, StatusW, pi->Status); - set_reg_DWORD(hkeyPrinter, txTimeoutW, 0); - set_reg_DWORD(hkeyPrinter, UntilTimeW, pi->UntilTime); + set_reg_DWORD( printer_key, L"Attributes", pi->Attributes ); + set_reg_szW( printer_key, L"Datatype", pi->pDatatype ); + set_reg_DWORD( printer_key, L"Default Priority", pi->DefaultPriority ); + set_reg_szW( printer_key, L"Description", pi->pComment ); + set_reg_DWORD( printer_key, L"dnsTimeout", 0 ); + set_reg_szW( printer_key, L"Location", pi->pLocation ); + set_reg_szW( printer_key, L"Name", pi->pPrinterName ); + set_reg_szW( printer_key, L"Parameters", pi->pParameters ); + set_reg_szW( printer_key, L"Port", pi->pPortName ); + set_reg_szW( printer_key, L"Print Processor", pi->pPrintProcessor ); + set_reg_szW( printer_key, L"Printer Driver", pi->pDriverName ); + set_reg_DWORD( printer_key, L"Priority", pi->Priority ); + set_reg_szW( printer_key, L"Separator File", pi->pSepFile ); + set_reg_szW( printer_key, L"Share Name", pi->pShareName ); + set_reg_DWORD( printer_key, L"StartTime", pi->StartTime ); + set_reg_DWORD( printer_key, L"Status", pi->Status ); + set_reg_DWORD( printer_key, L"txTimeout", 0 ); + set_reg_DWORD( printer_key, L"UntilTime", pi->UntilTime ); size = DocumentPropertiesW(0, 0, pi->pPrinterName, NULL, NULL, 0); @@ -2829,10 +2758,10 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) } } - set_reg_devmode( hkeyPrinter, Default_DevModeW, dm ); + set_reg_devmode( printer_key, L"Default DevMode", dm ); if (!pi->pDevMode) HeapFree( GetProcessHeap(), 0, dm ); - RegCloseKey(hkeyPrinter); + RegCloseKey( printer_key ); RegCloseKey( printers_key ); if(!OpenPrinterW(pi->pPrinterName, &retval, NULL)) { ERR("OpenPrinter failing\n"); @@ -2991,7 +2920,7 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) { if (!create_printers_reg_key( user_default_key, &key )) { - RegDeleteValueW( key, deviceW ); + RegDeleteValueW( key, L"device" ); RegCloseKey( key ); } SetDefaultPrinterW( NULL ); @@ -3023,33 +2952,33 @@ BOOL WINAPI SetPrinterA( HANDLE printer, DWORD level, LPBYTE data, DWORD command static void set_printer_2( HKEY key, const PRINTER_INFO_2W *pi ) { - set_reg_szW( key, NameW, pi->pPrinterName ); - set_reg_szW( key, Share_NameW, pi->pShareName ); - set_reg_szW( key, PortW, pi->pPortName ); - set_reg_szW( key, Printer_DriverW, pi->pDriverName ); - set_reg_szW( key, DescriptionW, pi->pComment ); - set_reg_szW( key, LocationW, pi->pLocation ); + set_reg_szW( key, L"Name", pi->pPrinterName ); + set_reg_szW( key, L"Share Name", pi->pShareName ); + set_reg_szW( key, L"Port", pi->pPortName ); + set_reg_szW( key, L"Printer Driver", pi->pDriverName ); + set_reg_szW( key, L"Description", pi->pComment ); + set_reg_szW( key, L"Location", pi->pLocation ); if (pi->pDevMode) - set_reg_devmode( key, Default_DevModeW, pi->pDevMode ); + set_reg_devmode( key, L"Default DevMode", pi->pDevMode ); - set_reg_szW( key, Separator_FileW, pi->pSepFile ); - set_reg_szW( key, Print_ProcessorW, pi->pPrintProcessor ); - set_reg_szW( key, DatatypeW, pi->pDatatype ); - set_reg_szW( key, ParametersW, pi->pParameters ); + set_reg_szW( key, L"Separator File", pi->pSepFile ); + set_reg_szW( key, L"Print Processor", pi->pPrintProcessor ); + set_reg_szW( key, L"Datatype", pi->pDatatype ); + set_reg_szW( key, L"Parameters", pi->pParameters ); - set_reg_DWORD( key, AttributesW, pi->Attributes ); - set_reg_DWORD( key, PriorityW, pi->Priority ); - set_reg_DWORD( key, Default_PriorityW, pi->DefaultPriority ); - set_reg_DWORD( key, StartTimeW, pi->StartTime ); - set_reg_DWORD( key, UntilTimeW, pi->UntilTime ); + set_reg_DWORD( key, L"Attributes", pi->Attributes ); + set_reg_DWORD( key, L"Priority", pi->Priority ); + set_reg_DWORD( key, L"Default Priority", pi->DefaultPriority ); + set_reg_DWORD( key, L"StartTime", pi->StartTime ); + set_reg_DWORD( key, L"UntilTime", pi->UntilTime ); } static BOOL set_printer_9( HKEY key, const PRINTER_INFO_9W *pi ) { if (!pi->pDevMode) return FALSE; - set_reg_devmode( key, Default_DevModeW, pi->pDevMode ); + set_reg_devmode( key, L"Default DevMode", pi->pDevMode ); return TRUE; } @@ -3627,8 +3556,6 @@ static BOOL WINSPOOL_GetStringFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr, */ static void WINSPOOL_GetDefaultDevMode(LPBYTE ptr, DWORD buflen, DWORD *needed) { - static const WCHAR winepsW[] = { 'w','i','n','e','p','s','.','d','r','v',0 }; - if (buflen >= sizeof(DEVMODEW)) { DEVMODEW *dm = (DEVMODEW *)ptr; @@ -3636,7 +3563,7 @@ static void WINSPOOL_GetDefaultDevMode(LPBYTE ptr, DWORD buflen, DWORD *needed) /* the driver will update registry with real values */ memset(dm, 0, sizeof(*dm)); dm->dmSize = sizeof(*dm); - wcscpy( dm->dmDeviceName, winepsW ); + wcscpy( dm->dmDeviceName, L"wineps.drv" ); } *needed = sizeof(DEVMODEW); } @@ -3689,7 +3616,8 @@ static BOOL WINSPOOL_GetPrinter_1(HKEY hkeyPrinter, PRINTER_INFO_1W *pi1, *pcbNeeded = 0; - if(WINSPOOL_GetStringFromReg(hkeyPrinter, NameW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Name", ptr, left, &size )) + { if(space && size <= left) { pi1->pName = (LPWSTR)ptr; ptr += size; @@ -3700,7 +3628,8 @@ static BOOL WINSPOOL_GetPrinter_1(HKEY hkeyPrinter, PRINTER_INFO_1W *pi1, } /* FIXME: pDescription should be something like "Name,Driver_Name,". */ - if(WINSPOOL_GetStringFromReg(hkeyPrinter, NameW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Name", ptr, left, &size )) + { if(space && size <= left) { pi1->pDescription = (LPWSTR)ptr; ptr += size; @@ -3710,7 +3639,8 @@ static BOOL WINSPOOL_GetPrinter_1(HKEY hkeyPrinter, PRINTER_INFO_1W *pi1, *pcbNeeded += size; } - if(WINSPOOL_GetStringFromReg(hkeyPrinter, DescriptionW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Description", ptr, left, &size )) + { if(space && size <= left) { pi1->pComment = (LPWSTR)ptr; ptr += size; @@ -3741,7 +3671,8 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, *pcbNeeded = 0; - if(WINSPOOL_GetStringFromReg(hkeyPrinter, NameW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Name", ptr, left, &size )) + { if(space && size <= left) { pi2->pPrinterName = (LPWSTR)ptr; ptr += size; @@ -3750,7 +3681,8 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetStringFromReg(hkeyPrinter, Share_NameW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Share Name", ptr, left, &size)) + { if(space && size <= left) { pi2->pShareName = (LPWSTR)ptr; ptr += size; @@ -3759,7 +3691,8 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetStringFromReg(hkeyPrinter, PortW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Port", ptr, left, &size )) + { if(space && size <= left) { pi2->pPortName = (LPWSTR)ptr; ptr += size; @@ -3768,7 +3701,8 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetStringFromReg(hkeyPrinter, Printer_DriverW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Printer Driver", ptr, left, &size )) + { if(space && size <= left) { pi2->pDriverName = (LPWSTR)ptr; ptr += size; @@ -3777,7 +3711,8 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetStringFromReg(hkeyPrinter, DescriptionW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Description", ptr, left, &size )) + { if(space && size <= left) { pi2->pComment = (LPWSTR)ptr; ptr += size; @@ -3786,7 +3721,8 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetStringFromReg(hkeyPrinter, LocationW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Location", ptr, left, &size )) + { if(space && size <= left) { pi2->pLocation = (LPWSTR)ptr; ptr += size; @@ -3795,7 +3731,8 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetDevModeFromReg(hkeyPrinter, Default_DevModeW, ptr, left, &size)) { + if (WINSPOOL_GetDevModeFromReg( hkeyPrinter, L"Default DevMode", ptr, left, &size )) + { if(space && size <= left) { pi2->pDevMode = (LPDEVMODEW)ptr; ptr += size; @@ -3815,7 +3752,8 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetStringFromReg(hkeyPrinter, Separator_FileW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Separator File", ptr, left, &size )) + { if(space && size <= left) { pi2->pSepFile = (LPWSTR)ptr; ptr += size; @@ -3824,7 +3762,8 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetStringFromReg(hkeyPrinter, Print_ProcessorW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Print Processor", ptr, left, &size )) + { if(space && size <= left) { pi2->pPrintProcessor = (LPWSTR)ptr; ptr += size; @@ -3833,7 +3772,8 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetStringFromReg(hkeyPrinter, DatatypeW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Datatype", ptr, left, &size )) + { if(space && size <= left) { pi2->pDatatype = (LPWSTR)ptr; ptr += size; @@ -3842,7 +3782,8 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetStringFromReg(hkeyPrinter, ParametersW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Parameters", ptr, left, &size )) + { if(space && size <= left) { pi2->pParameters = (LPWSTR)ptr; ptr += size; @@ -3851,12 +3792,13 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(pi2) { - pi2->Attributes = get_dword_from_reg( hkeyPrinter, AttributesW ); - pi2->Priority = get_dword_from_reg( hkeyPrinter, PriorityW ); - pi2->DefaultPriority = get_dword_from_reg( hkeyPrinter, Default_PriorityW ); - pi2->StartTime = get_dword_from_reg( hkeyPrinter, StartTimeW ); - pi2->UntilTime = get_dword_from_reg( hkeyPrinter, UntilTimeW ); + if (pi2) + { + pi2->Attributes = get_dword_from_reg( hkeyPrinter, L"Attributes" ); + pi2->Priority = get_dword_from_reg( hkeyPrinter, L"Priority" ); + pi2->DefaultPriority = get_dword_from_reg( hkeyPrinter, L"Default Priority" ); + pi2->StartTime = get_dword_from_reg( hkeyPrinter, L"StartTime" ); + pi2->UntilTime = get_dword_from_reg( hkeyPrinter, L"UntilTime" ); } if(!space && pi2) /* zero out pi2 if we can't completely fill buf */ @@ -3879,7 +3821,8 @@ static BOOL WINSPOOL_GetPrinter_4(HKEY hkeyPrinter, PRINTER_INFO_4W *pi4, *pcbNeeded = 0; - if(WINSPOOL_GetStringFromReg(hkeyPrinter, NameW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Name", ptr, left, &size )) + { if(space && size <= left) { pi4->pPrinterName = (LPWSTR)ptr; ptr += size; @@ -3889,7 +3832,7 @@ static BOOL WINSPOOL_GetPrinter_4(HKEY hkeyPrinter, PRINTER_INFO_4W *pi4, *pcbNeeded += size; } if(pi4) { - pi4->Attributes = get_dword_from_reg( hkeyPrinter, AttributesW ); + pi4->Attributes = get_dword_from_reg( hkeyPrinter, L"Attributes" ); } if(!space && pi4) /* zero out pi4 if we can't completely fill buf */ @@ -3912,7 +3855,8 @@ static BOOL WINSPOOL_GetPrinter_5(HKEY hkeyPrinter, PRINTER_INFO_5W *pi5, *pcbNeeded = 0; - if(WINSPOOL_GetStringFromReg(hkeyPrinter, NameW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Name", ptr, left, &size )) + { if(space && size <= left) { pi5->pPrinterName = (LPWSTR)ptr; ptr += size; @@ -3921,7 +3865,8 @@ static BOOL WINSPOOL_GetPrinter_5(HKEY hkeyPrinter, PRINTER_INFO_5W *pi5, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetStringFromReg(hkeyPrinter, PortW, ptr, left, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyPrinter, L"Port", ptr, left, &size )) + { if(space && size <= left) { pi5->pPortName = (LPWSTR)ptr; ptr += size; @@ -3931,9 +3876,9 @@ static BOOL WINSPOOL_GetPrinter_5(HKEY hkeyPrinter, PRINTER_INFO_5W *pi5, *pcbNeeded += size; } if(pi5) { - pi5->Attributes = get_dword_from_reg( hkeyPrinter, AttributesW ); - pi5->DeviceNotSelectedTimeout = get_dword_from_reg( hkeyPrinter, dnsTimeoutW ); - pi5->TransmissionRetryTimeout = get_dword_from_reg( hkeyPrinter, txTimeoutW ); + pi5->Attributes = get_dword_from_reg( hkeyPrinter, L"Attributes" ); + pi5->DeviceNotSelectedTimeout = get_dword_from_reg( hkeyPrinter, L"dnsTimeout" ); + pi5->TransmissionRetryTimeout = get_dword_from_reg( hkeyPrinter, L"txTimeout" ); } if(!space && pi5) /* zero out pi5 if we can't completely fill buf */ @@ -3956,7 +3901,7 @@ static BOOL WINSPOOL_GetPrinter_7(HKEY hkeyPrinter, PRINTER_INFO_7W *pi7, LPBYTE *pcbNeeded = 0; - if (! WINSPOOL_GetStringFromReg(hkeyPrinter, ObjectGUIDW, ptr, left, &size)) + if (!WINSPOOL_GetStringFromReg( hkeyPrinter, L"ObjectGUID", ptr, left, &size )) { ptr = NULL; size = sizeof(pi7->pszObjectGUID); @@ -3992,7 +3937,8 @@ static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE *pcbNeeded = 0; - if(WINSPOOL_GetDevModeFromReg(hkeyPrinter, Default_DevModeW, buf, cbBuf, &size)) { + if (WINSPOOL_GetDevModeFromReg( hkeyPrinter, L"Default DevMode", buf, cbBuf, &size )) + { if(space && size <= cbBuf) { pi9->pDevMode = (LPDEVMODEW)buf; } else @@ -4118,7 +4064,7 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, size = sizeof(PRINTER_INFO_6); if (size <= cbBuf) { /* FIXME: We do not update the status yet */ - pi6->dwStatus = get_dword_from_reg( hkeyPrinter, StatusW ); + pi6->dwStatus = get_dword_from_reg( hkeyPrinter, L"Status" ); ret = TRUE; } else { ret = FALSE; @@ -4507,14 +4453,14 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( strPtr = (pDriverStrings) ? (pDriverStrings + (*pcbNeeded)) : NULL; } - /* Reserve Space for the largest subdir and a Backslash*/ - size = sizeof(driverdir) - sizeof(Version3_SubdirW) - sizeof(WCHAR); + /* Reserve Space for "\\3\\" + \0 */ + size = sizeof(driverdir) - 4 * sizeof(WCHAR); if (!GetPrinterDriverDirectoryW(NULL, (LPWSTR) env->envname, 1, (LPBYTE) driverdir, size, &size)) { /* Should never Fail */ return FALSE; } wcscat( driverdir, env->versionsubdir ); - wcscat( driverdir, backslashW ); + wcscat( driverdir, L"\\" ); /* dirlen must not include the terminating zero */ dirlen = wcslen( driverdir ) * sizeof(WCHAR); @@ -4537,30 +4483,33 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( /* .pDriverPath is the Graphics rendering engine. The full Path is required to avoid a crash in some apps */ - if (get_filename_from_reg(hkeyDriver, driverdir, dirlen, DriverW, strPtr, 0, &size)) { + if (get_filename_from_reg( hkeyDriver, driverdir, dirlen, L"Driver", strPtr, 0, &size )) + { *pcbNeeded += size; if (*pcbNeeded <= cbBuf) - get_filename_from_reg(hkeyDriver, driverdir, dirlen, DriverW, strPtr, size, &tmp); + get_filename_from_reg( hkeyDriver, driverdir, dirlen, L"Driver", strPtr, size, &tmp ); if (di) di->pDriverPath = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? (pDriverStrings + (*pcbNeeded)) : NULL; } /* .pDataFile: For postscript-drivers, this is the ppd-file */ - if (get_filename_from_reg(hkeyDriver, driverdir, dirlen, Data_FileW, strPtr, 0, &size)) { + if (get_filename_from_reg( hkeyDriver, driverdir, dirlen, L"Data File", strPtr, 0, &size )) + { *pcbNeeded += size; if (*pcbNeeded <= cbBuf) - get_filename_from_reg(hkeyDriver, driverdir, dirlen, Data_FileW, strPtr, size, &size); + get_filename_from_reg( hkeyDriver, driverdir, dirlen, L"Data File", strPtr, size, &size ); if (di) di->pDataFile = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } /* .pConfigFile is the Driver user Interface */ - if (get_filename_from_reg(hkeyDriver, driverdir, dirlen, Configuration_FileW, strPtr, 0, &size)) { + if (get_filename_from_reg( hkeyDriver, driverdir, dirlen, L"Configuration File", strPtr, 0, &size )) + { *pcbNeeded += size; if (*pcbNeeded <= cbBuf) - get_filename_from_reg(hkeyDriver, driverdir, dirlen, Configuration_FileW, strPtr, size, &size); + get_filename_from_reg( hkeyDriver, driverdir, dirlen, L"Configuration File", strPtr, size, &size ); if (di) di->pConfigFile = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; @@ -4579,20 +4528,22 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( } /* .pHelpFile */ - if (get_filename_from_reg(hkeyDriver, driverdir, dirlen, Help_FileW, strPtr, 0, &size)) { + if (get_filename_from_reg( hkeyDriver, driverdir, dirlen, L"Help File", strPtr, 0, &size )) + { *pcbNeeded += size; if (*pcbNeeded <= cbBuf) - get_filename_from_reg(hkeyDriver, driverdir, dirlen, Help_FileW, strPtr, size, &size); + get_filename_from_reg( hkeyDriver, driverdir, dirlen, L"Help File", strPtr, size, &size ); if (di) di->pHelpFile = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } /* .pDependentFiles */ - if (get_filename_from_reg(hkeyDriver, driverdir, dirlen, Dependent_FilesW, strPtr, 0, &size)) { + if (get_filename_from_reg( hkeyDriver, driverdir, dirlen, L"Dependent Files", strPtr, 0, &size )) + { *pcbNeeded += size; if (*pcbNeeded <= cbBuf) - get_filename_from_reg(hkeyDriver, driverdir, dirlen, Dependent_FilesW, strPtr, size, &size); + get_filename_from_reg( hkeyDriver, driverdir, dirlen, L"Dependent Files", strPtr, size, &size ); if (di) di->pDependentFiles = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; @@ -4608,20 +4559,22 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( } /* .pMonitorName is the optional Language Monitor */ - if (WINSPOOL_GetStringFromReg(hkeyDriver, MonitorW, strPtr, 0, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyDriver, L"Monitor", strPtr, 0, &size )) + { *pcbNeeded += size; if (*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, MonitorW, strPtr, size, &size); + WINSPOOL_GetStringFromReg( hkeyDriver, L"Monitor", strPtr, size, &size ); if (di) di->pMonitorName = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } /* .pDefaultDataType */ - if (WINSPOOL_GetStringFromReg(hkeyDriver, DatatypeW, strPtr, 0, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyDriver, L"Datatype", strPtr, 0, &size )) + { *pcbNeeded += size; if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, DatatypeW, strPtr, size, &size); + WINSPOOL_GetStringFromReg( hkeyDriver, L"Datatype", strPtr, size, &size ); if (di) di->pDefaultDataType = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; @@ -4634,10 +4587,11 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( } /* .pszzPreviousNames */ - if (WINSPOOL_GetStringFromReg(hkeyDriver, Previous_NamesW, strPtr, 0, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyDriver, L"Previous Names", strPtr, 0, &size )) + { *pcbNeeded += size; if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, Previous_NamesW, strPtr, size, &size); + WINSPOOL_GetStringFromReg( hkeyDriver, L"Previous Names", strPtr, size, &size ); if (di) di->pszzPreviousNames = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; @@ -4653,40 +4607,44 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( TRACE("%s: DriverDate + DriverVersion not supported\n", debugstr_w(DriverName)); /* .pszMfgName */ - if (WINSPOOL_GetStringFromReg(hkeyDriver, ManufacturerW, strPtr, 0, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyDriver, L"Manufacturer", strPtr, 0, &size )) + { *pcbNeeded += size; if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, ManufacturerW, strPtr, size, &size); + WINSPOOL_GetStringFromReg( hkeyDriver, L"Manufacturer", strPtr, size, &size ); if (di) di->pszMfgName = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } /* .pszOEMUrl */ - if (WINSPOOL_GetStringFromReg(hkeyDriver, OEM_UrlW, strPtr, 0, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyDriver, L"OEM Url", strPtr, 0, &size )) + { *pcbNeeded += size; if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, OEM_UrlW, strPtr, size, &size); + WINSPOOL_GetStringFromReg( hkeyDriver, L"OEM Url", strPtr, size, &size ); if (di) di->pszOEMUrl = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } /* .pszHardwareID */ - if (WINSPOOL_GetStringFromReg(hkeyDriver, HardwareIDW, strPtr, 0, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyDriver, L"HardwareID", strPtr, 0, &size )) + { *pcbNeeded += size; if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, HardwareIDW, strPtr, size, &size); + WINSPOOL_GetStringFromReg( hkeyDriver, L"HardwareID", strPtr, size, &size ); if (di) di->pszHardwareID = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } /* .pszProvider */ - if (WINSPOOL_GetStringFromReg(hkeyDriver, ProviderW, strPtr, 0, &size)) { + if (WINSPOOL_GetStringFromReg( hkeyDriver, L"Provider", strPtr, 0, &size )) + { *pcbNeeded += size; if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, ProviderW, strPtr, size, &size); + WINSPOOL_GetStringFromReg( hkeyDriver, L"Provider", strPtr, size, &size ); if (di) di->pszProvider = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; @@ -4748,8 +4706,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, size = sizeof(DriverName); DriverName[0] = 0; - ret = RegQueryValueExW(hkeyPrinter, Printer_DriverW, 0, &type, - (LPBYTE)DriverName, &size); + ret = RegQueryValueExW( hkeyPrinter, L"Printer Driver", 0, &type, (BYTE *)DriverName, &size ); RegCloseKey(hkeyPrinter); if(ret != ERROR_SUCCESS) { ERR("Can't get DriverName for printer %s\n", debugstr_w(name)); @@ -5186,7 +5143,6 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { - static const WCHAR allW[] = {'a','l','l',0}; BOOL ret; DWORD found; @@ -5213,7 +5169,7 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, memset( pDriverInfo, 0, cbBuf); /* Exception: pull all printers */ - if (pEnvironment && !wcscmp( pEnvironment, allW )) + if (pEnvironment && !wcscmp( pEnvironment, L"all" )) { DWORD i, needed, bufsize = cbBuf; DWORD total_found = 0; @@ -5496,7 +5452,7 @@ BOOL WINAPI GetDefaultPrinterW(LPWSTR name, LPDWORD namesize) len = max(100, (insize + 20)); buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!GetProfileStringW(windowsW, deviceW, emptyStringW, buffer, len)) + if (!GetProfileStringW( L"windows", L"device", L"", buffer, len )) { SetLastError (ERROR_FILE_NOT_FOUND); retval = FALSE; @@ -5650,7 +5606,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) if (!create_printers_reg_key( user_default_key, &hdev )) { - RegSetValueExW(hdev, deviceW, 0, REG_SZ, (BYTE *)buffer, (wcslen( buffer ) + 1) * sizeof(WCHAR)); + RegSetValueExW( hdev, L"device", 0, REG_SZ, (BYTE *)buffer, (wcslen( buffer ) + 1) * sizeof(WCHAR) ); RegCloseKey(hdev); } } @@ -5763,8 +5719,8 @@ DWORD WINAPI SetPrinterDataA(HANDLE hPrinter, LPSTR pValueName, DWORD Type, DWORD WINAPI SetPrinterDataW(HANDLE hPrinter, LPWSTR pValueName, DWORD Type, LPBYTE pData, DWORD cbData) { - return SetPrinterDataExW(hPrinter, PrinterDriverDataW, pValueName, Type, - pData, cbData); + return SetPrinterDataExW( hPrinter, L"PrinterDriverData", pValueName, Type, + pData, cbData ); } /****************************************************************************** @@ -5886,8 +5842,8 @@ DWORD WINAPI GetPrinterDataA(HANDLE hPrinter, LPSTR pValueName, LPDWORD pType, DWORD WINAPI GetPrinterDataW(HANDLE hPrinter, LPWSTR pValueName, LPDWORD pType, LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded) { - return GetPrinterDataExW(hPrinter, PrinterDriverDataW, pValueName, pType, - pData, nSize, pcbNeeded); + return GetPrinterDataExW( hPrinter, L"PrinterDriverData", pValueName, pType, + pData, nSize, pcbNeeded ); } /******************************************************************************* @@ -7897,8 +7853,6 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) DWORD needed; HKEY hkey; WCHAR output[1024]; - static const WCHAR spooler_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'P','r','i','n','t','i','n','g','\\','S','p','o','o','l','e','r',0}; if (!portname) { @@ -7910,7 +7864,7 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) TRACE("need to schedule job %d filename %s to port %s\n", job->job_id, debugstr_w(job->filename), debugstr_w(portname)); - if (!wcsncmp( portname, FILE_Port, wcslen( FILE_Port ) )) + if (!wcsncmp( portname, L"FILE:", ARRAY_SIZE(L"FILE:") - 1 )) { ret = schedule_file( job->filename ); } @@ -7931,7 +7885,7 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) output[0] = 0; /* @@ Wine registry key: HKCU\Software\Wine\Printing\Spooler */ - if (RegOpenKeyW( HKEY_CURRENT_USER, spooler_key, &hkey ) == ERROR_SUCCESS) + if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Printing\\Spooler", &hkey )) { DWORD type, count = sizeof(output); RegQueryValueExW( hkey, portname, NULL, &type, (BYTE *)output, &count ); @@ -8030,7 +7984,7 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) return NULL; pi5 = HeapAlloc(GetProcessHeap(), 0, len); GetPrinterW(hPrinter, 5, (LPBYTE)pi5, len, &len); - if(!pi5->pPortName || wcscmp( pi5->pPortName, FILE_Port )) + if(!pi5->pPortName || wcscmp( pi5->pPortName, L"FILE:" )) { HeapFree(GetProcessHeap(), 0, pi5); return NULL; @@ -8038,7 +7992,7 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) HeapFree(GetProcessHeap(), 0, pi5); } - if(doc->lpszOutput == NULL || !wcscmp( doc->lpszOutput, FILE_Port )) + if(doc->lpszOutput == NULL || !wcscmp( doc->lpszOutput, L"FILE:" )) { LPWSTR name; -- 2.23.0

1 0

[PATCH 3/4] winspool: Add a helper to open various printer registry keys.
by Huw Davies 27 Oct '21

27 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/info.c | 255 ++++++++++++++++++++------------------- 1 file changed, 128 insertions(+), 127 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7cffc9ae7ec..9bc5c5e7a8c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -126,37 +126,6 @@ static opened_printer_t **printer_handles; static UINT nb_printer_handles; static LONG next_job_id = 1; -static const WCHAR DriversW[] = { 'S','y','s','t','e','m','\\', - 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'c','o','n','t','r','o','l','\\', - 'P','r','i','n','t','\\', - 'E','n','v','i','r','o','n','m','e','n','t','s','\\', - '%','s','\\','D','r','i','v','e','r','s','%','s',0 }; - -static const WCHAR PrintersW[] = {'S','y','s','t','e','m','\\', - 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'P','r','i','n','t','\\', - 'P','r','i','n','t','e','r','s',0}; - -static const WCHAR user_default_reg_key[] = { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'W','i','n','d','o','w','s',0}; - -static const WCHAR user_printers_reg_key[] = { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'D','e','v','i','c','e','s',0}; - -static const WCHAR WinNT_CV_PrinterPortsW[] = { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'P','r','i','n','t','e','r','P','o','r','t','s',0}; - static WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR envname_x64W[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; @@ -456,17 +425,18 @@ static HKEY WINSPOOL_OpenDriverReg(const void *pEnvironment) LPWSTR buffer; const printenv_t *env; unsigned int len; + static const WCHAR driver_fmt[] = L"System\\CurrentControlSet\\control\\Print\\Environments\\%s\\Drivers%s"; TRACE("(%s)\n", debugstr_w(pEnvironment)); env = validate_envW(pEnvironment); if (!env) return NULL; - len = wcslen( DriversW ) + wcslen( env->envname ) + wcslen( env->versionregpath ) + 1; + len = ARRAY_SIZE( driver_fmt ) + wcslen( env->envname ) + wcslen( env->versionregpath ); buffer = heap_alloc( len * sizeof(WCHAR) ); if (buffer) { - swprintf( buffer, len, DriversW, env->envname, env->versionregpath ); + swprintf( buffer, len, driver_fmt, env->envname, env->versionregpath ); RegCreateKeyW( HKEY_LOCAL_MACHINE, buffer, &retval ); heap_free( buffer ); } @@ -652,13 +622,37 @@ static HANDLE get_backend_handle( HANDLE hprn ) return printer->backend_printer; } +enum printers_key +{ + system_printers_key, + user_printers_key, + user_ports_key, + user_default_key, +}; + +static DWORD create_printers_reg_key( enum printers_key type, HKEY *key ) +{ + switch( type ) + { + case system_printers_key: + return RegCreateKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Print\\Printers", key ); + case user_printers_key: + return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Devices", key ); + case user_ports_key: + return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\PrinterPorts", key ); + case user_default_key: + return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows", key ); + } + return ERROR_PATH_NOT_FOUND; +} + static DWORD open_printer_reg_key( const WCHAR *name, HKEY *key ) { HKEY printers; DWORD err; *key = NULL; - err = RegCreateKeyW( HKEY_LOCAL_MACHINE, PrintersW, &printers ); + err = create_printers_reg_key( system_printers_key, &printers ); if (err) return err; err = RegOpenKeyW( printers, name, key ); @@ -810,7 +804,7 @@ static BOOL init_unix_printers( void ) NTSTATUS status; int i; - if (RegCreateKeyW( HKEY_LOCAL_MACHINE, PrintersW, &printers_key ) != ERROR_SUCCESS) + if (create_printers_reg_key( system_printers_key, &printers_key )) { ERR( "Can't create Printers key\n" ); return FALSE; @@ -1207,7 +1201,7 @@ static HANDLE init_mutex; void WINSPOOL_LoadSystemPrinters(void) { - HKEY hkey, hkeyPrinters; + HKEY printers_key, printer_key; DWORD needed, num, i; WCHAR PrinterName[256]; @@ -1229,21 +1223,18 @@ void WINSPOOL_LoadSystemPrinters(void) /* This ensures that all printer entries have a valid Name value. If causes problems later if they don't. If one is found to be missed we create one and set it equal to the name of the key */ - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) == ERROR_SUCCESS) { - if(RegQueryInfoKeyW(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, - NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { - for(i = 0; i < num; i++) { - if(RegEnumKeyW(hkeyPrinters, i, PrinterName, ARRAY_SIZE(PrinterName)) == ERROR_SUCCESS) { - if(RegOpenKeyW(hkeyPrinters, PrinterName, &hkey) == ERROR_SUCCESS) { - if(RegQueryValueExW(hkey, NameW, 0, 0, 0, &needed) == ERROR_FILE_NOT_FOUND) { - set_reg_szW(hkey, NameW, PrinterName); - } - RegCloseKey(hkey); + if (!create_printers_reg_key( system_printers_key, &printers_key )) + { + if (!RegQueryInfoKeyW( printers_key, NULL, NULL, NULL, &num, NULL, NULL, NULL, NULL, NULL, NULL, NULL )) + for (i = 0; i < num; i++) + if (!RegEnumKeyW( printers_key, i, PrinterName, ARRAY_SIZE(PrinterName) )) + if (!RegOpenKeyW( printers_key, PrinterName, &printer_key )) + { + if (RegQueryValueExW( printer_key, NameW, 0, 0, 0, &needed ) == ERROR_FILE_NOT_FOUND) + set_reg_szW( printer_key, NameW, PrinterName ); + RegCloseKey( printer_key ); } - } - } - } - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); } old_printer_check( FALSE ); @@ -2684,7 +2675,7 @@ static void set_devices_and_printerports(PRINTER_INFO_2W *pi) { DWORD portlen = wcslen( pi->pPortName ) * sizeof(WCHAR); WCHAR *devline; - HKEY hkey; + HKEY key; TRACE("(%p) %s\n", pi, debugstr_w(pi->pPrinterName)); @@ -2697,17 +2688,19 @@ static void set_devices_and_printerports(PRINTER_INFO_2W *pi) wcscat( devline, pi->pPortName ); TRACE("using %s\n", debugstr_w(devline)); - if (!RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey)) { - RegSetValueExW(hkey, pi->pPrinterName, 0, REG_SZ, (LPBYTE)devline, - (wcslen( devline ) + 1) * sizeof(WCHAR)); - RegCloseKey(hkey); + if (!create_printers_reg_key( user_printers_key, &key )) + { + RegSetValueExW( key, pi->pPrinterName, 0, REG_SZ, (BYTE *)devline, + (wcslen( devline ) + 1) * sizeof(WCHAR) ); + RegCloseKey( key ); } wcscat( devline, timeout_15_45 ); - if (!RegCreateKeyW(HKEY_CURRENT_USER, WinNT_CV_PrinterPortsW, &hkey)) { - RegSetValueExW(hkey, pi->pPrinterName, 0, REG_SZ, (LPBYTE)devline, - (wcslen( devline ) + 1) * sizeof(WCHAR)); - RegCloseKey(hkey); + if (!create_printers_reg_key( user_ports_key, &key )) + { + RegSetValueExW( key, pi->pPrinterName, 0, REG_SZ, (BYTE *)devline, + (wcslen( devline ) + 1) * sizeof(WCHAR) ); + RegCloseKey( key ); } HeapFree(GetProcessHeap(), 0, devline); } @@ -2721,7 +2714,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) PRINTER_INFO_2W *pi = (PRINTER_INFO_2W *) pPrinter; LPDEVMODEW dm; HANDLE retval; - HKEY hkeyPrinter, hkeyPrinters, hkeyDriver, hkeyDrivers; + HKEY hkeyPrinter, printers_key, hkeyDriver, hkeyDrivers; LONG size; TRACE("(%s,%d,%p)\n", debugstr_w(pName), Level, pPrinter); @@ -2740,16 +2733,17 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) SetLastError(ERROR_INVALID_PARAMETER); return 0; } - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != - ERROR_SUCCESS) { + if (create_printers_reg_key( system_printers_key, &printers_key )) + { ERR("Can't create Printers key\n"); return 0; } - if(!RegOpenKeyW(hkeyPrinters, pi->pPrinterName, &hkeyPrinter)) { + if (!RegOpenKeyW( printers_key, pi->pPrinterName, &hkeyPrinter )) + { if (!RegQueryValueW(hkeyPrinter, AttributesW, NULL, NULL)) { SetLastError(ERROR_PRINTER_ALREADY_EXISTS); RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); return 0; } RegCloseKey(hkeyPrinter); @@ -2757,13 +2751,13 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) hkeyDrivers = WINSPOOL_OpenDriverReg(NULL); if(!hkeyDrivers) { ERR("Can't create Drivers key\n"); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); return 0; } if(RegOpenKeyW(hkeyDrivers, pi->pDriverName, &hkeyDriver) != ERROR_SUCCESS) { WARN("Can't find driver %s\n", debugstr_w(pi->pDriverName)); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); RegCloseKey(hkeyDrivers); SetLastError(ERROR_UNKNOWN_PRINTER_DRIVER); return 0; @@ -2775,15 +2769,15 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) { FIXME("Can't find processor %s\n", debugstr_w(pi->pPrintProcessor)); SetLastError(ERROR_UNKNOWN_PRINTPROCESSOR); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); return 0; } - if(RegCreateKeyW(hkeyPrinters, pi->pPrinterName, &hkeyPrinter) != - ERROR_SUCCESS) { + if (RegCreateKeyW( printers_key, pi->pPrinterName, &hkeyPrinter )) + { FIXME("Can't create printer %s\n", debugstr_w(pi->pPrinterName)); SetLastError(ERROR_INVALID_PRINTER_NAME); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); return 0; } @@ -2839,7 +2833,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) if (!pi->pDevMode) HeapFree( GetProcessHeap(), 0, dm ); RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); if(!OpenPrinterW(pi->pPrinterName, &retval, NULL)) { ERR("OpenPrinter failing\n"); return 0; @@ -2959,7 +2953,7 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) { LPCWSTR lpNameW = get_opened_printer_name(hPrinter); config_module_t *config_module; - HKEY hkeyPrinters, hkey; + HKEY key; WCHAR def[MAX_PATH]; DWORD size = ARRAY_SIZE(def); @@ -2975,27 +2969,30 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) } LeaveCriticalSection(&config_modules_cs); - if(RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) == ERROR_SUCCESS) { - RegDeleteTreeW(hkeyPrinters, lpNameW); - RegCloseKey(hkeyPrinters); + if (!create_printers_reg_key( system_printers_key, &key )) + { + RegDeleteTreeW( key, lpNameW ); + RegCloseKey( key ); } - if(RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey) == ERROR_SUCCESS) { - RegDeleteValueW(hkey, lpNameW); - RegCloseKey(hkey); + if (!create_printers_reg_key( user_printers_key, &key )) + { + RegDeleteValueW( key, lpNameW ); + RegCloseKey( key ); } - if(RegCreateKeyW(HKEY_CURRENT_USER, WinNT_CV_PrinterPortsW, &hkey) == ERROR_SUCCESS) { - RegDeleteValueW(hkey, lpNameW); - RegCloseKey(hkey); + if (!create_printers_reg_key( user_ports_key, &key ) == ERROR_SUCCESS) + { + RegDeleteValueW( key, lpNameW ); + RegCloseKey( key ); } if (GetDefaultPrinterW( def, &size ) && !wcscmp( def, lpNameW )) { - if (!RegCreateKeyW( HKEY_CURRENT_USER, user_default_reg_key, &hkey )) + if (!create_printers_reg_key( user_default_key, &key )) { - RegDeleteValueW( hkey, deviceW ); - RegCloseKey( hkey ); + RegDeleteValueW( key, deviceW ); + RegCloseKey( key ); } SetDefaultPrinterW( NULL ); } @@ -4222,7 +4219,7 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName, LPDWORD lpdwReturned) { - HKEY hkeyPrinters, hkeyPrinter; + HKEY printers_key, hkeyPrinter; WCHAR PrinterName[255]; DWORD needed = 0, number = 0; DWORD used, i, left; @@ -4255,15 +4252,15 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName, return FALSE; } - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != - ERROR_SUCCESS) { + if (create_printers_reg_key( system_printers_key, &printers_key )) + { ERR("Can't create Printers key\n"); return FALSE; } - if(RegQueryInfoKeyA(hkeyPrinters, NULL, NULL, NULL, &number, NULL, NULL, - NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) { - RegCloseKey(hkeyPrinters); + if (RegQueryInfoKeyA( printers_key, NULL, NULL, NULL, &number, NULL, NULL, NULL, NULL, NULL, NULL, NULL )) + { + RegCloseKey( printers_key ); ERR("Can't query Printers key\n"); return FALSE; } @@ -4285,22 +4282,23 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName, default: SetLastError(ERROR_INVALID_LEVEL); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); return FALSE; } pi = (used <= cbBuf) ? lpbPrinters : NULL; for(i = 0; i < number; i++) { - if(RegEnumKeyW(hkeyPrinters, i, PrinterName, ARRAY_SIZE(PrinterName)) != ERROR_SUCCESS) { + if (RegEnumKeyW( printers_key, i, PrinterName, ARRAY_SIZE(PrinterName) )) + { ERR("Can't enum key number %d\n", i); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); return FALSE; } TRACE("Printer %d is %s\n", i, debugstr_w(PrinterName)); - if(RegOpenKeyW(hkeyPrinters, PrinterName, &hkeyPrinter) != - ERROR_SUCCESS) { + if (RegOpenKeyW( printers_key, PrinterName, &hkeyPrinter )) + { ERR("Can't open key %s\n", debugstr_w(PrinterName)); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); return FALSE; } @@ -4340,12 +4338,12 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName, default: ERR("Shouldn't be here!\n"); RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); return FALSE; } RegCloseKey(hkeyPrinter); } - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); if(lpdwNeeded) *lpdwNeeded = used; @@ -5609,16 +5607,16 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) pszPrinter = NULL; /* we have no default Printer: search local Printers and use the first */ - if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, PrintersW, 0, KEY_READ, &hreg)) { - + if (!create_printers_reg_key( system_printers_key, &hreg )) + { default_printer[0] = '\0'; size = ARRAY_SIZE(default_printer); - if (!RegEnumKeyExW(hreg, 0, default_printer, &size, NULL, NULL, NULL, NULL)) { - + if (!RegEnumKeyExW( hreg, 0, default_printer, &size, NULL, NULL, NULL, NULL )) + { pszPrinter = default_printer; TRACE("using %s\n", debugstr_w(pszPrinter)); } - RegCloseKey(hreg); + RegCloseKey( hreg ); } if (pszPrinter == NULL) { @@ -5632,8 +5630,8 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) namelen = wcslen( pszPrinter ); size = namelen + (MAX_PATH * 2) + 3; /* printer,driver,port and a 0 */ buffer = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (!buffer || - (RegOpenKeyExW(HKEY_CURRENT_USER, user_printers_reg_key, 0, KEY_READ, &hreg) != ERROR_SUCCESS)) { + if (!buffer || create_printers_reg_key( user_printers_key, &hreg )) + { HeapFree(GetProcessHeap(), 0, buffer); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; @@ -5650,7 +5648,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) if (!lres) { HKEY hdev; - if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hdev)) + if (!create_printers_reg_key( user_default_key, &hdev )) { RegSetValueExW(hdev, deviceW, 0, REG_SZ, (BYTE *)buffer, (wcslen( buffer ) + 1) * sizeof(WCHAR)); RegCloseKey(hdev); @@ -5777,7 +5775,7 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded) { opened_printer_t *printer; - HKEY hkeyPrinters, hkeyPrinter = 0, hkeySubkey = 0; + HKEY printers_key, hkeyPrinter = 0, hkeySubkey = 0; DWORD ret; TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_a(pKeyName), @@ -5786,34 +5784,35 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, printer = get_opened_printer(hPrinter); if(!printer) return ERROR_INVALID_HANDLE; - ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters); + ret = create_printers_reg_key( system_printers_key, &printers_key ); if (ret) return ret; TRACE("printer->name: %s\n", debugstr_w(printer->name)); if (printer->name) { - ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter); - if (ret) { - RegCloseKey(hkeyPrinters); + ret = RegOpenKeyW( printers_key, printer->name, &hkeyPrinter ); + if (ret) + { + RegCloseKey( printers_key ); return ret; } if((ret = RegOpenKeyA(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS) { WARN("Can't open subkey %s: %d\n", debugstr_a(pKeyName), ret); RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); return ret; } } *pcbNeeded = nSize; - ret = RegQueryValueExA(printer->name ? hkeySubkey : hkeyPrinters, pValueName, - 0, pType, pData, pcbNeeded); + ret = RegQueryValueExA( printer->name ? hkeySubkey : printers_key, pValueName, + 0, pType, pData, pcbNeeded ); if (!ret && !pData) ret = ERROR_MORE_DATA; RegCloseKey(hkeySubkey); RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); TRACE("--> %d\n", ret); return ret; @@ -5827,7 +5826,7 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded) { opened_printer_t *printer; - HKEY hkeyPrinters, hkeyPrinter = 0, hkeySubkey = 0; + HKEY printers_key, hkeyPrinter = 0, hkeySubkey = 0; DWORD ret; TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_w(pKeyName), @@ -5836,34 +5835,36 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, printer = get_opened_printer(hPrinter); if(!printer) return ERROR_INVALID_HANDLE; - ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters); + ret = create_printers_reg_key( system_printers_key, &printers_key ); if (ret) return ret; TRACE("printer->name: %s\n", debugstr_w(printer->name)); - if (printer->name) { - - ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter); - if (ret) { - RegCloseKey(hkeyPrinters); + if (printer->name) + { + ret = RegOpenKeyW( printers_key, printer->name, &hkeyPrinter); + if (ret) + { + RegCloseKey( printers_key ); return ret; } - if((ret = RegOpenKeyW(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS) { + if ((ret = RegOpenKeyW(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS) + { WARN("Can't open subkey %s: %d\n", debugstr_w(pKeyName), ret); RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); return ret; } } *pcbNeeded = nSize; - ret = RegQueryValueExW(printer->name ? hkeySubkey : hkeyPrinters, pValueName, - 0, pType, pData, pcbNeeded); + ret = RegQueryValueExW( printer->name ? hkeySubkey : printers_key, pValueName, + 0, pType, pData, pcbNeeded ); if (!ret && !pData) ret = ERROR_MORE_DATA; RegCloseKey(hkeySubkey); RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); + RegCloseKey( printers_key ); TRACE("--> %d\n", ret); return ret; -- 2.23.0

1 0

[PATCH 2/4] winspool: Build with msvcrt.
by Huw Davies 27 Oct '21

27 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/Makefile.in | 3 +- dlls/winspool.drv/cups.c | 47 +++++----- dlls/winspool.drv/info.c | 157 ++++++++++++++++++---------------- dlls/winspool.drv/wspool.c | 16 ++-- dlls/winspool.drv/wspool.h | 17 ++-- 5 files changed, 121 insertions(+), 119 deletions(-) diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index d40813d649c..673b26e1fae 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -1,12 +1,11 @@ EXTRADEFS = -D_SPOOL32_ MODULE = winspool.drv +UNIXLIB = winspool.so IMPORTLIB = winspool IMPORTS = user32 gdi32 advapi32 EXTRAINCL = $(CUPS_CFLAGS) EXTRALIBS = $(APPLICATIONSERVICES_LIBS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ cups.c \ info.c \ diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 511cf9a5c4d..2bc5c9aafad 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -17,20 +17,22 @@ * 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" -#include "wine/port.h" #include <stdarg.h> #include <string.h> #include <stdio.h> #include <sys/types.h> #include <unistd.h> +#include <dlfcn.h> #include <fcntl.h> #include <errno.h> #include <signal.h> -#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> -#endif #ifdef HAVE_CUPS_CUPS_H #include <cups/cups.h> #endif @@ -107,6 +109,7 @@ #include "ddk/winsplp.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/unixlib.h" #include "wspool.h" @@ -115,21 +118,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winspool); static const WCHAR CUPS_Port[] = { 'C','U','P','S',':',0 }; static const WCHAR LPR_Port[] = { 'L','P','R',':',0 }; -/* Temporary helpers until switch to unixlib */ -#include "winnls.h" -#include "wine/heap.h" -#define malloc( sz ) heap_alloc( sz ) -#define free( ptr ) heap_free( ptr ) -static DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) -{ - return MultiByteToWideChar( CP_UNIXCP, 0, src, srclen, dst, dstlen ); -} -static int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) -{ - /* FIXME: strict */ - return WideCharToMultiByte( CP_UNIXCP, 0, src, srclen, dst, dstlen, NULL, NULL ); -} - #ifdef SONAME_LIBCUPS static void *libcups_handle; @@ -158,7 +146,7 @@ static const char * (*pcupsLastErrorString)(void); #endif /* SONAME_LIBCUPS */ -NTSTATUS unix_process_attach( void *arg ) +NTSTATUS process_attach( void *args ) { #ifdef SONAME_LIBCUPS libcups_handle = dlopen( SONAME_LIBCUPS, RTLD_NOW ); @@ -346,7 +334,7 @@ static int get_cups_default_options( const char *printer, int num_options, cups_ } #endif /* SONAME_LIBCUPS */ -NTSTATUS unix_enum_printers( void *args ) +NTSTATUS enum_printers( void *args ) { struct enum_printers_params *params = args; #ifdef SONAME_LIBCUPS @@ -416,7 +404,7 @@ NTSTATUS unix_enum_printers( void *args ) #endif /* SONAME_LIBCUPS */ } -NTSTATUS unix_get_ppd( void *args ) +NTSTATUS get_ppd( void *args ) { struct get_ppd_params *params = args; char *unix_ppd = get_unix_file_name( params->ppd ); @@ -457,7 +445,7 @@ NTSTATUS unix_get_ppd( void *args ) return status; } -NTSTATUS unix_get_default_page_size( void *args ) +NTSTATUS get_default_page_size( void *args ) { #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H struct get_default_page_size_params *params = args; @@ -503,7 +491,6 @@ end: */ static BOOL schedule_pipe( const WCHAR *cmd, const WCHAR *filename ) { -#ifdef HAVE_FORK char *unixname, *cmdA; DWORD len; int fds[2] = { -1, -1 }, file_fd = -1, no_read; @@ -579,9 +566,6 @@ end: free( cmdA ); free( unixname ); return ret; -#else - return FALSE; -#endif } /***************************************************************************** @@ -676,7 +660,7 @@ static BOOL schedule_cups( const WCHAR *printer_name, const WCHAR *filename, con } } -BOOL unix_schedule_job( void *args ) +BOOL schedule_job( void *args ) { struct schedule_job_params *params = args; @@ -694,3 +678,12 @@ BOOL unix_schedule_job( void *args ) return FALSE; } + +unixlib_entry_t __wine_unix_call_funcs[] = +{ + process_attach, + enum_printers, + get_default_page_size, + get_ppd, + schedule_job, +}; diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f813e188058..7cffc9ae7ec 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -23,9 +23,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" - #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -46,13 +43,13 @@ #include "wingdi.h" #include "winspool.h" #include "winternl.h" +#include "winnls.h" #include "wine/windef16.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/list.h" #include "wine/rbtree.h" #include "wine/heap.h" -#include "winnls.h" +#include <wine/unixlib.h> #include "ddk/winsplp.h" #include "wspool.h" @@ -276,7 +273,7 @@ static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_arm, * NOTES * An empty string is handled the same way as NULL. * SetLastError(ERROR_INVALID_ENVIRONMENT) is called on Failure - * + * */ static const printenv_t * validate_envW(LPCWSTR env) @@ -289,7 +286,7 @@ static const printenv_t * validate_envW(LPCWSTR env) { for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { - if (lstrcmpiW(env, all_printenv[i]->envname) == 0) + if (!wcsicmp( env, all_printenv[i]->envname )) { result = all_printenv[i]; break; @@ -325,14 +322,14 @@ static inline PWSTR asciitounicode( UNICODE_STRING * usBufferPtr, LPCSTR src ) usBufferPtr->Buffer = NULL; /* so that RtlFreeUnicodeString won't barf */ return NULL; } - + static LPWSTR strdupW(LPCWSTR p) { LPWSTR ret; DWORD len; if(!p) return NULL; - len = (strlenW(p) + 1) * sizeof(WCHAR); + len = (wcslen( p ) + 1) * sizeof(WCHAR); ret = HeapAlloc(GetProcessHeap(), 0, len); memcpy(ret, p, len); return ret; @@ -389,7 +386,7 @@ static DEVMODEA *DEVMODEdupWtoA( const DEVMODEW *dmW ) static void packed_string_WtoA( WCHAR *strW ) { - DWORD len = strlenW( strW ), size = (len + 1) * sizeof(WCHAR), ret; + DWORD len = wcslen( strW ), size = (len + 1) * sizeof(WCHAR), ret; char *str; if (!len) return; @@ -455,22 +452,23 @@ static inline const DWORD *form_string_info( DWORD level ) */ static HKEY WINSPOOL_OpenDriverReg(const void *pEnvironment) { - HKEY retval = NULL; + HKEY retval = NULL; LPWSTR buffer; const printenv_t *env; + unsigned int len; TRACE("(%s)\n", debugstr_w(pEnvironment)); env = validate_envW(pEnvironment); if (!env) return NULL; - buffer = HeapAlloc( GetProcessHeap(), 0, - (strlenW(DriversW) + strlenW(env->envname) + - strlenW(env->versionregpath) + 1) * sizeof(WCHAR)); - if(buffer) { - wsprintfW(buffer, DriversW, env->envname, env->versionregpath); - RegCreateKeyW(HKEY_LOCAL_MACHINE, buffer, &retval); - HeapFree(GetProcessHeap(), 0, buffer); + len = wcslen( DriversW ) + wcslen( env->envname ) + wcslen( env->versionregpath ) + 1; + buffer = heap_alloc( len * sizeof(WCHAR) ); + if (buffer) + { + swprintf( buffer, len, DriversW, env->envname, env->versionregpath ); + RegCreateKeyW( HKEY_LOCAL_MACHINE, buffer, &retval ); + heap_free( buffer ); } return retval; } @@ -487,7 +485,7 @@ static CRITICAL_SECTION config_modules_cs = { &config_modules_cs_debug, -1, 0, 0 static int compare_config_modules(const void *key, const struct wine_rb_entry *entry) { config_module_t *module = WINE_RB_ENTRY_VALUE(entry, config_module_t, entry); - return lstrcmpiW(key, module->name); + return wcsicmp( key, module->name ); } static struct wine_rb_tree config_modules = { compare_config_modules }; @@ -549,7 +547,7 @@ static config_module_t *get_config_module(const WCHAR *device, BOOL grab) goto ret; } - len = lstrlenW(device); + len = wcslen( device ); if (!(ret = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(config_module_t, name[len + 1])))) goto ret; @@ -557,7 +555,7 @@ static config_module_t *get_config_module(const WCHAR *device, BOOL grab) ret->module = driver_module; ret->pDrvDeviceCapabilities = (void *)GetProcAddress(driver_module, "DrvDeviceCapabilities"); ret->pDrvDocumentProperties = (void *)GetProcAddress(driver_module, "DrvDocumentProperties"); - lstrcpyW(ret->name, device); + wcscpy( ret->name, device ); wine_rb_put(&config_modules, ret->name, &ret->entry); ret: @@ -582,7 +580,7 @@ static int multi_sz_lenA(const char *str) if(!str) return 0; do { - ptr += lstrlenA(ptr) + 1; + ptr += strlen( ptr ) + 1; } while(*ptr); return ptr - str + 1; @@ -708,7 +706,7 @@ static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) { static const WCHAR dot_ppd[] = {'.','p','p','d',0}; static const WCHAR invalid_chars[] = {'*','?','<','>','|','"','/','\\',0}; - int dir_len = strlenW( dir ), file_len = strlenW( file_name ); + int dir_len = wcslen( dir ), file_len = wcslen( file_name ); int len = (dir_len + file_len + ARRAY_SIZE( dot_ppd )) * sizeof(WCHAR); WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ), *p; @@ -718,7 +716,7 @@ static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) memcpy( ppd + dir_len + file_len, dot_ppd, sizeof(dot_ppd) ); p = ppd + dir_len; - while ((p = strpbrkW( p, invalid_chars ))) *p++ = '_'; + while ((p = wcspbrk( p, invalid_chars ))) *p++ = '_'; return ppd; } @@ -850,9 +848,9 @@ static BOOL init_unix_printers( void ) if (!ppd_dir && !(ppd_dir = get_ppd_dir())) break; if (!add_printer_driver( printer->name, ppd_dir )) continue; - port = heap_alloc( sizeof(CUPS_Port) + lstrlenW( printer->name ) * sizeof(WCHAR) ); - lstrcpyW( port, CUPS_Port ); - lstrcatW( port, printer->name ); + port = heap_alloc( sizeof(CUPS_Port) + wcslen( printer->name ) * sizeof(WCHAR) ); + wcscpy( port, CUPS_Port ); + wcscat( port, printer->name ); memset( &pi2, 0, sizeof(PRINTER_INFO_2W) ); pi2.pPrinterName = printer->name; @@ -934,7 +932,7 @@ static inline DWORD set_reg_szW(HKEY hkey, const WCHAR *keyname, const WCHAR *va { if (value) return RegSetValueExW(hkey, keyname, 0, REG_SZ, (const BYTE*)value, - (lstrlenW(value) + 1) * sizeof(WCHAR)); + (wcslen( value ) + 1) * sizeof(WCHAR)); else return ERROR_FILE_NOT_FOUND; } @@ -979,14 +977,16 @@ static LPWSTR get_servername_from_name(LPCWSTR name) if (server == NULL) return NULL; /* strip '\' and the printername */ - ptr = strchrW(server, '\\'); + ptr = wcschr( server, '\\' ); if (ptr) ptr[0] = '\0'; TRACE("found %s\n", debugstr_w(server)); len = ARRAY_SIZE(buffer); - if (GetComputerNameW(buffer, &len)) { - if (lstrcmpW(buffer, server) == 0) { + if (GetComputerNameW(buffer, &len)) + { + if (!wcscmp( buffer, server )) + { /* The requested Servername is our computername */ HeapFree(GetProcessHeap(), 0, server); return NULL; @@ -1004,10 +1004,12 @@ static LPWSTR get_servername_from_name(LPCWSTR name) static LPCWSTR get_basename_from_name(LPCWSTR name) { if (name == NULL) return NULL; - if ((name[0] == '\\') && (name[1] == '\\')) { + if ((name[0] == '\\') && (name[1] == '\\')) + { /* skip over the servername and search for the following '\' */ - name = strchrW(&name[2], '\\'); - if ((name) && (name[1])) { + name = wcschr( &name[2], '\\' ); + if ((name) && (name[1])) + { /* found a separator ('\') followed by a name: skip over the separator and return the rest */ name++; @@ -1075,7 +1077,7 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault } else { - if(!queue && (name) && !lstrcmpW(name, printer_handles[i]->name)) + if(!queue && (name) && !wcscmp( name, printer_handles[i]->name )) queue = printer_handles[i]->queue; } } @@ -1167,8 +1169,8 @@ static void old_printer_check( BOOL delete_phase ) { if (!pi[i].pPortName) continue; - if (strncmpW( pi[i].pPortName, CUPS_Port, strlenW(CUPS_Port) ) && - strncmpW( pi[i].pPortName, LPR_Port, strlenW(LPR_Port) )) + if (wcsncmp( pi[i].pPortName, CUPS_Port, wcslen( CUPS_Port ) ) && + wcsncmp( pi[i].pPortName, LPR_Port, wcslen( LPR_Port ) )) continue; if (open_printer_reg_key( pi[i].pPrinterName, &key )) continue; @@ -2516,7 +2518,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD ADDJOB_INFO_1W *addjob; TRACE("(%p,%d,%p,%d,%p)\n", hPrinter, Level, pData, cbBuf, pcbNeeded); - + EnterCriticalSection(&printer_handles_cs); printer = get_opened_printer(hPrinter); @@ -2540,10 +2542,10 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD len = GetSystemDirectoryW(path, ARRAY_SIZE(path)); if(path[len - 1] != '\\') path[len++] = '\\'; - memcpy(path + len, spool_path, sizeof(spool_path)); - sprintfW(filename, fmtW, path, job->job_id); + memcpy( path + len, spool_path, sizeof(spool_path) ); + swprintf( filename, ARRAY_SIZE(filename), fmtW, path, job->job_id ); - len = strlenW(filename); + len = wcslen( filename ); job->filename = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); memcpy(job->filename, filename, (len + 1) * sizeof(WCHAR)); job->portname = NULL; @@ -2559,7 +2561,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD addjob->Path = (WCHAR *)(addjob + 1); memcpy(addjob->Path, filename, (len + 1) * sizeof(WCHAR)); ret = TRUE; - } else + } else SetLastError(ERROR_INSUFFICIENT_BUFFER); end: @@ -2680,7 +2682,7 @@ BOOL WINAPI GetPrintProcessorDirectoryW(LPWSTR server, LPWSTR env, */ static void set_devices_and_printerports(PRINTER_INFO_2W *pi) { - DWORD portlen = lstrlenW(pi->pPortName) * sizeof(WCHAR); + DWORD portlen = wcslen( pi->pPortName ) * sizeof(WCHAR); WCHAR *devline; HKEY hkey; @@ -2688,22 +2690,23 @@ static void set_devices_and_printerports(PRINTER_INFO_2W *pi) /* FIXME: the driver must change to "winspool" */ devline = HeapAlloc(GetProcessHeap(), 0, sizeof(driver_nt) + portlen + sizeof(timeout_15_45)); - if (devline) { - lstrcpyW(devline, driver_nt); - lstrcatW(devline, commaW); - lstrcatW(devline, pi->pPortName); + if (devline) + { + wcscpy( devline, driver_nt ); + wcscat( devline, commaW ); + wcscat( devline, pi->pPortName ); TRACE("using %s\n", debugstr_w(devline)); if (!RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey)) { RegSetValueExW(hkey, pi->pPrinterName, 0, REG_SZ, (LPBYTE)devline, - (lstrlenW(devline) + 1) * sizeof(WCHAR)); + (wcslen( devline ) + 1) * sizeof(WCHAR)); RegCloseKey(hkey); } - lstrcatW(devline, timeout_15_45); + wcscat( devline, timeout_15_45 ); if (!RegCreateKeyW(HKEY_CURRENT_USER, WinNT_CV_PrinterPortsW, &hkey)) { RegSetValueExW(hkey, pi->pPrinterName, 0, REG_SZ, (LPBYTE)devline, - (lstrlenW(devline) + 1) * sizeof(WCHAR)); + (wcslen( devline ) + 1) * sizeof(WCHAR)); RegCloseKey(hkey); } HeapFree(GetProcessHeap(), 0, devline); @@ -2768,7 +2771,8 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) RegCloseKey(hkeyDriver); RegCloseKey(hkeyDrivers); - if(lstrcmpiW(pi->pPrintProcessor, WinPrintW)) { /* FIXME */ + if(wcsicmp( pi->pPrintProcessor, WinPrintW )) + { FIXME("Can't find processor %s\n", debugstr_w(pi->pPrintProcessor)); SetLastError(ERROR_UNKNOWN_PRINTPROCESSOR); RegCloseKey(hkeyPrinters); @@ -2825,8 +2829,9 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) } else { - /* set devmode to printer name */ - lstrcpynW( dm->dmDeviceName, pi->pPrinterName, CCHDEVICENAME ); + unsigned int len = min( ARRAY_SIZE( dm->dmDeviceName ) - 1, wcslen( pi->pPrinterName ) ); + memcpy( dm->dmDeviceName, pi->pPrinterName, len * sizeof(WCHAR) ); + dm->dmDeviceName[len] = '\0'; } } @@ -2985,7 +2990,7 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) RegCloseKey(hkey); } - if (GetDefaultPrinterW( def, &size ) && !strcmpW( def, lpNameW )) + if (GetDefaultPrinterW( def, &size ) && !wcscmp( def, lpNameW )) { if (!RegCreateKeyW( HKEY_CURRENT_USER, user_default_reg_key, &hkey )) { @@ -3554,7 +3559,7 @@ static BOOL get_filename_from_reg(HKEY hkey, LPCWSTR driverdir, DWORD dirlen, LP /* we must build the full Path */ *needed += dirlen; if ((out) && (outlen > dirlen)) { - lstrcpyW((LPWSTR)out, driverdir); + wcscpy( (WCHAR *)out, driverdir ); out += dirlen; outlen -= dirlen; } @@ -3563,16 +3568,16 @@ static BOOL get_filename_from_reg(HKEY hkey, LPCWSTR driverdir, DWORD dirlen, LP } /* write the filename */ - size = (lstrlenW(ptr) + 1) * sizeof(WCHAR); + size = (wcslen( ptr ) + 1) * sizeof(WCHAR); if ((out) && (outlen >= size)) { - lstrcpyW((LPWSTR)out, ptr); + wcscpy( (WCHAR *)out, ptr ); out += size; outlen -= size; } else out = NULL; *needed += size; - ptr += lstrlenW(ptr)+1; + ptr += wcslen( ptr ) + 1; if ((type != REG_MULTI_SZ) || (!ptr[0])) ptr = NULL; } @@ -3634,7 +3639,7 @@ static void WINSPOOL_GetDefaultDevMode(LPBYTE ptr, DWORD buflen, DWORD *needed) /* the driver will update registry with real values */ memset(dm, 0, sizeof(*dm)); dm->dmSize = sizeof(*dm); - lstrcpyW(dm->dmDeviceName, winepsW); + wcscpy( dm->dmDeviceName, winepsW ); } *needed = sizeof(DEVMODEW); } @@ -4487,9 +4492,9 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( if (di) ZeroMemory(di, di_sizeof[Level]); - *pcbNeeded = (lstrlenW(DriverName) + 1) * sizeof(WCHAR); + *pcbNeeded = (wcslen( DriverName ) + 1) * sizeof(WCHAR); if (*pcbNeeded <= cbBuf) - strcpyW((LPWSTR)strPtr, DriverName); + wcscpy( (WCHAR *)strPtr, DriverName ); /* pName for level 1 has a different offset! */ if (Level == 1) { @@ -4510,11 +4515,11 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( /* Should never Fail */ return FALSE; } - lstrcatW(driverdir, env->versionsubdir); - lstrcatW(driverdir, backslashW); + wcscat( driverdir, env->versionsubdir ); + wcscat( driverdir, backslashW ); /* dirlen must not include the terminating zero */ - dirlen = lstrlenW(driverdir) * sizeof(WCHAR); + dirlen = wcslen( driverdir ) * sizeof(WCHAR); if (!DriverName[0] || RegOpenKeyW(hkeyDrivers, DriverName, &hkeyDriver) != ERROR_SUCCESS) { ERR("Can't find driver %s in registry\n", debugstr_w(DriverName)); @@ -4523,11 +4528,11 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( } /* pEnvironment */ - size = (lstrlenW(env->envname) + 1) * sizeof(WCHAR); + size = (wcslen( env->envname ) + 1) * sizeof(WCHAR); *pcbNeeded += size; if (*pcbNeeded <= cbBuf) { - lstrcpyW((LPWSTR)strPtr, env->envname); + wcscpy( (WCHAR *)strPtr, env->envname ); if (di) di->pEnvironment = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? (pDriverStrings + (*pcbNeeded)) : NULL; } @@ -5210,7 +5215,7 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, memset( pDriverInfo, 0, cbBuf); /* Exception: pull all printers */ - if (pEnvironment && !strcmpW(pEnvironment, allW)) + if (pEnvironment && !wcscmp( pEnvironment, allW )) { DWORD i, needed, bufsize = cbBuf; DWORD total_found = 0; @@ -5501,7 +5506,7 @@ BOOL WINAPI GetDefaultPrinterW(LPWSTR name, LPDWORD namesize) } TRACE("%s\n", debugstr_w(buffer)); - if ((ptr = strchrW(buffer, ',')) == NULL) + if ((ptr = wcschr( buffer, ',' )) == NULL) { SetLastError(ERROR_INVALID_NAME); retval = FALSE; @@ -5509,14 +5514,14 @@ BOOL WINAPI GetDefaultPrinterW(LPWSTR name, LPDWORD namesize) } *ptr = 0; - *namesize = strlenW(buffer) + 1; + *namesize = wcslen( buffer ) + 1; if(!name || (*namesize > insize)) { SetLastError(ERROR_INSUFFICIENT_BUFFER); retval = FALSE; goto end; } - strcpyW(name, buffer); + wcscpy( name, buffer ); end: HeapFree( GetProcessHeap(), 0, buffer); @@ -5624,7 +5629,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) } /* "pszPrinter" is never empty or NULL here. */ - namelen = lstrlenW(pszPrinter); + namelen = wcslen( pszPrinter ); size = namelen + (MAX_PATH * 2) + 3; /* printer,driver,port and a 0 */ buffer = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); if (!buffer || @@ -5647,7 +5652,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hdev)) { - RegSetValueExW(hdev, deviceW, 0, REG_SZ, (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR)); + RegSetValueExW(hdev, deviceW, 0, REG_SZ, (BYTE *)buffer, (wcslen( buffer ) + 1) * sizeof(WCHAR)); RegCloseKey(hdev); } } @@ -7525,7 +7530,7 @@ static BOOL string_to_buf(LPCWSTR str, LPBYTE ptr, DWORD cb, DWORD *size, BOOL u if(unicode) { - *size = (strlenW(str) + 1) * sizeof(WCHAR); + *size = (wcslen( str ) + 1) * sizeof(WCHAR); if(*size <= cb) { memcpy(ptr, str, *size); @@ -7904,7 +7909,7 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) TRACE("need to schedule job %d filename %s to port %s\n", job->job_id, debugstr_w(job->filename), debugstr_w(portname)); - if (!strncmpW( portname, FILE_Port, strlenW( FILE_Port ) )) + if (!wcsncmp( portname, FILE_Port, wcslen( FILE_Port ) )) { ret = schedule_file( job->filename ); } @@ -8024,7 +8029,7 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) return NULL; pi5 = HeapAlloc(GetProcessHeap(), 0, len); GetPrinterW(hPrinter, 5, (LPBYTE)pi5, len, &len); - if(!pi5->pPortName || strcmpW(pi5->pPortName, FILE_Port)) + if(!pi5->pPortName || wcscmp( pi5->pPortName, FILE_Port )) { HeapFree(GetProcessHeap(), 0, pi5); return NULL; @@ -8032,7 +8037,7 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) HeapFree(GetProcessHeap(), 0, pi5); } - if(doc->lpszOutput == NULL || !strcmpW(doc->lpszOutput, FILE_Port)) + if(doc->lpszOutput == NULL || !wcscmp( doc->lpszOutput, FILE_Port )) { LPWSTR name; diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index 90d35bee73e..2555692b097 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -18,19 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - - -#include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winspool.h" - #include "winreg.h" +#include "winternl.h" #include "ddk/winsplp.h" #include "wine/debug.h" +#include "wine/unixlib.h" #include "wspool.h" @@ -50,11 +48,11 @@ static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; /* ############################### */ HINSTANCE WINSPOOL_hInstance = NULL; +unixlib_handle_t winspool_handle = 0; -static HMODULE hlocalspl = NULL; +static HMODULE hlocalspl; static BOOL (WINAPI *pInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR); - -PRINTPROVIDOR * backend = NULL; +PRINTPROVIDOR *backend = NULL; /****************************************************************************** * load_backend [internal] @@ -117,7 +115,9 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) case DLL_PROCESS_ATTACH: WINSPOOL_hInstance = instance; DisableThreadLibraryCalls( instance ); - UNIX_CALL( process_attach, NULL ); + if (!NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, + &winspool_handle, sizeof(winspool_handle), NULL )) + UNIX_CALL( process_attach, NULL ); WINSPOOL_LoadSystemPrinters(); break; diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index 899d5cbec90..39c14f24358 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -72,10 +72,15 @@ struct schedule_job_params const WCHAR *wine_port; }; -#define UNIX_CALL( func, params ) unix_ ## func( params ) +extern unixlib_handle_t winspool_handle DECLSPEC_HIDDEN; -NTSTATUS unix_process_attach( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_enum_printers( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_get_default_page_size( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_get_ppd( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_schedule_job( void * ) DECLSPEC_HIDDEN; +#define UNIX_CALL( func, params ) __wine_unix_call( winspool_handle, unix_ ## func, params ) + +enum cups_funcs +{ + unix_process_attach, + unix_enum_printers, + unix_get_default_page_size, + unix_get_ppd, + unix_schedule_job, +}; -- 2.23.0

1 0

[PATCH 1/4] winspool: Move the unix job schedulers to cups.c.
by Huw Davies 27 Oct '21

27 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/cups.c | 268 ++++++++++++++++++++++++++++- dlls/winspool.drv/info.c | 344 ++++--------------------------------- dlls/winspool.drv/wspool.h | 9 + 3 files changed, 300 insertions(+), 321 deletions(-) diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index ae771eba46c..511cf9a5c4d 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -23,8 +23,14 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include <sys/types.h> #include <unistd.h> #include <fcntl.h> +#include <errno.h> +#include <signal.h> +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif #ifdef HAVE_CUPS_CUPS_H #include <cups/cups.h> #endif @@ -106,6 +112,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(winspool); +static const WCHAR CUPS_Port[] = { 'C','U','P','S',':',0 }; +static const WCHAR LPR_Port[] = { 'L','P','R',':',0 }; + /* Temporary helpers until switch to unixlib */ #include "winnls.h" #include "wine/heap.h" @@ -123,7 +132,7 @@ static int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dst #ifdef SONAME_LIBCUPS -void *libcups_handle = NULL; +static void *libcups_handle; #define CUPS_FUNCS \ DO_FUNC(cupsAddOption); \ @@ -139,13 +148,13 @@ void *libcups_handle = NULL; DO_FUNC(cupsGetPPD3); \ DO_FUNC(cupsLastErrorString) -#define DO_FUNC(f) typeof(f) *p##f = NULL +#define DO_FUNC(f) static typeof(f) *p##f CUPS_FUNCS; #undef DO_FUNC -cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *) = NULL; -const char * (*pcupsGetPPD)(const char *) = NULL; -http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t) = NULL; -const char * (*pcupsLastErrorString)(void) = NULL; +static cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); +static const char * (*pcupsGetPPD)(const char *); +static http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); +static const char * (*pcupsLastErrorString)(void); #endif /* SONAME_LIBCUPS */ @@ -285,6 +294,56 @@ static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, time_t } return HTTP_OK; } + +/***************************************************************************** + * get_cups_jobs_ticket_options + * + * Explicitly set CUPS options based on any %cupsJobTicket lines. + * The CUPS scheduler only looks for these in Print-File requests, and since + * cupsPrintFile uses Create-Job / Send-Document, the ticket lines don't get + * parsed. + */ +static int get_cups_job_ticket_options( const char *file, int num_options, cups_option_t **options ) +{ + FILE *fp = fopen( file, "r" ); + char buf[257]; /* DSC max of 256 + '\0' */ + const char *ps_adobe = "%!PS-Adobe-"; + const char *cups_job = "%cupsJobTicket:"; + + if (!fp) return num_options; + if (!fgets( buf, sizeof(buf), fp )) goto end; + if (strncmp( buf, ps_adobe, strlen( ps_adobe ) )) goto end; + while (fgets( buf, sizeof(buf), fp )) + { + if (strncmp( buf, cups_job, strlen( cups_job ) )) break; + num_options = pcupsParseOptions( buf + strlen( cups_job ), num_options, options ); + } + +end: + fclose( fp ); + return num_options; +} + +static int get_cups_default_options( const char *printer, int num_options, cups_option_t **options ) +{ + cups_dest_t *dest; + int i; + + if (!pcupsGetNamedDest) return num_options; + + dest = pcupsGetNamedDest( NULL, printer, NULL ); + if (!dest) return num_options; + + for (i = 0; i < dest->num_options; i++) + { + if (!pcupsGetOption( dest->options[i].name, num_options, *options )) + num_options = pcupsAddOption( dest->options[i].name, dest->options[i].value, + num_options, options ); + } + + pcupsFreeDests( 1, dest ); + return num_options; +} #endif /* SONAME_LIBCUPS */ NTSTATUS unix_enum_printers( void *args ) @@ -438,3 +497,200 @@ end: return STATUS_NOT_IMPLEMENTED; #endif } + +/***************************************************************************** + * schedule_pipe + */ +static BOOL schedule_pipe( const WCHAR *cmd, const WCHAR *filename ) +{ +#ifdef HAVE_FORK + char *unixname, *cmdA; + DWORD len; + int fds[2] = { -1, -1 }, file_fd = -1, no_read; + BOOL ret = FALSE; + char buf[1024]; + pid_t pid, wret; + int status; + + if (!(unixname = get_unix_file_name( filename ))) return FALSE; + + len = strlenW( cmd ); + cmdA = malloc( len * 3 + 1); + ntdll_wcstoumbs( cmd, len + 1, cmdA, len * 3 + 1, FALSE ); + + TRACE( "printing with: %s\n", cmdA ); + + if ((file_fd = open( unixname, O_RDONLY )) == -1) goto end; + + if (pipe( fds )) + { + ERR( "pipe() failed!\n" ); + goto end; + } + + if ((pid = fork()) == 0) + { + close( 0 ); + dup2( fds[0], 0 ); + close( fds[1] ); + + /* reset signals that we previously set to SIG_IGN */ + signal( SIGPIPE, SIG_DFL ); + + execl( "/bin/sh", "/bin/sh", "-c", cmdA, NULL ); + _exit( 1 ); + } + else if (pid == -1) + { + ERR( "fork() failed!\n" ); + goto end; + } + + close( fds[0] ); + fds[0] = -1; + while ((no_read = read( file_fd, buf, sizeof(buf) )) > 0) + write( fds[1], buf, no_read ); + + close( fds[1] ); + fds[1] = -1; + + /* reap child */ + do { + wret = waitpid( pid, &status, 0 ); + } while (wret < 0 && errno == EINTR); + if (wret < 0) + { + ERR( "waitpid() failed!\n" ); + goto end; + } + if (!WIFEXITED(status) || WEXITSTATUS(status)) + { + ERR( "child process failed! %d\n", status ); + goto end; + } + + ret = TRUE; + +end: + if (file_fd != -1) close( file_fd ); + if (fds[0] != -1) close( fds[0] ); + if (fds[1] != -1) close( fds[1] ); + + free( cmdA ); + free( unixname ); + return ret; +#else + return FALSE; +#endif +} + +/***************************************************************************** + * schedule_unixfile + */ +static BOOL schedule_unixfile( const WCHAR *output, const WCHAR *filename ) +{ + char *unixname, *outputA; + DWORD len; + BOOL ret; + + if (!(unixname = get_unix_file_name( filename ))) return FALSE; + + len = strlenW( output ); + outputA = malloc( len * 3 + 1); + ntdll_wcstoumbs( output, len + 1, outputA, len * 3 + 1, FALSE ); + + ret = copy_file( unixname, outputA ); + + free( outputA ); + free( unixname ); + return ret; +} + +/***************************************************************************** + * schedule_lpr + */ +static BOOL schedule_lpr( const WCHAR *printer_name, const WCHAR *filename ) +{ + static const WCHAR lpr[] = { 'l','p','r',' ','-','P','\'' }; + static const WCHAR quote[] = { '\'',0 }; + int printer_len = strlenW( printer_name ); + WCHAR *cmd; + BOOL ret; + + cmd = malloc( printer_len * sizeof(WCHAR) + sizeof(lpr) + sizeof(quote) ); + memcpy( cmd, lpr, sizeof(lpr) ); + memcpy( cmd + ARRAY_SIZE(lpr), printer_name, printer_len * sizeof(WCHAR) ); + memcpy( cmd + ARRAY_SIZE(lpr) + printer_len, quote, sizeof(quote) ); + + ret = schedule_pipe( cmd, filename ); + + free( cmd ); + return ret; +} + +/***************************************************************************** + * schedule_cups + */ +static BOOL schedule_cups( const WCHAR *printer_name, const WCHAR *filename, const WCHAR *document_title ) +{ +#ifdef SONAME_LIBCUPS + if (pcupsPrintFile) + { + char *unixname, *queue, *unix_doc_title; + cups_option_t *options = NULL; + int num_options = 0, i; + DWORD len; + BOOL ret; + + if (!(unixname = get_unix_file_name( filename ))) return FALSE; + len = strlenW( printer_name ); + queue = malloc( len * 3 + 1); + ntdll_wcstoumbs( printer_name, len + 1, queue, len * 3 + 1, FALSE ); + + len = strlenW( document_title ); + unix_doc_title = malloc( len * 3 + 1 ); + ntdll_wcstoumbs( document_title, len + 1, unix_doc_title, len + 3 + 1, FALSE ); + + num_options = get_cups_job_ticket_options( unixname, num_options, &options ); + num_options = get_cups_default_options( queue, num_options, &options ); + + TRACE( "printing via cups with options:\n" ); + for (i = 0; i < num_options; i++) + TRACE( "\t%d: %s = %s\n", i, options[i].name, options[i].value ); + + ret = pcupsPrintFile( queue, unixname, unix_doc_title, num_options, options ); + if (ret == 0 && pcupsLastErrorString) + WARN( "cupsPrintFile failed with error %s\n", debugstr_a( pcupsLastErrorString() ) ); + + pcupsFreeOptions( num_options, options ); + + free( unix_doc_title ); + free( queue ); + free( unixname ); + return ret; + } + else +#endif + { + return schedule_lpr( printer_name, filename ); + } +} + +BOOL unix_schedule_job( void *args ) +{ + struct schedule_job_params *params = args; + + if (params->wine_port[0] == '|') + return schedule_pipe( params->wine_port + 1, params->filename ); + + if (params->wine_port[0]) + return schedule_unixfile( params->wine_port, params->filename ); + + if (!strncmpW( params->port, LPR_Port, ARRAY_SIZE(LPR_Port) - 1 )) + return schedule_lpr( params->port + ARRAY_SIZE(LPR_Port) - 1, params->filename ); + + if (!strncmpW( params->port, CUPS_Port, ARRAY_SIZE(CUPS_Port) - 1 )) + return schedule_cups( params->port + ARRAY_SIZE(CUPS_Port) - 1, params->filename, params->document_title ); + + return FALSE; +} diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a8b0a0365ae..f813e188058 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -25,7 +25,6 @@ */ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> @@ -33,20 +32,6 @@ #include <string.h> #include <ctype.h> #include <stddef.h> -#include <errno.h> -#ifdef HAVE_SYS_WAIT_H -#include <sys/wait.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <signal.h> -#ifdef HAVE_CUPS_CUPS_H -# include <cups/cups.h> -#endif -#ifdef HAVE_CUPS_PPD_H -# include <cups/ppd.h> -#endif #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -77,7 +62,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winspool); /* ############################### */ static CRITICAL_SECTION printer_handles_cs; -static CRITICAL_SECTION_DEBUG printer_handles_cs_debug = +static CRITICAL_SECTION_DEBUG printer_handles_cs_debug = { 0, 0, &printer_handles_cs, { &printer_handles_cs_debug.ProcessLocksList, &printer_handles_cs_debug.ProcessLocksList }, @@ -817,30 +802,6 @@ static WCHAR *get_ppd_dir( void ) return dir; } -#ifdef SONAME_LIBCUPS - -extern void *libcups_handle; - -#define CUPS_FUNCS \ - DO_FUNC(cupsAddOption); \ - DO_FUNC(cupsFreeDests); \ - DO_FUNC(cupsFreeOptions); \ - DO_FUNC(cupsGetOption); \ - DO_FUNC(cupsParseOptions); \ - DO_FUNC(cupsPrintFile) -#define CUPS_OPT_FUNCS \ - DO_FUNC(cupsGetNamedDest); \ - DO_FUNC(cupsGetPPD); \ - DO_FUNC(cupsGetPPD3); \ - DO_FUNC(cupsLastErrorString) - -#define DO_FUNC(f) extern typeof(f) *p##f -CUPS_FUNCS; -#undef DO_FUNC -extern cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); -extern const char * (*pcupsLastErrorString)(void); -#endif - static BOOL init_unix_printers( void ) { WCHAR *port, *ppd_dir = NULL, *default_printer = NULL; @@ -7806,214 +7767,6 @@ BOOL WINAPI GetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, return get_job_info(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded, TRUE); } -/***************************************************************************** - * schedule_pipe - */ -static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) -{ -#ifdef HAVE_FORK - char *unixname, *cmdA; - DWORD len; - int fds[2] = {-1, -1}, file_fd = -1, no_read; - BOOL ret = FALSE; - char buf[1024]; - pid_t pid, wret; - int status; - - if(!(unixname = wine_get_unix_file_name(filename))) - return FALSE; - - len = WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, NULL, 0, NULL, NULL); - cmdA = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, cmdA, len, NULL, NULL); - - TRACE("printing with: %s\n", cmdA); - - if((file_fd = open(unixname, O_RDONLY)) == -1) - goto end; - - if (pipe(fds)) - { - ERR("pipe() failed!\n"); - goto end; - } - - if ((pid = fork()) == 0) - { - close(0); - dup2(fds[0], 0); - close(fds[1]); - - /* reset signals that we previously set to SIG_IGN */ - signal(SIGPIPE, SIG_DFL); - - execl("/bin/sh", "/bin/sh", "-c", cmdA, NULL); - _exit(1); - } - else if (pid == -1) - { - ERR("fork() failed!\n"); - goto end; - } - - close(fds[0]); - fds[0] = -1; - while((no_read = read(file_fd, buf, sizeof(buf))) > 0) - write(fds[1], buf, no_read); - - close(fds[1]); - fds[1] = -1; - - /* reap child */ - do { - wret = waitpid(pid, &status, 0); - } while (wret < 0 && errno == EINTR); - if (wret < 0) - { - ERR("waitpid() failed!\n"); - goto end; - } - if (!WIFEXITED(status) || WEXITSTATUS(status)) - { - ERR("child process failed! %d\n", status); - goto end; - } - - ret = TRUE; - -end: - if(file_fd != -1) close(file_fd); - if(fds[0] != -1) close(fds[0]); - if(fds[1] != -1) close(fds[1]); - - HeapFree(GetProcessHeap(), 0, cmdA); - HeapFree(GetProcessHeap(), 0, unixname); - return ret; -#else - return FALSE; -#endif -} - -/***************************************************************************** - * schedule_lpr - */ -static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) -{ - static const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; - WCHAR *cmd; - BOOL r; - - cmd = HeapAlloc(GetProcessHeap(), 0, strlenW(printer_name) * sizeof(WCHAR) + sizeof(fmtW)); - sprintfW(cmd, fmtW, printer_name); - - r = schedule_pipe(cmd, filename); - - HeapFree(GetProcessHeap(), 0, cmd); - return r; -} - -#ifdef SONAME_LIBCUPS -/***************************************************************************** - * get_cups_jobs_ticket_options - * - * Explicitly set CUPS options based on any %cupsJobTicket lines. - * The CUPS scheduler only looks for these in Print-File requests, and since - * cupsPrintFile uses Create-Job / Send-Document, the ticket lines don't get - * parsed. - */ -static int get_cups_job_ticket_options( const char *file, int num_options, cups_option_t **options ) -{ - FILE *fp = fopen( file, "r" ); - char buf[257]; /* DSC max of 256 + '\0' */ - const char *ps_adobe = "%!PS-Adobe-"; - const char *cups_job = "%cupsJobTicket:"; - - if (!fp) return num_options; - if (!fgets( buf, sizeof(buf), fp )) goto end; - if (strncmp( buf, ps_adobe, strlen( ps_adobe ) )) goto end; - while (fgets( buf, sizeof(buf), fp )) - { - if (strncmp( buf, cups_job, strlen( cups_job ) )) break; - num_options = pcupsParseOptions( buf + strlen( cups_job ), num_options, options ); - } - -end: - fclose( fp ); - return num_options; -} - -static int get_cups_default_options( const char *printer, int num_options, cups_option_t **options ) -{ - cups_dest_t *dest; - int i; - - if (!pcupsGetNamedDest) return num_options; - - dest = pcupsGetNamedDest( NULL, printer, NULL ); - if (!dest) return num_options; - - for (i = 0; i < dest->num_options; i++) - { - if (!pcupsGetOption( dest->options[i].name, num_options, *options )) - num_options = pcupsAddOption( dest->options[i].name, dest->options[i].value, - num_options, options ); - } - - pcupsFreeDests( 1, dest ); - return num_options; -} -#endif - -/***************************************************************************** - * schedule_cups - */ -static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR document_title) -{ -#ifdef SONAME_LIBCUPS - if(pcupsPrintFile) - { - char *unixname, *queue, *unix_doc_title; - DWORD len; - BOOL ret; - int num_options = 0, i; - cups_option_t *options = NULL; - - if(!(unixname = wine_get_unix_file_name(filename))) - return FALSE; - - len = WideCharToMultiByte(CP_UNIXCP, 0, printer_name, -1, NULL, 0, NULL, NULL); - queue = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_UNIXCP, 0, printer_name, -1, queue, len, NULL, NULL); - - len = WideCharToMultiByte(CP_UNIXCP, 0, document_title, -1, NULL, 0, NULL, NULL); - unix_doc_title = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_UNIXCP, 0, document_title, -1, unix_doc_title, len, NULL, NULL); - - num_options = get_cups_job_ticket_options( unixname, num_options, &options ); - num_options = get_cups_default_options( queue, num_options, &options ); - - TRACE( "printing via cups with options:\n" ); - for (i = 0; i < num_options; i++) - TRACE( "\t%d: %s = %s\n", i, options[i].name, options[i].value ); - - ret = pcupsPrintFile( queue, unixname, unix_doc_title, num_options, options ); - if (ret == 0 && pcupsLastErrorString) - WARN("cupsPrintFile failed with error %s\n", debugstr_a(pcupsLastErrorString())); - - pcupsFreeOptions( num_options, options ); - - HeapFree(GetProcessHeap(), 0, unix_doc_title); - HeapFree(GetProcessHeap(), 0, queue); - HeapFree(GetProcessHeap(), 0, unixname); - return ret; - } - else -#endif - { - return schedule_lpr(printer_name, filename); - } -} - static INT_PTR CALLBACK file_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { LPWSTR filename; @@ -8106,41 +7859,6 @@ static BOOL schedule_file(LPCWSTR filename) return FALSE; } -/***************************************************************************** - * schedule_unixfile - */ -static BOOL schedule_unixfile(LPCWSTR output, LPCWSTR filename) -{ - int in_fd, out_fd, no_read; - char buf[1024]; - BOOL ret = FALSE; - char *unixname, *outputA; - DWORD len; - - if(!(unixname = wine_get_unix_file_name(filename))) - return FALSE; - - len = WideCharToMultiByte(CP_UNIXCP, 0, output, -1, NULL, 0, NULL, NULL); - outputA = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_UNIXCP, 0, output, -1, outputA, len, NULL, NULL); - - out_fd = open(outputA, O_CREAT | O_TRUNC | O_WRONLY, 0666); - in_fd = open(unixname, O_RDONLY); - if(out_fd == -1 || in_fd == -1) - goto end; - - while((no_read = read(in_fd, buf, sizeof(buf))) > 0) - write(out_fd, buf, no_read); - - ret = TRUE; -end: - if(in_fd != -1) close(in_fd); - if(out_fd != -1) close(out_fd); - HeapFree(GetProcessHeap(), 0, outputA); - HeapFree(GetProcessHeap(), 0, unixname); - return ret; -} - /***************************************************************************** * ScheduleJob [WINSPOOL.@] * @@ -8169,6 +7887,7 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) { PRINTER_INFO_5W *pi5 = NULL; LPWSTR portname = job->portname; + UNICODE_STRING nt_name; DWORD needed; HKEY hkey; WCHAR output[1024]; @@ -8184,45 +7903,40 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) } TRACE("need to schedule job %d filename %s to port %s\n", job->job_id, debugstr_w(job->filename), debugstr_w(portname)); - - output[0] = 0; - /* @@ Wine registry key: HKCU\Software\Wine\Printing\Spooler */ - if(RegOpenKeyW(HKEY_CURRENT_USER, spooler_key, &hkey) == ERROR_SUCCESS) - { - DWORD type, count = sizeof(output); - RegQueryValueExW(hkey, portname, NULL, &type, (LPBYTE)output, &count); - RegCloseKey(hkey); - } - if(output[0] == '|') - { - ret = schedule_pipe(output + 1, job->filename); - } - else if(output[0]) - { - ret = schedule_unixfile(output, job->filename); - } - else if(!strncmpW(portname, LPR_Port, strlenW(LPR_Port))) - { - ret = schedule_lpr(portname + strlenW(LPR_Port), job->filename); - } - else if(!strncmpW(portname, CUPS_Port, strlenW(CUPS_Port))) - { - ret = schedule_cups(portname + strlenW(CUPS_Port), job->filename, job->document_title); - } - else if(!strncmpW(portname, FILE_Port, strlenW(FILE_Port))) + if (!strncmpW( portname, FILE_Port, strlenW( FILE_Port ) )) { - ret = schedule_file(job->filename); + ret = schedule_file( job->filename ); } - else if(isalpha(portname[0]) && portname[1] == ':') + else if (isalpha(portname[0]) && portname[1] == ':') { - TRACE("copying to %s\n", debugstr_w(portname)); - ret = CopyFileW(job->filename, portname, FALSE); + TRACE( "copying to %s\n", debugstr_w( portname ) ); + ret = CopyFileW( job->filename, portname, FALSE ); } - else + else if (RtlDosPathNameToNtPathName_U( job->filename, &nt_name, NULL, NULL )) { - FIXME("can't schedule to port %s\n", debugstr_w(portname)); + struct schedule_job_params params = + { + .filename = nt_name.Buffer, + .port = portname, + .document_title = job->document_title, + .wine_port = output + }; + + output[0] = 0; + /* @@ Wine registry key: HKCU\Software\Wine\Printing\Spooler */ + if (RegOpenKeyW( HKEY_CURRENT_USER, spooler_key, &hkey ) == ERROR_SUCCESS) + { + DWORD type, count = sizeof(output); + RegQueryValueExW( hkey, portname, NULL, &type, (BYTE *)output, &count ); + RegCloseKey( hkey ); + } + ret = UNIX_CALL( schedule_job, &params ); + RtlFreeUnicodeString( &nt_name ); } + else ret = FALSE; + + if (!ret) FIXME( "can't schedule to port %s\n", debugstr_w( portname ) ); HeapFree(GetProcessHeap(), 0, pi5); CloseHandle(hf); DeleteFileW(job->filename); diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index 578ed39733d..899d5cbec90 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -64,9 +64,18 @@ struct get_ppd_params const WCHAR *ppd; }; +struct schedule_job_params +{ + const WCHAR *filename; + const WCHAR *port; + const WCHAR *document_title; + const WCHAR *wine_port; +}; + #define UNIX_CALL( func, params ) unix_ ## func( params ) NTSTATUS unix_process_attach( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_enum_printers( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_get_default_page_size( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_get_ppd( void * ) DECLSPEC_HIDDEN; +NTSTATUS unix_schedule_job( void * ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH v3 5/5] msdasql: Add IPersist interface support
by Alistair Leslie-Hughes 27 Oct '21

27 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 50 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 27 +++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 0f23d50ae80..76b93ac0490 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -178,6 +178,7 @@ struct msdasql IDBProperties IDBProperties_iface; IDBInitialize IDBInitialize_iface; IDBCreateSession IDBCreateSession_iface; + IPersist IPersist_iface; LONG ref; }; @@ -202,6 +203,11 @@ static inline struct msdasql *impl_from_IDBCreateSession(IDBCreateSession *iface return CONTAINING_RECORD(iface, struct msdasql, IDBCreateSession_iface); } +static inline struct msdasql *impl_from_IPersist( IPersist *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql, IPersist_iface ); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -225,6 +231,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBCreateSession_iface; } + else if(IsEqualGUID(&IID_IPersist, riid)) + { + *out = &provider->IPersist_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -457,6 +467,45 @@ static const struct IDBCreateSessionVtbl dbsess_vtbl = dbsess_CreateSession }; +static HRESULT WINAPI persist_QueryInterface(IPersist *iface, REFIID riid, void **ppv) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); +} + +static ULONG WINAPI persist_AddRef(IPersist *iface) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI persist_Release(IPersist *iface) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI persist_GetClassID(IPersist *iface, CLSID *classid) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + + TRACE("(%p)->(%p)\n", provider, classid); + + if(!classid) + return E_INVALIDARG; + + *classid = CLSID_MSDASQL; + return S_OK; + +} + +static const IPersistVtbl persistVtbl = { + persist_QueryInterface, + persist_AddRef, + persist_Release, + persist_GetClassID +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -470,6 +519,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; provider->IDBCreateSession_iface.lpVtbl = &dbsess_vtbl; + provider->IPersist_iface.lpVtbl = &persistVtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 2e90d2f848d..4cab6a24daf 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -38,6 +38,32 @@ static char mdbpath[MAX_PATH]; static const VARTYPE intptr_vartype = (sizeof(void *) == 8 ? VT_I8 : VT_I4); +static void test_msdasql(void) +{ + HRESULT hr; + IUnknown *unk; + IPersist *persist; + CLSID classid; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + hr = IUnknown_QueryInterface(unk, &IID_IPersist, (void**)&persist); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IPersist_GetClassID(persist, &classid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&classid, &CLSID_MSDASQL), "got %s\n", debugstr_guid(&classid)); + + IPersist_Release(persist); + + IUnknown_Release(unk); +} + static void test_Properties(void) { HRESULT hr; @@ -275,6 +301,7 @@ START_TEST(provider) setup_database(); + test_msdasql(); test_Properties(); test_sessions(); -- 2.33.0

1 0

[PATCH v3 4/5] msdasql: Implement IDBCreateSession CreateSession
by Alistair Leslie-Hughes 27 Oct '21

27 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 3 +- dlls/msdasql/msdasql_main.c | 12 +++- dlls/msdasql/msdasql_private.h | 19 ++++++ dlls/msdasql/session.c | 114 +++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 3 deletions(-) create mode 100644 dlls/msdasql/msdasql_private.h create mode 100644 dlls/msdasql/session.c diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 04d9cb29f2a..ee8fa672623 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -4,7 +4,8 @@ IMPORTS = uuid ole32 oleaut32 EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ - msdasql_main.c + msdasql_main.c \ + session.c RC_SRCS = msdasql.rc diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index b6f0c8136e9..0f23d50ae80 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -30,6 +30,8 @@ #include "initguid.h" #include "msdasql.h" +#include "msdasql_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(msdasql); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); @@ -435,10 +437,16 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou IUnknown **session) { struct msdasql *provider = impl_from_IDBCreateSession(iface); + HRESULT hr; - FIXME("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); + TRACE("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); - return E_FAIL; + if (outer) + FIXME("outer currently not supported.\n"); + + hr = create_db_session(riid, (void**)session); + + return hr; } static const struct IDBCreateSessionVtbl dbsess_vtbl = diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h new file mode 100644 index 00000000000..a3d73498fe9 --- /dev/null +++ b/dlls/msdasql/msdasql_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2020 Alistair Leslie-Hughes + * + * 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 + */ + +HRESULT create_db_session(REFIID riid, void **unk) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c new file mode 100644 index 00000000000..57174be40f8 --- /dev/null +++ b/dlls/msdasql/session.c @@ -0,0 +1,114 @@ +/* + * Copyright 2020 Alistair Leslie-Hughes + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "msdasc.h" +#include "wine/heap.h" +#include "wine/debug.h" + +#include "msdasql.h" + +#include "msdasql_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdasql); + +struct msdasql_session +{ + IUnknown session_iface; + LONG refs; +}; + +static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, session_iface ); +} + +static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), ppv ); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) + { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = &session->session_iface; + } + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI session_AddRef(IUnknown *iface) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + LONG refs = InterlockedIncrement( &session->refs ); + TRACE( "%p new refcount %d\n", session, refs ); + return refs; +} + +static ULONG WINAPI session_Release(IUnknown *iface) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + LONG refs = InterlockedDecrement( &session->refs ); + TRACE( "%p new refcount %d\n", session, refs ); + if (!refs) + { + TRACE( "destroying %p\n", session ); + heap_free( session ); + } + return refs; +} + +static const IUnknownVtbl unkfactoryVtbl = +{ + session_QueryInterface, + session_AddRef, + session_Release, +}; + +HRESULT create_db_session(REFIID riid, void **unk) +{ + struct msdasql_session *session; + HRESULT hr; + + session = heap_alloc(sizeof(*session)); + if (!session) + return E_OUTOFMEMORY; + + session->session_iface.lpVtbl = &unkfactoryVtbl; + session->refs = 1; + + hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); + IUnknown_Release(&session->session_iface); + return hr; +} -- 2.33.0

1 0

[PATCH v3 3/5] msdasql: Add IDBCreateSession support
by Alistair Leslie-Hughes 27 Oct '21

27 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 96a1bc392e2..b6f0c8136e9 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -175,6 +175,7 @@ struct msdasql IUnknown MSDASQL_iface; IDBProperties IDBProperties_iface; IDBInitialize IDBInitialize_iface; + IDBCreateSession IDBCreateSession_iface; LONG ref; }; @@ -194,6 +195,11 @@ static inline struct msdasql *impl_from_IDBInitialize(IDBInitialize *iface) return CONTAINING_RECORD(iface, struct msdasql, IDBInitialize_iface); } +static inline struct msdasql *impl_from_IDBCreateSession(IDBCreateSession *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBCreateSession_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -213,6 +219,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBInitialize_iface; } + else if (IsEqualGUID(riid, &IID_IDBCreateSession)) + { + *out = &provider->IDBCreateSession_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -400,6 +410,45 @@ static const struct IDBInitializeVtbl dbinit_vtbl = dbinit_Uninitialize }; +static HRESULT WINAPI dbsess_QueryInterface(IDBCreateSession *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbsess_AddRef(IDBCreateSession *iface) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbsess_Release(IDBCreateSession *iface) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *outer, REFIID riid, + IUnknown **session) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + FIXME("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); + + return E_FAIL; +} + +static const struct IDBCreateSessionVtbl dbsess_vtbl = +{ + dbsess_QueryInterface, + dbsess_AddRef, + dbsess_Release, + dbsess_CreateSession +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -412,6 +461,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; + provider->IDBCreateSession_iface.lpVtbl = &dbsess_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); -- 2.33.0

1 0

[PATCH v3 2/5] msdasql: Implement IDBProperties GetPropertyInfo
by Alistair Leslie-Hughes 27 Oct '21

27 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 2 +- dlls/msdasql/msdasql_main.c | 106 +++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 11 +++- dlls/oledb32/tests/database.c | 8 ++- 4 files changed, 120 insertions(+), 7 deletions(-) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 8c99c8ea6f0..04d9cb29f2a 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -1,5 +1,5 @@ MODULE = msdasql.dll -IMPORTS = uuid +IMPORTS = uuid ole32 oleaut32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 00dbcec6780..96a1bc392e2 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -100,6 +102,74 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) return CLASS_E_CLASSNOTAVAILABLE; } +struct dbproperty +{ + const WCHAR *name; + DBPROPID id; + DBPROPOPTIONS options; + VARTYPE type; + HRESULT (*convert_dbproperty)(const WCHAR *src, VARIANT *dest); +}; + +struct mode_propval +{ + const WCHAR *name; + DWORD value; +}; + +static int __cdecl dbmodeprop_compare(const void *a, const void *b) +{ + const WCHAR *src = a; + const struct mode_propval *propval = b; + return wcsicmp(src, propval->name); +} + +static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) +{ + struct mode_propval mode_propvals[] = + { + { L"Read", DB_MODE_READ }, + { L"ReadWrite", DB_MODE_READWRITE }, + { L"Share Deny None", DB_MODE_SHARE_DENY_NONE }, + { L"Share Deny Read", DB_MODE_SHARE_DENY_READ }, + { L"Share Deny Write", DB_MODE_SHARE_DENY_WRITE }, + { L"Share Exclusive", DB_MODE_SHARE_EXCLUSIVE }, + { L"Write", DB_MODE_WRITE }, + }; + struct mode_propval *prop; + + if ((prop = bsearch(src, mode_propvals, ARRAY_SIZE(mode_propvals), + sizeof(struct mode_propval), dbmodeprop_compare))) + { + V_VT(dest) = VT_I4; + V_I4(dest) = prop->value; + TRACE("%s = %#x\n", debugstr_w(src), prop->value); + return S_OK; + } + + return E_FAIL; +} + +static const VARTYPE intptr_vartype = (sizeof(void *) == 8 ? VT_I8 : VT_I4); + +static const struct dbproperty dbproperties[] = +{ + { L"Password", DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Persist Security Info", DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { L"User ID", DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Data Source", DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { L"Window Handle", DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, intptr_vartype }, + { L"Location", DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Mode", DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4, convert_dbproperty_mode }, + { L"Prompt", DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, + { L"Connect Timeout", DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Extended Properties", DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { L"Locale Identifier", DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Initial Catalog", DBPROP_INIT_CATALOG, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"OLE DB Services", DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"General Timeout", DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, +}; + struct msdasql { IUnknown MSDASQL_iface; @@ -222,11 +292,43 @@ static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPrope DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i; + DBPROPINFOSET *infoset; + int size = 1; + OLECHAR *ptr; - FIXME("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + TRACE("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, prgPropertyInfoSets, ppDescBuffer); - return E_NOTIMPL; + infoset = CoTaskMemAlloc(sizeof(DBPROPINFOSET)); + memcpy(&infoset->guidPropertySet, &DBPROPSET_DBINIT, sizeof(GUID)); + infoset->cPropertyInfos = ARRAY_SIZE(dbproperties); + infoset->rgPropertyInfos = CoTaskMemAlloc(sizeof(DBPROPINFO) * ARRAY_SIZE(dbproperties)); + + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + size += lstrlenW(dbproperties[i].name) + 1; + } + + ptr = *ppDescBuffer = CoTaskMemAlloc(size * sizeof(WCHAR)); + memset(*ppDescBuffer, 0, size * sizeof(WCHAR)); + + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + lstrcpyW(ptr, dbproperties[i].name); + infoset->rgPropertyInfos[i].pwszDescription = ptr; + infoset->rgPropertyInfos[i].dwPropertyID = dbproperties[i].id; + infoset->rgPropertyInfos[i].dwFlags = DBPROPFLAGS_DBINIT | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE; + infoset->rgPropertyInfos[i].vtType = dbproperties[i].type; + V_VT(&infoset->rgPropertyInfos[i].vValues) = VT_EMPTY; + + ptr += lstrlenW(dbproperties[i].name) + 1; + } + + *pcPropertyInfoSets = 1; + *prgPropertyInfoSets = infoset; + + return S_OK; } static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets, diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 96d33f6bd10..2e90d2f848d 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -22,6 +22,7 @@ #include "msdasc.h" #include "oledb.h" #include "odbcinst.h" +#include "wtypes.h" #include "initguid.h" @@ -30,10 +31,13 @@ #include "wine/test.h" 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); static BOOL db_created; static char mdbpath[MAX_PATH]; +static const VARTYPE intptr_vartype = (sizeof(void *) == 8 ? VT_I8 : VT_I4); + static void test_Properties(void) { HRESULT hr; @@ -52,16 +56,21 @@ static void test_Properties(void) infocount = 0; hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ULONG i; + VARTYPE types[14] = { VT_BSTR, VT_BOOL, VT_BSTR, VT_BSTR, intptr_vartype, VT_BSTR, VT_I4, VT_I2 , VT_I4, VT_BSTR, VT_I4, VT_BSTR, VT_I4, VT_I4 }; + ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", debugstr_guid(&propinfoset->guidPropertySet)); ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); for (i = 0; i < propinfoset->cPropertyInfos; i++) { trace("%d: pwszDescription: %s\n", i, debugstr_w(propinfoset->rgPropertyInfos[i].pwszDescription) ); + ok(propinfoset->rgPropertyInfos[i].vtType == types[i], "got %d\n", propinfoset->rgPropertyInfos[i].vtType); + ok(propinfoset->rgPropertyInfos[i].dwFlags == (DBPROPFLAGS_DBINIT | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE), + "got %d\n", propinfoset->rgPropertyInfos[i].dwFlags); } for (i = 0; i < propinfoset->cPropertyInfos; i++) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 3baa91b87a4..775da0f7b61 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -82,7 +82,7 @@ static void test_GetDataSource(WCHAR *initstring) EXPECT_REF(dbinit, 2); EXPECT_REF(props, 2); hr = IDBProperties_GetPropertyInfo(props, 0, NULL, &cnt, &pInfoset, &ary); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); if(hr == S_OK) { ULONG i; @@ -1006,7 +1006,7 @@ static void test_odbc_provider(void) infocount = 0; hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ULONG i; @@ -1039,7 +1039,8 @@ static void test_odbc_provider(void) CoTaskMemFree(propinfoset); hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); - ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { /* Remove if, once _GetProperties is implemented */ ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); for (i = 0; i < propidlist.cPropertyIDs; i++) @@ -1049,6 +1050,7 @@ static void test_odbc_provider(void) propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; } + } CoTaskMemFree(propidlist.rgPropertyIDs); CoTaskMemFree(propset); -- 2.33.0

1 0

[PATCH v3 1/5] msdasql/tests: Remove DSN on cleanup
by Alistair Leslie-Hughes 27 Oct '21

27 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 951ab2a7387..96d33f6bd10 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -241,9 +241,22 @@ static void setup_database(void) static void cleanup_database(void) { + BOOL ret; + if (winetest_interactive) return; + ret = SQLConfigDataSource(NULL, ODBC_REMOVE_DSN, "Microsoft Access Driver (*.mdb)", "DSN=wine_test\0\0"); + if (!ret) + { + DWORD code; + char buffer[1024]; + WORD size; + + SQLInstallerError(1, &code, buffer, sizeof(buffer), &size); + trace("code %d, buffer %s, size %d\n", code, debugstr_a(buffer), size); + } + DeleteFileA(mdbpath); } -- 2.33.0

1 0

[PATCH v2 2/5] msdasql: Implement IDBProperties GetPropertyInfo
by Alistair Leslie-Hughes 27 Oct '21

27 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 2 +- dlls/msdasql/msdasql_main.c | 106 +++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 11 +++- dlls/oledb32/tests/database.c | 10 ++-- 4 files changed, 121 insertions(+), 8 deletions(-) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 8c99c8ea6f0..04d9cb29f2a 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -1,5 +1,5 @@ MODULE = msdasql.dll -IMPORTS = uuid +IMPORTS = uuid ole32 oleaut32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 00dbcec6780..96a1bc392e2 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -100,6 +102,74 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) return CLASS_E_CLASSNOTAVAILABLE; } +struct dbproperty +{ + const WCHAR *name; + DBPROPID id; + DBPROPOPTIONS options; + VARTYPE type; + HRESULT (*convert_dbproperty)(const WCHAR *src, VARIANT *dest); +}; + +struct mode_propval +{ + const WCHAR *name; + DWORD value; +}; + +static int __cdecl dbmodeprop_compare(const void *a, const void *b) +{ + const WCHAR *src = a; + const struct mode_propval *propval = b; + return wcsicmp(src, propval->name); +} + +static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) +{ + struct mode_propval mode_propvals[] = + { + { L"Read", DB_MODE_READ }, + { L"ReadWrite", DB_MODE_READWRITE }, + { L"Share Deny None", DB_MODE_SHARE_DENY_NONE }, + { L"Share Deny Read", DB_MODE_SHARE_DENY_READ }, + { L"Share Deny Write", DB_MODE_SHARE_DENY_WRITE }, + { L"Share Exclusive", DB_MODE_SHARE_EXCLUSIVE }, + { L"Write", DB_MODE_WRITE }, + }; + struct mode_propval *prop; + + if ((prop = bsearch(src, mode_propvals, ARRAY_SIZE(mode_propvals), + sizeof(struct mode_propval), dbmodeprop_compare))) + { + V_VT(dest) = VT_I4; + V_I4(dest) = prop->value; + TRACE("%s = %#x\n", debugstr_w(src), prop->value); + return S_OK; + } + + return E_FAIL; +} + +static const VARTYPE intptr_vartype = (sizeof(void *) == 8 ? VT_I8 : VT_I4); + +static const struct dbproperty dbproperties[] = +{ + { L"Password", DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Persist Security Info", DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { L"User ID", DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Data Source", DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { L"Window Handle", DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, intptr_vartype }, + { L"Location", DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Mode", DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4, convert_dbproperty_mode }, + { L"Prompt", DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, + { L"Connect Timeout", DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Extended Properties", DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { L"Locale Identifier", DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Initial Catalog", DBPROP_INIT_CATALOG, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"OLE DB Services", DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"General Timeout", DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, +}; + struct msdasql { IUnknown MSDASQL_iface; @@ -222,11 +292,43 @@ static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPrope DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i; + DBPROPINFOSET *infoset; + int size = 1; + OLECHAR *ptr; - FIXME("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + TRACE("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, prgPropertyInfoSets, ppDescBuffer); - return E_NOTIMPL; + infoset = CoTaskMemAlloc(sizeof(DBPROPINFOSET)); + memcpy(&infoset->guidPropertySet, &DBPROPSET_DBINIT, sizeof(GUID)); + infoset->cPropertyInfos = ARRAY_SIZE(dbproperties); + infoset->rgPropertyInfos = CoTaskMemAlloc(sizeof(DBPROPINFO) * ARRAY_SIZE(dbproperties)); + + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + size += lstrlenW(dbproperties[i].name) + 1; + } + + ptr = *ppDescBuffer = CoTaskMemAlloc(size * sizeof(WCHAR)); + memset(*ppDescBuffer, 0, size * sizeof(WCHAR)); + + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + lstrcpyW(ptr, dbproperties[i].name); + infoset->rgPropertyInfos[i].pwszDescription = ptr; + infoset->rgPropertyInfos[i].dwPropertyID = dbproperties[i].id; + infoset->rgPropertyInfos[i].dwFlags = DBPROPFLAGS_DBINIT | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE; + infoset->rgPropertyInfos[i].vtType = dbproperties[i].type; + V_VT(&infoset->rgPropertyInfos[i].vValues) = VT_EMPTY; + + ptr += lstrlenW(dbproperties[i].name) + 1; + } + + *pcPropertyInfoSets = 1; + *prgPropertyInfoSets = infoset; + + return S_OK; } static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets, diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 96d33f6bd10..2e90d2f848d 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -22,6 +22,7 @@ #include "msdasc.h" #include "oledb.h" #include "odbcinst.h" +#include "wtypes.h" #include "initguid.h" @@ -30,10 +31,13 @@ #include "wine/test.h" 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); static BOOL db_created; static char mdbpath[MAX_PATH]; +static const VARTYPE intptr_vartype = (sizeof(void *) == 8 ? VT_I8 : VT_I4); + static void test_Properties(void) { HRESULT hr; @@ -52,16 +56,21 @@ static void test_Properties(void) infocount = 0; hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ULONG i; + VARTYPE types[14] = { VT_BSTR, VT_BOOL, VT_BSTR, VT_BSTR, intptr_vartype, VT_BSTR, VT_I4, VT_I2 , VT_I4, VT_BSTR, VT_I4, VT_BSTR, VT_I4, VT_I4 }; + ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", debugstr_guid(&propinfoset->guidPropertySet)); ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); for (i = 0; i < propinfoset->cPropertyInfos; i++) { trace("%d: pwszDescription: %s\n", i, debugstr_w(propinfoset->rgPropertyInfos[i].pwszDescription) ); + ok(propinfoset->rgPropertyInfos[i].vtType == types[i], "got %d\n", propinfoset->rgPropertyInfos[i].vtType); + ok(propinfoset->rgPropertyInfos[i].dwFlags == (DBPROPFLAGS_DBINIT | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE), + "got %d\n", propinfoset->rgPropertyInfos[i].dwFlags); } for (i = 0; i < propinfoset->cPropertyInfos; i++) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 3baa91b87a4..44b783dba85 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -82,7 +82,7 @@ static void test_GetDataSource(WCHAR *initstring) EXPECT_REF(dbinit, 2); EXPECT_REF(props, 2); hr = IDBProperties_GetPropertyInfo(props, 0, NULL, &cnt, &pInfoset, &ary); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); if(hr == S_OK) { ULONG i; @@ -279,7 +279,7 @@ static void test_GetDataSource2(WCHAR *initstring) dbinit = &dbinittest; hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring, &IID_IDBInitialize, (IUnknown**)&dbinit); - ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(hr == S_OK, "got %08x\n", hr); IDataInitialize_Release(datainit); } @@ -1006,7 +1006,7 @@ static void test_odbc_provider(void) infocount = 0; hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ULONG i; @@ -1039,7 +1039,8 @@ static void test_odbc_provider(void) CoTaskMemFree(propinfoset); hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); - ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { /* Remove if, once _GetProperties is implemented */ ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); for (i = 0; i < propidlist.cPropertyIDs; i++) @@ -1049,6 +1050,7 @@ static void test_odbc_provider(void) propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; } + } CoTaskMemFree(propidlist.rgPropertyIDs); CoTaskMemFree(propset); -- 2.33.0

2 1

[PATCH 1/2] ntdll/tests: Move some tests to a new sync.c file.
by Zebediah Figura 27 Oct '21

27 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/om.c | 574 ------------------------------- dlls/ntdll/tests/sync.c | 630 +++++++++++++++++++++++++++++++++++ 3 files changed, 631 insertions(+), 574 deletions(-) create mode 100644 dlls/ntdll/tests/sync.c diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 7ad39e0992c..8c6a86fb965 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -21,6 +21,7 @@ C_SRCS = \ rtlbitmap.c \ rtlstr.c \ string.c \ + sync.c \ threadpool.c \ time.c \ virtual.c \ diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index af5e014f069..77eb58a23b5 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -30,10 +30,6 @@ static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, EVENT_TYPE, BOOLEAN); static NTSTATUS (WINAPI *pNtOpenEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES); -static NTSTATUS (WINAPI *pNtPulseEvent) ( HANDLE, PLONG ); -static NTSTATUS (WINAPI *pNtQueryEvent) ( HANDLE, EVENT_INFORMATION_CLASS, PVOID, ULONG, PULONG ); -static NTSTATUS (WINAPI *pNtResetEvent) ( HANDLE, LONG* ); -static NTSTATUS (WINAPI *pNtSetEvent) ( HANDLE, LONG* ); static NTSTATUS (WINAPI *pNtCreateJobObject)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtOpenJobObject)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtCreateKey)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG, @@ -44,11 +40,8 @@ static NTSTATUS (WINAPI *pNtCreateMailslotFile)( PHANDLE, ACCESS_MASK, POBJECT_A ULONG, ULONG, ULONG, PLARGE_INTEGER ); static NTSTATUS (WINAPI *pNtCreateMutant)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN ); static NTSTATUS (WINAPI *pNtOpenMutant) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); -static NTSTATUS (WINAPI *pNtQueryMutant) ( HANDLE, MUTANT_INFORMATION_CLASS, PVOID, ULONG, PULONG ); -static NTSTATUS (WINAPI *pNtReleaseMutant)( HANDLE, PLONG ); static NTSTATUS (WINAPI *pNtCreateSemaphore)( PHANDLE, ACCESS_MASK,const POBJECT_ATTRIBUTES,LONG,LONG ); static NTSTATUS (WINAPI *pNtOpenSemaphore)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); -static NTSTATUS (WINAPI *pNtQuerySemaphore)( PHANDLE, SEMAPHORE_INFORMATION_CLASS, PVOID, ULONG, PULONG ); static NTSTATUS (WINAPI *pNtCreateTimer) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, TIMER_TYPE ); static NTSTATUS (WINAPI *pNtOpenTimer)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtCreateSection)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, const PLARGE_INTEGER, @@ -67,15 +60,9 @@ static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,U static NTSTATUS (WINAPI *pNtReleaseSemaphore)(HANDLE, ULONG, PULONG); static NTSTATUS (WINAPI *pNtCreateKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, ULONG ); static NTSTATUS (WINAPI *pNtOpenKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * ); -static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); -static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI *pNtOpenIoCompletion)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, void *, ULONG, FILE_INFORMATION_CLASS); -static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); -static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); -static void (WINAPI *pRtlWakeAddressAll)( const void * ); -static void (WINAPI *pRtlWakeAddressSingle)( const void * ); static NTSTATUS (WINAPI *pNtOpenProcess)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID * ); static NTSTATUS (WINAPI *pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); static NTSTATUS (WINAPI *pNtGetNextThread)(HANDLE process, HANDLE thread, ACCESS_MASK access, ULONG attributes, @@ -1939,286 +1926,6 @@ static void test_type_mismatch(void) pNtClose( h ); } -static void test_event(void) -{ - HANDLE Event; - HANDLE Event2; - LONG prev_state = 0xdeadbeef; - NTSTATUS status; - UNICODE_STRING str; - OBJECT_ATTRIBUTES attr; - EVENT_BASIC_INFORMATION info; - - pRtlInitUnicodeString( &str, L"\\BaseNamedObjects\\testEvent" ); - InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, 2, 0); - ok( status == STATUS_INVALID_PARAMETER, "NtCreateEvent failed %08x\n", status ); - - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, 0); - ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == NotificationEvent && info.EventState == 0, - "NtQueryEvent failed, expected 0 0, got %d %d\n", info.EventType, info.EventState ); - pNtClose(Event); - - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, SynchronizationEvent, 0); - ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); - - status = pNtPulseEvent(Event, &prev_state); - ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == SynchronizationEvent && info.EventState == 0, - "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); - - status = pNtOpenEvent(&Event2, GENERIC_ALL, &attr); - ok( status == STATUS_SUCCESS, "NtOpenEvent failed %08x\n", status ); - - pNtClose(Event); - Event = Event2; - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == SynchronizationEvent && info.EventState == 0, - "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); - - status = pNtSetEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == SynchronizationEvent && info.EventState == 1, - "NtQueryEvent failed, expected 1 1, got %d %d\n", info.EventType, info.EventState ); - - status = pNtSetEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( prev_state == 1, "prev_state = %x\n", prev_state ); - - status = pNtResetEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( prev_state == 1, "prev_state = %x\n", prev_state ); - - status = pNtResetEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); - - status = pNtPulseEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); - - status = pNtSetEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); - - status = pNtPulseEvent( Event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); - ok( prev_state == 1, "prev_state = %x\n", prev_state ); - - pNtClose(Event); -} - -static const WCHAR keyed_nameW[] = L"\\BaseNamedObjects\\WineTestEvent"; - -static DWORD WINAPI keyed_event_thread( void *arg ) -{ - HANDLE handle; - NTSTATUS status; - LARGE_INTEGER timeout; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING str; - ULONG_PTR i; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &str; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &str, keyed_nameW ); - - status = pNtOpenKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr ); - ok( !status, "NtOpenKeyedEvent failed %x\n", status ); - - for (i = 0; i < 20; i++) - { - if (i & 1) - status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); - else - status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); - ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); - Sleep( 20 - i ); - } - - status = pNtReleaseKeyedEvent( handle, (void *)0x1234, 0, NULL ); - ok( status == STATUS_SUCCESS, "NtReleaseKeyedEvent %x\n", status ); - - timeout.QuadPart = -10000; - status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - - NtClose( handle ); - return 0; -} - -static void test_keyed_events(void) -{ - OBJECT_ATTRIBUTES attr; - UNICODE_STRING str; - HANDLE handle, event, thread; - NTSTATUS status; - LARGE_INTEGER timeout; - ULONG_PTR i; - - if (!pNtCreateKeyedEvent) - { - win_skip( "Keyed events not supported\n" ); - return; - } - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &str; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &str, keyed_nameW ); - - status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS | SYNCHRONIZE, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - - status = WaitForSingleObject( handle, 1000 ); - ok( status == 0, "WaitForSingleObject %x\n", status ); - - timeout.QuadPart = -100000; - status = pNtWaitForKeyedEvent( handle, (void *)255, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)255, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); - - status = pNtWaitForKeyedEvent( handle, (void *)254, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)254, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - - status = pNtWaitForKeyedEvent( handle, NULL, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, NULL, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - - status = pNtWaitForKeyedEvent( NULL, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ - "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( NULL, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ - "NtReleaseKeyedEvent %x\n", status ); - - status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); - - status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); - ok( status == STATUS_INVALID_HANDLE, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); - ok( status == STATUS_INVALID_HANDLE, "NtReleaseKeyedEvent %x\n", status ); - - thread = CreateThread( NULL, 0, keyed_event_thread, 0, 0, NULL ); - for (i = 0; i < 20; i++) - { - if (i & 1) - status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); - else - status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); - ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); - Sleep( i ); - } - status = pNtWaitForKeyedEvent( handle, (void *)0x1234, 0, &timeout ); - ok( status == STATUS_SUCCESS, "NtWaitForKeyedEvent %x\n", status ); - status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - - ok( WaitForSingleObject( thread, 30000 ) == 0, "wait failed\n" ); - - NtClose( handle ); - - /* test access rights */ - - status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAIT, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); - NtClose( handle ); - - status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAKE, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - NtClose( handle ); - - status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - status = WaitForSingleObject( handle, 1000 ); - ok( status == WAIT_FAILED && GetLastError() == ERROR_ACCESS_DENIED, - "WaitForSingleObject %x err %u\n", status, GetLastError() ); - status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - NtClose( handle ); - - /* GENERIC_READ gives wait access */ - status = pNtCreateKeyedEvent( &handle, GENERIC_READ, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); - NtClose( handle ); - - /* GENERIC_WRITE gives wake access */ - status = pNtCreateKeyedEvent( &handle, GENERIC_WRITE, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); - status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); - - /* it's not an event */ - status = pNtPulseEvent( handle, NULL ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); - - status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); - ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* 7+ */, - "CreateEvent %x\n", status ); - - NtClose( handle ); - - status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); - ok( status == 0, "CreateEvent %x\n", status ); - status = pNtWaitForKeyedEvent( event, (void *)8, 0, &timeout ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtWaitForKeyedEvent %x\n", status ); - status = pNtReleaseKeyedEvent( event, (void *)8, 0, &timeout ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtReleaseKeyedEvent %x\n", status ); - NtClose( event ); -} - static void test_null_device(void) { OBJECT_ATTRIBUTES attr; @@ -2292,269 +1999,6 @@ static void test_null_device(void) CloseHandle(ov.hEvent); } -static DWORD WINAPI mutant_thread( void *arg ) -{ - MUTANT_BASIC_INFORMATION info; - NTSTATUS status; - HANDLE mutant; - DWORD ret; - - mutant = arg; - ret = WaitForSingleObject( mutant, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); - /* abandon mutant */ - - return 0; -} - -static void test_mutant(void) -{ - MUTANT_BASIC_INFORMATION info; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING str; - NTSTATUS status; - HANDLE mutant; - HANDLE thread; - DWORD ret; - ULONG len; - LONG prev; - - pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test_mutant"); - InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtCreateMutant(&mutant, GENERIC_ALL, &attr, TRUE); - ok( status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status ); - - /* bogus */ - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, 0, NULL); - ok( status == STATUS_INFO_LENGTH_MISMATCH, - "Failed to NtQueryMutant, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); - status = pNtQueryMutant(mutant, 0x42, &info, sizeof(info), NULL); - ok( status == STATUS_INVALID_INFO_CLASS || broken(status == STATUS_NOT_IMPLEMENTED), /* 32-bit on Vista/2k8 */ - "Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); - status = pNtQueryMutant((HANDLE)0xdeadbeef, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_INVALID_HANDLE, - "Failed to NtQueryMutant, expected STATUS_INVALID_HANDLE, got %08x\n", status ); - - /* new */ - len = -1; - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), &len); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); - ok( len == sizeof(info), "got %u\n", len ); - - ret = WaitForSingleObject( mutant, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == -1, "expected -1, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); - - prev = 0xdeadbeef; - status = pNtReleaseMutant(mutant, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); - ok( prev == -1, "NtReleaseMutant failed, expected -1, got %d\n", prev ); - - prev = 0xdeadbeef; - status = pNtReleaseMutant(mutant, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); - ok( prev == 0, "NtReleaseMutant failed, expected 0, got %d\n", prev ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == FALSE, "expected FALSE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); - - /* abandoned */ - thread = CreateThread( NULL, 0, mutant_thread, mutant, 0, NULL ); - ret = WaitForSingleObject( thread, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); - CloseHandle( thread ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 1, "expected 0, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == FALSE, "expected FALSE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == TRUE, "expected TRUE, got %d\n", info.AbandonedState ); - - ret = WaitForSingleObject( mutant, 1000 ); - ok( ret == WAIT_ABANDONED_0, "WaitForSingleObject failed %08x\n", ret ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); - ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); - ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); - - NtClose( mutant ); -} - -static void test_semaphore(void) -{ - SEMAPHORE_BASIC_INFORMATION info; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING str; - NTSTATUS status; - HANDLE semaphore; - ULONG prev; - ULONG len; - DWORD ret; - - pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test_semaphore"); - InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - - status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 2, 1); - ok( status == STATUS_INVALID_PARAMETER, "Failed to create Semaphore(%08x)\n", status ); - status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 1, 2); - ok( status == STATUS_SUCCESS, "Failed to create Semaphore(%08x)\n", status ); - - /* bogus */ - status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, 0, NULL); - ok( status == STATUS_INFO_LENGTH_MISMATCH, - "Failed to NtQuerySemaphore, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); - status = pNtQuerySemaphore(semaphore, 0x42, &info, sizeof(info), NULL); - ok( status == STATUS_INVALID_INFO_CLASS, - "Failed to NtQuerySemaphore, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); - status = pNtQuerySemaphore((HANDLE)0xdeadbeef, SemaphoreBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_INVALID_HANDLE, - "Failed to NtQuerySemaphore, expected STATUS_INVALID_HANDLE, got %08x\n", status ); - - len = -1; - memset(&info, 0xcc, sizeof(info)); - status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), &len); - ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); - ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); - ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); - ok( len == sizeof(info), "got %u\n", len ); - - ret = WaitForSingleObject( semaphore, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); - ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); - - prev = 0xdeadbeef; - status = pNtReleaseSemaphore(semaphore, 3, &prev); - ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); - - prev = 0xdeadbeef; - status = pNtReleaseSemaphore(semaphore, 1, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 0, "NtReleaseSemaphore failed, expected 0, got %d\n", prev ); - - prev = 0xdeadbeef; - status = pNtReleaseSemaphore(semaphore, 1, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 1, "NtReleaseSemaphore failed, expected 1, got %d\n", prev ); - - prev = 0xdeadbeef; - status = pNtReleaseSemaphore(semaphore, 1, &prev); - ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); - - memset(&info, 0xcc, sizeof(info)); - status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); - ok( info.CurrentCount == 2, "expected 2, got %d\n", info.CurrentCount ); - ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); - - NtClose( semaphore ); -} - -static void test_wait_on_address(void) -{ - SIZE_T size; - NTSTATUS status; - LARGE_INTEGER start, end, timeout; - DWORD elapsed; - LONG64 address, compare; - - if (!pRtlWaitOnAddress) - { - win_skip("RtlWaitOnAddress not supported, skipping test\n"); - return; - } - - if (0) /* crash on Windows */ - { - pRtlWaitOnAddress(&address, NULL, 8, NULL); - pRtlWaitOnAddress(NULL, &compare, 8, NULL); - pRtlWaitOnAddress(NULL, NULL, 8, NULL); - } - - /* don't crash */ - pRtlWakeAddressSingle(NULL); - pRtlWakeAddressAll(NULL); - - /* invalid values */ - address = 0; - compare = 0; - status = pRtlWaitOnAddress(&address, &compare, 5, NULL); - ok(status == STATUS_INVALID_PARAMETER, "got %x\n", status); - - /* values match */ - address = 0; - compare = 0; - pNtQuerySystemTime(&start); - timeout.QuadPart = start.QuadPart + 100 * 10000; - status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); - pNtQuerySystemTime(&end); - ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - elapsed = (end.QuadPart - start.QuadPart) / 10000; - ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); - ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); - ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); - - /* different address size */ - for (size = 1; size <= 4; size <<= 1) - { - compare = ~0; - compare <<= size * 8; - - pNtQuerySystemTime(&start); - timeout.QuadPart = -100 * 10000; - status = pRtlWaitOnAddress(&address, &compare, size, &timeout); - pNtQuerySystemTime(&end); - ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - elapsed = (end.QuadPart - start.QuadPart) / 10000; - ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); - - status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); - ok(!status, "got 0x%08x\n", status); - } - address = 0; - compare = 1; - status = pRtlWaitOnAddress(&address, &compare, 8, NULL); - ok(!status, "got 0x%08x\n", status); - - /* no waiters */ - address = 0; - pRtlWakeAddressSingle(&address); - ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); - pRtlWakeAddressAll(&address); - ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); -} - static void test_process(void) { OBJECT_ATTRIBUTES attr; @@ -2957,13 +2401,7 @@ START_TEST(om) pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile"); pNtCreateMutant = (void *)GetProcAddress(hntdll, "NtCreateMutant"); pNtOpenEvent = (void *)GetProcAddress(hntdll, "NtOpenEvent"); - pNtQueryEvent = (void *)GetProcAddress(hntdll, "NtQueryEvent"); - pNtPulseEvent = (void *)GetProcAddress(hntdll, "NtPulseEvent"); - pNtResetEvent = (void *)GetProcAddress(hntdll, "NtResetEvent"); - pNtSetEvent = (void *)GetProcAddress(hntdll, "NtSetEvent"); pNtOpenMutant = (void *)GetProcAddress(hntdll, "NtOpenMutant"); - pNtQueryMutant = (void *)GetProcAddress(hntdll, "NtQueryMutant"); - pNtReleaseMutant = (void *)GetProcAddress(hntdll, "NtReleaseMutant"); pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile"); pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); @@ -2975,7 +2413,6 @@ START_TEST(om) pNtQuerySymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtQuerySymbolicLinkObject"); pNtCreateSemaphore = (void *)GetProcAddress(hntdll, "NtCreateSemaphore"); pNtOpenSemaphore = (void *)GetProcAddress(hntdll, "NtOpenSemaphore"); - pNtQuerySemaphore = (void *)GetProcAddress(hntdll, "NtQuerySemaphore"); pNtCreateTimer = (void *)GetProcAddress(hntdll, "NtCreateTimer"); pNtOpenTimer = (void *)GetProcAddress(hntdll, "NtOpenTimer"); pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection"); @@ -2984,15 +2421,9 @@ START_TEST(om) pNtReleaseSemaphore = (void *)GetProcAddress(hntdll, "NtReleaseSemaphore"); pNtCreateKeyedEvent = (void *)GetProcAddress(hntdll, "NtCreateKeyedEvent"); pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent"); - pNtWaitForKeyedEvent = (void *)GetProcAddress(hntdll, "NtWaitForKeyedEvent"); - pNtReleaseKeyedEvent = (void *)GetProcAddress(hntdll, "NtReleaseKeyedEvent"); pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); pNtOpenIoCompletion = (void *)GetProcAddress(hntdll, "NtOpenIoCompletion"); pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); - pNtQuerySystemTime = (void *)GetProcAddress(hntdll, "NtQuerySystemTime"); - pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); - pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); - pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess"); pNtCreateDebugObject = (void *)GetProcAddress(hntdll, "NtCreateDebugObject"); pNtGetNextThread = (void *)GetProcAddress(hntdll, "NtGetNextThread"); @@ -3009,12 +2440,7 @@ START_TEST(om) test_symboliclink(); test_query_object(); test_type_mismatch(); - test_event(); - test_mutant(); - test_semaphore(); - test_keyed_events(); test_null_device(); - test_wait_on_address(); test_process(); test_token(); test_duplicate_object(); diff --git a/dlls/ntdll/tests/sync.c b/dlls/ntdll/tests/sync.c new file mode 100644 index 00000000000..3d6b6a3a04d --- /dev/null +++ b/dlls/ntdll/tests/sync.c @@ -0,0 +1,630 @@ +/* + * Unit tests for NT synchronization objects + * + * Copyright 2020 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "wine/test.h" + +static NTSTATUS (WINAPI *pNtClose)( HANDLE ); +static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const OBJECT_ATTRIBUTES *, EVENT_TYPE, BOOLEAN); +static NTSTATUS (WINAPI *pNtCreateKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, ULONG ); +static NTSTATUS (WINAPI *pNtCreateMutant)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, BOOLEAN ); +static NTSTATUS (WINAPI *pNtCreateSemaphore)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, LONG, LONG ); +static NTSTATUS (WINAPI *pNtOpenEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * ); +static NTSTATUS (WINAPI *pNtOpenKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * ); +static NTSTATUS (WINAPI *pNtPulseEvent)( HANDLE, LONG * ); +static NTSTATUS (WINAPI *pNtQueryEvent)( HANDLE, EVENT_INFORMATION_CLASS, void *, ULONG, ULONG * ); +static NTSTATUS (WINAPI *pNtQueryMutant)( HANDLE, MUTANT_INFORMATION_CLASS, void *, ULONG, ULONG * ); +static NTSTATUS (WINAPI *pNtQuerySemaphore)( HANDLE, SEMAPHORE_INFORMATION_CLASS, void *, ULONG, ULONG * ); +static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); +static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); +static NTSTATUS (WINAPI *pNtReleaseMutant)( HANDLE, LONG * ); +static NTSTATUS (WINAPI *pNtReleaseSemaphore)( HANDLE, ULONG, ULONG * ); +static NTSTATUS (WINAPI *pNtResetEvent)( HANDLE, LONG * ); +static NTSTATUS (WINAPI *pNtSetEvent)( HANDLE, LONG * ); +static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); +static void (WINAPI *pRtlInitUnicodeString)( UNICODE_STRING *, const WCHAR * ); +static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); +static void (WINAPI *pRtlWakeAddressAll)( const void * ); +static void (WINAPI *pRtlWakeAddressSingle)( const void * ); + +#define KEYEDEVENT_WAIT 0x0001 +#define KEYEDEVENT_WAKE 0x0002 +#define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) + +static void test_event(void) +{ + HANDLE event; + HANDLE event2; + LONG prev_state = 0xdeadbeef; + NTSTATUS status; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + EVENT_BASIC_INFORMATION info; + + pRtlInitUnicodeString( &str, L"\\BaseNamedObjects\\testEvent" ); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + + status = pNtCreateEvent(&event, GENERIC_ALL, &attr, 2, 0); + ok( status == STATUS_INVALID_PARAMETER, "NtCreateEvent failed %08x\n", status ); + + status = pNtCreateEvent(&event, GENERIC_ALL, &attr, NotificationEvent, 0); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == NotificationEvent && info.EventState == 0, + "NtQueryEvent failed, expected 0 0, got %d %d\n", info.EventType, info.EventState ); + pNtClose(event); + + status = pNtCreateEvent(&event, GENERIC_ALL, &attr, SynchronizationEvent, 0); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); + + status = pNtPulseEvent(event, &prev_state); + ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); + ok( !prev_state, "prev_state = %x\n", prev_state ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == SynchronizationEvent && info.EventState == 0, + "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); + + status = pNtOpenEvent(&event2, GENERIC_ALL, &attr); + ok( status == STATUS_SUCCESS, "NtOpenEvent failed %08x\n", status ); + + pNtClose(event); + event = event2; + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == SynchronizationEvent && info.EventState == 0, + "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); + + status = pNtSetEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); + ok( !prev_state, "prev_state = %x\n", prev_state ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == SynchronizationEvent && info.EventState == 1, + "NtQueryEvent failed, expected 1 1, got %d %d\n", info.EventType, info.EventState ); + + status = pNtSetEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); + ok( prev_state == 1, "prev_state = %x\n", prev_state ); + + status = pNtResetEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); + ok( prev_state == 1, "prev_state = %x\n", prev_state ); + + status = pNtResetEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); + ok( !prev_state, "prev_state = %x\n", prev_state ); + + status = pNtPulseEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); + ok( !prev_state, "prev_state = %x\n", prev_state ); + + status = pNtSetEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); + ok( !prev_state, "prev_state = %x\n", prev_state ); + + status = pNtPulseEvent( event, &prev_state ); + ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); + ok( prev_state == 1, "prev_state = %x\n", prev_state ); + + pNtClose(event); +} + +static const WCHAR keyed_nameW[] = L"\\BaseNamedObjects\\WineTestEvent"; + +static DWORD WINAPI keyed_event_thread( void *arg ) +{ + HANDLE handle; + NTSTATUS status; + LARGE_INTEGER timeout; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + ULONG_PTR i; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &str; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &str, keyed_nameW ); + + status = pNtOpenKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr ); + ok( !status, "NtOpenKeyedEvent failed %x\n", status ); + + for (i = 0; i < 20; i++) + { + if (i & 1) + status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + else + status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); + Sleep( 20 - i ); + } + + status = pNtReleaseKeyedEvent( handle, (void *)0x1234, 0, NULL ); + ok( status == STATUS_SUCCESS, "NtReleaseKeyedEvent %x\n", status ); + + timeout.QuadPart = -10000; + status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + NtClose( handle ); + return 0; +} + +static void test_keyed_events(void) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + HANDLE handle, event, thread; + NTSTATUS status; + LARGE_INTEGER timeout; + ULONG_PTR i; + + if (!pNtCreateKeyedEvent) + { + win_skip( "Keyed events not supported\n" ); + return; + } + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &str; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &str, keyed_nameW ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS | SYNCHRONIZE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + + status = WaitForSingleObject( handle, 1000 ); + ok( status == 0, "WaitForSingleObject %x\n", status ); + + timeout.QuadPart = -100000; + status = pNtWaitForKeyedEvent( handle, (void *)255, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)255, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( handle, (void *)254, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)254, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( handle, NULL, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, NULL, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( NULL, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( NULL, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); + ok( status == STATUS_INVALID_HANDLE, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); + ok( status == STATUS_INVALID_HANDLE, "NtReleaseKeyedEvent %x\n", status ); + + thread = CreateThread( NULL, 0, keyed_event_thread, 0, 0, NULL ); + for (i = 0; i < 20; i++) + { + if (i & 1) + status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + else + status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); + Sleep( i ); + } + status = pNtWaitForKeyedEvent( handle, (void *)0x1234, 0, &timeout ); + ok( status == STATUS_SUCCESS, "NtWaitForKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + ok( WaitForSingleObject( thread, 30000 ) == 0, "wait failed\n" ); + + NtClose( handle ); + + /* test access rights */ + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAIT, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAKE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = WaitForSingleObject( handle, 1000 ); + ok( status == WAIT_FAILED && GetLastError() == ERROR_ACCESS_DENIED, + "WaitForSingleObject %x err %u\n", status, GetLastError() ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + /* GENERIC_READ gives wait access */ + status = pNtCreateKeyedEvent( &handle, GENERIC_READ, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + /* GENERIC_WRITE gives wake access */ + status = pNtCreateKeyedEvent( &handle, GENERIC_WRITE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + /* it's not an event */ + status = pNtPulseEvent( handle, NULL ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); + + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); + ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* 7+ */, + "CreateEvent %x\n", status ); + + NtClose( handle ); + + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); + ok( status == 0, "CreateEvent %x\n", status ); + status = pNtWaitForKeyedEvent( event, (void *)8, 0, &timeout ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( event, (void *)8, 0, &timeout ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtReleaseKeyedEvent %x\n", status ); + NtClose( event ); +} + +static DWORD WINAPI mutant_thread( void *arg ) +{ + MUTANT_BASIC_INFORMATION info; + NTSTATUS status; + HANDLE mutant; + DWORD ret; + + mutant = arg; + ret = WaitForSingleObject( mutant, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); + /* abandon mutant */ + + return 0; +} + +static void test_mutant(void) +{ + MUTANT_BASIC_INFORMATION info; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + NTSTATUS status; + HANDLE mutant; + HANDLE thread; + DWORD ret; + ULONG len; + LONG prev; + + pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test_mutant"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtCreateMutant(&mutant, GENERIC_ALL, &attr, TRUE); + ok( status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status ); + + /* bogus */ + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, 0, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, + "Failed to NtQueryMutant, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtQueryMutant(mutant, 0x42, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_INFO_CLASS || broken(status == STATUS_NOT_IMPLEMENTED), /* 32-bit on Vista/2k8 */ + "Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + status = pNtQueryMutant((HANDLE)0xdeadbeef, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_HANDLE, + "Failed to NtQueryMutant, expected STATUS_INVALID_HANDLE, got %08x\n", status ); + + /* new */ + len = -1; + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), &len); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); + ok( len == sizeof(info), "got %u\n", len ); + + ret = WaitForSingleObject( mutant, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == -1, "expected -1, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); + + prev = 0xdeadbeef; + status = pNtReleaseMutant(mutant, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); + ok( prev == -1, "NtReleaseMutant failed, expected -1, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseMutant(mutant, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); + ok( prev == 0, "NtReleaseMutant failed, expected 0, got %d\n", prev ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == FALSE, "expected FALSE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); + + /* abandoned */ + thread = CreateThread( NULL, 0, mutant_thread, mutant, 0, NULL ); + ret = WaitForSingleObject( thread, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + CloseHandle( thread ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == 1, "expected 0, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == FALSE, "expected FALSE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == TRUE, "expected TRUE, got %d\n", info.AbandonedState ); + + ret = WaitForSingleObject( mutant, 1000 ); + ok( ret == WAIT_ABANDONED_0, "WaitForSingleObject failed %08x\n", ret ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); + ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); + + NtClose( mutant ); +} + +static void test_semaphore(void) +{ + SEMAPHORE_BASIC_INFORMATION info; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + NTSTATUS status; + HANDLE semaphore; + ULONG prev; + ULONG len; + DWORD ret; + + pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test_semaphore"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + + status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 2, 1); + ok( status == STATUS_INVALID_PARAMETER, "Failed to create Semaphore(%08x)\n", status ); + status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 1, 2); + ok( status == STATUS_SUCCESS, "Failed to create Semaphore(%08x)\n", status ); + + /* bogus */ + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, 0, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, + "Failed to NtQuerySemaphore, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtQuerySemaphore(semaphore, 0x42, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_INFO_CLASS, + "Failed to NtQuerySemaphore, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + status = pNtQuerySemaphore((HANDLE)0xdeadbeef, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_HANDLE, + "Failed to NtQuerySemaphore, expected STATUS_INVALID_HANDLE, got %08x\n", status ); + + len = -1; + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), &len); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + ok( len == sizeof(info), "got %u\n", len ); + + ret = WaitForSingleObject( semaphore, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 3, &prev); + ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0, "NtReleaseSemaphore failed, expected 0, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 1, "NtReleaseSemaphore failed, expected 1, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 2, "expected 2, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + + NtClose( semaphore ); +} + +static void test_wait_on_address(void) +{ + DWORD ticks; + SIZE_T size; + NTSTATUS status; + LARGE_INTEGER timeout; + LONG64 address, compare; + + if (!pRtlWaitOnAddress) + { + win_skip("RtlWaitOnAddress not supported, skipping test\n"); + return; + } + + if (0) /* crash on Windows */ + { + pRtlWaitOnAddress(&address, NULL, 8, NULL); + pRtlWaitOnAddress(NULL, &compare, 8, NULL); + pRtlWaitOnAddress(NULL, NULL, 8, NULL); + } + + /* don't crash */ + pRtlWakeAddressSingle(NULL); + pRtlWakeAddressAll(NULL); + + /* invalid values */ + address = 0; + compare = 0; + status = pRtlWaitOnAddress(&address, &compare, 5, NULL); + ok(status == STATUS_INVALID_PARAMETER, "got %x\n", status); + + /* values match */ + address = 0; + compare = 0; + pNtQuerySystemTime(&timeout); + timeout.QuadPart += 100*10000; + ticks = GetTickCount(); + status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); + ticks = GetTickCount() - ticks; + ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); + ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); + ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); + + /* different address size */ + for (size = 1; size <= 4; size <<= 1) + { + compare = ~0; + compare <<= size * 8; + + timeout.QuadPart = -100 * 10000; + ticks = GetTickCount(); + status = pRtlWaitOnAddress(&address, &compare, size, &timeout); + ticks = GetTickCount() - ticks; + ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); + + status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); + ok(!status, "got 0x%08x\n", status); + } + address = 0; + compare = 1; + status = pRtlWaitOnAddress(&address, &compare, 8, NULL); + ok(!status, "got 0x%08x\n", status); + + /* no waiters */ + address = 0; + pRtlWakeAddressSingle(&address); + ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); + pRtlWakeAddressAll(&address); + ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); +} + +START_TEST(sync) +{ + HMODULE module = GetModuleHandleA("ntdll.dll"); + + pNtClose = (void *)GetProcAddress(module, "NtClose"); + pNtCreateEvent = (void *)GetProcAddress(module, "NtCreateEvent"); + pNtCreateKeyedEvent = (void *)GetProcAddress(module, "NtCreateKeyedEvent"); + pNtCreateMutant = (void *)GetProcAddress(module, "NtCreateMutant"); + pNtCreateSemaphore = (void *)GetProcAddress(module, "NtCreateSemaphore"); + pNtOpenEvent = (void *)GetProcAddress(module, "NtOpenEvent"); + pNtOpenKeyedEvent = (void *)GetProcAddress(module, "NtOpenKeyedEvent"); + pNtPulseEvent = (void *)GetProcAddress(module, "NtPulseEvent"); + pNtQueryEvent = (void *)GetProcAddress(module, "NtQueryEvent"); + pNtQueryMutant = (void *)GetProcAddress(module, "NtQueryMutant"); + pNtQuerySemaphore = (void *)GetProcAddress(module, "NtQuerySemaphore"); + pNtQuerySystemTime = (void *)GetProcAddress(module, "NtQuerySystemTime"); + pNtReleaseKeyedEvent = (void *)GetProcAddress(module, "NtReleaseKeyedEvent"); + pNtReleaseMutant = (void *)GetProcAddress(module, "NtReleaseMutant"); + pNtReleaseSemaphore = (void *)GetProcAddress(module, "NtReleaseSemaphore"); + pNtResetEvent = (void *)GetProcAddress(module, "NtResetEvent"); + pNtSetEvent = (void *)GetProcAddress(module, "NtSetEvent"); + pNtWaitForKeyedEvent = (void *)GetProcAddress(module, "NtWaitForKeyedEvent"); + pRtlInitUnicodeString = (void *)GetProcAddress(module, "RtlInitUnicodeString"); + pRtlWaitOnAddress = (void *)GetProcAddress(module, "RtlWaitOnAddress"); + pRtlWakeAddressAll = (void *)GetProcAddress(module, "RtlWakeAddressAll"); + pRtlWakeAddressSingle = (void *)GetProcAddress(module, "RtlWakeAddressSingle"); + + test_wait_on_address(); + test_event(); + test_mutant(); + test_semaphore(); + test_keyed_events(); +} -- 2.33.0

2 3

[PATCH v2 5/5] msdasql: Add IPersist interface support
by Alistair Leslie-Hughes 27 Oct '21

27 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 50 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 27 +++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 0f23d50ae80..76b93ac0490 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -178,6 +178,7 @@ struct msdasql IDBProperties IDBProperties_iface; IDBInitialize IDBInitialize_iface; IDBCreateSession IDBCreateSession_iface; + IPersist IPersist_iface; LONG ref; }; @@ -202,6 +203,11 @@ static inline struct msdasql *impl_from_IDBCreateSession(IDBCreateSession *iface return CONTAINING_RECORD(iface, struct msdasql, IDBCreateSession_iface); } +static inline struct msdasql *impl_from_IPersist( IPersist *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql, IPersist_iface ); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -225,6 +231,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBCreateSession_iface; } + else if(IsEqualGUID(&IID_IPersist, riid)) + { + *out = &provider->IPersist_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -457,6 +467,45 @@ static const struct IDBCreateSessionVtbl dbsess_vtbl = dbsess_CreateSession }; +static HRESULT WINAPI persist_QueryInterface(IPersist *iface, REFIID riid, void **ppv) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); +} + +static ULONG WINAPI persist_AddRef(IPersist *iface) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI persist_Release(IPersist *iface) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI persist_GetClassID(IPersist *iface, CLSID *classid) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + + TRACE("(%p)->(%p)\n", provider, classid); + + if(!classid) + return E_INVALIDARG; + + *classid = CLSID_MSDASQL; + return S_OK; + +} + +static const IPersistVtbl persistVtbl = { + persist_QueryInterface, + persist_AddRef, + persist_Release, + persist_GetClassID +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -470,6 +519,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; provider->IDBCreateSession_iface.lpVtbl = &dbsess_vtbl; + provider->IPersist_iface.lpVtbl = &persistVtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 2e90d2f848d..4cab6a24daf 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -38,6 +38,32 @@ static char mdbpath[MAX_PATH]; static const VARTYPE intptr_vartype = (sizeof(void *) == 8 ? VT_I8 : VT_I4); +static void test_msdasql(void) +{ + HRESULT hr; + IUnknown *unk; + IPersist *persist; + CLSID classid; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + hr = IUnknown_QueryInterface(unk, &IID_IPersist, (void**)&persist); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IPersist_GetClassID(persist, &classid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&classid, &CLSID_MSDASQL), "got %s\n", debugstr_guid(&classid)); + + IPersist_Release(persist); + + IUnknown_Release(unk); +} + static void test_Properties(void) { HRESULT hr; @@ -275,6 +301,7 @@ START_TEST(provider) setup_database(); + test_msdasql(); test_Properties(); test_sessions(); -- 2.33.0

1 0

[PATCH v2 4/5] msdasql: Implement IDBCreateSession CreateSession
by Alistair Leslie-Hughes 27 Oct '21

27 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 3 +- dlls/msdasql/msdasql_main.c | 12 +++- dlls/msdasql/msdasql_private.h | 19 ++++++ dlls/msdasql/session.c | 114 +++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 3 deletions(-) create mode 100644 dlls/msdasql/msdasql_private.h create mode 100644 dlls/msdasql/session.c diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 04d9cb29f2a..ee8fa672623 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -4,7 +4,8 @@ IMPORTS = uuid ole32 oleaut32 EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ - msdasql_main.c + msdasql_main.c \ + session.c RC_SRCS = msdasql.rc diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index b6f0c8136e9..0f23d50ae80 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -30,6 +30,8 @@ #include "initguid.h" #include "msdasql.h" +#include "msdasql_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(msdasql); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); @@ -435,10 +437,16 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou IUnknown **session) { struct msdasql *provider = impl_from_IDBCreateSession(iface); + HRESULT hr; - FIXME("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); + TRACE("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); - return E_FAIL; + if (outer) + FIXME("outer currently not supported.\n"); + + hr = create_db_session(riid, (void**)session); + + return hr; } static const struct IDBCreateSessionVtbl dbsess_vtbl = diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h new file mode 100644 index 00000000000..a3d73498fe9 --- /dev/null +++ b/dlls/msdasql/msdasql_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2020 Alistair Leslie-Hughes + * + * 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 + */ + +HRESULT create_db_session(REFIID riid, void **unk) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c new file mode 100644 index 00000000000..57174be40f8 --- /dev/null +++ b/dlls/msdasql/session.c @@ -0,0 +1,114 @@ +/* + * Copyright 2020 Alistair Leslie-Hughes + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "msdasc.h" +#include "wine/heap.h" +#include "wine/debug.h" + +#include "msdasql.h" + +#include "msdasql_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdasql); + +struct msdasql_session +{ + IUnknown session_iface; + LONG refs; +}; + +static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, session_iface ); +} + +static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), ppv ); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) + { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = &session->session_iface; + } + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI session_AddRef(IUnknown *iface) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + LONG refs = InterlockedIncrement( &session->refs ); + TRACE( "%p new refcount %d\n", session, refs ); + return refs; +} + +static ULONG WINAPI session_Release(IUnknown *iface) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + LONG refs = InterlockedDecrement( &session->refs ); + TRACE( "%p new refcount %d\n", session, refs ); + if (!refs) + { + TRACE( "destroying %p\n", session ); + heap_free( session ); + } + return refs; +} + +static const IUnknownVtbl unkfactoryVtbl = +{ + session_QueryInterface, + session_AddRef, + session_Release, +}; + +HRESULT create_db_session(REFIID riid, void **unk) +{ + struct msdasql_session *session; + HRESULT hr; + + session = heap_alloc(sizeof(*session)); + if (!session) + return E_OUTOFMEMORY; + + session->session_iface.lpVtbl = &unkfactoryVtbl; + session->refs = 1; + + hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); + IUnknown_Release(&session->session_iface); + return hr; +} -- 2.33.0

1 0

[PATCH v2 3/5] msdasql: Add IDBCreateSession support
by Alistair Leslie-Hughes 27 Oct '21

27 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 96a1bc392e2..b6f0c8136e9 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -175,6 +175,7 @@ struct msdasql IUnknown MSDASQL_iface; IDBProperties IDBProperties_iface; IDBInitialize IDBInitialize_iface; + IDBCreateSession IDBCreateSession_iface; LONG ref; }; @@ -194,6 +195,11 @@ static inline struct msdasql *impl_from_IDBInitialize(IDBInitialize *iface) return CONTAINING_RECORD(iface, struct msdasql, IDBInitialize_iface); } +static inline struct msdasql *impl_from_IDBCreateSession(IDBCreateSession *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBCreateSession_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -213,6 +219,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBInitialize_iface; } + else if (IsEqualGUID(riid, &IID_IDBCreateSession)) + { + *out = &provider->IDBCreateSession_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -400,6 +410,45 @@ static const struct IDBInitializeVtbl dbinit_vtbl = dbinit_Uninitialize }; +static HRESULT WINAPI dbsess_QueryInterface(IDBCreateSession *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbsess_AddRef(IDBCreateSession *iface) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbsess_Release(IDBCreateSession *iface) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *outer, REFIID riid, + IUnknown **session) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + FIXME("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); + + return E_FAIL; +} + +static const struct IDBCreateSessionVtbl dbsess_vtbl = +{ + dbsess_QueryInterface, + dbsess_AddRef, + dbsess_Release, + dbsess_CreateSession +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -412,6 +461,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; + provider->IDBCreateSession_iface.lpVtbl = &dbsess_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); -- 2.33.0

1 0

[PATCH v2 1/5] msdasql/tests: Remove DSN on cleanup
by Alistair Leslie-Hughes 27 Oct '21

27 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 951ab2a7387..96d33f6bd10 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -241,9 +241,22 @@ static void setup_database(void) static void cleanup_database(void) { + BOOL ret; + if (winetest_interactive) return; + ret = SQLConfigDataSource(NULL, ODBC_REMOVE_DSN, "Microsoft Access Driver (*.mdb)", "DSN=wine_test\0\0"); + if (!ret) + { + DWORD code; + char buffer[1024]; + WORD size; + + SQLInstallerError(1, &code, buffer, sizeof(buffer), &size); + trace("code %d, buffer %s, size %d\n", code, debugstr_a(buffer), size); + } + DeleteFileA(mdbpath); } -- 2.33.0

1 0

[PATCH v4] po: Update Traditional Chinese translation.
by Chilung Chan 27 Oct '21

27 Oct '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- v4: Applied suggestions from review for v3. po/zh_TW.po | 1292 ++++++++++++++++++++++++--------------------------- 1 file changed, 605 insertions(+), 687 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a8312e8bcec..06e71baea94 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,9 +5,9 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-28 00:06+0800\n" -"Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" -"Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" +"PO-Revision-Date: 2021-10-27 11:45+0800\n" +"Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,36 +20,30 @@ msgid "Security" msgstr "安全性" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "使用者名稱(&U)：" +msgstr "群組或使用者名稱(&G):" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "黃色" +msgstr "允許" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "拒絕" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "存取被拒。\n" +msgstr "%1 的權限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" -msgstr "安裝/移除" +msgstr "安裝/解除安裝" #: dlls/appwiz.cpl/appwiz.rc:61 msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "要從軟碟、光碟或硬碟安裝新程式，請按「安裝」。" +msgstr "要從軟碟、光碟或硬碟安裝新程式，請按 [安裝]。" #: dlls/appwiz.cpl/appwiz.rc:62 msgid "&Install..." @@ -61,8 +55,8 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"下列軟體可以自動解除安裝。從清單中選取它並按下「新增/移除」，可以移除程式或" -"者調整已安裝元件。" +"下列軟體可以自動解除安裝。要移除程式或者調整已安裝元件，請從清單中選取程式" +"並按下 [修改/移除]。" #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -123,39 +117,39 @@ msgstr "確定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技術支援資訊：" +msgstr "以下資訊可協助取得 %s 的技術支援:" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生產商：" +msgstr "發行者:" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" -msgstr "版本：" +msgstr "版本:" #: dlls/appwiz.cpl/appwiz.rc:82 msgid "Contact:" -msgstr "聯絡人：" +msgstr "聯絡人:" #: dlls/appwiz.cpl/appwiz.rc:83 msgid "Support Information:" -msgstr "支援資訊：" +msgstr "支援資訊:" #: dlls/appwiz.cpl/appwiz.rc:84 msgid "Support Telephone:" -msgstr "支援電話：" +msgstr "支援電話:" #: dlls/appwiz.cpl/appwiz.rc:85 msgid "Readme:" -msgstr "產品說明：" +msgstr "產品說明:" #: dlls/appwiz.cpl/appwiz.rc:86 msgid "Product Updates:" -msgstr "產品更新：" +msgstr "產品更新:" #: dlls/appwiz.cpl/appwiz.rc:87 msgid "Comments:" -msgstr "備註：" +msgstr "備註:" #: dlls/appwiz.cpl/appwiz.rc:100 msgid "Wine Gecko Installer" @@ -174,8 +168,8 @@ msgstr "" "Wine 需要安裝 Gecko 套件才能正確顯示嵌在應用程式中的 HTML 網頁。Wine 可以自動" "幫您下載並安裝 Gecko。\n" "\n" -"備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Gecko\">https://wiki.winehq.org/Gecko</a>" +"備註: 建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" +"Gecko\">https://wiki.winehq.org/Gecko</a>。" #: dlls/appwiz.cpl/appwiz.rc:109 dlls/appwiz.cpl/appwiz.rc:124 msgid "&Install" @@ -241,8 +235,8 @@ msgstr "" "Wine 需要安裝 wine-mono 套件才能正確執行 .NET 應用程式。Wine 可以自動幫您下載" "並安裝它。\n" "\n" -"備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Mono\">https://wiki.winehq.org/Mono</a>" +"備註: 建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" +"Mono\">https://wiki.winehq.org/Mono</a>。" #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" @@ -263,7 +257,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式 %s。您想將這個移除程式從註冊表中刪除嗎？" +msgstr "無法執行移除程式 '%s'。您想將這個移除程式從註冊表中移除嗎?" #: dlls/appwiz.cpl/appwiz.rc:36 msgid "Not specified" @@ -277,7 +271,7 @@ msgstr "名稱" #: dlls/appwiz.cpl/appwiz.rc:39 msgid "Publisher" -msgstr "生產商" +msgstr "發行者" #: dlls/appwiz.cpl/appwiz.rc:40 dlls/cryptui/cryptui.rc:54 msgid "Version" @@ -323,7 +317,7 @@ msgstr "壓縮選項" #: dlls/avifil32/avifil32.rc:45 msgid "&Choose a stream:" -msgstr "選擇來源(&C)：" +msgstr "選擇來源(&C):" #: dlls/avifil32/avifil32.rc:48 programs/wordpad/wordpad.rc:76 msgid "&Options..." @@ -331,7 +325,7 @@ msgstr "選項(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交錯(&I)" +msgstr "交錯(&I): 每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -339,11 +333,11 @@ msgstr "影格數" #: dlls/avifil32/avifil32.rc:52 msgid "Current format:" -msgstr "目前格式：" +msgstr "目前格式:" #: dlls/avifil32/avifil32.rc:30 msgid "Waveform: %s" -msgstr "波形：%s" +msgstr "波形: %s" #: dlls/avifil32/avifil32.rc:31 msgid "Waveform" @@ -363,7 +357,7 @@ msgstr "音訊" #: dlls/avifil32/avifil32.rc:36 msgid "Wine AVI-default-filehandler" -msgstr "Wine AVI-預設處理器" +msgstr "Wine AVI 預設處理器" #: dlls/avifil32/avifil32.rc:37 msgid "uncompressed" @@ -375,29 +369,27 @@ msgstr "正在取消..." #: dlls/browseui/browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2" #: dlls/browseui/browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2 %3!u! %4" #: dlls/browseui/browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "秒(&S)" +msgstr "秒" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "分" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "小時" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" -msgstr "屬性 %s" +msgstr "%s 的內容" #: dlls/comctl32/comctl32.rc:73 dlls/comdlg32/comdlg32.rc:265 msgid "&Apply" @@ -438,7 +430,7 @@ msgstr "關閉(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "重置(&e)" +msgstr "重置(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -458,7 +450,7 @@ msgstr "重置(&e)" #: programs/winemine/winemine.rc:53 programs/winhlp32/winhlp32.rc:57 #: programs/wordpad/wordpad.rc:102 msgid "&Help" -msgstr "求助(&H)" +msgstr "說明(&H)" #: dlls/comctl32/comctl32.rc:103 msgid "Move &Up" @@ -470,7 +462,7 @@ msgstr "下移(&D)" #: dlls/comctl32/comctl32.rc:105 msgid "A&vailable buttons:" -msgstr "可用工具列按鈕(&V)：" +msgstr "可用工具列按鈕(&V):" #: dlls/comctl32/comctl32.rc:107 msgid "&Add ->" @@ -482,7 +474,7 @@ msgstr "<- 移除(&R)" #: dlls/comctl32/comctl32.rc:109 msgid "&Toolbar buttons:" -msgstr "目前工具列按鈕(&T)：" +msgstr "目前工具列按鈕(&T):" #: dlls/comctl32/comctl32.rc:42 msgid "Separator" @@ -508,16 +500,12 @@ msgid "&Retry" msgstr "重試(&R)" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "隱藏分頁(&T)" +msgstr "隱藏詳細資訊" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "詳細資料" +msgstr "顯示詳細資訊" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -528,7 +516,7 @@ msgstr "關閉" #: dlls/comctl32/comctl32.rc:36 msgid "Today:" -msgstr "今天：" +msgstr "今天:" #: dlls/comctl32/comctl32.rc:37 msgid "Go to today" @@ -543,19 +531,19 @@ msgstr "開啟" #: dlls/comdlg32/comdlg32.rc:161 dlls/comdlg32/comdlg32.rc:183 msgid "File &Name:" -msgstr "檔案名稱(&N)：" +msgstr "檔案名稱(&N):" #: dlls/comdlg32/comdlg32.rc:164 dlls/comdlg32/comdlg32.rc:186 msgid "&Directories:" -msgstr "目錄(&D)：" +msgstr "目錄(&D):" #: dlls/comdlg32/comdlg32.rc:167 dlls/comdlg32/comdlg32.rc:189 msgid "List Files of &Type:" -msgstr "檔案類型(&T)：" +msgstr "檔案類型(&T):" #: dlls/comdlg32/comdlg32.rc:169 dlls/comdlg32/comdlg32.rc:191 msgid "Dri&ves:" -msgstr "磁碟機(&V)：" +msgstr "磁碟機(&V):" #: dlls/comdlg32/comdlg32.rc:174 dlls/comdlg32/comdlg32.rc:196 #: dlls/shell32/shell32.rc:368 dlls/shell32/shell32.rc:405 @@ -579,7 +567,7 @@ msgstr "列印" #: dlls/comdlg32/comdlg32.rc:205 msgid "Printer:" -msgstr "印表機：" +msgstr "印表機:" #: dlls/comdlg32/comdlg32.rc:207 dlls/comdlg32/comdlg32.rc:375 msgid "Print range" @@ -604,15 +592,15 @@ msgstr "設定(&S)" #: dlls/comdlg32/comdlg32.rc:214 msgid "&From:" -msgstr "從(&F)：" +msgstr "從(&F):" #: dlls/comdlg32/comdlg32.rc:215 msgid "&To:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:216 dlls/wineps.drv/wineps.rc:42 msgid "Print &Quality:" -msgstr "列印品質(&Q)：" +msgstr "列印品質(&Q):" #: dlls/comdlg32/comdlg32.rc:218 msgid "Print to Fi&le" @@ -641,7 +629,7 @@ msgstr "[無]" #: dlls/comdlg32/comdlg32.rc:231 msgid "Specific &Printer" -msgstr "特定的印表機(&P)" +msgstr "指定的印表機(&P)" #: dlls/comdlg32/comdlg32.rc:236 dlls/comdlg32/comdlg32.rc:419 #: dlls/comdlg32/comdlg32.rc:443 dlls/wineps.drv/wineps.rc:34 @@ -676,16 +664,16 @@ msgstr "字型" #: dlls/comdlg32/comdlg32.rc:254 msgid "&Font:" -msgstr "字型(&F)：" +msgstr "字型(&F):" #: dlls/comdlg32/comdlg32.rc:257 msgid "Font St&yle:" -msgstr "字型樣式(&Y)：" +msgstr "字型樣式(&Y):" #: dlls/comdlg32/comdlg32.rc:260 dlls/comdlg32/comdlg32.rc:439 #: programs/winecfg/winecfg.rc:292 msgid "&Size:" -msgstr "大小(&S)：" +msgstr "大小(&S):" #: dlls/comdlg32/comdlg32.rc:267 msgid "Effects" @@ -701,7 +689,7 @@ msgstr "底線(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "色彩(&C):" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -709,7 +697,7 @@ msgstr "範例" #: dlls/comdlg32/comdlg32.rc:275 msgid "Scr&ipt:" -msgstr "腳本(&I)：" +msgstr "指令碼(&I):" #: dlls/comdlg32/comdlg32.rc:283 dlls/comdlg32/comdlg32.rc:288 msgid "Color" @@ -717,56 +705,54 @@ msgstr "色彩" #: dlls/comdlg32/comdlg32.rc:286 msgid "&Basic Colors:" -msgstr "基本色彩(&B)：" +msgstr "基本色彩(&B):" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定色彩(&C)：" +msgstr "自訂色彩(&C):" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|純色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" -msgstr "紅(&R)：" +msgstr "紅(&R):" #: dlls/comdlg32/comdlg32.rc:292 msgid "&Green:" -msgstr "綠(&G)：" +msgstr "綠(&G):" #: dlls/comdlg32/comdlg32.rc:294 msgid "&Blue:" -msgstr "藍(&B)：" +msgstr "藍(&B):" #: dlls/comdlg32/comdlg32.rc:296 msgid "&Hue:" -msgstr "色調(&H)：" +msgstr "色調(&H):" #: dlls/comdlg32/comdlg32.rc:298 msgctxt "Saturation" msgid "&Sat:" -msgstr "飽和度(&S)：" +msgstr "飽和度(&S):" #: dlls/comdlg32/comdlg32.rc:300 msgctxt "Luminance" msgid "&Lum:" -msgstr "亮度(&L)：" +msgstr "亮度(&L):" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" -msgstr "新增自定色彩(&A)" +msgstr "新增自訂色彩(&A)" #: dlls/comdlg32/comdlg32.rc:311 msgid "&Define Custom Colors >>" -msgstr "定義自定色彩(&D) >>" +msgstr "定義自訂色彩(&D) >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "否(&N)" +msgstr "&o" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -775,7 +761,7 @@ msgstr "搜尋" #: dlls/comdlg32/comdlg32.rc:321 dlls/comdlg32/comdlg32.rc:340 msgid "Fi&nd What:" -msgstr "搜尋目標(&N)：" +msgstr "搜尋目標(&N):" #: dlls/comdlg32/comdlg32.rc:323 dlls/comdlg32/comdlg32.rc:344 msgid "Match &Whole Word Only" @@ -807,7 +793,7 @@ msgstr "取代" #: dlls/comdlg32/comdlg32.rc:342 msgid "Re&place With:" -msgstr "取代為(&P)：" +msgstr "取代為(&P):" #: dlls/comdlg32/comdlg32.rc:348 msgid "&Replace" @@ -822,7 +808,7 @@ msgstr "取代全部(&A)" #: dlls/shell32/shell32.rc:108 programs/clock/clock.rc:31 #: programs/conhost/conhost.rc:34 msgid "&Properties" -msgstr "屬性(&P)" +msgstr "內容(&P)" #: dlls/comdlg32/comdlg32.rc:364 msgid "Print to fi&le" @@ -831,23 +817,23 @@ msgstr "列印至檔案(&L)" #: dlls/comdlg32/comdlg32.rc:365 dlls/comdlg32/comdlg32.rc:401 #: dlls/msacm32/msacm32.rc:34 programs/winefile/winefile.rc:137 msgid "&Name:" -msgstr "名稱(&N)：" +msgstr "名稱(&N):" #: dlls/comdlg32/comdlg32.rc:366 dlls/comdlg32/comdlg32.rc:404 msgid "Status:" -msgstr "狀態：" +msgstr "狀態:" #: dlls/comdlg32/comdlg32.rc:368 dlls/comdlg32/comdlg32.rc:406 msgid "Type:" -msgstr "類型：" +msgstr "類型:" #: dlls/comdlg32/comdlg32.rc:370 dlls/comdlg32/comdlg32.rc:408 msgid "Where:" -msgstr "位置：" +msgstr "位置:" #: dlls/comdlg32/comdlg32.rc:372 dlls/comdlg32/comdlg32.rc:410 msgid "Comment:" -msgstr "備註：" +msgstr "備註:" #: dlls/comdlg32/comdlg32.rc:377 msgid "Pa&ges" @@ -859,11 +845,11 @@ msgstr "選擇(&S)" #: dlls/comdlg32/comdlg32.rc:381 msgid "&from:" -msgstr "從(&F)：" +msgstr "從(&F):" #: dlls/comdlg32/comdlg32.rc:382 msgid "&to:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:384 msgid "Copies" @@ -871,7 +857,7 @@ msgstr "份數" #: dlls/comdlg32/comdlg32.rc:385 msgid "Number of &copies:" -msgstr "份數(&C)：" +msgstr "份數(&C):" #: dlls/comdlg32/comdlg32.rc:387 msgid "C&ollate" @@ -879,11 +865,11 @@ msgstr "自動分頁(&O)" #: dlls/comdlg32/comdlg32.rc:414 programs/winecfg/winecfg.rc:298 msgid "Si&ze:" -msgstr "大小(&Z)：" +msgstr "大小(&Z):" #: dlls/comdlg32/comdlg32.rc:416 msgid "&Source:" -msgstr "來源(&S)：" +msgstr "來源(&S):" #: dlls/comdlg32/comdlg32.rc:421 msgid "P&ortrait" @@ -899,7 +885,7 @@ msgstr "設定頁面" #: dlls/comdlg32/comdlg32.rc:441 msgid "&Tray:" -msgstr "進紙匣(&T)：" +msgstr "進紙匣(&T):" #: dlls/comdlg32/comdlg32.rc:444 dlls/wineps.drv/wineps.rc:35 msgid "&Portrait" @@ -907,19 +893,19 @@ msgstr "縱向(&P)" #: dlls/comdlg32/comdlg32.rc:447 msgid "L&eft:" -msgstr "左(&E)：" +msgstr "左(&E):" #: dlls/comdlg32/comdlg32.rc:449 programs/notepad/notepad.rc:112 msgid "&Right:" -msgstr "右(&R)：" +msgstr "右(&R):" #: dlls/comdlg32/comdlg32.rc:451 msgid "T&op:" -msgstr "上(&O)：" +msgstr "上(&O):" #: dlls/comdlg32/comdlg32.rc:453 programs/notepad/notepad.rc:114 msgid "&Bottom:" -msgstr "下(&B)：" +msgstr "下(&B):" #: dlls/comdlg32/comdlg32.rc:457 msgid "P&rinter..." @@ -927,19 +913,19 @@ msgstr "印表機(&R)..." #: dlls/comdlg32/comdlg32.rc:465 dlls/comdlg32/comdlg32.rc:490 msgid "Look &in:" -msgstr "搜尋位置(&I)：" +msgstr "搜尋位置(&I):" #: dlls/comdlg32/comdlg32.rc:471 dlls/comdlg32/comdlg32.rc:497 msgid "File &name:" -msgstr "檔案名稱(&N)：" +msgstr "檔案名稱(&N):" #: dlls/comdlg32/comdlg32.rc:475 dlls/comdlg32/comdlg32.rc:501 msgid "Files of &type:" -msgstr "檔案類型(&T)：" +msgstr "檔案類型(&T):" #: dlls/comdlg32/comdlg32.rc:478 dlls/comdlg32/comdlg32.rc:504 msgid "Open as &read-only" -msgstr "開啟成唯讀(&R)" +msgstr "以唯讀方式開啟(&R)" #: dlls/comdlg32/comdlg32.rc:480 dlls/comdlg32/comdlg32.rc:506 #: dlls/comdlg32/comdlg32.rc:524 dlls/shdoclc/shdoclc.rc:127 @@ -949,11 +935,11 @@ msgstr "開啟(&O)" #: dlls/comdlg32/comdlg32.rc:517 msgid "File name:" -msgstr "檔案名稱：" +msgstr "檔案名稱:" #: dlls/comdlg32/comdlg32.rc:520 msgid "Files of type:" -msgstr "檔案類型：" +msgstr "檔案類型:" #: dlls/comdlg32/comdlg32.rc:33 dlls/vbscript/vbscript.rc:35 msgid "File not found" @@ -961,7 +947,7 @@ msgstr "找不到檔案" #: dlls/comdlg32/comdlg32.rc:34 msgid "Please verify that the correct file name was given" -msgstr "請檢查是否給予正確的檔案名稱。" +msgstr "請檢查是否給予正確的檔案名稱" #: dlls/comdlg32/comdlg32.rc:35 msgid "" @@ -969,7 +955,7 @@ msgid "" "Do you want to create file?" msgstr "" "找不到檔案\n" -"是否建立新檔案？" +"是否建立新檔案?" #: dlls/comdlg32/comdlg32.rc:36 msgid "" @@ -977,23 +963,23 @@ msgid "" "Do you want to replace it?" msgstr "" "檔案已經存在。\n" -"要取代嗎？" +"您要取代它嗎?" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" -msgstr "檔案名稱中存在無效的字元" +msgstr "路徑中存在無效的字元" #: dlls/comdlg32/comdlg32.rc:38 msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"檔案名中不能包含任何一下字元:\n" +"檔案名稱中不能包含以下任何一個字元:\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 msgid "Path does not exist" -msgstr "資料夾不存在" +msgstr "路徑不存在" #: dlls/comdlg32/comdlg32.rc:40 msgid "File does not exist" @@ -1001,7 +987,7 @@ msgstr "檔案不存在" #: dlls/comdlg32/comdlg32.rc:41 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "已選項目包含非資料夾物件" #: dlls/comdlg32/comdlg32.rc:46 msgid "Up One Level" @@ -1106,7 +1092,7 @@ msgstr "白色" #: dlls/comdlg32/comdlg32.rc:57 msgid "Unreadable Entry" -msgstr "數值不可讀" +msgstr "無法讀取的數值" #: dlls/comdlg32/comdlg32.rc:59 msgid "" @@ -1114,19 +1100,19 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "輸入值不在頁數範圍內。\n" -"請輸入一個 %1!d! 和 %2!d! 之間的值。" +"請輸入一個介於 %1!d! 和 %2!d! 之間的值。" #: dlls/comdlg32/comdlg32.rc:61 msgid "The 'from' entry cannot exceed the 'to' entry." -msgstr "起始值不能大於終點值。" +msgstr "「從」項的值不能大於「到」項的值。" #: dlls/comdlg32/comdlg32.rc:63 msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"邊緣空白重疊或落於邊界外，\n" -"請重新輸入邊緣空白。" +"頁面邊距重疊或落於邊界外。\n" +"請重新輸入頁面邊距。" #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -1137,8 +1123,8 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"您的印表機不支持這麼大的份數。\n" -"請輸入一個 1 和 %d 之間的數。" +"您的印表機不支援列印這麼大的份數。\n" +"請輸入一個介於 1 和 %d 之間的數值。" #: dlls/comdlg32/comdlg32.rc:68 msgid "A printer error occurred." @@ -1162,19 +1148,19 @@ msgstr "發生錯誤。" #: dlls/comdlg32/comdlg32.rc:73 msgid "Unknown printer driver." -msgstr "找不到印表機驅動程式。" +msgstr "不明的印表機驅動程式。" #: dlls/comdlg32/comdlg32.rc:76 msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"在使用與印表機有關功能(版面設定, 列印檔案)之前, 您必須先安裝印表機。請安裝一" -"個印表機後再試。" +"您必須先安裝印表機才能使用與印表機有關的功能 (如: 版面設定，列印檔案)。" +"請安裝印表機後再試一次。" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "選取介於 %1!d! 和 %2!d! 點的字型尺寸。" +msgstr "選取介於 %1!d! 和 %2!d! 點之間的字型大小。" #: dlls/comdlg32/comdlg32.rc:143 dlls/ieframe/ieframe.rc:35 msgid "&Save" @@ -1182,7 +1168,7 @@ msgstr "儲存(&S)" #: dlls/comdlg32/comdlg32.rc:144 msgid "Save &in:" -msgstr "儲存至(&I)：" +msgstr "儲存至(&I):" #: dlls/comdlg32/comdlg32.rc:145 msgid "Save" @@ -1193,14 +1179,12 @@ msgid "Open File" msgstr "開啟檔案" #: dlls/comdlg32/comdlg32.rc:148 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "新資料夾" +msgstr "選擇資料夾" #: dlls/comdlg32/comdlg32.rc:149 msgid "Font size has to be a number." -msgstr "" +msgstr "字型大小必須是數字。" #: dlls/comdlg32/comdlg32.rc:84 programs/oleview/oleview.rc:98 msgid "Ready" @@ -1208,107 +1192,107 @@ msgstr "待命" #: dlls/comdlg32/comdlg32.rc:85 msgid "Paused; " -msgstr "暫停；" +msgstr "暫停; " #: dlls/comdlg32/comdlg32.rc:86 msgid "Error; " -msgstr "錯誤；" +msgstr "錯誤; " #: dlls/comdlg32/comdlg32.rc:87 msgid "Pending deletion; " -msgstr "等待刪除；" +msgstr "刪除擱置中; " #: dlls/comdlg32/comdlg32.rc:88 msgid "Paper jam; " -msgstr "卡紙；" +msgstr "卡紙; " #: dlls/comdlg32/comdlg32.rc:89 msgid "Out of paper; " -msgstr "無紙；" +msgstr "無紙; " #: dlls/comdlg32/comdlg32.rc:90 msgid "Feed paper manual; " -msgstr "手動進紙；" +msgstr "手動進紙; " #: dlls/comdlg32/comdlg32.rc:91 msgid "Paper problem; " -msgstr "紙張問題；" +msgstr "紙張問題; " #: dlls/comdlg32/comdlg32.rc:92 msgid "Printer offline; " -msgstr "印表機離線；" +msgstr "印表機離線; " #: dlls/comdlg32/comdlg32.rc:93 msgid "I/O Active; " -msgstr "I/O 活動；" +msgstr "I/O 活動; " #: dlls/comdlg32/comdlg32.rc:94 msgid "Busy; " -msgstr "忙碌中；" +msgstr "忙碌中; " #: dlls/comdlg32/comdlg32.rc:95 msgid "Printing; " -msgstr "正在列印；" +msgstr "正在列印; " #: dlls/comdlg32/comdlg32.rc:96 msgid "Output tray is full; " -msgstr "出紙匣已滿；" +msgstr "出紙匣已滿; " #: dlls/comdlg32/comdlg32.rc:97 msgid "Not available; " -msgstr "不可用；" +msgstr "不可用; " #: dlls/comdlg32/comdlg32.rc:98 msgid "Waiting; " -msgstr "等待；" +msgstr "正在等待; " #: dlls/comdlg32/comdlg32.rc:99 msgid "Processing; " -msgstr "正在處理；" +msgstr "正在處理; " #: dlls/comdlg32/comdlg32.rc:100 msgid "Initializing; " -msgstr "正在初始化；" +msgstr "正在初始化; " #: dlls/comdlg32/comdlg32.rc:101 msgid "Warming up; " -msgstr "預熱中；" +msgstr "預熱中; " #: dlls/comdlg32/comdlg32.rc:102 msgid "Toner low; " -msgstr "墨水量低；" +msgstr "墨水量低; " #: dlls/comdlg32/comdlg32.rc:103 msgid "No toner; " -msgstr "墨水用盡；" +msgstr "墨水用盡; " #: dlls/comdlg32/comdlg32.rc:104 msgid "Page punt; " -msgstr "頁處理記憶體超支；" +msgstr "頁處理記憶體超支; " #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " -msgstr "已被使用者中斷；" +msgstr "被使用者中斷; " #: dlls/comdlg32/comdlg32.rc:106 msgid "Out of memory; " -msgstr "記憶體不足；" +msgstr "記憶體不足; " #: dlls/comdlg32/comdlg32.rc:107 msgid "The printer door is open; " -msgstr "印表機蓋是打開的；" +msgstr "印表機蓋已打開; " #: dlls/comdlg32/comdlg32.rc:108 msgid "Print server unknown; " -msgstr "找不到列印伺服器；" +msgstr "不明的列印伺服器; " #: dlls/comdlg32/comdlg32.rc:109 msgid "Power save mode; " -msgstr "省電狀態；" +msgstr "省電模式; " #: dlls/comdlg32/comdlg32.rc:78 msgid "Default Printer; " -msgstr "預設印表機；" +msgstr "預設印表機; " #: dlls/comdlg32/comdlg32.rc:79 msgid "There are %d documents in the queue" @@ -1316,11 +1300,11 @@ msgstr "有 %d 個文件正在等待列印" #: dlls/comdlg32/comdlg32.rc:80 msgid "Margins [inches]" -msgstr "邊緣空白 [英寸]" +msgstr "頁面邊距 [英寸]" #: dlls/comdlg32/comdlg32.rc:81 msgid "Margins [mm]" -msgstr "邊緣空白 [毫米]" +msgstr "頁面邊距 [毫米]" #: dlls/comdlg32/comdlg32.rc:82 dlls/sane.ds/sane.rc:33 msgctxt "unit: millimeters" @@ -1329,12 +1313,12 @@ msgstr "毫米" #: dlls/credui/credui.rc:45 msgid "&User name:" -msgstr "使用者名稱(&U)：" +msgstr "使用者名稱(&U):" #: dlls/credui/credui.rc:48 dlls/cryptui/cryptui.rc:402 #: dlls/oledb32/version.rc:81 msgid "&Password:" -msgstr "密碼(&P)：" +msgstr "密碼(&P):" #: dlls/credui/credui.rc:50 msgid "&Remember my password" @@ -1346,7 +1330,7 @@ msgstr "連接到 %s" #: dlls/credui/credui.rc:31 msgid "Connecting to %s" -msgstr "正在連接到 %s" +msgstr "正在連線到 %s" #: dlls/credui/credui.rc:32 msgid "Logon unsuccessful" @@ -1357,8 +1341,8 @@ msgid "" "Make sure that your user name\n" "and password are correct." msgstr "" -"請確認您輸入的使用者名稱和密碼\n" -"是否正確。" +"請確認您輸入的使用者名稱\n" +"和密碼是否正確。" #: dlls/credui/credui.rc:35 msgid "" @@ -1369,8 +1353,7 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"請在輸入密碼前按下 Caps Lock 鍵，解除\n" -"大寫鎖定。" +"您可以按下 Caps Lock 鍵以解除大寫鎖定，然後再輸入密碼。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1378,7 +1361,7 @@ msgstr "大寫鎖定已開啟" #: dlls/crypt32/crypt32.rc:30 msgid "Authority Key Identifier" -msgstr "授權金鑰識別碼" +msgstr "授權單位金鑰識別元" #: dlls/crypt32/crypt32.rc:31 msgid "Key Attributes" @@ -1394,7 +1377,7 @@ msgstr "主體替代名稱" #: dlls/crypt32/crypt32.rc:34 msgid "Issuer Alternative Name" -msgstr "發證者替代名稱" +msgstr "簽發者替代名稱" #: dlls/crypt32/crypt32.rc:35 msgid "Basic Constraints" @@ -1406,7 +1389,7 @@ msgstr "金鑰用法" #: dlls/crypt32/crypt32.rc:37 msgid "Certificate Policies" -msgstr "憑證策略" +msgstr "憑證原則" #: dlls/crypt32/crypt32.rc:38 msgid "Subject Key Identifier" @@ -1418,7 +1401,7 @@ msgstr "CRL 原因編碼" #: dlls/crypt32/crypt32.rc:40 msgid "CRL Distribution Points" -msgstr "CRL 發布點" +msgstr "CRL 發佈點" #: dlls/crypt32/crypt32.rc:41 msgid "Enhanced Key Usage" @@ -1438,7 +1421,7 @@ msgstr "下一個更新位置" #: dlls/crypt32/crypt32.rc:45 msgid "Yes or No Trust" -msgstr "是或否信賴" +msgstr "信任或不信任" #: dlls/crypt32/crypt32.rc:46 msgid "Email Address" @@ -1446,7 +1429,7 @@ msgstr "電子郵件地址" #: dlls/crypt32/crypt32.rc:47 msgid "Unstructured Name" -msgstr "無結構的名稱" +msgstr "非結構化名稱" #: dlls/crypt32/crypt32.rc:48 msgid "Content Type" @@ -1462,7 +1445,7 @@ msgstr "簽署時間" #: dlls/crypt32/crypt32.rc:51 msgid "Counter Sign" -msgstr "計數器符號" +msgstr "副署" #: dlls/crypt32/crypt32.rc:52 msgid "Challenge Password" @@ -1470,7 +1453,7 @@ msgstr "挑戰密碼" #: dlls/crypt32/crypt32.rc:53 msgid "Unstructured Address" -msgstr "無結構的位址" +msgstr "非結構化位址" #: dlls/crypt32/crypt32.rc:54 msgid "S/MIME Capabilities" @@ -1478,7 +1461,7 @@ msgstr "S/MIME 能力" #: dlls/crypt32/crypt32.rc:55 msgid "Prefer Signed Data" -msgstr "偏好已簽署資料" +msgstr "已簽署資料優先" #: dlls/crypt32/crypt32.rc:56 dlls/cryptdlg/cryptdlg.rc:34 msgctxt "Certification Practice Statement" @@ -1495,7 +1478,7 @@ msgstr "線上憑證狀態協定" #: dlls/crypt32/crypt32.rc:59 msgid "Certification Authority Issuer" -msgstr "憑證授權發證者" +msgstr "憑證授權單位簽發者" #: dlls/crypt32/crypt32.rc:60 msgid "Certification Template Name" @@ -1511,27 +1494,27 @@ msgstr "憑證複本" #: dlls/crypt32/crypt32.rc:63 msgid "Netscape Cert Type" -msgstr "Netscape 憑證型態" +msgstr "Netscape 憑證類型" #: dlls/crypt32/crypt32.rc:64 msgid "Netscape Base URL" -msgstr "Netscape 基準網址" +msgstr "Netscape 基本網址" #: dlls/crypt32/crypt32.rc:65 msgid "Netscape Revocation URL" -msgstr "Netscape 廢止網址" +msgstr "Netscape 撤銷網址" #: dlls/crypt32/crypt32.rc:66 msgid "Netscape CA Revocation URL" -msgstr "Netscape CA 廢止網址" +msgstr "Netscape CA 撤銷網址" #: dlls/crypt32/crypt32.rc:67 msgid "Netscape Cert Renewal URL" -msgstr "Netscape 憑證重申網址" +msgstr "Netscape 憑證更新網址" #: dlls/crypt32/crypt32.rc:68 msgid "Netscape CA Policy URL" -msgstr "Netscape CA 策略網址" +msgstr "Netscape CA 原則網址" #: dlls/crypt32/crypt32.rc:69 msgid "Netscape SSL ServerName" @@ -1583,7 +1566,7 @@ msgstr "姓氏" #: dlls/crypt32/crypt32.rc:81 msgid "Domain Component" -msgstr "區域部分" +msgstr "網域元件" #: dlls/crypt32/crypt32.rc:82 msgid "Street Address" @@ -1591,7 +1574,7 @@ msgstr "街道地址" #: dlls/crypt32/crypt32.rc:83 msgid "Serial Number" -msgstr "門牌號碼" +msgstr "序號" #: dlls/crypt32/crypt32.rc:84 msgid "CA Version" @@ -1603,7 +1586,7 @@ msgstr "交叉 CA 版本" #: dlls/crypt32/crypt32.rc:86 msgid "Serialized Signature Serial Number" -msgstr "序列化的簽名序號" +msgstr "序列化簽章序號" #: dlls/crypt32/crypt32.rc:87 msgid "Principal Name" @@ -1615,7 +1598,7 @@ msgstr "Windows 產品更新" #: dlls/crypt32/crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "註冊名稱值對" +msgstr "註冊名稱值配對" #: dlls/crypt32/crypt32.rc:90 msgid "OS Version" @@ -1627,7 +1610,7 @@ msgstr "註冊 CSP" #: dlls/crypt32/crypt32.rc:92 msgid "CRL Number" -msgstr "CRL 數字" +msgstr "CRL 號碼" #: dlls/crypt32/crypt32.rc:93 msgid "Delta CRL Indicator" @@ -1635,7 +1618,7 @@ msgstr "Delta CRL 指示器" #: dlls/crypt32/crypt32.rc:94 msgid "Issuing Distribution Point" -msgstr "議題發布點" +msgstr "發行發佈點" #: dlls/crypt32/crypt32.rc:95 msgid "Freshest CRL" @@ -1647,27 +1630,27 @@ msgstr "名稱條件約束" #: dlls/crypt32/crypt32.rc:97 msgid "Policy Mappings" -msgstr "策略映射" +msgstr "原則對應" #: dlls/crypt32/crypt32.rc:98 msgid "Policy Constraints" -msgstr "策略條件約束" +msgstr "原則條件約束" #: dlls/crypt32/crypt32.rc:99 msgid "Cross-Certificate Distribution Points" -msgstr "交叉憑證發布點" +msgstr "交叉憑證發佈點" #: dlls/crypt32/crypt32.rc:100 msgid "Application Policies" -msgstr "應用程式策略" +msgstr "應用程式原則" #: dlls/crypt32/crypt32.rc:101 msgid "Application Policy Mappings" -msgstr "應用程式策略映射" +msgstr "應用程式原則對應" #: dlls/crypt32/crypt32.rc:102 msgid "Application Policy Constraints" -msgstr "應用程式策略條件約束" +msgstr "應用程式原則條件約束" #: dlls/crypt32/crypt32.rc:103 msgid "CMC Data" @@ -1723,11 +1706,11 @@ msgstr "前一個 CA 憑證雜湊" #: dlls/crypt32/crypt32.rc:116 msgid "Virtual Base CRL Number" -msgstr "虛擬基底 CRL 數字" +msgstr "虛擬基本 CRL 數目" #: dlls/crypt32/crypt32.rc:117 msgid "Next CRL Publish" -msgstr "下一個 CRL 發布" +msgstr "下一個 CRL 發佈" #: dlls/crypt32/crypt32.rc:118 msgid "CA Encryption Certificate" @@ -1751,27 +1734,27 @@ msgstr "虛設簽署人" #: dlls/crypt32/crypt32.rc:123 msgid "Encrypted Private Key" -msgstr "加密的私鑰" +msgstr "已加密的私鑰" #: dlls/crypt32/crypt32.rc:124 msgid "Published CRL Locations" -msgstr "發布的 CRL 位置" +msgstr "已發行的 CRL 位置" #: dlls/crypt32/crypt32.rc:125 msgid "Enforce Certificate Chain Policy" -msgstr "強制憑證鏈策略" +msgstr "強制憑證鏈結原則" #: dlls/crypt32/crypt32.rc:126 msgid "Transaction Id" -msgstr "異動作業識別號" +msgstr "異動作業識別碼" #: dlls/crypt32/crypt32.rc:127 msgid "Sender Nonce" -msgstr "當前傳送者" +msgstr "發送者的一次性隨機數" #: dlls/crypt32/crypt32.rc:128 msgid "Recipient Nonce" -msgstr "當前收件者" +msgstr "收件者的一次性隨機數" #: dlls/crypt32/crypt32.rc:129 msgid "Reg Info" @@ -1779,11 +1762,11 @@ msgstr "註冊資訊" #: dlls/crypt32/crypt32.rc:130 msgid "Get Certificate" -msgstr "提取憑證" +msgstr "取得憑證" #: dlls/crypt32/crypt32.rc:131 msgid "Get CRL" -msgstr "提取 CRL" +msgstr "取得 CRL" #: dlls/crypt32/crypt32.rc:132 msgid "Revoke Request" @@ -1791,11 +1774,11 @@ msgstr "取消要求" #: dlls/crypt32/crypt32.rc:133 msgid "Query Pending" -msgstr "查詢擱置" +msgstr "查詢擱置中" #: dlls/crypt32/crypt32.rc:134 dlls/cryptui/cryptui.rc:95 msgid "Certificate Trust List" -msgstr "憑證信賴清單" +msgstr "憑證信任清單" #: dlls/crypt32/crypt32.rc:135 msgid "Archived Key Certificate Hash" @@ -1803,11 +1786,11 @@ msgstr "封存的金鑰憑證雜湊" #: dlls/crypt32/crypt32.rc:136 msgid "Private Key Usage Period" -msgstr "私鑰使用週期" +msgstr "私鑰使用期限" #: dlls/crypt32/crypt32.rc:137 msgid "Client Information" -msgstr "客戶端資訊" +msgstr "用戶端資訊" #: dlls/crypt32/crypt32.rc:138 msgid "Server Authentication" @@ -1815,7 +1798,7 @@ msgstr "伺服器認證" #: dlls/crypt32/crypt32.rc:139 msgid "Client Authentication" -msgstr "客戶端認證" +msgstr "用戶端認證" #: dlls/crypt32/crypt32.rc:140 msgid "Code Signing" @@ -1831,7 +1814,7 @@ msgstr "時間戳記" #: dlls/crypt32/crypt32.rc:143 msgid "Microsoft Trust List Signing" -msgstr "Microsoft 信賴清單簽署" +msgstr "Microsoft 信任清單簽署" #: dlls/crypt32/crypt32.rc:144 msgid "Microsoft Time Stamping" @@ -1843,7 +1826,7 @@ msgstr "IP 安全終端系統" #: dlls/crypt32/crypt32.rc:146 msgid "IP security tunnel termination" -msgstr "IP 安全遂道終端" +msgstr "IP 安全隧道終端" #: dlls/crypt32/crypt32.rc:147 msgid "IP security user" @@ -1855,19 +1838,19 @@ msgstr "加密檔案系統" #: dlls/crypt32/crypt32.rc:149 dlls/cryptui/cryptui.rc:133 msgid "Windows Hardware Driver Verification" -msgstr "Windows 硬體驅動程式查核" +msgstr "Windows 硬體驅動程式驗證" #: dlls/crypt32/crypt32.rc:150 dlls/cryptui/cryptui.rc:134 msgid "Windows System Component Verification" -msgstr "Windows 系統成分查核" +msgstr "Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:151 dlls/cryptui/cryptui.rc:135 msgid "OEM Windows System Component Verification" -msgstr "OEM Windows 系統成分查核" +msgstr "OEM Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:152 dlls/cryptui/cryptui.rc:136 msgid "Embedded Windows System Component Verification" -msgstr "嵌入式 Windows 系統成分查核" +msgstr "嵌入式 Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:153 dlls/cryptui/cryptui.rc:143 msgid "Key Pack Licenses" @@ -1875,11 +1858,11 @@ msgstr "金鑰包裝授權" #: dlls/crypt32/crypt32.rc:154 dlls/cryptui/cryptui.rc:144 msgid "License Server Verification" -msgstr "授權伺服器查核" +msgstr "授權伺服器驗證" #: dlls/crypt32/crypt32.rc:155 dlls/cryptui/cryptui.rc:146 msgid "Smart Card Logon" -msgstr "智慧卡登錄" +msgstr "智慧卡登入" #: dlls/crypt32/crypt32.rc:156 dlls/cryptui/cryptui.rc:142 msgid "Digital Rights" @@ -1887,7 +1870,7 @@ msgstr "數位權限" #: dlls/crypt32/crypt32.rc:157 dlls/cryptui/cryptui.rc:138 msgid "Qualified Subordination" -msgstr "合格的隸屬" +msgstr "合格的分類" #: dlls/crypt32/crypt32.rc:158 dlls/cryptui/cryptui.rc:139 msgid "Key Recovery" @@ -1911,7 +1894,7 @@ msgstr "根清單簽署人" #: dlls/crypt32/crypt32.rc:163 msgid "All application policies" -msgstr "所有應用程式策略" +msgstr "所有應用程式原則" #: dlls/crypt32/crypt32.rc:164 dlls/cryptui/cryptui.rc:149 msgid "Directory Service Email Replication" @@ -1919,19 +1902,19 @@ msgstr "目錄服務電子郵件複寫" #: dlls/crypt32/crypt32.rc:165 dlls/cryptui/cryptui.rc:145 msgid "Certificate Request Agent" -msgstr "憑證請求代理程式" +msgstr "憑證要求代理" #: dlls/crypt32/crypt32.rc:166 dlls/cryptui/cryptui.rc:141 msgid "Lifetime Signing" -msgstr "生命期簽署" +msgstr "永久簽署" #: dlls/crypt32/crypt32.rc:167 msgid "All issuance policies" -msgstr "所有發布策略" +msgstr "所有發佈原則" #: dlls/crypt32/crypt32.rc:172 msgid "Trusted Root Certification Authorities" -msgstr "信賴的根憑證授權者" +msgstr "信任的根憑證授權單位" #: dlls/crypt32/crypt32.rc:173 msgid "Personal" @@ -1939,7 +1922,7 @@ msgstr "個人的" #: dlls/crypt32/crypt32.rc:174 msgid "Intermediate Certification Authorities" -msgstr "中介憑證授權者" +msgstr "中介憑證授權單位" #: dlls/crypt32/crypt32.rc:175 msgid "Other People" @@ -1947,11 +1930,11 @@ msgstr "其他人" #: dlls/crypt32/crypt32.rc:176 msgid "Trusted Publishers" -msgstr "信賴的發行者" +msgstr "信任的發行者" #: dlls/crypt32/crypt32.rc:177 msgid "Untrusted Certificates" -msgstr "不可信的憑證" +msgstr "不信任的憑證" #: dlls/crypt32/crypt32.rc:182 msgid "KeyID=" @@ -1959,7 +1942,7 @@ msgstr "KeyID=" #: dlls/crypt32/crypt32.rc:183 msgid "Certificate Issuer" -msgstr "憑證發證者" +msgstr "憑證簽發者" #: dlls/crypt32/crypt32.rc:184 msgid "Certificate Serial Number=" @@ -1995,11 +1978,11 @@ msgstr "遮罩=" #: dlls/crypt32/crypt32.rc:192 msgid "Registered ID=" -msgstr "已註冊的識別號=" +msgstr "已註冊的識別碼=" #: dlls/crypt32/crypt32.rc:193 msgid "Unknown Key Usage" -msgstr "不明金鑰用法" +msgstr "不明的金鑰使用方法" #: dlls/crypt32/crypt32.rc:194 msgid "Subject Type=" @@ -2025,7 +2008,7 @@ msgstr "無" #: dlls/crypt32/crypt32.rc:199 msgid "Information Not Available" -msgstr "資訊無法使用" +msgstr "沒有可用資訊" #: dlls/crypt32/crypt32.rc:200 msgid "Authority Info Access" @@ -2042,23 +2025,23 @@ msgstr "OCSP" #: dlls/crypt32/crypt32.rc:203 msgid "CA Issuers" -msgstr "CA 發證者" +msgstr "CA 簽發者" #: dlls/crypt32/crypt32.rc:204 msgid "Unknown Access Method" -msgstr "不明存取方法" +msgstr "不明的存取方法" #: dlls/crypt32/crypt32.rc:205 msgid "Alternative Name" -msgstr "另類名稱" +msgstr "替代名稱" #: dlls/crypt32/crypt32.rc:206 msgid "CRL Distribution Point" -msgstr "CRL 發布點" +msgstr "CRL 發佈點" #: dlls/crypt32/crypt32.rc:207 msgid "Distribution Point Name" -msgstr "發布點名稱" +msgstr "發佈點名稱" #: dlls/crypt32/crypt32.rc:208 msgid "Full Name" @@ -2074,19 +2057,19 @@ msgstr "CRL 原因=" #: dlls/crypt32/crypt32.rc:211 msgid "CRL Issuer" -msgstr "CRL 發證者" +msgstr "CRL 簽發者" #: dlls/crypt32/crypt32.rc:212 msgid "Key Compromise" -msgstr "金鑰折衷" +msgstr "金鑰洩露" #: dlls/crypt32/crypt32.rc:213 msgid "CA Compromise" -msgstr "CA 折衷" +msgstr "CA 洩露" #: dlls/crypt32/crypt32.rc:214 msgid "Affiliation Changed" -msgstr "會籍變更" +msgstr "聯盟已變更" #: dlls/crypt32/crypt32.rc:215 msgid "Superseded" @@ -2094,11 +2077,11 @@ msgstr "已取代" #: dlls/crypt32/crypt32.rc:216 msgid "Operation Ceased" -msgstr "作業終了" +msgstr "作業已停止" #: dlls/crypt32/crypt32.rc:217 msgid "Certificate Hold" -msgstr "憑證暫停" +msgstr "持有的憑證" #: dlls/crypt32/crypt32.rc:218 msgid "Financial Information=" @@ -2110,11 +2093,11 @@ msgstr "可用" #: dlls/crypt32/crypt32.rc:220 msgid "Not Available" -msgstr "無法使用" +msgstr "不可用" #: dlls/crypt32/crypt32.rc:221 msgid "Meets Criteria=" -msgstr "會面準則=" +msgstr "符合準則=" #: dlls/crypt32/crypt32.rc:222 dlls/cryptui/cryptui.rc:166 #: dlls/oleaut32/oleaut32.rc:32 dlls/wininet/wininet.rc:94 @@ -2130,7 +2113,7 @@ msgstr "否" #: dlls/crypt32/crypt32.rc:224 msgid "Digital Signature" -msgstr "數位簽名" +msgstr "數位簽章" #: dlls/crypt32/crypt32.rc:225 msgid "Non-Repudiation" @@ -2142,11 +2125,11 @@ msgstr "金鑰編密" #: dlls/crypt32/crypt32.rc:227 msgid "Data Encipherment" -msgstr "資料加密" +msgstr "資料編密" #: dlls/crypt32/crypt32.rc:228 msgid "Key Agreement" -msgstr "金鑰協定" +msgstr "金鑰合約" #: dlls/crypt32/crypt32.rc:229 msgid "Certificate Signing" @@ -2170,7 +2153,7 @@ msgstr "只解開密文" #: dlls/crypt32/crypt32.rc:234 msgid "SSL Client Authentication" -msgstr "SSL 客戶端認證" +msgstr "SSL 用戶端認證" #: dlls/crypt32/crypt32.rc:235 msgid "SSL Server Authentication" @@ -2182,7 +2165,7 @@ msgstr "S/MIME" #: dlls/crypt32/crypt32.rc:237 msgid "Signature" -msgstr "簽名" +msgstr "簽章" #: dlls/crypt32/crypt32.rc:238 msgid "SSL CA" @@ -2194,23 +2177,23 @@ msgstr "S/MIME CA" #: dlls/crypt32/crypt32.rc:240 msgid "Signature CA" -msgstr "簽名 CA" +msgstr "簽章 CA" #: dlls/cryptdlg/cryptdlg.rc:30 msgid "Certificate Policy" -msgstr "憑證策略" +msgstr "憑證原則" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略識別碼：" +msgstr "原則識別碼: " #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" -msgstr "策略限定元資訊" +msgstr "原則限定元資訊" #: dlls/cryptdlg/cryptdlg.rc:33 msgid "Policy Qualifier Id=" -msgstr "策略限定元識別號=" +msgstr "原則限定元識別碼=" #: dlls/cryptdlg/cryptdlg.rc:36 msgid "Qualifier" @@ -2244,15 +2227,15 @@ msgstr "安裝憑證(&I)..." #: dlls/cryptui/cryptui.rc:197 msgid "Issuer &Statement" -msgstr "發證者敘述(&S)" +msgstr "簽發者敘述(&S)" #: dlls/cryptui/cryptui.rc:205 msgid "&Show:" -msgstr "顯示(&S)：" +msgstr "顯示(&S):" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." -msgstr "編輯屬性(&E)..." +msgstr "編輯內容(&E)..." #: dlls/cryptui/cryptui.rc:211 msgid "&Copy to File..." @@ -2272,7 +2255,7 @@ msgstr "檢視憑證(&V)" #: dlls/cryptui/cryptui.rc:223 msgid "Certificate &status:" -msgstr "憑證狀態(&S)：" +msgstr "憑證狀態(&S):" #: dlls/cryptui/cryptui.rc:229 msgid "Disclaimer" @@ -2284,12 +2267,12 @@ msgstr "更多資訊(&I)" #: dlls/cryptui/cryptui.rc:244 msgid "&Friendly name:" -msgstr "易記名稱(&F)：" +msgstr "易記名稱(&F):" #: dlls/cryptui/cryptui.rc:246 programs/progman/progman.rc:154 #: programs/progman/progman.rc:170 msgid "&Description:" -msgstr "描述(&D)：" +msgstr "描述(&D):" #: dlls/cryptui/cryptui.rc:248 msgid "Certificate purposes" @@ -2305,32 +2288,32 @@ msgstr "停用這個憑證的全部目的(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "只有啟用這個憑證的下列目的(&O)：" +msgstr "只啟用這個憑證的下列目的(&O):" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." -msgstr "加入目的(&P)..." +msgstr "新增目的(&P)..." #: dlls/cryptui/cryptui.rc:262 msgid "Add Purpose" -msgstr "加入目的" +msgstr "新增目的" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "加入您所希望的憑證目的物件識別符號 (OID)：" +msgstr "新增您希望加入的憑證目的的物件識別碼 (OID):" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" -msgstr "選取憑證儲存處" +msgstr "選取憑證存放區" #: dlls/cryptui/cryptui.rc:276 msgid "Select the certificate store you want to use:" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證存放區:" #: dlls/cryptui/cryptui.rc:279 msgid "&Show physical stores" -msgstr "顯示實體儲存(&S)" +msgstr "顯示實體存放區(&S)" #: dlls/cryptui/cryptui.rc:285 dlls/cryptui/cryptui.rc:296 #: dlls/cryptui/cryptui.rc:313 dlls/cryptui/cryptui.rc:327 @@ -2354,16 +2337,16 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信賴清單到憑證儲存處。\n" +"這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信任清單到憑證存放區。\n" "\n" -"憑證可用於識別您或您正在通訊的電腦。它也可以用於認證以及對訊息簽署。憑證儲" -"存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。\n" "\n" -"要繼續，請按下一步。" +"請按 [下一步] 繼續。" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" -msgstr "檔案名稱(&F)：" +msgstr "檔案名稱(&F):" #: dlls/cryptui/cryptui.rc:301 dlls/cryptui/cryptui.rc:323 #: dlls/cryptui/cryptui.rc:437 programs/winecfg/winecfg.rc:311 @@ -2375,7 +2358,7 @@ msgid "" "Note: The following file formats may contain more than one certificate, " "certificate revocation list, or certificate trust list:" msgstr "" -"註記：下列檔案格式也許會包含超過一個的憑證、憑證撤銷清單或憑證信賴清單：" +"註記: 下列檔案格式也許會包含超過一個的憑證、憑證撤銷清單或憑證信任清單:" #: dlls/cryptui/cryptui.rc:304 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" @@ -2388,21 +2371,21 @@ msgstr "個人資訊交換/PKCS #12 (*.pfx; *.p12)" #: dlls/cryptui/cryptui.rc:308 dlls/cryptui/cryptui.rc:81 #: dlls/cryptui/cryptui.rc:162 msgid "Microsoft Serialized Certificate Store (*.sst)" -msgstr "Microsoft 序列化憑證儲存處 (*.sst)" +msgstr "Microsoft 序列化憑證存放區 (*.sst)" #: dlls/cryptui/cryptui.rc:316 msgid "" "Wine can automatically select the certificate store, or you can specify a " "location for the certificates." -msgstr "Wine 可以自動選取憑證儲存處，或者您可以指定用於憑證的位置。" +msgstr "Wine 可以自動選取憑證存放區，或者您可以指定用於憑證的位置。" #: dlls/cryptui/cryptui.rc:318 msgid "&Automatically select certificate store" -msgstr "自動選取憑證儲存處(&A)" +msgstr "自動選取憑證存放區(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "將所有憑證放置於下列儲存(&P)：" +msgstr "將所有憑證放置於下列存放區(&P):" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2410,11 +2393,11 @@ msgstr "正在完成憑證匯入精靈" #: dlls/cryptui/cryptui.rc:332 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "您已經成功地完成憑證匯入精靈。" +msgstr "您已經成功完成憑證匯入精靈。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" -msgstr "您已指定下列設定值：" +msgstr "您已指定下列設定值:" #: dlls/cryptui/cryptui.rc:342 dlls/cryptui/cryptui.rc:122 #: dlls/inetcpl.cpl/inetcpl.rc:111 @@ -2423,7 +2406,7 @@ msgstr "憑證" #: dlls/cryptui/cryptui.rc:345 msgid "I&ntended purpose:" -msgstr "預定目的(&N)：" +msgstr "預定目的(&N):" #: dlls/cryptui/cryptui.rc:349 msgid "&Import..." @@ -2462,11 +2445,11 @@ msgstr "憑證目的" #: dlls/cryptui/cryptui.rc:364 msgid "" "Select one or more purposes to be listed when Advanced Purposes is selected." -msgstr "當進階目的已選時選取一或多個要列出的目的。" +msgstr "選取一個或多個在進階目的已選取時要列出的目的。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" -msgstr "憑證目的(&C)：" +msgstr "憑證目的(&C):" #: dlls/cryptui/cryptui.rc:375 dlls/cryptui/cryptui.rc:386 #: dlls/cryptui/cryptui.rc:399 dlls/cryptui/cryptui.rc:409 @@ -2491,12 +2474,12 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"這個精靈協助您從憑證儲存處匯出憑證、憑證撤銷清單以及憑證信賴清單到檔案。\n" +"這個精靈協助您從憑證存放區匯出憑證、憑證撤銷清單以及憑證信任清單到檔案。\n" "\n" -"憑證可用於識別您或您用以通訊的電腦。它也可以被用於認證以及簽署訊息。憑證儲存" -"處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。\n" "\n" -"要繼續請按下一步。" +"請按 [下一步] 繼續。" #: dlls/cryptui/cryptui.rc:389 msgid "" @@ -2506,23 +2489,23 @@ msgstr "如果您選擇要匯出私鑰，將於後續頁面向您提示要求密 #: dlls/cryptui/cryptui.rc:390 msgid "Do you wish to export the private key?" -msgstr "您要匯出私鑰嗎？" +msgstr "您要匯出私鑰嗎?" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" -msgstr "是(&Y)，匯出私鑰。" +msgstr "是，匯出私鑰(&Y)" #: dlls/cryptui/cryptui.rc:393 msgid "N&o, do not export the private key" -msgstr "否(&N)，不要匯出私鑰。" +msgstr "否，不要匯出私鑰(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" -msgstr "確認密碼(&C)：" +msgstr "確認密碼(&C):" #: dlls/cryptui/cryptui.rc:412 msgid "Select the format you want to use:" -msgstr "請選擇您要使用的格式：" +msgstr "請選擇您要使用的格式:" #: dlls/cryptui/cryptui.rc:413 msgid "&DER-encoded X.509 (*.cer)" @@ -2530,7 +2513,7 @@ msgstr "&DER-encoded X.509 (*.cer)" #: dlls/cryptui/cryptui.rc:415 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-encoded X.509 (*.cer)：" +msgstr "Ba&se64-encoded X.509 (*.cer):" #: dlls/cryptui/cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2562,19 +2545,15 @@ msgstr "正在完成憑證匯出精靈" #: dlls/cryptui/cryptui.rc:446 msgid "You have successfully completed the Certificate Export Wizard." -msgstr "您已經成功地完成憑證匯出精靈" +msgstr "您已經成功完成憑證匯出精靈。" #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -2588,21 +2567,23 @@ msgstr "憑證資訊" msgid "" "This certificate has an invalid signature. The certificate may have been " "altered or corrupted." -msgstr "這個憑證的簽名無效。憑證也許已被改變或已損壞。" +msgstr "這個憑證的簽章無效。憑證可能已被更改或損壞。" #: dlls/cryptui/cryptui.rc:33 msgid "" "This root certificate is not trusted. To trust it, add it to your system's " "trusted root certificate store." -msgstr "這個根憑證未被信賴。要信賴它，就將它加入您系統的信賴根憑證儲存處。" +msgstr "" +"這個根憑證不受信任。如果您要信任它，請將這個憑證加入到系統的" +"受信任的根憑證存放區。" #: dlls/cryptui/cryptui.rc:34 msgid "This certificate could not be validated to a trusted root certificate." -msgstr "這個憑證無法被驗證為信賴的根憑證。" +msgstr "這個憑證無法被驗證為信任的根憑證。" #: dlls/cryptui/cryptui.rc:35 msgid "This certificate's issuer could not be found." -msgstr "找不到這個憑證的發證者。" +msgstr "找不到這個憑證的簽發者。" #: dlls/cryptui/cryptui.rc:36 msgid "All the intended purposes of this certificate could not be verified." @@ -2610,15 +2591,15 @@ msgstr "這個憑證的所有預定目的都無法被驗證。" #: dlls/cryptui/cryptui.rc:37 msgid "This certificate is intended for the following purposes:" -msgstr "這個憑證是適用於下列目的：" +msgstr "這個憑證適用於下列目的:" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "發證對象：" +msgstr "發證給: " #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "發證來源：" +msgstr "簽發者: " #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2630,7 +2611,7 @@ msgstr " 到 " #: dlls/cryptui/cryptui.rc:42 msgid "This certificate has an invalid signature." -msgstr "這個憑證的簽名無效。" +msgstr "這個憑證的簽章無效。" #: dlls/cryptui/cryptui.rc:43 msgid "This certificate has expired or is not yet valid." @@ -2638,11 +2619,11 @@ msgstr "這個憑證已過期或尚未生效。" #: dlls/cryptui/cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." -msgstr "這個憑證的有效期限超過它的發證者。" +msgstr "這個憑證的有效期限超過簽發者的有效期限。" #: dlls/cryptui/cryptui.rc:45 msgid "This certificate was revoked by its issuer." -msgstr "這個憑證已被它的發證者取消。" +msgstr "這個憑證已被其簽發者撤銷。" #: dlls/cryptui/cryptui.rc:46 msgid "This certificate is OK." @@ -2667,15 +2648,15 @@ msgstr "只有版本 1 欄位" #: dlls/cryptui/cryptui.rc:51 msgid "Extensions Only" -msgstr "只有進階屬性" +msgstr "只有延伸" #: dlls/cryptui/cryptui.rc:52 msgid "Critical Extensions Only" -msgstr "只有關鍵進階屬性" +msgstr "只有關鍵延伸" #: dlls/cryptui/cryptui.rc:53 msgid "Properties Only" -msgstr "只有屬性" +msgstr "只有內容" #: dlls/cryptui/cryptui.rc:55 msgid "Serial number" @@ -2724,11 +2705,11 @@ msgstr "描述" #: dlls/cryptui/cryptui.rc:66 msgid "Certificate Properties" -msgstr "憑證屬性" +msgstr "憑證內容" #: dlls/cryptui/cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "請以 1.2.3.4 的形式輸入 OID" +msgstr "請以 1.2.3.4 的格式輸入 OID" #: dlls/cryptui/cryptui.rc:68 msgid "The OID you entered already exists." @@ -2736,13 +2717,13 @@ msgstr "您輸入的 OID 已經存在。" #: dlls/cryptui/cryptui.rc:70 msgid "Please select a certificate store." -msgstr "請選取憑證儲存處。" +msgstr "請選取憑證存放區。" #: dlls/cryptui/cryptui.rc:72 msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." -msgstr "檔案含有不匹配給定準則的物件。請選取另一個檔案。" +msgstr "檔案含有不符合指定條件的物件。請選取另一個檔案。" #: dlls/cryptui/cryptui.rc:73 msgid "File to Import" @@ -2754,13 +2735,13 @@ msgstr "指定您要匯入的檔案。" #: dlls/cryptui/cryptui.rc:75 dlls/cryptui/cryptui.rc:98 msgid "Certificate Store" -msgstr "憑證儲存處" +msgstr "憑證存放區" #: dlls/cryptui/cryptui.rc:76 msgid "" "Certificate stores are collections of certificates, certificate revocation " "lists, and certificate trust lists." -msgstr "憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。" +msgstr "憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。" #: dlls/cryptui/cryptui.rc:77 msgid "X.509 Certificate (*.cer; *.crt)" @@ -2776,7 +2757,7 @@ msgstr "憑證撤銷清單 (*.crl)" #: dlls/cryptui/cryptui.rc:80 dlls/cryptui/cryptui.rc:159 msgid "Certificate Trust List (*.stl)" -msgstr "憑證信賴清單 (*.stl)" +msgstr "憑證信任清單 (*.stl)" #: dlls/cryptui/cryptui.rc:82 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" @@ -2800,11 +2781,11 @@ msgstr "由程式所決定" #: dlls/cryptui/cryptui.rc:88 msgid "Please select a store" -msgstr "請選取儲存處" +msgstr "請選取存放區" #: dlls/cryptui/cryptui.rc:89 msgid "Certificate Store Selected" -msgstr "憑證儲存處已選" +msgstr "已選取憑證存放區" #: dlls/cryptui/cryptui.rc:90 msgid "Automatically determined by the program" @@ -2832,7 +2813,7 @@ msgstr "個人資訊交換" #: dlls/cryptui/cryptui.rc:99 msgid "The import was successful." -msgstr "已成功匯入。" +msgstr "匯入成功。" #: dlls/cryptui/cryptui.rc:100 msgid "The import failed." @@ -2848,15 +2829,15 @@ msgstr "<進階目的>" #: dlls/cryptui/cryptui.rc:104 msgid "Issued To" -msgstr "發證對象" +msgstr "發證給" #: dlls/cryptui/cryptui.rc:105 msgid "Issued By" -msgstr "發證來源" +msgstr "簽發者" #: dlls/cryptui/cryptui.rc:106 dlls/wininet/wininet.rc:36 msgid "Expiration Date" -msgstr "過期日期" +msgstr "到期日期" #: dlls/cryptui/cryptui.rc:107 msgid "Friendly Name" @@ -2873,7 +2854,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證解密訊息，或用它簽署訊息。\n" -"確定要移除這個憑證？" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:111 msgid "" @@ -2882,7 +2863,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證解密訊息，或用它們簽署訊息。\n" -"確定要移除這些憑證？" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:112 msgid "" @@ -2891,21 +2872,16 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證加密訊息，或驗證以它簽署的訊息。\n" -"確定要移除這個憑證？" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證加密訊息，或驗證以它們簽署的訊息。\n" -"確定要移除這些憑證？" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:114 msgid "" @@ -2913,8 +2889,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個憑證授權者所發的憑證將不再被信賴。\n" -"確定要移除這個憑證？" +"由這個憑證授權單位所發的憑證將不再被信任。\n" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:115 msgid "" @@ -2922,8 +2898,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些憑證授權者所發的憑證將不再被信賴。\n" -"確定要移除這些憑證？" +"由這些憑證授權單位所發的憑證將不再被信任。\n" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:116 msgid "" @@ -2931,8 +2907,8 @@ msgid "" "certification authorities it issued, will no longer be trusted.\n" "Are you sure you want to remove this trusted root certificate?" msgstr "" -"由這個憑證授權者所發的憑證，或是任何由它發證的憑證授權者，將不再被信賴。\n" -"確定要移除這個信賴的根憑證？" +"由這個憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" +"確定要移除這個信任的根憑證?" #: dlls/cryptui/cryptui.rc:117 msgid "" @@ -2940,36 +2916,36 @@ msgid "" "certification authorities they issued, will no longer be trusted.\n" "Are you sure you want to remove these trusted root certificates?" msgstr "" -"由這些憑證授權者所發的憑證，或是任何由它們發證的憑證授權者，將不再被信賴。\n" -"確定要移除這些信賴的根憑證？" +"由這些憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" +"確定要移除這些信任的根憑證?" #: dlls/cryptui/cryptui.rc:118 msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個發行者簽署的軟體將不再被信賴。\n" -"確定要移除這個憑證？" +"由這個發行者簽署的軟體將將不再被信任。\n" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:119 msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些發行者簽署的軟體將不再被信賴。\n" -"確定要移除這些憑證？" +"由這些發行者簽署的軟體將不再被信任。\n" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" -msgstr "確定要移除這個憑證？" +msgstr "確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:121 msgid "Are you sure you want to remove these certificates?" -msgstr "確定要移除這些憑證？" +msgstr "確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" -msgstr "確保遠端電腦的身分" +msgstr "確認遠端電腦的身分" #: dlls/cryptui/cryptui.rc:125 msgid "Proves your identity to a remote computer" @@ -2980,8 +2956,8 @@ msgid "" "Ensures software came from software publisher\n" "Protects software from alteration after publication" msgstr "" -"請確認軟體是來自軟體發行者\n" -"保護軟體以避免發行之後的變更" +"確認軟體是來自軟體發行者\n" +"確保軟體在發行之後未被修改" #: dlls/cryptui/cryptui.rc:127 msgid "Protects e-mail messages" @@ -2997,15 +2973,15 @@ msgstr "允許以目前的時間簽署資料" #: dlls/cryptui/cryptui.rc:130 msgid "Allows you to digitally sign a certificate trust list" -msgstr "允許您數位簽署憑證信賴清單" +msgstr "允許您數位簽署憑證信任清單" #: dlls/cryptui/cryptui.rc:131 msgid "Allows data on disk to be encrypted" -msgstr "允許磁碟上的資料被加密" +msgstr "允許加密磁碟上的資料" #: dlls/cryptui/cryptui.rc:147 msgid "Private Key Archival" -msgstr "私鑰檔案的" +msgstr "私鑰檔案封存" #: dlls/cryptui/cryptui.rc:151 msgid "Export Format" @@ -3017,7 +2993,7 @@ msgstr "選擇將用來儲存內容的格式。" #: dlls/cryptui/cryptui.rc:153 msgid "Export Filename" -msgstr "匯出檔名" +msgstr "匯出檔案名稱" #: dlls/cryptui/cryptui.rc:154 msgid "Specify the name of the file in which the content will be saved." @@ -3025,7 +3001,7 @@ msgstr "指定將會儲存內容的檔案名稱。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案已經存在。您要取代它嗎?" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3057,7 +3033,7 @@ msgstr "匯出密鑰" #: dlls/cryptui/cryptui.rc:168 msgid "The export was successful." -msgstr "已成功匯出。" +msgstr "匯出成功。" #: dlls/cryptui/cryptui.rc:169 msgid "The export failed." @@ -3079,35 +3055,31 @@ msgstr "輸入密碼" #: dlls/cryptui/cryptui.rc:173 msgid "You may password-protect a private key." -msgstr "您可以以密碼保護私鑰。" +msgstr "您可以使用密碼來保護私鑰。" #: dlls/cryptui/cryptui.rc:174 msgid "The passwords do not match." -msgstr "密碼不匹配。" +msgstr "密碼不相符。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." -msgstr "註記：用於這個憑證的私鑰無法開啟。" +msgstr "註記: 用於這個憑證的私鑰無法開啟。" #: dlls/cryptui/cryptui.rc:176 msgid "Note: The private key for this certificate is not exportable." -msgstr "註記：用於這個憑證的私鑰不可匯出。" +msgstr "註記: 用於這個憑證的私鑰不可匯出。" #: dlls/cryptui/cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "預定目的(&N)：" +msgstr "預定目的" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:150 msgid "Location" msgstr "位置" #: dlls/cryptui/cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:181 programs/winefile/winefile.rc:101 #: programs/winhlp32/winhlp32.rc:110 programs/winhlp32/winhlp32.rc:85 @@ -3120,11 +3092,11 @@ msgstr "裝置設定" #: dlls/dinput/dinput.rc:39 msgid "Reset" -msgstr "重置" +msgstr "重設" #: dlls/dinput/dinput.rc:42 msgid "Player" -msgstr "玩家" +msgstr "播放器" #: dlls/dinput/dinput.rc:43 programs/winecfg/winecfg.rc:88 msgid "Device" @@ -3136,7 +3108,7 @@ msgstr "動作" #: dlls/dinput/dinput.rc:45 msgid "Mapping" -msgstr "映射" +msgstr "對應" #: dlls/dinput/dinput.rc:47 msgid "Show Assigned First" @@ -3188,7 +3160,7 @@ msgstr "阿拉伯語" #: dlls/gdi32/gdi32.rc:35 msgid "Baltic" -msgstr "波羅的海語" +msgstr "波羅的海語言" #: dlls/gdi32/gdi32.rc:36 msgid "Vietnamese" @@ -3204,19 +3176,19 @@ msgstr "日語" #: dlls/gdi32/gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "簡化字漢語" +msgstr "中文 (GB2312)" #: dlls/gdi32/gdi32.rc:40 msgid "Hangul" -msgstr "韓語諺文" +msgstr "韓語" #: dlls/gdi32/gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "傳統字漢語" +msgstr "中文 (BIG5)" #: dlls/gdi32/gdi32.rc:42 msgid "Hangul(Johab)" -msgstr "韓語諺文(組合型)" +msgstr "韓語 (Johab)" #: dlls/gdi32/gdi32.rc:43 msgid "Symbol" @@ -3237,7 +3209,7 @@ msgstr "照相機中的檔案" #: dlls/gphoto2.ds/gphoto2.rc:34 msgid "Import Selected" -msgstr "匯入選擇的檔案" +msgstr "匯入已選取檔案" #: dlls/gphoto2.ds/gphoto2.rc:35 msgid "Preview" @@ -3265,7 +3237,7 @@ msgstr "正在傳輸... 請稍候" #: dlls/gphoto2.ds/gphoto2.rc:51 msgid "Connecting to camera" -msgstr "連接照相機" +msgstr "正在連接照相機" #: dlls/gphoto2.ds/gphoto2.rc:55 msgid "Connecting to camera... Please Wait" @@ -3278,11 +3250,11 @@ msgstr "同步(&Y)" #: dlls/hhctrl.ocx/hhctrl.rc:60 dlls/hhctrl.ocx/hhctrl.rc:73 #: dlls/shdoclc/shdoclc.rc:41 programs/winhlp32/winhlp32.rc:89 msgid "&Back" -msgstr "返回(&B)" +msgstr "上一頁(&B)" #: dlls/hhctrl.ocx/hhctrl.rc:61 dlls/hhctrl.ocx/hhctrl.rc:74 msgid "&Forward" -msgstr "向前" +msgstr "下一頁(&F)" #: dlls/hhctrl.ocx/hhctrl.rc:62 msgctxt "table of contents" @@ -3314,10 +3286,8 @@ msgid "&View Source" msgstr "檢視原始碼(&V)" #: dlls/hhctrl.ocx/hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "屬性" +msgstr "內容(&T)" #: dlls/hhctrl.ocx/hhctrl.rc:87 dlls/shdoclc/shdoclc.rc:79 #: dlls/shdoclc/shdoclc.rc:93 dlls/shdoclc/shdoclc.rc:117 @@ -3388,7 +3358,7 @@ msgstr "重新整理" #: dlls/hhctrl.ocx/hhctrl.rc:46 dlls/ieframe/ieframe.rc:66 msgid "Back" -msgstr "返回" +msgstr "上一頁" #: dlls/hhctrl.ocx/hhctrl.rc:47 msgctxt "table of contents" @@ -3406,7 +3376,7 @@ msgstr "選項" #: dlls/hhctrl.ocx/hhctrl.rc:51 dlls/ieframe/ieframe.rc:67 msgid "Forward" -msgstr "向前" +msgstr "下一頁" #: dlls/iccvid/iccvid.rc:28 dlls/iccvid/iccvid.rc:29 msgid "Cinepak Video codec" @@ -3438,7 +3408,7 @@ msgstr "開啟(&O)..." #: dlls/ieframe/ieframe.rc:36 programs/notepad/notepad.rc:33 #: programs/wordpad/wordpad.rc:34 msgid "Save &as..." -msgstr "另存為(&A)..." +msgstr "另存新檔(&A)..." #: dlls/ieframe/ieframe.rc:38 msgid "Print &format..." @@ -3478,7 +3448,7 @@ msgstr "關於 Internet Explorer(&A)" #: dlls/ieframe/ieframe.rc:90 msgid "Open URL" -msgstr "開啟連結(&O)" +msgstr "開啟連結" #: dlls/ieframe/ieframe.rc:93 msgid "Specify the URL you wish to open in Internet Explorer" @@ -3486,7 +3456,7 @@ msgstr "指定您希望在 Internet Explorer 中開啟的網址" #: dlls/ieframe/ieframe.rc:94 msgid "Open:" -msgstr "開啟：" +msgstr "開啟:" #: dlls/ieframe/ieframe.rc:70 msgctxt "home page" @@ -3539,11 +3509,11 @@ msgstr "空白頁面(&B)" #: dlls/inetcpl.cpl/inetcpl.rc:56 msgid "Browsing history" -msgstr "瀏覽歷程" +msgstr "瀏覽歷程記錄" #: dlls/inetcpl.cpl/inetcpl.rc:57 msgid "You can delete cached pages, cookies and other data." -msgstr "您可以刪除網頁快取、訊餅和其他資料。" +msgstr "您可以刪除網頁快取、Cookie 以及其他資料。" #: dlls/inetcpl.cpl/inetcpl.rc:59 msgid "Delete &files..." @@ -3555,7 +3525,7 @@ msgstr "設定(&S)..." #: dlls/inetcpl.cpl/inetcpl.rc:68 msgid "Delete browsing history" -msgstr "刪除瀏覽歷程" +msgstr "刪除瀏覽歷程記錄" #: dlls/inetcpl.cpl/inetcpl.rc:71 msgid "" @@ -3571,7 +3541,7 @@ msgid "" "Files saved on your computer by websites, which store things like user " "preferences and login information." msgstr "" -"訊餅\n" +"Cookies\n" "由網站儲存於您電腦的檔案，其存有諸如使用者偏好設定和登入資訊。" #: dlls/inetcpl.cpl/inetcpl.rc:75 @@ -3579,7 +3549,7 @@ msgid "" "History\n" "List of websites you have accessed." msgstr "" -"歷程\n" +"歷程記錄\n" "您曾存取過的網站清單。" #: dlls/inetcpl.cpl/inetcpl.rc:77 @@ -3606,7 +3576,7 @@ msgstr "刪除" msgid "" "Certificates are used for your personal identification and to identify " "certificate authorities and publishers." -msgstr "憑證是做為您的個人識別，以及識別憑證授權機構和發行者。" +msgstr "憑證是用於您的個人識別，以及識別憑證授權單位和發行者。" #: dlls/inetcpl.cpl/inetcpl.rc:114 msgid "Certificates..." @@ -3617,46 +3587,36 @@ msgid "Publishers..." msgstr "發行者..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "區域網路連線" +msgstr "連線" #: dlls/inetcpl.cpl/inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 設定" +msgstr "自動設定" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "使用 Web Proxy Auto-Discovery (WPAD)" #: dlls/inetcpl.cpl/inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "使用 Proxy Auto-Config (PAC) 指令碼" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "位址" +msgstr "位址:" #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "本機伺服器(&L)" +msgstr "代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "使用代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "無連接埠" +msgstr "連接埠:" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3668,7 +3628,7 @@ msgstr "設定 Wine 網際網路瀏覽器和相關的設定。" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "區域的安全設定：" +msgstr "此區域的安全設定: " #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3680,7 +3640,7 @@ msgstr "非常低" #: dlls/inetcpl.cpl/inetcpl.rc:36 dlls/wininet/wininet.rc:42 msgid "Low" -msgstr "慢" +msgstr "低" #: dlls/inetcpl.cpl/inetcpl.rc:37 msgid "Medium" @@ -3688,7 +3648,7 @@ msgstr "中" #: dlls/inetcpl.cpl/inetcpl.rc:38 msgid "Increased" -msgstr "已增加" +msgstr "稍高" #: dlls/inetcpl.cpl/inetcpl.rc:39 dlls/wininet/wininet.rc:41 msgid "High" @@ -3703,30 +3663,24 @@ msgid "&Disable" msgstr "停用(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "重置" +msgstr "重設(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "啟用(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "編輯覆載設定" +msgstr "覆寫(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" -msgstr "已連線" +msgstr "已連接" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "語音輸入裝置：" +msgstr "已連接 (xinput 裝置)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3736,7 +3690,7 @@ msgstr "已停用" msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." -msgstr "停用或啟用裝置之後，已連線的搖桿將無法更新，直到您重新啟動這個小程式。" +msgstr "停用或啟用裝置之後，已連接的搖桿將無法更新，直到您重新啟動這個程式。" #: dlls/joy.cpl/joy.rc:55 msgid "Test Joystick" @@ -3759,8 +3713,8 @@ msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" -"請按下控制器中的任何按鈕以啟用所選的效果。效果的方向可以利用控制器的軸向來變" -"更。" +"請按下控制器中的任何按鈕以啟用所選的效果。" +"效果的方向可以利用控制器的軸向來變更。" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers" @@ -3768,7 +3722,7 @@ msgstr "遊戲控制器" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "測試和設定遊戲控制器。" #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3783,10 +3737,8 @@ msgid "Subscript out of range" msgstr "註標超出範圍" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "無紙；" +msgstr "堆疊空間不足" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3802,7 +3754,7 @@ msgstr "物件不支援這個屬性或方法" #: dlls/jscript/jscript.rc:35 dlls/vbscript/vbscript.rc:50 msgid "Object doesn't support this action" -msgstr "物件不支援此動作" +msgstr "物件不支援這個動作" #: dlls/jscript/jscript.rc:36 msgid "Argument not optional" @@ -3814,27 +3766,23 @@ msgstr "語法錯誤" #: dlls/jscript/jscript.rc:38 msgid "Expected ';'" -msgstr "預期為 ;" +msgstr "預期為 ';'" #: dlls/jscript/jscript.rc:39 msgid "Expected '('" -msgstr "預期為 (" +msgstr "預期為 '('" #: dlls/jscript/jscript.rc:40 msgid "Expected ')'" -msgstr "預期為 )" +msgstr "預期為 ')'" #: dlls/jscript/jscript.rc:41 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "主體金鑰識別碼" +msgstr "預期為識別碼" #: dlls/jscript/jscript.rc:42 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "預期為 ;" +msgstr "預期為 '='" #: dlls/jscript/jscript.rc:43 msgid "Invalid character" @@ -3846,15 +3794,15 @@ msgstr "未終結的字串常數" #: dlls/jscript/jscript.rc:45 msgid "'return' statement outside of function" -msgstr "return 敘述位於函式之外" +msgstr "'return' 敘述位於函式之外" #: dlls/jscript/jscript.rc:46 msgid "Can't have 'break' outside of loop" -msgstr "在迴圈之外不可有 break" +msgstr "在迴圈之外不可有 'break'" #: dlls/jscript/jscript.rc:47 msgid "Can't have 'continue' outside of loop" -msgstr "在迴圈之外不可有 continue" +msgstr "在迴圈之外不可有 'continue'" #: dlls/jscript/jscript.rc:48 msgid "Label redefined" @@ -3865,38 +3813,32 @@ msgid "Label not found" msgstr "找不到標貼" #: dlls/jscript/jscript.rc:50 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "預期為 ;" +msgstr "預期為 '@end'" #: dlls/jscript/jscript.rc:51 msgid "Conditional compilation is turned off" -msgstr "條件編譯已被關閉" +msgstr "條件編譯已關閉" #: dlls/jscript/jscript.rc:52 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "預期為 ;" +msgstr "預期為 '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript 編譯錯誤" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 執行期錯誤" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "未知錯誤" +msgstr "不明執行期錯誤" #: dlls/jscript/jscript.rc:55 msgid "Number expected" -msgstr "預期為編號" +msgstr "預期為數字" #: dlls/jscript/jscript.rc:53 msgid "Function expected" @@ -3904,7 +3846,7 @@ msgstr "預期為函式" #: dlls/jscript/jscript.rc:54 msgid "'[object]' is not a date object" -msgstr "[object] 並非日期物件" +msgstr "'[object]' 並非日期物件" #: dlls/jscript/jscript.rc:56 msgid "Object expected" @@ -3916,11 +3858,11 @@ msgstr "不合法的指派" #: dlls/jscript/jscript.rc:58 msgid "'|' is undefined" -msgstr "| 未定義" +msgstr "'|' 未定義" #: dlls/jscript/jscript.rc:59 msgid "Boolean object expected" -msgstr "預期為布林物件" +msgstr "預期為布林值物件" #: dlls/jscript/jscript.rc:60 msgid "Cannot delete '|'" @@ -3935,16 +3877,12 @@ msgid "JScript object expected" msgstr "預期為 JScript 物件" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "預期為陣列物件" +msgstr "預期為列舉器物件" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "預期為布林物件" +msgstr "預期為正規表示式" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3952,7 +3890,7 @@ msgstr "正規表示式語法發生錯誤" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "發生異常且未被捕捉" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -3982,33 +3920,31 @@ msgstr "預期為陣列物件" msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" -msgstr "" +msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 'true'" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "無法定義屬性 '|': 物件不能擴展" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "無法重新定義不可設定的屬性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "[object] 並非日期物件" +msgstr "'this' 不是 Map 物件" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "屬性不可同時有存取子和值" #: include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine 核心 DLL" #: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32 #: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137 @@ -4041,7 +3977,7 @@ msgstr "存取被拒。\n" #: dlls/kernel32/winerror.mc:58 msgid "Invalid handle.\n" -msgstr "無效的控柄。\n" +msgstr "無效的控制代碼。\n" #: dlls/kernel32/winerror.mc:63 msgid "Memory trashed.\n" @@ -4057,11 +3993,11 @@ msgstr "無效的區塊。\n" #: dlls/kernel32/winerror.mc:78 msgid "Bad environment.\n" -msgstr "不當的環境。\n" +msgstr "不良的環境。\n" #: dlls/kernel32/winerror.mc:83 msgid "Bad format.\n" -msgstr "不當的格式。\n" +msgstr "錯誤的格式。\n" #: dlls/kernel32/winerror.mc:88 msgid "Invalid access.\n" @@ -4081,7 +4017,7 @@ msgstr "無效的儲存裝置。\n" #: dlls/kernel32/winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "無法刪除現行目錄。\n" +msgstr "無法刪除目前的目錄。\n" #: dlls/kernel32/winerror.mc:113 msgid "Not same device.\n" @@ -4089,15 +4025,15 @@ msgstr "並非相同裝置。\n" #: dlls/kernel32/winerror.mc:118 msgid "No more files.\n" -msgstr "沒有檔案了。\n" +msgstr "沒有更多檔案。\n" #: dlls/kernel32/winerror.mc:123 msgid "Write protected.\n" -msgstr "防止寫入的。\n" +msgstr "已設定寫入保護。\n" #: dlls/kernel32/winerror.mc:128 msgid "Bad unit.\n" -msgstr "不當的單位。\n" +msgstr "錯誤的單位。\n" #: dlls/kernel32/winerror.mc:133 msgid "Not ready.\n" @@ -4105,7 +4041,7 @@ msgstr "未就緒。\n" #: dlls/kernel32/winerror.mc:138 msgid "Bad command.\n" -msgstr "不當的命令。\n" +msgstr "錯誤的命令。\n" #: dlls/kernel32/winerror.mc:143 msgid "CRC error.\n" @@ -4113,7 +4049,7 @@ msgstr "循環冗餘檢查錯誤。\n" #: dlls/kernel32/winerror.mc:148 msgid "Bad length.\n" -msgstr "不當長度。\n" +msgstr "長度錯誤。\n" #: dlls/kernel32/winerror.mc:153 dlls/kernel32/winerror.mc:528 msgid "Seek error.\n" @@ -4181,7 +4117,7 @@ msgstr "重複的網路名稱。\n" #: dlls/kernel32/winerror.mc:233 msgid "Bad network path.\n" -msgstr "不當的網路路徑。\n" +msgstr "錯誤的網路路徑。\n" #: dlls/kernel32/winerror.mc:238 msgid "Network busy.\n" @@ -4197,11 +4133,11 @@ msgstr "太多命令。\n" #: dlls/kernel32/winerror.mc:253 msgid "Adapter hardware error.\n" -msgstr "調適器硬體錯誤。\n" +msgstr "介面卡硬體錯誤。\n" #: dlls/kernel32/winerror.mc:258 msgid "Bad network response.\n" -msgstr "不當的網路回應。\n" +msgstr "不良的網路回應。\n" #: dlls/kernel32/winerror.mc:263 msgid "Unexpected network error.\n" @@ -4209,7 +4145,7 @@ msgstr "未預期的網路錯誤。\n" #: dlls/kernel32/winerror.mc:268 msgid "Bad remote adapter.\n" -msgstr "不當的遠端調適器。\n" +msgstr "不良的遠端介面卡。\n" #: dlls/kernel32/winerror.mc:273 msgid "Print queue full.\n" @@ -4233,11 +4169,11 @@ msgstr "存取網路被拒絕。\n" #: dlls/kernel32/winerror.mc:298 msgid "Bad device type.\n" -msgstr "不當的裝置類型。\n" +msgstr "錯誤的裝置類型。\n" #: dlls/kernel32/winerror.mc:303 msgid "Bad network name.\n" -msgstr "不當的網路名稱。\n" +msgstr "錯誤的網路名稱。\n" #: dlls/kernel32/winerror.mc:308 msgid "Too many network names.\n" @@ -4245,7 +4181,7 @@ msgstr "太多網路名稱。\n" #: dlls/kernel32/winerror.mc:313 msgid "Too many network sessions.\n" -msgstr "太多網路執行期間。\n" +msgstr "太多網路工作階段。\n" #: dlls/kernel32/winerror.mc:318 msgid "Sharing paused.\n" @@ -4293,23 +4229,23 @@ msgstr "網路寫入錯誤。\n" #: dlls/kernel32/winerror.mc:373 msgid "No process slots.\n" -msgstr "沒有行程插槽。\n" +msgstr "沒有線程插槽。\n" #: dlls/kernel32/winerror.mc:378 msgid "Too many semaphores.\n" -msgstr "太多號誌。\n" +msgstr "太多旗號。\n" #: dlls/kernel32/winerror.mc:383 msgid "Exclusive semaphore already owned.\n" -msgstr "已擁有互斥號誌。\n" +msgstr "已擁有專屬旗號。\n" #: dlls/kernel32/winerror.mc:388 msgid "Semaphore is set.\n" -msgstr "已設定號誌。\n" +msgstr "已設定旗號。\n" #: dlls/kernel32/winerror.mc:393 msgid "Too many semaphore requests.\n" -msgstr "太多號誌要求。\n" +msgstr "太多旗號要求。\n" #: dlls/kernel32/winerror.mc:398 msgid "Invalid at interrupt time.\n" @@ -4317,11 +4253,11 @@ msgstr "於插斷時間無效。\n" #: dlls/kernel32/winerror.mc:403 msgid "Semaphore owner died.\n" -msgstr "號誌擁有者已死。\n" +msgstr "旗號擁有者已終止。\n" #: dlls/kernel32/winerror.mc:408 msgid "Semaphore user limit.\n" -msgstr "號誌使用者限制。\n" +msgstr "旗號使用者限制。\n" #: dlls/kernel32/winerror.mc:413 msgid "Insert disk for drive %1.\n" @@ -4329,7 +4265,7 @@ msgstr "插入磁碟於儲存裝置 %1。\n" #: dlls/kernel32/winerror.mc:418 msgid "Drive locked.\n" -msgstr "已鎖定儲存裝置。\n" +msgstr "儲存裝置已鎖定。\n" #: dlls/kernel32/winerror.mc:423 msgid "Broken pipe.\n" @@ -4345,11 +4281,11 @@ msgstr "緩衝區溢位。\n" #: dlls/kernel32/winerror.mc:443 msgid "No more search handles.\n" -msgstr "沒有搜尋控柄了。\n" +msgstr "沒有更多搜尋控制代碼。\n" #: dlls/kernel32/winerror.mc:448 msgid "Invalid target handle.\n" -msgstr "無效的目標控柄。\n" +msgstr "無效的目標控制代碼。\n" #: dlls/kernel32/winerror.mc:453 msgid "Invalid IOCTL.\n" @@ -4369,7 +4305,7 @@ msgstr "呼叫尚未實作。\n" #: dlls/kernel32/winerror.mc:473 msgid "Semaphore timeout.\n" -msgstr "號誌逾時。\n" +msgstr "旗號逾時。\n" #: dlls/kernel32/winerror.mc:478 msgid "Insufficient buffer.\n" @@ -4385,7 +4321,7 @@ msgstr "無效的層級。\n" #: dlls/kernel32/winerror.mc:493 msgid "No volume label.\n" -msgstr "沒有卷冊標貼。\n" +msgstr "沒有磁碟區標籤。\n" #: dlls/kernel32/winerror.mc:498 msgid "Module not found.\n" @@ -4405,7 +4341,7 @@ msgstr "子行程還未完成。\n" #: dlls/kernel32/winerror.mc:518 msgid "Invalid use of direct access handle.\n" -msgstr "直接存取控柄的使用無效。\n" +msgstr "直接存取控制代碼的使用無效。\n" #: dlls/kernel32/winerror.mc:523 msgid "Negative seek.\n" @@ -4433,19 +4369,19 @@ msgstr "儲存裝置未被 SUBST。\n" #: dlls/kernel32/winerror.mc:558 msgid "Attempt to JOIN onto a JOINed drive.\n" -msgstr "試圖 JOIN 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:563 msgid "Attempt to SUBST onto a SUBSTed drive.\n" -msgstr "試圖 SUBST 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:568 msgid "Attempt to JOIN to a SUBSTed drive.\n" -msgstr "試圖 JOIN 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:573 msgid "Attempt to SUBST to a JOINed drive.\n" -msgstr "試圖 SUBST 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:578 msgid "Drive is busy.\n" @@ -4489,7 +4425,7 @@ msgstr "用於 DosMuxSemWait 的事件計數不正確。\n" #: dlls/kernel32/winerror.mc:628 msgid "Too many waiters for DosMuxSemWait.\n" -msgstr "太多 DosMuxSemWait 的等待者。\n" +msgstr "太多 DosMuxSemWait 的等待項。\n" #: dlls/kernel32/winerror.mc:633 msgid "DosSemMuxWait list invalid.\n" @@ -4497,11 +4433,11 @@ msgstr "DosSemMuxWait 清單無效。\n" #: dlls/kernel32/winerror.mc:638 msgid "Volume label too long.\n" -msgstr "卷冊標貼太長。\n" +msgstr "磁碟區標籤太長。\n" #: dlls/kernel32/winerror.mc:643 msgid "Too many TCBs.\n" -msgstr "太多 TCBs。\n" +msgstr "太多 TCB。\n" #: dlls/kernel32/winerror.mc:648 msgid "Signal refused.\n" @@ -4517,11 +4453,11 @@ msgstr "無法鎖定資料段。\n" #: dlls/kernel32/winerror.mc:663 msgid "Bad thread ID address.\n" -msgstr "不當的執行緒識別號位址。\n" +msgstr "錯誤的執行緒識別碼位址。\n" #: dlls/kernel32/winerror.mc:668 msgid "Bad arguments to DosExecPgm.\n" -msgstr "不當的 DosExecPgm 引數。\n" +msgstr "錯誤的 DosExecPgm 引數。\n" #: dlls/kernel32/winerror.mc:673 msgid "Path is invalid.\n" @@ -4569,7 +4505,7 @@ msgstr "無效的旗標號碼。\n" #: dlls/kernel32/winerror.mc:728 msgid "Semaphore name not found.\n" -msgstr "找不到號誌名稱。\n" +msgstr "找不到旗號名稱。\n" #: dlls/kernel32/winerror.mc:733 msgid "Invalid starting code segment for %1.\n" @@ -4593,7 +4529,7 @@ msgstr "EXE %1 被標記為無效。\n" #: dlls/kernel32/winerror.mc:758 msgid "Bad EXE format for %1.\n" -msgstr "%1 的不當 EXE 格式。\n" +msgstr "%1 是錯誤的 EXE 格式。\n" #: dlls/kernel32/winerror.mc:763 msgid "Iterated data exceeds 64k in %1.\n" @@ -4673,19 +4609,19 @@ msgstr "不允許巢狀 LoadModule 呼叫。\n" #: dlls/kernel32/winerror.mc:858 msgid "Machine type mismatch.\n" -msgstr "機器型態不匹配。\n" +msgstr "機器類型不相符。\n" #: dlls/kernel32/winerror.mc:863 msgid "Bad pipe.\n" -msgstr "不當的管線。\n" +msgstr "錯誤的管線。\n" #: dlls/kernel32/winerror.mc:868 msgid "Pipe busy.\n" -msgstr "管線忙碌。\n" +msgstr "管線忙碌中。\n" #: dlls/kernel32/winerror.mc:873 msgid "Pipe closed.\n" -msgstr "管線關閉。\n" +msgstr "管線已關閉。\n" #: dlls/kernel32/winerror.mc:878 msgid "Pipe not connected.\n" @@ -4693,11 +4629,11 @@ msgstr "管線未連接。\n" #: dlls/kernel32/winerror.mc:883 msgid "More data available.\n" -msgstr "更多資料可用。\n" +msgstr "有更多可用資料。\n" #: dlls/kernel32/winerror.mc:888 msgid "Session canceled.\n" -msgstr "已取消工作階段。\n" +msgstr "工作階段已取消。\n" #: dlls/kernel32/winerror.mc:893 msgid "Invalid extended attribute name.\n" @@ -4733,7 +4669,7 @@ msgstr "進階屬性表格已滿。\n" #: dlls/kernel32/winerror.mc:933 msgid "Invalid extended attribute handle.\n" -msgstr "無效的進階屬性控柄。\n" +msgstr "無效的進階屬性控制代碼。\n" #: dlls/kernel32/winerror.mc:938 msgid "Extended attributes not supported.\n" @@ -4745,7 +4681,7 @@ msgstr "Mutex 非由呼叫者所擁有。\n" #: dlls/kernel32/winerror.mc:948 msgid "Too many posts to semaphore.\n" -msgstr "號誌太多貼文。\n" +msgstr "旗號太多貼文。\n" #: dlls/kernel32/winerror.mc:953 msgid "Read/WriteProcessMemory partially completed.\n" @@ -4753,7 +4689,7 @@ msgstr "讀取/寫入行程記憶體已部分完成。\n" #: dlls/kernel32/winerror.mc:958 msgid "The oplock wasn't granted.\n" -msgstr "未被授與 oplock。\n" +msgstr "未授權 oplock。\n" #: dlls/kernel32/winerror.mc:963 msgid "Invalid oplock message received.\n" @@ -4821,7 +4757,7 @@ msgstr "無效的旗標。\n" #: dlls/kernel32/winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "無法辨識的卷冊。\n" +msgstr "無法辨識的磁碟區。\n" #: dlls/kernel32/winerror.mc:1048 msgid "File invalid.\n" @@ -4833,7 +4769,7 @@ msgstr "無法全螢幕運行。\n" #: dlls/kernel32/winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "不存在的字組。\n" +msgstr "不存在的權杖。\n" #: dlls/kernel32/winerror.mc:1063 msgid "Registry corrupt.\n" @@ -4885,7 +4821,7 @@ msgstr "註冊表索引鍵有子項。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子項必須是易變的。\n" +msgstr "子項必須是可變的。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -4937,7 +4873,7 @@ msgstr "服務無法接受控制訊息。\n" #: dlls/kernel32/winerror.mc:1188 msgid "Service not active.\n" -msgstr "服務現未啟用。\n" +msgstr "服務尚未啟用。\n" #: dlls/kernel32/winerror.mc:1193 msgid "Service controller connect failed.\n" @@ -4985,7 +4921,7 @@ msgstr "服務已存在。\n" #: dlls/kernel32/winerror.mc:1248 msgid "System running last-known-good config.\n" -msgstr "系統執行最後已知正常的組配。\n" +msgstr "系統執行最近已知正常的組配。\n" #: dlls/kernel32/winerror.mc:1253 msgid "Service dependency deleted.\n" @@ -4993,11 +4929,11 @@ msgstr "服務相依性已刪除。\n" #: dlls/kernel32/winerror.mc:1258 msgid "Boot already accepted as last-good config.\n" -msgstr "開機已被接受為最後正常的組配。\n" +msgstr "開機已接受為上次正常的組配。\n" #: dlls/kernel32/winerror.mc:1263 msgid "Service not started since last boot.\n" -msgstr "服務自從最後一次開機即無法啟動。\n" +msgstr "服務自上次開機之後尚未啟動。\n" #: dlls/kernel32/winerror.mc:1268 msgid "Duplicate service name.\n" @@ -5013,11 +4949,11 @@ msgstr "無法偵測到驅動程式的失敗。\n" #: dlls/kernel32/winerror.mc:1283 msgid "Process abort cannot be detected.\n" -msgstr "無法偵測到行程中止。\n" +msgstr "無法偵測到處理程序中止。\n" #: dlls/kernel32/winerror.mc:1288 msgid "No recovery program for service.\n" -msgstr "沒有復原程式用於服務。\n" +msgstr "服務沒有復原程式。\n" #: dlls/kernel32/winerror.mc:1293 msgid "Service not implemented by exe.\n" @@ -5053,7 +4989,7 @@ msgstr "無效的區塊長度。\n" #: dlls/kernel32/winerror.mc:1333 msgid "Device not partitioned.\n" -msgstr "裝置未設分割區。\n" +msgstr "裝置未設定分割區。\n" #: dlls/kernel32/winerror.mc:1338 msgid "Unable to lock media.\n" @@ -5080,8 +5016,6 @@ msgid "No Unicode translation.\n" msgstr "沒有萬國碼轉譯。\n" #: dlls/kernel32/winerror.mc:1368 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "動態連結函式庫初始失敗。\n" @@ -5115,7 +5049,7 @@ msgstr "序列 I/O 計數器逾時。\n" #: dlls/kernel32/winerror.mc:1408 msgid "Floppy ID address mark not found.\n" -msgstr "找不到軟碟識別號位址標記。\n" +msgstr "找不到軟碟識別碼位址標記。\n" #: dlls/kernel32/winerror.mc:1413 msgid "Floppy reports wrong cylinder.\n" @@ -5123,7 +5057,7 @@ msgstr "軟碟回報錯誤的磁柱。\n" #: dlls/kernel32/winerror.mc:1418 msgid "Unknown floppy error.\n" -msgstr "未知的軟碟錯誤。\n" +msgstr "不明的軟碟錯誤。\n" #: dlls/kernel32/winerror.mc:1423 msgid "Floppy registers inconsistent.\n" @@ -5167,7 +5101,7 @@ msgstr "設定電源狀態失敗。\n" #: dlls/kernel32/winerror.mc:1473 msgid "Too many links.\n" -msgstr "太多鏈結。\n" +msgstr "太多連結。\n" #: dlls/kernel32/winerror.mc:1478 msgid "Newer Windows version needed.\n" @@ -5203,7 +5137,7 @@ msgstr "找不到 DLL 檔。\n" #: dlls/kernel32/winerror.mc:1518 msgid "Out of user handles.\n" -msgstr "超出使用者控柄。\n" +msgstr "超出使用者控制代碼。\n" #: dlls/kernel32/winerror.mc:1523 msgid "Message can only be used in synchronous calls.\n" @@ -5231,7 +5165,7 @@ msgstr "裝置需要重新初始化。\n" #: dlls/kernel32/winerror.mc:1553 msgid "The device requires cleaning.\n" -msgstr "裝置需要清潔。\n" +msgstr "裝置需要清理。\n" #: dlls/kernel32/winerror.mc:1558 msgid "The device door is open.\n" @@ -5259,11 +5193,11 @@ msgstr "找不到點。\n" #: dlls/kernel32/winerror.mc:1588 msgid "No running tracking service.\n" -msgstr "沒在執行追蹤服務。\n" +msgstr "沒有執行中的追蹤服務。\n" #: dlls/kernel32/winerror.mc:1593 msgid "No such volume ID.\n" -msgstr "沒有此類卷冊識別號。\n" +msgstr "沒有此類磁碟區識別碼。\n" #: dlls/kernel32/winerror.mc:1598 msgid "Unable to remove the file to be replaced.\n" @@ -5283,11 +5217,11 @@ msgstr "正在刪除日誌。\n" #: dlls/kernel32/winerror.mc:1618 msgid "The journal is not active.\n" -msgstr "日誌現未啟用。\n" +msgstr "日誌尚未啟用。\n" #: dlls/kernel32/winerror.mc:1623 msgid "Potential matching file found.\n" -msgstr "找到可能的匹配檔案。\n" +msgstr "找到可能的相符檔案。\n" #: dlls/kernel32/winerror.mc:1628 msgid "The journal entry was deleted.\n" @@ -5299,7 +5233,7 @@ msgstr "無效的裝置名稱。\n" #: dlls/kernel32/winerror.mc:1638 msgid "Connection unavailable.\n" -msgstr "連接不得使用。\n" +msgstr "連接無法使用。\n" #: dlls/kernel32/winerror.mc:1643 msgid "Device already remembered.\n" @@ -5307,7 +5241,7 @@ msgstr "裝置已被記住。\n" #: dlls/kernel32/winerror.mc:1648 msgid "No network or bad path.\n" -msgstr "沒有網路或不當的路徑。\n" +msgstr "沒有網路或錯誤的路徑。\n" #: dlls/kernel32/winerror.mc:1653 msgid "Invalid network provider name.\n" @@ -5315,11 +5249,11 @@ msgstr "無效的網路提供者名稱。\n" #: dlls/kernel32/winerror.mc:1658 msgid "Cannot open network connection profile.\n" -msgstr "無法開啟網路連線側寫檔。\n" +msgstr "無法開啟網路連線設定檔。\n" #: dlls/kernel32/winerror.mc:1663 msgid "Corrupt network connection profile.\n" -msgstr "損壞的網路連線側寫檔。\n" +msgstr "損壞的網路連線設定檔。\n" #: dlls/kernel32/winerror.mc:1668 msgid "Not a container.\n" @@ -5327,7 +5261,7 @@ msgstr "不是一個容器。\n" #: dlls/kernel32/winerror.mc:1673 msgid "Extended error.\n" -msgstr "進階錯誤。\n" +msgstr "延伸錯誤。\n" #: dlls/kernel32/winerror.mc:1678 msgid "Invalid group name.\n" @@ -5367,11 +5301,11 @@ msgstr "無效的訊息目的地。\n" #: dlls/kernel32/winerror.mc:1728 msgid "Session credential conflict.\n" -msgstr "作業階段憑據發生衝突。\n" +msgstr "工作階段憑據發生衝突。\n" #: dlls/kernel32/winerror.mc:1733 msgid "Remote session limit exceeded.\n" -msgstr "已超出遠端作業階段限制。\n" +msgstr "已超出遠端工作階段限制。\n" #: dlls/kernel32/winerror.mc:1738 msgid "Duplicate domain or workgroup name.\n" @@ -5395,7 +5329,7 @@ msgstr "連線被拒。\n" #: dlls/kernel32/winerror.mc:1763 msgid "Connection gracefully closed.\n" -msgstr "已平順關閉連接。\n" +msgstr "已順利關閉連線。\n" #: dlls/kernel32/winerror.mc:1768 msgid "Address already associated with transport endpoint.\n" @@ -5411,23 +5345,23 @@ msgstr "連線無效。\n" #: dlls/kernel32/winerror.mc:1783 msgid "Connection is active.\n" -msgstr "連接現正使用。\n" +msgstr "連線現正使用。\n" #: dlls/kernel32/winerror.mc:1788 msgid "Network unreachable.\n" -msgstr "無法連線網路。\n" +msgstr "網路無法連線。\n" #: dlls/kernel32/winerror.mc:1793 msgid "Host unreachable.\n" -msgstr "無法連線主機。\n" +msgstr "主機無法連線。\n" #: dlls/kernel32/winerror.mc:1798 msgid "Protocol unreachable.\n" -msgstr "無法連線協定。\n" +msgstr "協定無法連線。\n" #: dlls/kernel32/winerror.mc:1803 msgid "Port unreachable.\n" -msgstr "無法連線通訊埠。\n" +msgstr "通訊埠無法連線。\n" #: dlls/kernel32/winerror.mc:1808 msgid "Request aborted.\n" @@ -5435,7 +5369,7 @@ msgstr "已放棄要求。\n" #: dlls/kernel32/winerror.mc:1813 msgid "Connection aborted.\n" -msgstr "已放棄連接。\n" +msgstr "已放棄連線。\n" #: dlls/kernel32/winerror.mc:1818 msgid "Please retry operation.\n" @@ -5471,7 +5405,7 @@ msgstr "使用者未被認證。\n" #: dlls/kernel32/winerror.mc:1858 msgid "User not logged on.\n" -msgstr "使用者未被記錄。\n" +msgstr "使用者未登入。\n" #: dlls/kernel32/winerror.mc:1863 msgid "Continue work in progress.\n" @@ -5503,7 +5437,7 @@ msgstr "即使沒有變更任何東西時也進行作業。\n" #: dlls/kernel32/winerror.mc:1898 msgid "The user profile is invalid.\n" -msgstr "使用者側寫檔無效。\n" +msgstr "使用者設定檔無效。\n" #: dlls/kernel32/winerror.mc:1903 msgid "Not supported on Small Business Server.\n" @@ -5515,7 +5449,7 @@ msgstr "並非所有權限都被指派。\n" #: dlls/kernel32/winerror.mc:1913 msgid "Some security IDs not mapped.\n" -msgstr "某些安全識別號未對應。\n" +msgstr "某些安全識別碼未對應。\n" #: dlls/kernel32/winerror.mc:1918 msgid "No quotas for account.\n" @@ -5547,7 +5481,7 @@ msgstr "無效的主要群組。\n" #: dlls/kernel32/winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "沒有假冒字組。\n" +msgstr "沒有模擬權杖。\n" #: dlls/kernel32/winerror.mc:1958 msgid "Can't disable mandatory group.\n" @@ -5555,11 +5489,11 @@ msgstr "無法停用必要群組。\n" #: dlls/kernel32/winerror.mc:1963 msgid "No logon servers available.\n" -msgstr "沒有可用的登錄伺服器。\n" +msgstr "沒有可用的登入伺服器。\n" #: dlls/kernel32/winerror.mc:1968 msgid "No such logon session.\n" -msgstr "沒有此類登錄作業階段。\n" +msgstr "沒有此類登入工作階段。\n" #: dlls/kernel32/winerror.mc:1973 msgid "No such privilege.\n" @@ -5623,7 +5557,7 @@ msgstr "帳號限制。\n" #: dlls/kernel32/winerror.mc:2048 msgid "Invalid logon hours.\n" -msgstr "無效的登錄時數。\n" +msgstr "無效的登入時數。\n" #: dlls/kernel32/winerror.mc:2053 msgid "Invalid workstation.\n" @@ -5639,7 +5573,7 @@ msgstr "帳號已停用。\n" #: dlls/kernel32/winerror.mc:2068 msgid "No security ID mapped.\n" -msgstr "沒有對應的安全識別號。\n" +msgstr "沒有對應的安全識別碼。\n" #: dlls/kernel32/winerror.mc:2073 msgid "Too many LUIDs requested.\n" @@ -5667,7 +5601,7 @@ msgstr "無效的安全描述元。\n" #: dlls/kernel32/winerror.mc:2103 msgid "Bad inherited ACL.\n" -msgstr "不當繼承的 ACL。\n" +msgstr "錯誤繼承的 ACL。\n" #: dlls/kernel32/winerror.mc:2108 msgid "Server disabled.\n" @@ -5679,7 +5613,7 @@ msgstr "伺服器未停用。\n" #: dlls/kernel32/winerror.mc:2118 msgid "Invalid ID authority.\n" -msgstr "無效的識別號授權。\n" +msgstr "無效的識別碼授權。\n" #: dlls/kernel32/winerror.mc:2123 msgid "Allotted space exceeded.\n" @@ -5691,19 +5625,19 @@ msgstr "無效的群組屬性。\n" #: dlls/kernel32/winerror.mc:2133 msgid "Bad impersonation level.\n" -msgstr "不當的假冒等級。\n" +msgstr "錯誤的模擬等級。\n" #: dlls/kernel32/winerror.mc:2138 msgid "Can't open anonymous security token.\n" -msgstr "無法開啟匿名安全性代表字組。\n" +msgstr "無法開啟匿名的安全權杖。\n" #: dlls/kernel32/winerror.mc:2143 msgid "Bad validation class.\n" -msgstr "不當的驗證類別。\n" +msgstr "錯誤的驗證類別。\n" #: dlls/kernel32/winerror.mc:2148 msgid "Bad token type.\n" -msgstr "不當的字組型態。\n" +msgstr "錯誤的權杖類型。\n" #: dlls/kernel32/winerror.mc:2153 msgid "No security on object.\n" @@ -5751,15 +5685,15 @@ msgstr "通用存取類型未對應。\n" #: dlls/kernel32/winerror.mc:2208 msgid "Bad descriptor format.\n" -msgstr "不當的描述元格式。\n" +msgstr "錯誤的描述元格式。\n" #: dlls/kernel32/winerror.mc:2213 msgid "Not a logon process.\n" -msgstr "不是個登錄行程。\n" +msgstr "不是登入工作階段。\n" #: dlls/kernel32/winerror.mc:2218 msgid "Logon session ID exists.\n" -msgstr "登錄期間識別碼已存在。\n" +msgstr "登入工作階段識別碼已存在。\n" #: dlls/kernel32/winerror.mc:2223 msgid "Unknown authentication package.\n" @@ -5767,19 +5701,19 @@ msgstr "不明認證套件。\n" #: dlls/kernel32/winerror.mc:2228 msgid "Bad logon session state.\n" -msgstr "不當的登錄作業階段狀態。\n" +msgstr "錯誤的登入工作階段狀態。\n" #: dlls/kernel32/winerror.mc:2233 msgid "Logon session ID collision.\n" -msgstr "登錄期間識別碼產生碰撞。\n" +msgstr "登入工作階段識別碼發生衝突。\n" #: dlls/kernel32/winerror.mc:2238 msgid "Invalid logon type.\n" -msgstr "無效的登錄型態。\n" +msgstr "無效的登入類型。\n" #: dlls/kernel32/winerror.mc:2243 msgid "Cannot impersonate.\n" -msgstr "無法假冒。\n" +msgstr "無法模擬。\n" #: dlls/kernel32/winerror.mc:2248 msgid "Invalid transaction state.\n" @@ -5807,7 +5741,7 @@ msgstr "其為使用者的主要群組。\n" #: dlls/kernel32/winerror.mc:2278 msgid "Token already in use.\n" -msgstr "字組已使用中。\n" +msgstr "權杖已在使用中。\n" #: dlls/kernel32/winerror.mc:2283 msgid "No such local group.\n" @@ -5827,7 +5761,7 @@ msgstr "本地群組已存在。\n" #: dlls/kernel32/winerror.mc:2303 dlls/kernel32/winerror.mc:2328 msgid "Logon type not granted.\n" -msgstr "登錄型態未授與。\n" +msgstr "登錄類型未授與。\n" #: dlls/kernel32/winerror.mc:2308 msgid "Too many secrets.\n" @@ -5843,7 +5777,7 @@ msgstr "內部安全資料庫錯誤。\n" #: dlls/kernel32/winerror.mc:2323 msgid "Too many context IDs.\n" -msgstr "太多文脈識別號。\n" +msgstr "太多內容識別碼。\n" #: dlls/kernel32/winerror.mc:2333 msgid "Cross-encrypted NT password required.\n" @@ -5867,7 +5801,7 @@ msgstr "必須輸入交叉加密過的本機密碼。\n" #: dlls/kernel32/winerror.mc:2358 msgid "No inheritable components.\n" -msgstr "沒有可繼承的成分。\n" +msgstr "沒有可繼承的元件。\n" #: dlls/kernel32/winerror.mc:2363 msgid "File or directory corrupt.\n" @@ -5879,7 +5813,7 @@ msgstr "磁碟已損壞。\n" #: dlls/kernel32/winerror.mc:2373 msgid "No user session key.\n" -msgstr "沒有使用者作業階段金鑰。\n" +msgstr "沒有使用者工作階段金鑰。\n" #: dlls/kernel32/winerror.mc:2378 msgid "License quota exceeded.\n" @@ -5895,31 +5829,31 @@ msgstr "相互認證失敗。\n" #: dlls/kernel32/winerror.mc:2393 msgid "Time skew between client and server.\n" -msgstr "客戶端與伺服端的時間偏斜。\n" +msgstr "用戶端與伺服器的時間存在偏移。\n" #: dlls/kernel32/winerror.mc:2398 msgid "Invalid window handle.\n" -msgstr "無效的視窗控柄。\n" +msgstr "無效的視窗控制代碼。\n" #: dlls/kernel32/winerror.mc:2403 msgid "Invalid menu handle.\n" -msgstr "無效的選單控柄。\n" +msgstr "無效的選單控制代碼。\n" #: dlls/kernel32/winerror.mc:2408 msgid "Invalid cursor handle.\n" -msgstr "無效的游標控柄。\n" +msgstr "無效的游標控制代碼。\n" #: dlls/kernel32/winerror.mc:2413 msgid "Invalid accelerator table handle.\n" -msgstr "無效的加速功能表格控柄。\n" +msgstr "無效的加速功能表格控制代碼。\n" #: dlls/kernel32/winerror.mc:2418 msgid "Invalid hook handle.\n" -msgstr "無效的攔截控柄。\n" +msgstr "無效的勾點控制代碼。\n" #: dlls/kernel32/winerror.mc:2423 msgid "Invalid DWP handle.\n" -msgstr "無效的 DWP 控柄。\n" +msgstr "無效的 DWP 控制代碼。\n" #: dlls/kernel32/winerror.mc:2428 msgid "Can't create top-level child window.\n" @@ -5935,7 +5869,7 @@ msgstr "視窗由另外的執行緒所擁有。\n" #: dlls/kernel32/winerror.mc:2443 msgid "Hotkey already registered.\n" -msgstr "熱鍵已被註冊。\n" +msgstr "快捷鍵已被註冊。\n" #: dlls/kernel32/winerror.mc:2448 msgid "Class already exists.\n" @@ -5955,7 +5889,7 @@ msgstr "無效的索引。\n" #: dlls/kernel32/winerror.mc:2468 msgid "Invalid icon handle.\n" -msgstr "無效的圖示控柄。\n" +msgstr "無效的圖示控制代碼。\n" #: dlls/kernel32/winerror.mc:2473 msgid "Private dialog index.\n" @@ -5963,11 +5897,11 @@ msgstr "私人的對話框索引。\n" #: dlls/kernel32/winerror.mc:2478 msgid "List box ID not found.\n" -msgstr "找不到清單方塊識別號。\n" +msgstr "找不到清單方塊識別碼。\n" #: dlls/kernel32/winerror.mc:2483 msgid "No wildcard characters.\n" -msgstr "沒有萬用字元字元。\n" +msgstr "沒有萬用字元。\n" #: dlls/kernel32/winerror.mc:2488 msgid "Clipboard not open.\n" @@ -5975,7 +5909,7 @@ msgstr "未開啟剪貼簿。\n" #: dlls/kernel32/winerror.mc:2493 msgid "Hotkey not registered.\n" -msgstr "快速鍵未註冊。\n" +msgstr "快捷鍵未註冊。\n" #: dlls/kernel32/winerror.mc:2498 msgid "Not a dialog window.\n" @@ -5983,7 +5917,7 @@ msgstr "不是個對話框視窗。\n" #: dlls/kernel32/winerror.mc:2503 msgid "Control ID not found.\n" -msgstr "找不到控制識別號。\n" +msgstr "找不到控制識別碼。\n" #: dlls/kernel32/winerror.mc:2508 msgid "Invalid combo box message.\n" @@ -6003,7 +5937,7 @@ msgstr "找不到 DC。\n" #: dlls/kernel32/winerror.mc:2528 msgid "Invalid hook filter.\n" -msgstr "無效的攔截篩選器。\n" +msgstr "無效的勾點篩選器。\n" #: dlls/kernel32/winerror.mc:2533 msgid "Invalid filter procedure.\n" @@ -6011,19 +5945,19 @@ msgstr "無效的篩選器程序。\n" #: dlls/kernel32/winerror.mc:2538 msgid "Hook procedure needs module handle.\n" -msgstr "攔截程序需要模組控柄。\n" +msgstr "勾點程序需要模組控制代碼。\n" #: dlls/kernel32/winerror.mc:2543 msgid "Global-only hook procedure.\n" -msgstr "僅限全域的攔截程序。\n" +msgstr "只限全域的勾點程序。\n" #: dlls/kernel32/winerror.mc:2548 msgid "Journal hook already set.\n" -msgstr "已經設定日誌攔截。\n" +msgstr "已經設定日誌勾點。\n" #: dlls/kernel32/winerror.mc:2553 msgid "Hook procedure not installed.\n" -msgstr "尚未安裝攔截程序。\n" +msgstr "尚未安裝勾點程序。\n" #: dlls/kernel32/winerror.mc:2558 msgid "Invalid list box message.\n" @@ -6039,7 +5973,7 @@ msgstr "這個清單方塊沒有定位停駐點。\n" #: dlls/kernel32/winerror.mc:2573 msgid "Can't destroy object owned by another thread.\n" -msgstr "無法銷毀由另外執行緒所擁有的物件。\n" +msgstr "無法銷毀由其他執行緒所擁有的物件。\n" #: dlls/kernel32/winerror.mc:2578 msgid "Child window menus not allowed.\n" @@ -6063,7 +5997,7 @@ msgstr "螢幕已鎖定。\n" #: dlls/kernel32/winerror.mc:2603 msgid "Window handles have different parents.\n" -msgstr "視窗控柄有不同的上層。\n" +msgstr "視窗控制代碼有不同的父系。\n" #: dlls/kernel32/winerror.mc:2608 msgid "Not a child window.\n" @@ -6075,7 +6009,7 @@ msgstr "數字格式無效。\n" #: dlls/kernel32/winerror.mc:2618 msgid "Invalid thread ID.\n" -msgstr "無效的執行緒識別號。\n" +msgstr "無效的執行緒識別碼。\n" #: dlls/kernel32/winerror.mc:2623 msgid "Not an MDI child window.\n" @@ -6107,7 +6041,7 @@ msgstr "沒有非置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2658 msgid "No paged system resources.\n" -msgstr "非置換頁的系統資源。\n" +msgstr "沒有置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2663 msgid "No working set quota.\n" @@ -6127,11 +6061,11 @@ msgstr "找不到選單項目。\n" #: dlls/kernel32/winerror.mc:2683 msgid "Invalid keyboard handle.\n" -msgstr "無效的鍵盤控柄。\n" +msgstr "無效的鍵盤控制代碼。\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許的勾點類型。\n" #: dlls/kernel32/winerror.mc:2693 msgid "Interactive window station required.\n" @@ -6143,7 +6077,7 @@ msgstr "逾時。\n" #: dlls/kernel32/winerror.mc:2703 msgid "Invalid monitor handle.\n" -msgstr "無效的監視器控柄。\n" +msgstr "無效的監視器控制代碼。\n" #: dlls/kernel32/winerror.mc:2708 msgid "Event log file corrupt.\n" @@ -6171,11 +6105,11 @@ msgstr "使用者已放棄安裝。\n" #: dlls/kernel32/winerror.mc:2738 msgid "Installation failure.\n" -msgstr "安裝已失敗。\n" +msgstr "安裝失敗。\n" #: dlls/kernel32/winerror.mc:2743 msgid "Installation suspended.\n" -msgstr "安裝已懸置。\n" +msgstr "安裝暫停。\n" #: dlls/kernel32/winerror.mc:2748 msgid "Unknown product.\n" @@ -6183,19 +6117,19 @@ msgstr "不明產品。\n" #: dlls/kernel32/winerror.mc:2753 msgid "Unknown feature.\n" -msgstr "不明特徵。\n" +msgstr "不明功能。\n" #: dlls/kernel32/winerror.mc:2758 msgid "Unknown component.\n" -msgstr "未知的元件。\n" +msgstr "不明元件。\n" #: dlls/kernel32/winerror.mc:2763 msgid "Unknown property.\n" -msgstr "未知的屬性。\n" +msgstr "不明屬性。\n" #: dlls/kernel32/winerror.mc:2768 msgid "Invalid handle state.\n" -msgstr "無效的控柄狀態。\n" +msgstr "無效的控制代碼狀態。\n" #: dlls/kernel32/winerror.mc:2773 msgid "Bad configuration.\n" @@ -6207,7 +6141,7 @@ msgstr "索引遺失。\n" #: dlls/kernel32/winerror.mc:2783 msgid "Installation source is missing.\n" -msgstr "本功能的安裝來源不存在。\n" +msgstr "找不到本功能的安裝來源。\n" #: dlls/kernel32/winerror.mc:2788 msgid "Wrong installation package version.\n" @@ -6251,7 +6185,7 @@ msgstr "開啟安裝記錄檔時失敗。\n" #: dlls/kernel32/winerror.mc:2838 msgid "Installation language not supported.\n" -msgstr "不受支援的安裝語言。\n" +msgstr "不支援的安裝語言。\n" #: dlls/kernel32/winerror.mc:2843 msgid "Installation transform failed to apply.\n" @@ -6275,11 +6209,11 @@ msgstr "無效的表格。\n" #: dlls/kernel32/winerror.mc:2868 msgid "Data type mismatch.\n" -msgstr "資料類型不匹配。\n" +msgstr "資料類型不相符。\n" #: dlls/kernel32/winerror.mc:2873 dlls/kernel32/winerror.mc:3083 msgid "Unsupported type.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的類型。\n" #: dlls/kernel32/winerror.mc:2878 msgid "Creation failed.\n" @@ -6291,7 +6225,7 @@ msgstr "無法寫入暫存資料夾。\n" #: dlls/kernel32/winerror.mc:2888 msgid "Installation platform not supported.\n" -msgstr "不受支援的安裝平臺。\n" +msgstr "不支援的安裝平臺。\n" #: dlls/kernel32/winerror.mc:2893 msgid "Installer not used.\n" @@ -6307,7 +6241,7 @@ msgstr "無效的更新套件。\n" #: dlls/kernel32/winerror.mc:2908 msgid "Unsupported patch package.\n" -msgstr "不受支援的修補程式套件。\n" +msgstr "不支援的修補程式套件。\n" #: dlls/kernel32/winerror.mc:2913 msgid "Another version is installed.\n" @@ -6351,7 +6285,7 @@ msgstr "無效的字串 UUID。\n" #: dlls/kernel32/winerror.mc:2963 msgid "Invalid endpoint format.\n" -msgstr "無效的終點格式。\n" +msgstr "無效的端點格式。\n" #: dlls/kernel32/winerror.mc:2968 msgid "Invalid network address.\n" @@ -6359,7 +6293,7 @@ msgstr "無效的網路位址。\n" #: dlls/kernel32/winerror.mc:2973 msgid "No endpoint found.\n" -msgstr "找不到任何終點。\n" +msgstr "找不到任何端點。\n" #: dlls/kernel32/winerror.mc:2978 msgid "Invalid timeout value.\n" @@ -6391,11 +6325,11 @@ msgstr "RPC 伺服器未傾聽。\n" #: dlls/kernel32/winerror.mc:3013 msgid "Unknown manager type.\n" -msgstr "不明管理員型態。\n" +msgstr "不明管理員類型。\n" #: dlls/kernel32/winerror.mc:3018 msgid "Unknown interface.\n" -msgstr "未知的介面。\n" +msgstr "不明的介面。\n" #: dlls/kernel32/winerror.mc:3023 msgid "No bindings.\n" @@ -6407,7 +6341,7 @@ msgstr "沒有協定序列。\n" #: dlls/kernel32/winerror.mc:3033 msgid "Can't create endpoint.\n" -msgstr "無法建立終點。\n" +msgstr "無法建立端點。\n" #: dlls/kernel32/winerror.mc:3038 msgid "Out of resources.\n" @@ -6415,7 +6349,7 @@ msgstr "資源不足。\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "RPC 伺服器不得使用。\n" +msgstr "RPC 伺服器不可用。\n" #: dlls/kernel32/winerror.mc:3048 msgid "RPC server too busy.\n" @@ -6427,7 +6361,7 @@ msgstr "無效的網路選項。\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "沒有現用的 RPC 呼叫。\n" +msgstr "沒有可用的 RPC 呼叫。\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" @@ -6443,7 +6377,7 @@ msgstr "RPC 協定發生錯誤。\n" #: dlls/kernel32/winerror.mc:3078 msgid "Unsupported transfer syntax.\n" -msgstr "不受支援的轉送語法。\n" +msgstr "不支援的轉送語法。\n" #: dlls/kernel32/winerror.mc:3088 msgid "Invalid tag.\n" @@ -6463,7 +6397,7 @@ msgstr "無效的名稱語法。\n" #: dlls/kernel32/winerror.mc:3108 msgid "Unsupported name syntax.\n" -msgstr "不受支援的名稱語法。\n" +msgstr "不支援的名稱語法。\n" #: dlls/kernel32/winerror.mc:3113 msgid "No network address.\n" @@ -6471,7 +6405,7 @@ msgstr "沒有網路位址。\n" #: dlls/kernel32/winerror.mc:3118 msgid "Duplicate endpoint.\n" -msgstr "重複的終點。\n" +msgstr "重複的端點。\n" #: dlls/kernel32/winerror.mc:3123 msgid "Unknown authentication type.\n" @@ -6479,7 +6413,7 @@ msgstr "不明認證類型。\n" #: dlls/kernel32/winerror.mc:3128 msgid "Maximum calls too low.\n" -msgstr "太低的呼叫數最大值。\n" +msgstr "呼叫數的最大值太低。\n" #: dlls/kernel32/winerror.mc:3133 msgid "String too long.\n" @@ -6523,7 +6457,7 @@ msgstr "無法進行作業。\n" #: dlls/kernel32/winerror.mc:3183 msgid "Endpoints not registered.\n" -msgstr "終點未註冊。\n" +msgstr "端點未註冊。\n" #: dlls/kernel32/winerror.mc:3188 msgid "Nothing to export.\n" @@ -6543,7 +6477,7 @@ msgstr "已無更多成員。\n" #: dlls/kernel32/winerror.mc:3208 msgid "Not all objects unexported.\n" -msgstr "並非所有物件被取消匯出。\n" +msgstr "並非所有物件未被匯出。\n" #: dlls/kernel32/winerror.mc:3213 msgid "Interface not found.\n" @@ -6559,7 +6493,7 @@ msgstr "找不到條目。\n" #: dlls/kernel32/winerror.mc:3228 msgid "Name service unavailable.\n" -msgstr "名稱服務不得使用。\n" +msgstr "名稱服務不可用。\n" #: dlls/kernel32/winerror.mc:3233 msgid "Invalid network address family.\n" @@ -6571,7 +6505,7 @@ msgstr "操作不受支援。\n" #: dlls/kernel32/winerror.mc:3243 msgid "No security context available.\n" -msgstr "沒有可用安全文脈。\n" +msgstr "沒有可用的安全內容。\n" #: dlls/kernel32/winerror.mc:3248 msgid "RPCInternal error.\n" @@ -6599,7 +6533,7 @@ msgstr "浮點數溢位。\n" #: dlls/kernel32/winerror.mc:3278 msgid "No more entries.\n" -msgstr "已無更多條目。\n" +msgstr "已無更多項目。\n" #: dlls/kernel32/winerror.mc:3283 msgid "Character translation table open failed.\n" @@ -6611,23 +6545,23 @@ msgstr "字元翻譯表格檔案太小。\n" #: dlls/kernel32/winerror.mc:3293 msgid "Null context handle.\n" -msgstr "空值文脈控柄。\n" +msgstr "內容控制代碼為空值。\n" #: dlls/kernel32/winerror.mc:3298 msgid "Context handle damaged.\n" -msgstr "文脈控柄受損害。\n" +msgstr "內容控制代碼已損壞。\n" #: dlls/kernel32/winerror.mc:3303 msgid "Binding handle mismatch.\n" -msgstr "繫結控柄不匹配。\n" +msgstr "繫結控制代碼不相符。\n" #: dlls/kernel32/winerror.mc:3308 msgid "Cannot get call handle.\n" -msgstr "無法提取呼叫控柄。\n" +msgstr "無法提取呼叫控制代碼。\n" #: dlls/kernel32/winerror.mc:3313 msgid "Null reference pointer.\n" -msgstr "空值參考指標。\n" +msgstr "參考指標為空值。\n" #: dlls/kernel32/winerror.mc:3318 msgid "Enumeration value out of range.\n" @@ -6639,7 +6573,7 @@ msgstr "位元組數量太小。\n" #: dlls/kernel32/winerror.mc:3328 msgid "Bad stub data.\n" -msgstr "不當的殘餘資料。\n" +msgstr "損壞的虛設常式資料。\n" #: dlls/kernel32/winerror.mc:3333 msgid "Invalid user buffer.\n" @@ -6667,15 +6601,15 @@ msgstr "信賴的關聯性失敗。\n" #: dlls/kernel32/winerror.mc:3363 msgid "Trust logon failure.\n" -msgstr "信賴登錄失敗。\n" +msgstr "信賴登入失敗。\n" #: dlls/kernel32/winerror.mc:3368 msgid "RPC call already in progress.\n" -msgstr "RPC 呼叫已正進行。\n" +msgstr "RPC 呼叫已在進行。\n" #: dlls/kernel32/winerror.mc:3373 msgid "NETLOGON is not started.\n" -msgstr "NETLOGON 未被啟始。\n" +msgstr "NETLOGON 未被啟動。\n" #: dlls/kernel32/winerror.mc:3378 msgid "Account expired.\n" @@ -6683,7 +6617,7 @@ msgstr "帳號已過期。\n" #: dlls/kernel32/winerror.mc:3383 msgid "Redirector has open handles.\n" -msgstr "重導器已開啟控柄。\n" +msgstr "重導器已開啟控制代碼。\n" #: dlls/kernel32/winerror.mc:3388 msgid "Printer driver already installed.\n" @@ -6695,7 +6629,7 @@ msgstr "不明通訊埠。\n" #: dlls/kernel32/winerror.mc:3398 msgid "Unknown printer driver.\n" -msgstr "未知的印表機驅動程式。\n" +msgstr "不明印表機驅動程式。\n" #: dlls/kernel32/winerror.mc:3403 msgid "Unknown print processor.\n" @@ -6735,15 +6669,15 @@ msgstr "已無更多繫結。\n" #: dlls/kernel32/winerror.mc:3448 msgid "Can't log on with inter-domain trust account.\n" -msgstr "無法以網域間信賴帳號登錄。\n" +msgstr "無法以網域間信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3453 msgid "Can't log on with workstation trust account.\n" -msgstr "無法以工作站信賴帳號登錄。\n" +msgstr "無法以工作站信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3458 msgid "Can't log on with server trust account.\n" -msgstr "無法以伺服器信賴帳號登錄。\n" +msgstr "無法以伺服器信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3463 msgid "Domain trust information inconsistent.\n" @@ -6751,7 +6685,7 @@ msgstr "網域信賴資訊不一致。\n" #: dlls/kernel32/winerror.mc:3468 msgid "Server has open handles.\n" -msgstr "伺服器已開啟控柄。\n" +msgstr "伺服器已開啟控制代碼。\n" #: dlls/kernel32/winerror.mc:3473 msgid "Resource data not found.\n" @@ -6791,7 +6725,7 @@ msgstr "RPC 指令失敗。\n" #: dlls/kernel32/winerror.mc:3518 msgid "Unsupported authorization level.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的授權等級。\n" #: dlls/kernel32/winerror.mc:3523 msgid "No principal name registered.\n" @@ -6815,7 +6749,7 @@ msgstr "執行緒未取消。\n" #: dlls/kernel32/winerror.mc:3548 msgid "Invalid handle operation.\n" -msgstr "無效的控柄作業。\n" +msgstr "無效的控制代碼作業。\n" #: dlls/kernel32/winerror.mc:3553 msgid "Wrong serializing package version.\n" @@ -6843,7 +6777,7 @@ msgstr "找不到群組成員。\n" #: dlls/kernel32/winerror.mc:3583 msgid "Can't create endpoint mapper DB.\n" -msgstr "無法建立終點映射器資料庫。\n" +msgstr "無法建立端點對應器資料庫。\n" #: dlls/kernel32/winerror.mc:3588 msgid "Invalid object.\n" @@ -6863,7 +6797,7 @@ msgstr "無效的表單大小。\n" #: dlls/kernel32/winerror.mc:3608 msgid "Already awaiting printer handle.\n" -msgstr "已經在等待印表機控柄。\n" +msgstr "已經在等待印表機控制代碼。\n" #: dlls/kernel32/winerror.mc:3613 msgid "Printer deleted.\n" @@ -6903,7 +6837,7 @@ msgstr "不完整的 RPC 發送。\n" #: dlls/kernel32/winerror.mc:3658 msgid "Invalid asynchronous RPC handle.\n" -msgstr "無效的非同步 RPC 控柄。\n" +msgstr "無效的非同步 RPC 控制代碼。\n" #: dlls/kernel32/winerror.mc:3663 msgid "Invalid asynchronous RPC call.\n" @@ -6935,7 +6869,7 @@ msgstr "無法解析檔名。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" -msgstr "RPC 條目型態不匹配。\n" +msgstr "RPC 條目類型不匹配。\n" #: dlls/kernel32/winerror.mc:3703 msgid "Not all objects could be exported.\n" @@ -6947,15 +6881,15 @@ msgstr "無法匯出介面。\n" #: dlls/kernel32/winerror.mc:3713 msgid "The profile could not be added.\n" -msgstr "無法加入側寫檔。\n" +msgstr "無法加入設定檔。\n" #: dlls/kernel32/winerror.mc:3718 msgid "The profile element could not be added.\n" -msgstr "無法加入側寫檔元件。\n" +msgstr "無法加入設定檔元件。\n" #: dlls/kernel32/winerror.mc:3723 msgid "The profile element could not be removed.\n" -msgstr "無法移除側寫檔元件。\n" +msgstr "無法移除設定檔元件。\n" #: dlls/kernel32/winerror.mc:3728 msgid "The group element could not be added.\n" @@ -6970,57 +6904,41 @@ msgid "The username could not be found.\n" msgstr "無法找到使用者名稱。\n" #: dlls/kernel32/winerror.mc:3743 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "站臺不存在。\n" +msgstr "這個網路連線不存在。\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "連線被拒。\n" +msgstr "連線被同儕節點重設。\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "未實作" +msgstr "未實作。\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC 呼叫失敗。\n" +msgstr "呼叫失敗。\n" #: dlls/kernel32/winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "在檔案 %2 中找不到訊息 0x%1。\n" +msgstr "無法在檔案中找到簽章。\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "無效的層級。\n" +msgstr "無效的呼叫。\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Help not available." msgid "Resource is not currently available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "資源目前不可用。\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "類別名稱:" +msgstr "經典藍" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 msgid "Normal" -msgstr "中" +msgstr "標準" #: dlls/localspl/localspl.rc:37 #, fuzzy -- 2.33.0.windows.2

2 1

[PATCH 1/5] winegstreamer: Implement IWMSyncReader::GetOutputCount().
by Zebediah Figura 27 Oct '21

27 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wm_syncreader.c | 13 +++++++++---- dlls/wmvcore/tests/wmvcore.c | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index bb98a60ad48..32b668f68c6 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -85,11 +85,16 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, WORD str return E_NOTIMPL; } -static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader2 *iface, DWORD *outputs) +static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader2 *iface, DWORD *count) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%p): stub!\n", This, outputs); - return E_NOTIMPL; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, count %p.\n", reader, count); + + EnterCriticalSection(&reader->reader.cs); + *count = reader->reader.stream_count; + LeaveCriticalSection(&reader->reader.cs); + return S_OK; } static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface, DWORD output_num, DWORD format_num, diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index ad58f53d552..5576018b1d6 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -463,8 +463,8 @@ static void test_sync_reader_streaming(void) count = 0xdeadbeef; hr = IWMSyncReader_GetOutputCount(reader, &count); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); for (i = 0; i < 2; ++i) { -- 2.33.0

1 4

[PATCH] ntdll: Merge critsection.c into sync.c.
by Zebediah Figura 27 Oct '21

27 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/Makefile.in | 1 - dlls/ntdll/critsection.c | 543 --------------------------------------- dlls/ntdll/sync.c | 335 +++++++++++++++++++++++- 3 files changed, 334 insertions(+), 545 deletions(-) delete mode 100644 dlls/ntdll/critsection.c diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index c40e7ba8242..d3be1fad0bc 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -11,7 +11,6 @@ EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 C_SRCS = \ actctx.c \ atom.c \ - critsection.c \ crypt.c \ debugbuffer.c \ env.c \ diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c deleted file mode 100644 index fe7d933c0fa..00000000000 --- a/dlls/ntdll/critsection.c +++ /dev/null @@ -1,543 +0,0 @@ -/* - * Win32 critical sections - * - * Copyright 1998 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <assert.h> -#include <errno.h> -#include <stdarg.h> -#include <stdio.h> -#include <sys/types.h> -#include <time.h> -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winternl.h" -#include "wine/debug.h" -#include "ntdll_misc.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ntdll); -WINE_DECLARE_DEBUG_CHANNEL(relay); - -static inline void small_pause(void) -{ -#ifdef __i386__ - __asm__ __volatile__( "rep;nop" : : : "memory" ); -#else - __asm__ __volatile__( "" : : : "memory" ); -#endif -} - -static void *no_debug_info_marker = (void *)(ULONG_PTR)-1; - -static BOOL crit_section_has_debuginfo(const RTL_CRITICAL_SECTION *crit) -{ - return crit->DebugInfo != NULL && crit->DebugInfo != no_debug_info_marker; -} - -/*********************************************************************** - * get_semaphore - */ -static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit ) -{ - HANDLE ret = crit->LockSemaphore; - if (!ret) - { - HANDLE sem; - if (NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 )) return 0; - if (!(ret = InterlockedCompareExchangePointer( &crit->LockSemaphore, sem, 0 ))) - ret = sem; - else - NtClose(sem); /* somebody beat us to it */ - } - return ret; -} - -/*********************************************************************** - * wait_semaphore - */ -static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) -{ - NTSTATUS ret; - - /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit ) || - ((ret = unix_funcs->fast_RtlpWaitForCriticalSection( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) - { - HANDLE sem = get_semaphore( crit ); - LARGE_INTEGER time; - - time.QuadPart = timeout * (LONGLONG)-10000000; - ret = NtWaitForSingleObject( sem, FALSE, &time ); - } - return ret; -} - -/*********************************************************************** - * RtlInitializeCriticalSection (NTDLL.@) - * - * Initialises a new critical section. - * - * PARAMS - * crit [O] Critical section to initialise - * - * RETURNS - * STATUS_SUCCESS. - * - * SEE - * RtlInitializeCriticalSectionEx(), - * RtlInitializeCriticalSectionAndSpinCount(), RtlDeleteCriticalSection(), - * RtlEnterCriticalSection(), RtlLeaveCriticalSection(), - * RtlTryEnterCriticalSection(), RtlSetCriticalSectionSpinCount() - */ -NTSTATUS WINAPI RtlInitializeCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - return RtlInitializeCriticalSectionEx( crit, 0, 0 ); -} - -/*********************************************************************** - * RtlInitializeCriticalSectionAndSpinCount (NTDLL.@) - * - * Initialises a new critical section with a given spin count. - * - * PARAMS - * crit [O] Critical section to initialise - * spincount [I] Spin count for crit - * - * RETURNS - * STATUS_SUCCESS. - * - * NOTES - * Available on NT4 SP3 or later. - * - * SEE - * RtlInitializeCriticalSectionEx(), - * RtlInitializeCriticalSection(), RtlDeleteCriticalSection(), - * RtlEnterCriticalSection(), RtlLeaveCriticalSection(), - * RtlTryEnterCriticalSection(), RtlSetCriticalSectionSpinCount() - */ -NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount( RTL_CRITICAL_SECTION *crit, ULONG spincount ) -{ - return RtlInitializeCriticalSectionEx( crit, spincount, 0 ); -} - -/*********************************************************************** - * RtlInitializeCriticalSectionEx (NTDLL.@) - * - * Initialises a new critical section with a given spin count and flags. - * - * PARAMS - * crit [O] Critical section to initialise. - * spincount [I] Number of times to spin upon contention. - * flags [I] RTL_CRITICAL_SECTION_FLAG_ flags from winnt.h. - * - * RETURNS - * STATUS_SUCCESS. - * - * NOTES - * Available on Vista or later. - * - * SEE - * RtlInitializeCriticalSection(), RtlDeleteCriticalSection(), - * RtlEnterCriticalSection(), RtlLeaveCriticalSection(), - * RtlTryEnterCriticalSection(), RtlSetCriticalSectionSpinCount() - */ -NTSTATUS WINAPI RtlInitializeCriticalSectionEx( RTL_CRITICAL_SECTION *crit, ULONG spincount, ULONG flags ) -{ - if (flags & (RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN|RTL_CRITICAL_SECTION_FLAG_STATIC_INIT)) - FIXME("(%p,%u,0x%08x) semi-stub\n", crit, spincount, flags); - - /* FIXME: if RTL_CRITICAL_SECTION_FLAG_STATIC_INIT is given, we should use - * memory from a static pool to hold the debug info. Then heap.c could pass - * this flag rather than initialising the process heap CS by hand. If this - * is done, then debug info should be managed through Rtlp[Allocate|Free]DebugInfo - * so (e.g.) MakeCriticalSectionGlobal() doesn't free it using HeapFree(). - */ - if (flags & RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO) - crit->DebugInfo = no_debug_info_marker; - else - { - crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); - if (crit->DebugInfo) - { - crit->DebugInfo->Type = 0; - crit->DebugInfo->CreatorBackTraceIndex = 0; - crit->DebugInfo->CriticalSection = crit; - crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->EntryCount = 0; - crit->DebugInfo->ContentionCount = 0; - memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); - } - } - crit->LockCount = -1; - crit->RecursionCount = 0; - crit->OwningThread = 0; - crit->LockSemaphore = 0; - if (NtCurrentTeb()->Peb->NumberOfProcessors <= 1) spincount = 0; - crit->SpinCount = spincount & ~0x80000000; - return STATUS_SUCCESS; -} - -/*********************************************************************** - * RtlSetCriticalSectionSpinCount (NTDLL.@) - * - * Sets the spin count of a critical section. - * - * PARAMS - * crit [I/O] Critical section - * spincount [I] Spin count for crit - * - * RETURNS - * The previous spin count. - * - * NOTES - * If the system is not SMP, spincount is ignored and set to 0. - * - * SEE - * RtlInitializeCriticalSectionEx(), - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlEnterCriticalSection(), - * RtlLeaveCriticalSection(), RtlTryEnterCriticalSection() - */ -ULONG WINAPI RtlSetCriticalSectionSpinCount( RTL_CRITICAL_SECTION *crit, ULONG spincount ) -{ - ULONG oldspincount = crit->SpinCount; - if (NtCurrentTeb()->Peb->NumberOfProcessors <= 1) spincount = 0; - crit->SpinCount = spincount; - return oldspincount; -} - -/*********************************************************************** - * RtlDeleteCriticalSection (NTDLL.@) - * - * Frees the resources used by a critical section. - * - * PARAMS - * crit [I/O] Critical section to free - * - * RETURNS - * STATUS_SUCCESS. - * - * SEE - * RtlInitializeCriticalSectionEx(), - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlEnterCriticalSection(), - * RtlLeaveCriticalSection(), RtlTryEnterCriticalSection() - */ -NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - crit->LockCount = -1; - crit->RecursionCount = 0; - crit->OwningThread = 0; - if (crit_section_has_debuginfo( crit )) - { - /* only free the ones we made in here */ - if (!crit->DebugInfo->Spare[0]) - { - RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); - crit->DebugInfo = NULL; - } - if (unix_funcs->fast_RtlDeleteCriticalSection( crit ) == STATUS_NOT_IMPLEMENTED) - NtClose( crit->LockSemaphore ); - } - else NtClose( crit->LockSemaphore ); - crit->LockSemaphore = 0; - return STATUS_SUCCESS; -} - - -/*********************************************************************** - * RtlpWaitForCriticalSection (NTDLL.@) - * - * Waits for a busy critical section to become free. - * - * PARAMS - * crit [I/O] Critical section to wait for - * - * RETURNS - * STATUS_SUCCESS. - * - * NOTES - * Use RtlEnterCriticalSection() instead of this function as it is often much - * faster. - * - * SEE - * RtlInitializeCriticalSectionEx(), - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlEnterCriticalSection(), - * RtlLeaveCriticalSection(), RtlTryEnterCriticalSection() - */ -NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - LONGLONG timeout = NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart / -10000000; - - /* Don't allow blocking on a critical section during process termination */ - if (RtlDllShutdownInProgress()) - { - WARN( "process %s is shutting down, returning STATUS_SUCCESS\n", - debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer) ); - return STATUS_SUCCESS; - } - - for (;;) - { - EXCEPTION_RECORD rec; - NTSTATUS status = wait_semaphore( crit, 5 ); - timeout -= 5; - - if ( status == STATUS_TIMEOUT ) - { - const char *name = NULL; - if (crit_section_has_debuginfo( crit )) name = (char *)crit->DebugInfo->Spare[0]; - if (!name) name = "?"; - ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (60 sec)\n", - crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); - status = wait_semaphore( crit, 60 ); - timeout -= 60; - - if ( status == STATUS_TIMEOUT && TRACE_ON(relay) ) - { - ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (5 min)\n", - crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); - status = wait_semaphore( crit, 300 ); - timeout -= 300; - } - } - if (status == STATUS_WAIT_0) break; - - /* Throw exception only for Wine internal locks */ - if (!crit_section_has_debuginfo( crit ) || !crit->DebugInfo->Spare[0]) continue; - - /* only throw deadlock exception if configured timeout is reached */ - if (timeout > 0) continue; - - rec.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; - rec.ExceptionFlags = 0; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = RtlRaiseException; /* sic */ - rec.NumberParameters = 1; - rec.ExceptionInformation[0] = (ULONG_PTR)crit; - RtlRaiseException( &rec ); - } - if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; - return STATUS_SUCCESS; -} - - -/*********************************************************************** - * RtlpUnWaitCriticalSection (NTDLL.@) - * - * Notifies other threads waiting on the busy critical section that it has - * become free. - * - * PARAMS - * crit [I/O] Critical section - * - * RETURNS - * Success: STATUS_SUCCESS. - * Failure: Any error returned by NtReleaseSemaphore() - * - * NOTES - * Use RtlLeaveCriticalSection() instead of this function as it is often much - * faster. - * - * SEE - * RtlInitializeCriticalSectionEx(), - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlEnterCriticalSection(), - * RtlLeaveCriticalSection(), RtlTryEnterCriticalSection() - */ -NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - NTSTATUS ret; - - /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit ) || - ((ret = unix_funcs->fast_RtlpUnWaitCriticalSection( crit )) == STATUS_NOT_IMPLEMENTED)) - { - HANDLE sem = get_semaphore( crit ); - ret = NtReleaseSemaphore( sem, 1, NULL ); - } - if (ret) RtlRaiseStatus( ret ); - return ret; -} - - -/*********************************************************************** - * RtlEnterCriticalSection (NTDLL.@) - * - * Enters a critical section, waiting for it to become available if necessary. - * - * PARAMS - * crit [I/O] Critical section to enter - * - * RETURNS - * STATUS_SUCCESS. The critical section is held by the caller. - * - * SEE - * RtlInitializeCriticalSectionEx(), - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlSetCriticalSectionSpinCount(), - * RtlLeaveCriticalSection(), RtlTryEnterCriticalSection() - */ -NTSTATUS WINAPI RtlEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - if (crit->SpinCount) - { - ULONG count; - - if (RtlTryEnterCriticalSection( crit )) return STATUS_SUCCESS; - for (count = crit->SpinCount; count > 0; count--) - { - if (crit->LockCount > 0) break; /* more than one waiter, don't bother spinning */ - if (crit->LockCount == -1) /* try again */ - { - if (InterlockedCompareExchange( &crit->LockCount, 0, -1 ) == -1) goto done; - } - small_pause(); - } - } - - if (InterlockedIncrement( &crit->LockCount )) - { - if (crit->OwningThread == ULongToHandle(GetCurrentThreadId())) - { - crit->RecursionCount++; - return STATUS_SUCCESS; - } - - /* Now wait for it */ - RtlpWaitForCriticalSection( crit ); - } -done: - crit->OwningThread = ULongToHandle(GetCurrentThreadId()); - crit->RecursionCount = 1; - return STATUS_SUCCESS; -} - - -/*********************************************************************** - * RtlTryEnterCriticalSection (NTDLL.@) - * - * Tries to enter a critical section without waiting. - * - * PARAMS - * crit [I/O] Critical section to enter - * - * RETURNS - * Success: TRUE. The critical section is held by the caller. - * Failure: FALSE. The critical section is currently held by another thread. - * - * SEE - * RtlInitializeCriticalSectionEx(), - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlEnterCriticalSection(), - * RtlLeaveCriticalSection(), RtlSetCriticalSectionSpinCount() - */ -BOOL WINAPI RtlTryEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - BOOL ret = FALSE; - if (InterlockedCompareExchange( &crit->LockCount, 0, -1 ) == -1) - { - crit->OwningThread = ULongToHandle(GetCurrentThreadId()); - crit->RecursionCount = 1; - ret = TRUE; - } - else if (crit->OwningThread == ULongToHandle(GetCurrentThreadId())) - { - InterlockedIncrement( &crit->LockCount ); - crit->RecursionCount++; - ret = TRUE; - } - return ret; -} - - -/*********************************************************************** - * RtlIsCriticalSectionLocked (NTDLL.@) - * - * Checks if the critical section is locked by any thread. - * - * PARAMS - * crit [I/O] Critical section to check. - * - * RETURNS - * Success: TRUE. The critical section is locked. - * Failure: FALSE. The critical section is not locked. - */ -BOOL WINAPI RtlIsCriticalSectionLocked( RTL_CRITICAL_SECTION *crit ) -{ - return crit->RecursionCount != 0; -} - - -/*********************************************************************** - * RtlIsCriticalSectionLockedByThread (NTDLL.@) - * - * Checks if the critical section is locked by the current thread. - * - * PARAMS - * crit [I/O] Critical section to check. - * - * RETURNS - * Success: TRUE. The critical section is locked. - * Failure: FALSE. The critical section is not locked. - */ -BOOL WINAPI RtlIsCriticalSectionLockedByThread( RTL_CRITICAL_SECTION *crit ) -{ - return crit->OwningThread == ULongToHandle(GetCurrentThreadId()) && - crit->RecursionCount; -} - - -/*********************************************************************** - * RtlLeaveCriticalSection (NTDLL.@) - * - * Leaves a critical section. - * - * PARAMS - * crit [I/O] Critical section to leave. - * - * RETURNS - * STATUS_SUCCESS. - * - * SEE - * RtlInitializeCriticalSectionEx(), - * RtlInitializeCriticalSection(), RtlInitializeCriticalSectionAndSpinCount(), - * RtlDeleteCriticalSection(), RtlEnterCriticalSection(), - * RtlSetCriticalSectionSpinCount(), RtlTryEnterCriticalSection() - */ -NTSTATUS WINAPI RtlLeaveCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - if (--crit->RecursionCount) - { - if (crit->RecursionCount > 0) InterlockedDecrement( &crit->LockCount ); - else ERR( "section %p is not acquired\n", crit ); - } - else - { - crit->OwningThread = 0; - if (InterlockedDecrement( &crit->LockCount ) >= 0) - { - /* someone is waiting */ - RtlpUnWaitCriticalSection( crit ); - } - } - return STATUS_SUCCESS; -} diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index f1263ae33fd..bfb30661864 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2,7 +2,7 @@ * Process synchronisation * * Copyright 1996, 1997, 1998 Marcus Meissner - * Copyright 1997, 1999 Alexandre Julliard + * Copyright 1997, 1998, 1999 Alexandre Julliard * Copyright 1999, 2000 Juergen Schmied * Copyright 2003 Eric Pouech * @@ -36,6 +36,8 @@ #include "wine/debug.h" #include "ntdll_misc.h" +WINE_DEFAULT_DEBUG_CHANNEL(sync); +WINE_DECLARE_DEBUG_CHANNEL(relay); /****************************************************************** * RtlRunOnceInitialize (NTDLL.@) @@ -133,6 +135,337 @@ DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context } } + +/*********************************************************************** + * Critical sections + ***********************************************************************/ + + +static void *no_debug_info_marker = (void *)(ULONG_PTR)-1; + +static BOOL crit_section_has_debuginfo( const RTL_CRITICAL_SECTION *crit ) +{ + return crit->DebugInfo != NULL && crit->DebugInfo != no_debug_info_marker; +} + +static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit ) +{ + HANDLE ret = crit->LockSemaphore; + if (!ret) + { + HANDLE sem; + if (NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 )) return 0; + if (!(ret = InterlockedCompareExchangePointer( &crit->LockSemaphore, sem, 0 ))) + ret = sem; + else + NtClose(sem); /* somebody beat us to it */ + } + return ret; +} + +static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) +{ + NTSTATUS ret; + + /* debug info is cleared by MakeCriticalSectionGlobal */ + if (!crit_section_has_debuginfo( crit ) || + ((ret = unix_funcs->fast_RtlpWaitForCriticalSection( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) + { + HANDLE sem = get_semaphore( crit ); + LARGE_INTEGER time; + + time.QuadPart = timeout * (LONGLONG)-10000000; + ret = NtWaitForSingleObject( sem, FALSE, &time ); + } + return ret; +} + +/****************************************************************************** + * RtlInitializeCriticalSection (NTDLL.@) + */ +NTSTATUS WINAPI RtlInitializeCriticalSection( RTL_CRITICAL_SECTION *crit ) +{ + return RtlInitializeCriticalSectionEx( crit, 0, 0 ); +} + + +/****************************************************************************** + * RtlInitializeCriticalSectionAndSpinCount (NTDLL.@) + */ +NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount( RTL_CRITICAL_SECTION *crit, ULONG spincount ) +{ + return RtlInitializeCriticalSectionEx( crit, spincount, 0 ); +} + + +/****************************************************************************** + * RtlInitializeCriticalSectionEx (NTDLL.@) + */ +NTSTATUS WINAPI RtlInitializeCriticalSectionEx( RTL_CRITICAL_SECTION *crit, ULONG spincount, ULONG flags ) +{ + if (flags & (RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN|RTL_CRITICAL_SECTION_FLAG_STATIC_INIT)) + FIXME("(%p,%u,0x%08x) semi-stub\n", crit, spincount, flags); + + /* FIXME: if RTL_CRITICAL_SECTION_FLAG_STATIC_INIT is given, we should use + * memory from a static pool to hold the debug info. Then heap.c could pass + * this flag rather than initialising the process heap CS by hand. If this + * is done, then debug info should be managed through Rtlp[Allocate|Free]DebugInfo + * so (e.g.) MakeCriticalSectionGlobal() doesn't free it using HeapFree(). + */ + if (flags & RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO) + crit->DebugInfo = no_debug_info_marker; + else + { + crit->DebugInfo = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG )); + if (crit->DebugInfo) + { + crit->DebugInfo->Type = 0; + crit->DebugInfo->CreatorBackTraceIndex = 0; + crit->DebugInfo->CriticalSection = crit; + crit->DebugInfo->ProcessLocksList.Blink = &crit->DebugInfo->ProcessLocksList; + crit->DebugInfo->ProcessLocksList.Flink = &crit->DebugInfo->ProcessLocksList; + crit->DebugInfo->EntryCount = 0; + crit->DebugInfo->ContentionCount = 0; + memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + } + } + crit->LockCount = -1; + crit->RecursionCount = 0; + crit->OwningThread = 0; + crit->LockSemaphore = 0; + if (NtCurrentTeb()->Peb->NumberOfProcessors <= 1) spincount = 0; + crit->SpinCount = spincount & ~0x80000000; + return STATUS_SUCCESS; +} + + +/****************************************************************************** + * RtlSetCriticalSectionSpinCount (NTDLL.@) + */ +ULONG WINAPI RtlSetCriticalSectionSpinCount( RTL_CRITICAL_SECTION *crit, ULONG spincount ) +{ + ULONG oldspincount = crit->SpinCount; + if (NtCurrentTeb()->Peb->NumberOfProcessors <= 1) spincount = 0; + crit->SpinCount = spincount; + return oldspincount; +} + + +/****************************************************************************** + * RtlDeleteCriticalSection (NTDLL.@) + */ +NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) +{ + crit->LockCount = -1; + crit->RecursionCount = 0; + crit->OwningThread = 0; + if (crit_section_has_debuginfo( crit )) + { + /* only free the ones we made in here */ + if (!crit->DebugInfo->Spare[0]) + { + RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); + crit->DebugInfo = NULL; + } + if (unix_funcs->fast_RtlDeleteCriticalSection( crit ) == STATUS_NOT_IMPLEMENTED) + NtClose( crit->LockSemaphore ); + } + else NtClose( crit->LockSemaphore ); + crit->LockSemaphore = 0; + return STATUS_SUCCESS; +} + + +/****************************************************************************** + * RtlpWaitForCriticalSection (NTDLL.@) + */ +NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) +{ + LONGLONG timeout = NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart / -10000000; + + /* Don't allow blocking on a critical section during process termination */ + if (RtlDllShutdownInProgress()) + { + WARN( "process %s is shutting down, returning STATUS_SUCCESS\n", + debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer) ); + return STATUS_SUCCESS; + } + + for (;;) + { + EXCEPTION_RECORD rec; + NTSTATUS status = wait_semaphore( crit, 5 ); + timeout -= 5; + + if ( status == STATUS_TIMEOUT ) + { + const char *name = NULL; + if (crit_section_has_debuginfo( crit )) name = (char *)crit->DebugInfo->Spare[0]; + if (!name) name = "?"; + ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (60 sec)\n", + crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); + status = wait_semaphore( crit, 60 ); + timeout -= 60; + + if ( status == STATUS_TIMEOUT && TRACE_ON(relay) ) + { + ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (5 min)\n", + crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); + status = wait_semaphore( crit, 300 ); + timeout -= 300; + } + } + if (status == STATUS_WAIT_0) break; + + /* Throw exception only for Wine internal locks */ + if (!crit_section_has_debuginfo( crit ) || !crit->DebugInfo->Spare[0]) continue; + + /* only throw deadlock exception if configured timeout is reached */ + if (timeout > 0) continue; + + rec.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = RtlRaiseException; /* sic */ + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (ULONG_PTR)crit; + RtlRaiseException( &rec ); + } + if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; + return STATUS_SUCCESS; +} + + +/****************************************************************************** + * RtlpUnWaitCriticalSection (NTDLL.@) + */ +NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) +{ + NTSTATUS ret; + + /* debug info is cleared by MakeCriticalSectionGlobal */ + if (!crit_section_has_debuginfo( crit ) || + ((ret = unix_funcs->fast_RtlpUnWaitCriticalSection( crit )) == STATUS_NOT_IMPLEMENTED)) + { + HANDLE sem = get_semaphore( crit ); + ret = NtReleaseSemaphore( sem, 1, NULL ); + } + if (ret) RtlRaiseStatus( ret ); + return ret; +} + + +static inline void small_pause(void) +{ +#ifdef __i386__ + __asm__ __volatile__( "rep;nop" : : : "memory" ); +#else + __asm__ __volatile__( "" : : : "memory" ); +#endif +} + +/****************************************************************************** + * RtlEnterCriticalSection (NTDLL.@) + */ +NTSTATUS WINAPI RtlEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) +{ + if (crit->SpinCount) + { + ULONG count; + + if (RtlTryEnterCriticalSection( crit )) return STATUS_SUCCESS; + for (count = crit->SpinCount; count > 0; count--) + { + if (crit->LockCount > 0) break; /* more than one waiter, don't bother spinning */ + if (crit->LockCount == -1) /* try again */ + { + if (InterlockedCompareExchange( &crit->LockCount, 0, -1 ) == -1) goto done; + } + small_pause(); + } + } + + if (InterlockedIncrement( &crit->LockCount )) + { + if (crit->OwningThread == ULongToHandle(GetCurrentThreadId())) + { + crit->RecursionCount++; + return STATUS_SUCCESS; + } + + /* Now wait for it */ + RtlpWaitForCriticalSection( crit ); + } +done: + crit->OwningThread = ULongToHandle(GetCurrentThreadId()); + crit->RecursionCount = 1; + return STATUS_SUCCESS; +} + + +/****************************************************************************** + * RtlTryEnterCriticalSection (NTDLL.@) + */ +BOOL WINAPI RtlTryEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) +{ + BOOL ret = FALSE; + if (InterlockedCompareExchange( &crit->LockCount, 0, -1 ) == -1) + { + crit->OwningThread = ULongToHandle(GetCurrentThreadId()); + crit->RecursionCount = 1; + ret = TRUE; + } + else if (crit->OwningThread == ULongToHandle(GetCurrentThreadId())) + { + InterlockedIncrement( &crit->LockCount ); + crit->RecursionCount++; + ret = TRUE; + } + return ret; +} + + +/****************************************************************************** + * RtlIsCriticalSectionLocked (NTDLL.@) + */ +BOOL WINAPI RtlIsCriticalSectionLocked( RTL_CRITICAL_SECTION *crit ) +{ + return crit->RecursionCount != 0; +} + + +/****************************************************************************** + * RtlIsCriticalSectionLockedByThread (NTDLL.@) + */ +BOOL WINAPI RtlIsCriticalSectionLockedByThread( RTL_CRITICAL_SECTION *crit ) +{ + return crit->OwningThread == ULongToHandle(GetCurrentThreadId()) && + crit->RecursionCount; +} + + +/****************************************************************************** + * RtlLeaveCriticalSection (NTDLL.@) + */ +NTSTATUS WINAPI RtlLeaveCriticalSection( RTL_CRITICAL_SECTION *crit ) +{ + if (--crit->RecursionCount) + { + if (crit->RecursionCount > 0) InterlockedDecrement( &crit->LockCount ); + else ERR( "section %p is not acquired\n", crit ); + } + else + { + crit->OwningThread = 0; + if (InterlockedDecrement( &crit->LockCount ) >= 0) + { + /* someone is waiting */ + RtlpUnWaitCriticalSection( crit ); + } + } + return STATUS_SUCCESS; +} + /****************************************************************** * RtlRunOnceExecuteOnce (NTDLL.@) */ -- 2.33.0

1 0

[PATCH] d3dx9/tests: Add some tests for constant descriptions in texture shaders.
by Nikolay Sivov 26 Oct '21

26 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/tests/texture.c | 191 +++++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 26e5aa3dbb6..9e2c999c5f2 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2351,21 +2351,87 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR 0x00000003, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x10000001, 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000003, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, }; +#if 0 +float f1[2] = { 0.4f, 0.1f }; +bool b1 = false; +float4 f2; +bool b2[2]; + +struct s +{ + bool b3; + float f3; + float4 f4; + uint i1; + int i2; +}; + +struct s s1; + +float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR +{ + float t = b2[0] * b2[1] * f2.x + s1.i2; + return float4(pos, f1[0] + f1[1] + b1 * 0.6f + t); +} +#endif + static const DWORD shader_code2[] = + { + 0x54580100, 0x0074fffe, 0x42415443, 0x0000001c, 0x000001a3, 0x54580100, 0x00000005, 0x0000001c, + 0x00000100, 0x000001a0, 0x00000080, 0x00090002, 0x00000001, 0x00000084, 0x00000094, 0x000000a4, + 0x00070002, 0x00000002, 0x000000a8, 0x00000000, 0x000000b8, 0x00050002, 0x00000002, 0x000000bc, + 0x000000cc, 0x000000ec, 0x000a0002, 0x00000001, 0x000000f0, 0x00000000, 0x00000100, 0x00000002, + 0x00000005, 0x00000190, 0x00000000, 0xab003162, 0x00010000, 0x00010001, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xab003262, 0x00010000, 0x00010001, 0x00000002, + 0x00000000, 0xab003166, 0x00030000, 0x00010001, 0x00000002, 0x00000000, 0x3ecccccd, 0x00000000, + 0x00000000, 0x00000000, 0x3dcccccd, 0x00000000, 0x00000000, 0x00000000, 0xab003266, 0x00030001, + 0x00040001, 0x00000001, 0x00000000, 0x62003173, 0xabab0033, 0x00010000, 0x00010001, 0x00000001, + 0x00000000, 0xab003366, 0x00030000, 0x00010001, 0x00000001, 0x00000000, 0xab003466, 0x00030001, + 0x00040001, 0x00000001, 0x00000000, 0xab003169, 0x00020000, 0x00010001, 0x00000001, 0x00000000, + 0xab003269, 0x00020000, 0x00010001, 0x00000001, 0x00000000, 0x00000103, 0x00000108, 0x00000118, + 0x0000011c, 0x0000012c, 0x00000130, 0x00000140, 0x00000144, 0x00000154, 0x00000158, 0x00000005, + 0x00080001, 0x00050001, 0x00000168, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, + 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x0062fffe, 0x54494c43, + 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x40000000, 0x3fe33333, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0059fffe, 0x434c5846, 0x00000008, 0xa0500001, 0x00000002, 0x00000000, 0x00000002, + 0x0000001c, 0x00000000, 0x00000002, 0x00000020, 0x00000000, 0x00000007, 0x00000000, 0xa0500001, + 0x00000002, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000002, 0x00000028, 0x00000000, + 0x00000007, 0x00000004, 0xa0400001, 0x00000002, 0x00000000, 0x00000007, 0x00000004, 0x00000000, + 0x00000002, 0x00000010, 0x00000000, 0x00000007, 0x00000000, 0xa0400001, 0x00000002, 0x00000000, + 0x00000002, 0x00000014, 0x00000000, 0x00000002, 0x00000018, 0x00000000, 0x00000007, 0x00000001, + 0xa0500001, 0x00000002, 0x00000000, 0x00000002, 0x00000024, 0x00000000, 0x00000001, 0x0000002c, + 0x00000000, 0x00000007, 0x00000002, 0xa0400001, 0x00000002, 0x00000000, 0x00000007, 0x00000002, + 0x00000000, 0x00000007, 0x00000001, 0x00000000, 0x00000007, 0x00000004, 0xa0400001, 0x00000002, + 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000007, 0x00000004, 0x00000000, 0x00000004, + 0x00000003, 0x10000003, 0x00000001, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000004, + 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, + }; IDirect3DVolumeTexture9 *volume_texture; IDirect3DCubeTexture9 *cube_texture; D3DXCONSTANTTABLE_DESC ctab_desc; ID3DXBuffer *buffer, *buffer2; + D3DXCONSTANT_DESC const_desc; + unsigned int x, y, z, count; D3DPRESENT_PARAMETERS d3dpp; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; ID3DXTextureShader *tx; - unsigned int x, y, z; unsigned int *data; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; + D3DXHANDLE h, h2; IDirect3D9 *d3d; D3DCAPS9 caps; - D3DXHANDLE h; DWORD size; HRESULT hr; HWND wnd; @@ -2577,6 +2643,127 @@ todo_wine IDirect3DVolumeTexture9_Release(volume_texture); + IUnknown_Release(tx); + + /* With constant table */ + hr = D3DXCreateTextureShader(shader_code2, &tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); +todo_wine + ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); + if (FAILED(hr)) + { + skip("Texture shaders not supported, skipping further tests.\n"); + IUnknown_Release(tx); + return; + } + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(size == 176, "Unexpected buffer size %u.\n", size); + + hr = tx->lpVtbl->GetDesc(tx, &ctab_desc); + ok(hr == S_OK, "Failed to get constant description, hr %#x.\n", hr); + ok(ctab_desc.Constants == 5, "Unexpected number of constants %u.\n", ctab_desc.Constants); + + h = tx->lpVtbl->GetConstant(tx, NULL, 0); + ok(!!h, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "b1"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 9, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + + h = tx->lpVtbl->GetConstant(tx, NULL, 1); + ok(!!h, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "b2"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 7, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 2, "Unexpected register count %u.\n", const_desc.RegisterCount); + + h = tx->lpVtbl->GetConstant(tx, NULL, 2); + ok(!!h, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "f1"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 5, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 2, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Elements == 2, "Unexpected elements count %u.\n", const_desc.Elements); + + /* Array */ + h2 = tx->lpVtbl->GetConstantElement(tx, h, 0); + ok(!!h2, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h2, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "f1"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 5, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Elements == 1, "Unexpected elements count %u.\n", const_desc.Elements); + + h2 = tx->lpVtbl->GetConstantElement(tx, h, 1); + ok(!!h2, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h2, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "f1"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 6, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Elements == 1, "Unexpected elements count %u.\n", const_desc.Elements); + + h2 = tx->lpVtbl->GetConstantElement(tx, h, 2); + ok(!h2, "Unexpected handle %p.\n", h); + + h = tx->lpVtbl->GetConstant(tx, NULL, 3); + ok(!!h, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "f2"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 10, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + + /* Structure */ + h = tx->lpVtbl->GetConstant(tx, NULL, 4); + ok(!!h, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "s1"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 0, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 5, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Class == D3DXPC_STRUCT, "Unexpected class %u.\n", const_desc.Class); + ok(const_desc.StructMembers == 5, "Unexpected member count %u.\n", const_desc.StructMembers); + + h2 = tx->lpVtbl->GetConstant(tx, h, 0); + ok(!!h2, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h2, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "b3"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 0, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Elements == 1, "Unexpected elements count %u.\n", const_desc.Elements); + + h2 = tx->lpVtbl->GetConstant(tx, h, 1); + ok(!!h2, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h2, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "f3"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 1, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Elements == 1, "Unexpected elements count %u.\n", const_desc.Elements); + + h2 = tx->lpVtbl->GetConstant(tx, h, 10); + ok(!h2, "Unexpected handle %p.\n", h); + + ID3DXBuffer_Release(buffer); + cleanup: IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); -- 2.33.0

2 1

[v2 PATCH 01/10] d3d10/effect: Return when effect creation fails.
by Matteo Bruni 26 Oct '21

26 Oct '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d10/effect.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3b4050460a0..7590bba6317 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8551,6 +8551,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl if (FAILED(hr = d3d10_create_effect(data, data_size, device, pool, 0, &object))) { WARN("Failed to create an effect, hr %#x.\n", hr); + return hr; } *effect = &object->ID3D10Effect_iface; -- 2.26.3

1 9

[v2 PATCH 3/3] d3dx10/tests: Add tests for D3DX10CreateTextureFromResource{A, W}.
by Matteo Bruni 26 Oct '21

26 Oct '21

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Mark the D3DX10_IFF_WMP failure case broken(). Supersedes patch 217576. dlls/d3dx10_43/tests/d3dx10.c | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 87c06f97780..13f70f34f96 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1974,8 +1974,10 @@ static void test_get_image_info(void) static void test_create_texture(void) { + static const WCHAR test_resource_name[] = L"resource.data"; static const WCHAR test_filename[] = L"image.data"; ID3D10Resource *resource; + HMODULE resource_module; ID3D10Device *device; WCHAR path[MAX_PATH]; unsigned int i; @@ -2075,6 +2077,53 @@ static void test_create_texture(void) winetest_pop_context(); } + /* D3DX10CreateTextureFromResource tests */ + + todo_wine + { + hr = D3DX10CreateTextureFromResourceW(device, NULL, NULL, NULL, NULL, &resource, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromResourceW(device, NULL, L"deadbeef", NULL, NULL, &resource, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromResourceA(device, NULL, NULL, NULL, NULL, &resource, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromResourceA(device, NULL, "deadbeef", NULL, NULL, &resource, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + winetest_push_context("Test %u", i); + resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); + + hr = D3DX10CreateTextureFromResourceW(device, resource_module, + test_resource_name, NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + hr = D3DX10CreateTextureFromResourceA(device, resource_module, + get_str_a(test_resource_name), NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + delete_resource_module(test_resource_name, resource_module); + winetest_pop_context(); + } + CoUninitialize(); ID3D10Device_Release(device); -- 2.26.3

1 0

[v2 PATCH 2/3] d3dx10/tests: Add tests for D3DX10CreateTextureFromFile{A, W}.
by Matteo Bruni 26 Oct '21

26 Oct '21

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Mark the D3DX10_IFF_WMP failure case broken(). Supersedes patch 217575. dlls/d3dx10_43/tests/d3dx10.c | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 84a644cb55d..87c06f97780 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1974,8 +1974,10 @@ static void test_get_image_info(void) static void test_create_texture(void) { + static const WCHAR test_filename[] = L"image.data"; ID3D10Resource *resource; ID3D10Device *device; + WCHAR path[MAX_PATH]; unsigned int i; HRESULT hr; @@ -2028,6 +2030,51 @@ static void test_create_texture(void) winetest_pop_context(); } + /* D3DX10CreateTextureFromFile tests */ + + todo_wine + { + hr = D3DX10CreateTextureFromFileW(device, NULL, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromFileW(device, L"deadbeef", NULL, NULL, &resource, NULL); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromFileA(device, NULL, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromFileA(device, "deadbeef", NULL, NULL, &resource, NULL); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + winetest_push_context("Test %u", i); + create_file(test_filename, test_image[i].data, test_image[i].size, path); + + hr = D3DX10CreateTextureFromFileW(device, path, NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + hr = D3DX10CreateTextureFromFileA(device, get_str_a(path), NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + delete_file(test_filename); + winetest_pop_context(); + } + CoUninitialize(); ID3D10Device_Release(device); -- 2.26.3

1 0

[PATCH 1/3] d3dx10/tests: Only accept D3DX10_IFF_WMP tests failure on Windows.
by Matteo Bruni 26 Oct '21

26 Oct '21

Since eb0180e7b4df18d806ceb31e4a96e9a771b4db3e we're guaranteed to have support for the format in Wine. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 70827056f5f..84a644cb55d 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1896,7 +1896,7 @@ static void test_get_image_info(void) winetest_push_context("Test %u", i); hr = D3DX10GetImageInfoFromMemory(test_image[i].data, test_image[i].size, NULL, &image_info, NULL); - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); @@ -1919,13 +1919,13 @@ static void test_get_image_info(void) create_file(test_filename, test_image[i].data, test_image[i].size, path); hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); hr = D3DX10GetImageInfoFromFileA(get_str_a(path), NULL, &image_info, NULL); - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); @@ -1952,14 +1952,14 @@ static void test_get_image_info(void) resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); hr = D3DX10GetImageInfoFromResourceW(resource_module, test_resource_name, NULL, &image_info, NULL); - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP) + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP) || broken(hr == D3DX10_ERR_INVALID_DATA) /* Vista */, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); hr = D3DX10GetImageInfoFromResourceA(resource_module, get_str_a(test_resource_name), NULL, &image_info, NULL); - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP) + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP) || broken(hr == D3DX10_ERR_INVALID_DATA) /* Vista */, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) @@ -2016,7 +2016,7 @@ static void test_create_texture(void) hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, NULL); todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) { -- 2.26.3

1 0

[PATCH 1/4] msdasql: Implement IDBProperties GetPropertyInfo
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 2 +- dlls/msdasql/msdasql_main.c | 108 +++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 13 +++- 3 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 8c99c8ea6f0..04d9cb29f2a 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -1,5 +1,5 @@ MODULE = msdasql.dll -IMPORTS = uuid +IMPORTS = uuid ole32 oleaut32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 00dbcec6780..8fac3fb23df 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -100,6 +102,76 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) return CLASS_E_CLASSNOTAVAILABLE; } +struct dbproperty +{ + const WCHAR *name; + DBPROPID id; + DBPROPOPTIONS options; + VARTYPE type; + HRESULT (*convert_dbproperty)(const WCHAR *src, VARIANT *dest); +}; + +struct mode_propval +{ + const WCHAR *name; + DWORD value; +}; + +static int __cdecl dbmodeprop_compare(const void *a, const void *b) +{ + const WCHAR *src = a; + const struct mode_propval *propval = b; + return wcsicmp(src, propval->name); +} + +static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) +{ + struct mode_propval mode_propvals[] = + { + { L"Read", DB_MODE_READ }, + { L"ReadWrite", DB_MODE_READWRITE }, + { L"Share Deny None", DB_MODE_SHARE_DENY_NONE }, + { L"Share Deny Read", DB_MODE_SHARE_DENY_READ }, + { L"Share Deny Write", DB_MODE_SHARE_DENY_WRITE }, + { L"Share Exclusive", DB_MODE_SHARE_EXCLUSIVE }, + { L"Write", DB_MODE_WRITE }, + }; + struct mode_propval *prop; + + if ((prop = bsearch(src, mode_propvals, ARRAY_SIZE(mode_propvals), + sizeof(struct mode_propval), dbmodeprop_compare))) + { + V_VT(dest) = VT_I4; + V_I4(dest) = prop->value; + TRACE("%s = %#x\n", debugstr_w(src), prop->value); + return S_OK; + } + + return E_FAIL; +} + +static const struct dbproperty dbproperties[] = +{ + { L"Password", DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Persist Security Info", DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { L"User ID", DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Data Source", DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, +#ifndef _WIN64 + { L"Window Handle", DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I4 }, +#else + { L"Window Handle", DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I8 }, +#endif + { L"Location", DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Mode", DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4, convert_dbproperty_mode }, + { L"Prompt", DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, + { L"Connect Timeout", DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Extended Properties", DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { L"Locale Identifier", DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Initial Catalog", DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"OLE DB Services", DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"General Timeout", DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, +}; + struct msdasql { IUnknown MSDASQL_iface; @@ -222,11 +294,43 @@ static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPrope DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i; + DBPROPINFOSET *infoset; + int size = 1; + OLECHAR *ptr; - FIXME("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + TRACE("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, prgPropertyInfoSets, ppDescBuffer); - return E_NOTIMPL; + infoset = CoTaskMemAlloc(sizeof(DBPROPINFOSET)); + memcpy(&infoset->guidPropertySet, &DBPROPSET_DBINIT, sizeof(GUID)); + infoset->cPropertyInfos = ARRAY_SIZE(dbproperties); + infoset->rgPropertyInfos = CoTaskMemAlloc(sizeof(DBPROPINFO) * ARRAY_SIZE(dbproperties)); + + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + size += lstrlenW(dbproperties[i].name) + 1; + } + + ptr = *ppDescBuffer = CoTaskMemAlloc(size * sizeof(WCHAR)); + memset(*ppDescBuffer, 0, size * sizeof(WCHAR)); + + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + lstrcpyW(ptr, dbproperties[i].name); + infoset->rgPropertyInfos[i].pwszDescription = ptr; + infoset->rgPropertyInfos[i].dwPropertyID = dbproperties[i].id; + infoset->rgPropertyInfos[i].dwFlags = DBPROPFLAGS_DBINIT | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE; + infoset->rgPropertyInfos[i].vtType = dbproperties[i].type; + V_VT(&infoset->rgPropertyInfos[i].vValues) = VT_EMPTY; + + ptr += lstrlenW(dbproperties[i].name) + 1; + } + + *pcPropertyInfoSets = 1; + *prgPropertyInfoSets = infoset; + + return S_OK; } static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets, diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 951ab2a7387..ff4757eb236 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -22,6 +22,7 @@ #include "msdasc.h" #include "oledb.h" #include "odbcinst.h" +#include "wtypes.h" #include "initguid.h" @@ -30,6 +31,7 @@ #include "wine/test.h" 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); static BOOL db_created; static char mdbpath[MAX_PATH]; @@ -52,16 +54,25 @@ static void test_Properties(void) infocount = 0; hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ULONG i; +#ifndef _WIN64 + VARTYPE types[14] = { VT_BSTR, VT_BOOL, VT_BSTR, VT_BSTR, VT_I4, VT_BSTR, VT_I4, VT_I2 , VT_I4, VT_BSTR, VT_I4, VT_BSTR, VT_I4, VT_I4 }; +#else + VARTYPE types[14] = { VT_BSTR, VT_BOOL, VT_BSTR, VT_BSTR, VT_I8, VT_BSTR, VT_I4, VT_I2 , VT_I4, VT_BSTR, VT_I4, VT_BSTR, VT_I4, VT_I4 }; +#endif + ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", debugstr_guid(&propinfoset->guidPropertySet)); ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); for (i = 0; i < propinfoset->cPropertyInfos; i++) { trace("%d: pwszDescription: %s\n", i, debugstr_w(propinfoset->rgPropertyInfos[i].pwszDescription) ); + ok(propinfoset->rgPropertyInfos[i].vtType == types[i], "got %d\n", propinfoset->rgPropertyInfos[i].vtType); + ok(propinfoset->rgPropertyInfos[i].dwFlags == (DBPROPFLAGS_DBINIT | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE), + "got %d\n", propinfoset->rgPropertyInfos[i].dwFlags); } for (i = 0; i < propinfoset->cPropertyInfos; i++) -- 2.33.0

3 2

[PATCH] ntdll: Fix alignment mask size in RtlInitializeExtendedContext2().
by Paul Gofman 26 Oct '21

26 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 3c499c4fa80..c3714e8369b 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -837,7 +837,7 @@ NTSTATUS WINAPI RtlInitializeExtendedContext2( void *context, ULONG context_flag if ((context_flags & 0x40) && !(supported_mask = RtlGetEnabledExtendedFeatures( ~(ULONG64)0 ))) return STATUS_NOT_SUPPORTED; - context = (void *)(((ULONG_PTR)context + p->true_alignment) & ~p->true_alignment); + context = (void *)(((ULONG_PTR)context + p->true_alignment) & ~(ULONG_PTR)p->true_alignment); *(ULONG *)((BYTE *)context + p->flags_offset) = context_flags; *context_ex = c_ex = (CONTEXT_EX *)((BYTE *)context + p->context_size); -- 2.31.1

1 0

[PATCH] mfplay: Trace normalized rectangle arguments.
by Nikolay Sivov 26 Oct '21

26 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 6f8d4942a0b..12ea653b97d 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -53,6 +53,12 @@ static void platform_shutdown(void) MFShutdown(); } +static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect *rect) +{ + if (!rect) return "(null)"; + return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); +} + struct media_item { IMFPMediaItem IMFPMediaItem_iface; @@ -1437,7 +1443,7 @@ static HRESULT WINAPI media_player_SetVideoSourceRect(IMFPMediaPlayer *iface, RECT dst_rect; HRESULT hr; - TRACE("%p, %p.\n", iface, rect); + TRACE("%p, %s.\n", iface, debugstr_normalized_rect(rect)); if (!GetClientRect(player->output_window, &dst_rect)) hr = HRESULT_FROM_WIN32(GetLastError()); -- 2.33.0

1 0

[PATCH 1/2] evr/presenter: Remove scaling by zoom rectangle.
by Nikolay Sivov 26 Oct '21

26 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Zooming should be handled by the mixer. dlls/evr/presenter.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index bf0f89df0eb..b8b18638185 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -460,21 +460,6 @@ static HRESULT video_presenter_get_sample_surface(IMFSample *sample, IDirect3DSu return hr; } -static void scale_rect(RECT *rect, unsigned int width, unsigned int height, const MFVideoNormalizedRect *scale) -{ - if (rect->left == 0.0f && rect->top == 0.0f && rect->right == 1.0f && rect->bottom == 1.0f) - { - SetRect(rect, 0, 0, width, height); - } - else - { - rect->left = width * scale->left; - rect->right = width * scale->right; - rect->top = height * scale->top; - rect->bottom = height * scale->bottom; - } -} - static void video_presenter_sample_present(struct video_presenter *presenter, IMFSample *sample) { IDirect3DSurface9 *surface, *backbuffer; @@ -503,7 +488,7 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT); IDirect3DSurface9_GetDesc(surface, &desc); - scale_rect(&src, desc.Width, desc.Height, &presenter->src_rect); + SetRect(&src, 0, 0, desc.Width, desc.Height); IDirect3DSurface9_GetDesc(backbuffer, &desc); SetRect(&dst, 0, 0, desc.Width, desc.Height); -- 2.33.0

1 1

[PATCH 2/2] vcomp: Add _vcomp_for_static_simple_init_i8 implementation.
by Piotr Caban 26 Oct '21

26 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43546 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48377 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcomp/main.c | 52 ++++++++++++ dlls/vcomp/tests/vcomp.c | 154 ++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp120/vcomp120.spec | 2 +- dlls/vcomp140/vcomp140.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 8 files changed, 212 insertions(+), 6 deletions(-)

1 0

[PATCH 1/2] vcomp: Add _vcomp_for_static_init_i8 implementation.
by Piotr Caban 26 Oct '21

26 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcomp/main.c | 73 +++++++++++ dlls/vcomp/tests/vcomp.c | 254 ++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp120/vcomp120.spec | 2 +- dlls/vcomp140/vcomp140.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 8 files changed, 333 insertions(+), 6 deletions(-)

1 0

[PATCH 1/3] winepulse.drv: Move pulse_write helper around.
by Rémi Bernon 26 Oct '21

26 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 380 ++++++++++++++++++------------------- 1 file changed, 190 insertions(+), 190 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 98b4a1ec964..590122cc7b1 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -270,6 +270,196 @@ static void pulse_started_callback(pa_stream *s, void *userdata) TRACE("%p: (Re)started playing\n", userdata); } +static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes) +{ + memset(buffer, format == PA_SAMPLE_U8 ? 0x80 : 0, bytes); +} + +static int write_buffer(const struct pulse_stream *stream, BYTE *buffer, UINT32 bytes) +{ + const float *vol = stream->vol; + UINT32 i, channels, mute = 0; + BOOL adjust = FALSE; + BYTE *end; + + if (!bytes) return 0; + + /* Adjust the buffer based on the volume for each channel */ + channels = stream->ss.channels; + for (i = 0; i < channels; i++) + { + adjust |= vol[i] != 1.0f; + if (vol[i] == 0.0f) + mute++; + } + if (mute == channels) + { + silence_buffer(stream->ss.format, buffer, bytes); + goto write; + } + if (!adjust) goto write; + + end = buffer + bytes; + switch (stream->ss.format) + { +#ifndef WORDS_BIGENDIAN +#define PROCESS_BUFFER(type) do \ +{ \ + type *p = (type*)buffer; \ + do \ + { \ + for (i = 0; i < channels; i++) \ + p[i] = p[i] * vol[i]; \ + p += i; \ + } while ((BYTE*)p != end); \ +} while (0) + case PA_SAMPLE_S16LE: + PROCESS_BUFFER(INT16); + break; + case PA_SAMPLE_S32LE: + PROCESS_BUFFER(INT32); + break; + case PA_SAMPLE_FLOAT32LE: + PROCESS_BUFFER(float); + break; +#undef PROCESS_BUFFER + case PA_SAMPLE_S24_32LE: + { + UINT32 *p = (UINT32*)buffer; + do + { + for (i = 0; i < channels; i++) + { + p[i] = (INT32)((INT32)(p[i] << 8) * vol[i]); + p[i] >>= 8; + } + p += i; + } while ((BYTE*)p != end); + break; + } + case PA_SAMPLE_S24LE: + { + /* do it 12 bytes at a time until it is no longer possible */ + UINT32 *q = (UINT32*)buffer; + BYTE *p; + + i = 0; + while (end - (BYTE*)q >= 12) + { + UINT32 v[4], k; + v[0] = q[0] << 8; + v[1] = q[1] << 16 | (q[0] >> 16 & ~0xff); + v[2] = q[2] << 24 | (q[1] >> 8 & ~0xff); + v[3] = q[2] & ~0xff; + for (k = 0; k < 4; k++) + { + v[k] = (INT32)((INT32)v[k] * vol[i]); + if (++i == channels) i = 0; + } + *q++ = v[0] >> 8 | (v[1] & ~0xff) << 16; + *q++ = v[1] >> 16 | (v[2] & ~0xff) << 8; + *q++ = v[2] >> 24 | (v[3] & ~0xff); + } + p = (BYTE*)q; + while (p != end) + { + UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * vol[i]); + *p++ = v >> 8 & 0xff; + *p++ = v >> 16 & 0xff; + *p++ = v >> 24; + if (++i == channels) i = 0; + } + break; + } +#endif + case PA_SAMPLE_U8: + { + UINT8 *p = (UINT8*)buffer; + do + { + for (i = 0; i < channels; i++) + p[i] = (int)((p[i] - 128) * vol[i]) + 128; + p += i; + } while ((BYTE*)p != end); + break; + } + case PA_SAMPLE_ALAW: + { + UINT8 *p = (UINT8*)buffer; + do + { + for (i = 0; i < channels; i++) + p[i] = mult_alaw_sample(p[i], vol[i]); + p += i; + } while ((BYTE*)p != end); + break; + } + case PA_SAMPLE_ULAW: + { + UINT8 *p = (UINT8*)buffer; + do + { + for (i = 0; i < channels; i++) + p[i] = mult_ulaw_sample(p[i], vol[i]); + p += i; + } while ((BYTE*)p != end); + break; + } + default: + TRACE("Unhandled format %i, not adjusting volume.\n", stream->ss.format); + break; + } + +write: + return pa_stream_write(stream->stream, buffer, bytes, NULL, 0, PA_SEEK_RELATIVE); +} + +static void pulse_write(struct pulse_stream *stream) +{ + /* write as much data to PA as we can */ + UINT32 to_write; + BYTE *buf = stream->local_buffer + stream->pa_offs_bytes; + UINT32 bytes = pa_stream_writable_size(stream->stream); + + if (stream->just_underran) + { + /* prebuffer with silence if needed */ + if(stream->pa_held_bytes < bytes){ + to_write = bytes - stream->pa_held_bytes; + TRACE("prebuffering %u frames of silence\n", + (int)(to_write / pa_frame_size(&stream->ss))); + buf = calloc(1, to_write); + pa_stream_write(stream->stream, buf, to_write, NULL, 0, PA_SEEK_RELATIVE); + free(buf); + } + + stream->just_underran = FALSE; + } + + buf = stream->local_buffer + stream->pa_offs_bytes; + TRACE("held: %lu, avail: %u\n", stream->pa_held_bytes, bytes); + bytes = min(stream->pa_held_bytes, bytes); + + if (stream->pa_offs_bytes + bytes > stream->real_bufsize_bytes) + { + to_write = stream->real_bufsize_bytes - stream->pa_offs_bytes; + TRACE("writing small chunk of %u bytes\n", to_write); + write_buffer(stream, buf, to_write); + stream->pa_held_bytes -= to_write; + to_write = bytes - to_write; + stream->pa_offs_bytes = 0; + buf = stream->local_buffer; + } + else + to_write = bytes; + + TRACE("writing main chunk of %u bytes\n", to_write); + write_buffer(stream, buf, to_write); + stream->pa_offs_bytes += to_write; + stream->pa_offs_bytes %= stream->real_bufsize_bytes; + stream->pa_held_bytes -= to_write; +} + static void pulse_op_cb(pa_stream *s, int success, void *user) { TRACE("Success: %i\n", success); @@ -277,11 +467,6 @@ static void pulse_op_cb(pa_stream *s, int success, void *user) pulse_broadcast(); } -static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes) -{ - memset(buffer, format == PA_SAMPLE_U8 ? 0x80 : 0, bytes); -} - static BOOL pulse_stream_valid(struct pulse_stream *stream) { return pa_stream_get_state(stream->stream) == PA_STREAM_READY; @@ -958,191 +1143,6 @@ static NTSTATUS pulse_release_stream(void *args) return STATUS_SUCCESS; } -static int write_buffer(const struct pulse_stream *stream, BYTE *buffer, UINT32 bytes) -{ - const float *vol = stream->vol; - UINT32 i, channels, mute = 0; - BOOL adjust = FALSE; - BYTE *end; - - if (!bytes) return 0; - - /* Adjust the buffer based on the volume for each channel */ - channels = stream->ss.channels; - for (i = 0; i < channels; i++) - { - adjust |= vol[i] != 1.0f; - if (vol[i] == 0.0f) - mute++; - } - if (mute == channels) - { - silence_buffer(stream->ss.format, buffer, bytes); - goto write; - } - if (!adjust) goto write; - - end = buffer + bytes; - switch (stream->ss.format) - { -#ifndef WORDS_BIGENDIAN -#define PROCESS_BUFFER(type) do \ -{ \ - type *p = (type*)buffer; \ - do \ - { \ - for (i = 0; i < channels; i++) \ - p[i] = p[i] * vol[i]; \ - p += i; \ - } while ((BYTE*)p != end); \ -} while (0) - case PA_SAMPLE_S16LE: - PROCESS_BUFFER(INT16); - break; - case PA_SAMPLE_S32LE: - PROCESS_BUFFER(INT32); - break; - case PA_SAMPLE_FLOAT32LE: - PROCESS_BUFFER(float); - break; -#undef PROCESS_BUFFER - case PA_SAMPLE_S24_32LE: - { - UINT32 *p = (UINT32*)buffer; - do - { - for (i = 0; i < channels; i++) - { - p[i] = (INT32)((INT32)(p[i] << 8) * vol[i]); - p[i] >>= 8; - } - p += i; - } while ((BYTE*)p != end); - break; - } - case PA_SAMPLE_S24LE: - { - /* do it 12 bytes at a time until it is no longer possible */ - UINT32 *q = (UINT32*)buffer; - BYTE *p; - - i = 0; - while (end - (BYTE*)q >= 12) - { - UINT32 v[4], k; - v[0] = q[0] << 8; - v[1] = q[1] << 16 | (q[0] >> 16 & ~0xff); - v[2] = q[2] << 24 | (q[1] >> 8 & ~0xff); - v[3] = q[2] & ~0xff; - for (k = 0; k < 4; k++) - { - v[k] = (INT32)((INT32)v[k] * vol[i]); - if (++i == channels) i = 0; - } - *q++ = v[0] >> 8 | (v[1] & ~0xff) << 16; - *q++ = v[1] >> 16 | (v[2] & ~0xff) << 8; - *q++ = v[2] >> 24 | (v[3] & ~0xff); - } - p = (BYTE*)q; - while (p != end) - { - UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * vol[i]); - *p++ = v >> 8 & 0xff; - *p++ = v >> 16 & 0xff; - *p++ = v >> 24; - if (++i == channels) i = 0; - } - break; - } -#endif - case PA_SAMPLE_U8: - { - UINT8 *p = (UINT8*)buffer; - do - { - for (i = 0; i < channels; i++) - p[i] = (int)((p[i] - 128) * vol[i]) + 128; - p += i; - } while ((BYTE*)p != end); - break; - } - case PA_SAMPLE_ALAW: - { - UINT8 *p = (UINT8*)buffer; - do - { - for (i = 0; i < channels; i++) - p[i] = mult_alaw_sample(p[i], vol[i]); - p += i; - } while ((BYTE*)p != end); - break; - } - case PA_SAMPLE_ULAW: - { - UINT8 *p = (UINT8*)buffer; - do - { - for (i = 0; i < channels; i++) - p[i] = mult_ulaw_sample(p[i], vol[i]); - p += i; - } while ((BYTE*)p != end); - break; - } - default: - TRACE("Unhandled format %i, not adjusting volume.\n", stream->ss.format); - break; - } - -write: - return pa_stream_write(stream->stream, buffer, bytes, NULL, 0, PA_SEEK_RELATIVE); -} - -static void pulse_write(struct pulse_stream *stream) -{ - /* write as much data to PA as we can */ - UINT32 to_write; - BYTE *buf = stream->local_buffer + stream->pa_offs_bytes; - UINT32 bytes = pa_stream_writable_size(stream->stream); - - if (stream->just_underran) - { - /* prebuffer with silence if needed */ - if(stream->pa_held_bytes < bytes){ - to_write = bytes - stream->pa_held_bytes; - TRACE("prebuffering %u frames of silence\n", - (int)(to_write / pa_frame_size(&stream->ss))); - buf = calloc(1, to_write); - pa_stream_write(stream->stream, buf, to_write, NULL, 0, PA_SEEK_RELATIVE); - free(buf); - } - - stream->just_underran = FALSE; - } - - buf = stream->local_buffer + stream->pa_offs_bytes; - TRACE("held: %lu, avail: %u\n", stream->pa_held_bytes, bytes); - bytes = min(stream->pa_held_bytes, bytes); - - if (stream->pa_offs_bytes + bytes > stream->real_bufsize_bytes) - { - to_write = stream->real_bufsize_bytes - stream->pa_offs_bytes; - TRACE("writing small chunk of %u bytes\n", to_write); - write_buffer(stream, buf, to_write); - stream->pa_held_bytes -= to_write; - to_write = bytes - to_write; - stream->pa_offs_bytes = 0; - buf = stream->local_buffer; - } - else - to_write = bytes; - - TRACE("writing main chunk of %u bytes\n", to_write); - write_buffer(stream, buf, to_write); - stream->pa_offs_bytes += to_write; - stream->pa_offs_bytes %= stream->real_bufsize_bytes; - stream->pa_held_bytes -= to_write; -} - static void pulse_read(struct pulse_stream *stream) { size_t bytes = pa_stream_readable_size(stream->stream); -- 2.33.0

1 2

[PATCH v3 resend] po: Update Traditional Chinese translation.
by Chilung Chan 26 Oct '21

26 Oct '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- v3: Applied suggestions from review for v2. po/zh_TW.po | 1288 ++++++++++++++++++++++++--------------------------- 1 file changed, 603 insertions(+), 685 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a8312e8bcec..cd87da7bbf1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,9 +5,9 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-28 00:06+0800\n" -"Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" -"Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" +"PO-Revision-Date: 2021-10-23 18:45+0800\n" +"Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,36 +20,30 @@ msgid "Security" msgstr "安全性" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "使用者名稱(&U)：" +msgstr "群組或使用者名稱(&G):" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "黃色" +msgstr "允許" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "拒絕" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "存取被拒。\n" +msgstr "%1 的權限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" -msgstr "安裝/移除" +msgstr "安裝/解除安裝" #: dlls/appwiz.cpl/appwiz.rc:61 msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "要從軟碟、光碟或硬碟安裝新程式，請按「安裝」。" +msgstr "要從軟碟、光碟或硬碟安裝新程式，請按 [安裝]。" #: dlls/appwiz.cpl/appwiz.rc:62 msgid "&Install..." @@ -61,8 +55,8 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"下列軟體可以自動解除安裝。從清單中選取它並按下「新增/移除」，可以移除程式或" -"者調整已安裝元件。" +"下列軟體可以自動解除安裝。要移除程式或者調整已安裝元件，請從清單中選取程式" +"並按下 [修改/移除]。" #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -123,39 +117,39 @@ msgstr "確定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技術支援資訊：" +msgstr "以下資訊可協助取得 %s 的技術支援:" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生產商：" +msgstr "發行者:" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" -msgstr "版本：" +msgstr "版本:" #: dlls/appwiz.cpl/appwiz.rc:82 msgid "Contact:" -msgstr "聯絡人：" +msgstr "聯絡人:" #: dlls/appwiz.cpl/appwiz.rc:83 msgid "Support Information:" -msgstr "支援資訊：" +msgstr "支援資訊:" #: dlls/appwiz.cpl/appwiz.rc:84 msgid "Support Telephone:" -msgstr "支援電話：" +msgstr "支援電話:" #: dlls/appwiz.cpl/appwiz.rc:85 msgid "Readme:" -msgstr "產品說明：" +msgstr "產品說明:" #: dlls/appwiz.cpl/appwiz.rc:86 msgid "Product Updates:" -msgstr "產品更新：" +msgstr "產品更新:" #: dlls/appwiz.cpl/appwiz.rc:87 msgid "Comments:" -msgstr "備註：" +msgstr "備註:" #: dlls/appwiz.cpl/appwiz.rc:100 msgid "Wine Gecko Installer" @@ -174,8 +168,8 @@ msgstr "" "Wine 需要安裝 Gecko 套件才能正確顯示嵌在應用程式中的 HTML 網頁。Wine 可以自動" "幫您下載並安裝 Gecko。\n" "\n" -"備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Gecko\">https://wiki.winehq.org/Gecko</a>" +"備註: 建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" +"Gecko\">https://wiki.winehq.org/Gecko</a>。" #: dlls/appwiz.cpl/appwiz.rc:109 dlls/appwiz.cpl/appwiz.rc:124 msgid "&Install" @@ -241,8 +235,8 @@ msgstr "" "Wine 需要安裝 wine-mono 套件才能正確執行 .NET 應用程式。Wine 可以自動幫您下載" "並安裝它。\n" "\n" -"備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Mono\">https://wiki.winehq.org/Mono</a>" +"備註: 建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" +"Mono\">https://wiki.winehq.org/Mono</a>。" #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" @@ -263,7 +257,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式 %s。您想將這個移除程式從註冊表中刪除嗎？" +msgstr "無法執行移除程式「%s」。您想將這個移除程式從註冊表中移除嗎？" #: dlls/appwiz.cpl/appwiz.rc:36 msgid "Not specified" @@ -277,7 +271,7 @@ msgstr "名稱" #: dlls/appwiz.cpl/appwiz.rc:39 msgid "Publisher" -msgstr "生產商" +msgstr "發行者" #: dlls/appwiz.cpl/appwiz.rc:40 dlls/cryptui/cryptui.rc:54 msgid "Version" @@ -323,7 +317,7 @@ msgstr "壓縮選項" #: dlls/avifil32/avifil32.rc:45 msgid "&Choose a stream:" -msgstr "選擇來源(&C)：" +msgstr "選擇來源(&C):" #: dlls/avifil32/avifil32.rc:48 programs/wordpad/wordpad.rc:76 msgid "&Options..." @@ -331,7 +325,7 @@ msgstr "選項(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交錯(&I)" +msgstr "交錯(&I): 每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -339,11 +333,11 @@ msgstr "影格數" #: dlls/avifil32/avifil32.rc:52 msgid "Current format:" -msgstr "目前格式：" +msgstr "目前格式:" #: dlls/avifil32/avifil32.rc:30 msgid "Waveform: %s" -msgstr "波形：%s" +msgstr "波形: %s" #: dlls/avifil32/avifil32.rc:31 msgid "Waveform" @@ -363,7 +357,7 @@ msgstr "音訊" #: dlls/avifil32/avifil32.rc:36 msgid "Wine AVI-default-filehandler" -msgstr "Wine AVI-預設處理器" +msgstr "Wine AVI 預設處理器" #: dlls/avifil32/avifil32.rc:37 msgid "uncompressed" @@ -375,29 +369,27 @@ msgstr "正在取消..." #: dlls/browseui/browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2" #: dlls/browseui/browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2 %3!u! %4" #: dlls/browseui/browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "秒(&S)" +msgstr "秒" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "分" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "小時" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" -msgstr "屬性 %s" +msgstr "%s 的內容" #: dlls/comctl32/comctl32.rc:73 dlls/comdlg32/comdlg32.rc:265 msgid "&Apply" @@ -438,7 +430,7 @@ msgstr "關閉(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "重置(&e)" +msgstr "重置(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -458,7 +450,7 @@ msgstr "重置(&e)" #: programs/winemine/winemine.rc:53 programs/winhlp32/winhlp32.rc:57 #: programs/wordpad/wordpad.rc:102 msgid "&Help" -msgstr "求助(&H)" +msgstr "說明(&H)" #: dlls/comctl32/comctl32.rc:103 msgid "Move &Up" @@ -470,7 +462,7 @@ msgstr "下移(&D)" #: dlls/comctl32/comctl32.rc:105 msgid "A&vailable buttons:" -msgstr "可用工具列按鈕(&V)：" +msgstr "可用工具列按鈕(&V):" #: dlls/comctl32/comctl32.rc:107 msgid "&Add ->" @@ -482,7 +474,7 @@ msgstr "<- 移除(&R)" #: dlls/comctl32/comctl32.rc:109 msgid "&Toolbar buttons:" -msgstr "目前工具列按鈕(&T)：" +msgstr "目前工具列按鈕(&T):" #: dlls/comctl32/comctl32.rc:42 msgid "Separator" @@ -508,16 +500,12 @@ msgid "&Retry" msgstr "重試(&R)" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "隱藏分頁(&T)" +msgstr "隱藏詳細資訊" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "詳細資料" +msgstr "顯示詳細資訊" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -528,7 +516,7 @@ msgstr "關閉" #: dlls/comctl32/comctl32.rc:36 msgid "Today:" -msgstr "今天：" +msgstr "今天:" #: dlls/comctl32/comctl32.rc:37 msgid "Go to today" @@ -543,19 +531,19 @@ msgstr "開啟" #: dlls/comdlg32/comdlg32.rc:161 dlls/comdlg32/comdlg32.rc:183 msgid "File &Name:" -msgstr "檔案名稱(&N)：" +msgstr "檔案名稱(&N):" #: dlls/comdlg32/comdlg32.rc:164 dlls/comdlg32/comdlg32.rc:186 msgid "&Directories:" -msgstr "目錄(&D)：" +msgstr "目錄(&D):" #: dlls/comdlg32/comdlg32.rc:167 dlls/comdlg32/comdlg32.rc:189 msgid "List Files of &Type:" -msgstr "檔案類型(&T)：" +msgstr "檔案類型(&T):" #: dlls/comdlg32/comdlg32.rc:169 dlls/comdlg32/comdlg32.rc:191 msgid "Dri&ves:" -msgstr "磁碟機(&V)：" +msgstr "磁碟機(&V):" #: dlls/comdlg32/comdlg32.rc:174 dlls/comdlg32/comdlg32.rc:196 #: dlls/shell32/shell32.rc:368 dlls/shell32/shell32.rc:405 @@ -579,7 +567,7 @@ msgstr "列印" #: dlls/comdlg32/comdlg32.rc:205 msgid "Printer:" -msgstr "印表機：" +msgstr "印表機:" #: dlls/comdlg32/comdlg32.rc:207 dlls/comdlg32/comdlg32.rc:375 msgid "Print range" @@ -604,15 +592,15 @@ msgstr "設定(&S)" #: dlls/comdlg32/comdlg32.rc:214 msgid "&From:" -msgstr "從(&F)：" +msgstr "從(&F):" #: dlls/comdlg32/comdlg32.rc:215 msgid "&To:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:216 dlls/wineps.drv/wineps.rc:42 msgid "Print &Quality:" -msgstr "列印品質(&Q)：" +msgstr "列印品質(&Q):" #: dlls/comdlg32/comdlg32.rc:218 msgid "Print to Fi&le" @@ -641,7 +629,7 @@ msgstr "[無]" #: dlls/comdlg32/comdlg32.rc:231 msgid "Specific &Printer" -msgstr "特定的印表機(&P)" +msgstr "指定的印表機(&P)" #: dlls/comdlg32/comdlg32.rc:236 dlls/comdlg32/comdlg32.rc:419 #: dlls/comdlg32/comdlg32.rc:443 dlls/wineps.drv/wineps.rc:34 @@ -676,16 +664,16 @@ msgstr "字型" #: dlls/comdlg32/comdlg32.rc:254 msgid "&Font:" -msgstr "字型(&F)：" +msgstr "字型(&F):" #: dlls/comdlg32/comdlg32.rc:257 msgid "Font St&yle:" -msgstr "字型樣式(&Y)：" +msgstr "字型樣式(&Y):" #: dlls/comdlg32/comdlg32.rc:260 dlls/comdlg32/comdlg32.rc:439 #: programs/winecfg/winecfg.rc:292 msgid "&Size:" -msgstr "大小(&S)：" +msgstr "大小(&S):" #: dlls/comdlg32/comdlg32.rc:267 msgid "Effects" @@ -701,7 +689,7 @@ msgstr "底線(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "色彩(&C):" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -709,7 +697,7 @@ msgstr "範例" #: dlls/comdlg32/comdlg32.rc:275 msgid "Scr&ipt:" -msgstr "腳本(&I)：" +msgstr "指令碼(&I):" #: dlls/comdlg32/comdlg32.rc:283 dlls/comdlg32/comdlg32.rc:288 msgid "Color" @@ -717,56 +705,54 @@ msgstr "色彩" #: dlls/comdlg32/comdlg32.rc:286 msgid "&Basic Colors:" -msgstr "基本色彩(&B)：" +msgstr "基本色彩(&B):" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定色彩(&C)：" +msgstr "自訂色彩(&C):" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|純色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" -msgstr "紅(&R)：" +msgstr "紅(&R):" #: dlls/comdlg32/comdlg32.rc:292 msgid "&Green:" -msgstr "綠(&G)：" +msgstr "綠(&G):" #: dlls/comdlg32/comdlg32.rc:294 msgid "&Blue:" -msgstr "藍(&B)：" +msgstr "藍(&B):" #: dlls/comdlg32/comdlg32.rc:296 msgid "&Hue:" -msgstr "色調(&H)：" +msgstr "色調(&H):" #: dlls/comdlg32/comdlg32.rc:298 msgctxt "Saturation" msgid "&Sat:" -msgstr "飽和度(&S)：" +msgstr "飽和度(&S):" #: dlls/comdlg32/comdlg32.rc:300 msgctxt "Luminance" msgid "&Lum:" -msgstr "亮度(&L)：" +msgstr "亮度(&L):" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" -msgstr "新增自定色彩(&A)" +msgstr "新增自訂色彩(&A)" #: dlls/comdlg32/comdlg32.rc:311 msgid "&Define Custom Colors >>" -msgstr "定義自定色彩(&D) >>" +msgstr "定義自訂色彩(&D) >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "否(&N)" +msgstr "&o" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -775,7 +761,7 @@ msgstr "搜尋" #: dlls/comdlg32/comdlg32.rc:321 dlls/comdlg32/comdlg32.rc:340 msgid "Fi&nd What:" -msgstr "搜尋目標(&N)：" +msgstr "搜尋目標(&N):" #: dlls/comdlg32/comdlg32.rc:323 dlls/comdlg32/comdlg32.rc:344 msgid "Match &Whole Word Only" @@ -807,7 +793,7 @@ msgstr "取代" #: dlls/comdlg32/comdlg32.rc:342 msgid "Re&place With:" -msgstr "取代為(&P)：" +msgstr "取代為(&P):" #: dlls/comdlg32/comdlg32.rc:348 msgid "&Replace" @@ -822,7 +808,7 @@ msgstr "取代全部(&A)" #: dlls/shell32/shell32.rc:108 programs/clock/clock.rc:31 #: programs/conhost/conhost.rc:34 msgid "&Properties" -msgstr "屬性(&P)" +msgstr "內容(&P)" #: dlls/comdlg32/comdlg32.rc:364 msgid "Print to fi&le" @@ -831,23 +817,23 @@ msgstr "列印至檔案(&L)" #: dlls/comdlg32/comdlg32.rc:365 dlls/comdlg32/comdlg32.rc:401 #: dlls/msacm32/msacm32.rc:34 programs/winefile/winefile.rc:137 msgid "&Name:" -msgstr "名稱(&N)：" +msgstr "名稱(&N):" #: dlls/comdlg32/comdlg32.rc:366 dlls/comdlg32/comdlg32.rc:404 msgid "Status:" -msgstr "狀態：" +msgstr "狀態:" #: dlls/comdlg32/comdlg32.rc:368 dlls/comdlg32/comdlg32.rc:406 msgid "Type:" -msgstr "類型：" +msgstr "類型:" #: dlls/comdlg32/comdlg32.rc:370 dlls/comdlg32/comdlg32.rc:408 msgid "Where:" -msgstr "位置：" +msgstr "位置:" #: dlls/comdlg32/comdlg32.rc:372 dlls/comdlg32/comdlg32.rc:410 msgid "Comment:" -msgstr "備註：" +msgstr "備註:" #: dlls/comdlg32/comdlg32.rc:377 msgid "Pa&ges" @@ -859,11 +845,11 @@ msgstr "選擇(&S)" #: dlls/comdlg32/comdlg32.rc:381 msgid "&from:" -msgstr "從(&F)：" +msgstr "從(&F):" #: dlls/comdlg32/comdlg32.rc:382 msgid "&to:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:384 msgid "Copies" @@ -871,7 +857,7 @@ msgstr "份數" #: dlls/comdlg32/comdlg32.rc:385 msgid "Number of &copies:" -msgstr "份數(&C)：" +msgstr "份數(&C):" #: dlls/comdlg32/comdlg32.rc:387 msgid "C&ollate" @@ -879,11 +865,11 @@ msgstr "自動分頁(&O)" #: dlls/comdlg32/comdlg32.rc:414 programs/winecfg/winecfg.rc:298 msgid "Si&ze:" -msgstr "大小(&Z)：" +msgstr "大小(&Z):" #: dlls/comdlg32/comdlg32.rc:416 msgid "&Source:" -msgstr "來源(&S)：" +msgstr "來源(&S):" #: dlls/comdlg32/comdlg32.rc:421 msgid "P&ortrait" @@ -899,7 +885,7 @@ msgstr "設定頁面" #: dlls/comdlg32/comdlg32.rc:441 msgid "&Tray:" -msgstr "進紙匣(&T)：" +msgstr "進紙匣(&T):" #: dlls/comdlg32/comdlg32.rc:444 dlls/wineps.drv/wineps.rc:35 msgid "&Portrait" @@ -907,19 +893,19 @@ msgstr "縱向(&P)" #: dlls/comdlg32/comdlg32.rc:447 msgid "L&eft:" -msgstr "左(&E)：" +msgstr "左(&E):" #: dlls/comdlg32/comdlg32.rc:449 programs/notepad/notepad.rc:112 msgid "&Right:" -msgstr "右(&R)：" +msgstr "右(&R):" #: dlls/comdlg32/comdlg32.rc:451 msgid "T&op:" -msgstr "上(&O)：" +msgstr "上(&O):" #: dlls/comdlg32/comdlg32.rc:453 programs/notepad/notepad.rc:114 msgid "&Bottom:" -msgstr "下(&B)：" +msgstr "下(&B):" #: dlls/comdlg32/comdlg32.rc:457 msgid "P&rinter..." @@ -927,19 +913,19 @@ msgstr "印表機(&R)..." #: dlls/comdlg32/comdlg32.rc:465 dlls/comdlg32/comdlg32.rc:490 msgid "Look &in:" -msgstr "搜尋位置(&I)：" +msgstr "搜尋位置(&I):" #: dlls/comdlg32/comdlg32.rc:471 dlls/comdlg32/comdlg32.rc:497 msgid "File &name:" -msgstr "檔案名稱(&N)：" +msgstr "檔案名稱(&N):" #: dlls/comdlg32/comdlg32.rc:475 dlls/comdlg32/comdlg32.rc:501 msgid "Files of &type:" -msgstr "檔案類型(&T)：" +msgstr "檔案類型(&T):" #: dlls/comdlg32/comdlg32.rc:478 dlls/comdlg32/comdlg32.rc:504 msgid "Open as &read-only" -msgstr "開啟成唯讀(&R)" +msgstr "以唯讀方式開啟(&R)" #: dlls/comdlg32/comdlg32.rc:480 dlls/comdlg32/comdlg32.rc:506 #: dlls/comdlg32/comdlg32.rc:524 dlls/shdoclc/shdoclc.rc:127 @@ -949,11 +935,11 @@ msgstr "開啟(&O)" #: dlls/comdlg32/comdlg32.rc:517 msgid "File name:" -msgstr "檔案名稱：" +msgstr "檔案名稱:" #: dlls/comdlg32/comdlg32.rc:520 msgid "Files of type:" -msgstr "檔案類型：" +msgstr "檔案類型:" #: dlls/comdlg32/comdlg32.rc:33 dlls/vbscript/vbscript.rc:35 msgid "File not found" @@ -961,7 +947,7 @@ msgstr "找不到檔案" #: dlls/comdlg32/comdlg32.rc:34 msgid "Please verify that the correct file name was given" -msgstr "請檢查是否給予正確的檔案名稱。" +msgstr "請檢查是否給予正確的檔案名稱" #: dlls/comdlg32/comdlg32.rc:35 msgid "" @@ -969,7 +955,7 @@ msgid "" "Do you want to create file?" msgstr "" "找不到檔案\n" -"是否建立新檔案？" +"是否建立新檔案?" #: dlls/comdlg32/comdlg32.rc:36 msgid "" @@ -977,23 +963,23 @@ msgid "" "Do you want to replace it?" msgstr "" "檔案已經存在。\n" -"要取代嗎？" +"您要取代它嗎?" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" -msgstr "檔案名稱中存在無效的字元" +msgstr "路徑中存在無效的字元" #: dlls/comdlg32/comdlg32.rc:38 msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"檔案名中不能包含任何一下字元:\n" +"檔案名稱中不能包含以下任何一個字元:\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 msgid "Path does not exist" -msgstr "資料夾不存在" +msgstr "路徑不存在" #: dlls/comdlg32/comdlg32.rc:40 msgid "File does not exist" @@ -1001,7 +987,7 @@ msgstr "檔案不存在" #: dlls/comdlg32/comdlg32.rc:41 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "已選項目包含非資料夾物件" #: dlls/comdlg32/comdlg32.rc:46 msgid "Up One Level" @@ -1106,7 +1092,7 @@ msgstr "白色" #: dlls/comdlg32/comdlg32.rc:57 msgid "Unreadable Entry" -msgstr "數值不可讀" +msgstr "無法讀取的數值" #: dlls/comdlg32/comdlg32.rc:59 msgid "" @@ -1114,19 +1100,19 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "輸入值不在頁數範圍內。\n" -"請輸入一個 %1!d! 和 %2!d! 之間的值。" +"請輸入一個介於 %1!d! 和 %2!d! 之間的值。" #: dlls/comdlg32/comdlg32.rc:61 msgid "The 'from' entry cannot exceed the 'to' entry." -msgstr "起始值不能大於終點值。" +msgstr "「從」項的值不能大於「到」項的值。" #: dlls/comdlg32/comdlg32.rc:63 msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"邊緣空白重疊或落於邊界外，\n" -"請重新輸入邊緣空白。" +"頁面邊距重疊或落於邊界外。\n" +"請重新輸入頁面邊距。" #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -1137,8 +1123,8 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"您的印表機不支持這麼大的份數。\n" -"請輸入一個 1 和 %d 之間的數。" +"您的印表機不支援列印這麼大的份數。\n" +"請輸入一個介於 1 和 %d 之間的數值。" #: dlls/comdlg32/comdlg32.rc:68 msgid "A printer error occurred." @@ -1162,19 +1148,19 @@ msgstr "發生錯誤。" #: dlls/comdlg32/comdlg32.rc:73 msgid "Unknown printer driver." -msgstr "找不到印表機驅動程式。" +msgstr "不明的印表機驅動程式。" #: dlls/comdlg32/comdlg32.rc:76 msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"在使用與印表機有關功能(版面設定, 列印檔案)之前, 您必須先安裝印表機。請安裝一" -"個印表機後再試。" +"您必須先安裝印表機才能使用與印表機有關的功能 (如: 版面設定，列印檔案)。" +"請安裝印表機後再試一次。" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "選取介於 %1!d! 和 %2!d! 點的字型尺寸。" +msgstr "選取介於 %1!d! 和 %2!d! 點之間的字型大小。" #: dlls/comdlg32/comdlg32.rc:143 dlls/ieframe/ieframe.rc:35 msgid "&Save" @@ -1182,7 +1168,7 @@ msgstr "儲存(&S)" #: dlls/comdlg32/comdlg32.rc:144 msgid "Save &in:" -msgstr "儲存至(&I)：" +msgstr "儲存至(&I):" #: dlls/comdlg32/comdlg32.rc:145 msgid "Save" @@ -1193,14 +1179,12 @@ msgid "Open File" msgstr "開啟檔案" #: dlls/comdlg32/comdlg32.rc:148 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "新資料夾" +msgstr "選擇資料夾" #: dlls/comdlg32/comdlg32.rc:149 msgid "Font size has to be a number." -msgstr "" +msgstr "字型大小必須是數字。" #: dlls/comdlg32/comdlg32.rc:84 programs/oleview/oleview.rc:98 msgid "Ready" @@ -1208,107 +1192,107 @@ msgstr "待命" #: dlls/comdlg32/comdlg32.rc:85 msgid "Paused; " -msgstr "暫停；" +msgstr "暫停; " #: dlls/comdlg32/comdlg32.rc:86 msgid "Error; " -msgstr "錯誤；" +msgstr "錯誤; " #: dlls/comdlg32/comdlg32.rc:87 msgid "Pending deletion; " -msgstr "等待刪除；" +msgstr "刪除擱置中; " #: dlls/comdlg32/comdlg32.rc:88 msgid "Paper jam; " -msgstr "卡紙；" +msgstr "卡紙; " #: dlls/comdlg32/comdlg32.rc:89 msgid "Out of paper; " -msgstr "無紙；" +msgstr "無紙; " #: dlls/comdlg32/comdlg32.rc:90 msgid "Feed paper manual; " -msgstr "手動進紙；" +msgstr "手動進紙; " #: dlls/comdlg32/comdlg32.rc:91 msgid "Paper problem; " -msgstr "紙張問題；" +msgstr "紙張問題; " #: dlls/comdlg32/comdlg32.rc:92 msgid "Printer offline; " -msgstr "印表機離線；" +msgstr "印表機離線; " #: dlls/comdlg32/comdlg32.rc:93 msgid "I/O Active; " -msgstr "I/O 活動；" +msgstr "I/O 活動; " #: dlls/comdlg32/comdlg32.rc:94 msgid "Busy; " -msgstr "忙碌中；" +msgstr "忙碌中; " #: dlls/comdlg32/comdlg32.rc:95 msgid "Printing; " -msgstr "正在列印；" +msgstr "正在列印; " #: dlls/comdlg32/comdlg32.rc:96 msgid "Output tray is full; " -msgstr "出紙匣已滿；" +msgstr "出紙匣已滿; " #: dlls/comdlg32/comdlg32.rc:97 msgid "Not available; " -msgstr "不可用；" +msgstr "不可用; " #: dlls/comdlg32/comdlg32.rc:98 msgid "Waiting; " -msgstr "等待；" +msgstr "正在等待; " #: dlls/comdlg32/comdlg32.rc:99 msgid "Processing; " -msgstr "正在處理；" +msgstr "正在處理; " #: dlls/comdlg32/comdlg32.rc:100 msgid "Initializing; " -msgstr "正在初始化；" +msgstr "正在初始化; " #: dlls/comdlg32/comdlg32.rc:101 msgid "Warming up; " -msgstr "預熱中；" +msgstr "預熱中; " #: dlls/comdlg32/comdlg32.rc:102 msgid "Toner low; " -msgstr "墨水量低；" +msgstr "墨水量低; " #: dlls/comdlg32/comdlg32.rc:103 msgid "No toner; " -msgstr "墨水用盡；" +msgstr "墨水用盡; " #: dlls/comdlg32/comdlg32.rc:104 msgid "Page punt; " -msgstr "頁處理記憶體超支；" +msgstr "頁處理記憶體超支; " #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " -msgstr "已被使用者中斷；" +msgstr "被使用者中斷; " #: dlls/comdlg32/comdlg32.rc:106 msgid "Out of memory; " -msgstr "記憶體不足；" +msgstr "記憶體不足; " #: dlls/comdlg32/comdlg32.rc:107 msgid "The printer door is open; " -msgstr "印表機蓋是打開的；" +msgstr "印表機蓋已打開; " #: dlls/comdlg32/comdlg32.rc:108 msgid "Print server unknown; " -msgstr "找不到列印伺服器；" +msgstr "不明的列印伺服器; " #: dlls/comdlg32/comdlg32.rc:109 msgid "Power save mode; " -msgstr "省電狀態；" +msgstr "省電模式; " #: dlls/comdlg32/comdlg32.rc:78 msgid "Default Printer; " -msgstr "預設印表機；" +msgstr "預設印表機; " #: dlls/comdlg32/comdlg32.rc:79 msgid "There are %d documents in the queue" @@ -1316,11 +1300,11 @@ msgstr "有 %d 個文件正在等待列印" #: dlls/comdlg32/comdlg32.rc:80 msgid "Margins [inches]" -msgstr "邊緣空白 [英寸]" +msgstr "頁面邊距 [英寸]" #: dlls/comdlg32/comdlg32.rc:81 msgid "Margins [mm]" -msgstr "邊緣空白 [毫米]" +msgstr "頁面邊距 [毫米]" #: dlls/comdlg32/comdlg32.rc:82 dlls/sane.ds/sane.rc:33 msgctxt "unit: millimeters" @@ -1329,12 +1313,12 @@ msgstr "毫米" #: dlls/credui/credui.rc:45 msgid "&User name:" -msgstr "使用者名稱(&U)：" +msgstr "使用者名稱(&U):" #: dlls/credui/credui.rc:48 dlls/cryptui/cryptui.rc:402 #: dlls/oledb32/version.rc:81 msgid "&Password:" -msgstr "密碼(&P)：" +msgstr "密碼(&P):" #: dlls/credui/credui.rc:50 msgid "&Remember my password" @@ -1346,7 +1330,7 @@ msgstr "連接到 %s" #: dlls/credui/credui.rc:31 msgid "Connecting to %s" -msgstr "正在連接到 %s" +msgstr "正在連線到 %s" #: dlls/credui/credui.rc:32 msgid "Logon unsuccessful" @@ -1357,8 +1341,8 @@ msgid "" "Make sure that your user name\n" "and password are correct." msgstr "" -"請確認您輸入的使用者名稱和密碼\n" -"是否正確。" +"請確認您輸入的使用者名稱\n" +"和密碼是否正確。" #: dlls/credui/credui.rc:35 msgid "" @@ -1369,8 +1353,7 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"請在輸入密碼前按下 Caps Lock 鍵，解除\n" -"大寫鎖定。" +"您可以按下 Caps Lock 鍵以解除大寫鎖定，然後再輸入密碼。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1378,7 +1361,7 @@ msgstr "大寫鎖定已開啟" #: dlls/crypt32/crypt32.rc:30 msgid "Authority Key Identifier" -msgstr "授權金鑰識別碼" +msgstr "授權單位金鑰識別元" #: dlls/crypt32/crypt32.rc:31 msgid "Key Attributes" @@ -1394,7 +1377,7 @@ msgstr "主體替代名稱" #: dlls/crypt32/crypt32.rc:34 msgid "Issuer Alternative Name" -msgstr "發證者替代名稱" +msgstr "簽發者替代名稱" #: dlls/crypt32/crypt32.rc:35 msgid "Basic Constraints" @@ -1406,7 +1389,7 @@ msgstr "金鑰用法" #: dlls/crypt32/crypt32.rc:37 msgid "Certificate Policies" -msgstr "憑證策略" +msgstr "憑證原則" #: dlls/crypt32/crypt32.rc:38 msgid "Subject Key Identifier" @@ -1418,7 +1401,7 @@ msgstr "CRL 原因編碼" #: dlls/crypt32/crypt32.rc:40 msgid "CRL Distribution Points" -msgstr "CRL 發布點" +msgstr "CRL 發佈點" #: dlls/crypt32/crypt32.rc:41 msgid "Enhanced Key Usage" @@ -1438,7 +1421,7 @@ msgstr "下一個更新位置" #: dlls/crypt32/crypt32.rc:45 msgid "Yes or No Trust" -msgstr "是或否信賴" +msgstr "信任或不信任" #: dlls/crypt32/crypt32.rc:46 msgid "Email Address" @@ -1446,7 +1429,7 @@ msgstr "電子郵件地址" #: dlls/crypt32/crypt32.rc:47 msgid "Unstructured Name" -msgstr "無結構的名稱" +msgstr "非結構化名稱" #: dlls/crypt32/crypt32.rc:48 msgid "Content Type" @@ -1462,7 +1445,7 @@ msgstr "簽署時間" #: dlls/crypt32/crypt32.rc:51 msgid "Counter Sign" -msgstr "計數器符號" +msgstr "副署" #: dlls/crypt32/crypt32.rc:52 msgid "Challenge Password" @@ -1470,7 +1453,7 @@ msgstr "挑戰密碼" #: dlls/crypt32/crypt32.rc:53 msgid "Unstructured Address" -msgstr "無結構的位址" +msgstr "非結構化位址" #: dlls/crypt32/crypt32.rc:54 msgid "S/MIME Capabilities" @@ -1478,7 +1461,7 @@ msgstr "S/MIME 能力" #: dlls/crypt32/crypt32.rc:55 msgid "Prefer Signed Data" -msgstr "偏好已簽署資料" +msgstr "已簽署資料優先" #: dlls/crypt32/crypt32.rc:56 dlls/cryptdlg/cryptdlg.rc:34 msgctxt "Certification Practice Statement" @@ -1495,7 +1478,7 @@ msgstr "線上憑證狀態協定" #: dlls/crypt32/crypt32.rc:59 msgid "Certification Authority Issuer" -msgstr "憑證授權發證者" +msgstr "憑證授權單位簽發者" #: dlls/crypt32/crypt32.rc:60 msgid "Certification Template Name" @@ -1511,27 +1494,27 @@ msgstr "憑證複本" #: dlls/crypt32/crypt32.rc:63 msgid "Netscape Cert Type" -msgstr "Netscape 憑證型態" +msgstr "Netscape 憑證類型" #: dlls/crypt32/crypt32.rc:64 msgid "Netscape Base URL" -msgstr "Netscape 基準網址" +msgstr "Netscape 基本網址" #: dlls/crypt32/crypt32.rc:65 msgid "Netscape Revocation URL" -msgstr "Netscape 廢止網址" +msgstr "Netscape 撤銷網址" #: dlls/crypt32/crypt32.rc:66 msgid "Netscape CA Revocation URL" -msgstr "Netscape CA 廢止網址" +msgstr "Netscape CA 撤銷網址" #: dlls/crypt32/crypt32.rc:67 msgid "Netscape Cert Renewal URL" -msgstr "Netscape 憑證重申網址" +msgstr "Netscape 憑證更新網址" #: dlls/crypt32/crypt32.rc:68 msgid "Netscape CA Policy URL" -msgstr "Netscape CA 策略網址" +msgstr "Netscape CA 原則網址" #: dlls/crypt32/crypt32.rc:69 msgid "Netscape SSL ServerName" @@ -1583,7 +1566,7 @@ msgstr "姓氏" #: dlls/crypt32/crypt32.rc:81 msgid "Domain Component" -msgstr "區域部分" +msgstr "網域元件" #: dlls/crypt32/crypt32.rc:82 msgid "Street Address" @@ -1591,7 +1574,7 @@ msgstr "街道地址" #: dlls/crypt32/crypt32.rc:83 msgid "Serial Number" -msgstr "門牌號碼" +msgstr "序號" #: dlls/crypt32/crypt32.rc:84 msgid "CA Version" @@ -1603,7 +1586,7 @@ msgstr "交叉 CA 版本" #: dlls/crypt32/crypt32.rc:86 msgid "Serialized Signature Serial Number" -msgstr "序列化的簽名序號" +msgstr "序列化簽章序號" #: dlls/crypt32/crypt32.rc:87 msgid "Principal Name" @@ -1615,7 +1598,7 @@ msgstr "Windows 產品更新" #: dlls/crypt32/crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "註冊名稱值對" +msgstr "註冊名稱值配對" #: dlls/crypt32/crypt32.rc:90 msgid "OS Version" @@ -1627,7 +1610,7 @@ msgstr "註冊 CSP" #: dlls/crypt32/crypt32.rc:92 msgid "CRL Number" -msgstr "CRL 數字" +msgstr "CRL 號碼" #: dlls/crypt32/crypt32.rc:93 msgid "Delta CRL Indicator" @@ -1635,7 +1618,7 @@ msgstr "Delta CRL 指示器" #: dlls/crypt32/crypt32.rc:94 msgid "Issuing Distribution Point" -msgstr "議題發布點" +msgstr "發行發佈點" #: dlls/crypt32/crypt32.rc:95 msgid "Freshest CRL" @@ -1647,27 +1630,27 @@ msgstr "名稱條件約束" #: dlls/crypt32/crypt32.rc:97 msgid "Policy Mappings" -msgstr "策略映射" +msgstr "原則對應" #: dlls/crypt32/crypt32.rc:98 msgid "Policy Constraints" -msgstr "策略條件約束" +msgstr "原則條件約束" #: dlls/crypt32/crypt32.rc:99 msgid "Cross-Certificate Distribution Points" -msgstr "交叉憑證發布點" +msgstr "交叉憑證發佈點" #: dlls/crypt32/crypt32.rc:100 msgid "Application Policies" -msgstr "應用程式策略" +msgstr "應用程式原則" #: dlls/crypt32/crypt32.rc:101 msgid "Application Policy Mappings" -msgstr "應用程式策略映射" +msgstr "應用程式原則對應" #: dlls/crypt32/crypt32.rc:102 msgid "Application Policy Constraints" -msgstr "應用程式策略條件約束" +msgstr "應用程式原則條件約束" #: dlls/crypt32/crypt32.rc:103 msgid "CMC Data" @@ -1723,11 +1706,11 @@ msgstr "前一個 CA 憑證雜湊" #: dlls/crypt32/crypt32.rc:116 msgid "Virtual Base CRL Number" -msgstr "虛擬基底 CRL 數字" +msgstr "虛擬基本 CRL 數目" #: dlls/crypt32/crypt32.rc:117 msgid "Next CRL Publish" -msgstr "下一個 CRL 發布" +msgstr "下一個 CRL 發佈" #: dlls/crypt32/crypt32.rc:118 msgid "CA Encryption Certificate" @@ -1751,27 +1734,27 @@ msgstr "虛設簽署人" #: dlls/crypt32/crypt32.rc:123 msgid "Encrypted Private Key" -msgstr "加密的私鑰" +msgstr "已加密的私鑰" #: dlls/crypt32/crypt32.rc:124 msgid "Published CRL Locations" -msgstr "發布的 CRL 位置" +msgstr "已發行的 CRL 位置" #: dlls/crypt32/crypt32.rc:125 msgid "Enforce Certificate Chain Policy" -msgstr "強制憑證鏈策略" +msgstr "強制憑證鏈結原則" #: dlls/crypt32/crypt32.rc:126 msgid "Transaction Id" -msgstr "異動作業識別號" +msgstr "異動作業識別碼" #: dlls/crypt32/crypt32.rc:127 msgid "Sender Nonce" -msgstr "當前傳送者" +msgstr "發送者的一次性隨機數" #: dlls/crypt32/crypt32.rc:128 msgid "Recipient Nonce" -msgstr "當前收件者" +msgstr "收件者的一次性隨機數" #: dlls/crypt32/crypt32.rc:129 msgid "Reg Info" @@ -1779,11 +1762,11 @@ msgstr "註冊資訊" #: dlls/crypt32/crypt32.rc:130 msgid "Get Certificate" -msgstr "提取憑證" +msgstr "取得憑證" #: dlls/crypt32/crypt32.rc:131 msgid "Get CRL" -msgstr "提取 CRL" +msgstr "取得 CRL" #: dlls/crypt32/crypt32.rc:132 msgid "Revoke Request" @@ -1791,11 +1774,11 @@ msgstr "取消要求" #: dlls/crypt32/crypt32.rc:133 msgid "Query Pending" -msgstr "查詢擱置" +msgstr "查詢擱置中" #: dlls/crypt32/crypt32.rc:134 dlls/cryptui/cryptui.rc:95 msgid "Certificate Trust List" -msgstr "憑證信賴清單" +msgstr "憑證信任清單" #: dlls/crypt32/crypt32.rc:135 msgid "Archived Key Certificate Hash" @@ -1803,11 +1786,11 @@ msgstr "封存的金鑰憑證雜湊" #: dlls/crypt32/crypt32.rc:136 msgid "Private Key Usage Period" -msgstr "私鑰使用週期" +msgstr "私鑰使用期限" #: dlls/crypt32/crypt32.rc:137 msgid "Client Information" -msgstr "客戶端資訊" +msgstr "用戶端資訊" #: dlls/crypt32/crypt32.rc:138 msgid "Server Authentication" @@ -1815,7 +1798,7 @@ msgstr "伺服器認證" #: dlls/crypt32/crypt32.rc:139 msgid "Client Authentication" -msgstr "客戶端認證" +msgstr "用戶端認證" #: dlls/crypt32/crypt32.rc:140 msgid "Code Signing" @@ -1831,7 +1814,7 @@ msgstr "時間戳記" #: dlls/crypt32/crypt32.rc:143 msgid "Microsoft Trust List Signing" -msgstr "Microsoft 信賴清單簽署" +msgstr "Microsoft 信任清單簽署" #: dlls/crypt32/crypt32.rc:144 msgid "Microsoft Time Stamping" @@ -1843,7 +1826,7 @@ msgstr "IP 安全終端系統" #: dlls/crypt32/crypt32.rc:146 msgid "IP security tunnel termination" -msgstr "IP 安全遂道終端" +msgstr "IP 安全隧道終端" #: dlls/crypt32/crypt32.rc:147 msgid "IP security user" @@ -1855,19 +1838,19 @@ msgstr "加密檔案系統" #: dlls/crypt32/crypt32.rc:149 dlls/cryptui/cryptui.rc:133 msgid "Windows Hardware Driver Verification" -msgstr "Windows 硬體驅動程式查核" +msgstr "Windows 硬體驅動程式驗證" #: dlls/crypt32/crypt32.rc:150 dlls/cryptui/cryptui.rc:134 msgid "Windows System Component Verification" -msgstr "Windows 系統成分查核" +msgstr "Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:151 dlls/cryptui/cryptui.rc:135 msgid "OEM Windows System Component Verification" -msgstr "OEM Windows 系統成分查核" +msgstr "OEM Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:152 dlls/cryptui/cryptui.rc:136 msgid "Embedded Windows System Component Verification" -msgstr "嵌入式 Windows 系統成分查核" +msgstr "嵌入式 Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:153 dlls/cryptui/cryptui.rc:143 msgid "Key Pack Licenses" @@ -1875,11 +1858,11 @@ msgstr "金鑰包裝授權" #: dlls/crypt32/crypt32.rc:154 dlls/cryptui/cryptui.rc:144 msgid "License Server Verification" -msgstr "授權伺服器查核" +msgstr "授權伺服器驗證" #: dlls/crypt32/crypt32.rc:155 dlls/cryptui/cryptui.rc:146 msgid "Smart Card Logon" -msgstr "智慧卡登錄" +msgstr "智慧卡登入" #: dlls/crypt32/crypt32.rc:156 dlls/cryptui/cryptui.rc:142 msgid "Digital Rights" @@ -1887,7 +1870,7 @@ msgstr "數位權限" #: dlls/crypt32/crypt32.rc:157 dlls/cryptui/cryptui.rc:138 msgid "Qualified Subordination" -msgstr "合格的隸屬" +msgstr "合格的分類" #: dlls/crypt32/crypt32.rc:158 dlls/cryptui/cryptui.rc:139 msgid "Key Recovery" @@ -1911,7 +1894,7 @@ msgstr "根清單簽署人" #: dlls/crypt32/crypt32.rc:163 msgid "All application policies" -msgstr "所有應用程式策略" +msgstr "所有應用程式原則" #: dlls/crypt32/crypt32.rc:164 dlls/cryptui/cryptui.rc:149 msgid "Directory Service Email Replication" @@ -1919,19 +1902,19 @@ msgstr "目錄服務電子郵件複寫" #: dlls/crypt32/crypt32.rc:165 dlls/cryptui/cryptui.rc:145 msgid "Certificate Request Agent" -msgstr "憑證請求代理程式" +msgstr "憑證要求代理" #: dlls/crypt32/crypt32.rc:166 dlls/cryptui/cryptui.rc:141 msgid "Lifetime Signing" -msgstr "生命期簽署" +msgstr "永久簽署" #: dlls/crypt32/crypt32.rc:167 msgid "All issuance policies" -msgstr "所有發布策略" +msgstr "所有發佈原則" #: dlls/crypt32/crypt32.rc:172 msgid "Trusted Root Certification Authorities" -msgstr "信賴的根憑證授權者" +msgstr "信任的根憑證授權單位" #: dlls/crypt32/crypt32.rc:173 msgid "Personal" @@ -1939,7 +1922,7 @@ msgstr "個人的" #: dlls/crypt32/crypt32.rc:174 msgid "Intermediate Certification Authorities" -msgstr "中介憑證授權者" +msgstr "中介憑證授權單位" #: dlls/crypt32/crypt32.rc:175 msgid "Other People" @@ -1947,11 +1930,11 @@ msgstr "其他人" #: dlls/crypt32/crypt32.rc:176 msgid "Trusted Publishers" -msgstr "信賴的發行者" +msgstr "信任的發行者" #: dlls/crypt32/crypt32.rc:177 msgid "Untrusted Certificates" -msgstr "不可信的憑證" +msgstr "不信任的憑證" #: dlls/crypt32/crypt32.rc:182 msgid "KeyID=" @@ -1959,7 +1942,7 @@ msgstr "KeyID=" #: dlls/crypt32/crypt32.rc:183 msgid "Certificate Issuer" -msgstr "憑證發證者" +msgstr "憑證簽發者" #: dlls/crypt32/crypt32.rc:184 msgid "Certificate Serial Number=" @@ -1995,11 +1978,11 @@ msgstr "遮罩=" #: dlls/crypt32/crypt32.rc:192 msgid "Registered ID=" -msgstr "已註冊的識別號=" +msgstr "已註冊的識別碼=" #: dlls/crypt32/crypt32.rc:193 msgid "Unknown Key Usage" -msgstr "不明金鑰用法" +msgstr "不明的金鑰使用方法" #: dlls/crypt32/crypt32.rc:194 msgid "Subject Type=" @@ -2025,7 +2008,7 @@ msgstr "無" #: dlls/crypt32/crypt32.rc:199 msgid "Information Not Available" -msgstr "資訊無法使用" +msgstr "沒有可用資訊" #: dlls/crypt32/crypt32.rc:200 msgid "Authority Info Access" @@ -2042,23 +2025,23 @@ msgstr "OCSP" #: dlls/crypt32/crypt32.rc:203 msgid "CA Issuers" -msgstr "CA 發證者" +msgstr "CA 簽發者" #: dlls/crypt32/crypt32.rc:204 msgid "Unknown Access Method" -msgstr "不明存取方法" +msgstr "不明的存取方法" #: dlls/crypt32/crypt32.rc:205 msgid "Alternative Name" -msgstr "另類名稱" +msgstr "替代名稱" #: dlls/crypt32/crypt32.rc:206 msgid "CRL Distribution Point" -msgstr "CRL 發布點" +msgstr "CRL 發佈點" #: dlls/crypt32/crypt32.rc:207 msgid "Distribution Point Name" -msgstr "發布點名稱" +msgstr "發佈點名稱" #: dlls/crypt32/crypt32.rc:208 msgid "Full Name" @@ -2074,19 +2057,19 @@ msgstr "CRL 原因=" #: dlls/crypt32/crypt32.rc:211 msgid "CRL Issuer" -msgstr "CRL 發證者" +msgstr "CRL 簽發者" #: dlls/crypt32/crypt32.rc:212 msgid "Key Compromise" -msgstr "金鑰折衷" +msgstr "金鑰洩露" #: dlls/crypt32/crypt32.rc:213 msgid "CA Compromise" -msgstr "CA 折衷" +msgstr "CA 洩露" #: dlls/crypt32/crypt32.rc:214 msgid "Affiliation Changed" -msgstr "會籍變更" +msgstr "聯盟已變更" #: dlls/crypt32/crypt32.rc:215 msgid "Superseded" @@ -2094,11 +2077,11 @@ msgstr "已取代" #: dlls/crypt32/crypt32.rc:216 msgid "Operation Ceased" -msgstr "作業終了" +msgstr "作業已停止" #: dlls/crypt32/crypt32.rc:217 msgid "Certificate Hold" -msgstr "憑證暫停" +msgstr "持有的憑證" #: dlls/crypt32/crypt32.rc:218 msgid "Financial Information=" @@ -2110,11 +2093,11 @@ msgstr "可用" #: dlls/crypt32/crypt32.rc:220 msgid "Not Available" -msgstr "無法使用" +msgstr "不可用" #: dlls/crypt32/crypt32.rc:221 msgid "Meets Criteria=" -msgstr "會面準則=" +msgstr "符合準則=" #: dlls/crypt32/crypt32.rc:222 dlls/cryptui/cryptui.rc:166 #: dlls/oleaut32/oleaut32.rc:32 dlls/wininet/wininet.rc:94 @@ -2130,7 +2113,7 @@ msgstr "否" #: dlls/crypt32/crypt32.rc:224 msgid "Digital Signature" -msgstr "數位簽名" +msgstr "數位簽章" #: dlls/crypt32/crypt32.rc:225 msgid "Non-Repudiation" @@ -2142,11 +2125,11 @@ msgstr "金鑰編密" #: dlls/crypt32/crypt32.rc:227 msgid "Data Encipherment" -msgstr "資料加密" +msgstr "資料編密" #: dlls/crypt32/crypt32.rc:228 msgid "Key Agreement" -msgstr "金鑰協定" +msgstr "金鑰合約" #: dlls/crypt32/crypt32.rc:229 msgid "Certificate Signing" @@ -2170,7 +2153,7 @@ msgstr "只解開密文" #: dlls/crypt32/crypt32.rc:234 msgid "SSL Client Authentication" -msgstr "SSL 客戶端認證" +msgstr "SSL 用戶端認證" #: dlls/crypt32/crypt32.rc:235 msgid "SSL Server Authentication" @@ -2182,7 +2165,7 @@ msgstr "S/MIME" #: dlls/crypt32/crypt32.rc:237 msgid "Signature" -msgstr "簽名" +msgstr "簽章" #: dlls/crypt32/crypt32.rc:238 msgid "SSL CA" @@ -2194,23 +2177,23 @@ msgstr "S/MIME CA" #: dlls/crypt32/crypt32.rc:240 msgid "Signature CA" -msgstr "簽名 CA" +msgstr "簽章 CA" #: dlls/cryptdlg/cryptdlg.rc:30 msgid "Certificate Policy" -msgstr "憑證策略" +msgstr "憑證原則" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略識別碼：" +msgstr "原則識別碼: " #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" -msgstr "策略限定元資訊" +msgstr "原則限定元資訊" #: dlls/cryptdlg/cryptdlg.rc:33 msgid "Policy Qualifier Id=" -msgstr "策略限定元識別號=" +msgstr "原則限定元識別碼=" #: dlls/cryptdlg/cryptdlg.rc:36 msgid "Qualifier" @@ -2244,15 +2227,15 @@ msgstr "安裝憑證(&I)..." #: dlls/cryptui/cryptui.rc:197 msgid "Issuer &Statement" -msgstr "發證者敘述(&S)" +msgstr "簽發者敘述(&S)" #: dlls/cryptui/cryptui.rc:205 msgid "&Show:" -msgstr "顯示(&S)：" +msgstr "顯示(&S):" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." -msgstr "編輯屬性(&E)..." +msgstr "編輯內容(&E)..." #: dlls/cryptui/cryptui.rc:211 msgid "&Copy to File..." @@ -2272,7 +2255,7 @@ msgstr "檢視憑證(&V)" #: dlls/cryptui/cryptui.rc:223 msgid "Certificate &status:" -msgstr "憑證狀態(&S)：" +msgstr "憑證狀態(&S):" #: dlls/cryptui/cryptui.rc:229 msgid "Disclaimer" @@ -2284,12 +2267,12 @@ msgstr "更多資訊(&I)" #: dlls/cryptui/cryptui.rc:244 msgid "&Friendly name:" -msgstr "易記名稱(&F)：" +msgstr "易記名稱(&F):" #: dlls/cryptui/cryptui.rc:246 programs/progman/progman.rc:154 #: programs/progman/progman.rc:170 msgid "&Description:" -msgstr "描述(&D)：" +msgstr "描述(&D):" #: dlls/cryptui/cryptui.rc:248 msgid "Certificate purposes" @@ -2305,32 +2288,32 @@ msgstr "停用這個憑證的全部目的(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "只有啟用這個憑證的下列目的(&O)：" +msgstr "只啟用這個憑證的下列目的(&O):" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." -msgstr "加入目的(&P)..." +msgstr "新增目的(&P)..." #: dlls/cryptui/cryptui.rc:262 msgid "Add Purpose" -msgstr "加入目的" +msgstr "新增目的" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "加入您所希望的憑證目的物件識別符號 (OID)：" +msgstr "新增您希望加入的憑證目的的物件識別碼 (OID):" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" -msgstr "選取憑證儲存處" +msgstr "選取憑證存放區" #: dlls/cryptui/cryptui.rc:276 msgid "Select the certificate store you want to use:" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證存放區:" #: dlls/cryptui/cryptui.rc:279 msgid "&Show physical stores" -msgstr "顯示實體儲存(&S)" +msgstr "顯示實體存放區(&S)" #: dlls/cryptui/cryptui.rc:285 dlls/cryptui/cryptui.rc:296 #: dlls/cryptui/cryptui.rc:313 dlls/cryptui/cryptui.rc:327 @@ -2354,16 +2337,16 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信賴清單到憑證儲存處。\n" +"這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信任清單到憑證存放區。\n" "\n" -"憑證可用於識別您或您正在通訊的電腦。它也可以用於認證以及對訊息簽署。憑證儲" -"存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。\n" "\n" -"要繼續，請按下一步。" +"請按 [下一步] 繼續。" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" -msgstr "檔案名稱(&F)：" +msgstr "檔案名稱(&F):" #: dlls/cryptui/cryptui.rc:301 dlls/cryptui/cryptui.rc:323 #: dlls/cryptui/cryptui.rc:437 programs/winecfg/winecfg.rc:311 @@ -2375,7 +2358,7 @@ msgid "" "Note: The following file formats may contain more than one certificate, " "certificate revocation list, or certificate trust list:" msgstr "" -"註記：下列檔案格式也許會包含超過一個的憑證、憑證撤銷清單或憑證信賴清單：" +"註記: 下列檔案格式也許會包含超過一個的憑證、憑證撤銷清單或憑證信任清單:" #: dlls/cryptui/cryptui.rc:304 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" @@ -2388,21 +2371,21 @@ msgstr "個人資訊交換/PKCS #12 (*.pfx; *.p12)" #: dlls/cryptui/cryptui.rc:308 dlls/cryptui/cryptui.rc:81 #: dlls/cryptui/cryptui.rc:162 msgid "Microsoft Serialized Certificate Store (*.sst)" -msgstr "Microsoft 序列化憑證儲存處 (*.sst)" +msgstr "Microsoft 序列化憑證存放區 (*.sst)" #: dlls/cryptui/cryptui.rc:316 msgid "" "Wine can automatically select the certificate store, or you can specify a " "location for the certificates." -msgstr "Wine 可以自動選取憑證儲存處，或者您可以指定用於憑證的位置。" +msgstr "Wine 可以自動選取憑證存放區，或者您可以指定用於憑證的位置。" #: dlls/cryptui/cryptui.rc:318 msgid "&Automatically select certificate store" -msgstr "自動選取憑證儲存處(&A)" +msgstr "自動選取憑證存放區(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "將所有憑證放置於下列儲存(&P)：" +msgstr "將所有憑證放置於下列存放區(&P):" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2410,11 +2393,11 @@ msgstr "正在完成憑證匯入精靈" #: dlls/cryptui/cryptui.rc:332 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "您已經成功地完成憑證匯入精靈。" +msgstr "您已經成功完成憑證匯入精靈。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" -msgstr "您已指定下列設定值：" +msgstr "您已指定下列設定值:" #: dlls/cryptui/cryptui.rc:342 dlls/cryptui/cryptui.rc:122 #: dlls/inetcpl.cpl/inetcpl.rc:111 @@ -2423,7 +2406,7 @@ msgstr "憑證" #: dlls/cryptui/cryptui.rc:345 msgid "I&ntended purpose:" -msgstr "預定目的(&N)：" +msgstr "預定目的(&N):" #: dlls/cryptui/cryptui.rc:349 msgid "&Import..." @@ -2462,11 +2445,11 @@ msgstr "憑證目的" #: dlls/cryptui/cryptui.rc:364 msgid "" "Select one or more purposes to be listed when Advanced Purposes is selected." -msgstr "當進階目的已選時選取一或多個要列出的目的。" +msgstr "選取一個或多個在進階目的已選取時要列出的目的。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" -msgstr "憑證目的(&C)：" +msgstr "憑證目的(&C):" #: dlls/cryptui/cryptui.rc:375 dlls/cryptui/cryptui.rc:386 #: dlls/cryptui/cryptui.rc:399 dlls/cryptui/cryptui.rc:409 @@ -2491,12 +2474,12 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"這個精靈協助您從憑證儲存處匯出憑證、憑證撤銷清單以及憑證信賴清單到檔案。\n" +"這個精靈協助您從憑證存放區匯出憑證、憑證撤銷清單以及憑證信任清單到檔案。\n" "\n" -"憑證可用於識別您或您用以通訊的電腦。它也可以被用於認證以及簽署訊息。憑證儲存" -"處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。\n" "\n" -"要繼續請按下一步。" +"請按 [下一步] 繼續。" #: dlls/cryptui/cryptui.rc:389 msgid "" @@ -2506,23 +2489,23 @@ msgstr "如果您選擇要匯出私鑰，將於後續頁面向您提示要求密 #: dlls/cryptui/cryptui.rc:390 msgid "Do you wish to export the private key?" -msgstr "您要匯出私鑰嗎？" +msgstr "您要匯出私鑰嗎?" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" -msgstr "是(&Y)，匯出私鑰。" +msgstr "是，匯出私鑰(&Y)" #: dlls/cryptui/cryptui.rc:393 msgid "N&o, do not export the private key" -msgstr "否(&N)，不要匯出私鑰。" +msgstr "否，不要匯出私鑰(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" -msgstr "確認密碼(&C)：" +msgstr "確認密碼(&C):" #: dlls/cryptui/cryptui.rc:412 msgid "Select the format you want to use:" -msgstr "請選擇您要使用的格式：" +msgstr "請選擇您要使用的格式:" #: dlls/cryptui/cryptui.rc:413 msgid "&DER-encoded X.509 (*.cer)" @@ -2530,7 +2513,7 @@ msgstr "&DER-encoded X.509 (*.cer)" #: dlls/cryptui/cryptui.rc:415 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-encoded X.509 (*.cer)：" +msgstr "Ba&se64-encoded X.509 (*.cer):" #: dlls/cryptui/cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2562,19 +2545,15 @@ msgstr "正在完成憑證匯出精靈" #: dlls/cryptui/cryptui.rc:446 msgid "You have successfully completed the Certificate Export Wizard." -msgstr "您已經成功地完成憑證匯出精靈" +msgstr "您已經成功完成憑證匯出精靈。" #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -2588,21 +2567,23 @@ msgstr "憑證資訊" msgid "" "This certificate has an invalid signature. The certificate may have been " "altered or corrupted." -msgstr "這個憑證的簽名無效。憑證也許已被改變或已損壞。" +msgstr "這個憑證的簽章無效。憑證可能已被更改或損壞。" #: dlls/cryptui/cryptui.rc:33 msgid "" "This root certificate is not trusted. To trust it, add it to your system's " "trusted root certificate store." -msgstr "這個根憑證未被信賴。要信賴它，就將它加入您系統的信賴根憑證儲存處。" +msgstr "" +"這個根憑證不受信任。如果您要信任它，請將這個憑證加入到系統的" +"受信任的根憑證存放區。" #: dlls/cryptui/cryptui.rc:34 msgid "This certificate could not be validated to a trusted root certificate." -msgstr "這個憑證無法被驗證為信賴的根憑證。" +msgstr "這個憑證無法被驗證為信任的根憑證。" #: dlls/cryptui/cryptui.rc:35 msgid "This certificate's issuer could not be found." -msgstr "找不到這個憑證的發證者。" +msgstr "找不到這個憑證的簽發者。" #: dlls/cryptui/cryptui.rc:36 msgid "All the intended purposes of this certificate could not be verified." @@ -2610,15 +2591,15 @@ msgstr "這個憑證的所有預定目的都無法被驗證。" #: dlls/cryptui/cryptui.rc:37 msgid "This certificate is intended for the following purposes:" -msgstr "這個憑證是適用於下列目的：" +msgstr "這個憑證適用於下列目的:" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "發證對象：" +msgstr "發證給:" #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "發證來源：" +msgstr "簽發者:" #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2630,7 +2611,7 @@ msgstr " 到 " #: dlls/cryptui/cryptui.rc:42 msgid "This certificate has an invalid signature." -msgstr "這個憑證的簽名無效。" +msgstr "這個憑證的簽章無效。" #: dlls/cryptui/cryptui.rc:43 msgid "This certificate has expired or is not yet valid." @@ -2638,11 +2619,11 @@ msgstr "這個憑證已過期或尚未生效。" #: dlls/cryptui/cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." -msgstr "這個憑證的有效期限超過它的發證者。" +msgstr "這個憑證的有效期限超過簽發者的有效期限。" #: dlls/cryptui/cryptui.rc:45 msgid "This certificate was revoked by its issuer." -msgstr "這個憑證已被它的發證者取消。" +msgstr "這個憑證已被其簽發者撤銷。" #: dlls/cryptui/cryptui.rc:46 msgid "This certificate is OK." @@ -2667,15 +2648,15 @@ msgstr "只有版本 1 欄位" #: dlls/cryptui/cryptui.rc:51 msgid "Extensions Only" -msgstr "只有進階屬性" +msgstr "只有延伸" #: dlls/cryptui/cryptui.rc:52 msgid "Critical Extensions Only" -msgstr "只有關鍵進階屬性" +msgstr "只有關鍵延伸" #: dlls/cryptui/cryptui.rc:53 msgid "Properties Only" -msgstr "只有屬性" +msgstr "只有內容" #: dlls/cryptui/cryptui.rc:55 msgid "Serial number" @@ -2724,11 +2705,11 @@ msgstr "描述" #: dlls/cryptui/cryptui.rc:66 msgid "Certificate Properties" -msgstr "憑證屬性" +msgstr "憑證內容" #: dlls/cryptui/cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "請以 1.2.3.4 的形式輸入 OID" +msgstr "請以 1.2.3.4 的格式輸入 OID" #: dlls/cryptui/cryptui.rc:68 msgid "The OID you entered already exists." @@ -2736,13 +2717,13 @@ msgstr "您輸入的 OID 已經存在。" #: dlls/cryptui/cryptui.rc:70 msgid "Please select a certificate store." -msgstr "請選取憑證儲存處。" +msgstr "請選取憑證存放區。" #: dlls/cryptui/cryptui.rc:72 msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." -msgstr "檔案含有不匹配給定準則的物件。請選取另一個檔案。" +msgstr "檔案含有不符合指定條件的物件。請選取另一個檔案。" #: dlls/cryptui/cryptui.rc:73 msgid "File to Import" @@ -2754,13 +2735,13 @@ msgstr "指定您要匯入的檔案。" #: dlls/cryptui/cryptui.rc:75 dlls/cryptui/cryptui.rc:98 msgid "Certificate Store" -msgstr "憑證儲存處" +msgstr "憑證存放區" #: dlls/cryptui/cryptui.rc:76 msgid "" "Certificate stores are collections of certificates, certificate revocation " "lists, and certificate trust lists." -msgstr "憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。" +msgstr "憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。" #: dlls/cryptui/cryptui.rc:77 msgid "X.509 Certificate (*.cer; *.crt)" @@ -2776,7 +2757,7 @@ msgstr "憑證撤銷清單 (*.crl)" #: dlls/cryptui/cryptui.rc:80 dlls/cryptui/cryptui.rc:159 msgid "Certificate Trust List (*.stl)" -msgstr "憑證信賴清單 (*.stl)" +msgstr "憑證信任清單 (*.stl)" #: dlls/cryptui/cryptui.rc:82 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" @@ -2800,11 +2781,11 @@ msgstr "由程式所決定" #: dlls/cryptui/cryptui.rc:88 msgid "Please select a store" -msgstr "請選取儲存處" +msgstr "請選取存放區" #: dlls/cryptui/cryptui.rc:89 msgid "Certificate Store Selected" -msgstr "憑證儲存處已選" +msgstr "已選取憑證存放區" #: dlls/cryptui/cryptui.rc:90 msgid "Automatically determined by the program" @@ -2832,7 +2813,7 @@ msgstr "個人資訊交換" #: dlls/cryptui/cryptui.rc:99 msgid "The import was successful." -msgstr "已成功匯入。" +msgstr "匯入成功。" #: dlls/cryptui/cryptui.rc:100 msgid "The import failed." @@ -2848,15 +2829,15 @@ msgstr "<進階目的>" #: dlls/cryptui/cryptui.rc:104 msgid "Issued To" -msgstr "發證對象" +msgstr "發證給" #: dlls/cryptui/cryptui.rc:105 msgid "Issued By" -msgstr "發證來源" +msgstr "簽發者" #: dlls/cryptui/cryptui.rc:106 dlls/wininet/wininet.rc:36 msgid "Expiration Date" -msgstr "過期日期" +msgstr "到期日期" #: dlls/cryptui/cryptui.rc:107 msgid "Friendly Name" @@ -2873,7 +2854,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證解密訊息，或用它簽署訊息。\n" -"確定要移除這個憑證？" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:111 msgid "" @@ -2882,7 +2863,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證解密訊息，或用它們簽署訊息。\n" -"確定要移除這些憑證？" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:112 msgid "" @@ -2891,21 +2872,16 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證加密訊息，或驗證以它簽署的訊息。\n" -"確定要移除這個憑證？" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證加密訊息，或驗證以它們簽署的訊息。\n" -"確定要移除這些憑證？" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:114 msgid "" @@ -2913,8 +2889,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個憑證授權者所發的憑證將不再被信賴。\n" -"確定要移除這個憑證？" +"由這個憑證授權單位所發的憑證將不再被信任。\n" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:115 msgid "" @@ -2922,8 +2898,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些憑證授權者所發的憑證將不再被信賴。\n" -"確定要移除這些憑證？" +"由這些憑證授權單位所發的憑證將不再被信任。\n" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:116 msgid "" @@ -2931,8 +2907,8 @@ msgid "" "certification authorities it issued, will no longer be trusted.\n" "Are you sure you want to remove this trusted root certificate?" msgstr "" -"由這個憑證授權者所發的憑證，或是任何由它發證的憑證授權者，將不再被信賴。\n" -"確定要移除這個信賴的根憑證？" +"由這個憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" +"確定要移除這個信任的根憑證?" #: dlls/cryptui/cryptui.rc:117 msgid "" @@ -2940,36 +2916,36 @@ msgid "" "certification authorities they issued, will no longer be trusted.\n" "Are you sure you want to remove these trusted root certificates?" msgstr "" -"由這些憑證授權者所發的憑證，或是任何由它們發證的憑證授權者，將不再被信賴。\n" -"確定要移除這些信賴的根憑證？" +"由這些憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" +"確定要移除這些信任的根憑證?" #: dlls/cryptui/cryptui.rc:118 msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個發行者簽署的軟體將不再被信賴。\n" -"確定要移除這個憑證？" +"由這個發行者簽署的軟體將將不再被信任。\n" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:119 msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些發行者簽署的軟體將不再被信賴。\n" -"確定要移除這些憑證？" +"由這些發行者簽署的軟體將不再被信任。\n" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" -msgstr "確定要移除這個憑證？" +msgstr "確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:121 msgid "Are you sure you want to remove these certificates?" -msgstr "確定要移除這些憑證？" +msgstr "確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" -msgstr "確保遠端電腦的身分" +msgstr "確認遠端電腦的身分" #: dlls/cryptui/cryptui.rc:125 msgid "Proves your identity to a remote computer" @@ -2980,8 +2956,8 @@ msgid "" "Ensures software came from software publisher\n" "Protects software from alteration after publication" msgstr "" -"請確認軟體是來自軟體發行者\n" -"保護軟體以避免發行之後的變更" +"確認軟體是來自軟體發行者\n" +"確保軟體在發行之後未被修改" #: dlls/cryptui/cryptui.rc:127 msgid "Protects e-mail messages" @@ -2997,15 +2973,15 @@ msgstr "允許以目前的時間簽署資料" #: dlls/cryptui/cryptui.rc:130 msgid "Allows you to digitally sign a certificate trust list" -msgstr "允許您數位簽署憑證信賴清單" +msgstr "允許您數位簽署憑證信任清單" #: dlls/cryptui/cryptui.rc:131 msgid "Allows data on disk to be encrypted" -msgstr "允許磁碟上的資料被加密" +msgstr "允許加密磁碟上的資料" #: dlls/cryptui/cryptui.rc:147 msgid "Private Key Archival" -msgstr "私鑰檔案的" +msgstr "私鑰檔案封存" #: dlls/cryptui/cryptui.rc:151 msgid "Export Format" @@ -3017,7 +2993,7 @@ msgstr "選擇將用來儲存內容的格式。" #: dlls/cryptui/cryptui.rc:153 msgid "Export Filename" -msgstr "匯出檔名" +msgstr "匯出檔案名稱" #: dlls/cryptui/cryptui.rc:154 msgid "Specify the name of the file in which the content will be saved." @@ -3025,7 +3001,7 @@ msgstr "指定將會儲存內容的檔案名稱。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案已經存在。您要取代它嗎?" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3057,7 +3033,7 @@ msgstr "匯出密鑰" #: dlls/cryptui/cryptui.rc:168 msgid "The export was successful." -msgstr "已成功匯出。" +msgstr "匯出成功。" #: dlls/cryptui/cryptui.rc:169 msgid "The export failed." @@ -3079,35 +3055,31 @@ msgstr "輸入密碼" #: dlls/cryptui/cryptui.rc:173 msgid "You may password-protect a private key." -msgstr "您可以以密碼保護私鑰。" +msgstr "您可以使用密碼來保護私鑰。" #: dlls/cryptui/cryptui.rc:174 msgid "The passwords do not match." -msgstr "密碼不匹配。" +msgstr "密碼不相符。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." -msgstr "註記：用於這個憑證的私鑰無法開啟。" +msgstr "註記: 用於這個憑證的私鑰無法開啟。" #: dlls/cryptui/cryptui.rc:176 msgid "Note: The private key for this certificate is not exportable." -msgstr "註記：用於這個憑證的私鑰不可匯出。" +msgstr "註記: 用於這個憑證的私鑰不可匯出。" #: dlls/cryptui/cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "預定目的(&N)：" +msgstr "預定目的" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:150 msgid "Location" msgstr "位置" #: dlls/cryptui/cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:181 programs/winefile/winefile.rc:101 #: programs/winhlp32/winhlp32.rc:110 programs/winhlp32/winhlp32.rc:85 @@ -3120,11 +3092,11 @@ msgstr "裝置設定" #: dlls/dinput/dinput.rc:39 msgid "Reset" -msgstr "重置" +msgstr "重設" #: dlls/dinput/dinput.rc:42 msgid "Player" -msgstr "玩家" +msgstr "播放器" #: dlls/dinput/dinput.rc:43 programs/winecfg/winecfg.rc:88 msgid "Device" @@ -3136,7 +3108,7 @@ msgstr "動作" #: dlls/dinput/dinput.rc:45 msgid "Mapping" -msgstr "映射" +msgstr "對應" #: dlls/dinput/dinput.rc:47 msgid "Show Assigned First" @@ -3188,7 +3160,7 @@ msgstr "阿拉伯語" #: dlls/gdi32/gdi32.rc:35 msgid "Baltic" -msgstr "波羅的海語" +msgstr "波羅的海語言" #: dlls/gdi32/gdi32.rc:36 msgid "Vietnamese" @@ -3204,19 +3176,19 @@ msgstr "日語" #: dlls/gdi32/gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "簡化字漢語" +msgstr "中文 (GB2312)" #: dlls/gdi32/gdi32.rc:40 msgid "Hangul" -msgstr "韓語諺文" +msgstr "韓語" #: dlls/gdi32/gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "傳統字漢語" +msgstr "中文 (BIG5)" #: dlls/gdi32/gdi32.rc:42 msgid "Hangul(Johab)" -msgstr "韓語諺文(組合型)" +msgstr "韓語 (Johab)" #: dlls/gdi32/gdi32.rc:43 msgid "Symbol" @@ -3237,7 +3209,7 @@ msgstr "照相機中的檔案" #: dlls/gphoto2.ds/gphoto2.rc:34 msgid "Import Selected" -msgstr "匯入選擇的檔案" +msgstr "匯入已選取檔案" #: dlls/gphoto2.ds/gphoto2.rc:35 msgid "Preview" @@ -3265,7 +3237,7 @@ msgstr "正在傳輸... 請稍候" #: dlls/gphoto2.ds/gphoto2.rc:51 msgid "Connecting to camera" -msgstr "連接照相機" +msgstr "正在連接照相機" #: dlls/gphoto2.ds/gphoto2.rc:55 msgid "Connecting to camera... Please Wait" @@ -3278,11 +3250,11 @@ msgstr "同步(&Y)" #: dlls/hhctrl.ocx/hhctrl.rc:60 dlls/hhctrl.ocx/hhctrl.rc:73 #: dlls/shdoclc/shdoclc.rc:41 programs/winhlp32/winhlp32.rc:89 msgid "&Back" -msgstr "返回(&B)" +msgstr "上一頁(&B)" #: dlls/hhctrl.ocx/hhctrl.rc:61 dlls/hhctrl.ocx/hhctrl.rc:74 msgid "&Forward" -msgstr "向前" +msgstr "下一頁(&F)" #: dlls/hhctrl.ocx/hhctrl.rc:62 msgctxt "table of contents" @@ -3314,10 +3286,8 @@ msgid "&View Source" msgstr "檢視原始碼(&V)" #: dlls/hhctrl.ocx/hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "屬性" +msgstr "內容(&T)" #: dlls/hhctrl.ocx/hhctrl.rc:87 dlls/shdoclc/shdoclc.rc:79 #: dlls/shdoclc/shdoclc.rc:93 dlls/shdoclc/shdoclc.rc:117 @@ -3388,7 +3358,7 @@ msgstr "重新整理" #: dlls/hhctrl.ocx/hhctrl.rc:46 dlls/ieframe/ieframe.rc:66 msgid "Back" -msgstr "返回" +msgstr "上一頁" #: dlls/hhctrl.ocx/hhctrl.rc:47 msgctxt "table of contents" @@ -3406,7 +3376,7 @@ msgstr "選項" #: dlls/hhctrl.ocx/hhctrl.rc:51 dlls/ieframe/ieframe.rc:67 msgid "Forward" -msgstr "向前" +msgstr "下一頁" #: dlls/iccvid/iccvid.rc:28 dlls/iccvid/iccvid.rc:29 msgid "Cinepak Video codec" @@ -3438,7 +3408,7 @@ msgstr "開啟(&O)..." #: dlls/ieframe/ieframe.rc:36 programs/notepad/notepad.rc:33 #: programs/wordpad/wordpad.rc:34 msgid "Save &as..." -msgstr "另存為(&A)..." +msgstr "另存新檔(&A)..." #: dlls/ieframe/ieframe.rc:38 msgid "Print &format..." @@ -3478,7 +3448,7 @@ msgstr "關於 Internet Explorer(&A)" #: dlls/ieframe/ieframe.rc:90 msgid "Open URL" -msgstr "開啟連結(&O)" +msgstr "開啟連結" #: dlls/ieframe/ieframe.rc:93 msgid "Specify the URL you wish to open in Internet Explorer" @@ -3486,7 +3456,7 @@ msgstr "指定您希望在 Internet Explorer 中開啟的網址" #: dlls/ieframe/ieframe.rc:94 msgid "Open:" -msgstr "開啟：" +msgstr "開啟:" #: dlls/ieframe/ieframe.rc:70 msgctxt "home page" @@ -3539,11 +3509,11 @@ msgstr "空白頁面(&B)" #: dlls/inetcpl.cpl/inetcpl.rc:56 msgid "Browsing history" -msgstr "瀏覽歷程" +msgstr "瀏覽歷程記錄" #: dlls/inetcpl.cpl/inetcpl.rc:57 msgid "You can delete cached pages, cookies and other data." -msgstr "您可以刪除網頁快取、訊餅和其他資料。" +msgstr "您可以刪除網頁快取、Cookie 以及其他資料。" #: dlls/inetcpl.cpl/inetcpl.rc:59 msgid "Delete &files..." @@ -3555,7 +3525,7 @@ msgstr "設定(&S)..." #: dlls/inetcpl.cpl/inetcpl.rc:68 msgid "Delete browsing history" -msgstr "刪除瀏覽歷程" +msgstr "刪除瀏覽歷程記錄" #: dlls/inetcpl.cpl/inetcpl.rc:71 msgid "" @@ -3571,7 +3541,7 @@ msgid "" "Files saved on your computer by websites, which store things like user " "preferences and login information." msgstr "" -"訊餅\n" +"Cookies\n" "由網站儲存於您電腦的檔案，其存有諸如使用者偏好設定和登入資訊。" #: dlls/inetcpl.cpl/inetcpl.rc:75 @@ -3579,7 +3549,7 @@ msgid "" "History\n" "List of websites you have accessed." msgstr "" -"歷程\n" +"歷程記錄\n" "您曾存取過的網站清單。" #: dlls/inetcpl.cpl/inetcpl.rc:77 @@ -3606,7 +3576,7 @@ msgstr "刪除" msgid "" "Certificates are used for your personal identification and to identify " "certificate authorities and publishers." -msgstr "憑證是做為您的個人識別，以及識別憑證授權機構和發行者。" +msgstr "憑證是用於您的個人識別，以及識別憑證授權單位和發行者。" #: dlls/inetcpl.cpl/inetcpl.rc:114 msgid "Certificates..." @@ -3617,46 +3587,36 @@ msgid "Publishers..." msgstr "發行者..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "區域網路連線" +msgstr "連線" #: dlls/inetcpl.cpl/inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 設定" +msgstr "自動設定" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "使用 Web Proxy Auto-Discovery (WPAD)" #: dlls/inetcpl.cpl/inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "使用 Proxy Auto-Config (PAC) 指令碼" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "位址" +msgstr "位址:" #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "本機伺服器(&L)" +msgstr "代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "使用代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "無連接埠" +msgstr "連接埠:" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3668,7 +3628,7 @@ msgstr "設定 Wine 網際網路瀏覽器和相關的設定。" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "區域的安全設定：" +msgstr "此區域的安全設定:" #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3680,7 +3640,7 @@ msgstr "非常低" #: dlls/inetcpl.cpl/inetcpl.rc:36 dlls/wininet/wininet.rc:42 msgid "Low" -msgstr "慢" +msgstr "低" #: dlls/inetcpl.cpl/inetcpl.rc:37 msgid "Medium" @@ -3688,7 +3648,7 @@ msgstr "中" #: dlls/inetcpl.cpl/inetcpl.rc:38 msgid "Increased" -msgstr "已增加" +msgstr "稍高" #: dlls/inetcpl.cpl/inetcpl.rc:39 dlls/wininet/wininet.rc:41 msgid "High" @@ -3703,30 +3663,24 @@ msgid "&Disable" msgstr "停用(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "重置" +msgstr "重設(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "啟用(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "編輯覆載設定" +msgstr "覆寫(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" -msgstr "已連線" +msgstr "已連接" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "語音輸入裝置：" +msgstr "已連接 (xinput 裝置)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3736,7 +3690,7 @@ msgstr "已停用" msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." -msgstr "停用或啟用裝置之後，已連線的搖桿將無法更新，直到您重新啟動這個小程式。" +msgstr "停用或啟用裝置之後，已連接的搖桿將無法更新，直到您重新啟動這個程式。" #: dlls/joy.cpl/joy.rc:55 msgid "Test Joystick" @@ -3759,8 +3713,8 @@ msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" -"請按下控制器中的任何按鈕以啟用所選的效果。效果的方向可以利用控制器的軸向來變" -"更。" +"請按下控制器中的任何按鈕以啟用所選的效果。" +"效果的方向可以利用控制器的軸向來變更。" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers" @@ -3768,7 +3722,7 @@ msgstr "遊戲控制器" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "測試和設定遊戲控制器。" #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3783,10 +3737,8 @@ msgid "Subscript out of range" msgstr "註標超出範圍" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "無紙；" +msgstr "堆疊空間不足" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3802,7 +3754,7 @@ msgstr "物件不支援這個屬性或方法" #: dlls/jscript/jscript.rc:35 dlls/vbscript/vbscript.rc:50 msgid "Object doesn't support this action" -msgstr "物件不支援此動作" +msgstr "物件不支援這個動作" #: dlls/jscript/jscript.rc:36 msgid "Argument not optional" @@ -3814,27 +3766,23 @@ msgstr "語法錯誤" #: dlls/jscript/jscript.rc:38 msgid "Expected ';'" -msgstr "預期為 ;" +msgstr "預期為 ';'" #: dlls/jscript/jscript.rc:39 msgid "Expected '('" -msgstr "預期為 (" +msgstr "預期為 '('" #: dlls/jscript/jscript.rc:40 msgid "Expected ')'" -msgstr "預期為 )" +msgstr "預期為 ')'" #: dlls/jscript/jscript.rc:41 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "主體金鑰識別碼" +msgstr "預期為識別碼" #: dlls/jscript/jscript.rc:42 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "預期為 ;" +msgstr "預期為 '='" #: dlls/jscript/jscript.rc:43 msgid "Invalid character" @@ -3846,15 +3794,15 @@ msgstr "未終結的字串常數" #: dlls/jscript/jscript.rc:45 msgid "'return' statement outside of function" -msgstr "return 敘述位於函式之外" +msgstr "'return' 敘述位於函式之外" #: dlls/jscript/jscript.rc:46 msgid "Can't have 'break' outside of loop" -msgstr "在迴圈之外不可有 break" +msgstr "在迴圈之外不可有 'break'" #: dlls/jscript/jscript.rc:47 msgid "Can't have 'continue' outside of loop" -msgstr "在迴圈之外不可有 continue" +msgstr "在迴圈之外不可有 'continue'" #: dlls/jscript/jscript.rc:48 msgid "Label redefined" @@ -3865,38 +3813,32 @@ msgid "Label not found" msgstr "找不到標貼" #: dlls/jscript/jscript.rc:50 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "預期為 ;" +msgstr "預期為 '@end'" #: dlls/jscript/jscript.rc:51 msgid "Conditional compilation is turned off" -msgstr "條件編譯已被關閉" +msgstr "條件編譯已關閉" #: dlls/jscript/jscript.rc:52 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "預期為 ;" +msgstr "預期為 '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript 編譯錯誤" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 執行期錯誤" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "未知錯誤" +msgstr "不明執行期錯誤" #: dlls/jscript/jscript.rc:55 msgid "Number expected" -msgstr "預期為編號" +msgstr "預期為數字" #: dlls/jscript/jscript.rc:53 msgid "Function expected" @@ -3904,7 +3846,7 @@ msgstr "預期為函式" #: dlls/jscript/jscript.rc:54 msgid "'[object]' is not a date object" -msgstr "[object] 並非日期物件" +msgstr "'[object]' 並非日期物件" #: dlls/jscript/jscript.rc:56 msgid "Object expected" @@ -3916,11 +3858,11 @@ msgstr "不合法的指派" #: dlls/jscript/jscript.rc:58 msgid "'|' is undefined" -msgstr "| 未定義" +msgstr "'|' 未定義" #: dlls/jscript/jscript.rc:59 msgid "Boolean object expected" -msgstr "預期為布林物件" +msgstr "預期為布林值物件" #: dlls/jscript/jscript.rc:60 msgid "Cannot delete '|'" @@ -3935,16 +3877,12 @@ msgid "JScript object expected" msgstr "預期為 JScript 物件" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "預期為陣列物件" +msgstr "預期為列舉器物件" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "預期為布林物件" +msgstr "預期為正規表示式" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3952,7 +3890,7 @@ msgstr "正規表示式語法發生錯誤" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "發生異常且未被捕捉" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -3982,33 +3920,31 @@ msgstr "預期為陣列物件" msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" -msgstr "" +msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 'true'" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "無法定義屬性 '|': 物件不能擴展" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "無法重新定義不可設定的屬性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "[object] 並非日期物件" +msgstr "'this' 不是 Map 物件" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "屬性不可同時有存取子和值" #: include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine 核心 DLL" #: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32 #: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137 @@ -4041,7 +3977,7 @@ msgstr "存取被拒。\n" #: dlls/kernel32/winerror.mc:58 msgid "Invalid handle.\n" -msgstr "無效的控柄。\n" +msgstr "無效的控制代碼。\n" #: dlls/kernel32/winerror.mc:63 msgid "Memory trashed.\n" @@ -4057,11 +3993,11 @@ msgstr "無效的區塊。\n" #: dlls/kernel32/winerror.mc:78 msgid "Bad environment.\n" -msgstr "不當的環境。\n" +msgstr "不良的環境。\n" #: dlls/kernel32/winerror.mc:83 msgid "Bad format.\n" -msgstr "不當的格式。\n" +msgstr "錯誤的格式。\n" #: dlls/kernel32/winerror.mc:88 msgid "Invalid access.\n" @@ -4081,7 +4017,7 @@ msgstr "無效的儲存裝置。\n" #: dlls/kernel32/winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "無法刪除現行目錄。\n" +msgstr "無法刪除目前的目錄。\n" #: dlls/kernel32/winerror.mc:113 msgid "Not same device.\n" @@ -4089,15 +4025,15 @@ msgstr "並非相同裝置。\n" #: dlls/kernel32/winerror.mc:118 msgid "No more files.\n" -msgstr "沒有檔案了。\n" +msgstr "沒有更多檔案。\n" #: dlls/kernel32/winerror.mc:123 msgid "Write protected.\n" -msgstr "防止寫入的。\n" +msgstr "已設定寫入保護。\n" #: dlls/kernel32/winerror.mc:128 msgid "Bad unit.\n" -msgstr "不當的單位。\n" +msgstr "錯誤的單位。\n" #: dlls/kernel32/winerror.mc:133 msgid "Not ready.\n" @@ -4105,7 +4041,7 @@ msgstr "未就緒。\n" #: dlls/kernel32/winerror.mc:138 msgid "Bad command.\n" -msgstr "不當的命令。\n" +msgstr "錯誤的命令。\n" #: dlls/kernel32/winerror.mc:143 msgid "CRC error.\n" @@ -4113,7 +4049,7 @@ msgstr "循環冗餘檢查錯誤。\n" #: dlls/kernel32/winerror.mc:148 msgid "Bad length.\n" -msgstr "不當長度。\n" +msgstr "長度錯誤。\n" #: dlls/kernel32/winerror.mc:153 dlls/kernel32/winerror.mc:528 msgid "Seek error.\n" @@ -4181,7 +4117,7 @@ msgstr "重複的網路名稱。\n" #: dlls/kernel32/winerror.mc:233 msgid "Bad network path.\n" -msgstr "不當的網路路徑。\n" +msgstr "錯誤的網路路徑。\n" #: dlls/kernel32/winerror.mc:238 msgid "Network busy.\n" @@ -4197,11 +4133,11 @@ msgstr "太多命令。\n" #: dlls/kernel32/winerror.mc:253 msgid "Adapter hardware error.\n" -msgstr "調適器硬體錯誤。\n" +msgstr "介面卡硬體錯誤。\n" #: dlls/kernel32/winerror.mc:258 msgid "Bad network response.\n" -msgstr "不當的網路回應。\n" +msgstr "不良的網路回應。\n" #: dlls/kernel32/winerror.mc:263 msgid "Unexpected network error.\n" @@ -4209,7 +4145,7 @@ msgstr "未預期的網路錯誤。\n" #: dlls/kernel32/winerror.mc:268 msgid "Bad remote adapter.\n" -msgstr "不當的遠端調適器。\n" +msgstr "不良的遠端介面卡。\n" #: dlls/kernel32/winerror.mc:273 msgid "Print queue full.\n" @@ -4233,11 +4169,11 @@ msgstr "存取網路被拒絕。\n" #: dlls/kernel32/winerror.mc:298 msgid "Bad device type.\n" -msgstr "不當的裝置類型。\n" +msgstr "錯誤的裝置類型。\n" #: dlls/kernel32/winerror.mc:303 msgid "Bad network name.\n" -msgstr "不當的網路名稱。\n" +msgstr "錯誤的網路名稱。\n" #: dlls/kernel32/winerror.mc:308 msgid "Too many network names.\n" @@ -4245,7 +4181,7 @@ msgstr "太多網路名稱。\n" #: dlls/kernel32/winerror.mc:313 msgid "Too many network sessions.\n" -msgstr "太多網路執行期間。\n" +msgstr "太多網路工作階段。\n" #: dlls/kernel32/winerror.mc:318 msgid "Sharing paused.\n" @@ -4293,23 +4229,23 @@ msgstr "網路寫入錯誤。\n" #: dlls/kernel32/winerror.mc:373 msgid "No process slots.\n" -msgstr "沒有行程插槽。\n" +msgstr "沒有線程插槽。\n" #: dlls/kernel32/winerror.mc:378 msgid "Too many semaphores.\n" -msgstr "太多號誌。\n" +msgstr "太多旗號。\n" #: dlls/kernel32/winerror.mc:383 msgid "Exclusive semaphore already owned.\n" -msgstr "已擁有互斥號誌。\n" +msgstr "已擁有專屬旗號。\n" #: dlls/kernel32/winerror.mc:388 msgid "Semaphore is set.\n" -msgstr "已設定號誌。\n" +msgstr "已設定旗號。\n" #: dlls/kernel32/winerror.mc:393 msgid "Too many semaphore requests.\n" -msgstr "太多號誌要求。\n" +msgstr "太多旗號要求。\n" #: dlls/kernel32/winerror.mc:398 msgid "Invalid at interrupt time.\n" @@ -4317,11 +4253,11 @@ msgstr "於插斷時間無效。\n" #: dlls/kernel32/winerror.mc:403 msgid "Semaphore owner died.\n" -msgstr "號誌擁有者已死。\n" +msgstr "旗號擁有者已終止。\n" #: dlls/kernel32/winerror.mc:408 msgid "Semaphore user limit.\n" -msgstr "號誌使用者限制。\n" +msgstr "旗號使用者限制。\n" #: dlls/kernel32/winerror.mc:413 msgid "Insert disk for drive %1.\n" @@ -4329,7 +4265,7 @@ msgstr "插入磁碟於儲存裝置 %1。\n" #: dlls/kernel32/winerror.mc:418 msgid "Drive locked.\n" -msgstr "已鎖定儲存裝置。\n" +msgstr "儲存裝置已鎖定。\n" #: dlls/kernel32/winerror.mc:423 msgid "Broken pipe.\n" @@ -4345,11 +4281,11 @@ msgstr "緩衝區溢位。\n" #: dlls/kernel32/winerror.mc:443 msgid "No more search handles.\n" -msgstr "沒有搜尋控柄了。\n" +msgstr "沒有更多搜尋控制代碼。\n" #: dlls/kernel32/winerror.mc:448 msgid "Invalid target handle.\n" -msgstr "無效的目標控柄。\n" +msgstr "無效的目標控制代碼。\n" #: dlls/kernel32/winerror.mc:453 msgid "Invalid IOCTL.\n" @@ -4369,7 +4305,7 @@ msgstr "呼叫尚未實作。\n" #: dlls/kernel32/winerror.mc:473 msgid "Semaphore timeout.\n" -msgstr "號誌逾時。\n" +msgstr "旗號逾時。\n" #: dlls/kernel32/winerror.mc:478 msgid "Insufficient buffer.\n" @@ -4385,7 +4321,7 @@ msgstr "無效的層級。\n" #: dlls/kernel32/winerror.mc:493 msgid "No volume label.\n" -msgstr "沒有卷冊標貼。\n" +msgstr "沒有磁碟區標籤。\n" #: dlls/kernel32/winerror.mc:498 msgid "Module not found.\n" @@ -4405,7 +4341,7 @@ msgstr "子行程還未完成。\n" #: dlls/kernel32/winerror.mc:518 msgid "Invalid use of direct access handle.\n" -msgstr "直接存取控柄的使用無效。\n" +msgstr "直接存取控制代碼的使用無效。\n" #: dlls/kernel32/winerror.mc:523 msgid "Negative seek.\n" @@ -4433,19 +4369,19 @@ msgstr "儲存裝置未被 SUBST。\n" #: dlls/kernel32/winerror.mc:558 msgid "Attempt to JOIN onto a JOINed drive.\n" -msgstr "試圖 JOIN 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:563 msgid "Attempt to SUBST onto a SUBSTed drive.\n" -msgstr "試圖 SUBST 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:568 msgid "Attempt to JOIN to a SUBSTed drive.\n" -msgstr "試圖 JOIN 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:573 msgid "Attempt to SUBST to a JOINed drive.\n" -msgstr "試圖 SUBST 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:578 msgid "Drive is busy.\n" @@ -4489,7 +4425,7 @@ msgstr "用於 DosMuxSemWait 的事件計數不正確。\n" #: dlls/kernel32/winerror.mc:628 msgid "Too many waiters for DosMuxSemWait.\n" -msgstr "太多 DosMuxSemWait 的等待者。\n" +msgstr "太多 DosMuxSemWait 的等待項。\n" #: dlls/kernel32/winerror.mc:633 msgid "DosSemMuxWait list invalid.\n" @@ -4497,11 +4433,11 @@ msgstr "DosSemMuxWait 清單無效。\n" #: dlls/kernel32/winerror.mc:638 msgid "Volume label too long.\n" -msgstr "卷冊標貼太長。\n" +msgstr "磁碟區標籤太長。\n" #: dlls/kernel32/winerror.mc:643 msgid "Too many TCBs.\n" -msgstr "太多 TCBs。\n" +msgstr "太多 TCB。\n" #: dlls/kernel32/winerror.mc:648 msgid "Signal refused.\n" @@ -4517,11 +4453,11 @@ msgstr "無法鎖定資料段。\n" #: dlls/kernel32/winerror.mc:663 msgid "Bad thread ID address.\n" -msgstr "不當的執行緒識別號位址。\n" +msgstr "錯誤的執行緒識別碼位址。\n" #: dlls/kernel32/winerror.mc:668 msgid "Bad arguments to DosExecPgm.\n" -msgstr "不當的 DosExecPgm 引數。\n" +msgstr "錯誤的 DosExecPgm 引數。\n" #: dlls/kernel32/winerror.mc:673 msgid "Path is invalid.\n" @@ -4569,7 +4505,7 @@ msgstr "無效的旗標號碼。\n" #: dlls/kernel32/winerror.mc:728 msgid "Semaphore name not found.\n" -msgstr "找不到號誌名稱。\n" +msgstr "找不到旗號名稱。\n" #: dlls/kernel32/winerror.mc:733 msgid "Invalid starting code segment for %1.\n" @@ -4593,7 +4529,7 @@ msgstr "EXE %1 被標記為無效。\n" #: dlls/kernel32/winerror.mc:758 msgid "Bad EXE format for %1.\n" -msgstr "%1 的不當 EXE 格式。\n" +msgstr "%1 是錯誤的 EXE 格式。\n" #: dlls/kernel32/winerror.mc:763 msgid "Iterated data exceeds 64k in %1.\n" @@ -4673,19 +4609,19 @@ msgstr "不允許巢狀 LoadModule 呼叫。\n" #: dlls/kernel32/winerror.mc:858 msgid "Machine type mismatch.\n" -msgstr "機器型態不匹配。\n" +msgstr "機器類型不相符。\n" #: dlls/kernel32/winerror.mc:863 msgid "Bad pipe.\n" -msgstr "不當的管線。\n" +msgstr "錯誤的管線。\n" #: dlls/kernel32/winerror.mc:868 msgid "Pipe busy.\n" -msgstr "管線忙碌。\n" +msgstr "管線忙碌中。\n" #: dlls/kernel32/winerror.mc:873 msgid "Pipe closed.\n" -msgstr "管線關閉。\n" +msgstr "管線已關閉。\n" #: dlls/kernel32/winerror.mc:878 msgid "Pipe not connected.\n" @@ -4693,11 +4629,11 @@ msgstr "管線未連接。\n" #: dlls/kernel32/winerror.mc:883 msgid "More data available.\n" -msgstr "更多資料可用。\n" +msgstr "有更多可用資料。\n" #: dlls/kernel32/winerror.mc:888 msgid "Session canceled.\n" -msgstr "已取消工作階段。\n" +msgstr "工作階段已取消。\n" #: dlls/kernel32/winerror.mc:893 msgid "Invalid extended attribute name.\n" @@ -4733,7 +4669,7 @@ msgstr "進階屬性表格已滿。\n" #: dlls/kernel32/winerror.mc:933 msgid "Invalid extended attribute handle.\n" -msgstr "無效的進階屬性控柄。\n" +msgstr "無效的進階屬性控制代碼。\n" #: dlls/kernel32/winerror.mc:938 msgid "Extended attributes not supported.\n" @@ -4745,7 +4681,7 @@ msgstr "Mutex 非由呼叫者所擁有。\n" #: dlls/kernel32/winerror.mc:948 msgid "Too many posts to semaphore.\n" -msgstr "號誌太多貼文。\n" +msgstr "旗號太多貼文。\n" #: dlls/kernel32/winerror.mc:953 msgid "Read/WriteProcessMemory partially completed.\n" @@ -4753,7 +4689,7 @@ msgstr "讀取/寫入行程記憶體已部分完成。\n" #: dlls/kernel32/winerror.mc:958 msgid "The oplock wasn't granted.\n" -msgstr "未被授與 oplock。\n" +msgstr "未授權 oplock。\n" #: dlls/kernel32/winerror.mc:963 msgid "Invalid oplock message received.\n" @@ -4821,7 +4757,7 @@ msgstr "無效的旗標。\n" #: dlls/kernel32/winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "無法辨識的卷冊。\n" +msgstr "無法辨識的磁碟區。\n" #: dlls/kernel32/winerror.mc:1048 msgid "File invalid.\n" @@ -4833,7 +4769,7 @@ msgstr "無法全螢幕運行。\n" #: dlls/kernel32/winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "不存在的字組。\n" +msgstr "不存在的權杖。\n" #: dlls/kernel32/winerror.mc:1063 msgid "Registry corrupt.\n" @@ -4885,7 +4821,7 @@ msgstr "註冊表索引鍵有子項。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子項必須是易變的。\n" +msgstr "子項必須是可變的。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -4937,7 +4873,7 @@ msgstr "服務無法接受控制訊息。\n" #: dlls/kernel32/winerror.mc:1188 msgid "Service not active.\n" -msgstr "服務現未啟用。\n" +msgstr "服務尚未啟用。\n" #: dlls/kernel32/winerror.mc:1193 msgid "Service controller connect failed.\n" @@ -4985,7 +4921,7 @@ msgstr "服務已存在。\n" #: dlls/kernel32/winerror.mc:1248 msgid "System running last-known-good config.\n" -msgstr "系統執行最後已知正常的組配。\n" +msgstr "系統執行最近已知正常的組配。\n" #: dlls/kernel32/winerror.mc:1253 msgid "Service dependency deleted.\n" @@ -4993,11 +4929,11 @@ msgstr "服務相依性已刪除。\n" #: dlls/kernel32/winerror.mc:1258 msgid "Boot already accepted as last-good config.\n" -msgstr "開機已被接受為最後正常的組配。\n" +msgstr "開機已接受為上次正常的組配。\n" #: dlls/kernel32/winerror.mc:1263 msgid "Service not started since last boot.\n" -msgstr "服務自從最後一次開機即無法啟動。\n" +msgstr "服務自上次開機之後尚未啟動。\n" #: dlls/kernel32/winerror.mc:1268 msgid "Duplicate service name.\n" @@ -5013,11 +4949,11 @@ msgstr "無法偵測到驅動程式的失敗。\n" #: dlls/kernel32/winerror.mc:1283 msgid "Process abort cannot be detected.\n" -msgstr "無法偵測到行程中止。\n" +msgstr "無法偵測到處理程序中止。\n" #: dlls/kernel32/winerror.mc:1288 msgid "No recovery program for service.\n" -msgstr "沒有復原程式用於服務。\n" +msgstr "服務沒有復原程式。\n" #: dlls/kernel32/winerror.mc:1293 msgid "Service not implemented by exe.\n" @@ -5053,7 +4989,7 @@ msgstr "無效的區塊長度。\n" #: dlls/kernel32/winerror.mc:1333 msgid "Device not partitioned.\n" -msgstr "裝置未設分割區。\n" +msgstr "裝置未設定分割區。\n" #: dlls/kernel32/winerror.mc:1338 msgid "Unable to lock media.\n" @@ -5080,8 +5016,6 @@ msgid "No Unicode translation.\n" msgstr "沒有萬國碼轉譯。\n" #: dlls/kernel32/winerror.mc:1368 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "動態連結函式庫初始失敗。\n" @@ -5115,7 +5049,7 @@ msgstr "序列 I/O 計數器逾時。\n" #: dlls/kernel32/winerror.mc:1408 msgid "Floppy ID address mark not found.\n" -msgstr "找不到軟碟識別號位址標記。\n" +msgstr "找不到軟碟識別碼位址標記。\n" #: dlls/kernel32/winerror.mc:1413 msgid "Floppy reports wrong cylinder.\n" @@ -5123,7 +5057,7 @@ msgstr "軟碟回報錯誤的磁柱。\n" #: dlls/kernel32/winerror.mc:1418 msgid "Unknown floppy error.\n" -msgstr "未知的軟碟錯誤。\n" +msgstr "不明的軟碟錯誤。\n" #: dlls/kernel32/winerror.mc:1423 msgid "Floppy registers inconsistent.\n" @@ -5167,7 +5101,7 @@ msgstr "設定電源狀態失敗。\n" #: dlls/kernel32/winerror.mc:1473 msgid "Too many links.\n" -msgstr "太多鏈結。\n" +msgstr "太多連結。\n" #: dlls/kernel32/winerror.mc:1478 msgid "Newer Windows version needed.\n" @@ -5203,7 +5137,7 @@ msgstr "找不到 DLL 檔。\n" #: dlls/kernel32/winerror.mc:1518 msgid "Out of user handles.\n" -msgstr "超出使用者控柄。\n" +msgstr "超出使用者控制代碼。\n" #: dlls/kernel32/winerror.mc:1523 msgid "Message can only be used in synchronous calls.\n" @@ -5231,7 +5165,7 @@ msgstr "裝置需要重新初始化。\n" #: dlls/kernel32/winerror.mc:1553 msgid "The device requires cleaning.\n" -msgstr "裝置需要清潔。\n" +msgstr "裝置需要清理。\n" #: dlls/kernel32/winerror.mc:1558 msgid "The device door is open.\n" @@ -5259,11 +5193,11 @@ msgstr "找不到點。\n" #: dlls/kernel32/winerror.mc:1588 msgid "No running tracking service.\n" -msgstr "沒在執行追蹤服務。\n" +msgstr "沒有執行中的追蹤服務。\n" #: dlls/kernel32/winerror.mc:1593 msgid "No such volume ID.\n" -msgstr "沒有此類卷冊識別號。\n" +msgstr "沒有此類磁碟區識別碼。\n" #: dlls/kernel32/winerror.mc:1598 msgid "Unable to remove the file to be replaced.\n" @@ -5283,11 +5217,11 @@ msgstr "正在刪除日誌。\n" #: dlls/kernel32/winerror.mc:1618 msgid "The journal is not active.\n" -msgstr "日誌現未啟用。\n" +msgstr "日誌尚未啟用。\n" #: dlls/kernel32/winerror.mc:1623 msgid "Potential matching file found.\n" -msgstr "找到可能的匹配檔案。\n" +msgstr "找到可能的相符檔案。\n" #: dlls/kernel32/winerror.mc:1628 msgid "The journal entry was deleted.\n" @@ -5299,7 +5233,7 @@ msgstr "無效的裝置名稱。\n" #: dlls/kernel32/winerror.mc:1638 msgid "Connection unavailable.\n" -msgstr "連接不得使用。\n" +msgstr "連接無法使用。\n" #: dlls/kernel32/winerror.mc:1643 msgid "Device already remembered.\n" @@ -5307,7 +5241,7 @@ msgstr "裝置已被記住。\n" #: dlls/kernel32/winerror.mc:1648 msgid "No network or bad path.\n" -msgstr "沒有網路或不當的路徑。\n" +msgstr "沒有網路或錯誤的路徑。\n" #: dlls/kernel32/winerror.mc:1653 msgid "Invalid network provider name.\n" @@ -5315,11 +5249,11 @@ msgstr "無效的網路提供者名稱。\n" #: dlls/kernel32/winerror.mc:1658 msgid "Cannot open network connection profile.\n" -msgstr "無法開啟網路連線側寫檔。\n" +msgstr "無法開啟網路連線設定檔。\n" #: dlls/kernel32/winerror.mc:1663 msgid "Corrupt network connection profile.\n" -msgstr "損壞的網路連線側寫檔。\n" +msgstr "損壞的網路連線設定檔。\n" #: dlls/kernel32/winerror.mc:1668 msgid "Not a container.\n" @@ -5327,7 +5261,7 @@ msgstr "不是一個容器。\n" #: dlls/kernel32/winerror.mc:1673 msgid "Extended error.\n" -msgstr "進階錯誤。\n" +msgstr "延伸錯誤。\n" #: dlls/kernel32/winerror.mc:1678 msgid "Invalid group name.\n" @@ -5367,11 +5301,11 @@ msgstr "無效的訊息目的地。\n" #: dlls/kernel32/winerror.mc:1728 msgid "Session credential conflict.\n" -msgstr "作業階段憑據發生衝突。\n" +msgstr "工作階段憑據發生衝突。\n" #: dlls/kernel32/winerror.mc:1733 msgid "Remote session limit exceeded.\n" -msgstr "已超出遠端作業階段限制。\n" +msgstr "已超出遠端工作階段限制。\n" #: dlls/kernel32/winerror.mc:1738 msgid "Duplicate domain or workgroup name.\n" @@ -5395,7 +5329,7 @@ msgstr "連線被拒。\n" #: dlls/kernel32/winerror.mc:1763 msgid "Connection gracefully closed.\n" -msgstr "已平順關閉連接。\n" +msgstr "已順利關閉連線。\n" #: dlls/kernel32/winerror.mc:1768 msgid "Address already associated with transport endpoint.\n" @@ -5411,23 +5345,23 @@ msgstr "連線無效。\n" #: dlls/kernel32/winerror.mc:1783 msgid "Connection is active.\n" -msgstr "連接現正使用。\n" +msgstr "連線現正使用。\n" #: dlls/kernel32/winerror.mc:1788 msgid "Network unreachable.\n" -msgstr "無法連線網路。\n" +msgstr "網路無法連線。\n" #: dlls/kernel32/winerror.mc:1793 msgid "Host unreachable.\n" -msgstr "無法連線主機。\n" +msgstr "主機無法連線。\n" #: dlls/kernel32/winerror.mc:1798 msgid "Protocol unreachable.\n" -msgstr "無法連線協定。\n" +msgstr "協定無法連線。\n" #: dlls/kernel32/winerror.mc:1803 msgid "Port unreachable.\n" -msgstr "無法連線通訊埠。\n" +msgstr "通訊埠無法連線。\n" #: dlls/kernel32/winerror.mc:1808 msgid "Request aborted.\n" @@ -5435,7 +5369,7 @@ msgstr "已放棄要求。\n" #: dlls/kernel32/winerror.mc:1813 msgid "Connection aborted.\n" -msgstr "已放棄連接。\n" +msgstr "已放棄連線。\n" #: dlls/kernel32/winerror.mc:1818 msgid "Please retry operation.\n" @@ -5471,7 +5405,7 @@ msgstr "使用者未被認證。\n" #: dlls/kernel32/winerror.mc:1858 msgid "User not logged on.\n" -msgstr "使用者未被記錄。\n" +msgstr "使用者未登入。\n" #: dlls/kernel32/winerror.mc:1863 msgid "Continue work in progress.\n" @@ -5503,7 +5437,7 @@ msgstr "即使沒有變更任何東西時也進行作業。\n" #: dlls/kernel32/winerror.mc:1898 msgid "The user profile is invalid.\n" -msgstr "使用者側寫檔無效。\n" +msgstr "使用者設定檔無效。\n" #: dlls/kernel32/winerror.mc:1903 msgid "Not supported on Small Business Server.\n" @@ -5515,7 +5449,7 @@ msgstr "並非所有權限都被指派。\n" #: dlls/kernel32/winerror.mc:1913 msgid "Some security IDs not mapped.\n" -msgstr "某些安全識別號未對應。\n" +msgstr "某些安全識別碼未對應。\n" #: dlls/kernel32/winerror.mc:1918 msgid "No quotas for account.\n" @@ -5547,7 +5481,7 @@ msgstr "無效的主要群組。\n" #: dlls/kernel32/winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "沒有假冒字組。\n" +msgstr "沒有模擬權杖。\n" #: dlls/kernel32/winerror.mc:1958 msgid "Can't disable mandatory group.\n" @@ -5555,11 +5489,11 @@ msgstr "無法停用必要群組。\n" #: dlls/kernel32/winerror.mc:1963 msgid "No logon servers available.\n" -msgstr "沒有可用的登錄伺服器。\n" +msgstr "沒有可用的登入伺服器。\n" #: dlls/kernel32/winerror.mc:1968 msgid "No such logon session.\n" -msgstr "沒有此類登錄作業階段。\n" +msgstr "沒有此類登入工作階段。\n" #: dlls/kernel32/winerror.mc:1973 msgid "No such privilege.\n" @@ -5623,7 +5557,7 @@ msgstr "帳號限制。\n" #: dlls/kernel32/winerror.mc:2048 msgid "Invalid logon hours.\n" -msgstr "無效的登錄時數。\n" +msgstr "無效的登入時數。\n" #: dlls/kernel32/winerror.mc:2053 msgid "Invalid workstation.\n" @@ -5639,7 +5573,7 @@ msgstr "帳號已停用。\n" #: dlls/kernel32/winerror.mc:2068 msgid "No security ID mapped.\n" -msgstr "沒有對應的安全識別號。\n" +msgstr "沒有對應的安全識別碼。\n" #: dlls/kernel32/winerror.mc:2073 msgid "Too many LUIDs requested.\n" @@ -5667,7 +5601,7 @@ msgstr "無效的安全描述元。\n" #: dlls/kernel32/winerror.mc:2103 msgid "Bad inherited ACL.\n" -msgstr "不當繼承的 ACL。\n" +msgstr "錯誤繼承的 ACL。\n" #: dlls/kernel32/winerror.mc:2108 msgid "Server disabled.\n" @@ -5679,7 +5613,7 @@ msgstr "伺服器未停用。\n" #: dlls/kernel32/winerror.mc:2118 msgid "Invalid ID authority.\n" -msgstr "無效的識別號授權。\n" +msgstr "無效的識別碼授權。\n" #: dlls/kernel32/winerror.mc:2123 msgid "Allotted space exceeded.\n" @@ -5691,19 +5625,19 @@ msgstr "無效的群組屬性。\n" #: dlls/kernel32/winerror.mc:2133 msgid "Bad impersonation level.\n" -msgstr "不當的假冒等級。\n" +msgstr "錯誤的模擬等級。\n" #: dlls/kernel32/winerror.mc:2138 msgid "Can't open anonymous security token.\n" -msgstr "無法開啟匿名安全性代表字組。\n" +msgstr "無法開啟匿名的安全權杖。\n" #: dlls/kernel32/winerror.mc:2143 msgid "Bad validation class.\n" -msgstr "不當的驗證類別。\n" +msgstr "錯誤的驗證類別。\n" #: dlls/kernel32/winerror.mc:2148 msgid "Bad token type.\n" -msgstr "不當的字組型態。\n" +msgstr "錯誤的權杖類型。\n" #: dlls/kernel32/winerror.mc:2153 msgid "No security on object.\n" @@ -5751,15 +5685,15 @@ msgstr "通用存取類型未對應。\n" #: dlls/kernel32/winerror.mc:2208 msgid "Bad descriptor format.\n" -msgstr "不當的描述元格式。\n" +msgstr "錯誤的描述元格式。\n" #: dlls/kernel32/winerror.mc:2213 msgid "Not a logon process.\n" -msgstr "不是個登錄行程。\n" +msgstr "不是登入工作階段。\n" #: dlls/kernel32/winerror.mc:2218 msgid "Logon session ID exists.\n" -msgstr "登錄期間識別碼已存在。\n" +msgstr "登入工作階段識別碼已存在。\n" #: dlls/kernel32/winerror.mc:2223 msgid "Unknown authentication package.\n" @@ -5767,19 +5701,19 @@ msgstr "不明認證套件。\n" #: dlls/kernel32/winerror.mc:2228 msgid "Bad logon session state.\n" -msgstr "不當的登錄作業階段狀態。\n" +msgstr "錯誤的登入工作階段狀態。\n" #: dlls/kernel32/winerror.mc:2233 msgid "Logon session ID collision.\n" -msgstr "登錄期間識別碼產生碰撞。\n" +msgstr "登入工作階段識別碼發生衝突。\n" #: dlls/kernel32/winerror.mc:2238 msgid "Invalid logon type.\n" -msgstr "無效的登錄型態。\n" +msgstr "無效的登入類型。\n" #: dlls/kernel32/winerror.mc:2243 msgid "Cannot impersonate.\n" -msgstr "無法假冒。\n" +msgstr "無法模擬。\n" #: dlls/kernel32/winerror.mc:2248 msgid "Invalid transaction state.\n" @@ -5807,7 +5741,7 @@ msgstr "其為使用者的主要群組。\n" #: dlls/kernel32/winerror.mc:2278 msgid "Token already in use.\n" -msgstr "字組已使用中。\n" +msgstr "權杖已在使用中。\n" #: dlls/kernel32/winerror.mc:2283 msgid "No such local group.\n" @@ -5827,7 +5761,7 @@ msgstr "本地群組已存在。\n" #: dlls/kernel32/winerror.mc:2303 dlls/kernel32/winerror.mc:2328 msgid "Logon type not granted.\n" -msgstr "登錄型態未授與。\n" +msgstr "登錄類型未授與。\n" #: dlls/kernel32/winerror.mc:2308 msgid "Too many secrets.\n" @@ -5843,7 +5777,7 @@ msgstr "內部安全資料庫錯誤。\n" #: dlls/kernel32/winerror.mc:2323 msgid "Too many context IDs.\n" -msgstr "太多文脈識別號。\n" +msgstr "太多內容識別碼。\n" #: dlls/kernel32/winerror.mc:2333 msgid "Cross-encrypted NT password required.\n" @@ -5867,7 +5801,7 @@ msgstr "必須輸入交叉加密過的本機密碼。\n" #: dlls/kernel32/winerror.mc:2358 msgid "No inheritable components.\n" -msgstr "沒有可繼承的成分。\n" +msgstr "沒有可繼承的元件。\n" #: dlls/kernel32/winerror.mc:2363 msgid "File or directory corrupt.\n" @@ -5879,7 +5813,7 @@ msgstr "磁碟已損壞。\n" #: dlls/kernel32/winerror.mc:2373 msgid "No user session key.\n" -msgstr "沒有使用者作業階段金鑰。\n" +msgstr "沒有使用者工作階段金鑰。\n" #: dlls/kernel32/winerror.mc:2378 msgid "License quota exceeded.\n" @@ -5895,31 +5829,31 @@ msgstr "相互認證失敗。\n" #: dlls/kernel32/winerror.mc:2393 msgid "Time skew between client and server.\n" -msgstr "客戶端與伺服端的時間偏斜。\n" +msgstr "用戶端與伺服器的時間存在偏移。\n" #: dlls/kernel32/winerror.mc:2398 msgid "Invalid window handle.\n" -msgstr "無效的視窗控柄。\n" +msgstr "無效的視窗控制代碼。\n" #: dlls/kernel32/winerror.mc:2403 msgid "Invalid menu handle.\n" -msgstr "無效的選單控柄。\n" +msgstr "無效的選單控制代碼。\n" #: dlls/kernel32/winerror.mc:2408 msgid "Invalid cursor handle.\n" -msgstr "無效的游標控柄。\n" +msgstr "無效的游標控制代碼。\n" #: dlls/kernel32/winerror.mc:2413 msgid "Invalid accelerator table handle.\n" -msgstr "無效的加速功能表格控柄。\n" +msgstr "無效的加速功能表格控制代碼。\n" #: dlls/kernel32/winerror.mc:2418 msgid "Invalid hook handle.\n" -msgstr "無效的攔截控柄。\n" +msgstr "無效的勾點控制代碼。\n" #: dlls/kernel32/winerror.mc:2423 msgid "Invalid DWP handle.\n" -msgstr "無效的 DWP 控柄。\n" +msgstr "無效的 DWP 控制代碼。\n" #: dlls/kernel32/winerror.mc:2428 msgid "Can't create top-level child window.\n" @@ -5935,7 +5869,7 @@ msgstr "視窗由另外的執行緒所擁有。\n" #: dlls/kernel32/winerror.mc:2443 msgid "Hotkey already registered.\n" -msgstr "熱鍵已被註冊。\n" +msgstr "快捷鍵已被註冊。\n" #: dlls/kernel32/winerror.mc:2448 msgid "Class already exists.\n" @@ -5955,7 +5889,7 @@ msgstr "無效的索引。\n" #: dlls/kernel32/winerror.mc:2468 msgid "Invalid icon handle.\n" -msgstr "無效的圖示控柄。\n" +msgstr "無效的圖示控制代碼。\n" #: dlls/kernel32/winerror.mc:2473 msgid "Private dialog index.\n" @@ -5963,11 +5897,11 @@ msgstr "私人的對話框索引。\n" #: dlls/kernel32/winerror.mc:2478 msgid "List box ID not found.\n" -msgstr "找不到清單方塊識別號。\n" +msgstr "找不到清單方塊識別碼。\n" #: dlls/kernel32/winerror.mc:2483 msgid "No wildcard characters.\n" -msgstr "沒有萬用字元字元。\n" +msgstr "沒有萬用字元。\n" #: dlls/kernel32/winerror.mc:2488 msgid "Clipboard not open.\n" @@ -5975,7 +5909,7 @@ msgstr "未開啟剪貼簿。\n" #: dlls/kernel32/winerror.mc:2493 msgid "Hotkey not registered.\n" -msgstr "快速鍵未註冊。\n" +msgstr "快捷鍵未註冊。\n" #: dlls/kernel32/winerror.mc:2498 msgid "Not a dialog window.\n" @@ -5983,7 +5917,7 @@ msgstr "不是個對話框視窗。\n" #: dlls/kernel32/winerror.mc:2503 msgid "Control ID not found.\n" -msgstr "找不到控制識別號。\n" +msgstr "找不到控制識別碼。\n" #: dlls/kernel32/winerror.mc:2508 msgid "Invalid combo box message.\n" @@ -6003,7 +5937,7 @@ msgstr "找不到 DC。\n" #: dlls/kernel32/winerror.mc:2528 msgid "Invalid hook filter.\n" -msgstr "無效的攔截篩選器。\n" +msgstr "無效的勾點篩選器。\n" #: dlls/kernel32/winerror.mc:2533 msgid "Invalid filter procedure.\n" @@ -6011,19 +5945,19 @@ msgstr "無效的篩選器程序。\n" #: dlls/kernel32/winerror.mc:2538 msgid "Hook procedure needs module handle.\n" -msgstr "攔截程序需要模組控柄。\n" +msgstr "勾點程序需要模組控制代碼。\n" #: dlls/kernel32/winerror.mc:2543 msgid "Global-only hook procedure.\n" -msgstr "僅限全域的攔截程序。\n" +msgstr "只限全域的勾點程序。\n" #: dlls/kernel32/winerror.mc:2548 msgid "Journal hook already set.\n" -msgstr "已經設定日誌攔截。\n" +msgstr "已經設定日誌勾點。\n" #: dlls/kernel32/winerror.mc:2553 msgid "Hook procedure not installed.\n" -msgstr "尚未安裝攔截程序。\n" +msgstr "尚未安裝勾點程序。\n" #: dlls/kernel32/winerror.mc:2558 msgid "Invalid list box message.\n" @@ -6039,7 +5973,7 @@ msgstr "這個清單方塊沒有定位停駐點。\n" #: dlls/kernel32/winerror.mc:2573 msgid "Can't destroy object owned by another thread.\n" -msgstr "無法銷毀由另外執行緒所擁有的物件。\n" +msgstr "無法銷毀由其他執行緒所擁有的物件。\n" #: dlls/kernel32/winerror.mc:2578 msgid "Child window menus not allowed.\n" @@ -6063,7 +5997,7 @@ msgstr "螢幕已鎖定。\n" #: dlls/kernel32/winerror.mc:2603 msgid "Window handles have different parents.\n" -msgstr "視窗控柄有不同的上層。\n" +msgstr "視窗控制代碼有不同的父系。\n" #: dlls/kernel32/winerror.mc:2608 msgid "Not a child window.\n" @@ -6075,7 +6009,7 @@ msgstr "數字格式無效。\n" #: dlls/kernel32/winerror.mc:2618 msgid "Invalid thread ID.\n" -msgstr "無效的執行緒識別號。\n" +msgstr "無效的執行緒識別碼。\n" #: dlls/kernel32/winerror.mc:2623 msgid "Not an MDI child window.\n" @@ -6107,7 +6041,7 @@ msgstr "沒有非置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2658 msgid "No paged system resources.\n" -msgstr "非置換頁的系統資源。\n" +msgstr "沒有置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2663 msgid "No working set quota.\n" @@ -6127,11 +6061,11 @@ msgstr "找不到選單項目。\n" #: dlls/kernel32/winerror.mc:2683 msgid "Invalid keyboard handle.\n" -msgstr "無效的鍵盤控柄。\n" +msgstr "無效的鍵盤控制代碼。\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許的勾點類型。\n" #: dlls/kernel32/winerror.mc:2693 msgid "Interactive window station required.\n" @@ -6143,7 +6077,7 @@ msgstr "逾時。\n" #: dlls/kernel32/winerror.mc:2703 msgid "Invalid monitor handle.\n" -msgstr "無效的監視器控柄。\n" +msgstr "無效的監視器控制代碼。\n" #: dlls/kernel32/winerror.mc:2708 msgid "Event log file corrupt.\n" @@ -6171,11 +6105,11 @@ msgstr "使用者已放棄安裝。\n" #: dlls/kernel32/winerror.mc:2738 msgid "Installation failure.\n" -msgstr "安裝已失敗。\n" +msgstr "安裝失敗。\n" #: dlls/kernel32/winerror.mc:2743 msgid "Installation suspended.\n" -msgstr "安裝已懸置。\n" +msgstr "安裝暫停。\n" #: dlls/kernel32/winerror.mc:2748 msgid "Unknown product.\n" @@ -6183,19 +6117,19 @@ msgstr "不明產品。\n" #: dlls/kernel32/winerror.mc:2753 msgid "Unknown feature.\n" -msgstr "不明特徵。\n" +msgstr "不明功能。\n" #: dlls/kernel32/winerror.mc:2758 msgid "Unknown component.\n" -msgstr "未知的元件。\n" +msgstr "不明元件。\n" #: dlls/kernel32/winerror.mc:2763 msgid "Unknown property.\n" -msgstr "未知的屬性。\n" +msgstr "不明屬性。\n" #: dlls/kernel32/winerror.mc:2768 msgid "Invalid handle state.\n" -msgstr "無效的控柄狀態。\n" +msgstr "無效的控制代碼狀態。\n" #: dlls/kernel32/winerror.mc:2773 msgid "Bad configuration.\n" @@ -6251,7 +6185,7 @@ msgstr "開啟安裝記錄檔時失敗。\n" #: dlls/kernel32/winerror.mc:2838 msgid "Installation language not supported.\n" -msgstr "不受支援的安裝語言。\n" +msgstr "不支援的安裝語言。\n" #: dlls/kernel32/winerror.mc:2843 msgid "Installation transform failed to apply.\n" @@ -6275,11 +6209,11 @@ msgstr "無效的表格。\n" #: dlls/kernel32/winerror.mc:2868 msgid "Data type mismatch.\n" -msgstr "資料類型不匹配。\n" +msgstr "資料類型不相符。\n" #: dlls/kernel32/winerror.mc:2873 dlls/kernel32/winerror.mc:3083 msgid "Unsupported type.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的類型。\n" #: dlls/kernel32/winerror.mc:2878 msgid "Creation failed.\n" @@ -6291,7 +6225,7 @@ msgstr "無法寫入暫存資料夾。\n" #: dlls/kernel32/winerror.mc:2888 msgid "Installation platform not supported.\n" -msgstr "不受支援的安裝平臺。\n" +msgstr "不支援的安裝平臺。\n" #: dlls/kernel32/winerror.mc:2893 msgid "Installer not used.\n" @@ -6307,7 +6241,7 @@ msgstr "無效的更新套件。\n" #: dlls/kernel32/winerror.mc:2908 msgid "Unsupported patch package.\n" -msgstr "不受支援的修補程式套件。\n" +msgstr "不支援的修補程式套件。\n" #: dlls/kernel32/winerror.mc:2913 msgid "Another version is installed.\n" @@ -6351,7 +6285,7 @@ msgstr "無效的字串 UUID。\n" #: dlls/kernel32/winerror.mc:2963 msgid "Invalid endpoint format.\n" -msgstr "無效的終點格式。\n" +msgstr "無效的端點格式。\n" #: dlls/kernel32/winerror.mc:2968 msgid "Invalid network address.\n" @@ -6359,7 +6293,7 @@ msgstr "無效的網路位址。\n" #: dlls/kernel32/winerror.mc:2973 msgid "No endpoint found.\n" -msgstr "找不到任何終點。\n" +msgstr "找不到任何端點。\n" #: dlls/kernel32/winerror.mc:2978 msgid "Invalid timeout value.\n" @@ -6391,11 +6325,11 @@ msgstr "RPC 伺服器未傾聽。\n" #: dlls/kernel32/winerror.mc:3013 msgid "Unknown manager type.\n" -msgstr "不明管理員型態。\n" +msgstr "不明管理員類型。\n" #: dlls/kernel32/winerror.mc:3018 msgid "Unknown interface.\n" -msgstr "未知的介面。\n" +msgstr "不明的介面。\n" #: dlls/kernel32/winerror.mc:3023 msgid "No bindings.\n" @@ -6407,7 +6341,7 @@ msgstr "沒有協定序列。\n" #: dlls/kernel32/winerror.mc:3033 msgid "Can't create endpoint.\n" -msgstr "無法建立終點。\n" +msgstr "無法建立端點。\n" #: dlls/kernel32/winerror.mc:3038 msgid "Out of resources.\n" @@ -6415,7 +6349,7 @@ msgstr "資源不足。\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "RPC 伺服器不得使用。\n" +msgstr "RPC 伺服器不可用。\n" #: dlls/kernel32/winerror.mc:3048 msgid "RPC server too busy.\n" @@ -6427,7 +6361,7 @@ msgstr "無效的網路選項。\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "沒有現用的 RPC 呼叫。\n" +msgstr "沒有可用的 RPC 呼叫。\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" @@ -6443,7 +6377,7 @@ msgstr "RPC 協定發生錯誤。\n" #: dlls/kernel32/winerror.mc:3078 msgid "Unsupported transfer syntax.\n" -msgstr "不受支援的轉送語法。\n" +msgstr "不支援的轉送語法。\n" #: dlls/kernel32/winerror.mc:3088 msgid "Invalid tag.\n" @@ -6463,7 +6397,7 @@ msgstr "無效的名稱語法。\n" #: dlls/kernel32/winerror.mc:3108 msgid "Unsupported name syntax.\n" -msgstr "不受支援的名稱語法。\n" +msgstr "不支援的名稱語法。\n" #: dlls/kernel32/winerror.mc:3113 msgid "No network address.\n" @@ -6471,7 +6405,7 @@ msgstr "沒有網路位址。\n" #: dlls/kernel32/winerror.mc:3118 msgid "Duplicate endpoint.\n" -msgstr "重複的終點。\n" +msgstr "重複的端點。\n" #: dlls/kernel32/winerror.mc:3123 msgid "Unknown authentication type.\n" @@ -6479,7 +6413,7 @@ msgstr "不明認證類型。\n" #: dlls/kernel32/winerror.mc:3128 msgid "Maximum calls too low.\n" -msgstr "太低的呼叫數最大值。\n" +msgstr "呼叫數的最大值太低。\n" #: dlls/kernel32/winerror.mc:3133 msgid "String too long.\n" @@ -6523,7 +6457,7 @@ msgstr "無法進行作業。\n" #: dlls/kernel32/winerror.mc:3183 msgid "Endpoints not registered.\n" -msgstr "終點未註冊。\n" +msgstr "端點未註冊。\n" #: dlls/kernel32/winerror.mc:3188 msgid "Nothing to export.\n" @@ -6543,7 +6477,7 @@ msgstr "已無更多成員。\n" #: dlls/kernel32/winerror.mc:3208 msgid "Not all objects unexported.\n" -msgstr "並非所有物件被取消匯出。\n" +msgstr "並非所有物件未被匯出。\n" #: dlls/kernel32/winerror.mc:3213 msgid "Interface not found.\n" @@ -6559,7 +6493,7 @@ msgstr "找不到條目。\n" #: dlls/kernel32/winerror.mc:3228 msgid "Name service unavailable.\n" -msgstr "名稱服務不得使用。\n" +msgstr "名稱服務不可用。\n" #: dlls/kernel32/winerror.mc:3233 msgid "Invalid network address family.\n" @@ -6571,7 +6505,7 @@ msgstr "操作不受支援。\n" #: dlls/kernel32/winerror.mc:3243 msgid "No security context available.\n" -msgstr "沒有可用安全文脈。\n" +msgstr "沒有可用的安全內容。\n" #: dlls/kernel32/winerror.mc:3248 msgid "RPCInternal error.\n" @@ -6611,23 +6545,23 @@ msgstr "字元翻譯表格檔案太小。\n" #: dlls/kernel32/winerror.mc:3293 msgid "Null context handle.\n" -msgstr "空值文脈控柄。\n" +msgstr "內容控制代碼為空值。\n" #: dlls/kernel32/winerror.mc:3298 msgid "Context handle damaged.\n" -msgstr "文脈控柄受損害。\n" +msgstr "內容控制代碼已損壞。\n" #: dlls/kernel32/winerror.mc:3303 msgid "Binding handle mismatch.\n" -msgstr "繫結控柄不匹配。\n" +msgstr "繫結控制代碼不相符。\n" #: dlls/kernel32/winerror.mc:3308 msgid "Cannot get call handle.\n" -msgstr "無法提取呼叫控柄。\n" +msgstr "無法提取呼叫控制代碼。\n" #: dlls/kernel32/winerror.mc:3313 msgid "Null reference pointer.\n" -msgstr "空值參考指標。\n" +msgstr "參考指標為空值。\n" #: dlls/kernel32/winerror.mc:3318 msgid "Enumeration value out of range.\n" @@ -6639,7 +6573,7 @@ msgstr "位元組數量太小。\n" #: dlls/kernel32/winerror.mc:3328 msgid "Bad stub data.\n" -msgstr "不當的殘餘資料。\n" +msgstr "損壞的虛設常式資料。\n" #: dlls/kernel32/winerror.mc:3333 msgid "Invalid user buffer.\n" @@ -6667,15 +6601,15 @@ msgstr "信賴的關聯性失敗。\n" #: dlls/kernel32/winerror.mc:3363 msgid "Trust logon failure.\n" -msgstr "信賴登錄失敗。\n" +msgstr "信賴登入失敗。\n" #: dlls/kernel32/winerror.mc:3368 msgid "RPC call already in progress.\n" -msgstr "RPC 呼叫已正進行。\n" +msgstr "RPC 呼叫已在進行。\n" #: dlls/kernel32/winerror.mc:3373 msgid "NETLOGON is not started.\n" -msgstr "NETLOGON 未被啟始。\n" +msgstr "NETLOGON 未被啟動。\n" #: dlls/kernel32/winerror.mc:3378 msgid "Account expired.\n" @@ -6683,7 +6617,7 @@ msgstr "帳號已過期。\n" #: dlls/kernel32/winerror.mc:3383 msgid "Redirector has open handles.\n" -msgstr "重導器已開啟控柄。\n" +msgstr "重導器已開啟控制代碼。\n" #: dlls/kernel32/winerror.mc:3388 msgid "Printer driver already installed.\n" @@ -6695,7 +6629,7 @@ msgstr "不明通訊埠。\n" #: dlls/kernel32/winerror.mc:3398 msgid "Unknown printer driver.\n" -msgstr "未知的印表機驅動程式。\n" +msgstr "不明印表機驅動程式。\n" #: dlls/kernel32/winerror.mc:3403 msgid "Unknown print processor.\n" @@ -6735,15 +6669,15 @@ msgstr "已無更多繫結。\n" #: dlls/kernel32/winerror.mc:3448 msgid "Can't log on with inter-domain trust account.\n" -msgstr "無法以網域間信賴帳號登錄。\n" +msgstr "無法以網域間信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3453 msgid "Can't log on with workstation trust account.\n" -msgstr "無法以工作站信賴帳號登錄。\n" +msgstr "無法以工作站信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3458 msgid "Can't log on with server trust account.\n" -msgstr "無法以伺服器信賴帳號登錄。\n" +msgstr "無法以伺服器信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3463 msgid "Domain trust information inconsistent.\n" @@ -6751,7 +6685,7 @@ msgstr "網域信賴資訊不一致。\n" #: dlls/kernel32/winerror.mc:3468 msgid "Server has open handles.\n" -msgstr "伺服器已開啟控柄。\n" +msgstr "伺服器已開啟控制代碼。\n" #: dlls/kernel32/winerror.mc:3473 msgid "Resource data not found.\n" @@ -6791,7 +6725,7 @@ msgstr "RPC 指令失敗。\n" #: dlls/kernel32/winerror.mc:3518 msgid "Unsupported authorization level.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的授權等級。\n" #: dlls/kernel32/winerror.mc:3523 msgid "No principal name registered.\n" @@ -6815,7 +6749,7 @@ msgstr "執行緒未取消。\n" #: dlls/kernel32/winerror.mc:3548 msgid "Invalid handle operation.\n" -msgstr "無效的控柄作業。\n" +msgstr "無效的控制代碼作業。\n" #: dlls/kernel32/winerror.mc:3553 msgid "Wrong serializing package version.\n" @@ -6843,7 +6777,7 @@ msgstr "找不到群組成員。\n" #: dlls/kernel32/winerror.mc:3583 msgid "Can't create endpoint mapper DB.\n" -msgstr "無法建立終點映射器資料庫。\n" +msgstr "無法建立端點對應器資料庫。\n" #: dlls/kernel32/winerror.mc:3588 msgid "Invalid object.\n" @@ -6863,7 +6797,7 @@ msgstr "無效的表單大小。\n" #: dlls/kernel32/winerror.mc:3608 msgid "Already awaiting printer handle.\n" -msgstr "已經在等待印表機控柄。\n" +msgstr "已經在等待印表機控制代碼。\n" #: dlls/kernel32/winerror.mc:3613 msgid "Printer deleted.\n" @@ -6903,7 +6837,7 @@ msgstr "不完整的 RPC 發送。\n" #: dlls/kernel32/winerror.mc:3658 msgid "Invalid asynchronous RPC handle.\n" -msgstr "無效的非同步 RPC 控柄。\n" +msgstr "無效的非同步 RPC 控制代碼。\n" #: dlls/kernel32/winerror.mc:3663 msgid "Invalid asynchronous RPC call.\n" @@ -6935,7 +6869,7 @@ msgstr "無法解析檔名。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" -msgstr "RPC 條目型態不匹配。\n" +msgstr "RPC 條目類型不匹配。\n" #: dlls/kernel32/winerror.mc:3703 msgid "Not all objects could be exported.\n" @@ -6947,15 +6881,15 @@ msgstr "無法匯出介面。\n" #: dlls/kernel32/winerror.mc:3713 msgid "The profile could not be added.\n" -msgstr "無法加入側寫檔。\n" +msgstr "無法加入設定檔。\n" #: dlls/kernel32/winerror.mc:3718 msgid "The profile element could not be added.\n" -msgstr "無法加入側寫檔元件。\n" +msgstr "無法加入設定檔元件。\n" #: dlls/kernel32/winerror.mc:3723 msgid "The profile element could not be removed.\n" -msgstr "無法移除側寫檔元件。\n" +msgstr "無法移除設定檔元件。\n" #: dlls/kernel32/winerror.mc:3728 msgid "The group element could not be added.\n" @@ -6970,57 +6904,41 @@ msgid "The username could not be found.\n" msgstr "無法找到使用者名稱。\n" #: dlls/kernel32/winerror.mc:3743 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "站臺不存在。\n" +msgstr "這個網路連線不存在。\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "連線被拒。\n" +msgstr "連線被同儕節點重設。\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "未實作" +msgstr "未實作。\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC 呼叫失敗。\n" +msgstr "呼叫失敗。\n" #: dlls/kernel32/winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "在檔案 %2 中找不到訊息 0x%1。\n" +msgstr "無法在檔案中找到簽章。\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "無效的層級。\n" +msgstr "無效的呼叫。\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Help not available." msgid "Resource is not currently available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "資源目前不可用。\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "類別名稱:" +msgstr "經典藍" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 msgid "Normal" -msgstr "中" +msgstr "標準" #: dlls/localspl/localspl.rc:37 #, fuzzy -- 2.33.0.windows.2

2 1

[PATCH 6/6] winspool: Move the default page size query to cups.c.
by Huw Davies 26 Oct '21

26 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/cups.c | 97 +++++++++++++++++++++++++++++++++ dlls/winspool.drv/info.c | 108 +++++-------------------------------- dlls/winspool.drv/wspool.h | 7 +++ 3 files changed, 117 insertions(+), 95 deletions(-) diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 2ce5f43fa8f..ae771eba46c 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -32,6 +32,62 @@ #include <cups/ppd.h> #endif +#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H +#define GetCurrentProcess GetCurrentProcess_Mac +#define GetCurrentThread GetCurrentThread_Mac +#define LoadResource LoadResource_Mac +#define AnimatePalette AnimatePalette_Mac +#define EqualRgn EqualRgn_Mac +#define FillRgn FillRgn_Mac +#define FrameRgn FrameRgn_Mac +#define GetPixel GetPixel_Mac +#define InvertRgn InvertRgn_Mac +#define LineTo LineTo_Mac +#define OffsetRgn OffsetRgn_Mac +#define PaintRgn PaintRgn_Mac +#define Polygon Polygon_Mac +#define ResizePalette ResizePalette_Mac +#define SetRectRgn SetRectRgn_Mac +#define EqualRect EqualRect_Mac +#define FillRect FillRect_Mac +#define FrameRect FrameRect_Mac +#define GetCursor GetCursor_Mac +#define InvertRect InvertRect_Mac +#define OffsetRect OffsetRect_Mac +#define PtInRect PtInRect_Mac +#define SetCursor SetCursor_Mac +#define SetRect SetRect_Mac +#define ShowCursor ShowCursor_Mac +#define UnionRect UnionRect_Mac +#include <ApplicationServices/ApplicationServices.h> +#undef GetCurrentProcess +#undef GetCurrentThread +#undef LoadResource +#undef AnimatePalette +#undef EqualRgn +#undef FillRgn +#undef FrameRgn +#undef GetPixel +#undef InvertRgn +#undef LineTo +#undef OffsetRgn +#undef PaintRgn +#undef Polygon +#undef ResizePalette +#undef SetRectRgn +#undef EqualRect +#undef FillRect +#undef FrameRect +#undef GetCursor +#undef InvertRect +#undef OffsetRect +#undef PtInRect +#undef SetCursor +#undef SetRect +#undef ShowCursor +#undef UnionRect +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -341,3 +397,44 @@ NTSTATUS unix_get_ppd( void *args ) free( unix_ppd ); return status; } + +NTSTATUS unix_get_default_page_size( void *args ) +{ +#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H + struct get_default_page_size_params *params = args; + NTSTATUS status = STATUS_UNSUCCESSFUL; + PMPrintSession session = NULL; + PMPageFormat format = NULL; + CFStringRef paper_name; + PMPaper paper; + CFRange range; + int size; + + if (PMCreateSession( &session )) goto end; + if (PMCreatePageFormat( &format )) goto end; + if (PMSessionDefaultPageFormat( session, format )) goto end; + if (PMGetPageFormatPaper( format, &paper )) goto end; + if (PMPaperGetPPDPaperName( paper, &paper_name )) goto end; + + range.location = 0; + range.length = CFStringGetLength( paper_name ); + size = (range.length + 1) * sizeof(WCHAR); + + if (params->name_size >= size) + { + CFStringGetCharacters( paper_name, range, (UniChar*)params->name ); + params->name[range.length] = 0; + status = STATUS_SUCCESS; + } + else + status = STATUS_BUFFER_OVERFLOW; + params->name_size = size; + +end: + if (format) PMRelease( format ); + if (session) PMRelease( session ); + return status; +#else + return STATUS_NOT_IMPLEMENTED; +#endif +} diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 5deab0083d3..a8b0a0365ae 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -48,62 +48,6 @@ # include <cups/ppd.h> #endif -#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H -#define GetCurrentProcess GetCurrentProcess_Mac -#define GetCurrentThread GetCurrentThread_Mac -#define LoadResource LoadResource_Mac -#define AnimatePalette AnimatePalette_Mac -#define EqualRgn EqualRgn_Mac -#define FillRgn FillRgn_Mac -#define FrameRgn FrameRgn_Mac -#define GetPixel GetPixel_Mac -#define InvertRgn InvertRgn_Mac -#define LineTo LineTo_Mac -#define OffsetRgn OffsetRgn_Mac -#define PaintRgn PaintRgn_Mac -#define Polygon Polygon_Mac -#define ResizePalette ResizePalette_Mac -#define SetRectRgn SetRectRgn_Mac -#define EqualRect EqualRect_Mac -#define FillRect FillRect_Mac -#define FrameRect FrameRect_Mac -#define GetCursor GetCursor_Mac -#define InvertRect InvertRect_Mac -#define OffsetRect OffsetRect_Mac -#define PtInRect PtInRect_Mac -#define SetCursor SetCursor_Mac -#define SetRect SetRect_Mac -#define ShowCursor ShowCursor_Mac -#define UnionRect UnionRect_Mac -#include <ApplicationServices/ApplicationServices.h> -#undef GetCurrentProcess -#undef GetCurrentThread -#undef LoadResource -#undef AnimatePalette -#undef EqualRgn -#undef FillRgn -#undef FrameRgn -#undef GetPixel -#undef InvertRgn -#undef LineTo -#undef OffsetRgn -#undef PaintRgn -#undef Polygon -#undef ResizePalette -#undef SetRectRgn -#undef EqualRect -#undef FillRect -#undef FrameRect -#undef GetCursor -#undef InvertRect -#undef OffsetRect -#undef PtInRect -#undef SetCursor -#undef SetRect -#undef ShowCursor -#undef UnionRect -#endif - #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -987,46 +931,20 @@ end: static void set_ppd_overrides( HANDLE printer ) { - WCHAR *wstr = NULL; - int size = 0; -#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H - OSStatus status; - PMPrintSession session = NULL; - PMPageFormat format = NULL; - PMPaper paper; - CFStringRef paper_name; - CFRange range; - - status = PMCreateSession( &session ); - if (status) goto end; - - status = PMCreatePageFormat( &format ); - if (status) goto end; - - status = PMSessionDefaultPageFormat( session, format ); - if (status) goto end; - - status = PMGetPageFormatPaper( format, &paper ); - if (status) goto end; - - status = PMPaperGetPPDPaperName( paper, &paper_name ); - if (status) goto end; - - range.location = 0; - range.length = CFStringGetLength( paper_name ); - size = (range.length + 1) * sizeof(WCHAR); - - wstr = HeapAlloc( GetProcessHeap(), 0, size ); - CFStringGetCharacters( paper_name, range, (UniChar*)wstr ); - wstr[range.length] = 0; - -end: - if (format) PMRelease( format ); - if (session) PMRelease( session ); -#endif + WCHAR buffer[256]; + struct get_default_page_size_params params = { .name = buffer, .name_size = sizeof(buffer) }; + NTSTATUS status; - SetPrinterDataExW( printer, PPD_Overrides, DefaultPageSize, REG_SZ, (BYTE*)wstr, size ); - HeapFree( GetProcessHeap(), 0, wstr ); + while (1) + { + status = UNIX_CALL( get_default_page_size, &params ); + if (status != STATUS_BUFFER_OVERFLOW) break; + if (params.name != buffer) heap_free( params.name ); + params.name = heap_alloc( params.name_size ); + if (!params.name) break; + } + if (!status) SetPrinterDataExW( printer, PPD_Overrides, DefaultPageSize, REG_SZ, (BYTE*)params.name, params.name_size ); + if (params.name != buffer) heap_free( params.name ); } static BOOL update_driver( HANDLE printer ) diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index e66e08bfee0..578ed39733d 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -52,6 +52,12 @@ struct enum_printers_params unsigned int num; }; +struct get_default_page_size_params +{ + WCHAR *name; + unsigned int name_size; +}; + struct get_ppd_params { const WCHAR *printer; /* set to NULL to unlink */ @@ -62,4 +68,5 @@ struct get_ppd_params NTSTATUS unix_process_attach( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_enum_printers( void * ) DECLSPEC_HIDDEN; +NTSTATUS unix_get_default_page_size( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_get_ppd( void * ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 5/6] winspool: Move ppd retrieval to cups.c
by Huw Davies 26 Oct '21

26 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/cups.c | 125 +++++++++++++++++++++++++++++++++++++ dlls/winspool.drv/info.c | 107 +++---------------------------- dlls/winspool.drv/wspool.h | 7 +++ 3 files changed, 142 insertions(+), 97 deletions(-) diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 7aeb68d4f8d..2ce5f43fa8f 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -22,6 +22,9 @@ #include <stdarg.h> #include <string.h> +#include <stdio.h> +#include <unistd.h> +#include <fcntl.h> #ifdef HAVE_CUPS_CUPS_H #include <cups/cups.h> #endif @@ -56,6 +59,11 @@ static DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD d { return MultiByteToWideChar( CP_UNIXCP, 0, src, srclen, dst, dstlen ); } +static int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) +{ + /* FIXME: strict */ + return WideCharToMultiByte( CP_UNIXCP, 0, src, srclen, dst, dstlen, NULL, NULL ); +} #ifdef SONAME_LIBCUPS @@ -111,6 +119,56 @@ NTSTATUS unix_process_attach( void *arg ) #endif /* SONAME_LIBCUPS */ } +static BOOL copy_file( const char *src, const char *dst ) +{ + int fds[2] = { -1, -1 }, num; + char buf[1024]; + BOOL ret = FALSE; + + fds[0] = open( src, O_RDONLY ); + fds[1] = open( dst, O_CREAT | O_TRUNC | O_WRONLY, 0666 ); + if (fds[0] == -1 || fds[1] == -1) goto fail; + + while ((num = read( fds[0], buf, sizeof(buf) )) != 0) + { + if (num == -1) goto fail; + if (write( fds[1], buf, num ) != num) goto fail; + } + ret = TRUE; + +fail: + if (fds[1] != -1) close( fds[1] ); + if (fds[0] != -1) close( fds[0] ); + return ret; +} + +static char *get_unix_file_name( LPCWSTR path ) +{ + UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + ULONG size = 256; + char *buffer; + + nt_name.Buffer = (WCHAR *)path; + nt_name.MaximumLength = nt_name.Length = lstrlenW( path ) * sizeof(WCHAR); + InitializeObjectAttributes( &attr, &nt_name, 0, 0, NULL ); + for (;;) + { + if (!(buffer = malloc( size ))) return NULL; + status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN_IF ); + if (status != STATUS_BUFFER_TOO_SMALL) break; + free( buffer ); + } + if (status && status != STATUS_NO_SUCH_FILE) + { + free( buffer ); + return NULL; + } + return buffer; +} + + #ifdef SONAME_LIBCUPS static WCHAR *cups_get_optionW( const char *opt_name, int num_options, cups_option_t *options ) { @@ -145,6 +203,32 @@ static BOOL cups_is_scanner( cups_dest_t *dest ) { return cups_get_printer_type( dest ) & 0x2000000 /* CUPS_PRINTER_SCANNER */; } + +static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, time_t *modtime, + char *buffer, size_t bufsize ) +{ + const char *ppd; + + if (pcupsGetPPD3) return pcupsGetPPD3( http, name, modtime, buffer, bufsize ); + if (!pcupsGetPPD) return HTTP_NOT_FOUND; + + TRACE( "No cupsGetPPD3 implementation, so calling cupsGetPPD\n" ); + + *modtime = 0; + ppd = pcupsGetPPD( name ); + + TRACE( "cupsGetPPD returns %s\n", debugstr_a(ppd) ); + + if (!ppd) return HTTP_NOT_FOUND; + + if (rename( ppd, buffer ) == -1) + { + BOOL res = copy_file( ppd, buffer ); + unlink( ppd ); + if (!res) return HTTP_NOT_FOUND; + } + return HTTP_OK; +} #endif /* SONAME_LIBCUPS */ NTSTATUS unix_enum_printers( void *args ) @@ -216,3 +300,44 @@ NTSTATUS unix_enum_printers( void *args ) return STATUS_NOT_SUPPORTED; #endif /* SONAME_LIBCUPS */ } + +NTSTATUS unix_get_ppd( void *args ) +{ + struct get_ppd_params *params = args; + char *unix_ppd = get_unix_file_name( params->ppd ); + NTSTATUS status = STATUS_SUCCESS; + + TRACE( "(%s, %s)\n", debugstr_w( params->printer ), debugstr_w( params->ppd ) ); + + if (!unix_ppd) return STATUS_NO_SUCH_FILE; + + if (!params->printer) /* unlink */ + { + unlink( unix_ppd ); + } + else + { +#ifdef SONAME_LIBCUPS + http_status_t http_status; + time_t modtime = 0; + char *printer_name; + int len; + + len = strlenW( params->printer ); + printer_name = malloc( len * 3 + 1 ); + ntdll_wcstoumbs( params->printer, len + 1, printer_name, len * 3 + 1, FALSE ); + + http_status = cupsGetPPD3_wrapper( 0, printer_name, &modtime, unix_ppd, strlen( unix_ppd ) + 1 ); + if (http_status != HTTP_OK) + { + unlink( unix_ppd ); + status = STATUS_DEVICE_UNREACHABLE; + } + free( printer_name ); +#else + status = STATUS_NOT_SUPPORTED; +#endif + } + free( unix_ppd ); + return status; +} diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a3fcb32641a..5deab0083d3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -752,29 +752,6 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) return open_printer_reg_key( name, phkey ); } -static BOOL copy_file( const char *src, const char *dst ) -{ - int fds[2] = {-1, -1}, num; - char buf[1024]; - BOOL ret = FALSE; - - fds[0] = open( src, O_RDONLY ); - fds[1] = open( dst, O_CREAT | O_TRUNC | O_WRONLY, 0666 ); - if (fds[0] == -1 || fds[1] == -1) goto fail; - - while ((num = read( fds[0], buf, sizeof(buf) )) != 0) - { - if (num == -1) goto fail; - if (write( fds[1], buf, num ) != num) goto fail; - } - ret = TRUE; - -fail: - if (fds[1] != -1) close( fds[1] ); - if (fds[0] != -1) close( fds[0] ); - return ret; -} - static BOOL get_internal_fallback_ppd( const WCHAR *ppd ) { static const WCHAR typeW[] = {'P','P','D','F','I','L','E',0}; @@ -817,31 +794,22 @@ static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) return ppd; } -static char *get_dest_name( const WCHAR *printer ) -{ - int len = WideCharToMultiByte( CP_UNIXCP, 0, printer, -1, NULL, 0, NULL, NULL ); - char *dest = heap_alloc( len ); - - if (dest) WideCharToMultiByte( CP_UNIXCP, 0, printer, -1, dest, len, NULL, NULL ); - return dest; -} - -static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ); -static void unlink_ppd( const WCHAR *ppd ); - static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir ) { WCHAR *ppd = get_ppd_filename( ppd_dir, name ); - char *dest_name; + struct get_ppd_params ppd_params; + UNICODE_STRING nt_ppd; DRIVER_INFO_3W di3; unsigned int i; BOOL res = FALSE; if (!ppd) return FALSE; - dest_name = get_dest_name( name ); - if (!dest_name) goto end; + RtlInitUnicodeString( &nt_ppd, NULL ); + if (!RtlDosPathNameToNtPathName_U( ppd, &nt_ppd, NULL, NULL )) goto end; - res = get_cups_ppd( dest_name, ppd ) || get_internal_fallback_ppd( ppd ); + ppd_params.printer = name; + ppd_params.ppd = nt_ppd.Buffer; + res = !UNIX_CALL( get_ppd, &ppd_params ) || get_internal_fallback_ppd( ppd ); if (!res) goto end; memset( &di3, 0, sizeof(DRIVER_INFO_3W) ); @@ -872,10 +840,11 @@ static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir ) } res = TRUE; } - unlink_ppd( ppd ); + ppd_params.printer = NULL; /* unlink the ppd */ + UNIX_CALL( get_ppd, &ppd_params ); end: - heap_free( dest_name ); + RtlFreeUnicodeString( &nt_ppd ); heap_free( ppd ); return res; } @@ -904,13 +873,6 @@ static WCHAR *get_ppd_dir( void ) return dir; } -static void unlink_ppd( const WCHAR *ppd ) -{ - char *unix_name = wine_get_unix_file_name( ppd ); - unlink( unix_name ); - HeapFree( GetProcessHeap(), 0, unix_name ); -} - #ifdef SONAME_LIBCUPS extern void *libcups_handle; @@ -932,56 +894,7 @@ extern void *libcups_handle; CUPS_FUNCS; #undef DO_FUNC extern cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); -extern const char * (*pcupsGetPPD)(const char *); -extern http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); extern const char * (*pcupsLastErrorString)(void); - -static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, - time_t *modtime, char *buffer, - size_t bufsize ) -{ - const char *ppd; - - if (pcupsGetPPD3) return pcupsGetPPD3( http, name, modtime, buffer, bufsize ); - - if (!pcupsGetPPD) return HTTP_NOT_FOUND; - - TRACE( "No cupsGetPPD3 implementation, so calling cupsGetPPD\n" ); - - *modtime = 0; - ppd = pcupsGetPPD( name ); - - TRACE( "cupsGetPPD returns %s\n", debugstr_a(ppd) ); - - if (!ppd) return HTTP_NOT_FOUND; - - if (rename( ppd, buffer ) == -1) - { - BOOL res = copy_file( ppd, buffer ); - unlink( ppd ); - if (!res) return HTTP_NOT_FOUND; - } - return HTTP_OK; -} - -static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ) -{ - time_t modtime = 0; - http_status_t http_status; - char *unix_name = wine_get_unix_file_name( ppd ); - - TRACE( "(%s, %s)\n", debugstr_a(printer_name), debugstr_w(ppd) ); - - if (!unix_name) return FALSE; - - http_status = cupsGetPPD3_wrapper( 0, printer_name, &modtime, - unix_name, strlen( unix_name ) + 1 ); - - if (http_status != HTTP_OK) unlink( unix_name ); - HeapFree( GetProcessHeap(), 0, unix_name ); - - return http_status == HTTP_OK; -} #endif static BOOL init_unix_printers( void ) diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index 5a1f1038995..e66e08bfee0 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -52,7 +52,14 @@ struct enum_printers_params unsigned int num; }; +struct get_ppd_params +{ + const WCHAR *printer; /* set to NULL to unlink */ + const WCHAR *ppd; +}; + #define UNIX_CALL( func, params ) unix_ ## func( params ) NTSTATUS unix_process_attach( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_enum_printers( void * ) DECLSPEC_HIDDEN; +NTSTATUS unix_get_ppd( void * ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 4/6] winspool: Move CUPS printer enumeration to cups.c.
by Huw Davies 26 Oct '21

26 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/cups.c | 117 +++++++++++++++++++++++++++++ dlls/winspool.drv/info.c | 148 +++++++++++++------------------------ dlls/winspool.drv/wspool.h | 16 ++++ 3 files changed, 185 insertions(+), 96 deletions(-) diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 207c95c568a..7aeb68d4f8d 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -41,11 +41,22 @@ #include "winspool.h" #include "ddk/winsplp.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "wspool.h" WINE_DEFAULT_DEBUG_CHANNEL(winspool); +/* Temporary helpers until switch to unixlib */ +#include "winnls.h" +#include "wine/heap.h" +#define malloc( sz ) heap_alloc( sz ) +#define free( ptr ) heap_free( ptr ) +static DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) +{ + return MultiByteToWideChar( CP_UNIXCP, 0, src, srclen, dst, dstlen ); +} + #ifdef SONAME_LIBCUPS void *libcups_handle = NULL; @@ -99,3 +110,109 @@ NTSTATUS unix_process_attach( void *arg ) return STATUS_NOT_SUPPORTED; #endif /* SONAME_LIBCUPS */ } + +#ifdef SONAME_LIBCUPS +static WCHAR *cups_get_optionW( const char *opt_name, int num_options, cups_option_t *options ) +{ + const char *value; + WCHAR *ret; + int len; + + value = pcupsGetOption( opt_name, num_options, options ); + if (!value) return NULL; + + len = strlen( value ) + 1; + ret = malloc( len * sizeof(WCHAR) ); + if (ret) ntdll_umbstowcs( value, len, ret, len ); + + return ret; +} + +static cups_ptype_t cups_get_printer_type( const cups_dest_t *dest ) +{ + const char *value; + cups_ptype_t ret; + char *end; + + value = pcupsGetOption( "printer-type", dest->num_options, dest->options ); + if (!value) return 0; + ret = (cups_ptype_t)strtoul( value, &end, 10 ); + if (*end) ret = 0; + return ret; +} + +static BOOL cups_is_scanner( cups_dest_t *dest ) +{ + return cups_get_printer_type( dest ) & 0x2000000 /* CUPS_PRINTER_SCANNER */; +} +#endif /* SONAME_LIBCUPS */ + +NTSTATUS unix_enum_printers( void *args ) +{ + struct enum_printers_params *params = args; +#ifdef SONAME_LIBCUPS + unsigned int num, i, name_len, comment_len, location_len, needed; + WCHAR *comment, *location, *ptr; + struct printer_info *info; + cups_dest_t *dests; + + params->num = 0; + if (!pcupsGetDests) return STATUS_NOT_SUPPORTED; + + num = pcupsGetDests( &dests ); + + for (i = 0; i < num; i++) + { + if (cups_is_scanner( dests + i )) + { + TRACE( "Printer %d: %s - skipping scanner\n", i, debugstr_a( dests[i].name ) ); + continue; + } + TRACE( "Printer %d: %s\n", i, debugstr_a( dests[i].name ) ); + params->num++; + } + + needed = sizeof( *info ) * params->num; + info = params->printers; + ptr = (WCHAR *)(info + params->num); + + for (i = 0; i < num; i++) + { + if (cups_is_scanner( dests + i )) continue; + + comment = cups_get_optionW( "printer-info", dests[i].num_options, dests[i].options ); + location = cups_get_optionW( "printer-location", dests[i].num_options, dests[i].options ); + + name_len = strlen( dests[i].name ) + 1; + comment_len = comment ? strlenW( comment ) + 1 : 0; + location_len = location ? strlenW( location ) + 1 : 0; + needed += (name_len + comment_len + location_len) * sizeof(WCHAR); + + if (needed <= params->size) + { + info->name = ptr; + ntdll_umbstowcs( dests[i].name, name_len, info->name, name_len ); + info->comment = comment ? ptr + name_len : NULL; + memcpy( info->comment, comment, comment_len * sizeof(WCHAR) ); + info->location = location ? ptr + name_len + comment_len : NULL; + memcpy( info->location, location, location_len * sizeof(WCHAR) ); + info->is_default = dests[i].is_default; + info++; + ptr += name_len + comment_len + location_len; + } + free( comment ); + free( location ); + } + pcupsFreeDests( num, dests ); + + if (needed > params->size) + { + params->size = needed; + return STATUS_BUFFER_OVERFLOW; + } + return STATUS_SUCCESS; +#else + params->num = 0; + return STATUS_NOT_SUPPORTED; +#endif /* SONAME_LIBCUPS */ +} diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9d2af8cec94..a3fcb32641a 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -107,6 +107,8 @@ #define NONAMELESSSTRUCT #define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -917,7 +919,6 @@ extern void *libcups_handle; DO_FUNC(cupsAddOption); \ DO_FUNC(cupsFreeDests); \ DO_FUNC(cupsFreeOptions); \ - DO_FUNC(cupsGetDests); \ DO_FUNC(cupsGetOption); \ DO_FUNC(cupsParseOptions); \ DO_FUNC(cupsPrintFile) @@ -981,137 +982,96 @@ static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ) return http_status == HTTP_OK; } +#endif -static WCHAR *get_cups_option( const char *name, int num_options, cups_option_t *options ) -{ - const char *value; - WCHAR *ret; - int len; - - value = pcupsGetOption( name, num_options, options ); - if (!value) return NULL; - - len = MultiByteToWideChar( CP_UNIXCP, 0, value, -1, NULL, 0 ); - ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - if (ret) MultiByteToWideChar( CP_UNIXCP, 0, value, -1, ret, len ); - - return ret; -} - -static cups_ptype_t get_cups_printer_type( const cups_dest_t *dest ) +static BOOL init_unix_printers( void ) { - WCHAR *type = get_cups_option( "printer-type", dest->num_options, dest->options ), *end; - cups_ptype_t ret = 0; + WCHAR *port, *ppd_dir = NULL, *default_printer = NULL; + struct enum_printers_params enum_params; + HKEY printer_key, printers_key; + HANDLE added_printer; + PRINTER_INFO_2W pi2; + NTSTATUS status; + int i; - if (type && *type) + if (RegCreateKeyW( HKEY_LOCAL_MACHINE, PrintersW, &printers_key ) != ERROR_SUCCESS) { - ret = (cups_ptype_t)strtoulW( type, &end, 10 ); - if (*end) ret = 0; - } - HeapFree( GetProcessHeap(), 0, type ); - return ret; -} - -static BOOL CUPS_LoadPrinters(void) -{ - int i, nrofdests; - BOOL hadprinter = FALSE, haddefault = FALSE; - cups_dest_t *dests; - PRINTER_INFO_2W pi2; - WCHAR *port, *ppd_dir = NULL; - HKEY hkeyPrinter, hkeyPrinters; - WCHAR nameW[MAX_PATH]; - HANDLE added_printer; - cups_ptype_t printer_type; - - if (!libcups_handle) return FALSE; - - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != - ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - return FALSE; + ERR( "Can't create Printers key\n" ); + return FALSE; } - nrofdests = pcupsGetDests(&dests); - TRACE("Found %d CUPS %s:\n", nrofdests, (nrofdests == 1) ? "printer" : "printers"); - for (i=0;i<nrofdests;i++) { - MultiByteToWideChar(CP_UNIXCP, 0, dests[i].name, -1, nameW, ARRAY_SIZE(nameW)); - printer_type = get_cups_printer_type( dests + i ); - - TRACE( "Printer %d: %s. printer_type %x\n", i, debugstr_w(nameW), printer_type ); + enum_params.size = 10000; + enum_params.printers = NULL; + do + { + enum_params.size *= 2; + heap_free( enum_params.printers ); + enum_params.printers = heap_alloc( enum_params.size ); + status = UNIX_CALL( enum_printers, &enum_params ); + } while (status == STATUS_BUFFER_OVERFLOW); + if (status) goto end; - if (printer_type & 0x2000000 /* CUPS_PRINTER_SCANNER */) - { - TRACE( "skipping scanner-only device\n" ); - continue; - } + TRACE( "Found %d CUPS %s:\n", enum_params.num, (enum_params.num == 1) ? "printer" : "printers" ); + for (i = 0; i < enum_params.num; i++) + { + struct printer_info *printer = enum_params.printers + i; - if (RegOpenKeyW( hkeyPrinters, nameW, &hkeyPrinter ) == ERROR_SUCCESS) + if (RegOpenKeyW( printers_key, printer->name, &printer_key ) == ERROR_SUCCESS) { - DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); + DWORD status = get_dword_from_reg( printer_key, StatusW ); /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ TRACE("Printer already exists\n"); - RegDeleteValueW(hkeyPrinter, May_Delete_Value); + RegDeleteValueW( printer_key, May_Delete_Value ); /* flag that the PPD file should be checked for an update */ - set_reg_DWORD( hkeyPrinter, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); - RegCloseKey(hkeyPrinter); + set_reg_DWORD( printer_key, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); + RegCloseKey( printer_key ); } else { if (!ppd_dir && !(ppd_dir = get_ppd_dir())) break; - if (!add_printer_driver( nameW, ppd_dir )) continue; + if (!add_printer_driver( printer->name, ppd_dir )) continue; - port = heap_alloc( sizeof(CUPS_Port) + lstrlenW( nameW ) * sizeof(WCHAR) ); + port = heap_alloc( sizeof(CUPS_Port) + lstrlenW( printer->name ) * sizeof(WCHAR) ); lstrcpyW( port, CUPS_Port ); - lstrcatW( port, nameW ); + lstrcatW( port, printer->name ); - memset(&pi2, 0, sizeof(PRINTER_INFO_2W)); - pi2.pPrinterName = nameW; + memset( &pi2, 0, sizeof(PRINTER_INFO_2W) ); + pi2.pPrinterName = printer->name; pi2.pDatatype = rawW; pi2.pPrintProcessor = WinPrintW; - pi2.pDriverName = nameW; - pi2.pComment = get_cups_option( "printer-info", dests[i].num_options, dests[i].options ); - pi2.pLocation = get_cups_option( "printer-location", dests[i].num_options, dests[i].options ); + pi2.pDriverName = printer->name; + pi2.pComment = printer->comment; + pi2.pLocation = printer->location; pi2.pPortName = port; pi2.pParameters = emptyStringW; pi2.pShareName = emptyStringW; pi2.pSepFile = emptyStringW; - added_printer = AddPrinterW( NULL, 2, (LPBYTE)&pi2 ); + added_printer = AddPrinterW( NULL, 2, (BYTE *)&pi2 ); if (added_printer) ClosePrinter( added_printer ); else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) - ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_w(nameW), GetLastError() ); + ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_w( printer->name ), GetLastError() ); heap_free( port ); - HeapFree( GetProcessHeap(), 0, pi2.pComment ); - HeapFree( GetProcessHeap(), 0, pi2.pLocation ); - } - - hadprinter = TRUE; - if (dests[i].is_default) { - SetDefaultPrinterW(nameW); - haddefault = TRUE; } + if (printer->is_default) default_printer = printer->name; } + if (!default_printer && enum_params.num) default_printer = enum_params.printers[0].name; + if (default_printer) SetDefaultPrinterW( default_printer ); + if (ppd_dir) { RemoveDirectoryW( ppd_dir ); - HeapFree( GetProcessHeap(), 0, ppd_dir ); + heap_free( ppd_dir ); } - - if (hadprinter && !haddefault) { - MultiByteToWideChar(CP_UNIXCP, 0, dests[0].name, -1, nameW, ARRAY_SIZE(nameW)); - SetDefaultPrinterW(nameW); - } - pcupsFreeDests(nrofdests, dests); - RegCloseKey(hkeyPrinters); +end: + heap_free( enum_params.printers ); + RegCloseKey( printers_key ); return TRUE; } -#endif - static void set_ppd_overrides( HANDLE printer ) { WCHAR *wstr = NULL; @@ -1493,11 +1453,7 @@ void WINSPOOL_LoadSystemPrinters(void) } old_printer_check( FALSE ); - -#ifdef SONAME_LIBCUPS - CUPS_LoadPrinters(); -#endif - + init_unix_printers(); old_printer_check( TRUE ); ReleaseMutex( init_mutex ); diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index bca4a5ea02d..5a1f1038995 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -37,6 +37,22 @@ extern void WINSPOOL_LoadSystemPrinters(void) DECLSPEC_HIDDEN; #define FILENAME_DIALOG 100 #define EDITBOX 201 +struct printer_info +{ + WCHAR *name; + WCHAR *comment; + WCHAR *location; + BOOL is_default; +}; + +struct enum_printers_params +{ + struct printer_info *printers; + unsigned int size; + unsigned int num; +}; + #define UNIX_CALL( func, params ) unix_ ## func( params ) NTSTATUS unix_process_attach( void * ) DECLSPEC_HIDDEN; +NTSTATUS unix_enum_printers( void * ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 3/6] winspool: Call the ppd retrieval function from add_printer_driver().
by Huw Davies 26 Oct '21

26 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/info.c | 197 +++++++++++++++------------------------ 1 file changed, 77 insertions(+), 120 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index badde6ea5ae..9d2af8cec94 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -750,43 +750,6 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) return open_printer_reg_key( name, phkey ); } -static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) -{ - DRIVER_INFO_3W di3; - unsigned int i; - BOOL res; - - ZeroMemory(&di3, sizeof(DRIVER_INFO_3W)); - di3.cVersion = 3; - di3.pName = (WCHAR*)name; - di3.pDriverPath = driver_nt; - di3.pDataFile = ppd; - di3.pConfigFile = driver_nt; - di3.pDefaultDataType = rawW; - - for (i = 0; i < ARRAY_SIZE(all_printenv); i++) - { - di3.pEnvironment = (WCHAR *) all_printenv[i]->envname; - if (all_printenv[i]->envname == envname_win40W) - { - /* We use wineps16.drv as driver for 16 bit */ - di3.pDriverPath = driver_9x; - di3.pConfigFile = driver_9x; - } - res = AddPrinterDriverExW( NULL, 3, (LPBYTE)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY ); - TRACE("got %d and %d for %s (%s)\n", res, GetLastError(), debugstr_w(name), debugstr_w(di3.pEnvironment)); - - if (!res && (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED)) - { - ERR("failed with %u for %s (%s) %s\n", GetLastError(), debugstr_w(name), - debugstr_w(di3.pEnvironment), debugstr_w(di3.pDriverPath)); - return FALSE; - } - } - - return TRUE; -} - static BOOL copy_file( const char *src, const char *dst ) { int fds[2] = {-1, -1}, num; @@ -852,6 +815,69 @@ static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) return ppd; } +static char *get_dest_name( const WCHAR *printer ) +{ + int len = WideCharToMultiByte( CP_UNIXCP, 0, printer, -1, NULL, 0, NULL, NULL ); + char *dest = heap_alloc( len ); + + if (dest) WideCharToMultiByte( CP_UNIXCP, 0, printer, -1, dest, len, NULL, NULL ); + return dest; +} + +static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ); +static void unlink_ppd( const WCHAR *ppd ); + +static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir ) +{ + WCHAR *ppd = get_ppd_filename( ppd_dir, name ); + char *dest_name; + DRIVER_INFO_3W di3; + unsigned int i; + BOOL res = FALSE; + + if (!ppd) return FALSE; + dest_name = get_dest_name( name ); + if (!dest_name) goto end; + + res = get_cups_ppd( dest_name, ppd ) || get_internal_fallback_ppd( ppd ); + if (!res) goto end; + + memset( &di3, 0, sizeof(DRIVER_INFO_3W) ); + di3.cVersion = 3; + di3.pName = (WCHAR *)name; + di3.pDriverPath = driver_nt; + di3.pDataFile = ppd; + di3.pConfigFile = driver_nt; + di3.pDefaultDataType = rawW; + + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) + { + di3.pEnvironment = (WCHAR *)all_printenv[i]->envname; + if (all_printenv[i]->envname == envname_win40W) + { + /* We use wineps16.drv as driver for 16 bit */ + di3.pDriverPath = driver_9x; + di3.pConfigFile = driver_9x; + } + res = AddPrinterDriverExW( NULL, 3, (BYTE *)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY ); + TRACE( "got %d and %d for %s (%s)\n", res, GetLastError(), debugstr_w( name ), debugstr_w( di3.pEnvironment ) ); + + if (!res && (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED)) + { + ERR( "failed with %u for %s (%s) %s\n", GetLastError(), debugstr_w( name ), + debugstr_w( di3.pEnvironment ), debugstr_w( di3.pDriverPath ) ); + break; + } + res = TRUE; + } + unlink_ppd( ppd ); + +end: + heap_free( dest_name ); + heap_free( ppd ); + return res; +} + static WCHAR *get_ppd_dir( void ) { static const WCHAR wine_ppds[] = {'w','i','n','e','_','p','p','d','s','\\',0}; @@ -953,11 +979,7 @@ static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ) if (http_status != HTTP_OK) unlink( unix_name ); HeapFree( GetProcessHeap(), 0, unix_name ); - if (http_status == HTTP_OK) return TRUE; - - TRACE( "failed to get ppd for printer %s from cups (status %d), calling fallback\n", - debugstr_a(printer_name), http_status ); - return get_internal_fallback_ppd( ppd ); + return http_status == HTTP_OK; } static WCHAR *get_cups_option( const char *name, int num_options, cups_option_t *options ) @@ -996,7 +1018,7 @@ static BOOL CUPS_LoadPrinters(void) BOOL hadprinter = FALSE, haddefault = FALSE; cups_dest_t *dests; PRINTER_INFO_2W pi2; - WCHAR *port, *ppd_dir = NULL, *ppd; + WCHAR *port, *ppd_dir = NULL; HKEY hkeyPrinter, hkeyPrinters; WCHAR nameW[MAX_PATH]; HANDLE added_printer; @@ -1024,7 +1046,8 @@ static BOOL CUPS_LoadPrinters(void) continue; } - if(RegOpenKeyW(hkeyPrinters, nameW, &hkeyPrinter) == ERROR_SUCCESS) { + if (RegOpenKeyW( hkeyPrinters, nameW, &hkeyPrinter ) == ERROR_SUCCESS) + { DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ @@ -1033,19 +1056,11 @@ static BOOL CUPS_LoadPrinters(void) /* flag that the PPD file should be checked for an update */ set_reg_DWORD( hkeyPrinter, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); RegCloseKey(hkeyPrinter); - } else { - BOOL added_driver = FALSE; - + } + else + { if (!ppd_dir && !(ppd_dir = get_ppd_dir())) break; - - ppd = get_ppd_filename( ppd_dir, nameW ); - if (get_cups_ppd( dests[i].name, ppd )) - { - added_driver = add_printer_driver( nameW, ppd ); - unlink_ppd( ppd ); - } - HeapFree( GetProcessHeap(), 0, ppd ); - if (!added_driver) continue; + if (!add_printer_driver( nameW, ppd_dir )) continue; port = heap_alloc( sizeof(CUPS_Port) + lstrlenW( nameW ) * sizeof(WCHAR) ); lstrcpyW( port, CUPS_Port ); @@ -1097,43 +1112,6 @@ static BOOL CUPS_LoadPrinters(void) #endif -static char *get_queue_name( HANDLE printer, BOOL *cups ) -{ - WCHAR *port, *name = NULL; - DWORD err, needed, type; - char *ret = NULL; - HKEY key; - - *cups = FALSE; - - err = WINSPOOL_GetOpenedPrinterRegKey( printer, &key ); - if (err) return NULL; - err = RegQueryValueExW( key, PortW, 0, &type, NULL, &needed ); - if (err) goto end; - port = HeapAlloc( GetProcessHeap(), 0, needed ); - if (!port) goto end; - RegQueryValueExW( key, PortW, 0, &type, (BYTE*)port, &needed ); - - if (!strncmpW( port, CUPS_Port, ARRAY_SIZE( CUPS_Port ) -1 )) - { - name = port + ARRAY_SIZE( CUPS_Port ) - 1; - *cups = TRUE; - } - else if (!strncmpW( port, LPR_Port, ARRAY_SIZE( LPR_Port ) -1 )) - name = port + ARRAY_SIZE( LPR_Port ) - 1; - if (name) - { - needed = WideCharToMultiByte( CP_UNIXCP, 0, name, -1, NULL, 0, NULL, NULL ); - ret = HeapAlloc( GetProcessHeap(), 0, needed ); - if(ret) WideCharToMultiByte( CP_UNIXCP, 0, name, -1, ret, needed, NULL, NULL ); - } - HeapFree( GetProcessHeap(), 0, port ); -end: - RegCloseKey( key ); - return ret; -} - - static void set_ppd_overrides( HANDLE printer ) { WCHAR *wstr = NULL; @@ -1180,38 +1158,17 @@ end: static BOOL update_driver( HANDLE printer ) { - BOOL ret, is_cups; + BOOL ret; const WCHAR *name = get_opened_printer_name( printer ); - WCHAR *ppd_dir, *ppd; - char *queue_name; + WCHAR *ppd_dir; if (!name) return FALSE; - queue_name = get_queue_name( printer, &is_cups ); - if (!queue_name) return FALSE; - - if (!(ppd_dir = get_ppd_dir())) - { - HeapFree( GetProcessHeap(), 0, queue_name ); - return FALSE; - } - ppd = get_ppd_filename( ppd_dir, name ); + if (!(ppd_dir = get_ppd_dir())) return FALSE; -#ifdef SONAME_LIBCUPS - if (is_cups) - ret = get_cups_ppd( queue_name, ppd ); - else -#endif - ret = get_internal_fallback_ppd( ppd ); + TRACE( "updating driver %s\n", debugstr_w( name ) ); + ret = add_printer_driver( name, ppd_dir ); - if (ret) - { - TRACE( "updating driver %s\n", debugstr_w( name ) ); - ret = add_printer_driver( name, ppd ); - unlink_ppd( ppd ); - } - HeapFree( GetProcessHeap(), 0, ppd_dir ); - HeapFree( GetProcessHeap(), 0, ppd ); - HeapFree( GetProcessHeap(), 0, queue_name ); + heap_free( ppd_dir ); set_ppd_overrides( printer ); -- 2.23.0

1 0

[PATCH 2/6] winspool: Remove support for parsing /etc/printcap.
by Huw Davies 26 Oct '21

26 Oct '21

This is extremely obsolete and doesn't provide the location of the ppd file anyway. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/info.c | 310 ++------------------------------------- 1 file changed, 11 insertions(+), 299 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fd02d2b2b3e..badde6ea5ae 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -750,20 +750,6 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) return open_printer_reg_key( name, phkey ); } -static void set_default_printer(const char *devname, const char *name) -{ - char *buf = HeapAlloc(GetProcessHeap(), 0, strlen(name)+strlen(devname)+strlen(",WINEPS.DRV,LPR:")+1); - HKEY hkey; - - sprintf(buf, "%s,WINEPS.DRV,LPR:%s", devname, name); - if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hkey)) - { - RegSetValueExA(hkey, "Device", 0, REG_SZ, (BYTE *)buf, strlen(buf) + 1); - RegCloseKey(hkey); - } - HeapFree(GetProcessHeap(), 0, buf); -} - static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) { DRIVER_INFO_3W di3; @@ -801,52 +787,6 @@ static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) return TRUE; } -static inline char *expand_env_string( char *str, DWORD type ) -{ - if (type == REG_EXPAND_SZ) - { - char *tmp; - DWORD needed = ExpandEnvironmentStringsA( str, NULL, 0 ); - tmp = HeapAlloc( GetProcessHeap(), 0, needed ); - if (tmp) - { - ExpandEnvironmentStringsA( str, tmp, needed ); - HeapFree( GetProcessHeap(), 0, str ); - return tmp; - } - } - return str; -} - -static char *get_fallback_ppd_name( const char *printer_name ) -{ - static const WCHAR ppds_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'P','r','i','n','t','i','n','g','\\','P','P','D',' ','F','i','l','e','s',0}; - HKEY hkey; - DWORD needed, type; - char *ret = NULL; - - if (RegOpenKeyW( HKEY_CURRENT_USER, ppds_key, &hkey ) == ERROR_SUCCESS ) - { - const char *value_name = NULL; - - if (RegQueryValueExA( hkey, printer_name, 0, NULL, NULL, &needed ) == ERROR_SUCCESS) - value_name = printer_name; - else if (RegQueryValueExA( hkey, "generic", 0, NULL, NULL, &needed ) == ERROR_SUCCESS) - value_name = "generic"; - - if (value_name) - { - ret = HeapAlloc( GetProcessHeap(), 0, needed ); - if (!ret) return NULL; - RegQueryValueExA( hkey, value_name, 0, &type, (BYTE *)ret, &needed ); - } - RegCloseKey( hkey ); - if (ret) return expand_env_string( ret, type ); - } - return NULL; -} - static BOOL copy_file( const char *src, const char *dst ) { int fds[2] = {-1, -1}, num; @@ -893,28 +833,6 @@ static BOOL get_internal_fallback_ppd( const WCHAR *ppd ) return ret; } -static BOOL get_fallback_ppd( const char *printer_name, const WCHAR *ppd ) -{ - char *dst, *src = get_fallback_ppd_name( printer_name ); - BOOL ret = FALSE; - - if (!src) return get_internal_fallback_ppd( ppd ); - - TRACE( "(%s %s) found %s\n", debugstr_a(printer_name), debugstr_w(ppd), debugstr_a(src) ); - - if (!(dst = wine_get_unix_file_name( ppd ))) goto fail; - - if (symlink( src, dst ) == -1) - if (errno != ENOSYS || !copy_file( src, dst )) - goto fail; - - ret = TRUE; -fail: - HeapFree( GetProcessHeap(), 0, dst ); - HeapFree( GetProcessHeap(), 0, src ); - return ret; -} - static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) { static const WCHAR dot_ppd[] = {'.','p','p','d',0}; @@ -1039,7 +957,7 @@ static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ) TRACE( "failed to get ppd for printer %s from cups (status %d), calling fallback\n", debugstr_a(printer_name), http_status ); - return get_fallback_ppd( printer_name, ppd ); + return get_internal_fallback_ppd( ppd ); } static WCHAR *get_cups_option( const char *name, int num_options, cups_option_t *options ) @@ -1106,17 +1024,11 @@ static BOOL CUPS_LoadPrinters(void) continue; } - port = HeapAlloc(GetProcessHeap(), 0, sizeof(CUPS_Port) + lstrlenW(nameW) * sizeof(WCHAR)); - lstrcpyW(port, CUPS_Port); - lstrcatW(port, nameW); - if(RegOpenKeyW(hkeyPrinters, nameW, &hkeyPrinter) == ERROR_SUCCESS) { DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ TRACE("Printer already exists\n"); - /* overwrite old LPR:* port */ - RegSetValueExW(hkeyPrinter, PortW, 0, REG_SZ, (LPBYTE)port, (lstrlenW(port) + 1) * sizeof(WCHAR)); RegDeleteValueW(hkeyPrinter, May_Delete_Value); /* flag that the PPD file should be checked for an update */ set_reg_DWORD( hkeyPrinter, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); @@ -1124,11 +1036,8 @@ static BOOL CUPS_LoadPrinters(void) } else { BOOL added_driver = FALSE; - if (!ppd_dir && !(ppd_dir = get_ppd_dir())) - { - HeapFree( GetProcessHeap(), 0, port ); - break; - } + if (!ppd_dir && !(ppd_dir = get_ppd_dir())) break; + ppd = get_ppd_filename( ppd_dir, nameW ); if (get_cups_ppd( dests[i].name, ppd )) { @@ -1136,11 +1045,11 @@ static BOOL CUPS_LoadPrinters(void) unlink_ppd( ppd ); } HeapFree( GetProcessHeap(), 0, ppd ); - if (!added_driver) - { - HeapFree( GetProcessHeap(), 0, port ); - continue; - } + if (!added_driver) continue; + + port = heap_alloc( sizeof(CUPS_Port) + lstrlenW( nameW ) * sizeof(WCHAR) ); + lstrcpyW( port, CUPS_Port ); + lstrcatW( port, nameW ); memset(&pi2, 0, sizeof(PRINTER_INFO_2W)); pi2.pPrinterName = nameW; @@ -1159,10 +1068,10 @@ static BOOL CUPS_LoadPrinters(void) else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_w(nameW), GetLastError() ); + heap_free( port ); HeapFree( GetProcessHeap(), 0, pi2.pComment ); HeapFree( GetProcessHeap(), 0, pi2.pLocation ); } - HeapFree( GetProcessHeap(), 0, port ); hadprinter = TRUE; if (dests[i].is_default) { @@ -1292,7 +1201,7 @@ static BOOL update_driver( HANDLE printer ) ret = get_cups_ppd( queue_name, ppd ); else #endif - ret = get_fallback_ppd( queue_name, ppd ); + ret = get_internal_fallback_ppd( ppd ); if (ret) { @@ -1312,199 +1221,6 @@ static BOOL update_driver( HANDLE printer ) return ret; } -static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) -{ - PRINTER_INFO_2A pinfo2a; - const char *r; - size_t name_len; - char *e,*s,*name,*prettyname,*devname; - BOOL ret = FALSE, set_default = FALSE; - char *port = NULL, *env_default; - HKEY hkeyPrinter, hkeyPrinters = NULL; - WCHAR devnameW[MAX_PATH], *ppd_dir = NULL, *ppd; - HANDLE added_printer; - - while (isspace(*pent)) pent++; - r = strchr(pent,':'); - if (r) - name_len = r - pent; - else - name_len = strlen(pent); - name = HeapAlloc(GetProcessHeap(), 0, name_len + 1); - memcpy(name, pent, name_len); - name[name_len] = '\0'; - if (r) - pent = r; - else - pent = ""; - - TRACE("name=%s entry=%s\n",name, pent); - - if(ispunct(*name)) { /* a tc entry, not a real printer */ - TRACE("skipping tc entry\n"); - goto end; - } - - if(strstr(pent,":server")) { /* server only version so skip */ - TRACE("skipping server entry\n"); - goto end; - } - - /* Determine whether this is a postscript printer. */ - - ret = TRUE; - env_default = getenv("PRINTER"); - prettyname = name; - /* Get longest name, usually the one at the right for later display. */ - while((s=strchr(prettyname,'|'))) { - *s = '\0'; - e = s; - while(isspace(*--e)) *e = '\0'; - TRACE("\t%s\n", debugstr_a(prettyname)); - if(env_default && !_strnicmp(prettyname, env_default, -1)) set_default = TRUE; - for(prettyname = s+1; isspace(*prettyname); prettyname++) - ; - } - e = prettyname + strlen(prettyname); - while(isspace(*--e)) *e = '\0'; - TRACE("\t%s\n", debugstr_a(prettyname)); - if(env_default && !_strnicmp(prettyname, env_default, -1)) set_default = TRUE; - - /* prettyname must fit into the dmDeviceName member of DEVMODE struct, - * if it is too long, we use it as comment below. */ - devname = prettyname; - if (strlen(devname)>=CCHDEVICENAME-1) - devname = name; - if (strlen(devname)>=CCHDEVICENAME-1) { - ret = FALSE; - goto end; - } - - port = HeapAlloc(GetProcessHeap(),0,strlen("LPR:")+strlen(name)+1); - sprintf(port,"LPR:%s",name); - - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != - ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - ret = FALSE; - goto end; - } - - MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, ARRAY_SIZE(devnameW)); - - if(RegOpenKeyA(hkeyPrinters, devname, &hkeyPrinter) == ERROR_SUCCESS) { - DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); - /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters - and continue */ - TRACE("Printer already exists\n"); - RegDeleteValueW(hkeyPrinter, May_Delete_Value); - /* flag that the PPD file should be checked for an update */ - set_reg_DWORD( hkeyPrinter, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); - RegCloseKey(hkeyPrinter); - } else { - static CHAR data_type[] = "RAW", - print_proc[] = "WinPrint", - comment[] = "WINEPS Printer using LPR", - params[] = "<parameters?>", - share_name[] = "<share name?>", - sep_file[] = "<sep file?>"; - BOOL added_driver = FALSE; - - if (!ppd_dir && !(ppd_dir = get_ppd_dir())) goto end; - ppd = get_ppd_filename( ppd_dir, devnameW ); - if (get_fallback_ppd( devname, ppd )) - { - added_driver = add_printer_driver( devnameW, ppd ); - unlink_ppd( ppd ); - } - HeapFree( GetProcessHeap(), 0, ppd ); - if (!added_driver) goto end; - - memset(&pinfo2a,0,sizeof(pinfo2a)); - pinfo2a.pPrinterName = devname; - pinfo2a.pDatatype = data_type; - pinfo2a.pPrintProcessor = print_proc; - pinfo2a.pDriverName = devname; - pinfo2a.pComment = comment; - pinfo2a.pLocation = prettyname; - pinfo2a.pPortName = port; - pinfo2a.pParameters = params; - pinfo2a.pShareName = share_name; - pinfo2a.pSepFile = sep_file; - - added_printer = AddPrinterA( NULL, 2, (LPBYTE)&pinfo2a ); - if (added_printer) ClosePrinter( added_printer ); - else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) - ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_a(name), GetLastError() ); - } - - if (isfirst || set_default) - set_default_printer(devname, name); - - end: - if (hkeyPrinters) RegCloseKey( hkeyPrinters ); - if (ppd_dir) - { - RemoveDirectoryW( ppd_dir ); - HeapFree( GetProcessHeap(), 0, ppd_dir ); - } - HeapFree(GetProcessHeap(), 0, port); - HeapFree(GetProcessHeap(), 0, name); - return ret; -} - -static BOOL -PRINTCAP_LoadPrinters(void) { - BOOL hadprinter = FALSE; - char buf[200]; - FILE *f; - char *pent = NULL; - BOOL had_bash = FALSE; - - f = fopen("/etc/printcap","r"); - if (!f) - return FALSE; - - while(fgets(buf,sizeof(buf),f)) { - char *start, *end; - - end=strchr(buf,'\n'); - if (end) *end='\0'; - - start = buf; - while(isspace(*start)) start++; - if(*start == '#' || *start == '\0') - continue; - - if(pent && !had_bash && *start != ':' && *start != '|') { /* start of new entry, parse the previous one */ - hadprinter |= PRINTCAP_ParseEntry(pent,!hadprinter); - HeapFree(GetProcessHeap(),0,pent); - pent = NULL; - } - - if (end && *--end == '\\') { - *end = '\0'; - had_bash = TRUE; - } else - had_bash = FALSE; - - if (pent) { - pent=HeapReAlloc(GetProcessHeap(),0,pent,strlen(pent)+strlen(start)+1); - strcat(pent,start); - } else { - pent=HeapAlloc(GetProcessHeap(),0,strlen(start)+1); - strcpy(pent,start); - } - - } - if(pent) { - hadprinter |= PRINTCAP_ParseEntry(pent,!hadprinter); - HeapFree(GetProcessHeap(),0,pent); - } - fclose(f); - return hadprinter; -} - static inline DWORD set_reg_szW(HKEY hkey, const WCHAR *keyname, const WCHAR *value) { if (value) @@ -1783,7 +1499,6 @@ void WINSPOOL_LoadSystemPrinters(void) HKEY hkey, hkeyPrinters; DWORD needed, num, i; WCHAR PrinterName[256]; - BOOL done = FALSE; /* FIXME: The init code should be moved to spoolsv.exe */ init_mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); @@ -1823,12 +1538,9 @@ void WINSPOOL_LoadSystemPrinters(void) old_printer_check( FALSE ); #ifdef SONAME_LIBCUPS - done = CUPS_LoadPrinters(); + CUPS_LoadPrinters(); #endif - if(!done) /* If we have any CUPS based printers, skip looking for printcap printers */ - PRINTCAP_LoadPrinters(); - old_printer_check( TRUE ); ReleaseMutex( init_mutex ); -- 2.23.0

1 0

[PATCH 1/6] winspool: Move loading of libcups to cups.c.
by Huw Davies 26 Oct '21

26 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/Makefile.in | 1 + dlls/winspool.drv/cups.c | 101 ++++++++++++++++++++++++++++++++++ dlls/winspool.drv/info.c | 40 +++----------- dlls/winspool.drv/wspool.c | 31 ++++++----- dlls/winspool.drv/wspool.h | 5 ++ 5 files changed, 130 insertions(+), 48 deletions(-) create mode 100644 dlls/winspool.drv/cups.c diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index a0d0f9504f2..d40813d649c 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -8,6 +8,7 @@ EXTRALIBS = $(APPLICATIONSERVICES_LIBS) EXTRADLLFLAGS = -mcygwin C_SRCS = \ + cups.c \ info.c \ wspool.c diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c new file mode 100644 index 00000000000..207c95c568a --- /dev/null +++ b/dlls/winspool.drv/cups.c @@ -0,0 +1,101 @@ +/* + * CUPS functions + * + * 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 + */ +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <string.h> +#ifdef HAVE_CUPS_CUPS_H +#include <cups/cups.h> +#endif +#ifdef HAVE_CUPS_PPD_H +#include <cups/ppd.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" +#include "wingdi.h" +#include "winspool.h" +#include "ddk/winsplp.h" +#include "wine/debug.h" + +#include "wspool.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winspool); + +#ifdef SONAME_LIBCUPS + +void *libcups_handle = NULL; + +#define CUPS_FUNCS \ + DO_FUNC(cupsAddOption); \ + DO_FUNC(cupsFreeDests); \ + DO_FUNC(cupsFreeOptions); \ + DO_FUNC(cupsGetDests); \ + DO_FUNC(cupsGetOption); \ + DO_FUNC(cupsParseOptions); \ + DO_FUNC(cupsPrintFile) +#define CUPS_OPT_FUNCS \ + DO_FUNC(cupsGetNamedDest); \ + DO_FUNC(cupsGetPPD); \ + DO_FUNC(cupsGetPPD3); \ + DO_FUNC(cupsLastErrorString) + +#define DO_FUNC(f) typeof(f) *p##f = NULL +CUPS_FUNCS; +#undef DO_FUNC +cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *) = NULL; +const char * (*pcupsGetPPD)(const char *) = NULL; +http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t) = NULL; +const char * (*pcupsLastErrorString)(void) = NULL; + +#endif /* SONAME_LIBCUPS */ + +NTSTATUS unix_process_attach( void *arg ) +{ +#ifdef SONAME_LIBCUPS + libcups_handle = dlopen( SONAME_LIBCUPS, RTLD_NOW ); + TRACE( "%p: %s loaded\n", libcups_handle, SONAME_LIBCUPS ); + if (!libcups_handle) return STATUS_DLL_NOT_FOUND; + +#define DO_FUNC(x) \ + p##x = dlsym( libcups_handle, #x ); \ + if (!p##x) \ + { \ + ERR( "failed to load symbol %s\n", #x ); \ + libcups_handle = NULL; \ + return STATUS_ENTRYPOINT_NOT_FOUND; \ + } + CUPS_FUNCS; +#undef DO_FUNC +#define DO_FUNC(x) p##x = dlsym( libcups_handle, #x ) + CUPS_OPT_FUNCS; +#undef DO_FUNC + return STATUS_SUCCESS; +#else /* SONAME_LIBCUPS */ + return STATUS_NOT_SUPPORTED; +#endif /* SONAME_LIBCUPS */ +} diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 660a5afe74d..fd02d2b2b3e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -967,7 +967,7 @@ static void unlink_ppd( const WCHAR *ppd ) #ifdef SONAME_LIBCUPS -static void *cupshandle; +extern void *libcups_handle; #define CUPS_FUNCS \ DO_FUNC(cupsAddOption); \ @@ -983,13 +983,13 @@ static void *cupshandle; DO_FUNC(cupsGetPPD3); \ DO_FUNC(cupsLastErrorString) -#define DO_FUNC(f) static typeof(f) *p##f +#define DO_FUNC(f) extern typeof(f) *p##f CUPS_FUNCS; #undef DO_FUNC -static cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); -static const char * (*pcupsGetPPD)(const char *); -static http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); -static const char * (*pcupsLastErrorString)(void); +extern cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); +extern const char * (*pcupsGetPPD)(const char *); +extern http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); +extern const char * (*pcupsLastErrorString)(void); static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, time_t *modtime, char *buffer, @@ -1072,28 +1072,6 @@ static cups_ptype_t get_cups_printer_type( const cups_dest_t *dest ) return ret; } -static void load_cups(void) -{ - cupshandle = dlopen( SONAME_LIBCUPS, RTLD_NOW ); - if (!cupshandle) return; - - TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); - -#define DO_FUNC(x) \ - p##x = dlsym( cupshandle, #x ); \ - if (!p##x) \ - { \ - ERR("failed to load symbol %s\n", #x); \ - cupshandle = NULL; \ - return; \ - } - CUPS_FUNCS; -#undef DO_FUNC -#define DO_FUNC(x) p##x = dlsym( cupshandle, #x ) - CUPS_OPT_FUNCS; -#undef DO_FUNC -} - static BOOL CUPS_LoadPrinters(void) { int i, nrofdests; @@ -1106,7 +1084,7 @@ static BOOL CUPS_LoadPrinters(void) HANDLE added_printer; cups_ptype_t printer_type; - if (!cupshandle) return FALSE; + if (!libcups_handle) return FALSE; if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { @@ -1807,10 +1785,6 @@ void WINSPOOL_LoadSystemPrinters(void) WCHAR PrinterName[256]; BOOL done = FALSE; -#ifdef SONAME_LIBCUPS - load_cups(); -#endif - /* FIXME: The init code should be moved to spoolsv.exe */ init_mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); if (!init_mutex) diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index bbfb0fb0f42..90d35bee73e 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -110,22 +110,23 @@ BOOL load_backend(void) * Winspool entry point. * */ -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD reason, LPVOID lpReserved) +BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) { - switch (reason) - { - case DLL_PROCESS_ATTACH: { - WINSPOOL_hInstance = hInstance; - DisableThreadLibraryCalls(hInstance); - WINSPOOL_LoadSystemPrinters(); - break; - } + switch (reason) + { + case DLL_PROCESS_ATTACH: + WINSPOOL_hInstance = instance; + DisableThreadLibraryCalls( instance ); + UNIX_CALL( process_attach, NULL ); + WINSPOOL_LoadSystemPrinters(); + break; + case DLL_PROCESS_DETACH: - if (lpReserved) break; - DeleteCriticalSection(&backend_cs); - FreeLibrary(hlocalspl); - break; - } + if (reserved) break; + DeleteCriticalSection(&backend_cs); + FreeLibrary(hlocalspl); + break; + } - return TRUE; + return TRUE; } diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index 06c28231330..bca4a5ea02d 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -21,6 +21,7 @@ #include <windef.h> #include <winuser.h> +#include <winternl.h> extern HINSTANCE WINSPOOL_hInstance DECLSPEC_HIDDEN; @@ -35,3 +36,7 @@ extern void WINSPOOL_LoadSystemPrinters(void) DECLSPEC_HIDDEN; #define FILENAME_DIALOG 100 #define EDITBOX 201 + +#define UNIX_CALL( func, params ) unix_ ## func( params ) + +NTSTATUS unix_process_attach( void * ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 00/10] First step for supporting inlined frames in winedbg & dbghelp
by Eric Pouech 26 Oct '21

26 Oct '21

The following series implements: - local scope management in dbghelp (instead of SymSetContext) - basic implementation of some inline context oriented APIs of dbghelp (when the inline context doesn't represent an inlined frame) - let winedbg use all those APIs instead of the (old = non inline context oriented APIs) A+ --- Eric Pouech (10): dbghelp: let StackWalkEx() succeed even when inline mode is requested dbghelp: implement SymFromInlineContext() when context isn't in inline mode dbghelp: implement SymGetLineFromInlineContext*() when context isn't in inline mode dbghelp: add local scope information in struct process dbghelp: implement SymSetScopeFromAddr() and SymSetScopeFromIndex() dbghelp: rewrite SymSetContext() on top of SymSetScopeFromAddr() dbghelp: implement SymSetScopeFromInlineContext() when context isn't inlined programs/winedbg: add a pair of helpers for accessing frames' internal info programs/winedbg: use SymSetScopeFromAddr() instead of SymSetContext() programs/winedbg: use inline contexts oriented APIs for stack backtrace dlls/dbghelp/dbghelp.c | 60 ++++++++++------ dlls/dbghelp/dbghelp_private.h | 23 +++++++ dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/module.c | 10 ++- dlls/dbghelp/stack.c | 10 ++- dlls/dbghelp/symbol.c | 68 +++++++++++++----- programs/winedbg/debugger.h | 15 +++- programs/winedbg/stack.c | 121 +++++++++++++++------------------ programs/winedbg/symbol.c | 23 ++++--- 9 files changed, 212 insertions(+), 120 deletions(-)

1 10

[PATCH] include: Add CMSH264DecoderMFT CLSID
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 61381bee6d4..fd21ad54a40 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -30,3 +30,8 @@ coclass CMP3DecMediaObject {} uuid(f447b69e-1884-4a7e-8055-346f74d6edb3) ] coclass CResamplerMediaObject {} + +[ + uuid(62ce7e72-4c71-4d20-b15d-452831a87d9d) +] +coclass CMSH264DecoderMFT {} -- 2.33.0

1 0

[PATCH v2] include: Add missing MFT CLSIDs
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/mfidl.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 62e0ca3025a..d23995fbc18 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1620,4 +1620,12 @@ cpp_quote("EXTERN_GUID(MF_XVP_DISABLE_FRC, 0x2c0afa19, 0x7a97, 0x4d5a, 0x9e, 0xe cpp_quote("EXTERN_GUID(MF_XVP_CALLER_ALLOCATES_OUTPUT, 0x4a2cabc, 0x0cab, 0x40b1, 0xa1, 0xb9, 0x75, 0xbc, 0x36, 0x58, 0xf0, 0x00);") cpp_quote("EXTERN_GUID(MF_XVP_SAMPLE_LOCK_TIMEOUT, 0xaa4ddb29, 0x5134, 0x4363, 0xac, 0x72, 0x83, 0xec, 0x4b, 0xc1, 0x04, 0x26);") +cpp_quote("EXTERN_GUID(CLSID_MSAACDecMFT, 0x32d186a7, 0x218f, 0x4c75, 0x88, 0x76, 0xdd, 0x77, 0x27, 0x3a, 0x89, 0x99);") +cpp_quote("EXTERN_GUID(CLSID_MSDDPlusDecMFT, 0x177c0afe, 0x900b, 0x48d4, 0x9e, 0x4c, 0x57, 0xad, 0xd2, 0x50, 0xb3, 0xd4);") +cpp_quote("EXTERN_GUID(CLSID_MSMPEGAudDecMFT, 0x70707b39, 0xb2ca, 0x4015, 0xab, 0xea, 0xf8, 0x44, 0x7d, 0x22, 0xd8, 0x8b);") +cpp_quote("EXTERN_GUID(CLSID_MSMPEGDecoderMFT, 0x2d709e52, 0x123f, 0x49b5, 0x9c, 0xbc, 0x9a, 0xf5, 0xcd, 0xe2, 0x8f, 0xb9);") +cpp_quote("EXTERN_GUID(CLSID_MSH264DecoderMFT, 0x62ce7e72, 0x4c71, 0x4d20, 0xb1, 0x5d, 0x45, 0x28, 0x31, 0xa8, 0x7d, 0x9d);") +cpp_quote("EXTERN_GUID(CLSID_MSH264EncoderMFT, 0x6ca50344, 0x051a, 0x4ded, 0x97, 0x79, 0xa4, 0x33, 0x05, 0x16, 0x5e, 0x35);") +cpp_quote("EXTERN_GUID(CLSID_MSH265DecoderMFT, 0x420a51a3, 0xd605, 0x430c, 0xb4, 0xfc, 0x45, 0x27, 0x4f, 0xa6, 0xc5, 0x62);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") +cpp_quote("EXTERN_GUID(CLSID_WMVDecoderMFT, 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);") -- 2.33.0

1 0

[PATCH] include: Add missing MFT CLSIDs
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/mfidl.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 62e0ca3025a..7f3af2eb1fd 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1620,4 +1620,12 @@ cpp_quote("EXTERN_GUID(MF_XVP_DISABLE_FRC, 0x2c0afa19, 0x7a97, 0x4d5a, 0x9e, 0xe cpp_quote("EXTERN_GUID(MF_XVP_CALLER_ALLOCATES_OUTPUT, 0x4a2cabc, 0x0cab, 0x40b1, 0xa1, 0xb9, 0x75, 0xbc, 0x36, 0x58, 0xf0, 0x00);") cpp_quote("EXTERN_GUID(MF_XVP_SAMPLE_LOCK_TIMEOUT, 0xaa4ddb29, 0x5134, 0x4363, 0xac, 0x72, 0x83, 0xec, 0x4b, 0xc1, 0x04, 0x26);") +cpp_quote("EXTERN_GUID(CLSID_MSAACDecMFT, 0x32d186a7, 0x218f, 0x4c75, 0x88, 0x76, 0xdd, 0x77, 0x27, 0x3a, 0x89, 0x99);") +cpp_quote("EXTERN_GUID(CLSID_MSDDPlusDecMFT, 0x177C0AFE, 0x900B, 0x48d4, 0x9E, 0x4C, 0x57, 0xAD, 0xD2, 0x50, 0xB3, 0xD4);") +cpp_quote("EXTERN_GUID(CLSID_MSMPEGAudDecMFT, 0x70707B39, 0xB2CA, 0x4015, 0xAB, 0xEA, 0xF8, 0x44, 0x7D, 0x22, 0xD8, 0x8B);") +cpp_quote("EXTERN_GUID(CLSID_MSMPEGDecoderMFT, 0x2D709E52, 0x123F, 0x49b5, 0x9C, 0xBC, 0x9A, 0xF5, 0xCD, 0xE2, 0x8F, 0xB9);") +cpp_quote("EXTERN_GUID(CLSID_MSH264DecoderMFT, 0x62CE7E72, 0x4C71, 0x4d20, 0xB1, 0x5D, 0x45, 0x28, 0x31, 0xA8, 0x7D, 0x9D);") +cpp_quote("EXTERN_GUID(CLSID_MSH264EncoderMFT, 0x6ca50344, 0x051a, 0x4ded, 0x97, 0x79, 0xa4, 0x33, 0x05, 0x16, 0x5e, 0x35);") +cpp_quote("EXTERN_GUID(CLSID_MSH265DecoderMFT, 0x420A51A3, 0xD605, 0x430C, 0xB4, 0xFC, 0x45, 0x27, 0x4F, 0xA6, 0xC5, 0x62);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") +cpp_quote("EXTERN_GUID(CLSID_WMVDecoderMFT, 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);") -- 2.33.0

2 1

[PATCH 4/4] msdasql: Add IPersist interface support
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 50 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 27 +++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 38cec9e88e1..d9aaf491d3c 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -180,6 +180,7 @@ struct msdasql IDBProperties IDBProperties_iface; IDBInitialize IDBInitialize_iface; IDBCreateSession IDBCreateSession_iface; + IPersist IPersist_iface; LONG ref; }; @@ -204,6 +205,11 @@ static inline struct msdasql *impl_from_IDBCreateSession(IDBCreateSession *iface return CONTAINING_RECORD(iface, struct msdasql, IDBCreateSession_iface); } +static inline struct msdasql *impl_from_IPersist( IPersist *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql, IPersist_iface ); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -227,6 +233,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBCreateSession_iface; } + else if(IsEqualGUID(&IID_IPersist, riid)) + { + *out = &provider->IPersist_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -459,6 +469,45 @@ static const struct IDBCreateSessionVtbl dbsess_vtbl = dbsess_CreateSession }; +static HRESULT WINAPI persist_QueryInterface(IPersist *iface, REFIID riid, void **ppv) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); +} + +static ULONG WINAPI persist_AddRef(IPersist *iface) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI persist_Release(IPersist *iface) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI persist_GetClassID(IPersist *iface, CLSID *classid) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + + TRACE("(%p)->(%p)\n", provider, classid); + + if(!classid) + return E_INVALIDARG; + + *classid = CLSID_MSDASQL; + return S_OK; + +} + +static const IPersistVtbl persistVtbl = { + persist_QueryInterface, + persist_AddRef, + persist_Release, + persist_GetClassID +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -472,6 +521,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; provider->IDBCreateSession_iface.lpVtbl = &dbsess_vtbl; + provider->IPersist_iface.lpVtbl = &persistVtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index ff4757eb236..16d6de6cd9a 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -36,6 +36,32 @@ DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0 static BOOL db_created; static char mdbpath[MAX_PATH]; +static test_msdasql(void) +{ + HRESULT hr; + IUnknown *unk; + IPersist *persist; + CLSID classid; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + hr = IUnknown_QueryInterface(unk, &IID_IPersist, (void**)&persist); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IPersist_GetClassID(persist, &classid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&classid, &CLSID_MSDASQL), "got %s\n", debugstr_guid(&classid)); + + IPersist_Release(persist); + + IUnknown_Release(unk); +} + static void test_Properties(void) { HRESULT hr; @@ -264,6 +290,7 @@ START_TEST(provider) setup_database(); + test_msdasql(); test_Properties(); test_sessions(); -- 2.33.0

1 0

[PATCH 3/4] msdasql: Implement IDBCreateSession CreateSession
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 3 +- dlls/msdasql/msdasql_main.c | 12 +++- dlls/msdasql/msdasql_private.h | 19 ++++++ dlls/msdasql/session.c | 114 +++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 3 deletions(-) create mode 100644 dlls/msdasql/msdasql_private.h create mode 100644 dlls/msdasql/session.c diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 04d9cb29f2a..ee8fa672623 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -4,7 +4,8 @@ IMPORTS = uuid ole32 oleaut32 EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ - msdasql_main.c + msdasql_main.c \ + session.c RC_SRCS = msdasql.rc diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 9a3adba49ff..38cec9e88e1 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -30,6 +30,8 @@ #include "initguid.h" #include "msdasql.h" +#include "msdasql_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(msdasql); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); @@ -437,10 +439,16 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou IUnknown **session) { struct msdasql *provider = impl_from_IDBCreateSession(iface); + HRESULT hr; - FIXME("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); + TRACE("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); - return E_FAIL; + if (outer) + FIXME("outer currently not supported.\n"); + + hr = create_db_session(riid, (void**)session); + + return hr; } static const struct IDBCreateSessionVtbl dbsess_vtbl = diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h new file mode 100644 index 00000000000..a3d73498fe9 --- /dev/null +++ b/dlls/msdasql/msdasql_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2020 Alistair Leslie-Hughes + * + * 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 + */ + +HRESULT create_db_session(REFIID riid, void **unk) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c new file mode 100644 index 00000000000..57174be40f8 --- /dev/null +++ b/dlls/msdasql/session.c @@ -0,0 +1,114 @@ +/* + * Copyright 2020 Alistair Leslie-Hughes + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "msdasc.h" +#include "wine/heap.h" +#include "wine/debug.h" + +#include "msdasql.h" + +#include "msdasql_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdasql); + +struct msdasql_session +{ + IUnknown session_iface; + LONG refs; +}; + +static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, session_iface ); +} + +static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), ppv ); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) + { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = &session->session_iface; + } + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI session_AddRef(IUnknown *iface) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + LONG refs = InterlockedIncrement( &session->refs ); + TRACE( "%p new refcount %d\n", session, refs ); + return refs; +} + +static ULONG WINAPI session_Release(IUnknown *iface) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + LONG refs = InterlockedDecrement( &session->refs ); + TRACE( "%p new refcount %d\n", session, refs ); + if (!refs) + { + TRACE( "destroying %p\n", session ); + heap_free( session ); + } + return refs; +} + +static const IUnknownVtbl unkfactoryVtbl = +{ + session_QueryInterface, + session_AddRef, + session_Release, +}; + +HRESULT create_db_session(REFIID riid, void **unk) +{ + struct msdasql_session *session; + HRESULT hr; + + session = heap_alloc(sizeof(*session)); + if (!session) + return E_OUTOFMEMORY; + + session->session_iface.lpVtbl = &unkfactoryVtbl; + session->refs = 1; + + hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); + IUnknown_Release(&session->session_iface); + return hr; +} -- 2.33.0

1 0

[PATCH 2/4] msdasql: Add IDBCreateSession support
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 8fac3fb23df..9a3adba49ff 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -177,6 +177,7 @@ struct msdasql IUnknown MSDASQL_iface; IDBProperties IDBProperties_iface; IDBInitialize IDBInitialize_iface; + IDBCreateSession IDBCreateSession_iface; LONG ref; }; @@ -196,6 +197,11 @@ static inline struct msdasql *impl_from_IDBInitialize(IDBInitialize *iface) return CONTAINING_RECORD(iface, struct msdasql, IDBInitialize_iface); } +static inline struct msdasql *impl_from_IDBCreateSession(IDBCreateSession *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBCreateSession_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -215,6 +221,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBInitialize_iface; } + else if (IsEqualGUID(riid, &IID_IDBCreateSession)) + { + *out = &provider->IDBCreateSession_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -402,6 +412,45 @@ static const struct IDBInitializeVtbl dbinit_vtbl = dbinit_Uninitialize }; +static HRESULT WINAPI dbsess_QueryInterface(IDBCreateSession *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbsess_AddRef(IDBCreateSession *iface) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbsess_Release(IDBCreateSession *iface) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *outer, REFIID riid, + IUnknown **session) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + FIXME("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); + + return E_FAIL; +} + +static const struct IDBCreateSessionVtbl dbsess_vtbl = +{ + dbsess_QueryInterface, + dbsess_AddRef, + dbsess_Release, + dbsess_CreateSession +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -414,6 +463,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; + provider->IDBCreateSession_iface.lpVtbl = &dbsess_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); -- 2.33.0

1 0

[PATCH 1/6] dinput: Canonicalize code style of IDirectInputWImpl_EnumDevices.
by Rémi Bernon 26 Oct '21

26 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 95 +++++++++------------------------------ 1 file changed, 20 insertions(+), 75 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 985dae1ab36..da790bae36c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -270,58 +270,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVer return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); } -static const char *_dump_DIDEVTYPE_value(DWORD dwDevType, DWORD dwVersion) -{ - if (dwVersion < 0x0800) { - switch (dwDevType) { - case 0: return "All devices"; - case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE"; - case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD"; - case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK"; - case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE"; - default: return "Unknown"; - } - } else { - switch (dwDevType) { - case DI8DEVCLASS_ALL: return "All devices"; - case DI8DEVCLASS_POINTER: return "DI8DEVCLASS_POINTER"; - case DI8DEVCLASS_KEYBOARD: return "DI8DEVCLASS_KEYBOARD"; - case DI8DEVCLASS_DEVICE: return "DI8DEVCLASS_DEVICE"; - case DI8DEVCLASS_GAMECTRL: return "DI8DEVCLASS_GAMECTRL"; - default: return "Unknown"; - } - } -} - -static void _dump_EnumDevices_dwFlags(DWORD dwFlags) -{ - if (TRACE_ON(dinput)) { - unsigned int i; - static const struct { - DWORD mask; - const char *name; - } flags[] = { -#define FE(x) { x, #x} - FE(DIEDFL_ALLDEVICES), - FE(DIEDFL_ATTACHEDONLY), - FE(DIEDFL_FORCEFEEDBACK), - FE(DIEDFL_INCLUDEALIASES), - FE(DIEDFL_INCLUDEPHANTOMS), - FE(DIEDFL_INCLUDEHIDDEN) -#undef FE - }; - TRACE(" flags: "); - if (dwFlags == 0) { - TRACE("DIEDFL_ALLDEVICES\n"); - return; - } - for (i = 0; i < ARRAY_SIZE(flags); i++) - if (flags[i].mask & dwFlags) - TRACE("%s ",flags[i].name); - } - TRACE("\n"); -} - static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) { int i; @@ -371,38 +319,35 @@ __ASM_GLOBAL_FUNC( enum_callback_wrapper, /****************************************************************************** * IDirectInputW_EnumDevices */ -static HRESULT WINAPI IDirectInputWImpl_EnumDevices( - LPDIRECTINPUT7W iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKW lpCallback, - LPVOID pvRef, DWORD dwFlags) +static HRESULT WINAPI IDirectInputWImpl_EnumDevices( IDirectInput7W *iface, DWORD type, LPDIENUMDEVICESCALLBACKW callback, + void *context, DWORD flags ) { - IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); - DIDEVICEINSTANCEW devInstance; - unsigned int i; - int j; - HRESULT r; + DIDEVICEINSTANCEW instance = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + unsigned int i, j; + HRESULT hr; - TRACE("(this=%p,0x%04x '%s',%p,%p,0x%04x)\n", - This, dwDevType, _dump_DIDEVTYPE_value(dwDevType, This->dwVersion), - lpCallback, pvRef, dwFlags); - _dump_EnumDevices_dwFlags(dwFlags); + TRACE( "iface %p, type %#x, callback %p, context %p, flags %#x\n", iface, type, callback, context, flags ); - if (!lpCallback || - dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) || - (dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL) + if (!callback) return DIERR_INVALIDPARAM; + + if ((type > DI8DEVCLASS_GAMECTRL && type < DI8DEVTYPE_DEVICE) || type > DI8DEVTYPE_SUPPLEMENTAL) + return DIERR_INVALIDPARAM; + if (flags & ~(DIEDFL_ATTACHEDONLY|DIEDFL_FORCEFEEDBACK|DIEDFL_INCLUDEALIASES|DIEDFL_INCLUDEPHANTOMS|DIEDFL_INCLUDEHIDDEN)) return DIERR_INVALIDPARAM; - if (!This->initialized) + if (!impl->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) + { if (!dinput_devices[i]->enum_device) continue; - for (j = 0, r = S_OK; SUCCEEDED(r); j++) { - devInstance.dwSize = sizeof(devInstance); + for (j = 0, hr = S_OK; SUCCEEDED(hr); j++) + { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - r = dinput_devices[i]->enum_device(dwDevType, dwFlags, &devInstance, This->dwVersion, j); - if (r == S_OK) - if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP) - return S_OK; + hr = dinput_devices[i]->enum_device( type, flags, &instance, impl->dwVersion, j ); + if (hr != S_OK) continue; + if (enum_callback_wrapper( callback, &instance, context ) == DIENUM_STOP) return S_OK; } } -- 2.33.0

1 5

[PATCH v2] wmc: Remove struct and enum typedefs.
by Huw Davies 26 Oct '21

26 Oct '21

This has the side effect of fixing the build on macOS after commit 2c1b8153630. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/wmc/lang.c | 8 ++-- tools/wmc/lang.h | 6 +-- tools/wmc/mcl.c | 16 +++---- tools/wmc/mcy.y | 103 +++++++++++++++++++++---------------------- tools/wmc/po.c | 14 +++--- tools/wmc/wmc.h | 10 ++--- tools/wmc/wmctypes.h | 52 +++++++++++----------- tools/wmc/write.c | 24 +++++----- 8 files changed, 116 insertions(+), 117 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index b5ab3be7225..7dd80d840e6 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -31,7 +31,7 @@ * * MUST be sorting ascending on language ID */ -static const language_t languages[] = { +static const struct language languages[] = { {0x0000, 437, "Neutral", NULL}, {0x0002, 866, "Bulgarian", NULL}, @@ -177,11 +177,11 @@ void show_languages(void) static int langcmp(const void *p1, const void *p2) { - return *(const unsigned *)p1 - ((const language_t *)p2)->id; + return *(const unsigned *)p1 - ((const struct language *)p2)->id; } -const language_t *find_language(unsigned id) +const struct language *find_language(unsigned id) { - return (const language_t *)bsearch(&id, languages, ARRAY_SIZE(languages), + return (const struct language *)bsearch(&id, languages, ARRAY_SIZE(languages), sizeof(languages[0]), langcmp); } diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h index 365aacdd766..f8798f142eb 100644 --- a/tools/wmc/lang.h +++ b/tools/wmc/lang.h @@ -23,14 +23,14 @@ #include "winnls.h" -typedef struct language { +struct language { unsigned id; unsigned doscp; const char *name; const char *country; -} language_t; +}; void show_languages(void); -const language_t *find_language(unsigned id); +const struct language *find_language(unsigned id); #endif diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index c0ca4eeba5c..0d7b50027c5 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -486,21 +486,21 @@ static void newline(void) static int unisort(const void *p1, const void *p2) { - return unistricmp(((const token_t *)p1)->name, ((const token_t *)p2)->name); + return unistricmp(((const struct token *)p1)->name, ((const struct token *)p2)->name); } -static token_t *tokentable = NULL; +static struct token *tokentable = NULL; static int ntokentable = 0; -token_t *lookup_token(const WCHAR *s) +struct token *lookup_token(const WCHAR *s) { - token_t tok; + struct token tok; tok.name = s; - return (token_t *)bsearch(&tok, tokentable, ntokentable, sizeof(*tokentable), unisort); + return (struct token *)bsearch(&tok, tokentable, ntokentable, sizeof(*tokentable), unisort); } -void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix) +void add_token(enum tok_enum type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix) { ntokentable++; tokentable = xrealloc(tokentable, ntokentable * sizeof(*tokentable)); @@ -513,7 +513,7 @@ void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alia qsort(tokentable, ntokentable, sizeof(*tokentable), unisort); } -void get_tokentable(token_t **tab, int *len) +void get_tokentable(struct token **tab, int *len) { assert(tab != NULL); assert(len != NULL); @@ -624,7 +624,7 @@ int mcy_lex(void) if(char_table[ch] & CH_IDENT) { - token_t *tok; + struct token *tok; while(isisochar(ch) && (char_table[ch] & (CH_IDENT|CH_NUMBER))) { push_unichar(ch); diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 879c46ffc77..79d3679afdf 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -62,9 +62,9 @@ int want_nl = 0; /* Request next newlinw */ int want_line = 0; /* Request next complete line */ int want_file = 0; /* Request next ident as filename */ -node_t *nodehead = NULL; /* The list of all parsed elements */ -static node_t *nodetail = NULL; -lan_blk_t *lanblockhead; /* List of parsed elements transposed */ +struct node *nodehead = NULL; /* The list of all parsed elements */ +static struct node *nodetail; +struct lan_blk *lanblockhead; /* List of parsed elements transposed */ static int base = 16; /* Current printout base to use (8, 10 or 16) */ static WCHAR *cast = NULL; /* Current typecast to use */ @@ -77,31 +77,31 @@ static int have_sev; /* Set if severity parsed for current message */ static int have_fac; /* Set if facility parsed for current message */ static int have_sym; /* Set is symbol parsed for current message */ -static cp_xlat_t *cpxlattab = NULL; /* Codepage translation table */ +static struct cp_xlat *cpxlattab = NULL; /* Codepage translation table */ static int ncpxlattab = 0; /* Prototypes */ static WCHAR *merge(WCHAR *s1, WCHAR *s2); -static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg); -static msg_t *add_lanmsg(msg_t *msg, lanmsg_t *lanmsg); -static msg_t *complete_msg(msg_t *msg, int id); -static void add_node(node_e type, void *p); -static void do_add_token(tok_e type, token_t *tok, const char *code); +static struct lanmsg *new_lanmsg(struct lan_cp *lcp, WCHAR *msg); +static struct msg *add_lanmsg(struct msg *msg, struct lanmsg *lanmsg); +static struct msg *complete_msg(struct msg *msg, int id); +static void add_node(enum node_type type, void *p); +static void do_add_token(enum tok_enum type, struct token *tok, const char *code); static void test_id(int id); -static int check_languages(node_t *head); -static lan_blk_t *block_messages(node_t *head); +static int check_languages(struct node *head); +static struct lan_blk *block_messages(struct node *head); static void add_cpxlat(int lan, int cpin, int cpout); -static cp_xlat_t *find_cpxlat(int lan); +static struct cp_xlat *find_cpxlat(int lan); %} %union { WCHAR *str; unsigned num; - token_t *tok; - lanmsg_t *lmp; - msg_t *msg; - lan_cp_t lcp; + struct token *tok; + struct lanmsg *lmp; + struct msg *msg; + struct lan_cp lcp; } @@ -306,7 +306,7 @@ sym : tSYMNAME '=' tIDENT { last_sym = $3; } ; sev : tSEVERITY '=' token { - token_t *tok = lookup_token($3->name); + struct token *tok = lookup_token($3->name); if(!tok) xyyerror("Undefined severityname\n"); if(tok->type != tok_severity) @@ -318,7 +318,7 @@ sev : tSEVERITY '=' token { ; fac : tFACILITY '=' token { - token_t *tok = lookup_token($3->name); + struct token *tok = lookup_token($3->name); if(!tok) xyyerror("Undefined facilityname\n"); if(tok->type != tok_facility) @@ -346,8 +346,8 @@ body : lang setline lines tMSGEND { $$ = new_lanmsg(&$1, $3); } * message to be parsed. */ lang : tLANGUAGE setnl '=' token tNL { - token_t *tok = lookup_token($4->name); - cp_xlat_t *cpx; + struct token *tok = lookup_token($4->name); + struct cp_xlat *cpx; if(!tok) xyyerror("Undefined language\n"); if(tok->type != tok_language) @@ -358,7 +358,7 @@ lang : tLANGUAGE setnl '=' token tNL { } else if(!tok->codepage) { - const language_t *lan = find_language(tok->token); + const struct language *lan = find_language(tok->token); if(!lan) { /* Just set default; warning was given while parsing languagenames */ @@ -388,7 +388,7 @@ lines : tLINE { $$ = $1; } /*---------------------------------------------------------------------- * Helper rules */ -token : tIDENT { $$ = xmalloc(sizeof(token_t)); memset($$,0,sizeof(*$$)); $$->name = $1; } +token : tIDENT { $$ = xmalloc(sizeof(struct token)); memset($$,0,sizeof(*$$)); $$->name = $1; } | tTOKEN { $$ = $1; } ; @@ -413,9 +413,9 @@ static WCHAR *merge(WCHAR *s1, WCHAR *s2) return s1; } -static void do_add_token(tok_e type, token_t *tok, const char *code) +static void do_add_token(enum tok_enum type, struct token *tok, const char *code) { - token_t *tp = lookup_token(tok->name); + struct token *tp = lookup_token(tok->name); if(tp) { if(tok->type != type) @@ -434,9 +434,9 @@ static void do_add_token(tok_e type, token_t *tok, const char *code) } } -static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg) +static struct lanmsg *new_lanmsg(struct lan_cp *lcp, WCHAR *msg) { - lanmsg_t *lmp = xmalloc(sizeof(lanmsg_t)); + struct lanmsg *lmp = xmalloc(sizeof(*lmp)); lmp->lan = lcp->language; lmp->cp = lcp->codepage; lmp->msg = msg; @@ -448,12 +448,12 @@ static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg) return lmp; } -static msg_t *add_lanmsg(msg_t *msg, lanmsg_t *lanmsg) +static struct msg *add_lanmsg(struct msg *msg, struct lanmsg *lanmsg) { int i; if(!msg) { - msg = xmalloc(sizeof(msg_t)); + msg = xmalloc(sizeof(*msg)); memset( msg, 0, sizeof(*msg) ); } msg->msgs = xrealloc(msg->msgs, (msg->nmsgs+1) * sizeof(*(msg->msgs))); @@ -469,10 +469,10 @@ static msg_t *add_lanmsg(msg_t *msg, lanmsg_t *lanmsg) static int sort_lanmsg(const void *p1, const void *p2) { - return (*(const lanmsg_t * const *)p1)->lan - (*(const lanmsg_t * const*)p2)->lan; + return (*(const struct lanmsg * const *)p1)->lan - (*(const struct lanmsg * const*)p2)->lan; } -static msg_t *complete_msg(msg_t *mp, int id) +static struct msg *complete_msg(struct msg *mp, int id) { assert(mp != NULL); mp->id = id; @@ -491,9 +491,9 @@ static msg_t *complete_msg(msg_t *mp, int id) return mp; } -static void add_node(node_e type, void *p) +static void add_node(enum node_type type, void *p) { - node_t *ndp = xmalloc(sizeof(node_t)); + struct node *ndp = xmalloc(sizeof(*ndp)); memset( ndp, 0, sizeof(*ndp) ); ndp->type = type; ndp->u.all = p; @@ -512,7 +512,7 @@ static void add_node(node_e type, void *p) static void test_id(int id) { - node_t *ndp; + struct node *ndp; for(ndp = nodehead; ndp; ndp = ndp->next) { if(ndp->type != nd_msg) @@ -522,12 +522,12 @@ static void test_id(int id) } } -static int check_languages(node_t *head) +static int check_languages(struct node *head) { static const char err_missing[] = "Missing definition for language 0x%x; MessageID %d, facility 0x%x, severity 0x%x\n"; - node_t *ndp; + struct node *ndp; int nm = 0; - msg_t *msg = NULL; + struct msg *msg = NULL; for(ndp = head; ndp; ndp = ndp->next) { @@ -540,8 +540,8 @@ static int check_languages(node_t *head) else { int i; - msg_t *m1; - msg_t *m2; + struct msg *m1; + struct msg *m2; if(ndp->u.msg->nmsgs > msg->nmsgs) { m1 = ndp->u.msg; @@ -568,11 +568,10 @@ static int check_languages(node_t *head) return nm; } -#define MSGRID(x) ((*(const msg_t * const*)(x))->realid) +#define MSGRID(x) ((*(const struct msg * const*)(x))->realid) static int sort_msg(const void *p1, const void *p2) { return MSGRID(p1) > MSGRID(p2) ? 1 : (MSGRID(p1) == MSGRID(p2) ? 0 : -1); - /* return (*(msg_t **)p1)->realid - (*(msg_t **)p1)->realid; */ } /* @@ -580,13 +579,13 @@ static int sort_msg(const void *p1, const void *p2) * from ID/language based list to a language/ID * based list. */ -static lan_blk_t *block_messages(node_t *head) +static struct lan_blk *block_messages(struct node *head) { - lan_blk_t *lbp; - lan_blk_t *lblktail = NULL; - lan_blk_t *lblkhead = NULL; - msg_t **msgtab = NULL; - node_t *ndp; + struct lan_blk *lbp; + struct lan_blk *lblktail = NULL; + struct lan_blk *lblkhead = NULL; + struct msg **msgtab = NULL; + struct node *ndp; int nmsg = 0; int i; int nl; @@ -605,7 +604,7 @@ static lan_blk_t *block_messages(node_t *head) for(nl = 0; nl < msgtab[0]->nmsgs; nl++) /* This should be equal for all after check_languages() */ { - lbp = xmalloc(sizeof(lan_blk_t)); + lbp = xmalloc(sizeof(*lbp)); memset( lbp, 0, sizeof(*lbp) ); if(!lblktail) { @@ -630,7 +629,7 @@ static lan_blk_t *block_messages(node_t *head) for(i = 1; i < nmsg; i++) { - block_t *blk = &(lbp->blks[lbp->nblk-1]); + struct block *blk = &(lbp->blks[lbp->nblk-1]); if(msgtab[i]->realid == blk->idhi+1) { blk->size += ((factor * msgtab[i]->msgs[nl]->len + 3) & ~3) + 4; @@ -658,7 +657,7 @@ static lan_blk_t *block_messages(node_t *head) static int sc_xlat(const void *p1, const void *p2) { - return ((const cp_xlat_t *)p1)->lan - ((const cp_xlat_t *)p2)->lan; + return ((const struct cp_xlat *)p1)->lan - ((const struct cp_xlat *)p2)->lan; } static void add_cpxlat(int lan, int cpin, int cpout) @@ -671,12 +670,12 @@ static void add_cpxlat(int lan, int cpin, int cpout) qsort(cpxlattab, ncpxlattab, sizeof(*cpxlattab), sc_xlat); } -static cp_xlat_t *find_cpxlat(int lan) +static struct cp_xlat *find_cpxlat(int lan) { - cp_xlat_t t; + struct cp_xlat t; if(!cpxlattab) return NULL; t.lan = lan; - return (cp_xlat_t *)bsearch(&t, cpxlattab, ncpxlattab, sizeof(*cpxlattab), sc_xlat); + return (struct cp_xlat *)bsearch(&t, cpxlattab, ncpxlattab, sizeof(*cpxlattab), sc_xlat); } diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 28bcea91f59..87ebc072df1 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -46,7 +46,7 @@ struct mo_file /* ... rest of file data here */ }; -static lan_blk_t *new_top, *new_tail; +static struct lan_blk *new_top, *new_tail; static const struct { @@ -365,7 +365,7 @@ static BOOL is_english( int lan ) return lan == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); } -static char *convert_msgid_ascii( const lanmsg_t *msg, int error_on_invalid_char ) +static char *convert_msgid_ascii( const struct lanmsg *msg, int error_on_invalid_char ) { int i; char *buffer = xmalloc( msg->len * 4 + 1 ); @@ -632,9 +632,9 @@ static const char *get_msgstr( const char *msgid, const char *context, int *foun return ret; } -static lanmsg_t *translate_string( lanmsg_t *str, int lang, int *found ) +static struct lanmsg *translate_string( struct lanmsg *str, int lang, int *found ) { - lanmsg_t *new; + struct lanmsg *new; const char *transl; char *buffer, *msgid, *context; @@ -654,7 +654,7 @@ static lanmsg_t *translate_string( lanmsg_t *str, int lang, int *found ) return new; } -static void translate_block( block_t *blk, block_t *new, int lang, int *found ) +static void translate_block( struct block *blk, struct block *new, int lang, int *found ) { int i; @@ -673,7 +673,7 @@ static void translate_block( block_t *blk, block_t *new, int lang, int *found ) static void translate_messages( int lang ) { int i, found; - lan_blk_t *lbp, *new; + struct lan_blk *lbp, *new; for (lbp = lanblockhead; lbp; lbp = lbp->next) { @@ -705,7 +705,7 @@ static void translate_messages( int lang ) void add_translations( const char *po_dir ) { - lan_blk_t *lbp; + struct lan_blk *lbp; char buffer[256]; char *p, *tok, *name; unsigned int i; diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index 913c2a9443e..e9736103fe3 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -60,15 +60,15 @@ extern int mcy_debug; extern int want_nl; extern int want_line; extern int want_file; -extern node_t *nodehead; -extern lan_blk_t *lanblockhead; +extern struct node *nodehead; +extern struct lan_blk *lanblockhead; int mcy_lex(void); extern FILE *yyin; void set_codepage(int cp); -void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix); -token_t *lookup_token(const WCHAR *s); -void get_tokentable(token_t **tab, int *len); +void add_token(enum tok_enum type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix); +struct token *lookup_token(const WCHAR *s); +void get_tokentable(struct token **tab, int *len); #endif diff --git a/tools/wmc/wmctypes.h b/tools/wmc/wmctypes.h index 6c9a97c5e68..116ace20545 100644 --- a/tools/wmc/wmctypes.h +++ b/tools/wmc/wmctypes.h @@ -40,86 +40,86 @@ /* * Tokenizer types */ -typedef enum tok_enum { +enum tok_enum { tok_null = 0, tok_keyword, tok_severity, tok_facility, tok_language -} tok_e; +}; -typedef struct token { - tok_e type; +struct token { + enum tok_enum type; const WCHAR *name; /* Parsed name of token */ int token; /* Tokenvalue or language code */ int codepage; const WCHAR *alias; /* Alias or filename */ int fixed; /* Cleared if token may change */ -} token_t; +}; -typedef struct lan_cp { +struct lan_cp { int language; int codepage; -} lan_cp_t; +}; -typedef struct cp_xlat { +struct cp_xlat { int lan; int cpin; int cpout; -} cp_xlat_t; +}; -typedef struct lanmsg { +struct lanmsg { int lan; /* Language code of message */ int cp; /* Codepage of message */ WCHAR *msg; /* Message text */ int len; /* Message length including trailing '\0' */ const char *file; /* File location for definition */ int line; -} lanmsg_t; +}; -typedef struct msg { +struct msg { int id; /* Message ID */ unsigned realid; /* Combined message ID */ WCHAR *sym; /* Symbolic name */ int sev; /* Severity code */ int fac; /* Facility code */ - lanmsg_t **msgs; /* Array message texts */ + struct lanmsg **msgs; /* Array message texts */ int nmsgs; /* Number of message texts in array */ int base; /* Base of number to print */ WCHAR *cast; /* Typecase to use */ -} msg_t; +}; -typedef enum { +enum node_type { nd_msg, nd_comment -} node_e; +}; -typedef struct node { +struct node { struct node *next; struct node *prev; - node_e type; + enum node_type type; union { void *all; WCHAR *comment; - msg_t *msg; + struct msg *msg; } u; -} node_t; +}; -typedef struct block { +struct block { unsigned idlo; /* Lowest ID in this set */ unsigned idhi; /* Highest ID in this set */ int size; /* Size of this set */ - lanmsg_t **msgs; /* Array of messages in this set */ + struct lanmsg **msgs; /* Array of messages in this set */ int nmsg; /* Number of array entries */ -} block_t; +}; -typedef struct lan_blk { +struct lan_blk { struct lan_blk *next; /* Linkage for languages */ struct lan_blk *prev; int lan; /* The language of this block */ int version; /* The resource version for auto-translated resources */ - block_t *blks; /* Array of blocks for this language */ + struct block *blks; /* Array of blocks for this language */ int nblk; /* Nr of blocks in array */ -} lan_blk_t; +}; #endif diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 69ebf24b6b9..353a503f674 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -150,11 +150,11 @@ static int killcomment(char *s) void write_h_file(const char *fname) { - node_t *ndp; + struct node *ndp; char *cptr; char *cast; FILE *fp; - token_t *ttab; + struct token *ttab; int ntab; int i; int once = 0; @@ -278,8 +278,8 @@ void write_h_file(const char *fname) static void write_rcbin(FILE *fp) { - lan_blk_t *lbp; - token_t *ttab; + struct lan_blk *lbp; + struct token *ttab; int ntab; int i; @@ -370,7 +370,7 @@ static char *make_string(WCHAR *uc, int len) static void write_rcinline(FILE *fp) { - lan_blk_t *lbp; + struct lan_blk *lbp; int i; int j; @@ -391,7 +391,7 @@ static void write_rcinline(FILE *fp) } for(i = 0; i < lbp->nblk; i++) { - block_t *blk = &lbp->blks[i]; + struct block *blk = &lbp->blks[i]; for(j = 0; j < blk->nmsg; j++) { char *cptr; @@ -426,7 +426,7 @@ void write_rc_file(const char *fname) fclose(fp); } -static void output_bin_data( lan_blk_t *lbp ) +static void output_bin_data( struct lan_blk *lbp ) { unsigned int offs = 4 * (lbp->nblk * 3 + 1); int i, j, k; @@ -441,7 +441,7 @@ static void output_bin_data( lan_blk_t *lbp ) } for (i = 0; i < lbp->nblk; i++) { - block_t *blk = &lbp->blks[i]; + struct block *blk = &lbp->blks[i]; for (j = 0; j < blk->nmsg; j++) { int len = (2 * blk->msgs[j]->len + 3) & ~3; @@ -455,8 +455,8 @@ static void output_bin_data( lan_blk_t *lbp ) void write_bin_files(void) { - lan_blk_t *lbp; - token_t *ttab; + struct lan_blk *lbp; + struct token *ttab; int ntab; int i; @@ -487,7 +487,7 @@ void write_bin_files(void) void write_res_file( const char *name ) { - lan_blk_t *lbp; + struct lan_blk *lbp; int i, j; init_output_buffer(); @@ -511,7 +511,7 @@ void write_res_file( const char *name ) for (i = 0; i < lbp->nblk; i++) { - block_t *blk = &lbp->blks[i]; + struct block *blk = &lbp->blks[i]; for (j = 0; j < blk->nmsg; j++) data_size += 4 + ((blk->msgs[j]->len * 2 + 3) & ~3); } -- 2.23.0

1 0

[PATCH] dinput8/tests: Relax test results for 3 buttons mouse.
by Rémi Bernon 26 Oct '21

26 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51913 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 4492170673e..3cad4ce256c 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -1278,7 +1278,7 @@ static void test_mouse_info(void) todo_wine check_member( caps, expect_caps, "%#x", dwDevType ); check_member( caps, expect_caps, "%d", dwAxes ); - check_member( caps, expect_caps, "%d", dwButtons ); + ok( caps.dwButtons == 3 || caps.dwButtons == 5, "got dwButtons %d, expected 3 or 5\n", caps.dwButtons ); check_member( caps, expect_caps, "%d", dwPOVs ); check_member( caps, expect_caps, "%d", dwFFSamplePeriod ); check_member( caps, expect_caps, "%d", dwFFMinTimeResolution ); @@ -1384,7 +1384,8 @@ static void test_mouse_info(void) res = 0; hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); - ok( res == 8, "got %u expected %u\n", res, 8 ); + ok( res == 3 + caps.dwButtons, "got %u expected %u\n", res, 3 + caps.dwButtons ); + check_objects_params.expect_count = 3 + caps.dwButtons; hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", -- 2.33.0

1 0

[PATCH] wmc: Remove the token_t typedef.
by Huw Davies 26 Oct '21

26 Oct '21

This conflicts with a system typedef on macOS brought in by including sys/sysctl.h in commit 2c1b8153630. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/wmc/mcl.c | 14 +++++++------- tools/wmc/mcy.y | 16 ++++++++-------- tools/wmc/wmc.h | 4 ++-- tools/wmc/wmctypes.h | 4 ++-- tools/wmc/write.c | 6 +++--- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index c0ca4eeba5c..c524871d267 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -486,18 +486,18 @@ static void newline(void) static int unisort(const void *p1, const void *p2) { - return unistricmp(((const token_t *)p1)->name, ((const token_t *)p2)->name); + return unistricmp(((const struct token *)p1)->name, ((const struct token *)p2)->name); } -static token_t *tokentable = NULL; +static struct token *tokentable = NULL; static int ntokentable = 0; -token_t *lookup_token(const WCHAR *s) +struct token *lookup_token(const WCHAR *s) { - token_t tok; + struct token tok; tok.name = s; - return (token_t *)bsearch(&tok, tokentable, ntokentable, sizeof(*tokentable), unisort); + return (struct token *)bsearch(&tok, tokentable, ntokentable, sizeof(*tokentable), unisort); } void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix) @@ -513,7 +513,7 @@ void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alia qsort(tokentable, ntokentable, sizeof(*tokentable), unisort); } -void get_tokentable(token_t **tab, int *len) +void get_tokentable(struct token **tab, int *len) { assert(tab != NULL); assert(len != NULL); @@ -624,7 +624,7 @@ int mcy_lex(void) if(char_table[ch] & CH_IDENT) { - token_t *tok; + struct token *tok; while(isisochar(ch) && (char_table[ch] & (CH_IDENT|CH_NUMBER))) { push_unichar(ch); diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 879c46ffc77..2c68438c2c1 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -86,7 +86,7 @@ static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg); static msg_t *add_lanmsg(msg_t *msg, lanmsg_t *lanmsg); static msg_t *complete_msg(msg_t *msg, int id); static void add_node(node_e type, void *p); -static void do_add_token(tok_e type, token_t *tok, const char *code); +static void do_add_token(tok_e type, struct token *tok, const char *code); static void test_id(int id); static int check_languages(node_t *head); static lan_blk_t *block_messages(node_t *head); @@ -98,7 +98,7 @@ static cp_xlat_t *find_cpxlat(int lan); %union { WCHAR *str; unsigned num; - token_t *tok; + struct token *tok; lanmsg_t *lmp; msg_t *msg; lan_cp_t lcp; @@ -306,7 +306,7 @@ sym : tSYMNAME '=' tIDENT { last_sym = $3; } ; sev : tSEVERITY '=' token { - token_t *tok = lookup_token($3->name); + struct token *tok = lookup_token($3->name); if(!tok) xyyerror("Undefined severityname\n"); if(tok->type != tok_severity) @@ -318,7 +318,7 @@ sev : tSEVERITY '=' token { ; fac : tFACILITY '=' token { - token_t *tok = lookup_token($3->name); + struct token *tok = lookup_token($3->name); if(!tok) xyyerror("Undefined facilityname\n"); if(tok->type != tok_facility) @@ -346,7 +346,7 @@ body : lang setline lines tMSGEND { $$ = new_lanmsg(&$1, $3); } * message to be parsed. */ lang : tLANGUAGE setnl '=' token tNL { - token_t *tok = lookup_token($4->name); + struct token *tok = lookup_token($4->name); cp_xlat_t *cpx; if(!tok) xyyerror("Undefined language\n"); @@ -388,7 +388,7 @@ lines : tLINE { $$ = $1; } /*---------------------------------------------------------------------- * Helper rules */ -token : tIDENT { $$ = xmalloc(sizeof(token_t)); memset($$,0,sizeof(*$$)); $$->name = $1; } +token : tIDENT { $$ = xmalloc(sizeof(struct token)); memset($$,0,sizeof(*$$)); $$->name = $1; } | tTOKEN { $$ = $1; } ; @@ -413,9 +413,9 @@ static WCHAR *merge(WCHAR *s1, WCHAR *s2) return s1; } -static void do_add_token(tok_e type, token_t *tok, const char *code) +static void do_add_token(tok_e type, struct token *tok, const char *code) { - token_t *tp = lookup_token(tok->name); + struct token *tp = lookup_token(tok->name); if(tp) { if(tok->type != type) diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index 913c2a9443e..891348ad92d 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -68,7 +68,7 @@ extern FILE *yyin; void set_codepage(int cp); void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix); -token_t *lookup_token(const WCHAR *s); -void get_tokentable(token_t **tab, int *len); +struct token *lookup_token(const WCHAR *s); +void get_tokentable(struct token **tab, int *len); #endif diff --git a/tools/wmc/wmctypes.h b/tools/wmc/wmctypes.h index 6c9a97c5e68..b0ae24f6029 100644 --- a/tools/wmc/wmctypes.h +++ b/tools/wmc/wmctypes.h @@ -48,14 +48,14 @@ typedef enum tok_enum { tok_language } tok_e; -typedef struct token { +struct token { tok_e type; const WCHAR *name; /* Parsed name of token */ int token; /* Tokenvalue or language code */ int codepage; const WCHAR *alias; /* Alias or filename */ int fixed; /* Cleared if token may change */ -} token_t; +}; typedef struct lan_cp { int language; diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 69ebf24b6b9..469c55722cb 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -154,7 +154,7 @@ void write_h_file(const char *fname) char *cptr; char *cast; FILE *fp; - token_t *ttab; + struct token *ttab; int ntab; int i; int once = 0; @@ -279,7 +279,7 @@ void write_h_file(const char *fname) static void write_rcbin(FILE *fp) { lan_blk_t *lbp; - token_t *ttab; + struct token *ttab; int ntab; int i; @@ -456,7 +456,7 @@ static void output_bin_data( lan_blk_t *lbp ) void write_bin_files(void) { lan_blk_t *lbp; - token_t *ttab; + struct token *ttab; int ntab; int i; -- 2.23.0

1 1

[PATCH] include: Add async_uuid for IBackgroundCopyCallback in bits.idl
by Biswapriyo Nath 26 Oct '21

26 Oct '21

2 1

[PATCH] include: Add BackgroundCopyManager1_5 library in bits1_5.idl
by Biswapriyo Nath 26 Oct '21

26 Oct '21

1 0

[PATCH] dwrite: Implement IDWriteCollection1::GetFontSet.
by Daniel Lehman 26 Oct '21

26 Oct '21

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- the factory refcount is incremented by both: - create_fontset_builder - IDWriteFontSetBuilder2_CreateFontSet there is no leak as the factory is released at end it's just the intermediate counts that mismatch with windows --- dlls/dwrite/font.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 35 ++++++++++++++++++++++++++++------- 2 files changed, 63 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b7071314bb2..a6394ec58bb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3117,9 +3117,42 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec static HRESULT WINAPI dwritefontcollection1_GetFontSet(IDWriteFontCollection3 *iface, IDWriteFontSet **fontset) { - FIXME("%p, %p.\n", iface, fontset); + struct dwrite_fontcollection *collection = impl_from_IDWriteFontCollection3(iface); + IDWriteFontSetBuilder2 *builder; + IDWriteFontFaceReference *ref; + IDWriteFontFamily2 *family; + UINT32 i, nfamilies; + UINT32 j, nfonts; + HRESULT hr; - return E_NOTIMPL; + *fontset = NULL; + if (FAILED(hr = create_fontset_builder(collection->factory, &builder))) + return hr; + + nfamilies = IDWriteFontCollection3_GetFontFamilyCount(iface); + for (i = 0; i < nfamilies; i++) + { + if (FAILED(hr = IDWriteFontCollection3_GetFontFamily(iface, i, &family))) + break; + + nfonts = IDWriteFontFamily2_GetFontCount(family); + for (j = 0; j < nfonts; j++) + { + if (FAILED(hr = IDWriteFontFamily2_GetFontFaceReference(family, j, &ref))) + break; + if (IDWriteFontFaceReference_GetSimulations(ref) == DWRITE_FONT_SIMULATIONS_NONE) + hr = IDWriteFontSetBuilder2_AddFontFaceReference(builder, ref); + IDWriteFontFaceReference_Release(ref); + if (FAILED(hr)) + break; + } + IDWriteFontFamily2_Release(family); + } + + if (SUCCEEDED(hr)) + hr = IDWriteFontSetBuilder2_CreateFontSet(builder, fontset); + IDWriteFontSetBuilder2_Release(builder); + return hr; } static HRESULT WINAPI dwritefontcollection1_GetFontFamily(IDWriteFontCollection3 *iface, UINT32 index, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ba4a2793372..8adb91108d5 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2460,15 +2460,20 @@ static void test_system_fontcollection(void) IDWriteFontCollection2 *collection2; IDWriteFontCollection3 *collection3; IDWriteFactory *factory, *factory2; + IDWriteFontFaceReference *fontref; IDWriteFontFileLoader *loader; IDWriteFontFamily *family; IDWriteFontFace *fontface; IDWriteFactory6 *factory6; IDWriteFontFile *file; IDWriteFont *font; + UINT32 nfamilies; + UINT32 nfonts; + UINT32 count2; + UINT32 count; + UINT32 i, j; HRESULT hr; ULONG ref; - UINT32 i; BOOL ret; factory = create_factory(); @@ -2597,11 +2602,8 @@ static void test_system_fontcollection(void) EXPECT_REF(collection1, 2); EXPECT_REF(factory, 2); hr = IDWriteFontCollection1_GetFontSet(collection1, &fontset); - todo_wine ok(hr == S_OK, "Failed to get fontset, hr %#x.\n", hr); - if (hr == S_OK) { EXPECT_REF(collection1, 2); - EXPECT_REF(factory, 2); EXPECT_REF(fontset, 1); hr = IDWriteFontCollection1_GetFontSet(collection1, &fontset2); @@ -2613,18 +2615,37 @@ static void test_system_fontcollection(void) hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory3, (void **)&factory3); ok(hr == S_OK, "Failed to get IDWriteFactory3 interface, hr %#x.\n", hr); - EXPECT_REF(factory, 3); hr = IDWriteFactory3_GetSystemFontSet(factory3, &fontset2); ok(hr == S_OK, "Failed to get system font set, hr %#x.\n", hr); ok(fontset != fontset2, "Expected new fontset instance.\n"); EXPECT_REF(fontset2, 1); - EXPECT_REF(factory, 4); + + count = IDWriteFontSet_GetFontCount(fontset); + count2 = 0; + nfamilies = IDWriteFontCollection1_GetFontFamilyCount(collection1); + for (i = 0; i < nfamilies; i++) + { + hr = IDWriteFontCollection1_GetFontFamily(collection1, i, &family1); + ok(hr == S_OK, "Failed to get font family, hr %#x.\n", hr); + + nfonts = IDWriteFontFamily1_GetFontCount(family1); + for (j = 0; j < nfonts; j++) + { + hr = IDWriteFontFamily1_GetFontFaceReference(family1, j, &fontref); + ok(hr == S_OK, "Failed to get font reference, hr %#x.\n", hr); + + if (!IDWriteFontFaceReference_GetSimulations(fontref)) + count2++; + IDWriteFontFaceReference_Release(fontref); + } + IDWriteFontFamily1_Release(family1); + } + ok(count == count2, "Expected %#x, got %#x\n", count, count2); IDWriteFontSet_Release(fontset2); IDWriteFontSet_Release(fontset); IDWriteFactory3_Release(factory3); - } IDWriteFontCollection1_Release(collection1); } else -- 2.25.1

2 2

[PATCH v2 1/4] wmvcore/tests: Add tests for synchronous reader media types.
by Zebediah Figura 25 Oct '21

25 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wmvcore/tests/wmvcore.c | 265 +++++++++++++++++++++++++++++++++++ 1 file changed, 265 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index dd1e3027d57..df55c2d3198 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -24,11 +24,20 @@ #include "initguid.h" #include "wmsdk.h" #include "wmsecure.h" +#include "amvideo.h" +#include "uuids.h" +#include "wmcodecdsp.h" #include "wine/test.h" HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer); +static BOOL compare_media_types(const WM_MEDIA_TYPE *a, const WM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(WM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -616,6 +625,261 @@ static void test_sync_reader_streaming(void) ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); } +static void check_video_type(const WM_MEDIA_TYPE *mt) +{ + const VIDEOINFOHEADER *video_info = (const VIDEOINFOHEADER *)mt->pbFormat; + static const RECT rect = {.right = 64, .bottom = 48}; + + ok(IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo), "Got format %s.\n", debugstr_guid(&mt->formattype)); + todo_wine ok(mt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", mt->bFixedSizeSamples); + todo_wine ok(!mt->bTemporalCompression, "Got temporal compression %d.\n", mt->bTemporalCompression); + ok(!mt->pUnk, "Got pUnk %p.\n", mt->pUnk); + + todo_wine ok(EqualRect(&video_info->rcSource, &rect), "Got source rect %s.\n", wine_dbgstr_rect(&rect)); + todo_wine ok(EqualRect(&video_info->rcTarget, &rect), "Got target rect %s.\n", wine_dbgstr_rect(&rect)); + ok(!video_info->dwBitRate, "Got bit rate %u.\n", video_info->dwBitRate); + ok(!video_info->dwBitErrorRate, "Got bit error rate %u.\n", video_info->dwBitErrorRate); + ok(video_info->bmiHeader.biSize == sizeof(video_info->bmiHeader), + "Got size %u.\n", video_info->bmiHeader.biSize); + ok(video_info->bmiHeader.biWidth == 64, "Got width %d.\n", video_info->bmiHeader.biWidth); + ok(video_info->bmiHeader.biHeight == 48, "Got height %d.\n", video_info->bmiHeader.biHeight); + ok(video_info->bmiHeader.biPlanes == 1, "Got planes %d.\n", video_info->bmiHeader.biPlanes); +} + +static void check_audio_type(const WM_MEDIA_TYPE *mt) +{ + const WAVEFORMATEX *wave_format = (const WAVEFORMATEX *)mt->pbFormat; + + ok(IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", debugstr_guid(&mt->subtype)); + ok(IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx), "Got format %s.\n", debugstr_guid(&mt->formattype)); + ok(mt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", mt->bFixedSizeSamples); + ok(!mt->bTemporalCompression, "Got temporal compression %d.\n", mt->bTemporalCompression); + ok(!mt->pUnk, "Got pUnk %p.\n", mt->pUnk); + + ok(wave_format->wFormatTag == WAVE_FORMAT_PCM, "Got tag %#x.\n", wave_format->wFormatTag); +} + +static void test_sync_reader_types(void) +{ + char mt_buffer[2000], mt2_buffer[2000]; + const WCHAR *filename = load_resource(L"test.wmv"); + IWMOutputMediaProps *output_props, *output_props2; + WM_MEDIA_TYPE *mt2 = (WM_MEDIA_TYPE *)mt2_buffer; + WM_MEDIA_TYPE *mt = (WM_MEDIA_TYPE *)mt_buffer; + bool got_video = false, got_audio = false; + DWORD size, ret_size, output_number; + WORD stream_number, stream_number2; + struct teststream stream = {0}; + IWMStreamConfig *config; + ULONG count, ref, i, j; + IWMSyncReader *reader; + IWMProfile *profile; + GUID majortype; + HANDLE file; + HRESULT hr; + BOOL ret; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + + stream.IStream_iface.lpVtbl = &stream_vtbl; + stream.refcount = 1; + stream.file = file; + + hr = WMCreateSyncReader(NULL, 0, &reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + + hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + + for (i = 0; i < 2; ++i) + { + winetest_push_context("Stream %u", i); + + hr = IWMProfile_GetStream(profile, i, &config); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) + { + winetest_pop_context(); + continue; + } + + stream_number = 0xdead; + hr = IWMStreamConfig_GetStreamNumber(config, &stream_number); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream_number == i + 1, "Got stream number %u.\n", stream_number); + + hr = IWMStreamConfig_GetStreamType(config, &majortype); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (!i) + todo_wine ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + else + todo_wine ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype)); + + ref = IWMStreamConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + output_number = 0xdeadbeef; + hr = IWMSyncReader_GetOutputNumberForStream(reader, stream_number, &output_number); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(output_number == 1 - i, "Got output number %u.\n", output_number); + + stream_number2 = 0xdead; + hr = IWMSyncReader_GetStreamNumberForOutput(reader, output_number, &stream_number2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream_number2 == stream_number, "Expected stream number %u, got %u.\n", stream_number, stream_number2); + + hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret_size = sizeof(mt_buffer); + hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) + { + got_audio = true; + check_audio_type(mt); + } + else + { + ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + got_video = true; + check_video_type(mt); + } + + count = 0; + hr = IWMSyncReader_GetOutputFormatCount(reader, output_number, &count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(count > 0, "Got count %u.\n", count); + + for (j = 0; j < count; ++j) + { + winetest_push_context("Format %u", j); + + hr = IWMSyncReader_GetOutputFormat(reader, output_number, j, &output_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetOutputFormat(reader, output_number, j, &output_props2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(output_props2 != output_props, "Expected different objects.\n"); + ref = IWMOutputMediaProps_Release(output_props2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + size = 0xdeadbeef; + hr = IWMOutputMediaProps_GetMediaType(output_props, NULL, &size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %u.\n", size); + + ret_size = size - 1; + hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); + ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr); + ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + + ret_size = sizeof(mt_buffer); + memset(mt_buffer, 0xcc, sizeof(mt_buffer)); + hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %u, got %u.\n", + sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); + + ok(IsEqualGUID(&mt->majortype, &majortype), "Got major type %s.\n", debugstr_guid(&mt->majortype)); + + if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio)) + check_audio_type(mt); + else + check_video_type(mt); + + hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) + { + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); + winetest_pop_context(); + continue; + } + hr = IWMSyncReader_SetOutputProps(reader, 1 - output_number, output_props); + if (!i) + todo_wine ok(hr == ASF_E_BADMEDIATYPE, "Got hr %#x.\n", hr); + else + ok(hr == NS_E_INCOMPATIBLE_FORMAT + || hr == NS_E_INVALID_OUTPUT_FORMAT /* win10 */, "Got hr %#x.\n", hr); + hr = IWMSyncReader_SetOutputProps(reader, 2, output_props); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(output_props2 != output_props, "Expected different objects.\n"); + + ret_size = sizeof(mt2_buffer); + hr = IWMOutputMediaProps_GetMediaType(output_props2, mt2, &ret_size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); + + ref = IWMOutputMediaProps_Release(output_props2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + winetest_pop_context(); + } + + hr = IWMSyncReader_GetOutputFormat(reader, output_number, count, &output_props); + todo_wine ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(output_props2 != output_props, "Expected different objects.\n"); + + ref = IWMOutputMediaProps_Release(output_props2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + + winetest_pop_context(); + } + + todo_wine ok(got_audio, "No audio stream was enumerated.\n"); + todo_wine ok(got_video, "No video stream was enumerated.\n"); + + count = 0xdeadbeef; + hr = IWMSyncReader_GetOutputFormatCount(reader, 2, &count); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(count == 0xdeadbeef, "Got count %#x.\n", count); + + output_props = (void *)0xdeadbeef; + hr = IWMSyncReader_GetOutputProps(reader, 2, &output_props); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); + + output_props = (void *)0xdeadbeef; + hr = IWMSyncReader_GetOutputFormat(reader, 2, 0, &output_props); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); + + IWMProfile_Release(profile); + ref = IWMSyncReader_Release(reader); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + CloseHandle(stream.file); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); +} + START_TEST(wmvcore) { HRESULT hr; @@ -633,6 +897,7 @@ START_TEST(wmvcore) test_urlextension(); test_iscontentprotected(); test_sync_reader_streaming(); + test_sync_reader_types(); CoUninitialize(); } -- 2.33.0

1 3

[PATCH v4 1/2] kernel32: add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH
by Nick Fox 25 Oct '21

25 Oct '21

Add tests for various paths and undefined behavior with regards to LdrGetDllPath with LOAD_ALTERED_SEARCH_PATH and relative module names. Signed-off-by: Nick Fox <nick(a)foxsec.net> --- v4: add another test case and fix todo_wine usage --- dlls/kernel32/tests/path.c | 101 +++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f49af6d5bfe..b2a6d5acbda 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2654,6 +2654,107 @@ static void test_LdrGetDllPath(void) ok( !lstrcmpW( path, L"\\\\?\\c:" ), "got %s expected \\\\?\\c:\n", wine_dbgstr_w(path)); pRtlReleasePath( path ); + lstrcpyW( buffer, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + todo_wine + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, L"temp" ); + p = buffer + lstrlenW( buffer ); + *p++ = '/'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + todo_wine + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, L".\\foo\\foooo" ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + lstrcpyW( buffer, L".\\foo" ); + p = buffer + lstrlenW( buffer ); + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer) - 2; /* remove "32" */ + *p++ = ';'; + GetWindowsDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + *p++ = '.'; + *p++ = ';'; + GetEnvironmentVariableW( pathW, p, buffer + ARRAY_SIZE(buffer) - p ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, L"temp" ); + p = buffer + lstrlenW( buffer ); + *p++ = '\\'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + lstrcpyW( buffer, L"temp" ); + p = buffer + lstrlenW( buffer ); + *p++ = '\\'; + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer) - 2; /* remove "32" */ + *p++ = ';'; + GetWindowsDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + *p++ = '.'; + *p++ = ';'; + GetEnvironmentVariableW( pathW, p, buffer + ARRAY_SIZE(buffer) - p ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, L"c:\\temp" ); + p = buffer + lstrlenW(buffer); + *p++ = '\\'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + lstrcpyW( buffer, L"c:\\temp" ); + p = buffer + lstrlenW( buffer ); + *p++ = '\\'; + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer) - 2; /* remove "32" */ + *p++ = ';'; + GetWindowsDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + *p++ = '.'; + *p++ = ';'; + GetEnvironmentVariableW( pathW, p, buffer + ARRAY_SIZE(buffer) - p ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( ret == STATUS_INVALID_PARAMETER, "got %x expected %x\n", ret, STATUS_INVALID_PARAMETER ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + pRtlReleasePath( path ); + lstrcpyW( buffer, dlldir ); p = buffer + lstrlenW(buffer); *p++ = '\\'; -- 2.33.0

4 4

[PATCH 0/2] Introduce FIXME_ONCE macro
by David Kahurani 25 Oct '21

25 Oct '21

The following patches introduce the FIXME_ONCE macro which suppresses repeated FIXMEs into WARNings. The current FIXME macro tends to be insufficient in cases where a developer wishes to suppresses fixmes other than the first. The first patch is the implementation while the second demonstrates how this could be useful. It is based on the vkd3d version. v2: Fix programming mistakes, fixed a test and some formating v3: Fixed a programming error(s), dropped all patches except two David Kahurani (2): include/wine: suppress subsequent FIXMEs into WARNINGs dlls/ntdll: Use FIXME_ONCE dlls/ntdll/unix/system.c | 8 +++----- include/wine/debug.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) -- 2.33.0

2 3

[PATCH 00/11] Inline sites, scopes
by Eric Pouech 25 Oct '21

25 Oct '21

The following series implements: - the first internal bits for inline sites - stack walking with inline sites - (local) scope management (replacement of SymSetContext) - some fixes for line number information This serie doesn't yet provide functional improvement for inline site (as no debug format readers - aka dwarf, pdb... handle inline site properly generate inline site information). A+ --- Eric Pouech (11): dbghelp: introduce symt_inlinesite (SymTagInlineSite) to support inline sites dbghelp: introduce a couple of helpers to manage inline contexts dbghelp: added functions to add a range to an inline site dbghelp: implement StackWalkEx inline features dbghelp: implement SymFromInlineContext dbghelp: add local scope information in struct process dbghelp: implement the SymSetScope* functions dbghelp: renamed line_info pc_offset into address dbghelp: let symt_add_func_line() last parameter be an absolute address dbghelp: in SymGetLine* family, compute displacement relative to line_info's address dbghelp: added first implementations for SymGetLineFromInlineContext(W) dlls/dbghelp/coff.c | 7 +- dlls/dbghelp/dbghelp.c | 71 +++++-- dlls/dbghelp/dbghelp_private.h | 108 +++++++++- dlls/dbghelp/dwarf.c | 6 +- dlls/dbghelp/module.c | 10 +- dlls/dbghelp/msc.c | 9 +- dlls/dbghelp/stabs.c | 4 +- dlls/dbghelp/stack.c | 34 +++- dlls/dbghelp/symbol.c | 360 ++++++++++++++++++++++++++------- dlls/dbghelp/type.c | 16 ++ 10 files changed, 504 insertions(+), 121 deletions(-)

2 29

[PATCH v2 1/3] ntdll: Return sufficient info size at once from NtQuerySystemInformation(SystemProcessInformation).
by Paul Gofman 25 Oct '21

25 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 43 ++++++++++++++++++++++++++++------------ dlls/ntdll/unix/system.c | 17 ++++++++++++---- server/process.c | 4 ++++ server/protocol.def | 2 ++ 4 files changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6e71f0848ec..635c551383c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -470,25 +470,30 @@ static void test_query_process(void) SYSTEM_THREAD_INFORMATION ti[1]; } SYSTEM_PROCESS_INFORMATION_PRIVATE; - ULONG SystemInformationLength = sizeof(SYSTEM_PROCESS_INFORMATION_PRIVATE); - SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); + SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf; + BOOL current_process_found = FALSE; /* test ReturnLength */ ReturnLength = 0; status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08x\n", status); - ok( ReturnLength > 0, "got 0 length\n"); + ok( ReturnLength > 0, "got 0 length\n" ); - /* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */ - for (;;) + /* W2K3 and later returns the needed length, the rest returns 0. */ + if (!ReturnLength) { - status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, SystemInformationLength, &ReturnLength); - - if (status != STATUS_INFO_LENGTH_MISMATCH) break; - - spi_buf = HeapReAlloc(GetProcessHeap(), 0, spi_buf , SystemInformationLength *= 2); + win_skip( "Zero return length, skipping tests." ); + return; } - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + spi_buf = HeapAlloc(GetProcessHeap(), 0, ReturnLength); + status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, ReturnLength, &ReturnLength); + + /* Sometimes new process or threads appear between the call and increase the size, + * otherwise the previously returned buffer size should be sufficient. */ + ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH, + "Expected STATUS_SUCCESS, got %08x\n", status ); + spi = spi_buf; for (;;) @@ -496,9 +501,16 @@ static void test_query_process(void) DWORD_PTR tid; DWORD j; + winetest_push_context( "i %u (%s)", i, debugstr_w(spi->ProcessName.Buffer) ); + i++; last_pid = (DWORD_PTR)spi->UniqueProcessId; + ok( !(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId ); + + if (last_pid == GetCurrentProcessId()) + current_process_found = TRUE; + ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); for (j = 0; j < spi->dwThreadCount; j++) { @@ -511,12 +523,17 @@ static void test_query_process(void) ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); } - if (!spi->NextEntryOffset) break; - + if (!spi->NextEntryOffset) + { + winetest_pop_context(); + break; + } one_before_last_pid = last_pid; spi = (SYSTEM_PROCESS_INFORMATION_PRIVATE*)((char*)spi + spi->NextEntryOffset); + winetest_pop_context(); } + ok( current_process_found, "Test process not found.\n" ); if (winetest_debug > 1) trace("%u processes, %u threads\n", i, k); if (one_before_last_pid == 0) one_before_last_pid = last_pid; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c6bbabd85c5..33e7083d18b 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2446,10 +2446,13 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemProcessInformation: /* 5 */ { - unsigned int process_count, i, j; + unsigned int process_count, total_thread_count, total_name_len, i, j; char *buffer = NULL; unsigned int pos = 0; +C_ASSERT( sizeof(struct thread_info) <= sizeof(SYSTEM_THREAD_INFORMATION) ); +C_ASSERT( sizeof(struct process_info) <= sizeof(SYSTEM_PROCESS_INFORMATION) ); + if (size && !(buffer = malloc( size ))) { ret = STATUS_NO_MEMORY; @@ -2460,19 +2463,25 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { wine_server_set_reply( req, buffer, size ); ret = wine_server_call( req ); - len = reply->info_size; + total_thread_count = reply->total_thread_count; + total_name_len = reply->total_name_len; process_count = reply->process_count; } SERVER_END_REQ; + len = 0; + if (ret) { + if (ret == STATUS_INFO_LENGTH_MISMATCH) + len = sizeof(SYSTEM_PROCESS_INFORMATION) * process_count + + (total_name_len + process_count) * sizeof(WCHAR) + + total_thread_count * sizeof(SYSTEM_THREAD_INFORMATION); + free( buffer ); break; } - len = 0; - for (i = 0; i < process_count; i++) { SYSTEM_PROCESS_INFORMATION *nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)info + len); diff --git a/server/process.c b/server/process.c index d8d09698558..b6ad4e47bd4 100644 --- a/server/process.c +++ b/server/process.c @@ -1868,6 +1868,8 @@ DECL_HANDLER(list_processes) char *buffer; reply->process_count = 0; + reply->total_thread_count = 0; + reply->total_name_len = 0; reply->info_size = 0; LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) @@ -1877,6 +1879,8 @@ DECL_HANDLER(list_processes) reply->info_size = (reply->info_size + 7) & ~7; reply->info_size += process->running_threads * sizeof(struct thread_info); reply->process_count++; + reply->total_thread_count += process->running_threads; + reply->total_name_len += process->imagelen; } if (reply->info_size > get_reply_max_size()) diff --git a/server/protocol.def b/server/protocol.def index 0f58dc7c85a..7d27fa382d2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1624,6 +1624,8 @@ struct process_info @REPLY data_size_t info_size; int process_count; + int total_thread_count; + data_size_t total_name_len; VARARG(data,process_info,info_size); @END -- 2.31.1

2 3

[PATCH 1/3] ntdll: Return sufficient info size at once from NtQuerySystemInformation(SystemProcessInformation).
by Paul Gofman 25 Oct '21

25 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 43 ++++++++++++++++++++++++++++------------ dlls/ntdll/unix/system.c | 17 ++++++++++++---- server/process.c | 4 ++++ server/protocol.def | 2 ++ 4 files changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6e71f0848ec..635c551383c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -470,25 +470,30 @@ static void test_query_process(void) SYSTEM_THREAD_INFORMATION ti[1]; } SYSTEM_PROCESS_INFORMATION_PRIVATE; - ULONG SystemInformationLength = sizeof(SYSTEM_PROCESS_INFORMATION_PRIVATE); - SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); + SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf; + BOOL current_process_found = FALSE; /* test ReturnLength */ ReturnLength = 0; status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08x\n", status); - ok( ReturnLength > 0, "got 0 length\n"); + ok( ReturnLength > 0, "got 0 length\n" ); - /* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */ - for (;;) + /* W2K3 and later returns the needed length, the rest returns 0. */ + if (!ReturnLength) { - status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, SystemInformationLength, &ReturnLength); - - if (status != STATUS_INFO_LENGTH_MISMATCH) break; - - spi_buf = HeapReAlloc(GetProcessHeap(), 0, spi_buf , SystemInformationLength *= 2); + win_skip( "Zero return length, skipping tests." ); + return; } - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + spi_buf = HeapAlloc(GetProcessHeap(), 0, ReturnLength); + status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, ReturnLength, &ReturnLength); + + /* Sometimes new process or threads appear between the call and increase the size, + * otherwise the previously returned buffer size should be sufficient. */ + ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH, + "Expected STATUS_SUCCESS, got %08x\n", status ); + spi = spi_buf; for (;;) @@ -496,9 +501,16 @@ static void test_query_process(void) DWORD_PTR tid; DWORD j; + winetest_push_context( "i %u (%s)", i, debugstr_w(spi->ProcessName.Buffer) ); + i++; last_pid = (DWORD_PTR)spi->UniqueProcessId; + ok( !(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId ); + + if (last_pid == GetCurrentProcessId()) + current_process_found = TRUE; + ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); for (j = 0; j < spi->dwThreadCount; j++) { @@ -511,12 +523,17 @@ static void test_query_process(void) ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); } - if (!spi->NextEntryOffset) break; - + if (!spi->NextEntryOffset) + { + winetest_pop_context(); + break; + } one_before_last_pid = last_pid; spi = (SYSTEM_PROCESS_INFORMATION_PRIVATE*)((char*)spi + spi->NextEntryOffset); + winetest_pop_context(); } + ok( current_process_found, "Test process not found.\n" ); if (winetest_debug > 1) trace("%u processes, %u threads\n", i, k); if (one_before_last_pid == 0) one_before_last_pid = last_pid; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c6bbabd85c5..33e7083d18b 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2446,10 +2446,13 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemProcessInformation: /* 5 */ { - unsigned int process_count, i, j; + unsigned int process_count, total_thread_count, total_name_len, i, j; char *buffer = NULL; unsigned int pos = 0; +C_ASSERT( sizeof(struct thread_info) <= sizeof(SYSTEM_THREAD_INFORMATION) ); +C_ASSERT( sizeof(struct process_info) <= sizeof(SYSTEM_PROCESS_INFORMATION) ); + if (size && !(buffer = malloc( size ))) { ret = STATUS_NO_MEMORY; @@ -2460,19 +2463,25 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { wine_server_set_reply( req, buffer, size ); ret = wine_server_call( req ); - len = reply->info_size; + total_thread_count = reply->total_thread_count; + total_name_len = reply->total_name_len; process_count = reply->process_count; } SERVER_END_REQ; + len = 0; + if (ret) { + if (ret == STATUS_INFO_LENGTH_MISMATCH) + len = sizeof(SYSTEM_PROCESS_INFORMATION) * process_count + + (total_name_len + process_count) * sizeof(WCHAR) + + total_thread_count * sizeof(SYSTEM_THREAD_INFORMATION); + free( buffer ); break; } - len = 0; - for (i = 0; i < process_count; i++) { SYSTEM_PROCESS_INFORMATION *nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)info + len); diff --git a/server/process.c b/server/process.c index d8d09698558..b6ad4e47bd4 100644 --- a/server/process.c +++ b/server/process.c @@ -1868,6 +1868,8 @@ DECL_HANDLER(list_processes) char *buffer; reply->process_count = 0; + reply->total_thread_count = 0; + reply->total_name_len = 0; reply->info_size = 0; LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) @@ -1877,6 +1879,8 @@ DECL_HANDLER(list_processes) reply->info_size = (reply->info_size + 7) & ~7; reply->info_size += process->running_threads * sizeof(struct thread_info); reply->process_count++; + reply->total_thread_count += process->running_threads; + reply->total_name_len += process->imagelen; } if (reply->info_size > get_reply_max_size()) diff --git a/server/protocol.def b/server/protocol.def index 0f58dc7c85a..7d27fa382d2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1624,6 +1624,8 @@ struct process_info @REPLY data_size_t info_size; int process_count; + int total_thread_count; + data_size_t total_name_len; VARARG(data,process_info,info_size); @END -- 2.31.1

2 3

[PATCH 1/2] msvcrt: Write memory forward in memset.
by Rémi Bernon 25 Oct '21

25 Oct '21

Instead of going backward, which breaks the Linux kernel transparent huge pages allocation assumptions. This can be reproduced by calling memset on large, newly allocated, memory regions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/msvcrt/string.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5655fbfe68a..48d44d3b72e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2857,13 +2857,14 @@ void * __cdecl memcpy(void *dst, const void *src, size_t n) static inline void memset_aligned_32(unsigned char *d, uint64_t v, size_t n) { - while (n >= 32) - { - *(uint64_t *)(d + n - 32) = v; - *(uint64_t *)(d + n - 24) = v; - *(uint64_t *)(d + n - 16) = v; - *(uint64_t *)(d + n - 8) = v; - n -= 32; + unsigned char *end = d + n; + while (d < end) + { + *(uint64_t *)(d + 0) = v; + *(uint64_t *)(d + 8) = v; + *(uint64_t *)(d + 16) = v; + *(uint64_t *)(d + 24) = v; + d += 32; } } -- 2.33.0

2 2

[PATCH 2/2] msvcrt: Rewrite _popen function.
by Piotr Caban 25 Oct '21

25 Oct '21

Old implementation was not thread safe, incorrectly copied file descriptors to child process and was leaking parent pipe fd to child process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51719 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/process.c | 217 ++++++++++++++++++++++----------------- dlls/msvcrt/tests/misc.c | 50 +++++++-- 2 files changed, 166 insertions(+), 101 deletions(-)

1 0

[PATCH 1/2] msvcrt: Fix clearaing NOINHERIT flag in _dup2.
by Piotr Caban 25 Oct '21

25 Oct '21

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

1 0

[PATCH 1/5] wmvcore/tests: Add some basic tests for streaming with the synchronous reader.
by Zebediah Figura 25 Oct '21

25 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wmvcore/tests/Makefile.in | 3 + dlls/wmvcore/tests/rsrc.rc | 25 +++ dlls/wmvcore/tests/test.wmv | Bin 0 -> 45663 bytes dlls/wmvcore/tests/wmvcore.c | 392 +++++++++++++++++++++++++++++++++ 4 files changed, 420 insertions(+) create mode 100644 dlls/wmvcore/tests/rsrc.rc create mode 100644 dlls/wmvcore/tests/test.wmv diff --git a/dlls/wmvcore/tests/Makefile.in b/dlls/wmvcore/tests/Makefile.in index 8054ddd0a2e..856e02d45d5 100644 --- a/dlls/wmvcore/tests/Makefile.in +++ b/dlls/wmvcore/tests/Makefile.in @@ -3,3 +3,6 @@ IMPORTS = ole32 wmvcore C_SRCS = \ wmvcore.c + +RC_SRCS = \ + rsrc.rc diff --git a/dlls/wmvcore/tests/rsrc.rc b/dlls/wmvcore/tests/rsrc.rc new file mode 100644 index 00000000000..cd642ceb1d0 --- /dev/null +++ b/dlls/wmvcore/tests/rsrc.rc @@ -0,0 +1,25 @@ +/* + * Resource file for wmvcore tests + * + * Copyright 2021 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=700" -t 2.0 -f asf -vcodec wmv1 -vf scale=64x48 -acodec wmav1 test.wmv */ +/* @makedep: test.wmv */ +test.wmv RCDATA "test.wmv" diff --git a/dlls/wmvcore/tests/test.wmv b/dlls/wmvcore/tests/test.wmv new file mode 100644 index 0000000000000000000000000000000000000000..fa953771cd31213ec24bef9000127125047e0623 GIT binary patch literal 45663 zcmeI5dsq|47Qkn+KuCBb#DJ(M0TB=sL9IrL5KuHwMMUwzqsF&b@C7O=)lEPJA4pY1 zxr$LiQBlzg1<`8a3yZfx@lm9xDHgHTT55fu7P&LKB<Ab=`dz)f{iDeauq0<EyL(Q~ zFEeN6WY*jD#Ny0Z)i(QYfkR;0)%YtcKov8zg{(adhc}EoSZ$N}Jy2PS#?72V@BEML zloK5y(*MSt<GY}B$5Z8C8v;Mn_=q9??_i0y0N|65=rR72KvPgkoSou@&vTDH&rYfq z05-MP4p(6LeOhh?=Ak_gue4q~7QIxOHv7<q;jczjVHqy?s1S4o1TaC50zo2J0A_;e zAPGc(sc0Jq=7UL89kltcH79q}l;qdcvhUT}<g@_gmme2~&%iH61p;?45sU`?Krp(h z>FC%q&>7}|*<c(xYZ7%n{49~G?EprhYghtife(Nfc!9xS5Zd|xZ}bDeXY7WuGCe)z z)N24x{oLjB=;&&j!Ztuoi5cz*CcYL$>Ob$OH=yG`Wn>^h&+t)M?&uPcfjgc;U=Jpa zp5Oyqkl=Ua_ZJY~v0suG*Q$R3;a{CUyJ>2*&H59_T}m27+QZnP2j=JxzXbruAOypU z(A(<|Kr@R^y&Vw1W>zx`U7;l6>owhdYHar9BZCss=lCtbCGdB0`t39YOF;rMoDWsU zgwlWo%qS@~C@p89a}N5QEB8M}z2rYOTIYmNfjlhsHD$C3APrv|(xMri7yD^5YezT$ z#DS_Go+Z8V{j|IP(cKfr>`Sj}98|vXXwTVCJYU*13S)v&)2}xQ7sS4>IXrZ3byQ32 z?x8b_Z^VCab7#Bwe8zn1UZ=~qeIvLP6Fkvo<?{BtFEpY|(1T^JAvB_Gz@Nn-p+>Y9 zNw^{;If^6}07*_Gi6uai8YHojA;|+I;h{QCW=LYAgc_&*NMeg63y`EMmeeANi;~bd zry+?SI*yAgk`&7b&Ct2PpSYtTG<}3<mzac_o=?#(ClXbjfFzyq%l9LR0H6a7M-ppP z2b~LDh6r6oJ(6%`9T&zybwv5V-)fvHPz3z$eQ@Dpi!WkE`hJ@7th{IS_Y>2OTx+UU zRLf=mXm@+#Rjo+cs2;5LX+8DwmFmTqThRlWjtoeh{p-!jid743E(}gfY*M>gW#)W7 zwDzj=?6YZ~q?%-(S43S(DxKbZHn)2I;21Ht+`IeqH<24(zC3&7tC{}u-Bpvrh&EZj zyUnkDJG*MvsV8MkgC6a@yY<@>nE`h@|G4SJ#aH**eu>`p(~lFHPA$K2a^9WN3uTu| zFSKub(do_LhB2*o`vyd(l(Z#0x%RBW?qKwux!LI7s$mbO)V#`h>R-^tqn_+}GKKn$ z3+5CEUAKnkjt%;QhvvQC^T&lH`GenS|F<$#6ZURJPWyeV2>_wU?_*6&Q#Sa1e`#5z zC@x&QP_r<x(8_~t?Pu+^Wa)=eOTqZg&$If3a&GS67d@#z{MjeN*18H^Q^D#q<voo$ ze3*0ig4gi;E_P>MGibpHtW+zMYh)dw4;{UNqa?x~rFL$nZTYrc#>Tm-k3Y(Jo@KuL z+R2DoQ>(xkB?|fBMRoh!z0G6ALq3Ol>crA)c4K&=<hwkR;<v&OqA=8Yj>7;|j^hzg zmm~Qwv_u}bE<vPxc3{Msp<60yVQIaj(+a7b)7(Y1Tu%LBj$D+!)4{yIrO>2RI!hHN z7V~G=yK`DLSFV?uT@Fjg=XO8oDfO@~st-{{)I!gO?0k!^Yoev@orjmaoVQrgVTv>C zm8Pq<uAcH`wq2`jp7k%%`c6a~5Gc<|>Lp{{-DK|jX3pMr@p9>&^IN!bGU#0R!WLPf z({=}c)q>{0i&vFq)~C2<GLtNJv^dR{c`kN%aO?8CUimN#zg*m}r9{5ZqpwSy_lmHL zxQ2t@{Uj1yw;SG?WO`uHmFc0~YzeUXTIxS!UAw2IW%;Hl@5|5oabz-nMRIx5>Kv9k zyinIYFnNe_K{X4hkc%vRSSqyNU(4l1CC%|JA^T3qGHDnNLcS^$%lWXI)ZA^Mw{Vn# z2vMt2MQX{Iw5?`aQsriW3NlwPf9(|0C57DE`NVX$fuSYjurim)6S7=<CYNlH976Vq z*)}N4a&8x7@mRsNrgG3DZgyJw)UOwKu9I&jWrqn68%XwEtx=gABhn>J<lgSEMP^?~ zzFMOeeldALinW+8AG40Qe<mvWhV7UkSIcYsZV{ka9%RYw2UM~`<u=P)^U4zwI_-%2 zHpk8Msc@{NBA{?z>#BwqzVepJ)v<|NXVxrQx9P)#%YDlD-+a_1ac5;;Xa3r*DH4~l zc?-PF9ATxh(Sc2n`-yX6v($7x|D{rMh{*UzRnyHJK4)uwn_5cbZA&iOHSS+M*|{+{ zSX)$kN!b^rvIE;IcF*2wP2AWT`D!?CkenPL)AX?9_F?x(HD!|z`p<Dc6jxzeYPY?9 zzs0?nb!(#c#eRD>EutVa*Zt_p?}8I|xb>HW%PfC+l$&;cY{IyOqP<n>A$t<a5AohK zM=XB)(*eHiRS%B0lq<C7PY!f0_mw0mlO6c#i2@hFM{+gaDyU{~WKd0Tyj768@>cMj zJ1yxFdyr@CZ))#n1~;ZEijugp$ka?&C9kUOA0>9oTxmUM{zLJ;f)ra;AQ^Q2UVQ4X zI%|O&-+zwlf%aj&1l%Iwq?zTrH_bb`^`Pzb<V9H^@>2YY*P|z&^c<HH(;As=azEPZ zv9r6P$UVaGaRl48-C=w~#mMWu#W8ctL~Lho_j6$L5Vomzpdif$6gw0-NCdUK^GzR& zOydvycILYAg%|xE<^_2#D=4;y&fQZLX||fQ{4O5u%E$*ELB-1oEW*YJT9xrXczdoP zS-4rJTUq>R)6Cj~T3Pna%be(=Ja`YaF+(ST0k`8!$d-5e^kQl;7Wg|@0MdSsJIRZX z-<yNrPb)Vp@o6V94ooph3n&2K#14x=y61v)78NN|;Yae@55`});iWPDM1zX0T3QS$ zCeO>_B>x@Uow-KF0`F!4Nc%nB<|4l*KyW}i3&kQGorD8=ECdP4Cfy-^Q4y-7EZ`ga zjOir2n~9lPe-jHp+V3$7=X5NX>R7lzu~3MIrShFDRuWf99$6<MUWLGSjrIQ~c3>`( zu>hJDz-<6#;h~NNJS{;7k0w?)c%)e{%RUBwmJq5q0NRuSCU9h&$G|KAX}`xT2$0`X zeI!i6pDa}T(a#Qz{}zG_78@Upia+}6vE{t_EPMgjs+k(t=5k(TV1{MXF?tI?+V3%2 zzFM|ec$kJ}VX7VrW;u6=-vFDuD1on89~-^p7y}rZ1t9JBn1yLt79fXW0n65DWh`2T zr^+``d>o`>5@9P(f~Jb^lDr4onPDnJ^A1KI$knlMLdOCv!z`T9W5F!fk6j9QaJq_k zZgQG29b*9lvjDWvu~4sN0ZZPap!mZk7O-ki0OF7Gujm6}kRIuQ<jGB8R{}>kQNn&Y z%Fn=z$f(0u0HV>Yj)5)~%1xvvKxi3ep(~O#v*-?%g)o^{gp%^IN%kXV9*}VzgR_7f zeefd|a4w<;@_Qy1k;z45auJza#J?yP5r5V&#ds}%;tx)&M_<&*I*8^!=%xpExkB{1 zT%IPayvt}zD+MrPS_aqMU=#`qqra?Yjz@kYkl(*eOvS-S$0W#7Js@xl(tu)+X-o{l zxQ`)P0P-lm#}gjQk>6ACIOOYOd$lqaT@N=H`}O$nBs2l#pq1kc0uHVv4bec1PDX73 zXrp7HO2-1t2WH{A9t##Wng9(*HZKQ`<v9!sM(s8RsXP?uSa_mk0ZZPkC~*AI4?|Oi z;tv`t{ER>?OEaq&&8eGl?hs#s0P`~pJqGDNj8b8+6NZJ#^X-cKo}T`ovBE6)=&|qy zvEVhhg-P&b+{Q310EIdhf^;m<d|(!)=&^v?g~8IwS_THgbOoc=3fk&en5$!f<^!{k zNwLr|E#65JP=msZM<9R+GmPGG4A1}&udhY-kv3~tfSq-+3at!F-lHh!{3|6I>Iy^o zS2S=KuG4yOc|uLVb~K(f9yl`NSqA7^Mz0dI$H-6tNTU`c77ZL`;YU3dEKq_wUS(}Q z;62J<65Ng6bqvk`@-7q$IRA=^hIE<yD<=Pn$-iRqubBL+_vlqKRo~SDDE>hCS8XW# zIEm&z=y(Qqxw@dHN1O8QX_CyVK>1f0fc?Op>2eudkHhE{f?cUD7tX)xkNjRQ|B8-F zFc4BbAaD$lhhmVuOblZ5zGILEfZZq{aQ;;k@_Twhkd8|*3rqA^@Z|cj&!F!H#*)NS zOXj<Q2I&q)trT?7v7pegKsOkeg#tYm;J{Yi1k^5EBbl)&qxKm?RUUTNv2aMs0_>ra z)oNu}@@_>zt-o7_2D^5n^>^uJ2V-?j5363h)9h^2#4JWlj0Lm&m7zM9@#+N~F)Y;d z$15#DEV|jjEZ}Tk?K+FBoHxWXz$Pz~#A_*&k!ZX=W2l-#k&Xpt<o9&wK{q>?1#dkT zTvs21ze?Du*$Y6Mh*=lWP(8wU^@2`17D9C_(A_P}!pC|nK+l!LO_ELC0H|Fs)flhM z7|jjS0?=8<!XhmTSn?-}0_R^nf(y|~*RfzVi|&YFxHeL7QFliAl@(EX|1|prTI#(? z1JpeqGJqMTj~T62uqVcd3P5tTaIr*`46|@bkA+Zv*`zl_GfAkHh(JZ`JW|Tc2pX;5 z7^33PMaRN9EerBqlnm!&Jw!4lCyU9+Vsf&WoGd0M3x6y!<xf}u#UGql|EnncP@?${ zI^M@!F5Jv$Z_KLd9ffYp`UAS>x8HU!;MUyDkm+(6V$Z{9b%L&#AZq<90s7jxUjCIc zwF3iTk9KH*$S{wtUIlL}p~jyN5^pD%yD*6-M(aF=s5o?^{2u3D`69okCqd{K9kVb} zj|J7hGu89q*DAE+RTA)&$Mt4zL}-W}VZ1s)cO47UbS%&@I%Z)p#R7d3LO7@$7NeUG zF3*DZq&#4}He)n5Obfu?Iu_PxS-_J2y(p;luhycQ8y-X7|DcDtFjo8CVwI7$_qJvr z`u;g@JFpnf+}qPIUCWrYf*u$kYWm}Z7AqDVlVBEV^;jt0eV6<fiPmF~fg`m9lZ<H0 zZex(TLr)zG^*R>la0Ige&{A0R_X16iPrI$@SBRR0fq<9w5rcw3x`R<G1^eh&U?IP! z!f@DEC-czCSagVj`RJ#|$B4TcF9}HI%>w<HroyNl$v~BdUOE;cv@BrBdlUsqZ;uT` z_kT_RYglx2gE5NLVMJtX?t6#z72uICMKGATji-USk}<0V`(a?H@MF0aBNiQ!U=}v$ zu~58fC94#$$=6C^v^TTvs4;tuVd@UObu8@Fu|S6;n1u>G7B&Zb%-V(8g*FuoW=5q9 z(;bXjE4dHF0?s<DLViDvFiqLu`~9V5m7=(C@j}hQ#6l|%wzZ$N*OH|lN-YKBJ3r6r z6Uw={gJ1Nd{_tm?3|s3ebWH`T)0Fo#>hNLC;R{~F^Sjucea)Z+C$LhjP_B`6h(2`m z3XYNpf0Wv}nYQKIb{QMzsy_ZG=XsX-@@pp}YE7*IXOt-9hZoiDbN4on6%Y9w?x_<? zv)PT|iIVT~Op4zMLx{pq>p2bsR5^}EL|u;L!_X3W;JO5n^4WnAYld#AsD-8Vl1?k6 zc208_)p9xYi#c*p`c4P){+2?MR_QENoLJ1CVeigq*<86^YIZp+A)nj*q^H!wzNkJ# z$z&ZeS%?4UtV0xk*u;)7KZ+s{caSRg8HeWFse9jI;<#{6Lir)yo92kckAFJAx4r7Y z@s@Ih_Wa3#&gH(6BxSM#Up-OaBKSzI=352T42}${368f4QdiyzzH_G~U1AUNto=>x z{mkITR7Ft|R~DI?39IB)wf&>Sj+ra12hD#d-dB)f%L*ie&fkkq9ad*8aO3;WaXrvJ zte1dWB%Cy}eD|h#N4Fldy`H=%3q)RuU-5eM<ddG`a$;H|vrX<tdp&k`R}{HNI6jVG z+qOH5Z>ac-k`h_;SO{)}A5e|3G8}z6Ro!~&yGmVJTj%O{ll`V;lsLW7i?jQi#->B6 z-vs4r)IRrHMqlOpv*5(%O$ln(6hTU_Wj|*xoaE5x=<&~aZ-OTh2fq2m(chwa(hn)m zs()>nJ3tfGt4tLn1?_Ih=Cc70@<_AB=xQ=u0$OZb(b5{-RBTnqcJQs$N+KMfnO;6< zweUmrdH|?#egINTqDbq=>8j!0Kz2*xGzTQ!Jl%PP`j9N=s%h1#&n8FPO>5usN$R=C z5s_C4+VhgyVunPIjhgQM`Ow;D8{-pSPrum`LKgQ}aVF`6=h_!9mlaf0`hT*%ch!Vq z8`b<L>zDS3*s#a3wDj<zRkIpi&d*%Gbaib>>6mUxr-U|(ksFST4Xul^NUC}1IqzKW z0^Y7I!JL(j+=z8nu4%5H1zp%<mQ99^MgKX{y$6H1b4~J{4@!C;9G@n<Zt7$!HT?iO z*~&UaNKI5O9CB0$OV&vsadnY<b23DuLNc&q+Ne>S3?J{h?VSYErXKIJJ$}@nUR$g( zCJ6IRF)4w6O<w`_ry60rHrNy7_iuC4u$U=~1sDr37GNyESb(trV}bX#K$bZeaJ;G7 nCgUkkeo2H}nf3>VAh&I&_CT~nvC1D7oHC43x~Q!s+CuPe!fZnO literal 0 HcmV?d00001 diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 79bcfef0d52..dd1e3027d57 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1,6 +1,7 @@ /* * Copyright 2017 Alistair Leslie-Hughes * Copyright 2019 Vijay Kiran Kamuju + * Copyright 2021 Zebediah Figura for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,15 +17,43 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include <stdbool.h> #define COBJMACROS #define WIN32_LEAN_AND_MEAN #include "initguid.h" #include "wmsdk.h" +#include "wmsecure.h" #include "wine/test.h" HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer); +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(pathW), pathW); + wcscat(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %u.\n", + wine_dbgstr_w(pathW), GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok(!!res, "Failed to load resource, error %u.\n", GetLastError()); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource.\n"); + CloseHandle(file); + + return pathW; +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOOL supported) { @@ -225,6 +254,368 @@ static void test_iscontentprotected(void) ok(drm == FALSE, "got %0dx\n", drm); } +struct teststream +{ + IStream IStream_iface; + LONG refcount; + HANDLE file; +}; + +static struct teststream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, struct teststream, IStream_iface); +} + +static HRESULT WINAPI stream_QueryInterface(IStream *iface, REFIID iid, void **out) +{ + if (winetest_debug > 1) + trace("%04x: IStream::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); + + if (!IsEqualGUID(iid, &IID_IWMGetSecureChannel) && !IsEqualGUID(iid, &IID_IWMIStreamProps)) + ok(0, "Unexpected IID %s.\n", debugstr_guid(iid)); + + return E_NOINTERFACE; +} + +static ULONG WINAPI stream_AddRef(IStream *iface) +{ + struct teststream *stream = impl_from_IStream(iface); + + return InterlockedIncrement(&stream->refcount); +} + +static ULONG WINAPI stream_Release(IStream *iface) +{ + struct teststream *stream = impl_from_IStream(iface); + + return InterlockedDecrement(&stream->refcount); +} + +static HRESULT WINAPI stream_Read(IStream *iface, void *data, ULONG size, ULONG *ret_size) +{ + struct teststream *stream = impl_from_IStream(iface); + + if (winetest_debug > 2) + trace("%04x: IStream::Read(size %u)\n", GetCurrentThreadId(), size); + + ok(size > 0, "Got zero size.\n"); + ok(!!ret_size, "Got NULL ret_size pointer.\n"); + if (!ReadFile(stream->file, data, size, ret_size, NULL)) + return HRESULT_FROM_WIN32(GetLastError()); + return S_OK; +} + +static HRESULT WINAPI stream_Write(IStream *iface, const void *data, ULONG size, ULONG *ret_size) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Seek(IStream *iface, LARGE_INTEGER offset, DWORD method, ULARGE_INTEGER *ret_offset) +{ + struct teststream *stream = impl_from_IStream(iface); + LARGE_INTEGER size; + + if (winetest_debug > 2) + trace("%04x: IStream::Seek(offset %I64u, method %#x)\n", GetCurrentThreadId(), offset.QuadPart, method); + + GetFileSizeEx(stream->file, &size); + ok(offset.QuadPart < size.QuadPart, "Expected offset less than size %I64u, got %I64u.\n", + size.QuadPart, offset.QuadPart); + + ok(method == STREAM_SEEK_SET, "Got method %#x.\n", method); + ok(!ret_offset, "Got unexpected ret_offset pointer %p\n", ret_offset); + + if (!SetFilePointerEx(stream->file, offset, &offset, method)) + return HRESULT_FROM_WIN32(GetLastError()); + return S_OK; +} + +static HRESULT WINAPI stream_SetSize(IStream *iface, ULARGE_INTEGER size) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGER size, + ULARGE_INTEGER *read_size, ULARGE_INTEGER *write_size) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Commit(IStream *iface, DWORD flags) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Revert(IStream *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_LockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD type) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD type) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Stat(IStream *iface, STATSTG *stat, DWORD flags) +{ + struct teststream *stream = impl_from_IStream(iface); + LARGE_INTEGER size; + + if (winetest_debug > 1) + trace("%04x: IStream::Stat(flags %#x)\n", GetCurrentThreadId(), flags); + + ok(flags == STATFLAG_NONAME, "Got flags %#x.\n", flags); + + stat->type = 0xdeadbeef; + GetFileSizeEx(stream->file, &size); + stat->cbSize.QuadPart = size.QuadPart; + stat->grfMode = 0; + stat->grfLocksSupported = TRUE; + + return S_OK; +} + +static HRESULT WINAPI stream_Clone(IStream *iface, IStream **out) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl stream_vtbl = +{ + stream_QueryInterface, + stream_AddRef, + stream_Release, + stream_Read, + stream_Write, + stream_Seek, + stream_SetSize, + stream_CopyTo, + stream_Commit, + stream_Revert, + stream_LockRegion, + stream_UnlockRegion, + stream_Stat, + stream_Clone, +}; + +static void test_sync_reader_streaming(void) +{ + DWORD size, flags, output_number, expect_output_number; + const WCHAR *filename = load_resource(L"test.wmv"); + WORD stream_numbers[2], stream_number; + IWMStreamConfig *config, *config2; + bool eos[2] = {0}, first = true; + struct teststream stream = {0}; + ULONG i, j, count, ref; + IWMSyncReader *reader; + IWMProfile *profile; + QWORD pts, duration; + INSSBuffer *sample; + HANDLE file; + HRESULT hr; + BYTE *data; + BOOL ret; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + + stream.IStream_iface.lpVtbl = &stream_vtbl; + stream.refcount = 1; + stream.file = file; + + hr = WMCreateSyncReader(NULL, 0, &reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + + hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + + hr = IWMProfile_GetStreamCount(profile, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + count = 0xdeadbeef; + hr = IWMProfile_GetStreamCount(profile, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(count == 2, "Got count %u.\n", count); + + count = 0xdeadbeef; + hr = IWMSyncReader_GetOutputCount(reader, &count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(count == 2, "Got count %u.\n", count); + + for (i = 0; i < 2; ++i) + { + hr = IWMProfile_GetStream(profile, i, &config); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + hr = IWMProfile_GetStream(profile, i, &config2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(config2 != config, "Expected different objects.\n"); + ref = IWMStreamConfig_Release(config2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + stream_numbers[i] = 0xdead; + hr = IWMStreamConfig_GetStreamNumber(config, &stream_numbers[i]); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream_numbers[i] == i + 1, "Got stream number %u.\n", stream_numbers[i]); + + ref = IWMStreamConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + + hr = IWMSyncReader_SetReadStreamSamples(reader, stream_numbers[i], FALSE); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + } + + hr = IWMProfile_GetStream(profile, 2, &config); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + while (!eos[0] || !eos[1]) + { + for (j = 0; j < 2; ++j) + { + stream_number = pts = duration = flags = output_number = 0xdeadbeef; + hr = IWMSyncReader_GetNextSample(reader, stream_numbers[j], &sample, + &pts, &duration, &flags, &output_number, &stream_number); + if (first) + todo_wine ok(hr == S_OK, "Expected at least one valid sample; got hr %#x.\n", hr); + else if (eos[j]) + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + else + ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = INSSBuffer_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IWMSyncReader_GetOutputNumberForStream(reader, stream_number, &expect_output_number); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(output_number == expect_output_number, "Expected output number %u, got %u.\n", + expect_output_number, output_number); + } + else + { + ok(pts == 0xdeadbeef, "Got PTS %I64u.\n", pts); + ok(duration == 0xdeadbeef, "Got duration %I64u.\n", duration); + ok(flags == 0xdeadbeef, "Got flags %#x.\n", flags); + ok(output_number == 0xdeadbeef, "Got output number %u.\n", output_number); + eos[j] = true; + } + + todo_wine ok(stream_number == stream_numbers[j], "Expected stream number %u, got %u.\n", + stream_numbers[j], stream_number); + } + first = false; + } + + hr = IWMSyncReader_GetNextSample(reader, stream_numbers[0], &sample, + &pts, &duration, &flags, NULL, NULL); + todo_wine ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetNextSample(reader, stream_numbers[1], &sample, + &pts, &duration, &flags, NULL, NULL); + todo_wine ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_SetRange(reader, 0, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetNextSample(reader, stream_numbers[0], &sample, &pts, &duration, &flags, NULL, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + INSSBuffer_Release(sample); + + hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, &output_number, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + INSSBuffer_Release(sample); + + hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + INSSBuffer_Release(sample); + + for (;;) + { + stream_number = pts = duration = flags = output_number = 0xdeadbeef; + hr = IWMSyncReader_GetNextSample(reader, 0, &sample, + &pts, &duration, &flags, &output_number, &stream_number); + todo_wine ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = INSSBuffer_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + else + { + ok(pts == 0xdeadbeef, "Got PTS %I64u.\n", pts); + ok(duration == 0xdeadbeef, "Got duration %I64u.\n", duration); + ok(flags == 0xdeadbeef, "Got flags %#x.\n", flags); + ok(output_number == 0xdeadbeef, "Got output number %u.\n", output_number); + ok(stream_number == 0xbeef, "Got stream number %u.\n", stream_number); + break; + } + } + + hr = IWMSyncReader_GetNextSample(reader, 0, &sample, + &pts, &duration, &flags, NULL, &stream_number); + todo_wine ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetNextSample(reader, stream_numbers[0], &sample, + &pts, &duration, &flags, NULL, NULL); + todo_wine ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetNextSample(reader, stream_numbers[1], &sample, + &pts, &duration, &flags, NULL, NULL); + todo_wine ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_Close(reader); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_Close(reader); + todo_wine ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + + ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + + SetFilePointer(stream.file, 0, NULL, FILE_BEGIN); + hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + + IWMProfile_Release(profile); + ref = IWMSyncReader_Release(reader); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + CloseHandle(stream.file); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); +} + START_TEST(wmvcore) { HRESULT hr; @@ -241,6 +632,7 @@ START_TEST(wmvcore) test_WMCreateWriterPriv(); test_urlextension(); test_iscontentprotected(); + test_sync_reader_streaming(); CoUninitialize(); } -- 2.33.0

2 7

[PATCH] dsound: Correctly report hardware audio buffers as unsupported.
by Eduard Permyakov 25 Oct '21

25 Oct '21

Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/dsound/dsound.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 3085d86e5b5..6a94d1a6670 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -373,7 +373,7 @@ 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; @@ -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

2 1

[PATCH] faudio: Build with -DNDEBUG.
by Rémi Bernon 25 Oct '21

25 Oct '21

Unix version of FAudio uses SDL_assert for its assertions, which is generally compiled as no-op in release builds. This better matches the original behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51921 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- libs/faudio/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/faudio/Makefile.in b/libs/faudio/Makefile.in index 9058cac6543..3a9bb591227 100644 --- a/libs/faudio/Makefile.in +++ b/libs/faudio/Makefile.in @@ -1,6 +1,6 @@ EXTLIB = libfaudio.a EXTRAINCL = -I$(srcdir)/include -EXTRADEFS = -DFAUDIO_WIN32_PLATFORM -DHAVE_WMADEC +EXTRADEFS = -DFAUDIO_WIN32_PLATFORM -DHAVE_WMADEC -DNDEBUG C_SRCS = \ src/F3DAudio.c \ -- 2.33.0

1 0

[PATCH v4 1/2] nsiproxy: Convert the reply to ICMP_ECHO_REPLY in the output buffer.
by Gabriel Ivăncescu 25 Oct '21

25 Oct '21

Because iphlpapi has no opportunity to convert the reply in async mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Handles architecture differences and family (can be easily extended to support IPv6's struct). dlls/iphlpapi/iphlpapi_main.c | 44 ++---------- dlls/nsiproxy.sys/device.c | 100 ++++++++++++++++++++++++--- dlls/nsiproxy.sys/nsiproxy_private.h | 55 +++++++++++++++ include/wine/nsi.h | 21 +----- 4 files changed, 152 insertions(+), 68 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d9a85be..8a31241 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4579,33 +4579,6 @@ DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) return num_pkts; } -/************************************************************************* - * icmpv4_echo_reply_fixup - * - * Convert struct nsiproxy_icmpv4_echo_reply into ICMP_ECHO_REPLY. - * - * This is necessary due to the different sizes of ICMP_ECHO_REPLY on - * 32 and 64-bits. Despite mention of ICMP_ECHO_REPLY32, 64-bit Windows - * actually does return a full 64-bit version. - */ -static void icmpv4_echo_reply_fixup( ICMP_ECHO_REPLY *dst, struct nsiproxy_icmp_echo_reply *reply ) -{ - dst->Address = reply->addr.Ipv4.sin_addr.s_addr; - dst->Status = reply->status; - dst->RoundTripTime = reply->round_trip_time; - dst->DataSize = reply->data_size; - dst->Reserved = reply->num_of_pkts; - dst->Data = (BYTE *)(dst + 1) + ((reply->opts.options_size + 3) & ~3); - dst->Options.Ttl = reply->opts.ttl; - dst->Options.Tos = reply->opts.tos; - dst->Options.Flags = reply->opts.flags; - dst->Options.OptionsSize = reply->opts.options_size; - dst->Options.OptionsData = (BYTE *)(reply + 1); - - memcpy( dst->Options.OptionsData, (BYTE *)reply + reply->opts.options_offset, reply->opts.options_size ); - memcpy( dst->Data, (BYTE *)reply + reply->data_offset, reply->data_size ); -} - /*********************************************************************** * IcmpSendEcho (IPHLPAPI.@) */ @@ -4636,9 +4609,8 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r void *reply, DWORD reply_size, DWORD timeout ) { struct icmp_handle_data *data = (struct icmp_handle_data *)handle; - DWORD opt_size, in_size, ret = 0, out_size; + DWORD opt_size, in_size, ret = 0; struct nsiproxy_icmp_echo *in; - struct nsiproxy_icmp_echo_reply *out; HANDLE request_event; IO_STATUS_BLOCK iosb; NTSTATUS status; @@ -4658,17 +4630,15 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r opt_size = opts ? (opts->OptionsSize + 3) & ~3 : 0; in_size = FIELD_OFFSET(struct nsiproxy_icmp_echo, data[opt_size + request_size]); in = heap_alloc_zero( in_size ); - out_size = reply_size - sizeof(ICMP_ECHO_REPLY) + sizeof(*out); - out = heap_alloc( out_size ); - if (!in || !out) + if (!in) { - heap_free( out ); - heap_free( in ); SetLastError( IP_NO_RESOURCES ); return 0; } + in->user_reply_ptr = (ULONG_PTR)reply; + in->bits = sizeof(void*) * 8; in->src.Ipv4.sin_family = AF_INET; in->src.Ipv4.sin_addr.s_addr = src; in->dst.Ipv4.sin_family = AF_INET; @@ -4689,19 +4659,15 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r status = NtDeviceIoControlFile( data->nsi_device, request_event, NULL, NULL, &iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, in, in_size, - out, out_size ); + reply, reply_size ); if (status == STATUS_PENDING && !WaitForSingleObject( request_event, INFINITE )) status = iosb.Status; if (!status) - { - icmpv4_echo_reply_fixup( reply, out ); ret = IcmpParseReplies( reply, reply_size ); - } CloseHandle( request_event ); - heap_free( out ); heap_free( in ); if (status) SetLastError( RtlNtStatusToDosError( status ) ); diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 90a7a3d..e8f0e72 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -31,6 +31,7 @@ #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unixlib.h" #include "nsiproxy_private.h" @@ -211,6 +212,57 @@ static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) LeaveCriticalSection( &nsiproxy_cs ); } +static void icmp_echo_reply_fixup( void *out, struct nsiproxy_icmp_echo_reply *reply, ULONGLONG user_reply_ptr, ULONG family, ULONG bits ) +{ + void *data = out; + if (family == AF_INET) + { + void *options_data; + if (bits == 32) + { + struct icmp_echo_reply_32 *dst = out; + dst->addr = reply->addr.Ipv4.sin_addr.s_addr; + dst->status = reply->status; + dst->round_trip_time = reply->round_trip_time; + dst->data_size = reply->data_size; + dst->num_of_pkts = reply->num_of_pkts; + dst->data_ptr = user_reply_ptr + sizeof(*dst) + ((reply->opts.options_size + 3) & ~3); + dst->opts.ttl = reply->opts.ttl; + dst->opts.tos = reply->opts.tos; + dst->opts.flags = reply->opts.flags; + dst->opts.options_size = reply->opts.options_size; + dst->opts.options_ptr = user_reply_ptr + sizeof(*dst); + options_data = dst + 1; + } + else + { + struct icmp_echo_reply_64 *dst = out; + dst->addr = reply->addr.Ipv4.sin_addr.s_addr; + dst->status = reply->status; + dst->round_trip_time = reply->round_trip_time; + dst->data_size = reply->data_size; + dst->num_of_pkts = reply->num_of_pkts; + dst->data_ptr = user_reply_ptr + sizeof(*dst) + ((reply->opts.options_size + 3) & ~3); + dst->opts.ttl = reply->opts.ttl; + dst->opts.tos = reply->opts.tos; + dst->opts.flags = reply->opts.flags; + dst->opts.options_size = reply->opts.options_size; + dst->opts.options_ptr = user_reply_ptr + sizeof(*dst); + options_data = dst + 1; + } + memcpy( options_data, (BYTE *)reply + reply->opts.options_offset, reply->opts.options_size ); + data = (BYTE *)options_data + ((reply->opts.options_size + 3) & ~3); + } + memcpy( data, (BYTE *)reply + reply->data_offset, reply->data_size ); +} + +static int icmp_echo_reply_struct_len( ULONG family, ULONG bits ) +{ + if (family == AF_INET) + return (bits == 32) ? sizeof(struct icmp_echo_reply_32) : sizeof(struct icmp_echo_reply_64); + return 0; +} + static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -222,7 +274,7 @@ static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) if (in_len < offsetof(struct nsiproxy_icmp_echo, data[0]) || in_len < offsetof(struct nsiproxy_icmp_echo, data[((in->opt_size + 3) & ~3) + in->req_size]) || - out_len < sizeof(struct nsiproxy_icmp_echo_reply)) + out_len < icmp_echo_reply_struct_len( in->dst.si_family, in->bits )) return STATUS_INVALID_PARAMETER; switch (in->dst.si_family) @@ -320,19 +372,31 @@ static DWORD WINAPI listen_thread_proc( void *arg ) { IRP *irp = arg; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + unsigned int reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsiproxy_icmp_echo *in = irp->AssociatedIrp.SystemBuffer; struct icmp_listen_params params; + ULONG struct_len; NTSTATUS status; TRACE( "\n" ); + struct_len = icmp_echo_reply_struct_len( in->dst.si_family, in->bits ); params.handle = irp_get_icmp_handle( irp ); params.timeout = in->timeout; - params.reply = irp->AssociatedIrp.SystemBuffer; - params.reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + params.reply_len = reply_len - struct_len + sizeof(struct nsiproxy_icmp_echo_reply); + params.reply = heap_alloc( params.reply_len ); - status = nsiproxy_call( icmp_listen, &params ); - TRACE( "icmp_listen rets %08x\n", status ); + if (params.reply) + { + void *reply = irp->AssociatedIrp.SystemBuffer; + status = nsiproxy_call( icmp_listen, &params ); + TRACE( "icmp_listen rets %08x\n", status ); + + icmp_echo_reply_fixup( reply, params.reply, in->user_reply_ptr, in->dst.si_family, in->bits ); + heap_free( params.reply ); + reply_len = params.reply_len - sizeof(struct nsiproxy_icmp_echo_reply) + struct_len; + } + else status = STATUS_NO_MEMORY; EnterCriticalSection( &nsiproxy_cs ); @@ -340,7 +404,7 @@ static DWORD WINAPI listen_thread_proc( void *arg ) irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) - irp->IoStatus.Information = params.reply_len; + irp->IoStatus.Information = reply_len; else irp->IoStatus.Information = 0; IoCompleteRequest( irp, IO_NO_INCREMENT ); @@ -353,8 +417,10 @@ static DWORD WINAPI listen_thread_proc( void *arg ) static void handle_queued_send_echo( IRP *irp ) { struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; - struct nsiproxy_icmp_echo_reply *reply = (struct nsiproxy_icmp_echo_reply *)irp->AssociatedIrp.SystemBuffer; + void *out = irp->AssociatedIrp.SystemBuffer; struct icmp_send_echo_params params; + ULONG family = in->dst.si_family; + ULONG bits = in->bits; NTSTATUS status; TRACE( "\n" ); @@ -372,9 +438,23 @@ static void handle_queued_send_echo( IRP *irp ) irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) { - memset( reply, 0, sizeof(*reply) ); - reply->status = params.ip_status; - irp->IoStatus.Information = sizeof(*reply); + if (family == AF_INET) + { + if (bits == 32) + { + struct icmp_echo_reply_32 *reply = out; + memset( reply, 0, sizeof(*reply) ); + reply->status = params.ip_status; + irp->IoStatus.Information = sizeof(*reply); + } + else + { + struct icmp_echo_reply_64 *reply = out; + memset( reply, 0, sizeof(*reply) ); + reply->status = params.ip_status; + irp->IoStatus.Information = sizeof(*reply); + } + } } IoCompleteRequest( irp, IO_NO_INCREMENT ); } diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 91dd393..0694757 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -34,3 +34,58 @@ struct icmp_send_echo_params HANDLE handle; ULONG ip_status; }; + +/* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */ +struct nsiproxy_icmp_echo_reply +{ + SOCKADDR_INET addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + DWORD data_offset; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + DWORD options_offset; + } opts; +}; + +struct icmp_echo_reply_32 +{ + ULONG addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + ULONG data_ptr; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + ULONG options_ptr; + } opts; +}; + +struct icmp_echo_reply_64 +{ + ULONG addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + ULONGLONG data_ptr; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + ULONGLONG options_ptr; + } opts; +}; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 9664b53..8c3488d 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -426,6 +426,8 @@ struct nsiproxy_icmp_echo { SOCKADDR_INET src; SOCKADDR_INET dst; + ULONGLONG user_reply_ptr; + BYTE bits; BYTE ttl; BYTE tos; BYTE flags; @@ -435,25 +437,6 @@ struct nsiproxy_icmp_echo BYTE data[1]; /* ((opt_size + 3) & ~3) + req_size */ }; -/* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */ -struct nsiproxy_icmp_echo_reply -{ - SOCKADDR_INET addr; - ULONG status; - ULONG round_trip_time; - USHORT data_size; - USHORT num_of_pkts; - DWORD data_offset; - struct - { - BYTE ttl; - BYTE tos; - BYTE flags; - BYTE options_size; - DWORD options_offset; - } opts; -}; - /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0 -- 2.31.1

2 3

[PATCH] xaudio2_7: Restore FAudioCreateReverbWithCustomAllocatorEXT use for old XAPO versions.
by Rémi Bernon 25 Oct '21

25 Oct '21

This was initially guarded to check the presence of FAudioCreateReverb9* variant and dropped in d8be85863fedf6982944d06ebd1ce5904cb3d4e1 but it is required, and causes crackling sound after Life is Strange 2 intro. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xaudio2_7/xapo.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index 657d2f3f507..47210f1570e 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -311,6 +311,7 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Free, XAudio_Internal_Realloc ); +#if XAUDIO2_VER >= 9 if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) return FAudioCreateReverb9WithCustomAllocatorEXT( fapo, @@ -319,6 +320,16 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Free, XAudio_Internal_Realloc ); +#else + if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) + return FAudioCreateReverbWithCustomAllocatorEXT( + fapo, + 0, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); +#endif #endif #if XAUDIO2_VER >= 8 || defined XAPOFX1_VER if(IsEqualGUID(clsid, &CLSID_FXReverb) || -- 2.33.0

1 0

[PATCH] cng.sys: New dll
by Alistair Leslie-Hughes 25 Oct '21

25 Oct '21

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=48981 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure.ac | 1 + dlls/cng.sys/Makefile.in | 1 + dlls/cng.sys/cng.sys.spec | 63 +++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 4 files changed, 66 insertions(+) create mode 100644 dlls/cng.sys/Makefile.in create mode 100644 dlls/cng.sys/cng.sys.spec diff --git a/configure.ac b/configure.ac index e8b200b0dd7..b0168849960 100644 --- a/configure.ac +++ b/configure.ac @@ -2713,6 +2713,7 @@ WINE_CONFIG_MAKEFILE(dlls/cards) WINE_CONFIG_MAKEFILE(dlls/cdosys) WINE_CONFIG_MAKEFILE(dlls/cfgmgr32) WINE_CONFIG_MAKEFILE(dlls/clusapi) +WINE_CONFIG_MAKEFILE(dlls/cng.sys) WINE_CONFIG_MAKEFILE(dlls/combase) WINE_CONFIG_MAKEFILE(dlls/combase/tests) WINE_CONFIG_MAKEFILE(dlls/comcat) diff --git a/dlls/cng.sys/Makefile.in b/dlls/cng.sys/Makefile.in new file mode 100644 index 00000000000..81d37898e01 --- /dev/null +++ b/dlls/cng.sys/Makefile.in @@ -0,0 +1 @@ +MODULE = cng.sys diff --git a/dlls/cng.sys/cng.sys.spec b/dlls/cng.sys/cng.sys.spec new file mode 100644 index 00000000000..0a2858579d2 --- /dev/null +++ b/dlls/cng.sys/cng.sys.spec @@ -0,0 +1,63 @@ +@ stdcall BCryptAddContextFunctionProvider(long wstr long wstr wstr long) bcrypt.BCryptAddContextFunctionProvider +@ stdcall BCryptCloseAlgorithmProvider(ptr long) bcrypt.BCryptCloseAlgorithmProvider +@ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) bcrypt.BCryptCreateHash +@ stub BCryptCreateMultiHash +@ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptDecrypt +@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) bcrypt.BCryptDeriveKey +@ stdcall BCryptDeriveKeyCapi(ptr ptr ptr long long) bcrypt.BCryptDeriveKeyCapi +@ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2 +@ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash +@ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey +@ stdcall BCryptDestroySecret(ptr) bcrypt.BCryptDestroySecret +@ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash +@ stdcall BCryptDuplicateKey(ptr ptr ptr long long) bcrypt.BCryptDuplicateKey +@ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt +@ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms +@ stub BCryptEnumProviders +@ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) bcrypt.BCryptExportKey +@ stdcall BCryptFinalizeKeyPair(ptr long) bcrypt.BCryptFinalizeKeyPair +@ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash +@ stdcall BCryptFreeBuffer(ptr) bcrypt.BCryptFreeBuffer +@ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom +@ stdcall BCryptGenerateKeyPair(ptr ptr long long) bcrypt.BCryptGenerateKeyPair +@ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) bcrypt.BCryptGenerateSymmetricKey +@ stdcall BCryptGetFipsAlgorithmMode(ptr) bcrypt.BCryptGetFipsAlgorithmMode +@ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) bcrypt.BCryptGetProperty +@ stdcall BCryptHash(ptr ptr long ptr long ptr long) bcrypt.BCryptHash +@ stdcall BCryptHashData(ptr ptr long long) bcrypt.BCryptHashData +@ stdcall BCryptImportKey(ptr ptr wstr ptr ptr long ptr long long) bcrypt.BCryptImportKey +@ stdcall BCryptImportKeyPair(ptr ptr wstr ptr ptr long long) bcrypt.BCryptImportKeyPair +@ stub BCryptKeyDerivation +@ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) bcrypt.BCryptOpenAlgorithmProvider +@ stub BCryptProcessMultiOperations +@ stub BCryptRegisterConfigChangeNotify +@ stdcall BCryptRegisterProvider(wstr long ptr) bcrypt.BCryptRegisterProvider +@ stub BCryptResolveProviders +@ stdcall BCryptSecretAgreement(ptr ptr ptr long) bcrypt.BCryptSecretAgreement +@ stdcall BCryptSetProperty(ptr wstr ptr long long) bcrypt.BCryptSetProperty +@ stdcall BCryptSignHash(ptr ptr ptr long ptr long ptr long) bcrypt.BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stdcall BCryptUnregisterProvider(wstr) bcrypt.BCryptUnregisterProvider +@ stdcall BCryptVerifySignature(ptr ptr ptr long ptr long long) bcrypt.BCryptVerifySignature +@ stub CngGetFipsAlgorithmMode +@ stub EntropyPoolTriggerReseedForIum +@ stub EntropyProvideData +@ stub EntropyRegisterCallback +@ stub EntropyRegisterSource +@ stub EntropyUnregisterSource +@ stub SslDecrementProviderReferenceCount +@ stub SslDecryptPacket +@ stub SslEncryptPacket +@ stub SslExportKey +@ stub SslExportKeyingMaterial +@ stub SslFreeObject +@ stub SslImportKey +@ stub SslIncrementProviderReferenceCount +@ stub SslLookupCipherLengths +@ stub SslLookupCipherSuiteInfo +@ stub SslOpenProvider +@ stub SymCrypt802_11SaeCustomCommitCreate +@ stub SymCrypt802_11SaeCustomCommitProcess +@ stub SymCrypt802_11SaeCustomDestroy +@ stub SymCrypt802_11SaeCustomInit +@ stub SystemPrng diff --git a/tools/make_specfiles b/tools/make_specfiles index ecfc6d0e8f2..f9e93799ba2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -507,6 +507,7 @@ my @dll_groups = [ "bcrypt", "ncrypt", + "cng.sys", ], [ "ntoskrnl.exe", -- 2.33.0

2 1

[PATCH v2] include: Add MFVideoAlphaBitmapFlags in evr9.idl
by Biswapriyo Nath 25 Oct '21

25 Oct '21

2 1

[PATCH] user32: DragDetect() should enter its message loop only if the left mouse button is pressed.
by Dmitry Timoshkov 25 Oct '21

25 Oct '21

There's an application that calls DragDetect() on every WM_MOUSEMOVE message, and this breaks handling of mouse events. A simple test app shows that on Windows DragDetect() starts its message loop when left mouse button is pressed. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 17 +++++++++++++++++ dlls/user32/win.c | 10 ++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6b13d93be14..88989f4064b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12293,6 +12293,22 @@ static void test_cancel_mode(void) DestroyWindow(hwnd2); } +static void test_DragDetect(void) +{ + POINT pt; + BOOL ret; + + ok(!GetCapture(), "got capture window %p\n", GetCapture()); + ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n"); + + GetCursorPos(&pt); + ret = DragDetect(hwndMain, pt); + ok(!ret, "got %d\n", ret); + + ok(!GetCapture(), "got capture window %p\n", GetCapture()); + ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n"); +} + START_TEST(win) { char **argv; @@ -12461,6 +12477,7 @@ START_TEST(win) test_other_process_window(argv[0]); test_SC_SIZE(); test_cancel_mode(); + test_DragDetect(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4d0240f21a8..3c6810f4200 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3893,9 +3893,15 @@ BOOL WINAPI DragDetect( HWND hWnd, POINT pt ) { MSG msg; RECT rect; - WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); - WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); + WORD wDragWidth, wDragHeight; + TRACE( "%p,%s\n", hWnd, wine_dbgstr_point( &pt ) ); + + if (!(GetKeyState( VK_LBUTTON ) & 0x8000)) + return FALSE; + + wDragWidth = GetSystemMetrics(SM_CXDRAG); + wDragHeight= GetSystemMetrics(SM_CYDRAG); SetRect(&rect, pt.x - wDragWidth, pt.y - wDragHeight, pt.x + wDragWidth, pt.y + wDragHeight); SetCapture(hWnd); -- 2.33.1

2 2

[PATCH] evr: Trace normalized rectangle arguments.
by Nikolay Sivov 25 Oct '21

25 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr_private.h | 6 ++++++ dlls/evr/mixer.c | 3 ++- dlls/evr/presenter.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 7ae83140579..ef38b0f70cf 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -45,6 +45,12 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } +static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect *rect) +{ + if (!rect) return "(null)"; + return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); +} + HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 66c3960511a..f821dc7e6d9 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -25,6 +25,7 @@ #include "mferror.h" #include "evr_classes.h" +#include "evr_private.h" #include "initguid.h" #include "evr9.h" @@ -1551,7 +1552,7 @@ static HRESULT WINAPI video_mixer_control_SetStreamOutputRect(IMFVideoMixerContr struct input_stream *stream; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, id, rect); + TRACE("%p, %u, %s.\n", iface, id, debugstr_normalized_rect(rect)); if (!rect) return E_POINTER; diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index fa116c18ccc..bf0f89df0eb 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1280,7 +1280,7 @@ static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayCo struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); HRESULT hr = S_OK; - TRACE("%p, %p, %s.\n", iface, src_rect, wine_dbgstr_rect(dst_rect)); + TRACE("%p, %s, %s.\n", iface, debugstr_normalized_rect(src_rect), wine_dbgstr_rect(dst_rect)); if (!src_rect && !dst_rect) return E_POINTER; -- 2.33.0

1 0

[PATCH 1/7] mfplay: Better handle video control method calls when there is no media item set.
by Nikolay Sivov 25 Oct '21

25 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 33 +++++++------- dlls/mfplay/tests/Makefile.in | 2 +- dlls/mfplay/tests/mfplay.c | 86 +++++++++++++++++++++++++++++++++-- 3 files changed, 101 insertions(+), 20 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 28226f92962..03f204768ab 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1323,6 +1323,15 @@ static HRESULT WINAPI media_player_SetMute(IMFPMediaPlayer *iface, BOOL mute) return E_NOTIMPL; } +static HRESULT media_player_get_display_control(const struct media_player *player, + IMFVideoDisplayControl **display_control) +{ + HRESULT hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)display_control); + if (SUCCEEDED(hr)) return hr; + return hr == MF_E_SHUTDOWN ? hr : MF_E_INVALIDREQUEST; +} + static HRESULT WINAPI media_player_GetNativeVideoSize(IMFPMediaPlayer *iface, SIZE *video, SIZE *arvideo) { @@ -1332,8 +1341,7 @@ static HRESULT WINAPI media_player_GetNativeVideoSize(IMFPMediaPlayer *iface, TRACE("%p, %p, %p.\n", iface, video, arvideo); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, video, arvideo); IMFVideoDisplayControl_Release(display_control); @@ -1351,8 +1359,7 @@ static HRESULT WINAPI media_player_GetIdealVideoSize(IMFPMediaPlayer *iface, TRACE("%p, %p, %p.\n", iface, min_size, max_size); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetIdealVideoSize(display_control, min_size, max_size); IMFVideoDisplayControl_Release(display_control); @@ -1370,8 +1377,7 @@ static HRESULT WINAPI media_player_SetVideoSourceRect(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, rect); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetVideoPosition(display_control, rect, NULL); IMFVideoDisplayControl_Release(display_control); @@ -1390,8 +1396,7 @@ static HRESULT WINAPI media_player_GetVideoSourceRect(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, rect); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetVideoPosition(display_control, rect, &dest); IMFVideoDisplayControl_Release(display_control); @@ -1408,8 +1413,7 @@ static HRESULT WINAPI media_player_SetAspectRatioMode(IMFPMediaPlayer *iface, DW TRACE("%p, %u.\n", iface, mode); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, mode); IMFVideoDisplayControl_Release(display_control); @@ -1427,8 +1431,7 @@ static HRESULT WINAPI media_player_GetAspectRatioMode(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, mode); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, mode); IMFVideoDisplayControl_Release(display_control); @@ -1463,8 +1466,7 @@ static HRESULT WINAPI media_player_SetBorderColor(IMFPMediaPlayer *iface, COLORR TRACE("%p, %#x.\n", iface, color); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetBorderColor(display_control, color); IMFVideoDisplayControl_Release(display_control); @@ -1481,8 +1483,7 @@ static HRESULT WINAPI media_player_GetBorderColor(IMFPMediaPlayer *iface, COLORR TRACE("%p, %p.\n", iface, color); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetBorderColor(display_control, color); IMFVideoDisplayControl_Release(display_control); diff --git a/dlls/mfplay/tests/Makefile.in b/dlls/mfplay/tests/Makefile.in index 43c7ec26240..4eabb5ae0ab 100644 --- a/dlls/mfplay/tests/Makefile.in +++ b/dlls/mfplay/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplay.dll -IMPORTS = mfplay uuid mfuuid +IMPORTS = mfplay user32 uuid mfuuid C_SRCS = \ mfplay.c diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 438d636daa2..074cee6d217 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -142,13 +142,16 @@ static void test_create_player(void) static void test_shutdown(void) { - SIZE min_size, max_size; + SIZE size, min_size, max_size; + MFP_MEDIAPLAYER_STATE state; + MFVideoNormalizedRect rect; IMFPMediaPlayer *player; float slowest, fastest; - HRESULT hr; - MFP_MEDIAPLAYER_STATE state; IMFPMediaItem *item; + COLORREF color; HWND window; + DWORD mode; + HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -180,6 +183,28 @@ static void test_shutdown(void) hr = IMFPMediaPlayer_GetIdealVideoSize(player, &min_size, &max_size); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetBorderColor(player, &color); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetBorderColor(player, 0); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_UpdateVideo(player); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -212,9 +237,64 @@ static void test_media_item(void) IMFPMediaPlayer_Release(player); } +static void test_video_control(void) +{ + MFVideoNormalizedRect rect; + IMFPMediaPlayer *player; + COLORREF color; + HWND window; + DWORD mode; + HRESULT hr; + SIZE size; + + window = CreateWindowA("static", "mfplay_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create output window.\n"); + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, window, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* No active media item */ + + rect.left = rect.top = 0.0f; + rect.right = rect.bottom = 1.0f; + hr = IMFPMediaPlayer_SetVideoSourceRect(player, &rect); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetBorderColor(player, 0); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetBorderColor(player, &color); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetIdealVideoSize(player, &size, &size); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_UpdateVideo(player); +todo_wine + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + IMFPMediaPlayer_Release(player); + + DestroyWindow(window); +} + START_TEST(mfplay) { test_create_player(); test_shutdown(); test_media_item(); + test_video_control(); } -- 2.33.0

1 6

[PATCH 1/4] winex11.drv: Introduce new map_raw_event_coords helper.
by Rémi Bernon 25 Oct '21

25 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 125 ++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 61 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 42bac332664..2243261e0b8 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -634,6 +634,65 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x input->u.mi.dy = pt.y; } +static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + const double *values = event->valuators.values; + struct x11drv_valuator_data *x_rel, *y_rel; + double dx = 0, dy = 0, val; + RECT virtual_rect; + int i; + + if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; + if (!event->valuators.mask_len) return FALSE; + if (thread_data->xi2_state != xi_enabled) return FALSE; + + /* If there is no slave currently detected, no previous motion nor device + * change events were received. Look it up now on the device list in this + * case. + */ + if (!thread_data->xi2_current_slave) + { + XIDeviceInfo *devices = thread_data->xi2_devices; + + for (i = 0; i < thread_data->xi2_device_count; i++) + { + if (devices[i].use != XISlavePointer) continue; + if (devices[i].deviceid != event->deviceid) continue; + if (devices[i].attachment != thread_data->xi2_core_pointer) continue; + thread_data->xi2_current_slave = event->deviceid; + break; + } + } + if (event->deviceid != thread_data->xi2_current_slave) return FALSE; + + x_rel = &thread_data->x_rel_valuator; + y_rel = &thread_data->y_rel_valuator; + + virtual_rect = get_virtual_screen_rect(); + + for (i = 0; i <= max( x_rel->number, y_rel->number ); i++) + { + if (!XIMaskIsSet( event->valuators.mask, i )) continue; + val = *values++; + if (i == x_rel->number) + { + input->u.mi.dx = dx = val; + if (x_rel->min < x_rel->max) + input->u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min); + } + if (i == y_rel->number) + { + input->u.mi.dy = dy = val; + if (y_rel->min < y_rel->max) + input->u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min); + } + } + + TRACE( "pos %d,%d (event %f,%f)\n", input->u.mi.dx, input->u.mi.dy, dx, dy ); + return TRUE; +} + /*********************************************************************** * send_mouse_input @@ -1827,79 +1886,23 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev ) static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { XIRawEvent *event = xev->data; - const double *values = event->valuators.values; - RECT virtual_rect; INPUT input; - int i; - double dx = 0, dy = 0, val; - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - struct x11drv_valuator_data *x_rel, *y_rel; - - if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; - if (!event->valuators.mask_len) return FALSE; - if (thread_data->xi2_state != xi_enabled) return FALSE; - /* If there is no slave currently detected, no previous motion nor device - * change events were received. Look it up now on the device list in this - * case. - */ - if (!thread_data->xi2_current_slave) + if (broken_rawevents && is_old_motion_event( xev->serial )) { - XIDeviceInfo *devices = thread_data->xi2_devices; - - for (i = 0; i < thread_data->xi2_device_count; i++) - { - if (devices[i].use != XISlavePointer) continue; - if (devices[i].deviceid != event->deviceid) continue; - if (devices[i].attachment != thread_data->xi2_core_pointer) continue; - thread_data->xi2_current_slave = event->deviceid; - break; - } + TRACE( "old serial %lu, ignoring\n", xev->serial ); + return FALSE; } - if (event->deviceid != thread_data->xi2_current_slave) return FALSE; - - x_rel = &thread_data->x_rel_valuator; - y_rel = &thread_data->y_rel_valuator; - + input.type = INPUT_MOUSE; input.u.mi.mouseData = 0; input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; input.u.mi.dx = 0; input.u.mi.dy = 0; + if (!map_raw_event_coords( event, &input )) return FALSE; - virtual_rect = get_virtual_screen_rect(); - - for (i = 0; i <= max ( x_rel->number, y_rel->number ); i++) - { - if (!XIMaskIsSet( event->valuators.mask, i )) continue; - val = *values++; - if (i == x_rel->number) - { - input.u.mi.dx = dx = val; - if (x_rel->min < x_rel->max) - input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left) - / (x_rel->max - x_rel->min); - } - if (i == y_rel->number) - { - input.u.mi.dy = dy = val; - if (y_rel->min < y_rel->max) - input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) - / (y_rel->max - y_rel->min); - } - } - - if (broken_rawevents && is_old_motion_event( xev->serial )) - { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); - return FALSE; - } - - TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); - - input.type = INPUT_MOUSE; __wine_send_input( 0, &input, NULL ); return TRUE; } -- 2.33.0

1 3

[PATCH 6/6] msdasql/tests: Initial tests
by Alistair Leslie-Hughes 25 Oct '21

25 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 1 + configure.ac | 1 + dlls/msdasql/tests/Makefile.in | 5 + dlls/msdasql/tests/provider.c | 262 +++++++++++++++++++++++++++++++++ 4 files changed, 269 insertions(+) create mode 100644 dlls/msdasql/tests/Makefile.in create mode 100644 dlls/msdasql/tests/provider.c diff --git a/configure b/configure index d0988eb32ed..8c495f546f8 100755 --- a/configure +++ b/configure @@ -19409,6 +19409,7 @@ wine_fn_config_makefile dlls/msctf/tests enable_tests wine_fn_config_makefile dlls/msctfp enable_msctfp wine_fn_config_makefile dlls/msdaps enable_msdaps wine_fn_config_makefile dlls/msdasql enable_msdasql +wine_fn_config_makefile dlls/msdasql/tests enable_tests wine_fn_config_makefile dlls/msdelta enable_msdelta wine_fn_config_makefile dlls/msdmo enable_msdmo wine_fn_config_makefile dlls/msdmo/tests enable_tests diff --git a/configure.ac b/configure.ac index 36ab649240b..c91b2bccbb8 100644 --- a/configure.ac +++ b/configure.ac @@ -3119,6 +3119,7 @@ WINE_CONFIG_MAKEFILE(dlls/msctf/tests) WINE_CONFIG_MAKEFILE(dlls/msctfp) WINE_CONFIG_MAKEFILE(dlls/msdaps) WINE_CONFIG_MAKEFILE(dlls/msdasql) +WINE_CONFIG_MAKEFILE(dlls/msdasql/tests) WINE_CONFIG_MAKEFILE(dlls/msdelta) WINE_CONFIG_MAKEFILE(dlls/msdmo) WINE_CONFIG_MAKEFILE(dlls/msdmo/tests) diff --git a/dlls/msdasql/tests/Makefile.in b/dlls/msdasql/tests/Makefile.in new file mode 100644 index 00000000000..314238660e2 --- /dev/null +++ b/dlls/msdasql/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msdasql.dll +IMPORTS = uuid oleaut32 ole32 odbccp32 + +C_SRCS = \ + provider.c diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c new file mode 100644 index 00000000000..951ab2a7387 --- /dev/null +++ b/dlls/msdasql/tests/provider.c @@ -0,0 +1,262 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#define COBJMACROS + +#include "msdasc.h" +#include "oledb.h" +#include "odbcinst.h" + +#include "initguid.h" + +#include "msdasql.h" + +#include "wine/test.h" + +DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +static BOOL db_created; +static char mdbpath[MAX_PATH]; + +static void test_Properties(void) +{ + HRESULT hr; + IDBProperties *props; + DBPROPIDSET propidset; + ULONG infocount; + DBPROPINFOSET *propinfoset; + WCHAR *desc; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + + propidset.rgPropertyIDs = NULL; + propidset.cPropertyIDs = 0; + propidset.guidPropertySet = DBPROPSET_DBINITALL; + + infocount = 0; + hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + ULONG i; + + ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + { + trace("%d: pwszDescription: %s\n", i, debugstr_w(propinfoset->rgPropertyInfos[i].pwszDescription) ); + } + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + VariantClear(&propinfoset->rgPropertyInfos[i].vValues); + + CoTaskMemFree(propinfoset->rgPropertyInfos); + CoTaskMemFree(propinfoset); + } + + IDBProperties_Release(props); +} + +static void test_command_interfaces(IUnknown *cmd) +{ + HRESULT hr; + ICommandProperties *commandProp; + ICommandText *comand_text; + IConvertType *convertype; + ICommandPrepare *commandprepare; + ICommandStream *commandstream; + IColumnsInfo *colinfo; + IMultipleResults *multiple; + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandProperties_Release(commandProp); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandText_Release(comand_text); + + hr = IUnknown_QueryInterface(cmd, &IID_IConvertType, (void**)&convertype); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IConvertType_Release(convertype); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + ICommandPrepare_Release(commandprepare); + + hr = IUnknown_QueryInterface(cmd, &IID_IColumnsInfo, (void**)&colinfo); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IColumnsInfo_Release(colinfo); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandStream, (void**)&commandstream); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IMultipleResults, (void**)&multiple); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); +} + +static void test_sessions(void) +{ + IDBProperties *props; + IDBInitialize *dbinit = NULL; + IDataInitialize *datainit; + IDBCreateSession *dbsession = NULL; + IUnknown *session = NULL; + IOpenRowset *openrowset = NULL; + IDBCreateCommand *create_command = NULL; + IUnknown *cmd = NULL; + HRESULT hr; + BSTR connect_str; + + if (!db_created) + { + skip("ODBC source wine_test not available.\n"); + return; + } + + connect_str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + + hr = CoCreateInstance( &CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize, + (void **)&datainit ); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + hr = IDataInitialize_GetDataSource( datainit, NULL, CLSCTX_INPROC_SERVER, connect_str, &IID_IDBInitialize, + (IUnknown **)&dbinit ); + SysFreeString(connect_str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(FAILED(hr)) + { + IDataInitialize_Release( datainit ); + return; + } + + hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBProperties, (void **)&props ); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDBProperties_Release(props); + + hr = IDBInitialize_Initialize( dbinit ); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(FAILED(hr)) + { + IDBInitialize_Release( dbinit ); + IDataInitialize_Release( datainit ); + return; + } + + hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBCreateSession, (void **)&dbsession ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDBCreateSession_CreateSession( dbsession, NULL, &IID_IUnknown, &session ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + test_command_interfaces(cmd); + IUnknown_Release(cmd); + } + + IDBCreateCommand_Release(create_command); + IOpenRowset_Release(openrowset); + IUnknown_Release( session ); + IDBCreateSession_Release(dbsession); + IDBInitialize_Uninitialize( dbinit ); + IDBInitialize_Release( dbinit ); + IDataInitialize_Release( datainit ); +} + +static void setup_database(void) +{ + char *driver; + DWORD code; + char buffer[1024]; + WORD size; + + if (winetest_interactive) + { + trace("assuming odbc 'wine_test' is available\n"); + db_created = TRUE; + return; + } + + /* + * 32 bit Windows has a default driver for "Microsoft Access Driver" (Windows 7+) + * and has the ability to create files on the fly. + * + * 64 bit Windows ONLY has a driver for "SQL Server", which we cannot use since we don't have a + * server to connect to. + * + * The filename passed to CREATE_DB must end in mdb. + */ + GetTempPathA(sizeof(mdbpath), mdbpath); + strcat(mdbpath, "wine_test.mdb"); + + driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof("DSN=wine_test\0CREATE_DB=") + strlen(mdbpath) + 2); + memcpy(driver, "DSN=wine_test\0CREATE_DB=", sizeof("DSN=wine_test\0CREATE_DB=")); + strcat(driver+sizeof("DSN=wine_test\0CREATE_DB=")-1, mdbpath); + + db_created = SQLConfigDataSource(NULL, ODBC_ADD_DSN, "Microsoft Access Driver (*.mdb)", driver); + if (!db_created) + { + SQLInstallerError(1, &code, buffer, sizeof(buffer), &size); + trace("code %d, buffer %s, size %d\n", code, debugstr_a(buffer), size); + + HeapFree(GetProcessHeap(), 0, driver); + + return; + } + + memcpy(driver, "DSN=wine_test\0DBQ=", sizeof("DSN=wine_test\0DBQ=")); + strcat(driver+sizeof("DSN=wine_test\0DBQ=")-1, mdbpath); + db_created = SQLConfigDataSource(NULL, ODBC_ADD_DSN, "Microsoft Access Driver (*.mdb)", driver); + + HeapFree(GetProcessHeap(), 0, driver); +} + +static void cleanup_database(void) +{ + if (winetest_interactive) + return; + + DeleteFileA(mdbpath); +} + +START_TEST(provider) +{ + CoInitialize(0); + + setup_database(); + + test_Properties(); + test_sessions(); + + cleanup_database(); + + CoUninitialize(); +} -- 2.33.0

1 0

[PATCH 5/6] msdasql: Add IDBInitialize support
by Alistair Leslie-Hughes 25 Oct '21

25 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index a9ab3a4933d..9ac70f49c3f 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -105,6 +105,7 @@ struct msdasql { IUnknown MSDASQL_iface; IDBProperties IDBProperties_iface; + IDBInitialize IDBInitialize_iface; LONG ref; }; @@ -119,6 +120,11 @@ static inline struct msdasql *impl_from_IDBProperties(IDBProperties *iface) return CONTAINING_RECORD(iface, struct msdasql, IDBProperties_iface); } +static inline struct msdasql *impl_from_IDBInitialize(IDBInitialize *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBInitialize_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -134,6 +140,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBProperties_iface; } + else if ( IsEqualGUID(riid, &IID_IDBInitialize)) + { + *out = &provider->IDBInitialize_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -240,6 +250,55 @@ static const struct IDBPropertiesVtbl dbprops_vtbl = dbprops_SetProperties }; +static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbinit_AddRef(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbinit_Release(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + FIXME("%p stub\n", provider); + + return S_OK; +} + +static HRESULT WINAPI dbinit_Uninitialize(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + FIXME("%p stub\n", provider); + + return S_OK; +} + + +static const struct IDBInitializeVtbl dbinit_vtbl = +{ + dbinit_QueryInterface, + dbinit_AddRef, + dbinit_Release, + dbinit_Initialize, + dbinit_Uninitialize +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -251,6 +310,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; + provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); -- 2.33.0

1 0

[PATCH 4/6] msdasql: Support IDBProperties interface.
by Alistair Leslie-Hughes 25 Oct '21

25 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 75 +++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 6650951387f..a9ab3a4933d 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "oledb.h" #include "rpcproxy.h" #include "wine/heap.h" #include "wine/debug.h" @@ -103,6 +104,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) struct msdasql { IUnknown MSDASQL_iface; + IDBProperties IDBProperties_iface; LONG ref; }; @@ -112,6 +114,11 @@ static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct msdasql, MSDASQL_iface); } +static inline struct msdasql *impl_from_IDBProperties(IDBProperties *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBProperties_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -123,6 +130,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->MSDASQL_iface; } + else if(IsEqualGUID(riid, &IID_IDBProperties)) + { + *out = &provider->IDBProperties_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -166,6 +177,69 @@ static const IUnknownVtbl msdsql_vtbl = msdsql_Release }; +static HRESULT WINAPI dbprops_QueryInterface(IDBProperties *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbprops_AddRef(IDBProperties *iface) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbprops_Release(IDBProperties *iface) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertyInfoSets, + DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + prgPropertyInfoSets, ppDescBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets, + DBPROPSET rgPropertySets[]) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + + return E_NOTIMPL; +} + +static const struct IDBPropertiesVtbl dbprops_vtbl = +{ + dbprops_QueryInterface, + dbprops_AddRef, + dbprops_Release, + dbprops_GetProperties, + dbprops_GetPropertyInfo, + dbprops_SetProperties +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -176,6 +250,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) return E_OUTOFMEMORY; provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; + provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); -- 2.33.0

1 0

[PATCH 3/6] msdasql: Implement MSDASQL provider
by Alistair Leslie-Hughes 25 Oct '21

25 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 106 +++++++++++++++++++++++++++++++++--- 1 file changed, 98 insertions(+), 8 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index c3c54ba2606..6650951387f 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "objbase.h" #include "rpcproxy.h" +#include "wine/heap.h" #include "wine/debug.h" #include "initguid.h" @@ -64,11 +65,13 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) return 1; } -HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +static HRESULT create_msdasql_provider(REFIID riid, void **ppv); + +HRESULT WINAPI msdasql_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { - FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - return CLASS_E_CLASSNOTAVAILABLE; + return create_msdasql_provider(riid, ppv); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) @@ -77,18 +80,105 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) return S_OK; } -static const IClassFactoryVtbl cffactoryVtbl = { +static const IClassFactoryVtbl cfmsdasqlVtbl = { ClassFactory_QueryInterface, ClassFactory_AddRef, ClassFactory_Release, - ClassFactory_CreateInstance, + msdasql_CreateInstance, ClassFactory_LockServer }; -static IClassFactory cffactory = { &cffactoryVtbl }; +static IClassFactory cfmsdasql = { &cfmsdasqlVtbl }; HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return IClassFactory_QueryInterface(&cffactory, riid, ppv); + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (IsEqualGUID(&CLSID_MSDASQL, rclsid)) + return IClassFactory_QueryInterface(&cfmsdasql, riid, ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +struct msdasql +{ + IUnknown MSDASQL_iface; + + LONG ref; +}; + +static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, MSDASQL_iface); +} + +static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s %p)\n", provider, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &CLSID_MSDASQL)) + { + *out = &provider->MSDASQL_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI msdsql_AddRef(IUnknown *iface) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&provider->ref); + + TRACE("(%p) ref=%u\n", provider, ref); + + return ref; +} + +static ULONG WINAPI msdsql_Release(IUnknown *iface) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&provider->ref); + + TRACE("(%p) ref=%u\n", provider, ref); + + if (!ref) + { + heap_free(provider); + } + + return ref; +} + +static const IUnknownVtbl msdsql_vtbl = +{ + msdsql_QueryInterface, + msdsql_AddRef, + msdsql_Release +}; + +static HRESULT create_msdasql_provider(REFIID riid, void **ppv) +{ + struct msdasql *provider; + HRESULT hr; + + provider = heap_alloc(sizeof(struct msdasql)); + if (!provider) + return E_OUTOFMEMORY; + + provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; + provider->ref = 1; + + hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); + IUnknown_Release(&provider->MSDASQL_iface); + return hr; } -- 2.33.0

1 0

[PATCH 2/6] msdasql: Register MSDASQL interfaces
by Alistair Leslie-Hughes 25 Oct '21

25 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 4 ++++ dlls/msdasql/msdasql.rc | 20 +++++++++++++++++++ dlls/msdasql/msdasql.rgs | 11 +++++++++++ dlls/msdasql/msdasql_classes.idl | 34 ++++++++++++++++++++++++++++++++ dlls/msdasql/msdasql_main.c | 3 +++ 5 files changed, 72 insertions(+) create mode 100644 dlls/msdasql/msdasql.rc create mode 100644 dlls/msdasql/msdasql.rgs create mode 100644 dlls/msdasql/msdasql_classes.idl diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index cb27d332500..3ec26a331df 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -5,3 +5,7 @@ EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ msdasql_main.c + +RC_SRCS = msdasql.rc + +IDL_SRCS = msdasql_classes.idl diff --git a/dlls/msdasql/msdasql.rc b/dlls/msdasql/msdasql.rc new file mode 100644 index 00000000000..d2ba45b8c42 --- /dev/null +++ b/dlls/msdasql/msdasql.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * 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 + */ + +/* @makedep: msdasql.rgs */ +2 WINE_REGISTRY msdasql.rgs diff --git a/dlls/msdasql/msdasql.rgs b/dlls/msdasql/msdasql.rgs new file mode 100644 index 00000000000..b5ac427199b --- /dev/null +++ b/dlls/msdasql/msdasql.rgs @@ -0,0 +1,11 @@ +HKCR +{ + NoRemove CLSID + { + NoRemove {c8b522cb-5cf3-11ce-ade5-00aa0044773d} = s 'MSDASQL' + { + val 'OLEDB_SERVICES' = d 4294967295 + 'OLE DB Provider' = s 'WINE OLE DB Provider for ODBC Drivers' + } + } +} diff --git a/dlls/msdasql/msdasql_classes.idl b/dlls/msdasql/msdasql_classes.idl new file mode 100644 index 00000000000..00a0e99aaa8 --- /dev/null +++ b/dlls/msdasql/msdasql_classes.idl @@ -0,0 +1,34 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ +#pragma makedep register + +[ + progid("MSDASQL.1"), + vi_progid("MSDASQL"), + threading(both), + uuid(c8b522cb-5cf3-11ce-ade5-00aa0044773d) +] +coclass MSDASQL { } + +[ + progid("MSDAENUM.1"), + vi_progid("MSDAENUM"), + threading(both), + uuid(c8b522cd-5cf3-11ce-ade5-00aa0044773d) +] +coclass MSDAENUM { } diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 1b3f5f5ed24..c3c54ba2606 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -26,6 +26,9 @@ #include "rpcproxy.h" #include "wine/debug.h" +#include "initguid.h" +#include "msdasql.h" + WINE_DEFAULT_DEBUG_CHANNEL(msdasql); static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) -- 2.33.0

1 0

[PATCH 1/6] msdasql: New DLL
by Alistair Leslie-Hughes 25 Oct '21

25 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 2 + configure.ac | 1 + dlls/msdasql/Makefile.in | 7 +++ dlls/msdasql/msdasql.spec | 4 ++ dlls/msdasql/msdasql_main.c | 91 +++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + 6 files changed, 107 insertions(+) create mode 100644 dlls/msdasql/Makefile.in create mode 100644 dlls/msdasql/msdasql.spec create mode 100644 dlls/msdasql/msdasql_main.c diff --git a/configure b/configure index 389b83e931e..d0988eb32ed 100755 --- a/configure +++ b/configure @@ -1450,6 +1450,7 @@ enable_mscorwks enable_msctf enable_msctfp enable_msdaps +enable_msdasql enable_msdelta enable_msdmo enable_msdrm @@ -19407,6 +19408,7 @@ wine_fn_config_makefile dlls/msctf enable_msctf wine_fn_config_makefile dlls/msctf/tests enable_tests wine_fn_config_makefile dlls/msctfp enable_msctfp wine_fn_config_makefile dlls/msdaps enable_msdaps +wine_fn_config_makefile dlls/msdasql enable_msdasql wine_fn_config_makefile dlls/msdelta enable_msdelta wine_fn_config_makefile dlls/msdmo enable_msdmo wine_fn_config_makefile dlls/msdmo/tests enable_tests diff --git a/configure.ac b/configure.ac index 0dbf7365714..36ab649240b 100644 --- a/configure.ac +++ b/configure.ac @@ -3118,6 +3118,7 @@ WINE_CONFIG_MAKEFILE(dlls/msctf) WINE_CONFIG_MAKEFILE(dlls/msctf/tests) WINE_CONFIG_MAKEFILE(dlls/msctfp) WINE_CONFIG_MAKEFILE(dlls/msdaps) +WINE_CONFIG_MAKEFILE(dlls/msdasql) WINE_CONFIG_MAKEFILE(dlls/msdelta) WINE_CONFIG_MAKEFILE(dlls/msdmo) WINE_CONFIG_MAKEFILE(dlls/msdmo/tests) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in new file mode 100644 index 00000000000..cb27d332500 --- /dev/null +++ b/dlls/msdasql/Makefile.in @@ -0,0 +1,7 @@ +MODULE = msdasql.dll +IMPORTS = uuid + +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native + +C_SRCS = \ + msdasql_main.c diff --git a/dlls/msdasql/msdasql.spec b/dlls/msdasql/msdasql.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/msdasql/msdasql.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c new file mode 100644 index 00000000000..1b3f5f5ed24 --- /dev/null +++ b/dlls/msdasql/msdasql_main.c @@ -0,0 +1,91 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdasql); + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl cffactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory cffactory = { &cffactoryVtbl }; + +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&cffactory, riid, ppv); +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d023701c04b..b1894dcba61 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2657,6 +2657,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Windows NT\Accessories,wordpad.exe 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll 66000,3,wineps.drv 12,,*.sys,- @@ -2716,6 +2717,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,Microsoft Shared\TextConv, 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll 66000,3,wineps.drv 12,,*.sys -- 2.33.0

1 0

[PATCH v2] winebus.sys: get inotify working on FreeBSD
by Damjan Jovanovic 25 Oct '21

25 Oct '21

FreeBSD requires linking to the inotify library, and including limits.h. Try 2 adds to EXTRALIBS instead of overwriting it. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus_udev.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)

2 1

[PATCH] user16: Fix truncation for 16-bit handles.
by Oleh Nykyforchyn 25 Oct '21

25 Oct '21

When background is erased in a 16 bit app, a handle to DC is passed through USER16 functions, namely CallWindowProc16 (USER.122) and DefDriverProc16 (USER.255), whose respective parameters are of type WPARAM16, hence the upper part of the handle is truncated. Later the returned handle is rejected by get_dc_attr() in GDI32 because its type is 0, although such handles are accepted by handle_entry(). This results in black and not cleared background. If handles are restored with HDC_32(), they pass get_dc_attr() successfully. Based on a patch by Nikolay Sivov. Supercedes https://source.winehq.org/patches/data/218030 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51899 Signed-off-by: Oleh Nykyforchyn <oleh.nyk(a)gmail.com> --- dlls/user.exe16/message.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 93e2cc018bf..eb1d957847a 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -899,6 +899,9 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 case WM_SIZECLIPBOARD: FIXME_(msg)( "message %04x needs translation\n", msg ); break; + case WM_ERASEBKGND: + ret = callback( hwnd32, msg, (WPARAM)HDC_32(wParam), lParam, result, arg ); + break; default: ret = callback( hwnd32, msg, wParam, lParam, result, arg ); break; @@ -1670,6 +1673,14 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd16, UINT16 msg, WPARAM16 wParam, LPAR case WM_GETTEXT: case WM_SETTEXT: return DefWindowProcA( hwnd, msg, wParam, (LPARAM)MapSL(lParam) ); + case WM_CTLCOLOR: + if (HIWORD(lParam) <= CTLCOLOR_STATIC) + return DefWindowProcA( hwnd, WM_CTLCOLORMSGBOX + HIWORD(lParam), + (WPARAM)HDC_32(wParam), (LPARAM)WIN_Handle32( LOWORD(lParam) ) ); + else + return 0; + case WM_ERASEBKGND: + return DefWindowProcA( hwnd, msg, (WPARAM)HDC_32(wParam), lParam ); default: return DefWindowProcA( hwnd, msg, wParam, lParam ); } -- 2.33.0

1 0

[PATCH] dxtrans: Add DllGetClassObject stub
by Alex Henrie 25 Oct '21

25 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51917 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/dxtrans/Makefile.in | 3 +++ dlls/dxtrans/dxtrans.spec | 2 +- dlls/dxtrans/main.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 dlls/dxtrans/main.c diff --git a/dlls/dxtrans/Makefile.in b/dlls/dxtrans/Makefile.in index b5c1602917f..cf669277b93 100644 --- a/dlls/dxtrans/Makefile.in +++ b/dlls/dxtrans/Makefile.in @@ -1 +1,4 @@ MODULE = dxtrans.dll + +C_SRCS = \ + main.c diff --git a/dlls/dxtrans/dxtrans.spec b/dlls/dxtrans/dxtrans.spec index 7c2d605e534..b8ff0297a1b 100644 --- a/dlls/dxtrans/dxtrans.spec +++ b/dlls/dxtrans/dxtrans.spec @@ -6,6 +6,6 @@ @ stub ?DXOverArrayMMX@@YGXPAVDXPMSAMPLE@@PBV1@K@Z @ stdcall -private DllCanUnloadNow() @ stub DllEnumClassObjects -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dxtrans/main.c b/dlls/dxtrans/main.c new file mode 100644 index 00000000000..2b87e9f69c4 --- /dev/null +++ b/dlls/dxtrans/main.c @@ -0,0 +1,35 @@ +/* + * DirectX Transitions + * + * Copyright 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxtrans); + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("(%s, %s, %p) stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} -- 2.33.1

1 0

[PATCH] gdi32: Accept 16-bit handles in get_dc_attr().
by Oleh Nykyforchyn 24 Oct '21

24 Oct '21

When background is erased in a 16 bit app, a handle to DC is passed through USER16 functions, namely CallWindowProc16 (USER.122) and DefDriverProc16 (USER.255), whose respective parameters are of type WPARAM16, hence the upper part of the handle is cut. Later the returned handle is rejected by get_dc_attr() in GDI32 because its type is 0, although such handles are accepted by handle_entry(). This results in black and not cleared background. Allowing type==0 in get_dc_attr() solves the problem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51899 Signed-off-by: Oleh Nykyforchyn <oleh.nyk(a)gmail.com> --- dlls/gdi32/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1511c565194..a161b3cb640 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -56,7 +56,7 @@ DC_ATTR *get_dc_attr( HDC hdc ) { DWORD type = gdi_handle_type( hdc ); DC_ATTR *dc_attr; - if ((type & 0x1f0000) != NTGDI_OBJ_DC || !(dc_attr = get_gdi_client_ptr( hdc, 0 ))) + if ((type && (type & 0x1f0000) != NTGDI_OBJ_DC) || !(dc_attr = get_gdi_client_ptr( hdc, 0 ))) { SetLastError( ERROR_INVALID_HANDLE ); return NULL; -- 2.33.0

2 4

[PATCH v3] po: Update Traditional Chinese translation.
by Chan Chilung 23 Oct '21

23 Oct '21

Signed-off-by: Chan Chilung <eason066(a)gmail.com> --- v3: Applied suggestions from review for v2. po/zh_TW.po | 1288 ++++++++++++++++++++++++--------------------------- 1 file changed, 603 insertions(+), 685 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a8312e8bcec..52c9749f922 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,9 +5,9 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-28 00:06+0800\n" -"Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" -"Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" +"PO-Revision-Date: 2021-10-23 18:45+0800\n" +"Last-Translator: Chan Chilung <eason066(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,36 +20,30 @@ msgid "Security" msgstr "安全性" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "使用者名稱(&U)：" +msgstr "群組或使用者名稱(&G):" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "黃色" +msgstr "允許" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "拒絕" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "存取被拒。\n" +msgstr "%1 的權限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" -msgstr "安裝/移除" +msgstr "安裝/解除安裝" #: dlls/appwiz.cpl/appwiz.rc:61 msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "要從軟碟、光碟或硬碟安裝新程式，請按「安裝」。" +msgstr "要從軟碟、光碟或硬碟安裝新程式，請按 [安裝]。" #: dlls/appwiz.cpl/appwiz.rc:62 msgid "&Install..." @@ -61,8 +55,8 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"下列軟體可以自動解除安裝。從清單中選取它並按下「新增/移除」，可以移除程式或" -"者調整已安裝元件。" +"下列軟體可以自動解除安裝。要移除程式或者調整已安裝元件，請從清單中選取程式" +"並按下 [修改/移除]。" #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -123,39 +117,39 @@ msgstr "確定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技術支援資訊：" +msgstr "以下資訊可協助取得 %s 的技術支援:" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生產商：" +msgstr "發行者:" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" -msgstr "版本：" +msgstr "版本:" #: dlls/appwiz.cpl/appwiz.rc:82 msgid "Contact:" -msgstr "聯絡人：" +msgstr "聯絡人:" #: dlls/appwiz.cpl/appwiz.rc:83 msgid "Support Information:" -msgstr "支援資訊：" +msgstr "支援資訊:" #: dlls/appwiz.cpl/appwiz.rc:84 msgid "Support Telephone:" -msgstr "支援電話：" +msgstr "支援電話:" #: dlls/appwiz.cpl/appwiz.rc:85 msgid "Readme:" -msgstr "產品說明：" +msgstr "產品說明:" #: dlls/appwiz.cpl/appwiz.rc:86 msgid "Product Updates:" -msgstr "產品更新：" +msgstr "產品更新:" #: dlls/appwiz.cpl/appwiz.rc:87 msgid "Comments:" -msgstr "備註：" +msgstr "備註:" #: dlls/appwiz.cpl/appwiz.rc:100 msgid "Wine Gecko Installer" @@ -174,8 +168,8 @@ msgstr "" "Wine 需要安裝 Gecko 套件才能正確顯示嵌在應用程式中的 HTML 網頁。Wine 可以自動" "幫您下載並安裝 Gecko。\n" "\n" -"備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Gecko\">https://wiki.winehq.org/Gecko</a>" +"備註: 建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" +"Gecko\">https://wiki.winehq.org/Gecko</a>。" #: dlls/appwiz.cpl/appwiz.rc:109 dlls/appwiz.cpl/appwiz.rc:124 msgid "&Install" @@ -241,8 +235,8 @@ msgstr "" "Wine 需要安裝 wine-mono 套件才能正確執行 .NET 應用程式。Wine 可以自動幫您下載" "並安裝它。\n" "\n" -"備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Mono\">https://wiki.winehq.org/Mono</a>" +"備註: 建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" +"Mono\">https://wiki.winehq.org/Mono</a>。" #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" @@ -263,7 +257,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式 %s。您想將這個移除程式從註冊表中刪除嗎？" +msgstr "無法執行移除程式「%s」。您想將這個移除程式從註冊表中移除嗎？" #: dlls/appwiz.cpl/appwiz.rc:36 msgid "Not specified" @@ -277,7 +271,7 @@ msgstr "名稱" #: dlls/appwiz.cpl/appwiz.rc:39 msgid "Publisher" -msgstr "生產商" +msgstr "發行者" #: dlls/appwiz.cpl/appwiz.rc:40 dlls/cryptui/cryptui.rc:54 msgid "Version" @@ -323,7 +317,7 @@ msgstr "壓縮選項" #: dlls/avifil32/avifil32.rc:45 msgid "&Choose a stream:" -msgstr "選擇來源(&C)：" +msgstr "選擇來源(&C):" #: dlls/avifil32/avifil32.rc:48 programs/wordpad/wordpad.rc:76 msgid "&Options..." @@ -331,7 +325,7 @@ msgstr "選項(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交錯(&I)" +msgstr "交錯(&I): 每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -339,11 +333,11 @@ msgstr "影格數" #: dlls/avifil32/avifil32.rc:52 msgid "Current format:" -msgstr "目前格式：" +msgstr "目前格式:" #: dlls/avifil32/avifil32.rc:30 msgid "Waveform: %s" -msgstr "波形：%s" +msgstr "波形: %s" #: dlls/avifil32/avifil32.rc:31 msgid "Waveform" @@ -363,7 +357,7 @@ msgstr "音訊" #: dlls/avifil32/avifil32.rc:36 msgid "Wine AVI-default-filehandler" -msgstr "Wine AVI-預設處理器" +msgstr "Wine AVI 預設處理器" #: dlls/avifil32/avifil32.rc:37 msgid "uncompressed" @@ -375,29 +369,27 @@ msgstr "正在取消..." #: dlls/browseui/browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2" #: dlls/browseui/browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2 %3!u! %4" #: dlls/browseui/browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "秒(&S)" +msgstr "秒" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "分" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "小時" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" -msgstr "屬性 %s" +msgstr "%s 的內容" #: dlls/comctl32/comctl32.rc:73 dlls/comdlg32/comdlg32.rc:265 msgid "&Apply" @@ -438,7 +430,7 @@ msgstr "關閉(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "重置(&e)" +msgstr "重置(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -458,7 +450,7 @@ msgstr "重置(&e)" #: programs/winemine/winemine.rc:53 programs/winhlp32/winhlp32.rc:57 #: programs/wordpad/wordpad.rc:102 msgid "&Help" -msgstr "求助(&H)" +msgstr "說明(&H)" #: dlls/comctl32/comctl32.rc:103 msgid "Move &Up" @@ -470,7 +462,7 @@ msgstr "下移(&D)" #: dlls/comctl32/comctl32.rc:105 msgid "A&vailable buttons:" -msgstr "可用工具列按鈕(&V)：" +msgstr "可用工具列按鈕(&V):" #: dlls/comctl32/comctl32.rc:107 msgid "&Add ->" @@ -482,7 +474,7 @@ msgstr "<- 移除(&R)" #: dlls/comctl32/comctl32.rc:109 msgid "&Toolbar buttons:" -msgstr "目前工具列按鈕(&T)：" +msgstr "目前工具列按鈕(&T):" #: dlls/comctl32/comctl32.rc:42 msgid "Separator" @@ -508,16 +500,12 @@ msgid "&Retry" msgstr "重試(&R)" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "隱藏分頁(&T)" +msgstr "隱藏詳細資訊" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "詳細資料" +msgstr "顯示詳細資訊" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -528,7 +516,7 @@ msgstr "關閉" #: dlls/comctl32/comctl32.rc:36 msgid "Today:" -msgstr "今天：" +msgstr "今天:" #: dlls/comctl32/comctl32.rc:37 msgid "Go to today" @@ -543,19 +531,19 @@ msgstr "開啟" #: dlls/comdlg32/comdlg32.rc:161 dlls/comdlg32/comdlg32.rc:183 msgid "File &Name:" -msgstr "檔案名稱(&N)：" +msgstr "檔案名稱(&N):" #: dlls/comdlg32/comdlg32.rc:164 dlls/comdlg32/comdlg32.rc:186 msgid "&Directories:" -msgstr "目錄(&D)：" +msgstr "目錄(&D):" #: dlls/comdlg32/comdlg32.rc:167 dlls/comdlg32/comdlg32.rc:189 msgid "List Files of &Type:" -msgstr "檔案類型(&T)：" +msgstr "檔案類型(&T):" #: dlls/comdlg32/comdlg32.rc:169 dlls/comdlg32/comdlg32.rc:191 msgid "Dri&ves:" -msgstr "磁碟機(&V)：" +msgstr "磁碟機(&V):" #: dlls/comdlg32/comdlg32.rc:174 dlls/comdlg32/comdlg32.rc:196 #: dlls/shell32/shell32.rc:368 dlls/shell32/shell32.rc:405 @@ -579,7 +567,7 @@ msgstr "列印" #: dlls/comdlg32/comdlg32.rc:205 msgid "Printer:" -msgstr "印表機：" +msgstr "印表機:" #: dlls/comdlg32/comdlg32.rc:207 dlls/comdlg32/comdlg32.rc:375 msgid "Print range" @@ -604,15 +592,15 @@ msgstr "設定(&S)" #: dlls/comdlg32/comdlg32.rc:214 msgid "&From:" -msgstr "從(&F)：" +msgstr "從(&F):" #: dlls/comdlg32/comdlg32.rc:215 msgid "&To:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:216 dlls/wineps.drv/wineps.rc:42 msgid "Print &Quality:" -msgstr "列印品質(&Q)：" +msgstr "列印品質(&Q):" #: dlls/comdlg32/comdlg32.rc:218 msgid "Print to Fi&le" @@ -641,7 +629,7 @@ msgstr "[無]" #: dlls/comdlg32/comdlg32.rc:231 msgid "Specific &Printer" -msgstr "特定的印表機(&P)" +msgstr "指定的印表機(&P)" #: dlls/comdlg32/comdlg32.rc:236 dlls/comdlg32/comdlg32.rc:419 #: dlls/comdlg32/comdlg32.rc:443 dlls/wineps.drv/wineps.rc:34 @@ -676,16 +664,16 @@ msgstr "字型" #: dlls/comdlg32/comdlg32.rc:254 msgid "&Font:" -msgstr "字型(&F)：" +msgstr "字型(&F):" #: dlls/comdlg32/comdlg32.rc:257 msgid "Font St&yle:" -msgstr "字型樣式(&Y)：" +msgstr "字型樣式(&Y):" #: dlls/comdlg32/comdlg32.rc:260 dlls/comdlg32/comdlg32.rc:439 #: programs/winecfg/winecfg.rc:292 msgid "&Size:" -msgstr "大小(&S)：" +msgstr "大小(&S):" #: dlls/comdlg32/comdlg32.rc:267 msgid "Effects" @@ -701,7 +689,7 @@ msgstr "底線(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "色彩(&C):" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -709,7 +697,7 @@ msgstr "範例" #: dlls/comdlg32/comdlg32.rc:275 msgid "Scr&ipt:" -msgstr "腳本(&I)：" +msgstr "指令碼(&I):" #: dlls/comdlg32/comdlg32.rc:283 dlls/comdlg32/comdlg32.rc:288 msgid "Color" @@ -717,56 +705,54 @@ msgstr "色彩" #: dlls/comdlg32/comdlg32.rc:286 msgid "&Basic Colors:" -msgstr "基本色彩(&B)：" +msgstr "基本色彩(&B):" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定色彩(&C)：" +msgstr "自訂色彩(&C):" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|純色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" -msgstr "紅(&R)：" +msgstr "紅(&R):" #: dlls/comdlg32/comdlg32.rc:292 msgid "&Green:" -msgstr "綠(&G)：" +msgstr "綠(&G):" #: dlls/comdlg32/comdlg32.rc:294 msgid "&Blue:" -msgstr "藍(&B)：" +msgstr "藍(&B):" #: dlls/comdlg32/comdlg32.rc:296 msgid "&Hue:" -msgstr "色調(&H)：" +msgstr "色調(&H):" #: dlls/comdlg32/comdlg32.rc:298 msgctxt "Saturation" msgid "&Sat:" -msgstr "飽和度(&S)：" +msgstr "飽和度(&S):" #: dlls/comdlg32/comdlg32.rc:300 msgctxt "Luminance" msgid "&Lum:" -msgstr "亮度(&L)：" +msgstr "亮度(&L):" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" -msgstr "新增自定色彩(&A)" +msgstr "新增自訂色彩(&A)" #: dlls/comdlg32/comdlg32.rc:311 msgid "&Define Custom Colors >>" -msgstr "定義自定色彩(&D) >>" +msgstr "定義自訂色彩(&D) >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "否(&N)" +msgstr "&o" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -775,7 +761,7 @@ msgstr "搜尋" #: dlls/comdlg32/comdlg32.rc:321 dlls/comdlg32/comdlg32.rc:340 msgid "Fi&nd What:" -msgstr "搜尋目標(&N)：" +msgstr "搜尋目標(&N):" #: dlls/comdlg32/comdlg32.rc:323 dlls/comdlg32/comdlg32.rc:344 msgid "Match &Whole Word Only" @@ -807,7 +793,7 @@ msgstr "取代" #: dlls/comdlg32/comdlg32.rc:342 msgid "Re&place With:" -msgstr "取代為(&P)：" +msgstr "取代為(&P):" #: dlls/comdlg32/comdlg32.rc:348 msgid "&Replace" @@ -822,7 +808,7 @@ msgstr "取代全部(&A)" #: dlls/shell32/shell32.rc:108 programs/clock/clock.rc:31 #: programs/conhost/conhost.rc:34 msgid "&Properties" -msgstr "屬性(&P)" +msgstr "內容(&P)" #: dlls/comdlg32/comdlg32.rc:364 msgid "Print to fi&le" @@ -831,23 +817,23 @@ msgstr "列印至檔案(&L)" #: dlls/comdlg32/comdlg32.rc:365 dlls/comdlg32/comdlg32.rc:401 #: dlls/msacm32/msacm32.rc:34 programs/winefile/winefile.rc:137 msgid "&Name:" -msgstr "名稱(&N)：" +msgstr "名稱(&N):" #: dlls/comdlg32/comdlg32.rc:366 dlls/comdlg32/comdlg32.rc:404 msgid "Status:" -msgstr "狀態：" +msgstr "狀態:" #: dlls/comdlg32/comdlg32.rc:368 dlls/comdlg32/comdlg32.rc:406 msgid "Type:" -msgstr "類型：" +msgstr "類型:" #: dlls/comdlg32/comdlg32.rc:370 dlls/comdlg32/comdlg32.rc:408 msgid "Where:" -msgstr "位置：" +msgstr "位置:" #: dlls/comdlg32/comdlg32.rc:372 dlls/comdlg32/comdlg32.rc:410 msgid "Comment:" -msgstr "備註：" +msgstr "備註:" #: dlls/comdlg32/comdlg32.rc:377 msgid "Pa&ges" @@ -859,11 +845,11 @@ msgstr "選擇(&S)" #: dlls/comdlg32/comdlg32.rc:381 msgid "&from:" -msgstr "從(&F)：" +msgstr "從(&F):" #: dlls/comdlg32/comdlg32.rc:382 msgid "&to:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:384 msgid "Copies" @@ -871,7 +857,7 @@ msgstr "份數" #: dlls/comdlg32/comdlg32.rc:385 msgid "Number of &copies:" -msgstr "份數(&C)：" +msgstr "份數(&C):" #: dlls/comdlg32/comdlg32.rc:387 msgid "C&ollate" @@ -879,11 +865,11 @@ msgstr "自動分頁(&O)" #: dlls/comdlg32/comdlg32.rc:414 programs/winecfg/winecfg.rc:298 msgid "Si&ze:" -msgstr "大小(&Z)：" +msgstr "大小(&Z):" #: dlls/comdlg32/comdlg32.rc:416 msgid "&Source:" -msgstr "來源(&S)：" +msgstr "來源(&S):" #: dlls/comdlg32/comdlg32.rc:421 msgid "P&ortrait" @@ -899,7 +885,7 @@ msgstr "設定頁面" #: dlls/comdlg32/comdlg32.rc:441 msgid "&Tray:" -msgstr "進紙匣(&T)：" +msgstr "進紙匣(&T):" #: dlls/comdlg32/comdlg32.rc:444 dlls/wineps.drv/wineps.rc:35 msgid "&Portrait" @@ -907,19 +893,19 @@ msgstr "縱向(&P)" #: dlls/comdlg32/comdlg32.rc:447 msgid "L&eft:" -msgstr "左(&E)：" +msgstr "左(&E):" #: dlls/comdlg32/comdlg32.rc:449 programs/notepad/notepad.rc:112 msgid "&Right:" -msgstr "右(&R)：" +msgstr "右(&R):" #: dlls/comdlg32/comdlg32.rc:451 msgid "T&op:" -msgstr "上(&O)：" +msgstr "上(&O):" #: dlls/comdlg32/comdlg32.rc:453 programs/notepad/notepad.rc:114 msgid "&Bottom:" -msgstr "下(&B)：" +msgstr "下(&B):" #: dlls/comdlg32/comdlg32.rc:457 msgid "P&rinter..." @@ -927,19 +913,19 @@ msgstr "印表機(&R)..." #: dlls/comdlg32/comdlg32.rc:465 dlls/comdlg32/comdlg32.rc:490 msgid "Look &in:" -msgstr "搜尋位置(&I)：" +msgstr "搜尋位置(&I):" #: dlls/comdlg32/comdlg32.rc:471 dlls/comdlg32/comdlg32.rc:497 msgid "File &name:" -msgstr "檔案名稱(&N)：" +msgstr "檔案名稱(&N):" #: dlls/comdlg32/comdlg32.rc:475 dlls/comdlg32/comdlg32.rc:501 msgid "Files of &type:" -msgstr "檔案類型(&T)：" +msgstr "檔案類型(&T):" #: dlls/comdlg32/comdlg32.rc:478 dlls/comdlg32/comdlg32.rc:504 msgid "Open as &read-only" -msgstr "開啟成唯讀(&R)" +msgstr "以唯讀方式開啟(&R)" #: dlls/comdlg32/comdlg32.rc:480 dlls/comdlg32/comdlg32.rc:506 #: dlls/comdlg32/comdlg32.rc:524 dlls/shdoclc/shdoclc.rc:127 @@ -949,11 +935,11 @@ msgstr "開啟(&O)" #: dlls/comdlg32/comdlg32.rc:517 msgid "File name:" -msgstr "檔案名稱：" +msgstr "檔案名稱:" #: dlls/comdlg32/comdlg32.rc:520 msgid "Files of type:" -msgstr "檔案類型：" +msgstr "檔案類型:" #: dlls/comdlg32/comdlg32.rc:33 dlls/vbscript/vbscript.rc:35 msgid "File not found" @@ -961,7 +947,7 @@ msgstr "找不到檔案" #: dlls/comdlg32/comdlg32.rc:34 msgid "Please verify that the correct file name was given" -msgstr "請檢查是否給予正確的檔案名稱。" +msgstr "請檢查是否給予正確的檔案名稱" #: dlls/comdlg32/comdlg32.rc:35 msgid "" @@ -969,7 +955,7 @@ msgid "" "Do you want to create file?" msgstr "" "找不到檔案\n" -"是否建立新檔案？" +"是否建立新檔案?" #: dlls/comdlg32/comdlg32.rc:36 msgid "" @@ -977,23 +963,23 @@ msgid "" "Do you want to replace it?" msgstr "" "檔案已經存在。\n" -"要取代嗎？" +"您要取代它嗎?" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" -msgstr "檔案名稱中存在無效的字元" +msgstr "路徑中存在無效的字元" #: dlls/comdlg32/comdlg32.rc:38 msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"檔案名中不能包含任何一下字元:\n" +"檔案名稱中不能包含以下任何一個字元:\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 msgid "Path does not exist" -msgstr "資料夾不存在" +msgstr "路徑不存在" #: dlls/comdlg32/comdlg32.rc:40 msgid "File does not exist" @@ -1001,7 +987,7 @@ msgstr "檔案不存在" #: dlls/comdlg32/comdlg32.rc:41 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "已選項目包含非資料夾物件" #: dlls/comdlg32/comdlg32.rc:46 msgid "Up One Level" @@ -1106,7 +1092,7 @@ msgstr "白色" #: dlls/comdlg32/comdlg32.rc:57 msgid "Unreadable Entry" -msgstr "數值不可讀" +msgstr "無法讀取的數值" #: dlls/comdlg32/comdlg32.rc:59 msgid "" @@ -1114,19 +1100,19 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "輸入值不在頁數範圍內。\n" -"請輸入一個 %1!d! 和 %2!d! 之間的值。" +"請輸入一個介於 %1!d! 和 %2!d! 之間的值。" #: dlls/comdlg32/comdlg32.rc:61 msgid "The 'from' entry cannot exceed the 'to' entry." -msgstr "起始值不能大於終點值。" +msgstr "「從」項的值不能大於「到」項的值。" #: dlls/comdlg32/comdlg32.rc:63 msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"邊緣空白重疊或落於邊界外，\n" -"請重新輸入邊緣空白。" +"頁面邊距重疊或落於邊界外。\n" +"請重新輸入頁面邊距。" #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -1137,8 +1123,8 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"您的印表機不支持這麼大的份數。\n" -"請輸入一個 1 和 %d 之間的數。" +"您的印表機不支援列印這麼大的份數。\n" +"請輸入一個介於 1 和 %d 之間的數值。" #: dlls/comdlg32/comdlg32.rc:68 msgid "A printer error occurred." @@ -1162,19 +1148,19 @@ msgstr "發生錯誤。" #: dlls/comdlg32/comdlg32.rc:73 msgid "Unknown printer driver." -msgstr "找不到印表機驅動程式。" +msgstr "不明的印表機驅動程式。" #: dlls/comdlg32/comdlg32.rc:76 msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"在使用與印表機有關功能(版面設定, 列印檔案)之前, 您必須先安裝印表機。請安裝一" -"個印表機後再試。" +"您必須先安裝印表機才能使用與印表機有關的功能 (如: 版面設定，列印檔案)。" +"請安裝印表機後再試一次。" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "選取介於 %1!d! 和 %2!d! 點的字型尺寸。" +msgstr "選取介於 %1!d! 和 %2!d! 點之間的字型大小。" #: dlls/comdlg32/comdlg32.rc:143 dlls/ieframe/ieframe.rc:35 msgid "&Save" @@ -1182,7 +1168,7 @@ msgstr "儲存(&S)" #: dlls/comdlg32/comdlg32.rc:144 msgid "Save &in:" -msgstr "儲存至(&I)：" +msgstr "儲存至(&I):" #: dlls/comdlg32/comdlg32.rc:145 msgid "Save" @@ -1193,14 +1179,12 @@ msgid "Open File" msgstr "開啟檔案" #: dlls/comdlg32/comdlg32.rc:148 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "新資料夾" +msgstr "選擇資料夾" #: dlls/comdlg32/comdlg32.rc:149 msgid "Font size has to be a number." -msgstr "" +msgstr "字型大小必須是數字。" #: dlls/comdlg32/comdlg32.rc:84 programs/oleview/oleview.rc:98 msgid "Ready" @@ -1208,107 +1192,107 @@ msgstr "待命" #: dlls/comdlg32/comdlg32.rc:85 msgid "Paused; " -msgstr "暫停；" +msgstr "暫停; " #: dlls/comdlg32/comdlg32.rc:86 msgid "Error; " -msgstr "錯誤；" +msgstr "錯誤; " #: dlls/comdlg32/comdlg32.rc:87 msgid "Pending deletion; " -msgstr "等待刪除；" +msgstr "刪除擱置中; " #: dlls/comdlg32/comdlg32.rc:88 msgid "Paper jam; " -msgstr "卡紙；" +msgstr "卡紙; " #: dlls/comdlg32/comdlg32.rc:89 msgid "Out of paper; " -msgstr "無紙；" +msgstr "無紙; " #: dlls/comdlg32/comdlg32.rc:90 msgid "Feed paper manual; " -msgstr "手動進紙；" +msgstr "手動進紙; " #: dlls/comdlg32/comdlg32.rc:91 msgid "Paper problem; " -msgstr "紙張問題；" +msgstr "紙張問題; " #: dlls/comdlg32/comdlg32.rc:92 msgid "Printer offline; " -msgstr "印表機離線；" +msgstr "印表機離線; " #: dlls/comdlg32/comdlg32.rc:93 msgid "I/O Active; " -msgstr "I/O 活動；" +msgstr "I/O 活動; " #: dlls/comdlg32/comdlg32.rc:94 msgid "Busy; " -msgstr "忙碌中；" +msgstr "忙碌中; " #: dlls/comdlg32/comdlg32.rc:95 msgid "Printing; " -msgstr "正在列印；" +msgstr "正在列印; " #: dlls/comdlg32/comdlg32.rc:96 msgid "Output tray is full; " -msgstr "出紙匣已滿；" +msgstr "出紙匣已滿; " #: dlls/comdlg32/comdlg32.rc:97 msgid "Not available; " -msgstr "不可用；" +msgstr "不可用; " #: dlls/comdlg32/comdlg32.rc:98 msgid "Waiting; " -msgstr "等待；" +msgstr "正在等待; " #: dlls/comdlg32/comdlg32.rc:99 msgid "Processing; " -msgstr "正在處理；" +msgstr "正在處理; " #: dlls/comdlg32/comdlg32.rc:100 msgid "Initializing; " -msgstr "正在初始化；" +msgstr "正在初始化; " #: dlls/comdlg32/comdlg32.rc:101 msgid "Warming up; " -msgstr "預熱中；" +msgstr "預熱中; " #: dlls/comdlg32/comdlg32.rc:102 msgid "Toner low; " -msgstr "墨水量低；" +msgstr "墨水量低; " #: dlls/comdlg32/comdlg32.rc:103 msgid "No toner; " -msgstr "墨水用盡；" +msgstr "墨水用盡; " #: dlls/comdlg32/comdlg32.rc:104 msgid "Page punt; " -msgstr "頁處理記憶體超支；" +msgstr "頁處理記憶體超支; " #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " -msgstr "已被使用者中斷；" +msgstr "被使用者中斷; " #: dlls/comdlg32/comdlg32.rc:106 msgid "Out of memory; " -msgstr "記憶體不足；" +msgstr "記憶體不足; " #: dlls/comdlg32/comdlg32.rc:107 msgid "The printer door is open; " -msgstr "印表機蓋是打開的；" +msgstr "印表機蓋已打開; " #: dlls/comdlg32/comdlg32.rc:108 msgid "Print server unknown; " -msgstr "找不到列印伺服器；" +msgstr "不明的列印伺服器; " #: dlls/comdlg32/comdlg32.rc:109 msgid "Power save mode; " -msgstr "省電狀態；" +msgstr "省電模式; " #: dlls/comdlg32/comdlg32.rc:78 msgid "Default Printer; " -msgstr "預設印表機；" +msgstr "預設印表機; " #: dlls/comdlg32/comdlg32.rc:79 msgid "There are %d documents in the queue" @@ -1316,11 +1300,11 @@ msgstr "有 %d 個文件正在等待列印" #: dlls/comdlg32/comdlg32.rc:80 msgid "Margins [inches]" -msgstr "邊緣空白 [英寸]" +msgstr "頁面邊距 [英寸]" #: dlls/comdlg32/comdlg32.rc:81 msgid "Margins [mm]" -msgstr "邊緣空白 [毫米]" +msgstr "頁面邊距 [毫米]" #: dlls/comdlg32/comdlg32.rc:82 dlls/sane.ds/sane.rc:33 msgctxt "unit: millimeters" @@ -1329,12 +1313,12 @@ msgstr "毫米" #: dlls/credui/credui.rc:45 msgid "&User name:" -msgstr "使用者名稱(&U)：" +msgstr "使用者名稱(&U):" #: dlls/credui/credui.rc:48 dlls/cryptui/cryptui.rc:402 #: dlls/oledb32/version.rc:81 msgid "&Password:" -msgstr "密碼(&P)：" +msgstr "密碼(&P):" #: dlls/credui/credui.rc:50 msgid "&Remember my password" @@ -1346,7 +1330,7 @@ msgstr "連接到 %s" #: dlls/credui/credui.rc:31 msgid "Connecting to %s" -msgstr "正在連接到 %s" +msgstr "正在連線到 %s" #: dlls/credui/credui.rc:32 msgid "Logon unsuccessful" @@ -1357,8 +1341,8 @@ msgid "" "Make sure that your user name\n" "and password are correct." msgstr "" -"請確認您輸入的使用者名稱和密碼\n" -"是否正確。" +"請確認您輸入的使用者名稱\n" +"和密碼是否正確。" #: dlls/credui/credui.rc:35 msgid "" @@ -1369,8 +1353,7 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"請在輸入密碼前按下 Caps Lock 鍵，解除\n" -"大寫鎖定。" +"您可以按下 Caps Lock 鍵以解除大寫鎖定，然後再輸入密碼。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1378,7 +1361,7 @@ msgstr "大寫鎖定已開啟" #: dlls/crypt32/crypt32.rc:30 msgid "Authority Key Identifier" -msgstr "授權金鑰識別碼" +msgstr "授權單位金鑰識別元" #: dlls/crypt32/crypt32.rc:31 msgid "Key Attributes" @@ -1394,7 +1377,7 @@ msgstr "主體替代名稱" #: dlls/crypt32/crypt32.rc:34 msgid "Issuer Alternative Name" -msgstr "發證者替代名稱" +msgstr "簽發者替代名稱" #: dlls/crypt32/crypt32.rc:35 msgid "Basic Constraints" @@ -1406,7 +1389,7 @@ msgstr "金鑰用法" #: dlls/crypt32/crypt32.rc:37 msgid "Certificate Policies" -msgstr "憑證策略" +msgstr "憑證原則" #: dlls/crypt32/crypt32.rc:38 msgid "Subject Key Identifier" @@ -1418,7 +1401,7 @@ msgstr "CRL 原因編碼" #: dlls/crypt32/crypt32.rc:40 msgid "CRL Distribution Points" -msgstr "CRL 發布點" +msgstr "CRL 發佈點" #: dlls/crypt32/crypt32.rc:41 msgid "Enhanced Key Usage" @@ -1438,7 +1421,7 @@ msgstr "下一個更新位置" #: dlls/crypt32/crypt32.rc:45 msgid "Yes or No Trust" -msgstr "是或否信賴" +msgstr "信任或不信任" #: dlls/crypt32/crypt32.rc:46 msgid "Email Address" @@ -1446,7 +1429,7 @@ msgstr "電子郵件地址" #: dlls/crypt32/crypt32.rc:47 msgid "Unstructured Name" -msgstr "無結構的名稱" +msgstr "非結構化名稱" #: dlls/crypt32/crypt32.rc:48 msgid "Content Type" @@ -1462,7 +1445,7 @@ msgstr "簽署時間" #: dlls/crypt32/crypt32.rc:51 msgid "Counter Sign" -msgstr "計數器符號" +msgstr "副署" #: dlls/crypt32/crypt32.rc:52 msgid "Challenge Password" @@ -1470,7 +1453,7 @@ msgstr "挑戰密碼" #: dlls/crypt32/crypt32.rc:53 msgid "Unstructured Address" -msgstr "無結構的位址" +msgstr "非結構化位址" #: dlls/crypt32/crypt32.rc:54 msgid "S/MIME Capabilities" @@ -1478,7 +1461,7 @@ msgstr "S/MIME 能力" #: dlls/crypt32/crypt32.rc:55 msgid "Prefer Signed Data" -msgstr "偏好已簽署資料" +msgstr "已簽署資料優先" #: dlls/crypt32/crypt32.rc:56 dlls/cryptdlg/cryptdlg.rc:34 msgctxt "Certification Practice Statement" @@ -1495,7 +1478,7 @@ msgstr "線上憑證狀態協定" #: dlls/crypt32/crypt32.rc:59 msgid "Certification Authority Issuer" -msgstr "憑證授權發證者" +msgstr "憑證授權單位簽發者" #: dlls/crypt32/crypt32.rc:60 msgid "Certification Template Name" @@ -1511,27 +1494,27 @@ msgstr "憑證複本" #: dlls/crypt32/crypt32.rc:63 msgid "Netscape Cert Type" -msgstr "Netscape 憑證型態" +msgstr "Netscape 憑證類型" #: dlls/crypt32/crypt32.rc:64 msgid "Netscape Base URL" -msgstr "Netscape 基準網址" +msgstr "Netscape 基本網址" #: dlls/crypt32/crypt32.rc:65 msgid "Netscape Revocation URL" -msgstr "Netscape 廢止網址" +msgstr "Netscape 撤銷網址" #: dlls/crypt32/crypt32.rc:66 msgid "Netscape CA Revocation URL" -msgstr "Netscape CA 廢止網址" +msgstr "Netscape CA 撤銷網址" #: dlls/crypt32/crypt32.rc:67 msgid "Netscape Cert Renewal URL" -msgstr "Netscape 憑證重申網址" +msgstr "Netscape 憑證更新網址" #: dlls/crypt32/crypt32.rc:68 msgid "Netscape CA Policy URL" -msgstr "Netscape CA 策略網址" +msgstr "Netscape CA 原則網址" #: dlls/crypt32/crypt32.rc:69 msgid "Netscape SSL ServerName" @@ -1583,7 +1566,7 @@ msgstr "姓氏" #: dlls/crypt32/crypt32.rc:81 msgid "Domain Component" -msgstr "區域部分" +msgstr "網域元件" #: dlls/crypt32/crypt32.rc:82 msgid "Street Address" @@ -1591,7 +1574,7 @@ msgstr "街道地址" #: dlls/crypt32/crypt32.rc:83 msgid "Serial Number" -msgstr "門牌號碼" +msgstr "序號" #: dlls/crypt32/crypt32.rc:84 msgid "CA Version" @@ -1603,7 +1586,7 @@ msgstr "交叉 CA 版本" #: dlls/crypt32/crypt32.rc:86 msgid "Serialized Signature Serial Number" -msgstr "序列化的簽名序號" +msgstr "序列化簽章序號" #: dlls/crypt32/crypt32.rc:87 msgid "Principal Name" @@ -1615,7 +1598,7 @@ msgstr "Windows 產品更新" #: dlls/crypt32/crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "註冊名稱值對" +msgstr "註冊名稱值配對" #: dlls/crypt32/crypt32.rc:90 msgid "OS Version" @@ -1627,7 +1610,7 @@ msgstr "註冊 CSP" #: dlls/crypt32/crypt32.rc:92 msgid "CRL Number" -msgstr "CRL 數字" +msgstr "CRL 號碼" #: dlls/crypt32/crypt32.rc:93 msgid "Delta CRL Indicator" @@ -1635,7 +1618,7 @@ msgstr "Delta CRL 指示器" #: dlls/crypt32/crypt32.rc:94 msgid "Issuing Distribution Point" -msgstr "議題發布點" +msgstr "發行發佈點" #: dlls/crypt32/crypt32.rc:95 msgid "Freshest CRL" @@ -1647,27 +1630,27 @@ msgstr "名稱條件約束" #: dlls/crypt32/crypt32.rc:97 msgid "Policy Mappings" -msgstr "策略映射" +msgstr "原則對應" #: dlls/crypt32/crypt32.rc:98 msgid "Policy Constraints" -msgstr "策略條件約束" +msgstr "原則條件約束" #: dlls/crypt32/crypt32.rc:99 msgid "Cross-Certificate Distribution Points" -msgstr "交叉憑證發布點" +msgstr "交叉憑證發佈點" #: dlls/crypt32/crypt32.rc:100 msgid "Application Policies" -msgstr "應用程式策略" +msgstr "應用程式原則" #: dlls/crypt32/crypt32.rc:101 msgid "Application Policy Mappings" -msgstr "應用程式策略映射" +msgstr "應用程式原則對應" #: dlls/crypt32/crypt32.rc:102 msgid "Application Policy Constraints" -msgstr "應用程式策略條件約束" +msgstr "應用程式原則條件約束" #: dlls/crypt32/crypt32.rc:103 msgid "CMC Data" @@ -1723,11 +1706,11 @@ msgstr "前一個 CA 憑證雜湊" #: dlls/crypt32/crypt32.rc:116 msgid "Virtual Base CRL Number" -msgstr "虛擬基底 CRL 數字" +msgstr "虛擬基本 CRL 數目" #: dlls/crypt32/crypt32.rc:117 msgid "Next CRL Publish" -msgstr "下一個 CRL 發布" +msgstr "下一個 CRL 發佈" #: dlls/crypt32/crypt32.rc:118 msgid "CA Encryption Certificate" @@ -1751,27 +1734,27 @@ msgstr "虛設簽署人" #: dlls/crypt32/crypt32.rc:123 msgid "Encrypted Private Key" -msgstr "加密的私鑰" +msgstr "已加密的私鑰" #: dlls/crypt32/crypt32.rc:124 msgid "Published CRL Locations" -msgstr "發布的 CRL 位置" +msgstr "已發行的 CRL 位置" #: dlls/crypt32/crypt32.rc:125 msgid "Enforce Certificate Chain Policy" -msgstr "強制憑證鏈策略" +msgstr "強制憑證鏈結原則" #: dlls/crypt32/crypt32.rc:126 msgid "Transaction Id" -msgstr "異動作業識別號" +msgstr "異動作業識別碼" #: dlls/crypt32/crypt32.rc:127 msgid "Sender Nonce" -msgstr "當前傳送者" +msgstr "發送者的一次性隨機數" #: dlls/crypt32/crypt32.rc:128 msgid "Recipient Nonce" -msgstr "當前收件者" +msgstr "收件者的一次性隨機數" #: dlls/crypt32/crypt32.rc:129 msgid "Reg Info" @@ -1779,11 +1762,11 @@ msgstr "註冊資訊" #: dlls/crypt32/crypt32.rc:130 msgid "Get Certificate" -msgstr "提取憑證" +msgstr "取得憑證" #: dlls/crypt32/crypt32.rc:131 msgid "Get CRL" -msgstr "提取 CRL" +msgstr "取得 CRL" #: dlls/crypt32/crypt32.rc:132 msgid "Revoke Request" @@ -1791,11 +1774,11 @@ msgstr "取消要求" #: dlls/crypt32/crypt32.rc:133 msgid "Query Pending" -msgstr "查詢擱置" +msgstr "查詢擱置中" #: dlls/crypt32/crypt32.rc:134 dlls/cryptui/cryptui.rc:95 msgid "Certificate Trust List" -msgstr "憑證信賴清單" +msgstr "憑證信任清單" #: dlls/crypt32/crypt32.rc:135 msgid "Archived Key Certificate Hash" @@ -1803,11 +1786,11 @@ msgstr "封存的金鑰憑證雜湊" #: dlls/crypt32/crypt32.rc:136 msgid "Private Key Usage Period" -msgstr "私鑰使用週期" +msgstr "私鑰使用期限" #: dlls/crypt32/crypt32.rc:137 msgid "Client Information" -msgstr "客戶端資訊" +msgstr "用戶端資訊" #: dlls/crypt32/crypt32.rc:138 msgid "Server Authentication" @@ -1815,7 +1798,7 @@ msgstr "伺服器認證" #: dlls/crypt32/crypt32.rc:139 msgid "Client Authentication" -msgstr "客戶端認證" +msgstr "用戶端認證" #: dlls/crypt32/crypt32.rc:140 msgid "Code Signing" @@ -1831,7 +1814,7 @@ msgstr "時間戳記" #: dlls/crypt32/crypt32.rc:143 msgid "Microsoft Trust List Signing" -msgstr "Microsoft 信賴清單簽署" +msgstr "Microsoft 信任清單簽署" #: dlls/crypt32/crypt32.rc:144 msgid "Microsoft Time Stamping" @@ -1843,7 +1826,7 @@ msgstr "IP 安全終端系統" #: dlls/crypt32/crypt32.rc:146 msgid "IP security tunnel termination" -msgstr "IP 安全遂道終端" +msgstr "IP 安全隧道終端" #: dlls/crypt32/crypt32.rc:147 msgid "IP security user" @@ -1855,19 +1838,19 @@ msgstr "加密檔案系統" #: dlls/crypt32/crypt32.rc:149 dlls/cryptui/cryptui.rc:133 msgid "Windows Hardware Driver Verification" -msgstr "Windows 硬體驅動程式查核" +msgstr "Windows 硬體驅動程式驗證" #: dlls/crypt32/crypt32.rc:150 dlls/cryptui/cryptui.rc:134 msgid "Windows System Component Verification" -msgstr "Windows 系統成分查核" +msgstr "Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:151 dlls/cryptui/cryptui.rc:135 msgid "OEM Windows System Component Verification" -msgstr "OEM Windows 系統成分查核" +msgstr "OEM Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:152 dlls/cryptui/cryptui.rc:136 msgid "Embedded Windows System Component Verification" -msgstr "嵌入式 Windows 系統成分查核" +msgstr "嵌入式 Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:153 dlls/cryptui/cryptui.rc:143 msgid "Key Pack Licenses" @@ -1875,11 +1858,11 @@ msgstr "金鑰包裝授權" #: dlls/crypt32/crypt32.rc:154 dlls/cryptui/cryptui.rc:144 msgid "License Server Verification" -msgstr "授權伺服器查核" +msgstr "授權伺服器驗證" #: dlls/crypt32/crypt32.rc:155 dlls/cryptui/cryptui.rc:146 msgid "Smart Card Logon" -msgstr "智慧卡登錄" +msgstr "智慧卡登入" #: dlls/crypt32/crypt32.rc:156 dlls/cryptui/cryptui.rc:142 msgid "Digital Rights" @@ -1887,7 +1870,7 @@ msgstr "數位權限" #: dlls/crypt32/crypt32.rc:157 dlls/cryptui/cryptui.rc:138 msgid "Qualified Subordination" -msgstr "合格的隸屬" +msgstr "合格的分類" #: dlls/crypt32/crypt32.rc:158 dlls/cryptui/cryptui.rc:139 msgid "Key Recovery" @@ -1911,7 +1894,7 @@ msgstr "根清單簽署人" #: dlls/crypt32/crypt32.rc:163 msgid "All application policies" -msgstr "所有應用程式策略" +msgstr "所有應用程式原則" #: dlls/crypt32/crypt32.rc:164 dlls/cryptui/cryptui.rc:149 msgid "Directory Service Email Replication" @@ -1919,19 +1902,19 @@ msgstr "目錄服務電子郵件複寫" #: dlls/crypt32/crypt32.rc:165 dlls/cryptui/cryptui.rc:145 msgid "Certificate Request Agent" -msgstr "憑證請求代理程式" +msgstr "憑證要求代理" #: dlls/crypt32/crypt32.rc:166 dlls/cryptui/cryptui.rc:141 msgid "Lifetime Signing" -msgstr "生命期簽署" +msgstr "永久簽署" #: dlls/crypt32/crypt32.rc:167 msgid "All issuance policies" -msgstr "所有發布策略" +msgstr "所有發佈原則" #: dlls/crypt32/crypt32.rc:172 msgid "Trusted Root Certification Authorities" -msgstr "信賴的根憑證授權者" +msgstr "信任的根憑證授權單位" #: dlls/crypt32/crypt32.rc:173 msgid "Personal" @@ -1939,7 +1922,7 @@ msgstr "個人的" #: dlls/crypt32/crypt32.rc:174 msgid "Intermediate Certification Authorities" -msgstr "中介憑證授權者" +msgstr "中介憑證授權單位" #: dlls/crypt32/crypt32.rc:175 msgid "Other People" @@ -1947,11 +1930,11 @@ msgstr "其他人" #: dlls/crypt32/crypt32.rc:176 msgid "Trusted Publishers" -msgstr "信賴的發行者" +msgstr "信任的發行者" #: dlls/crypt32/crypt32.rc:177 msgid "Untrusted Certificates" -msgstr "不可信的憑證" +msgstr "不信任的憑證" #: dlls/crypt32/crypt32.rc:182 msgid "KeyID=" @@ -1959,7 +1942,7 @@ msgstr "KeyID=" #: dlls/crypt32/crypt32.rc:183 msgid "Certificate Issuer" -msgstr "憑證發證者" +msgstr "憑證簽發者" #: dlls/crypt32/crypt32.rc:184 msgid "Certificate Serial Number=" @@ -1995,11 +1978,11 @@ msgstr "遮罩=" #: dlls/crypt32/crypt32.rc:192 msgid "Registered ID=" -msgstr "已註冊的識別號=" +msgstr "已註冊的識別碼=" #: dlls/crypt32/crypt32.rc:193 msgid "Unknown Key Usage" -msgstr "不明金鑰用法" +msgstr "不明的金鑰使用方法" #: dlls/crypt32/crypt32.rc:194 msgid "Subject Type=" @@ -2025,7 +2008,7 @@ msgstr "無" #: dlls/crypt32/crypt32.rc:199 msgid "Information Not Available" -msgstr "資訊無法使用" +msgstr "沒有可用資訊" #: dlls/crypt32/crypt32.rc:200 msgid "Authority Info Access" @@ -2042,23 +2025,23 @@ msgstr "OCSP" #: dlls/crypt32/crypt32.rc:203 msgid "CA Issuers" -msgstr "CA 發證者" +msgstr "CA 簽發者" #: dlls/crypt32/crypt32.rc:204 msgid "Unknown Access Method" -msgstr "不明存取方法" +msgstr "不明的存取方法" #: dlls/crypt32/crypt32.rc:205 msgid "Alternative Name" -msgstr "另類名稱" +msgstr "替代名稱" #: dlls/crypt32/crypt32.rc:206 msgid "CRL Distribution Point" -msgstr "CRL 發布點" +msgstr "CRL 發佈點" #: dlls/crypt32/crypt32.rc:207 msgid "Distribution Point Name" -msgstr "發布點名稱" +msgstr "發佈點名稱" #: dlls/crypt32/crypt32.rc:208 msgid "Full Name" @@ -2074,19 +2057,19 @@ msgstr "CRL 原因=" #: dlls/crypt32/crypt32.rc:211 msgid "CRL Issuer" -msgstr "CRL 發證者" +msgstr "CRL 簽發者" #: dlls/crypt32/crypt32.rc:212 msgid "Key Compromise" -msgstr "金鑰折衷" +msgstr "金鑰洩露" #: dlls/crypt32/crypt32.rc:213 msgid "CA Compromise" -msgstr "CA 折衷" +msgstr "CA 洩露" #: dlls/crypt32/crypt32.rc:214 msgid "Affiliation Changed" -msgstr "會籍變更" +msgstr "聯盟已變更" #: dlls/crypt32/crypt32.rc:215 msgid "Superseded" @@ -2094,11 +2077,11 @@ msgstr "已取代" #: dlls/crypt32/crypt32.rc:216 msgid "Operation Ceased" -msgstr "作業終了" +msgstr "作業已停止" #: dlls/crypt32/crypt32.rc:217 msgid "Certificate Hold" -msgstr "憑證暫停" +msgstr "持有的憑證" #: dlls/crypt32/crypt32.rc:218 msgid "Financial Information=" @@ -2110,11 +2093,11 @@ msgstr "可用" #: dlls/crypt32/crypt32.rc:220 msgid "Not Available" -msgstr "無法使用" +msgstr "不可用" #: dlls/crypt32/crypt32.rc:221 msgid "Meets Criteria=" -msgstr "會面準則=" +msgstr "符合準則=" #: dlls/crypt32/crypt32.rc:222 dlls/cryptui/cryptui.rc:166 #: dlls/oleaut32/oleaut32.rc:32 dlls/wininet/wininet.rc:94 @@ -2130,7 +2113,7 @@ msgstr "否" #: dlls/crypt32/crypt32.rc:224 msgid "Digital Signature" -msgstr "數位簽名" +msgstr "數位簽章" #: dlls/crypt32/crypt32.rc:225 msgid "Non-Repudiation" @@ -2142,11 +2125,11 @@ msgstr "金鑰編密" #: dlls/crypt32/crypt32.rc:227 msgid "Data Encipherment" -msgstr "資料加密" +msgstr "資料編密" #: dlls/crypt32/crypt32.rc:228 msgid "Key Agreement" -msgstr "金鑰協定" +msgstr "金鑰合約" #: dlls/crypt32/crypt32.rc:229 msgid "Certificate Signing" @@ -2170,7 +2153,7 @@ msgstr "只解開密文" #: dlls/crypt32/crypt32.rc:234 msgid "SSL Client Authentication" -msgstr "SSL 客戶端認證" +msgstr "SSL 用戶端認證" #: dlls/crypt32/crypt32.rc:235 msgid "SSL Server Authentication" @@ -2182,7 +2165,7 @@ msgstr "S/MIME" #: dlls/crypt32/crypt32.rc:237 msgid "Signature" -msgstr "簽名" +msgstr "簽章" #: dlls/crypt32/crypt32.rc:238 msgid "SSL CA" @@ -2194,23 +2177,23 @@ msgstr "S/MIME CA" #: dlls/crypt32/crypt32.rc:240 msgid "Signature CA" -msgstr "簽名 CA" +msgstr "簽章 CA" #: dlls/cryptdlg/cryptdlg.rc:30 msgid "Certificate Policy" -msgstr "憑證策略" +msgstr "憑證原則" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略識別碼：" +msgstr "原則識別碼: " #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" -msgstr "策略限定元資訊" +msgstr "原則限定元資訊" #: dlls/cryptdlg/cryptdlg.rc:33 msgid "Policy Qualifier Id=" -msgstr "策略限定元識別號=" +msgstr "原則限定元識別碼=" #: dlls/cryptdlg/cryptdlg.rc:36 msgid "Qualifier" @@ -2244,15 +2227,15 @@ msgstr "安裝憑證(&I)..." #: dlls/cryptui/cryptui.rc:197 msgid "Issuer &Statement" -msgstr "發證者敘述(&S)" +msgstr "簽發者敘述(&S)" #: dlls/cryptui/cryptui.rc:205 msgid "&Show:" -msgstr "顯示(&S)：" +msgstr "顯示(&S):" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." -msgstr "編輯屬性(&E)..." +msgstr "編輯內容(&E)..." #: dlls/cryptui/cryptui.rc:211 msgid "&Copy to File..." @@ -2272,7 +2255,7 @@ msgstr "檢視憑證(&V)" #: dlls/cryptui/cryptui.rc:223 msgid "Certificate &status:" -msgstr "憑證狀態(&S)：" +msgstr "憑證狀態(&S):" #: dlls/cryptui/cryptui.rc:229 msgid "Disclaimer" @@ -2284,12 +2267,12 @@ msgstr "更多資訊(&I)" #: dlls/cryptui/cryptui.rc:244 msgid "&Friendly name:" -msgstr "易記名稱(&F)：" +msgstr "易記名稱(&F):" #: dlls/cryptui/cryptui.rc:246 programs/progman/progman.rc:154 #: programs/progman/progman.rc:170 msgid "&Description:" -msgstr "描述(&D)：" +msgstr "描述(&D):" #: dlls/cryptui/cryptui.rc:248 msgid "Certificate purposes" @@ -2305,32 +2288,32 @@ msgstr "停用這個憑證的全部目的(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "只有啟用這個憑證的下列目的(&O)：" +msgstr "只啟用這個憑證的下列目的(&O):" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." -msgstr "加入目的(&P)..." +msgstr "新增目的(&P)..." #: dlls/cryptui/cryptui.rc:262 msgid "Add Purpose" -msgstr "加入目的" +msgstr "新增目的" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "加入您所希望的憑證目的物件識別符號 (OID)：" +msgstr "新增您希望加入的憑證目的的物件識別碼 (OID):" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" -msgstr "選取憑證儲存處" +msgstr "選取憑證存放區" #: dlls/cryptui/cryptui.rc:276 msgid "Select the certificate store you want to use:" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證存放區:" #: dlls/cryptui/cryptui.rc:279 msgid "&Show physical stores" -msgstr "顯示實體儲存(&S)" +msgstr "顯示實體存放區(&S)" #: dlls/cryptui/cryptui.rc:285 dlls/cryptui/cryptui.rc:296 #: dlls/cryptui/cryptui.rc:313 dlls/cryptui/cryptui.rc:327 @@ -2354,16 +2337,16 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信賴清單到憑證儲存處。\n" +"這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信任清單到憑證存放區。\n" "\n" -"憑證可用於識別您或您正在通訊的電腦。它也可以用於認證以及對訊息簽署。憑證儲" -"存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。\n" "\n" -"要繼續，請按下一步。" +"請按 [下一步] 繼續。" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" -msgstr "檔案名稱(&F)：" +msgstr "檔案名稱(&F):" #: dlls/cryptui/cryptui.rc:301 dlls/cryptui/cryptui.rc:323 #: dlls/cryptui/cryptui.rc:437 programs/winecfg/winecfg.rc:311 @@ -2375,7 +2358,7 @@ msgid "" "Note: The following file formats may contain more than one certificate, " "certificate revocation list, or certificate trust list:" msgstr "" -"註記：下列檔案格式也許會包含超過一個的憑證、憑證撤銷清單或憑證信賴清單：" +"註記: 下列檔案格式也許會包含超過一個的憑證、憑證撤銷清單或憑證信任清單:" #: dlls/cryptui/cryptui.rc:304 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" @@ -2388,21 +2371,21 @@ msgstr "個人資訊交換/PKCS #12 (*.pfx; *.p12)" #: dlls/cryptui/cryptui.rc:308 dlls/cryptui/cryptui.rc:81 #: dlls/cryptui/cryptui.rc:162 msgid "Microsoft Serialized Certificate Store (*.sst)" -msgstr "Microsoft 序列化憑證儲存處 (*.sst)" +msgstr "Microsoft 序列化憑證存放區 (*.sst)" #: dlls/cryptui/cryptui.rc:316 msgid "" "Wine can automatically select the certificate store, or you can specify a " "location for the certificates." -msgstr "Wine 可以自動選取憑證儲存處，或者您可以指定用於憑證的位置。" +msgstr "Wine 可以自動選取憑證存放區，或者您可以指定用於憑證的位置。" #: dlls/cryptui/cryptui.rc:318 msgid "&Automatically select certificate store" -msgstr "自動選取憑證儲存處(&A)" +msgstr "自動選取憑證存放區(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "將所有憑證放置於下列儲存(&P)：" +msgstr "將所有憑證放置於下列存放區(&P):" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2410,11 +2393,11 @@ msgstr "正在完成憑證匯入精靈" #: dlls/cryptui/cryptui.rc:332 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "您已經成功地完成憑證匯入精靈。" +msgstr "您已經成功完成憑證匯入精靈。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" -msgstr "您已指定下列設定值：" +msgstr "您已指定下列設定值:" #: dlls/cryptui/cryptui.rc:342 dlls/cryptui/cryptui.rc:122 #: dlls/inetcpl.cpl/inetcpl.rc:111 @@ -2423,7 +2406,7 @@ msgstr "憑證" #: dlls/cryptui/cryptui.rc:345 msgid "I&ntended purpose:" -msgstr "預定目的(&N)：" +msgstr "預定目的(&N):" #: dlls/cryptui/cryptui.rc:349 msgid "&Import..." @@ -2462,11 +2445,11 @@ msgstr "憑證目的" #: dlls/cryptui/cryptui.rc:364 msgid "" "Select one or more purposes to be listed when Advanced Purposes is selected." -msgstr "當進階目的已選時選取一或多個要列出的目的。" +msgstr "選取一個或多個在進階目的已選取時要列出的目的。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" -msgstr "憑證目的(&C)：" +msgstr "憑證目的(&C):" #: dlls/cryptui/cryptui.rc:375 dlls/cryptui/cryptui.rc:386 #: dlls/cryptui/cryptui.rc:399 dlls/cryptui/cryptui.rc:409 @@ -2491,12 +2474,12 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"這個精靈協助您從憑證儲存處匯出憑證、憑證撤銷清單以及憑證信賴清單到檔案。\n" +"這個精靈協助您從憑證存放區匯出憑證、憑證撤銷清單以及憑證信任清單到檔案。\n" "\n" -"憑證可用於識別您或您用以通訊的電腦。它也可以被用於認證以及簽署訊息。憑證儲存" -"處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。\n" "\n" -"要繼續請按下一步。" +"請按 [下一步] 繼續。" #: dlls/cryptui/cryptui.rc:389 msgid "" @@ -2506,23 +2489,23 @@ msgstr "如果您選擇要匯出私鑰，將於後續頁面向您提示要求密 #: dlls/cryptui/cryptui.rc:390 msgid "Do you wish to export the private key?" -msgstr "您要匯出私鑰嗎？" +msgstr "您要匯出私鑰嗎?" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" -msgstr "是(&Y)，匯出私鑰。" +msgstr "是，匯出私鑰(&Y)" #: dlls/cryptui/cryptui.rc:393 msgid "N&o, do not export the private key" -msgstr "否(&N)，不要匯出私鑰。" +msgstr "否，不要匯出私鑰(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" -msgstr "確認密碼(&C)：" +msgstr "確認密碼(&C):" #: dlls/cryptui/cryptui.rc:412 msgid "Select the format you want to use:" -msgstr "請選擇您要使用的格式：" +msgstr "請選擇您要使用的格式:" #: dlls/cryptui/cryptui.rc:413 msgid "&DER-encoded X.509 (*.cer)" @@ -2530,7 +2513,7 @@ msgstr "&DER-encoded X.509 (*.cer)" #: dlls/cryptui/cryptui.rc:415 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-encoded X.509 (*.cer)：" +msgstr "Ba&se64-encoded X.509 (*.cer):" #: dlls/cryptui/cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2562,19 +2545,15 @@ msgstr "正在完成憑證匯出精靈" #: dlls/cryptui/cryptui.rc:446 msgid "You have successfully completed the Certificate Export Wizard." -msgstr "您已經成功地完成憑證匯出精靈" +msgstr "您已經成功完成憑證匯出精靈。" #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -2588,21 +2567,23 @@ msgstr "憑證資訊" msgid "" "This certificate has an invalid signature. The certificate may have been " "altered or corrupted." -msgstr "這個憑證的簽名無效。憑證也許已被改變或已損壞。" +msgstr "這個憑證的簽章無效。憑證可能已被更改或損壞。" #: dlls/cryptui/cryptui.rc:33 msgid "" "This root certificate is not trusted. To trust it, add it to your system's " "trusted root certificate store." -msgstr "這個根憑證未被信賴。要信賴它，就將它加入您系統的信賴根憑證儲存處。" +msgstr "" +"這個根憑證不受信任。如果您要信任它，請將這個憑證加入到系統的" +"受信任的根憑證存放區。" #: dlls/cryptui/cryptui.rc:34 msgid "This certificate could not be validated to a trusted root certificate." -msgstr "這個憑證無法被驗證為信賴的根憑證。" +msgstr "這個憑證無法被驗證為信任的根憑證。" #: dlls/cryptui/cryptui.rc:35 msgid "This certificate's issuer could not be found." -msgstr "找不到這個憑證的發證者。" +msgstr "找不到這個憑證的簽發者。" #: dlls/cryptui/cryptui.rc:36 msgid "All the intended purposes of this certificate could not be verified." @@ -2610,15 +2591,15 @@ msgstr "這個憑證的所有預定目的都無法被驗證。" #: dlls/cryptui/cryptui.rc:37 msgid "This certificate is intended for the following purposes:" -msgstr "這個憑證是適用於下列目的：" +msgstr "這個憑證適用於下列目的:" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "發證對象：" +msgstr "發證給:" #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "發證來源：" +msgstr "簽發者:" #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2630,7 +2611,7 @@ msgstr " 到 " #: dlls/cryptui/cryptui.rc:42 msgid "This certificate has an invalid signature." -msgstr "這個憑證的簽名無效。" +msgstr "這個憑證的簽章無效。" #: dlls/cryptui/cryptui.rc:43 msgid "This certificate has expired or is not yet valid." @@ -2638,11 +2619,11 @@ msgstr "這個憑證已過期或尚未生效。" #: dlls/cryptui/cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." -msgstr "這個憑證的有效期限超過它的發證者。" +msgstr "這個憑證的有效期限超過簽發者的有效期限。" #: dlls/cryptui/cryptui.rc:45 msgid "This certificate was revoked by its issuer." -msgstr "這個憑證已被它的發證者取消。" +msgstr "這個憑證已被其簽發者撤銷。" #: dlls/cryptui/cryptui.rc:46 msgid "This certificate is OK." @@ -2667,15 +2648,15 @@ msgstr "只有版本 1 欄位" #: dlls/cryptui/cryptui.rc:51 msgid "Extensions Only" -msgstr "只有進階屬性" +msgstr "只有延伸" #: dlls/cryptui/cryptui.rc:52 msgid "Critical Extensions Only" -msgstr "只有關鍵進階屬性" +msgstr "只有關鍵延伸" #: dlls/cryptui/cryptui.rc:53 msgid "Properties Only" -msgstr "只有屬性" +msgstr "只有內容" #: dlls/cryptui/cryptui.rc:55 msgid "Serial number" @@ -2724,11 +2705,11 @@ msgstr "描述" #: dlls/cryptui/cryptui.rc:66 msgid "Certificate Properties" -msgstr "憑證屬性" +msgstr "憑證內容" #: dlls/cryptui/cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "請以 1.2.3.4 的形式輸入 OID" +msgstr "請以 1.2.3.4 的格式輸入 OID" #: dlls/cryptui/cryptui.rc:68 msgid "The OID you entered already exists." @@ -2736,13 +2717,13 @@ msgstr "您輸入的 OID 已經存在。" #: dlls/cryptui/cryptui.rc:70 msgid "Please select a certificate store." -msgstr "請選取憑證儲存處。" +msgstr "請選取憑證存放區。" #: dlls/cryptui/cryptui.rc:72 msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." -msgstr "檔案含有不匹配給定準則的物件。請選取另一個檔案。" +msgstr "檔案含有不符合指定條件的物件。請選取另一個檔案。" #: dlls/cryptui/cryptui.rc:73 msgid "File to Import" @@ -2754,13 +2735,13 @@ msgstr "指定您要匯入的檔案。" #: dlls/cryptui/cryptui.rc:75 dlls/cryptui/cryptui.rc:98 msgid "Certificate Store" -msgstr "憑證儲存處" +msgstr "憑證存放區" #: dlls/cryptui/cryptui.rc:76 msgid "" "Certificate stores are collections of certificates, certificate revocation " "lists, and certificate trust lists." -msgstr "憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。" +msgstr "憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。" #: dlls/cryptui/cryptui.rc:77 msgid "X.509 Certificate (*.cer; *.crt)" @@ -2776,7 +2757,7 @@ msgstr "憑證撤銷清單 (*.crl)" #: dlls/cryptui/cryptui.rc:80 dlls/cryptui/cryptui.rc:159 msgid "Certificate Trust List (*.stl)" -msgstr "憑證信賴清單 (*.stl)" +msgstr "憑證信任清單 (*.stl)" #: dlls/cryptui/cryptui.rc:82 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" @@ -2800,11 +2781,11 @@ msgstr "由程式所決定" #: dlls/cryptui/cryptui.rc:88 msgid "Please select a store" -msgstr "請選取儲存處" +msgstr "請選取存放區" #: dlls/cryptui/cryptui.rc:89 msgid "Certificate Store Selected" -msgstr "憑證儲存處已選" +msgstr "已選取憑證存放區" #: dlls/cryptui/cryptui.rc:90 msgid "Automatically determined by the program" @@ -2832,7 +2813,7 @@ msgstr "個人資訊交換" #: dlls/cryptui/cryptui.rc:99 msgid "The import was successful." -msgstr "已成功匯入。" +msgstr "匯入成功。" #: dlls/cryptui/cryptui.rc:100 msgid "The import failed." @@ -2848,15 +2829,15 @@ msgstr "<進階目的>" #: dlls/cryptui/cryptui.rc:104 msgid "Issued To" -msgstr "發證對象" +msgstr "發證給" #: dlls/cryptui/cryptui.rc:105 msgid "Issued By" -msgstr "發證來源" +msgstr "簽發者" #: dlls/cryptui/cryptui.rc:106 dlls/wininet/wininet.rc:36 msgid "Expiration Date" -msgstr "過期日期" +msgstr "到期日期" #: dlls/cryptui/cryptui.rc:107 msgid "Friendly Name" @@ -2873,7 +2854,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證解密訊息，或用它簽署訊息。\n" -"確定要移除這個憑證？" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:111 msgid "" @@ -2882,7 +2863,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證解密訊息，或用它們簽署訊息。\n" -"確定要移除這些憑證？" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:112 msgid "" @@ -2891,21 +2872,16 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證加密訊息，或驗證以它簽署的訊息。\n" -"確定要移除這個憑證？" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證加密訊息，或驗證以它們簽署的訊息。\n" -"確定要移除這些憑證？" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:114 msgid "" @@ -2913,8 +2889,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個憑證授權者所發的憑證將不再被信賴。\n" -"確定要移除這個憑證？" +"由這個憑證授權單位所發的憑證將不再被信任。\n" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:115 msgid "" @@ -2922,8 +2898,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些憑證授權者所發的憑證將不再被信賴。\n" -"確定要移除這些憑證？" +"由這些憑證授權單位所發的憑證將不再被信任。\n" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:116 msgid "" @@ -2931,8 +2907,8 @@ msgid "" "certification authorities it issued, will no longer be trusted.\n" "Are you sure you want to remove this trusted root certificate?" msgstr "" -"由這個憑證授權者所發的憑證，或是任何由它發證的憑證授權者，將不再被信賴。\n" -"確定要移除這個信賴的根憑證？" +"由這個憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" +"確定要移除這個信任的根憑證?" #: dlls/cryptui/cryptui.rc:117 msgid "" @@ -2940,36 +2916,36 @@ msgid "" "certification authorities they issued, will no longer be trusted.\n" "Are you sure you want to remove these trusted root certificates?" msgstr "" -"由這些憑證授權者所發的憑證，或是任何由它們發證的憑證授權者，將不再被信賴。\n" -"確定要移除這些信賴的根憑證？" +"由這些憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" +"確定要移除這些信任的根憑證?" #: dlls/cryptui/cryptui.rc:118 msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個發行者簽署的軟體將不再被信賴。\n" -"確定要移除這個憑證？" +"由這個發行者簽署的軟體將將不再被信任。\n" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:119 msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些發行者簽署的軟體將不再被信賴。\n" -"確定要移除這些憑證？" +"由這些發行者簽署的軟體將不再被信任。\n" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" -msgstr "確定要移除這個憑證？" +msgstr "確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:121 msgid "Are you sure you want to remove these certificates?" -msgstr "確定要移除這些憑證？" +msgstr "確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" -msgstr "確保遠端電腦的身分" +msgstr "確認遠端電腦的身分" #: dlls/cryptui/cryptui.rc:125 msgid "Proves your identity to a remote computer" @@ -2980,8 +2956,8 @@ msgid "" "Ensures software came from software publisher\n" "Protects software from alteration after publication" msgstr "" -"請確認軟體是來自軟體發行者\n" -"保護軟體以避免發行之後的變更" +"確認軟體是來自軟體發行者\n" +"確保軟體在發行之後未被修改" #: dlls/cryptui/cryptui.rc:127 msgid "Protects e-mail messages" @@ -2997,15 +2973,15 @@ msgstr "允許以目前的時間簽署資料" #: dlls/cryptui/cryptui.rc:130 msgid "Allows you to digitally sign a certificate trust list" -msgstr "允許您數位簽署憑證信賴清單" +msgstr "允許您數位簽署憑證信任清單" #: dlls/cryptui/cryptui.rc:131 msgid "Allows data on disk to be encrypted" -msgstr "允許磁碟上的資料被加密" +msgstr "允許加密磁碟上的資料" #: dlls/cryptui/cryptui.rc:147 msgid "Private Key Archival" -msgstr "私鑰檔案的" +msgstr "私鑰檔案封存" #: dlls/cryptui/cryptui.rc:151 msgid "Export Format" @@ -3017,7 +2993,7 @@ msgstr "選擇將用來儲存內容的格式。" #: dlls/cryptui/cryptui.rc:153 msgid "Export Filename" -msgstr "匯出檔名" +msgstr "匯出檔案名稱" #: dlls/cryptui/cryptui.rc:154 msgid "Specify the name of the file in which the content will be saved." @@ -3025,7 +3001,7 @@ msgstr "指定將會儲存內容的檔案名稱。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案已經存在。您要取代它嗎?" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3057,7 +3033,7 @@ msgstr "匯出密鑰" #: dlls/cryptui/cryptui.rc:168 msgid "The export was successful." -msgstr "已成功匯出。" +msgstr "匯出成功。" #: dlls/cryptui/cryptui.rc:169 msgid "The export failed." @@ -3079,35 +3055,31 @@ msgstr "輸入密碼" #: dlls/cryptui/cryptui.rc:173 msgid "You may password-protect a private key." -msgstr "您可以以密碼保護私鑰。" +msgstr "您可以使用密碼來保護私鑰。" #: dlls/cryptui/cryptui.rc:174 msgid "The passwords do not match." -msgstr "密碼不匹配。" +msgstr "密碼不相符。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." -msgstr "註記：用於這個憑證的私鑰無法開啟。" +msgstr "註記: 用於這個憑證的私鑰無法開啟。" #: dlls/cryptui/cryptui.rc:176 msgid "Note: The private key for this certificate is not exportable." -msgstr "註記：用於這個憑證的私鑰不可匯出。" +msgstr "註記: 用於這個憑證的私鑰不可匯出。" #: dlls/cryptui/cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "預定目的(&N)：" +msgstr "預定目的" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:150 msgid "Location" msgstr "位置" #: dlls/cryptui/cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:181 programs/winefile/winefile.rc:101 #: programs/winhlp32/winhlp32.rc:110 programs/winhlp32/winhlp32.rc:85 @@ -3120,11 +3092,11 @@ msgstr "裝置設定" #: dlls/dinput/dinput.rc:39 msgid "Reset" -msgstr "重置" +msgstr "重設" #: dlls/dinput/dinput.rc:42 msgid "Player" -msgstr "玩家" +msgstr "播放器" #: dlls/dinput/dinput.rc:43 programs/winecfg/winecfg.rc:88 msgid "Device" @@ -3136,7 +3108,7 @@ msgstr "動作" #: dlls/dinput/dinput.rc:45 msgid "Mapping" -msgstr "映射" +msgstr "對應" #: dlls/dinput/dinput.rc:47 msgid "Show Assigned First" @@ -3188,7 +3160,7 @@ msgstr "阿拉伯語" #: dlls/gdi32/gdi32.rc:35 msgid "Baltic" -msgstr "波羅的海語" +msgstr "波羅的海語言" #: dlls/gdi32/gdi32.rc:36 msgid "Vietnamese" @@ -3204,19 +3176,19 @@ msgstr "日語" #: dlls/gdi32/gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "簡化字漢語" +msgstr "中文 (GB2312)" #: dlls/gdi32/gdi32.rc:40 msgid "Hangul" -msgstr "韓語諺文" +msgstr "韓語" #: dlls/gdi32/gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "傳統字漢語" +msgstr "中文 (BIG5)" #: dlls/gdi32/gdi32.rc:42 msgid "Hangul(Johab)" -msgstr "韓語諺文(組合型)" +msgstr "韓語 (Johab)" #: dlls/gdi32/gdi32.rc:43 msgid "Symbol" @@ -3237,7 +3209,7 @@ msgstr "照相機中的檔案" #: dlls/gphoto2.ds/gphoto2.rc:34 msgid "Import Selected" -msgstr "匯入選擇的檔案" +msgstr "匯入已選取檔案" #: dlls/gphoto2.ds/gphoto2.rc:35 msgid "Preview" @@ -3265,7 +3237,7 @@ msgstr "正在傳輸... 請稍候" #: dlls/gphoto2.ds/gphoto2.rc:51 msgid "Connecting to camera" -msgstr "連接照相機" +msgstr "正在連接照相機" #: dlls/gphoto2.ds/gphoto2.rc:55 msgid "Connecting to camera... Please Wait" @@ -3278,11 +3250,11 @@ msgstr "同步(&Y)" #: dlls/hhctrl.ocx/hhctrl.rc:60 dlls/hhctrl.ocx/hhctrl.rc:73 #: dlls/shdoclc/shdoclc.rc:41 programs/winhlp32/winhlp32.rc:89 msgid "&Back" -msgstr "返回(&B)" +msgstr "上一頁(&B)" #: dlls/hhctrl.ocx/hhctrl.rc:61 dlls/hhctrl.ocx/hhctrl.rc:74 msgid "&Forward" -msgstr "向前" +msgstr "下一頁(&F)" #: dlls/hhctrl.ocx/hhctrl.rc:62 msgctxt "table of contents" @@ -3314,10 +3286,8 @@ msgid "&View Source" msgstr "檢視原始碼(&V)" #: dlls/hhctrl.ocx/hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "屬性" +msgstr "內容(&T)" #: dlls/hhctrl.ocx/hhctrl.rc:87 dlls/shdoclc/shdoclc.rc:79 #: dlls/shdoclc/shdoclc.rc:93 dlls/shdoclc/shdoclc.rc:117 @@ -3388,7 +3358,7 @@ msgstr "重新整理" #: dlls/hhctrl.ocx/hhctrl.rc:46 dlls/ieframe/ieframe.rc:66 msgid "Back" -msgstr "返回" +msgstr "上一頁" #: dlls/hhctrl.ocx/hhctrl.rc:47 msgctxt "table of contents" @@ -3406,7 +3376,7 @@ msgstr "選項" #: dlls/hhctrl.ocx/hhctrl.rc:51 dlls/ieframe/ieframe.rc:67 msgid "Forward" -msgstr "向前" +msgstr "下一頁" #: dlls/iccvid/iccvid.rc:28 dlls/iccvid/iccvid.rc:29 msgid "Cinepak Video codec" @@ -3438,7 +3408,7 @@ msgstr "開啟(&O)..." #: dlls/ieframe/ieframe.rc:36 programs/notepad/notepad.rc:33 #: programs/wordpad/wordpad.rc:34 msgid "Save &as..." -msgstr "另存為(&A)..." +msgstr "另存新檔(&A)..." #: dlls/ieframe/ieframe.rc:38 msgid "Print &format..." @@ -3478,7 +3448,7 @@ msgstr "關於 Internet Explorer(&A)" #: dlls/ieframe/ieframe.rc:90 msgid "Open URL" -msgstr "開啟連結(&O)" +msgstr "開啟連結" #: dlls/ieframe/ieframe.rc:93 msgid "Specify the URL you wish to open in Internet Explorer" @@ -3486,7 +3456,7 @@ msgstr "指定您希望在 Internet Explorer 中開啟的網址" #: dlls/ieframe/ieframe.rc:94 msgid "Open:" -msgstr "開啟：" +msgstr "開啟:" #: dlls/ieframe/ieframe.rc:70 msgctxt "home page" @@ -3539,11 +3509,11 @@ msgstr "空白頁面(&B)" #: dlls/inetcpl.cpl/inetcpl.rc:56 msgid "Browsing history" -msgstr "瀏覽歷程" +msgstr "瀏覽歷程記錄" #: dlls/inetcpl.cpl/inetcpl.rc:57 msgid "You can delete cached pages, cookies and other data." -msgstr "您可以刪除網頁快取、訊餅和其他資料。" +msgstr "您可以刪除網頁快取、Cookie 以及其他資料。" #: dlls/inetcpl.cpl/inetcpl.rc:59 msgid "Delete &files..." @@ -3555,7 +3525,7 @@ msgstr "設定(&S)..." #: dlls/inetcpl.cpl/inetcpl.rc:68 msgid "Delete browsing history" -msgstr "刪除瀏覽歷程" +msgstr "刪除瀏覽歷程記錄" #: dlls/inetcpl.cpl/inetcpl.rc:71 msgid "" @@ -3571,7 +3541,7 @@ msgid "" "Files saved on your computer by websites, which store things like user " "preferences and login information." msgstr "" -"訊餅\n" +"Cookies\n" "由網站儲存於您電腦的檔案，其存有諸如使用者偏好設定和登入資訊。" #: dlls/inetcpl.cpl/inetcpl.rc:75 @@ -3579,7 +3549,7 @@ msgid "" "History\n" "List of websites you have accessed." msgstr "" -"歷程\n" +"歷程記錄\n" "您曾存取過的網站清單。" #: dlls/inetcpl.cpl/inetcpl.rc:77 @@ -3606,7 +3576,7 @@ msgstr "刪除" msgid "" "Certificates are used for your personal identification and to identify " "certificate authorities and publishers." -msgstr "憑證是做為您的個人識別，以及識別憑證授權機構和發行者。" +msgstr "憑證是用於您的個人識別，以及識別憑證授權單位和發行者。" #: dlls/inetcpl.cpl/inetcpl.rc:114 msgid "Certificates..." @@ -3617,46 +3587,36 @@ msgid "Publishers..." msgstr "發行者..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "區域網路連線" +msgstr "連線" #: dlls/inetcpl.cpl/inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 設定" +msgstr "自動設定" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "使用 Web Proxy Auto-Discovery (WPAD)" #: dlls/inetcpl.cpl/inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "使用 Proxy Auto-Config (PAC) 指令碼" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "位址" +msgstr "位址:" #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "本機伺服器(&L)" +msgstr "代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "使用代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "無連接埠" +msgstr "連接埠:" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3668,7 +3628,7 @@ msgstr "設定 Wine 網際網路瀏覽器和相關的設定。" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "區域的安全設定：" +msgstr "此區域的安全設定:" #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3680,7 +3640,7 @@ msgstr "非常低" #: dlls/inetcpl.cpl/inetcpl.rc:36 dlls/wininet/wininet.rc:42 msgid "Low" -msgstr "慢" +msgstr "低" #: dlls/inetcpl.cpl/inetcpl.rc:37 msgid "Medium" @@ -3688,7 +3648,7 @@ msgstr "中" #: dlls/inetcpl.cpl/inetcpl.rc:38 msgid "Increased" -msgstr "已增加" +msgstr "稍高" #: dlls/inetcpl.cpl/inetcpl.rc:39 dlls/wininet/wininet.rc:41 msgid "High" @@ -3703,30 +3663,24 @@ msgid "&Disable" msgstr "停用(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "重置" +msgstr "重設(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "啟用(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "編輯覆載設定" +msgstr "覆寫(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" -msgstr "已連線" +msgstr "已連接" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "語音輸入裝置：" +msgstr "已連接 (xinput 裝置)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3736,7 +3690,7 @@ msgstr "已停用" msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." -msgstr "停用或啟用裝置之後，已連線的搖桿將無法更新，直到您重新啟動這個小程式。" +msgstr "停用或啟用裝置之後，已連接的搖桿將無法更新，直到您重新啟動這個程式。" #: dlls/joy.cpl/joy.rc:55 msgid "Test Joystick" @@ -3759,8 +3713,8 @@ msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" -"請按下控制器中的任何按鈕以啟用所選的效果。效果的方向可以利用控制器的軸向來變" -"更。" +"請按下控制器中的任何按鈕以啟用所選的效果。" +"效果的方向可以利用控制器的軸向來變更。" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers" @@ -3768,7 +3722,7 @@ msgstr "遊戲控制器" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "測試和設定遊戲控制器。" #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3783,10 +3737,8 @@ msgid "Subscript out of range" msgstr "註標超出範圍" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "無紙；" +msgstr "堆疊空間不足" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3802,7 +3754,7 @@ msgstr "物件不支援這個屬性或方法" #: dlls/jscript/jscript.rc:35 dlls/vbscript/vbscript.rc:50 msgid "Object doesn't support this action" -msgstr "物件不支援此動作" +msgstr "物件不支援這個動作" #: dlls/jscript/jscript.rc:36 msgid "Argument not optional" @@ -3814,27 +3766,23 @@ msgstr "語法錯誤" #: dlls/jscript/jscript.rc:38 msgid "Expected ';'" -msgstr "預期為 ;" +msgstr "預期為 ';'" #: dlls/jscript/jscript.rc:39 msgid "Expected '('" -msgstr "預期為 (" +msgstr "預期為 '('" #: dlls/jscript/jscript.rc:40 msgid "Expected ')'" -msgstr "預期為 )" +msgstr "預期為 ')'" #: dlls/jscript/jscript.rc:41 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "主體金鑰識別碼" +msgstr "預期為識別碼" #: dlls/jscript/jscript.rc:42 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "預期為 ;" +msgstr "預期為 '='" #: dlls/jscript/jscript.rc:43 msgid "Invalid character" @@ -3846,15 +3794,15 @@ msgstr "未終結的字串常數" #: dlls/jscript/jscript.rc:45 msgid "'return' statement outside of function" -msgstr "return 敘述位於函式之外" +msgstr "'return' 敘述位於函式之外" #: dlls/jscript/jscript.rc:46 msgid "Can't have 'break' outside of loop" -msgstr "在迴圈之外不可有 break" +msgstr "在迴圈之外不可有 'break'" #: dlls/jscript/jscript.rc:47 msgid "Can't have 'continue' outside of loop" -msgstr "在迴圈之外不可有 continue" +msgstr "在迴圈之外不可有 'continue'" #: dlls/jscript/jscript.rc:48 msgid "Label redefined" @@ -3865,38 +3813,32 @@ msgid "Label not found" msgstr "找不到標貼" #: dlls/jscript/jscript.rc:50 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "預期為 ;" +msgstr "預期為 '@end'" #: dlls/jscript/jscript.rc:51 msgid "Conditional compilation is turned off" -msgstr "條件編譯已被關閉" +msgstr "條件編譯已關閉" #: dlls/jscript/jscript.rc:52 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "預期為 ;" +msgstr "預期為 '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript 編譯錯誤" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 執行期錯誤" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "未知錯誤" +msgstr "不明執行期錯誤" #: dlls/jscript/jscript.rc:55 msgid "Number expected" -msgstr "預期為編號" +msgstr "預期為數字" #: dlls/jscript/jscript.rc:53 msgid "Function expected" @@ -3904,7 +3846,7 @@ msgstr "預期為函式" #: dlls/jscript/jscript.rc:54 msgid "'[object]' is not a date object" -msgstr "[object] 並非日期物件" +msgstr "'[object]' 並非日期物件" #: dlls/jscript/jscript.rc:56 msgid "Object expected" @@ -3916,11 +3858,11 @@ msgstr "不合法的指派" #: dlls/jscript/jscript.rc:58 msgid "'|' is undefined" -msgstr "| 未定義" +msgstr "'|' 未定義" #: dlls/jscript/jscript.rc:59 msgid "Boolean object expected" -msgstr "預期為布林物件" +msgstr "預期為布林值物件" #: dlls/jscript/jscript.rc:60 msgid "Cannot delete '|'" @@ -3935,16 +3877,12 @@ msgid "JScript object expected" msgstr "預期為 JScript 物件" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "預期為陣列物件" +msgstr "預期為列舉器物件" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "預期為布林物件" +msgstr "預期為正規表示式" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3952,7 +3890,7 @@ msgstr "正規表示式語法發生錯誤" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "發生異常且未被捕捉" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -3982,33 +3920,31 @@ msgstr "預期為陣列物件" msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" -msgstr "" +msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 'true'" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "無法定義屬性 '|': 物件不能擴展" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "無法重新定義不可設定的屬性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "[object] 並非日期物件" +msgstr "'this' 不是 Map 物件" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "屬性不可同時有存取子和值" #: include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine 核心 DLL" #: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32 #: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137 @@ -4041,7 +3977,7 @@ msgstr "存取被拒。\n" #: dlls/kernel32/winerror.mc:58 msgid "Invalid handle.\n" -msgstr "無效的控柄。\n" +msgstr "無效的控制代碼。\n" #: dlls/kernel32/winerror.mc:63 msgid "Memory trashed.\n" @@ -4057,11 +3993,11 @@ msgstr "無效的區塊。\n" #: dlls/kernel32/winerror.mc:78 msgid "Bad environment.\n" -msgstr "不當的環境。\n" +msgstr "不良的環境。\n" #: dlls/kernel32/winerror.mc:83 msgid "Bad format.\n" -msgstr "不當的格式。\n" +msgstr "錯誤的格式。\n" #: dlls/kernel32/winerror.mc:88 msgid "Invalid access.\n" @@ -4081,7 +4017,7 @@ msgstr "無效的儲存裝置。\n" #: dlls/kernel32/winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "無法刪除現行目錄。\n" +msgstr "無法刪除目前的目錄。\n" #: dlls/kernel32/winerror.mc:113 msgid "Not same device.\n" @@ -4089,15 +4025,15 @@ msgstr "並非相同裝置。\n" #: dlls/kernel32/winerror.mc:118 msgid "No more files.\n" -msgstr "沒有檔案了。\n" +msgstr "沒有更多檔案。\n" #: dlls/kernel32/winerror.mc:123 msgid "Write protected.\n" -msgstr "防止寫入的。\n" +msgstr "已設定寫入保護。\n" #: dlls/kernel32/winerror.mc:128 msgid "Bad unit.\n" -msgstr "不當的單位。\n" +msgstr "錯誤的單位。\n" #: dlls/kernel32/winerror.mc:133 msgid "Not ready.\n" @@ -4105,7 +4041,7 @@ msgstr "未就緒。\n" #: dlls/kernel32/winerror.mc:138 msgid "Bad command.\n" -msgstr "不當的命令。\n" +msgstr "錯誤的命令。\n" #: dlls/kernel32/winerror.mc:143 msgid "CRC error.\n" @@ -4113,7 +4049,7 @@ msgstr "循環冗餘檢查錯誤。\n" #: dlls/kernel32/winerror.mc:148 msgid "Bad length.\n" -msgstr "不當長度。\n" +msgstr "長度錯誤。\n" #: dlls/kernel32/winerror.mc:153 dlls/kernel32/winerror.mc:528 msgid "Seek error.\n" @@ -4181,7 +4117,7 @@ msgstr "重複的網路名稱。\n" #: dlls/kernel32/winerror.mc:233 msgid "Bad network path.\n" -msgstr "不當的網路路徑。\n" +msgstr "錯誤的網路路徑。\n" #: dlls/kernel32/winerror.mc:238 msgid "Network busy.\n" @@ -4197,11 +4133,11 @@ msgstr "太多命令。\n" #: dlls/kernel32/winerror.mc:253 msgid "Adapter hardware error.\n" -msgstr "調適器硬體錯誤。\n" +msgstr "介面卡硬體錯誤。\n" #: dlls/kernel32/winerror.mc:258 msgid "Bad network response.\n" -msgstr "不當的網路回應。\n" +msgstr "不良的網路回應。\n" #: dlls/kernel32/winerror.mc:263 msgid "Unexpected network error.\n" @@ -4209,7 +4145,7 @@ msgstr "未預期的網路錯誤。\n" #: dlls/kernel32/winerror.mc:268 msgid "Bad remote adapter.\n" -msgstr "不當的遠端調適器。\n" +msgstr "不良的遠端介面卡。\n" #: dlls/kernel32/winerror.mc:273 msgid "Print queue full.\n" @@ -4233,11 +4169,11 @@ msgstr "存取網路被拒絕。\n" #: dlls/kernel32/winerror.mc:298 msgid "Bad device type.\n" -msgstr "不當的裝置類型。\n" +msgstr "錯誤的裝置類型。\n" #: dlls/kernel32/winerror.mc:303 msgid "Bad network name.\n" -msgstr "不當的網路名稱。\n" +msgstr "錯誤的網路名稱。\n" #: dlls/kernel32/winerror.mc:308 msgid "Too many network names.\n" @@ -4245,7 +4181,7 @@ msgstr "太多網路名稱。\n" #: dlls/kernel32/winerror.mc:313 msgid "Too many network sessions.\n" -msgstr "太多網路執行期間。\n" +msgstr "太多網路工作階段。\n" #: dlls/kernel32/winerror.mc:318 msgid "Sharing paused.\n" @@ -4293,23 +4229,23 @@ msgstr "網路寫入錯誤。\n" #: dlls/kernel32/winerror.mc:373 msgid "No process slots.\n" -msgstr "沒有行程插槽。\n" +msgstr "沒有線程插槽。\n" #: dlls/kernel32/winerror.mc:378 msgid "Too many semaphores.\n" -msgstr "太多號誌。\n" +msgstr "太多旗號。\n" #: dlls/kernel32/winerror.mc:383 msgid "Exclusive semaphore already owned.\n" -msgstr "已擁有互斥號誌。\n" +msgstr "已擁有專屬旗號。\n" #: dlls/kernel32/winerror.mc:388 msgid "Semaphore is set.\n" -msgstr "已設定號誌。\n" +msgstr "已設定旗號。\n" #: dlls/kernel32/winerror.mc:393 msgid "Too many semaphore requests.\n" -msgstr "太多號誌要求。\n" +msgstr "太多旗號要求。\n" #: dlls/kernel32/winerror.mc:398 msgid "Invalid at interrupt time.\n" @@ -4317,11 +4253,11 @@ msgstr "於插斷時間無效。\n" #: dlls/kernel32/winerror.mc:403 msgid "Semaphore owner died.\n" -msgstr "號誌擁有者已死。\n" +msgstr "旗號擁有者已終止。\n" #: dlls/kernel32/winerror.mc:408 msgid "Semaphore user limit.\n" -msgstr "號誌使用者限制。\n" +msgstr "旗號使用者限制。\n" #: dlls/kernel32/winerror.mc:413 msgid "Insert disk for drive %1.\n" @@ -4329,7 +4265,7 @@ msgstr "插入磁碟於儲存裝置 %1。\n" #: dlls/kernel32/winerror.mc:418 msgid "Drive locked.\n" -msgstr "已鎖定儲存裝置。\n" +msgstr "儲存裝置已鎖定。\n" #: dlls/kernel32/winerror.mc:423 msgid "Broken pipe.\n" @@ -4345,11 +4281,11 @@ msgstr "緩衝區溢位。\n" #: dlls/kernel32/winerror.mc:443 msgid "No more search handles.\n" -msgstr "沒有搜尋控柄了。\n" +msgstr "沒有更多搜尋控制代碼。\n" #: dlls/kernel32/winerror.mc:448 msgid "Invalid target handle.\n" -msgstr "無效的目標控柄。\n" +msgstr "無效的目標控制代碼。\n" #: dlls/kernel32/winerror.mc:453 msgid "Invalid IOCTL.\n" @@ -4369,7 +4305,7 @@ msgstr "呼叫尚未實作。\n" #: dlls/kernel32/winerror.mc:473 msgid "Semaphore timeout.\n" -msgstr "號誌逾時。\n" +msgstr "旗號逾時。\n" #: dlls/kernel32/winerror.mc:478 msgid "Insufficient buffer.\n" @@ -4385,7 +4321,7 @@ msgstr "無效的層級。\n" #: dlls/kernel32/winerror.mc:493 msgid "No volume label.\n" -msgstr "沒有卷冊標貼。\n" +msgstr "沒有磁碟區標籤。\n" #: dlls/kernel32/winerror.mc:498 msgid "Module not found.\n" @@ -4405,7 +4341,7 @@ msgstr "子行程還未完成。\n" #: dlls/kernel32/winerror.mc:518 msgid "Invalid use of direct access handle.\n" -msgstr "直接存取控柄的使用無效。\n" +msgstr "直接存取控制代碼的使用無效。\n" #: dlls/kernel32/winerror.mc:523 msgid "Negative seek.\n" @@ -4433,19 +4369,19 @@ msgstr "儲存裝置未被 SUBST。\n" #: dlls/kernel32/winerror.mc:558 msgid "Attempt to JOIN onto a JOINed drive.\n" -msgstr "試圖 JOIN 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:563 msgid "Attempt to SUBST onto a SUBSTed drive.\n" -msgstr "試圖 SUBST 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:568 msgid "Attempt to JOIN to a SUBSTed drive.\n" -msgstr "試圖 JOIN 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:573 msgid "Attempt to SUBST to a JOINed drive.\n" -msgstr "試圖 SUBST 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:578 msgid "Drive is busy.\n" @@ -4489,7 +4425,7 @@ msgstr "用於 DosMuxSemWait 的事件計數不正確。\n" #: dlls/kernel32/winerror.mc:628 msgid "Too many waiters for DosMuxSemWait.\n" -msgstr "太多 DosMuxSemWait 的等待者。\n" +msgstr "太多 DosMuxSemWait 的等待項。\n" #: dlls/kernel32/winerror.mc:633 msgid "DosSemMuxWait list invalid.\n" @@ -4497,11 +4433,11 @@ msgstr "DosSemMuxWait 清單無效。\n" #: dlls/kernel32/winerror.mc:638 msgid "Volume label too long.\n" -msgstr "卷冊標貼太長。\n" +msgstr "磁碟區標籤太長。\n" #: dlls/kernel32/winerror.mc:643 msgid "Too many TCBs.\n" -msgstr "太多 TCBs。\n" +msgstr "太多 TCB。\n" #: dlls/kernel32/winerror.mc:648 msgid "Signal refused.\n" @@ -4517,11 +4453,11 @@ msgstr "無法鎖定資料段。\n" #: dlls/kernel32/winerror.mc:663 msgid "Bad thread ID address.\n" -msgstr "不當的執行緒識別號位址。\n" +msgstr "錯誤的執行緒識別碼位址。\n" #: dlls/kernel32/winerror.mc:668 msgid "Bad arguments to DosExecPgm.\n" -msgstr "不當的 DosExecPgm 引數。\n" +msgstr "錯誤的 DosExecPgm 引數。\n" #: dlls/kernel32/winerror.mc:673 msgid "Path is invalid.\n" @@ -4569,7 +4505,7 @@ msgstr "無效的旗標號碼。\n" #: dlls/kernel32/winerror.mc:728 msgid "Semaphore name not found.\n" -msgstr "找不到號誌名稱。\n" +msgstr "找不到旗號名稱。\n" #: dlls/kernel32/winerror.mc:733 msgid "Invalid starting code segment for %1.\n" @@ -4593,7 +4529,7 @@ msgstr "EXE %1 被標記為無效。\n" #: dlls/kernel32/winerror.mc:758 msgid "Bad EXE format for %1.\n" -msgstr "%1 的不當 EXE 格式。\n" +msgstr "%1 是錯誤的 EXE 格式。\n" #: dlls/kernel32/winerror.mc:763 msgid "Iterated data exceeds 64k in %1.\n" @@ -4673,19 +4609,19 @@ msgstr "不允許巢狀 LoadModule 呼叫。\n" #: dlls/kernel32/winerror.mc:858 msgid "Machine type mismatch.\n" -msgstr "機器型態不匹配。\n" +msgstr "機器類型不相符。\n" #: dlls/kernel32/winerror.mc:863 msgid "Bad pipe.\n" -msgstr "不當的管線。\n" +msgstr "錯誤的管線。\n" #: dlls/kernel32/winerror.mc:868 msgid "Pipe busy.\n" -msgstr "管線忙碌。\n" +msgstr "管線忙碌中。\n" #: dlls/kernel32/winerror.mc:873 msgid "Pipe closed.\n" -msgstr "管線關閉。\n" +msgstr "管線已關閉。\n" #: dlls/kernel32/winerror.mc:878 msgid "Pipe not connected.\n" @@ -4693,11 +4629,11 @@ msgstr "管線未連接。\n" #: dlls/kernel32/winerror.mc:883 msgid "More data available.\n" -msgstr "更多資料可用。\n" +msgstr "有更多可用資料。\n" #: dlls/kernel32/winerror.mc:888 msgid "Session canceled.\n" -msgstr "已取消工作階段。\n" +msgstr "工作階段已取消。\n" #: dlls/kernel32/winerror.mc:893 msgid "Invalid extended attribute name.\n" @@ -4733,7 +4669,7 @@ msgstr "進階屬性表格已滿。\n" #: dlls/kernel32/winerror.mc:933 msgid "Invalid extended attribute handle.\n" -msgstr "無效的進階屬性控柄。\n" +msgstr "無效的進階屬性控制代碼。\n" #: dlls/kernel32/winerror.mc:938 msgid "Extended attributes not supported.\n" @@ -4745,7 +4681,7 @@ msgstr "Mutex 非由呼叫者所擁有。\n" #: dlls/kernel32/winerror.mc:948 msgid "Too many posts to semaphore.\n" -msgstr "號誌太多貼文。\n" +msgstr "旗號太多貼文。\n" #: dlls/kernel32/winerror.mc:953 msgid "Read/WriteProcessMemory partially completed.\n" @@ -4753,7 +4689,7 @@ msgstr "讀取/寫入行程記憶體已部分完成。\n" #: dlls/kernel32/winerror.mc:958 msgid "The oplock wasn't granted.\n" -msgstr "未被授與 oplock。\n" +msgstr "未授權 oplock。\n" #: dlls/kernel32/winerror.mc:963 msgid "Invalid oplock message received.\n" @@ -4821,7 +4757,7 @@ msgstr "無效的旗標。\n" #: dlls/kernel32/winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "無法辨識的卷冊。\n" +msgstr "無法辨識的磁碟區。\n" #: dlls/kernel32/winerror.mc:1048 msgid "File invalid.\n" @@ -4833,7 +4769,7 @@ msgstr "無法全螢幕運行。\n" #: dlls/kernel32/winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "不存在的字組。\n" +msgstr "不存在的權杖。\n" #: dlls/kernel32/winerror.mc:1063 msgid "Registry corrupt.\n" @@ -4885,7 +4821,7 @@ msgstr "註冊表索引鍵有子項。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子項必須是易變的。\n" +msgstr "子項必須是可變的。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -4937,7 +4873,7 @@ msgstr "服務無法接受控制訊息。\n" #: dlls/kernel32/winerror.mc:1188 msgid "Service not active.\n" -msgstr "服務現未啟用。\n" +msgstr "服務尚未啟用。\n" #: dlls/kernel32/winerror.mc:1193 msgid "Service controller connect failed.\n" @@ -4985,7 +4921,7 @@ msgstr "服務已存在。\n" #: dlls/kernel32/winerror.mc:1248 msgid "System running last-known-good config.\n" -msgstr "系統執行最後已知正常的組配。\n" +msgstr "系統執行最近已知正常的組配。\n" #: dlls/kernel32/winerror.mc:1253 msgid "Service dependency deleted.\n" @@ -4993,11 +4929,11 @@ msgstr "服務相依性已刪除。\n" #: dlls/kernel32/winerror.mc:1258 msgid "Boot already accepted as last-good config.\n" -msgstr "開機已被接受為最後正常的組配。\n" +msgstr "開機已接受為上次正常的組配。\n" #: dlls/kernel32/winerror.mc:1263 msgid "Service not started since last boot.\n" -msgstr "服務自從最後一次開機即無法啟動。\n" +msgstr "服務自上次開機之後尚未啟動。\n" #: dlls/kernel32/winerror.mc:1268 msgid "Duplicate service name.\n" @@ -5013,11 +4949,11 @@ msgstr "無法偵測到驅動程式的失敗。\n" #: dlls/kernel32/winerror.mc:1283 msgid "Process abort cannot be detected.\n" -msgstr "無法偵測到行程中止。\n" +msgstr "無法偵測到處理程序中止。\n" #: dlls/kernel32/winerror.mc:1288 msgid "No recovery program for service.\n" -msgstr "沒有復原程式用於服務。\n" +msgstr "服務沒有復原程式。\n" #: dlls/kernel32/winerror.mc:1293 msgid "Service not implemented by exe.\n" @@ -5053,7 +4989,7 @@ msgstr "無效的區塊長度。\n" #: dlls/kernel32/winerror.mc:1333 msgid "Device not partitioned.\n" -msgstr "裝置未設分割區。\n" +msgstr "裝置未設定分割區。\n" #: dlls/kernel32/winerror.mc:1338 msgid "Unable to lock media.\n" @@ -5080,8 +5016,6 @@ msgid "No Unicode translation.\n" msgstr "沒有萬國碼轉譯。\n" #: dlls/kernel32/winerror.mc:1368 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "動態連結函式庫初始失敗。\n" @@ -5115,7 +5049,7 @@ msgstr "序列 I/O 計數器逾時。\n" #: dlls/kernel32/winerror.mc:1408 msgid "Floppy ID address mark not found.\n" -msgstr "找不到軟碟識別號位址標記。\n" +msgstr "找不到軟碟識別碼位址標記。\n" #: dlls/kernel32/winerror.mc:1413 msgid "Floppy reports wrong cylinder.\n" @@ -5123,7 +5057,7 @@ msgstr "軟碟回報錯誤的磁柱。\n" #: dlls/kernel32/winerror.mc:1418 msgid "Unknown floppy error.\n" -msgstr "未知的軟碟錯誤。\n" +msgstr "不明的軟碟錯誤。\n" #: dlls/kernel32/winerror.mc:1423 msgid "Floppy registers inconsistent.\n" @@ -5167,7 +5101,7 @@ msgstr "設定電源狀態失敗。\n" #: dlls/kernel32/winerror.mc:1473 msgid "Too many links.\n" -msgstr "太多鏈結。\n" +msgstr "太多連結。\n" #: dlls/kernel32/winerror.mc:1478 msgid "Newer Windows version needed.\n" @@ -5203,7 +5137,7 @@ msgstr "找不到 DLL 檔。\n" #: dlls/kernel32/winerror.mc:1518 msgid "Out of user handles.\n" -msgstr "超出使用者控柄。\n" +msgstr "超出使用者控制代碼。\n" #: dlls/kernel32/winerror.mc:1523 msgid "Message can only be used in synchronous calls.\n" @@ -5231,7 +5165,7 @@ msgstr "裝置需要重新初始化。\n" #: dlls/kernel32/winerror.mc:1553 msgid "The device requires cleaning.\n" -msgstr "裝置需要清潔。\n" +msgstr "裝置需要清理。\n" #: dlls/kernel32/winerror.mc:1558 msgid "The device door is open.\n" @@ -5259,11 +5193,11 @@ msgstr "找不到點。\n" #: dlls/kernel32/winerror.mc:1588 msgid "No running tracking service.\n" -msgstr "沒在執行追蹤服務。\n" +msgstr "沒有執行中的追蹤服務。\n" #: dlls/kernel32/winerror.mc:1593 msgid "No such volume ID.\n" -msgstr "沒有此類卷冊識別號。\n" +msgstr "沒有此類磁碟區識別碼。\n" #: dlls/kernel32/winerror.mc:1598 msgid "Unable to remove the file to be replaced.\n" @@ -5283,11 +5217,11 @@ msgstr "正在刪除日誌。\n" #: dlls/kernel32/winerror.mc:1618 msgid "The journal is not active.\n" -msgstr "日誌現未啟用。\n" +msgstr "日誌尚未啟用。\n" #: dlls/kernel32/winerror.mc:1623 msgid "Potential matching file found.\n" -msgstr "找到可能的匹配檔案。\n" +msgstr "找到可能的相符檔案。\n" #: dlls/kernel32/winerror.mc:1628 msgid "The journal entry was deleted.\n" @@ -5299,7 +5233,7 @@ msgstr "無效的裝置名稱。\n" #: dlls/kernel32/winerror.mc:1638 msgid "Connection unavailable.\n" -msgstr "連接不得使用。\n" +msgstr "連接無法使用。\n" #: dlls/kernel32/winerror.mc:1643 msgid "Device already remembered.\n" @@ -5307,7 +5241,7 @@ msgstr "裝置已被記住。\n" #: dlls/kernel32/winerror.mc:1648 msgid "No network or bad path.\n" -msgstr "沒有網路或不當的路徑。\n" +msgstr "沒有網路或錯誤的路徑。\n" #: dlls/kernel32/winerror.mc:1653 msgid "Invalid network provider name.\n" @@ -5315,11 +5249,11 @@ msgstr "無效的網路提供者名稱。\n" #: dlls/kernel32/winerror.mc:1658 msgid "Cannot open network connection profile.\n" -msgstr "無法開啟網路連線側寫檔。\n" +msgstr "無法開啟網路連線設定檔。\n" #: dlls/kernel32/winerror.mc:1663 msgid "Corrupt network connection profile.\n" -msgstr "損壞的網路連線側寫檔。\n" +msgstr "損壞的網路連線設定檔。\n" #: dlls/kernel32/winerror.mc:1668 msgid "Not a container.\n" @@ -5327,7 +5261,7 @@ msgstr "不是一個容器。\n" #: dlls/kernel32/winerror.mc:1673 msgid "Extended error.\n" -msgstr "進階錯誤。\n" +msgstr "延伸錯誤。\n" #: dlls/kernel32/winerror.mc:1678 msgid "Invalid group name.\n" @@ -5367,11 +5301,11 @@ msgstr "無效的訊息目的地。\n" #: dlls/kernel32/winerror.mc:1728 msgid "Session credential conflict.\n" -msgstr "作業階段憑據發生衝突。\n" +msgstr "工作階段憑據發生衝突。\n" #: dlls/kernel32/winerror.mc:1733 msgid "Remote session limit exceeded.\n" -msgstr "已超出遠端作業階段限制。\n" +msgstr "已超出遠端工作階段限制。\n" #: dlls/kernel32/winerror.mc:1738 msgid "Duplicate domain or workgroup name.\n" @@ -5395,7 +5329,7 @@ msgstr "連線被拒。\n" #: dlls/kernel32/winerror.mc:1763 msgid "Connection gracefully closed.\n" -msgstr "已平順關閉連接。\n" +msgstr "已順利關閉連線。\n" #: dlls/kernel32/winerror.mc:1768 msgid "Address already associated with transport endpoint.\n" @@ -5411,23 +5345,23 @@ msgstr "連線無效。\n" #: dlls/kernel32/winerror.mc:1783 msgid "Connection is active.\n" -msgstr "連接現正使用。\n" +msgstr "連線現正使用。\n" #: dlls/kernel32/winerror.mc:1788 msgid "Network unreachable.\n" -msgstr "無法連線網路。\n" +msgstr "網路無法連線。\n" #: dlls/kernel32/winerror.mc:1793 msgid "Host unreachable.\n" -msgstr "無法連線主機。\n" +msgstr "主機無法連線。\n" #: dlls/kernel32/winerror.mc:1798 msgid "Protocol unreachable.\n" -msgstr "無法連線協定。\n" +msgstr "協定無法連線。\n" #: dlls/kernel32/winerror.mc:1803 msgid "Port unreachable.\n" -msgstr "無法連線通訊埠。\n" +msgstr "通訊埠無法連線。\n" #: dlls/kernel32/winerror.mc:1808 msgid "Request aborted.\n" @@ -5435,7 +5369,7 @@ msgstr "已放棄要求。\n" #: dlls/kernel32/winerror.mc:1813 msgid "Connection aborted.\n" -msgstr "已放棄連接。\n" +msgstr "已放棄連線。\n" #: dlls/kernel32/winerror.mc:1818 msgid "Please retry operation.\n" @@ -5471,7 +5405,7 @@ msgstr "使用者未被認證。\n" #: dlls/kernel32/winerror.mc:1858 msgid "User not logged on.\n" -msgstr "使用者未被記錄。\n" +msgstr "使用者未登入。\n" #: dlls/kernel32/winerror.mc:1863 msgid "Continue work in progress.\n" @@ -5503,7 +5437,7 @@ msgstr "即使沒有變更任何東西時也進行作業。\n" #: dlls/kernel32/winerror.mc:1898 msgid "The user profile is invalid.\n" -msgstr "使用者側寫檔無效。\n" +msgstr "使用者設定檔無效。\n" #: dlls/kernel32/winerror.mc:1903 msgid "Not supported on Small Business Server.\n" @@ -5515,7 +5449,7 @@ msgstr "並非所有權限都被指派。\n" #: dlls/kernel32/winerror.mc:1913 msgid "Some security IDs not mapped.\n" -msgstr "某些安全識別號未對應。\n" +msgstr "某些安全識別碼未對應。\n" #: dlls/kernel32/winerror.mc:1918 msgid "No quotas for account.\n" @@ -5547,7 +5481,7 @@ msgstr "無效的主要群組。\n" #: dlls/kernel32/winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "沒有假冒字組。\n" +msgstr "沒有模擬權杖。\n" #: dlls/kernel32/winerror.mc:1958 msgid "Can't disable mandatory group.\n" @@ -5555,11 +5489,11 @@ msgstr "無法停用必要群組。\n" #: dlls/kernel32/winerror.mc:1963 msgid "No logon servers available.\n" -msgstr "沒有可用的登錄伺服器。\n" +msgstr "沒有可用的登入伺服器。\n" #: dlls/kernel32/winerror.mc:1968 msgid "No such logon session.\n" -msgstr "沒有此類登錄作業階段。\n" +msgstr "沒有此類登入工作階段。\n" #: dlls/kernel32/winerror.mc:1973 msgid "No such privilege.\n" @@ -5623,7 +5557,7 @@ msgstr "帳號限制。\n" #: dlls/kernel32/winerror.mc:2048 msgid "Invalid logon hours.\n" -msgstr "無效的登錄時數。\n" +msgstr "無效的登入時數。\n" #: dlls/kernel32/winerror.mc:2053 msgid "Invalid workstation.\n" @@ -5639,7 +5573,7 @@ msgstr "帳號已停用。\n" #: dlls/kernel32/winerror.mc:2068 msgid "No security ID mapped.\n" -msgstr "沒有對應的安全識別號。\n" +msgstr "沒有對應的安全識別碼。\n" #: dlls/kernel32/winerror.mc:2073 msgid "Too many LUIDs requested.\n" @@ -5667,7 +5601,7 @@ msgstr "無效的安全描述元。\n" #: dlls/kernel32/winerror.mc:2103 msgid "Bad inherited ACL.\n" -msgstr "不當繼承的 ACL。\n" +msgstr "錯誤繼承的 ACL。\n" #: dlls/kernel32/winerror.mc:2108 msgid "Server disabled.\n" @@ -5679,7 +5613,7 @@ msgstr "伺服器未停用。\n" #: dlls/kernel32/winerror.mc:2118 msgid "Invalid ID authority.\n" -msgstr "無效的識別號授權。\n" +msgstr "無效的識別碼授權。\n" #: dlls/kernel32/winerror.mc:2123 msgid "Allotted space exceeded.\n" @@ -5691,19 +5625,19 @@ msgstr "無效的群組屬性。\n" #: dlls/kernel32/winerror.mc:2133 msgid "Bad impersonation level.\n" -msgstr "不當的假冒等級。\n" +msgstr "錯誤的模擬等級。\n" #: dlls/kernel32/winerror.mc:2138 msgid "Can't open anonymous security token.\n" -msgstr "無法開啟匿名安全性代表字組。\n" +msgstr "無法開啟匿名的安全權杖。\n" #: dlls/kernel32/winerror.mc:2143 msgid "Bad validation class.\n" -msgstr "不當的驗證類別。\n" +msgstr "錯誤的驗證類別。\n" #: dlls/kernel32/winerror.mc:2148 msgid "Bad token type.\n" -msgstr "不當的字組型態。\n" +msgstr "錯誤的權杖類型。\n" #: dlls/kernel32/winerror.mc:2153 msgid "No security on object.\n" @@ -5751,15 +5685,15 @@ msgstr "通用存取類型未對應。\n" #: dlls/kernel32/winerror.mc:2208 msgid "Bad descriptor format.\n" -msgstr "不當的描述元格式。\n" +msgstr "錯誤的描述元格式。\n" #: dlls/kernel32/winerror.mc:2213 msgid "Not a logon process.\n" -msgstr "不是個登錄行程。\n" +msgstr "不是登入工作階段。\n" #: dlls/kernel32/winerror.mc:2218 msgid "Logon session ID exists.\n" -msgstr "登錄期間識別碼已存在。\n" +msgstr "登入工作階段識別碼已存在。\n" #: dlls/kernel32/winerror.mc:2223 msgid "Unknown authentication package.\n" @@ -5767,19 +5701,19 @@ msgstr "不明認證套件。\n" #: dlls/kernel32/winerror.mc:2228 msgid "Bad logon session state.\n" -msgstr "不當的登錄作業階段狀態。\n" +msgstr "錯誤的登入工作階段狀態。\n" #: dlls/kernel32/winerror.mc:2233 msgid "Logon session ID collision.\n" -msgstr "登錄期間識別碼產生碰撞。\n" +msgstr "登入工作階段識別碼發生衝突。\n" #: dlls/kernel32/winerror.mc:2238 msgid "Invalid logon type.\n" -msgstr "無效的登錄型態。\n" +msgstr "無效的登入類型。\n" #: dlls/kernel32/winerror.mc:2243 msgid "Cannot impersonate.\n" -msgstr "無法假冒。\n" +msgstr "無法模擬。\n" #: dlls/kernel32/winerror.mc:2248 msgid "Invalid transaction state.\n" @@ -5807,7 +5741,7 @@ msgstr "其為使用者的主要群組。\n" #: dlls/kernel32/winerror.mc:2278 msgid "Token already in use.\n" -msgstr "字組已使用中。\n" +msgstr "權杖已在使用中。\n" #: dlls/kernel32/winerror.mc:2283 msgid "No such local group.\n" @@ -5827,7 +5761,7 @@ msgstr "本地群組已存在。\n" #: dlls/kernel32/winerror.mc:2303 dlls/kernel32/winerror.mc:2328 msgid "Logon type not granted.\n" -msgstr "登錄型態未授與。\n" +msgstr "登錄類型未授與。\n" #: dlls/kernel32/winerror.mc:2308 msgid "Too many secrets.\n" @@ -5843,7 +5777,7 @@ msgstr "內部安全資料庫錯誤。\n" #: dlls/kernel32/winerror.mc:2323 msgid "Too many context IDs.\n" -msgstr "太多文脈識別號。\n" +msgstr "太多內容識別碼。\n" #: dlls/kernel32/winerror.mc:2333 msgid "Cross-encrypted NT password required.\n" @@ -5867,7 +5801,7 @@ msgstr "必須輸入交叉加密過的本機密碼。\n" #: dlls/kernel32/winerror.mc:2358 msgid "No inheritable components.\n" -msgstr "沒有可繼承的成分。\n" +msgstr "沒有可繼承的元件。\n" #: dlls/kernel32/winerror.mc:2363 msgid "File or directory corrupt.\n" @@ -5879,7 +5813,7 @@ msgstr "磁碟已損壞。\n" #: dlls/kernel32/winerror.mc:2373 msgid "No user session key.\n" -msgstr "沒有使用者作業階段金鑰。\n" +msgstr "沒有使用者工作階段金鑰。\n" #: dlls/kernel32/winerror.mc:2378 msgid "License quota exceeded.\n" @@ -5895,31 +5829,31 @@ msgstr "相互認證失敗。\n" #: dlls/kernel32/winerror.mc:2393 msgid "Time skew between client and server.\n" -msgstr "客戶端與伺服端的時間偏斜。\n" +msgstr "用戶端與伺服器的時間存在偏移。\n" #: dlls/kernel32/winerror.mc:2398 msgid "Invalid window handle.\n" -msgstr "無效的視窗控柄。\n" +msgstr "無效的視窗控制代碼。\n" #: dlls/kernel32/winerror.mc:2403 msgid "Invalid menu handle.\n" -msgstr "無效的選單控柄。\n" +msgstr "無效的選單控制代碼。\n" #: dlls/kernel32/winerror.mc:2408 msgid "Invalid cursor handle.\n" -msgstr "無效的游標控柄。\n" +msgstr "無效的游標控制代碼。\n" #: dlls/kernel32/winerror.mc:2413 msgid "Invalid accelerator table handle.\n" -msgstr "無效的加速功能表格控柄。\n" +msgstr "無效的加速功能表格控制代碼。\n" #: dlls/kernel32/winerror.mc:2418 msgid "Invalid hook handle.\n" -msgstr "無效的攔截控柄。\n" +msgstr "無效的勾點控制代碼。\n" #: dlls/kernel32/winerror.mc:2423 msgid "Invalid DWP handle.\n" -msgstr "無效的 DWP 控柄。\n" +msgstr "無效的 DWP 控制代碼。\n" #: dlls/kernel32/winerror.mc:2428 msgid "Can't create top-level child window.\n" @@ -5935,7 +5869,7 @@ msgstr "視窗由另外的執行緒所擁有。\n" #: dlls/kernel32/winerror.mc:2443 msgid "Hotkey already registered.\n" -msgstr "熱鍵已被註冊。\n" +msgstr "快捷鍵已被註冊。\n" #: dlls/kernel32/winerror.mc:2448 msgid "Class already exists.\n" @@ -5955,7 +5889,7 @@ msgstr "無效的索引。\n" #: dlls/kernel32/winerror.mc:2468 msgid "Invalid icon handle.\n" -msgstr "無效的圖示控柄。\n" +msgstr "無效的圖示控制代碼。\n" #: dlls/kernel32/winerror.mc:2473 msgid "Private dialog index.\n" @@ -5963,11 +5897,11 @@ msgstr "私人的對話框索引。\n" #: dlls/kernel32/winerror.mc:2478 msgid "List box ID not found.\n" -msgstr "找不到清單方塊識別號。\n" +msgstr "找不到清單方塊識別碼。\n" #: dlls/kernel32/winerror.mc:2483 msgid "No wildcard characters.\n" -msgstr "沒有萬用字元字元。\n" +msgstr "沒有萬用字元。\n" #: dlls/kernel32/winerror.mc:2488 msgid "Clipboard not open.\n" @@ -5975,7 +5909,7 @@ msgstr "未開啟剪貼簿。\n" #: dlls/kernel32/winerror.mc:2493 msgid "Hotkey not registered.\n" -msgstr "快速鍵未註冊。\n" +msgstr "快捷鍵未註冊。\n" #: dlls/kernel32/winerror.mc:2498 msgid "Not a dialog window.\n" @@ -5983,7 +5917,7 @@ msgstr "不是個對話框視窗。\n" #: dlls/kernel32/winerror.mc:2503 msgid "Control ID not found.\n" -msgstr "找不到控制識別號。\n" +msgstr "找不到控制識別碼。\n" #: dlls/kernel32/winerror.mc:2508 msgid "Invalid combo box message.\n" @@ -6003,7 +5937,7 @@ msgstr "找不到 DC。\n" #: dlls/kernel32/winerror.mc:2528 msgid "Invalid hook filter.\n" -msgstr "無效的攔截篩選器。\n" +msgstr "無效的勾點篩選器。\n" #: dlls/kernel32/winerror.mc:2533 msgid "Invalid filter procedure.\n" @@ -6011,19 +5945,19 @@ msgstr "無效的篩選器程序。\n" #: dlls/kernel32/winerror.mc:2538 msgid "Hook procedure needs module handle.\n" -msgstr "攔截程序需要模組控柄。\n" +msgstr "勾點程序需要模組控制代碼。\n" #: dlls/kernel32/winerror.mc:2543 msgid "Global-only hook procedure.\n" -msgstr "僅限全域的攔截程序。\n" +msgstr "只限全域的勾點程序。\n" #: dlls/kernel32/winerror.mc:2548 msgid "Journal hook already set.\n" -msgstr "已經設定日誌攔截。\n" +msgstr "已經設定日誌勾點。\n" #: dlls/kernel32/winerror.mc:2553 msgid "Hook procedure not installed.\n" -msgstr "尚未安裝攔截程序。\n" +msgstr "尚未安裝勾點程序。\n" #: dlls/kernel32/winerror.mc:2558 msgid "Invalid list box message.\n" @@ -6039,7 +5973,7 @@ msgstr "這個清單方塊沒有定位停駐點。\n" #: dlls/kernel32/winerror.mc:2573 msgid "Can't destroy object owned by another thread.\n" -msgstr "無法銷毀由另外執行緒所擁有的物件。\n" +msgstr "無法銷毀由其他執行緒所擁有的物件。\n" #: dlls/kernel32/winerror.mc:2578 msgid "Child window menus not allowed.\n" @@ -6063,7 +5997,7 @@ msgstr "螢幕已鎖定。\n" #: dlls/kernel32/winerror.mc:2603 msgid "Window handles have different parents.\n" -msgstr "視窗控柄有不同的上層。\n" +msgstr "視窗控制代碼有不同的父系。\n" #: dlls/kernel32/winerror.mc:2608 msgid "Not a child window.\n" @@ -6075,7 +6009,7 @@ msgstr "數字格式無效。\n" #: dlls/kernel32/winerror.mc:2618 msgid "Invalid thread ID.\n" -msgstr "無效的執行緒識別號。\n" +msgstr "無效的執行緒識別碼。\n" #: dlls/kernel32/winerror.mc:2623 msgid "Not an MDI child window.\n" @@ -6107,7 +6041,7 @@ msgstr "沒有非置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2658 msgid "No paged system resources.\n" -msgstr "非置換頁的系統資源。\n" +msgstr "沒有置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2663 msgid "No working set quota.\n" @@ -6127,11 +6061,11 @@ msgstr "找不到選單項目。\n" #: dlls/kernel32/winerror.mc:2683 msgid "Invalid keyboard handle.\n" -msgstr "無效的鍵盤控柄。\n" +msgstr "無效的鍵盤控制代碼。\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許的勾點類型。\n" #: dlls/kernel32/winerror.mc:2693 msgid "Interactive window station required.\n" @@ -6143,7 +6077,7 @@ msgstr "逾時。\n" #: dlls/kernel32/winerror.mc:2703 msgid "Invalid monitor handle.\n" -msgstr "無效的監視器控柄。\n" +msgstr "無效的監視器控制代碼。\n" #: dlls/kernel32/winerror.mc:2708 msgid "Event log file corrupt.\n" @@ -6171,11 +6105,11 @@ msgstr "使用者已放棄安裝。\n" #: dlls/kernel32/winerror.mc:2738 msgid "Installation failure.\n" -msgstr "安裝已失敗。\n" +msgstr "安裝失敗。\n" #: dlls/kernel32/winerror.mc:2743 msgid "Installation suspended.\n" -msgstr "安裝已懸置。\n" +msgstr "安裝暫停。\n" #: dlls/kernel32/winerror.mc:2748 msgid "Unknown product.\n" @@ -6183,19 +6117,19 @@ msgstr "不明產品。\n" #: dlls/kernel32/winerror.mc:2753 msgid "Unknown feature.\n" -msgstr "不明特徵。\n" +msgstr "不明功能。\n" #: dlls/kernel32/winerror.mc:2758 msgid "Unknown component.\n" -msgstr "未知的元件。\n" +msgstr "不明元件。\n" #: dlls/kernel32/winerror.mc:2763 msgid "Unknown property.\n" -msgstr "未知的屬性。\n" +msgstr "不明屬性。\n" #: dlls/kernel32/winerror.mc:2768 msgid "Invalid handle state.\n" -msgstr "無效的控柄狀態。\n" +msgstr "無效的控制代碼狀態。\n" #: dlls/kernel32/winerror.mc:2773 msgid "Bad configuration.\n" @@ -6251,7 +6185,7 @@ msgstr "開啟安裝記錄檔時失敗。\n" #: dlls/kernel32/winerror.mc:2838 msgid "Installation language not supported.\n" -msgstr "不受支援的安裝語言。\n" +msgstr "不支援的安裝語言。\n" #: dlls/kernel32/winerror.mc:2843 msgid "Installation transform failed to apply.\n" @@ -6275,11 +6209,11 @@ msgstr "無效的表格。\n" #: dlls/kernel32/winerror.mc:2868 msgid "Data type mismatch.\n" -msgstr "資料類型不匹配。\n" +msgstr "資料類型不相符。\n" #: dlls/kernel32/winerror.mc:2873 dlls/kernel32/winerror.mc:3083 msgid "Unsupported type.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的類型。\n" #: dlls/kernel32/winerror.mc:2878 msgid "Creation failed.\n" @@ -6291,7 +6225,7 @@ msgstr "無法寫入暫存資料夾。\n" #: dlls/kernel32/winerror.mc:2888 msgid "Installation platform not supported.\n" -msgstr "不受支援的安裝平臺。\n" +msgstr "不支援的安裝平臺。\n" #: dlls/kernel32/winerror.mc:2893 msgid "Installer not used.\n" @@ -6307,7 +6241,7 @@ msgstr "無效的更新套件。\n" #: dlls/kernel32/winerror.mc:2908 msgid "Unsupported patch package.\n" -msgstr "不受支援的修補程式套件。\n" +msgstr "不支援的修補程式套件。\n" #: dlls/kernel32/winerror.mc:2913 msgid "Another version is installed.\n" @@ -6351,7 +6285,7 @@ msgstr "無效的字串 UUID。\n" #: dlls/kernel32/winerror.mc:2963 msgid "Invalid endpoint format.\n" -msgstr "無效的終點格式。\n" +msgstr "無效的端點格式。\n" #: dlls/kernel32/winerror.mc:2968 msgid "Invalid network address.\n" @@ -6359,7 +6293,7 @@ msgstr "無效的網路位址。\n" #: dlls/kernel32/winerror.mc:2973 msgid "No endpoint found.\n" -msgstr "找不到任何終點。\n" +msgstr "找不到任何端點。\n" #: dlls/kernel32/winerror.mc:2978 msgid "Invalid timeout value.\n" @@ -6391,11 +6325,11 @@ msgstr "RPC 伺服器未傾聽。\n" #: dlls/kernel32/winerror.mc:3013 msgid "Unknown manager type.\n" -msgstr "不明管理員型態。\n" +msgstr "不明管理員類型。\n" #: dlls/kernel32/winerror.mc:3018 msgid "Unknown interface.\n" -msgstr "未知的介面。\n" +msgstr "不明的介面。\n" #: dlls/kernel32/winerror.mc:3023 msgid "No bindings.\n" @@ -6407,7 +6341,7 @@ msgstr "沒有協定序列。\n" #: dlls/kernel32/winerror.mc:3033 msgid "Can't create endpoint.\n" -msgstr "無法建立終點。\n" +msgstr "無法建立端點。\n" #: dlls/kernel32/winerror.mc:3038 msgid "Out of resources.\n" @@ -6415,7 +6349,7 @@ msgstr "資源不足。\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "RPC 伺服器不得使用。\n" +msgstr "RPC 伺服器不可用。\n" #: dlls/kernel32/winerror.mc:3048 msgid "RPC server too busy.\n" @@ -6427,7 +6361,7 @@ msgstr "無效的網路選項。\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "沒有現用的 RPC 呼叫。\n" +msgstr "沒有可用的 RPC 呼叫。\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" @@ -6443,7 +6377,7 @@ msgstr "RPC 協定發生錯誤。\n" #: dlls/kernel32/winerror.mc:3078 msgid "Unsupported transfer syntax.\n" -msgstr "不受支援的轉送語法。\n" +msgstr "不支援的轉送語法。\n" #: dlls/kernel32/winerror.mc:3088 msgid "Invalid tag.\n" @@ -6463,7 +6397,7 @@ msgstr "無效的名稱語法。\n" #: dlls/kernel32/winerror.mc:3108 msgid "Unsupported name syntax.\n" -msgstr "不受支援的名稱語法。\n" +msgstr "不支援的名稱語法。\n" #: dlls/kernel32/winerror.mc:3113 msgid "No network address.\n" @@ -6471,7 +6405,7 @@ msgstr "沒有網路位址。\n" #: dlls/kernel32/winerror.mc:3118 msgid "Duplicate endpoint.\n" -msgstr "重複的終點。\n" +msgstr "重複的端點。\n" #: dlls/kernel32/winerror.mc:3123 msgid "Unknown authentication type.\n" @@ -6479,7 +6413,7 @@ msgstr "不明認證類型。\n" #: dlls/kernel32/winerror.mc:3128 msgid "Maximum calls too low.\n" -msgstr "太低的呼叫數最大值。\n" +msgstr "呼叫數的最大值太低。\n" #: dlls/kernel32/winerror.mc:3133 msgid "String too long.\n" @@ -6523,7 +6457,7 @@ msgstr "無法進行作業。\n" #: dlls/kernel32/winerror.mc:3183 msgid "Endpoints not registered.\n" -msgstr "終點未註冊。\n" +msgstr "端點未註冊。\n" #: dlls/kernel32/winerror.mc:3188 msgid "Nothing to export.\n" @@ -6543,7 +6477,7 @@ msgstr "已無更多成員。\n" #: dlls/kernel32/winerror.mc:3208 msgid "Not all objects unexported.\n" -msgstr "並非所有物件被取消匯出。\n" +msgstr "並非所有物件未被匯出。\n" #: dlls/kernel32/winerror.mc:3213 msgid "Interface not found.\n" @@ -6559,7 +6493,7 @@ msgstr "找不到條目。\n" #: dlls/kernel32/winerror.mc:3228 msgid "Name service unavailable.\n" -msgstr "名稱服務不得使用。\n" +msgstr "名稱服務不可用。\n" #: dlls/kernel32/winerror.mc:3233 msgid "Invalid network address family.\n" @@ -6571,7 +6505,7 @@ msgstr "操作不受支援。\n" #: dlls/kernel32/winerror.mc:3243 msgid "No security context available.\n" -msgstr "沒有可用安全文脈。\n" +msgstr "沒有可用的安全內容。\n" #: dlls/kernel32/winerror.mc:3248 msgid "RPCInternal error.\n" @@ -6611,23 +6545,23 @@ msgstr "字元翻譯表格檔案太小。\n" #: dlls/kernel32/winerror.mc:3293 msgid "Null context handle.\n" -msgstr "空值文脈控柄。\n" +msgstr "內容控制代碼為空值。\n" #: dlls/kernel32/winerror.mc:3298 msgid "Context handle damaged.\n" -msgstr "文脈控柄受損害。\n" +msgstr "內容控制代碼已損壞。\n" #: dlls/kernel32/winerror.mc:3303 msgid "Binding handle mismatch.\n" -msgstr "繫結控柄不匹配。\n" +msgstr "繫結控制代碼不相符。\n" #: dlls/kernel32/winerror.mc:3308 msgid "Cannot get call handle.\n" -msgstr "無法提取呼叫控柄。\n" +msgstr "無法提取呼叫控制代碼。\n" #: dlls/kernel32/winerror.mc:3313 msgid "Null reference pointer.\n" -msgstr "空值參考指標。\n" +msgstr "參考指標為空值。\n" #: dlls/kernel32/winerror.mc:3318 msgid "Enumeration value out of range.\n" @@ -6639,7 +6573,7 @@ msgstr "位元組數量太小。\n" #: dlls/kernel32/winerror.mc:3328 msgid "Bad stub data.\n" -msgstr "不當的殘餘資料。\n" +msgstr "損壞的虛設常式資料。\n" #: dlls/kernel32/winerror.mc:3333 msgid "Invalid user buffer.\n" @@ -6667,15 +6601,15 @@ msgstr "信賴的關聯性失敗。\n" #: dlls/kernel32/winerror.mc:3363 msgid "Trust logon failure.\n" -msgstr "信賴登錄失敗。\n" +msgstr "信賴登入失敗。\n" #: dlls/kernel32/winerror.mc:3368 msgid "RPC call already in progress.\n" -msgstr "RPC 呼叫已正進行。\n" +msgstr "RPC 呼叫已在進行。\n" #: dlls/kernel32/winerror.mc:3373 msgid "NETLOGON is not started.\n" -msgstr "NETLOGON 未被啟始。\n" +msgstr "NETLOGON 未被啟動。\n" #: dlls/kernel32/winerror.mc:3378 msgid "Account expired.\n" @@ -6683,7 +6617,7 @@ msgstr "帳號已過期。\n" #: dlls/kernel32/winerror.mc:3383 msgid "Redirector has open handles.\n" -msgstr "重導器已開啟控柄。\n" +msgstr "重導器已開啟控制代碼。\n" #: dlls/kernel32/winerror.mc:3388 msgid "Printer driver already installed.\n" @@ -6695,7 +6629,7 @@ msgstr "不明通訊埠。\n" #: dlls/kernel32/winerror.mc:3398 msgid "Unknown printer driver.\n" -msgstr "未知的印表機驅動程式。\n" +msgstr "不明印表機驅動程式。\n" #: dlls/kernel32/winerror.mc:3403 msgid "Unknown print processor.\n" @@ -6735,15 +6669,15 @@ msgstr "已無更多繫結。\n" #: dlls/kernel32/winerror.mc:3448 msgid "Can't log on with inter-domain trust account.\n" -msgstr "無法以網域間信賴帳號登錄。\n" +msgstr "無法以網域間信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3453 msgid "Can't log on with workstation trust account.\n" -msgstr "無法以工作站信賴帳號登錄。\n" +msgstr "無法以工作站信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3458 msgid "Can't log on with server trust account.\n" -msgstr "無法以伺服器信賴帳號登錄。\n" +msgstr "無法以伺服器信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3463 msgid "Domain trust information inconsistent.\n" @@ -6751,7 +6685,7 @@ msgstr "網域信賴資訊不一致。\n" #: dlls/kernel32/winerror.mc:3468 msgid "Server has open handles.\n" -msgstr "伺服器已開啟控柄。\n" +msgstr "伺服器已開啟控制代碼。\n" #: dlls/kernel32/winerror.mc:3473 msgid "Resource data not found.\n" @@ -6791,7 +6725,7 @@ msgstr "RPC 指令失敗。\n" #: dlls/kernel32/winerror.mc:3518 msgid "Unsupported authorization level.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的授權等級。\n" #: dlls/kernel32/winerror.mc:3523 msgid "No principal name registered.\n" @@ -6815,7 +6749,7 @@ msgstr "執行緒未取消。\n" #: dlls/kernel32/winerror.mc:3548 msgid "Invalid handle operation.\n" -msgstr "無效的控柄作業。\n" +msgstr "無效的控制代碼作業。\n" #: dlls/kernel32/winerror.mc:3553 msgid "Wrong serializing package version.\n" @@ -6843,7 +6777,7 @@ msgstr "找不到群組成員。\n" #: dlls/kernel32/winerror.mc:3583 msgid "Can't create endpoint mapper DB.\n" -msgstr "無法建立終點映射器資料庫。\n" +msgstr "無法建立端點對應器資料庫。\n" #: dlls/kernel32/winerror.mc:3588 msgid "Invalid object.\n" @@ -6863,7 +6797,7 @@ msgstr "無效的表單大小。\n" #: dlls/kernel32/winerror.mc:3608 msgid "Already awaiting printer handle.\n" -msgstr "已經在等待印表機控柄。\n" +msgstr "已經在等待印表機控制代碼。\n" #: dlls/kernel32/winerror.mc:3613 msgid "Printer deleted.\n" @@ -6903,7 +6837,7 @@ msgstr "不完整的 RPC 發送。\n" #: dlls/kernel32/winerror.mc:3658 msgid "Invalid asynchronous RPC handle.\n" -msgstr "無效的非同步 RPC 控柄。\n" +msgstr "無效的非同步 RPC 控制代碼。\n" #: dlls/kernel32/winerror.mc:3663 msgid "Invalid asynchronous RPC call.\n" @@ -6935,7 +6869,7 @@ msgstr "無法解析檔名。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" -msgstr "RPC 條目型態不匹配。\n" +msgstr "RPC 條目類型不匹配。\n" #: dlls/kernel32/winerror.mc:3703 msgid "Not all objects could be exported.\n" @@ -6947,15 +6881,15 @@ msgstr "無法匯出介面。\n" #: dlls/kernel32/winerror.mc:3713 msgid "The profile could not be added.\n" -msgstr "無法加入側寫檔。\n" +msgstr "無法加入設定檔。\n" #: dlls/kernel32/winerror.mc:3718 msgid "The profile element could not be added.\n" -msgstr "無法加入側寫檔元件。\n" +msgstr "無法加入設定檔元件。\n" #: dlls/kernel32/winerror.mc:3723 msgid "The profile element could not be removed.\n" -msgstr "無法移除側寫檔元件。\n" +msgstr "無法移除設定檔元件。\n" #: dlls/kernel32/winerror.mc:3728 msgid "The group element could not be added.\n" @@ -6970,57 +6904,41 @@ msgid "The username could not be found.\n" msgstr "無法找到使用者名稱。\n" #: dlls/kernel32/winerror.mc:3743 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "站臺不存在。\n" +msgstr "這個網路連線不存在。\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "連線被拒。\n" +msgstr "連線被同儕節點重設。\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "未實作" +msgstr "未實作。\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC 呼叫失敗。\n" +msgstr "呼叫失敗。\n" #: dlls/kernel32/winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "在檔案 %2 中找不到訊息 0x%1。\n" +msgstr "無法在檔案中找到簽章。\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "無效的層級。\n" +msgstr "無效的呼叫。\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Help not available." msgid "Resource is not currently available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "資源目前不可用。\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "類別名稱:" +msgstr "經典藍" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 msgid "Normal" -msgstr "中" +msgstr "標準" #: dlls/localspl/localspl.rc:37 #, fuzzy -- 2.33.0.windows.2

1 0

[PATCH] winebus.sys: get inotify working on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

FreeBSD requires linking to the inotify library, and including limits.h. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/winebus.sys/Makefile.in | 2 ++ dlls/winebus.sys/bus_udev.c | 1 + 2 files changed, 3 insertions(+)

2 1

[PATCH 8/8] wrc: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- tools/wrc/wrc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 7/8] wmc: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- tools/wmc/wmc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 6/8] winegcc: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- tools/winegcc/winegcc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 5/8] widl: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- tools/widl/widl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 4/8] libs/wine: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- libs/wine/config.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)

1 0

[PATCH 3/8] ntdll: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/loader.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

1 0

[PATCH 2/8] loader: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- loader/main.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH 1/8] server: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- server/unicode.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)

1 0

[PATCH 0/8] use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

/proc isn't even mounted by default on FreeBSD, causing Wine to crash, yet everything it provides is always available through sysctl(3) and/or libprocstat(3). This patchset changes Wine to use sysctl() calls instead of /proc/curproc/file, and gets Wine working with /proc unmounted. Damjan Jovanovic (8): server: use sysctl instead of /proc/curproc/file on FreeBSD loader: use sysctl instead of /proc/curproc/file on FreeBSD ntdll: use sysctl instead of /proc/curproc/file on FreeBSD libs/wine: use sysctl instead of /proc/curproc/file on FreeBSD widl: use sysctl instead of /proc/curproc/file on FreeBSD winegcc: use sysctl instead of /proc/curproc/file on FreeBSD wmc: use sysctl instead of /proc/curproc/file on FreeBSD wrc: use sysctl instead of /proc/curproc/file on FreeBSD dlls/ntdll/unix/loader.c | 14 +++++++++++++- libs/wine/config.c | 16 ++++++++++++++-- loader/main.c | 15 ++++++++++++--- server/unicode.c | 16 +++++++++++++++- tools/widl/widl.c | 12 +++++++++++- tools/winegcc/winegcc.c | 12 +++++++++++- tools/wmc/wmc.c | 12 +++++++++++- tools/wrc/wrc.c | 12 +++++++++++- 8 files changed, 98 insertions(+), 11 deletions(-) -- 2.32.0

1 0

[PATCH] libs/mpg123: Fix compilation with clang.
by Dmitry Timoshkov 23 Oct '21

23 Oct '21

clang -c -o libs/mpg123/src/compat/compat.cross.o ../wine.src/libs/mpg123/src/compat/compat.c -Ilibs/mpg123 \ -I../wine.src/libs/mpg123 -Iinclude -I../wine.src/include -I../wine.src/include/msvcrt \ -I../wine.src/libs/mpg123/src -I../wine.src/libs/mpg123/src/compat \ -I../wine.src/libs/mpg123/src/libmpg123 -DOPT_GENERIC_DITHER -DREAL_IS_FLOAT -DNO_CATCHSIGNAL \ -D_UCRT -D__WINE_PE_BUILD -target x86_64-windows -fno-strict-aliasing -Wno-pragma-pack -Wno-format \ -mcx16 -gdwarf-2 -gstrict-dwarf -g -O2 In file included from ../wine.src/libs/mpg123/src/compat/compat.c:15: ../wine.src/libs/mpg123/src/compat/compat.h:74:10: fatal error: 'strings.h' file not found ^~~~~~~~~~~ 1 error generated. make: *** [Makefile:216382: libs/mpg123/src/compat/compat.cross.o] Error 1 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- libs/mpg123/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/mpg123/config.h b/libs/mpg123/config.h index 77986b2a513..c0ad79f0ebf 100644 --- a/libs/mpg123/config.h +++ b/libs/mpg123/config.h @@ -219,7 +219,7 @@ #define HAVE_STRERROR 1 /* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 +/* #undef HAVE_STRINGS_H 1 */ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 -- 2.33.1

2 1

Fwd: [PATCH 1/2] Add xinputuap.dll
by Yusuf Khan 23 Oct '21

23 Oct '21

---------- Forwarded message --------- From: Yusuf Khan <yusisamerican(a)gmail.com> Date: Fri, Oct 22, 2021 at 4:01 PM Subject: Re: [PATCH 1/2] Add xinputuap.dll To: Alex Henrie <alexhenrie24(a)gmail.com> On Fri, Oct 22, 2021 at 3:52 PM Yusuf Khan <yusisamerican(a)gmail.com> wrote: > > Hi Alex! > > I have added the changes you have suggested. I do not know what names > of the applications were since I have an awful memory. When I checked > my custom build of wine I saw in my notes document that an app was not > booting without this DLL, it was dated 10/12/21 which was quite recent > so it probably wouldn't break any modern functionality. I just sent a > patch file to this mailing list. > > -Yusuf Khan > > On Thu, Oct 21, 2021 at 9:11 PM Alex Henrie <alexhenrie24(a)gmail.com> wrote: > > > > Hello Yusuf, and thank you for your interest in contributing to Wine! > > > > You should add the new DLL to configure.ac instead of configure. Run > > `autoconf` to copy the changes from configure.ac to configure, but > > only commit the changes to configure.ac to Git, not the changes to > > configure. Send it all as one patch and only attach one patch to each > > email that you send to the wine-devel mailing list. > > > > What are the names of the applications that require this DLL? > > > > -Alex

1 0

[PATCH] mpg123: Don't try to include strings.h
by Martin Storsjö 23 Oct '21

23 Oct '21

Wine doesn't provide this header. When building with mingw tools, it ends up including the header from the mingw toolchain's headers. When building with Clang in MSVC mode, it fails to include the header altogether. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- libs/mpg123/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/mpg123/config.h b/libs/mpg123/config.h index 77986b2a513..ba3e217ee0d 100644 --- a/libs/mpg123/config.h +++ b/libs/mpg123/config.h @@ -219,7 +219,7 @@ #define HAVE_STRERROR 1 /* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 +/* #undef HAVE_STRINGS_H */ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 -- 2.25.1

1 0

[PATCH 1/2] Add xinputuap.dll
by Yusuf Khan 22 Oct '21

22 Oct '21

2 2

Wine staging 6.20 release
by Alistair Leslie-Hughes 22 Oct '21

22 Oct '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.20 (557 patches are applied to wine vanilla) Notes * The mfplat-streaming patchset is currently disabled, so some games will not work with release. * All the dinput patches are also disabled as these should be fixed upstream by the new HID backend. Please file bug reports if a feature is not working as expected. Upstreamed (Either directly from staging or fixed with a similar patch). * dinput: Recalculated Axis after deadzone change. * dinput: Load users Joystick mappings. * dinput: Allow reconnecting to disconnected joysticks. * imm32: Automatically initialize COM on window activation. * imm32: Only generate 'WM_IME_SETCONTEXT' message if window has focus Added: * None Updated: * eventfd_synchronization * ntdll-NtAlertThreadByThreadId Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] strmbase: Send EC_COMPLETE on Run for unconnected renderers
by Andrew Eikum 22 Oct '21

22 Oct '21

Tests written by Zebediah Figura. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/evr/tests/evr.c | 104 ++++++++++++++++++++++++++++++ dlls/qedit/tests/nullrenderer.c | 104 ++++++++++++++++++++++++++++++ dlls/quartz/tests/videorenderer.c | 67 +++++++++++++++++++ dlls/quartz/tests/vmr9.c | 67 +++++++++++++++++++ dlls/strmbase/renderer.c | 2 +- 5 files changed, 343 insertions(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 01edda7bc9b..4f2bfc5b986 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -84,6 +84,15 @@ static IBaseFilter *create_evr(void) return filter; } +static IFilterGraph2 *create_graph(void) +{ + IFilterGraph2 *ret; + HRESULT hr; + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret); + ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr); + return ret; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -2763,6 +2772,100 @@ static void test_MFIsFormatYUV(void) } } +static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG expected_code, LONG_PTR expected1, LONG_PTR expected2) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == expected_code) + { + ok(param1 == expected1, "Got param1 %#lx.\n", param1); + ok(param2 == expected2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static inline unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + return check_event_code(eventsrc, timeout, EC_COMPLETE, S_OK, 0); +} + +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_evr(); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(evr) { CoInitialize(NULL); @@ -2788,6 +2891,7 @@ START_TEST(evr) test_mixer_zorder(); test_mixer_samples(); test_MFIsFormatYUV(); + test_unconnected_eos(); CoUninitialize(); } diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 1800f4dad4c..59e346fe5bf 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -32,6 +32,15 @@ static IBaseFilter *create_null_renderer(void) return filter; } +static IFilterGraph2 *create_graph(void) +{ + IFilterGraph2 *ret; + HRESULT hr; + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret); + ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr); + return ret; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -900,6 +909,100 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG expected_code, LONG_PTR expected1, LONG_PTR expected2) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == expected_code) + { + ok(param1 == expected1, "Got param1 %#lx.\n", param1); + ok(param2 == expected2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static inline unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + return check_event_code(eventsrc, timeout, EC_COMPLETE, S_OK, 0); +} + +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_null_renderer(); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -924,6 +1027,7 @@ START_TEST(nullrenderer) test_media_types(); test_enum_media_types(); test_connect_pin(); + test_unconnected_eos(); CoUninitialize(); } diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 8d0003cf12e..5625971426b 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2865,6 +2865,72 @@ static void test_basic_video(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_video_renderer(); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(videorenderer) { CoInitialize(NULL); @@ -2881,6 +2947,7 @@ START_TEST(videorenderer) test_overlay(); test_video_window(); test_basic_video(); + test_unconnected_eos(); CoUninitialize(); } diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 154b6a6b99e..bb8b91eaeef 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -4170,6 +4170,72 @@ static void test_mixing_prefs(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_vmr9(0); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -4205,6 +4271,7 @@ START_TEST(vmr9) test_basic_video(); test_windowless_size(); test_mixing_prefs(); + test_unconnected_eos(); CoUninitialize(); } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index a879917b169..da257555a19 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -252,7 +252,7 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI if (filter->sink.pin.peer && filter->ops->renderer_start_stream) filter->ops->renderer_start_stream(filter); - if (filter->eos && graph + if ((filter->eos || !filter->sink.pin.peer) && graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, &IID_IMediaEventSink, (void **)&event_sink))) { -- 2.33.1

2 1

[PATCH] gdi32: Fixed obj_map_cmp special cases.
by Francisco Casas 22 Oct '21

22 Oct '21

>From 6e1444a2d4a7585e199f3e8cc01844362e6358c7 Mon Sep 17 00:00:00 2001 From: Francisco Casas <franciscojacb(a)gmail.com> Date: Fri, 22 Oct 2021 14:21:30 -0300 Subject: [PATCH] gdi32: Fixed obj_map_cmp special cases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed obj_map_cmp when the difference between key and entry is too large and the resulting integer overflows. e.g. The subtraction: 0x000000000A0A009F - 0xFFFFFFFF9910019E doesn't result in -1 as it should (even when using the highwords 0A0A009F - 9910019E). Also, by suggestion of Zebediah Figura, pointers are now cast to (UINT_PTR) instead of using HandleToLong(·), to avoid a theoretical chance of collision by only using the highwords. Signed-off-by: Francisco Casas <franciscojacb(a)gmail.com> --- dlls/gdi32/objects.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4b390aa0160..c92a83bdebc 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -178,7 +178,11 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle ) static int obj_map_cmp( const void *key, const struct wine_rb_entry *entry ) { struct obj_map_entry *obj_entry = WINE_RB_ENTRY_VALUE( entry, struct obj_map_entry, entry ); - return HandleToLong( key ) - HandleToLong( obj_entry->obj ); + UINT_PTR a = (UINT_PTR)(key); + UINT_PTR b = (UINT_PTR)(obj_entry->obj); + if(a>b) return 1; + if(a<b) return -1; + return 0; }; struct wine_rb_tree obj_map = { obj_map_cmp }; -- 2.25.1

1 0

[PATCH] Fixed obj_map_cmp when the difference between key and entry
by Francisco Casas 22 Oct '21

22 Oct '21

>From 2034bd429c5ab345d480c7faeb8ee2185d3449e4 Mon Sep 17 00:00:00 2001 From: Francisco Casas <franciscojacb(a)gmail.com> Date: Fri, 22 Oct 2021 11:09:44 -0300 Subject: [PATCH] Fixed obj_map_cmp when the difference between key and entry is too large. e.g. The substraction: 000000000A0A009F - FFFFFFFF9910019E doesn't result in -1 as it should. Signed-off-by: Francisco Casas <franciscojacb(a)gmail.com> --- dlls/gdi32/objects.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4b390aa0160..3eebaef31cc 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -178,7 +178,11 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle ) static int obj_map_cmp( const void *key, const struct wine_rb_entry *entry ) { struct obj_map_entry *obj_entry = WINE_RB_ENTRY_VALUE( entry, struct obj_map_entry, entry ); - return HandleToLong( key ) - HandleToLong( obj_entry->obj ); + LONG32 a = HandleToLong( key ); + LONG32 b = HandleToLong( obj_entry->obj ); + if(a>b) return 1; + if(a<b) return -1; + return 0; }; struct wine_rb_tree obj_map = { obj_map_cmp }; -- 2.25.1

2 1

[PATCH v2] wininet: Support option INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT for http requests.
by Hans Leidekker 22 Oct '21

22 Oct '21

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: PCERT_CHAIN_CONTEXT -> PCCERT_CHAIN_CONTEXT. Set last error before testing it. Improve patch subject. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/http.c | 13 +++++++++++++ dlls/wininet/tests/http.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c9c4a060aac..1ca97cf3eb0 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2321,6 +2321,19 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(ULONG*)buffer = hdr->ErrorMask; *size = sizeof(ULONG); + return ERROR_SUCCESS; + case INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT: + TRACE("INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT\n"); + + if (*size < sizeof(PCCERT_CHAIN_CONTEXT)) + return ERROR_INSUFFICIENT_BUFFER; + + if (!req->server->cert_chain) + return ERROR_INTERNET_INCORRECT_HANDLE_STATE; + + *(PCCERT_CHAIN_CONTEXT *)buffer = CertDuplicateCertificateChain(req->server->cert_chain); + *size = sizeof(PCCERT_CHAIN_CONTEXT); + return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d1d7e678853..3b8f16a9fb2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6855,6 +6855,7 @@ static void test_secure_connection(void) INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; char certstr1[512], certstr2[512]; BOOL ret; + PCCERT_CHAIN_CONTEXT chain; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); @@ -6886,6 +6887,13 @@ static void test_secure_connection(void) test_cert_struct(req, &test_winehq_org_cert); + size = sizeof(chain); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &chain, &size); + ok(ret || GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE /* < IE8 */, + "InternetQueryOption failed: %u\n", GetLastError()); + if (ret) CertFreeCertificateChain(chain); + /* Querying the same option through InternetQueryOptionW still results in * ANSI strings being returned. */ @@ -7825,6 +7833,7 @@ static void test_cert_string(void) char actual[512]; DWORD size; BOOL res; + PCCERT_CHAIN_CONTEXT chain; ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); @@ -7845,6 +7854,12 @@ static void test_cert_string(void) ok( size == 0, "unexpected size: %u\n", size ); ok( actual[0] == 0x55, "unexpected byte: %02x\n", actual[0] ); + size = sizeof(chain); + SetLastError(0xdeadbeef); + res = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &chain, &size); + ok(!res && (GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_STATE), + "InternetQueryOption failed: %u\n", GetLastError()); + InternetCloseHandle( req ); InternetCloseHandle( con ); InternetCloseHandle( ses ); -- 2.30.2

3 2

[PATCH] Fixed obj_map_cmp when the difference between key and entry is too large.
by Francisco Casas 22 Oct '21

22 Oct '21

>From 2034bd429c5ab345d480c7faeb8ee2185d3449e4 Mon Sep 17 00:00:00 2001 From: Francisco Casas <franciscojacb(a)gmail.com> Date: Fri, 22 Oct 2021 11:09:44 -0300 Subject: [PATCH] Fixed obj_map_cmp when the difference between key and entry is too large. e.g. The substraction: 000000000A0A009F - FFFFFFFF9910019E doesn't result in -1 as it should. --- dlls/gdi32/objects.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4b390aa0160..3eebaef31cc 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -178,7 +178,11 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle ) static int obj_map_cmp( const void *key, const struct wine_rb_entry *entry ) { struct obj_map_entry *obj_entry = WINE_RB_ENTRY_VALUE( entry, struct obj_map_entry, entry ); - return HandleToLong( key ) - HandleToLong( obj_entry->obj ); + LONG32 a = HandleToLong( key ); + LONG32 b = HandleToLong( obj_entry->obj ); + if(a>b) return 1; + if(a<b) return -1; + return 0; }; struct wine_rb_tree obj_map = { obj_map_cmp }; -- 2.25.1

2 1

[PATCH 1/5] ntdll: Factor out capture_stack_back_trace() function.
by Paul Gofman 22 Oct '21

22 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/signal_i386.c | 22 ++++++++++++++++------ dlls/ntdll/signal_x86_64.c | 35 +++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 14971032ce6..0245aa602a1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -481,17 +481,15 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +static USHORT capture_stack_back_trace( CONTEXT *context, ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { - CONTEXT context; - ULONG i; ULONG *frame; + ULONG i; - RtlCaptureContext( &context ); if (hash) *hash = 0; - frame = (ULONG *)context.Ebp; + frame = (ULONG *)context->Ebp; while (skip--) { @@ -510,6 +508,18 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + CONTEXT context; + + RtlCaptureContext( &context ); + return capture_stack_back_trace( &context, skip, count, buffer, hash ); +} + + /*********************************************************************** * signal_start_thread */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ef32eba68b7..dbf622392b7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1490,27 +1490,23 @@ static inline ULONG hash_pointers( void **ptrs, ULONG count ) /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +static USHORT capture_stack_back_trace( CONTEXT *context, ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { - UNWIND_HISTORY_TABLE table; DISPATCHER_CONTEXT dispatch; - CONTEXT context; + UNWIND_HISTORY_TABLE table; + USHORT num_entries = 0; NTSTATUS status; ULONG i; - USHORT num_entries = 0; - TRACE( "(%u, %u, %p, %p)\n", skip, count, buffer, hash ); - - RtlCaptureContext( &context ); dispatch.TargetIp = 0; - dispatch.ContextRecord = &context; + dispatch.ContextRecord = context; dispatch.HistoryTable = &table; if (hash) *hash = 0; for (i = 0; i < skip + count; i++) { - status = virtual_unwind( UNW_FLAG_NHANDLER, &dispatch, &context ); + status = virtual_unwind( UNW_FLAG_NHANDLER, &dispatch, context ); if (status != STATUS_SUCCESS) return i; if (!dispatch.EstablisherFrame) break; @@ -1524,9 +1520,9 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, break; } - if (context.Rsp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; + if (context->Rsp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; - if (i >= skip) buffer[num_entries++] = (void *)context.Rip; + if (i >= skip) buffer[num_entries++] = (void *)context->Rip; } if (hash && num_entries > 0) *hash = hash_pointers( buffer, num_entries ); TRACE( "captured %hu frames\n", num_entries ); @@ -1534,6 +1530,21 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + CONTEXT context; + + TRACE( "(%u, %u, %p, %p)\n", skip, count, buffer, hash ); + + RtlCaptureContext( &context ); + + return capture_stack_back_trace( &context, skip, count, buffer, hash ); +} + + /*********************************************************************** * signal_start_thread */ -- 2.31.1

2 7

[v2 PATCH 1/5] msxml3/tests: Add some processing instruction tests.
by Nikolay Sivov 22 Oct '21

22 Oct '21

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9e9789ebd9a..d98a87f6d9c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8594,6 +8594,31 @@ static void test_createProcessingInstruction(void) hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\" dummy=\"value\""), &pi); todo_wine ok(hr == XML_E_UNEXPECTED_ATTRIBUTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, NULL, _bstr_("version=\"1.0\" encoding=\"UTF-8\""), &pi); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), NULL, &pi); +todo_wine + ok(hr == XML_E_XMLDECLSYNTAX, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=UTF-8"), &pi); +todo_wine + ok(hr == XML_E_MISSINGQUOTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8\""), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"UTF-8"), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8'"), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); + node_map = NULL; + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_attributes(node, &node_map); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + if (node_map) IXMLDOMNamedNodeMap_Release(node_map); + IXMLDOMNode_Release(node); + IXMLDOMProcessingInstruction_Release(pi); /* test for BSTR handling, pass broken BSTR */ memcpy(&buff[2], L"test", 5 * sizeof(WCHAR)); -- 2.33.0

1 4

[PATCH 1/3] dinput: Cleanup mouse device enumeration and creation.
by Rémi Bernon 22 Oct '21

22 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/mouse.c | 134 +++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 83 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1b91fa12189..4e353dba200 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -76,120 +76,88 @@ static inline SysMouseImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), SysMouseImpl, base); } -static void fill_mouse_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version) { - DWORD dwSize; - DIDEVICEINSTANCEW ddi; - - dwSize = lpddi->dwSize; - - TRACE("%d %p\n", dwSize, lpddi); - - memset(lpddi, 0, dwSize); - memset(&ddi, 0, sizeof(ddi)); - - ddi.dwSize = dwSize; - ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = GUID_SysMouse; - if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); - else - ddi.dwDevType = DIDEVTYPE_MOUSE | (DIDEVTYPEMOUSE_TRADITIONAL << 8); - MultiByteToWideChar(CP_ACP, 0, "Mouse", -1, ddi.tszInstanceName, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, "Wine Mouse", -1, ddi.tszProductName, MAX_PATH); - - memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); -} - -static HRESULT mousedev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ) { - if (id != 0) - return E_FAIL; - - if (dwFlags & DIEDFL_FORCEFEEDBACK) - return S_FALSE; - - if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || - (((dwDevType == DI8DEVCLASS_POINTER) || (dwDevType == DI8DEVTYPE_MOUSE)) && (version >= 0x0800))) { - TRACE("Enumerating the mouse device\n"); - - fill_mouse_dideviceinstanceW(lpddi, version); - - return S_OK; - } - - return S_FALSE; + DWORD size; + + TRACE( "type %#x, flags %#x, instance %p, version %#04x, index %d\n", type, flags, instance, version, index ); + + if (index != 0) return DIERR_GENERIC; + if (flags & DIEDFL_FORCEFEEDBACK) return DI_NOEFFECT; + if (version < 0x0800 && type != 0 && type != DIDEVTYPE_MOUSE) return DI_NOEFFECT; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_POINTER && type != DI8DEVTYPE_MOUSE) + return DI_NOEFFECT; + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW) && + instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) + return DIERR_INVALIDPARAM; + + size = instance->dwSize; + memset( instance, 0, size ); + instance->dwSize = size; + instance->guidInstance = GUID_SysMouse; + instance->guidProduct = GUID_SysMouse; + if (version >= 0x0800) instance->dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); + else instance->dwDevType = DIDEVTYPE_MOUSE | (DIDEVTYPEMOUSE_TRADITIONAL << 8); + MultiByteToWideChar( CP_ACP, 0, "Mouse", -1, instance->tszInstanceName, MAX_PATH ); + MultiByteToWideChar( CP_ACP, 0, "Wine Mouse", -1, instance->tszProductName, MAX_PATH ); + + return DI_OK; } -static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseImpl **out ) +static HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { - SysMouseImpl* newDevice; - WCHAR buffer[20]; + SysMouseImpl *impl; HKEY hkey, appkey; + WCHAR buffer[20]; HRESULT hr; + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + if (!IsEqualGUID( &GUID_SysMouse, guid )) return DIERR_DEVICENOTREG; + if (FAILED(hr = direct_input_device_alloc( sizeof(SysMouseImpl), &SysMouseWvt, &mouse_internal_vtbl, - rguid, dinput, (void **)&newDevice ))) + guid, dinput, (void **)&impl ))) return hr; - newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); - fill_mouse_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion ); - newDevice->base.caps.dwDevType = newDevice->base.instance.dwDevType; - newDevice->base.caps.dwFirmwareRevision = 100; - newDevice->base.caps.dwHardwareRevision = 100; - newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + mouse_enum_device( 0, 0, &impl->base.instance, dinput->dwVersion, 0 ); + impl->base.caps.dwDevType = impl->base.instance.dwDevType; + impl->base.caps.dwFirmwareRevision = 100; + impl->base.caps.dwHardwareRevision = 100; + impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; get_app_key(&hkey, &appkey); if (!get_config_key( hkey, appkey, L"MouseWarpOverride", buffer, sizeof(buffer) )) { - if (!wcsnicmp( buffer, L"disable", -1 )) newDevice->warp_override = WARP_DISABLE; - else if (!wcsnicmp( buffer, L"force", -1 )) newDevice->warp_override = WARP_FORCE_ON; + if (!wcsnicmp( buffer, L"disable", -1 )) impl->warp_override = WARP_DISABLE; + else if (!wcsnicmp( buffer, L"force", -1 )) impl->warp_override = WARP_FORCE_ON; } if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); - if (FAILED(hr = direct_input_device_init( &newDevice->base.IDirectInputDevice8W_iface ))) + if (FAILED(hr = direct_input_device_init( &impl->base.IDirectInputDevice8W_iface ))) { - IDirectInputDevice_Release( &newDevice->base.IDirectInputDevice8W_iface ); + IDirectInputDevice_Release( &impl->base.IDirectInputDevice8W_iface ); return hr; } if (dinput->dwVersion >= 0x0800) { - newDevice->base.use_raw_input = TRUE; - newDevice->base.raw_device.usUsagePage = 1; /* HID generic device page */ - newDevice->base.raw_device.usUsage = 2; /* HID generic mouse */ + impl->base.use_raw_input = TRUE; + impl->base.raw_device.usUsagePage = 1; /* HID generic device page */ + impl->base.raw_device.usUsage = 2; /* HID generic mouse */ } - *out = newDevice; + *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK; } -static HRESULT mousedev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) -{ - TRACE( "%p %s %p\n", dinput, debugstr_guid( rguid ), out ); - *out = NULL; - - if (IsEqualGUID(&GUID_SysMouse, rguid)) /* Wine Mouse */ - { - SysMouseImpl *This; - HRESULT hr; - - if (FAILED(hr = alloc_device( rguid, dinput, &This ))) return hr; - - TRACE( "Created a Mouse device (%p)\n", This ); - - *out = &This->base.IDirectInputDevice8W_iface; - return DI_OK; - } - - return DIERR_DEVICENOTREG; -} - const struct dinput_device mouse_device = { "Wine mouse driver", - mousedev_enum_device, - mousedev_create_device + mouse_enum_device, + mouse_create_device }; /****************************************************************************** -- 2.33.0

1 2

[v3 PATCH] msxml3/saxreader: Handle null url in parseURL().
by Nikolay Sivov 22 Oct '21

22 Oct '21

From: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51267 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/saxreader.c | 14 +++++++------- dlls/msxml3/tests/saxreader.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index c610ffcaccb..8c202bddccd 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2728,23 +2728,23 @@ static HRESULT internal_onDataAvailable(void *obj, char *ptr, DWORD len) return internal_parseBuffer(This, ptr, len, FALSE); } -static HRESULT internal_parseURL( - saxreader* This, - const WCHAR *url, - BOOL vbInterface) +static HRESULT internal_parseURL(saxreader *reader, const WCHAR *url, BOOL vbInterface) { IMoniker *mon; bsc_t *bsc; HRESULT hr; - TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + TRACE("%p, %s.\n", reader, debugstr_w(url)); + + if (!url && reader->version < MSXML4) + return E_INVALIDARG; hr = create_moniker_from_url(url, &mon); if(FAILED(hr)) return hr; - if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, This, &bsc); - else hr = bind_url(mon, internal_onDataAvailable, This, &bsc); + if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, reader, &bsc); + else hr = bind_url(mon, internal_onDataAvailable, reader, &bsc); IMoniker_Release(mon); if(FAILED(hr)) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ad093af6a12..20c5e07443b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2325,6 +2325,22 @@ static void test_saxreader(void) WriteFile(file, testXML, sizeof(testXML)-1, &written, NULL); CloseHandle(file); + /* crashes on newer versions */ + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader30)) + { + IVBSAXXMLReader *vb_reader; + + hr = ISAXXMLReader_parseURL(reader, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = ISAXXMLReader_QueryInterface(reader, &IID_IVBSAXXMLReader, (void **)&vb_reader); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IVBSAXXMLReader_parseURL(vb_reader, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IVBSAXXMLReader_Release(vb_reader); + } + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) test_seq = content_handler_test1_alternate; -- 2.33.0

1 0

[PATCH 1/2] mfplat: Consider MF_BYTESTREAM_ORIGIN_NAME when looking for bytestream handler.
by Nikolay Sivov 22 Oct '21

22 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7fd713261fc..5bd19190ed5 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5946,9 +5946,9 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA { static const char streamhandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers"; static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + WCHAR *mimeW = NULL, *urlW = NULL; IMFAttributes *attributes; const WCHAR *url_ext; - WCHAR *mimeW = NULL; HRESULT hr = E_FAIL; unsigned int i, j; UINT32 length; @@ -5959,6 +5959,11 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) { IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &mimeW, &length); + if (!url) + { + IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_ORIGIN_NAME, &urlW, &length); + url = urlW; + } IMFAttributes_Release(attributes); } @@ -5967,7 +5972,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA if (!url_ext && !mimeW) { - CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return MF_E_UNSUPPORTED_BYTESTREAM_TYPE; } @@ -5991,7 +5996,11 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA LeaveCriticalSection(&local_handlers_section); if (*handler) + { + CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return hr; + } } for (i = 0, hr = E_FAIL; i < ARRAY_SIZE(hkey_roots); ++i) @@ -6030,6 +6039,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA } CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return hr; } -- 2.33.0

2 2

[PATCH 1/2] mfplay: Do not clear media item when playback ends.
by Nikolay Sivov 22 Oct '21

22 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index f7832598ae6..42b40b99ea1 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1860,21 +1860,6 @@ static void media_player_create_forward_event(struct media_player *player, HRESU LeaveCriticalSection(&player->cs); } -static void media_player_create_playback_ended_event(struct media_player *player, HRESULT event_status, - struct media_event **event) -{ - EnterCriticalSection(&player->cs); - - if (SUCCEEDED(media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, event))) - { - if (player->item) - IMFPMediaItem_Release(player->item); - player->item = NULL; - } - - LeaveCriticalSection(&player->cs); -} - static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -1936,7 +1921,7 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba if (SUCCEEDED(IMFMediaEvent_GetUINT32(session_event, &MF_EVENT_TOPOLOGY_STATUS, &status)) && status == MF_TOPOSTATUS_ENDED) { - media_player_create_playback_ended_event(player, event_status, &event); + media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, &event); } break; -- 2.33.0

1 1

[PATCH 0/1] Cross-compiling 32-bit macOS from 64-bit-only macOS.
by Brendan Shanks 22 Oct '21

22 Oct '21

Something I've been working on lately is cross-compiling Wine for 32-bit Mac from newer 64-bit-only macOS versions (10.15 and newer). This should be especially useful for anyone packaging Wine for macOS. The first part needed is a toolchain. Apple's last official toolchain to support targeting i386 is Xcode 9.4.1 and the 10.13 SDK, but this is unable to run on any OS newer than 10.14. To fix this, I've created a hack that allows the Xcode 9.4.1 toolchain to be used on newer OSes: <https://github.com/mrpippy/XcodeNueve> With the toolchain working, building i386 with it is now a cross-compile. Apple does not prefix the commands with the host triplet though (i.e. 'i386-apple-darwin'), which Wine seems to expect for cross-compiling. Specifically, configure adds "-b <host triplet>" to TARGETFLAGS, causing winebuild to search for commands like ld and nm prefixed with that host triplet, which fails. This is a patch which only sets that TARGETFLAGS when the host triplet appears in $CC. I'm open to a different approach to fixing this though. Here's the command I use to configure, assuming the modified Xcode 9.4.1 is at /Applications/Xcode9.app: DEVELOPER_DIR="/Applications/Xcode9.app" \ SDKROOT="/Applications/Xcode9.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk" \ ../configure --host=i386-apple-darwin \ --with-wine-tools=<path to wine64 build> --with-wine64=<path to wine64 build> \ CC="clang -arch i386" TARGETFLAGS="-m32" Make also needs to be run with DEVELOPER_DIR and SDKROOT set. And this also works on Apple Silicon, just run with 'arch -x86_64' Brendan Shanks (1): configure: Only set TARGETFLAGS when cross-compiling with host-prefixed tools. configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.30.1 (Apple Git-130)

3 8

Re: TestBot job 100579 results: [PATCH v2 resend] msxml3: Null check url in parseURL.
by Jefferson Carpenter 21 Oct '21

21 Oct '21

On 10/21/2021 12:45 PM, Marvin wrote: > debiant2 failed 1 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=100579 > Looks like this failure occurred in domdoc, and was unrelated to this patch.

1 0

[PATCH 1/2] quartz: Use the performance counter for the system clock.
by Zebediah Figura 21 Oct '21

21 Oct '21

Native probably uses timeGetTime() as a source. That doesn't actually match the performance counter on Windows, but it does on Wine, and accessing the counter directly is slightly more efficient anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51684 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- I remember testing before and finding that the system clock had a 15ms granularity, like the tick count, but that doesn't seem to hold on testing again. Possibly it was true for Windows XP and nothing else (or possibly I just messed up)... dlls/quartz/systemclock.c | 14 ++++++++++++-- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/systemclock.c | 9 +-------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index cebe4846f04..56ad217c76a 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -44,6 +44,7 @@ struct system_clock BOOL thread_created, thread_stopped; HANDLE thread; + LARGE_INTEGER frequency; REFERENCE_TIME last_time; CRITICAL_SECTION cs; CONDITION_VARIABLE cv; @@ -51,6 +52,14 @@ struct system_clock struct list sinks; }; +static REFERENCE_TIME get_current_time(const struct system_clock *clock) +{ + LARGE_INTEGER time; + + QueryPerformanceCounter(&time); + return (time.QuadPart * 1000) / clock->frequency.QuadPart * 10000; +} + static inline struct system_clock *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct system_clock, IUnknown_inner); @@ -145,7 +154,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) EnterCriticalSection(&clock->cs); - current_time = GetTickCount64() * 10000; + current_time = get_current_time(clock); LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &clock->sinks, struct advise_sink, entry) { @@ -240,7 +249,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ return E_POINTER; } - ret = GetTickCount64() * 10000; + ret = get_current_time(clock); EnterCriticalSection(&clock->cs); @@ -336,6 +345,7 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) list_init(&object->sinks); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); + QueryPerformanceFrequency(&object->frequency); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner; diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index b4a372d4d3e..423abc78ef6 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = quartz.dll -IMPORTS = strmbase advapi32 d3d9 dsound msdmo msvfw32 ole32 oleaut32 user32 uuid +IMPORTS = strmbase advapi32 d3d9 dsound msdmo msvfw32 ole32 oleaut32 user32 uuid winmm C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index be5472ed6e1..3b39d2aadb4 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -22,8 +22,6 @@ #include "dshow.h" #include "wine/test.h" -static ULONGLONG (WINAPI *pGetTickCount64)(void); - static IReferenceClock *create_system_clock(void) { IReferenceClock *clock = NULL; @@ -178,10 +176,7 @@ static void test_get_time(void) ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n", wine_dbgstr_longlong(time1)); - if (pGetTickCount64) - ticks = pGetTickCount64() * 10000; - else - ticks = (REFERENCE_TIME)GetTickCount() * 10000; + ticks = (REFERENCE_TIME)timeGetTime() * 10000; hr = IReferenceClock_GetTime(clock, &time2); ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr); @@ -291,8 +286,6 @@ START_TEST(systemclock) { CoInitialize(NULL); - pGetTickCount64 = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetTickCount64"); - test_interfaces(); test_aggregation(); test_get_time(); -- 2.33.0

2 2

[PATCH] windows.devices.enumeration: Add stub dll.
by Gijs Vermeulen 21 Oct '21

21 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51884 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- configure.ac | 1 + dlls/windows.devices.enumeration/Makefile.in | 7 + dlls/windows.devices.enumeration/classes.idl | 23 +++ dlls/windows.devices.enumeration/main.c | 157 ++++++++++++++++++ .../windows.devices.enumeration.spec | 3 + include/Makefile.in | 1 + include/windows.devices.enumeration.idl | 55 ++++++ 7 files changed, 247 insertions(+) create mode 100644 dlls/windows.devices.enumeration/Makefile.in create mode 100644 dlls/windows.devices.enumeration/classes.idl create mode 100644 dlls/windows.devices.enumeration/main.c create mode 100644 dlls/windows.devices.enumeration/windows.devices.enumeration.spec create mode 100644 include/windows.devices.enumeration.idl diff --git a/configure.ac b/configure.ac index 3f1d50a4dfc..c897057a9df 100644 --- a/configure.ac +++ b/configure.ac @@ -3560,6 +3560,7 @@ WINE_CONFIG_MAKEFILE(dlls/win32u/tests) WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/windows.devices.enumeration) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input/tests) WINE_CONFIG_MAKEFILE(dlls/windows.globalization) diff --git a/dlls/windows.devices.enumeration/Makefile.in b/dlls/windows.devices.enumeration/Makefile.in new file mode 100644 index 00000000000..a2058b3d002 --- /dev/null +++ b/dlls/windows.devices.enumeration/Makefile.in @@ -0,0 +1,7 @@ +MODULE = windows.devices.enumeration.dll +IMPORTS = combase uuid + +C_SRCS = \ + main.c + +IDL_SRCS = classes.idl diff --git a/dlls/windows.devices.enumeration/classes.idl b/dlls/windows.devices.enumeration/classes.idl new file mode 100644 index 00000000000..8d13d9bbef7 --- /dev/null +++ b/dlls/windows.devices.enumeration/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for windows.devices.enumeration.dll + * + * Copyright 2021 Gijs Vermeulen + * + * 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 + */ + +#pragma makedep register + +#include "windows.devices.enumeration.idl" diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c new file mode 100644 index 00000000000..a2a13861a88 --- /dev/null +++ b/dlls/windows.devices.enumeration/main.c @@ -0,0 +1,157 @@ +/* WinRT Windows.Devices.Enumeration implementation + * + * Copyright 2021 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "initguid.h" +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Devices_Enumeration +#include "windows.devices.enumeration.h" + +WINE_DEFAULT_DEBUG_CHANNEL(enumeration); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct windows_devices_enumeration +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_devices_enumeration *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_devices_enumeration, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_devices_enumeration_AddRef( + IActivationFactory *iface) +{ + struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_devices_enumeration_Release( + IActivationFactory *iface) +{ + struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_devices_enumeration_QueryInterface, + windows_devices_enumeration_AddRef, + windows_devices_enumeration_Release, + /* IInspectable methods */ + windows_devices_enumeration_GetIids, + windows_devices_enumeration_GetRuntimeClassName, + windows_devices_enumeration_GetTrustLevel, + /* IActivationFactory methods */ + windows_devices_enumeration_ActivateInstance, +}; + +static struct windows_devices_enumeration windows_devices_enumeration = +{ + {&activation_factory_vtbl}, + 1 +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_devices_enumeration.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/windows.devices.enumeration/windows.devices.enumeration.spec b/dlls/windows.devices.enumeration/windows.devices.enumeration.spec new file mode 100644 index 00000000000..20a8bfa98ea --- /dev/null +++ b/dlls/windows.devices.enumeration/windows.devices.enumeration.spec @@ -0,0 +1,3 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/include/Makefile.in b/include/Makefile.in index a9a478e5433..71d1b497b6d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -767,6 +767,7 @@ SOURCES = \ windef.h \ windns.h \ windot11.h \ + windows.devices.enumeration.idl \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.gaming.input.forcefeedback.idl \ diff --git a/include/windows.devices.enumeration.idl b/include/windows.devices.enumeration.idl new file mode 100644 index 00000000000..9aa2aaba441 --- /dev/null +++ b/include/windows.devices.enumeration.idl @@ -0,0 +1,55 @@ +/* + * Copyright 2021 Gijs Vermeulen + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Devices { + namespace Enumeration { + interface IDeviceInformationStatics; + interface IDeviceInformationStatics2; + } + } +} + +namespace Windows { + namespace Devices { + namespace Enumeration { + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Devices.Enumeration.IDeviceInformationStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Devices.Enumeration.IDeviceInformationStatics2, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass DeviceInformation + { + [default] interface Windows.Devices.Enumeration.IDeviceInformation; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Devices.Enumeration.IDeviceInformation2; + } + } + } +} -- 2.33.1

1 0

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

21 Oct '21

Signed-off-by: Chan Chilung <eason066(a)gmail.com> --- v2: Corrected accelerator key for translation of "dlls/aclui/aclui.rc:32:". po/zh_TW.po | 1081 +++++++++++++++++++++------------------------------ 1 file changed, 454 insertions(+), 627 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a8312e8bcec..3bf580d6c79 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,9 +5,9 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-28 00:06+0800\n" -"Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" -"Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" +"PO-Revision-Date: 2021-10-20 21:30+0800\n" +"Last-Translator: Chan Chilung <eason066(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,30 +20,24 @@ msgid "Security" msgstr "安全性" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "使用者名稱(&U)：" +msgstr "群組或使用者名稱(&G)：" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "黃色" +msgstr "允許" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "拒絕" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "存取被拒。\n" +msgstr "%1 的權限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" -msgstr "安裝/移除" +msgstr "安裝/解除安裝" #: dlls/appwiz.cpl/appwiz.rc:61 msgid "" @@ -61,8 +55,8 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"下列軟體可以自動解除安裝。從清單中選取它並按下「新增/移除」，可以移除程式或" -"者調整已安裝元件。" +"下列軟體可以自動解除安裝。要移除程式或者調整已安裝元件，請從清單中選取程式" +"並按下「修改/移除」。" #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -123,11 +117,11 @@ msgstr "確定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技術支援資訊：" +msgstr "以下資訊可協助取得 %s 的技術支援：" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生產商：" +msgstr "發行者：" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" @@ -175,7 +169,7 @@ msgstr "" "幫您下載並安裝 Gecko。\n" "\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Gecko\">https://wiki.winehq.org/Gecko</a>" +"Gecko\">https://wiki.winehq.org/Gecko</a>。" #: dlls/appwiz.cpl/appwiz.rc:109 dlls/appwiz.cpl/appwiz.rc:124 msgid "&Install" @@ -242,7 +236,7 @@ msgstr "" "並安裝它。\n" "\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Mono\">https://wiki.winehq.org/Mono</a>" +"Mono\">https://wiki.winehq.org/Mono</a>。" #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" @@ -263,7 +257,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式 %s。您想將這個移除程式從註冊表中刪除嗎？" +msgstr "無法執行移除程式「%s」。您想將這個移除程式從註冊表中移除嗎？" #: dlls/appwiz.cpl/appwiz.rc:36 msgid "Not specified" @@ -277,7 +271,7 @@ msgstr "名稱" #: dlls/appwiz.cpl/appwiz.rc:39 msgid "Publisher" -msgstr "生產商" +msgstr "發行者" #: dlls/appwiz.cpl/appwiz.rc:40 dlls/cryptui/cryptui.rc:54 msgid "Version" @@ -331,7 +325,7 @@ msgstr "選項(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交錯(&I)" +msgstr "交錯(&I)：每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -363,7 +357,7 @@ msgstr "音訊" #: dlls/avifil32/avifil32.rc:36 msgid "Wine AVI-default-filehandler" -msgstr "Wine AVI-預設處理器" +msgstr "Wine AVI 預設處理器" #: dlls/avifil32/avifil32.rc:37 msgid "uncompressed" @@ -375,29 +369,27 @@ msgstr "正在取消..." #: dlls/browseui/browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2" #: dlls/browseui/browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2 %3!u! %4" #: dlls/browseui/browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "秒(&S)" +msgstr "秒" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "分" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "小時" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" -msgstr "屬性 %s" +msgstr "%s 的內容" #: dlls/comctl32/comctl32.rc:73 dlls/comdlg32/comdlg32.rc:265 msgid "&Apply" @@ -438,7 +430,7 @@ msgstr "關閉(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "重置(&e)" +msgstr "重置(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -458,7 +450,7 @@ msgstr "重置(&e)" #: programs/winemine/winemine.rc:53 programs/winhlp32/winhlp32.rc:57 #: programs/wordpad/wordpad.rc:102 msgid "&Help" -msgstr "求助(&H)" +msgstr "說明(&H)" #: dlls/comctl32/comctl32.rc:103 msgid "Move &Up" @@ -508,16 +500,12 @@ msgid "&Retry" msgstr "重試(&R)" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "隱藏分頁(&T)" +msgstr "隱藏詳細資訊" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "詳細資料" +msgstr "顯示詳細資訊" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -641,7 +629,7 @@ msgstr "[無]" #: dlls/comdlg32/comdlg32.rc:231 msgid "Specific &Printer" -msgstr "特定的印表機(&P)" +msgstr "指定的印表機(&P)" #: dlls/comdlg32/comdlg32.rc:236 dlls/comdlg32/comdlg32.rc:419 #: dlls/comdlg32/comdlg32.rc:443 dlls/wineps.drv/wineps.rc:34 @@ -701,7 +689,7 @@ msgstr "底線(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "色彩(&C)：" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -721,11 +709,11 @@ msgstr "基本色彩(&B)：" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定色彩(&C)：" +msgstr "自訂色彩(&C)：" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|純色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -755,18 +743,16 @@ msgstr "亮度(&L)：" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" -msgstr "新增自定色彩(&A)" +msgstr "新增自訂色彩(&A)" #: dlls/comdlg32/comdlg32.rc:311 msgid "&Define Custom Colors >>" -msgstr "定義自定色彩(&D) >>" +msgstr "定義自訂色彩(&D) >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "否(&N)" +msgstr "&o" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -822,7 +808,7 @@ msgstr "取代全部(&A)" #: dlls/shell32/shell32.rc:108 programs/clock/clock.rc:31 #: programs/conhost/conhost.rc:34 msgid "&Properties" -msgstr "屬性(&P)" +msgstr "內容(&P)" #: dlls/comdlg32/comdlg32.rc:364 msgid "Print to fi&le" @@ -961,7 +947,7 @@ msgstr "找不到檔案" #: dlls/comdlg32/comdlg32.rc:34 msgid "Please verify that the correct file name was given" -msgstr "請檢查是否給予正確的檔案名稱。" +msgstr "請檢查是否給予正確的檔案名稱" #: dlls/comdlg32/comdlg32.rc:35 msgid "" @@ -977,23 +963,23 @@ msgid "" "Do you want to replace it?" msgstr "" "檔案已經存在。\n" -"要取代嗎？" +"您要取代它嗎？" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" -msgstr "檔案名稱中存在無效的字元" +msgstr "路徑中存在無效的字元" #: dlls/comdlg32/comdlg32.rc:38 msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"檔案名中不能包含任何一下字元:\n" +"檔案名稱中不能包含以下任何一個字元：\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 msgid "Path does not exist" -msgstr "資料夾不存在" +msgstr "路徑不存在" #: dlls/comdlg32/comdlg32.rc:40 msgid "File does not exist" @@ -1001,7 +987,7 @@ msgstr "檔案不存在" #: dlls/comdlg32/comdlg32.rc:41 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "已選項目包含非資料夾對象" #: dlls/comdlg32/comdlg32.rc:46 msgid "Up One Level" @@ -1118,15 +1104,15 @@ msgstr "" #: dlls/comdlg32/comdlg32.rc:61 msgid "The 'from' entry cannot exceed the 'to' entry." -msgstr "起始值不能大於終點值。" +msgstr "「從」項的值不能大於「到」項的值。" #: dlls/comdlg32/comdlg32.rc:63 msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"邊緣空白重疊或落於邊界外，\n" -"請重新輸入邊緣空白。" +"頁面邊距重疊或落於邊界外，\n" +"請重新輸入頁面邊距。" #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -1137,8 +1123,8 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"您的印表機不支持這麼大的份數。\n" -"請輸入一個 1 和 %d 之間的數。" +"您的印表機不支援列印這麼大的份數。\n" +"請輸入一個 1 和 %d 之間的數值。" #: dlls/comdlg32/comdlg32.rc:68 msgid "A printer error occurred." @@ -1169,12 +1155,12 @@ msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"在使用與印表機有關功能(版面設定, 列印檔案)之前, 您必須先安裝印表機。請安裝一" -"個印表機後再試。" +"您必須先安裝印表機才能使用與印表機有關的功能（如：版面設定、列印檔案）。" +"請安裝印表機後再試一次。" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "選取介於 %1!d! 和 %2!d! 點的字型尺寸。" +msgstr "選取介於 %1!d! 和 %2!d! 點的字型大小。" #: dlls/comdlg32/comdlg32.rc:143 dlls/ieframe/ieframe.rc:35 msgid "&Save" @@ -1193,14 +1179,12 @@ msgid "Open File" msgstr "開啟檔案" #: dlls/comdlg32/comdlg32.rc:148 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "新資料夾" +msgstr "選擇資料夾" #: dlls/comdlg32/comdlg32.rc:149 msgid "Font size has to be a number." -msgstr "" +msgstr "字型大小必須是數字。" #: dlls/comdlg32/comdlg32.rc:84 programs/oleview/oleview.rc:98 msgid "Ready" @@ -1260,7 +1244,7 @@ msgstr "不可用；" #: dlls/comdlg32/comdlg32.rc:98 msgid "Waiting; " -msgstr "等待；" +msgstr "正在等待；" #: dlls/comdlg32/comdlg32.rc:99 msgid "Processing; " @@ -1288,7 +1272,7 @@ msgstr "頁處理記憶體超支；" #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " -msgstr "已被使用者中斷；" +msgstr "被使用者中斷；" #: dlls/comdlg32/comdlg32.rc:106 msgid "Out of memory; " @@ -1296,7 +1280,7 @@ msgstr "記憶體不足；" #: dlls/comdlg32/comdlg32.rc:107 msgid "The printer door is open; " -msgstr "印表機蓋是打開的；" +msgstr "印表機蓋已打開；" #: dlls/comdlg32/comdlg32.rc:108 msgid "Print server unknown; " @@ -1316,11 +1300,11 @@ msgstr "有 %d 個文件正在等待列印" #: dlls/comdlg32/comdlg32.rc:80 msgid "Margins [inches]" -msgstr "邊緣空白 [英寸]" +msgstr "頁面邊距 [英寸]" #: dlls/comdlg32/comdlg32.rc:81 msgid "Margins [mm]" -msgstr "邊緣空白 [毫米]" +msgstr "頁面邊距 [毫米]" #: dlls/comdlg32/comdlg32.rc:82 dlls/sane.ds/sane.rc:33 msgctxt "unit: millimeters" @@ -1369,8 +1353,7 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"請在輸入密碼前按下 Caps Lock 鍵，解除\n" -"大寫鎖定。" +"您可以按下 Caps Lock 鍵以解除大寫鎖定，然後再輸入密碼。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1378,7 +1361,7 @@ msgstr "大寫鎖定已開啟" #: dlls/crypt32/crypt32.rc:30 msgid "Authority Key Identifier" -msgstr "授權金鑰識別碼" +msgstr "授權金鑰識別號" #: dlls/crypt32/crypt32.rc:31 msgid "Key Attributes" @@ -1410,7 +1393,7 @@ msgstr "憑證策略" #: dlls/crypt32/crypt32.rc:38 msgid "Subject Key Identifier" -msgstr "主體金鑰識別碼" +msgstr "主體金鑰識別號" #: dlls/crypt32/crypt32.rc:39 msgid "CRL Reason Code" @@ -1446,7 +1429,7 @@ msgstr "電子郵件地址" #: dlls/crypt32/crypt32.rc:47 msgid "Unstructured Name" -msgstr "無結構的名稱" +msgstr "非結構化名稱" #: dlls/crypt32/crypt32.rc:48 msgid "Content Type" @@ -1462,15 +1445,15 @@ msgstr "簽署時間" #: dlls/crypt32/crypt32.rc:51 msgid "Counter Sign" -msgstr "計數器符號" +msgstr "副署" #: dlls/crypt32/crypt32.rc:52 msgid "Challenge Password" -msgstr "挑戰密碼" +msgstr "要求密碼" #: dlls/crypt32/crypt32.rc:53 msgid "Unstructured Address" -msgstr "無結構的位址" +msgstr "非結構化位址" #: dlls/crypt32/crypt32.rc:54 msgid "S/MIME Capabilities" @@ -1478,7 +1461,7 @@ msgstr "S/MIME 能力" #: dlls/crypt32/crypt32.rc:55 msgid "Prefer Signed Data" -msgstr "偏好已簽署資料" +msgstr "已簽署資料優先" #: dlls/crypt32/crypt32.rc:56 dlls/cryptdlg/cryptdlg.rc:34 msgctxt "Certification Practice Statement" @@ -1527,7 +1510,7 @@ msgstr "Netscape CA 廢止網址" #: dlls/crypt32/crypt32.rc:67 msgid "Netscape Cert Renewal URL" -msgstr "Netscape 憑證重申網址" +msgstr "Netscape 憑證續約網址" #: dlls/crypt32/crypt32.rc:68 msgid "Netscape CA Policy URL" @@ -1615,7 +1598,7 @@ msgstr "Windows 產品更新" #: dlls/crypt32/crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "註冊名稱值對" +msgstr "註冊名稱值配對" #: dlls/crypt32/crypt32.rc:90 msgid "OS Version" @@ -1627,7 +1610,7 @@ msgstr "註冊 CSP" #: dlls/crypt32/crypt32.rc:92 msgid "CRL Number" -msgstr "CRL 數字" +msgstr "CRL 號碼" #: dlls/crypt32/crypt32.rc:93 msgid "Delta CRL Indicator" @@ -1635,7 +1618,7 @@ msgstr "Delta CRL 指示器" #: dlls/crypt32/crypt32.rc:94 msgid "Issuing Distribution Point" -msgstr "議題發布點" +msgstr "發證發布點" #: dlls/crypt32/crypt32.rc:95 msgid "Freshest CRL" @@ -1751,7 +1734,7 @@ msgstr "虛設簽署人" #: dlls/crypt32/crypt32.rc:123 msgid "Encrypted Private Key" -msgstr "加密的私鑰" +msgstr "已加密的私鑰" #: dlls/crypt32/crypt32.rc:124 msgid "Published CRL Locations" @@ -1767,11 +1750,11 @@ msgstr "異動作業識別號" #: dlls/crypt32/crypt32.rc:127 msgid "Sender Nonce" -msgstr "當前傳送者" +msgstr "發送者的一次性隨機數" #: dlls/crypt32/crypt32.rc:128 msgid "Recipient Nonce" -msgstr "當前收件者" +msgstr "收件者的一次性隨機數" #: dlls/crypt32/crypt32.rc:129 msgid "Reg Info" @@ -1807,7 +1790,7 @@ msgstr "私鑰使用週期" #: dlls/crypt32/crypt32.rc:137 msgid "Client Information" -msgstr "客戶端資訊" +msgstr "用戶端資訊" #: dlls/crypt32/crypt32.rc:138 msgid "Server Authentication" @@ -1815,7 +1798,7 @@ msgstr "伺服器認證" #: dlls/crypt32/crypt32.rc:139 msgid "Client Authentication" -msgstr "客戶端認證" +msgstr "用戶端認證" #: dlls/crypt32/crypt32.rc:140 msgid "Code Signing" @@ -1843,7 +1826,7 @@ msgstr "IP 安全終端系統" #: dlls/crypt32/crypt32.rc:146 msgid "IP security tunnel termination" -msgstr "IP 安全遂道終端" +msgstr "IP 安全隧道終端" #: dlls/crypt32/crypt32.rc:147 msgid "IP security user" @@ -1923,7 +1906,7 @@ msgstr "憑證請求代理程式" #: dlls/crypt32/crypt32.rc:166 dlls/cryptui/cryptui.rc:141 msgid "Lifetime Signing" -msgstr "生命期簽署" +msgstr "永久簽署" #: dlls/crypt32/crypt32.rc:167 msgid "All issuance policies" @@ -2050,7 +2033,7 @@ msgstr "不明存取方法" #: dlls/crypt32/crypt32.rc:205 msgid "Alternative Name" -msgstr "另類名稱" +msgstr "其他名稱" #: dlls/crypt32/crypt32.rc:206 msgid "CRL Distribution Point" @@ -2094,11 +2077,11 @@ msgstr "已取代" #: dlls/crypt32/crypt32.rc:216 msgid "Operation Ceased" -msgstr "作業終了" +msgstr "作業已停止" #: dlls/crypt32/crypt32.rc:217 msgid "Certificate Hold" -msgstr "憑證暫停" +msgstr "持有的憑證" #: dlls/crypt32/crypt32.rc:218 msgid "Financial Information=" @@ -2110,11 +2093,11 @@ msgstr "可用" #: dlls/crypt32/crypt32.rc:220 msgid "Not Available" -msgstr "無法使用" +msgstr "不可用" #: dlls/crypt32/crypt32.rc:221 msgid "Meets Criteria=" -msgstr "會面準則=" +msgstr "符合準則=" #: dlls/crypt32/crypt32.rc:222 dlls/cryptui/cryptui.rc:166 #: dlls/oleaut32/oleaut32.rc:32 dlls/wininet/wininet.rc:94 @@ -2138,7 +2121,7 @@ msgstr "不可否認性" #: dlls/crypt32/crypt32.rc:226 msgid "Key Encipherment" -msgstr "金鑰編密" +msgstr "金鑰加密" #: dlls/crypt32/crypt32.rc:227 msgid "Data Encipherment" @@ -2162,15 +2145,15 @@ msgstr "CRL 簽署" #: dlls/crypt32/crypt32.rc:232 msgid "Encipher Only" -msgstr "只譯為密文" +msgstr "僅加密者" #: dlls/crypt32/crypt32.rc:233 msgid "Decipher Only" -msgstr "只解開密文" +msgstr "僅解密者" #: dlls/crypt32/crypt32.rc:234 msgid "SSL Client Authentication" -msgstr "SSL 客戶端認證" +msgstr "SSL 用戶端認證" #: dlls/crypt32/crypt32.rc:235 msgid "SSL Server Authentication" @@ -2202,7 +2185,7 @@ msgstr "憑證策略" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略識別碼：" +msgstr "策略識別號：" #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" @@ -2252,7 +2235,7 @@ msgstr "顯示(&S)：" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." -msgstr "編輯屬性(&E)..." +msgstr "編輯內容(&E)..." #: dlls/cryptui/cryptui.rc:211 msgid "&Copy to File..." @@ -2305,20 +2288,20 @@ msgstr "停用這個憑證的全部目的(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "只有啟用這個憑證的下列目的(&O)：" +msgstr "只啟用這個憑證的下列目的(&O)：" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." -msgstr "加入目的(&P)..." +msgstr "新增目的(&P)..." #: dlls/cryptui/cryptui.rc:262 msgid "Add Purpose" -msgstr "加入目的" +msgstr "新增目的" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "加入您所希望的憑證目的物件識別符號 (OID)：" +msgstr "新增您希望加入的憑證目的的物件識別號 (OID)：" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" @@ -2330,7 +2313,7 @@ msgstr "選取您要使用的憑證儲存處：" #: dlls/cryptui/cryptui.rc:279 msgid "&Show physical stores" -msgstr "顯示實體儲存(&S)" +msgstr "顯示實體儲存裝置(&S)" #: dlls/cryptui/cryptui.rc:285 dlls/cryptui/cryptui.rc:296 #: dlls/cryptui/cryptui.rc:313 dlls/cryptui/cryptui.rc:327 @@ -2356,10 +2339,10 @@ msgid "" msgstr "" "這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信賴清單到憑證儲存處。\n" "\n" -"憑證可用於識別您或您正在通訊的電腦。它也可以用於認證以及對訊息簽署。憑證儲" -"存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" "\n" -"要繼續，請按下一步。" +"請按下一步繼續。" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" @@ -2402,7 +2385,7 @@ msgstr "自動選取憑證儲存處(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "將所有憑證放置於下列儲存(&P)：" +msgstr "將所有憑證放置於下列儲存處(&P)：" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2410,7 +2393,7 @@ msgstr "正在完成憑證匯入精靈" #: dlls/cryptui/cryptui.rc:332 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "您已經成功地完成憑證匯入精靈。" +msgstr "您已經成功完成憑證匯入精靈。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" @@ -2462,7 +2445,7 @@ msgstr "憑證目的" #: dlls/cryptui/cryptui.rc:364 msgid "" "Select one or more purposes to be listed when Advanced Purposes is selected." -msgstr "當進階目的已選時選取一或多個要列出的目的。" +msgstr "選取一個或多個在進階目的已選取時要列出的目的。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" @@ -2493,10 +2476,10 @@ msgid "" msgstr "" "這個精靈協助您從憑證儲存處匯出憑證、憑證撤銷清單以及憑證信賴清單到檔案。\n" "\n" -"憑證可用於識別您或您用以通訊的電腦。它也可以被用於認證以及簽署訊息。憑證儲存" -"處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" "\n" -"要繼續請按下一步。" +"請按下一步繼續。" #: dlls/cryptui/cryptui.rc:389 msgid "" @@ -2510,11 +2493,11 @@ msgstr "您要匯出私鑰嗎？" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" -msgstr "是(&Y)，匯出私鑰。" +msgstr "是，匯出私鑰(&Y)" #: dlls/cryptui/cryptui.rc:393 msgid "N&o, do not export the private key" -msgstr "否(&N)，不要匯出私鑰。" +msgstr "否，不要匯出私鑰(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" @@ -2562,19 +2545,15 @@ msgstr "正在完成憑證匯出精靈" #: dlls/cryptui/cryptui.rc:446 msgid "You have successfully completed the Certificate Export Wizard." -msgstr "您已經成功地完成憑證匯出精靈" +msgstr "您已經成功完成憑證匯出精靈。" #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -2594,7 +2573,7 @@ msgstr "這個憑證的簽名無效。憑證也許已被改變或已損壞。" msgid "" "This root certificate is not trusted. To trust it, add it to your system's " "trusted root certificate store." -msgstr "這個根憑證未被信賴。要信賴它，就將它加入您系統的信賴根憑證儲存處。" +msgstr "這個根憑證未被信賴。要信賴它，就要將它加入到系統的信賴根憑證儲存處。" #: dlls/cryptui/cryptui.rc:34 msgid "This certificate could not be validated to a trusted root certificate." @@ -2614,11 +2593,11 @@ msgstr "這個憑證是適用於下列目的：" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "發證對象：" +msgstr "發證予：" #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "發證來源：" +msgstr "發證者：" #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2638,7 +2617,7 @@ msgstr "這個憑證已過期或尚未生效。" #: dlls/cryptui/cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." -msgstr "這個憑證的有效期限超過它的發證者。" +msgstr "這個憑證的有效期限超過發證者的有效期限。" #: dlls/cryptui/cryptui.rc:45 msgid "This certificate was revoked by its issuer." @@ -2663,19 +2642,19 @@ msgstr "<所有>" #: dlls/cryptui/cryptui.rc:50 msgid "Version 1 Fields Only" -msgstr "只有版本 1 欄位" +msgstr "僅版本 1 欄位" #: dlls/cryptui/cryptui.rc:51 msgid "Extensions Only" -msgstr "只有進階屬性" +msgstr "僅進階屬性" #: dlls/cryptui/cryptui.rc:52 msgid "Critical Extensions Only" -msgstr "只有關鍵進階屬性" +msgstr "僅重要進階屬性" #: dlls/cryptui/cryptui.rc:53 msgid "Properties Only" -msgstr "只有屬性" +msgstr "僅屬性" #: dlls/cryptui/cryptui.rc:55 msgid "Serial number" @@ -2703,7 +2682,7 @@ msgstr "公鑰" #: dlls/cryptui/cryptui.rc:61 msgid "%1 (%2!d! bits)" -msgstr "%1 (%2!d! 位元)" +msgstr "%1（%2!d! 位元）" #: dlls/cryptui/cryptui.rc:62 msgid "SHA1 hash" @@ -2711,7 +2690,7 @@ msgstr "SHA1 雜湊" #: dlls/cryptui/cryptui.rc:63 msgid "Enhanced key usage (property)" -msgstr "進階金鑰用法 (內容)" +msgstr "進階金鑰用法（內容）" #: dlls/cryptui/cryptui.rc:64 msgid "Friendly name" @@ -2724,11 +2703,11 @@ msgstr "描述" #: dlls/cryptui/cryptui.rc:66 msgid "Certificate Properties" -msgstr "憑證屬性" +msgstr "憑證內容" #: dlls/cryptui/cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "請以 1.2.3.4 的形式輸入 OID" +msgstr "請以 1.2.3.4 的格式輸入 OID" #: dlls/cryptui/cryptui.rc:68 msgid "The OID you entered already exists." @@ -2742,7 +2721,7 @@ msgstr "請選取憑證儲存處。" msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." -msgstr "檔案含有不匹配給定準則的物件。請選取另一個檔案。" +msgstr "檔案含有不符合給定準則的物件。請選取另一個檔案。" #: dlls/cryptui/cryptui.rc:73 msgid "File to Import" @@ -2804,7 +2783,7 @@ msgstr "請選取儲存處" #: dlls/cryptui/cryptui.rc:89 msgid "Certificate Store Selected" -msgstr "憑證儲存處已選" +msgstr "已選取憑證儲存處" #: dlls/cryptui/cryptui.rc:90 msgid "Automatically determined by the program" @@ -2832,7 +2811,7 @@ msgstr "個人資訊交換" #: dlls/cryptui/cryptui.rc:99 msgid "The import was successful." -msgstr "已成功匯入。" +msgstr "匯入成功。" #: dlls/cryptui/cryptui.rc:100 msgid "The import failed." @@ -2848,11 +2827,11 @@ msgstr "<進階目的>" #: dlls/cryptui/cryptui.rc:104 msgid "Issued To" -msgstr "發證對象" +msgstr "發證予" #: dlls/cryptui/cryptui.rc:105 msgid "Issued By" -msgstr "發證來源" +msgstr "發證者" #: dlls/cryptui/cryptui.rc:106 dlls/wininet/wininet.rc:36 msgid "Expiration Date" @@ -2894,11 +2873,6 @@ msgstr "" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -2913,7 +2887,7 @@ msgid "" "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個憑證授權者所發的憑證將不再被信賴。\n" +"將不再信賴由這個憑證授權者所發的憑證。\n" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:115 @@ -2922,7 +2896,7 @@ msgid "" "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些憑證授權者所發的憑證將不再被信賴。\n" +"將不再信賴由這些憑證授權者所發的憑證。\n" "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:116 @@ -2931,7 +2905,7 @@ msgid "" "certification authorities it issued, will no longer be trusted.\n" "Are you sure you want to remove this trusted root certificate?" msgstr "" -"由這個憑證授權者所發的憑證，或是任何由它發證的憑證授權者，將不再被信賴。\n" +"將不再信賴由這個憑證授權者所發的憑證或憑證授權者。\n" "確定要移除這個信賴的根憑證？" #: dlls/cryptui/cryptui.rc:117 @@ -2940,7 +2914,7 @@ msgid "" "certification authorities they issued, will no longer be trusted.\n" "Are you sure you want to remove these trusted root certificates?" msgstr "" -"由這些憑證授權者所發的憑證，或是任何由它們發證的憑證授權者，將不再被信賴。\n" +"將不再信賴由這些憑證授權者所發的憑證或憑證授權者。\n" "確定要移除這些信賴的根憑證？" #: dlls/cryptui/cryptui.rc:118 @@ -2948,7 +2922,7 @@ msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個發行者簽署的軟體將不再被信賴。\n" +"將不再信賴由這個發行者簽署的軟體。\n" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:119 @@ -2956,7 +2930,7 @@ msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些發行者簽署的軟體將不再被信賴。\n" +"將不再信賴由這些發行者簽署的軟體。\n" "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:120 @@ -2969,7 +2943,7 @@ msgstr "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" -msgstr "確保遠端電腦的身分" +msgstr "確認遠端電腦的身分" #: dlls/cryptui/cryptui.rc:125 msgid "Proves your identity to a remote computer" @@ -2980,8 +2954,8 @@ msgid "" "Ensures software came from software publisher\n" "Protects software from alteration after publication" msgstr "" -"請確認軟體是來自軟體發行者\n" -"保護軟體以避免發行之後的變更" +"確認軟體是來自軟體發行者\n" +"確保軟體在發行之後未被修改" #: dlls/cryptui/cryptui.rc:127 msgid "Protects e-mail messages" @@ -3001,11 +2975,11 @@ msgstr "允許您數位簽署憑證信賴清單" #: dlls/cryptui/cryptui.rc:131 msgid "Allows data on disk to be encrypted" -msgstr "允許磁碟上的資料被加密" +msgstr "允許加密磁碟上的資料" #: dlls/cryptui/cryptui.rc:147 msgid "Private Key Archival" -msgstr "私鑰檔案的" +msgstr "私鑰檔案封存" #: dlls/cryptui/cryptui.rc:151 msgid "Export Format" @@ -3017,7 +2991,7 @@ msgstr "選擇將用來儲存內容的格式。" #: dlls/cryptui/cryptui.rc:153 msgid "Export Filename" -msgstr "匯出檔名" +msgstr "匯出檔案名稱" #: dlls/cryptui/cryptui.rc:154 msgid "Specify the name of the file in which the content will be saved." @@ -3025,7 +2999,7 @@ msgstr "指定將會儲存內容的檔案名稱。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案已經存在。您要取代它嗎？" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3057,7 +3031,7 @@ msgstr "匯出密鑰" #: dlls/cryptui/cryptui.rc:168 msgid "The export was successful." -msgstr "已成功匯出。" +msgstr "匯出成功。" #: dlls/cryptui/cryptui.rc:169 msgid "The export failed." @@ -3079,11 +3053,11 @@ msgstr "輸入密碼" #: dlls/cryptui/cryptui.rc:173 msgid "You may password-protect a private key." -msgstr "您可以以密碼保護私鑰。" +msgstr "您可以使用密碼來保護私鑰。" #: dlls/cryptui/cryptui.rc:174 msgid "The passwords do not match." -msgstr "密碼不匹配。" +msgstr "密碼不相符。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." @@ -3094,20 +3068,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "註記：用於這個憑證的私鑰不可匯出。" #: dlls/cryptui/cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "預定目的(&N)：" +msgstr "預定目的" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:150 msgid "Location" msgstr "位置" #: dlls/cryptui/cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:181 programs/winefile/winefile.rc:101 #: programs/winhlp32/winhlp32.rc:110 programs/winhlp32/winhlp32.rc:85 @@ -3120,11 +3090,11 @@ msgstr "裝置設定" #: dlls/dinput/dinput.rc:39 msgid "Reset" -msgstr "重置" +msgstr "重設" #: dlls/dinput/dinput.rc:42 msgid "Player" -msgstr "玩家" +msgstr "播放器" #: dlls/dinput/dinput.rc:43 programs/winecfg/winecfg.rc:88 msgid "Device" @@ -3168,55 +3138,55 @@ msgstr "中歐語言" #: dlls/gdi32/gdi32.rc:30 msgid "Cyrillic" -msgstr "斯拉夫語" +msgstr "斯拉夫文" #: dlls/gdi32/gdi32.rc:31 msgid "Greek" -msgstr "希臘語" +msgstr "希臘文" #: dlls/gdi32/gdi32.rc:32 msgid "Turkish" -msgstr "土耳其語" +msgstr "土耳其文" #: dlls/gdi32/gdi32.rc:33 msgid "Hebrew" -msgstr "希伯來語" +msgstr "希伯來文" #: dlls/gdi32/gdi32.rc:34 msgid "Arabic" -msgstr "阿拉伯語" +msgstr "阿拉伯文" #: dlls/gdi32/gdi32.rc:35 msgid "Baltic" -msgstr "波羅的海語" +msgstr "波羅的海語言" #: dlls/gdi32/gdi32.rc:36 msgid "Vietnamese" -msgstr "越南語" +msgstr "越南文" #: dlls/gdi32/gdi32.rc:37 msgid "Thai" -msgstr "泰語" +msgstr "泰文" #: dlls/gdi32/gdi32.rc:38 msgid "Japanese" -msgstr "日語" +msgstr "日文" #: dlls/gdi32/gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "簡化字漢語" +msgstr "中文（GB2312）" #: dlls/gdi32/gdi32.rc:40 msgid "Hangul" -msgstr "韓語諺文" +msgstr "韓文" #: dlls/gdi32/gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "傳統字漢語" +msgstr "中文（BIG5）" #: dlls/gdi32/gdi32.rc:42 msgid "Hangul(Johab)" -msgstr "韓語諺文(組合型)" +msgstr "韓文（Johab）" #: dlls/gdi32/gdi32.rc:43 msgid "Symbol" @@ -3237,7 +3207,7 @@ msgstr "照相機中的檔案" #: dlls/gphoto2.ds/gphoto2.rc:34 msgid "Import Selected" -msgstr "匯入選擇的檔案" +msgstr "匯入已選取檔案" #: dlls/gphoto2.ds/gphoto2.rc:35 msgid "Preview" @@ -3265,7 +3235,7 @@ msgstr "正在傳輸... 請稍候" #: dlls/gphoto2.ds/gphoto2.rc:51 msgid "Connecting to camera" -msgstr "連接照相機" +msgstr "正在連接照相機" #: dlls/gphoto2.ds/gphoto2.rc:55 msgid "Connecting to camera... Please Wait" @@ -3278,11 +3248,11 @@ msgstr "同步(&Y)" #: dlls/hhctrl.ocx/hhctrl.rc:60 dlls/hhctrl.ocx/hhctrl.rc:73 #: dlls/shdoclc/shdoclc.rc:41 programs/winhlp32/winhlp32.rc:89 msgid "&Back" -msgstr "返回(&B)" +msgstr "上一頁(&B)" #: dlls/hhctrl.ocx/hhctrl.rc:61 dlls/hhctrl.ocx/hhctrl.rc:74 msgid "&Forward" -msgstr "向前" +msgstr "下一頁(&F)" #: dlls/hhctrl.ocx/hhctrl.rc:62 msgctxt "table of contents" @@ -3314,10 +3284,8 @@ msgid "&View Source" msgstr "檢視原始碼(&V)" #: dlls/hhctrl.ocx/hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "屬性" +msgstr "內容(&T)" #: dlls/hhctrl.ocx/hhctrl.rc:87 dlls/shdoclc/shdoclc.rc:79 #: dlls/shdoclc/shdoclc.rc:93 dlls/shdoclc/shdoclc.rc:117 @@ -3388,7 +3356,7 @@ msgstr "重新整理" #: dlls/hhctrl.ocx/hhctrl.rc:46 dlls/ieframe/ieframe.rc:66 msgid "Back" -msgstr "返回" +msgstr "上一頁" #: dlls/hhctrl.ocx/hhctrl.rc:47 msgctxt "table of contents" @@ -3406,7 +3374,7 @@ msgstr "選項" #: dlls/hhctrl.ocx/hhctrl.rc:51 dlls/ieframe/ieframe.rc:67 msgid "Forward" -msgstr "向前" +msgstr "下一頁" #: dlls/iccvid/iccvid.rc:28 dlls/iccvid/iccvid.rc:29 msgid "Cinepak Video codec" @@ -3438,7 +3406,7 @@ msgstr "開啟(&O)..." #: dlls/ieframe/ieframe.rc:36 programs/notepad/notepad.rc:33 #: programs/wordpad/wordpad.rc:34 msgid "Save &as..." -msgstr "另存為(&A)..." +msgstr "另存新檔(&A)..." #: dlls/ieframe/ieframe.rc:38 msgid "Print &format..." @@ -3478,7 +3446,7 @@ msgstr "關於 Internet Explorer(&A)" #: dlls/ieframe/ieframe.rc:90 msgid "Open URL" -msgstr "開啟連結(&O)" +msgstr "開啟連結" #: dlls/ieframe/ieframe.rc:93 msgid "Specify the URL you wish to open in Internet Explorer" @@ -3539,11 +3507,11 @@ msgstr "空白頁面(&B)" #: dlls/inetcpl.cpl/inetcpl.rc:56 msgid "Browsing history" -msgstr "瀏覽歷程" +msgstr "瀏覽歷史" #: dlls/inetcpl.cpl/inetcpl.rc:57 msgid "You can delete cached pages, cookies and other data." -msgstr "您可以刪除網頁快取、訊餅和其他資料。" +msgstr "您可以刪除網頁快取、Cookie 和其他資料。" #: dlls/inetcpl.cpl/inetcpl.rc:59 msgid "Delete &files..." @@ -3555,7 +3523,7 @@ msgstr "設定(&S)..." #: dlls/inetcpl.cpl/inetcpl.rc:68 msgid "Delete browsing history" -msgstr "刪除瀏覽歷程" +msgstr "刪除瀏覽歷史" #: dlls/inetcpl.cpl/inetcpl.rc:71 msgid "" @@ -3571,7 +3539,7 @@ msgid "" "Files saved on your computer by websites, which store things like user " "preferences and login information." msgstr "" -"訊餅\n" +"Cookies\n" "由網站儲存於您電腦的檔案，其存有諸如使用者偏好設定和登入資訊。" #: dlls/inetcpl.cpl/inetcpl.rc:75 @@ -3579,7 +3547,7 @@ msgid "" "History\n" "List of websites you have accessed." msgstr "" -"歷程\n" +"歷史\n" "您曾存取過的網站清單。" #: dlls/inetcpl.cpl/inetcpl.rc:77 @@ -3617,16 +3585,12 @@ msgid "Publishers..." msgstr "發行者..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "區域網路連線" +msgstr "連線" #: dlls/inetcpl.cpl/inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 設定" +msgstr "自動設定" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" @@ -3637,26 +3601,20 @@ msgid "Use Proxy Auto-Config (PAC) script" msgstr "" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "位址" +msgstr "位址：" #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "本機伺服器(&L)" +msgstr "代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "使用代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "無連接埠" +msgstr "連接埠：" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3668,7 +3626,7 @@ msgstr "設定 Wine 網際網路瀏覽器和相關的設定。" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "區域的安全設定：" +msgstr "此區域的安全設定：" #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3680,7 +3638,7 @@ msgstr "非常低" #: dlls/inetcpl.cpl/inetcpl.rc:36 dlls/wininet/wininet.rc:42 msgid "Low" -msgstr "慢" +msgstr "低" #: dlls/inetcpl.cpl/inetcpl.rc:37 msgid "Medium" @@ -3688,7 +3646,7 @@ msgstr "中" #: dlls/inetcpl.cpl/inetcpl.rc:38 msgid "Increased" -msgstr "已增加" +msgstr "稍高" #: dlls/inetcpl.cpl/inetcpl.rc:39 dlls/wininet/wininet.rc:41 msgid "High" @@ -3703,30 +3661,24 @@ msgid "&Disable" msgstr "停用(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "重置" +msgstr "重設(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "啟用(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "編輯覆載設定" +msgstr "覆寫(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" -msgstr "已連線" +msgstr "已連接" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "語音輸入裝置：" +msgstr "已連接（Xinput 裝置）" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3736,7 +3688,7 @@ msgstr "已停用" msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." -msgstr "停用或啟用裝置之後，已連線的搖桿將無法更新，直到您重新啟動這個小程式。" +msgstr "停用或啟用裝置之後，已連接的搖桿將無法更新，直到您重新啟動這個程式。" #: dlls/joy.cpl/joy.rc:55 msgid "Test Joystick" @@ -3759,8 +3711,8 @@ msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" -"請按下控制器中的任何按鈕以啟用所選的效果。效果的方向可以利用控制器的軸向來變" -"更。" +"請按下控制器中的任何按鈕以啟用所選的效果。" +"效果的方向可以利用控制器的軸向來變更。" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers" @@ -3768,7 +3720,7 @@ msgstr "遊戲控制器" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "測試和設定遊戲控制器。" #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3783,10 +3735,8 @@ msgid "Subscript out of range" msgstr "註標超出範圍" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "無紙；" +msgstr "堆疊空間不足" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3802,7 +3752,7 @@ msgstr "物件不支援這個屬性或方法" #: dlls/jscript/jscript.rc:35 dlls/vbscript/vbscript.rc:50 msgid "Object doesn't support this action" -msgstr "物件不支援此動作" +msgstr "物件不支援這個動作" #: dlls/jscript/jscript.rc:36 msgid "Argument not optional" @@ -3814,27 +3764,23 @@ msgstr "語法錯誤" #: dlls/jscript/jscript.rc:38 msgid "Expected ';'" -msgstr "預期為 ;" +msgstr "預期為 ';'" #: dlls/jscript/jscript.rc:39 msgid "Expected '('" -msgstr "預期為 (" +msgstr "預期為 '('" #: dlls/jscript/jscript.rc:40 msgid "Expected ')'" -msgstr "預期為 )" +msgstr "預期為 ')'" #: dlls/jscript/jscript.rc:41 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "主體金鑰識別碼" +msgstr "預期為識別號" #: dlls/jscript/jscript.rc:42 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "預期為 ;" +msgstr "預期為 '='" #: dlls/jscript/jscript.rc:43 msgid "Invalid character" @@ -3846,15 +3792,15 @@ msgstr "未終結的字串常數" #: dlls/jscript/jscript.rc:45 msgid "'return' statement outside of function" -msgstr "return 敘述位於函式之外" +msgstr "'return' 敘述位於函式之外" #: dlls/jscript/jscript.rc:46 msgid "Can't have 'break' outside of loop" -msgstr "在迴圈之外不可有 break" +msgstr "在迴圈之外不可有 'break'" #: dlls/jscript/jscript.rc:47 msgid "Can't have 'continue' outside of loop" -msgstr "在迴圈之外不可有 continue" +msgstr "在迴圈之外不可有 'continue'" #: dlls/jscript/jscript.rc:48 msgid "Label redefined" @@ -3865,38 +3811,32 @@ msgid "Label not found" msgstr "找不到標貼" #: dlls/jscript/jscript.rc:50 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "預期為 ;" +msgstr "預期為 '@end'" #: dlls/jscript/jscript.rc:51 msgid "Conditional compilation is turned off" -msgstr "條件編譯已被關閉" +msgstr "條件編譯已關閉" #: dlls/jscript/jscript.rc:52 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "預期為 ;" +msgstr "預期為 '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript 編譯錯誤" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 執行期錯誤" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "未知錯誤" +msgstr "不明執行期錯誤" #: dlls/jscript/jscript.rc:55 msgid "Number expected" -msgstr "預期為編號" +msgstr "預期為數字" #: dlls/jscript/jscript.rc:53 msgid "Function expected" @@ -3904,7 +3844,7 @@ msgstr "預期為函式" #: dlls/jscript/jscript.rc:54 msgid "'[object]' is not a date object" -msgstr "[object] 並非日期物件" +msgstr "'[object]' 並非日期物件" #: dlls/jscript/jscript.rc:56 msgid "Object expected" @@ -3916,11 +3856,11 @@ msgstr "不合法的指派" #: dlls/jscript/jscript.rc:58 msgid "'|' is undefined" -msgstr "| 未定義" +msgstr "'|' 未定義" #: dlls/jscript/jscript.rc:59 msgid "Boolean object expected" -msgstr "預期為布林物件" +msgstr "預期為布林值物件" #: dlls/jscript/jscript.rc:60 msgid "Cannot delete '|'" @@ -3935,16 +3875,12 @@ msgid "JScript object expected" msgstr "預期為 JScript 物件" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "預期為陣列物件" +msgstr "預期為列舉器物件" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "預期為布林物件" +msgstr "預期為正規表示式" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3952,7 +3888,7 @@ msgstr "正規表示式語法發生錯誤" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "發生異常且未被捕捉" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -3982,25 +3918,23 @@ msgstr "預期為陣列物件" msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" -msgstr "" +msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 'true'" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "無法定義屬性 '|'：物件不能擴展" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "無法重新定義不可設定的屬性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "[object] 並非日期物件" +msgstr "'this' 不是 Map 物件" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -4008,7 +3942,7 @@ msgstr "" #: include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine 核心 DLL" #: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32 #: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137 @@ -4081,7 +4015,7 @@ msgstr "無效的儲存裝置。\n" #: dlls/kernel32/winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "無法刪除現行目錄。\n" +msgstr "無法刪除目前的目錄。\n" #: dlls/kernel32/winerror.mc:113 msgid "Not same device.\n" @@ -4093,7 +4027,7 @@ msgstr "沒有檔案了。\n" #: dlls/kernel32/winerror.mc:123 msgid "Write protected.\n" -msgstr "防止寫入的。\n" +msgstr "已設定寫入保護。\n" #: dlls/kernel32/winerror.mc:128 msgid "Bad unit.\n" @@ -4245,7 +4179,7 @@ msgstr "太多網路名稱。\n" #: dlls/kernel32/winerror.mc:313 msgid "Too many network sessions.\n" -msgstr "太多網路執行期間。\n" +msgstr "太多網路工作階段。\n" #: dlls/kernel32/winerror.mc:318 msgid "Sharing paused.\n" @@ -4293,7 +4227,7 @@ msgstr "網路寫入錯誤。\n" #: dlls/kernel32/winerror.mc:373 msgid "No process slots.\n" -msgstr "沒有行程插槽。\n" +msgstr "沒有線程插槽。\n" #: dlls/kernel32/winerror.mc:378 msgid "Too many semaphores.\n" @@ -4301,7 +4235,7 @@ msgstr "太多號誌。\n" #: dlls/kernel32/winerror.mc:383 msgid "Exclusive semaphore already owned.\n" -msgstr "已擁有互斥號誌。\n" +msgstr "已擁有專屬號誌。\n" #: dlls/kernel32/winerror.mc:388 msgid "Semaphore is set.\n" @@ -4317,7 +4251,7 @@ msgstr "於插斷時間無效。\n" #: dlls/kernel32/winerror.mc:403 msgid "Semaphore owner died.\n" -msgstr "號誌擁有者已死。\n" +msgstr "號誌擁有者已終止。\n" #: dlls/kernel32/winerror.mc:408 msgid "Semaphore user limit.\n" @@ -4329,7 +4263,7 @@ msgstr "插入磁碟於儲存裝置 %1。\n" #: dlls/kernel32/winerror.mc:418 msgid "Drive locked.\n" -msgstr "已鎖定儲存裝置。\n" +msgstr "儲存裝置已鎖定。\n" #: dlls/kernel32/winerror.mc:423 msgid "Broken pipe.\n" @@ -4385,7 +4319,7 @@ msgstr "無效的層級。\n" #: dlls/kernel32/winerror.mc:493 msgid "No volume label.\n" -msgstr "沒有卷冊標貼。\n" +msgstr "沒有磁碟區代號。\n" #: dlls/kernel32/winerror.mc:498 msgid "Module not found.\n" @@ -4433,19 +4367,19 @@ msgstr "儲存裝置未被 SUBST。\n" #: dlls/kernel32/winerror.mc:558 msgid "Attempt to JOIN onto a JOINed drive.\n" -msgstr "試圖 JOIN 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:563 msgid "Attempt to SUBST onto a SUBSTed drive.\n" -msgstr "試圖 SUBST 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:568 msgid "Attempt to JOIN to a SUBSTed drive.\n" -msgstr "試圖 JOIN 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:573 msgid "Attempt to SUBST to a JOINed drive.\n" -msgstr "試圖 SUBST 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:578 msgid "Drive is busy.\n" @@ -4489,7 +4423,7 @@ msgstr "用於 DosMuxSemWait 的事件計數不正確。\n" #: dlls/kernel32/winerror.mc:628 msgid "Too many waiters for DosMuxSemWait.\n" -msgstr "太多 DosMuxSemWait 的等待者。\n" +msgstr "太多 DosMuxSemWait 的等待項。\n" #: dlls/kernel32/winerror.mc:633 msgid "DosSemMuxWait list invalid.\n" @@ -4497,7 +4431,7 @@ msgstr "DosSemMuxWait 清單無效。\n" #: dlls/kernel32/winerror.mc:638 msgid "Volume label too long.\n" -msgstr "卷冊標貼太長。\n" +msgstr "磁碟區代號太長。\n" #: dlls/kernel32/winerror.mc:643 msgid "Too many TCBs.\n" @@ -4673,7 +4607,7 @@ msgstr "不允許巢狀 LoadModule 呼叫。\n" #: dlls/kernel32/winerror.mc:858 msgid "Machine type mismatch.\n" -msgstr "機器型態不匹配。\n" +msgstr "機器類型不相符。\n" #: dlls/kernel32/winerror.mc:863 msgid "Bad pipe.\n" @@ -4681,11 +4615,11 @@ msgstr "不當的管線。\n" #: dlls/kernel32/winerror.mc:868 msgid "Pipe busy.\n" -msgstr "管線忙碌。\n" +msgstr "管線忙碌中。\n" #: dlls/kernel32/winerror.mc:873 msgid "Pipe closed.\n" -msgstr "管線關閉。\n" +msgstr "管線已關閉。\n" #: dlls/kernel32/winerror.mc:878 msgid "Pipe not connected.\n" @@ -4693,11 +4627,11 @@ msgstr "管線未連接。\n" #: dlls/kernel32/winerror.mc:883 msgid "More data available.\n" -msgstr "更多資料可用。\n" +msgstr "有更多可用資料。\n" #: dlls/kernel32/winerror.mc:888 msgid "Session canceled.\n" -msgstr "已取消工作階段。\n" +msgstr "工作階段已取消。\n" #: dlls/kernel32/winerror.mc:893 msgid "Invalid extended attribute name.\n" @@ -4753,7 +4687,7 @@ msgstr "讀取/寫入行程記憶體已部分完成。\n" #: dlls/kernel32/winerror.mc:958 msgid "The oplock wasn't granted.\n" -msgstr "未被授與 oplock。\n" +msgstr "未授權 oplock。\n" #: dlls/kernel32/winerror.mc:963 msgid "Invalid oplock message received.\n" @@ -4821,7 +4755,7 @@ msgstr "無效的旗標。\n" #: dlls/kernel32/winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "無法辨識的卷冊。\n" +msgstr "無法辨識的磁碟區。\n" #: dlls/kernel32/winerror.mc:1048 msgid "File invalid.\n" @@ -4833,7 +4767,7 @@ msgstr "無法全螢幕運行。\n" #: dlls/kernel32/winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "不存在的字組。\n" +msgstr "不存在的權杖。\n" #: dlls/kernel32/winerror.mc:1063 msgid "Registry corrupt.\n" @@ -4885,7 +4819,7 @@ msgstr "註冊表索引鍵有子項。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子項必須是易變的。\n" +msgstr "子項必須是可變的。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -4937,7 +4871,7 @@ msgstr "服務無法接受控制訊息。\n" #: dlls/kernel32/winerror.mc:1188 msgid "Service not active.\n" -msgstr "服務現未啟用。\n" +msgstr "服務尚未啟用。\n" #: dlls/kernel32/winerror.mc:1193 msgid "Service controller connect failed.\n" @@ -4985,7 +4919,7 @@ msgstr "服務已存在。\n" #: dlls/kernel32/winerror.mc:1248 msgid "System running last-known-good config.\n" -msgstr "系統執行最後已知正常的組配。\n" +msgstr "系統執行最近已知正常的組配。\n" #: dlls/kernel32/winerror.mc:1253 msgid "Service dependency deleted.\n" @@ -4993,7 +4927,7 @@ msgstr "服務相依性已刪除。\n" #: dlls/kernel32/winerror.mc:1258 msgid "Boot already accepted as last-good config.\n" -msgstr "開機已被接受為最後正常的組配。\n" +msgstr "開機已接受為最近正常的組配。\n" #: dlls/kernel32/winerror.mc:1263 msgid "Service not started since last boot.\n" @@ -5017,7 +4951,7 @@ msgstr "無法偵測到行程中止。\n" #: dlls/kernel32/winerror.mc:1288 msgid "No recovery program for service.\n" -msgstr "沒有復原程式用於服務。\n" +msgstr "服務沒有復原程式。\n" #: dlls/kernel32/winerror.mc:1293 msgid "Service not implemented by exe.\n" @@ -5080,8 +5014,6 @@ msgid "No Unicode translation.\n" msgstr "沒有萬國碼轉譯。\n" #: dlls/kernel32/winerror.mc:1368 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "動態連結函式庫初始失敗。\n" @@ -5123,7 +5055,7 @@ msgstr "軟碟回報錯誤的磁柱。\n" #: dlls/kernel32/winerror.mc:1418 msgid "Unknown floppy error.\n" -msgstr "未知的軟碟錯誤。\n" +msgstr "不明的軟碟錯誤。\n" #: dlls/kernel32/winerror.mc:1423 msgid "Floppy registers inconsistent.\n" @@ -5167,7 +5099,7 @@ msgstr "設定電源狀態失敗。\n" #: dlls/kernel32/winerror.mc:1473 msgid "Too many links.\n" -msgstr "太多鏈結。\n" +msgstr "太多連結。\n" #: dlls/kernel32/winerror.mc:1478 msgid "Newer Windows version needed.\n" @@ -5231,7 +5163,7 @@ msgstr "裝置需要重新初始化。\n" #: dlls/kernel32/winerror.mc:1553 msgid "The device requires cleaning.\n" -msgstr "裝置需要清潔。\n" +msgstr "裝置需要清理。\n" #: dlls/kernel32/winerror.mc:1558 msgid "The device door is open.\n" @@ -5259,11 +5191,11 @@ msgstr "找不到點。\n" #: dlls/kernel32/winerror.mc:1588 msgid "No running tracking service.\n" -msgstr "沒在執行追蹤服務。\n" +msgstr "沒有執行中的追蹤服務。\n" #: dlls/kernel32/winerror.mc:1593 msgid "No such volume ID.\n" -msgstr "沒有此類卷冊識別號。\n" +msgstr "沒有此類磁碟區識別號。\n" #: dlls/kernel32/winerror.mc:1598 msgid "Unable to remove the file to be replaced.\n" @@ -5283,11 +5215,11 @@ msgstr "正在刪除日誌。\n" #: dlls/kernel32/winerror.mc:1618 msgid "The journal is not active.\n" -msgstr "日誌現未啟用。\n" +msgstr "日誌尚未啟用。\n" #: dlls/kernel32/winerror.mc:1623 msgid "Potential matching file found.\n" -msgstr "找到可能的匹配檔案。\n" +msgstr "找到可能的相符檔案。\n" #: dlls/kernel32/winerror.mc:1628 msgid "The journal entry was deleted.\n" @@ -5299,7 +5231,7 @@ msgstr "無效的裝置名稱。\n" #: dlls/kernel32/winerror.mc:1638 msgid "Connection unavailable.\n" -msgstr "連接不得使用。\n" +msgstr "連接無法使用。\n" #: dlls/kernel32/winerror.mc:1643 msgid "Device already remembered.\n" @@ -5315,11 +5247,11 @@ msgstr "無效的網路提供者名稱。\n" #: dlls/kernel32/winerror.mc:1658 msgid "Cannot open network connection profile.\n" -msgstr "無法開啟網路連線側寫檔。\n" +msgstr "無法開啟網路連線配置檔案。\n" #: dlls/kernel32/winerror.mc:1663 msgid "Corrupt network connection profile.\n" -msgstr "損壞的網路連線側寫檔。\n" +msgstr "損壞的網路連線配置檔案。\n" #: dlls/kernel32/winerror.mc:1668 msgid "Not a container.\n" @@ -5327,7 +5259,7 @@ msgstr "不是一個容器。\n" #: dlls/kernel32/winerror.mc:1673 msgid "Extended error.\n" -msgstr "進階錯誤。\n" +msgstr "延伸錯誤。\n" #: dlls/kernel32/winerror.mc:1678 msgid "Invalid group name.\n" @@ -5367,11 +5299,11 @@ msgstr "無效的訊息目的地。\n" #: dlls/kernel32/winerror.mc:1728 msgid "Session credential conflict.\n" -msgstr "作業階段憑據發生衝突。\n" +msgstr "工作階段憑據發生衝突。\n" #: dlls/kernel32/winerror.mc:1733 msgid "Remote session limit exceeded.\n" -msgstr "已超出遠端作業階段限制。\n" +msgstr "已超出遠端工作階段限制。\n" #: dlls/kernel32/winerror.mc:1738 msgid "Duplicate domain or workgroup name.\n" @@ -5395,7 +5327,7 @@ msgstr "連線被拒。\n" #: dlls/kernel32/winerror.mc:1763 msgid "Connection gracefully closed.\n" -msgstr "已平順關閉連接。\n" +msgstr "已順利關閉連線。\n" #: dlls/kernel32/winerror.mc:1768 msgid "Address already associated with transport endpoint.\n" @@ -5411,23 +5343,23 @@ msgstr "連線無效。\n" #: dlls/kernel32/winerror.mc:1783 msgid "Connection is active.\n" -msgstr "連接現正使用。\n" +msgstr "連線現正使用。\n" #: dlls/kernel32/winerror.mc:1788 msgid "Network unreachable.\n" -msgstr "無法連線網路。\n" +msgstr "網路無法連線。\n" #: dlls/kernel32/winerror.mc:1793 msgid "Host unreachable.\n" -msgstr "無法連線主機。\n" +msgstr "主機無法連線。\n" #: dlls/kernel32/winerror.mc:1798 msgid "Protocol unreachable.\n" -msgstr "無法連線協定。\n" +msgstr "協定無法連線。\n" #: dlls/kernel32/winerror.mc:1803 msgid "Port unreachable.\n" -msgstr "無法連線通訊埠。\n" +msgstr "通訊埠無法連線。\n" #: dlls/kernel32/winerror.mc:1808 msgid "Request aborted.\n" @@ -5435,7 +5367,7 @@ msgstr "已放棄要求。\n" #: dlls/kernel32/winerror.mc:1813 msgid "Connection aborted.\n" -msgstr "已放棄連接。\n" +msgstr "已放棄連線。\n" #: dlls/kernel32/winerror.mc:1818 msgid "Please retry operation.\n" @@ -5471,7 +5403,7 @@ msgstr "使用者未被認證。\n" #: dlls/kernel32/winerror.mc:1858 msgid "User not logged on.\n" -msgstr "使用者未被記錄。\n" +msgstr "使用者未登入。\n" #: dlls/kernel32/winerror.mc:1863 msgid "Continue work in progress.\n" @@ -5503,7 +5435,7 @@ msgstr "即使沒有變更任何東西時也進行作業。\n" #: dlls/kernel32/winerror.mc:1898 msgid "The user profile is invalid.\n" -msgstr "使用者側寫檔無效。\n" +msgstr "使用者配置檔案無效。\n" #: dlls/kernel32/winerror.mc:1903 msgid "Not supported on Small Business Server.\n" @@ -5547,7 +5479,7 @@ msgstr "無效的主要群組。\n" #: dlls/kernel32/winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "沒有假冒字組。\n" +msgstr "沒有模擬權杖。\n" #: dlls/kernel32/winerror.mc:1958 msgid "Can't disable mandatory group.\n" @@ -5555,11 +5487,11 @@ msgstr "無法停用必要群組。\n" #: dlls/kernel32/winerror.mc:1963 msgid "No logon servers available.\n" -msgstr "沒有可用的登錄伺服器。\n" +msgstr "沒有可用的登入伺服器。\n" #: dlls/kernel32/winerror.mc:1968 msgid "No such logon session.\n" -msgstr "沒有此類登錄作業階段。\n" +msgstr "沒有此類登入工作階段。\n" #: dlls/kernel32/winerror.mc:1973 msgid "No such privilege.\n" @@ -5623,7 +5555,7 @@ msgstr "帳號限制。\n" #: dlls/kernel32/winerror.mc:2048 msgid "Invalid logon hours.\n" -msgstr "無效的登錄時數。\n" +msgstr "無效的登入時數。\n" #: dlls/kernel32/winerror.mc:2053 msgid "Invalid workstation.\n" @@ -5691,11 +5623,11 @@ msgstr "無效的群組屬性。\n" #: dlls/kernel32/winerror.mc:2133 msgid "Bad impersonation level.\n" -msgstr "不當的假冒等級。\n" +msgstr "不當的模擬等級。\n" #: dlls/kernel32/winerror.mc:2138 msgid "Can't open anonymous security token.\n" -msgstr "無法開啟匿名安全性代表字組。\n" +msgstr "無法開啟匿名的安全權杖。\n" #: dlls/kernel32/winerror.mc:2143 msgid "Bad validation class.\n" @@ -5703,7 +5635,7 @@ msgstr "不當的驗證類別。\n" #: dlls/kernel32/winerror.mc:2148 msgid "Bad token type.\n" -msgstr "不當的字組型態。\n" +msgstr "不當的權杖類型。\n" #: dlls/kernel32/winerror.mc:2153 msgid "No security on object.\n" @@ -5755,11 +5687,11 @@ msgstr "不當的描述元格式。\n" #: dlls/kernel32/winerror.mc:2213 msgid "Not a logon process.\n" -msgstr "不是個登錄行程。\n" +msgstr "不是登入工作階段。\n" #: dlls/kernel32/winerror.mc:2218 msgid "Logon session ID exists.\n" -msgstr "登錄期間識別碼已存在。\n" +msgstr "登入工作階段識別號已存在。\n" #: dlls/kernel32/winerror.mc:2223 msgid "Unknown authentication package.\n" @@ -5767,19 +5699,19 @@ msgstr "不明認證套件。\n" #: dlls/kernel32/winerror.mc:2228 msgid "Bad logon session state.\n" -msgstr "不當的登錄作業階段狀態。\n" +msgstr "不當的登入工作階段狀態。\n" #: dlls/kernel32/winerror.mc:2233 msgid "Logon session ID collision.\n" -msgstr "登錄期間識別碼產生碰撞。\n" +msgstr "登入工作階段識別號發生衝突。\n" #: dlls/kernel32/winerror.mc:2238 msgid "Invalid logon type.\n" -msgstr "無效的登錄型態。\n" +msgstr "無效的登入類型。\n" #: dlls/kernel32/winerror.mc:2243 msgid "Cannot impersonate.\n" -msgstr "無法假冒。\n" +msgstr "無法模擬。\n" #: dlls/kernel32/winerror.mc:2248 msgid "Invalid transaction state.\n" @@ -5807,7 +5739,7 @@ msgstr "其為使用者的主要群組。\n" #: dlls/kernel32/winerror.mc:2278 msgid "Token already in use.\n" -msgstr "字組已使用中。\n" +msgstr "權杖已在使用中。\n" #: dlls/kernel32/winerror.mc:2283 msgid "No such local group.\n" @@ -5827,7 +5759,7 @@ msgstr "本地群組已存在。\n" #: dlls/kernel32/winerror.mc:2303 dlls/kernel32/winerror.mc:2328 msgid "Logon type not granted.\n" -msgstr "登錄型態未授與。\n" +msgstr "登錄類型未授與。\n" #: dlls/kernel32/winerror.mc:2308 msgid "Too many secrets.\n" @@ -5843,7 +5775,7 @@ msgstr "內部安全資料庫錯誤。\n" #: dlls/kernel32/winerror.mc:2323 msgid "Too many context IDs.\n" -msgstr "太多文脈識別號。\n" +msgstr "太多內容識別號。\n" #: dlls/kernel32/winerror.mc:2333 msgid "Cross-encrypted NT password required.\n" @@ -5879,7 +5811,7 @@ msgstr "磁碟已損壞。\n" #: dlls/kernel32/winerror.mc:2373 msgid "No user session key.\n" -msgstr "沒有使用者作業階段金鑰。\n" +msgstr "沒有使用者工作階段金鑰。\n" #: dlls/kernel32/winerror.mc:2378 msgid "License quota exceeded.\n" @@ -5895,7 +5827,7 @@ msgstr "相互認證失敗。\n" #: dlls/kernel32/winerror.mc:2393 msgid "Time skew between client and server.\n" -msgstr "客戶端與伺服端的時間偏斜。\n" +msgstr "用戶端與伺服器的時間存在偏移。\n" #: dlls/kernel32/winerror.mc:2398 msgid "Invalid window handle.\n" @@ -5935,7 +5867,7 @@ msgstr "視窗由另外的執行緒所擁有。\n" #: dlls/kernel32/winerror.mc:2443 msgid "Hotkey already registered.\n" -msgstr "熱鍵已被註冊。\n" +msgstr "快捷鍵已被註冊。\n" #: dlls/kernel32/winerror.mc:2448 msgid "Class already exists.\n" @@ -5967,7 +5899,7 @@ msgstr "找不到清單方塊識別號。\n" #: dlls/kernel32/winerror.mc:2483 msgid "No wildcard characters.\n" -msgstr "沒有萬用字元字元。\n" +msgstr "沒有萬用字元。\n" #: dlls/kernel32/winerror.mc:2488 msgid "Clipboard not open.\n" @@ -5975,7 +5907,7 @@ msgstr "未開啟剪貼簿。\n" #: dlls/kernel32/winerror.mc:2493 msgid "Hotkey not registered.\n" -msgstr "快速鍵未註冊。\n" +msgstr "快捷鍵未註冊。\n" #: dlls/kernel32/winerror.mc:2498 msgid "Not a dialog window.\n" @@ -6039,7 +5971,7 @@ msgstr "這個清單方塊沒有定位停駐點。\n" #: dlls/kernel32/winerror.mc:2573 msgid "Can't destroy object owned by another thread.\n" -msgstr "無法銷毀由另外執行緒所擁有的物件。\n" +msgstr "無法銷毀由其他執行緒所擁有的物件。\n" #: dlls/kernel32/winerror.mc:2578 msgid "Child window menus not allowed.\n" @@ -6107,7 +6039,7 @@ msgstr "沒有非置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2658 msgid "No paged system resources.\n" -msgstr "非置換頁的系統資源。\n" +msgstr "沒有置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2663 msgid "No working set quota.\n" @@ -6131,7 +6063,7 @@ msgstr "無效的鍵盤控柄。\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許的攔截類型。\n" #: dlls/kernel32/winerror.mc:2693 msgid "Interactive window station required.\n" @@ -6171,11 +6103,11 @@ msgstr "使用者已放棄安裝。\n" #: dlls/kernel32/winerror.mc:2738 msgid "Installation failure.\n" -msgstr "安裝已失敗。\n" +msgstr "安裝失敗。\n" #: dlls/kernel32/winerror.mc:2743 msgid "Installation suspended.\n" -msgstr "安裝已懸置。\n" +msgstr "安裝擱置。\n" #: dlls/kernel32/winerror.mc:2748 msgid "Unknown product.\n" @@ -6183,15 +6115,15 @@ msgstr "不明產品。\n" #: dlls/kernel32/winerror.mc:2753 msgid "Unknown feature.\n" -msgstr "不明特徵。\n" +msgstr "不明功能。\n" #: dlls/kernel32/winerror.mc:2758 msgid "Unknown component.\n" -msgstr "未知的元件。\n" +msgstr "不明元件。\n" #: dlls/kernel32/winerror.mc:2763 msgid "Unknown property.\n" -msgstr "未知的屬性。\n" +msgstr "不明屬性。\n" #: dlls/kernel32/winerror.mc:2768 msgid "Invalid handle state.\n" @@ -6251,7 +6183,7 @@ msgstr "開啟安裝記錄檔時失敗。\n" #: dlls/kernel32/winerror.mc:2838 msgid "Installation language not supported.\n" -msgstr "不受支援的安裝語言。\n" +msgstr "不支援的安裝語言。\n" #: dlls/kernel32/winerror.mc:2843 msgid "Installation transform failed to apply.\n" @@ -6275,11 +6207,11 @@ msgstr "無效的表格。\n" #: dlls/kernel32/winerror.mc:2868 msgid "Data type mismatch.\n" -msgstr "資料類型不匹配。\n" +msgstr "資料類型不相符。\n" #: dlls/kernel32/winerror.mc:2873 dlls/kernel32/winerror.mc:3083 msgid "Unsupported type.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的類型。\n" #: dlls/kernel32/winerror.mc:2878 msgid "Creation failed.\n" @@ -6291,7 +6223,7 @@ msgstr "無法寫入暫存資料夾。\n" #: dlls/kernel32/winerror.mc:2888 msgid "Installation platform not supported.\n" -msgstr "不受支援的安裝平臺。\n" +msgstr "不支援的安裝平臺。\n" #: dlls/kernel32/winerror.mc:2893 msgid "Installer not used.\n" @@ -6307,7 +6239,7 @@ msgstr "無效的更新套件。\n" #: dlls/kernel32/winerror.mc:2908 msgid "Unsupported patch package.\n" -msgstr "不受支援的修補程式套件。\n" +msgstr "不支援的修補程式套件。\n" #: dlls/kernel32/winerror.mc:2913 msgid "Another version is installed.\n" @@ -6391,7 +6323,7 @@ msgstr "RPC 伺服器未傾聽。\n" #: dlls/kernel32/winerror.mc:3013 msgid "Unknown manager type.\n" -msgstr "不明管理員型態。\n" +msgstr "不明管理員類型。\n" #: dlls/kernel32/winerror.mc:3018 msgid "Unknown interface.\n" @@ -6415,7 +6347,7 @@ msgstr "資源不足。\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "RPC 伺服器不得使用。\n" +msgstr "RPC 伺服器不可用。\n" #: dlls/kernel32/winerror.mc:3048 msgid "RPC server too busy.\n" @@ -6427,7 +6359,7 @@ msgstr "無效的網路選項。\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "沒有現用的 RPC 呼叫。\n" +msgstr "沒有可用的 RPC 呼叫。\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" @@ -6443,7 +6375,7 @@ msgstr "RPC 協定發生錯誤。\n" #: dlls/kernel32/winerror.mc:3078 msgid "Unsupported transfer syntax.\n" -msgstr "不受支援的轉送語法。\n" +msgstr "不支援的轉送語法。\n" #: dlls/kernel32/winerror.mc:3088 msgid "Invalid tag.\n" @@ -6463,7 +6395,7 @@ msgstr "無效的名稱語法。\n" #: dlls/kernel32/winerror.mc:3108 msgid "Unsupported name syntax.\n" -msgstr "不受支援的名稱語法。\n" +msgstr "不支援的名稱語法。\n" #: dlls/kernel32/winerror.mc:3113 msgid "No network address.\n" @@ -6479,7 +6411,7 @@ msgstr "不明認證類型。\n" #: dlls/kernel32/winerror.mc:3128 msgid "Maximum calls too low.\n" -msgstr "太低的呼叫數最大值。\n" +msgstr "呼叫數的最大值太低。\n" #: dlls/kernel32/winerror.mc:3133 msgid "String too long.\n" @@ -6543,7 +6475,7 @@ msgstr "已無更多成員。\n" #: dlls/kernel32/winerror.mc:3208 msgid "Not all objects unexported.\n" -msgstr "並非所有物件被取消匯出。\n" +msgstr "並非所有物件未被匯出。\n" #: dlls/kernel32/winerror.mc:3213 msgid "Interface not found.\n" @@ -6559,7 +6491,7 @@ msgstr "找不到條目。\n" #: dlls/kernel32/winerror.mc:3228 msgid "Name service unavailable.\n" -msgstr "名稱服務不得使用。\n" +msgstr "名稱服務不可用。\n" #: dlls/kernel32/winerror.mc:3233 msgid "Invalid network address family.\n" @@ -6571,7 +6503,7 @@ msgstr "操作不受支援。\n" #: dlls/kernel32/winerror.mc:3243 msgid "No security context available.\n" -msgstr "沒有可用安全文脈。\n" +msgstr "沒有可用的安全內容。\n" #: dlls/kernel32/winerror.mc:3248 msgid "RPCInternal error.\n" @@ -6611,15 +6543,15 @@ msgstr "字元翻譯表格檔案太小。\n" #: dlls/kernel32/winerror.mc:3293 msgid "Null context handle.\n" -msgstr "空值文脈控柄。\n" +msgstr "內容控柄為空值。\n" #: dlls/kernel32/winerror.mc:3298 msgid "Context handle damaged.\n" -msgstr "文脈控柄受損害。\n" +msgstr "內容控柄已損壞。\n" #: dlls/kernel32/winerror.mc:3303 msgid "Binding handle mismatch.\n" -msgstr "繫結控柄不匹配。\n" +msgstr "繫結控柄不相符。\n" #: dlls/kernel32/winerror.mc:3308 msgid "Cannot get call handle.\n" @@ -6627,7 +6559,7 @@ msgstr "無法提取呼叫控柄。\n" #: dlls/kernel32/winerror.mc:3313 msgid "Null reference pointer.\n" -msgstr "空值參考指標。\n" +msgstr "參考指標為空值。\n" #: dlls/kernel32/winerror.mc:3318 msgid "Enumeration value out of range.\n" @@ -6667,15 +6599,15 @@ msgstr "信賴的關聯性失敗。\n" #: dlls/kernel32/winerror.mc:3363 msgid "Trust logon failure.\n" -msgstr "信賴登錄失敗。\n" +msgstr "信賴登入失敗。\n" #: dlls/kernel32/winerror.mc:3368 msgid "RPC call already in progress.\n" -msgstr "RPC 呼叫已正進行。\n" +msgstr "RPC 呼叫已在進行。\n" #: dlls/kernel32/winerror.mc:3373 msgid "NETLOGON is not started.\n" -msgstr "NETLOGON 未被啟始。\n" +msgstr "NETLOGON 未被啟動。\n" #: dlls/kernel32/winerror.mc:3378 msgid "Account expired.\n" @@ -6695,7 +6627,7 @@ msgstr "不明通訊埠。\n" #: dlls/kernel32/winerror.mc:3398 msgid "Unknown printer driver.\n" -msgstr "未知的印表機驅動程式。\n" +msgstr "不明印表機驅動程式。\n" #: dlls/kernel32/winerror.mc:3403 msgid "Unknown print processor.\n" @@ -6735,15 +6667,15 @@ msgstr "已無更多繫結。\n" #: dlls/kernel32/winerror.mc:3448 msgid "Can't log on with inter-domain trust account.\n" -msgstr "無法以網域間信賴帳號登錄。\n" +msgstr "無法以網域間信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3453 msgid "Can't log on with workstation trust account.\n" -msgstr "無法以工作站信賴帳號登錄。\n" +msgstr "無法以工作站信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3458 msgid "Can't log on with server trust account.\n" -msgstr "無法以伺服器信賴帳號登錄。\n" +msgstr "無法以伺服器信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3463 msgid "Domain trust information inconsistent.\n" @@ -6791,7 +6723,7 @@ msgstr "RPC 指令失敗。\n" #: dlls/kernel32/winerror.mc:3518 msgid "Unsupported authorization level.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的授權等級。\n" #: dlls/kernel32/winerror.mc:3523 msgid "No principal name registered.\n" @@ -6935,7 +6867,7 @@ msgstr "無法解析檔名。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" -msgstr "RPC 條目型態不匹配。\n" +msgstr "RPC 條目類型不匹配。\n" #: dlls/kernel32/winerror.mc:3703 msgid "Not all objects could be exported.\n" @@ -6947,15 +6879,15 @@ msgstr "無法匯出介面。\n" #: dlls/kernel32/winerror.mc:3713 msgid "The profile could not be added.\n" -msgstr "無法加入側寫檔。\n" +msgstr "無法加入配置檔案。\n" #: dlls/kernel32/winerror.mc:3718 msgid "The profile element could not be added.\n" -msgstr "無法加入側寫檔元件。\n" +msgstr "無法加入配置檔案元件。\n" #: dlls/kernel32/winerror.mc:3723 msgid "The profile element could not be removed.\n" -msgstr "無法移除側寫檔元件。\n" +msgstr "無法移除配置檔案元件。\n" #: dlls/kernel32/winerror.mc:3728 msgid "The group element could not be added.\n" @@ -6970,610 +6902,505 @@ msgid "The username could not be found.\n" msgstr "無法找到使用者名稱。\n" #: dlls/kernel32/winerror.mc:3743 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "站臺不存在。\n" +msgstr "這個網路連線不存在。\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "連線被拒。\n" +msgstr "連線被同儕節點重設。\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "未實作" +msgstr "未實作。\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC 呼叫失敗。\n" +msgstr "呼叫失敗。\n" #: dlls/kernel32/winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "在檔案 %2 中找不到訊息 0x%1。\n" +msgstr "無法在檔案中找到簽名。\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "無效的層級。\n" +msgstr "無效的呼叫。\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Help not available." msgid "Resource is not currently available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "資源目前不可用。\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "類別名稱:" +msgstr "經典藍" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 msgid "Normal" -msgstr "中" +msgstr "標準" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "代號" +msgstr "Letter" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "代號" +msgstr "Letter Small" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "表格(&T)" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "狀態" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "執行(&E)..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "小" +msgstr "A4 Small" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "記事本" +msgstr "Note" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "信封 #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "信封 #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "信封 #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "信封 #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "信封 #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C 尺寸紙張" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D 尺寸紙張" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E 尺寸紙張" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "信封 DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "信封 C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "信封 C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "信封 C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "信封 C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "信封 C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "信封 B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "信封 B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "信封 B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "PKCS 7 封套" +msgstr "信封" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "信封 Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "PKCS 7 封套" +msgstr "6 3/4 信封" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "美國標準 Fanfold" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "德國標準 Fanfold" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "德國法定 Fanfold" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "日語" +msgstr "明信片" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "信封 Invite" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "代號" +msgstr "Letter Extra" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "Legal Extra" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "Tabloid Extra" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "其他(&X)" +msgstr "A4 Extra" #: dlls/localspl/localspl.rc:88 msgid "Letter Transverse" -msgstr "" +msgstr "Letter Transverse" #: dlls/localspl/localspl.rc:89 msgid "A4 Transverse" -msgstr "" +msgstr "A4 Transverse" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "Letter Extra Transverse" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "Super A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "Super B" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "代號" +msgstr "Letter Plus" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 Plus" #: dlls/localspl/localspl.rc:95 msgid "A5 Transverse" -msgstr "" +msgstr "A5 Transverse" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) Transverse" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "其他(&X)" +msgstr "A3 Extra" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "其他(&X)" +msgstr "A5 Extra" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) Extra" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 msgid "A3 Transverse" -msgstr "" +msgstr "A3 Transverse" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 Extra Transverse" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "雙面明信片" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "日本角形信封 #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "日本角形信封 #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "日本長形信封 #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "日本長形信封 #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Letter 橫向" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 橫向" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 橫向" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 橫向" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) 橫向" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) 橫向" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "明信片橫向" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "雙面明信片橫向" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 橫向" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "日本角形信封 #2 橫向" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "日本角形信封 #3 橫向" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "日本長形信封 #3 橫向" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "日本長形信封 #4 橫向" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) 橫向" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "日本洋形信封 #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "日本洋形信封 #4 橫向" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "中國 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "中國 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "PRC 32K（大）" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "PKCS 7 封套" +msgstr "中國信封 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "中國 16K 橫向" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "中國 32K 橫向" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "PRC 32K（大）橫向" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #1 橫向" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2 橫向" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3 橫向" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4 橫向" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5 橫向" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6 橫向" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7 橫向" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8 橫向" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9 橫向" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10 橫向" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7590,7 +7417,7 @@ msgstr "新增本機連接埠" #: dlls/localui/localui.rc:42 msgid "&Enter the port name to add:" -msgstr "輸入要新增的本機連接埠名稱(&E):" +msgstr "輸入要新增的本機連接埠名稱(&E)：" #: dlls/localui/localui.rc:51 msgid "Configure LPT Port" @@ -7598,15 +7425,15 @@ msgstr "設定並列埠" #: dlls/localui/localui.rc:54 msgid "Timeout (seconds)" -msgstr "超時(秒)" +msgstr "超時（秒）" #: dlls/localui/localui.rc:55 msgid "&Transmission Retry:" -msgstr "重試傳送(&T):" +msgstr "重試傳送(&T)：" #: dlls/localui/localui.rc:32 msgid "'%s' is not a valid port name" -msgstr "%s 不是有效的連接埠名稱" +msgstr "「%s」不是有效的連接埠名稱" #: dlls/localui/localui.rc:33 msgid "Port %s already exists" @@ -7626,7 +7453,7 @@ msgstr "傳送郵件" #: dlls/mferror/mferror.mc:249 dlls/mferror/mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "已建立開始要求。\n" #: dlls/mferror/mferror.mc:599 #, fuzzy -- 2.33.0.windows.2

2 5

[PATCH] dinput: Set high DIK bit for extended scancodes.
by Rémi Bernon 21 Oct '21

21 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51910 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/keyboard.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index fb6cf33b911..fd8e9e8fd12 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -80,7 +80,8 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers break; } } - return scanCode; + if (scanCode & 0x100) scanCode |= 0x80; + return (BYTE)scanCode; } int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) @@ -89,6 +90,7 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; + DWORD scan_code; if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) @@ -105,9 +107,9 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break; case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break; default: - dik_code = map_dik_code( hook->scanCode & 0xff, hook->vkCode, subtype, - This->base.dinput->dwVersion ); - if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; + scan_code = hook->scanCode & 0xff; + if (hook->flags & LLKHF_EXTENDED) scan_code |= 0x100; + dik_code = map_dik_code( scan_code, hook->vkCode, subtype, This->base.dinput->dwVersion ); } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; -- 2.33.0

1 0

[PATCH vkd3d v2] vkd3d-shader/hlsl: Return the shape of the left operand when appropriate.
by Giovanni Mascellani 21 Oct '21

21 Oct '21

The assumption about the size of matrices is not correct: it is legitimate to compose a matrix 2x2 with a vector of length 4, in which case it appears that the result has the shape of the first (leftmost) operand. Even for matrices 1xN or Nx1, the result is not always a vector: in general it has the shape of the first operand again. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bfe2bbb9..c42e372e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -971,18 +971,7 @@ static bool expr_common_shape(struct hlsl_ctx *ctx, struct hlsl_type *t1, struct } else { - /* Two vectors or a vector and a matrix (matrix must be 1xn or nx1) */ - unsigned int max_dim_1, max_dim_2; - - max_dim_1 = max(t1->dimx, t1->dimy); - max_dim_2 = max(t2->dimx, t2->dimy); - if (t1->dimx * t1->dimy == t2->dimx * t2->dimy) - { - *type = HLSL_CLASS_VECTOR; - *dimx = max(t1->dimx, t2->dimx); - *dimy = 1; - } - else if (max_dim_1 <= max_dim_2) + if (t1->dimx * t1->dimy <= t2->dimx * t2->dimy) { *type = t1->type; *dimx = t1->dimx; -- 2.33.0

4 5

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Introduce a helper for getting numeric types.
by Giovanni Mascellani 21 Oct '21

21 Oct '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 4 ++-- libs/vkd3d-shader/hlsl.h | 28 ++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.y | 28 ++++++++++++---------------- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9bce6beb..421aaf27 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -560,7 +560,7 @@ struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned i if (!(c = hlsl_alloc(ctx, sizeof(*c)))) return NULL; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_UINT], loc); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_UINT), loc); c->value[0].u = n; return c; } @@ -650,7 +650,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned if (!(swizzle = hlsl_alloc(ctx, sizeof(*swizzle)))) return NULL; init_node(&swizzle->node, HLSL_IR_SWIZZLE, - ctx->builtin_types.vector[val->data_type->base_type][components - 1], *loc); + get_vector_type(ctx, val->data_type->base_type, components), *loc); hlsl_src_from_node(&swizzle->val, val); swizzle->swizzle = s; return swizzle; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e401971e..2e6b1bf7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -629,6 +629,34 @@ static inline void hlsl_release_string_buffer(struct hlsl_ctx *ctx, struct vkd3d vkd3d_string_buffer_release(&ctx->string_buffers, buffer); } +static inline struct hlsl_type *get_scalar_type(const struct hlsl_ctx *ctx, enum hlsl_base_type base_type) +{ + return ctx->builtin_types.scalar[base_type]; +} + +static inline struct hlsl_type *get_vector_type(const struct hlsl_ctx *ctx, enum hlsl_base_type base_type, + unsigned int dimx) +{ + return ctx->builtin_types.vector[base_type][dimx - 1]; +} + +static inline struct hlsl_type *get_matrix_type(const struct hlsl_ctx *ctx, enum hlsl_base_type base_type, + unsigned int dimx, unsigned int dimy) +{ + return ctx->builtin_types.matrix[base_type][dimx - 1][dimy - 1]; +} + +static inline struct hlsl_type *get_numeric_type(const struct hlsl_ctx *ctx, enum hlsl_type_class type, + enum hlsl_base_type base_type, unsigned int dimx, unsigned int dimy) +{ + if (type == HLSL_CLASS_SCALAR) + return get_scalar_type(ctx, base_type); + else if (type == HLSL_CLASS_VECTOR) + return get_vector_type(ctx, base_type, dimx); + else + return get_matrix_type(ctx, base_type, dimx, dimy); +} + const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); const char *debug_hlsl_writemask(unsigned int writemask); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ae19cd1a..addb9c59 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1021,11 +1021,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type } } - if (type == HLSL_CLASS_SCALAR) - return ctx->builtin_types.scalar[base]; - if (type == HLSL_CLASS_VECTOR) - return ctx->builtin_types.vector[base][dimx - 1]; - return ctx->builtin_types.matrix[base][dimx - 1][dimy - 1]; + return get_numeric_type(ctx, type, base, dimx, dimy); } static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, @@ -1761,7 +1757,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type } if (!(arg = add_implicit_conversion(ctx, params->instrs, arg, - ctx->builtin_types.vector[type->base_type][width - 1], &arg->loc))) + get_vector_type(ctx, type->base_type, width), &arg->loc))) continue; if (!(store = hlsl_new_store(ctx, var, NULL, arg, @@ -1816,9 +1812,9 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl if (params->args_count >= 2) FIXME("Ignoring index and/or offset parameter(s).\n"); - /* -1 for zero-indexing; +1 for the mipmap level */ + /* +1 for the mipmap level */ if (!(coords = add_implicit_conversion(ctx, instrs, params->args[0], - ctx->builtin_types.vector[HLSL_TYPE_INT][sampler_dim - 1 + 1], loc))) + get_vector_type(ctx, HLSL_TYPE_INT, sampler_dim + 1), loc))) return false; if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format, HLSL_RESOURCE_LOAD, @@ -2500,7 +2496,7 @@ type: YYABORT; } - $$ = ctx->builtin_types.vector[$3->base_type][$5 - 1]; + $$ = get_vector_type(ctx, $3->base_type, $5); } | KW_MATRIX '<' type ',' C_INTEGER ',' C_INTEGER '>' { @@ -2528,7 +2524,7 @@ type: YYABORT; } - $$ = ctx->builtin_types.matrix[$3->base_type][$7 - 1][$5 - 1]; + $$ = get_matrix_type(ctx, $3->base_type, $7, $5); } | KW_VOID { @@ -2560,7 +2556,7 @@ type: } | texture_type { - $$ = hlsl_new_texture_type(ctx, $1, ctx->builtin_types.vector[HLSL_TYPE_FLOAT][4 - 1]); + $$ = hlsl_new_texture_type(ctx, $1, get_vector_type(ctx, HLSL_TYPE_FLOAT, 4)); } | texture_type '<' type '>' { @@ -2971,7 +2967,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_FLOAT], @1); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_FLOAT), @1); c->value[0].f = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; @@ -2982,7 +2978,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_INT], @1); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_INT), @1); c->value[0].i = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; @@ -2993,7 +2989,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_BOOL], @1); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_BOOL), @1); c->value[0].b = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; @@ -3030,7 +3026,7 @@ primary_expr: struct hlsl_ir_var *var; if (!(var = hlsl_new_synthetic_var(ctx, "<state-block-expr>", - ctx->builtin_types.scalar[HLSL_TYPE_INT], @1))) + get_scalar_type(ctx, HLSL_TYPE_INT), @1))) YYABORT; if (!(load = hlsl_new_var_load(ctx, var, @1))) YYABORT; @@ -3116,7 +3112,7 @@ postfix_expr: YYABORT; } - if (!(cast = hlsl_new_cast(ctx, index, ctx->builtin_types.scalar[HLSL_TYPE_UINT], &index->loc))) + if (!(cast = hlsl_new_cast(ctx, index, get_scalar_type(ctx, HLSL_TYPE_UINT), &index->loc))) { destroy_instr_list($1); YYABORT; -- 2.33.0

3 16

[PATCH v2 1/2] include: Update struct _LDR_DDAG_NODE definition.
by Paul Gofman 21 Oct '21

21 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- include/winternl.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index f1272518dbb..097dea4601a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3284,18 +3284,13 @@ typedef struct _LDR_DDAG_NODE LIST_ENTRY Modules; LDR_SERVICE_TAG_RECORD *ServiceTagList; ULONG LoadCount; - ULONG ReferenceCount; - ULONG DependencyCount; - union - { - LDRP_CSLIST Dependencies; - SINGLE_LIST_ENTRY RemovalLink; - }; + ULONG LoadWhileUnloadingCount; + ULONG LowestLink; + LDRP_CSLIST Dependencies; LDRP_CSLIST IncomingDependencies; LDR_DDAG_STATE State; SINGLE_LIST_ENTRY CondenseLink; ULONG PreorderNumber; - ULONG LowestLink; } LDR_DDAG_NODE, *PLDR_DDAG_NODE; typedef enum _LDR_DLL_LOAD_REASON -- 2.31.1

1 1

[PATCH 1/2] include: Update struct _LDR_DDAG_NODE definition.
by Paul Gofman 21 Oct '21

21 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- include/winternl.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index f1272518dbb..097dea4601a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3284,18 +3284,13 @@ typedef struct _LDR_DDAG_NODE LIST_ENTRY Modules; LDR_SERVICE_TAG_RECORD *ServiceTagList; ULONG LoadCount; - ULONG ReferenceCount; - ULONG DependencyCount; - union - { - LDRP_CSLIST Dependencies; - SINGLE_LIST_ENTRY RemovalLink; - }; + ULONG LoadWhileUnloadingCount; + ULONG LowestLink; + LDRP_CSLIST Dependencies; LDRP_CSLIST IncomingDependencies; LDR_DDAG_STATE State; SINGLE_LIST_ENTRY CondenseLink; ULONG PreorderNumber; - ULONG LowestLink; } LDR_DDAG_NODE, *PLDR_DDAG_NODE; typedef enum _LDR_DLL_LOAD_REASON -- 2.31.1

2 2

[PATCH v2 resend] msxml3: Null check url in parseURL.
by Jefferson Carpenter 21 Oct '21

21 Oct '21

Considered adding IVBSAXXMLReader_parseURL to test_saxreader() instead of adding the function test_vb_saxreader() but ran into two problems: 1) ISAXXMLReader sometimes cannot be queried for IVBSAXXMLReader and 2) the EXPECT_REF lines in contentHandler_putDocumentLocator would need to be incremented to account for the additional reference.

1 0

[PATCH v2] msxml3: Null check url in parseURL.
by Jefferson Carpenter 21 Oct '21

21 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51267 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> --- Considered adding IVBSAXXMLReader_parseURL to test_saxreader() instead of adding the function test_vb_saxreader() but ran into two problems: 1) ISAXXMLReader sometimes cannot be queried for IVBSAXXMLReader and 2) the EXPECT_REF lines in contentHandler_putDocumentLocator would need to be incremented to account for the additional reference. --- dlls/msxml3/saxreader.c | 2 ++ dlls/msxml3/tests/saxreader.c | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index c610ffcaccb..eadf8e0c631 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2739,6 +2739,8 @@ static HRESULT internal_parseURL( TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + if (!url) return E_INVALIDARG; + hr = create_moniker_from_url(url, &mon); if(FAILED(hr)) return hr; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ad093af6a12..7fda64f9776 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2325,6 +2325,13 @@ static void test_saxreader(void) WriteFile(file, testXML, sizeof(testXML)-1, &written, NULL); CloseHandle(file); + /* crashes on new versions */ + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader30)) { + hr = ISAXXMLReader_parseURL(reader, NULL); + EXPECT_HR(hr, E_INVALIDARG); + } + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) test_seq = content_handler_test1_alternate; @@ -2561,6 +2568,34 @@ static void test_saxreader(void) free_bstrs(); } +static void test_vb_saxreader(void) +{ + const struct msxmlsupported_data_t *table = reader_support_data; + HRESULT hr; + IVBSAXXMLReader *reader = NULL; + + while (table->clsid) + { + if (!is_clsid_supported(table->clsid, reader_support_data)) + { + table++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IVBSAXXMLReader, (void**)&reader); + EXPECT_HR(hr, S_OK); + + /* crashes on new versions */ + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader30)) { + hr = IVBSAXXMLReader_parseURL(reader, NULL); + EXPECT_HR(hr, E_INVALIDARG); + } + + table++; + } +} + struct saxreader_props_test_t { const char *prop_name; @@ -6019,6 +6054,7 @@ START_TEST(saxreader) get_class_support_data(reader_support_data, &IID_ISAXXMLReader); test_saxreader(); + test_vb_saxreader(); test_saxreader_properties(); test_saxreader_features(); test_saxreader_encoding(); -- 2.26.2

2 1

[PATCH 1/5] winegstreamer: Translate GST_AUDIO_CHANNEL_POSITION_MONO to SPEAKER_FRONT_CENTER.
by Zebediah Figura 21 Oct '21

21 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0c23ae6d351..c3c9051a174 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -159,7 +159,10 @@ static uint32_t wg_channel_position_from_gst(GstAudioChannelPosition position) SPEAKER_TOP_BACK_CENTER, }; - if (position < ARRAY_SIZE(position_map)) + if (position == GST_AUDIO_CHANNEL_POSITION_MONO) + return SPEAKER_FRONT_CENTER; + + if (position >= 0 && position < ARRAY_SIZE(position_map)) return position_map[position]; return 0; } -- 2.33.0

2 5

[PATCH] xslt: Build with LIBXSLT_STATIC, fix building with clang in MSVC mode
by Martin Storsjö 21 Oct '21

21 Oct '21

This avoids unnecessarily embedding dllexport directives in all the object files. This also fixes building with clang in MSVC mode, as the MSVC definition of XSLTPUBVAR in xsltexports.h is lacking 'extern' when doing dllexport. (This probably used to work before compilers defaulted to -fcommon.) This fixes duplicate symbols like these: lld-link: error: duplicate symbol: xsltGenericError >>> defined at ../src/libs/xslt/libxslt/xsltutils.h:140 >>> libxslt.cross.a(documents.cross.o) >>> defined at ../src/libs/xslt/libxslt/xsltutils.h:140 >>> libxslt.cross.a(extensions.cross.o) Signed-off-by: Martin Storsjö <martin(a)martin.st> --- configure.ac | 2 +- libs/xslt/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3f1d50a4dfc..62af43220ce 100644 --- a/configure.ac +++ b/configure.ac @@ -1060,7 +1060,7 @@ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") WINE_EXTLIB_FLAGS(XML2, libxml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") -WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt") +WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") dnl **** Check for pthread **** diff --git a/libs/xslt/Makefile.in b/libs/xslt/Makefile.in index 3550010ce31..b620710c5af 100644 --- a/libs/xslt/Makefile.in +++ b/libs/xslt/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libxslt.a -EXTRAINCL = $(XML2_PE_CFLAGS) +EXTRAINCL = $(XML2_PE_CFLAGS) $(XSLT_PE_CFLAGS) C_SRCS = \ libxslt/attributes.c \ -- 2.25.1

1 0

[PATCH v2] winebus.sys: Map SDL joystick axes the same way as UDEV evdev.
by Rémi Bernon 21 Oct '21

21 Oct '21

And increase the arbitrary absolute axis count limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 217916 v2: Only resending this single patch to fix relative_usages index which should be 2 * i, as SDL balls are two axes combined together. In any case, SDL linux backend may only ever report one ball at the moment. dlls/winebus.sys/bus_sdl.c | 64 +++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 403c4821f24..fe3a960649c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -227,33 +227,47 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) { - static const USAGE joystick_usages[] = + static const USAGE_AND_PAGE absolute_usages[] = { - HID_USAGE_GENERIC_X, - HID_USAGE_GENERIC_Y, - HID_USAGE_GENERIC_Z, - HID_USAGE_GENERIC_RX, - HID_USAGE_GENERIC_RY, - HID_USAGE_GENERIC_RZ, - HID_USAGE_GENERIC_SLIDER, - HID_USAGE_GENERIC_DIAL, - HID_USAGE_GENERIC_WHEEL + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_THROTTLE}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_RUDDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_ACCELERATOR}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_BRAKE}, + }; + static const USAGE_AND_PAGE relative_usages[] = + { + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, }; struct sdl_device *impl = impl_from_unix_device(iface); int i, button_count, axis_count, ball_count, hat_count; axis_count = pSDL_JoystickNumAxes(impl->sdl_joystick); - if (axis_count > 6) + if (axis_count > ARRAY_SIZE(absolute_usages)) { - FIXME("Clamping joystick to 6 axis\n"); - axis_count = 6; + FIXME("More than %zu absolute axes found, ignoring.\n", ARRAY_SIZE(absolute_usages)); + axis_count = ARRAY_SIZE(absolute_usages); } ball_count = pSDL_JoystickNumBalls(impl->sdl_joystick); - if (axis_count + ball_count * 2 > ARRAY_SIZE(joystick_usages)) + if (ball_count > ARRAY_SIZE(relative_usages) / 2) { - FIXME("Capping ball + axis at 9\n"); - ball_count = (ARRAY_SIZE(joystick_usages) - axis_count) / 2; + FIXME("More than %zu relative axes found, ignoring.\n", ARRAY_SIZE(relative_usages)); + ball_count = ARRAY_SIZE(relative_usages) / 2; } hat_count = pSDL_JoystickNumHats(impl->sdl_joystick); @@ -265,13 +279,19 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) if (!hid_device_begin_input_report(iface)) return STATUS_NO_MEMORY; - if (axis_count && !hid_device_add_axes(iface, axis_count, HID_USAGE_PAGE_GENERIC, - joystick_usages, FALSE, -32768, 32767)) - return STATUS_NO_MEMORY; + for (i = 0; i < axis_count; i++) + { + if (!hid_device_add_axes(iface, 1, absolute_usages[i].UsagePage, + &absolute_usages[i].Usage, FALSE, -32768, 32767)) + return STATUS_NO_MEMORY; + } - if (ball_count && !hid_device_add_axes(iface, ball_count * 2, HID_USAGE_PAGE_GENERIC, - &joystick_usages[axis_count], TRUE, INT32_MIN, INT32_MAX)) - return STATUS_NO_MEMORY; + for (i = 0; i < ball_count; i++) + { + if (!hid_device_add_axes(iface, 2, relative_usages[2 * i].UsagePage, + &relative_usages[2 * i].Usage, TRUE, INT32_MIN, INT32_MAX)) + return STATUS_NO_MEMORY; + } if (hat_count && !hid_device_add_hatswitch(iface, hat_count)) return STATUS_NO_MEMORY; -- 2.33.0

1 0

[PATCH 1/4] winebus.sys: Prefer USAGE_AND_PAGE over BYTE arrays.
by Rémi Bernon 21 Oct '21

21 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 133 +++++++++++++++++------------------- 1 file changed, 63 insertions(+), 70 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index c7125520c33..f0651a8e529 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -141,15 +141,63 @@ static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_dev #ifdef HAS_PROPER_INPUT_HEADER -#define HID_REL_MAX (REL_MISC+1) -#define HID_ABS_MAX (ABS_VOLUME+1) +static const USAGE_AND_PAGE absolute_usages[] = +{ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, /* ABS_X */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, /* ABS_Y */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, /* ABS_Z */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, /* ABS_RX */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, /* ABS_RY */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, /* ABS_RZ */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_THROTTLE}, /* ABS_THROTTLE */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_RUDDER}, /* ABS_RUDDER */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, /* ABS_WHEEL */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_ACCELERATOR}, /* ABS_GAS */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_BRAKE}, /* ABS_BRAKE */ + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, /* ABS_HAT0X */ + {0}, /* ABS_HAT0Y */ + {0}, /* ABS_HAT1X */ + {0}, /* ABS_HAT1Y */ + {0}, /* ABS_HAT2X */ + {0}, /* ABS_HAT2Y */ + {0}, /* ABS_HAT3X */ + {0}, /* ABS_HAT3Y */ + {.UsagePage = HID_USAGE_PAGE_DIGITIZER, .Usage = HID_USAGE_DIGITIZER_TIP_PRESSURE}, /* ABS_PRESSURE */ + {0}, /* ABS_DISTANCE */ + {.UsagePage = HID_USAGE_PAGE_DIGITIZER, .Usage = HID_USAGE_DIGITIZER_X_TILT}, /* ABS_TILT_X */ + {.UsagePage = HID_USAGE_PAGE_DIGITIZER, .Usage = HID_USAGE_DIGITIZER_Y_TILT}, /* ABS_TILT_Y */ + {0}, /* ABS_TOOL_WIDTH */ + {0}, + {0}, + {0}, + {.UsagePage = HID_USAGE_PAGE_CONSUMER, .Usage = HID_USAGE_CONSUMER_VOLUME}, /* ABS_VOLUME */ +}; + +static const USAGE_AND_PAGE relative_usages[] = +{ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, /* REL_X */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, /* REL_Y */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, /* REL_Z */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, /* REL_RX */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, /* REL_RY */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, /* REL_RZ */ + {0}, /* REL_HWHEEL */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, /* REL_DIAL */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, /* REL_WHEEL */ + {0}, /* REL_MISC */ +}; struct lnxev_device { struct base_device base; - BYTE abs_map[HID_ABS_MAX]; - BYTE rel_map[HID_REL_MAX]; + BYTE abs_map[ARRAY_SIZE(absolute_usages)]; + BYTE rel_map[ARRAY_SIZE(relative_usages)]; BYTE hat_map[8]; BYTE button_map[KEY_MAX]; @@ -459,58 +507,6 @@ static struct base_device *find_device_from_syspath(const char *path) return NULL; } -static const BYTE ABS_TO_HID_MAP[][2] = { - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /*ABS_X*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /*ABS_Y*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Z}, /*ABS_Z*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RX}, /*ABS_RX*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RY}, /*ABS_RY*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RZ}, /*ABS_RZ*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_THROTTLE}, /*ABS_THROTTLE*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_RUDDER}, /*ABS_RUDDER*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELERATOR}, /*ABS_GAS*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ - {0,0}, - {0,0}, - {0,0}, - {0,0}, - {0,0}, - {0,0}, /*ABS_HAT0X*/ - {0,0}, /*ABS_HAT0Y*/ - {0,0}, /*ABS_HAT1X*/ - {0,0}, /*ABS_HAT1Y*/ - {0,0}, /*ABS_HAT2X*/ - {0,0}, /*ABS_HAT2Y*/ - {0,0}, /*ABS_HAT3X*/ - {0,0}, /*ABS_HAT3Y*/ - {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TIP_PRESSURE}, /*ABS_PRESSURE*/ - {0, 0}, /*ABS_DISTANCE*/ - {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_X_TILT}, /*ABS_TILT_X*/ - {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_Y_TILT}, /*ABS_TILT_Y*/ - {0, 0}, /*ABS_TOOL_WIDTH*/ - {0, 0}, - {0, 0}, - {0, 0}, - {HID_USAGE_PAGE_CONSUMER, HID_USAGE_CONSUMER_VOLUME} /*ABS_VOLUME*/ -}; -C_ASSERT(ARRAY_SIZE(ABS_TO_HID_MAP) == HID_ABS_MAX); -#define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) - -static const BYTE REL_TO_HID_MAP[][2] = { - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /* REL_X */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /* REL_Y */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Z}, /* REL_Z */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RX}, /* REL_RX */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RY}, /* REL_RY */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RZ}, /* REL_RZ */ - {0, 0}, /* REL_HWHEEL */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_DIAL}, /* REL_DIAL */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /* REL_WHEEL */ - {0, 0} /* REL_MISC */ -}; -#define TOP_REL_PAGE (HID_USAGE_PAGE_CONSUMER+1) - #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) static const BYTE* what_am_I(struct udev_device *dev) @@ -584,17 +580,17 @@ static INT count_abs_axis(int device_fd) return 0; } - for (i = 0; i < HID_ABS_MAX; i++) + for (i = 0; i < ARRAY_SIZE(absolute_usages); i++) if (test_bit(absbits, i) && - (ABS_TO_HID_MAP[i][1] >= HID_USAGE_GENERIC_X && - ABS_TO_HID_MAP[i][1] <= HID_USAGE_GENERIC_WHEEL)) + (absolute_usages[i].Usage >= HID_USAGE_GENERIC_X && + absolute_usages[i].Usage <= HID_USAGE_GENERIC_WHEEL)) abs_count++; return abs_count; } static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_device *dev) { - struct input_absinfo abs_info[HID_ABS_MAX]; + struct input_absinfo abs_info[ARRAY_SIZE(absolute_usages)]; BYTE absbits[(ABS_MAX+7)/8]; BYTE relbits[(REL_MAX+7)/8]; BYTE ffbits[(FF_MAX+7)/8]; @@ -629,14 +625,12 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d return STATUS_NO_MEMORY; abs_count = 0; - for (i = 0; i < HID_ABS_MAX; i++) + for (i = 0; i < ARRAY_SIZE(absolute_usages); i++) { + usage = absolute_usages[i]; if (!test_bit(absbits, i)) continue; ioctl(impl->base.device_fd, EVIOCGABS(i), abs_info + i); - - if (!(usage.UsagePage = ABS_TO_HID_MAP[i][0])) continue; - if (!(usage.Usage = ABS_TO_HID_MAP[i][1])) continue; - + if (!usage.UsagePage || !usage.Usage) continue; if (!hid_device_add_axes(iface, 1, usage.UsagePage, &usage.Usage, FALSE, LE_DWORD(abs_info[i].minimum), LE_DWORD(abs_info[i].maximum))) return STATUS_NO_MEMORY; @@ -645,12 +639,11 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d } rel_count = 0; - for (i = 0; i < HID_REL_MAX; i++) + for (i = 0; i < ARRAY_SIZE(relative_usages); i++) { + usage = relative_usages[i]; if (!test_bit(relbits, i)) continue; - if (!(usage.UsagePage = REL_TO_HID_MAP[i][0])) continue; - if (!(usage.Usage = REL_TO_HID_MAP[i][1])) continue; - + if (!usage.UsagePage || !usage.Usage) continue; if (!hid_device_add_axes(iface, 1, usage.UsagePage, &usage.Usage, TRUE, INT32_MIN, INT32_MAX)) return STATUS_NO_MEMORY; @@ -719,7 +712,7 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d return STATUS_NO_MEMORY; /* Initialize axis in the report */ - for (i = 0; i < HID_ABS_MAX; i++) + for (i = 0; i < ARRAY_SIZE(absolute_usages); i++) { if (!test_bit(absbits, i)) continue; if (i < ABS_HAT0X || i > ABS_HAT3Y) -- 2.33.0

1 3

[PATCH 1/6] dinput: Replace stub EnumEffects with generic implementation.
by Rémi Bernon 21 Oct '21

21 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 73 ++++++++++++++++++++++++++++++++++---- dlls/dinput/joystick_hid.c | 73 +------------------------------------- 2 files changed, 67 insertions(+), 79 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8858bfa26bb..e5713f4713d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1661,14 +1661,73 @@ HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface return DIERR_UNSUPPORTED; } -HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( - LPDIRECTINPUTDEVICE8W iface, - LPDIENUMEFFECTSCALLBACKW lpCallback, - LPVOID lpvRef, - DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *context, DWORD type ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p,%p,0x%08x): stub!\n", This, lpCallback, lpvRef, dwFlags); + DIEFFECTINFOW info = {.dwSize = sizeof(info)}; + HRESULT hr; + + TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + type = DIEFT_GETTYPE( type ); + + if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_PERIODIC) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_CONDITION) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } return DI_OK; } diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 766e022ebe0..91b6020d1f1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -838,77 +838,6 @@ failed: return hr; } -static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, - void *context, DWORD type ) -{ - DIEFFECTINFOW info = {.dwSize = sizeof(info)}; - HRESULT hr; - - TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); - - if (!callback) return DIERR_INVALIDPARAM; - - type = DIEFT_GETTYPE( type ); - - if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_PERIODIC) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_CONDITION) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - return DI_OK; -} - static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ) { @@ -1155,7 +1084,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_Initialize, /*** IDirectInputDevice2 methods ***/ hid_joystick_CreateEffect, - hid_joystick_EnumEffects, + IDirectInputDevice2WImpl_EnumEffects, hid_joystick_GetEffectInfo, hid_joystick_GetForceFeedbackState, hid_joystick_SendForceFeedbackCommand, -- 2.33.0

1 5

[PATCH] po: Update German translation.
by Julian Rüger 21 Oct '21

21 Oct '21

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

1 0

[PATCH v2] msxml3/tests: Test VBSAXXMLReader.
by Jefferson Carpenter 21 Oct '21

21 Oct '21

Removed vb_reader_support_data. Looped through reader_support_data, but incremented a flag through SAXObjectType and VB_SAXObjectType while incrementing the table. thanks, Jefferson

2 4

[PATCH] include: Add MFVideoAlphaBitmapFlags in evr9.idl
by Biswapriyo Nath 21 Oct '21

21 Oct '21

2 2

[PATCH 1/3] winegstreamer: Move the IWMPacketSize2 implementation to the wm_reader object.
by Zebediah Figura 21 Oct '21

21 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_asyncreader.c | 68 ----------------------------- dlls/winegstreamer/wm_reader.c | 67 ++++++++++++++++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 4 +- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 6dc0ad3e291..519be33dadd 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -117,6 +117,7 @@ struct wm_reader { IWMHeaderInfo3 IWMHeaderInfo3_iface; IWMLanguageList IWMLanguageList_iface; + IWMPacketSize2 IWMPacketSize2_iface; IWMProfile3 IWMProfile3_iface; LONG refcount; diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index a36718ef453..d2891730bfb 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -33,7 +33,6 @@ struct async_reader IWMReaderTimecode IWMReaderTimecode_iface; IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; IReferenceClock IReferenceClock_iface; - IWMPacketSize2 IWMPacketSize2_iface; }; static struct async_reader *impl_from_IWMReader(IWMReader *iface) @@ -1322,68 +1321,6 @@ static const IReferenceClockVtbl ReferenceClockVtbl = refclock_Unadvise }; -static struct async_reader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, IWMPacketSize2_iface); -} - -static HRESULT WINAPI packetsize_QueryInterface(IWMPacketSize2 *iface, REFIID riid, void **ppv) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI packetsize_AddRef(IWMPacketSize2 *iface) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI packetsize_Release(IWMPacketSize2 *iface) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI packetsize_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); - return E_NOTIMPL; -} - -static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = -{ - packetsize_QueryInterface, - packetsize_AddRef, - packetsize_Release, - packetsize_GetMaxPacketSize, - packetsize_SetMaxPacketSize, - packetsize_GetMinPacketSize, - packetsize_SetMinPacketSize -}; - static struct async_reader *impl_from_wm_reader(struct wm_reader *iface) { return CONTAINING_RECORD(iface, struct async_reader, reader); @@ -1398,10 +1335,6 @@ static void *async_reader_query_interface(struct wm_reader *iface, REFIID iid) if (IsEqualIID(iid, &IID_IReferenceClock)) return &reader->IReferenceClock_iface; - if (IsEqualIID(iid, &IID_IWMPacketSize) - || IsEqualIID(iid, &IID_IWMPacketSize2)) - return &reader->IWMPacketSize2_iface; - if (IsEqualIID(iid, &IID_IWMReader)) return &reader->IWMReader_iface; @@ -1462,7 +1395,6 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) wm_reader_init(&object->reader, &async_reader_ops); object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; - object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; object->IWMReader_iface.lpVtbl = &WMReaderVtbl; object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index b72ff98cd18..edf8f227308 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -41,6 +41,11 @@ static HRESULT WINAPI profile_QueryInterface(IWMProfile3 *iface, REFIID iid, voi { *out = &reader->IWMLanguageList_iface; } + else if (IsEqualIID(iid, &IID_IWMPacketSize) + || IsEqualIID(iid, &IID_IWMPacketSize2)) + { + *out = &reader->IWMPacketSize2_iface; + } else if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IWMProfile) || IsEqualIID(iid, &IID_IWMProfile2) @@ -572,10 +577,72 @@ static const IWMLanguageListVtbl language_list_vtbl = language_list_AddLanguageByRFC1766String, }; +static struct wm_reader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) +{ + return CONTAINING_RECORD(iface, struct wm_reader, IWMPacketSize2_iface); +} + +static HRESULT WINAPI packet_size_QueryInterface(IWMPacketSize2 *iface, REFIID iid, void **out) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_QueryInterface(&reader->IWMProfile3_iface, iid, out); +} + +static ULONG WINAPI packet_size_AddRef(IWMPacketSize2 *iface) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_AddRef(&reader->IWMProfile3_iface); +} + +static ULONG WINAPI packet_size_Release(IWMPacketSize2 *iface) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_Release(&reader->IWMProfile3_iface); +} + +static HRESULT WINAPI packet_size_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + FIXME("iface %p, size %p, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + FIXME("iface %p, size %u, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + FIXME("iface %p, size %p, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + FIXME("iface %p, size %u, stub!\n", iface, size); + return E_NOTIMPL; +} + +static const IWMPacketSize2Vtbl packet_size_vtbl = +{ + packet_size_QueryInterface, + packet_size_AddRef, + packet_size_Release, + packet_size_GetMaxPacketSize, + packet_size_SetMaxPacketSize, + packet_size_GetMinPacketSize, + packet_size_SetMinPacketSize, +}; + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; reader->IWMLanguageList_iface.lpVtbl = &language_list_vtbl; + reader->IWMPacketSize2_iface.lpVtbl = &packet_size_vtbl; reader->IWMProfile3_iface.lpVtbl = &profile_vtbl; reader->refcount = 1; reader->ops = ops; diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 9f9c5ed393f..0662c035617 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -148,8 +148,8 @@ static void test_wmsyncreader_interfaces(void) check_interface(reader, &IID_IWMHeaderInfo2, TRUE); check_interface(reader, &IID_IWMHeaderInfo3, TRUE); check_interface(reader, &IID_IWMLanguageList, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); + check_interface(reader, &IID_IWMPacketSize, TRUE); + check_interface(reader, &IID_IWMPacketSize2, TRUE); check_interface(reader, &IID_IWMProfile, TRUE); check_interface(reader, &IID_IWMProfile2, TRUE); check_interface(reader, &IID_IWMProfile3, TRUE); -- 2.33.0

1 2

[PATCH] user32: Fix event queue congestion can cause WINPOS_WindowFromPoint is null.
by Chao Long 21 Oct '21

21 Oct '21

Signed-off-by: Chao Long <longchao(a)uniontech.com> --- dlls/user32/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index b4e3579f5e8..b19fadbf195 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1815,7 +1815,7 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) tracking_info.tme.dwHoverTime = 0; } - if (ptme->hwndTrack == hwnd) + if (ptme->hwndTrack == hwnd || (ptme->dwFlags & TME_LEAVE && hittest==HTNOWHERE)) { /* Adding new mouse event to the tracking list */ tracking_info.tme = *ptme; -- 2.20.1

2 1

[PATCH 2/2] uxtheme: Check LoadedBefore registry key before loading theme.
by Zhiyi Zhang 21 Oct '21

21 Oct '21

Only save unthemed system metrics to the registry when the LoadedBefore registry key value is '0'. This avoids saving themed system metrics when two processes are trying to activate theming at the same time. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 37 +++++++++++++++++++++++++------------ dlls/uxtheme/uxthemedll.h | 4 ++++ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index d9eedf6543b..0298fe61d4a 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -185,7 +185,7 @@ static void UXTHEME_LoadTheme(void) lstrcpynW(szCurrentColor, pt->pszSelectedColor, ARRAY_SIZE(szCurrentColor)); lstrcpynW(szCurrentSize, pt->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); - MSSTYLES_SetActiveTheme(pt, FALSE); + UXTHEME_SetActiveTheme(pt); TRACE("Theme active: %s %s %s\n", debugstr_w(szCurrentTheme), debugstr_w(szCurrentColor), debugstr_w(szCurrentSize)); MSSTYLES_CloseThemeFile(pt); @@ -419,27 +419,38 @@ static void UXTHEME_SaveSystemMetrics(struct system_metrics *metrics, BOOL send_ * * Change the current active theme */ -static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) +HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) { + BOOL ret, loaded_before = FALSE; struct system_metrics metrics; + DWORD size; HKEY hKey; WCHAR tmp[2]; HRESULT hr; - if (tf && !bThemeActive) - { - if (UXTHEME_GetSystemMetrics(&metrics)) - UXTHEME_SaveUnthemedSystemMetrics(&metrics); - } - - hr = MSSTYLES_SetActiveTheme(tf, TRUE); - if(FAILED(hr)) - return hr; if(tf) { bThemeActive = TRUE; lstrcpynW(szCurrentTheme, tf->szThemeFile, ARRAY_SIZE(szCurrentTheme)); lstrcpynW(szCurrentColor, tf->pszSelectedColor, ARRAY_SIZE(szCurrentColor)); lstrcpynW(szCurrentSize, tf->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); + + ret = UXTHEME_GetSystemMetrics(&metrics); + + /* Check if theming is already active */ + if (!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) + { + size = sizeof(tmp); + if (!RegQueryValueExW(hKey, L"LoadedBefore", NULL, NULL, (BYTE *)tmp, &size)) + loaded_before = (tmp[0] != '0'); + else + WARN("Failed to get LoadedBefore: %d\n", GetLastError()); + RegCloseKey(hKey); + } + if (loaded_before) + return MSSTYLES_SetActiveTheme(tf, FALSE); + + if (ret) + UXTHEME_SaveUnthemedSystemMetrics(&metrics); } else { bThemeActive = FALSE; @@ -460,18 +471,20 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) (lstrlenW(szCurrentSize)+1)*sizeof(WCHAR)); RegSetValueExW(hKey, L"DllName", 0, REG_SZ, (const BYTE*)szCurrentTheme, (lstrlenW(szCurrentTheme)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey, L"LoadedBefore", 0, REG_SZ, (const BYTE *)tmp, sizeof(WCHAR) * 2); } else { RegDeleteValueW(hKey, L"ColorName"); RegDeleteValueW(hKey, L"SizeName"); RegDeleteValueW(hKey, L"DllName"); - + RegDeleteValueW(hKey, L"LoadedBefore"); } RegCloseKey(hKey); } else TRACE("Failed to open theme registry key\n"); + hr = MSSTYLES_SetActiveTheme(tf, TRUE); if (bThemeActive) { if (UXTHEME_GetSystemMetrics(&metrics)) diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 4b8f95764d6..67130774392 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -21,7 +21,10 @@ #ifndef __WINE_UXTHEMEDLL_H #define __WINE_UXTHEMEDLL_H +#include <wingdi.h> #include <winuser.h> +#include <uxtheme.h> +#include <msstyles.h> typedef HANDLE HTHEMEFILE; @@ -99,6 +102,7 @@ BOOL WINAPI ThemeHooksInstall(void) DECLSPEC_HIDDEN; BOOL WINAPI ThemeHooksRemove(void) DECLSPEC_HIDDEN; extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; +extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN; -- 2.32.0

1 0

[PATCH 1/2] uxtheme: Save temporary system metrics to a struct in memory.
by Zhiyi Zhang 21 Oct '21

21 Oct '21

So that temporary system metrics are not saved in the registry. Saving them to the registry creates a race condition when two processes are trying to activate theming at the same time, one process might save themed system metrics instead of unthemed system metrics to the registry. The race condition will be more apparent when initializing a wine prefix after theming is turned on by default in wine.inf. This patch refactors the system metric helper functions to use an in-memory struct and is a prerequisite to remove the race condition. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 344 ++++++++++++++++++++---------------------- 1 file changed, 161 insertions(+), 183 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 628bd9bfdc4..d9eedf6543b 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -236,217 +236,182 @@ static const WCHAR * const SysColorsNames[] = static const WCHAR strColorKey[] = L"Control Panel\\Colors"; -static const struct BackupSysParam -{ - int spiGet, spiSet; - const WCHAR* keyName; -} backupSysParams[] = -{ - {SPI_GETFLATMENU, SPI_SETFLATMENU, L"FlatMenu"}, - {SPI_GETGRADIENTCAPTIONS, SPI_SETGRADIENTCAPTIONS, L"GradientCaption"}, - {-1, -1, 0} -}; - #define NUM_SYS_COLORS (COLOR_MENUBAR+1) -static void save_sys_colors (HKEY baseKey) +struct system_metrics { - WCHAR colorStr[13]; - HKEY hKey; - int i, length; + COLORREF system_colors[NUM_SYS_COLORS]; + NONCLIENTMETRICSW non_client_metrics; + LOGFONTW icon_title_font; + DWORD gradient_caption; + DWORD flat_menu; +}; - if (RegCreateKeyExW( baseKey, strColorKey, - 0, 0, 0, KEY_ALL_ACCESS, - 0, &hKey, 0 ) == ERROR_SUCCESS) - { - for (i = 0; i < NUM_SYS_COLORS; i++) - { - COLORREF col = GetSysColor (i); - - length = swprintf(colorStr, ARRAY_SIZE(colorStr), L"%d %d %d", GetRValue(col), - GetGValue(col), GetBValue(col)); - RegSetValueExW(hKey, SysColorsNames[i], 0, REG_SZ, (BYTE *)colorStr, - (length + 1) * sizeof(WCHAR)); - } - RegCloseKey (hKey); - } -} - -/* Before activating a theme, query current system colors, certain settings - * and backup them in the registry, so they can be restored when the theme - * is deactivated */ -static void UXTHEME_BackupSystemMetrics(void) +static BOOL UXTHEME_GetSystemMetrics(struct system_metrics *metrics) { DPI_AWARENESS_CONTEXT old_context; - HKEY hKey; - const struct BackupSysParam* bsp = backupSysParams; + BOOL ret = FALSE; + int i; + + for (i = 0; i < NUM_SYS_COLORS; ++i) + metrics->system_colors[i] = GetSysColor(i); old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); - if (RegCreateKeyExW( HKEY_CURRENT_USER, szThemeManager, - 0, 0, 0, KEY_ALL_ACCESS, - 0, &hKey, 0) == ERROR_SUCCESS) - { - NONCLIENTMETRICSW ncm; - LOGFONTW iconTitleFont; - - /* back up colors */ - save_sys_colors (hKey); - - /* back up "other" settings */ - while (bsp->spiGet >= 0) - { - DWORD value; - - SystemParametersInfoW (bsp->spiGet, 0, &value, 0); - RegSetValueExW (hKey, bsp->keyName, 0, REG_DWORD, - (LPBYTE)&value, sizeof (value)); - - bsp++; - } - - /* back up non-client metrics */ - memset (&ncm, 0, sizeof (ncm)); - ncm.cbSize = sizeof (ncm); - SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (ncm), &ncm, 0); - RegSetValueExW (hKey, L"NonClientMetrics", 0, REG_BINARY, (BYTE*)&ncm, - sizeof (ncm)); - memset (&iconTitleFont, 0, sizeof (iconTitleFont)); - SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (iconTitleFont), - &iconTitleFont, 0); - RegSetValueExW (hKey, L"IconTitleFont", 0, REG_BINARY, - (LPBYTE)&iconTitleFont, sizeof (iconTitleFont)); - - RegCloseKey (hKey); - } + memset(&metrics->non_client_metrics, 0, sizeof(metrics->non_client_metrics)); + metrics->non_client_metrics.cbSize = sizeof(metrics->non_client_metrics); + if (!SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(metrics->non_client_metrics), + &metrics->non_client_metrics, 0)) + goto done; + memset(&metrics->icon_title_font, 0, sizeof(metrics->icon_title_font)); + if (!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(metrics->icon_title_font), + &metrics->icon_title_font, 0)) + goto done; + if (!SystemParametersInfoW(SPI_GETGRADIENTCAPTIONS, 0, &metrics->gradient_caption, 0)) + goto done; + if (!SystemParametersInfoW(SPI_GETFLATMENU, 0, &metrics->flat_menu, 0)) + goto done; + ret = TRUE; +done: SetThreadDpiAwarenessContext(old_context); + return ret; } /* Read back old settings after a theme was deactivated */ -static void UXTHEME_RestoreSystemMetrics(void) +static BOOL UXTHEME_GetUnthemedSystemMetrics(struct system_metrics *metrics) { - DPI_AWARENESS_CONTEXT old_context; - HKEY hKey; - const struct BackupSysParam* bsp = backupSysParams; + HKEY theme_manager_key = NULL, color_key = NULL; + BOOL ret = FALSE; + WCHAR string[13]; + int i, r, g, b; + DWORD size; - old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + if (RegOpenKeyExW(HKEY_CURRENT_USER, szThemeManager, 0, KEY_QUERY_VALUE, &theme_manager_key)) + goto done; - if (RegOpenKeyExW (HKEY_CURRENT_USER, szThemeManager, - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(theme_manager_key, strColorKey, 0, KEY_QUERY_VALUE, &color_key)) + goto done; + + for (i = 0; i < NUM_SYS_COLORS; ++i) { - HKEY colorKey; - - /* read backed-up colors */ - if (RegOpenKeyExW (hKey, strColorKey, - 0, KEY_QUERY_VALUE, &colorKey) == ERROR_SUCCESS) - { - int i; - COLORREF sysCols[NUM_SYS_COLORS]; - int sysColsIndices[NUM_SYS_COLORS]; - int sysColCount = 0; - - for (i = 0; i < NUM_SYS_COLORS; i++) - { - DWORD type; - WCHAR colorStr[13]; - DWORD count = sizeof(colorStr); + size = sizeof(string); + if (RegQueryValueExW(color_key, SysColorsNames[i], 0, NULL, (BYTE *)string, &size)) + goto done; - if (RegQueryValueExW(colorKey, SysColorsNames[i], 0, &type, (LPBYTE)colorStr, - &count) == ERROR_SUCCESS) - { - int r, g, b; - if (swscanf(colorStr, L"%d %d %d", &r, &g, &b) == 3) - { - sysColsIndices[sysColCount] = i; - sysCols[sysColCount] = RGB(r, g, b); - sysColCount++; - } - } - } - RegCloseKey (colorKey); - - SetSysColors (sysColCount, sysColsIndices, sysCols); - } - - /* read backed-up other settings */ - while (bsp->spiGet >= 0) - { - DWORD value; - DWORD count = sizeof(value); - DWORD type; - - if (RegQueryValueExW (hKey, bsp->keyName, 0, - &type, (LPBYTE)&value, &count) == ERROR_SUCCESS) - { - SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); - } - - bsp++; - } - - /* read backed-up non-client metrics */ - { - NONCLIENTMETRICSW ncm; - LOGFONTW iconTitleFont; - DWORD count = sizeof(ncm); - DWORD type; + if (swscanf(string, L"%d %d %d", &r, &g, &b) != 3) + goto done; - if (RegQueryValueExW (hKey, L"NonClientMetrics", 0, - &type, (LPBYTE)&ncm, &count) == ERROR_SUCCESS) - { - SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, - count, &ncm, SPIF_UPDATEINIFILE); - } - - count = sizeof(iconTitleFont); - - if (RegQueryValueExW (hKey, L"IconTitleFont", 0, - &type, (LPBYTE)&iconTitleFont, &count) == ERROR_SUCCESS) - { - SystemParametersInfoW (SPI_SETICONTITLELOGFONT, - count, &iconTitleFont, SPIF_UPDATEINIFILE); - } - } - - RegCloseKey (hKey); + metrics->system_colors[i] = RGB(r, g, b); } - SetThreadDpiAwarenessContext(old_context); + size = sizeof(metrics->non_client_metrics); + if (RegQueryValueExW(theme_manager_key, L"NonClientMetrics", 0, NULL, + (BYTE *)&metrics->non_client_metrics, &size)) + goto done; + size = sizeof(metrics->icon_title_font); + if (RegQueryValueExW(theme_manager_key, L"IconTitleFont", 0, NULL, + (BYTE *)&metrics->icon_title_font, &size)) + goto done; + size = sizeof(metrics->gradient_caption); + if (RegQueryValueExW(theme_manager_key, L"GradientCaption", 0, NULL, + (BYTE *)&metrics->gradient_caption, &size)) + goto done; + size = sizeof(metrics->flat_menu); + if (RegQueryValueExW(theme_manager_key, L"FlatMenu", 0, NULL, (BYTE *)&metrics->flat_menu, + &size)) + goto done; + + ret = TRUE; +done: + RegCloseKey(color_key); + RegCloseKey(theme_manager_key); + return ret; +} + +static void UXTHEME_SaveUnthemedSystemMetrics(struct system_metrics *metrics) +{ + HKEY theme_manager_key, color_key; + WCHAR string[13]; + DWORD length; + int i; + + if (!RegCreateKeyExW(HKEY_CURRENT_USER, szThemeManager, 0, 0, 0, KEY_ALL_ACCESS, 0, + &theme_manager_key, 0)) + { + if (!RegCreateKeyExW(theme_manager_key, strColorKey, 0, 0, 0, KEY_ALL_ACCESS, 0, &color_key, + 0)) + { + for (i = 0; i < NUM_SYS_COLORS; ++i) + { + length = swprintf(string, ARRAY_SIZE(string), L"%d %d %d", + GetRValue(metrics->system_colors[i]), + GetGValue(metrics->system_colors[i]), + GetBValue(metrics->system_colors[i])); + RegSetValueExW(color_key, SysColorsNames[i], 0, REG_SZ, (BYTE *)string, + (length + 1) * sizeof(WCHAR)); + } + + RegCloseKey(color_key); + } + + RegSetValueExW(theme_manager_key, L"NonClientMetrics", 0, REG_BINARY, + (BYTE *)&metrics->non_client_metrics, sizeof(metrics->non_client_metrics)); + RegSetValueExW(theme_manager_key, L"IconTitleFont", 0, REG_BINARY, + (BYTE *)&metrics->icon_title_font, sizeof(metrics->icon_title_font)); + RegSetValueExW(theme_manager_key, L"GradientCaption", 0, REG_DWORD, + (BYTE *)&metrics->gradient_caption, sizeof(metrics->gradient_caption)); + RegSetValueExW(theme_manager_key, L"FlatMenu", 0, REG_DWORD, (BYTE *)&metrics->flat_menu, + sizeof(metrics->flat_menu)); + RegCloseKey(theme_manager_key); + } } /* Make system settings persistent, so they're in effect even w/o uxtheme * loaded. * For efficiency reasons, only the last SystemParametersInfoW sets * SPIF_SENDWININICHANGE */ -static void UXTHEME_SaveSystemMetrics(void) +static void UXTHEME_SaveSystemMetrics(struct system_metrics *metrics, BOOL send_syscolor_change) { - const struct BackupSysParam* bsp = backupSysParams; - NONCLIENTMETRICSW ncm; - LOGFONTW iconTitleFont; + int i, length, index[NUM_SYS_COLORS]; + DPI_AWARENESS_CONTEXT old_context; + WCHAR string[13]; + HKEY hkey; - save_sys_colors (HKEY_CURRENT_USER); - - while (bsp->spiGet >= 0) + if (!RegCreateKeyExW(HKEY_CURRENT_USER, strColorKey, 0, 0, 0, KEY_ALL_ACCESS, 0, &hkey, 0)) { - DWORD value; - - SystemParametersInfoW (bsp->spiGet, 0, &value, 0); - SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); - bsp++; + for (i = 0; i < NUM_SYS_COLORS; ++i) + { + length = swprintf(string, ARRAY_SIZE(string), L"%d %d %d", + GetRValue(metrics->system_colors[i]), + GetGValue(metrics->system_colors[i]), + GetBValue(metrics->system_colors[i])); + RegSetValueExW(hkey, SysColorsNames[i], 0, REG_SZ, (BYTE *)string, + (length + 1) * sizeof(WCHAR)); + } + RegCloseKey(hkey); } - - memset (&ncm, 0, sizeof (ncm)); - ncm.cbSize = sizeof (ncm); - SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (ncm), &ncm, 0); - SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (ncm), &ncm, - SPIF_UPDATEINIFILE); - memset (&iconTitleFont, 0, sizeof (iconTitleFont)); - SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (iconTitleFont), - &iconTitleFont, 0); - SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof (iconTitleFont), - &iconTitleFont, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + if (send_syscolor_change) + { + for (i = 0; i < NUM_SYS_COLORS; ++i) + index[i] = i; + + SetSysColors(NUM_SYS_COLORS, index, metrics->system_colors); + } + + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + + SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(metrics->non_client_metrics), + &metrics->non_client_metrics, SPIF_UPDATEINIFILE); + SystemParametersInfoW(SPI_SETICONTITLELOGFONT, sizeof(metrics->icon_title_font), + &metrics->icon_title_font, SPIF_UPDATEINIFILE); + SystemParametersInfoW(SPI_SETGRADIENTCAPTIONS, 0, (void *)(INT_PTR)metrics->gradient_caption, + SPIF_UPDATEINIFILE); + SystemParametersInfoW(SPI_SETFLATMENU, 0, (void *)(INT_PTR)metrics->flat_menu, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + + SetThreadDpiAwarenessContext(old_context); } /*********************************************************************** @@ -456,11 +421,17 @@ static void UXTHEME_SaveSystemMetrics(void) */ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) { + struct system_metrics metrics; HKEY hKey; WCHAR tmp[2]; HRESULT hr; - if(tf && !bThemeActive) UXTHEME_BackupSystemMetrics(); + if (tf && !bThemeActive) + { + if (UXTHEME_GetSystemMetrics(&metrics)) + UXTHEME_SaveUnthemedSystemMetrics(&metrics); + } + hr = MSSTYLES_SetActiveTheme(tf, TRUE); if(FAILED(hr)) return hr; @@ -471,7 +442,6 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) lstrcpynW(szCurrentSize, tf->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); } else { - UXTHEME_RestoreSystemMetrics(); bThemeActive = FALSE; szCurrentTheme[0] = '\0'; szCurrentColor[0] = '\0'; @@ -501,9 +471,17 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) } else TRACE("Failed to open theme registry key\n"); - - UXTHEME_SaveSystemMetrics (); - + + if (bThemeActive) + { + if (UXTHEME_GetSystemMetrics(&metrics)) + UXTHEME_SaveSystemMetrics(&metrics, FALSE); + } + else + { + if (UXTHEME_GetUnthemedSystemMetrics(&metrics)) + UXTHEME_SaveSystemMetrics(&metrics, TRUE); + } return hr; } -- 2.32.0

1 0

[PATCH] ntdll: Fix size comparison in NtQuerySystemInformation(SystemCodeIntegrityInformation).
by Paul Gofman 20 Oct '21

20 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 82c9f0da492..9d518719942 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3061,7 +3061,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, len = sizeof(SYSTEM_CODEINTEGRITY_INFORMATION); - if (size < len) + if (size >= len) integrity_info->CodeIntegrityOptions = CODEINTEGRITY_OPTION_ENABLED; else ret = STATUS_INFO_LENGTH_MISMATCH; -- 2.31.1

1 0

[PATCH] gdiplus: Switch to STRETCH_HALFTONE mode before playing a blit record.
by Huw Davies 20 Oct '21

20 Oct '21

This is done even if the emf contains a previous EMR_SETSTRETCHBLTMODE record. Thanks to Sebastián Aedo for some of the testing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdiplus/metafile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d79c939218c..1b4bba18048 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2486,6 +2486,9 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, record->nSize = dataSize + 8; memcpy(record->dParm, data, dataSize); + if (record->iType == EMR_BITBLT || record->iType == EMR_STRETCHBLT) + SetStretchBltMode(metafile->playback_dc, STRETCH_HALFTONE); + if(PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, record, metafile->handle_count) == 0) ERR("PlayEnhMetaFileRecord failed\n"); -- 2.23.0

2 1

[PATCH] kernelbase: Add RaiseFailFastException stub.
by Brendan Shanks 20 Oct '21

20 Oct '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Fixes Essential Objects EO.WebBrowser, used by Quicken. dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/debug.c | 8 ++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 90b503af19f..71f33a72862 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1195,7 +1195,7 @@ @ stdcall -import QueueUserAPC(ptr long long) @ stdcall -import QueueUserWorkItem(ptr ptr long) @ stdcall -import RaiseException(long long long ptr) -# @ stub RaiseFailFastException +@ stdcall -import RaiseFailFastException(ptr ptr long) @ stdcall -import ReadConsoleA(long ptr long ptr ptr) @ stdcall -import ReadConsoleInputA(long ptr long ptr) @ stub ReadConsoleInputExA diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 45bb6c019e9..53b8b44f270 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -303,6 +303,14 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou } __ASM_STDCALL_IMPORT(RaiseException,16) +/******************************************************************* + * RaiseFailFastException (kernelbase.@) + */ +void WINAPI DECLSPEC_HOTPATCH RaiseFailFastException( EXCEPTION_RECORD *record, CONTEXT *context, DWORD flags ) +{ + FIXME( "(%p, %p, %d) stub\n", record, context, flags ); + TerminateProcess( GetCurrentProcess(), STATUS_FAIL_FAST_EXCEPTION ); +} /*********************************************************************** * SetUnhandledExceptionFilter (kernelbase.@) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index dd9f4a8ddce..c47e681edfa 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1236,7 +1236,7 @@ # @ stub QuirkIsEnabledForPackage4 # @ stub QuirkIsEnabledForProcess @ stdcall RaiseException(long long long ptr) -# @ stub RaiseFailFastException +@ stdcall RaiseFailFastException(ptr ptr long) @ stdcall ReOpenFile(ptr long long long) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) -- 2.30.1 (Apple Git-130)

1 0

[PATCH] msvcrt: support I width modifier in *scanf* family
by Eric Pouech 20 Oct '21

20 Oct '21

Despite what msdn states, I and I32 are supported width modifiers. V2: - better code structure - added support and tests for I32 v3: - fix 'test & copy & paste & don't test' error v4: - move the tests in ucrtbase instead of msvcrt (as Piotr suggestion) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/scanf.h | 10 ++++++++-- dlls/ucrtbase/tests/scanf.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3ab2efef13d..02284379854 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -279,13 +279,19 @@ _FUNCTION_ { *(format + 2) == '4') { I64_prefix = 1; format += 2; + break; } - break; + else if (*(format + 1) == '3' && + *(format + 2) == '2') { + format += 2; + break; + } + /* fall through */ #if _MSVCR_VER == 0 || _MSVCR_VER >= 140 case 'z': +#endif if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; break; -#endif default: prefix_finished = 1; } diff --git a/dlls/ucrtbase/tests/scanf.c b/dlls/ucrtbase/tests/scanf.c index 3d77746d23b..12a08864642 100644 --- a/dlls/ucrtbase/tests/scanf.c +++ b/dlls/ucrtbase/tests/scanf.c @@ -43,6 +43,7 @@ static void test_sscanf(void) char buffer[100], buffer1[100]; int result, ret, hour, min, count; LONGLONG result64; + DWORD_PTR result_ptr; char c; void *ptr; float ret_float1, ret_float2; @@ -296,6 +297,30 @@ static void test_sscanf(void) ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); ok(ret_size == 1, "got wrong size_t %s for flags %#x\n", wine_dbgstr_longlong((LONGLONG)ret_size), tests[i]); + + result64 = 0; + ret = vsscanf_wrapper(tests[i], "12345678901234", -1, "%I64d", &result64); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result64 == 12345678901234ll, "got wrong number 0x%s for flags %#x\n", + wine_dbgstr_longlong(result64), tests[i]); + + result = 0; + ret = vsscanf_wrapper(tests[i], "12345678901234", -1, "%I32d", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == (int)12345678901234ll, /* this is always truncated to 32bit */ + "got wrong number 0x%d for flags %#x\n", result, tests[i]); + + result_ptr = 0; + ret = vsscanf_wrapper(tests[i], "0x87654321", -1, "%Ix", &result_ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result_ptr == 0x87654321, + "got wrong number %Ix for flags %#x\n", result_ptr, tests[i]); + + result_ptr = 0; + ret = vsscanf_wrapper(tests[i], "0x123456789", -1, "%Ix", &result_ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result_ptr == (DWORD_PTR)0x123456789ull, /* this is truncated on 32bit systems */ + "got wrong number %Ix for flags %#x\n", result_ptr, tests[i]); } }

2 1

[PATCH 1/5] winegstreamer: Move the IWMProfile3 implementation to a separate object.
by Zebediah Figura 20 Oct '21

20 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/Makefile.in | 3 +- dlls/winegstreamer/gst_private.h | 17 + dlls/winegstreamer/main.c | 6 +- dlls/winegstreamer/mfplat.c | 3 +- dlls/winegstreamer/wm_asyncreader.c | 471 +++++----------------------- dlls/winegstreamer/wm_reader.c | 308 ++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 2 - 7 files changed, 418 insertions(+), 392 deletions(-) create mode 100644 dlls/winegstreamer/wm_reader.c diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 17311cd663c..76e6aeed54d 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,7 +1,7 @@ MODULE = winegstreamer.dll UNIXLIB = winegstreamer.so IMPORTLIB = winegstreamer -IMPORTS = strmbase strmiids uuid ole32 mfuuid +IMPORTS = strmbase ole32 DELAYIMPORTS = mfplat EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) @@ -14,6 +14,7 @@ C_SRCS = \ quartz_parser.c \ wg_parser.c \ wm_asyncreader.c \ + wm_reader.c \ wm_syncreader.c IDL_SRCS = \ diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 986c8ca695d..6c86031897e 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -33,6 +33,7 @@ #define NONAMELESSUNION #include "dshow.h" #include "mfidl.h" +#include "wmsdk.h" #include "wine/debug.h" #include "wine/strmbase.h" @@ -112,4 +113,20 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HI HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; +struct wm_reader +{ + IWMProfile3 IWMProfile3_iface; + LONG refcount; + + const struct wm_reader_ops *ops; +}; + +struct wm_reader_ops +{ + void *(*query_interface)(struct wm_reader *reader, REFIID iid); + void (*destroy)(struct wm_reader *reader); +}; + +void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); + #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index d6f19fb4ad1..ac9a3201792 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -20,17 +20,19 @@ #define WINE_NO_NAMELESS_EXTENSION +#define EXTERN_GUID DEFINE_GUID +#include "initguid.h" #include "gst_private.h" #include "winternl.h" #include "rpcproxy.h" - -#include "initguid.h" #include "gst_guids.h" static unixlib_handle_t unix_handle; WINE_DEFAULT_DEBUG_CHANNEL(quartz); +DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { unsigned int new_capacity, max_capacity; diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 93f4b8d5bd7..58200dc409a 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -19,9 +19,10 @@ #include "gst_private.h" -#include "mfapi.h" #include "ks.h" #include "ksmedia.h" +#include "initguid.h" +#include "mfapi.h" #include "wine/debug.h" diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index b4ef4851c33..3e341ec41e9 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -17,12 +17,13 @@ */ #include "gst_private.h" -#include "wmsdk.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); struct async_reader { + struct wm_reader reader; + IWMReader IWMReader_iface; IWMReaderAdvanced6 IWMReaderAdvanced6_iface; IWMReaderAccelerator IWMReaderAccelerator_iface; @@ -34,9 +35,7 @@ struct async_reader IWMHeaderInfo3 IWMHeaderInfo3_iface; IWMLanguageList IWMLanguageList_iface; IReferenceClock IReferenceClock_iface; - IWMProfile3 IWMProfile3_iface; IWMPacketSize2 IWMPacketSize2_iface; - LONG ref; }; static struct async_reader *impl_from_IWMReader(IWMReader *iface) @@ -44,116 +43,25 @@ static struct async_reader *impl_from_IWMReader(IWMReader *iface) return CONTAINING_RECORD(iface, struct async_reader, IWMReader_iface); } -static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID iid, void **out) { - struct async_reader *This = impl_from_IWMReader(iface); + struct async_reader *reader = impl_from_IWMReader(iface); - if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMReader_iface; - }else if(IsEqualGUID(riid, &IID_IWMReader)) { - TRACE("(%p)->(IID_IWMReader %p)\n", This, ppv); - *ppv = &This->IWMReader_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced)) { - TRACE("(%p)->(IID_IWMReaderAdvanced %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced2)) { - TRACE("(%p)->(IID_IWMReaderAdvanced2 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced3)) { - TRACE("(%p)->(IID_IWMReaderAdvanced3 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced4)) { - TRACE("(%p)->(IID_IWMReaderAdvanced4 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced5)) { - TRACE("(%p)->(IID_IWMReaderAdvanced5 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced6)) { - TRACE("(%p)->(IID_IWMReaderAdvanced6 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAccelerator)) { - TRACE("(%p)->(IID_IWMReaderAccelerator %p)\n", This, ppv); - *ppv = &This->IWMReaderAccelerator_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderNetworkConfig)) { - TRACE("(%p)->(IWMReaderNetworkConfig %p)\n", This, ppv); - *ppv = &This->IWMReaderNetworkConfig2_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderNetworkConfig2)) { - TRACE("(%p)->(IWMReaderNetworkConfig2 %p)\n", This, ppv); - *ppv = &This->IWMReaderNetworkConfig2_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderStreamClock)) { - TRACE("(%p)->(IWMReaderStreamClock %p)\n", This, ppv); - *ppv = &This->IWMReaderStreamClock_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderTypeNegotiation)) { - TRACE("(%p)->(IWMReaderTypeNegotiation %p)\n", This, ppv); - *ppv = &This->IWMReaderTypeNegotiation_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderTimecode)) { - TRACE("(%p)->(IWMReaderTimecode %p)\n", This, ppv); - *ppv = &This->IWMReaderTimecode_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderPlaylistBurn)) { - TRACE("(%p)->(IWMReaderPlaylistBurn %p)\n", This, ppv); - *ppv = &This->IWMReaderPlaylistBurn_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo)) { - TRACE("(%p)->(IWMHeaderInfo %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo2)) { - TRACE("(%p)->(IWMHeaderInfo2 %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo3)) { - TRACE("(%p)->(IWMHeaderInfo3 %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMLanguageList)) { - TRACE("(%p)->(IWMLanguageList %p)\n", This, ppv); - *ppv = &This->IWMLanguageList_iface; - }else if(IsEqualGUID(riid, &IID_IReferenceClock)) { - TRACE("(%p)->(IWMLanguageList %p)\n", This, ppv); - *ppv = &This->IReferenceClock_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile)) { - TRACE("(%p)->(IWMProfile %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile2)) { - TRACE("(%p)->(IWMProfile2 %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile3)) { - TRACE("(%p)->(IWMProfile3 %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMPacketSize)) { - TRACE("(%p)->(IWMPacketSize %p)\n", This, ppv); - *ppv = &This->IWMPacketSize2_iface; - }else if(IsEqualGUID(riid, &IID_IWMPacketSize2)) { - TRACE("(%p)->(IWMPacketSize2 %p)\n", This, ppv); - *ppv = &This->IWMPacketSize2_iface; - }else { - *ppv = NULL; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + return IWMProfile3_QueryInterface(&reader->reader.IWMProfile3_iface, iid, out); } static ULONG WINAPI WMReader_AddRef(IWMReader *iface) { - struct async_reader *This = impl_from_IWMReader(iface); - LONG ref = InterlockedIncrement(&This->ref); + struct async_reader *reader = impl_from_IWMReader(iface); - TRACE("(%p) ref=%d\n", This, ref); - - return ref; + return IWMProfile3_AddRef(&reader->reader.IWMProfile3_iface); } static ULONG WINAPI WMReader_Release(IWMReader *iface) { - struct async_reader *This = impl_from_IWMReader(iface); - LONG ref = InterlockedDecrement(&This->ref); + struct async_reader *reader = impl_from_IWMReader(iface); - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) - free(This); - - return ref; + return IWMProfile3_Release(&reader->reader.IWMProfile3_iface); } static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context) @@ -1692,289 +1600,6 @@ static const IReferenceClockVtbl ReferenceClockVtbl = refclock_Unadvise }; -static struct async_reader *impl_from_IWMProfile3(IWMProfile3 *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, IWMProfile3_iface); -} - -static HRESULT WINAPI profile3_QueryInterface(IWMProfile3 *iface, REFIID riid, void **ppv) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI profile3_AddRef(IWMProfile3 *iface) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI profile3_Release(IWMProfile3 *iface) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI profile3_GetVersion(IWMProfile3 *iface, WMT_VERSION *version) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, version); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetName(IWMProfile3 *iface, WCHAR *name, DWORD *length) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p, %p\n", This, name, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetName(IWMProfile3 *iface, const WCHAR *name) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s\n", This, debugstr_w(name)); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetDescription(IWMProfile3 *iface, WCHAR *description, DWORD *length) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p, %p\n", This, description, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetDescription(IWMProfile3 *iface, const WCHAR *description) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s\n", This, debugstr_w(description)); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamCount(IWMProfile3 *iface, DWORD *count) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - - if (!count) - return E_INVALIDARG; - - *count = 0; - return S_OK; -} - -static HRESULT WINAPI profile3_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamByNumber(IWMProfile3 *iface, WORD stream, IWMStreamConfig **config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, stream, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStreamByNumber(IWMProfile3 *iface, WORD stream) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_ReconfigStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewStream(IWMProfile3 *iface, REFGUID type, IWMStreamConfig **config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(type), config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetMutualExclusionCount(IWMProfile3 *iface, DWORD *count) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetMutualExclusion(IWMProfile3 *iface, DWORD index, IWMMutualExclusion **mutual) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion **mutual) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetProfileID(IWMProfile3 *iface, GUID *guid) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, guid); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT *storage) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, storage); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT storage) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d\n", This, storage); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD *count) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetBandwidthSharing(IWMProfile3 *iface, DWORD index, IWMBandwidthSharing **bandwidth) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing *bandwidth) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddBandwidthSharing(IWMProfile3 *iface, IWMBandwidthSharing *bandwidth) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing **bandwidth) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization *stream) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStreamPrioritization(IWMProfile3 *iface) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetExpectedPacketCount(IWMProfile3 *iface, QWORD duration, QWORD *packets) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s, %p\n", This, wine_dbgstr_longlong(duration), packets); - return E_NOTIMPL; -} - -static const IWMProfile3Vtbl WMProfile3Vtbl = -{ - profile3_QueryInterface, - profile3_AddRef, - profile3_Release, - profile3_GetVersion, - profile3_GetName, - profile3_SetName, - profile3_GetDescription, - profile3_SetDescription, - profile3_GetStreamCount, - profile3_GetStream, - profile3_GetStreamByNumber, - profile3_RemoveStream, - profile3_RemoveStreamByNumber, - profile3_AddStream, - profile3_ReconfigStream, - profile3_CreateNewStream, - profile3_GetMutualExclusionCount, - profile3_GetMutualExclusion, - profile3_RemoveMutualExclusion, - profile3_AddMutualExclusion, - profile3_CreateNewMutualExclusion, - profile3_GetProfileID, - profile3_GetStorageFormat, - profile3_SetStorageFormat, - profile3_GetBandwidthSharingCount, - profile3_GetBandwidthSharing, - profile3_RemoveBandwidthSharing, - profile3_AddBandwidthSharing, - profile3_CreateNewBandwidthSharing, - profile3_GetStreamPrioritization, - profile3_SetStreamPrioritization, - profile3_RemoveStreamPrioritization, - profile3_CreateNewStreamPrioritization, - profile3_GetExpectedPacketCount -}; - static struct async_reader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) { return CONTAINING_RECORD(iface, struct async_reader, IWMPacketSize2_iface); @@ -2037,6 +1662,80 @@ static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = packetsize_SetMinPacketSize }; +static struct async_reader *impl_from_wm_reader(struct wm_reader *iface) +{ + return CONTAINING_RECORD(iface, struct async_reader, reader); +} + +static void *async_reader_query_interface(struct wm_reader *iface, REFIID iid) +{ + struct async_reader *reader = impl_from_wm_reader(iface); + + TRACE("reader %p, iid %s.\n", reader, debugstr_guid(iid)); + + if (IsEqualIID(iid, &IID_IReferenceClock)) + return &reader->IReferenceClock_iface; + + if (IsEqualIID(iid, &IID_IWMHeaderInfo) + || IsEqualIID(iid, &IID_IWMHeaderInfo2) + || IsEqualIID(iid, &IID_IWMHeaderInfo3)) + return &reader->IWMHeaderInfo3_iface; + + if (IsEqualIID(iid, &IID_IWMLanguageList)) + return &reader->IWMLanguageList_iface; + + if (IsEqualIID(iid, &IID_IWMPacketSize) + || IsEqualIID(iid, &IID_IWMPacketSize2)) + return &reader->IWMPacketSize2_iface; + + if (IsEqualIID(iid, &IID_IWMReader)) + return &reader->IWMReader_iface; + + if (IsEqualIID(iid, &IID_IWMReaderAccelerator)) + return &reader->IWMReaderAccelerator_iface; + + if (IsEqualIID(iid, &IID_IWMReaderAdvanced) + || IsEqualIID(iid, &IID_IWMReaderAdvanced2) + || IsEqualIID(iid, &IID_IWMReaderAdvanced3) + || IsEqualIID(iid, &IID_IWMReaderAdvanced4) + || IsEqualIID(iid, &IID_IWMReaderAdvanced5) + || IsEqualIID(iid, &IID_IWMReaderAdvanced6)) + return &reader->IWMReaderAdvanced6_iface; + + if (IsEqualIID(iid, &IID_IWMReaderNetworkConfig) + || IsEqualIID(iid, &IID_IWMReaderNetworkConfig2)) + return &reader->IWMReaderNetworkConfig2_iface; + + if (IsEqualIID(iid, &IID_IWMReaderPlaylistBurn)) + return &reader->IWMReaderPlaylistBurn_iface; + + if (IsEqualIID(iid, &IID_IWMReaderStreamClock)) + return &reader->IWMReaderStreamClock_iface; + + if (IsEqualIID(iid, &IID_IWMReaderTimecode)) + return &reader->IWMReaderTimecode_iface; + + if (IsEqualIID(iid, &IID_IWMReaderTypeNegotiation)) + return &reader->IWMReaderTypeNegotiation_iface; + + return NULL; +} + +static void async_reader_destroy(struct wm_reader *iface) +{ + struct async_reader *reader = impl_from_wm_reader(iface); + + TRACE("reader %p.\n", reader); + + free(reader); +} + +static const struct wm_reader_ops async_reader_ops = +{ + .query_interface = async_reader_query_interface, + .destroy = async_reader_destroy, +}; + HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) { struct async_reader *object; @@ -2046,11 +1745,12 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; + wm_reader_init(&object->reader, &async_reader_ops); + object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; object->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl; object->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; - object->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; object->IWMReader_iface.lpVtbl = &WMReaderVtbl; object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; @@ -2059,7 +1759,6 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) object->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; object->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; object->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; - object->ref = 1; TRACE("Created async reader %p.\n", object); *reader = (IWMReader *)&object->IWMReader_iface; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c new file mode 100644 index 00000000000..2bab6eb462d --- /dev/null +++ b/dlls/winegstreamer/wm_reader.c @@ -0,0 +1,308 @@ +/* + * Copyright 2012 Austin English + * + * reader 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. + * + * reader library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "gst_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); + +static struct wm_reader *impl_from_IWMProfile3(IWMProfile3 *iface) +{ + return CONTAINING_RECORD(iface, struct wm_reader, IWMProfile3_iface); +} + +static HRESULT WINAPI profile_QueryInterface(IWMProfile3 *iface, REFIID iid, void **out) +{ + struct wm_reader *reader = impl_from_IWMProfile3(iface); + + TRACE("reader %p, iid %s, out %p.\n", reader, debugstr_guid(iid), out); + + if (IsEqualIID(iid, &IID_IUnknown) + || IsEqualIID(iid, &IID_IWMProfile) + || IsEqualIID(iid, &IID_IWMProfile2) + || IsEqualIID(iid, &IID_IWMProfile3)) + { + *out = &reader->IWMProfile3_iface; + } + else if (!(*out = reader->ops->query_interface(reader, iid))) + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI profile_AddRef(IWMProfile3 *iface) +{ + struct wm_reader *reader = impl_from_IWMProfile3(iface); + ULONG refcount = InterlockedIncrement(&reader->refcount); + + TRACE("%p increasing refcount to %u.\n", reader, refcount); + + return refcount; +} + +static ULONG WINAPI profile_Release(IWMProfile3 *iface) +{ + struct wm_reader *reader = impl_from_IWMProfile3(iface); + ULONG refcount = InterlockedDecrement(&reader->refcount); + + TRACE("%p decreasing refcount to %u.\n", reader, refcount); + + if (!refcount) + reader->ops->destroy(reader); + + return refcount; +} + +static HRESULT WINAPI profile_GetVersion(IWMProfile3 *iface, WMT_VERSION *version) +{ + FIXME("iface %p, version %p, stub!\n", iface, version); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetName(IWMProfile3 *iface, WCHAR *name, DWORD *length) +{ + FIXME("iface %p, name %p, length %p, stub!\n", iface, name, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_SetName(IWMProfile3 *iface, const WCHAR *name) +{ + FIXME("iface %p, name %s, stub!\n", iface, debugstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetDescription(IWMProfile3 *iface, WCHAR *description, DWORD *length) +{ + FIXME("iface %p, description %p, length %p, stub!\n", iface, description, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_SetDescription(IWMProfile3 *iface, const WCHAR *description) +{ + FIXME("iface %p, description %s, stub!\n", iface, debugstr_w(description)); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetStreamCount(IWMProfile3 *iface, DWORD *count) +{ + FIXME("iface %p, count %p, stub!\n", iface, count); + + if (!count) + return E_INVALIDARG; + + *count = 0; + return S_OK; +} + +static HRESULT WINAPI profile_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config) +{ + FIXME("iface %p, index %d, config %p, stub!\n", iface, index, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetStreamByNumber(IWMProfile3 *iface, WORD stream_number, IWMStreamConfig **config) +{ + FIXME("iface %p, stream_number %u, config %p, stub!\n", iface, stream_number, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_RemoveStream(IWMProfile3 *iface, IWMStreamConfig *config) +{ + FIXME("iface %p, config %p, stub!\n", iface, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_RemoveStreamByNumber(IWMProfile3 *iface, WORD stream_number) +{ + FIXME("iface %p, stream_number %u, stub!\n", iface, stream_number); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_AddStream(IWMProfile3 *iface, IWMStreamConfig *config) +{ + FIXME("iface %p, config %p, stub!\n", iface, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_ReconfigStream(IWMProfile3 *iface, IWMStreamConfig *config) +{ + FIXME("iface %p, config %p, stub!\n", iface, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_CreateNewStream(IWMProfile3 *iface, REFGUID type, IWMStreamConfig **config) +{ + FIXME("iface %p, type %s, config %p, stub!\n", iface, debugstr_guid(type), config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetMutualExclusionCount(IWMProfile3 *iface, DWORD *count) +{ + FIXME("iface %p, count %p, stub!\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetMutualExclusion(IWMProfile3 *iface, DWORD index, IWMMutualExclusion **excl) +{ + FIXME("iface %p, index %u, excl %p, stub!\n", iface, index, excl); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_RemoveMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *excl) +{ + FIXME("iface %p, excl %p, stub!\n", iface, excl); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_AddMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *excl) +{ + FIXME("iface %p, excl %p, stub!\n", iface, excl); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_CreateNewMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion **excl) +{ + FIXME("iface %p, excl %p, stub!\n", iface, excl); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetProfileID(IWMProfile3 *iface, GUID *id) +{ + FIXME("iface %p, id %p, stub!\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT *format) +{ + FIXME("iface %p, format %p, stub!\n", iface, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_SetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT format) +{ + FIXME("iface %p, format %#x, stub!\n", iface, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD *count) +{ + FIXME("iface %p, count %p, stub!\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetBandwidthSharing(IWMProfile3 *iface, DWORD index, IWMBandwidthSharing **sharing) +{ + FIXME("iface %p, index %d, sharing %p, stub!\n", iface, index, sharing); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_RemoveBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing *sharing) +{ + FIXME("iface %p, sharing %p, stub!\n", iface, sharing); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_AddBandwidthSharing(IWMProfile3 *iface, IWMBandwidthSharing *sharing) +{ + FIXME("iface %p, sharing %p, stub!\n", iface, sharing); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_CreateNewBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing **sharing) +{ + FIXME("iface %p, sharing %p, stub!\n", iface, sharing); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) +{ + FIXME("iface %p, stream %p, stub!\n", iface, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_SetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization *stream) +{ + FIXME("iface %p, stream %p, stub!\n", iface, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_RemoveStreamPrioritization(IWMProfile3 *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_CreateNewStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) +{ + FIXME("iface %p, stream %p, stub!\n", iface, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetExpectedPacketCount(IWMProfile3 *iface, QWORD duration, QWORD *count) +{ + FIXME("iface %p, duration %s, count %p, stub!\n", iface, debugstr_time(duration), count); + return E_NOTIMPL; +} + +static const IWMProfile3Vtbl profile_vtbl = +{ + profile_QueryInterface, + profile_AddRef, + profile_Release, + profile_GetVersion, + profile_GetName, + profile_SetName, + profile_GetDescription, + profile_SetDescription, + profile_GetStreamCount, + profile_GetStream, + profile_GetStreamByNumber, + profile_RemoveStream, + profile_RemoveStreamByNumber, + profile_AddStream, + profile_ReconfigStream, + profile_CreateNewStream, + profile_GetMutualExclusionCount, + profile_GetMutualExclusion, + profile_RemoveMutualExclusion, + profile_AddMutualExclusion, + profile_CreateNewMutualExclusion, + profile_GetProfileID, + profile_GetStorageFormat, + profile_SetStorageFormat, + profile_GetBandwidthSharingCount, + profile_GetBandwidthSharing, + profile_RemoveBandwidthSharing, + profile_AddBandwidthSharing, + profile_CreateNewBandwidthSharing, + profile_GetStreamPrioritization, + profile_SetStreamPrioritization, + profile_RemoveStreamPrioritization, + profile_CreateNewStreamPrioritization, + profile_GetExpectedPacketCount, +}; + +void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) +{ + reader->IWMProfile3_iface.lpVtbl = &profile_vtbl; + reader->refcount = 1; + reader->ops = ops; +} diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 1d65820aa02..f4a5c9503ca 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -17,8 +17,6 @@ */ #include "gst_private.h" -#include "initguid.h" -#include "wmsdk.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); -- 2.33.0

1 4

[PATCH] ws2_32: Support setting SO_ERROR
by Alex Henrie 20 Oct '21

20 Oct '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Qt sets this option, see https://code.qt.io/cgit/qt/qtbase.git/tree/src/network/socket/qnativesocket… --- dlls/ws2_32/socket.c | 4 +--- dlls/ws2_32/tests/sock.c | 10 ++++++++-- include/wine/afd.h | 1 + server/sock.c | 38 +++++++++++++++++++++++++++----------- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..2c2eabc09fa 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2750,9 +2750,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int } case SO_ERROR: - FIXME( "SO_ERROR, stub!\n" ); - SetLastError( WSAENOPROTOOPT ); - return -1; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_ERROR, optval, optlen ); case SO_KEEPALIVE: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02713a7c625..76f4f1ef8a2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1289,7 +1289,6 @@ static void test_set_getsockopt(void) SetLastError(0xdeadbeef); i = 1234; err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); -todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); @@ -1300,7 +1299,14 @@ todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); -todo_wine + ok (i == 1234, "got %d (expected 1234)\n", i); + + SetLastError(0xdeadbeef); + i = 4321; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); ok (i == 1234, "got %d (expected 1234)\n", i); /* Test invalid optlen */ diff --git a/include/wine/afd.h b/include/wine/afd.h index 3b8bdcb9e5d..9382e2acf2f 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -238,6 +238,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_RECVTTL WINE_AFD_IOC(294) #define IOCTL_AFD_WINE_GET_IP_RECVTOS WINE_AFD_IOC(295) #define IOCTL_AFD_WINE_SET_IP_RECVTOS WINE_AFD_IOC(296) +#define IOCTL_AFD_WINE_SET_SO_ERROR WINE_AFD_IOC(297) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 4cb5503ad25..9829b876ff2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -193,6 +193,7 @@ struct sock unsigned int message; /* message to send */ obj_handle_t wparam; /* message wparam (socket handle) */ int errors[AFD_POLL_BIT_COUNT]; /* event errors */ + unsigned int last_error; /* most recent error code */ timeout_t connect_time;/* time the socket was connected */ struct sock *deferred; /* socket that waits for a deferred accept */ struct async_queue read_q; /* queue for asynchronous reads */ @@ -965,6 +966,7 @@ static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, i sock->pending_events |= event; sock->reported_events |= event; sock->errors[event_bit] = error; + sock->last_error = sock_get_error( error ); } } @@ -980,6 +982,7 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs { post_socket_event( sock, AFD_POLL_BIT_CONNECT, 0 ); sock->errors[AFD_POLL_BIT_CONNECT_ERR] = 0; + sock->last_error = 0; } if (event & (POLLERR | POLLHUP)) post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, error ); @@ -1443,6 +1446,7 @@ static struct sock *create_socket(void) init_async_queue( &sock->connect_q ); init_async_queue( &sock->poll_q ); memset( sock->errors, 0, sizeof(sock->errors) ); + sock->last_error = 0; list_init( &sock->accept_list ); return sock; } @@ -2677,7 +2681,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { int error; socklen_t len = sizeof(error); - unsigned int i; if (get_reply_max_size() < sizeof(error)) { @@ -2691,19 +2694,32 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } - if (!error) + if (error) + sock->last_error = sock_get_error( error ); + + set_reply_data( &sock->last_error, sizeof(sock->last_error) ); + return; + } + + case IOCTL_AFD_WINE_SET_SO_ERROR: + { + int error; + socklen_t len = sizeof(error); + + if (get_req_data_size() < sizeof(sock->last_error)) { - for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i) - { - if (sock->errors[i]) - { - error = sock_get_error( sock->errors[i] ); - break; - } - } + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + /* clear the native error, if any */ + if (getsockopt( unix_fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len ) < 0) + { + set_error( sock_get_ntstatus( errno ) ); + return; } - set_reply_data( &error, sizeof(error) ); + sock->last_error = *(unsigned int *)get_req_data(); return; } -- 2.33.1

1 0

[PATCH 1/2] winebus.sys: Treat udev actions other than "remove" as "add".
by Rémi Bernon 20 Oct '21

20 Oct '21

From: Simon McVittie <smcv(a)collabora.com> As per https://github.com/systemd/systemd/blob/v247-rc1/NEWS#L5 there are more kernel uevent types than just "add" and "remove", and we should be treating everything other than "remove" as being potentially an "add". To cope with this, try_add_device() now checks whether the same device was already added. If so, we ignore it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Two patches from Proton, which should help the udev backend when running Wine within a container. There was some container detection too but that seemed a bit specific, and the new option should be enough. dlls/winebus.sys/bus_udev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1cad63f0275..59bb2564def 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1411,16 +1411,14 @@ static void process_monitor_event(struct udev_monitor *monitor) if (!action) WARN("No action received\n"); - else if (strcmp(action, "add") == 0) + else if (strcmp(action, "remove")) udev_add_device(dev); - else if (strcmp(action, "remove") == 0) + else { impl = find_device_from_udev(dev); if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device for udev device %p\n", dev); } - else - WARN("Unhandled action %s\n", debugstr_a(action)); udev_device_unref(dev); } -- 2.33.0

2 3

[PATCH] winebus.sys: Add a trailing linefeed to a couple of FIXME()s.
by Francois Gouget 20 Oct '21

20 Oct '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index f1c20692b29..403c4821f24 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -629,7 +629,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME("not implemented!"); + FIXME("not implemented!\n"); break; } diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1dfce05e4bc..45421c3fe12 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1084,7 +1084,7 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME("not implemented!"); + FIXME("not implemented!\n"); break; } -- 2.30.2

2 1

[PATCH] wrc: Add a trailing linefeed to a couple of error() messages.
by Francois Gouget 20 Oct '21

20 Oct '21

Unlike most of the other wrc error functions, error() does not append a trailing linefeed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/wrc/ppl.l | 2 +- tools/wrc/wpp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index d4df76f7950..ee5a4f97a1e 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -1192,7 +1192,7 @@ static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop) if(ppy_debug) printf("push_buffer(%d): %p %p %p %d\n", bufferstackidx, ppp, filename, incname, pop); if(bufferstackidx >= MAXBUFFERSTACK) - error("Buffer stack overflow"); + error("Buffer stack overflow\n"); memset(&bufferstack[bufferstackidx], 0, sizeof(bufferstack[0])); bufferstack[bufferstackidx].bufferstate = YY_CURRENT_BUFFER; diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c index 9ad09f25da2..18a7b015be0 100644 --- a/tools/wrc/wpp.c +++ b/tools/wrc/wpp.c @@ -421,7 +421,7 @@ static const char * const pp_if_state_str[] = { void pp_push_if(pp_if_state_t s) { if(if_stack_idx >= MAXIFSTACK) - error("#if-stack overflow; #{if,ifdef,ifndef} nested too deeply (> %d)", MAXIFSTACK); + error("#if-stack overflow; #{if,ifdef,ifndef} nested too deeply (> %d)\n", MAXIFSTACK); if(pp_flex_debug) fprintf(stderr, "Push if %s:%d: %s(%d) -> %s(%d)\n", pp_status.input, pp_status.line_number, pp_if_state_str[pp_if_state()], if_stack_idx, pp_if_state_str[s], if_stack_idx+1); -- 2.30.2

1 0

[PATCH v2 1/2] oleaut32: Allow the registration of 64bit typelibs from a 32bit context.
by Bernhard Kölbl 20 Oct '21

20 Oct '21

Windows allows the registration of 64bit typelibs from 32bit programs even on a pure Win32 install. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51864 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v2: Handle insufficient privileges in the testcase. --- dlls/oleaut32/tests/typelib.c | 180 ++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 4 - 2 files changed, 180 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 825851c948e..78290c94dfe 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -6848,6 +6848,185 @@ static void test_register_typelib(BOOL system_registration) DeleteFileW(filename); } +static void test_register_typelib_64(void) +{ + ICreateTypeInfo *createti, *createti_co; + ELEMDESC elemdesc[5], elemdesc2[5]; + FUNCDESC funcdesc, funcdesc2; + ITypeInfo *unknown, *tinfo; + ITypeLib *stdole, *typelib; + ICreateTypeLib2 *createtl; + WCHAR filename[MAX_PATH]; + HREFTYPE hreftype; + HRESULT hr; + + static const WCHAR wszStdOle2[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; + + static OLECHAR typelibW[] = { 'W','i','n','e','T','e','s','t','T','y','p','e','L','i','b',0}; + static OLECHAR helpfileW[] = { 'C',':','\\','b','o','g','u','s','.','h','l','p',0 }; + static OLECHAR dllfileW[] = { 'C',':','\\','b','o','g','u','s','.','d','l','l',0 }; + static OLECHAR interface1W[] = { 'I','T','e','s','t','W','i','n','e','6', '4', 0}; + static OLECHAR coclassW[] = {'W','i','n','e','T','e','s','t','C','o','c','l','a','s','s',0 }; + static OLECHAR func1W[] = { 'f','u','n','c','1',0 }; + static OLECHAR func2W[] = { 'f','u','n','c','2',0 }; + static OLECHAR param1W[] = { 'p','a','r','a','m','1',0 }; + static OLECHAR param2W[] = { 'p','a','r','a','m','2',0 }; + static OLECHAR *names1[] = { func1W, param1W, param2W }; + static OLECHAR *names2[] = { func2W, param1W }; + static const GUID tlcustguid = { 0x512d2fec,0xcaf6,0x4c33,{0xbc,0x38,0x84,0x2f,0x2e,0x37,0x0d,0x7b} }; + static const GUID coclassguid = { 0x317cd4dd,0x0ce0,0x4525,{0x8d,0x33,0x68,0x14,0x4c,0x53,0x60,0xe9} }; + static const GUID interfaceguid = { 0x35cc5cea,0x11cc,0x4bca,{0x89,0x8c,0xf8,0x92,0x8e,0xb8,0xda,0x24} }; + + static const SYSKIND sys = SYS_WIN64; + + hr = LoadTypeLib(wszStdOle2, &stdole); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IDispatch, &unknown); + ok(hr == S_OK, "got %08x\n", hr); + + GetTempFileNameW(L".", L"tlb", 0, filename); + + hr = CreateTypeLib2(sys, filename, &createtl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetName(createtl, typelibW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetHelpFileName(createtl, helpfileW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetHelpStringDll(createtl, dllfileW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetGuid(createtl, &tlcustguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetVersion(createtl, 1, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti_co); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_LayOut(createti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(createti, &interfaceguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetVersion(createti, 1, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(createti, unknown, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(createti, 0, hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + elemdesc[0].tdesc.vt = VT_UINT; + U(elemdesc[0]).idldesc.dwReserved = 0; + U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN; + + elemdesc[1].tdesc.vt = VT_DECIMAL; + U(elemdesc[1]).idldesc.dwReserved = 0; + U(elemdesc[1]).idldesc.wIDLFlags = IDLFLAG_FIN; + + memset(&funcdesc, 0, sizeof(FUNCDESC)); + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + funcdesc.cParams = 2; + funcdesc.memid = 0x1; + funcdesc.elemdescFunc.tdesc.vt = VT_HRESULT; + funcdesc.lprgelemdescParam = elemdesc; + + hr = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); + ok(hr == S_OK, "got %08x\n", hr); + + elemdesc2[0].tdesc.vt = VT_UINT; + U(elemdesc2[0]).idldesc.dwReserved = 0; + U(elemdesc2[0]).idldesc.wIDLFlags = IDLFLAG_FIN | IDLFLAG_FOUT; + + memset(&funcdesc2, 0, sizeof(FUNCDESC)); + funcdesc2.funckind = FUNC_PUREVIRTUAL; + funcdesc2.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + funcdesc2.cParams = 1; + funcdesc2.memid = 0x2; + funcdesc2.elemdescFunc.tdesc.vt = VT_HRESULT; + funcdesc2.lprgelemdescParam = elemdesc2; + + hr = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncHelpContext(createti, 0, 0xabcdefab); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncHelpContext(createti, 1, 0xabcdefab); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, names1, 3); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(createti, 1, names2, 2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetTypeFlags(createti, TYPEFLAG_FOLEAUTOMATION | TYPEFLAG_FNONEXTENSIBLE | TYPEFLAG_FDUAL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&tinfo); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, 0, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(createti_co, &coclassguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(createti_co, tinfo, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(createti_co, 0, hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetImplTypeFlags(createti_co, 0, IMPLTYPEFLAG_FDEFAULT); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_Release(createti_co); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeInfo_Release(createti); + + hr = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeLib2_Release(createtl); + + trace("TypeLib to load: %ls\n", filename); + hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib); + ok(hr == S_OK, "got: %08x\n", hr); + + if(typelib) + { + hr = RegisterTypeLib(typelib, filename, NULL); + if (hr == TYPE_E_REGISTRYACCESS) + { + win_skip("Insufficient privileges to register typelib in the registry\n"); + ITypeLib_Release(typelib); + DeleteFileW(filename); + return; + } + ok(hr == S_OK, "got: %08x\n", hr); + + ITypeLib_Release(typelib); + } + + DeleteFileW(filename); +} + static void test_LoadTypeLib(void) { ITypeLib *tl; @@ -8351,6 +8530,7 @@ START_TEST(typelib) test_register_typelib(TRUE); test_register_typelib(FALSE); + test_register_typelib_64(); test_create_typelibs(); test_LoadTypeLib(); test_TypeInfo2_GetContainingTypeLib(); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 70f15679811..ef546379174 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -629,10 +629,6 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W if (FAILED(ITypeLib_GetLibAttr(ptlib, &attr))) return E_FAIL; -#ifndef _WIN64 - if (attr->syskind == SYS_WIN64) return TYPE_E_BADMODULEKIND; -#endif - get_typelib_key( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, keyName ); res = S_OK; -- 2.33.0

1 1

[PATCH] po: Update Traditional Chinese translation.
by Chan Chilung 20 Oct '21

20 Oct '21

Signed-off-by: Chan Chilung <eason066(a)gmail.com> --- po/zh_TW.po | 1081 +++++++++++++++++++++------------------------------ 1 file changed, 454 insertions(+), 627 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a8312e8bcec..45f7be06f2e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,9 +5,9 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-28 00:06+0800\n" -"Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" -"Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" +"PO-Revision-Date: 2021-10-20 19:13+0800\n" +"Last-Translator: Chan Chilung <eason066(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,30 +20,24 @@ msgid "Security" msgstr "安全性" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "使用者名稱(&U)：" +msgstr "群組或使用者名稱(&U)：" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "黃色" +msgstr "允許" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "拒絕" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "存取被拒。\n" +msgstr "%1 的權限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" -msgstr "安裝/移除" +msgstr "安裝/解除安裝" #: dlls/appwiz.cpl/appwiz.rc:61 msgid "" @@ -61,8 +55,8 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"下列軟體可以自動解除安裝。從清單中選取它並按下「新增/移除」，可以移除程式或" -"者調整已安裝元件。" +"下列軟體可以自動解除安裝。要移除程式或者調整已安裝元件，請從清單中選取程式" +"並按下「修改/移除」。" #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -123,11 +117,11 @@ msgstr "確定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技術支援資訊：" +msgstr "以下資訊可協助取得 %s 的技術支援：" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生產商：" +msgstr "發行者：" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" @@ -175,7 +169,7 @@ msgstr "" "幫您下載並安裝 Gecko。\n" "\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Gecko\">https://wiki.winehq.org/Gecko</a>" +"Gecko\">https://wiki.winehq.org/Gecko</a>。" #: dlls/appwiz.cpl/appwiz.rc:109 dlls/appwiz.cpl/appwiz.rc:124 msgid "&Install" @@ -242,7 +236,7 @@ msgstr "" "並安裝它。\n" "\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Mono\">https://wiki.winehq.org/Mono</a>" +"Mono\">https://wiki.winehq.org/Mono</a>。" #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" @@ -263,7 +257,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式 %s。您想將這個移除程式從註冊表中刪除嗎？" +msgstr "無法執行移除程式「%s」。您想將這個移除程式從註冊表中移除嗎？" #: dlls/appwiz.cpl/appwiz.rc:36 msgid "Not specified" @@ -277,7 +271,7 @@ msgstr "名稱" #: dlls/appwiz.cpl/appwiz.rc:39 msgid "Publisher" -msgstr "生產商" +msgstr "發行者" #: dlls/appwiz.cpl/appwiz.rc:40 dlls/cryptui/cryptui.rc:54 msgid "Version" @@ -331,7 +325,7 @@ msgstr "選項(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交錯(&I)" +msgstr "交錯(&I)：每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -363,7 +357,7 @@ msgstr "音訊" #: dlls/avifil32/avifil32.rc:36 msgid "Wine AVI-default-filehandler" -msgstr "Wine AVI-預設處理器" +msgstr "Wine AVI 預設處理器" #: dlls/avifil32/avifil32.rc:37 msgid "uncompressed" @@ -375,29 +369,27 @@ msgstr "正在取消..." #: dlls/browseui/browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2" #: dlls/browseui/browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2 %3!u! %4" #: dlls/browseui/browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "秒(&S)" +msgstr "秒" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "分" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "小時" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" -msgstr "屬性 %s" +msgstr "%s 的內容" #: dlls/comctl32/comctl32.rc:73 dlls/comdlg32/comdlg32.rc:265 msgid "&Apply" @@ -438,7 +430,7 @@ msgstr "關閉(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "重置(&e)" +msgstr "重置(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -458,7 +450,7 @@ msgstr "重置(&e)" #: programs/winemine/winemine.rc:53 programs/winhlp32/winhlp32.rc:57 #: programs/wordpad/wordpad.rc:102 msgid "&Help" -msgstr "求助(&H)" +msgstr "說明(&H)" #: dlls/comctl32/comctl32.rc:103 msgid "Move &Up" @@ -508,16 +500,12 @@ msgid "&Retry" msgstr "重試(&R)" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "隱藏分頁(&T)" +msgstr "隱藏詳細資訊" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "詳細資料" +msgstr "顯示詳細資訊" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -641,7 +629,7 @@ msgstr "[無]" #: dlls/comdlg32/comdlg32.rc:231 msgid "Specific &Printer" -msgstr "特定的印表機(&P)" +msgstr "指定的印表機(&P)" #: dlls/comdlg32/comdlg32.rc:236 dlls/comdlg32/comdlg32.rc:419 #: dlls/comdlg32/comdlg32.rc:443 dlls/wineps.drv/wineps.rc:34 @@ -701,7 +689,7 @@ msgstr "底線(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "色彩(&C)：" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -721,11 +709,11 @@ msgstr "基本色彩(&B)：" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定色彩(&C)：" +msgstr "自訂色彩(&C)：" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|純色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -755,18 +743,16 @@ msgstr "亮度(&L)：" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" -msgstr "新增自定色彩(&A)" +msgstr "新增自訂色彩(&A)" #: dlls/comdlg32/comdlg32.rc:311 msgid "&Define Custom Colors >>" -msgstr "定義自定色彩(&D) >>" +msgstr "定義自訂色彩(&D) >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "否(&N)" +msgstr "&o" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -822,7 +808,7 @@ msgstr "取代全部(&A)" #: dlls/shell32/shell32.rc:108 programs/clock/clock.rc:31 #: programs/conhost/conhost.rc:34 msgid "&Properties" -msgstr "屬性(&P)" +msgstr "內容(&P)" #: dlls/comdlg32/comdlg32.rc:364 msgid "Print to fi&le" @@ -961,7 +947,7 @@ msgstr "找不到檔案" #: dlls/comdlg32/comdlg32.rc:34 msgid "Please verify that the correct file name was given" -msgstr "請檢查是否給予正確的檔案名稱。" +msgstr "請檢查是否給予正確的檔案名稱" #: dlls/comdlg32/comdlg32.rc:35 msgid "" @@ -977,23 +963,23 @@ msgid "" "Do you want to replace it?" msgstr "" "檔案已經存在。\n" -"要取代嗎？" +"您要取代它嗎？" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" -msgstr "檔案名稱中存在無效的字元" +msgstr "路徑中存在無效的字元" #: dlls/comdlg32/comdlg32.rc:38 msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"檔案名中不能包含任何一下字元:\n" +"檔案名稱中不能包含以下任何一個字元：\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 msgid "Path does not exist" -msgstr "資料夾不存在" +msgstr "路徑不存在" #: dlls/comdlg32/comdlg32.rc:40 msgid "File does not exist" @@ -1001,7 +987,7 @@ msgstr "檔案不存在" #: dlls/comdlg32/comdlg32.rc:41 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "已選項目包含非資料夾對象" #: dlls/comdlg32/comdlg32.rc:46 msgid "Up One Level" @@ -1118,15 +1104,15 @@ msgstr "" #: dlls/comdlg32/comdlg32.rc:61 msgid "The 'from' entry cannot exceed the 'to' entry." -msgstr "起始值不能大於終點值。" +msgstr "「從」項的值不能大於「到」項的值。" #: dlls/comdlg32/comdlg32.rc:63 msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"邊緣空白重疊或落於邊界外，\n" -"請重新輸入邊緣空白。" +"頁面邊距重疊或落於邊界外，\n" +"請重新輸入頁面邊距。" #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -1137,8 +1123,8 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"您的印表機不支持這麼大的份數。\n" -"請輸入一個 1 和 %d 之間的數。" +"您的印表機不支援列印這麼大的份數。\n" +"請輸入一個 1 和 %d 之間的數值。" #: dlls/comdlg32/comdlg32.rc:68 msgid "A printer error occurred." @@ -1169,12 +1155,12 @@ msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"在使用與印表機有關功能(版面設定, 列印檔案)之前, 您必須先安裝印表機。請安裝一" -"個印表機後再試。" +"您必須先安裝印表機才能使用與印表機有關的功能（如：版面設定、列印檔案）。" +"請安裝印表機後再試一次。" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "選取介於 %1!d! 和 %2!d! 點的字型尺寸。" +msgstr "選取介於 %1!d! 和 %2!d! 點的字型大小。" #: dlls/comdlg32/comdlg32.rc:143 dlls/ieframe/ieframe.rc:35 msgid "&Save" @@ -1193,14 +1179,12 @@ msgid "Open File" msgstr "開啟檔案" #: dlls/comdlg32/comdlg32.rc:148 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "新資料夾" +msgstr "選擇資料夾" #: dlls/comdlg32/comdlg32.rc:149 msgid "Font size has to be a number." -msgstr "" +msgstr "字型大小必須是數字。" #: dlls/comdlg32/comdlg32.rc:84 programs/oleview/oleview.rc:98 msgid "Ready" @@ -1260,7 +1244,7 @@ msgstr "不可用；" #: dlls/comdlg32/comdlg32.rc:98 msgid "Waiting; " -msgstr "等待；" +msgstr "正在等待；" #: dlls/comdlg32/comdlg32.rc:99 msgid "Processing; " @@ -1288,7 +1272,7 @@ msgstr "頁處理記憶體超支；" #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " -msgstr "已被使用者中斷；" +msgstr "被使用者中斷；" #: dlls/comdlg32/comdlg32.rc:106 msgid "Out of memory; " @@ -1296,7 +1280,7 @@ msgstr "記憶體不足；" #: dlls/comdlg32/comdlg32.rc:107 msgid "The printer door is open; " -msgstr "印表機蓋是打開的；" +msgstr "印表機蓋已打開；" #: dlls/comdlg32/comdlg32.rc:108 msgid "Print server unknown; " @@ -1316,11 +1300,11 @@ msgstr "有 %d 個文件正在等待列印" #: dlls/comdlg32/comdlg32.rc:80 msgid "Margins [inches]" -msgstr "邊緣空白 [英寸]" +msgstr "頁面邊距 [英寸]" #: dlls/comdlg32/comdlg32.rc:81 msgid "Margins [mm]" -msgstr "邊緣空白 [毫米]" +msgstr "頁面邊距 [毫米]" #: dlls/comdlg32/comdlg32.rc:82 dlls/sane.ds/sane.rc:33 msgctxt "unit: millimeters" @@ -1369,8 +1353,7 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"請在輸入密碼前按下 Caps Lock 鍵，解除\n" -"大寫鎖定。" +"您可以按下 Caps Lock 鍵以解除大寫鎖定，然後再輸入密碼。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1378,7 +1361,7 @@ msgstr "大寫鎖定已開啟" #: dlls/crypt32/crypt32.rc:30 msgid "Authority Key Identifier" -msgstr "授權金鑰識別碼" +msgstr "授權金鑰識別號" #: dlls/crypt32/crypt32.rc:31 msgid "Key Attributes" @@ -1410,7 +1393,7 @@ msgstr "憑證策略" #: dlls/crypt32/crypt32.rc:38 msgid "Subject Key Identifier" -msgstr "主體金鑰識別碼" +msgstr "主體金鑰識別號" #: dlls/crypt32/crypt32.rc:39 msgid "CRL Reason Code" @@ -1446,7 +1429,7 @@ msgstr "電子郵件地址" #: dlls/crypt32/crypt32.rc:47 msgid "Unstructured Name" -msgstr "無結構的名稱" +msgstr "非結構化名稱" #: dlls/crypt32/crypt32.rc:48 msgid "Content Type" @@ -1462,15 +1445,15 @@ msgstr "簽署時間" #: dlls/crypt32/crypt32.rc:51 msgid "Counter Sign" -msgstr "計數器符號" +msgstr "副署" #: dlls/crypt32/crypt32.rc:52 msgid "Challenge Password" -msgstr "挑戰密碼" +msgstr "要求密碼" #: dlls/crypt32/crypt32.rc:53 msgid "Unstructured Address" -msgstr "無結構的位址" +msgstr "非結構化位址" #: dlls/crypt32/crypt32.rc:54 msgid "S/MIME Capabilities" @@ -1478,7 +1461,7 @@ msgstr "S/MIME 能力" #: dlls/crypt32/crypt32.rc:55 msgid "Prefer Signed Data" -msgstr "偏好已簽署資料" +msgstr "已簽署資料優先" #: dlls/crypt32/crypt32.rc:56 dlls/cryptdlg/cryptdlg.rc:34 msgctxt "Certification Practice Statement" @@ -1527,7 +1510,7 @@ msgstr "Netscape CA 廢止網址" #: dlls/crypt32/crypt32.rc:67 msgid "Netscape Cert Renewal URL" -msgstr "Netscape 憑證重申網址" +msgstr "Netscape 憑證續約網址" #: dlls/crypt32/crypt32.rc:68 msgid "Netscape CA Policy URL" @@ -1615,7 +1598,7 @@ msgstr "Windows 產品更新" #: dlls/crypt32/crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "註冊名稱值對" +msgstr "註冊名稱值配對" #: dlls/crypt32/crypt32.rc:90 msgid "OS Version" @@ -1627,7 +1610,7 @@ msgstr "註冊 CSP" #: dlls/crypt32/crypt32.rc:92 msgid "CRL Number" -msgstr "CRL 數字" +msgstr "CRL 號碼" #: dlls/crypt32/crypt32.rc:93 msgid "Delta CRL Indicator" @@ -1635,7 +1618,7 @@ msgstr "Delta CRL 指示器" #: dlls/crypt32/crypt32.rc:94 msgid "Issuing Distribution Point" -msgstr "議題發布點" +msgstr "發證發布點" #: dlls/crypt32/crypt32.rc:95 msgid "Freshest CRL" @@ -1751,7 +1734,7 @@ msgstr "虛設簽署人" #: dlls/crypt32/crypt32.rc:123 msgid "Encrypted Private Key" -msgstr "加密的私鑰" +msgstr "已加密的私鑰" #: dlls/crypt32/crypt32.rc:124 msgid "Published CRL Locations" @@ -1767,11 +1750,11 @@ msgstr "異動作業識別號" #: dlls/crypt32/crypt32.rc:127 msgid "Sender Nonce" -msgstr "當前傳送者" +msgstr "發送者的一次性隨機數" #: dlls/crypt32/crypt32.rc:128 msgid "Recipient Nonce" -msgstr "當前收件者" +msgstr "收件者的一次性隨機數" #: dlls/crypt32/crypt32.rc:129 msgid "Reg Info" @@ -1807,7 +1790,7 @@ msgstr "私鑰使用週期" #: dlls/crypt32/crypt32.rc:137 msgid "Client Information" -msgstr "客戶端資訊" +msgstr "用戶端資訊" #: dlls/crypt32/crypt32.rc:138 msgid "Server Authentication" @@ -1815,7 +1798,7 @@ msgstr "伺服器認證" #: dlls/crypt32/crypt32.rc:139 msgid "Client Authentication" -msgstr "客戶端認證" +msgstr "用戶端認證" #: dlls/crypt32/crypt32.rc:140 msgid "Code Signing" @@ -1843,7 +1826,7 @@ msgstr "IP 安全終端系統" #: dlls/crypt32/crypt32.rc:146 msgid "IP security tunnel termination" -msgstr "IP 安全遂道終端" +msgstr "IP 安全隧道終端" #: dlls/crypt32/crypt32.rc:147 msgid "IP security user" @@ -1923,7 +1906,7 @@ msgstr "憑證請求代理程式" #: dlls/crypt32/crypt32.rc:166 dlls/cryptui/cryptui.rc:141 msgid "Lifetime Signing" -msgstr "生命期簽署" +msgstr "永久簽署" #: dlls/crypt32/crypt32.rc:167 msgid "All issuance policies" @@ -2050,7 +2033,7 @@ msgstr "不明存取方法" #: dlls/crypt32/crypt32.rc:205 msgid "Alternative Name" -msgstr "另類名稱" +msgstr "其他名稱" #: dlls/crypt32/crypt32.rc:206 msgid "CRL Distribution Point" @@ -2094,11 +2077,11 @@ msgstr "已取代" #: dlls/crypt32/crypt32.rc:216 msgid "Operation Ceased" -msgstr "作業終了" +msgstr "作業已停止" #: dlls/crypt32/crypt32.rc:217 msgid "Certificate Hold" -msgstr "憑證暫停" +msgstr "持有的憑證" #: dlls/crypt32/crypt32.rc:218 msgid "Financial Information=" @@ -2110,11 +2093,11 @@ msgstr "可用" #: dlls/crypt32/crypt32.rc:220 msgid "Not Available" -msgstr "無法使用" +msgstr "不可用" #: dlls/crypt32/crypt32.rc:221 msgid "Meets Criteria=" -msgstr "會面準則=" +msgstr "符合準則=" #: dlls/crypt32/crypt32.rc:222 dlls/cryptui/cryptui.rc:166 #: dlls/oleaut32/oleaut32.rc:32 dlls/wininet/wininet.rc:94 @@ -2138,7 +2121,7 @@ msgstr "不可否認性" #: dlls/crypt32/crypt32.rc:226 msgid "Key Encipherment" -msgstr "金鑰編密" +msgstr "金鑰加密" #: dlls/crypt32/crypt32.rc:227 msgid "Data Encipherment" @@ -2162,15 +2145,15 @@ msgstr "CRL 簽署" #: dlls/crypt32/crypt32.rc:232 msgid "Encipher Only" -msgstr "只譯為密文" +msgstr "僅加密者" #: dlls/crypt32/crypt32.rc:233 msgid "Decipher Only" -msgstr "只解開密文" +msgstr "僅解密者" #: dlls/crypt32/crypt32.rc:234 msgid "SSL Client Authentication" -msgstr "SSL 客戶端認證" +msgstr "SSL 用戶端認證" #: dlls/crypt32/crypt32.rc:235 msgid "SSL Server Authentication" @@ -2202,7 +2185,7 @@ msgstr "憑證策略" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略識別碼：" +msgstr "策略識別號：" #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" @@ -2252,7 +2235,7 @@ msgstr "顯示(&S)：" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." -msgstr "編輯屬性(&E)..." +msgstr "編輯內容(&E)..." #: dlls/cryptui/cryptui.rc:211 msgid "&Copy to File..." @@ -2305,20 +2288,20 @@ msgstr "停用這個憑證的全部目的(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "只有啟用這個憑證的下列目的(&O)：" +msgstr "只啟用這個憑證的下列目的(&O)：" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." -msgstr "加入目的(&P)..." +msgstr "新增目的(&P)..." #: dlls/cryptui/cryptui.rc:262 msgid "Add Purpose" -msgstr "加入目的" +msgstr "新增目的" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "加入您所希望的憑證目的物件識別符號 (OID)：" +msgstr "新增您希望加入的憑證目的的物件識別號 (OID)：" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" @@ -2330,7 +2313,7 @@ msgstr "選取您要使用的憑證儲存處：" #: dlls/cryptui/cryptui.rc:279 msgid "&Show physical stores" -msgstr "顯示實體儲存(&S)" +msgstr "顯示實體儲存裝置(&S)" #: dlls/cryptui/cryptui.rc:285 dlls/cryptui/cryptui.rc:296 #: dlls/cryptui/cryptui.rc:313 dlls/cryptui/cryptui.rc:327 @@ -2356,10 +2339,10 @@ msgid "" msgstr "" "這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信賴清單到憑證儲存處。\n" "\n" -"憑證可用於識別您或您正在通訊的電腦。它也可以用於認證以及對訊息簽署。憑證儲" -"存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" "\n" -"要繼續，請按下一步。" +"請按下一步繼續。" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" @@ -2402,7 +2385,7 @@ msgstr "自動選取憑證儲存處(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "將所有憑證放置於下列儲存(&P)：" +msgstr "將所有憑證放置於下列儲存處(&P)：" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2410,7 +2393,7 @@ msgstr "正在完成憑證匯入精靈" #: dlls/cryptui/cryptui.rc:332 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "您已經成功地完成憑證匯入精靈。" +msgstr "您已經成功完成憑證匯入精靈。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" @@ -2462,7 +2445,7 @@ msgstr "憑證目的" #: dlls/cryptui/cryptui.rc:364 msgid "" "Select one or more purposes to be listed when Advanced Purposes is selected." -msgstr "當進階目的已選時選取一或多個要列出的目的。" +msgstr "選取一個或多個在進階目的已選取時要列出的目的。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" @@ -2493,10 +2476,10 @@ msgid "" msgstr "" "這個精靈協助您從憑證儲存處匯出憑證、憑證撤銷清單以及憑證信賴清單到檔案。\n" "\n" -"憑證可用於識別您或您用以通訊的電腦。它也可以被用於認證以及簽署訊息。憑證儲存" -"處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" "\n" -"要繼續請按下一步。" +"請按下一步繼續。" #: dlls/cryptui/cryptui.rc:389 msgid "" @@ -2510,11 +2493,11 @@ msgstr "您要匯出私鑰嗎？" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" -msgstr "是(&Y)，匯出私鑰。" +msgstr "是，匯出私鑰(&Y)" #: dlls/cryptui/cryptui.rc:393 msgid "N&o, do not export the private key" -msgstr "否(&N)，不要匯出私鑰。" +msgstr "否，不要匯出私鑰(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" @@ -2562,19 +2545,15 @@ msgstr "正在完成憑證匯出精靈" #: dlls/cryptui/cryptui.rc:446 msgid "You have successfully completed the Certificate Export Wizard." -msgstr "您已經成功地完成憑證匯出精靈" +msgstr "您已經成功完成憑證匯出精靈。" #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -2594,7 +2573,7 @@ msgstr "這個憑證的簽名無效。憑證也許已被改變或已損壞。" msgid "" "This root certificate is not trusted. To trust it, add it to your system's " "trusted root certificate store." -msgstr "這個根憑證未被信賴。要信賴它，就將它加入您系統的信賴根憑證儲存處。" +msgstr "這個根憑證未被信賴。要信賴它，就要將它加入到系統的信賴根憑證儲存處。" #: dlls/cryptui/cryptui.rc:34 msgid "This certificate could not be validated to a trusted root certificate." @@ -2614,11 +2593,11 @@ msgstr "這個憑證是適用於下列目的：" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "發證對象：" +msgstr "發證予：" #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "發證來源：" +msgstr "發證者：" #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2638,7 +2617,7 @@ msgstr "這個憑證已過期或尚未生效。" #: dlls/cryptui/cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." -msgstr "這個憑證的有效期限超過它的發證者。" +msgstr "這個憑證的有效期限超過發證者的有效期限。" #: dlls/cryptui/cryptui.rc:45 msgid "This certificate was revoked by its issuer." @@ -2663,19 +2642,19 @@ msgstr "<所有>" #: dlls/cryptui/cryptui.rc:50 msgid "Version 1 Fields Only" -msgstr "只有版本 1 欄位" +msgstr "僅版本 1 欄位" #: dlls/cryptui/cryptui.rc:51 msgid "Extensions Only" -msgstr "只有進階屬性" +msgstr "僅進階屬性" #: dlls/cryptui/cryptui.rc:52 msgid "Critical Extensions Only" -msgstr "只有關鍵進階屬性" +msgstr "僅重要進階屬性" #: dlls/cryptui/cryptui.rc:53 msgid "Properties Only" -msgstr "只有屬性" +msgstr "僅屬性" #: dlls/cryptui/cryptui.rc:55 msgid "Serial number" @@ -2703,7 +2682,7 @@ msgstr "公鑰" #: dlls/cryptui/cryptui.rc:61 msgid "%1 (%2!d! bits)" -msgstr "%1 (%2!d! 位元)" +msgstr "%1（%2!d! 位元）" #: dlls/cryptui/cryptui.rc:62 msgid "SHA1 hash" @@ -2711,7 +2690,7 @@ msgstr "SHA1 雜湊" #: dlls/cryptui/cryptui.rc:63 msgid "Enhanced key usage (property)" -msgstr "進階金鑰用法 (內容)" +msgstr "進階金鑰用法（內容）" #: dlls/cryptui/cryptui.rc:64 msgid "Friendly name" @@ -2724,11 +2703,11 @@ msgstr "描述" #: dlls/cryptui/cryptui.rc:66 msgid "Certificate Properties" -msgstr "憑證屬性" +msgstr "憑證內容" #: dlls/cryptui/cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "請以 1.2.3.4 的形式輸入 OID" +msgstr "請以 1.2.3.4 的格式輸入 OID" #: dlls/cryptui/cryptui.rc:68 msgid "The OID you entered already exists." @@ -2742,7 +2721,7 @@ msgstr "請選取憑證儲存處。" msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." -msgstr "檔案含有不匹配給定準則的物件。請選取另一個檔案。" +msgstr "檔案含有不符合給定準則的物件。請選取另一個檔案。" #: dlls/cryptui/cryptui.rc:73 msgid "File to Import" @@ -2804,7 +2783,7 @@ msgstr "請選取儲存處" #: dlls/cryptui/cryptui.rc:89 msgid "Certificate Store Selected" -msgstr "憑證儲存處已選" +msgstr "已選取憑證儲存處" #: dlls/cryptui/cryptui.rc:90 msgid "Automatically determined by the program" @@ -2832,7 +2811,7 @@ msgstr "個人資訊交換" #: dlls/cryptui/cryptui.rc:99 msgid "The import was successful." -msgstr "已成功匯入。" +msgstr "匯入成功。" #: dlls/cryptui/cryptui.rc:100 msgid "The import failed." @@ -2848,11 +2827,11 @@ msgstr "<進階目的>" #: dlls/cryptui/cryptui.rc:104 msgid "Issued To" -msgstr "發證對象" +msgstr "發證予" #: dlls/cryptui/cryptui.rc:105 msgid "Issued By" -msgstr "發證來源" +msgstr "發證者" #: dlls/cryptui/cryptui.rc:106 dlls/wininet/wininet.rc:36 msgid "Expiration Date" @@ -2894,11 +2873,6 @@ msgstr "" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -2913,7 +2887,7 @@ msgid "" "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個憑證授權者所發的憑證將不再被信賴。\n" +"將不再信賴由這個憑證授權者所發的憑證。\n" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:115 @@ -2922,7 +2896,7 @@ msgid "" "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些憑證授權者所發的憑證將不再被信賴。\n" +"將不再信賴由這些憑證授權者所發的憑證。\n" "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:116 @@ -2931,7 +2905,7 @@ msgid "" "certification authorities it issued, will no longer be trusted.\n" "Are you sure you want to remove this trusted root certificate?" msgstr "" -"由這個憑證授權者所發的憑證，或是任何由它發證的憑證授權者，將不再被信賴。\n" +"將不再信賴由這個憑證授權者所發的憑證或憑證授權者。\n" "確定要移除這個信賴的根憑證？" #: dlls/cryptui/cryptui.rc:117 @@ -2940,7 +2914,7 @@ msgid "" "certification authorities they issued, will no longer be trusted.\n" "Are you sure you want to remove these trusted root certificates?" msgstr "" -"由這些憑證授權者所發的憑證，或是任何由它們發證的憑證授權者，將不再被信賴。\n" +"將不再信賴由這些憑證授權者所發的憑證或憑證授權者。\n" "確定要移除這些信賴的根憑證？" #: dlls/cryptui/cryptui.rc:118 @@ -2948,7 +2922,7 @@ msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個發行者簽署的軟體將不再被信賴。\n" +"將不再信賴由這個發行者簽署的軟體。\n" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:119 @@ -2956,7 +2930,7 @@ msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些發行者簽署的軟體將不再被信賴。\n" +"將不再信賴由這些發行者簽署的軟體。\n" "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:120 @@ -2969,7 +2943,7 @@ msgstr "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" -msgstr "確保遠端電腦的身分" +msgstr "確認遠端電腦的身分" #: dlls/cryptui/cryptui.rc:125 msgid "Proves your identity to a remote computer" @@ -2980,8 +2954,8 @@ msgid "" "Ensures software came from software publisher\n" "Protects software from alteration after publication" msgstr "" -"請確認軟體是來自軟體發行者\n" -"保護軟體以避免發行之後的變更" +"確認軟體是來自軟體發行者\n" +"確保軟體在發行之後未被修改" #: dlls/cryptui/cryptui.rc:127 msgid "Protects e-mail messages" @@ -3001,11 +2975,11 @@ msgstr "允許您數位簽署憑證信賴清單" #: dlls/cryptui/cryptui.rc:131 msgid "Allows data on disk to be encrypted" -msgstr "允許磁碟上的資料被加密" +msgstr "允許加密磁碟上的資料" #: dlls/cryptui/cryptui.rc:147 msgid "Private Key Archival" -msgstr "私鑰檔案的" +msgstr "私鑰檔案封存" #: dlls/cryptui/cryptui.rc:151 msgid "Export Format" @@ -3017,7 +2991,7 @@ msgstr "選擇將用來儲存內容的格式。" #: dlls/cryptui/cryptui.rc:153 msgid "Export Filename" -msgstr "匯出檔名" +msgstr "匯出檔案名稱" #: dlls/cryptui/cryptui.rc:154 msgid "Specify the name of the file in which the content will be saved." @@ -3025,7 +2999,7 @@ msgstr "指定將會儲存內容的檔案名稱。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案已經存在。您要取代它嗎？" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3057,7 +3031,7 @@ msgstr "匯出密鑰" #: dlls/cryptui/cryptui.rc:168 msgid "The export was successful." -msgstr "已成功匯出。" +msgstr "匯出成功。" #: dlls/cryptui/cryptui.rc:169 msgid "The export failed." @@ -3079,11 +3053,11 @@ msgstr "輸入密碼" #: dlls/cryptui/cryptui.rc:173 msgid "You may password-protect a private key." -msgstr "您可以以密碼保護私鑰。" +msgstr "您可以使用密碼來保護私鑰。" #: dlls/cryptui/cryptui.rc:174 msgid "The passwords do not match." -msgstr "密碼不匹配。" +msgstr "密碼不相符。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." @@ -3094,20 +3068,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "註記：用於這個憑證的私鑰不可匯出。" #: dlls/cryptui/cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "預定目的(&N)：" +msgstr "預定目的" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:150 msgid "Location" msgstr "位置" #: dlls/cryptui/cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:181 programs/winefile/winefile.rc:101 #: programs/winhlp32/winhlp32.rc:110 programs/winhlp32/winhlp32.rc:85 @@ -3120,11 +3090,11 @@ msgstr "裝置設定" #: dlls/dinput/dinput.rc:39 msgid "Reset" -msgstr "重置" +msgstr "重設" #: dlls/dinput/dinput.rc:42 msgid "Player" -msgstr "玩家" +msgstr "播放器" #: dlls/dinput/dinput.rc:43 programs/winecfg/winecfg.rc:88 msgid "Device" @@ -3168,55 +3138,55 @@ msgstr "中歐語言" #: dlls/gdi32/gdi32.rc:30 msgid "Cyrillic" -msgstr "斯拉夫語" +msgstr "斯拉夫文" #: dlls/gdi32/gdi32.rc:31 msgid "Greek" -msgstr "希臘語" +msgstr "希臘文" #: dlls/gdi32/gdi32.rc:32 msgid "Turkish" -msgstr "土耳其語" +msgstr "土耳其文" #: dlls/gdi32/gdi32.rc:33 msgid "Hebrew" -msgstr "希伯來語" +msgstr "希伯來文" #: dlls/gdi32/gdi32.rc:34 msgid "Arabic" -msgstr "阿拉伯語" +msgstr "阿拉伯文" #: dlls/gdi32/gdi32.rc:35 msgid "Baltic" -msgstr "波羅的海語" +msgstr "波羅的海語言" #: dlls/gdi32/gdi32.rc:36 msgid "Vietnamese" -msgstr "越南語" +msgstr "越南文" #: dlls/gdi32/gdi32.rc:37 msgid "Thai" -msgstr "泰語" +msgstr "泰文" #: dlls/gdi32/gdi32.rc:38 msgid "Japanese" -msgstr "日語" +msgstr "日文" #: dlls/gdi32/gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "簡化字漢語" +msgstr "中文（GB2312）" #: dlls/gdi32/gdi32.rc:40 msgid "Hangul" -msgstr "韓語諺文" +msgstr "韓文" #: dlls/gdi32/gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "傳統字漢語" +msgstr "中文（BIG5）" #: dlls/gdi32/gdi32.rc:42 msgid "Hangul(Johab)" -msgstr "韓語諺文(組合型)" +msgstr "韓文（Johab）" #: dlls/gdi32/gdi32.rc:43 msgid "Symbol" @@ -3237,7 +3207,7 @@ msgstr "照相機中的檔案" #: dlls/gphoto2.ds/gphoto2.rc:34 msgid "Import Selected" -msgstr "匯入選擇的檔案" +msgstr "匯入已選取檔案" #: dlls/gphoto2.ds/gphoto2.rc:35 msgid "Preview" @@ -3265,7 +3235,7 @@ msgstr "正在傳輸... 請稍候" #: dlls/gphoto2.ds/gphoto2.rc:51 msgid "Connecting to camera" -msgstr "連接照相機" +msgstr "正在連接照相機" #: dlls/gphoto2.ds/gphoto2.rc:55 msgid "Connecting to camera... Please Wait" @@ -3278,11 +3248,11 @@ msgstr "同步(&Y)" #: dlls/hhctrl.ocx/hhctrl.rc:60 dlls/hhctrl.ocx/hhctrl.rc:73 #: dlls/shdoclc/shdoclc.rc:41 programs/winhlp32/winhlp32.rc:89 msgid "&Back" -msgstr "返回(&B)" +msgstr "上一頁(&B)" #: dlls/hhctrl.ocx/hhctrl.rc:61 dlls/hhctrl.ocx/hhctrl.rc:74 msgid "&Forward" -msgstr "向前" +msgstr "下一頁(&F)" #: dlls/hhctrl.ocx/hhctrl.rc:62 msgctxt "table of contents" @@ -3314,10 +3284,8 @@ msgid "&View Source" msgstr "檢視原始碼(&V)" #: dlls/hhctrl.ocx/hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "屬性" +msgstr "內容(&T)" #: dlls/hhctrl.ocx/hhctrl.rc:87 dlls/shdoclc/shdoclc.rc:79 #: dlls/shdoclc/shdoclc.rc:93 dlls/shdoclc/shdoclc.rc:117 @@ -3388,7 +3356,7 @@ msgstr "重新整理" #: dlls/hhctrl.ocx/hhctrl.rc:46 dlls/ieframe/ieframe.rc:66 msgid "Back" -msgstr "返回" +msgstr "上一頁" #: dlls/hhctrl.ocx/hhctrl.rc:47 msgctxt "table of contents" @@ -3406,7 +3374,7 @@ msgstr "選項" #: dlls/hhctrl.ocx/hhctrl.rc:51 dlls/ieframe/ieframe.rc:67 msgid "Forward" -msgstr "向前" +msgstr "下一頁" #: dlls/iccvid/iccvid.rc:28 dlls/iccvid/iccvid.rc:29 msgid "Cinepak Video codec" @@ -3438,7 +3406,7 @@ msgstr "開啟(&O)..." #: dlls/ieframe/ieframe.rc:36 programs/notepad/notepad.rc:33 #: programs/wordpad/wordpad.rc:34 msgid "Save &as..." -msgstr "另存為(&A)..." +msgstr "另存新檔(&A)..." #: dlls/ieframe/ieframe.rc:38 msgid "Print &format..." @@ -3478,7 +3446,7 @@ msgstr "關於 Internet Explorer(&A)" #: dlls/ieframe/ieframe.rc:90 msgid "Open URL" -msgstr "開啟連結(&O)" +msgstr "開啟連結" #: dlls/ieframe/ieframe.rc:93 msgid "Specify the URL you wish to open in Internet Explorer" @@ -3539,11 +3507,11 @@ msgstr "空白頁面(&B)" #: dlls/inetcpl.cpl/inetcpl.rc:56 msgid "Browsing history" -msgstr "瀏覽歷程" +msgstr "瀏覽歷史" #: dlls/inetcpl.cpl/inetcpl.rc:57 msgid "You can delete cached pages, cookies and other data." -msgstr "您可以刪除網頁快取、訊餅和其他資料。" +msgstr "您可以刪除網頁快取、Cookie 和其他資料。" #: dlls/inetcpl.cpl/inetcpl.rc:59 msgid "Delete &files..." @@ -3555,7 +3523,7 @@ msgstr "設定(&S)..." #: dlls/inetcpl.cpl/inetcpl.rc:68 msgid "Delete browsing history" -msgstr "刪除瀏覽歷程" +msgstr "刪除瀏覽歷史" #: dlls/inetcpl.cpl/inetcpl.rc:71 msgid "" @@ -3571,7 +3539,7 @@ msgid "" "Files saved on your computer by websites, which store things like user " "preferences and login information." msgstr "" -"訊餅\n" +"Cookies\n" "由網站儲存於您電腦的檔案，其存有諸如使用者偏好設定和登入資訊。" #: dlls/inetcpl.cpl/inetcpl.rc:75 @@ -3579,7 +3547,7 @@ msgid "" "History\n" "List of websites you have accessed." msgstr "" -"歷程\n" +"歷史\n" "您曾存取過的網站清單。" #: dlls/inetcpl.cpl/inetcpl.rc:77 @@ -3617,16 +3585,12 @@ msgid "Publishers..." msgstr "發行者..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "區域網路連線" +msgstr "連線" #: dlls/inetcpl.cpl/inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 設定" +msgstr "自動設定" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" @@ -3637,26 +3601,20 @@ msgid "Use Proxy Auto-Config (PAC) script" msgstr "" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "位址" +msgstr "位址：" #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "本機伺服器(&L)" +msgstr "代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "使用代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "無連接埠" +msgstr "連接埠：" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3668,7 +3626,7 @@ msgstr "設定 Wine 網際網路瀏覽器和相關的設定。" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "區域的安全設定：" +msgstr "此區域的安全設定：" #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3680,7 +3638,7 @@ msgstr "非常低" #: dlls/inetcpl.cpl/inetcpl.rc:36 dlls/wininet/wininet.rc:42 msgid "Low" -msgstr "慢" +msgstr "低" #: dlls/inetcpl.cpl/inetcpl.rc:37 msgid "Medium" @@ -3688,7 +3646,7 @@ msgstr "中" #: dlls/inetcpl.cpl/inetcpl.rc:38 msgid "Increased" -msgstr "已增加" +msgstr "稍高" #: dlls/inetcpl.cpl/inetcpl.rc:39 dlls/wininet/wininet.rc:41 msgid "High" @@ -3703,30 +3661,24 @@ msgid "&Disable" msgstr "停用(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "重置" +msgstr "重設(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "啟用(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "編輯覆載設定" +msgstr "覆寫(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" -msgstr "已連線" +msgstr "已連接" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "語音輸入裝置：" +msgstr "已連接（Xinput 裝置）" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3736,7 +3688,7 @@ msgstr "已停用" msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." -msgstr "停用或啟用裝置之後，已連線的搖桿將無法更新，直到您重新啟動這個小程式。" +msgstr "停用或啟用裝置之後，已連接的搖桿將無法更新，直到您重新啟動這個程式。" #: dlls/joy.cpl/joy.rc:55 msgid "Test Joystick" @@ -3759,8 +3711,8 @@ msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" -"請按下控制器中的任何按鈕以啟用所選的效果。效果的方向可以利用控制器的軸向來變" -"更。" +"請按下控制器中的任何按鈕以啟用所選的效果。" +"效果的方向可以利用控制器的軸向來變更。" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers" @@ -3768,7 +3720,7 @@ msgstr "遊戲控制器" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "測試和設定遊戲控制器。" #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3783,10 +3735,8 @@ msgid "Subscript out of range" msgstr "註標超出範圍" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "無紙；" +msgstr "堆疊空間不足" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3802,7 +3752,7 @@ msgstr "物件不支援這個屬性或方法" #: dlls/jscript/jscript.rc:35 dlls/vbscript/vbscript.rc:50 msgid "Object doesn't support this action" -msgstr "物件不支援此動作" +msgstr "物件不支援這個動作" #: dlls/jscript/jscript.rc:36 msgid "Argument not optional" @@ -3814,27 +3764,23 @@ msgstr "語法錯誤" #: dlls/jscript/jscript.rc:38 msgid "Expected ';'" -msgstr "預期為 ;" +msgstr "預期為 ';'" #: dlls/jscript/jscript.rc:39 msgid "Expected '('" -msgstr "預期為 (" +msgstr "預期為 '('" #: dlls/jscript/jscript.rc:40 msgid "Expected ')'" -msgstr "預期為 )" +msgstr "預期為 ')'" #: dlls/jscript/jscript.rc:41 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "主體金鑰識別碼" +msgstr "預期為識別號" #: dlls/jscript/jscript.rc:42 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "預期為 ;" +msgstr "預期為 '='" #: dlls/jscript/jscript.rc:43 msgid "Invalid character" @@ -3846,15 +3792,15 @@ msgstr "未終結的字串常數" #: dlls/jscript/jscript.rc:45 msgid "'return' statement outside of function" -msgstr "return 敘述位於函式之外" +msgstr "'return' 敘述位於函式之外" #: dlls/jscript/jscript.rc:46 msgid "Can't have 'break' outside of loop" -msgstr "在迴圈之外不可有 break" +msgstr "在迴圈之外不可有 'break'" #: dlls/jscript/jscript.rc:47 msgid "Can't have 'continue' outside of loop" -msgstr "在迴圈之外不可有 continue" +msgstr "在迴圈之外不可有 'continue'" #: dlls/jscript/jscript.rc:48 msgid "Label redefined" @@ -3865,38 +3811,32 @@ msgid "Label not found" msgstr "找不到標貼" #: dlls/jscript/jscript.rc:50 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "預期為 ;" +msgstr "預期為 '@end'" #: dlls/jscript/jscript.rc:51 msgid "Conditional compilation is turned off" -msgstr "條件編譯已被關閉" +msgstr "條件編譯已關閉" #: dlls/jscript/jscript.rc:52 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "預期為 ;" +msgstr "預期為 '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript 編譯錯誤" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 執行期錯誤" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "未知錯誤" +msgstr "不明執行期錯誤" #: dlls/jscript/jscript.rc:55 msgid "Number expected" -msgstr "預期為編號" +msgstr "預期為數字" #: dlls/jscript/jscript.rc:53 msgid "Function expected" @@ -3904,7 +3844,7 @@ msgstr "預期為函式" #: dlls/jscript/jscript.rc:54 msgid "'[object]' is not a date object" -msgstr "[object] 並非日期物件" +msgstr "'[object]' 並非日期物件" #: dlls/jscript/jscript.rc:56 msgid "Object expected" @@ -3916,11 +3856,11 @@ msgstr "不合法的指派" #: dlls/jscript/jscript.rc:58 msgid "'|' is undefined" -msgstr "| 未定義" +msgstr "'|' 未定義" #: dlls/jscript/jscript.rc:59 msgid "Boolean object expected" -msgstr "預期為布林物件" +msgstr "預期為布林值物件" #: dlls/jscript/jscript.rc:60 msgid "Cannot delete '|'" @@ -3935,16 +3875,12 @@ msgid "JScript object expected" msgstr "預期為 JScript 物件" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "預期為陣列物件" +msgstr "預期為列舉器物件" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "預期為布林物件" +msgstr "預期為正規表示式" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3952,7 +3888,7 @@ msgstr "正規表示式語法發生錯誤" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "發生異常且未被捕捉" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -3982,25 +3918,23 @@ msgstr "預期為陣列物件" msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" -msgstr "" +msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 'true'" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "無法定義屬性 '|'：物件不能擴展" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "無法重新定義不可設定的屬性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "[object] 並非日期物件" +msgstr "'this' 不是 Map 物件" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -4008,7 +3942,7 @@ msgstr "" #: include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine 核心 DLL" #: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32 #: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137 @@ -4081,7 +4015,7 @@ msgstr "無效的儲存裝置。\n" #: dlls/kernel32/winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "無法刪除現行目錄。\n" +msgstr "無法刪除目前的目錄。\n" #: dlls/kernel32/winerror.mc:113 msgid "Not same device.\n" @@ -4093,7 +4027,7 @@ msgstr "沒有檔案了。\n" #: dlls/kernel32/winerror.mc:123 msgid "Write protected.\n" -msgstr "防止寫入的。\n" +msgstr "已設定寫入保護。\n" #: dlls/kernel32/winerror.mc:128 msgid "Bad unit.\n" @@ -4245,7 +4179,7 @@ msgstr "太多網路名稱。\n" #: dlls/kernel32/winerror.mc:313 msgid "Too many network sessions.\n" -msgstr "太多網路執行期間。\n" +msgstr "太多網路工作階段。\n" #: dlls/kernel32/winerror.mc:318 msgid "Sharing paused.\n" @@ -4293,7 +4227,7 @@ msgstr "網路寫入錯誤。\n" #: dlls/kernel32/winerror.mc:373 msgid "No process slots.\n" -msgstr "沒有行程插槽。\n" +msgstr "沒有線程插槽。\n" #: dlls/kernel32/winerror.mc:378 msgid "Too many semaphores.\n" @@ -4301,7 +4235,7 @@ msgstr "太多號誌。\n" #: dlls/kernel32/winerror.mc:383 msgid "Exclusive semaphore already owned.\n" -msgstr "已擁有互斥號誌。\n" +msgstr "已擁有專屬號誌。\n" #: dlls/kernel32/winerror.mc:388 msgid "Semaphore is set.\n" @@ -4317,7 +4251,7 @@ msgstr "於插斷時間無效。\n" #: dlls/kernel32/winerror.mc:403 msgid "Semaphore owner died.\n" -msgstr "號誌擁有者已死。\n" +msgstr "號誌擁有者已終止。\n" #: dlls/kernel32/winerror.mc:408 msgid "Semaphore user limit.\n" @@ -4329,7 +4263,7 @@ msgstr "插入磁碟於儲存裝置 %1。\n" #: dlls/kernel32/winerror.mc:418 msgid "Drive locked.\n" -msgstr "已鎖定儲存裝置。\n" +msgstr "儲存裝置已鎖定。\n" #: dlls/kernel32/winerror.mc:423 msgid "Broken pipe.\n" @@ -4385,7 +4319,7 @@ msgstr "無效的層級。\n" #: dlls/kernel32/winerror.mc:493 msgid "No volume label.\n" -msgstr "沒有卷冊標貼。\n" +msgstr "沒有磁碟區代號。\n" #: dlls/kernel32/winerror.mc:498 msgid "Module not found.\n" @@ -4433,19 +4367,19 @@ msgstr "儲存裝置未被 SUBST。\n" #: dlls/kernel32/winerror.mc:558 msgid "Attempt to JOIN onto a JOINed drive.\n" -msgstr "試圖 JOIN 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:563 msgid "Attempt to SUBST onto a SUBSTed drive.\n" -msgstr "試圖 SUBST 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:568 msgid "Attempt to JOIN to a SUBSTed drive.\n" -msgstr "試圖 JOIN 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:573 msgid "Attempt to SUBST to a JOINed drive.\n" -msgstr "試圖 SUBST 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:578 msgid "Drive is busy.\n" @@ -4489,7 +4423,7 @@ msgstr "用於 DosMuxSemWait 的事件計數不正確。\n" #: dlls/kernel32/winerror.mc:628 msgid "Too many waiters for DosMuxSemWait.\n" -msgstr "太多 DosMuxSemWait 的等待者。\n" +msgstr "太多 DosMuxSemWait 的等待項。\n" #: dlls/kernel32/winerror.mc:633 msgid "DosSemMuxWait list invalid.\n" @@ -4497,7 +4431,7 @@ msgstr "DosSemMuxWait 清單無效。\n" #: dlls/kernel32/winerror.mc:638 msgid "Volume label too long.\n" -msgstr "卷冊標貼太長。\n" +msgstr "磁碟區代號太長。\n" #: dlls/kernel32/winerror.mc:643 msgid "Too many TCBs.\n" @@ -4673,7 +4607,7 @@ msgstr "不允許巢狀 LoadModule 呼叫。\n" #: dlls/kernel32/winerror.mc:858 msgid "Machine type mismatch.\n" -msgstr "機器型態不匹配。\n" +msgstr "機器類型不相符。\n" #: dlls/kernel32/winerror.mc:863 msgid "Bad pipe.\n" @@ -4681,11 +4615,11 @@ msgstr "不當的管線。\n" #: dlls/kernel32/winerror.mc:868 msgid "Pipe busy.\n" -msgstr "管線忙碌。\n" +msgstr "管線忙碌中。\n" #: dlls/kernel32/winerror.mc:873 msgid "Pipe closed.\n" -msgstr "管線關閉。\n" +msgstr "管線已關閉。\n" #: dlls/kernel32/winerror.mc:878 msgid "Pipe not connected.\n" @@ -4693,11 +4627,11 @@ msgstr "管線未連接。\n" #: dlls/kernel32/winerror.mc:883 msgid "More data available.\n" -msgstr "更多資料可用。\n" +msgstr "有更多可用資料。\n" #: dlls/kernel32/winerror.mc:888 msgid "Session canceled.\n" -msgstr "已取消工作階段。\n" +msgstr "工作階段已取消。\n" #: dlls/kernel32/winerror.mc:893 msgid "Invalid extended attribute name.\n" @@ -4753,7 +4687,7 @@ msgstr "讀取/寫入行程記憶體已部分完成。\n" #: dlls/kernel32/winerror.mc:958 msgid "The oplock wasn't granted.\n" -msgstr "未被授與 oplock。\n" +msgstr "未授權 oplock。\n" #: dlls/kernel32/winerror.mc:963 msgid "Invalid oplock message received.\n" @@ -4821,7 +4755,7 @@ msgstr "無效的旗標。\n" #: dlls/kernel32/winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "無法辨識的卷冊。\n" +msgstr "無法辨識的磁碟區。\n" #: dlls/kernel32/winerror.mc:1048 msgid "File invalid.\n" @@ -4833,7 +4767,7 @@ msgstr "無法全螢幕運行。\n" #: dlls/kernel32/winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "不存在的字組。\n" +msgstr "不存在的權杖。\n" #: dlls/kernel32/winerror.mc:1063 msgid "Registry corrupt.\n" @@ -4885,7 +4819,7 @@ msgstr "註冊表索引鍵有子項。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子項必須是易變的。\n" +msgstr "子項必須是可變的。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -4937,7 +4871,7 @@ msgstr "服務無法接受控制訊息。\n" #: dlls/kernel32/winerror.mc:1188 msgid "Service not active.\n" -msgstr "服務現未啟用。\n" +msgstr "服務尚未啟用。\n" #: dlls/kernel32/winerror.mc:1193 msgid "Service controller connect failed.\n" @@ -4985,7 +4919,7 @@ msgstr "服務已存在。\n" #: dlls/kernel32/winerror.mc:1248 msgid "System running last-known-good config.\n" -msgstr "系統執行最後已知正常的組配。\n" +msgstr "系統執行最近已知正常的組配。\n" #: dlls/kernel32/winerror.mc:1253 msgid "Service dependency deleted.\n" @@ -4993,7 +4927,7 @@ msgstr "服務相依性已刪除。\n" #: dlls/kernel32/winerror.mc:1258 msgid "Boot already accepted as last-good config.\n" -msgstr "開機已被接受為最後正常的組配。\n" +msgstr "開機已接受為最近正常的組配。\n" #: dlls/kernel32/winerror.mc:1263 msgid "Service not started since last boot.\n" @@ -5017,7 +4951,7 @@ msgstr "無法偵測到行程中止。\n" #: dlls/kernel32/winerror.mc:1288 msgid "No recovery program for service.\n" -msgstr "沒有復原程式用於服務。\n" +msgstr "服務沒有復原程式。\n" #: dlls/kernel32/winerror.mc:1293 msgid "Service not implemented by exe.\n" @@ -5080,8 +5014,6 @@ msgid "No Unicode translation.\n" msgstr "沒有萬國碼轉譯。\n" #: dlls/kernel32/winerror.mc:1368 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "動態連結函式庫初始失敗。\n" @@ -5123,7 +5055,7 @@ msgstr "軟碟回報錯誤的磁柱。\n" #: dlls/kernel32/winerror.mc:1418 msgid "Unknown floppy error.\n" -msgstr "未知的軟碟錯誤。\n" +msgstr "不明的軟碟錯誤。\n" #: dlls/kernel32/winerror.mc:1423 msgid "Floppy registers inconsistent.\n" @@ -5167,7 +5099,7 @@ msgstr "設定電源狀態失敗。\n" #: dlls/kernel32/winerror.mc:1473 msgid "Too many links.\n" -msgstr "太多鏈結。\n" +msgstr "太多連結。\n" #: dlls/kernel32/winerror.mc:1478 msgid "Newer Windows version needed.\n" @@ -5231,7 +5163,7 @@ msgstr "裝置需要重新初始化。\n" #: dlls/kernel32/winerror.mc:1553 msgid "The device requires cleaning.\n" -msgstr "裝置需要清潔。\n" +msgstr "裝置需要清理。\n" #: dlls/kernel32/winerror.mc:1558 msgid "The device door is open.\n" @@ -5259,11 +5191,11 @@ msgstr "找不到點。\n" #: dlls/kernel32/winerror.mc:1588 msgid "No running tracking service.\n" -msgstr "沒在執行追蹤服務。\n" +msgstr "沒有執行中的追蹤服務。\n" #: dlls/kernel32/winerror.mc:1593 msgid "No such volume ID.\n" -msgstr "沒有此類卷冊識別號。\n" +msgstr "沒有此類磁碟區識別號。\n" #: dlls/kernel32/winerror.mc:1598 msgid "Unable to remove the file to be replaced.\n" @@ -5283,11 +5215,11 @@ msgstr "正在刪除日誌。\n" #: dlls/kernel32/winerror.mc:1618 msgid "The journal is not active.\n" -msgstr "日誌現未啟用。\n" +msgstr "日誌尚未啟用。\n" #: dlls/kernel32/winerror.mc:1623 msgid "Potential matching file found.\n" -msgstr "找到可能的匹配檔案。\n" +msgstr "找到可能的相符檔案。\n" #: dlls/kernel32/winerror.mc:1628 msgid "The journal entry was deleted.\n" @@ -5299,7 +5231,7 @@ msgstr "無效的裝置名稱。\n" #: dlls/kernel32/winerror.mc:1638 msgid "Connection unavailable.\n" -msgstr "連接不得使用。\n" +msgstr "連接無法使用。\n" #: dlls/kernel32/winerror.mc:1643 msgid "Device already remembered.\n" @@ -5315,11 +5247,11 @@ msgstr "無效的網路提供者名稱。\n" #: dlls/kernel32/winerror.mc:1658 msgid "Cannot open network connection profile.\n" -msgstr "無法開啟網路連線側寫檔。\n" +msgstr "無法開啟網路連線配置檔案。\n" #: dlls/kernel32/winerror.mc:1663 msgid "Corrupt network connection profile.\n" -msgstr "損壞的網路連線側寫檔。\n" +msgstr "損壞的網路連線配置檔案。\n" #: dlls/kernel32/winerror.mc:1668 msgid "Not a container.\n" @@ -5327,7 +5259,7 @@ msgstr "不是一個容器。\n" #: dlls/kernel32/winerror.mc:1673 msgid "Extended error.\n" -msgstr "進階錯誤。\n" +msgstr "延伸錯誤。\n" #: dlls/kernel32/winerror.mc:1678 msgid "Invalid group name.\n" @@ -5367,11 +5299,11 @@ msgstr "無效的訊息目的地。\n" #: dlls/kernel32/winerror.mc:1728 msgid "Session credential conflict.\n" -msgstr "作業階段憑據發生衝突。\n" +msgstr "工作階段憑據發生衝突。\n" #: dlls/kernel32/winerror.mc:1733 msgid "Remote session limit exceeded.\n" -msgstr "已超出遠端作業階段限制。\n" +msgstr "已超出遠端工作階段限制。\n" #: dlls/kernel32/winerror.mc:1738 msgid "Duplicate domain or workgroup name.\n" @@ -5395,7 +5327,7 @@ msgstr "連線被拒。\n" #: dlls/kernel32/winerror.mc:1763 msgid "Connection gracefully closed.\n" -msgstr "已平順關閉連接。\n" +msgstr "已順利關閉連線。\n" #: dlls/kernel32/winerror.mc:1768 msgid "Address already associated with transport endpoint.\n" @@ -5411,23 +5343,23 @@ msgstr "連線無效。\n" #: dlls/kernel32/winerror.mc:1783 msgid "Connection is active.\n" -msgstr "連接現正使用。\n" +msgstr "連線現正使用。\n" #: dlls/kernel32/winerror.mc:1788 msgid "Network unreachable.\n" -msgstr "無法連線網路。\n" +msgstr "網路無法連線。\n" #: dlls/kernel32/winerror.mc:1793 msgid "Host unreachable.\n" -msgstr "無法連線主機。\n" +msgstr "主機無法連線。\n" #: dlls/kernel32/winerror.mc:1798 msgid "Protocol unreachable.\n" -msgstr "無法連線協定。\n" +msgstr "協定無法連線。\n" #: dlls/kernel32/winerror.mc:1803 msgid "Port unreachable.\n" -msgstr "無法連線通訊埠。\n" +msgstr "通訊埠無法連線。\n" #: dlls/kernel32/winerror.mc:1808 msgid "Request aborted.\n" @@ -5435,7 +5367,7 @@ msgstr "已放棄要求。\n" #: dlls/kernel32/winerror.mc:1813 msgid "Connection aborted.\n" -msgstr "已放棄連接。\n" +msgstr "已放棄連線。\n" #: dlls/kernel32/winerror.mc:1818 msgid "Please retry operation.\n" @@ -5471,7 +5403,7 @@ msgstr "使用者未被認證。\n" #: dlls/kernel32/winerror.mc:1858 msgid "User not logged on.\n" -msgstr "使用者未被記錄。\n" +msgstr "使用者未登入。\n" #: dlls/kernel32/winerror.mc:1863 msgid "Continue work in progress.\n" @@ -5503,7 +5435,7 @@ msgstr "即使沒有變更任何東西時也進行作業。\n" #: dlls/kernel32/winerror.mc:1898 msgid "The user profile is invalid.\n" -msgstr "使用者側寫檔無效。\n" +msgstr "使用者配置檔案無效。\n" #: dlls/kernel32/winerror.mc:1903 msgid "Not supported on Small Business Server.\n" @@ -5547,7 +5479,7 @@ msgstr "無效的主要群組。\n" #: dlls/kernel32/winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "沒有假冒字組。\n" +msgstr "沒有模擬權杖。\n" #: dlls/kernel32/winerror.mc:1958 msgid "Can't disable mandatory group.\n" @@ -5555,11 +5487,11 @@ msgstr "無法停用必要群組。\n" #: dlls/kernel32/winerror.mc:1963 msgid "No logon servers available.\n" -msgstr "沒有可用的登錄伺服器。\n" +msgstr "沒有可用的登入伺服器。\n" #: dlls/kernel32/winerror.mc:1968 msgid "No such logon session.\n" -msgstr "沒有此類登錄作業階段。\n" +msgstr "沒有此類登入工作階段。\n" #: dlls/kernel32/winerror.mc:1973 msgid "No such privilege.\n" @@ -5623,7 +5555,7 @@ msgstr "帳號限制。\n" #: dlls/kernel32/winerror.mc:2048 msgid "Invalid logon hours.\n" -msgstr "無效的登錄時數。\n" +msgstr "無效的登入時數。\n" #: dlls/kernel32/winerror.mc:2053 msgid "Invalid workstation.\n" @@ -5691,11 +5623,11 @@ msgstr "無效的群組屬性。\n" #: dlls/kernel32/winerror.mc:2133 msgid "Bad impersonation level.\n" -msgstr "不當的假冒等級。\n" +msgstr "不當的模擬等級。\n" #: dlls/kernel32/winerror.mc:2138 msgid "Can't open anonymous security token.\n" -msgstr "無法開啟匿名安全性代表字組。\n" +msgstr "無法開啟匿名的安全權杖。\n" #: dlls/kernel32/winerror.mc:2143 msgid "Bad validation class.\n" @@ -5703,7 +5635,7 @@ msgstr "不當的驗證類別。\n" #: dlls/kernel32/winerror.mc:2148 msgid "Bad token type.\n" -msgstr "不當的字組型態。\n" +msgstr "不當的權杖類型。\n" #: dlls/kernel32/winerror.mc:2153 msgid "No security on object.\n" @@ -5755,11 +5687,11 @@ msgstr "不當的描述元格式。\n" #: dlls/kernel32/winerror.mc:2213 msgid "Not a logon process.\n" -msgstr "不是個登錄行程。\n" +msgstr "不是登入工作階段。\n" #: dlls/kernel32/winerror.mc:2218 msgid "Logon session ID exists.\n" -msgstr "登錄期間識別碼已存在。\n" +msgstr "登入工作階段識別號已存在。\n" #: dlls/kernel32/winerror.mc:2223 msgid "Unknown authentication package.\n" @@ -5767,19 +5699,19 @@ msgstr "不明認證套件。\n" #: dlls/kernel32/winerror.mc:2228 msgid "Bad logon session state.\n" -msgstr "不當的登錄作業階段狀態。\n" +msgstr "不當的登入工作階段狀態。\n" #: dlls/kernel32/winerror.mc:2233 msgid "Logon session ID collision.\n" -msgstr "登錄期間識別碼產生碰撞。\n" +msgstr "登入工作階段識別號發生衝突。\n" #: dlls/kernel32/winerror.mc:2238 msgid "Invalid logon type.\n" -msgstr "無效的登錄型態。\n" +msgstr "無效的登入類型。\n" #: dlls/kernel32/winerror.mc:2243 msgid "Cannot impersonate.\n" -msgstr "無法假冒。\n" +msgstr "無法模擬。\n" #: dlls/kernel32/winerror.mc:2248 msgid "Invalid transaction state.\n" @@ -5807,7 +5739,7 @@ msgstr "其為使用者的主要群組。\n" #: dlls/kernel32/winerror.mc:2278 msgid "Token already in use.\n" -msgstr "字組已使用中。\n" +msgstr "權杖已在使用中。\n" #: dlls/kernel32/winerror.mc:2283 msgid "No such local group.\n" @@ -5827,7 +5759,7 @@ msgstr "本地群組已存在。\n" #: dlls/kernel32/winerror.mc:2303 dlls/kernel32/winerror.mc:2328 msgid "Logon type not granted.\n" -msgstr "登錄型態未授與。\n" +msgstr "登錄類型未授與。\n" #: dlls/kernel32/winerror.mc:2308 msgid "Too many secrets.\n" @@ -5843,7 +5775,7 @@ msgstr "內部安全資料庫錯誤。\n" #: dlls/kernel32/winerror.mc:2323 msgid "Too many context IDs.\n" -msgstr "太多文脈識別號。\n" +msgstr "太多內容識別號。\n" #: dlls/kernel32/winerror.mc:2333 msgid "Cross-encrypted NT password required.\n" @@ -5879,7 +5811,7 @@ msgstr "磁碟已損壞。\n" #: dlls/kernel32/winerror.mc:2373 msgid "No user session key.\n" -msgstr "沒有使用者作業階段金鑰。\n" +msgstr "沒有使用者工作階段金鑰。\n" #: dlls/kernel32/winerror.mc:2378 msgid "License quota exceeded.\n" @@ -5895,7 +5827,7 @@ msgstr "相互認證失敗。\n" #: dlls/kernel32/winerror.mc:2393 msgid "Time skew between client and server.\n" -msgstr "客戶端與伺服端的時間偏斜。\n" +msgstr "用戶端與伺服器的時間存在偏移。\n" #: dlls/kernel32/winerror.mc:2398 msgid "Invalid window handle.\n" @@ -5935,7 +5867,7 @@ msgstr "視窗由另外的執行緒所擁有。\n" #: dlls/kernel32/winerror.mc:2443 msgid "Hotkey already registered.\n" -msgstr "熱鍵已被註冊。\n" +msgstr "快捷鍵已被註冊。\n" #: dlls/kernel32/winerror.mc:2448 msgid "Class already exists.\n" @@ -5967,7 +5899,7 @@ msgstr "找不到清單方塊識別號。\n" #: dlls/kernel32/winerror.mc:2483 msgid "No wildcard characters.\n" -msgstr "沒有萬用字元字元。\n" +msgstr "沒有萬用字元。\n" #: dlls/kernel32/winerror.mc:2488 msgid "Clipboard not open.\n" @@ -5975,7 +5907,7 @@ msgstr "未開啟剪貼簿。\n" #: dlls/kernel32/winerror.mc:2493 msgid "Hotkey not registered.\n" -msgstr "快速鍵未註冊。\n" +msgstr "快捷鍵未註冊。\n" #: dlls/kernel32/winerror.mc:2498 msgid "Not a dialog window.\n" @@ -6039,7 +5971,7 @@ msgstr "這個清單方塊沒有定位停駐點。\n" #: dlls/kernel32/winerror.mc:2573 msgid "Can't destroy object owned by another thread.\n" -msgstr "無法銷毀由另外執行緒所擁有的物件。\n" +msgstr "無法銷毀由其他執行緒所擁有的物件。\n" #: dlls/kernel32/winerror.mc:2578 msgid "Child window menus not allowed.\n" @@ -6107,7 +6039,7 @@ msgstr "沒有非置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2658 msgid "No paged system resources.\n" -msgstr "非置換頁的系統資源。\n" +msgstr "沒有置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2663 msgid "No working set quota.\n" @@ -6131,7 +6063,7 @@ msgstr "無效的鍵盤控柄。\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許的攔截類型。\n" #: dlls/kernel32/winerror.mc:2693 msgid "Interactive window station required.\n" @@ -6171,11 +6103,11 @@ msgstr "使用者已放棄安裝。\n" #: dlls/kernel32/winerror.mc:2738 msgid "Installation failure.\n" -msgstr "安裝已失敗。\n" +msgstr "安裝失敗。\n" #: dlls/kernel32/winerror.mc:2743 msgid "Installation suspended.\n" -msgstr "安裝已懸置。\n" +msgstr "安裝擱置。\n" #: dlls/kernel32/winerror.mc:2748 msgid "Unknown product.\n" @@ -6183,15 +6115,15 @@ msgstr "不明產品。\n" #: dlls/kernel32/winerror.mc:2753 msgid "Unknown feature.\n" -msgstr "不明特徵。\n" +msgstr "不明功能。\n" #: dlls/kernel32/winerror.mc:2758 msgid "Unknown component.\n" -msgstr "未知的元件。\n" +msgstr "不明元件。\n" #: dlls/kernel32/winerror.mc:2763 msgid "Unknown property.\n" -msgstr "未知的屬性。\n" +msgstr "不明屬性。\n" #: dlls/kernel32/winerror.mc:2768 msgid "Invalid handle state.\n" @@ -6251,7 +6183,7 @@ msgstr "開啟安裝記錄檔時失敗。\n" #: dlls/kernel32/winerror.mc:2838 msgid "Installation language not supported.\n" -msgstr "不受支援的安裝語言。\n" +msgstr "不支援的安裝語言。\n" #: dlls/kernel32/winerror.mc:2843 msgid "Installation transform failed to apply.\n" @@ -6275,11 +6207,11 @@ msgstr "無效的表格。\n" #: dlls/kernel32/winerror.mc:2868 msgid "Data type mismatch.\n" -msgstr "資料類型不匹配。\n" +msgstr "資料類型不相符。\n" #: dlls/kernel32/winerror.mc:2873 dlls/kernel32/winerror.mc:3083 msgid "Unsupported type.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的類型。\n" #: dlls/kernel32/winerror.mc:2878 msgid "Creation failed.\n" @@ -6291,7 +6223,7 @@ msgstr "無法寫入暫存資料夾。\n" #: dlls/kernel32/winerror.mc:2888 msgid "Installation platform not supported.\n" -msgstr "不受支援的安裝平臺。\n" +msgstr "不支援的安裝平臺。\n" #: dlls/kernel32/winerror.mc:2893 msgid "Installer not used.\n" @@ -6307,7 +6239,7 @@ msgstr "無效的更新套件。\n" #: dlls/kernel32/winerror.mc:2908 msgid "Unsupported patch package.\n" -msgstr "不受支援的修補程式套件。\n" +msgstr "不支援的修補程式套件。\n" #: dlls/kernel32/winerror.mc:2913 msgid "Another version is installed.\n" @@ -6391,7 +6323,7 @@ msgstr "RPC 伺服器未傾聽。\n" #: dlls/kernel32/winerror.mc:3013 msgid "Unknown manager type.\n" -msgstr "不明管理員型態。\n" +msgstr "不明管理員類型。\n" #: dlls/kernel32/winerror.mc:3018 msgid "Unknown interface.\n" @@ -6415,7 +6347,7 @@ msgstr "資源不足。\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "RPC 伺服器不得使用。\n" +msgstr "RPC 伺服器不可用。\n" #: dlls/kernel32/winerror.mc:3048 msgid "RPC server too busy.\n" @@ -6427,7 +6359,7 @@ msgstr "無效的網路選項。\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "沒有現用的 RPC 呼叫。\n" +msgstr "沒有可用的 RPC 呼叫。\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" @@ -6443,7 +6375,7 @@ msgstr "RPC 協定發生錯誤。\n" #: dlls/kernel32/winerror.mc:3078 msgid "Unsupported transfer syntax.\n" -msgstr "不受支援的轉送語法。\n" +msgstr "不支援的轉送語法。\n" #: dlls/kernel32/winerror.mc:3088 msgid "Invalid tag.\n" @@ -6463,7 +6395,7 @@ msgstr "無效的名稱語法。\n" #: dlls/kernel32/winerror.mc:3108 msgid "Unsupported name syntax.\n" -msgstr "不受支援的名稱語法。\n" +msgstr "不支援的名稱語法。\n" #: dlls/kernel32/winerror.mc:3113 msgid "No network address.\n" @@ -6479,7 +6411,7 @@ msgstr "不明認證類型。\n" #: dlls/kernel32/winerror.mc:3128 msgid "Maximum calls too low.\n" -msgstr "太低的呼叫數最大值。\n" +msgstr "呼叫數的最大值太低。\n" #: dlls/kernel32/winerror.mc:3133 msgid "String too long.\n" @@ -6543,7 +6475,7 @@ msgstr "已無更多成員。\n" #: dlls/kernel32/winerror.mc:3208 msgid "Not all objects unexported.\n" -msgstr "並非所有物件被取消匯出。\n" +msgstr "並非所有物件未被匯出。\n" #: dlls/kernel32/winerror.mc:3213 msgid "Interface not found.\n" @@ -6559,7 +6491,7 @@ msgstr "找不到條目。\n" #: dlls/kernel32/winerror.mc:3228 msgid "Name service unavailable.\n" -msgstr "名稱服務不得使用。\n" +msgstr "名稱服務不可用。\n" #: dlls/kernel32/winerror.mc:3233 msgid "Invalid network address family.\n" @@ -6571,7 +6503,7 @@ msgstr "操作不受支援。\n" #: dlls/kernel32/winerror.mc:3243 msgid "No security context available.\n" -msgstr "沒有可用安全文脈。\n" +msgstr "沒有可用的安全內容。\n" #: dlls/kernel32/winerror.mc:3248 msgid "RPCInternal error.\n" @@ -6611,15 +6543,15 @@ msgstr "字元翻譯表格檔案太小。\n" #: dlls/kernel32/winerror.mc:3293 msgid "Null context handle.\n" -msgstr "空值文脈控柄。\n" +msgstr "內容控柄為空值。\n" #: dlls/kernel32/winerror.mc:3298 msgid "Context handle damaged.\n" -msgstr "文脈控柄受損害。\n" +msgstr "內容控柄已損壞。\n" #: dlls/kernel32/winerror.mc:3303 msgid "Binding handle mismatch.\n" -msgstr "繫結控柄不匹配。\n" +msgstr "繫結控柄不相符。\n" #: dlls/kernel32/winerror.mc:3308 msgid "Cannot get call handle.\n" @@ -6627,7 +6559,7 @@ msgstr "無法提取呼叫控柄。\n" #: dlls/kernel32/winerror.mc:3313 msgid "Null reference pointer.\n" -msgstr "空值參考指標。\n" +msgstr "參考指標為空值。\n" #: dlls/kernel32/winerror.mc:3318 msgid "Enumeration value out of range.\n" @@ -6667,15 +6599,15 @@ msgstr "信賴的關聯性失敗。\n" #: dlls/kernel32/winerror.mc:3363 msgid "Trust logon failure.\n" -msgstr "信賴登錄失敗。\n" +msgstr "信賴登入失敗。\n" #: dlls/kernel32/winerror.mc:3368 msgid "RPC call already in progress.\n" -msgstr "RPC 呼叫已正進行。\n" +msgstr "RPC 呼叫已在進行。\n" #: dlls/kernel32/winerror.mc:3373 msgid "NETLOGON is not started.\n" -msgstr "NETLOGON 未被啟始。\n" +msgstr "NETLOGON 未被啟動。\n" #: dlls/kernel32/winerror.mc:3378 msgid "Account expired.\n" @@ -6695,7 +6627,7 @@ msgstr "不明通訊埠。\n" #: dlls/kernel32/winerror.mc:3398 msgid "Unknown printer driver.\n" -msgstr "未知的印表機驅動程式。\n" +msgstr "不明印表機驅動程式。\n" #: dlls/kernel32/winerror.mc:3403 msgid "Unknown print processor.\n" @@ -6735,15 +6667,15 @@ msgstr "已無更多繫結。\n" #: dlls/kernel32/winerror.mc:3448 msgid "Can't log on with inter-domain trust account.\n" -msgstr "無法以網域間信賴帳號登錄。\n" +msgstr "無法以網域間信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3453 msgid "Can't log on with workstation trust account.\n" -msgstr "無法以工作站信賴帳號登錄。\n" +msgstr "無法以工作站信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3458 msgid "Can't log on with server trust account.\n" -msgstr "無法以伺服器信賴帳號登錄。\n" +msgstr "無法以伺服器信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3463 msgid "Domain trust information inconsistent.\n" @@ -6791,7 +6723,7 @@ msgstr "RPC 指令失敗。\n" #: dlls/kernel32/winerror.mc:3518 msgid "Unsupported authorization level.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的授權等級。\n" #: dlls/kernel32/winerror.mc:3523 msgid "No principal name registered.\n" @@ -6935,7 +6867,7 @@ msgstr "無法解析檔名。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" -msgstr "RPC 條目型態不匹配。\n" +msgstr "RPC 條目類型不匹配。\n" #: dlls/kernel32/winerror.mc:3703 msgid "Not all objects could be exported.\n" @@ -6947,15 +6879,15 @@ msgstr "無法匯出介面。\n" #: dlls/kernel32/winerror.mc:3713 msgid "The profile could not be added.\n" -msgstr "無法加入側寫檔。\n" +msgstr "無法加入配置檔案。\n" #: dlls/kernel32/winerror.mc:3718 msgid "The profile element could not be added.\n" -msgstr "無法加入側寫檔元件。\n" +msgstr "無法加入配置檔案元件。\n" #: dlls/kernel32/winerror.mc:3723 msgid "The profile element could not be removed.\n" -msgstr "無法移除側寫檔元件。\n" +msgstr "無法移除配置檔案元件。\n" #: dlls/kernel32/winerror.mc:3728 msgid "The group element could not be added.\n" @@ -6970,610 +6902,505 @@ msgid "The username could not be found.\n" msgstr "無法找到使用者名稱。\n" #: dlls/kernel32/winerror.mc:3743 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "站臺不存在。\n" +msgstr "這個網路連線不存在。\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "連線被拒。\n" +msgstr "連線被同儕節點重設。\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "未實作" +msgstr "未實作。\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC 呼叫失敗。\n" +msgstr "呼叫失敗。\n" #: dlls/kernel32/winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "在檔案 %2 中找不到訊息 0x%1。\n" +msgstr "無法在檔案中找到簽名。\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "無效的層級。\n" +msgstr "無效的呼叫。\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Help not available." msgid "Resource is not currently available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "資源目前不可用。\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "類別名稱:" +msgstr "經典藍" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 msgid "Normal" -msgstr "中" +msgstr "標準" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "代號" +msgstr "Letter" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "代號" +msgstr "Letter Small" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "表格(&T)" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "狀態" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "執行(&E)..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "小" +msgstr "A4 Small" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "記事本" +msgstr "Note" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "信封 #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "信封 #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "信封 #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "信封 #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "信封 #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C 尺寸紙張" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D 尺寸紙張" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E 尺寸紙張" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "信封 DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "信封 C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "信封 C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "信封 C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "信封 C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "信封 C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "信封 B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "信封 B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "信封 B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "PKCS 7 封套" +msgstr "信封" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "信封 Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "PKCS 7 封套" +msgstr "6 3/4 信封" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "美國標準 Fanfold" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "德國標準 Fanfold" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "德國法定 Fanfold" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "日語" +msgstr "明信片" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "信封 Invite" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "代號" +msgstr "Letter Extra" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "Legal Extra" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "Tabloid Extra" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "其他(&X)" +msgstr "A4 Extra" #: dlls/localspl/localspl.rc:88 msgid "Letter Transverse" -msgstr "" +msgstr "Letter Transverse" #: dlls/localspl/localspl.rc:89 msgid "A4 Transverse" -msgstr "" +msgstr "A4 Transverse" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "Letter Extra Transverse" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "Super A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "Super B" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "代號" +msgstr "Letter Plus" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 Plus" #: dlls/localspl/localspl.rc:95 msgid "A5 Transverse" -msgstr "" +msgstr "A5 Transverse" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) Transverse" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "其他(&X)" +msgstr "A3 Extra" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "其他(&X)" +msgstr "A5 Extra" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) Extra" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 msgid "A3 Transverse" -msgstr "" +msgstr "A3 Transverse" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 Extra Transverse" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "雙面明信片" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "日本角形信封 #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "日本角形信封 #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "日本長形信封 #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "日本長形信封 #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Letter 橫向" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 橫向" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 橫向" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 橫向" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) 橫向" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) 橫向" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "明信片橫向" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "雙面明信片橫向" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 橫向" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "日本角形信封 #2 橫向" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "日本角形信封 #3 橫向" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "日本長形信封 #3 橫向" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "日本長形信封 #4 橫向" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) 橫向" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "日本洋形信封 #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "日本洋形信封 #4 橫向" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "中國 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "中國 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "PRC 32K（大）" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "PKCS 7 封套" +msgstr "中國信封 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "中國 16K 橫向" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "中國 32K 橫向" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "PRC 32K（大）橫向" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #1 橫向" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2 橫向" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3 橫向" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4 橫向" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5 橫向" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6 橫向" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7 橫向" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8 橫向" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9 橫向" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10 橫向" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7590,7 +7417,7 @@ msgstr "新增本機連接埠" #: dlls/localui/localui.rc:42 msgid "&Enter the port name to add:" -msgstr "輸入要新增的本機連接埠名稱(&E):" +msgstr "輸入要新增的本機連接埠名稱(&E)：" #: dlls/localui/localui.rc:51 msgid "Configure LPT Port" @@ -7598,15 +7425,15 @@ msgstr "設定並列埠" #: dlls/localui/localui.rc:54 msgid "Timeout (seconds)" -msgstr "超時(秒)" +msgstr "超時（秒）" #: dlls/localui/localui.rc:55 msgid "&Transmission Retry:" -msgstr "重試傳送(&T):" +msgstr "重試傳送(&T)：" #: dlls/localui/localui.rc:32 msgid "'%s' is not a valid port name" -msgstr "%s 不是有效的連接埠名稱" +msgstr "「%s」不是有效的連接埠名稱" #: dlls/localui/localui.rc:33 msgid "Port %s already exists" @@ -7626,7 +7453,7 @@ msgstr "傳送郵件" #: dlls/mferror/mferror.mc:249 dlls/mferror/mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "已建立開始要求。\n" #: dlls/mferror/mferror.mc:599 #, fuzzy -- 2.33.0.windows.2

1 0

[PATCH v2 1/5] dinput: Factor object enumeration checks and offset mapping.
by Rémi Bernon 20 Oct '21

20 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix keyboard test failure: check for acquired state before checking for data format in GetDeviceState. dlls/dinput/device.c | 39 ++++++++++++++++++++++++++++++++------ dlls/dinput/joystick_hid.c | 26 +++++++------------------ dlls/dinput/keyboard.c | 19 ++----------------- dlls/dinput/mouse.c | 20 ++----------------- 4 files changed, 44 insertions(+), 60 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index cdaa76cd504..2b2c4646e31 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1186,6 +1186,24 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects( IDirectInputDevice8W *iface return DI_OK; } +static HRESULT enum_object_filter_init( IDirectInputDeviceImpl *impl, DIPROPHEADER *filter ) +{ + DIDATAFORMAT *format = impl->data_format.wine_df; + int i, *offsets = impl->data_format.offsets; + + if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; + if (filter->dwHow == DIPH_BYUSAGE && !(impl->instance.dwDevType & DIDEVTYPE_HID)) return DIERR_UNSUPPORTED; + if (filter->dwHow != DIPH_BYOFFSET) return DI_OK; + + if (!offsets) return DIERR_NOTFOUND; + + for (i = 0; i < format->dwNumObjs; ++i) if (offsets[i] == filter->dwObj) break; + if (i == format->dwNumObjs) return DIERR_NOTFOUND; + + filter->dwObj = format->rgodf[i].dwOfs; + return DI_OK; +} + static BOOL CALLBACK find_object( const DIDEVICEOBJECTINSTANCEW *instance, void *context ) { *(DIDEVICEOBJECTINSTANCEW *)context = *instance; @@ -1198,6 +1216,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); DWORD object_mask = DIDFT_AXIS | DIDFT_BUTTON | DIDFT_POV; DIDEVICEOBJECTINSTANCEW instance; + DIPROPHEADER filter; HRESULT hr; TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); @@ -1206,6 +1225,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; if (!IS_DIPROP( guid )) return DI_OK; + filter = *header; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; + switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_PRODUCTNAME: @@ -1228,7 +1250,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_RANGE: if (header->dwSize != sizeof(DIPROPRANGE)) return DIERR_INVALIDPARAM; if (header->dwHow == DIPH_DEVICE) return DIERR_UNSUPPORTED; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_AXIS)) return DIERR_UNSUPPORTED; @@ -1239,7 +1261,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_GRANULARITY: if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; if (header->dwHow == DIPH_DEVICE) return DIERR_UNSUPPORTED; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_AXIS)) return DIERR_UNSUPPORTED; @@ -1247,7 +1269,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_KEYNAME: if (header->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_BUTTON)) return DIERR_UNSUPPORTED; @@ -1317,6 +1339,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface { struct set_object_property_params params = {.iface = iface, .header = header, .property = LOWORD( guid )}; IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + DIPROPHEADER filter; HRESULT hr; TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); @@ -1325,6 +1348,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; if (!IS_DIPROP( guid )) return DI_OK; + filter = *header; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; + switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_RANGE: @@ -1332,7 +1358,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface const DIPROPRANGE *value = (const DIPROPRANGE *)header; if (header->dwSize != sizeof(DIPROPRANGE)) return DIERR_INVALIDPARAM; if (value->lMin > value->lMax) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, DIDFT_AXIS, set_object_property, &params ); + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, set_object_property, &params ); if (FAILED(hr)) return hr; return DI_OK; } @@ -1342,7 +1368,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface const DIPROPDWORD *value = (const DIPROPDWORD *)header; if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; if (value->dwData > 10000) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, DIDFT_AXIS, set_object_property, &params ); + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, set_object_property, &params ); if (FAILED(hr)) return hr; return DI_OK; } @@ -1473,7 +1499,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( IDirectInputDevice8W *ifa DWORD obj, DWORD how ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); - const DIPROPHEADER filter = + DIPROPHEADER filter = { .dwSize = sizeof(filter), .dwHeaderSize = sizeof(filter), @@ -1488,6 +1514,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( IDirectInputDevice8W *ifa if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) return DIERR_INVALIDPARAM; if (how == DIPH_DEVICE) return DIERR_INVALIDPARAM; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_ALL, get_object_info, instance ); if (FAILED(hr)) return hr; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3dc43c450e4..2dec33e3ccd 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -392,28 +392,16 @@ static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD seen[i] = TRUE; } -static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, DWORD flags, +static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, DWORD flags, enum_object_callback callback, void *data ) { - DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, i, j; + DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, j; struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; struct hid_value_caps *caps, *caps_end, *nary, *nary_end, *effect_caps; - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; struct hid_collection_node *node, *node_end; - DIPROPHEADER filter = *header; BOOL ret, seen_axis[6] = {0}; - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - button_ofs += impl->caps.NumberInputValueCaps * sizeof(LONG); button_ofs += impl->caps.NumberOutputValueCaps * sizeof(LONG); button_ofs += impl->caps.NumberFeatureValueCaps * sizeof(LONG); @@ -489,7 +477,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; check_pid_effect_axis_caps( impl, &instance ); - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; value_ofs += sizeof(LONG); object++; @@ -532,7 +520,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = caps->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; object++; @@ -567,7 +555,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = nary->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, nary, &instance, data ); + ret = enum_object( impl, filter, flags, callback, nary, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; } @@ -586,7 +574,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = caps->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) button_ofs++; @@ -612,7 +600,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = node->parent; instance.dwDimension = 0; instance.wExponent = 0; - ret = enum_object( impl, &filter, flags, callback, NULL, &instance, data ); + ret = enum_object( impl, filter, flags, callback, NULL, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 0c2a1b839ff..ad91c948fbc 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -302,7 +302,7 @@ static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDE return DIENUM_CONTINUE; } -static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *header, DWORD flags, +static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) { SysKeyboardImpl *impl = impl_from_IDirectInputDevice8W( iface ); @@ -314,31 +314,16 @@ static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, cons .dwOfs = DIK_ESCAPE, .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ), }; - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; - DIPROPHEADER filter = *header; DWORD i, dik; BOOL ret; - if (header->dwHow != DIPH_DEVICE && header->dwHow != DIPH_BYOFFSET && header->dwHow != DIPH_BYID) - return DIERR_UNSUPPORTED; - - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - for (i = 0; i < 512; ++i) { if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue; if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue; instance.dwOfs = dik; instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik ); - ret = try_enum_object( &filter, flags, callback, &instance, context ); + ret = try_enum_object( filter, flags, callback, &instance, context ); if (ret != DIENUM_CONTINUE) return DIENUM_STOP; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 3553a5af94d..5b3ec2d1f20 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -575,7 +575,7 @@ static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDE return DIENUM_CONTINUE; } -static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *header, DWORD flags, +static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) { DIDEVICEOBJECTINSTANCEW instances[] = @@ -640,28 +640,12 @@ static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const D .tszName = L"Button 4", }, }; - SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; - DIPROPHEADER filter = *header; BOOL ret; DWORD i; - if (header->dwHow != DIPH_DEVICE && header->dwHow != DIPH_BYOFFSET && header->dwHow != DIPH_BYID) - return DIERR_UNSUPPORTED; - - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - for (i = 0; i < ARRAY_SIZE(instances); ++i) { - ret = try_enum_object( &filter, flags, callback, instances + i, context ); + ret = try_enum_object( filter, flags, callback, instances + i, context ); if (ret != DIENUM_CONTINUE) return DIENUM_STOP; } -- 2.33.0

1 4

[PATCH 1/5] dinput: Factor object enumeration checks and offset mapping.
by Rémi Bernon 20 Oct '21

20 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 39 ++++++++++++++++++++++++++++++++------ dlls/dinput/joystick_hid.c | 26 +++++++------------------ dlls/dinput/keyboard.c | 19 ++----------------- dlls/dinput/mouse.c | 20 ++----------------- 4 files changed, 44 insertions(+), 60 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index cdaa76cd504..2b2c4646e31 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1186,6 +1186,24 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects( IDirectInputDevice8W *iface return DI_OK; } +static HRESULT enum_object_filter_init( IDirectInputDeviceImpl *impl, DIPROPHEADER *filter ) +{ + DIDATAFORMAT *format = impl->data_format.wine_df; + int i, *offsets = impl->data_format.offsets; + + if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; + if (filter->dwHow == DIPH_BYUSAGE && !(impl->instance.dwDevType & DIDEVTYPE_HID)) return DIERR_UNSUPPORTED; + if (filter->dwHow != DIPH_BYOFFSET) return DI_OK; + + if (!offsets) return DIERR_NOTFOUND; + + for (i = 0; i < format->dwNumObjs; ++i) if (offsets[i] == filter->dwObj) break; + if (i == format->dwNumObjs) return DIERR_NOTFOUND; + + filter->dwObj = format->rgodf[i].dwOfs; + return DI_OK; +} + static BOOL CALLBACK find_object( const DIDEVICEOBJECTINSTANCEW *instance, void *context ) { *(DIDEVICEOBJECTINSTANCEW *)context = *instance; @@ -1198,6 +1216,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); DWORD object_mask = DIDFT_AXIS | DIDFT_BUTTON | DIDFT_POV; DIDEVICEOBJECTINSTANCEW instance; + DIPROPHEADER filter; HRESULT hr; TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); @@ -1206,6 +1225,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; if (!IS_DIPROP( guid )) return DI_OK; + filter = *header; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; + switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_PRODUCTNAME: @@ -1228,7 +1250,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_RANGE: if (header->dwSize != sizeof(DIPROPRANGE)) return DIERR_INVALIDPARAM; if (header->dwHow == DIPH_DEVICE) return DIERR_UNSUPPORTED; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_AXIS)) return DIERR_UNSUPPORTED; @@ -1239,7 +1261,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_GRANULARITY: if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; if (header->dwHow == DIPH_DEVICE) return DIERR_UNSUPPORTED; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_AXIS)) return DIERR_UNSUPPORTED; @@ -1247,7 +1269,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_KEYNAME: if (header->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_BUTTON)) return DIERR_UNSUPPORTED; @@ -1317,6 +1339,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface { struct set_object_property_params params = {.iface = iface, .header = header, .property = LOWORD( guid )}; IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + DIPROPHEADER filter; HRESULT hr; TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); @@ -1325,6 +1348,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; if (!IS_DIPROP( guid )) return DI_OK; + filter = *header; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; + switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_RANGE: @@ -1332,7 +1358,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface const DIPROPRANGE *value = (const DIPROPRANGE *)header; if (header->dwSize != sizeof(DIPROPRANGE)) return DIERR_INVALIDPARAM; if (value->lMin > value->lMax) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, DIDFT_AXIS, set_object_property, &params ); + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, set_object_property, &params ); if (FAILED(hr)) return hr; return DI_OK; } @@ -1342,7 +1368,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface const DIPROPDWORD *value = (const DIPROPDWORD *)header; if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; if (value->dwData > 10000) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, DIDFT_AXIS, set_object_property, &params ); + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, set_object_property, &params ); if (FAILED(hr)) return hr; return DI_OK; } @@ -1473,7 +1499,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( IDirectInputDevice8W *ifa DWORD obj, DWORD how ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); - const DIPROPHEADER filter = + DIPROPHEADER filter = { .dwSize = sizeof(filter), .dwHeaderSize = sizeof(filter), @@ -1488,6 +1514,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( IDirectInputDevice8W *ifa if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) return DIERR_INVALIDPARAM; if (how == DIPH_DEVICE) return DIERR_INVALIDPARAM; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_ALL, get_object_info, instance ); if (FAILED(hr)) return hr; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3dc43c450e4..2dec33e3ccd 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -392,28 +392,16 @@ static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD seen[i] = TRUE; } -static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, DWORD flags, +static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, DWORD flags, enum_object_callback callback, void *data ) { - DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, i, j; + DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, j; struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; struct hid_value_caps *caps, *caps_end, *nary, *nary_end, *effect_caps; - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; struct hid_collection_node *node, *node_end; - DIPROPHEADER filter = *header; BOOL ret, seen_axis[6] = {0}; - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - button_ofs += impl->caps.NumberInputValueCaps * sizeof(LONG); button_ofs += impl->caps.NumberOutputValueCaps * sizeof(LONG); button_ofs += impl->caps.NumberFeatureValueCaps * sizeof(LONG); @@ -489,7 +477,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; check_pid_effect_axis_caps( impl, &instance ); - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; value_ofs += sizeof(LONG); object++; @@ -532,7 +520,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = caps->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; object++; @@ -567,7 +555,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = nary->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, nary, &instance, data ); + ret = enum_object( impl, filter, flags, callback, nary, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; } @@ -586,7 +574,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = caps->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) button_ofs++; @@ -612,7 +600,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = node->parent; instance.dwDimension = 0; instance.wExponent = 0; - ret = enum_object( impl, &filter, flags, callback, NULL, &instance, data ); + ret = enum_object( impl, filter, flags, callback, NULL, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 0c2a1b839ff..ad91c948fbc 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -302,7 +302,7 @@ static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDE return DIENUM_CONTINUE; } -static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *header, DWORD flags, +static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) { SysKeyboardImpl *impl = impl_from_IDirectInputDevice8W( iface ); @@ -314,31 +314,16 @@ static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, cons .dwOfs = DIK_ESCAPE, .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ), }; - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; - DIPROPHEADER filter = *header; DWORD i, dik; BOOL ret; - if (header->dwHow != DIPH_DEVICE && header->dwHow != DIPH_BYOFFSET && header->dwHow != DIPH_BYID) - return DIERR_UNSUPPORTED; - - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - for (i = 0; i < 512; ++i) { if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue; if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue; instance.dwOfs = dik; instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik ); - ret = try_enum_object( &filter, flags, callback, &instance, context ); + ret = try_enum_object( filter, flags, callback, &instance, context ); if (ret != DIENUM_CONTINUE) return DIENUM_STOP; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 3553a5af94d..5b3ec2d1f20 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -575,7 +575,7 @@ static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDE return DIENUM_CONTINUE; } -static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *header, DWORD flags, +static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) { DIDEVICEOBJECTINSTANCEW instances[] = @@ -640,28 +640,12 @@ static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const D .tszName = L"Button 4", }, }; - SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; - DIPROPHEADER filter = *header; BOOL ret; DWORD i; - if (header->dwHow != DIPH_DEVICE && header->dwHow != DIPH_BYOFFSET && header->dwHow != DIPH_BYID) - return DIERR_UNSUPPORTED; - - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - for (i = 0; i < ARRAY_SIZE(instances); ++i) { - ret = try_enum_object( &filter, flags, callback, instances + i, context ); + ret = try_enum_object( filter, flags, callback, instances + i, context ); if (ret != DIENUM_CONTINUE) return DIENUM_STOP; } -- 2.33.0

2 6

[PATCH 0/6] Allow using external static libraries for PE dependencies
by Zebediah Figura 20 Oct '21

20 Oct '21

It's not actually clear if the ZLIB_PE_CFLAGS and ZLIB_PE_LIBS introduced in 2929aa3c74 were meant for this purpose, given the number of ways in which they're broken. Nevertheless, it would be really quite nice to have, so this series aims to provide that. After these patches I'm able to compile wine using distribution static libraries, with the following configure flags: configure ZLIB_PE_CFLAGS="$(x86_64-w64-mingw32-pkg-config --cflags zlib)" ZLIB_PE_LIBS="-Wl,-Bstatic $(x86_64-w64-mingw32-pkg-config --static --libs zlib) -Wl,-Bdynamic" PNG_PE_CFLAGS="$(x86_64-w64-mingw32-pkg-config --cflags libpng16)" PNG_PE_LIBS="-Wl,-Bstatic $(x86_64-w64-mingw32-pkg-config --static --libs libpng16) -lmingwex -lmingw32 -Wl,-Bdynamic" Patches 5-6 are necessary to allow static linking of libpng16. Patch 4 is probably desirable on its own anyway. This is also a first step to actually acquiescing to what distributions have asked for. After this I intend to submit patches to: * allow automatic detection of distribution packages via MinGW pkg-config, which is pretty well standardized; * allow the use of dynamic libraries using the approach demonstrated in [1]. [1] https://www.winehq.org/pipermail/wine-devel/2021-September/195543.html Zebediah Figura (6): makefiles: Allow using external system headers in PE libraries. winegcc: Allow explicit static and dynamic linking. makefiles: Allow using *_PE_LIBS to specify linker flags to external static libraries. include: Add DECLSPEC_RETURNS_TWICE. ucrtbase: Export _setjmp() from the import library. ucrtbase: Export atexit() from the import library. aclocal.m4 | 5 ++++- configure.ac | 2 +- dlls/cabinet/Makefile.in | 3 ++- dlls/dbghelp/Makefile.in | 3 ++- dlls/opcservices/Makefile.in | 3 ++- dlls/ucrtbase/Makefile.in | 2 ++ dlls/ucrtbase/atexit.c | 31 +++++++++++++++++++++++++++++++ dlls/ucrtbase/setjmp.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/Makefile.in | 3 ++- dlls/windowscodecs/Makefile.in | 3 ++- dlls/wininet/Makefile.in | 3 ++- include/msvcrt/corecrt.h | 18 ++++++++++++++++++ include/msvcrt/setjmp.h | 8 ++------ include/wine/exception.h | 4 ++-- include/wine/unixlib.h | 4 ++-- include/winnt.h | 8 ++++++++ tools/makedep.c | 14 ++------------ tools/winegcc/winegcc.c | 16 ++++++++++++---- 18 files changed, 128 insertions(+), 34 deletions(-) create mode 100644 dlls/ucrtbase/atexit.c create mode 100644 dlls/ucrtbase/setjmp.c -- 2.33.0

4 14

[PATCH v2 1/2] winebus.sys: Treat udev actions other than "remove" as "add".
by Rémi Bernon 20 Oct '21

20 Oct '21

From: Simon McVittie <smcv(a)collabora.com> As per https://github.com/systemd/systemd/blob/v247-rc1/NEWS#L5 there are more kernel uevent types than just "add" and "remove", and we should be treating everything other than "remove" as being potentially an "add". To cope with this, try_add_device() now checks whether the same device was already added. If so, we ignore it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix compilation when HAVE_SYS_INOTIFY_H is not defined. dlls/winebus.sys/bus_udev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1cad63f0275..59bb2564def 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1411,16 +1411,14 @@ static void process_monitor_event(struct udev_monitor *monitor) if (!action) WARN("No action received\n"); - else if (strcmp(action, "add") == 0) + else if (strcmp(action, "remove")) udev_add_device(dev); - else if (strcmp(action, "remove") == 0) + else { impl = find_device_from_udev(dev); if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device for udev device %p\n", dev); } - else - WARN("Unhandled action %s\n", debugstr_a(action)); udev_device_unref(dev); } -- 2.33.0

1 1

[PATCH] user32: Change the position and size of layered windows before flushing their surfaces.
by Zhiyi Zhang 20 Oct '21

20 Oct '21

When UpdateLayeredWindow() is called to paint a window and update its size, USER_Driver->pUpdateLayeredWindow() needs to be called after the window position and size are updated. Otherwise, UpdateLayeredWindow() may flush the painted content to a smaller window and then enlarge it, losing the painted result. Fix Word 2016 window frame corruption after restoring from maximized state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/win.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e07b7d39e4b..4d0240f21a8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4134,10 +4134,8 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF TRACE( "window %p win %s client %s\n", hwnd, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); - if (!USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect )) return FALSE; - set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); - return TRUE; + return USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect ); } -- 2.32.0

2 1

[PATCH] winex11.drv: Maintain a backing store for layered windows.
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Copy the window content to a pixmap and set it as the background because the X server may discard the window content at any time, even when the backing store attribute is set to TRUE when creating a X11 window. Layered windows don't get repainted in X11DRV_Expose() like normal windows do and their content should always be kept. The window surface may be recreated when handling position and changes. So for most of the time, there is only one backing store for a window with this patch. It's possible that the we can reuse window surfaces but it's a much bigger change and risk breaking things. Fix Word 2016 frame window corruption after it's moved off-screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/window.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7ec2639e309..c639b9d06d2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2706,6 +2706,9 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO HDC hdc = 0; HBITMAP dib; BOOL ret = FALSE; + int width, height; + Pixmap pixmap; + GC gc; if (!(data = get_win_data( hwnd ))) return FALSE; @@ -2726,11 +2729,15 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO else set_surface_color_key( surface, color_key ); if (surface) window_surface_add_ref( surface ); - release_win_data( data ); - if (!surface) return FALSE; + if (!surface) + { + release_win_data( data ); + return FALSE; + } if (!info->hdcSrc) { + release_win_data( data ); window_surface_release( surface ); return TRUE; } @@ -2767,7 +2774,24 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO surface->funcs->unlock( surface ); surface->funcs->flush( surface ); + /* Copy the window content to a pixmap and set it as the background because the X server may + * discard the window content at any time, even when the backing store attribute is set to TRUE + * when creating a X11 window. Layered windows don't get repainted in X11DRV_Expose() like + * normal windows do and their content should always be kept. */ + width = data->whole_rect.right - data->whole_rect.left; + height = data->whole_rect.bottom - data->whole_rect.top; + if (width > 0 && height > 0) + { + pixmap = XCreatePixmap( data->display, data->whole_window, width, height, 32 ); + gc = XCreateGC( data->display, pixmap, 0, NULL ); + XCopyArea( data->display, data->whole_window, pixmap, gc, 0, 0, width, height, 0, 0 ); + XFreeGC( data->display, gc ); + XSetWindowBackgroundPixmap( data->display, data->whole_window, pixmap ); + XFreePixmap( data->display, pixmap ); + } + done: + release_win_data( data ); window_surface_release( surface ); if (hdc) DeleteDC( hdc ); if (dib) DeleteObject( dib ); -- 2.32.0

1 0

[PATCH 6/6] winefile: Set size before calling RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

The value in size may be invalid if previous RegQueryValueExW() calls failed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winefile/winefile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index fa78237cccf..8ad785b924a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1220,20 +1220,22 @@ static windowOptions load_registry_settings(void) RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hKey ); - size = sizeof(DWORD); - + size = sizeof(opts.start_x); if( RegQueryValueExW( hKey, reg_start_x, NULL, &type, (LPBYTE) &opts.start_x, &size ) != ERROR_SUCCESS ) opts.start_x = CW_USEDEFAULT; + size = sizeof(opts.start_y); if( RegQueryValueExW( hKey, reg_start_y, NULL, &type, (LPBYTE) &opts.start_y, &size ) != ERROR_SUCCESS ) opts.start_y = CW_USEDEFAULT; + size = sizeof(opts.width); if( RegQueryValueExW( hKey, reg_width, NULL, &type, (LPBYTE) &opts.width, &size ) != ERROR_SUCCESS ) opts.width = CW_USEDEFAULT; + size = sizeof(opts.height); if( RegQueryValueExW( hKey, reg_height, NULL, &type, (LPBYTE) &opts.height, &size ) != ERROR_SUCCESS ) opts.height = CW_USEDEFAULT; -- 2.32.0

1 0

[PATCH 5/6] winecfg: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winecfg/drive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index bee5be3af34..b4b4239c003 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -140,7 +140,7 @@ static DWORD get_drive_type( char letter ) else { WCHAR buffer[80]; - DWORD size = ARRAY_SIZE(buffer); + DWORD size = sizeof(buffer); if (!RegQueryValueExW( hKey, driveValue, NULL, NULL, (LPBYTE)buffer, &size )) { -- 2.32.0

1 0

[PATCH 4/6] cmd: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/cmd/builtins.c | 5 +++-- programs/cmd/wcmdmain.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a55ce6e0244..d0a954d90fa 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4763,7 +4763,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { WCHAR *newValue; LONG rc = ERROR_SUCCESS; WCHAR keyValue[MAXSTRING]; - DWORD valueLen = MAXSTRING; + DWORD valueLen; HKEY readKey; /* See if parameter includes '=' */ @@ -4803,7 +4803,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { - valueLen = ARRAY_SIZE(keyValue); + valueLen = sizeof(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(keyName); WCMD_output_asis(L"="); @@ -4836,6 +4836,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { + valueLen = sizeof(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(args); WCMD_output_asis(L"="); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8c6ed1c057c..4ed1c96a9c2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2700,7 +2700,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) size = sizeof(DWORD); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)&value, &size); } else if (type == REG_SZ) { - size = ARRAY_SIZE(strvalue); + size = sizeof(strvalue); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)strvalue, &size); value = wcstoul(strvalue, NULL, 10); } @@ -2719,7 +2719,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) size = sizeof(DWORD); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)&value, &size); } else if (type == REG_SZ) { - size = ARRAY_SIZE(strvalue); + size = sizeof(strvalue); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)strvalue, &size); value = wcstoul(strvalue, NULL, 10); } -- 2.32.0

1 0

[PATCH 3/6] winex11.drv: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 57091522078..7f03f94db90 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -434,7 +434,7 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) if (lr) continue; - length = ARRAY_SIZE(device_instance); + length = sizeof(device_instance); lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); if (lr || lstrcmpiW(device_instance, instance)) { -- 2.32.0

1 0

[PATCH 2/6] winemac.drv: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 4a3b1ff39cb..99c852d7ffe 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1475,7 +1475,7 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) if (lr) continue; - length = ARRAY_SIZE(device_instance); + length = sizeof(device_instance); lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); if (lr || lstrcmpiW(device_instance, instance)) { -- 2.32.0

1 0

[PATCH 1/6] uxtheme: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 18b93435e4c..628bd9bfdc4 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -85,7 +85,7 @@ static BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg) static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, LPVOID pvData) { - DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH, dwExpDataLen; + DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH * sizeof(WCHAR), dwExpDataLen; TRACE("(hkey=%p,%s,%p)\n", hKey, debugstr_w(lpszValue), pvData); @@ -147,7 +147,7 @@ static void UXTHEME_LoadTheme(void) /* Get current theme configuration */ if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { TRACE("Loading theme config\n"); - buffsize = ARRAY_SIZE(tmp); + buffsize = sizeof(tmp); if (!RegQueryValueExW(hKey, L"ThemeActive", NULL, NULL, (BYTE*)tmp, &buffsize)) { bThemeActive = (tmp[0] != '0'); } @@ -155,10 +155,10 @@ static void UXTHEME_LoadTheme(void) bThemeActive = FALSE; TRACE("Failed to get ThemeActive: %d\n", GetLastError()); } - buffsize = ARRAY_SIZE(szCurrentColor); + buffsize = sizeof(szCurrentColor); if (RegQueryValueExW(hKey, L"ColorName", NULL, NULL, (BYTE*)szCurrentColor, &buffsize)) szCurrentColor[0] = '\0'; - buffsize = ARRAY_SIZE(szCurrentSize); + buffsize = sizeof(szCurrentSize); if (RegQueryValueExW(hKey, L"SizeName", NULL, NULL, (BYTE*)szCurrentSize, &buffsize)) szCurrentSize[0] = '\0'; if (query_reg_path (hKey, L"DllName", szCurrentTheme)) -- 2.32.0

1 0

[PATCH] dinput: Avoid negating FAILED()
by Michael Stefaniuc 19 Oct '21

19 Oct '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick_hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a6715463690..3e515f11fec 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2720,7 +2720,7 @@ static HRESULT WINAPI hid_joystick_effect_Start( IDirectInputEffect *iface, DWOR hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((flags & DIES_NODOWNLOAD) && !impl->index) hr = DIERR_NOTDOWNLOADED; - else if ((flags & DIES_NODOWNLOAD) || !FAILED(hr = IDirectInputEffect_Download( iface ))) + else if ((flags & DIES_NODOWNLOAD) || SUCCEEDED(hr = IDirectInputEffect_Download( iface ))) { count = 1; status = HidP_InitializeReportForID( HidP_Output, effect_control->id, preparsed, @@ -2865,7 +2865,7 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((impl->flags & complete_mask) != complete_mask) hr = DIERR_INCOMPLETEEFFECT; - else if (!impl->index && !FAILED(hr = find_next_effect_id( impl->joystick, &impl->index ))) + else if (!impl->index && SUCCEEDED(hr = find_next_effect_id( impl->joystick, &impl->index ))) { if (!impl->type_specific_buf[0][0]) status = HIDP_STATUS_SUCCESS; else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, @@ -3030,7 +3030,7 @@ static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface ) EnterCriticalSection( &joystick->base.crit ); if (!impl->index) hr = DI_NOEFFECT; - else if (!FAILED(hr = IDirectInputEffect_Stop( iface ))) + else if (SUCCEEDED(hr = IDirectInputEffect_Stop( iface ))) { impl->joystick->effect_inuse[impl->index - 1] = FALSE; impl->index = 0; -- 2.31.1

2 2

[PATCH v2 1/2] ws2_32: Validate pointers in select().
by Torge Matthies 19 Oct '21

19 Oct '21

The documentation says that SOCKET_ERROR is returned and the error is set to WSAEFAULT if any of the input pointers point to unmapped memory. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/ws2_32/socket.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b3dab22ae6e..7b7a985c40d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2384,6 +2384,14 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, TRACE( "read %p, write %p, except %p, timeout %p\n", read_ptr, write_ptr, except_ptr, timeout ); + if ((read_ptr && IsBadWritePtr(read_ptr, sizeof(*read_ptr))) + || (write_ptr && IsBadWritePtr(write_ptr, sizeof(*write_ptr))) + || (except_ptr && IsBadWritePtr(except_ptr, sizeof(*except_ptr)))) + { + SetLastError( WSAEFAULT ); + return -1; + } + FD_ZERO( &read ); FD_ZERO( &write ); FD_ZERO( &except ); @@ -2393,11 +2401,6 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, if (!(sync_event = get_sync_event())) return -1; - if (timeout) - params->timeout = timeout->tv_sec * -10000000 + timeout->tv_usec * -10; - else - params->timeout = TIMEOUT_INFINITE; - for (i = 0; i < read.fd_count; ++i) { params->sockets[params->count].socket = read.fd_array[i]; @@ -2428,6 +2431,18 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, return -1; } + if (timeout) + { + if (IsBadReadPtr(timeout, sizeof(*timeout))) + { + SetLastError( WSAEFAULT ); + return -1; + } + params->timeout = timeout->tv_sec * -10000000 + timeout->tv_usec * -10; + } + else + params->timeout = TIMEOUT_INFINITE; + params_size = offsetof( struct afd_poll_params, sockets[params->count] ); status = NtDeviceIoControlFile( (HANDLE)poll_socket, sync_event, NULL, NULL, &io, -- 2.33.1

3 7

[PATCH v2 1/5] winemac.drv: Simplify cursor clipping code paths.
by Tim Clem 19 Oct '21

19 Oct '21

Centralizes all clipping behavior into -startClippingCursor: and -stopClippingCursor. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- The current methods are confusingly named and, in some cases, broken. -updateCursorClippingState has an incomplete picture of when clipping should be enabled or disabled. Worse, -deactivateCursorClipping just disables the event tap without calling CGAssociateMouseAndMouseCursorPosition(true), so it will lock up the cursor if called while the app is active. There are two main scenarios where -updateCursorClippingState is called: when a window is being dragged and when the app is (de)activated. The drag-related calls can be removed entirely because the handlers in window.c call ClipCursor(NULL) when a window is being dragged. (This is in fact the only reason that the cursor doesn't get locked up when windows are dragged right now.) As for app (de)activation, the tap already ignores events if the app isn't active, so the -updateCursorClippingState calls there can be removed as well. (Moreover, Windows will cancel cursor clipping if the app loses focus; the next patch calls -stopClippingCursor when the app resigns active.) dlls/winemac.drv/cocoa_app.m | 52 +++++++++++------------------------- 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2d18da7f99a8..806252651613 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1456,33 +1456,6 @@ - (BOOL) setCursorPosition:(CGPoint)pos return ret; } - - (void) activateCursorClipping - { - if (cursorClippingEventTap && !CGEventTapIsEnabled(cursorClippingEventTap)) - { - CGEventTapEnable(cursorClippingEventTap, TRUE); - [self setCursorPosition:NSPointToCGPoint([self flippedMouseLocation:[NSEvent mouseLocation]])]; - } - } - - - (void) deactivateCursorClipping - { - if (cursorClippingEventTap && CGEventTapIsEnabled(cursorClippingEventTap)) - { - CGEventTapEnable(cursorClippingEventTap, FALSE); - [warpRecords removeAllObjects]; - lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; - } - } - - - (void) updateCursorClippingState - { - if (clippingCursor && [NSApp isActive] && ![windowsBeingDragged count]) - [self activateCursorClipping]; - else - [self deactivateCursorClipping]; - } - - (void) updateWindowsForCursorClipping { WineWindow* window; @@ -1510,7 +1483,10 @@ - (BOOL) startClippingCursor:(CGRect)rect clippingCursor = TRUE; cursorClipRect = rect; - [self updateCursorClippingState]; + + CGEventTapEnable(cursorClippingEventTap, TRUE); + [self setCursorPosition:NSPointToCGPoint([self flippedMouseLocation:[NSEvent mouseLocation]])]; + [self updateWindowsForCursorClipping]; return TRUE; @@ -1518,12 +1494,21 @@ - (BOOL) startClippingCursor:(CGRect)rect - (BOOL) stopClippingCursor { - CGError err = CGAssociateMouseAndMouseCursorPosition(true); + CGError err; + + if (!clippingCursor) + return TRUE; + + err = CGAssociateMouseAndMouseCursorPosition(true); if (err != kCGErrorSuccess) return FALSE; clippingCursor = FALSE; - [self updateCursorClippingState]; + + CGEventTapEnable(cursorClippingEventTap, FALSE); + [warpRecords removeAllObjects]; + lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; + [self updateWindowsForCursorClipping]; return TRUE; @@ -1554,7 +1539,6 @@ - (void) window:(WineWindow*)window isBeingDragged:(BOOL)dragged [windowsBeingDragged addObject:window]; else [windowsBeingDragged removeObject:window]; - [self updateCursorClippingState]; } - (void) windowWillOrderOut:(WineWindow*)window @@ -1584,7 +1568,6 @@ - (void) handleWindowDrag:(WineWindow*)window begin:(BOOL)begin [windowsBeingDragged removeObject:window]; eventType = WINDOW_DRAG_END; } - [self updateCursorClippingState]; event = macdrv_create_event(eventType, window); if (eventType == WINDOW_DRAG_BEGIN) @@ -2161,7 +2144,6 @@ - (void) setupObservations }); } [windowsBeingDragged removeObject:window]; - [self updateCursorClippingState]; }]; if (useDragNotifications) { @@ -2305,8 +2287,6 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification [self setMode:mode forDisplay:[displayID unsignedIntValue]]; } - [self updateCursorClippingState]; - [self updateFullscreenWindows]; [self adjustWindowLevels:YES]; @@ -2349,8 +2329,6 @@ - (void)applicationDidResignActive:(NSNotification *)notification macdrv_event* event; WineEventQueue* queue; - [self updateCursorClippingState]; - [self invalidateGotFocusEvents]; event = macdrv_create_event(APP_DEACTIVATED, nil); -- 2.33.0

1 4

[PATCH] msvcrt: support I width modifier in *scanf* family
by Eric Pouech 19 Oct '21

19 Oct '21

Despite what msdn states, I and I32 are supported width modifiers. V2: - better code structure - added support and tests for I32 v3: - fix 'test & copy & paste & don't test' error Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/scanf.h | 10 ++++++++-- dlls/msvcrt/tests/scanf.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3ab2efef13d..02284379854 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -279,13 +279,19 @@ _FUNCTION_ { *(format + 2) == '4') { I64_prefix = 1; format += 2; + break; } - break; + else if (*(format + 1) == '3' && + *(format + 2) == '2') { + format += 2; + break; + } + /* fall through */ #if _MSVCR_VER == 0 || _MSVCR_VER >= 140 case 'z': +#endif if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; break; -#endif default: prefix_finished = 1; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index e175342796b..a87b3b3d59e 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -74,6 +74,7 @@ static void test_sscanf( void ) int hour=21,min=59,sec=20; int number,number_so_far; HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + DWORD_PTR result_ptr; p_sprintf = (void *)GetProcAddress( hmod, "sprintf" ); p_sscanf = (void *)GetProcAddress( hmod, "sscanf" ); @@ -264,6 +265,45 @@ static void test_sscanf( void ) if(ret == 14) ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + strcpy(buffer,"12345678901234"); + ret = p_sscanf(buffer, "%I64d", &result64); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = p_sprintf(buffer1, "%I64d", result64); + ok(ret==14 || broken(ret==10), "sprintf returned %d\n", ret); + if(ret == 14) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + + result = 0; + strcpy(buffer,"0x123456789"); + ret = p_sscanf(buffer, "%I32x", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0x23456789, "got %x, expected 0x23456789\n", result); + + result_ptr = 0; + strcpy(buffer,"0x87654321"); + ret = p_sscanf(buffer, "%Ix", &result_ptr); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = p_sprintf(buffer1, "%#Ix", result_ptr); + ok(ret==10, "sprintf returned %d\n", ret); + if(ret == 10) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + + result_ptr = 0; + strcpy(buffer,"0x123456789"); + ret = p_sscanf(buffer, "%Ix", &result_ptr); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + if (sizeof(void*) == sizeof(LONGLONG)) + { + ret = p_sprintf(buffer1, "%#Ix", result_ptr); + ok(ret==11, "sprintf returned %d\n", ret); + if(ret == 11) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + } + else + { + ok(result_ptr == 0x23456789, "got %x, expected 0x23456789\n", result); + } + /* Check %i according to bug 1878 */ strcpy(buffer,"123"); ret = p_sscanf(buffer, "%i", &result);

1 0

[PATCH] d3d11: Correctly handle optional arguments in OMGetDepthStencilState().
by Nikolay Sivov 19 Oct '21

19 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 11 ++++++++++ dlls/d3d11/device.c | 37 ++++++++++++++++++++++---------- dlls/d3d11/tests/d3d11.c | 10 +++++++++ 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index c1178749345..f4aff519745 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5696,6 +5696,17 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D10DepthStencilState_Release(tmp_ds_state); ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + /* For OMGetDepthStencilState() both arguments are optional. */ + ID3D10Device_OMGetDepthStencilState(device, NULL, NULL); + stencil_ref = 0; + ID3D10Device_OMGetDepthStencilState(device, NULL, &stencil_ref); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + tmp_ds_state = NULL; + ID3D10Device_OMGetDepthStencilState(device, &tmp_ds_state, NULL); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); + ID3D10DepthStencilState_Release(tmp_ds_state); + ID3D10Device_OMGetRenderTargets(device, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 248634a245d..6d125e06ace 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2216,19 +2216,25 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetDepthStencilState(ID3D11 struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_depth_stencil_state *wined3d_state; struct d3d_depthstencil_state *state_impl; + UINT stencil_ref_tmp; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_context_get_depth_stencil_state(context->wined3d_context, stencil_ref))) + if (!stencil_ref) stencil_ref = &stencil_ref_tmp; + wined3d_state = wined3d_device_context_get_depth_stencil_state(context->wined3d_context, stencil_ref); + if (depth_stencil_state) { - state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); - ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); - } - else - { - *depth_stencil_state = NULL; + if (wined3d_state) + { + state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); + ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); + } + else + { + *depth_stencil_state = NULL; + } } wined3d_mutex_unlock(); } @@ -5554,7 +5560,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 ID3D10DepthStencilState **depth_stencil_state, UINT *stencil_ref) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11DepthStencilState *d3d11_iface; + ID3D11DepthStencilState *d3d11_iface = NULL; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); @@ -5562,10 +5568,19 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 d3d11_device_context_OMGetDepthStencilState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_iface, stencil_ref); + if (depth_stencil_state) + { + if (d3d11_iface) + { + *depth_stencil_state = &impl_from_ID3D11DepthStencilState(d3d11_iface)->ID3D10DepthStencilState_iface; + ID3D10DepthStencilState_AddRef(*depth_stencil_state); + } + else + *depth_stencil_state = NULL; + } + if (d3d11_iface) - *depth_stencil_state = &impl_from_ID3D11DepthStencilState(d3d11_iface)->ID3D10DepthStencilState_iface; - else - *depth_stencil_state = NULL; + ID3D11DepthStencilState_Release(d3d11_iface); } static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index eb8cde40dcc..e9a4cef211d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12599,6 +12599,16 @@ static void test_clear_state(void) ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D11DepthStencilState_Release(tmp_ds_state); ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + /* For OMGetDepthStencilState() both arguments are optional. */ + ID3D11DeviceContext_OMGetDepthStencilState(context, NULL, NULL); + stencil_ref = 0; + ID3D11DeviceContext_OMGetDepthStencilState(context, NULL, &stencil_ref); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + tmp_ds_state = NULL; + ID3D11DeviceContext_OMGetDepthStencilState(context, &tmp_ds_state, NULL); + ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); + ID3D11DepthStencilState_Release(tmp_ds_state); + ID3D11DeviceContext_OMGetRenderTargets(context, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i) { -- 2.33.0

2 1

[PATCH v2 1/3] wined3d: End transform feedback on SO buffer destruction even if the d3d buffer isn't bound.
by Zebediah Figura 19 Oct '21

19 Oct '21

From: Matteo Bruni <mbruni(a)codeweavers.com> It might still be bound in GL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d259b64bfaf..1d0d4d23cc5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -145,12 +145,16 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (!buffer_gl->b.buffer_object) return; - if (context_gl->c.transform_feedback_active && resource->bind_count - && resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + if (context_gl->c.transform_feedback_active && (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + && isStateDirty(&context_gl->c, STATE_STREAM_OUTPUT)) { - /* We have to make sure that transform feedback is not active - * when deleting a potentially bound transform feedback buffer. - * This may happen when the device is being destroyed. */ + /* It's illegal to (un)bind GL_TRANSFORM_FEEDBACK_BUFFER while transform + * feedback is active. Deleting a buffer implicitly unbinds it, so we + * meed to end transform feedback here if this buffer was bound. + * + * This should only be possible if STATE_STREAM_OUTPUT is dirty; if we + * do a draw call before destroying this buffer then the draw call will + * already rebind the GL target. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); wined3d_context_gl_end_transform_feedback(context_gl); } -- 2.33.0

3 6

[PATCH] wined3d: End transform feedback on SO buffer destruction even if the D3D buffer isn't bound.
by Henri Verbeet 19 Oct '21

19 Oct '21

From: Matteo Bruni <mbruni(a)codeweavers.com> It might still be bound in GL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: - Invalidate state in wined3d_device_uninit_3d(). In some sense that's redundant, because the device is subsequently going to be destroyed. However, we now rely on STATE_STREAM_OUTPUT being invalidated during device destruction. (As shown by the test_index_buffer_offset() test.) - Avoid (deprecated) isStateDirty(). - Minor spelling fix. This supersedes patch 217693. dlls/wined3d/buffer.c | 16 ++++++++++------ dlls/wined3d/device.c | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d259b64bfaf..854fa71aefe 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -145,12 +145,16 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (!buffer_gl->b.buffer_object) return; - if (context_gl->c.transform_feedback_active && resource->bind_count - && resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) - { - /* We have to make sure that transform feedback is not active - * when deleting a potentially bound transform feedback buffer. - * This may happen when the device is being destroyed. */ + if (context_gl->c.transform_feedback_active && (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + && wined3d_context_is_graphics_state_dirty(&context_gl->c, STATE_STREAM_OUTPUT)) + { + /* It's illegal to (un)bind GL_TRANSFORM_FEEDBACK_BUFFER while transform + * feedback is active. Deleting a buffer implicitly unbinds it, so we + * need to end transform feedback here if this buffer was bound. + * + * This should only be possible if STATE_STREAM_OUTPUT is dirty; if we + * do a draw call before destroying this buffer then the draw call will + * already rebind the GL target. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); wined3d_context_gl_end_transform_feedback(context_gl); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 86945485e20..1c584b93fe0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1182,7 +1182,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } - wined3d_device_context_emit_reset_state(&device->cs->c, false); + wined3d_device_context_emit_reset_state(&device->cs->c, true); state_cleanup(state); wine_rb_clear(&device->samplers, device_free_sampler, NULL); -- 2.20.1

1 0

[PATCH v2] winex11.drv: Add VRAM size to GPU hardware information if available.
by Paul Gofman 19 Oct '21

19 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - add device local heap sizes instead of taking maximum (matches wined3d behaviour). dlls/winex11.drv/display.c | 11 +++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrandr.c | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index bf32e82cb3e..c1d405ae951 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -464,6 +464,8 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g WCHAR *driver, LUID *gpu_luid) { static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR qw_mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','q','w','M','e','m','o','r','y','S','i','z','e',0}; + static const WCHAR mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; @@ -566,6 +568,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) goto done; + if (gpu->vram_size) + { + size = min(0xfff00000, gpu->vram_size); + if (RegSetValueExW(hkey, mem_sizeW, 0, REG_DWORD, (const BYTE *)&size, sizeof(size))) + goto done; + if (RegSetValueExW(hkey, qw_mem_sizeW, 0, REG_QWORD, (const BYTE *)&gpu->vram_size, sizeof(gpu->vram_size))) + goto done; + } + RegCloseKey(hkey); /* Retrieve driver value for adapters */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e82ee921830..07f83b6a5fc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -732,6 +732,7 @@ struct x11drv_gpu UINT revision_id; /* Vulkan device UUID */ GUID vulkan_uuid; + UINT64 vram_size; }; /* Represent an adapter in EnumDisplayDevices context */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 8faece9023a..0ced47d4e57 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -650,8 +650,10 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); + PFN_vkGetPhysicalDeviceMemoryProperties pvkGetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; + VkPhysicalDeviceMemoryProperties memory_properties; uint32_t device_count, device_idx, output_idx; VkPhysicalDevice *vk_physical_devices = NULL; VkPhysicalDeviceProperties2 properties2; @@ -660,6 +662,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro VkInstance vk_instance = NULL; VkDisplayKHR vk_display; BOOL ret = FALSE; + unsigned int i; VkResult vr; if (!vulkan_funcs) @@ -686,6 +689,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro LOAD_VK_FUNC(vkEnumeratePhysicalDevices) LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) + LOAD_VK_FUNC(vkGetPhysicalDeviceMemoryProperties) LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) #undef LOAD_VK_FUNC @@ -724,6 +728,13 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + pvkGetPhysicalDeviceMemoryProperties( vk_physical_devices[device_idx], &memory_properties ); + gpu->vram_size = 0; + for (i = 0; i < memory_properties.memoryHeapCount; ++i) + { + if (memory_properties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + gpu->vram_size += memory_properties.memoryHeaps[i].size; + } /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000) { -- 2.31.1

1 0

[PATCH] winex11.drv: Add VRAM size to GPU hardware information if available.
by Paul Gofman 19 Oct '21

19 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/display.c | 11 +++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrandr.c | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index bf32e82cb3e..c1d405ae951 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -464,6 +464,8 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g WCHAR *driver, LUID *gpu_luid) { static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR qw_mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','q','w','M','e','m','o','r','y','S','i','z','e',0}; + static const WCHAR mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; @@ -566,6 +568,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) goto done; + if (gpu->vram_size) + { + size = min(0xfff00000, gpu->vram_size); + if (RegSetValueExW(hkey, mem_sizeW, 0, REG_DWORD, (const BYTE *)&size, sizeof(size))) + goto done; + if (RegSetValueExW(hkey, qw_mem_sizeW, 0, REG_QWORD, (const BYTE *)&gpu->vram_size, sizeof(gpu->vram_size))) + goto done; + } + RegCloseKey(hkey); /* Retrieve driver value for adapters */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e82ee921830..07f83b6a5fc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -732,6 +732,7 @@ struct x11drv_gpu UINT revision_id; /* Vulkan device UUID */ GUID vulkan_uuid; + UINT64 vram_size; }; /* Represent an adapter in EnumDisplayDevices context */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 8faece9023a..3ce9d930784 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -650,8 +650,10 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); + PFN_vkGetPhysicalDeviceMemoryProperties pvkGetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; + VkPhysicalDeviceMemoryProperties memory_properties; uint32_t device_count, device_idx, output_idx; VkPhysicalDevice *vk_physical_devices = NULL; VkPhysicalDeviceProperties2 properties2; @@ -660,6 +662,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro VkInstance vk_instance = NULL; VkDisplayKHR vk_display; BOOL ret = FALSE; + unsigned int i; VkResult vr; if (!vulkan_funcs) @@ -686,6 +689,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro LOAD_VK_FUNC(vkEnumeratePhysicalDevices) LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) + LOAD_VK_FUNC(vkGetPhysicalDeviceMemoryProperties) LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) #undef LOAD_VK_FUNC @@ -724,6 +728,13 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + pvkGetPhysicalDeviceMemoryProperties( vk_physical_devices[device_idx], &memory_properties ); + gpu->vram_size = 0; + for (i = 0; i < memory_properties.memoryHeapCount; ++i) + { + if (memory_properties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + gpu->vram_size = max( gpu->vram_size, memory_properties.memoryHeaps[i].size ); + } /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000) { -- 2.31.1

2 3

[PATCH] server: ifdefs guards for unistd.h and sys/types.h
by Craig Andrews 19 Oct '21

19 Oct '21

unistd.h and sys/types.h should have ifdef HAVE_UNISTD_H and ifdef HAVE_SYS_TYPES_H guards, respectively. These includes were added in commit 8184bcc9 Signed-off-by: Craig Andrews <candrews(a)integralblue.com> --- server/token.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/token.c b/server/token.c index 820a7a0e07d..aec5aca12ac 100644 --- a/server/token.c +++ b/server/token.c @@ -26,8 +26,15 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> + +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif + +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS -- 2.32.0

2 3

[PATCH 00/11] Preparing for inline site support in dbghelp
by Eric Pouech 19 Oct '21

19 Oct '21

The following series starts implementing inline site support in dbghelp. Nothing fancy for now, just the definitions & stubs, and a couple of fixes and code improvements as well. A+ --- Eric Pouech (11): dbghelp: use wide string literals dbghelp: handle some more error conditions in SymGetTypeInfo() include/dbghelp.h: update for inline related APIs and structures dbghelp: added stubs for inline related APIs dbghelp: start implementing StackWalkEx dbgHelp: added stub implementation of SymFromInlineContext(W) dbghelp: added stub implementations of SymGetLineFromInlineContext(W) dbghelp: added stubs implementation for the SymSetScope* functions dbghelp: improved error handling in SymSetContext() dbghelp: factorize SymUnloadModule and SymUnloadModule64 dbghelp/dwarf: properly handle error cases while computing frame_cfa dlls/dbghelp/dbghelp.c | 63 +++++++++++++++++++++----- dlls/dbghelp/dbghelp.spec | 12 ++++- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/dwarf.c | 4 +- dlls/dbghelp/elf_module.c | 8 +--- dlls/dbghelp/macho_module.c | 15 +++---- dlls/dbghelp/minidump.c | 3 +- dlls/dbghelp/module.c | 43 +++++------------- dlls/dbghelp/path.c | 19 +++----- dlls/dbghelp/stack.c | 75 +++++++++++++++++++++++++++++++ dlls/dbghelp/symbol.c | 82 ++++++++++++++++++++++++++-------- dlls/dbghelp/type.c | 3 ++ include/dbghelp.h | 53 +++++++++++++++++++++- 13 files changed, 283 insertions(+), 98 deletions(-)

1 11

[PATCH] msvcrt: support I width modifier in *scanf* family
by Eric Pouech 19 Oct '21

19 Oct '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/scanf.h | 4 ++-- dlls/msvcrt/tests/scanf.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3ab2efef13d..c4697da0c44 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -280,12 +280,12 @@ _FUNCTION_ { I64_prefix = 1; format += 2; } - break; + /* fall through */ #if _MSVCR_VER == 0 || _MSVCR_VER >= 140 case 'z': if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; - break; #endif + break; default: prefix_finished = 1; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index e175342796b..ea897c3e09a 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -74,6 +74,7 @@ static void test_sscanf( void ) int hour=21,min=59,sec=20; int number,number_so_far; HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + DWORD_PTR result_ptr; p_sprintf = (void *)GetProcAddress( hmod, "sprintf" ); p_sscanf = (void *)GetProcAddress( hmod, "sscanf" ); @@ -264,6 +265,31 @@ static void test_sscanf( void ) if(ret == 14) ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + strcpy(buffer,"12345678901234"); + ret = p_sscanf(buffer, "%I64d", &result64); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = p_sprintf(buffer1, "%I64d", result64); + ok(ret==14 || broken(ret==10), "sprintf returned %d\n", ret); + if(ret == 14) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + + strcpy(buffer,"0x123456789"); + ret = p_sscanf(buffer, "%Ix", &result_ptr); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = p_sprintf(buffer1, "%#Ix", result_ptr); + if (sizeof(void*) == sizeof(LONGLONG)) + { + ok(ret==11, "sprintf returned %d\n", ret); + if(ret == 11) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + } + else + { + ok(ret==10, "sprintf returned %d\n", ret); + if(ret == 10) + ok(!strcmp("0x23456789", buffer1), "got %s, expected %s\n", buffer1, buffer); + } + /* Check %i according to bug 1878 */ strcpy(buffer,"123"); ret = p_sscanf(buffer, "%i", &result);

1 0

[PATCH v2 1/8] jscript: Implement proxy objects along with a private interface.
by Gabriel Ivăncescu 19 Oct '21

19 Oct '21

Native mshtml objects act like JS objects in IE9 modes and up (the JS engine is implemented in mshtml). This implements proxy JS objects for certain dispatch objects that export a new private (internal to Wine) interface in versions ES5 and up, to achieve the same behavior. It delegates as much as possible to mshtml to implement all quirks there. Props are queried by the underlying dispatch and accesses to them forwarded to the dispatch object. Since it's purely internal, the private interface is not part of any typelib, and for simplicity, it extends (inherits from) IDispatchEx, so we can just cast it as needed. Given certain conditions, we query IDispatch objects on demand for the interface. If it's available, we either create a JS proxy object that is associated with the dispatch object exposing the interface, or re-acquire another one (possibly dangling). It is also associated on the other end, so that we keep a 1:1 mapping between the JS proxy object and the actual dispatch object, to avoid having multiple JS proxy objects for the same mshtml object (which would result in different dispids on them, and subtle bugs). This keeps them both in sync at all times, on demand, without having to pre-create any objects, and deals with dynamic props and such automatically. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- There's only one caveat here: since the JS proxy object references the dispatch object, while the dispatch object is also associated to the JS proxy object, the JS proxy object must be kept alive even when its refcount is zero. We can't hold a reference from the dispatch object, because that would create a circular reference. In effect, we *need* to know *when* the JS proxy object has no references from jscript part, to release the dispatch object. But the dispatch object itself might still remain alive (if kept alive by mshtml refs), and the JS proxy object must also remain associated in this case, hence we keep it alive even when refcount == 0, but remove the proxy association on its side. This is slightly ugly, but it is the best approach I could think of, to avoid bugs or having to rely on more complicated hash table lookups. Keep in mind that we have to keep the JS proxy object alive as long as it is associated with the dispatch object, because it could have proxy props retrieved, and they must always match among multiple references of this object, if they refer to the same underlying mshtml object (we can't have different dispids or "reset" them). dlls/jscript/dispex.c | 210 +++++++++++++++++++++++++++++++++++--- dlls/jscript/engine.c | 17 ++- dlls/jscript/enumerator.c | 10 +- dlls/jscript/function.c | 98 +++++++++++++++++- dlls/jscript/jscript.h | 27 +++++ dlls/jscript/jsutils.c | 21 ++-- dlls/jscript/jsval.h | 2 +- dlls/jscript/object.c | 22 ++-- dlls/jscript/vbarray.c | 4 +- 9 files changed, 368 insertions(+), 43 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index c7e4ba9..0b834d8 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -33,6 +33,7 @@ static const GUID GUID_JScriptTypeInfo = {0xc59c6b12,0xf6c1,0x11cf,{0x88,0x35,0x typedef enum { PROP_JSVAL, PROP_BUILTIN, + PROP_PROXY, PROP_PROTREF, PROP_ACCESSOR, PROP_DELETED, @@ -50,6 +51,10 @@ struct _dispex_prop_t { const builtin_prop_t *p; DWORD ref; unsigned idx; + struct { + DISPID id; + DWORD flags; + } proxy; struct { jsdisp_t *getter; jsdisp_t *setter; @@ -199,6 +204,30 @@ static inline dispex_prop_t* alloc_prop(jsdisp_t *This, const WCHAR *name, prop_ return prop; } +static inline dispex_prop_t* alloc_proxy_prop(jsdisp_t *This, dispex_prop_t *prop, const WCHAR *name, DISPID id) +{ + unsigned flags, prop_flags; + + flags = prop_flags = This->proxy->lpVtbl->GetPropFlags(This->proxy, id); + + if(flags & PROPF_METHOD) + flags |= PROPF_WRITABLE | PROPF_CONFIGURABLE; + flags &= PROPF_ALL; + + if(prop) { + prop->type = PROP_PROXY; + prop->flags = flags; + }else { + prop = alloc_prop(This, name, PROP_PROXY, flags); + if(!prop) + return NULL; + } + + prop->u.proxy.id = id; + prop->u.proxy.flags = prop_flags; + return prop; +} + static dispex_prop_t *alloc_protref(jsdisp_t *This, const WCHAR *name, DWORD ref) { dispex_prop_t *ret; @@ -235,6 +264,23 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, pos = This->props[pos].bucket_next; } + if(This->proxy) { + DISPID id; + + if(FAILED(IDispatchEx_GetDispID((IDispatchEx*)This->proxy, (WCHAR*)name, make_grfdex(This->ctx, fdexNameCaseSensitive), &id))) + id = DISPID_UNKNOWN; + if(id == DISPID_UNKNOWN) { + *ret = NULL; + return S_OK; + } + prop = alloc_proxy_prop(This, NULL, name, id); + if(!prop) + return E_OUTOFMEMORY; + + *ret = prop; + return S_OK; + } + builtin = find_builtin_prop(This, name); if(builtin) { unsigned flags = builtin->flags; @@ -314,11 +360,28 @@ static HRESULT find_prop_name_prot(jsdisp_t *This, unsigned hash, const WCHAR *n static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, DWORD create_flags, dispex_prop_t **ret) { + unsigned hash = string_hash(name); dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(This, string_hash(name), name, &prop); + hres = find_prop_name_prot(This, hash, name, &prop); if(SUCCEEDED(hres) && (!prop || prop->type == PROP_DELETED)) { + if(This->proxy) { + DWORD fdex = make_grfdex(This->ctx, fdexNameEnsure | fdexNameCaseSensitive); + DISPID id; + + TRACE("creating proxy prop %s\n", debugstr_w(name)); + + hres = IDispatchEx_GetDispID((IDispatchEx*)This->proxy, (WCHAR*)name, fdex, &id); + if(FAILED(hres)) + return hres; + prop = alloc_proxy_prop(This, prop, name, id); + if(!prop) + return E_OUTOFMEMORY; + *ret = prop; + return S_OK; + } + TRACE("creating prop %s flags %x\n", debugstr_w(name), create_flags); if(prop) { @@ -356,7 +419,7 @@ static IDispatch *get_this(DISPPARAMS *dp) return NULL; } -static HRESULT convert_params(const DISPPARAMS *dp, jsval_t *buf, unsigned *argc, jsval_t **ret) +static HRESULT convert_params(script_ctx_t *ctx, const DISPPARAMS *dp, jsval_t *buf, unsigned *argc, jsval_t **ret) { jsval_t *argv; unsigned cnt; @@ -374,7 +437,7 @@ static HRESULT convert_params(const DISPPARAMS *dp, jsval_t *buf, unsigned *argc } for(i = 0; i < cnt; i++) { - hres = variant_to_jsval(dp->rgvarg+dp->cArgs-i-1, argv+i); + hres = variant_to_jsval(ctx, dp->rgvarg+dp->cArgs-i-1, argv+i); if(FAILED(hres)) { while(i--) jsval_release(argv[i]); @@ -419,6 +482,23 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) *r = jsval_obj(obj); } break; + case PROP_PROXY: + if(!(prop->u.proxy.flags & PROPF_METHOD)) { + hres = disp_propget(This->ctx, (IDispatch*)prop_obj->proxy, prop->u.proxy.id, r); + }else { + jsdisp_t *obj; + + hres = create_proxy_function(This->ctx, (IDispatchEx*)prop_obj->proxy, prop->u.proxy.id, prop->u.proxy.flags, &obj); + if(FAILED(hres)) + break; + + prop->type = PROP_JSVAL; + prop->u.val = jsval_obj(obj); + + jsdisp_addref(obj); + *r = jsval_obj(obj); + } + break; case PROP_JSVAL: hres = jsval_copy(prop->u.val, r); break; @@ -438,6 +518,8 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) ERR("type %d\n", prop->type); return E_FAIL; } + if(SUCCEEDED(hres)) + hres = convert_to_proxy(This->ctx, r); if(FAILED(hres)) { TRACE("fail %08x\n", hres); @@ -472,6 +554,10 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) return S_OK; } return prop->u.p->setter(This->ctx, This, val); + case PROP_PROXY: + if(!(prop->flags & PROPF_WRITABLE)) + return S_OK; + return disp_propput(This->ctx, (IDispatch*)This->proxy, prop->u.proxy.id, val); case PROP_PROTREF: case PROP_DELETED: if(!This->extensible) @@ -521,7 +607,8 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t HRESULT hres; switch(prop->type) { - case PROP_BUILTIN: { + case PROP_BUILTIN: + case PROP_PROXY: if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { WARN("%s is not a constructor\n", debugstr_w(prop->name)); return E_INVALIDARG; @@ -530,6 +617,17 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { vdisp_t vthis; + if(prop->type == PROP_PROXY) { + jsdisp_t *jsdisp = to_jsdisp(jsthis); + if(jsdisp) + jsthis = (IDispatch*)jsdisp->proxy; + if(jsthis != (IDispatch*)This->proxy) { + WARN("Incompatible this %p for proxy %p, id %d\n", jsthis, This->proxy, prop->u.proxy.id); + return E_UNEXPECTED; + } + return disp_call(This->ctx, jsthis, prop->u.proxy.id, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r); + } + if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(jsthis) @@ -542,8 +640,9 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t /* Function object calls are special case */ hres = Function_invoke(This, jsthis, flags, argc, argv, r); } + if(SUCCEEDED(hres)) + hres = convert_to_proxy(This->ctx, r); return hres; - } case PROP_PROTREF: return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, This->prototype->props+prop->u.ref, flags, argc, argv, r, caller); @@ -1563,7 +1662,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc jsval_t *argv, buf[6], r; unsigned argc; - hres = convert_params(pdp, buf, &argc, &argv); + hres = convert_params(This->ctx, pdp, buf, &argc, &argv); if(FAILED(hres)) break; @@ -1601,7 +1700,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc break; } - hres = variant_to_jsval(pdp->rgvarg+i, &val); + hres = variant_to_jsval(This->ctx, pdp->rgvarg+i, &val); if(FAILED(hres)) break; @@ -1618,8 +1717,19 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return leave_script(This->ctx, hres); } -static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) +static HRESULT delete_prop(jsdisp_t *prop_obj, dispex_prop_t *prop, BOOL *ret) { + if(prop->type == PROP_PROXY) { + BOOL deleted; + HRESULT hres = prop_obj->proxy->lpVtbl->DeleteProp(prop_obj->proxy, prop->u.proxy.id, &deleted); + if(SUCCEEDED(hres)) { + *ret = (hres == S_OK); + if(deleted) + prop->type = PROP_DELETED; + } + return hres; + } + if(!(prop->flags & PROPF_CONFIGURABLE)) { *ret = FALSE; return S_OK; @@ -1656,7 +1766,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst return S_OK; } - return delete_prop(prop, &b); + return delete_prop(This, prop, &b); } static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) @@ -1673,7 +1783,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID return DISP_E_MEMBERNOTFOUND; } - return delete_prop(prop, &b); + return delete_prop(This, prop, &b); } static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) @@ -1808,10 +1918,73 @@ HRESULT create_dispex(script_ctx_t *ctx, const builtin_info_t *builtin_info, jsd return S_OK; } +static const builtin_info_t proxy_dispex_info = { + JSCLASS_OBJECT, + {NULL, NULL, 0}, + 0, NULL, + NULL, + NULL +}; + +HRESULT convert_to_proxy(script_ctx_t *ctx, jsval_t *val) +{ + IWineDispatchProxyPrivate *proxy; + jsdisp_t **jsdisp_ref; + IDispatch *obj; + HRESULT hres; + + if(ctx->version < SCRIPTLANGUAGEVERSION_ES5 || !val || !is_object_instance(*val)) + return S_OK; + obj = get_object(*val); + if(!obj || to_jsdisp(obj)) + return S_OK; + + if(FAILED(IDispatch_QueryInterface(obj, &IID_IWineDispatchProxyPrivate, (void**)&proxy)) || !proxy) + return S_OK; + IDispatch_Release(obj); + + jsdisp_ref = proxy->lpVtbl->GetProxyFieldRef(proxy); + + if(*jsdisp_ref) { + /* Re-acquire the proxy if it's an old dangling proxy */ + if((*jsdisp_ref)->ref == 0) + (*jsdisp_ref)->proxy = proxy; + else + IDispatchEx_Release((IDispatchEx*)proxy); + + *val = jsval_obj(jsdisp_addref(*jsdisp_ref)); + return S_OK; + } + + hres = create_dispex(ctx, &proxy_dispex_info, ctx->object_prototype, jsdisp_ref); + if(FAILED(hres)) { + IDispatchEx_Release((IDispatchEx*)proxy); + return hres; + } + + (*jsdisp_ref)->props[0].type = PROP_PROXY; + (*jsdisp_ref)->props[0].u.proxy.id = DISPID_VALUE; + (*jsdisp_ref)->props[0].u.proxy.flags = proxy->lpVtbl->GetPropFlags(proxy, DISPID_VALUE); + (*jsdisp_ref)->proxy = proxy; + + *val = jsval_obj(*jsdisp_ref); + return S_OK; +} + void jsdisp_free(jsdisp_t *obj) { dispex_prop_t *prop; + /* If we are a proxy, stay alive and keep it associated with the disp, since + we can be re-acquired at some later point. When the underlying disp is + actually destroyed, it should let go and destroy us for real. */ + if(obj->proxy) { + IDispatchEx *disp = (IDispatchEx*)obj->proxy; + obj->proxy = NULL; + IDispatchEx_Release(disp); + return; + } + TRACE("(%p)\n", obj); for(prop = obj->props; prop < obj->props+obj->prop_cnt; prop++) { @@ -1931,6 +2104,8 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig if(is_class(jsfunc, JSCLASS_FUNCTION)) { hres = Function_invoke(jsfunc, jsthis, flags, argc, argv, r); + }else if(jsfunc->proxy) { + hres = disp_call_value(jsfunc->ctx, (IDispatch*)jsfunc->proxy, jsthis, flags, argc, argv, r); }else { vdisp_t vdisp; @@ -1944,6 +2119,8 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig hres = jsfunc->builtin_info->value_prop.invoke(jsfunc->ctx, &vdisp, flags, argc, argv, r); vdisp_release(&vdisp); } + if(SUCCEEDED(hres)) + hres = convert_to_proxy(jsfunc->ctx, r); return hres; } @@ -2082,7 +2259,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns heap_free(dp.rgvarg); if(SUCCEEDED(hres) && ret) - hres = variant_to_jsval(&retv, ret); + hres = variant_to_jsval(ctx, &retv, ret); VariantClear(&retv); return hres; } @@ -2148,7 +2325,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W if(!r) return S_OK; - hres = variant_to_jsval(&retv, r); + hres = variant_to_jsval(ctx, &retv, r); VariantClear(&retv); return hres; } @@ -2316,7 +2493,7 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val V_VT(&var) = VT_EMPTY; hres = disp_invoke(ctx, disp, id, INVOKE_PROPERTYGET, &dp, &var); if(SUCCEEDED(hres)) { - hres = variant_to_jsval(&var, val); + hres = variant_to_jsval(ctx, &var, val); VariantClear(&var); } return hres; @@ -2335,7 +2512,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) if(FAILED(hres) || !prop) return hres; - hres = delete_prop(prop, &b); + hres = delete_prop(obj, prop, &b); if(FAILED(hres)) return hres; return b ? S_OK : JS_E_INVALID_ACTION; @@ -2353,7 +2530,7 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) prop = get_prop(jsdisp, id); if(prop) - hres = delete_prop(prop, ret); + hres = delete_prop(jsdisp, prop, ret); else hres = DISP_E_MEMBERNOTFOUND; @@ -2424,7 +2601,7 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL hres = find_prop_name(jsdisp, string_hash(ptr), ptr, &prop); if(prop) { - hres = delete_prop(prop, ret); + hres = delete_prop(jsdisp, prop, ret); }else { *ret = TRUE; hres = S_OK; @@ -2480,6 +2657,7 @@ HRESULT jsdisp_get_own_property(jsdisp_t *obj, const WCHAR *name, BOOL flags_onl switch(prop->type) { case PROP_BUILTIN: + case PROP_PROXY: case PROP_JSVAL: desc->mask |= PROPF_WRITABLE; desc->explicit_value = TRUE; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 47b4e56..4ff4297 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -491,15 +491,24 @@ static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) { IObjectIdentity *identity; IUnknown *unk1, *unk2; + jsdisp_t *jsdisp; HRESULT hres; - if(disp1 == disp2) { - *ret = TRUE; + if(!disp1 || !disp2) { + *ret = (disp1 == disp2); return S_OK; } - if(!disp1 || !disp2) { - *ret = FALSE; + jsdisp = to_jsdisp(disp1); + if(jsdisp && jsdisp->proxy) + disp1 = (IDispatch*)jsdisp->proxy; + + jsdisp = to_jsdisp(disp2); + if(jsdisp && jsdisp->proxy) + disp2 = (IDispatch*)jsdisp->proxy; + + if(disp1 == disp2) { + *ret = TRUE; return S_OK; } diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index dea1940..eb6baf6 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -48,7 +48,7 @@ static inline EnumeratorInstance *enumerator_this(vdisp_t *jsthis) return is_vclass(jsthis, JSCLASS_ENUMERATOR) ? enumerator_from_vdisp(jsthis) : NULL; } -static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This) +static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This, script_ctx_t *ctx) { HRESULT hres; VARIANT nextitem; @@ -64,7 +64,7 @@ static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This) hres = IEnumVARIANT_Next(This->enumvar, 1, &nextitem, NULL); if (hres == S_OK) { - hres = variant_to_jsval(&nextitem, &This->item); + hres = variant_to_jsval(ctx, &nextitem, &This->item); VariantClear(&nextitem); if (FAILED(hres)) { @@ -138,7 +138,7 @@ static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla return hres; This->atend = FALSE; - hres = enumvar_get_next_item(This); + hres = enumvar_get_next_item(This, ctx); if(FAILED(hres)) return hres; } @@ -161,7 +161,7 @@ static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag if (This->enumvar) { - hres = enumvar_get_next_item(This); + hres = enumvar_get_next_item(This, ctx); if (FAILED(hres)) return hres; } @@ -276,7 +276,7 @@ static HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **re enumerator->enumvar = enumvar; enumerator->atend = !enumvar; - hres = enumvar_get_next_item(enumerator); + hres = enumvar_get_next_item(enumerator, ctx); if (FAILED(hres)) { jsdisp_release(&enumerator->dispex); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 318d6be..7cd83a3 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -54,6 +54,12 @@ typedef struct { const WCHAR *name; } NativeFunction; +typedef struct { + FunctionInstance function; + IDispatchEx *proxy; + DISPID id; +} ProxyFunction; + typedef struct { FunctionInstance function; FunctionInstance *target; @@ -340,7 +346,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un TRACE("\n"); - if(!(function = function_this(jsthis)) && (jsthis->flags & VDISP_JSDISP)) + if(!(function = function_this(jsthis)) && is_jsdisp(jsthis) && !get_jsdisp(jsthis)->proxy) return JS_E_FUNCTION_EXPECTED; if(argc) { @@ -707,6 +713,96 @@ HRESULT create_builtin_constructor(script_ctx_t *ctx, builtin_invoke_t value_pro return S_OK; } +static HRESULT ProxyFunction_call(script_ctx_t *ctx, FunctionInstance *func, IDispatch *this_disp, unsigned flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + ProxyFunction *function = (ProxyFunction*)func; + jsdisp_t *jsdisp; + + if(!this_disp) + this_disp = lookup_global_host(ctx); + + jsdisp = to_jsdisp(this_disp); + if(jsdisp) + this_disp = (IDispatch*)jsdisp->proxy; + if(this_disp != (IDispatch*)function->proxy) { + WARN("Incompatible this %p for proxy %p, id %d\n", this_disp, function->proxy, function->id); + return E_UNEXPECTED; + } + + return disp_call(ctx, this_disp, function->id, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r); +} + +static HRESULT ProxyFunction_toString(FunctionInstance *func, jsstr_t **ret) +{ + ProxyFunction *function = (ProxyFunction*)func; + BSTR name = NULL; + DWORD name_len; + jsstr_t *str; + WCHAR *ptr; + + static const WCHAR proxy_prefixW[] = L"\nfunction "; + static const WCHAR proxy_suffixW[] = L"() {\n [native code]\n}\n"; + + if(FAILED(IDispatchEx_GetMemberName(function->proxy, function->id, &name))) + name = NULL; + + name_len = name ? SysStringLen(name) : 0; + str = jsstr_alloc_buf(ARRAY_SIZE(proxy_prefixW) + ARRAY_SIZE(proxy_suffixW) + name_len - 2, &ptr); + if(!str) + return E_OUTOFMEMORY; + + memcpy(ptr, proxy_prefixW, sizeof(proxy_prefixW)); + ptr += ARRAY_SIZE(proxy_prefixW) - 1; + memcpy(ptr, name, name_len*sizeof(WCHAR)); + ptr += name_len; + memcpy(ptr, proxy_suffixW, sizeof(proxy_suffixW)); + + SysFreeString(name); + *ret = str; + return S_OK; +} + +static function_code_t *ProxyFunction_get_code(FunctionInstance *func) +{ + return NULL; +} + +static void ProxyFunction_destructor(FunctionInstance *func) +{ + ProxyFunction *function = (ProxyFunction*)func; + IDispatchEx_Release(function->proxy); +} + +static const function_vtbl_t ProxyFunctionVtbl = { + ProxyFunction_call, + ProxyFunction_toString, + ProxyFunction_get_code, + ProxyFunction_destructor +}; + +HRESULT create_proxy_function(script_ctx_t *ctx, IDispatchEx *proxy, DISPID id, DWORD flags, jsdisp_t **ret) +{ + ProxyFunction *function; + HRESULT hres; + + hres = create_function(ctx, NULL, &ProxyFunctionVtbl, sizeof(ProxyFunction), flags, FALSE, NULL, (void**)&function); + if(FAILED(hres)) + return hres; + + if(FAILED(hres)) { + jsdisp_release(&function->function.dispex); + return hres; + } + + function->proxy = proxy; + function->id = id; + IDispatchEx_AddRef(function->proxy); + + *ret = &function->function.dispex; + return S_OK; +} + static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *func, IDispatch *this_obj, unsigned flags, unsigned argc, jsval_t *argv, jsval_t *r) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 90a5e15..59f7cfc 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -47,6 +47,29 @@ #define SCRIPTLANGUAGEVERSION_ES5 0x102 #define SCRIPTLANGUAGEVERSION_ES6 0x103 +/* + * This is Wine jscript extension, used for mshtml objects so they act like JS objects. + * Extends IDispatchEx. + * + * NOTE: Keep in sync with mshtml_private.h in mshtml.dll + */ +DEFINE_GUID(IID_IWineDispatchProxyPrivate, 0xd359f2fe,0x5531,0x741b,0xa4,0x1a,0x5c,0xf9,0x2e,0xdc,0x97,0x1b); +typedef struct _IWineDispatchProxyPrivate IWineDispatchProxyPrivate; + +typedef struct { + IDispatchExVtbl dispex; + void* (STDMETHODCALLTYPE *GetProxyFieldRef)(IWineDispatchProxyPrivate *This); + DWORD (STDMETHODCALLTYPE *GetPropFlags)(IWineDispatchProxyPrivate *This, DISPID id); + HRESULT (STDMETHODCALLTYPE *DeleteProp)(IWineDispatchProxyPrivate *This, DISPID id, BOOL *deleted); + HRESULT (STDMETHODCALLTYPE *ToString)(IWineDispatchProxyPrivate *This, BSTR *string); +} IWineDispatchProxyPrivateVtbl; + +struct _IWineDispatchProxyPrivate { + const IWineDispatchProxyPrivateVtbl *lpVtbl; +}; + + + typedef struct _jsval_t jsval_t; typedef struct _jsstr_t jsstr_t; typedef struct _jsexcept_t jsexcept_t; @@ -91,6 +114,7 @@ typedef struct jsdisp_t jsdisp_t; extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN; HRESULT get_dispatch_typeinfo(ITypeInfo**) DECLSPEC_HIDDEN; +/* NOTE: Keep in sync with mshtml_private.h in mshtml.dll */ #define PROPF_ARGMASK 0x00ff #define PROPF_METHOD 0x0100 #define PROPF_CONSTR 0x0200 @@ -253,6 +277,7 @@ struct jsdisp_t { BOOL extensible; jsdisp_t *prototype; + IWineDispatchProxyPrivate *proxy; const builtin_info_t *builtin_info; }; @@ -302,6 +327,7 @@ enum jsdisp_enum_type { HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; +HRESULT convert_to_proxy(script_ctx_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_call_value(script_ctx_t*,IDispatch*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; @@ -333,6 +359,7 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,cons jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_builtin_constructor(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_proxy_function(script_ctx_t*,IDispatchEx*,DISPID,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT Function_invoke(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT Function_value(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 3c3cd01..1b1b904 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -246,7 +246,7 @@ HRESULT jsval_copy(jsval_t v, jsval_t *r) return E_FAIL; } -HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) +HRESULT variant_to_jsval(script_ctx_t *ctx, VARIANT *var, jsval_t *r) { if(V_VT(var) == (VT_VARIANT|VT_BYREF)) var = V_VARIANTREF(var); @@ -285,7 +285,7 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) if(V_DISPATCH(var)) IDispatch_AddRef(V_DISPATCH(var)); *r = jsval_disp(V_DISPATCH(var)); - return S_OK; + return convert_to_proxy(ctx, r); } case VT_I1: *r = jsval_number(V_I1(var)); @@ -329,7 +329,7 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) hres = IUnknown_QueryInterface(V_UNKNOWN(var), &IID_IDispatch, (void**)&disp); if(SUCCEEDED(hres)) { *r = jsval_disp(disp); - return S_OK; + return convert_to_proxy(ctx, r); } }else { *r = jsval_disp(NULL); @@ -343,6 +343,8 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) { + IDispatch *disp; + switch(jsval_type(val)) { case JSV_UNDEFINED: V_VT(retv) = VT_EMPTY; @@ -352,9 +354,14 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) return S_OK; case JSV_OBJECT: V_VT(retv) = VT_DISPATCH; - if(get_object(val)) - IDispatch_AddRef(get_object(val)); - V_DISPATCH(retv) = get_object(val); + disp = get_object(val); + if(disp) { + jsdisp_t *jsdisp = to_jsdisp(disp); + if(jsdisp && jsdisp->proxy) + disp = (IDispatch*)jsdisp->proxy; + IDispatch_AddRef(disp); + } + V_DISPATCH(retv) = disp; return S_OK; case JSV_STRING: V_VT(retv) = VT_BSTR; @@ -884,7 +891,7 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY jsval_t val; HRESULT hres; - hres = variant_to_jsval(src, &val); + hres = variant_to_jsval(ctx, src, &val); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index 9f451b1..c79bef4 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -241,7 +241,7 @@ static inline BOOL get_bool(jsval_t v) return __JSVAL_BOOL(v); } -HRESULT variant_to_jsval(VARIANT*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT variant_to_jsval(script_ctx_t*,VARIANT*,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsval_to_variant(jsval_t,VARIANT*) DECLSPEC_HIDDEN; void jsval_release(jsval_t) DECLSPEC_HIDDEN; HRESULT jsval_copy(jsval_t,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 169b47c..c107ed7 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -29,6 +29,8 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u { jsdisp_t *jsdisp; const WCHAR *str; + BSTR bstr = NULL; + jsstr_t *ret; /* Keep in sync with jsclass_t enum */ static const WCHAR *names[] = { @@ -54,9 +56,17 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u TRACE("\n"); + if(!r) + return S_OK; + jsdisp = get_jsdisp(jsthis); if(!jsdisp) { str = L"[object Object]"; + }else if(jsdisp->proxy) { + HRESULT hres = jsdisp->proxy->lpVtbl->ToString(jsdisp->proxy, &bstr); + if(FAILED(hres)) + return hres; + str = bstr; }else if(names[jsdisp->builtin_info->class]) { str = names[jsdisp->builtin_info->class]; }else { @@ -65,13 +75,11 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u return E_FAIL; } - if(r) { - jsstr_t *ret; - ret = jsstr_alloc(str); - if(!ret) - return E_OUTOFMEMORY; - *r = jsval_string(ret); - } + ret = jsstr_alloc(str); + SysFreeString(bstr); + if(!ret) + return E_OUTOFMEMORY; + *r = jsval_string(ret); return S_OK; } diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 69a77f1..3294ee6 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -96,7 +96,7 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un return hres; if(r) { - hres = variant_to_jsval(&out, r); + hres = variant_to_jsval(ctx, &out, r); VariantClear(&out); } return hres; @@ -166,7 +166,7 @@ static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un } for(i=0; i<size; i++) { - hres = variant_to_jsval(v, &val); + hres = variant_to_jsval(ctx, v, &val); if(SUCCEEDED(hres)) { hres = jsdisp_propput_idx(array, i, val); jsval_release(val); -- 2.31.1

3 13

[PATCH] ctype.h: Add _isctype_l() declaration.
by Francois Gouget 19 Oct '21

19 Oct '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- include/msvcrt/ctype.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h index be99f7409e4..312888c3cfc 100644 --- a/include/msvcrt/ctype.h +++ b/include/msvcrt/ctype.h @@ -24,6 +24,7 @@ _ACRTIMP int __cdecl __iscsymf(int); _ACRTIMP int __cdecl __toascii(int); _ACRTIMP int __cdecl _isblank_l(int,_locale_t); _ACRTIMP int __cdecl _isctype(int,int); +_ACRTIMP int __cdecl _isctype_l(int,int,_locale_t); _ACRTIMP int __cdecl _tolower(int); _ACRTIMP int __cdecl _tolower_l(int,_locale_t); _ACRTIMP int __cdecl _toupper(int); -- 2.30.2

2 1

[PATCH 3/5] msi: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/msi/package.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 23e938f1759..7488c095080 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -527,7 +527,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!RegCreateKeyExW(netsetup, L"v4\\Client", 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) { - size = ARRAY_SIZE(path); + size = sizeof(path); if (!RegQueryValueExW(hkey, L"InstallPath", NULL, &type, (BYTE *)path, &size)) { len = lstrlenW(path) + lstrlenW(L"fusion.dll") + 2; @@ -782,12 +782,12 @@ static VOID set_installer_properties(MSIPACKAGE *package) PathAddBackslashW( pth ); msi_set_property( package->db, L"SystemFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFilesFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFilesFolder", pth, -1 ); @@ -806,22 +806,22 @@ static VOID set_installer_properties(MSIPACKAGE *package) PathAddBackslashW( pth ); msi_set_property( package->db, L"SystemFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFiles64Folder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir (x86)", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFilesFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFiles64Folder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir (x86)", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFilesFolder", pth, -1 ); -- 2.32.0

2 1

[PATCH 5/5] shell32: Pass size in bytes to RegLoadMUIStringW() and RegQueryValueExW().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/shell32/classes.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 0087cc3c276..84784733853 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -212,11 +212,11 @@ static BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey) static BOOL HCR_RegGetDefaultIconW(HKEY hkey, LPWSTR szDest, DWORD len, int* picon_idx) { - DWORD dwType; + DWORD dwType, size = len * sizeof(WCHAR); WCHAR sTemp[MAX_PATH]; WCHAR sNum[5]; - if (!RegQueryValueExW(hkey, NULL, 0, &dwType, (LPBYTE)szDest, &len)) + if (!RegQueryValueExW(hkey, NULL, 0, &dwType, (LPBYTE)szDest, &size)) { if (dwType == REG_EXPAND_SZ) { @@ -316,13 +316,13 @@ BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len) { HKEY hkey; BOOL ret = FALSE; - DWORD buflen = len; + DWORD buflen = len * sizeof(WCHAR); szDest[0] = 0; if (HCR_RegOpenClassIDKey(riid, &hkey)) { - if (!RegLoadMUIStringW(hkey, L"LocalizedString", szDest, len, NULL, 0, NULL) || - !RegQueryValueExW(hkey, L"", 0, NULL, (LPBYTE)szDest, &len)) + if (!RegLoadMUIStringW(hkey, L"LocalizedString", szDest, buflen, NULL, 0, NULL) || + !RegQueryValueExW(hkey, L"", 0, NULL, (LPBYTE)szDest, &buflen)) { ret = TRUE; } @@ -333,12 +333,12 @@ BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len) { if(IsEqualIID(riid, &CLSID_ShellDesktop)) { - if (LoadStringW(shell32_hInstance, IDS_DESKTOP, szDest, buflen)) + if (LoadStringW(shell32_hInstance, IDS_DESKTOP, szDest, len)) ret = TRUE; } else if (IsEqualIID(riid, &CLSID_MyComputer)) { - if(LoadStringW(shell32_hInstance, IDS_MYCOMPUTER, szDest, buflen)) + if(LoadStringW(shell32_hInstance, IDS_MYCOMPUTER, szDest, len)) ret = TRUE; } } -- 2.32.0

1 0

[PATCH 4/5] mshtml: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index ae94f224fac..4224d6a2ac4 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -707,7 +707,7 @@ static WCHAR *find_wine_gecko_reg(void) if(res != ERROR_SUCCESS) return NULL; - size = ARRAY_SIZE(buffer); + size = sizeof(buffer); res = RegQueryValueExW(hkey, L"GeckoPath", NULL, &type, (LPBYTE)buffer, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS || type != REG_SZ) -- 2.32.0

1 0

[PATCH 2/5] msctf: Set size before calling RegQueryValueExW().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/msctf/inputprocessor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index ac7fad67548..5e687f5ccc9 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -432,6 +432,7 @@ static HRESULT WINAPI InputProcessorProfiles_GetDefaultLanguageProfile( } CLSIDFromString(buf,pclsid); + count = sizeof(buf); res = RegQueryValueExW(hkey, szwProfile, 0, NULL, (LPBYTE)buf, &count); if (res == ERROR_SUCCESS) CLSIDFromString(buf,pguidProfile); -- 2.32.0

1 0

[PATCH 1/5] appwiz.cpl: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/appwiz.cpl/appwiz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 2bc108b63c6..410de81043d 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -542,7 +542,7 @@ static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage } else { - buflen = MAX_STRING_LEN; + buflen = sizeof(buf); if ((RegQueryValueExW(hKey, lpKeyName, 0, 0, (LPBYTE) buf, &buflen) == ERROR_SUCCESS) && buf[0]) -- 2.32.0

1 0

[PATCH 1/2] localspl: Add ARM print environments.
by Esme Povirk 19 Oct '21

19 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51815 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- This supersedes 217514. I took some liberties with the ARM environments. I haven't found an actual Windows machine with a 32-bit ARM print environment, but MS_RPRN implies that "Windows ARM" is a valid environment name. My Windows 10 machine does have a "Windows ARM64" environment but it only has driver version 4 in the registry, not 3. dlls/localspl/provider.c | 8 +++++++- dlls/winspool.drv/info.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index c17983e3037..d7c1464ef2c 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -245,10 +245,16 @@ static const printenv_t env_x86 = {x86_envnameW, L"w32x86", 3, static const printenv_t env_x64 = {L"Windows x64", L"x64", 3, L"\\Version-3", L"\\3"}; +static const printenv_t env_arm = {L"Windows ARM", L"arm", 3, + L"\\Version-3", L"\\3"}; + +static const printenv_t env_arm64 = {L"Windows ARM64", L"arm64", 3, + L"\\Version-3", L"\\3"}; + static const printenv_t env_win40 = {L"Windows 4.0", L"win40", 0, L"\\Version-0", L"\\0"}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_arm, &env_arm64, &env_win40}; static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W), diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index edfdab218c4..74617537a6b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -232,9 +232,13 @@ static const WCHAR WinNT_CV_PrinterPortsW[] = { 'S','o','f','t','w','a','r','e', static WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR envname_x64W[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; +static const WCHAR envname_armW[] = {'W','i','n','d','o','w','s',' ','A','R','M',0}; +static const WCHAR envname_arm64W[] = {'W','i','n','d','o','w','s',' ','A','R','M','6','4',0}; static const WCHAR subdir_win40W[] = {'w','i','n','4','0',0}; static const WCHAR subdir_x64W[] = {'x','6','4',0}; static const WCHAR subdir_x86W[] = {'w','3','2','x','8','6',0}; +static const WCHAR subdir_armW[] = {'a','r','m',0}; +static const WCHAR subdir_arm64W[] = {'a','r','m','6','4',0}; static const WCHAR Version0_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; static const WCHAR Version0_SubdirW[] = {'\\','0',0}; static const WCHAR Version3_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; @@ -310,9 +314,11 @@ static const DWORD pi_sizeof[] = {0, sizeof(PRINTER_INFO_1W), sizeof(PRINTER_INF static const printenv_t env_x64 = {envname_x64W, subdir_x64W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_x86 = {envname_x86W, subdir_x86W, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_arm = {envname_armW, subdir_armW, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_arm64 = {envname_arm64W, subdir_arm64W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_win40 = {envname_win40W, subdir_win40W, 0, Version0_RegPathW, Version0_SubdirW}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_arm, &env_arm64, &env_win40}; /****************************************************************** * validate the user-supplied printing-environment [internal] -- 2.30.2

2 3

[PATCH 1/6] dinput: Use object instance offset to access extra value caps.
by Rémi Bernon 19 Oct '21

19 Oct '21

Value objects are always enumerated first, so offset / sizeof(LONG) can be safely used to index input_extra_caps array. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 89 ++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a6715463690..9c1f75ec9ee 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -73,6 +73,11 @@ static inline const char *debugstr_hid_collection_node( struct hid_collection_no struct extra_caps { + LONG bit_size; + LONG logical_min; + LONG logical_max; + LONG range_min; + LONG range_max; LONG deadzone; LONG saturation; }; @@ -659,19 +664,18 @@ static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) static BOOL get_property_prop_range( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPRANGE *value = data; - value->lMin = caps->physical_min; - value->lMax = caps->physical_max; + value->lMin = extra->range_min; + value->lMax = extra->range_max; return DIENUM_STOP; } static BOOL get_property_prop_deadzone( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *deadzone = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); deadzone->dwData = extra->deadzone; return DIENUM_STOP; } @@ -679,10 +683,8 @@ static BOOL get_property_prop_deadzone( struct hid_joystick *impl, struct hid_va static BOOL get_property_prop_saturation( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *saturation = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); saturation->dwData = extra->saturation; return DIENUM_STOP; } @@ -781,22 +783,23 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con static BOOL set_property_prop_range( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPRANGE *value = data; LONG tmp; - caps->physical_min = value->lMin; - caps->physical_max = value->lMax; + extra->range_min = value->lMin; + extra->range_max = value->lMax; if (instance->dwType & DIDFT_AXIS) { - if (!caps->physical_min) tmp = caps->physical_max / 2; - else tmp = round( (caps->physical_min + caps->physical_max) / 2.0 ); + if (!extra->range_min) tmp = extra->range_max / 2; + else tmp = round( (extra->range_min + extra->range_max) / 2.0 ); *(LONG *)(impl->base.device_state + instance->dwOfs) = tmp; } else if (instance->dwType & DIDFT_POV) { - tmp = caps->logical_max - caps->logical_min; - if (tmp > 0) caps->physical_max -= value->lMax / (tmp + 1); + tmp = extra->logical_max - extra->logical_min; + if (tmp > 0) extra->range_max -= value->lMax / (tmp + 1); *(LONG *)(impl->base.device_state + instance->dwOfs) = -1; } return DIENUM_CONTINUE; @@ -805,10 +808,8 @@ static BOOL set_property_prop_range( struct hid_joystick *impl, struct hid_value static BOOL set_property_prop_deadzone( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *deadzone = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); extra->deadzone = deadzone->dwData; return DIENUM_CONTINUE; } @@ -816,10 +817,8 @@ static BOOL set_property_prop_deadzone( struct hid_joystick *impl, struct hid_va static BOOL set_property_prop_saturation( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *saturation = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); extra->saturation = saturation->dwData; return DIENUM_CONTINUE; } @@ -1357,29 +1356,34 @@ static BOOL check_device_state_button( struct hid_joystick *impl, struct hid_val return DIENUM_CONTINUE; } -static LONG sign_extend( ULONG value, struct hid_value_caps *caps ) +static LONG sign_extend( ULONG value, struct extra_caps *caps ) { UINT sign = 1 << (caps->bit_size - 1); if (sign <= 1 || caps->logical_min >= 0) return value; return value - ((value & sign) << 1); } -static LONG scale_value( ULONG value, struct hid_value_caps *caps, LONG min, LONG max ) +static LONG scale_value( ULONG value, struct extra_caps *caps ) { - LONG tmp = sign_extend( value, caps ); - if (caps->logical_min > tmp || caps->logical_max < tmp) return -1; /* invalid / null value */ - return min + MulDiv( tmp - caps->logical_min, max - min, caps->logical_max - caps->logical_min ); + LONG tmp = sign_extend( value, caps ), log_min, log_max, phy_min, phy_max; + log_min = caps->logical_min; + log_max = caps->logical_max; + phy_min = caps->range_min; + phy_max = caps->range_max; + + if (log_min > tmp || log_max < tmp) return -1; /* invalid / null value */ + return phy_min + MulDiv( tmp - log_min, phy_max - phy_min, log_max - log_min ); } -static LONG scale_axis_value( ULONG value, struct hid_value_caps *caps, struct extra_caps *extra ) +static LONG scale_axis_value( ULONG value, struct extra_caps *caps ) { LONG tmp = sign_extend( value, caps ), log_ctr, log_min, log_max, phy_ctr, phy_min, phy_max; ULONG bit_max = (1 << caps->bit_size) - 1; log_min = caps->logical_min; log_max = caps->logical_max; - phy_min = caps->physical_min; - phy_max = caps->physical_max; + phy_min = caps->range_min; + phy_max = caps->range_max; /* xinput HID gamepad have bogus logical value range, let's use the bit range instead */ if (log_min == 0 && log_max == -1) log_max = bit_max; @@ -1391,14 +1395,14 @@ static LONG scale_axis_value( ULONG value, struct hid_value_caps *caps, struct e tmp -= log_ctr; if (tmp <= 0) { - log_max = MulDiv( log_min - log_ctr, extra->deadzone, 10000 ); - log_min = MulDiv( log_min - log_ctr, extra->saturation, 10000 ); + log_max = MulDiv( log_min - log_ctr, caps->deadzone, 10000 ); + log_min = MulDiv( log_min - log_ctr, caps->saturation, 10000 ); phy_max = phy_ctr; } else { - log_min = MulDiv( log_max - log_ctr, extra->deadzone, 10000 ); - log_max = MulDiv( log_max - log_ctr, extra->saturation, 10000 ); + log_min = MulDiv( log_max - log_ctr, caps->deadzone, 10000 ); + log_max = MulDiv( log_max - log_ctr, caps->saturation, 10000 ); phy_min = phy_ctr; } @@ -1410,24 +1414,22 @@ static LONG scale_axis_value( ULONG value, struct hid_value_caps *caps, struct e static BOOL read_device_state_value( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); IDirectInputDevice8W *iface = &impl->base.IDirectInputDevice8W_iface; ULONG logical_value, report_len = impl->caps.InputReportByteLength; struct parse_device_state_params *params = data; char *report_buf = impl->input_report_buf; - struct extra_caps *extra; LONG old_value, value; NTSTATUS status; if (instance->wReportId != impl->base.device_state_report_id) return DIENUM_CONTINUE; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); status = HidP_GetUsageValue( HidP_Input, instance->wUsagePage, 0, instance->wUsage, &logical_value, impl->preparsed, report_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_GetUsageValue %04x:%04x returned %#x\n", instance->wUsagePage, instance->wUsage, status ); - if (instance->dwType & DIDFT_AXIS) value = scale_axis_value( logical_value, caps, extra ); - else value = scale_value( logical_value, caps, caps->physical_min, caps->physical_max ); + if (instance->dwType & DIDFT_AXIS) value = scale_axis_value( logical_value, extra ); + else value = scale_value( logical_value, extra ); old_value = *(LONG *)(params->old_state + instance->dwOfs); *(LONG *)(impl->base.device_state + instance->dwOfs) = value; @@ -1807,6 +1809,18 @@ static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTAN return DI_OK; } +static BOOL init_extra_caps( struct hid_joystick *impl, struct hid_value_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); + extra->bit_size = caps->bit_size; + extra->logical_min = caps->logical_min; + extra->logical_max = caps->logical_max; + extra->range_min = caps->physical_min; + extra->range_max = caps->physical_max; + return DIENUM_CONTINUE; +} + static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { @@ -2124,6 +2138,7 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID size = preparsed->input_caps_count * sizeof(struct extra_caps); if (!(extra = calloc( 1, size ))) goto failed; impl->input_extra_caps = extra; + enum_objects( impl, &filter, DIDFT_AXIS | DIDFT_POV, init_extra_caps, NULL ); size = impl->caps.InputReportByteLength; if (!(buffer = malloc( size ))) goto failed; -- 2.33.0

1 5

[PATCH] ws2_32/tests: Correct name of IPV6_V6ONLY socket option in messages
by Alex Henrie 19 Oct '21

19 Oct '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 63f8149f160..02713a7c625 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5650,7 +5650,7 @@ static void test_ipv6only(void) enabled = 2; ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); ret = bind(v6, (struct sockaddr*)&sin6, sizeof(sin6)); @@ -5662,26 +5662,26 @@ static void test_ipv6only(void) todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 0; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(!ret, "setsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "setsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "expected 0, got %d\n", enabled); } enabled = 1; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(!ret, "setsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "setsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); /* bind on IPv4 socket should succeed - IPV6_V6ONLY is enabled by default */ ret = bind(v4, (struct sockaddr*)&sin4, sizeof(sin4)); @@ -5690,26 +5690,26 @@ todo_wine { todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 0; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(ret, "setsockopt(IPV6_ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); + ok(ret, "setsockopt(IPV6_V6ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); todo_wine { enabled = 0; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 1; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(ret, "setsockopt(IPV6_ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); + ok(ret, "setsockopt(IPV6_V6ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); closesocket(v4); closesocket(v6); @@ -5728,7 +5728,7 @@ todo_wine { enabled = 2; ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "expected 0, got %d\n", enabled); /* @@ -5749,7 +5749,7 @@ todo_wine { enabled = 2; len = sizeof(enabled); getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "IPV6_V6ONLY is enabled after bind\n"); v4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); -- 2.33.1

2 1

[PATCH] comctl32/combo: Invalidate child edit control after painting themed background.
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Fix the edit control in a themed combo control not displaying text when clicking the combo control dropdown button. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/combo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 074f54f0937..4208ff8b9c9 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -789,6 +789,8 @@ static LRESULT COMBO_ThemedPaint(HTHEME theme, HEADCOMBO *lphc, HDC hdc) if ((lphc->dwStyle & CBS_DROPDOWNLIST) == CBS_DROPDOWNLIST) CBPaintText(lphc, hdc); + else + InvalidateRect(lphc->hWndEdit, NULL, TRUE); return 0; } -- 2.32.0

1 0

[PATCH 3/3] winemac.drv: Set hkey to NULL after RegCloseKey() in macdrv_init_gpu().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Although it's unlikely, RegCloseKey() may close an already closed key if the following SetupDiGetDeviceRegistryPropertyW() failed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b32c553d411..4a3b1ff39cb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1601,6 +1601,7 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) goto done; RegCloseKey(hkey); + hkey = NULL; /* Retrieve driver value for adapters */ if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), -- 2.32.0

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel