- 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

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