- wine-devel - winehq.org

[PATCH 2/2] win32u: Use a real family name as otmpFamilyName for substituted face.
by Akihiro Sagawa 08 Nov '21

08 Nov '21

GetTextFace remains to return the original face name, e.g. MS Shell Dlg. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 +- dlls/win32u/font.c | 26 +++++++++++++------------- dlls/win32u/ntgdi_private.h | 1 + 3 files changed, 15 insertions(+), 14 deletions(-)

2 1

[PATCH 1/2] gdi32/tests: Test substituted face family name.
by Akihiro Sagawa 08 Nov '21

08 Nov '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)

2 1

[PATCH v2 2/6] include: Add transact.idl to oledb.idl
by Alistair Leslie-Hughes 08 Nov '21

08 Nov '21

Since uuid.lib includes oledb.h, we get duplicate symbols in adsiid since uuid.lib is linked. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + libs/adsiid/adsiid.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/oledb.idl b/include/oledb.idl index 49c0c304b2d..b889d72bc38 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -79,6 +79,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstchg.idl" #include "rstupd.idl" #include "mulres.idl" +#include "transact.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/libs/adsiid/adsiid.c b/libs/adsiid/adsiid.c index fc0b8b1bf4e..e4e85d89b84 100644 --- a/libs/adsiid/adsiid.c +++ b/libs/adsiid/adsiid.c @@ -25,4 +25,3 @@ #include "initguid.h" #include "iads.h" -#include "transact.h" -- 2.33.0

2 1

[PATCH 1/7] dinput: Always call the device internal poll callback.
by Rémi Bernon 08 Nov '21

08 Nov '21

We normally should not peek messages here, but because of current winex11.drv design, we have to call MsgWaitForMultipleObjectsEx from time to time to pull keyboard or mouse events. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51956 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 3 +-- dlls/dinput/dinput_main.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d375229e2c0..c79b182bc66 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1535,10 +1535,9 @@ static HRESULT WINAPI dinput_device_Poll( IDirectInputDevice8W *iface ) EnterCriticalSection( &impl->crit ); if (!impl->acquired) hr = DIERR_NOTACQUIRED; LeaveCriticalSection( &impl->crit ); - if (hr != DI_OK) return hr; if (impl->vtbl->poll) return impl->vtbl->poll( iface ); - return DI_OK; + return hr; } static HRESULT WINAPI dinput_device_SendDeviceData( IDirectInputDevice8W *iface, DWORD size, diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 3286e887662..835a8656bd1 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1430,6 +1430,8 @@ void check_dinput_events(void) * (for example Culpa Innata) * - some games only poll the device, and neither keyboard nor mouse * (for example Civilization: Call to Power 2) + * - some games do not explicitly poll for keyboard events + * (for example Morrowind in its key binding page) */ MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); } -- 2.33.1

2 8

[PATCH v6 0/6] gdi32/win32u: EMF fixes to support Hancom Office 2020
by Jinoh Kang 08 Nov '21

08 Nov '21

The following commits modify the behaviours of the following GDI functions: - StretchDIBits - SetDIBitsToDevice To match more closely to that of Windows 10, build 2108, subject to the following constraints: - The source image is not a JPEG (BI_JPEG) or a PNG (BI_PNG) image. - The source image is a *bottom-up* device-independent bitmap. Changelog: - v1 -> v2: add more tests, do extra work so that EMF outputs match - v2 -> v3: emf_parse_user_bitmapinfo: zero out *dst (BITMAPINFOHEADER) (gdi32: allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC.) - v3 -> v4: no changes (resend due to borked up patch orders) - v4 -> v5: change subject (no more RFC); address review comments so far - v5 -> v6: remove two EMFDRV functions entirely clarify code in EMF DC patch uppercase subjects Jinoh Kang (6): win32u: Remove EMFDRV_StretchDIBits and EMFDRV_SetDIBitsToDevice. gdi32/tests: Add tests for recording StretchDIBits in EMFs. gdi32/tests: Add tests for recording SetDIBitsToDevice in EMFs. gdi32: Fix bounding box calculation for EMR_STRETCHDIBITS. gdi32: Allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC. gdi32: Calculate effective number of scan lines and truncate bitmap bits for EMR_SETDIBITSTODEVICE. dlls/gdi32/emfdc.c | 234 ++- dlls/gdi32/tests/metafile.c | 2803 +++++++++++++++++++++++++++++++++++ dlls/win32u/emfdrv.c | 22 +- 3 files changed, 3021 insertions(+), 38 deletions(-) -- 2.33.1

2 12

[PATCH] msiexec: Append .msi extension to file name if file is not found.
by Paul Gofman 08 Nov '21

08 Nov '21

Fixes Stellaris failing to install launcher at start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msi/tests/db.c | 18 ++++++++++++++++ programs/msiexec/msiexec.c | 44 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index eedfcac486d..b42cc90a955 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -64,6 +64,8 @@ static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) static void test_msidatabase(void) { MSIHANDLE hdb = 0, hdb2 = 0; + WCHAR path[MAX_PATH]; + DWORD len; UINT res; DeleteFileW(msifileW); @@ -162,6 +164,22 @@ static void test_msidatabase(void) res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + res = GetCurrentDirectoryW(ARRAY_SIZE(path), path); + ok ( res, "Got zero res.\n" ); + lstrcatW( path, L"\\"); + lstrcatW( path, msifileW); + len = lstrlenW(path); + path[len - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + + lstrcpyW( path, msifileW ); + path[lstrlenW(path) - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + res = DeleteFileA( msifile2 ); ok( res == TRUE, "Failed to delete database\n" ); diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index e25cc2659e6..e9e74f5c19e 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -588,6 +588,31 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg return ret; } +static WCHAR *get_path_with_extension(const WCHAR *package_name) +{ + static const WCHAR ext[] = L".msi"; + unsigned int p; + WCHAR *path; + + if (!(path = heap_alloc(lstrlenW(package_name) * sizeof(WCHAR) + sizeof(ext)))) + { + WINE_ERR("No memory.\n"); + return NULL; + } + + lstrcpyW(path, package_name); + p = lstrlenW(path); + while (p && path[p] != '.' && path[p] != L'\\' && path[p] != '/') + --p; + if (path[p] == '.') + { + heap_free(path); + return NULL; + } + lstrcatW(path, ext); + return path; +} + int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { int i; @@ -626,6 +651,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine DWORD ReturnCode; int argc; LPWSTR *argvW = NULL; + WCHAR *path; InitCommonControls(); @@ -1040,14 +1066,28 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine if(IsProductCode(PackageName)) ReturnCode = MsiConfigureProductExW(PackageName, 0, INSTALLSTATE_DEFAULT, Properties); else - ReturnCode = MsiInstallProductW(PackageName, Properties); + { + if ((ReturnCode = MsiInstallProductW(PackageName, Properties)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiInstallProductW(path, Properties); + heap_free(path); + } + } } else if(FunctionRepair) { if(IsProductCode(PackageName)) WINE_FIXME("Product code treatment not implemented yet\n"); else - ReturnCode = MsiReinstallProductW(PackageName, RepairMode); + { + if ((ReturnCode = MsiReinstallProductW(PackageName, RepairMode)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiReinstallProductW(path, RepairMode); + heap_free(path); + } + } } else if(FunctionAdvertise) { -- 2.33.1

2 1

[PATCH] msvcrt: printf: Later width specifiers should override earlier ones
by David Gow 08 Nov '21

08 Nov '21

From: Andrew Eikum <aeikum(a)codeweavers.com> This is a replacement for "msvcrt: The '*' character should be interpreted as the beginning of the width specification"[1], which matches the behaviour I see on my machine better. If a printf format string contains both a '*' (to specify that the field width should be read from a variable), followed by another explicit field width, only the latter field width should be used. For further details, see [2] and [3]. [1]: https://source.winehq.org/patches/data/218904 [2]: https://www.winehq.org/pipermail/wine-devel/2021-November/200039.html [3]: https://github.com/ValveSoftware/Proton/issues/5258#issuecomment-962423092 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Co-Developed-by: David Gow <david(a)davidgow.net> Signed-off-by: David Gow <david(a)davidgow.net> --- Note also that this moves the new tests after the setlocale(LC_ALL, "C"), as I don't think they need to run in a Japanese locale. --- dlls/msvcrt/printf.h | 8 +++++++- dlls/msvcrt/tests/printf.c | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index aeb1290f48f..6d2f02ee85b 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,7 +1050,13 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while (*p >= '0' && *p <= '9') { + + /* Ignore this length if there's another specifier. */ + if (*p >= '0' && *p <= '9') + flags.FieldLength = 0; + } + + while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 06acf4c8450..cc824f571a6 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -396,6 +396,26 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); setlocale(LC_ALL, "C"); + + r = p_sprintf(buffer, "%0*02d", 1, 0); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, "00"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*02d", 30, 17); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, "17"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%*1d", 1, 3); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "3"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*0d", 1, 2); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "2"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "% *2d", 0, 7); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, " 7"), "failed: \"%s\"\n", buffer); } static void test_swprintf( void ) -- 2.32.0

2 2

[PATCH] mfplay: Fix leaks on error paths (Coverity).
by Nikolay Sivov 08 Nov '21

08 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 12ea653b97d..5abee9d7de8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1024,6 +1024,15 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, IUnknown *object; HRESULT hr; + if (sync && !ret) + return E_POINTER; + + if (!sync && !player->callback) + { + WARN("Asynchronous item creation is not supported without user callback.\n"); + return MF_E_INVALIDREQUEST; + } + if (FAILED(hr = create_media_item(&player->IMFPMediaPlayer_iface, user_data, &item))) return hr; @@ -1035,9 +1044,6 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, if (sync) { - if (!ret) - return E_POINTER; - *ret = NULL; if (SUCCEEDED(hr = IMFSourceResolver_CreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, @@ -1054,17 +1060,9 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, } IMFPMediaItem_Release(&item->IMFPMediaItem_iface); - - return hr; } else { - if (!player->callback) - { - WARN("Asynchronous item creation is not supported without user callback.\n"); - return MF_E_INVALIDREQUEST; - } - if (ret) *ret = NULL; hr = IMFSourceResolver_BeginCreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, -- 2.33.0

1 0

[PATCH 1/2] mf/session: Implement IsRateSupported().
by Nikolay Sivov 08 Nov '21

08 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 80 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e3d77864494..c4dc6419b87 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3537,6 +3537,80 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA return hr; } +static HRESULT session_is_presentation_rate_supported(struct media_session *session, BOOL thin, float rate, + float *nearest_rate) +{ + IMFRateSupport *rate_support; + struct media_source *source; + struct media_sink *sink; + float value = 0.0f, tmp; + unsigned int flags; + HRESULT hr = S_OK; + + if (!nearest_rate) nearest_rate = &tmp; + + if (rate == 0.0f) + { + *nearest_rate = 1.0f; + return S_OK; + } + + EnterCriticalSection(&session->cs); + + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) + { + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + if (FAILED(hr = MFGetService((IUnknown *)source->source, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + (void **)&rate_support))) + { + value = 1.0f; + break; + } + + value = rate; + if (FAILED(hr = IMFRateSupport_IsRateSupported(rate_support, thin, rate, &value))) + WARN("Source does not support rate %f, hr %#x.\n", rate, hr); + IMFRateSupport_Release(rate_support); + + /* Only "first" source is considered. */ + break; + } + + if (SUCCEEDED(hr)) + { + /* For sinks only check if rate is supported, ignoring nearest values. */ + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) + { + flags = 0; + if (FAILED(hr = IMFMediaSink_GetCharacteristics(sink->sink, &flags))) + break; + + if (flags & MEDIASINK_RATELESS) + continue; + + if (FAILED(MFGetService((IUnknown *)sink->sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + (void **)&rate_support))) + continue; + + hr = IMFRateSupport_IsRateSupported(rate_support, thin, rate, NULL); + IMFRateSupport_Release(rate_support); + if (FAILED(hr)) + { + WARN("Sink %p does not support rate %f, hr %#x.\n", sink->sink, rate, hr); + break; + } + } + } + } + + LeaveCriticalSection(&session->cs); + + *nearest_rate = value; + + return hr; +} + static HRESULT WINAPI session_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { @@ -3560,9 +3634,11 @@ static HRESULT WINAPI session_rate_support_GetFastestRate(IMFRateSupport *iface, static HRESULT WINAPI session_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_supported_rate) { - FIXME("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + struct media_session *session = impl_session_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + + return session_is_presentation_rate_supported(session, thin, rate, nearest_supported_rate); } static const IMFRateSupportVtbl session_rate_support_vtbl = -- 2.33.0

1 1

[PATCH] include: Add define SQL_OV_ODBC3_80
by Alistair Leslie-Hughes 08 Nov '21

08 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sqlext.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sqlext.h b/include/sqlext.h index ba799a36bb3..51e76a5a856 100644 --- a/include/sqlext.h +++ b/include/sqlext.h @@ -64,6 +64,7 @@ extern "C" { #define SQL_OV_ODBC2 __MSABI_LONG(2U) #define SQL_OV_ODBC3 __MSABI_LONG(3U) +#define SQL_OV_ODBC3_80 __MSABI_LONG(380U) #endif #define SQL_ACCESS_MODE 101 -- 2.33.0

1 0

Re: [PATCH] msvcrt: The '*' character should be interpreted as the beginning of the width specification
by David Gow 08 Nov '21

08 Nov '21

In reply to Andrew Eikum: > > Signed-off-by: Andrew Eikum <aeikum at codeweavers.com> > --- > > For example, > > "%*0d", 1, ... > > becomes > > "%10d", ... > > i.e. prints ten digits. This doesn't seem to be correct to me. I've written a test program and built it with MSVC 2019: int main(int argc, char **argv) { printf("%0*02d\n",1,0); printf("%0*02d\n",30,17); printf("%*1d\n", 1, 3); printf("%0*0d\n", 1, 2); printf("% *2d\n", 0, 7); return 0; } The output on windows (and wine with native ucrtbase.dll) is: 00 17 3 2 7 The output with this patch is notably different: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 <absurd number of zeros elided>0000017 3 0000000002 7 I've uploaded a binary for said test program here: https://davidgow.net/stuff/TestPrintf.exe Similarly, Age of Empires IV shows an incorrect timer with this patch (the text under "Gold Medal (Goal…)" should read 00:17): https://davidgow.net/stuff/aoe4-printf-bigtime.jpg This diff to the patch fixes these issues (though it doesn't update the tests): diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 40a8a13d861..6df7fd66156 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,6 +1050,10 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } + + /* Ignore this length if there's another specifier. */ + if (*p >= '0' && *p <= '9') + flags.FieldLength = 0; } while (*p >= '0' && *p <= '9') { Cheers, -- David

2 2

[PATCH] add xinputuap.dll(fixed)
by Yusuf Khan 07 Nov '21

07 Nov '21

2 1

[PATCH v2 6/6] msdasql: Fix use after free (Coverity)
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index d093c3c2087..9b75f40a741 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -130,8 +130,8 @@ static void test_Properties(void) hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); - ok(propset->cProperties == 14, "got %d\n", propinfoset->cPropertyInfos); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propidlist.cPropertyIDs); + ok(propset->cProperties == 14, "got %d\n", propset->cProperties); for (i = 0; i < propidlist.cPropertyIDs; i++) { -- 2.33.0

1 0

[PATCH v2 5/6] msdasql: Correct default dialect logic
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 98a1fc50220..e52e8cd18d8 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -847,7 +847,7 @@ static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialec struct command *command = impl_from_ICommandText( iface ); TRACE("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); - if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) FIXME("Currently non Default Dialect isn't supported\n"); heap_free(command->query); -- 2.33.0

1 0

[PATCH v2 4/6] msdasql: Trace session interfaces.
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 10 ++++++++++ dlls/msdasql/tests/provider.c | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 0298c7e7424..98a1fc50220 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -102,6 +102,16 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IDBCreateCommand_iface %p)\n", iface, ppv); *ppv = &session->IDBCreateCommand_iface; } + else if(IsEqualGUID(&IID_IBindResource, riid)) + { + TRACE("(%p)->(IID_IBindResource not support)\n", iface); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_ICreateRow, riid)) + { + TRACE("(%p)->(IID_ICreateRow not support)\n", iface); + return E_NOINTERFACE; + } if(*ppv) { diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 6ffe17e7028..d093c3c2087 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -367,6 +367,8 @@ static void test_sessions(void) IDBCreateCommand *create_command = NULL; IGetDataSource *datasource = NULL; ISessionProperties *session_props = NULL; + IUnknown *unimplemented = NULL; + ITransactionJoin *join = NULL; IUnknown *cmd = NULL; HRESULT hr; BSTR connect_str; @@ -415,6 +417,17 @@ static void test_sessions(void) ok(hr == S_OK, "got 0x%08x\n", hr); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + ITransactionJoin_Release(join); + + hr = IUnknown_QueryInterface(session, &IID_IBindResource, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_ICreateRow, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(session, &IID_ISessionProperties, (void**)&session_props); ok(hr == S_OK, "got 0x%08x\n", hr); ISessionProperties_Release(session_props); -- 2.33.0

1 0

[PATCH v2 3/6] include: Add trnjoi.idl
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 28 +++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnjoi.idl | 42 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 include/trnjoi.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 8910070fbac..dc0f2261096 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1741,3 +1741,31 @@ HRESULT __RPC_STUB ICommandWithParameters_MapParameterNames_Stub(ICommandWithPar FIXME("(%p)->(%ld %p %p %p): stub\n", This, count, names, ordinals, error); return E_NOTIMPL; } + +HRESULT __RPC_STUB ITransactionJoin_GetOptionsObject_Stub(ITransactionJoin* This, + ITransactionOptions **options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %p): stub\n", This, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_GetOptionsObject_Proxy(ITransactionJoin *This, + ITransactionOptions **options) +{ + FIXME("(%p)->(%p): stub\n", This, options); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionJoin_JoinTransaction_Stub(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p, %p): stub\n", This, unk, level, flags, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_JoinTransaction_Proxy(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p): stub\n", This, unk, level, flags, options); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index a16cba52642..8c4eb732e57 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -720,6 +720,7 @@ SOURCES = \ tpcshrd.h \ traffic.h \ transact.idl \ + trnjoi.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index b889d72bc38..abd4d55069c 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -80,6 +80,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstupd.idl" #include "mulres.idl" #include "transact.idl" +#include "trnjoi.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnjoi.idl b/include/trnjoi.idl new file mode 100644 index 00000000000..fcc22ce5ea3 --- /dev/null +++ b/include/trnjoi.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2021 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a5e-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionJoin : IUnknown +{ + [local] + HRESULT GetOptionsObject(ITransactionOptions **options); + + [call_as(GetOptionsObject)] + HRESULT RemoteGetOptionsObject([out] ITransactionOptions **options, [out] IErrorInfo **error); + + [local] + HRESULT JoinTransaction(IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, ITransactionOptions *options); + + [call_as(JoinTransaction)] + HRESULT RemoteJoinTransaction([in, unique] IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, + [in] ITransactionOptions *options, [out] IErrorInfo **error); +} -- 2.33.0

1 0

[PATCH v2 1/6] msdasql: Implement IDBProperties SetProperties
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index d14f7957978..e58facc47fc 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -424,10 +424,27 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert DBPROPSET rgPropertySets[]) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i, j, k; - FIXME("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + TRACE("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); - return E_NOTIMPL; + for (i=0; i < cPropertySets; i++) + { + for (j=0; j < rgPropertySets[i].cProperties; j++) + { + for(k=0; k < ARRAY_SIZE(provider->properties); k++) + { + if (provider->properties[k].id == rgPropertySets[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property %d\n", provider->properties[k].id); + VariantCopy(&provider->properties[k].value, &rgPropertySets[i].rgProperties[j].vValue); + break; + } + } + } + } + + return S_OK; } static const struct IDBPropertiesVtbl dbprops_vtbl = -- 2.33.0

1 0

[PATCH 6/6] msdasql: Fix use after free (Coverity)
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 63a51c6f60e..61b5dfc807d 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -130,8 +130,8 @@ static void test_Properties(void) hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); - ok(propset->cProperties == 14, "got %d\n", propinfoset->cPropertyInfos); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propidlist.cPropertyIDs); + ok(propset->cProperties == 14, "got %d\n", propset->cProperties); for (i = 0; i < propidlist.cPropertyIDs; i++) { -- 2.33.0

2 1

[PATCH 4/6] msdasql: Trace unsupported session interfaces.
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 15 +++++++++++++++ dlls/msdasql/tests/provider.c | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 0298c7e7424..e42aa2e21f2 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -102,6 +102,21 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IDBCreateCommand_iface %p)\n", iface, ppv); *ppv = &session->IDBCreateCommand_iface; } + else if(IsEqualGUID(&IID_ITransactionJoin, riid)) + { + TRACE("(%p)->(IID_ITransactionJoin not support)\n", iface); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_IBindResource, riid)) + { + TRACE("(%p)->(IID_IBindResource not support)\n", iface); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_ICreateRow, riid)) + { + TRACE("(%p)->(IID_ICreateRow not support)\n", iface); + return E_NOINTERFACE; + } if(*ppv) { diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 6ffe17e7028..63a51c6f60e 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -367,6 +367,7 @@ static void test_sessions(void) IDBCreateCommand *create_command = NULL; IGetDataSource *datasource = NULL; ISessionProperties *session_props = NULL; + IUnknown *unimplemented = NULL; IUnknown *cmd = NULL; HRESULT hr; BSTR connect_str; @@ -415,6 +416,15 @@ static void test_sessions(void) ok(hr == S_OK, "got 0x%08x\n", hr); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_IBindResource, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_ICreateRow, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(session, &IID_ISessionProperties, (void**)&session_props); ok(hr == S_OK, "got 0x%08x\n", hr); ISessionProperties_Release(session_props); -- 2.33.0

2 1

[PATCH 5/6] msdasql: Correct default dialect logic
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index e42aa2e21f2..ca561685009 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -852,7 +852,7 @@ static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialec struct command *command = impl_from_ICommandText( iface ); TRACE("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); - if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) FIXME("Currently non Default Dialect isn't supported\n"); heap_free(command->query); -- 2.33.0

1 0

[PATCH 3/6] include: Add trnjoi.idl
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 28 +++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnjoi.idl | 42 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 include/trnjoi.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 8910070fbac..dc0f2261096 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1741,3 +1741,31 @@ HRESULT __RPC_STUB ICommandWithParameters_MapParameterNames_Stub(ICommandWithPar FIXME("(%p)->(%ld %p %p %p): stub\n", This, count, names, ordinals, error); return E_NOTIMPL; } + +HRESULT __RPC_STUB ITransactionJoin_GetOptionsObject_Stub(ITransactionJoin* This, + ITransactionOptions **options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %p): stub\n", This, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_GetOptionsObject_Proxy(ITransactionJoin *This, + ITransactionOptions **options) +{ + FIXME("(%p)->(%p): stub\n", This, options); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionJoin_JoinTransaction_Stub(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p, %p): stub\n", This, unk, level, flags, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_JoinTransaction_Proxy(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p): stub\n", This, unk, level, flags, options); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index a16cba52642..8c4eb732e57 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -720,6 +720,7 @@ SOURCES = \ tpcshrd.h \ traffic.h \ transact.idl \ + trnjoi.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index b889d72bc38..abd4d55069c 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -80,6 +80,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstupd.idl" #include "mulres.idl" #include "transact.idl" +#include "trnjoi.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnjoi.idl b/include/trnjoi.idl new file mode 100644 index 00000000000..fcc22ce5ea3 --- /dev/null +++ b/include/trnjoi.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2021 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a5e-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionJoin : IUnknown +{ + [local] + HRESULT GetOptionsObject(ITransactionOptions **options); + + [call_as(GetOptionsObject)] + HRESULT RemoteGetOptionsObject([out] ITransactionOptions **options, [out] IErrorInfo **error); + + [local] + HRESULT JoinTransaction(IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, ITransactionOptions *options); + + [call_as(JoinTransaction)] + HRESULT RemoteJoinTransaction([in, unique] IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, + [in] ITransactionOptions *options, [out] IErrorInfo **error); +} -- 2.33.0

1 0

[PATCH 2/6] include: Add transact.idl to oledb.idl
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Since uuid.lib includes oledb.h, we get duplicate symbols in adsiid since uuid.lib is linked. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + libs/adsiid/adsiid.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/oledb.idl b/include/oledb.idl index 49c0c304b2d..b889d72bc38 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -79,6 +79,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstchg.idl" #include "rstupd.idl" #include "mulres.idl" +#include "transact.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/libs/adsiid/adsiid.c b/libs/adsiid/adsiid.c index fc0b8b1bf4e..e4e85d89b84 100644 --- a/libs/adsiid/adsiid.c +++ b/libs/adsiid/adsiid.c @@ -25,4 +25,3 @@ #include "initguid.h" #include "iads.h" -#include "transact.h" -- 2.33.0

1 0

[PATCH 1/6] msdasql: Implement IDBProperties SetProperties
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index d14f7957978..e58facc47fc 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -424,10 +424,27 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert DBPROPSET rgPropertySets[]) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i, j, k; - FIXME("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + TRACE("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); - return E_NOTIMPL; + for (i=0; i < cPropertySets; i++) + { + for (j=0; j < rgPropertySets[i].cProperties; j++) + { + for(k=0; k < ARRAY_SIZE(provider->properties); k++) + { + if (provider->properties[k].id == rgPropertySets[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property %d\n", provider->properties[k].id); + VariantCopy(&provider->properties[k].value, &rgPropertySets[i].rgProperties[j].vValue); + break; + } + } + } + } + + return S_OK; } static const struct IDBPropertiesVtbl dbprops_vtbl = -- 2.33.0

1 0

[PATCH 1/3] include: Update existing provider definitions in uiautomationcore.idl.
by Connor McAdams 06 Nov '21

06 Nov '21

Update definitions to match newer Windows SDK headers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationcore.idl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index 3ae6dac4b3f..9ee79170e4a 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -26,7 +26,10 @@ enum ProviderOptions { ProviderOptions_NonClientAreaProvider = 0x0004, ProviderOptions_OverrideProvider = 0x0008, ProviderOptions_ProviderOwnsSetFocus = 0x0010, - ProviderOptions_UseComThreading = 0x0020 + ProviderOptions_UseComThreading = 0x0020, + ProviderOptions_RefuseNonClientSupport = 0x0040, + ProviderOptions_HasNativeIAccessible = 0x0080, + ProviderOptions_UseClientCoordinates = 0x0100, }; typedef int PROPERTYID; @@ -48,7 +51,8 @@ library UIA [ object, uuid(d6dd68d1-86fd-4332-8666-9abedea2d24c), - pointer_default(unique) + pointer_default(unique), + oleautomation ] interface IRawElementProviderSimple : IUnknown { -- 2.25.1

1 2

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

06 Nov '21

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

2 1

can we exclude builtin->CRT calls from relay logs?
by Esme Povirk (she/they) 06 Nov '21

06 Nov '21

An unfortunate effect of the PE conversion is that relay logs contain much more noise, as every call from a builtin dll into the CRT is now included in relay logs. I tend to either delete those lines using a regex search in vim, or add ucrtbase.* to RelayExclude. I don't think we want to make ucrtbase.* a default RelayExclude, as it would exclude calls from applications too, but maybe I'm wrong about that. A possible alternative would be to add an option which excludes the calls only if they come from a builtin dll. We could then add ucrtbase.* to this by default. Maybe call it RelayFromBuiltinExclude. Does this seem like a good idea? Does anyone have other thoughts? If there were a way to apply this to libmono as well, that'd be useful, as it has a similar issue, but I can't think of a simple design that would make that work.

2 1

Wine staging 6.21 release
by Alistair Leslie-Hughes 06 Nov '21

06 Nov '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Notes: dwarf4 debug information is now the default for wine-staging. Summary since last release * Rebased to current wine 6.21 (558 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * winex11.drv: Accumulate mouse movement to avoid rounding losses. * ntdll/tests: Move some tests to a new sync.c file. * ntdll/tests: Add some tests for Rtl* resources. * ntdll: Merge critsection.c into sync.c. * uiautomationcore: Add dll and stub some functions. Added: * [51957] Append .exe, if registry lookup fails first. Updated: * user32-rawinput-mouse * user32-rawinput-mouse-experimental Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] winegstreamer: Drop a debugstr from an out parameter
by Michael Stefaniuc 05 Nov '21

05 Nov '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 2f5659608a9..12d1f04c270 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1063,7 +1063,7 @@ static HRESULT WINAPI header_info_GetAttributeByIndexEx(IWMHeaderInfo3 *iface, { FIXME("iface %p, stream_number %u, index %u, name %p, name_len %p," " type %p, lang_index %p, value %p, size %p, stub!\n", - iface, stream_number, index, debugstr_w(name), name_len, type, lang_index, value, size); + iface, stream_number, index, name, name_len, type, lang_index, value, size); return E_NOTIMPL; } -- 2.31.1

1 0

[PATCH] msvcrt: The '*' character should be interpreted as the beginning of the width specification
by Andrew Eikum 05 Nov '21

05 Nov '21

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- For example, "%*0d", 1, ... becomes "%10d", ... i.e. prints ten digits. dlls/msvcrt/printf.h | 4 +++- dlls/msvcrt/tests/printf.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index aeb1290f48f..40a8a13d861 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,7 +1050,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while (*p >= '0' && *p <= '9') { + } + + while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 06acf4c8450..0dd25c3ba8b 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -395,6 +395,18 @@ static void test_sprintf( void ) ok(r==14, "r = %d\n", r); ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); + r = p_sprintf(buffer, "%*1d", 1, 3); + ok(r==11, "r = %d\n", r); + ok(!strcmp(buffer, " 3"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*0d", 1, 2); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "0000000002"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "% *2d", 0, 7); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, " 7"), "failed: \"%s\"\n", buffer); + setlocale(LC_ALL, "C"); } -- 2.33.1

2 2

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Introduce a helper to write SM4 code blocks.
by Giovanni Mascellani 05 Nov '21

05 Nov '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 97 +++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9d45e163..0a9aac2a 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1422,13 +1422,63 @@ static void write_sm4_swizzle(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } +static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_block *block) +{ + const struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) + { + if (instr->data_type) + { + if (instr->data_type->type == HLSL_CLASS_MATRIX) + { + FIXME("Matrix operations need to be lowered.\n"); + break; + } + else if (instr->data_type->type == HLSL_CLASS_OBJECT) + { + hlsl_fixme(ctx, instr->loc, "Object copy.\n"); + break; + } + + assert(instr->data_type->type == HLSL_CLASS_SCALAR || instr->data_type->type == HLSL_CLASS_VECTOR); + } + + switch (instr->type) + { + case HLSL_IR_CONSTANT: + write_sm4_constant(ctx, buffer, hlsl_ir_constant(instr)); + break; + + case HLSL_IR_EXPR: + write_sm4_expr(ctx, buffer, hlsl_ir_expr(instr)); + break; + + case HLSL_IR_LOAD: + write_sm4_load(ctx, buffer, hlsl_ir_load(instr)); + break; + + case HLSL_IR_STORE: + write_sm4_store(ctx, buffer, hlsl_ir_store(instr)); + break; + + case HLSL_IR_SWIZZLE: + write_sm4_swizzle(ctx, buffer, hlsl_ir_swizzle(instr)); + break; + + default: + FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); + } + } +} + static void write_sm4_shdr(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *entry_func, struct dxbc_writer *dxbc) { const struct hlsl_profile_info *profile = ctx->profile; struct vkd3d_bytecode_buffer buffer = {0}; const struct hlsl_buffer *cbuffer; - const struct hlsl_ir_node *instr; const struct hlsl_ir_var *var; size_t token_count_position; @@ -1472,50 +1522,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, if (ctx->temp_count) write_sm4_dcl_temps(&buffer, ctx->temp_count); - LIST_FOR_EACH_ENTRY(instr, &entry_func->body.instrs, struct hlsl_ir_node, entry) - { - if (instr->data_type) - { - if (instr->data_type->type == HLSL_CLASS_MATRIX) - { - FIXME("Matrix operations need to be lowered.\n"); - break; - } - else if (instr->data_type->type == HLSL_CLASS_OBJECT) - { - hlsl_fixme(ctx, instr->loc, "Object copy.\n"); - break; - } - - assert(instr->data_type->type == HLSL_CLASS_SCALAR || instr->data_type->type == HLSL_CLASS_VECTOR); - } - - switch (instr->type) - { - case HLSL_IR_CONSTANT: - write_sm4_constant(ctx, &buffer, hlsl_ir_constant(instr)); - break; - - case HLSL_IR_EXPR: - write_sm4_expr(ctx, &buffer, hlsl_ir_expr(instr)); - break; - - case HLSL_IR_LOAD: - write_sm4_load(ctx, &buffer, hlsl_ir_load(instr)); - break; - - case HLSL_IR_STORE: - write_sm4_store(ctx, &buffer, hlsl_ir_store(instr)); - break; - - case HLSL_IR_SWIZZLE: - write_sm4_swizzle(ctx, &buffer, hlsl_ir_swizzle(instr)); - break; - - default: - FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); - } - } + write_sm4_block(ctx, &buffer, &entry_func->body); write_sm4_ret(&buffer); -- 2.33.1

3 7

[v2 PATCH 1/7] d3d10/effect: Handle D3D10_SVT_UINT type when returning numeric values.
by Nikolay Sivov 05 Nov '21

05 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 4 +++ dlls/d3d10/tests/effect.c | 59 +++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5da8d2065f7..5e65ad3f4be 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4865,6 +4865,7 @@ static BOOL get_value_as_bool(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_typ { case D3D10_SVT_FLOAT: case D3D10_SVT_INT: + case D3D10_SVT_UINT: case D3D10_SVT_BOOL: if (*(DWORD *)src_data) return -1; @@ -4885,6 +4886,7 @@ static int get_value_as_int(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_type) return (int)(*(float *)src_data); case D3D10_SVT_INT: + case D3D10_SVT_UINT: return *(int *)src_data; case D3D10_SVT_BOOL: @@ -4903,6 +4905,7 @@ static float get_value_as_float(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_t return *(float *)src_data; case D3D10_SVT_INT: + case D3D10_SVT_UINT: return (float)(*(int *)src_data); case D3D10_SVT_BOOL: @@ -4933,6 +4936,7 @@ static void get_vector_as_type(BYTE *dst_data, D3D_SHADER_VARIABLE_TYPE dst_type break; case D3D10_SVT_INT: + case D3D10_SVT_UINT: *(int *)dst_data_dword = get_value_as_int(src_data_dword, src_type); break; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a8a64a6ed0d..149328301e1 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4843,43 +4843,32 @@ cbuffer cb float f0, f_a[2]; int i0, i_a[2]; bool b0, b_a[2]; + uint i1, i1_a[2]; }; #endif static DWORD fx_test_scalar_variable[] = { - 0x43425844, 0xe4da4aa6, 0x1380ddc5, 0x445edad5, - 0x08581666, 0x00000001, 0x0000020b, 0x00000001, - 0x00000024, 0x30315846, 0x000001df, 0xfeff1001, - 0x00000001, 0x00000006, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x000000d3, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x66006263, - 0x74616f6c, 0x00000700, 0x00000100, 0x00000000, - 0x00000400, 0x00001000, 0x00000400, 0x00090900, - 0x00306600, 0x00000007, 0x00000001, 0x00000002, - 0x00000014, 0x00000010, 0x00000008, 0x00000909, - 0x00615f66, 0x00746e69, 0x0000004c, 0x00000001, - 0x00000000, 0x00000004, 0x00000010, 0x00000004, - 0x00000911, 0x4c003069, 0x01000000, 0x02000000, - 0x14000000, 0x10000000, 0x08000000, 0x11000000, - 0x69000009, 0x6200615f, 0x006c6f6f, 0x0000008f, - 0x00000001, 0x00000000, 0x00000004, 0x00000010, - 0x00000004, 0x00000921, 0x8f003062, 0x01000000, - 0x02000000, 0x14000000, 0x10000000, 0x08000000, - 0x21000000, 0x62000009, 0x0400615f, 0x70000000, - 0x00000000, 0x06000000, 0xff000000, 0x00ffffff, - 0x29000000, 0x0d000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x48000000, - 0x2c000000, 0x00000000, 0x10000000, 0x00000000, - 0x00000000, 0x00000000, 0x6c000000, 0x50000000, - 0x00000000, 0x24000000, 0x00000000, 0x00000000, - 0x00000000, 0x8b000000, 0x6f000000, 0x00000000, - 0x30000000, 0x00000000, 0x00000000, 0x00000000, - 0xb0000000, 0x94000000, 0x00000000, 0x44000000, - 0x00000000, 0x00000000, 0x00000000, 0xcf000000, - 0xb3000000, 0x00000000, 0x50000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, + 0x43425844, 0x7d97f44c, 0x1da4b110, 0xb710407e, 0x26750c1c, 0x00000001, 0x00000288, 0x00000001, + 0x00000024, 0x30315846, 0x0000025c, 0xfeff1001, 0x00000001, 0x00000008, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000118, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x66006263, + 0x74616f6c, 0x00000700, 0x00000100, 0x00000000, 0x00000400, 0x00001000, 0x00000400, 0x00090900, + 0x00306600, 0x00000007, 0x00000001, 0x00000002, 0x00000014, 0x00000010, 0x00000008, 0x00000909, + 0x00615f66, 0x00746e69, 0x0000004c, 0x00000001, 0x00000000, 0x00000004, 0x00000010, 0x00000004, + 0x00000911, 0x4c003069, 0x01000000, 0x02000000, 0x14000000, 0x10000000, 0x08000000, 0x11000000, + 0x69000009, 0x6200615f, 0x006c6f6f, 0x0000008f, 0x00000001, 0x00000000, 0x00000004, 0x00000010, + 0x00000004, 0x00000921, 0x8f003062, 0x01000000, 0x02000000, 0x14000000, 0x10000000, 0x08000000, + 0x21000000, 0x62000009, 0x7500615f, 0x00746e69, 0x000000d3, 0x00000001, 0x00000000, 0x00000004, + 0x00000010, 0x00000004, 0x00000919, 0xd3003169, 0x01000000, 0x02000000, 0x14000000, 0x10000000, + 0x08000000, 0x19000000, 0x69000009, 0x00615f31, 0x00000004, 0x00000090, 0x00000000, 0x00000008, + 0xffffffff, 0x00000000, 0x00000029, 0x0000000d, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000048, 0x0000002c, 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0x00000000, + 0x0000006c, 0x00000050, 0x00000000, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x0000008b, + 0x0000006f, 0x00000000, 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0x000000b0, 0x00000094, + 0x00000000, 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x000000cf, 0x000000b3, 0x00000000, + 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x000000f4, 0x000000d8, 0x00000000, 0x00000064, + 0x00000000, 0x00000000, 0x00000000, 0x00000113, 0x000000f7, 0x00000000, 0x00000070, 0x00000000, + 0x00000000, 0x00000000, }; static void test_scalar_methods(ID3D10EffectScalarVariable *var, D3D10_SHADER_VARIABLE_TYPE type, @@ -5145,9 +5134,11 @@ static void test_effect_scalar_variable(void) { {"f0", D3D10_SVT_FLOAT}, {"i0", D3D10_SVT_INT}, + {"i1", D3D10_SVT_UINT}, {"b0", D3D10_SVT_BOOL}, {"f_a", D3D10_SVT_FLOAT, TRUE}, {"i_a", D3D10_SVT_INT, TRUE}, + {"i1_a", D3D10_SVT_UINT, TRUE}, {"b_a", D3D10_SVT_BOOL, TRUE}, }; ID3D10EffectScalarVariable *s_v, *s_v2; @@ -5178,7 +5169,7 @@ static void test_effect_scalar_variable(void) effect_desc.ConstantBuffers); ok(effect_desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", effect_desc.SharedConstantBuffers); - ok(effect_desc.GlobalVariables == 6, "Unexpected global variables count %u.\n", + ok(effect_desc.GlobalVariables == 8, "Unexpected global variables count %u.\n", effect_desc.GlobalVariables); ok(effect_desc.SharedGlobalVariables == 0, "Unexpected shared global variables count %u.\n", effect_desc.SharedGlobalVariables); -- 2.33.0

3 16

[PATCH] dbghelp/dwarf: don't skip functions when their inlined flag comes from an abstract origin
by Eric Pouech 05 Nov '21

05 Nov '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 269cfadd56c..d812e03f833 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2242,6 +2242,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di) * a concrete object that we'll handle */ if (dwarf2_find_attribute(di, DW_AT_inline, &inline_flags) && + inline_flags.gotten_from == attr_direct && inline_flags.u.uvalue != DW_INL_not_inlined) { TRACE("Function %s declared as inlined (%ld)... skipping\n",

1 0

[PATCH] winegstreamer: Print the debug string and not the pointer to it
by Michael Stefaniuc 05 Nov '21

05 Nov '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 2f5659608a9..3476f25ca16 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1061,7 +1061,7 @@ static HRESULT WINAPI header_info_GetAttributeByIndexEx(IWMHeaderInfo3 *iface, WORD stream_number, WORD index, WCHAR *name, WORD *name_len, WMT_ATTR_DATATYPE *type, WORD *lang_index, BYTE *value, DWORD *size) { - FIXME("iface %p, stream_number %u, index %u, name %p, name_len %p," + FIXME("iface %p, stream_number %u, index %u, name %s, name_len %p," " type %p, lang_index %p, value %p, size %p, stub!\n", iface, stream_number, index, debugstr_w(name), name_len, type, lang_index, value, size); return E_NOTIMPL; -- 2.31.1

2 1

[PATCH resend 1/2] winedbg: Adapt build_command_line() from winevdm
by Robbert van der Helm 05 Nov '21

05 Nov '21

The only difference between the two versions is that this one doesn't prefix the result with the command line's length. Signed-off-by: Robbert van der Helm <mail(a)robbertvanderhelm.nl> --- Instead of having having four almost identical copies of this function spread around Wine's code base (two for WCHAR*, two for char*), someone who's more familiar with Wine's code base than I am should probably merge these and move them to somewhere in `include/wine/`. --- programs/winedbg/tgt_active.c | 110 ++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 3372a001dfbb..ad46d6b5fc5e 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -770,6 +770,116 @@ static void output_system_info(void) } } +/*********************************************************************** + * build_command_line + * + * Build the command line of a process from the argv array. + * Copied from winevdm, which in turn adapted it from ENV_BuildCommandLine. The difference between + * this and the winevdm version is the command line is not prefixed with its length. + */ +static char *build_command_line(char **argv) +{ + int len; + char *p, **arg, *cmd_line; + + len = 0; + for (arg = argv; *arg; arg++) + { + BOOL has_space; + int bcount; + char* a; + + has_space=FALSE; + bcount=0; + a=*arg; + if( !*a ) has_space=TRUE; + while (*a!='\0') { + if (*a=='\\') { + bcount++; + } else { + if (*a==' ' || *a=='\t') { + has_space=TRUE; + } else if (*a=='"') { + /* doubling of '\' preceding a '"', + * plus escaping of said '"' + */ + len+=2*bcount+1; + } + bcount=0; + } + a++; + } + len+=(a-*arg)+1 /* for the separating space */; + if (has_space) + len+=2; /* for the quotes */ + } + + if (!(cmd_line = HeapAlloc( GetProcessHeap(), 0, len ? len : 1 ))) + return NULL; + + p = cmd_line; + for (arg = argv; *arg; arg++) + { + BOOL has_space,has_quote; + char* a; + + /* Check for quotes and spaces in this argument */ + has_space=has_quote=FALSE; + a=*arg; + if( !*a ) has_space=TRUE; + while (*a!='\0') { + if (*a==' ' || *a=='\t') { + has_space=TRUE; + if (has_quote) + break; + } else if (*a=='"') { + has_quote=TRUE; + if (has_space) + break; + } + a++; + } + + /* Now transfer it to the command line */ + if (has_space) + *p++='"'; + if (has_quote) { + int bcount; + + bcount=0; + a=*arg; + while (*a!='\0') { + if (*a=='\\') { + *p++=*a; + bcount++; + } else { + if (*a=='"') { + int i; + + /* Double all the '\\' preceding this '"', plus one */ + for (i=0;i<=bcount;i++) + *p++='\\'; + *p++='"'; + } else { + *p++=*a; + } + bcount=0; + } + a++; + } + } else { + strcpy(p,*arg); + p+=strlen(*arg); + } + if (has_space) + *p++='"'; + *p++=' '; + } + if (len) p--; /* remove last space */ + *p = '\0'; + return cmd_line; +} + /****************************************************************** * dbg_active_attach * -- 2.33.1

1 1

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

05 Nov '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- po/zh_TW.po | 1385 +++++++++++++++++++++------------------------------ 1 file changed, 579 insertions(+), 806 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index ed6a76e6349..b15c0445278 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-10-29 21:40+0800\n" +"PO-Revision-Date: 2021-10-30 18:53+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -1353,7 +1353,8 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"您可以按下 Caps Lock 鍵以解除大寫鎖定，然後再輸入密碼。" +"您可以按下 Caps Lock 鍵以解除大寫鎖定，\n" +"然後再輸入密碼。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -9633,7 +9634,7 @@ msgstr "Wine Internet Explorer" #: dlls/shdoclc/shdoclc.rc:33 msgid "&w&bPage &p" -msgstr "&w&b頁 &p" +msgstr "&w&b第 &p 頁" #: dlls/shell32/shell32.rc:30 dlls/shell32/shell32.rc:45 #: dlls/shell32/shell32.rc:122 dlls/shell32/shell32.rc:160 @@ -10244,1769 +10245,1627 @@ msgstr "選擇來源" #: dlls/tzres/tzres.rc:126 msgid "China Standard Time" -msgstr "" +msgstr "中國標準時間" #: dlls/tzres/tzres.rc:127 msgid "China Daylight Time" -msgstr "" +msgstr "中國夏令時間" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) 北京，重慶，香港，烏魯木齊" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" -msgstr "" +msgstr "北亞標準時間" #: dlls/tzres/tzres.rc:268 msgid "North Asia Daylight Time" -msgstr "" +msgstr "北亞夏令時間" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) 克拉斯諾雅斯克" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" -msgstr "" +msgstr "喬治亞標準時間" #: dlls/tzres/tzres.rc:169 msgid "Georgian Daylight Time" -msgstr "" +msgstr "喬治亞夏令時間" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) 提比里斯" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:392 msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "" +msgstr "(UTC+12:00) 世界協調時間+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" -msgstr "" +msgstr "尼泊爾標準時間" #: dlls/tzres/tzres.rc:253 msgid "Nepal Daylight Time" -msgstr "" +msgstr "尼泊爾夏令時間" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) 加德滿都" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" -msgstr "" +msgstr "維德角標準時間" #: dlls/tzres/tzres.rc:91 msgid "Cape Verde Daylight Time" -msgstr "" +msgstr "維德角夏令時間" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) 維德角群島" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Date and time" msgid "Haiti Standard Time" -msgstr "日期和時間" +msgstr "海地標準時間" #: dlls/tzres/tzres.rc:184 -#, fuzzy -#| msgid "Date and time" msgid "Haiti Daylight Time" -msgstr "日期和時間" +msgstr "海地夏令時間" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) 海地" #: dlls/tzres/tzres.rc:111 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "中歐語言" +msgstr "歐洲中部標準時間" #: dlls/tzres/tzres.rc:112 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "中歐語言" +msgstr "歐洲中部夏令時間" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) 賽拉耶佛，斯高彼亞，華沙，札格雷布" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" -msgstr "" +msgstr "摩洛哥標準時間" #: dlls/tzres/tzres.rc:235 msgid "Morocco Daylight Time" -msgstr "" +msgstr "摩洛哥夏令時間" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) 卡薩布蘭卡" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:401 msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "" +msgstr "(UTC-08:00) 世界協調時間-08" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Date and time" msgid "Altai Standard Time" -msgstr "日期和時間" +msgstr "阿爾泰標準時間" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Date and time" msgid "Altai Daylight Time" -msgstr "日期和時間" +msgstr "阿爾泰夏令時間" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) 巴爾瑙爾，戈爾諾-阿爾泰斯克" #: dlls/tzres/tzres.rc:108 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "中歐語言" +msgstr "中歐標準時間" #: dlls/tzres/tzres.rc:109 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "中歐語言" +msgstr "中歐夏令時間" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) 貝爾格勒，布拉迪斯拉瓦，布達佩斯，盧布亞那，布拉格" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" -msgstr "" +msgstr "伊朗標準時間" #: dlls/tzres/tzres.rc:193 msgid "Iran Daylight Time" -msgstr "" +msgstr "伊朗夏令時間" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) 德黑蘭" #: dlls/tzres/tzres.rc:318 -#, fuzzy -#| msgid "Date and time" msgid "Saint Pierre Standard Time" -msgstr "日期和時間" +msgstr "聖皮埃標準時間" #: dlls/tzres/tzres.rc:319 -#, fuzzy -#| msgid "Date and time" msgid "Saint Pierre Daylight Time" -msgstr "日期和時間" +msgstr "聖皮埃夏令時間" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Date and time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "日期和時間" +msgstr "(UTC-03:00) 聖皮埃與密克隆群島" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "&Standard bar" msgid "Sao Tome Standard Time" -msgstr "標準列(&S)" +msgstr "聖多美標準時間" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Date and time" msgid "Sao Tome Daylight Time" -msgstr "日期和時間" +msgstr "聖多美夏令時間" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) 聖多美" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" -msgstr "" +msgstr "納米比亞標準時間" #: dlls/tzres/tzres.rc:250 msgid "Namibia Daylight Time" -msgstr "" +msgstr "納米比亞夏令時間" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) 溫荷克" #: dlls/tzres/tzres.rc:366 msgid "Tonga Standard Time" -msgstr "" +msgstr "東加標準時間" #: dlls/tzres/tzres.rc:367 msgid "Tonga Daylight Time" -msgstr "" +msgstr "東加夏令時間" #: dlls/tzres/tzres.rc:368 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) 努瓜婁發" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" -msgstr "" +msgstr "山區標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:241 msgid "Mountain Daylight Time (Mexico)" -msgstr "" +msgstr "山區夏令時間 (墨西哥)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) 契瓦瓦，拉帕茲，馬薩特蘭" #: dlls/tzres/tzres.rc:171 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "標準列(&S)" +msgstr "GMT 標準時間" #: dlls/tzres/tzres.rc:172 msgid "GMT Daylight Time" -msgstr "" +msgstr "GMT 夏令時間" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) 都柏林，愛丁堡，里斯本，倫敦" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" -msgstr "" +msgstr "中亞標準時間" #: dlls/tzres/tzres.rc:103 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "中亞夏令時間" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) 努爾蘇丹" #: dlls/tzres/tzres.rc:213 -#, fuzzy -#| msgid "&Standard bar" msgid "Lord Howe Standard Time" -msgstr "標準列(&S)" +msgstr "豪勳爵島標準時間" #: dlls/tzres/tzres.rc:214 -#, fuzzy -#| msgid "Date and time" msgid "Lord Howe Daylight Time" -msgstr "日期和時間" +msgstr "豪勳爵島夏令時間" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) 豪勳爵島" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" -msgstr "" +msgstr "伊拉克標準時間" #: dlls/tzres/tzres.rc:49 msgid "Arabic Daylight Time" -msgstr "" +msgstr "伊拉克夏令時間" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) 巴格達" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:395 msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "" +msgstr "(UTC+13:00) 世界協調時間+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" -msgstr "" +msgstr "馬加丹標準時間" #: dlls/tzres/tzres.rc:217 msgid "Magadan Daylight Time" -msgstr "" +msgstr "馬加丹夏令時間" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) 馬加丹" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" -msgstr "" +msgstr "紐芬蘭標準時間" #: dlls/tzres/tzres.rc:259 msgid "Newfoundland Daylight Time" -msgstr "" +msgstr "紐芬蘭夏令時間" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) 紐芬蘭" #: dlls/tzres/tzres.rc:345 -#, fuzzy -#| msgid "Date and time" msgid "Sudan Standard Time" -msgstr "日期和時間" +msgstr "蘇丹標準時間" #: dlls/tzres/tzres.rc:346 -#, fuzzy -#| msgid "Date and time" msgid "Sudan Daylight Time" -msgstr "日期和時間" +msgstr "蘇丹夏令時間" #: dlls/tzres/tzres.rc:347 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) 喀土穆" #: dlls/tzres/tzres.rc:435 msgid "West Pacific Standard Time" -msgstr "" +msgstr "西太平洋標準時間" #: dlls/tzres/tzres.rc:436 msgid "West Pacific Daylight Time" -msgstr "" +msgstr "西太平洋夏令時間" #: dlls/tzres/tzres.rc:437 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) 關島，莫爾斯貝港" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" -msgstr "" +msgstr "太平洋標準時間" #: dlls/tzres/tzres.rc:280 msgid "Pacific Daylight Time" -msgstr "" +msgstr "太平洋夏令時間" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) 太平洋時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "亞塞拜然標準時間" #: dlls/tzres/tzres.rc:70 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "亞塞拜然夏令時間" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) 巴庫" #: dlls/tzres/tzres.rc:219 -#, fuzzy -#| msgid "Date and time" msgid "Magallanes Standard Time" -msgstr "日期和時間" +msgstr "麥哲倫標準時間" #: dlls/tzres/tzres.rc:220 -#, fuzzy -#| msgid "Date and time" msgid "Magallanes Daylight Time" -msgstr "日期和時間" +msgstr "麥哲倫夏令時間" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) 旁塔阿雷納斯" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" -msgstr "" +msgstr "薩摩亞標準時間" #: dlls/tzres/tzres.rc:325 msgid "Samoa Daylight Time" -msgstr "" +msgstr "薩摩亞夏令時間" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) 薩摩亞" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "加里寧格勒標準時間" #: dlls/tzres/tzres.rc:202 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "加里寧格勒夏令時間" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) 加里寧格勒" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" -msgstr "" +msgstr "太平洋標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:283 msgid "Pacific Daylight Time (Mexico)" -msgstr "" +msgstr "太平洋夏令時間 (墨西哥)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) 下加利福尼亞" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" -msgstr "" +msgstr "中東標準時間" #: dlls/tzres/tzres.rc:229 msgid "Middle East Daylight Time" -msgstr "" +msgstr "中東夏令時間" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) 貝魯特" #: dlls/tzres/tzres.rc:360 msgid "Tokyo Standard Time" -msgstr "" +msgstr "東京標準時間" #: dlls/tzres/tzres.rc:361 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "東京夏令時間" #: dlls/tzres/tzres.rc:362 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) 大阪，札幌，東京" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" -msgstr "" +msgstr "萊恩群島標準時間" #: dlls/tzres/tzres.rc:211 msgid "Line Islands Daylight Time" -msgstr "" +msgstr "萊恩群島夏令時間" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) 聖誕島" #: dlls/tzres/tzres.rc:129 -#, fuzzy -#| msgid "Date and time" msgid "Cuba Standard Time" -msgstr "日期和時間" +msgstr "古巴標準時間" #: dlls/tzres/tzres.rc:130 -#, fuzzy -#| msgid "Date and time" msgid "Cuba Daylight Time" -msgstr "日期和時間" +msgstr "古巴夏令時間" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) 哈瓦那" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" -msgstr "" +msgstr "約旦標準時間" #: dlls/tzres/tzres.rc:199 msgid "Jordan Daylight Time" -msgstr "" +msgstr "約旦夏令時間" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) 安曼" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" -msgstr "" +msgstr "中部標準時間" #: dlls/tzres/tzres.rc:118 msgid "Central Daylight Time" -msgstr "" +msgstr "中部夏令時間" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) 中部時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" -msgstr "" +msgstr "俄羅斯時區 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) 伊熱夫斯克，薩馬拉" #: dlls/tzres/tzres.rc:414 -#, fuzzy -#| msgid "&Standard bar" msgid "Volgograd Standard Time" -msgstr "標準列(&S)" +msgstr "伏爾加格勒標準時間" #: dlls/tzres/tzres.rc:415 -#, fuzzy -#| msgid "Date and time" msgid "Volgograd Daylight Time" -msgstr "日期和時間" +msgstr "伏爾加格勒夏令時間" #: dlls/tzres/tzres.rc:416 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) 伏爾加格勒" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" -msgstr "" +msgstr "亞述標準時間" #: dlls/tzres/tzres.rc:73 msgid "Azores Daylight Time" -msgstr "" +msgstr "亞述夏令時間" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) 亞述群島" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" -msgstr "" +msgstr "北亞東部標準時間" #: dlls/tzres/tzres.rc:265 msgid "North Asia East Daylight Time" -msgstr "" +msgstr "北亞東部夏令時間" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) 伊爾庫次克" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:407 msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "" +msgstr "(UTC-11:00) 世界協調時間-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" -msgstr "" +msgstr "阿根廷標準時間" #: dlls/tzres/tzres.rc:52 msgid "Argentina Daylight Time" -msgstr "" +msgstr "阿根廷夏令時間" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) 布宜諾斯艾利斯" #: dlls/tzres/tzres.rc:375 -#, fuzzy -#| msgid "&Standard bar" msgid "Turks And Caicos Standard Time" -msgstr "標準列(&S)" +msgstr "土克凱可標準時間" #: dlls/tzres/tzres.rc:376 -#, fuzzy -#| msgid "Date and time" msgid "Turks And Caicos Daylight Time" -msgstr "日期和時間" +msgstr "土克凱可夏令時間" #: dlls/tzres/tzres.rc:377 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) 土克凱可" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "&Standard bar" msgid "Marquesas Standard Time" -msgstr "標準列(&S)" +msgstr "馬克薩斯標準時間" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Date and time" msgid "Marquesas Daylight Time" -msgstr "日期和時間" +msgstr "馬克薩斯夏令時間" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) 馬克薩斯群島" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" -msgstr "" +msgstr "緬甸標準時間" #: dlls/tzres/tzres.rc:244 msgid "Myanmar Daylight Time" -msgstr "" +msgstr "緬甸夏令時間" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) 仰光" #: dlls/tzres/tzres.rc:387 dlls/tzres/tzres.rc:388 msgid "Coordinated Universal Time" -msgstr "" +msgstr "世界協調時間" #: dlls/tzres/tzres.rc:389 msgid "(UTC) Coordinated Universal Time" -msgstr "" +msgstr "(UTC) 世界協調時間" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" -msgstr "" +msgstr "印度標準時間" #: dlls/tzres/tzres.rc:190 msgid "India Daylight Time" -msgstr "" +msgstr "印度夏令時間" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) 清奈，加爾各答，孟買，新德里" #: dlls/tzres/tzres.rc:180 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "標準列(&S)" +msgstr "GTB 標準時間" #: dlls/tzres/tzres.rc:181 msgid "GTB Daylight Time" -msgstr "" +msgstr "GTB 夏令時間" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) 雅典，布加勒斯特" #: dlls/tzres/tzres.rc:372 msgid "Turkey Standard Time" -msgstr "" +msgstr "土耳其標準時間" #: dlls/tzres/tzres.rc:373 msgid "Turkey Daylight Time" -msgstr "" +msgstr "土耳其夏令時間" #: dlls/tzres/tzres.rc:374 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) 伊斯坦堡" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Date and time" msgid "Astrakhan Standard Time" -msgstr "日期和時間" +msgstr "阿斯特拉罕標準時間" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Date and time" msgid "Astrakhan Daylight Time" -msgstr "日期和時間" +msgstr "阿斯特拉罕夏令時間" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) 阿斯特拉罕，烏里揚諾夫斯克" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" -msgstr "" +msgstr "斐濟標準時間" #: dlls/tzres/tzres.rc:163 msgid "Fiji Daylight Time" -msgstr "" +msgstr "斐濟夏令時間" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) 斐濟" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" -msgstr "" +msgstr "加拿大中部標準時間" #: dlls/tzres/tzres.rc:88 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "加拿大中部夏令時間" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) 薩克其萬" #: dlls/tzres/tzres.rc:441 -#, fuzzy -#| msgid "Date and time" msgid "Yukon Standard Time" -msgstr "日期和時間" +msgstr "育空標準時間" #: dlls/tzres/tzres.rc:442 -#, fuzzy -#| msgid "Date and time" msgid "Yukon Daylight Time" -msgstr "日期和時間" +msgstr "育空夏令時間" #: dlls/tzres/tzres.rc:443 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) 育空" #: dlls/tzres/tzres.rc:351 msgid "Taipei Standard Time" -msgstr "" +msgstr "臺北標準時間" #: dlls/tzres/tzres.rc:352 msgid "Taipei Daylight Time" -msgstr "" +msgstr "臺北夏令時間" #: dlls/tzres/tzres.rc:353 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) 臺北" #: dlls/tzres/tzres.rc:423 msgid "W. Europe Standard Time" -msgstr "" +msgstr "西歐標準時間" #: dlls/tzres/tzres.rc:424 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "西歐夏令時間" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) 阿姆斯特丹，柏林，伯恩，羅馬，斯德哥爾摩，維也納" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" -msgstr "" +msgstr "蒙特維多標準時間" #: dlls/tzres/tzres.rc:232 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "蒙特維多夏令時間" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) 蒙特維多" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" -msgstr "" +msgstr "巴基斯坦標準時間" #: dlls/tzres/tzres.rc:286 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "巴基斯坦夏令時間" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) 伊斯蘭瑪巴德，卡拉奇" #: dlls/tzres/tzres.rc:363 -#, fuzzy -#| msgid "&Standard bar" msgid "Tomsk Standard Time" -msgstr "標準列(&S)" +msgstr "托木斯克標準時間" #: dlls/tzres/tzres.rc:364 -#, fuzzy -#| msgid "Date and time" msgid "Tomsk Daylight Time" -msgstr "日期和時間" +msgstr "托木斯克夏令時間" #: dlls/tzres/tzres.rc:365 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) 托木斯克" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" -msgstr "" +msgstr "高加索標準時間" #: dlls/tzres/tzres.rc:94 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "高加索夏令時間" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) 葉里溫" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "澳洲東部標準時間" #: dlls/tzres/tzres.rc:67 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "澳洲東部夏令時間" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) 坎培拉，墨爾本，雪梨" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" -msgstr "" +msgstr "中亞北部標準時間" #: dlls/tzres/tzres.rc:247 msgid "N. Central Asia Daylight Time" -msgstr "" +msgstr "中亞北部夏令時間" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) 新西伯利亞" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" -msgstr "" +msgstr "東部標準時間" #: dlls/tzres/tzres.rc:151 msgid "Eastern Daylight Time" -msgstr "" +msgstr "東部夏令時間" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) 東部時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:369 -#, fuzzy -#| msgid "Date and time" msgid "Transbaikal Standard Time" -msgstr "日期和時間" +msgstr "外貝加爾標準時間" #: dlls/tzres/tzres.rc:370 -#, fuzzy -#| msgid "Date and time" msgid "Transbaikal Daylight Time" -msgstr "日期和時間" +msgstr "外貝加爾夏令時間" #: dlls/tzres/tzres.rc:371 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) 赤塔" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "Central European" msgid "E. Europe Standard Time" -msgstr "中歐語言" +msgstr "東歐標準時間" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "Central European" msgid "E. Europe Daylight Time" -msgstr "中歐語言" +msgstr "東歐夏令時間" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) 基希涅夫" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" -msgstr "" +msgstr "中部標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:121 msgid "Central Daylight Time (Mexico)" -msgstr "" +msgstr "中部夏令時間 (墨西哥)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) 瓜達拉哈拉，墨西哥城，蒙特雷" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Date and time" msgid "Saratov Standard Time" -msgstr "日期和時間" +msgstr "薩拉托夫標準時間" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Date and time" msgid "Saratov Daylight Time" -msgstr "日期和時間" +msgstr "薩拉托夫夏令時間" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) 薩拉托夫" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" -msgstr "" +msgstr "大西洋標準時間" #: dlls/tzres/tzres.rc:58 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "大西洋夏令時間" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) 大西洋時間 (加拿大)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" -msgstr "" +msgstr "山區標準時間" #: dlls/tzres/tzres.rc:238 msgid "Mountain Daylight Time" -msgstr "" +msgstr "山區夏令時間" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) 山區時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:381 msgid "US Eastern Standard Time" -msgstr "" +msgstr "美國東部標準時間" #: dlls/tzres/tzres.rc:382 msgid "US Eastern Daylight Time" -msgstr "" +msgstr "美國東部夏令時間" #: dlls/tzres/tzres.rc:383 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) 印第安納 (東部)" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Date and time" msgid "Sakhalin Standard Time" -msgstr "日期和時間" +msgstr "庫頁島標準時間" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Date and time" msgid "Sakhalin Daylight Time" -msgstr "日期和時間" +msgstr "庫頁島夏令時間" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) 庫頁島" #: dlls/tzres/tzres.rc:270 -#, fuzzy -#| msgid "&Standard bar" msgid "North Korea Standard Time" -msgstr "標準列(&S)" +msgstr "北韓標準時間" #: dlls/tzres/tzres.rc:271 -#, fuzzy -#| msgid "Date and time" msgid "North Korea Daylight Time" -msgstr "日期和時間" +msgstr "北韓夏令時間" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) 平壤" #: dlls/tzres/tzres.rc:354 msgid "Tasmania Standard Time" -msgstr "" +msgstr "塔斯馬尼亞標準時間" #: dlls/tzres/tzres.rc:355 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "塔斯馬尼亞夏令時間" #: dlls/tzres/tzres.rc:356 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) 荷巴特" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" -msgstr "" +msgstr "中美洲標準時間" #: dlls/tzres/tzres.rc:100 msgid "Central America Daylight Time" -msgstr "" +msgstr "中美洲夏令時間" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) 中美洲" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:398 msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "" +msgstr "(UTC-02:00) 世界協調時間-02" #: dlls/tzres/tzres.rc:384 msgid "US Mountain Standard Time" -msgstr "" +msgstr "美國山區標準時間" #: dlls/tzres/tzres.rc:385 msgid "US Mountain Daylight Time" -msgstr "" +msgstr "美國山區夏令時間" #: dlls/tzres/tzres.rc:386 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) 亞利桑那" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" -msgstr "" +msgstr "南非標準時間" #: dlls/tzres/tzres.rc:340 msgid "South Africa Daylight Time" -msgstr "" +msgstr "南非夏令時間" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) 哈拉雷，普利托利亞" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" -msgstr "" +msgstr "澳洲中部標準時間" #: dlls/tzres/tzres.rc:97 msgid "Cen. Australia Daylight Time" -msgstr "" +msgstr "澳洲中部夏令時間" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) 阿得雷德" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:404 msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "" +msgstr "(UTC-09:00) 世界協調時間-09" #: dlls/tzres/tzres.rc:342 msgid "Sri Lanka Standard Time" -msgstr "" +msgstr "斯里蘭卡標準時間" #: dlls/tzres/tzres.rc:343 msgid "Sri Lanka Daylight Time" -msgstr "" +msgstr "斯里蘭卡夏令時間" #: dlls/tzres/tzres.rc:344 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) 斯里賈亞瓦德納普拉科特" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "" +msgstr "阿富汗標準時間" #: dlls/tzres/tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "" +msgstr "阿富汗夏令時間" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) 喀布爾" #: dlls/tzres/tzres.rc:438 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "雅庫次克標準時間" #: dlls/tzres/tzres.rc:439 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "雅庫次克夏令時間" #: dlls/tzres/tzres.rc:440 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) 雅庫次克" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" -msgstr "" +msgstr "南美洲東部標準時間" #: dlls/tzres/tzres.rc:310 msgid "SA Eastern Daylight Time" -msgstr "" +msgstr "南美洲東部夏令時間" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) 開雲，福塔萊薩" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" -msgstr "" +msgstr "沙烏地阿拉伯標準時間" #: dlls/tzres/tzres.rc:43 msgid "Arab Daylight Time" -msgstr "" +msgstr "沙烏地阿拉伯夏令時間" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) 科威特，利雅德" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" -msgstr "" +msgstr "阿拉伯標準時間" #: dlls/tzres/tzres.rc:46 msgid "Arabian Daylight Time" -msgstr "" +msgstr "阿拉伯夏令時間" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) 阿布達比，馬斯開特" #: dlls/tzres/tzres.rc:357 -#, fuzzy -#| msgid "Date and time" msgid "Tocantins Standard Time" -msgstr "日期和時間" +msgstr "托坎廷斯標準時間" #: dlls/tzres/tzres.rc:358 -#, fuzzy -#| msgid "Date and time" msgid "Tocantins Daylight Time" -msgstr "日期和時間" +msgstr "托坎廷斯夏令時間" #: dlls/tzres/tzres.rc:359 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) 阿拉瓜伊納" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" -msgstr "" +msgstr "俄羅斯標準時間" #: dlls/tzres/tzres.rc:307 msgid "Russian Daylight Time" -msgstr "" +msgstr "俄羅斯夏令時間" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) 莫斯科，聖彼得堡" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Central European" msgid "Aus Central W. Standard Time" -msgstr "中歐語言" +msgstr "澳洲中西部標準時間" #: dlls/tzres/tzres.rc:64 -#, fuzzy -#| msgid "Central European" msgid "Aus Central W. Daylight Time" -msgstr "中歐語言" +msgstr "澳洲中西部夏令時間" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) 尤克拉" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" -msgstr "" +msgstr "羅曼語區標準時間" #: dlls/tzres/tzres.rc:295 msgid "Romance Daylight Time" -msgstr "" +msgstr "羅曼語區夏令時間" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) 布魯塞爾，哥本哈根，馬德里，巴黎" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "葉卡捷琳堡標準時間" #: dlls/tzres/tzres.rc:160 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "葉卡捷琳堡夏令時間" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) 葉卡捷琳堡" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "俄羅斯時區 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) 阿納德爾，堪察加彼得巴甫洛夫斯克" #: dlls/tzres/tzres.rc:432 -#, fuzzy -#| msgid "Date and time" msgid "West Bank Standard Time" -msgstr "日期和時間" +msgstr "西岸標準時間" #: dlls/tzres/tzres.rc:433 -#, fuzzy -#| msgid "Date and time" msgid "West Bank Daylight Time" -msgstr "日期和時間" +msgstr "西岸夏令時間" #: dlls/tzres/tzres.rc:434 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) 加薩，希伯侖" #: dlls/tzres/tzres.rc:348 msgid "Syria Standard Time" -msgstr "" +msgstr "敘利亞標準時間" #: dlls/tzres/tzres.rc:349 msgid "Syria Daylight Time" -msgstr "" +msgstr "敘利亞夏令時間" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) 大馬士革" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" -msgstr "" +msgstr "澳洲中部標準時間" #: dlls/tzres/tzres.rc:61 msgid "AUS Central Daylight Time" -msgstr "" +msgstr "澳洲中部夏令時間" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) 達爾文" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" -msgstr "" +msgstr "格林威治標準時間" #: dlls/tzres/tzres.rc:178 msgid "Greenwich Daylight Time" -msgstr "" +msgstr "格林威治夏令時間" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) 蒙羅維亞，雷克雅維克" #: dlls/tzres/tzres.rc:378 msgid "Ulaanbaatar Standard Time" -msgstr "" +msgstr "烏蘭巴托標準時間" #: dlls/tzres/tzres.rc:379 msgid "Ulaanbaatar Daylight Time" -msgstr "" +msgstr "烏蘭巴托夏令時間" #: dlls/tzres/tzres.rc:380 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) 烏蘭巴托" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "&Standard bar" msgid "Norfolk Standard Time" -msgstr "標準列(&S)" +msgstr "諾福克標準時間" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Date and time" msgid "Norfolk Daylight Time" -msgstr "日期和時間" +msgstr "諾福克夏令時間" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) 諾福克島" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" -msgstr "" +msgstr "以色列標準時間" #: dlls/tzres/tzres.rc:196 msgid "Israel Daylight Time" -msgstr "" +msgstr "以色列夏令時間" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) 耶路撒冷" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "孟加拉標準時間" #: dlls/tzres/tzres.rc:79 msgid "Bangladesh Daylight Time" -msgstr "" +msgstr "孟加拉夏令時間" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) 達卡" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" -msgstr "" +msgstr "南美洲太平洋標準時間" #: dlls/tzres/tzres.rc:313 msgid "SA Pacific Daylight Time" -msgstr "" +msgstr "南美洲太平洋夏令時間" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) 波哥大，利馬，基多，里約布蘭科" #: dlls/tzres/tzres.rc:429 msgid "West Asia Standard Time" -msgstr "" +msgstr "西亞標準時間" #: dlls/tzres/tzres.rc:430 msgid "West Asia Daylight Time" -msgstr "" +msgstr "西亞夏令時間" #: dlls/tzres/tzres.rc:431 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) 阿什哈巴特，塔什干" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" -msgstr "" +msgstr "阿拉斯加標準時間" #: dlls/tzres/tzres.rc:34 msgid "Alaskan Daylight Time" -msgstr "" +msgstr "阿拉斯加夏令時間" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) 阿拉斯加" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" -msgstr "" +msgstr "巴拉圭標準時間" #: dlls/tzres/tzres.rc:289 msgid "Paraguay Daylight Time" -msgstr "" +msgstr "巴拉圭夏令時間" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) 亞松森" #: dlls/tzres/tzres.rc:132 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "日期和時間" +msgstr "換日線標準時間" #: dlls/tzres/tzres.rc:133 msgid "Dateline Daylight Time" -msgstr "" +msgstr "換日線夏令時間" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) 國際換日線以西" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" -msgstr "" +msgstr "利比亞標準時間" #: dlls/tzres/tzres.rc:208 msgid "Libya Daylight Time" -msgstr "" +msgstr "利比亞夏令時間" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) 的黎波里" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" -msgstr "" +msgstr "巴伊亞標準時間" #: dlls/tzres/tzres.rc:76 msgid "Bahia Daylight Time" -msgstr "" +msgstr "巴伊亞夏令時間" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) 薩爾瓦多" #: dlls/tzres/tzres.rc:408 msgid "Venezuela Standard Time" -msgstr "" +msgstr "委內瑞拉標準時間" #: dlls/tzres/tzres.rc:409 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "委內瑞拉夏令時間" #: dlls/tzres/tzres.rc:410 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) 卡拉卡斯" #: dlls/tzres/tzres.rc:84 -#, fuzzy -#| msgid "Date and time" msgid "Bougainville Standard Time" -msgstr "日期和時間" +msgstr "布干維爾標準時間" #: dlls/tzres/tzres.rc:85 -#, fuzzy -#| msgid "Date and time" msgid "Bougainville Daylight Time" -msgstr "日期和時間" +msgstr "布干維爾夏令時間" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) 布干維爾島" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "夏威夷標準時間" #: dlls/tzres/tzres.rc:187 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "夏威夷夏令時間" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) 夏威夷" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" -msgstr "" +msgstr "東南亞標準時間" #: dlls/tzres/tzres.rc:334 msgid "SE Asia Daylight Time" -msgstr "" +msgstr "東南亞夏令時間" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) 曼谷，河內，雅加達" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "&Standard bar" msgid "Qyzylorda Standard Time" -msgstr "標準列(&S)" +msgstr "克孜勒奧爾達標準時間" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Date and time" msgid "Qyzylorda Daylight Time" -msgstr "日期和時間" +msgstr "克孜勒奧爾達夏令時間" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) 克孜勒奧爾達" #: dlls/tzres/tzres.rc:426 -#, fuzzy -#| msgid "Date and time" msgid "W. Mongolia Standard Time" -msgstr "日期和時間" +msgstr "蒙古西部標準時間" #: dlls/tzres/tzres.rc:427 -#, fuzzy -#| msgid "Date and time" msgid "W. Mongolia Daylight Time" -msgstr "日期和時間" +msgstr "蒙古西部夏令時間" #: dlls/tzres/tzres.rc:428 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) 科布多城" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" -msgstr "" +msgstr "紐西蘭標準時間" #: dlls/tzres/tzres.rc:256 msgid "New Zealand Daylight Time" -msgstr "" +msgstr "紐西蘭夏令時間" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) 奧克蘭，威靈頓" #: dlls/tzres/tzres.rc:36 -#, fuzzy -#| msgid "Date and time" msgid "Aleutian Standard Time" -msgstr "日期和時間" +msgstr "阿留申標準時間" #: dlls/tzres/tzres.rc:37 -#, fuzzy -#| msgid "Date and time" msgid "Aleutian Daylight Time" -msgstr "日期和時間" +msgstr "阿留申夏令時間" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) 阿留申群島" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "&Standard bar" msgid "Omsk Standard Time" -msgstr "標準列(&S)" +msgstr "鄂木斯克標準時間" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Date and time" msgid "Omsk Daylight Time" -msgstr "日期和時間" +msgstr "鄂木斯克夏令時間" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) 鄂木斯克" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" -msgstr "" +msgstr "巴西中部標準時間" #: dlls/tzres/tzres.rc:106 msgid "Central Brazilian Daylight Time" -msgstr "" +msgstr "巴西中部夏令時間" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) 庫亞巴" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" -msgstr "" +msgstr "白俄羅斯標準時間" #: dlls/tzres/tzres.rc:82 msgid "Belarus Daylight Time" -msgstr "" +msgstr "白俄羅斯夏令時間" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) 明斯克" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" -msgstr "" +msgstr "南美洲西部標準時間" #: dlls/tzres/tzres.rc:316 msgid "SA Western Daylight Time" -msgstr "" +msgstr "南美洲西部夏令時間" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) 喬治敦，拉巴斯，瑪瑙斯，聖胡安" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" -msgstr "" +msgstr "格陵蘭標準時間" #: dlls/tzres/tzres.rc:175 msgid "Greenland Daylight Time" -msgstr "" +msgstr "格陵蘭夏令時間" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) 格陵蘭" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "日期和時間" +msgstr "復活節島標準時間" #: dlls/tzres/tzres.rc:148 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "日期和時間" +msgstr "復活節島夏令時間" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) 復活節島" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" -msgstr "" +msgstr "俄羅斯時區 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) 喬庫爾達赫" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" -msgstr "" +msgstr "埃及標準時間" #: dlls/tzres/tzres.rc:157 msgid "Egypt Daylight Time" -msgstr "" +msgstr "埃及夏令時間" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) 開羅" #: dlls/tzres/tzres.rc:153 -#, fuzzy -#| msgid "Date and time" msgid "Eastern Standard Time (Mexico)" -msgstr "日期和時間" +msgstr "東部標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:154 -#, fuzzy -#| msgid "Date and time" msgid "Eastern Daylight Time (Mexico)" -msgstr "日期和時間" +msgstr "東部夏令時間 (墨西哥)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) 切圖馬爾" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" -msgstr "" +msgstr "模里西斯標準時間" #: dlls/tzres/tzres.rc:226 msgid "Mauritius Daylight Time" -msgstr "" +msgstr "模里西斯夏令時間" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) 路易士港" #: dlls/tzres/tzres.rc:411 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "海參崴標準時間" #: dlls/tzres/tzres.rc:412 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "海參崴夏令時間" #: dlls/tzres/tzres.rc:413 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) 海參崴" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" -msgstr "" +msgstr "新加坡標準時間" #: dlls/tzres/tzres.rc:337 msgid "Singapore Daylight Time" -msgstr "" +msgstr "新加坡夏令時間" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) 吉隆坡，新加坡" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" -msgstr "" +msgstr "韓國標準時間" #: dlls/tzres/tzres.rc:205 msgid "Korea Daylight Time" -msgstr "" +msgstr "韓國夏令時間" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) 首爾" #: dlls/tzres/tzres.rc:123 -#, fuzzy -#| msgid "Date and time" msgid "Chatham Islands Standard Time" -msgstr "日期和時間" +msgstr "查塔姆群島標準時間" #: dlls/tzres/tzres.rc:124 -#, fuzzy -#| msgid "Date and time" msgid "Chatham Islands Daylight Time" -msgstr "日期和時間" +msgstr "查塔姆群島夏令時間" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) 查塔姆群島" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" -msgstr "" +msgstr "東非標準時間" #: dlls/tzres/tzres.rc:136 msgid "E. Africa Daylight Time" -msgstr "" +msgstr "東非夏令時間" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) 奈洛比" #: dlls/tzres/tzres.rc:165 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "標準列(&S)" +msgstr "FLE 標準時間" #: dlls/tzres/tzres.rc:166 msgid "FLE Daylight Time" -msgstr "" +msgstr "FLE 夏令時間" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) 赫爾辛基，基輔，里加，索菲亞，塔林，維爾紐斯" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" -msgstr "" +msgstr "東南美洲標準時間" #: dlls/tzres/tzres.rc:145 msgid "E. South America Daylight Time" -msgstr "" +msgstr "東南美洲夏令時間" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) 巴西利亞" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" -msgstr "" +msgstr "太平洋中部標準時間" #: dlls/tzres/tzres.rc:115 msgid "Central Pacific Daylight Time" -msgstr "" +msgstr "太平洋中部夏令時間" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) 索羅門群島，新喀里多尼亞群島" #: dlls/tzres/tzres.rc:420 msgid "W. Central Africa Standard Time" -msgstr "" +msgstr "中西非標準時間" #: dlls/tzres/tzres.rc:421 msgid "W. Central Africa Daylight Time" -msgstr "" +msgstr "中西非夏令時間" #: dlls/tzres/tzres.rc:422 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) 中西非" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" -msgstr "" +msgstr "太平洋 (南美) 標準時間" #: dlls/tzres/tzres.rc:277 msgid "Pacific SA Daylight Time" -msgstr "" +msgstr "太平洋 (南美) 夏令時間" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) 聖地牙哥" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" -msgstr "" +msgstr "澳洲東部標準時間" #: dlls/tzres/tzres.rc:139 msgid "E. Australia Daylight Time" -msgstr "" +msgstr "澳洲東部夏令時間" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) 布里斯本" #: dlls/tzres/tzres.rc:417 msgid "W. Australia Standard Time" -msgstr "" +msgstr "澳洲西部標準時間" #: dlls/tzres/tzres.rc:418 msgid "W. Australia Daylight Time" -msgstr "" +msgstr "澳洲西部夏令時間" #: dlls/tzres/tzres.rc:419 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) 伯斯" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" -msgstr "安全警告" +msgstr "安全性警告" #: dlls/urlmon/urlmon.rc:35 msgid "Do you want to install this software?" -msgstr "您要安裝這個軟體？" +msgstr "您要安裝這個軟體?" #: dlls/urlmon/urlmon.rc:39 msgid "Don't install" @@ -12017,12 +11876,12 @@ msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"ActiveX 組成在安裝之後就能任意存取您的電腦。除非您絕對信賴以上的來源，否則不" -"要按下安裝。" +"在安裝之後，ActiveX 元件能完整存取您的電腦。" +"除非您非常信任以上的來源，否則不要按下安裝。" #: dlls/urlmon/urlmon.rc:51 msgid "Installation of component failed: %08x" -msgstr "無法安裝組成：%08x" +msgstr "無法安裝元件: %08x" #: dlls/urlmon/urlmon.rc:52 msgid "Install (%d)" @@ -12079,11 +11938,11 @@ msgstr "中止(&A)" #: dlls/user32/user32.rc:85 msgid "&Ignore" -msgstr "忽略(&I)" +msgstr "略過(&I)" #: dlls/user32/user32.rc:86 msgid "&Try Again" -msgstr "再試(&T)" +msgstr "再試一次(&T)" #: dlls/user32/user32.rc:87 msgid "&Continue" @@ -12099,217 +11958,167 @@ msgstr "更多視窗(&M)..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "溢位" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "記憶體不足。" +msgstr "記憶體不足" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" -msgstr "" +msgstr "此陣列的長度是固定的或暫時被鎖住" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "資料類型不匹配。\n" +msgstr "類型不相符" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "I/O 裝置錯誤。\n" +msgstr "I/O 裝置錯誤" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "檔案已經存在。\n" +msgstr "檔案已經存在" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "磁碟已滿。\n" +msgstr "磁碟已滿" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "開啟過多檔案。\n" +msgstr "過多檔案" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "存取被拒。\n" +msgstr "存取被拒" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "路徑/檔案存取錯誤" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "找不到路徑。\n" +msgstr "找不到路徑" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy -#| msgid "(value not set)" msgid "Object variable not set" -msgstr "(沒有設值)" +msgstr "沒有設定物件變數" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "無效的使用者緩衝區。\n" +msgstr "Null 的使用不正確" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "無法建立必須的暫存檔案" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "自動作業伺服器無法建立物件" +msgstr "ActiveX 元件無法建立物件" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "物件不支援此動作" +msgstr "物件類別不支援自動化" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" -msgstr "" +msgstr "在自動化運作過程中找不到檔案名稱或物件類別名稱" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "物件不支援此動作" +msgstr "物件不支援指名的引數" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "物件不支援此動作" +msgstr "物件不支援目前的地區設定" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "找不到元件。\n" +msgstr "找不到指名的引數" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" -msgstr "" +msgstr "引數的個數錯誤或指派的屬性無效" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "物件類別違規" +msgstr "物件並非集合物件" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "在訊息中找不到指定的控制" +msgstr "找不到指定的 DLL 函數" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" -msgstr "" +msgstr "變數使用了 VBScript 不支援的自動化類型" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" -msgstr "" +msgstr "遠端伺服器不存在或無法使用" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "" +msgstr "無效或不合格的引用" #: dlls/vbscript/vbscript.rc:62 msgid "Microsoft VBScript compilation error" -msgstr "" +msgstr "Microsoft VBScript 編譯錯誤" #: dlls/vbscript/vbscript.rc:63 msgid "Microsoft VBScript runtime error" -msgstr "" +msgstr "Microsoft VBScript 執行期錯誤" #: dlls/winemac.drv/winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "隱藏" +msgstr "隱藏 %@" #: dlls/winemac.drv/winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "其他" +msgstr "隱藏其他" #: dlls/winemac.drv/winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "顯示" +msgstr "顯示全部" #: dlls/winemac.drv/winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "結束 %@" #: dlls/winemac.drv/winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "結束" #: dlls/winemac.drv/winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "視窗(&W)" +msgstr "視窗" #: dlls/winemac.drv/winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "最小化(&M)" +msgstr "最小化" #: dlls/winemac.drv/winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "放大" +msgstr "縮放" #: dlls/winemac.drv/winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "進入全螢幕" #: dlls/winemac.drv/winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "移到最前面(&B)" +msgstr "將全部移到最前面" #: dlls/wineps.drv/wineps.rc:31 msgid "Paper Si&ze:" -msgstr "紙張大小(&Z)：" +msgstr "紙張大小(&Z):" #: dlls/wineps.drv/wineps.rc:39 msgid "Duplex:" -msgstr "雙面：" +msgstr "雙面:" #: dlls/wineps.drv/wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "設定(&S)" +msgstr "設定" #: dlls/wininet/wininet.rc:53 dlls/wininet/wininet.rc:73 msgid "Realm" @@ -12329,7 +12138,7 @@ msgstr "這個站臺的憑證有問題。" #: dlls/wininet/wininet.rc:93 msgid "Do you want to continue anyway?" -msgstr "您無論如何都要繼續？" +msgstr "您無論如何都要繼續?" #: dlls/wininet/wininet.rc:28 msgid "LAN Connection" @@ -12345,112 +12154,92 @@ msgstr "憑證上的日期無效。" #: dlls/wininet/wininet.rc:31 msgid "The name on the certificate does not match the site." -msgstr "憑證上的名稱不匹配站臺。" +msgstr "憑證上的名稱與站臺不相符。" #: dlls/wininet/wininet.rc:32 msgid "" "There is at least one unspecified security problem with this certificate." -msgstr "有至少一個未指定的安全問題與這個憑證相關。" +msgstr "這個憑證有至少一個未指定的安全問題。" #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "生效日期" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "安全性" +msgstr "安全性通訊協定" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "簽名" +msgstr "簽章類型" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "加密檔案系統" +msgstr "加密類型" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" -msgstr "" +msgstr "隱私層次" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "位元" #: dlls/wininet/winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "服務要求逾時。\n" +msgstr "要求已逾時。\n" #: dlls/wininet/winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "印表機發生錯誤。" +msgstr "發生內部錯誤。\n" #: dlls/wininet/winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "路徑無效。\n" +msgstr "這個 URL 無效。\n" #: dlls/wininet/winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "無法辨識或不支援的 URL 配置。\n" #: dlls/wininet/winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "無法找到使用者名稱。\n" +msgstr "無法解析伺服器名稱。\n" #: dlls/wininet/winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "使用者側寫檔無效。\n" +msgstr "要求的操作不正確。\n" #: dlls/wininet/winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" -msgstr "" +msgstr "這項操作已取消，這一般是因為要求控制代碼在操作完成前被關閉。\n" #: dlls/wininet/winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "無法加入側寫檔。\n" +msgstr "找不到要求的項目。\n" #: dlls/wininet/winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "無法連線到 LDAP 伺服器" +msgstr "嘗試連線到伺服器失敗。\n" #: dlls/wininet/winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "與伺服器的連線已終止。\n" #: dlls/wininet/winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" -msgstr "" +msgstr "從伺服器接收到的 SSL 憑證日期是錯誤的。該憑證已經過期。\n" #: dlls/wininet/winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL 憑證一般名稱 (主機名稱欄位) 無效。\n" #: dlls/winmm/winmm.rc:32 msgid "The specified command was carried out." -msgstr "指定的命令被帶出。" +msgstr "指定的命令已經執行。" #: dlls/winmm/winmm.rc:33 msgid "Undefined external error." @@ -12458,121 +12247,116 @@ msgstr "未定義的外部錯誤。" #: dlls/winmm/winmm.rc:34 msgid "A device ID has been used that is out of range for your system." -msgstr "裝置識別號已被用於超出您的系統範圍。" +msgstr "使用的裝置識別碼已超出您的系統範圍。" #: dlls/winmm/winmm.rc:35 msgid "The driver was not enabled." -msgstr "驅動程式未被啟用。" +msgstr "驅動程式未啟用。" #: dlls/winmm/winmm.rc:36 msgid "" "The specified device is already in use. Wait until it is free, and then try " "again." -msgstr "指定的裝置已在使用中。等到它可用時，然後再試一次。" +msgstr "指定的裝置已在使用中。請等候該裝置不再使用，然後再試一次。" #: dlls/winmm/winmm.rc:37 msgid "The specified device handle is invalid." -msgstr "指定的裝置控柄無效。" +msgstr "指定的裝置控制代碼無效。" #: dlls/winmm/winmm.rc:38 msgid "There is no driver installed on your system!" -msgstr "沒有任何驅動程式已安裝於您的系統！" +msgstr "您的系統上沒有安裝任何驅動程式!" #: dlls/winmm/winmm.rc:39 dlls/winmm/winmm.rc:65 msgid "" "Not enough memory available for this task. Quit one or more applications to " "increase available memory, and then try again." msgstr "" -"可用於這個任務的記憶體不足。離開一或多個應用程式以增加可用記憶體，然後再試一" -"次。" +"可用於這個任務的記憶體不足。結束一個或多個應用程式以增加可用記憶體，" +"然後再試一次。" #: dlls/winmm/winmm.rc:40 msgid "" "This function is not supported. Use the Capabilities function to determine " "which functions and messages the driver supports." -msgstr "這個函式未被支援。使用功能函式以決定驅動程式支援何項函式和訊息。" +msgstr "不支援這項功能。請使用 [能力] 功能來決定驅動程式所支援的功能和訊息。" #: dlls/winmm/winmm.rc:41 msgid "An error number was specified that is not defined in the system." -msgstr "被指定的錯誤代號未被定義於系統中。" +msgstr "指定的號碼錯誤: 號碼未在系統中定義。" #: dlls/winmm/winmm.rc:42 msgid "An invalid flag was passed to a system function." -msgstr "無效的旗標被傳遞到系統函式。" +msgstr "無效的旗標被傳送給系統功能。" #: dlls/winmm/winmm.rc:43 msgid "An invalid parameter was passed to a system function." -msgstr "無效的參數被傳遞到系統函式。" +msgstr "無效的參數被傳送給系統功能。" #: dlls/winmm/winmm.rc:46 msgid "" "The specified format is not supported or cannot be translated. Use the " "Capabilities function to determine the supported formats." -msgstr "指定的格式未被支援或無法翻譯。使用功能函式以決定支援的格式。" +msgstr "指定的格式未支援或無法翻譯。請使用 [能力] 功能來決定支援的格式。" #: dlls/winmm/winmm.rc:47 dlls/winmm/winmm.rc:53 msgid "" "Cannot perform this operation while media data is still playing. Reset the " "device, or wait until the data is finished playing." msgstr "" -"當媒體資料仍在播放中將無法進行這個作業。請重置裝置，或是等到資料已完成播放。" +"當媒體資料仍在播放時，無法進行這個操作。請重設裝置，或等待資料播放完畢。" #: dlls/winmm/winmm.rc:48 msgid "" "The wave header was not prepared. Use the Prepare function to prepare the " "header, and then try again." -msgstr "wave 標頭尚未就緒。使用「準備功能」以準備標頭，然後再試一次。" +msgstr "wave 標頭尚未就緒。請使用 [準備] 功能以準備標頭，然後再試一次。" #: dlls/winmm/winmm.rc:49 msgid "" "Cannot open the device without using the WAVE_ALLOWSYNC flag. Use the flag, " "and then try again." msgstr "" -"無法在不使用 WAVE_ALLOWSYNC 旗標的狀態下開啟裝置。使用旗標，然後再試一次。" +"無法在不使用 WAVE_ALLOWSYNC 旗標的狀態下開啟裝置。" +"請使用旗標，然後再試一次。" #: dlls/winmm/winmm.rc:52 msgid "" "The MIDI header was not prepared. Use the Prepare function to prepare the " "header, and then try again." -msgstr "MIDI 標頭尚未就緒。使用「準備功能」以準備標頭，然後再試一次。" +msgstr "MIDI 標頭尚未就緒。請使用 [準備] 功能以準備標頭，然後再試一次。" #: dlls/winmm/winmm.rc:54 msgid "" "A MIDI map was not found. There may be a problem with the driver, or the " "MIDIMAP.CFG file may be corrupt or missing." msgstr "" -"找不到 MIDI 對映。也許是驅動程式的問題，或者 MIDIMAP.CFG 檔案已損壞或缺少。" +"找不到 MIDI 對應。這可能是驅動程式的問題，或是 MIDIMAP.CFG 檔案已損壞或遺失。" #: dlls/winmm/winmm.rc:55 msgid "" "The port is transmitting data to the device. Wait until the data has been " "transmitted, and then try again." -msgstr "通訊埠正在傳送資料給裝置。等到資料傳輸完成，然後再試一次。" +msgstr "連接埠正在傳送資料給裝置。請等待資料傳輸完成，然後再試一次。" #: dlls/winmm/winmm.rc:56 dlls/winmm/winmm.rc:129 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." -msgstr "" -"目前的 MIDI 對映表設定，參照了未被安裝於系統上的 MIDI 裝置。使用 MIDI 對映表" -"以編輯設定。" +msgstr "目前的 MIDI Mapper 安裝程式參照了未安裝到系統上的 MIDI 裝置。" #: dlls/winmm/winmm.rc:57 msgid "" "The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the " "Windows SYSTEM directory, and then try again." msgstr "" -"目前的 MIDI 設定已受損。複製原來的 MIDIMAP.CFG 檔案到 Windows 系統目錄，然後" -"再試一次。" +"目前的 MIDI Mapper 安裝程式已損壞。請複製原始的 MIDIMAP.CFG 檔案" +"到 Windows SYSTEM 目錄，然後再試一次。" #: dlls/winmm/winmm.rc:60 msgid "Invalid MCI device ID. Use the ID returned when opening the MCI device." msgstr "" -"無效的多媒體控制介面裝置識別號。開啟多媒體控制介面裝置時使用回傳的識別號。" +"無效的多媒體控制介面裝置識別碼。請在開啟多媒體控制介面裝置時使用傳回的識別碼。" #: dlls/winmm/winmm.rc:61 msgid "The driver cannot recognize the specified command parameter." @@ -12586,11 +12370,11 @@ msgstr "驅動程式無法識別指定的命令。" msgid "" "There is a problem with your media device. Make sure it is working correctly " "or contact the device manufacturer." -msgstr "您的媒體裝置有問題。請確定它作用正確或與裝置製造商聯絡。" +msgstr "您的媒體裝置有問題。請確定它正常運作或與裝置製造商聯絡。" #: dlls/winmm/winmm.rc:64 msgid "The specified device is not open or is not recognized by MCI." -msgstr "指定的裝置未開啟或未被多媒體控制介面辨識出來。" +msgstr "指定的裝置未開啟或未被多媒體控制介面識別出來。" #: dlls/winmm/winmm.rc:66 msgid "" @@ -12605,19 +12389,19 @@ msgstr "載入指定的裝置驅動程式時發生無法偵測的問題。" #: dlls/winmm/winmm.rc:68 msgid "No command was specified." -msgstr "沒有任何命令被指定。" +msgstr "未指定任何命令。" #: dlls/winmm/winmm.rc:69 msgid "" "The output string was too large to fit in the return buffer. Increase the " "size of the buffer." -msgstr "輸出字串太大而不適合回傳緩衝區。請增加緩衝區的大小。" +msgstr "輸出字串太大，超出了傳回的緩衝區容量。請增加緩衝區的大小。" #: dlls/winmm/winmm.rc:70 msgid "" "The specified command requires a character-string parameter. Please provide " "one." -msgstr "指定的命令需要字串參數。請提供一個。" +msgstr "指定的命令需要一個字串參數。請提供一個。" #: dlls/winmm/winmm.rc:71 msgid "The specified integer is invalid for this command." @@ -12627,17 +12411,17 @@ msgstr "指定的整數對於這個命令無效。" msgid "" "The device driver returned an invalid return type. Check with the device " "manufacturer about obtaining a new driver." -msgstr "裝置驅動程式回傳無效的類型。請詢問裝置製造商以得到新的驅動程式。" +msgstr "裝置驅動程式傳回了無效的回傳類型。請詢問裝置製造商以取得新的驅動程式。" #: dlls/winmm/winmm.rc:73 msgid "" "There is a problem with the device driver. Check with the device " "manufacturer about obtaining a new driver." -msgstr "裝置驅動程式有問題。請詢問裝置製造商以得到新的驅動程式。" +msgstr "裝置驅動程式有問題。請詢問裝置製造商以取得新的驅動程式。" #: dlls/winmm/winmm.rc:74 msgid "The specified command requires a parameter. Please supply one." -msgstr "指定的命令需要參數。請提供一個。" +msgstr "指定的命令需要一個參數。請提供一個。" #: dlls/winmm/winmm.rc:75 msgid "The MCI device you are using does not support the specified command." @@ -12664,14 +12448,15 @@ msgstr "裝置驅動程式有問題。驅動程式已關閉。發生無法存取 #: dlls/winmm/winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." -msgstr "無法使用 all 做為指定命令的裝置名稱。" +msgstr "無法使用 'all' 做為指定命令的裝置名稱。" #: dlls/winmm/winmm.rc:81 msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." msgstr "" -"在一個以上的裝置中發生錯誤。每個命令分別指定裝置以決定何項裝置造成了錯誤。" +"在一個以上的裝置中發生錯誤。" +"請分別指定每一個命令和裝置，以判定造成錯誤的裝置。" #: dlls/winmm/winmm.rc:82 msgid "Cannot determine the device type from the given filename extension." @@ -12692,14 +12477,10 @@ msgid "" msgstr "無法儲存指定的檔案。請確定您有足夠的磁碟空間，或是仍然連線到網路。" #: dlls/winmm/winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." -msgstr "找不到指定的裝置。請確定它已安裝，或是該裝置名稱的拼寫正確。" +msgstr "找不到指定的裝置。請確定它已安裝，以及該裝置名稱的拼寫正確。" #: dlls/winmm/winmm.rc:87 msgid "" @@ -12721,8 +12502,9 @@ msgstr "指定的參數對於這個命令無效。" msgid "" "The device driver is already in use. To share it, use the 'shareable' " "parameter with each 'open' command." -msgstr "" -"裝置驅動程式已在使用中。要分享它，請使用 shareable 參數於每個 open 命令。" +msgstr "" +"裝置驅動程式已在使用中。要分享它，" +"請在每個 'open' 命令使用 'shareable' 參數。" #: dlls/winmm/winmm.rc:91 msgid "" @@ -12734,7 +12516,9 @@ msgstr "指定的命令需要一個別名、檔案、驅動程式或裝置名稱 msgid "" "The specified value for the time format is invalid. Refer to the MCI " "documentation for valid formats." -msgstr "指定的值用於時間格式無效。參考多媒體控制介面文件用於有效格式。" +msgstr "" +"指定的值對時間格式而言是無效的。" +"關於有效的格式，請參考多媒體控制介面文件。" #: dlls/winmm/winmm.rc:93 msgid "" @@ -12744,53 +12528,55 @@ msgstr "參數值缺少一個右側的雙引號。請提供一個。" #: dlls/winmm/winmm.rc:94 msgid "A parameter or value was specified twice. Only specify it once." -msgstr "參數或值被指定了兩次。只要指定它一次。" +msgstr "參數或值被指定了兩次。請只指定它一次。" #: dlls/winmm/winmm.rc:95 msgid "" "The specified file cannot be played on the specified MCI device. The file " "may be corrupt, or not in the correct format." msgstr "" -"指定的檔案無法在指定的多媒體控制介面裝置上播放。檔案也許已經損壞，或者並非正" -"確格式。" +"指定的檔案無法在指定的多媒體控制介面裝置上播放。" +"檔案可能已經損壞，或者並非正確格式。" #: dlls/winmm/winmm.rc:96 msgid "A null parameter block was passed to MCI." -msgstr "空的參數區塊被傳遞到多媒體控制介面。" +msgstr "空的參數區塊被傳送到多媒體控制介面。" #: dlls/winmm/winmm.rc:97 msgid "Cannot save an unnamed file. Supply a filename." -msgstr "無法儲存未命名的檔案。請提供一個檔名。" +msgstr "無法儲存未命名的檔案。請提供一個檔案名稱。" #: dlls/winmm/winmm.rc:98 msgid "You must specify an alias when using the 'new' parameter." -msgstr "使用 new 參數時，您必須指定別名。" +msgstr "使用 'new' 參數時，您必須指定別名。" #: dlls/winmm/winmm.rc:99 msgid "Cannot use the 'notify' flag with auto-opened devices." -msgstr "無法於自動開啟的裝置使用 notify 旗標。" +msgstr "無法於自動開啟的裝置使用 'notify' 旗標。" #: dlls/winmm/winmm.rc:100 msgid "Cannot use a filename with the specified device." -msgstr "無法於指定裝置使用檔名。" +msgstr "無法於指定裝置使用檔案名稱。" #: dlls/winmm/winmm.rc:101 msgid "" "Cannot carry out the commands in the order specified. Correct the command " "sequence, and then try again." -msgstr "無法以指定的順多帶出命令。請修正命令序列，然後再試一次。" +msgstr "無法以指定的順序執行命令。請修正命令序列，然後再試一次。" #: dlls/winmm/winmm.rc:102 msgid "" "Cannot carry out the specified command on an auto-opened device. Wait until " "the device is closed, and then try again." -msgstr "無法於自動開啟的裝置帶出指定的命令。請等到裝置關閉，然後再試一次。" +msgstr "無法於自動開啟的裝置執行指定的命令。請等待裝置關閉，然後再試一次。" #: dlls/winmm/winmm.rc:103 msgid "" "The filename is invalid. Make sure the filename is not longer than 8 " "characters, followed by a period and an extension." -msgstr "檔名無效。請確定檔名長度不超過 8 個字元，然後接著句點和延伸檔名。" +msgstr "" +"無效的檔案名稱。請確定檔案名稱長度不超過 8 個字元，" +"然後接著句點和副檔名。" #: dlls/winmm/winmm.rc:104 msgid "" @@ -12801,14 +12587,15 @@ msgstr "夾於引號的字串之後無法指定額外字元。" msgid "" "The specified device is not installed on the system. Use the Drivers option " "in Control Panel to install the device." -msgstr "指定的裝置未被安裝在系統上。請使用控制面板中的驅動程式選項以安裝裝置。" +msgstr "指定的裝置未被安裝在系統上。請使用控制臺中的驅動程式選項以安裝裝置。" #: dlls/winmm/winmm.rc:106 msgid "" "Cannot access the specified file or MCI device. Try changing directories or " "restarting your computer." msgstr "" -"無法存取指定的檔案或多媒體控制介面裝置。請嘗試變更目錄或重新啟動您的電腦。" +"無法存取指定的檔案或多媒體控制介面裝置。" +"請嘗試變更目錄或重新啟動您的電腦。" #: dlls/winmm/winmm.rc:107 msgid "" @@ -12840,32 +12627,32 @@ msgid "" "All wave devices that can play files in the current format are in use. Wait " "until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等到 wave 裝置有空時，然" -"後再試一次。" +"所有可以用目前格式播放檔案的 wave 裝置都在使用中。" +"請等待其中一個 wave 裝置不再使用，然後再試一次。" #: dlls/winmm/winmm.rc:113 msgid "" "Cannot set the current wave device for play back because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"無法設定目前的 wave 裝置去播放，因為它正在使用中。請等到裝置有空時，然後再試" -"一次。" +"目前的 wave 裝置正在使用中，所以無法設定它來播放。" +"請等待該裝置不再使用，再試一次。" #: dlls/winmm/winmm.rc:114 msgid "" "All wave devices that can record files in the current format are in use. " "Wait until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等到 wave 裝置有空時，然" -"後再試一次。" +"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。" +"請等待其中一個 wave 裝置不再使用，然後再試一次。" #: dlls/winmm/winmm.rc:115 msgid "" "Cannot set the current wave device for recording because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等到裝置有空時，然後再試" -"一次。" +"無法設定目前的 wave 裝置去記錄，因為它正在使用中。" +"請等待該裝置不再使用，然後再試一次。" #: dlls/winmm/winmm.rc:116 msgid "Any compatible waveform playback device may be used." @@ -12880,8 +12667,8 @@ msgid "" "No wave device that can play files in the current format is installed. Use " "the Drivers option to install the wave device." msgstr "" -"沒有任何可以用目前格式播放檔案的 wave 裝置已被安裝。請使用驅動程式選項以安裝 " -"wave 裝置。" +"沒有任何可以用目前格式播放檔案的 wave 裝置已被安裝。" +"請使用「驅動程式」選項以安裝 wave 裝置。" #: dlls/winmm/winmm.rc:119 msgid "" @@ -12894,8 +12681,8 @@ msgid "" "No wave device that can record files in the current format is installed. Use " "the Drivers option to install the wave device." msgstr "" -"沒有安裝任何能以目前的格式記錄檔案的 wave 裝置。使用「驅動程式」選項以安裝 " -"wave 裝置。" +"沒有安裝任何能以目前的格式記錄檔案的 wave 裝置。" +"使用「驅動程式」選項以安裝 wave 裝置。" #: dlls/winmm/winmm.rc:121 msgid "" @@ -12910,50 +12697,42 @@ msgid "" msgstr "「歌曲指標」的時間格式和 SMPTE 彼此互斥。您無法一起使用它們。" #: dlls/winmm/winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." -msgstr "指定的 MIDI 通訊埠已在使用中。等到它可用時；然後再試一次。" +msgstr "指定的 MIDI 連接埠已在使用中。請等待它不再使用，然後再試一次。" #: dlls/winmm/winmm.rc:131 msgid "" "The specified MIDI device is not installed on the system. Use the Drivers " "option from the Control Panel to install a MIDI device." msgstr "" -"指定的 MIDI 裝置未被安裝在系統上。使用「控制面板」中的「驅動程式」選項以安裝 " -"MIDI 裝置。" +"指定的 MIDI 裝置未安裝到系統上。請使用控制臺中的「驅動程式」選項" +"以安裝 MIDI 裝置。" #: dlls/winmm/winmm.rc:130 msgid "An error occurred with the specified port." -msgstr "指定的通訊埠發生了錯誤。" +msgstr "指定的連接埠發生了錯誤。" #: dlls/winmm/winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." msgstr "" -"所有多媒體計時器正被其他應用程式使用中。離開其中某一個應用程式；然後再試一" -"次。" +"所有多媒體計時器正被其他應用程式使用中。請結束其中某一個應用程式，" +"然後再試一次。" #: dlls/winmm/winmm.rc:132 msgid "The system doesn't have a current MIDI port specified." -msgstr "系統尚未指定當前的 MIDI 通訊埠。" +msgstr "系統尚未指定目前的 MIDI 連接埠。" #: dlls/winmm/winmm.rc:127 msgid "" "The system has no installed MIDI devices. Use the Drivers option from the " "Control Panel to install a MIDI driver." msgstr "" -"系統沒有任何已安裝的 MIDI 裝置。使用「控制面板」中的「驅動程式」選項以安裝 " -"MIDI 驅動程式。" +"系統沒有任何已安裝的 MIDI 裝置。請使用控制臺中的「驅動程式」選項" +"以安裝 MIDI 驅動程式。" #: dlls/winmm/winmm.rc:122 msgid "There is no display window." @@ -12976,24 +12755,20 @@ msgid "" msgstr "無法寫入指定的檔案。確定您有足夠的磁碟空間或是仍然連線到網路。" #: dlls/winmm/winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Wine Mono 安裝程式" +msgstr "Wine Sound Mapper" #: dlls/winmm/winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "行" +msgstr "音量" #: dlls/winmm/winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "主音量" #: dlls/winmm/winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "靜音" #: dlls/winspool.drv/winspool.rc:37 msgid "Print to File" @@ -13001,11 +12776,11 @@ msgstr "列印至檔案" #: dlls/winspool.drv/winspool.rc:40 msgid "&Output File Name:" -msgstr "輸出檔案名稱(&O)：" +msgstr "輸出檔案名稱(&O):" #: dlls/winspool.drv/winspool.rc:31 msgid "The output file already exists. Click OK to overwrite." -msgstr "輸出檔案已存在，按「確定」以覆寫。" +msgstr "輸出檔案已存在，按 [確定] 以覆寫。" #: dlls/winspool.drv/winspool.rc:32 msgid "Unable to create the output file." @@ -13041,7 +12816,7 @@ msgstr "比較為真" #: dlls/wldap32/wldap32.rc:39 msgid "Authentication Method Not Supported" -msgstr "認證方法不受支援" +msgstr "不支援的認證方法" #: dlls/wldap32/wldap32.rc:40 msgid "Strong Authentication Required" @@ -13061,17 +12836,15 @@ msgstr "超出了管理限制" #: dlls/wldap32/wldap32.rc:44 msgid "Unavailable Critical Extension" -msgstr "不得使用關鍵副檔名" +msgstr "無法使用關鍵延伸" #: dlls/wldap32/wldap32.rc:45 msgid "Confidentiality Required" msgstr "要求機密性" #: dlls/wldap32/wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "關機正在進行。\n" +msgstr "SASL 繫結正在進行中" #: dlls/wldap32/wldap32.rc:48 msgid "No Such Attribute" @@ -13087,7 +12860,7 @@ msgstr "不適當的匹配" #: dlls/wldap32/wldap32.rc:51 msgid "Constraint Violation" -msgstr "限制違規" +msgstr "約束違規" #: dlls/wldap32/wldap32.rc:52 msgid "Attribute Or Value Exists" @@ -13111,11 +12884,11 @@ msgstr "無效的 DN 語法" #: dlls/wldap32/wldap32.rc:67 msgid "Is Leaf" -msgstr "是枝葉" +msgstr "是分葉" #: dlls/wldap32/wldap32.rc:68 msgid "Alias Dereference Problem" -msgstr "別名去除參考的問題" +msgstr "別名解除參照問題" #: dlls/wldap32/wldap32.rc:80 msgid "Inappropriate Authentication" @@ -13123,11 +12896,11 @@ msgstr "不適當的認證" #: dlls/wldap32/wldap32.rc:81 msgid "Invalid Credentials" -msgstr "無效的憑據" +msgstr "無效的憑證" #: dlls/wldap32/wldap32.rc:82 msgid "Insufficient Rights" -msgstr "不足的權限" +msgstr "權限不足" #: dlls/wldap32/wldap32.rc:83 msgid "Busy" @@ -13135,11 +12908,11 @@ msgstr "忙碌" #: dlls/wldap32/wldap32.rc:84 msgid "Unavailable" -msgstr "不得使用" +msgstr "無法使用" #: dlls/wldap32/wldap32.rc:85 msgid "Unwilling To Perform" -msgstr "無進行意願" +msgstr "不願意執行" #: dlls/wldap32/wldap32.rc:86 msgid "Loop Detected" @@ -13163,7 +12936,7 @@ msgstr "物件類別違規" #: dlls/wldap32/wldap32.rc:98 msgid "Not allowed on Non-leaf" -msgstr "於非尾節點不允許" +msgstr "於非分葉結構不允許" #: dlls/wldap32/wldap32.rc:99 msgid "Not allowed on RDN" @@ -13175,7 +12948,7 @@ msgstr "已經存在" #: dlls/wldap32/wldap32.rc:101 msgid "No Object Class Mods" -msgstr "沒有物件類別方法" +msgstr "沒有物件類別 Mods" #: dlls/wldap32/wldap32.rc:102 msgid "Results Too Large" @@ -13183,7 +12956,7 @@ msgstr "結果太大" #: dlls/wldap32/wldap32.rc:103 msgid "Affects Multiple DSAs" -msgstr "影響多重 DSAs" +msgstr "影響多重 DSA" #: dlls/wldap32/wldap32.rc:113 msgid "Server Down" @@ -13207,7 +12980,7 @@ msgstr "逾時" #: dlls/wldap32/wldap32.rc:118 msgid "Auth Unknown" -msgstr "認證不明的" +msgstr "不明的認證" #: dlls/wldap32/wldap32.rc:119 msgid "Filter Error" @@ -13231,7 +13004,7 @@ msgstr "無法連線到 LDAP 伺服器" #: dlls/wldap32/wldap32.rc:124 msgid "Operation not supported by this version of the LDAP protocol" -msgstr "動作不受這個版本的 LDAP 協定所支援" +msgstr "這個 LDAP 協定版本不支援這個操作" #: dlls/wldap32/wldap32.rc:125 msgid "Specified control was not found in message" @@ -13243,7 +13016,7 @@ msgstr "在訊息中沒有結果呈現" #: dlls/wldap32/wldap32.rc:127 msgid "More results returned" -msgstr "回傳了更多結果" +msgstr "傳回了更多結果" #: dlls/wldap32/wldap32.rc:128 msgid "Loop while handling referrals" @@ -13251,7 +13024,7 @@ msgstr "處理參照時產生迴圈" #: dlls/wldap32/wldap32.rc:129 msgid "Referral hop limit exceeded" -msgstr "超出了參照躍點限制" +msgstr "轉介的躍點超出了限制" #: programs/attrib/attrib.rc:30 programs/cmd/cmd.rc:373 msgid "" -- 2.33.0.windows.2

2 1

[PATCH v2] mshtml: Implement HTMLAnchorElement_get_pathname().
by Hans Leidekker 05 Nov '21

05 Nov '21

v2: Keep leading slash and use GetPathname(). I added some more tests which show that for some protocols IE will prepend a slash if it's not there in the URL. I left those as todo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlanchor.c | 11 +++++++++-- dlls/mshtml/tests/dom.js | 37 ++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a3608abbeb1..b11d39ae07f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -476,8 +476,15 @@ static HRESULT WINAPI HTMLAnchorElement_put_pathname(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_get_pathname(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString pathname_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + /* FIXME: IE prepends a slash for some protocols */ + nsAString_Init(&pathname_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetPathname(This->nsanchor, &pathname_str); + return return_nsstr(nsres, &pathname_str, p); } static HRESULT WINAPI HTMLAnchorElement_put_port(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 3a2b96a7958..e2be69782fc 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -137,24 +137,39 @@ async_test("iframe_location", function() { }); sync_test("anchor", function() { - var iframe = document.body.firstChild; - var anchor = document.createElement("a"); - var anchor_tests = [ - { href: "http://www.winehq.org:123/about", protocol: "http:", host: "www.winehq.org:123" }, - { href: "https://www.winehq.org:123/about", protocol: "https:", host: "www.winehq.org:123" }, - { href: "about:blank", protocol: "about:", host: "" }, - { href: "file:///c:/dir/file.html", protocol: "file:", host: "" }, - { href: "http://www.winehq.org/about", protocol: "http:", host: "www.winehq.org:80", todo_host: true }, - { href: "https://www.winehq.org/about", protocol: "https:", host: "www.winehq.org:443", todo_host: true }, + { href: "http://www.winehq.org:123/about", + protocol: "http:", host: "www.winehq.org:123", path: "/about" }, + { href: "https://www.winehq.org:123/about", + protocol: "https:", host: "www.winehq.org:123", path: "/about" }, + { href: "about:blank", + protocol: "about:", host: "", path: "/blank", todo_pathname: 1 }, + { href: "unknown:path", + protocol: "unknown:", host: "", path: "path" }, + { href: "ftp:path", + protocol: "ftp:", host: "", path: "path" }, + { href: "mailto:path", + protocol: "mailto:", host: "", path: "path" }, + { href: "ws:path", + protocol: "ws:", host: "", path: "path" }, + { href: "file:path", + protocol: "file:", host: "", path: "/path", todo_pathname: 1 }, + { href: "file:///c:/dir/file.html", + protocol: "file:", host: "", path: "/c:/dir/file.html" }, + { href: "http://www.winehq.org/about", + protocol: "http:", host: "www.winehq.org", path: "/about" }, + { href: "https://www.winehq.org/about", + protocol: "https:", host: "www.winehq.org", path: "/about" }, ]; for(var i in anchor_tests) { var t = anchor_tests[i]; - anchor.href = t.href; + document.body.innerHTML = '<a href="' + t.href + '">'; + var anchor = document.body.firstChild; ok(anchor.protocol === t.protocol, "anchor(" + t.href + ").protocol = " + anchor.protocol); - todo_wine_if("todo_host" in t). ok(anchor.host === t.host, "anchor(" + t.href + ").host = " + anchor.host); + todo_wine_if("todo_pathname" in t). + ok(anchor.pathname === t.path, "anchor(" + t.href + ").pathname = " + anchor.pathname); } }); -- 2.30.2

3 2

[PATCH v5 1/3] uiautomationcore: Implement UiaGetReservedNotSupportedValue.
by Connor McAdams 05 Nov '21

05 Nov '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 131 +++++++++++++++++++++++++++++- 2 files changed, 130 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..77cacb7c4a4 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,12 +16,134 @@ * 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_object_wrapper +{ + IUnknown IUnknown_iface; + LONG refcount; + + IUnknown *marshaler; + IUnknown *marshal_object; +}; + +static struct uia_object_wrapper *impl_uia_object_wrapper_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct uia_object_wrapper, IUnknown_iface); +} + +static HRESULT WINAPI uia_object_wrapper_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + return IUnknown_QueryInterface(wrapper->marshal_object, riid, ppv); +} + +static ULONG WINAPI uia_object_wrapper_AddRef(IUnknown *iface) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI uia_object_wrapper_Release(IUnknown *iface) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + if (!refcount) + { + IUnknown_Release(wrapper->marshaler); + heap_free(wrapper); + } + + return refcount; +} + +static const IUnknownVtbl uia_object_wrapper_vtbl = { + uia_object_wrapper_QueryInterface, + uia_object_wrapper_AddRef, + uia_object_wrapper_Release, +}; + +/* + * When passing the ReservedNotSupportedValue/ReservedMixedAttributeValue + * interface pointers across apartments within the same process, create a free + * threaded marshaler so that the pointer value is preserved. + */ +static HRESULT create_uia_object_wrapper(IUnknown *reserved, void **ppv) +{ + struct uia_object_wrapper *wrapper; + HRESULT hr; + + TRACE("%p, %p\n", reserved, ppv); + + wrapper = heap_alloc(sizeof(*wrapper)); + if (!wrapper) + return E_OUTOFMEMORY; + + wrapper->IUnknown_iface.lpVtbl = &uia_object_wrapper_vtbl; + wrapper->marshal_object = reserved; + wrapper->refcount = 1; + + if (FAILED(hr = CoCreateFreeThreadedMarshaler(&wrapper->IUnknown_iface, &wrapper->marshaler))) + { + heap_free(wrapper); + return hr; + } + + hr = IUnknown_QueryInterface(wrapper->marshaler, &IID_IMarshal, ppv); + IUnknown_Release(&wrapper->IUnknown_iface); + + return hr; +} + +/* + * UiaReservedNotSupportedValue object. + */ +static HRESULT WINAPI uia_reserved_obj_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) + return create_uia_object_wrapper(iface, ppv); + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI uia_reserved_obj_AddRef(IUnknown *iface) +{ + return 1; +} + +static ULONG WINAPI uia_reserved_obj_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl uia_reserved_obj_vtbl = { + uia_reserved_obj_QueryInterface, + uia_reserved_obj_AddRef, + uia_reserved_obj_Release, +}; + +static IUnknown uia_reserved_ns_iface = {&uia_reserved_obj_vtbl}; + /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) */ @@ -46,8 +168,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 5

[PATCH] dxva2: Handle specified background color in VideoProcessBlt().
by Nikolay Sivov 05 Nov '21

05 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 46f5a7af485..401b5cc976b 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -258,6 +258,26 @@ static BOOL intersect_rect(RECT *dest, const RECT *src1, const RECT *src2) return TRUE; } +static D3DCOLOR video_processor_get_background_color(const DXVA2_AYUVSample16 *ayuv) +{ + float y, cb, cr; + BYTE r, g, b; + + y = (ayuv->Y >> 8) - 16; + cb = (ayuv->Cb >> 8) - 128; + cr = (ayuv->Cr >> 8) - 128; + + y = 255.0f * y / 219.0f; + cb = 255.0f * cb / 224.0f; + cr = 255.0f * cr / 224.0f; + + r = y + 1.402 * cr; + g = y - 0.344 * cb - 0.714 * cr; + b = y + 1.772 * cb; + + return D3DCOLOR_XRGB(r, g, b); +} + static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *iface, IDirect3DSurface9 *rt, const DXVA2_VideoProcessBltParams *params, const DXVA2_VideoSample *samples, UINT sample_count, HANDLE *complete_handle) @@ -269,14 +289,19 @@ static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *if TRACE("%p, %p, %p, %p, %u, %p.\n", iface, rt, params, samples, sample_count, complete_handle); + if (params->BackgroundColor.Alpha != 0xffff) + { + WARN("Unexpected background alpha %#x.\n", params->BackgroundColor.Alpha); + return E_INVALIDARG; + } + if (FAILED(hr = IDirect3DSurface9_GetDevice(rt, &device))) { WARN("Failed to get surface device, hr %#x.\n", hr); return hr; } - /* FIXME: use specified color */ - IDirect3DDevice9_ColorFill(device, rt, NULL, 0); + IDirect3DDevice9_ColorFill(device, rt, &params->TargetRect, video_processor_get_background_color(&params->BackgroundColor)); for (i = 0; i < sample_count; ++i) { -- 2.33.0

1 0

[PATCH] msvcp100: Export ctype<char>::table function.
by Piotr Caban 05 Nov '21

05 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51978 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp120_app/msvcp120_app.spec | 6 +++--- dlls/msvcp140/msvcp140.spec | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-)

1 0

[PATCH] evr/mixer: Set destination alpha to fully opaque.
by Nikolay Sivov 05 Nov '21

05 Nov '21

It's necessary for HW devices, software reference device does not support blending. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index fb7fcf79d9c..bb3f938cb64 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1326,7 +1326,7 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) video_mixer_normalize_rect(&dst, &stream_vis, &norm); video_mixer_scale_rect(&samples[sample_count].DstRect, rt_desc.Width, rt_desc.Height, &norm); - samples[sample_count].PlanarAlpha = DXVA2FloatToFixed(1.0f); + samples[sample_count].PlanarAlpha = DXVA2_Fixed32OpaqueAlpha(); sample_count++; } @@ -1335,6 +1335,7 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) { SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); params.BackgroundColor = mixer->bkgnd_color.ayuv; + params.Alpha = DXVA2_Fixed32OpaqueAlpha(); if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, sample_count, NULL))) -- 2.33.0

1 0

[PATCH 5/5] comctl32/button: Correctly place parts for themed split buttons.
by Zhiyi Zhang 05 Nov '21

05 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7b617a199b0..19febd8b6ac 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2917,7 +2917,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT rc, content_rect, push_rect, dropdown_rect, focus_rect; + RECT rc, content_rect, push_rect, dropdown_rect, focus_rect, label_rect, image_rect, text_rect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; @@ -2984,13 +2984,12 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in { COLORREF old_color, color; INT old_bk_mode; - WCHAR *text; - if ((text = get_button_text(infoPtr))) - { - DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &content_rect); - heap_free(text); - } + label_rect = content_rect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &label_rect, &image_rect, &text_rect); + if (dtFlags != (UINT)-1L) + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &image_rect, &text_rect, theme, + BP_PUSHBUTTON, state); GetThemeColor(theme, BP_PUSHBUTTON, state, TMT_TEXTCOLOR, &color); old_bk_mode = SetBkMode(hDC, TRANSPARENT); -- 2.32.0

1 0

[PATCH 4/5] comctl32/button: Correctly place parts for themed group boxes.
by Zhiyi Zhang 05 Nov '21

05 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 49 +++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 515dff03921..7b617a199b0 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2855,11 +2855,12 @@ cleanup: static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT bgRect, textRect, contentRect; - WCHAR *text = get_button_text(infoPtr); + RECT clientRect, contentRect, imageRect, textRect, bgRect; + HRGN region, textRegion = NULL; LOGFONTW lf; HFONT font, hPrevFont = NULL; BOOL created_font = FALSE; + TEXTMETRICW textMetric; HRESULT hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); if (SUCCEEDED(hr)) { @@ -2875,37 +2876,41 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in SelectObject(hDC, infoPtr->font); } - GetClientRect(infoPtr->hwnd, &bgRect); - textRect = bgRect; + GetClientRect(infoPtr->hwnd, &clientRect); + GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &clientRect, &contentRect); + region = set_control_clipping(hDC, &clientRect); - if (text) + bgRect = contentRect; + GetTextMetricsW(hDC, &textMetric); + bgRect.top += (textMetric.tmHeight / 2) - 1; + + InflateRect(&contentRect, -7, 1); + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &contentRect, &imageRect, &textRect); + if (dtFlags != (UINT)-1 && !show_image_only(infoPtr)) { - SIZE textExtent; - GetTextExtentPoint32W(hDC, text, lstrlenW(text), &textExtent); - bgRect.top += (textExtent.cy / 2); - textRect.left += 10; - textRect.bottom = textRect.top + textExtent.cy; - textRect.right = textRect.left + textExtent.cx + 4; - - ExcludeClipRect(hDC, textRect.left, textRect.top, textRect.right, textRect.bottom); + textRegion = CreateRectRgnIndirect(&textRect); + ExtSelectClipRgn(hDC, textRegion, RGN_DIFF); } - GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &bgRect, &contentRect); - ExcludeClipRect(hDC, contentRect.left, contentRect.top, contentRect.right, contentRect.bottom); - if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); DrawThemeBackground(theme, hDC, BP_GROUPBOX, state, &bgRect, NULL); - SelectClipRgn(hDC, NULL); - - if (text) + if (dtFlags != (UINT)-1) { - InflateRect(&textRect, -2, 0); - DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, lstrlenW(text), 0, 0, &textRect); - heap_free(text); + contentRect.left--; + contentRect.right++; + contentRect.bottom++; + if (textRegion) + { + SelectClipRgn(hDC, textRegion); + DeleteObject(textRegion); + } + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect, theme, BP_GROUPBOX, state); } + SelectClipRgn(hDC, region); + if (region) DeleteObject(region); if (created_font) DeleteObject(font); if (hPrevFont) SelectObject(hDC, hPrevFont); } -- 2.32.0

1 0

[PATCH 3/5] comctl32/button: Correctly place parts for themed check boxes.
by Zhiyi Zhang 05 Nov '21

05 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 76 +++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 80635feaafc..515dff03921 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2748,18 +2748,20 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - SIZE sz; - RECT bgRect, textRect; + RECT client_rect, content_rect, old_label_rect, label_rect, box_rect, image_rect, text_rect; HFONT font, hPrevFont = NULL; DWORD dwStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + LONG ex_style = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; NMCUSTOMDRAW nmcd; LRESULT cdrf; LOGFONTW lf; HWND parent; - WCHAR *text; BOOL created_font = FALSE; + int text_offset; + SIZE box_size; + HRGN region; HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); if (SUCCEEDED(hr)) { @@ -2775,20 +2777,31 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (infoPtr->font) SelectObject(hDC, infoPtr->font); } - if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &sz))) - sz.cx = sz.cy = 13; + GetClientRect(infoPtr->hwnd, &client_rect); + GetThemeBackgroundContentRect(theme, hDC, part, state, &client_rect, &content_rect); + region = set_control_clipping(hDC, &client_rect); - GetClientRect(infoPtr->hwnd, &bgRect); - GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); - init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); + if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &box_size))) + { + box_size.cx = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; + box_size.cy = box_size.cx; + } - if (dtFlags & DT_SINGLELINE) /* Center the checkbox / radio button to the text. */ - bgRect.top = bgRect.top + (textRect.bottom - textRect.top - sz.cy) / 2; + GetCharWidthW(hDC, '0', '0', &text_offset); + text_offset /= 2; - /* adjust for the check/radio marker */ - bgRect.bottom = bgRect.top + sz.cy; - bgRect.right = bgRect.left + sz.cx; - textRect.left = bgRect.right + 6; + label_rect = content_rect; + if (dwStyle & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) + label_rect.right -= box_size.cx + text_offset; + else + label_rect.left += box_size.cx + text_offset; + + old_label_rect = label_rect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &label_rect, &image_rect, &text_rect); + box_rect = get_box_rect(dwStyle, ex_style, &content_rect, &label_rect, dtFlags != (UINT)-1L, + box_size); + + init_custom_draw(&nmcd, infoPtr, hDC, &client_rect); parent = GetParent(infoPtr->hwnd); if (!parent) parent = infoPtr->hwnd; @@ -2798,7 +2811,6 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); - DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); if (cdrf & CDRF_NOTIFYPOSTERASE) { @@ -2811,36 +2823,32 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; - text = get_button_text(infoPtr); - if (!(cdrf & CDRF_DOERASE) && text) - DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); + /* Draw label */ + if (!(cdrf & CDRF_DOERASE)) + { + DrawThemeBackground(theme, hDC, part, state, &box_rect, NULL); + if (dtFlags != (UINT)-1L) + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &image_rect, &text_rect, theme, part, state); + } if (cdrf & CDRF_NOTIFYPOSTPAINT) { nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } + if ((cdrf & CDRF_SKIPPOSTPAINT) || dtFlags == (UINT)-1L) goto cleanup; - if (text) + if (focused) { - if (!(cdrf & CDRF_SKIPPOSTPAINT) && focused) - { - RECT focusRect; - - focusRect = textRect; - - DrawTextW(hDC, text, lstrlenW(text), &focusRect, dtFlags | DT_CALCRECT); - - if (focusRect.right < textRect.right) focusRect.right++; - focusRect.bottom = textRect.bottom; - - DrawFocusRect( hDC, &focusRect ); - } - - heap_free(text); + label_rect.left--; + label_rect.right++; + IntersectRect(&label_rect, &label_rect, &old_label_rect); + DrawFocusRect(hDC, &label_rect); } cleanup: + SelectClipRgn(hDC, region); + if (region) DeleteObject(region); if (created_font) DeleteObject(font); if (hPrevFont) SelectObject(hDC, hPrevFont); } -- 2.32.0

1 0

[PATCH 2/5] comctl32/button: Correctly place parts for themed push buttons.
by Zhiyi Zhang 05 Nov '21

05 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51916 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 47 +++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 70ac6b1c2da..80635feaafc 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1761,6 +1761,38 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, heap_free(text); } +static void BUTTON_DrawThemedLabel(const BUTTON_INFO *info, HDC hdc, UINT text_flags, + const RECT *image_rect, const RECT *text_rect, HTHEME theme, + int part, int state) +{ + HBRUSH brush = NULL; + UINT image_flags; + WCHAR *text; + + if (show_image(info)) + { + image_flags = IsWindowEnabled(info->hwnd) ? DSS_NORMAL : DSS_DISABLED; + + if ((GetWindowLongW(info->hwnd, GWL_STYLE) & BS_PUSHLIKE) + && (info->state & BST_INDETERMINATE)) + { + brush = GetSysColorBrush(COLOR_GRAYTEXT); + image_flags |= DSS_MONO; + } + + BUTTON_DrawImage(info, hdc, brush, image_flags, image_rect); + } + + if (show_image_only(info)) + return; + + if (!(text = get_button_text(info))) + return; + + DrawThemeText(theme, hdc, part, state, text, lstrlenW(text), text_flags, 0, text_rect); + heap_free(text); +} + /********************************************************************** * Push Button Functions */ @@ -2661,17 +2693,16 @@ cleanup: */ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT bgRect, textRect, focusRect; + RECT bgRect, labelRect, imageRect, textRect, focusRect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; - WCHAR *text; if (infoPtr->font) SelectObject(hDC, infoPtr->font); GetClientRect(infoPtr->hwnd, &bgRect); - GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); - focusRect = textRect; + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &labelRect); + focusRect = labelRect; init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); @@ -2697,10 +2728,12 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) return; - if (!(cdrf & CDRF_DOERASE) && (text = get_button_text(infoPtr))) + if (!(cdrf & CDRF_DOERASE)) { - DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); - heap_free(text); + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); + if (dtFlags != (UINT)-1L) + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect, theme, + BP_PUSHBUTTON, state); } if (cdrf & CDRF_NOTIFYPOSTPAINT) -- 2.32.0

1 0

[PATCH 1/5] comctl32/button: Correctly place parts for buttons with WS_EX_RIGHT.
by Zhiyi Zhang 05 Nov '21

05 Nov '21

WS_EX_RIGHT has the same effect as BS_RIGHT. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 6a463cb3460..70ac6b1c2da 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1547,17 +1547,15 @@ static BOOL CL_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) */ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *labelRc, RECT *imageRc, RECT *textRc) { - LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); - LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); - LONG split_style = infoPtr->imagelist.himl ? BUTTON_ILStoBS(infoPtr->imagelist.uAlign) : style; WCHAR *text = get_button_text(infoPtr); SIZE imageSize = BUTTON_GetImageSize(infoPtr); - UINT dtStyle = BUTTON_BStoDT(style, ex_style); RECT labelRect, imageRect, imageRectWithMargin, textRect; LONG imageMarginWidth, imageMarginHeight; const RECT *textMargin = BUTTON_GetTextMargin(infoPtr); + LONG style, ex_style, split_style; RECT emptyMargin = {0}; LONG maxTextWidth; + UINT dtStyle; /* Calculate label rectangle according to label type */ if ((imageSize.cx == 0 && imageSize.cy == 0) && (text == NULL || text[0] == '\0')) @@ -1569,6 +1567,14 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la return (UINT)-1; } + style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + ex_style = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); + /* Add BS_RIGHT directly. When both WS_EX_RIGHT and BS_LEFT are present, it becomes BS_CENTER */ + if (ex_style & WS_EX_RIGHT) + style |= BS_RIGHT; + split_style = infoPtr->imagelist.himl ? BUTTON_ILStoBS(infoPtr->imagelist.uAlign) : style; + dtStyle = BUTTON_BStoDT(style, ex_style); + SetRect(&imageRect, 0, 0, imageSize.cx, imageSize.cy); imageRectWithMargin = imageRect; if (infoPtr->imagelist.himl) -- 2.32.0

1 0

[PATCH] msdasql: Implement IDBProperties GetProperties
by Alistair Leslie-Hughes 05 Nov '21

05 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 76 ++++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 57 +++++++++++++++++++++++++- dlls/oledb32/tests/database.c | 4 +- 3 files changed, 130 insertions(+), 7 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index b8d68287e6a..d14f7957978 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -193,6 +193,12 @@ static const struct dbproperty dbproperties[] = { L"General Timeout", DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, }; +struct msdasql_prop +{ + VARTYPE id; + VARIANT value; +}; + struct msdasql { IUnknown MSDASQL_iface; @@ -202,6 +208,7 @@ struct msdasql IPersist IPersist_iface; LONG ref; + struct msdasql_prop properties[14]; }; static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) @@ -324,10 +331,49 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i, j, k; + DBPROPSET *propset; - FIXME("(%p)->(%d %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + TRACE("(%p)->(%d %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); - return E_NOTIMPL; + *pcPropertySets = 1; + + if (cPropertyIDSets != 1) + { + FIXME("Currently only 1 property set supported.\n"); + cPropertyIDSets = 1; + } + + propset = CoTaskMemAlloc(cPropertyIDSets * sizeof(DBPROPSET)); + propset->guidPropertySet = DBPROPSET_DBINIT; + + for (i=0; i < cPropertyIDSets; i++) + { + TRACE("Property id %d (count %d, set %s)\n", i, rgPropertyIDSets[i].cPropertyIDs, + debugstr_guid(&rgPropertyIDSets[i].guidPropertySet)); + + propset->cProperties = rgPropertyIDSets[i].cPropertyIDs; + propset->rgProperties = CoTaskMemAlloc(propset->cProperties * sizeof(DBPROP)); + + for (j=0; j < propset->cProperties; j++) + { + propset->rgProperties[j].dwPropertyID = rgPropertyIDSets[i].rgPropertyIDs[j]; + + for(k = 0; k < ARRAY_SIZE(provider->properties); k++) + { + if (provider->properties[k].id == rgPropertyIDSets[i].rgPropertyIDs[j]) + { + V_VT(&propset->rgProperties[j].vValue) = VT_EMPTY; + VariantCopy(&propset->rgProperties[j].vValue, &provider->properties[k].value); + break; + } + } + } + } + + *prgPropertySets = propset; + + return S_OK; } static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPropertyIDSets, @@ -531,6 +577,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; HRESULT hr; + int i; provider = malloc(sizeof(struct msdasql)); if (!provider) @@ -543,6 +590,31 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->IPersist_iface.lpVtbl = &persistVtbl; provider->ref = 1; + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + provider->properties[i].id = dbproperties[i].id; + VariantInit(&provider->properties[i].value); + + /* Only the follow are initialized to a value */ + switch(dbproperties[i].id) + { + case DBPROP_INIT_PROMPT: + V_VT(&provider->properties[i].value) = dbproperties[i].type; + V_I2(&provider->properties[i].value) = 4; + break; + case DBPROP_INIT_LCID: + V_VT(&provider->properties[i].value) = dbproperties[i].type; + V_I4(&provider->properties[i].value) = GetUserDefaultLCID(); + break; + case DBPROP_INIT_OLEDBSERVICES: + V_VT(&provider->properties[i].value) = dbproperties[i].type; + V_I4(&provider->properties[i].value) = -1; + break; + default: + V_VT(&provider->properties[i].value) = VT_EMPTY; + } + } + hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); IUnknown_Release(&provider->MSDASQL_iface); return hr; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 6cf95e02a80..6ffe17e7028 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -75,6 +75,14 @@ static void test_Properties(void) ULONG infocount; DBPROPINFOSET *propinfoset; WCHAR *desc; + DBPROPID properties[14] = + { + DBPROP_AUTH_PASSWORD, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, + DBPROP_INIT_DATASOURCE, DBPROP_INIT_HWND, DBPROP_INIT_LOCATION, + DBPROP_INIT_MODE, DBPROP_INIT_PROMPT, DBPROP_INIT_TIMEOUT, + DBPROP_INIT_PROVIDERSTRING, DBPROP_INIT_LCID, DBPROP_INIT_CATALOG, + DBPROP_INIT_OLEDBSERVICES, DBPROP_INIT_GENERALTIMEOUT + }; hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); @@ -88,18 +96,30 @@ static void test_Properties(void) 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 }; + ULONG i; + DBPROPIDSET propidlist; + ULONG propcnt; + DBPROPSET *propset; ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", debugstr_guid(&propinfoset->guidPropertySet)); ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); + propidlist.guidPropertySet = DBPROPSET_DBINIT; + propidlist.cPropertyIDs = propinfoset->cPropertyInfos; + propidlist.rgPropertyIDs = CoTaskMemAlloc(propinfoset->cPropertyInfos * sizeof(DBPROP)); + 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); + ok(properties[i] == propinfoset->rgPropertyInfos[i].dwPropertyID, "%d, got %d\n", i, + propinfoset->rgPropertyInfos[i].dwPropertyID); + ok(propinfoset->rgPropertyInfos[i].vtType != VT_EMPTY, "%d, got %d\n", i, + propinfoset->rgPropertyInfos[i].vtType); + + propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; } for (i = 0; i < propinfoset->cPropertyInfos; i++) @@ -107,6 +127,39 @@ static void test_Properties(void) CoTaskMemFree(propinfoset->rgPropertyInfos); CoTaskMemFree(propinfoset); + + hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); + ok(propset->cProperties == 14, "got %d\n", propinfoset->cPropertyInfos); + + for (i = 0; i < propidlist.cPropertyIDs; i++) + { + VARTYPE vartype = VT_EMPTY; + + ok(properties[i] == propidlist.rgPropertyIDs[i], "%d, got %d\n", i, propidlist.rgPropertyIDs[i]); + + if(properties[i] == DBPROP_INIT_PROMPT) + { + ok(V_I2(&propset->rgProperties[i].vValue) == 4, "wrong value %s\n", debugstr_variant(&propset->rgProperties[i].vValue)); + vartype = VT_I2; + } + else if(properties[i] == DBPROP_INIT_LCID) + { + ok(V_I4(&propset->rgProperties[i].vValue) == GetUserDefaultLCID(), "wrong value %s\n", debugstr_variant(&propset->rgProperties[i].vValue)); + vartype = VT_I4; + } + else if(properties[i] == DBPROP_INIT_OLEDBSERVICES) + { + ok(V_I4(&propset->rgProperties[i].vValue) == -1, "wrong value %s\n", debugstr_variant(&propset->rgProperties[i].vValue)); + vartype = VT_I4; + } + + ok(V_VT(&propset->rgProperties[i].vValue) == vartype, "%d wrong type %d\n", i, V_VT(&propset->rgProperties[i].vValue)); + } + + CoTaskMemFree(propidlist.rgPropertyIDs); + CoTaskMemFree(propset); } IDBProperties_Release(props); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 421f4258afd..8bdb1f948f4 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -1039,8 +1039,7 @@ static void test_odbc_provider(void) CoTaskMemFree(propinfoset); hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) { /* Remove if, once _GetProperties is implemented */ + ok(hr == S_OK, "got 0x%08x\n", hr); ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); for (i = 0; i < propidlist.cPropertyIDs; i++) @@ -1050,7 +1049,6 @@ static void test_odbc_provider(void) propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; } - } CoTaskMemFree(propidlist.rgPropertyIDs); CoTaskMemFree(propset); -- 2.33.0

1 0

[PATCH] msxml3: Allow DOMDocument in VT_DISPATCH slot for put_output.
by Jefferson Carpenter 04 Nov '21

04 Nov '21

Regarding locking the DOMDocument while it is being written to: It looks like DOMDocument is meant to be used in a single-threaded manner[1], so it should be all right to just grab an interface and not worry about threads attempting to manipulate the document while it is being written to by an mxwriter. For how to lock it, unless anyone has a better idea I think it would work to add an IWineXMLDOMDocumentLock interface with lock() and unlock() methods, and output a FIXME if this interface is unavailable. thanks, Jefferson [1] https://docs.microsoft.com/en-us/previous-versions/windows/desktop/ms756987…

2 2

[PATCH] dmime: Fixup the Wave track parser
by Michael Stefaniuc 04 Nov '21

04 Nov '21

An incomplete patch was prematurely added with 854895f70afeeb3c098ff32318353ec4fe7b9bc1 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/dmime_private.h | 6 - dlls/dmime/wavetrack.c | 254 +++++++++++++++++++++---------------- 2 files changed, 142 insertions(+), 118 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 6ab47292b39..c2221a15fd2 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -86,12 +86,6 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM { DMUS_IO_TEMPO_ITEM item; } DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM; -struct wave_item { - struct list entry; - DMUS_IO_WAVE_TRACK_HEADER header; - IDirectMusicObject *object; -}; - typedef struct _DMUS_PRIVATE_GRAPH_TOOL { struct list entry; /* for listing elements */ DWORD dwIndex; diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index da7ef37d2c8..454695ebfb6 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -19,7 +19,6 @@ #include "dmime_private.h" #include "dmobject.h" - #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); @@ -27,15 +26,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** * IDirectMusicWaveTrack implementation */ -/***************************************************************************** - * IDirectMusicChordMapTrack implementation - */ +struct wave_item { + struct list entry; + DMUS_IO_WAVE_ITEM_HEADER header; + IDirectMusicObject *object; +}; + +struct wave_part { + struct list entry; + DMUS_IO_WAVE_PART_HEADER header; + struct list items; +}; + typedef struct IDirectMusicWaveTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; - - struct list items; + DMUS_IO_WAVE_TRACK_HEADER header; + struct list parts; } IDirectMusicWaveTrack; /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ @@ -90,20 +98,21 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - struct list *cursor, *cursor2; - struct wave_item *item; - - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->items) { - item = LIST_ENTRY(cursor, struct wave_item, entry); - list_remove(cursor); - - if (item->object) - IDirectMusicObject_Release(item->object); - - heap_free(item); + struct wave_item *item, *item2; + struct wave_part *part, *part2; + + LIST_FOR_EACH_ENTRY_SAFE(part, part2, &This->parts, struct wave_part, entry) { + list_remove(&part->entry); + LIST_FOR_EACH_ENTRY_SAFE(item, item2, &part->items, struct wave_item, entry) { + list_remove(&item->entry); + if (item->object) + IDirectMusicObject_Release(item->object); + heap_free(item); + } + heap_free(part); } - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); DMIME_UnlockModule(); } @@ -302,131 +311,152 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { wave_track_Join }; -static HRESULT parse_wave_item(IDirectMusicWaveTrack *This, IStream *stream, - struct chunk_entry *wave, struct wave_item *item) +static HRESULT parse_wave_item(struct wave_part *part, IStream *stream, struct chunk_entry *wavi) { + struct chunk_entry wave = {.parent = wavi}; + struct chunk_entry chunk = {.parent = &wave}; + struct wave_item *item; HRESULT hr; - struct chunk_entry chunk = {.parent = wave}; - if (FAILED(hr = stream_next_chunk(stream, &chunk))) + /* Nested list with two chunks */ + if (FAILED(hr = stream_next_chunk(stream, &wave))) return hr; + if (wave.id != FOURCC_LIST || wave.type != DMUS_FOURCC_WAVE_LIST) + return DMUS_E_UNSUPPORTED_STREAM; - if(chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVE_LIST) - { - struct chunk_entry child = {.parent = &chunk}; - DMUS_IO_WAVE_ITEM_HEADER header; - - if (FAILED(hr = stream_next_chunk(stream, &child))) - return hr; - - if(child.id != DMUS_FOURCC_WAVEITEM_CHUNK) - return DMUS_E_UNSUPPORTED_STREAM; + if (!(item = heap_alloc_zero(sizeof(*item)))) + return E_OUTOFMEMORY; - if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, sizeof(header)))) { - WARN("Failed to read data of %s\n", debugstr_chunk(&child)); - return hr; - } + /* Wave item header chunk */ + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + goto error; + if (chunk.id != DMUS_FOURCC_WAVEITEM_CHUNK) { + hr = DMUS_E_UNSUPPORTED_STREAM; + goto error; + } - TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); - TRACE(" - lVolume %d\n", header.lVolume); - TRACE(" - dwVariations %d\n", header.dwVariations); - TRACE(" - rtTime %s\n", wine_dbgstr_longlong(header.rtTime)); - TRACE(" - rtStartOffset %s\n", wine_dbgstr_longlong(header.rtStartOffset)); - TRACE(" - rtReserved %s\n", wine_dbgstr_longlong(header.rtReserved)); - TRACE(" - rtDuration %s\n", wine_dbgstr_longlong(header.rtDuration)); - TRACE(" - dwLoopStart %d\n", header.dwLoopStart); - TRACE(" - dwLoopEnd %d\n", header.dwLoopEnd); - TRACE(" - dwFlags 0x%08x\n", header.dwFlags); - TRACE(" - wVolumeRange %d\n", header.wVolumeRange); - TRACE(" - wPitchRange %d\n", header.wPitchRange); - - if (FAILED(hr = stream_next_chunk(stream, &child))) - return hr; - - if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->object))) - return hr; + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &item->header, sizeof(item->header)))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + goto error; } - else + + TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); + TRACE("\tlVolume %d\n", item->header.lVolume); + TRACE("\tdwVariations %d\n", item->header.dwVariations); + TRACE("\trtTime %s\n", wine_dbgstr_longlong(item->header.rtTime)); + TRACE("\trtStartOffset %s\n", wine_dbgstr_longlong(item->header.rtStartOffset)); + TRACE("\trtReserved %s\n", wine_dbgstr_longlong(item->header.rtReserved)); + TRACE("\trtDuration %s\n", wine_dbgstr_longlong(item->header.rtDuration)); + TRACE("\tdwLoopStart %d\n", item->header.dwLoopStart); + TRACE("\tdwLoopEnd %d\n", item->header.dwLoopEnd); + TRACE("\tdwFlags %#08x\n", item->header.dwFlags); + TRACE("\twVolumeRange %d\n", item->header.wVolumeRange); + TRACE("\twPitchRange %d\n", item->header.wPitchRange); + + /* Second chunk is a reference list */ + if (stream_next_chunk(stream, &chunk) != S_OK || chunk.id != FOURCC_LIST || + chunk.type != DMUS_FOURCC_REF_LIST) { hr = DMUS_E_UNSUPPORTED_STREAM; + goto error; + } + if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->object))) + goto error; - return SUCCEEDED(hr) ? S_OK : hr; + list_add_tail(&part->items, &item->entry); + + return S_OK; + +error: + heap_free(item); + return hr; } -static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) +static HRESULT parse_wave_part(IDirectMusicWaveTrack *This, IStream *stream, + struct chunk_entry *wavp) { - IDirectMusicWaveTrack *This = impl_from_IPersistStream(iface); + struct chunk_entry chunk = {.parent = wavp}; + struct wave_part *part; HRESULT hr; - struct chunk_entry chunk = {0}; - - TRACE("%p, %p\n", This, stream); - - if (!stream) - return E_POINTER; - if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + /* Wave part header chunk */ + if (FAILED(hr = stream_next_chunk(stream, &chunk))) return hr; + if (chunk.id != DMUS_FOURCC_WAVEPART_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; - if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVETRACK_LIST) - { - struct chunk_entry chunklist = {.parent = &chunk}; - struct wave_item *item = NULL; + if (!(part = heap_alloc_zero(sizeof(*part)))) + return E_OUTOFMEMORY; + list_init(&part->items); - TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(&chunklist)); + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &part->header, sizeof(part->header)))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + goto error; + } - if (FAILED(hr = stream_next_chunk(stream, &chunklist))) - return hr; + TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); + TRACE("\tlVolume %d\n", part->header.lVolume); + TRACE("\tdwVariations %d\n", part->header.dwVariations); + TRACE("\tdwPChannel %d\n", part->header.dwPChannel); + TRACE("\tdwLockToPart %d\n", part->header.dwLockToPart); + TRACE("\tdwFlags %#08x\n", part->header.dwFlags); + TRACE("\tdwIndex %d\n", part->header.dwIndex); - if (chunklist.id != DMUS_FOURCC_WAVETRACK_CHUNK) - return DMUS_E_UNSUPPORTED_STREAM; + /* Array of wave items */ + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVEITEM_LIST) + if (FAILED(hr = parse_wave_item(part, stream, &chunk))) + break; - item = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct wave_item)); - if (!item) - return E_OUTOFMEMORY; + if (FAILED(hr)) + goto error; - list_add_tail (&This->items, &item->entry); + list_add_tail(&This->parts, &part->entry); - if (FAILED(hr = stream_next_chunk(stream, &chunklist))) - return hr; + return S_OK; - if (chunklist.id == FOURCC_LIST && chunklist.type == DMUS_FOURCC_WAVEPART_LIST) - { - struct chunk_entry child = {.parent = &chunklist}; - DMUS_IO_WAVE_PART_HEADER header; +error: + heap_free(part); + return hr; +} + +static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) +{ + IDirectMusicWaveTrack *This = impl_from_IPersistStream(iface); + struct chunk_entry wavt = {0}; + struct chunk_entry chunk = {.parent = &wavt}; + HRESULT hr; - if (FAILED(hr = stream_next_chunk(stream, &child))) - return hr; + TRACE("%p, %p\n", This, stream); - if (child.id != DMUS_FOURCC_WAVEPART_CHUNK) - return DMUS_E_UNSUPPORTED_STREAM; + if (!stream) + return E_POINTER; - if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, sizeof(header)))) { - WARN("Failed to read data of %s\n", debugstr_chunk(&child)); - return hr; - } + if ((hr = stream_get_chunk(stream, &wavt) != S_OK)) + return hr; + if (wavt.id != FOURCC_LIST || wavt.type != DMUS_FOURCC_WAVETRACK_LIST) + return DMUS_E_UNSUPPORTED_STREAM; - TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); - TRACE(" - lVolume %d\n", header.lVolume); - TRACE(" - dwVariations %d\n", header.dwVariations); - TRACE(" - dwPChannel %d\n", header.dwPChannel); - TRACE(" - dwLockToPart %d\n", header.dwLockToPart); - TRACE(" - dwFlags 0x%08x\n", header.dwFlags); - TRACE(" - dwIndex %d\n", header.dwIndex); + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(&wavt)); - if (FAILED(hr = stream_next_chunk(stream, &child))) - return hr; + /* Track header chunk */ + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + if (chunk.id != DMUS_FOURCC_WAVETRACK_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &This->header, sizeof(This->header)))) + return hr; - if(child.id != FOURCC_LIST || child.type != DMUS_FOURCC_WAVEITEM_LIST) - return DMUS_E_UNSUPPORTED_STREAM; + TRACE("Found DMUS_IO_WAVE_TRACK_HEADER\n"); + TRACE("\tlVolume %d\n", This->header.lVolume); + TRACE("\tdwFlags %#08x\n", This->header.dwFlags); - hr = parse_wave_item(This, stream, &child, item); - } - else - hr = DMUS_E_UNSUPPORTED_STREAM; - } - else - hr = DMUS_E_UNSUPPORTED_STREAM; + /* Array of wave parts */ + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVEPART_LIST) + if (FAILED(hr = parse_wave_part(This, stream, &chunk))) + break; - return hr; + return SUCCEEDED(hr) ? S_OK : hr; } static const IPersistStreamVtbl persiststream_vtbl = { @@ -456,7 +486,7 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) dmobject_init(&track->dmobj, &CLSID_DirectMusicWaveTrack, (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - list_init(&track->items); + list_init(&track->parts); DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); -- 2.31.1

2 1

Re: Alistair Leslie-Hughes : dmime: Parse Wave track stream.
by Michael Stefaniuc 04 Nov '21

04 Nov '21

The sign-off was on my own patch attached to the reply to this patch. Yes, 2am in the morning so I forgot to remove the sign-off as my patch wasn't ready either... bye michael On 11/4/21 23:04, Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: 854895f70afeeb3c098ff32318353ec4fe7b9bc1 > URL: https://source.winehq.org/git/wine.git/?a=commit;h=854895f70afeeb3c098ff323… > > Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > Date: Mon Nov 1 17:30:54 2021 +1100 > > dmime: Parse Wave track stream. > > For Tron 2.0. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > > dlls/dmime/dmime_private.h | 6 ++ > dlls/dmime/wavetrack.c | 148 ++++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 152 insertions(+), 2 deletions(-) > > diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h > index c2221a15fd2..6ab47292b39 100644 > --- a/dlls/dmime/dmime_private.h > +++ b/dlls/dmime/dmime_private.h > @@ -86,6 +86,12 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM { > DMUS_IO_TEMPO_ITEM item; > } DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM; > > +struct wave_item { > + struct list entry; > + DMUS_IO_WAVE_TRACK_HEADER header; > + IDirectMusicObject *object; > +}; > + > typedef struct _DMUS_PRIVATE_GRAPH_TOOL { > struct list entry; /* for listing elements */ > DWORD dwIndex; > diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c > index 1c6b08b5235..da7ef37d2c8 100644 > --- a/dlls/dmime/wavetrack.c > +++ b/dlls/dmime/wavetrack.c > @@ -20,6 +20,8 @@ > #include "dmime_private.h" > #include "dmobject.h" > > +#include "wine/heap.h" > + > WINE_DEFAULT_DEBUG_CHANNEL(dmime); > > /***************************************************************************** > @@ -32,6 +34,8 @@ typedef struct IDirectMusicWaveTrack { > IDirectMusicTrack8 IDirectMusicTrack8_iface; > struct dmobject dmobj; /* IPersistStream only */ > LONG ref; > + > + struct list items; > } IDirectMusicWaveTrack; > > /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ > @@ -40,6 +44,11 @@ static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr > return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, IDirectMusicTrack8_iface); > } > > +static inline IDirectMusicWaveTrack *impl_from_IPersistStream(IPersistStream *iface) > +{ > + return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, dmobj.IPersistStream_iface); > +} > + > static HRESULT WINAPI wave_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, > void **ret_iface) > { > @@ -81,6 +90,19 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) > TRACE("(%p) ref=%d\n", This, ref); > > if (!ref) { > + struct list *cursor, *cursor2; > + struct wave_item *item; > + > + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->items) { > + item = LIST_ENTRY(cursor, struct wave_item, entry); > + list_remove(cursor); > + > + if (item->object) > + IDirectMusicObject_Release(item->object); > + > + heap_free(item); > + } > + > HeapFree(GetProcessHeap(), 0, This); > DMIME_UnlockModule(); > } > @@ -280,10 +302,131 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > wave_track_Join > }; > > +static HRESULT parse_wave_item(IDirectMusicWaveTrack *This, IStream *stream, > + struct chunk_entry *wave, struct wave_item *item) > +{ > + HRESULT hr; > + struct chunk_entry chunk = {.parent = wave}; > + > + if (FAILED(hr = stream_next_chunk(stream, &chunk))) > + return hr; > + > + if(chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVE_LIST) > + { > + struct chunk_entry child = {.parent = &chunk}; > + DMUS_IO_WAVE_ITEM_HEADER header; > + > + if (FAILED(hr = stream_next_chunk(stream, &child))) > + return hr; > + > + if(child.id != DMUS_FOURCC_WAVEITEM_CHUNK) > + return DMUS_E_UNSUPPORTED_STREAM; > + > + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, sizeof(header)))) { > + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); > + return hr; > + } > + > + TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); > + TRACE(" - lVolume %d\n", header.lVolume); > + TRACE(" - dwVariations %d\n", header.dwVariations); > + TRACE(" - rtTime %s\n", wine_dbgstr_longlong(header.rtTime)); > + TRACE(" - rtStartOffset %s\n", wine_dbgstr_longlong(header.rtStartOffset)); > + TRACE(" - rtReserved %s\n", wine_dbgstr_longlong(header.rtReserved)); > + TRACE(" - rtDuration %s\n", wine_dbgstr_longlong(header.rtDuration)); > + TRACE(" - dwLoopStart %d\n", header.dwLoopStart); > + TRACE(" - dwLoopEnd %d\n", header.dwLoopEnd); > + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); > + TRACE(" - wVolumeRange %d\n", header.wVolumeRange); > + TRACE(" - wPitchRange %d\n", header.wPitchRange); > + > + if (FAILED(hr = stream_next_chunk(stream, &child))) > + return hr; > + > + if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->object))) > + return hr; > + } > + else > + hr = DMUS_E_UNSUPPORTED_STREAM; > + > + return SUCCEEDED(hr) ? S_OK : hr; > +} > + > static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) > { > - FIXME(": Loading not implemented yet\n"); > - return S_OK; > + IDirectMusicWaveTrack *This = impl_from_IPersistStream(iface); > + HRESULT hr; > + struct chunk_entry chunk = {0}; > + > + TRACE("%p, %p\n", This, stream); > + > + if (!stream) > + return E_POINTER; > + > + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) > + return hr; > + > + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVETRACK_LIST) > + { > + struct chunk_entry chunklist = {.parent = &chunk}; > + struct wave_item *item = NULL; > + > + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(&chunklist)); > + > + if (FAILED(hr = stream_next_chunk(stream, &chunklist))) > + return hr; > + > + if (chunklist.id != DMUS_FOURCC_WAVETRACK_CHUNK) > + return DMUS_E_UNSUPPORTED_STREAM; > + > + item = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct wave_item)); > + if (!item) > + return E_OUTOFMEMORY; > + > + list_add_tail (&This->items, &item->entry); > + > + if (FAILED(hr = stream_next_chunk(stream, &chunklist))) > + return hr; > + > + if (chunklist.id == FOURCC_LIST && chunklist.type == DMUS_FOURCC_WAVEPART_LIST) > + { > + struct chunk_entry child = {.parent = &chunklist}; > + DMUS_IO_WAVE_PART_HEADER header; > + > + if (FAILED(hr = stream_next_chunk(stream, &child))) > + return hr; > + > + if (child.id != DMUS_FOURCC_WAVEPART_CHUNK) > + return DMUS_E_UNSUPPORTED_STREAM; > + > + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, sizeof(header)))) { > + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); > + return hr; > + } > + > + TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); > + TRACE(" - lVolume %d\n", header.lVolume); > + TRACE(" - dwVariations %d\n", header.dwVariations); > + TRACE(" - dwPChannel %d\n", header.dwPChannel); > + TRACE(" - dwLockToPart %d\n", header.dwLockToPart); > + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); > + TRACE(" - dwIndex %d\n", header.dwIndex); > + > + if (FAILED(hr = stream_next_chunk(stream, &child))) > + return hr; > + > + if(child.id != FOURCC_LIST || child.type != DMUS_FOURCC_WAVEITEM_LIST) > + return DMUS_E_UNSUPPORTED_STREAM; > + > + hr = parse_wave_item(This, stream, &child, item); > + } > + else > + hr = DMUS_E_UNSUPPORTED_STREAM; > + } > + else > + hr = DMUS_E_UNSUPPORTED_STREAM; > + > + return hr; > } > > static const IPersistStreamVtbl persiststream_vtbl = { > @@ -313,6 +456,7 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) > dmobject_init(&track->dmobj, &CLSID_DirectMusicWaveTrack, > (IUnknown *)&track->IDirectMusicTrack8_iface); > track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; > + list_init(&track->items); > > DMIME_LockModule(); > hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); > >

1 0

AppDB: Bug #49999 - It should be possible to submit results for all versions of the current stable branch
by Joerg Schiermeier 04 Nov '21

04 Nov '21

Hi list! According to Austins recommendation to discuss the following bug in Wine-devel I want to do exactly this: it's about: https://bugs.winehq.org/show_bug.cgi?id=49999 The original bug reporter (elk_aide@e-mail-address-shortened) wrotes: ---cite--- Lots of Linux Distributions and FreeBSD only ship the stable releases of wine in their repositories. They often stick to the first minor release (In Debian and FreeBSD this currently is 5.0 for example). I think it should be possible to submit tests with the distribution's own most recent wine package, as that probably is the main way wine is aquired. Therefore the AppDB list should include the "outdated" minor releases of the current stable branch for selection aswell. This is currently not the case (only 5.0.2 is available for selection currently). ---/cite--- In my point of view this is not the problem of the wine authors. The maintainer of a distro will have to maintain the (stable) wine packages he/she supervises and should always provide the latest stable version of wine. So there is no need to open this door in the AppDB formula. Consequently I recommended to flag this bug as "wont fix". Austin (English) disagrees and reopens the bug and suggest this discussion thread. So please, write, what you think about this point! (And please excuse also my bad English ...:). -- Kind regards Joerg Schiermeier Bielefeld/Germany

2 1

[PATCH 1/5] winegstreamer: Implement IWMReader::GetOutputFormat().
by Zebediah Figura 04 Nov '21

04 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wm_asyncreader.c | 11 +++++++---- dlls/wmvcore/tests/wmvcore.c | 23 ++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 6771b590a71..dd5b01b3e5c 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -137,11 +137,14 @@ static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD outp return E_NOTIMPL; } -static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props) +static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output, + DWORD index, IWMOutputMediaProps **props) { - struct async_reader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReader(iface); + + TRACE("reader %p, output %u, index %u, props %p.\n", reader, output, index, props); + + return wm_reader_get_output_format(&reader->reader, output, index, props); } static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 148b4f5f373..6fbc2ed6a3e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1419,21 +1419,18 @@ static void test_async_reader_types(void) * with. In particular it has to be PCM. */ hr = IWMReader_GetOutputFormat(reader, output_number, 0, &output_props); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ret_size = sizeof(mt2_buffer); - hr = IWMOutputMediaProps_GetMediaType(output_props, mt2, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ret_size = sizeof(mt2_buffer); + hr = IWMOutputMediaProps_GetMediaType(output_props, mt2, &ret_size); + ok(hr == S_OK, "Got hr %#x.\n", hr); - ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); - /* The sample size might differ. */ - mt2->lSampleSize = mt->lSampleSize; - ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); - } + /* The sample size might differ. */ + mt2->lSampleSize = mt->lSampleSize; + ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); } else { @@ -1553,7 +1550,7 @@ static void test_async_reader_types(void) output_props = (void *)0xdeadbeef; hr = IWMReader_GetOutputFormat(reader, 2, 0, &output_props); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); IWMReaderAdvanced2_Release(advanced); -- 2.33.0

1 4

Re: [PATCH v2 1/3] include: Rename LDR_WINE_INTERNAL to LDR_WINE_BUILTIN.
by Zebediah Figura 04 Nov '21

04 Nov '21

On 11/4/21 4:31 AM, Alexandre Julliard wrote: > Zebediah Figura <zfigura(a)codeweavers.com> writes: > >> @@ -3394,7 +3394,7 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT >> >> /* these ones is Wine specific */ >> #define LDR_DONT_RESOLVE_REFS 0x40000000 >> -#define LDR_WINE_INTERNAL 0x80000000 >> +#define LDR_WINE_BUILTIN 0x80000000 > > That doesn't seem necessary. > No, it's not necessary. The idea is that LDR_WINE_INTERNAL is somewhat ambiguous, especially if we're introducing a second sense in which a module can be internally marked, and I wanted to clarify it. I suppose that it's less ambiguous to one who is familiar with the loader code, though. I'll resend the series without this patch.

2 2

[PATCH 1/2] scrrun: Use static sized buffer for drive root.
by Nikolay Sivov 04 Nov '21

04 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/filesystem.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d537239b3a1..c42096ae1f6 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -99,7 +99,7 @@ struct drive { struct provideclassinfo classinfo; IDrive IDrive_iface; LONG ref; - BSTR root; + WCHAR root[4]; }; struct folder { @@ -835,10 +835,7 @@ static ULONG WINAPI drive_Release(IDrive *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) - { - SysFreeString(This->root); heap_free(This); - } return ref; } @@ -1134,28 +1131,21 @@ static const IDriveVtbl drivevtbl = { static HRESULT create_drive(WCHAR letter, IDrive **drive) { - struct drive *This; + struct drive *object; *drive = NULL; - This = heap_alloc(sizeof(*This)); - if (!This) return E_OUTOFMEMORY; + object = heap_alloc(sizeof(*object)); + if (!object) return E_OUTOFMEMORY; - This->IDrive_iface.lpVtbl = &drivevtbl; - This->ref = 1; - This->root = SysAllocStringLen(NULL, 3); - if (!This->root) - { - heap_free(This); - return E_OUTOFMEMORY; - } - This->root[0] = letter; - This->root[1] = ':'; - This->root[2] = '\\'; - This->root[3] = 0; + object->IDrive_iface.lpVtbl = &drivevtbl; + object->ref = 1; + wcscpy(object->root, L"A:\\"); + *object->root = letter; + + init_classinfo(&CLSID_Drive, (IUnknown *)&object->IDrive_iface, &object->classinfo); + *drive = &object->IDrive_iface; - init_classinfo(&CLSID_Drive, (IUnknown *)&This->IDrive_iface, &This->classinfo); - *drive = &This->IDrive_iface; return S_OK; } -- 2.33.0

1 1

[PATCH] kerberos: Fix expiry time conversion.
by Dmitry Timoshkov 04 Nov '21

04 Nov '21

This got broken during transition to unixlib interface. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/unixlib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index a735a1c6a47..c66557efcca 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -477,6 +477,7 @@ static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) NtQuerySystemTime( &time ); RtlSystemTimeToLocalTime( &time, &time ); + time.QuadPart += expirytime; timestamp->LowPart = time.QuadPart; timestamp->HighPart = time.QuadPart >> 32; } -- 2.33.1

2 3

[PATCH v3 1/2] ntdll: Allow loading system DLLs from a path specified at configure time.
by Zebediah Figura 04 Nov '21

04 Nov '21

Many distributions provide MinGW-compiled system DLLs which are currently bundled with Wine. Unfortunately, while MinGW pkg-config can be used to detect the linking path, there is no standardized runtime path, and many distributions in fact use different paths. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: Use AC_ARG_WITH instead of AC_ARG_VAR, and pass the path via the top-level makefile rather than config.h. Makefile.in | 1 + configure.ac | 3 +++ dlls/ntdll/Makefile.in | 1 + dlls/ntdll/loader.c | 10 ++++++++-- dlls/ntdll/unix/env.c | 1 + dlls/ntdll/unix/loader.c | 3 +++ dlls/ntdll/unix/unix_private.h | 1 + 7 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 42f161e3af9..c4b0fbda616 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,6 +32,7 @@ nlsdir = ${datadir}/wine/nls dlldir = ${libdir}/wine srcdir = @srcdir@ host_cpu = @host_cpu@ +system_dlldir = @system_dlldir@ SHELL = /bin/sh CC = @CC@ CXX = @CXX@ diff --git a/configure.ac b/configure.ac index 57383fb2e31..77765db0490 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,7 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) +AC_ARG_WITH(system-dlldir, AS_HELP_STRING([--with-system-dlldir=DIR],[load external PE dependencies from directory DIR])) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) @@ -256,6 +257,8 @@ then TARGETFLAGS="-b $host_alias $TARGETFLAGS" fi +AC_SUBST(system_dlldir,"$with_system_dlldir") + dnl Check for flex AC_CHECK_PROGS(FLEX,flex,none) if test "$FLEX" = "none" diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index fa2ac1623ea..5b15ab5108f 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -73,5 +73,6 @@ EXTRA_OBJS = unix/version.o unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ + -DSYSTEMDLLDIR=\"${system_dlldir}\" \ -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \ -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 255d5afef79..a9578ae86bf 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -95,6 +95,7 @@ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ static ULONG path_safe_mode; /* path mode set by RtlSetSearchPathMode */ static ULONG dll_safe_mode = 1; /* dll search mode */ static UNICODE_STRING dll_directory; /* extra path for LdrSetDllDirectory */ +static UNICODE_STRING system_dll_path; /* path to search for system dependency dlls */ static DWORD default_search_flags; /* default flags set by LdrSetDefaultDllDirectories */ static WCHAR *default_load_path; /* default dll search path */ @@ -2981,12 +2982,15 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC struct file_id id; HANDLE mapping = 0; SECTION_IMAGE_INFORMATION image_info; - NTSTATUS nts; + NTSTATUS nts = STATUS_DLL_NOT_FOUND; ULONG64 prev; TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); - nts = find_dll_file( load_path, libname, default_ext, &nt_name, pwm, &mapping, &image_info, &id ); + if (system_dll_path.Buffer) + nts = find_dll_file( system_dll_path.Buffer, libname, default_ext, &nt_name, pwm, &mapping, &image_info, &id ); + if (nts) + nts = find_dll_file( load_path, libname, default_ext, &nt_name, pwm, &mapping, &image_info, &id ); if (*pwm) /* found already loaded module */ { @@ -3997,6 +4001,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR load_global_options(); version_init(); + get_env_var( L"WINESYSTEMDLLDIR", 0, &system_dll_path ); + wm = build_main_module(); wm->ldr.LoadCount = -1; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 43a34bf831b..1647603efa5 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1296,6 +1296,7 @@ static void add_dynamic_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) add_path_var( env, pos, size, "WINEHOMEDIR", home_dir ); add_path_var( env, pos, size, "WINEBUILDDIR", build_dir ); add_path_var( env, pos, size, "WINECONFIGDIR", config_dir ); + add_path_var( env, pos, size, "WINESYSTEMDLLDIR", system_dll_path ); for (i = 0; dll_paths[i]; i++) { sprintf( str, "WINEDLLDIR%u", i ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0ca4b1ea6dd..9fdcc236fb1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -388,6 +388,7 @@ const char *data_dir = NULL; const char *build_dir = NULL; const char *config_dir = NULL; const char **dll_paths = NULL; +const char *system_dll_path = NULL; const char *user_name = NULL; SECTION_IMAGE_INFORMATION main_image_info = { NULL }; static HMODULE ntdll_module; @@ -619,6 +620,8 @@ static void init_paths( char *argv[] ) data_dir = build_path( bin_dir, BIN_TO_DATADIR ); } + if (strlen(SYSTEMDLLDIR)) system_dll_path = SYSTEMDLLDIR; + set_dll_path(); set_home_dir(); set_config_dir(); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 792cb33710d..01c7cc1c103 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -125,6 +125,7 @@ extern const char *build_dir DECLSPEC_HIDDEN; extern const char *config_dir DECLSPEC_HIDDEN; extern const char *user_name DECLSPEC_HIDDEN; extern const char **dll_paths DECLSPEC_HIDDEN; +extern const char *system_dll_path DECLSPEC_HIDDEN; extern PEB *peb DECLSPEC_HIDDEN; extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; -- 2.33.0

1 1

[PATCH 1/8] wined3d: Pass a wined3d_device_vk to wined3d_context_vk_create_bo().
by Zebediah Figura 04 Nov '21

04 Nov '21

With the goal of making the context_vk parameter optional, so that we can allocate new BOs from the client thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 10 ++++++---- dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/context_vk.c | 11 +++++------ dlls/wined3d/device.c | 2 +- dlls/wined3d/texture.c | 9 ++++++--- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 5 +++-- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 02a359c4f07..da1302265ca 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -936,7 +936,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, if ((map_flags & WINED3D_MAP_DISCARD) && bo->command_buffer_id > context_vk->completed_command_buffer_id) { - if (wined3d_context_vk_create_bo(context_vk, bo->size, bo->usage, bo->memory_type, &tmp)) + if (wined3d_device_vk_create_bo(device_vk, context_vk, bo->size, bo->usage, bo->memory_type, &tmp)) { bool host_synced = bo->host_synced; list_move_head(&tmp.b.users, &bo->b.users); @@ -1045,6 +1045,7 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, void adapter_vk_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context->device); struct wined3d_context_vk *context_vk = wined3d_context_vk(context); const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_bo_vk staging_bo, *src_bo, *dst_bo; @@ -1122,7 +1123,7 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, if (src_bo && !(src_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) { - if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, + if (!(wined3d_device_vk_create_bo(device_vk, context_vk, size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) { ERR("Failed to create staging bo.\n"); @@ -1142,7 +1143,7 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, if (dst_bo && (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(map_flags & WINED3D_MAP_DISCARD) && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id))) { - if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, + if (!(wined3d_device_vk_create_bo(device_vk, context_vk, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) { ERR("Failed to create staging bo.\n"); @@ -1691,7 +1692,8 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, { struct wined3d_bo_vk *bo = &context_vk->vk_so_counter_bo; - if (!wined3d_context_vk_create_bo(context_vk, ARRAY_SIZE(context_vk->vk_so_counters) * sizeof(uint32_t) * 2, + if (!wined3d_device_vk_create_bo(wined3d_device_vk(device), context_vk, + ARRAY_SIZE(context_vk->vk_so_counters) * sizeof(uint32_t) * 2, VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, bo)) ERR("Failed to create counter BO.\n"); for (i = 0; i < ARRAY_SIZE(context_vk->vk_so_counters); ++i) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 55dcd9e67e8..d4efecb2241 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1433,7 +1433,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf else if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) + if (!(wined3d_device_vk_create_bo(wined3d_device_vk(resource->device), + context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n"); return FALSE; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ad7b0a8ba86..63de2f0f052 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -330,7 +330,7 @@ static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct return block; } -static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context_vk, +static bool wined3d_context_vk_create_slab_bo(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk, VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(context_vk->c.device->adapter); @@ -374,7 +374,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context } slab->requested_memory_type = memory_type; - if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) + if (!wined3d_device_vk_create_bo(device_vk, context_vk, key.size, usage, memory_type, &slab->bo)) { ERR("Failed to create slab bo.\n"); heap_free(slab); @@ -424,10 +424,9 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context return true; } -BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, - VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) +BOOL wined3d_device_vk_create_bo(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk, + VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) { - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; VkMemoryRequirements memory_requirements; struct wined3d_adapter_vk *adapter_vk; @@ -435,7 +434,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic unsigned int memory_type_idx; VkResult vr; - if (wined3d_context_vk_create_slab_bo(context_vk, size, usage, memory_type, bo)) + if (wined3d_context_vk_create_slab_bo(device_vk, context_vk, size, usage, memory_type, bo)) return TRUE; adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c5de58c29c9..cdea0ec42cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -655,7 +655,7 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT; memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - if (!wined3d_context_vk_create_bo(context_vk, 16, usage, memory_type, &r->bo)) + if (!wined3d_device_vk_create_bo(device_vk, context_vk, 16, usage, memory_type, &r->bo)) return false; VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); r->buffer_info.buffer = r->bo.vk_buffer; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index df42f2d766b..02a5d96346f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4647,6 +4647,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) { struct wined3d_texture_vk *dst_texture_vk = wined3d_texture_vk(dst_texture); + struct wined3d_device_vk *device_vk = wined3d_device_vk(context->device); struct wined3d_context_vk *context_vk = wined3d_context_vk(context); unsigned int dst_level, dst_row_pitch, dst_slice_pitch; struct wined3d_texture_sub_resource *sub_resource; @@ -4722,7 +4723,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, if (!(src_bo = (struct wined3d_bo_vk *)src_bo_addr->buffer_object)) { - if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, + if (!wined3d_device_vk_create_bo(device_vk, context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) { ERR("Failed to create staging bo.\n"); @@ -4833,6 +4834,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, unsigned int dst_row_pitch, unsigned int dst_slice_pitch) { struct wined3d_texture_vk *src_texture_vk = wined3d_texture_vk(src_texture); + struct wined3d_device_vk *device_vk = wined3d_device_vk(context->device); struct wined3d_context_vk *context_vk = wined3d_context_vk(context); unsigned int src_level, src_width, src_height, src_depth; struct wined3d_texture_sub_resource *sub_resource; @@ -4919,7 +4921,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, if (!(dst_bo = (struct wined3d_bo_vk *)dst_bo_addr->buffer_object)) { - if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, + if (!wined3d_device_vk_create_bo(device_vk, context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) { ERR("Failed to create staging bo.\n"); @@ -5191,6 +5193,7 @@ BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, static BOOL wined3d_texture_vk_prepare_buffer_object(struct wined3d_texture_vk *texture_vk, unsigned int sub_resource_idx, struct wined3d_context_vk *context_vk) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); struct wined3d_texture_sub_resource *sub_resource; struct wined3d_bo_vk *bo; @@ -5199,7 +5202,7 @@ static BOOL wined3d_texture_vk_prepare_buffer_object(struct wined3d_texture_vk * if (bo->vk_buffer) return TRUE; - if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, + if (!wined3d_device_vk_create_bo(device_vk, context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, bo)) return FALSE; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 374e693b17d..6a88286b861 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -2078,8 +2078,8 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view vk_writes[1].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; vk_writes[1].pBufferInfo = &buffer_info; - if (!wined3d_context_vk_create_bo(context_vk, sizeof(constants), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &constants_bo)) + if (!wined3d_device_vk_create_bo(device_vk, context_vk, sizeof(constants), + VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &constants_bo)) { ERR("Failed to create constants BO.\n"); goto out; @@ -2213,7 +2213,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) { - if (!wined3d_context_vk_create_bo(context_vk, sizeof(uint32_t), VK_BUFFER_USAGE_TRANSFER_SRC_BIT + if (!wined3d_device_vk_create_bo(device_vk, context_vk, sizeof(uint32_t), VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &uav_vk->counter_bo)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aa8974366a6..b2525110adc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2642,8 +2642,6 @@ VkCommandBuffer wined3d_context_vk_apply_compute_state(struct wined3d_context_vk VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *context_vk, const struct wined3d_state *state, struct wined3d_buffer_vk *indirect_vk, bool indexed) DECLSPEC_HIDDEN; void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, - VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; BOOL wined3d_context_vk_create_image(struct wined3d_context_vk *context_vk, VkImageType vk_image_type, VkImageUsageFlags usage, VkFormat vk_format, unsigned int width, unsigned int height, unsigned int depth, unsigned int sample_count, unsigned int mip_levels, unsigned int layer_count, unsigned int flags, @@ -4094,6 +4092,9 @@ static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_vk, d); } +BOOL wined3d_device_vk_create_bo(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk, + VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, + struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, -- 2.33.0

3 28

[PATCH v2 1/7] wined3d: Protect access to the Vulkan wined3d_allocator with a mutex.
by Zebediah Figura 04 Nov '21

04 Nov '21

So that it can be accessed from the client thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 9 ++++++ dlls/wined3d/context_vk.c | 52 ++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 11 +++++++ 3 files changed, 60 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 02a359c4f07..cbf7c94fd3a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -521,6 +521,10 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi goto fail; } + InitializeCriticalSection(&device_vk->allocator_cs); + if (device_vk->allocator_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + device_vk->allocator_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wined3d_device_vk.allocator_cs"); + *device = &device_vk->d; return WINED3D_OK; @@ -538,6 +542,11 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) wined3d_device_cleanup(&device_vk->d); wined3d_allocator_cleanup(&device_vk->allocator); + + if (device_vk->allocator_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + device_vk->allocator_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&device_vk->allocator_cs); + VK_CALL(vkDestroyDevice(device_vk->vk_device, NULL)); heap_free(device_vk); } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ad7b0a8ba86..54c5eb6bc24 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -313,27 +313,43 @@ static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct struct wined3d_allocator *allocator = &device_vk->allocator; struct wined3d_allocator_block *block; + wined3d_device_vk_allocator_lock(device_vk); + if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) { *vk_memory = wined3d_context_vk_allocate_vram_chunk_memory(context_vk, memory_type, size); + wined3d_device_vk_allocator_unlock(device_vk); return NULL; } if (!(block = wined3d_allocator_allocate(allocator, &context_vk->c, memory_type, size))) { + wined3d_device_vk_allocator_unlock(device_vk); *vk_memory = VK_NULL_HANDLE; return NULL; } *vk_memory = wined3d_allocator_chunk_vk(block->chunk)->vk_memory; + wined3d_device_vk_allocator_unlock(device_vk); return block; } +static void wined3d_context_vk_free_memory(struct wined3d_context_vk *context_vk, struct wined3d_allocator_block *block) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + + assert(block->chunk->allocator == &device_vk->allocator); + wined3d_device_vk_allocator_lock(device_vk); + wined3d_allocator_block_free(block); + wined3d_device_vk_allocator_unlock(device_vk); +} + static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(context_vk->c.device->adapter); + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const VkPhysicalDeviceLimits *limits = &adapter_vk->device_limits; struct wined3d_bo_slab_vk_key key; struct wined3d_bo_slab_vk *slab; @@ -360,6 +376,8 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context key.usage = usage; key.size = 32 * object_size; + wined3d_device_vk_allocator_lock(device_vk); + if ((entry = wine_rb_get(&context_vk->bo_slab_available, &key))) { slab = WINE_RB_ENTRY_VALUE(entry, struct wined3d_bo_slab_vk, entry); @@ -369,27 +387,30 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context { if (!(slab = heap_alloc_zero(sizeof(*slab)))) { + wined3d_device_vk_allocator_unlock(device_vk); ERR("Failed to allocate bo slab.\n"); return false; } + if (wine_rb_put(&context_vk->bo_slab_available, &key, &slab->entry) < 0) + { + wined3d_device_vk_allocator_unlock(device_vk); + ERR("Failed to add slab to available tree.\n"); + heap_free(slab); + return false; + } + slab->requested_memory_type = memory_type; if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) { + wined3d_device_vk_allocator_unlock(device_vk); ERR("Failed to create slab bo.\n"); + wine_rb_remove(&context_vk->bo_slab_available, &slab->entry); heap_free(slab); return false; } slab->map = ~0u; - if (wine_rb_put(&context_vk->bo_slab_available, &key, &slab->entry) < 0) - { - ERR("Failed to add slab to available tree.\n"); - wined3d_context_vk_destroy_bo(context_vk, &slab->bo); - heap_free(slab); - return false; - } - TRACE("Created new bo slab %p.\n", slab); } @@ -407,6 +428,8 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context } } + wined3d_device_vk_allocator_unlock(device_vk); + *bo = slab->bo; bo->memory = NULL; bo->slab = slab; @@ -480,7 +503,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic { ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); if (bo->memory) - wined3d_allocator_block_free(bo->memory); + wined3d_context_vk_free_memory(context_vk, bo->memory); else VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); @@ -574,7 +597,7 @@ BOOL wined3d_context_vk_create_image(struct wined3d_context_vk *context_vk, VkIm { VK_CALL(vkDestroyImage(device_vk->vk_device, image->vk_image, NULL)); if (image->memory) - wined3d_allocator_block_free(image->memory); + wined3d_context_vk_free_memory(context_vk, image->memory); else VK_CALL(vkFreeMemory(device_vk->vk_device, image->vk_memory, NULL)); ERR("Failed to bind image memory, vr %s.\n", wined3d_debug_vkresult(vr)); @@ -688,7 +711,7 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte if (context_vk->completed_command_buffer_id > command_buffer_id) { - wined3d_allocator_block_free(block); + wined3d_context_vk_free_memory(context_vk, block); TRACE("Freed block %p.\n", block); return; } @@ -707,11 +730,14 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, SIZE_T idx, struct wined3d_context_vk *context_vk) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); struct wined3d_bo_slab_vk_key key; struct wine_rb_entry *entry; TRACE("slab %p, idx %lu, context_vk %p.\n", slab, idx, context_vk); + wined3d_device_vk_allocator_lock(device_vk); + if (!slab->map) { key.memory_type = slab->requested_memory_type; @@ -729,6 +755,8 @@ static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, } } slab->map |= 1u << idx; + + wined3d_device_vk_allocator_unlock(device_vk); } static void wined3d_context_vk_destroy_bo_slab_slice(struct wined3d_context_vk *context_vk, @@ -1000,7 +1028,7 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont case WINED3D_RETIRED_ALLOCATOR_BLOCK_VK: TRACE("Destroying block %p.\n", o->u.block); - wined3d_allocator_block_free(o->u.block); + wined3d_context_vk_free_memory(context_vk, o->u.block); break; case WINED3D_RETIRED_BO_SLAB_SLICE_VK: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aa8974366a6..62b92ce7c34 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4084,6 +4084,7 @@ struct wined3d_device_vk struct wined3d_null_resources_vk null_resources_vk; struct wined3d_null_views_vk null_views_vk; + CRITICAL_SECTION allocator_cs; struct wined3d_allocator allocator; struct wined3d_uav_clear_state_vk uav_clear_state; @@ -4094,6 +4095,16 @@ static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_vk, d); } +static inline void wined3d_device_vk_allocator_lock(struct wined3d_device_vk *device_vk) +{ + EnterCriticalSection(&device_vk->allocator_cs); +} + +static inline void wined3d_device_vk_allocator_unlock(struct wined3d_device_vk *device_vk) +{ + LeaveCriticalSection(&device_vk->allocator_cs); +} + bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, -- 2.33.0

3 15

[PATCH 1/2] evr/mixer: Pass valid background color parameter to VideoProcessBlt().
by Nikolay Sivov 04 Nov '21

04 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Conversion is using coefficients from SDTV ITU-R BT.601, which matches official dxva2 samples, except for RGB values shift by 16, which I don't see in ITU paper. dlls/evr/mixer.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 3a2b6830782..2e03535fda3 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -95,7 +95,11 @@ struct video_mixer IMFAttributes *internal_attributes; unsigned int mixing_flags; unsigned int is_streaming; - COLORREF bkgnd_color; + struct + { + COLORREF rgba; + DXVA2_AYUVSample16 ayuv; + } bkgnd_color; LONGLONG lower_bound; LONGLONG upper_bound; CRITICAL_SECTION cs; @@ -1277,7 +1281,6 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) zoom_rect.right = zoom_rect.bottom = 1.0f; } - SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); video_mixer_scale_rect(&dst, rt_desc.Width, rt_desc.Height, &zoom_rect); for (i = 0; i < mixer->input_count; ++i) @@ -1329,6 +1332,9 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) if (SUCCEEDED(hr)) { + SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); + params.BackgroundColor = mixer->bkgnd_color.ayuv; + if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, sample_count, NULL))) { @@ -1983,12 +1989,28 @@ static HRESULT WINAPI video_mixer_processor_GetBackgroundColor(IMFVideoProcessor return E_POINTER; EnterCriticalSection(&mixer->cs); - *color = mixer->bkgnd_color; + *color = mixer->bkgnd_color.rgba; LeaveCriticalSection(&mixer->cs); return S_OK; } +static void video_mixer_rgb_to_ycbcr(COLORREF rgb, DXVA2_AYUVSample16 *ayuv) +{ + int y, cb, cr, r, g, b; + + r = GetRValue(rgb); g = GetGValue(rgb); b = GetBValue(rgb); + /* Coefficients according to SDTV ITU-R BT.601 */ + y = (77 * r + 150 * g + 29 * b + 128) / 256 + 16; + cb = (-44 * r - 87 * g + 131 * b + 128) / 256 + 128; + cr = (131 * r - 110 * g - 21 * b + 128) / 256 + 128; + + ayuv->Y = y * 0x100; + ayuv->Cb = cb * 0x100; + ayuv->Cr = cr * 0x100; + ayuv->Alpha = 0xffff; +} + static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor *iface, COLORREF color) { struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); @@ -1996,7 +2018,11 @@ static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor TRACE("%p, %#x.\n", iface, color); EnterCriticalSection(&mixer->cs); - mixer->bkgnd_color = color; + if (mixer->bkgnd_color.rgba != color) + { + video_mixer_rgb_to_ycbcr(color, &mixer->bkgnd_color.ayuv); + mixer->bkgnd_color.rgba = color; + } LeaveCriticalSection(&mixer->cs); return S_OK; @@ -2528,6 +2554,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->upper_bound = MFT_OUTPUT_BOUND_UPPER_UNBOUNDED; video_mixer_init_input(&object->inputs[0]); video_mixer_update_zorder_map(object); + video_mixer_rgb_to_ycbcr(object->bkgnd_color.rgba, &object->bkgnd_color.ayuv); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) { -- 2.33.0

1 1

[PATCH v2 1/5] jscript: Implement Object.prototype.isPrototypeOf method.
by Gabriel Ivăncescu 04 Nov '21

04 Nov '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/object.c | 20 ++++++++++++++++++-- dlls/jscript/tests/lang.js | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 169b47c..fd5ab52 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -196,8 +196,24 @@ static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, W static HRESULT Object_isPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + jsdisp_t *jsdisp; + BOOL ret = FALSE; + + if(!r) + return S_OK; + + if(argc && is_jsdisp(jsthis) && is_object_instance(argv[0]) && (jsdisp = to_jsdisp(get_object(argv[0])))) { + while(jsdisp->prototype) { + if(jsdisp->prototype == jsthis->u.jsdisp) { + ret = TRUE; + break; + } + jsdisp = jsdisp->prototype; + } + } + + *r = jsval_bool(ret); + return S_OK; } static HRESULT Object_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ad1217d..63aa669 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1679,14 +1679,28 @@ tmp = new instanceOfTest(); ok((tmp instanceof instanceOfTest) === true, "tmp is not instance of instanceOfTest"); ok((tmp instanceof Object) === true, "tmp is not instance of Object"); ok((tmp instanceof String) === false, "tmp is instance of String"); +ok(instanceOfTest.isPrototypeOf(tmp) === false, "instanceOfTest is prototype of tmp"); +ok(instanceOfTest.prototype.isPrototypeOf(tmp) === true, "instanceOfTest.prototype is not prototype of tmp"); +ok(Object.prototype.isPrototypeOf(tmp) === true, "Object.prototype is not prototype of tmp"); instanceOfTest.prototype = new Object(); ok((tmp instanceof instanceOfTest) === false, "tmp is instance of instanceOfTest"); ok((tmp instanceof Object) === true, "tmp is not instance of Object"); +ok(instanceOfTest.prototype.isPrototypeOf(tmp) === false, "instanceOfTest.prototype is prototype of tmp"); ok((1 instanceof Object) === false, "1 is instance of Object"); ok((false instanceof Boolean) === false, "false is instance of Boolean"); ok(("" instanceof Object) === false, "'' is instance of Object"); +ok(Number.prototype.isPrototypeOf(1) === false, "Number.prototype is prototype of 1"); +ok(String.prototype.isPrototypeOf("") === false, "String.prototype is prototype of ''"); + +ok(tmp.isPrototypeOf(null) === false, "tmp is prototype of null"); +ok(tmp.isPrototypeOf(undefined) === false, "tmp is prototype of undefined"); +ok(Object.prototype.isPrototypeOf.call(tmp) === false, "tmp is prototype of no argument"); +ok(Object.prototype.isPrototypeOf.call(test, Object) === false, "test is prototype of Object"); +ok(Object.prototype.isPrototypeOf.call(testObj, Object) === false, "testObj is prototype of Object"); +ok(Object.prototype.isPrototypeOf(test) === false, "Object.prototype is prototype of test"); +ok(Object.prototype.isPrototypeOf(testObj) === false, "Object.prototype is prototype of testObj"); (function () { ok((arguments instanceof Object) === true, "argument is not instance of Object"); -- 2.31.1

3 10

[PATCH v4 1/3] uiautomationcore: Implement UiaGetReservedNotSupportedValue.
by Connor McAdams 04 Nov '21

04 Nov '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 131 +++++++++++++++++++++++++++++- 2 files changed, 130 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..638899044f9 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,12 +16,134 @@ * 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_obj_marshal_wrapper +{ + IUnknown IUnknown_iface; + LONG refcount; + + IUnknown *marshaler; + IUnknown *marshal_object; +}; + +static struct uia_rsrv_obj_marshal_wrapper *impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct uia_rsrv_obj_marshal_wrapper, IUnknown_iface); +} + +static HRESULT WINAPI uia_rsrv_obj_marshal_wrapper_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper = impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(iface); + return IUnknown_QueryInterface(wrapper->marshal_object, riid, ppv); +} + +static ULONG WINAPI uia_rsrv_obj_marshal_wrapper_AddRef(IUnknown *iface) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper = impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI uia_rsrv_obj_marshal_wrapper_Release(IUnknown *iface) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper = impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + if (!refcount) + { + IUnknown_Release(wrapper->marshaler); + heap_free(wrapper); + } + + return refcount; +} + +static const IUnknownVtbl uia_rsrv_obj_marshal_wrapper_vtbl = { + uia_rsrv_obj_marshal_wrapper_QueryInterface, + uia_rsrv_obj_marshal_wrapper_AddRef, + uia_rsrv_obj_marshal_wrapper_Release, +}; + +/* + * When passing the ReservedNotSupportedValue/ReservedMixedAttributeValue + * interface pointers across apartments within the same process, create a free + * threaded marshaler so that the pointer value is preserved. + */ +static HRESULT uia_rsrv_obj_create_marshal_wrapper(IUnknown *reserved, void **ppv) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper; + HRESULT hr; + + TRACE("%p, %p\n", reserved, ppv); + + wrapper = heap_alloc(sizeof(*wrapper)); + if (!wrapper) + return E_OUTOFMEMORY; + + wrapper->IUnknown_iface.lpVtbl = &uia_rsrv_obj_marshal_wrapper_vtbl; + wrapper->marshal_object = reserved; + wrapper->refcount = 1; + + if (FAILED(hr = CoCreateFreeThreadedMarshaler(&wrapper->IUnknown_iface, &wrapper->marshaler))) + { + heap_free(wrapper); + return hr; + } + + hr = IUnknown_QueryInterface(wrapper->marshaler, &IID_IMarshal, ppv); + IUnknown_Release(&wrapper->IUnknown_iface); + + return hr; +} + +/* + * UiaReservedNotSupportedValue object. + */ +static HRESULT WINAPI uia_reserved_obj_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) + return uia_rsrv_obj_create_marshal_wrapper(iface, ppv); + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI uia_reserved_obj_AddRef(IUnknown *iface) +{ + return 1; +} + +static ULONG WINAPI uia_reserved_obj_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl uia_reserved_obj_vtbl = { + uia_reserved_obj_QueryInterface, + uia_reserved_obj_AddRef, + uia_reserved_obj_Release, +}; + +static IUnknown uia_reserved_ns_iface = {&uia_reserved_obj_vtbl}; + /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) */ @@ -46,8 +168,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 4

[PATCH v2] ntdll: Don't constraint TEB address to 2GB for native x64 process.
by Paul Gofman 04 Nov '21

04 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - don't change virtual_alloc_first_teb(). dlls/ntdll/unix/virtual.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 756a7388a22..f62ca1f5f01 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3021,6 +3021,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) void *ptr = NULL; NTSTATUS status = STATUS_SUCCESS; SIZE_T block_size = signal_stack_mask + 1; + BOOL is_wow = !!NtCurrentTeb()->WowTebOffset; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if (next_free_teb) @@ -3035,7 +3036,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { SIZE_T total = 32 * block_size; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 ? 0x7fffffff : 0, + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 && is_wow ? 0x7fffffff : 0, &total, MEM_RESERVE, PAGE_READWRITE ))) { server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -3048,7 +3049,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } - *ret_teb = teb = init_teb( ptr, !!NtCurrentTeb()->WowTebOffset ); + *ret_teb = teb = init_teb( ptr, is_wow ); server_leave_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = signal_alloc_thread( teb ))) -- 2.33.1

1 0

[PATCH] ntdll: Don't constraint TEB address to 2GB for native x64 process.
by Paul Gofman 04 Nov '21

04 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/virtual.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 756a7388a22..3dc06d520dd 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2985,6 +2985,7 @@ static TEB *init_teb( void *ptr, BOOL is_wow ) */ TEB *virtual_alloc_first_teb(void) { + static const BOOL is_wow = FALSE; void *ptr; NTSTATUS status; SIZE_T data_size = page_size; @@ -3000,14 +3001,14 @@ TEB *virtual_alloc_first_teb(void) exit(1); } - NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, is_win64 ? 0x7fffffff : 0, &total, + NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, is_win64 && is_wow ? 0x7fffffff : 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; ptr = (char *)teb_block + 30 * block_size; data_size = 2 * block_size; NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &data_size, MEM_COMMIT, PAGE_READWRITE ); peb = (PEB *)((char *)teb_block + 31 * block_size + (is_win64 ? 0 : page_size)); - return init_teb( ptr, FALSE ); + return init_teb( ptr, is_wow ); } @@ -3021,6 +3022,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) void *ptr = NULL; NTSTATUS status = STATUS_SUCCESS; SIZE_T block_size = signal_stack_mask + 1; + BOOL is_wow = !!NtCurrentTeb()->WowTebOffset; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if (next_free_teb) @@ -3035,7 +3037,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { SIZE_T total = 32 * block_size; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 ? 0x7fffffff : 0, + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 && is_wow ? 0x7fffffff : 0, &total, MEM_RESERVE, PAGE_READWRITE ))) { server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -3048,7 +3050,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } - *ret_teb = teb = init_teb( ptr, !!NtCurrentTeb()->WowTebOffset ); + *ret_teb = teb = init_teb( ptr, is_wow ); server_leave_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = signal_alloc_thread( teb ))) -- 2.33.1

2 1

[PATCH v2 1/3] include: Rename LDR_WINE_INTERNAL to LDR_WINE_BUILTIN.
by Zebediah Figura 04 Nov '21

04 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This series makes it possible to use dynamic libraries from an external path without needing to first copy them into a prefix. As an example, on Debian I am able to install the "libz-minw-w64-dev" package, and then use the following configure command to compile Wine: configure --enable-win64 ZLIB_PE_CFLAGS="$(x86_64-w64-mingw32-pkg-config --cflags zlib)" ZLIB_PE_LIBS="$(x86_64-w64-mingw32-pkg-config --libs zlib)" SYSTEMDLLDIR=/usr/x86_64-w64-mingw32/lib/ whereafter libraries are linked directly to system zlib1.dll, and no further configuration is needed I would like to submit patches in the future to allow the use of pkg-config for automatically detecting compile flags and libraries. I would also like to find some way to obviate manual specification of DLL bindirs. v2: Rebased on top of current git; no other change. dlls/kernel32/kernel_main.c | 2 +- dlls/krnl386.exe16/ne_module.c | 2 +- dlls/ntdll/loader.c | 10 +++++----- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- include/winternl.h | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 4467af739e0..317ee782d7a 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -136,7 +136,7 @@ static BOOL process_attach( HMODULE module ) { LDR_DATA_TABLE_ENTRY *ldr; - if (LdrFindEntryForAddress( GetModuleHandleW( 0 ), &ldr ) || !(ldr->Flags & LDR_WINE_INTERNAL)) + if (LdrFindEntryForAddress( GetModuleHandleW( 0 ), &ldr ) || !(ldr->Flags & LDR_WINE_BUILTIN)) LoadLibraryA( "krnl386.exe16" ); } #endif diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index c26fe778253..108e88e5546 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -982,7 +982,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ return ERROR_FILE_NOT_FOUND; } /* check if module was loaded native */ - if (LdrFindEntryForAddress( main_owner, &ldr ) || !(ldr->Flags & LDR_WINE_INTERNAL)) + if (LdrFindEntryForAddress( main_owner, &ldr ) || !(ldr->Flags & LDR_WINE_BUILTIN)) { FreeLibrary( mod32 ); descr = NULL; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 255d5afef79..17c8d7f7485 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1081,7 +1081,7 @@ static BOOL is_dll_native_subsystem( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_NT_H if (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_NATIVE) return FALSE; if (nt->OptionalHeader.SectionAlignment < page_size) return TRUE; - if (mod->Flags & LDR_WINE_INTERNAL) return TRUE; + if (mod->Flags & LDR_WINE_BUILTIN) return TRUE; if ((imports = RtlImageDirectoryEntryToData( mod->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) @@ -1310,7 +1310,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name wm->ldr.DllBase = hModule; wm->ldr.SizeOfImage = nt->OptionalHeader.SizeOfImage; - wm->ldr.Flags = LDR_DONT_RESOLVE_REFS | (builtin ? LDR_WINE_INTERNAL : 0); + wm->ldr.Flags = LDR_DONT_RESOLVE_REFS | (builtin ? LDR_WINE_BUILTIN : 0); wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; wm->CheckSum = nt->OptionalHeader.CheckSum; @@ -1454,7 +1454,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, reason ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL && reason == DLL_PROCESS_ATTACH) + if (wm->ldr.Flags & LDR_WINE_BUILTIN && reason == DLL_PROCESS_ATTACH) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (!entry) return STATUS_SUCCESS; @@ -3643,7 +3643,7 @@ static void free_modref( WINE_MODREF *wm ) if (!TRACE_ON(module)) TRACE_(loaddll)("Unloaded module %s : %s\n", debugstr_w(wm->ldr.FullDllName.Buffer), - (wm->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native" ); + (wm->ldr.Flags & LDR_WINE_BUILTIN) ? "builtin" : "native" ); free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); @@ -4079,7 +4079,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR } release_address_space(); if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); + if (wm->ldr.Flags & LDR_WINE_BUILTIN) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); process_breakpoint(); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 290639b676b..bfbaeab47c9 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -191,7 +191,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX /* then look for host system exception information */ - if (!module || (module->Flags & LDR_WINE_INTERNAL)) + if (!module || (module->Flags & LDR_WINE_BUILTIN)) { status = unix_funcs->unwind_builtin_dll( type, dispatch, context ); if (status != STATUS_SUCCESS) return status; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ef32eba68b7..8515b176e5d 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -275,7 +275,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX /* then look for host system exception information */ - if (!module || (module->Flags & LDR_WINE_INTERNAL)) + if (!module || (module->Flags & LDR_WINE_BUILTIN)) { status = unix_funcs->unwind_builtin_dll( type, dispatch, context ); diff --git a/include/winternl.h b/include/winternl.h index eea97f1238b..216a3b3fdaa 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3394,7 +3394,7 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT /* these ones is Wine specific */ #define LDR_DONT_RESOLVE_REFS 0x40000000 -#define LDR_WINE_INTERNAL 0x80000000 +#define LDR_WINE_BUILTIN 0x80000000 /* flag for LdrAddRefDll */ #define LDR_ADDREF_DLL_PIN 0x00000001 -- 2.33.0

2 3

[PATCH] comctl32: Fix 'pszHeaderTitle' copypasta.
by Serge Gautherie 04 Nov '21

04 Nov '21

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to https://source.winehq.org/git/wine.git/commit/335983ed9172e1a985c5b237676cf… Part of ReactOS-Bug: https://jira.reactos.org/browse/CORE-12912 --- dlls/comctl32/propsheet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 1604b9e..556d63f 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3372,7 +3372,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) if (ppshpage->dwFlags & PSP_USEHEADERSUBTITLE) { SelectObject(hdc, psInfo->hFont); SetRect(&r, 40, 25, rzone.right - 69, rzone.bottom); - if (!IS_INTRESOURCE(ppshpage->pszHeaderTitle)) + if (!IS_INTRESOURCE(ppshpage->pszHeaderSubTitle)) DrawTextW(hdc, ppshpage->pszHeaderSubTitle, -1, &r, DT_LEFT | DT_WORDBREAK); else { -- 2.10.0.windows.1

1 0

Feedback requested / dwarf4
by Eric Pouech 04 Nov '21

04 Nov '21

Background ---------- Wine has been using dwarf2 debug format for years, and hasn't updated to dwarf4 yet (gcc and most of distros switched more than 10 years ago). As gcc & distros have switched to dwarf5 for 6 months to a year, it's time to catch up. Status ------ As of today, support for reading and managing dwarf4 debug info is included in dbghelp (as well as dwarf2 and dwarf3) and is available through winedbg. However, by default all Wine components are still compiled with dwarf2. Since most system shared libraries are now shipped with dwarf5, it means that no modules with dwarf4 debug information are crunched. Need for help ------------- Before enabling dwarf4 as wine's default debug format, feedback is requested on all those changes. How can you help: 1) Setup the dwarf4 debug format for wine compilation using: > ./configure CFLAGS="-gdwarf-4 -O2" CROSSCFLAGS="-gdwarf-4 -O2" > make -B The two options to configure are needed to configure both the compiler for ELF parts, and the cross compiler for PE parts. And you need to recompile everything to generate correct debug information. 2) Report any strange / unexpected behavior Given the magnitude of change, I'd be surprised if everything would be perfect. So, your contribution here for testing and shaking would be much appreciated. Improvements (dwarf4 over dwarf2) ------------ Here's a typical debugging session (wine compiles with dwarf2): [eric:~/work/output-wine/wine64]$ ./wine programs/winedbg/winedbg.exe.so notepad WineDbg starting on pid 0100 RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x000000007bc50679 RtlDefaultNpAcl+0x2b9 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll: ret 1731 } Wine-dbg>b CreateWindowExW Breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 Wine-dbg>c Stopped on breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 CreateWindowExW () at Z:\home\eric\work\wine\dlls\user32\win.c:1913 1913 { Wine-dbg>bt Backtrace: =>0 0x000000006eb91448 CreateWindowExW(exStyle=<is not available>, className=<is not available>, windowName=<is not available>, style=<is not available>, x=<is not available>, y=<is not available>, width=<is not available>, height=<is not available>, parent=<is not available>, menu=<is not available>, instance=<is no t available>, data=<is not available>) [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 (0x0000000000000559) 1 0x0000000000405008 WinMain+0x3a7(hInstance=0x400000, prev=<is not available>, cmdline=<is not available>, show=0x1) [Z:\home\eric\work\wine\programs\notepad\main.c:792] in notepad (0x0000000000000559) 2 0x0000000000406326 main+0xa5(argc=<is not available>, argv=<is not available>) [Z:\home\eric\work\wine\dlls\msvcrt\crt_winmain.c:53] in notepad (0x0000000000000000) 3 0x0000000000406155 mainCRTStartup+0x64() [Z:\home\eric\work\wine\dlls\msvcrt\crt_main.c:58] in notepad (0x0000000000000000) 4 0x000000007b62c679 BaseThreadInitThunk+0x8(unknown=<is not available>, entry=<is not available>, arg=<is not available>) [Z:\home\eric\work\wine\dlls\kernel32\thread.c:61] in kernel32 (0x0000000000000000) 5 0x000000007bc56c73 RtlUserThreadStart+0x82(entry=0x4060f0, arg=0x3f0000) [Z:\home\eric\work\wine\dlls\ntdll\thread.c:241] in ntdll (0x0000000000000000) Wine-dbg> Note that most of variables in stack trace are not useful. With Wine recompiled with dwarf 4 support, you get: [eric:~/work/output-wine/winedw4-64]$ ./wine programs/winedbg/winedbg.exe.so notepad WineDbg starting on pid 0104 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rcx/330 -> r14/342) RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x000000007bc50679 RtlDefaultNpAcl+0x2b9 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll: ret 1731 } Wine-dbg>b CreateWindowExW 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (r8/336 -> r10/338) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rdx/331 -> rcx/330) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (r10/338 -> r8/336) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rbx/329 -> r12/340) 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found Breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 Wine-dbg>c Stopped on breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 CreateWindowExW () at Z:\home\eric\work\wine\dlls\user32\win.c:1913 1913 { Wine-dbg>bt Backtrace: =>0 0x000000006eb91448 CreateWindowExW(exStyle=0, className="Notepad", windowName="Notepad", style=0xcf0000, x=0x1, y=0x25, width=0x558, height=0x402, parent=(nil), menu=(nil), instance=0x400000, data=0x0(nil)) [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 (0x0000000000000559) 1 0x0000000000405008 WinMain+0x3a7(hInstance=0x400000, prev=<is not available>, cmdline=<is not available>, show=0x1) [Z:\home\eric\work\wine\programs\notepad\main.c:792] in notepad (0x0000000000000559) 2 0x0000000000406326 main+0xa5(argc=<is not available>, argv=<is not available>) [Z:\home\eric\work\wine\dlls\msvcrt\crt_winmain.c:53] in notepad (0x0000000000000000) 3 0x0000000000406155 mainCRTStartup+0x64() [Z:\home\eric\work\wine\dlls\msvcrt\crt_main.c:58] in notepad (0x0000000000000000) 4 0x000000007b62c679 BaseThreadInitThunk+0x8(unknown=<is not available>, entry=<is not available>, arg=<is not available>) [Z:\home\eric\work\wine\dlls\kernel32\thread.c:61] in kernel32 (0x0000000000000000) 5 0x000000007bc56c73 RtlUserThreadStart+0x82(entry=0x4060f0, arg=0x3f0000) [Z:\home\eric\work\wine\dlls\ntdll\thread.c:241] in ntdll (0x0000000000000000) Wine-dbg> and a much nicer backtrace regarding parameters. Note that the same improvements are also available with winedbg in gdb proxy mode: - same lack of values on parameters/local variables in dwarf-2 - provides (in this example) the same information as winedbg/dbghelp does There are quite a couple of other things available with dwarf4 (split .dwo files, inlined functions...). ---------- Thanks in advance -- Eric Pouech

1 0

Feedback requested / dwarf4
by Eric Pouech 04 Nov '21

04 Nov '21

Hi all, Since yesterday, dwarf4 debug format support is included in dbghelp. background ---------- Wine has been using dwarf2 for years, and hasn't updated to dwarf4 (gcc and most of distros switched more than 10 years ago). As distros have been switching to dwarf5 for 6 months to a year now, it's time to be back on track. status ------ As of today, support for reading and managing dwarf4 debug info is included in dbghelp (as well as dwarf2 and dwarf3). However, by default Wine is still compiled with dwarf2. need for help ------------- Before enabling dwa, feedback is requested on dwarf4. How can you help: Setup the dwarf4 debug format for wine compilation using: > ./configure CFLAGS="-gdwarf-4 -O2" CROSSCFLAGS="-gdwarf-4 -O2" > make -B We need to configure both gcc for ELF compilation, and the cross compiler (hence the two options to configure). And we need to recompile everything. improvements ------------ Here's a typical debugging session (compiled with dwarf2): [eric:~/work/output-wine/wine64]$ ./wine programs/winedbg/winedbg.exe.so notepad WineDbg starting on pid 0100 RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x000000007bc50679 RtlDefaultNpAcl+0x2b9 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll: ret 1731 } Wine-dbg>b CreateWindowExW Breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 Wine-dbg>c Stopped on breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 CreateWindowExW () at Z:\home\eric\work\wine\dlls\user32\win.c:1913 1913 { Wine-dbg>bt Backtrace: =>0 0x000000006eb91448 CreateWindowExW(exStyle=<is not available>, className=<is not available>, windowName=<is not available>, style=<is not available>, x=<is not available>, y=<is not available>, width=<is not available>, height=<is not available>, parent=<is not available>, menu=<is not available>, instance=<is no t available>, data=<is not available>) [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 (0x0000000000000559) 1 0x0000000000405008 WinMain+0x3a7(hInstance=0x400000, prev=<is not available>, cmdline=<is not available>, show=0x1) [Z:\home\eric\work\wine\programs\notepad\main.c:792] in notepad (0x0000000000000559) 2 0x0000000000406326 main+0xa5(argc=<is not available>, argv=<is not available>) [Z:\home\eric\work\wine\dlls\msvcrt\crt_winmain.c:53] in notepad (0x0000000000000000) 3 0x0000000000406155 mainCRTStartup+0x64() [Z:\home\eric\work\wine\dlls\msvcrt\crt_main.c:58] in notepad (0x0000000000000000) 4 0x000000007b62c679 BaseThreadInitThunk+0x8(unknown=<is not available>, entry=<is not available>, arg=<is not available>) [Z:\home\eric\work\wine\dlls\kernel32\thread.c:61] in kernel32 (0x0000000000000000) 5 0x000000007bc56c73 RtlUserThreadStart+0x82(entry=0x4060f0, arg=0x3f0000) [Z:\home\eric\work\wine\dlls\ntdll\thread.c:241] in ntdll (0x0000000000000000) Wine-dbg> Note that most of variables in stack trace are not useful. With Wine recompiled with dwarf 4 support, you get: [eric:~/work/output-wine/winedw4-64]$ ./wine programs/winedbg/winedbg.exe.so notepad WineDbg starting on pid 0104 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rcx/330 -> r14/342) RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x000000007bc50679 RtlDefaultNpAcl+0x2b9 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll: ret 1731 } Wine-dbg>b CreateWindowExW 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (r8/336 -> r10/338) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rdx/331 -> rcx/330) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (r10/338 -> r8/336) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rbx/329 -> r12/340) 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found Breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 Wine-dbg>c Stopped on breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 CreateWindowExW () at Z:\home\eric\work\wine\dlls\user32\win.c:1913 1913 { Wine-dbg>bt Backtrace: =>0 0x000000006eb91448 CreateWindowExW(exStyle=0, className="Notepad", windowName="Notepad", style=0xcf0000, x=0x1, y=0x25, width=0x558, height=0x402, parent=(nil), menu=(nil), instance=0x400000, data=0x0(nil)) [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 (0x0000000000000559) 1 0x0000000000405008 WinMain+0x3a7(hInstance=0x400000, prev=<is not available>, cmdline=<is not available>, show=0x1) [Z:\home\eric\work\wine\programs\notepad\main.c:792] in notepad (0x0000000000000559) 2 0x0000000000406326 main+0xa5(argc=<is not available>, argv=<is not available>) [Z:\home\eric\work\wine\dlls\msvcrt\crt_winmain.c:53] in notepad (0x0000000000000000) 3 0x0000000000406155 mainCRTStartup+0x64() [Z:\home\eric\work\wine\dlls\msvcrt\crt_main.c:58] in notepad (0x0000000000000000) 4 0x000000007b62c679 BaseThreadInitThunk+0x8(unknown=<is not available>, entry=<is not available>, arg=<is not available>) [Z:\home\eric\work\wine\dlls\kernel32\thread.c:61] in kernel32 (0x0000000000000000) 5 0x000000007bc56c73 RtlUserThreadStart+0x82(entry=0x4060f0, arg=0x3f0000) [Z:\home\eric\work\wine\dlls\ntdll\thread.c:241] in ntdll (0x0000000000000000) Wine-dbg> and a much nicer backtrace regarding parameters. When using winedbg's gdb proxy mode: - same lack of values on parameters/local variables in dwarf-2 - provides (in this example) the same information as winedbg -- -- Eric Pouech

1 0

[PATCH 3/3] comctl32/button: Add a get_box_rect() helper to calculation box rectangle.
by Zhiyi Zhang 04 Nov '21

04 Nov '21

get_box_rect() is introduced so that we don't need to duplicate the check box rectangle calculation when painting themed check boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 130 +++++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 63 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2738a4caee5..6a463cb3460 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1881,11 +1881,65 @@ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) * Check Box & Radio Button Functions */ +/* Get adjusted check box or radio box rectangle */ +static RECT get_box_rect(LONG style, LONG ex_style, const RECT *content_rect, + const RECT *label_rect, BOOL has_label, SIZE box_size) +{ + RECT rect; + int delta; + + rect = *content_rect; + + if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) + rect.left = rect.right - box_size.cx; + else + rect.right = rect.left + box_size.cx; + + /* Adjust box when label is valid */ + if (has_label) + { + rect.top = label_rect->top; + rect.bottom = label_rect->bottom; + } + + /* Box must have the correct height */ + delta = rect.bottom - rect.top - box_size.cy; + if ((style & BS_VCENTER) == BS_TOP) + { + if (delta <= 0) + rect.top -= -delta / 2 + 1; + + rect.bottom = rect.top + box_size.cy; + } + else if ((style & BS_VCENTER) == BS_BOTTOM) + { + if (delta <= 0) + rect.bottom += -delta / 2 + 1; + + rect.top = rect.bottom - box_size.cy; + } + else + { + if (delta > 0) + { + rect.bottom -= delta / 2 + 1; + rect.top = rect.bottom - box_size.cy; + } + else if (delta < 0) + { + rect.top -= -delta / 2 + 1; + rect.bottom = rect.top + box_size.cy; + } + } + + return rect; +} + static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { - RECT rbox, labelRect, imageRect, textRect, client; + RECT rbox, labelRect, oldLabelRect, imageRect, textRect, client; HBRUSH hBrush; - int delta, text_offset, checkBoxWidth, checkBoxHeight; + int text_offset; UINT dtFlags; LRESULT cdrf; HFONT hFont; @@ -1893,6 +1947,7 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) LONG state = infoPtr->state; LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); + SIZE box_size; HWND parent; HRGN hrgn; @@ -1903,10 +1958,10 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) } GetClientRect(infoPtr->hwnd, &client); - rbox = labelRect = client; + labelRect = client; - checkBoxWidth = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; - checkBoxHeight = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; + box_size.cx = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; + box_size.cy = box_size.cx; if ((hFont = infoPtr->font)) SelectObject( hDC, hFont ); GetCharWidthW( hDC, '0', '0', &text_offset ); @@ -1920,15 +1975,13 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) hrgn = set_control_clipping( hDC, &client ); if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) - { - labelRect.right -= checkBoxWidth + text_offset; - rbox.left = rbox.right - checkBoxWidth; - } + labelRect.right -= box_size.cx + text_offset; else - { - labelRect.left += checkBoxWidth + text_offset; - rbox.right = checkBoxWidth; - } + labelRect.left += box_size.cx + text_offset; + + oldLabelRect = labelRect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); + rbox = get_box_rect(style, ex_style, &client, &labelRect, dtFlags != (UINT)-1L, box_size); init_custom_draw(&nmcd, infoPtr, hDC, &client); @@ -1946,16 +1999,6 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) } /* Draw label */ - client = labelRect; - dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); - - /* Only adjust rbox when rtext is valid */ - if (dtFlags != (UINT)-1L) - { - rbox.top = labelRect.top; - rbox.bottom = labelRect.bottom; - } - /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); @@ -1977,45 +2020,6 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (state & BST_PUSHED) flags |= DFCS_PUSHED; if (style & WS_DISABLED) flags |= DFCS_INACTIVE; - /* rbox must have the correct height */ - delta = rbox.bottom - rbox.top - checkBoxHeight; - - if ((style & BS_VCENTER) == BS_TOP) - { - if (delta > 0) - rbox.bottom = rbox.top + checkBoxHeight; - else - { - rbox.top -= -delta / 2 + 1; - rbox.bottom = rbox.top + checkBoxHeight; - } - } - else if ((style & BS_VCENTER) == BS_BOTTOM) - { - if (delta > 0) - rbox.top = rbox.bottom - checkBoxHeight; - else - { - rbox.bottom += -delta / 2 + 1; - rbox.top = rbox.bottom - checkBoxHeight; - } - } - else /* Default */ - { - if (delta > 0) - { - int ofs = delta / 2; - rbox.bottom -= ofs + 1; - rbox.top = rbox.bottom - checkBoxHeight; - } - else if (delta < 0) - { - int ofs = -delta / 2; - rbox.top -= ofs + 1; - rbox.bottom = rbox.top + checkBoxHeight; - } - } - DrawFrameControl(hDC, &rbox, DFC_BUTTON, flags); } @@ -2035,7 +2039,7 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { labelRect.left--; labelRect.right++; - IntersectRect(&labelRect, &labelRect, &client); + IntersectRect(&labelRect, &labelRect, &oldLabelRect); DrawFocusRect(hDC, &labelRect); } -- 2.32.0

1 0

[PATCH 2/3] comctl32/button: Simplify focus rectangle calculation for drawing themed split buttons.
by Zhiyi Zhang 04 Nov '21

04 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 00f42322399..2738a4caee5 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2861,7 +2861,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT rc, content_rect, push_rect, dropdown_rect; + RECT rc, content_rect, push_rect, dropdown_rect, focus_rect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; @@ -2889,6 +2889,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in { push_rect = rc; DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &rc, NULL); + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &focus_rect); } else { @@ -2909,6 +2910,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* The content rect should be the content area of the push button */ GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &content_rect); + focus_rect = content_rect; } if (cdrf & CDRF_NOTIFYPOSTERASE) @@ -2951,18 +2953,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in } if (cdrf & CDRF_SKIPPOSTPAINT) return; - if (focused) - { - MARGINS margins; - - GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); - - push_rect.left += margins.cxLeftWidth; - push_rect.top += margins.cyTopHeight; - push_rect.right -= margins.cxRightWidth; - push_rect.bottom -= margins.cyBottomHeight; - DrawFocusRect(hDC, &push_rect); - } + if (focused) DrawFocusRect(hDC, &focus_rect); } static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) -- 2.32.0

1 0

[PATCH 1/3] comctl32/button: Simplify focus rectangle calculation for drawing themed push buttons.
by Zhiyi Zhang 04 Nov '21

04 Nov '21

The focus rectangle is the same as the result from GetThemeBackgroundContentRect(). So there is no need to retrieve content margins and calculate it again. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index fbe060513d2..00f42322399 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2651,7 +2651,7 @@ cleanup: */ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT bgRect, textRect; + RECT bgRect, textRect, focusRect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; @@ -2661,6 +2661,8 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in GetClientRect(infoPtr->hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); + focusRect = textRect; + init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); parent = GetParent(infoPtr->hwnd); @@ -2698,20 +2700,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in } if (cdrf & CDRF_SKIPPOSTPAINT) return; - if (focused) - { - MARGINS margins; - RECT focusRect = bgRect; - - GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); - - focusRect.left += margins.cxLeftWidth; - focusRect.top += margins.cyTopHeight; - focusRect.right -= margins.cxRightWidth; - focusRect.bottom -= margins.cyBottomHeight; - - DrawFocusRect( hDC, &focusRect ); - } + if (focused) DrawFocusRect(hDC, &focusRect); } static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) -- 2.32.0

1 0

[PATCH] uxtheme: Fix loading a different theme when theming is on.
by Zhiyi Zhang 04 Nov '21

04 Nov '21

When a theme is already active and a user tries to activate another theme, the new theme configuration should be written to the registry so that it's still in effect after a wine reboot. Fix a regression introduced in d290362. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index ba579a02edc..bf72baccebb 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -446,10 +446,8 @@ HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) WARN("Failed to get LoadedBefore: %d\n", GetLastError()); RegCloseKey(hKey); } - if (loaded_before) - return MSSTYLES_SetActiveTheme(tf, FALSE); - if (ret) + if (!loaded_before && ret) UXTHEME_SaveUnthemedSystemMetrics(&metrics); } else { -- 2.32.0

1 0

[PATCH 2/2] uxtheme: Do not draw parent background when handling WM_CTLCOLORSTATIC for static controls.
by Zhiyi Zhang 04 Nov '21

04 Nov '21

SetBkMode(TRANSPARENT) already indicates that the parent background should remain untouched. Drawing parent background destroys any previous content that applications drawn and some applications rely on the content being unchanged. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51914 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/static.c | 1 - dlls/uxtheme/dialog.c | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 269dfbb49eb..99738f7b513 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -458,7 +458,6 @@ static void test_WM_CTLCOLORSTATIC(void) todo_wine_if(todo) ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); color = GetPixel(dialog_hdc, 40, 40); - todo_wine_if(todo) ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); ReleaseDC(child, child_hdc); diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 043346b24e2..a949bfc6579 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -101,15 +101,11 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa HDC controlDC = (HDC)wParam; HWND controlWnd = (HWND)lParam; WCHAR controlClass[32]; - RECT rc; GetClassNameW (controlWnd, controlClass, ARRAY_SIZE(controlClass)); if (lstrcmpiW (controlClass, WC_STATICW) == 0) { - /* Static control - draw parent background and set text to - * transparent, so it looks right on tab pages. */ - GetClientRect (controlWnd, &rc); - DrawThemeParentBackground (controlWnd, controlDC, &rc); + SetBkColor(controlDC, GetSysColor(COLOR_BTNFACE)); SetBkMode (controlDC, TRANSPARENT); /* Return NULL brush since we painted the BG already */ -- 2.32.0

1 0

[PATCH 1/2] comctl32/tests: Test WM_CTLCOLORSTATIC for static controls in a themed dialog.
by Zhiyi Zhang 04 Nov '21

04 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/static.c | 92 ++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 40a337b97b0..269dfbb49eb 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "commctrl.h" #include "resources.h" +#include "uxtheme.h" #include "wine/test.h" @@ -377,6 +378,96 @@ static void test_STM_SETIMAGE(void) DeleteEnhMetaFile(emf); } +static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + static HWND child; + + switch (msg) + { + case WM_INITDIALOG: + child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, + (HMENU)100, 0, NULL); + ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + return FALSE; + + case WM_CLOSE: + DestroyWindow(child); + return TRUE; + + default: + return FALSE; + } +} + +static void test_WM_CTLCOLORSTATIC(void) +{ + HTHEME (WINAPI *pGetWindowTheme)(HTHEME) = NULL; + HWND parent, dialog, child; + COLORREF color, old_color; + HDC child_hdc, dialog_hdc; + int mode, old_mode; + BOOL todo = FALSE; + HMODULE uxtheme; + HBRUSH brush; + + struct + { + DLGTEMPLATE tmplate; + WORD menu; + WORD class; + WORD title; + } temp = {{0}}; + + parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, + NULL); + ok(parent != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + + temp.tmplate.style = WS_CHILD | WS_VISIBLE; + temp.tmplate.cx = 80; + temp.tmplate.cy = 80; + dialog = CreateDialogIndirectParamA(NULL, &temp.tmplate, parent, test_WM_CTLCOLORSTATIC_proc, 0); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); + child = GetDlgItem(dialog, 100); + ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); + + uxtheme = LoadLibraryA("uxtheme.dll"); + if (uxtheme) + { + pGetWindowTheme = (void*)GetProcAddress(uxtheme, "GetWindowTheme"); + if (pGetWindowTheme) + todo = !!pGetWindowTheme(dialog); + } + + dialog_hdc = GetDC(dialog); + child_hdc = GetDC(child); + PatBlt(dialog_hdc, 0, 0, 80, 80, BLACKNESS); + + old_mode = SetBkMode(child_hdc, OPAQUE); + ok(old_mode != 0, "SetBkMode failed.\n"); + old_color = SetBkColor(child_hdc, 0xaa5511); + ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); + + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(todo) + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), brush); + color = SetBkColor(child_hdc, old_color); + ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", + GetSysColor(COLOR_BTNFACE), color); + mode = SetBkMode(child_hdc, old_mode); + todo_wine_if(todo) + ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); + color = GetPixel(dialog_hdc, 40, 40); + todo_wine_if(todo) + ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); + + ReleaseDC(child, child_hdc); + ReleaseDC(dialog, dialog_hdc); + EndDialog(dialog, 0); + DestroyWindow(parent); + FreeLibrary(uxtheme); +} + START_TEST(static) { static const char classname[] = "testclass"; @@ -417,6 +508,7 @@ START_TEST(static) test_set_text(); test_set_image(); test_STM_SETIMAGE(); + test_WM_CTLCOLORSTATIC(); DestroyWindow(hMainWnd); -- 2.32.0

1 0

[PATCH 1/2] dmime: Parse Wave track stream
by Alistair Leslie-Hughes 04 Nov '21

04 Nov '21

Tron 2.0 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/dmime_private.h | 6 ++ dlls/dmime/wavetrack.c | 148 ++++++++++++++++++++++++++++++++++++- 2 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index c2221a15fd2..6ab47292b39 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -86,6 +86,12 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM { DMUS_IO_TEMPO_ITEM item; } DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM; +struct wave_item { + struct list entry; + DMUS_IO_WAVE_TRACK_HEADER header; + IDirectMusicObject *object; +}; + typedef struct _DMUS_PRIVATE_GRAPH_TOOL { struct list entry; /* for listing elements */ DWORD dwIndex; diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 1c6b08b5235..da7ef37d2c8 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -20,6 +20,8 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** @@ -32,6 +34,8 @@ typedef struct IDirectMusicWaveTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; + + struct list items; } IDirectMusicWaveTrack; /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ @@ -40,6 +44,11 @@ static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, IDirectMusicTrack8_iface); } +static inline IDirectMusicWaveTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI wave_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { @@ -81,6 +90,19 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + struct list *cursor, *cursor2; + struct wave_item *item; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->items) { + item = LIST_ENTRY(cursor, struct wave_item, entry); + list_remove(cursor); + + if (item->object) + IDirectMusicObject_Release(item->object); + + heap_free(item); + } + HeapFree(GetProcessHeap(), 0, This); DMIME_UnlockModule(); } @@ -280,10 +302,131 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { wave_track_Join }; +static HRESULT parse_wave_item(IDirectMusicWaveTrack *This, IStream *stream, + struct chunk_entry *wave, struct wave_item *item) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = wave}; + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if(chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVE_LIST) + { + struct chunk_entry child = {.parent = &chunk}; + DMUS_IO_WAVE_ITEM_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != DMUS_FOURCC_WAVEITEM_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, sizeof(header)))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - rtTime %s\n", wine_dbgstr_longlong(header.rtTime)); + TRACE(" - rtStartOffset %s\n", wine_dbgstr_longlong(header.rtStartOffset)); + TRACE(" - rtReserved %s\n", wine_dbgstr_longlong(header.rtReserved)); + TRACE(" - rtDuration %s\n", wine_dbgstr_longlong(header.rtDuration)); + TRACE(" - dwLoopStart %d\n", header.dwLoopStart); + TRACE(" - dwLoopEnd %d\n", header.dwLoopEnd); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - wVolumeRange %d\n", header.wVolumeRange); + TRACE(" - wPitchRange %d\n", header.wPitchRange); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->object))) + return hr; + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicWaveTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVETRACK_LIST) + { + struct chunk_entry chunklist = {.parent = &chunk}; + struct wave_item *item = NULL; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(&chunklist)); + + if (FAILED(hr = stream_next_chunk(stream, &chunklist))) + return hr; + + if (chunklist.id != DMUS_FOURCC_WAVETRACK_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + item = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct wave_item)); + if (!item) + return E_OUTOFMEMORY; + + list_add_tail (&This->items, &item->entry); + + if (FAILED(hr = stream_next_chunk(stream, &chunklist))) + return hr; + + if (chunklist.id == FOURCC_LIST && chunklist.type == DMUS_FOURCC_WAVEPART_LIST) + { + struct chunk_entry child = {.parent = &chunklist}; + DMUS_IO_WAVE_PART_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_WAVEPART_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, sizeof(header)))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - dwPChannel %d\n", header.dwPChannel); + TRACE(" - dwLockToPart %d\n", header.dwLockToPart); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - dwIndex %d\n", header.dwIndex); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != FOURCC_LIST || child.type != DMUS_FOURCC_WAVEITEM_LIST) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = parse_wave_item(This, stream, &child, item); + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { @@ -313,6 +456,7 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) dmobject_init(&track->dmobj, &CLSID_DirectMusicWaveTrack, (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + list_init(&track->items); DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); -- 2.33.0

2 1

[PATCH] loader: Create performance\winsat\datastore on prefix creation
by Fox2Code 03 Nov '21

03 Nov '21

1 0

[PATCH v5 0/7] gdi32/win32u: EMF fixes to support Hancom Office 2020
by Jinoh Kang 03 Nov '21

03 Nov '21

The following commits modify the behaviours of the following GDI functions: - StretchDIBits - SetDIBitsToDevice To match more closely to that of Windows 10, build 2108, subject to the following constraints: - The source image is not a JPEG (BI_JPEG) or a PNG (BI_PNG) image. - The source image is a *bottom-up* device-independent bitmap. Changelog: - v1 -> v2: add more tests, do extra work so that EMF outputs match - v2 -> v3: emf_parse_user_bitmapinfo: zero out *dst (BITMAPINFOHEADER) (gdi32: allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC.) - v3 -> v4: no changes (resend due to borked up patch orders) - v4 -> v5: change subject (no more RFC); address review comments so far Jinoh Kang (7): gdi32/tests: Add tests for recording StretchDIBits in EMFs. gdi32/tests: Add tests for recording SetDIBitsToDevice in EMFs. win32u: fix return value of StretchDIBits for EMF DC. win32u: fix return value of SetDIBitsToDevice for EMF DC. gdi32: fix bounding box calculation for EMR_STRETCHDIBITS. gdi32: allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC. gdi32: calculate effective number of scan lines and truncate bitmap bits for EMR_SETDIBITSTODEVICE. dlls/gdi32/emfdc.c | 227 ++- dlls/gdi32/tests/metafile.c | 2803 +++++++++++++++++++++++++++++++++++ dlls/win32u/emfdrv.c | 13 +- 3 files changed, 3024 insertions(+), 19 deletions(-) -- 2.31.1

3 15

[PATCH] configure.ac: allow expressing dwarf version in CFLAGS and CROSSCFLAGS
by Eric Pouech 03 Nov '21

03 Nov '21

Based on a patch from Jacek Caban <jacek(a)codeweavers.com> usage: configure CFLAGS="-gdwarf-4 -O2" will enable dwarf4 compilation for ELF parts (and CROSSCFLAGS="-gdwarf-4 -O2" for PE parts) Changes from previous version: - CROSS* part from Jacek Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- configure.ac | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 7c1e446814b..39c8e3a2a4d 100644 --- a/configure.ac +++ b/configure.ac @@ -1018,11 +1018,21 @@ then esac done fi - case $CROSSDEBUG in - *dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-2]) - WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;; - pdb) WINE_TRY_CROSSCFLAGS([-gcodeview]) ;; - esac + + ac_debug_format_seen="" + for ac_flag in $CROSSCFLAGS; do + case $ac_flag in + -gdwarf*|-gcodeview) ac_debug_format_seen=$ac_flag ;; + esac + done + if test "x$ac_debug_format_seen" = x + then + case $CROSSDEBUG in + *dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-2]) + WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;; + pdb) WINE_TRY_CROSSCFLAGS([-gcodeview]) ;; + esac + fi WINE_TRY_CROSSCFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) @@ -1822,13 +1832,19 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= *) EXTRACFLAGS="$EXTRACFLAGS $wine_cv_64bit_compare_swap" ;; esac - dnl Default to dwarf-2 debug info + dnl Determine debug info format + ac_debug_format_seen="" for ac_flag in $CFLAGS; do case $ac_flag in - -g) WINE_TRY_CFLAGS([-gdwarf-2]) - WINE_TRY_CFLAGS([-gstrict-dwarf]) ;; + -gdwarf*) ac_debug_format_seen=yes ;; + -g) ac_debug_format_seen=${ac_debug_format_seen:-default} ;; esac done + if test "x$ac_debug_format_seen" = xdefault + then + WINE_TRY_CFLAGS([-gdwarf-2]) + WINE_TRY_CFLAGS([-gstrict-dwarf]) + fi dnl Disable gcc builtins except for Mingw AC_SUBST(MSVCRTFLAGS,"")

2 1

[PATCH] vbscript: Support VT_BSTR in stack_pop_bool.
by Robert Wilhelm 03 Nov '21

03 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51911 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/interp.c | 7 +++++++ dlls/vbscript/tests/lang.vbs | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 48863068013..2d9d1eee741 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -417,6 +417,7 @@ static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) { variant_val_t val; HRESULT hres; + VARIANT_BOOL vb; hres = stack_pop_val(ctx, &val); if(FAILED(hres)) @@ -437,6 +438,12 @@ static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) case VT_I4: *b = V_I4(val.v); break; + case VT_BSTR: + hres = VarBoolFromStr(V_BSTR(val.v), ctx->script->lcid, 0, &vb); + if(FAILED(hres)) + return hres; + *b=vb; + break; default: FIXME("unsupported for %s\n", debugstr_variant(val.v)); release_val(&val); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dc2acbae69c..f147351b1af 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -357,6 +357,22 @@ while empty ok false, "while empty executed" wend +x = 0 +if "0" then + ok false, "if ""0"" executed" +else + x = 1 +end if +Call ok(x = 1, "if ""0"" else not executed") + +x = 0 +if "-1" then + x = 1 +else + ok false, "if ""-1"" else executed" +end if +Call ok(x = 1, "if ""-1"" not executed") + x = 0 WHILE x < 3 : x = x + 1 : Wend Call ok(x = 3, "x not equal to 3") -- 2.31.1

2 1

[PATCH] d2d1: Explicitly set default blend state.
by Jan Sikorski 03 Nov '21

03 Nov '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/d2d1/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index c6ef2e28690..2069eeda0fc 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -175,6 +175,10 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D11DeviceContext1_OMSetBlendState(context, render_target->bs, NULL, D3D11_DEFAULT_SAMPLE_MASK); d2d_brush_bind_resources(brush, render_target, 0); } + else + { + ID3D11DeviceContext1_OMSetBlendState(context, NULL, NULL, D3D11_DEFAULT_SAMPLE_MASK); + } if (opacity_brush) d2d_brush_bind_resources(opacity_brush, render_target, 1); -- 2.32.0

3 2

[PATCH] evr/presenter: Add presented frames counter.
by Nikolay Sivov 03 Nov '21

03 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 29 +++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 25 +++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 9aef960dbb8..0381cb3e593 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -116,6 +116,12 @@ struct video_presenter unsigned int ar_mode; unsigned int state; unsigned int flags; + + struct + { + int presented; + } frame_stats; + CRITICAL_SECTION cs; }; @@ -532,6 +538,7 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM } IDirect3DSwapChain9_Present(presenter->swapchain, &src, &dst, NULL, NULL, 0); + presenter->frame_stats.presented++; IDirect3DDevice9_Release(device); IDirect3DSurface9_Release(backbuffer); @@ -934,6 +941,7 @@ static HRESULT WINAPI video_presenter_OnClockStop(IMFVideoPresenter *iface, MFTI EnterCriticalSection(&presenter->cs); presenter->state = PRESENTER_STATE_STOPPED; + presenter->frame_stats.presented = 0; LeaveCriticalSection(&presenter->cs); return S_OK; @@ -1766,9 +1774,26 @@ static HRESULT WINAPI video_presenter_qualprop_get_FramesDroppedInRenderer(IQual static HRESULT WINAPI video_presenter_qualprop_get_FramesDrawn(IQualProp *iface, int *frames) { - FIXME("%p, %p stub.\n", iface, frames); + struct video_presenter *presenter = impl_from_IQualProp(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, frames); + + EnterCriticalSection(&presenter->cs); + + switch (presenter->state) + { + case PRESENTER_STATE_STARTED: + case PRESENTER_STATE_PAUSED: + if (frames) *frames = presenter->frame_stats.presented; + else hr = E_POINTER; + default: + hr = E_NOTIMPL; + } + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_qualprop_get_AvgFrameRate(IQualProp *iface, int *avg_frame_rate) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 48115388993..57b64937b79 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2240,6 +2240,8 @@ static void test_presenter_quality_control(void) MF_QUALITY_DROP_MODE mode; IMFQualityAdvise *advise; MF_QUALITY_LEVEL level; + IQualProp *qual_prop; + int frame_count; HRESULT hr; hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); @@ -2293,6 +2295,17 @@ todo_wine { IMFQualityAdvise_Release(advise); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IQualProp, (void **)&qual_prop); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IQualProp_get_FramesDrawn(qual_prop, NULL); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IQualProp_get_FramesDrawn(qual_prop, &frame_count); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + IQualProp_Release(qual_prop); + IMFVideoPresenter_Release(presenter); } @@ -2432,6 +2445,8 @@ static void test_presenter_shutdown(void) IMFVideoPresenter *presenter; IMFVideoDeviceID *deviceid; HWND window, window2; + IQualProp *qual_prop; + int frame_count; HRESULT hr; DWORD mode; RECT rect; @@ -2453,6 +2468,9 @@ static void test_presenter_shutdown(void) hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IQualProp, (void **)&qual_prop); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2505,9 +2523,16 @@ static void test_presenter_shutdown(void) hr = IMFVideoDisplayControl_RepaintVideo(display_control); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IQualProp_get_FramesDrawn(qual_prop, NULL); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IQualProp_get_FramesDrawn(qual_prop, &frame_count); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IQualProp_Release(qual_prop); IMFVideoDeviceID_Release(deviceid); IMFVideoDisplayControl_Release(display_control); IMFTopologyServiceLookupClient_Release(lookup_client); -- 2.33.0

1 0

[PATCH v5 1/4] ntdll: Factor out capture_stack_back_trace() helper.
by Paul Gofman 03 Nov '21

03 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v5: - fix max USHORT value. dlls/ntdll/exception.c | 12 ++++++++++++ dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/signal_arm.c | 4 ++-- dlls/ntdll/signal_arm64.c | 4 ++-- dlls/ntdll/signal_i386.c | 6 ++++-- dlls/ntdll/signal_x86_64.c | 10 ++++++---- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c3714e8369b..e956d8a722f 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -1065,3 +1065,15 @@ NTSTATUS WINAPI RtlCopyExtendedContext( CONTEXT_EX *dst, ULONG context_flags, CO memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); return STATUS_SUCCESS; } + + +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + ULONG ret; + + ret = capture_stack_back_trace( skip, count, buffer, hash ); + return min( ret, (USHORT)~0 ); +} diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 34af6b780cf..31a33b04dbf 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -57,6 +57,8 @@ extern void WINAPI KiUserCallbackDispatcher(ULONG,void*,ULONG) DECLSPEC_HIDDEN; extern RUNTIME_FUNCTION *lookup_function_info( ULONG_PTR pc, ULONG_PTR *base, LDR_DATA_TABLE_ENTRY **module ) DECLSPEC_HIDDEN; #endif +extern ULONG WINAPI capture_stack_back_trace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) DECLSPEC_HIDDEN; + /* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ) DECLSPEC_HIDDEN; extern const char *debugstr_exception_code( DWORD code ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0ef210a0331..241ddc3ce70 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -300,9 +300,9 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "bl " __ASM_NAME("RtlRaiseStatus") ) /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +ULONG WINAPI capture_stack_back_trace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); return 0; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 290639b676b..1bffbe7efe9 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1473,9 +1473,9 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "bl " __ASM_NAME("RtlRaiseStatus") /* does not return */ ); /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +ULONG WINAPI capture_stack_back_trace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); return 0; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 14971032ce6..26150ce877b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -481,14 +481,16 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +ULONG WINAPI capture_stack_back_trace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { CONTEXT context; ULONG i; ULONG *frame; + ++skip; + RtlCaptureContext( &context ); if (hash) *hash = 0; frame = (ULONG *)context.Ebp; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ef32eba68b7..5f3c8f70208 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1490,19 +1490,21 @@ static inline ULONG hash_pointers( void **ptrs, ULONG count ) /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +ULONG WINAPI capture_stack_back_trace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { UNWIND_HISTORY_TABLE table; DISPATCHER_CONTEXT dispatch; CONTEXT context; NTSTATUS status; ULONG i; - USHORT num_entries = 0; + ULONG num_entries = 0; TRACE( "(%u, %u, %p, %p)\n", skip, count, buffer, hash ); + ++skip; + RtlCaptureContext( &context ); dispatch.TargetIp = 0; dispatch.ContextRecord = &context; @@ -1529,7 +1531,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, if (i >= skip) buffer[num_entries++] = (void *)context.Rip; } if (hash && num_entries > 0) *hash = hash_pointers( buffer, num_entries ); - TRACE( "captured %hu frames\n", num_entries ); + TRACE( "captured %u frames\n", num_entries ); return num_entries; } -- 2.31.1

3 9

[PATCH] winebuild: Fix relay entry points in Thumb mode with binutils/ELF and LLVM/PE
by Martin Storsjö 03 Nov '21

03 Nov '21

b1fe783adee51b5c3d3c0dc58e5dc1e81fd46299 fixed relay entry points in Thumb mode when assembled with Clang/LLVM in ELF mode, but broke them when assembled with binutils as (and PE mode with LLVM didn't work either before or after). When/where the thumb bit is applied on symbols varies a lot between assemblers; this is a notoriously vague and undocumented area. After a .thumb_func directive, binutils as considers the next non-local symbol as a thumb symbol, to have the thumb bit set. LLVM's built-in assembler considers the next symbol, local or not, to be a thumb symbol. (Just noting for reference for possible solutions, this particular difference didn't play a role so far.) Secondly, in a symbol difference expression like this: .long symbol1 - symbol2 Binutils as ignores the potential thumb state for both symbols and just calculates the raw distance. LLVM does include the thumb bit in symbol1 but ignores it in symbol2. Finally, for PE targets, the linker sets the thumb bit on all absolute addresses pointing to the text section, regardless of any .thumb_func directives at assembly time. (I.e., the __wine_spec_relay_entry_points entry in .L__wine_spec_relay_descr gets the bit set even if it wasn't marked as .thumb_func.) Therefore, mark __wine_spec_relay_entry_points as .thumb_func, as the absolute address to it will end up with the thumb bit set in PE builds in any case. Don't mark the individual relay entry pointers as thumb functions (the code still is generated as thumb as there hasn't been any mode switch back to arm mode); this makes the differences calculated correctly (both LLVM and binutils ignore the thumb state of the subtracted label). If desired, one could change __wine_spec_relay_entry_point_%d into local labels with a .L prefix, just as before b1fe783adee51b5c3d3c0dc58e5dc1e81fd46299 again, it doesn't make any difference in this form. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- tools/winebuild/spec32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 513778ad10c..36df296b9c1 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -248,6 +248,7 @@ static void output_relay_debug( DLLSPEC *spec ) /* then the relay thunks */ output( "\t.text\n" ); + if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_spec_relay_entry_points:\n" ); output( "\tnop\n" ); /* to avoid 0 offset */ @@ -303,7 +304,6 @@ static void output_relay_debug( DLLSPEC *spec ) has_float = is_float_arg( odp, j ); output( "\t.align %d\n", get_alignment(4) ); - if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_spec_relay_entry_point_%d:\n", i ); output_cfi( ".cfi_startproc" ); output( "\tpush {r0-r3}\n" ); -- 2.25.1

1 0

[PATCH vkd3d v2 1/7] vkd3d-shader/hlsl: Define a symbolic constant to represent the D3D_SIF_TEXTURE_COMPONENTS shift.
by Zebediah Figura 03 Nov '21

03 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 2 +- libs/vkd3d-shader/sm4.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9d45e1633..f8eb0a1ef 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -561,7 +561,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) put_u32(&buffer, sm4_resource_format(var->data_type)); put_u32(&buffer, sm4_rdef_resource_dimension(var->data_type)); put_u32(&buffer, ~0u); /* FIXME: multisample count */ - flags |= (var->data_type->e.resource_format->dimx - 1) << 2; + flags |= (var->data_type->e.resource_format->dimx - 1) << VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT; } put_u32(&buffer, var->reg.id); put_u32(&buffer, 1); /* bind count */ diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index ddcb9a861..17a08ee27 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -526,4 +526,7 @@ enum vkd3d_sm4_shader_data_type VKD3D_SM4_SHADER_DATA_MESSAGE = 0x4, }; +/* The shift that corresponds to the D3D_SIF_TEXTURE_COMPONENTS mask. */ +#define VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT 2 + #endif /* __VKD3D_SM4_H */ -- 2.33.1

2 19

[PATCH 1/3] dxva2: Add a generic hardware video processor.
by Derek Lesho 03 Nov '21

03 Nov '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/dxva2/main.c | 63 ++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 2fab82ff476..ee11b1d4f84 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -377,28 +377,48 @@ static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSof return E_NOTIMPL; } -static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc) +DEFINE_GUID(WINE_DXVA2_VideoProcHardwareDevice, 0x986666c3,0x32ac,0x4788,0xab,0x2a,0xd5,0x74,0x5f,0xf9,0x52,0xd8); + +static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc, const GUID *guid) { - return video_desc->Format == D3DFMT_A8R8G8B8 || - video_desc->Format == D3DFMT_X8R8G8B8 || - video_desc->Format == D3DFMT_YUY2; + if (IsEqualGUID(guid, &DXVA2_VideoProcSoftwareDevice)) + { + return video_desc->Format == D3DFMT_A8R8G8B8 || + video_desc->Format == D3DFMT_X8R8G8B8 || + video_desc->Format == D3DFMT_YUY2; + } + if (IsEqualGUID(guid, &WINE_DXVA2_VideoProcHardwareDevice)) + { + return video_desc->Format == MAKEFOURCC('N','V','1','2'); + } + FIXME("Unsupported device %s.\n", debugstr_guid(guid)); + return FALSE; } static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( IDirectXVideoProcessorService *iface, const DXVA2_VideoDesc *video_desc, UINT *count, GUID **guids) { + UINT size, i = 0; + FIXME("%p, %p, %p, %p semi-stub.\n", iface, video_desc, count, guids); *count = 0; - if (!dxva_is_supported_stream_format(video_desc)) + size = dxva_is_supported_stream_format(video_desc, &DXVA2_VideoProcSoftwareDevice) + + dxva_is_supported_stream_format(video_desc, &WINE_DXVA2_VideoProcHardwareDevice); + + if (!size) return E_FAIL; - if (!(*guids = CoTaskMemAlloc(sizeof(**guids)))) + if (!(*guids = CoTaskMemAlloc(sizeof(**guids) * size))) return E_OUTOFMEMORY; - memcpy(*guids, &DXVA2_VideoProcSoftwareDevice, sizeof(**guids)); - *count = 1; + if (dxva_is_supported_stream_format(video_desc, &DXVA2_VideoProcSoftwareDevice)) + memcpy(guids[i++], &DXVA2_VideoProcSoftwareDevice, sizeof(**guids)); + if (dxva_is_supported_stream_format(video_desc, &WINE_DXVA2_VideoProcHardwareDevice)) + memcpy(guids[i++], &WINE_DXVA2_VideoProcHardwareDevice, sizeof(**guids)); + + *count = size; return S_OK; } @@ -409,27 +429,20 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa { TRACE("%p, %s, %p, %p, %p.\n", iface, debugstr_guid(deviceguid), video_desc, count, formats); - if (IsEqualGUID(deviceguid, &DXVA2_VideoProcSoftwareDevice)) + if (!dxva_is_supported_stream_format(video_desc, deviceguid)) { - if (!dxva_is_supported_stream_format(video_desc)) - { - WARN("Unsupported content format %#x.\n", video_desc->Format); - return E_FAIL; - } - - if (!(*formats = CoTaskMemAlloc(2 * sizeof(**formats)))) - return E_OUTOFMEMORY; + WARN("Unsupported content format %#x.\n", video_desc->Format); + return E_FAIL; + } - *count = 2; - (*formats)[0] = D3DFMT_X8R8G8B8; - (*formats)[1] = D3DFMT_A8R8G8B8; + if (!(*formats = CoTaskMemAlloc(2 * sizeof(**formats)))) + return E_OUTOFMEMORY; - return S_OK; - } - else - FIXME("Unsupported device %s.\n", debugstr_guid(deviceguid)); + *count = 2; + (*formats)[0] = D3DFMT_X8R8G8B8; + (*formats)[1] = D3DFMT_A8R8G8B8; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorSubStreamFormats( -- 2.33.1

3 5

[PATCH v4 1/4] ntdll: Factor out capture_stack_back_trace() helper.
by Paul Gofman 03 Nov '21

03 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v4: - added patch. dlls/ntdll/exception.c | 12 ++++++++++++ dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/signal_arm.c | 4 ++-- dlls/ntdll/signal_arm64.c | 4 ++-- dlls/ntdll/signal_i386.c | 6 ++++-- dlls/ntdll/signal_x86_64.c | 10 ++++++---- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c3714e8369b..02bf672f8fb 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -1065,3 +1065,15 @@ NTSTATUS WINAPI RtlCopyExtendedContext( CONTEXT_EX *dst, ULONG context_flags, CO memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); return STATUS_SUCCESS; } + + +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + ULONG ret; + + ret = capture_stack_back_trace( skip, count, buffer, hash ); + return min( ret, ~(USHORT)0 ); +} diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 34af6b780cf..31a33b04dbf 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -57,6 +57,8 @@ extern void WINAPI KiUserCallbackDispatcher(ULONG,void*,ULONG) DECLSPEC_HIDDEN; extern RUNTIME_FUNCTION *lookup_function_info( ULONG_PTR pc, ULONG_PTR *base, LDR_DATA_TABLE_ENTRY **module ) DECLSPEC_HIDDEN; #endif +extern ULONG WINAPI capture_stack_back_trace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) DECLSPEC_HIDDEN; + /* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ) DECLSPEC_HIDDEN; extern const char *debugstr_exception_code( DWORD code ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0ef210a0331..241ddc3ce70 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -300,9 +300,9 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "bl " __ASM_NAME("RtlRaiseStatus") ) /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +ULONG WINAPI capture_stack_back_trace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); return 0; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 290639b676b..1bffbe7efe9 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1473,9 +1473,9 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "bl " __ASM_NAME("RtlRaiseStatus") /* does not return */ ); /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +ULONG WINAPI capture_stack_back_trace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); return 0; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 14971032ce6..26150ce877b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -481,14 +481,16 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +ULONG WINAPI capture_stack_back_trace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { CONTEXT context; ULONG i; ULONG *frame; + ++skip; + RtlCaptureContext( &context ); if (hash) *hash = 0; frame = (ULONG *)context.Ebp; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ef32eba68b7..5f3c8f70208 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1490,19 +1490,21 @@ static inline ULONG hash_pointers( void **ptrs, ULONG count ) /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +ULONG WINAPI capture_stack_back_trace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { UNWIND_HISTORY_TABLE table; DISPATCHER_CONTEXT dispatch; CONTEXT context; NTSTATUS status; ULONG i; - USHORT num_entries = 0; + ULONG num_entries = 0; TRACE( "(%u, %u, %p, %p)\n", skip, count, buffer, hash ); + ++skip; + RtlCaptureContext( &context ); dispatch.TargetIp = 0; dispatch.ContextRecord = &context; @@ -1529,7 +1531,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, if (i >= skip) buffer[num_entries++] = (void *)context.Rip; } if (hash && num_entries > 0) *hash = hash_pointers( buffer, num_entries ); - TRACE( "captured %hu frames\n", num_entries ); + TRACE( "captured %u frames\n", num_entries ); return num_entries; } -- 2.31.1

3 7

[PATCH] configure.ac: allow expressing dwarf version in CFLAGS and CROSSCFLAGS
by Eric Pouech 03 Nov '21

03 Nov '21

usage: configure CFLAGS="-gdwarf-4 -O2" will enable dwarf4 compilation for ELF parts (and CROSSCFLAGS="-gdwarf-4 -O2" for PE parts) evolution from current behavior: - when CFLAGS contains "-gdwarf-X", -gdwarf-X option is not tested with WINE_TRY_CFLAGS (the option remains anyway in CFLAGS -so WINE_TRY is useless- and is not copied in EXTRACFLAGS) (ditto for CROSSCFLAGS) - using CROSSCFLAGS=-gdwarf is no longer converted to Wine's default format, but is kepts as is, hence will boil down to compiler's preferred dwarf version - CROSSDEBUG=split used to pick up compiler's default format (while CROSSDEBUG=split-dwarf picked up wine's default format). They both now pick up the format derived from or specified in CROSSCLAGS (if any) what remains undone (and could be improved): - no test that the final configuration is suitable for Wine (ie if WINE_TRY_CFLAGS fails on -gdwarf-2, compilation is done with compilers's default format => dwarf5 on Linux) Changes from previous version: - fixed handling of "-g -gcodeview" in CROSSCFLAGS - fixed CROSSDEBUG=split* (mixup between split-dwarf and dwarf-split) open question: - I kept the original behavior, when providing as configure args (and not providing CROSSCFLAGS in configure args): CROSSDEBUG=pdb to add -gcodeview to EXTRACROSSCFLAGS It could be simplified with no longer supporting CROSSDEBUG from command line, but: + set CROSSDEBUG=pdb in configure when -gcodeview option is present is CROSSCFLAGS + set CROSSDEBUG=split in configure when -gsplit-dwarf option is present is CROSSCFLAGS Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- configure.ac | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 7c1e446814b..99347813a13 100644 --- a/configure.ac +++ b/configure.ac @@ -1008,21 +1008,24 @@ then dnl Determine debug info format AC_SUBST(CROSSDEBUG) - if test -z "$CROSSDEBUG" + ac_debug_format_seen= + for ac_flag in $CROSSCFLAGS; do + case $ac_flag in + -gdwarf*) ac_debug_format_seen=yes ;; + -g) ac_debug_format_seen=${ac_debug_format_seen:-default} ;; + -gcodeview) ac_debug_format_seen=yes ;; + esac + done + if test "x$ac_debug_format_seen" = "xdefault" -a "x$CROSSDEBUG" = "xpdb" then - for ac_flag in $CROSSCFLAGS; do - case $ac_flag in - -gdwarf*) CROSSDEBUG=dwarf ;; - -gcodeview) CROSSDEBUG=pdb ;; - -g) CROSSDEBUG=${CROSSDEBUG:-dwarf} ;; - esac - done + WINE_TRY_CROSSCFLAGS([-gcodeview]) + ac_debug_format_seen=yes + fi + if test "x$ac_debug_format_seen" = "xdefault" + then + WINE_TRY_CROSSCFLAGS([-gdwarf-2]) + WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) fi - case $CROSSDEBUG in - *dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-2]) - WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;; - pdb) WINE_TRY_CROSSCFLAGS([-gcodeview]) ;; - esac WINE_TRY_CROSSCFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) @@ -1822,13 +1825,18 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= *) EXTRACFLAGS="$EXTRACFLAGS $wine_cv_64bit_compare_swap" ;; esac - dnl Default to dwarf-2 debug info + dnl Determine debug info format + ac_debug_format_seen= for ac_flag in $CFLAGS; do case $ac_flag in - -g) WINE_TRY_CFLAGS([-gdwarf-2]) - WINE_TRY_CFLAGS([-gstrict-dwarf]) ;; + -gdwarf*) ac_debug_format_seen=yes ;; + -g) ac_debug_format_seen=${ac_debug_format_seen:-default} ;; esac done + if test "x$ac_debug_format_seen" = "xdefault"; then + WINE_TRY_CFLAGS([-gdwarf-2]) + WINE_TRY_CFLAGS([-gstrict-dwarf]) + fi dnl Disable gcc builtins except for Mingw AC_SUBST(MSVCRTFLAGS,"")

3 2

[PATCH 4/4] msdasql/tests: Add MSDASQL_ENUMERATOR tests
by Alistair Leslie-Hughes 03 Nov '21

03 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 89 +++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 8b076ed4479..fff596ab2b4 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -461,6 +461,93 @@ static void cleanup_database(void) DeleteFileA(mdbpath); } +static void test_enumeration(void) +{ + ISourcesRowset *source; + IRowset *rowset, *rowset2; + IColumnsInfo *columninfo; + IAccessor *accessor; + DBBINDING bindings = { 1, 0, 0, 512, NULL, NULL, NULL, DBPART_VALUE | DBPART_STATUS, DBMEMOWNER_CLIENTOWNED, DBPARAMIO_NOTPARAM, 514, 0, DBTYPE_WSTR, 0, 0 }; + HACCESSOR hacc; + HRESULT hr; + + DBCOLUMNINFO colinfo_data[] = + { + { NULL, NULL, 0, DBCOLUMNFLAGS_ISFIXEDLENGTH | DBCOLUMNFLAGS_ISBOOKMARK, 4, DBTYPE_UI4, 10, 255 }, + { (WCHAR*)L"SOURCES_NAME", NULL, 1, DBCOLUMNFLAGS_MAYBENULL | DBCOLUMNFLAGS_WRITEUNKNOWN, 128, DBTYPE_WSTR, 255, 255 }, + { (WCHAR*)L"SOURCES_PARSENAME", NULL, 2, DBCOLUMNFLAGS_MAYBENULL | DBCOLUMNFLAGS_WRITEUNKNOWN, 128, DBTYPE_WSTR, 255, 255 }, + { (WCHAR*)L"SOURCES_DESCRIPTION", NULL, 3, DBCOLUMNFLAGS_MAYBENULL | DBCOLUMNFLAGS_WRITEUNKNOWN, 128, DBTYPE_WSTR, 255, 255 }, + { (WCHAR*)L"SOURCES_TYPE", NULL, 4, DBCOLUMNFLAGS_ISFIXEDLENGTH | DBCOLUMNFLAGS_MAYBENULL | DBCOLUMNFLAGS_WRITEUNKNOWN, 2, DBTYPE_UI2, 5, 255 }, + { (WCHAR*)L"SOURCES_ISPARENT", NULL, 5, DBCOLUMNFLAGS_ISFIXEDLENGTH | DBCOLUMNFLAGS_MAYBENULL | DBCOLUMNFLAGS_WRITEUNKNOWN, 2, DBTYPE_BOOL, 255, 255 } + }; + + hr = CoCreateInstance( &CLSID_MSDASQL_ENUMERATOR, NULL, CLSCTX_INPROC_SERVER, &IID_ISourcesRowset, + (void **)&source ); + if ( FAILED(hr)) + { + skip("Failed create Enumerator object\n"); + return; + } + + hr = ISourcesRowset_GetSourcesRowset(source, NULL, &IID_IRowset, 0, NULL, (IUnknown**)&rowset); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISourcesRowset_GetSourcesRowset(source, NULL, &IID_IRowset, 0, NULL, (IUnknown**)&rowset2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(rowset != rowset2, "same pointer\n"); + IRowset_Release(rowset2); + + hr = IRowset_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&columninfo); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + DBORDINAL columns; + DBCOLUMNINFO *dbcolumninfo; + OLECHAR *buffer; + int i; + + hr = IColumnsInfo_GetColumnInfo(columninfo, &columns, &dbcolumninfo, &buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(columns == 6, "got %lu\n", columns); + + for( i = 0; i < columns; i++ ) + { + if (!dbcolumninfo[i].pwszName || !colinfo_data[i].pwszName) + ok (dbcolumninfo[i].pwszName == colinfo_data[i].pwszName, "got %p/%p", dbcolumninfo[i].pwszName, colinfo_data[i].pwszName); + else + ok ( !wcscmp(dbcolumninfo[i].pwszName, colinfo_data[i].pwszName), "got %p/%p", + debugstr_w(dbcolumninfo[i].pwszName), debugstr_w(colinfo_data[i].pwszName)); + + ok (dbcolumninfo[i].pTypeInfo == colinfo_data[i].pTypeInfo, "got %p/%p", dbcolumninfo[i].pTypeInfo, colinfo_data[i].pTypeInfo); + ok (dbcolumninfo[i].iOrdinal == colinfo_data[i].iOrdinal, "got %ld/%ld", dbcolumninfo[i].iOrdinal, colinfo_data[i].iOrdinal); + ok (dbcolumninfo[i].dwFlags == colinfo_data[i].dwFlags, "got 0x%08x/0x%0x8", dbcolumninfo[i].dwFlags, colinfo_data[i].dwFlags); + ok (dbcolumninfo[i].ulColumnSize == colinfo_data[i].ulColumnSize, "got %lu/%lu", dbcolumninfo[i].ulColumnSize, colinfo_data[i].ulColumnSize); + ok (dbcolumninfo[i].wType == colinfo_data[i].wType, "got %d/%d", dbcolumninfo[i].wType, colinfo_data[i].wType); + ok (dbcolumninfo[i].bPrecision == colinfo_data[i].bPrecision, "got %d/%d", dbcolumninfo[i].bPrecision, colinfo_data[i].bPrecision); + ok (dbcolumninfo[i].bScale == colinfo_data[i].bScale, "got %d/%d", dbcolumninfo[i].bScale, colinfo_data[i].bScale); + } + + CoTaskMemFree(buffer); + IColumnsInfo_Release(columninfo); + } + + hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void**)&accessor); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Request only SOURCES_NAME column */ + hr = IAccessor_CreateAccessor(accessor, DBACCESSOR_ROWDATA, 1, &bindings, 0, &hacc, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hacc != 0, "got %p\n", hacc); + + hr = IAccessor_ReleaseAccessor(accessor, hacc, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IAccessor_Release(accessor); + + IRowset_Release(rowset); + ISourcesRowset_Release(source); +} + START_TEST(provider) { CoInitialize(0); @@ -471,6 +558,8 @@ START_TEST(provider) test_Properties(); test_sessions(); + test_enumeration(); + cleanup_database(); CoUninitialize(); -- 2.33.0

1 0

[PATCH 3/4] msdasql: Support IAccessor in IRowset for Enumation
by Alistair Leslie-Hughes 03 Nov '21

03 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 81 +++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 7402b505270..b8d68287e6a 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -609,6 +609,7 @@ static ULONG WINAPI msdasql_enum_Release(ISourcesRowset *iface) struct msdasql_enum_rowset { IRowset IRowset_iface; + IAccessor IAccessor_iface; LONG ref; }; @@ -617,6 +618,11 @@ static inline struct msdasql_enum_rowset *msdasql_rs_from_IRowset(IRowset *iface return CONTAINING_RECORD(iface, struct msdasql_enum_rowset, IRowset_iface); } +static inline struct msdasql_enum_rowset *msdasql_enum_from_IAccessor ( IAccessor *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_enum_rowset, IAccessor_iface ); +} + static HRESULT WINAPI enum_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); @@ -629,6 +635,10 @@ static HRESULT WINAPI enum_rowset_QueryInterface(IRowset *iface, REFIID riid, v { *ppv = &rowset->IRowset_iface; } + else if(IsEqualGUID(&IID_IAccessor, riid)) + { + *ppv = &rowset->IAccessor_iface; + } if(*ppv) { @@ -729,6 +739,76 @@ static const struct IRowsetVtbl enum_rowset_vtbl = enum_rowset_RestartPosition }; +static HRESULT WINAPI enum_rs_accessor_QueryInterface(IAccessor *iface, REFIID riid, void **out) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI enum_rs_accessor_AddRef(IAccessor *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI enum_rs_accessor_Release(IAccessor *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI enum_rs_accessor_AddRefAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + FIXME("%p, %lu, %p\n", rowset, accessor, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rs_accessor_CreateAccessor(IAccessor *iface, DBACCESSORFLAGS flags, + DBCOUNTITEM count, const DBBINDING bindings[], DBLENGTH row_size, HACCESSOR *accessor, + DBBINDSTATUS status[]) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + + FIXME("%p 0x%08x, %lu, %p, %lu, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status); + + if (accessor) + *accessor = 0xdeadbeef; + + return S_OK; +} + +static HRESULT WINAPI enum_rs_accessor_GetBindings(IAccessor *iface, HACCESSOR accessor, + DBACCESSORFLAGS *flags, DBCOUNTITEM *count, DBBINDING **bindings) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + FIXME("%p %lu, %p, %p, %p\n", rowset, accessor, flags, count, bindings); + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rs_accessor_ReleaseAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + + FIXME("%p, %lu, %p\n", rowset, accessor, count); + + if (count) + *count = 0; + + return S_OK; +} + +struct IAccessorVtbl enum_accessor_vtbl = +{ + enum_rs_accessor_QueryInterface, + enum_rs_accessor_AddRef, + enum_rs_accessor_Release, + enum_rs_accessor_AddRefAccessor, + enum_rs_accessor_CreateAccessor, + enum_rs_accessor_GetBindings, + enum_rs_accessor_ReleaseAccessor +}; + static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnknown *outer, REFIID riid, ULONG sets, DBPROPSET properties[], IUnknown **rowset) { @@ -740,6 +820,7 @@ static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnkn enum_rs = malloc(sizeof(*enum_rs)); enum_rs->IRowset_iface.lpVtbl = &enum_rowset_vtbl; + enum_rs->IAccessor_iface.lpVtbl = &enum_accessor_vtbl; enum_rs->ref = 1; hr = IRowset_QueryInterface(&enum_rs->IRowset_iface, riid, (void**)rowset); -- 2.33.0

1 0

[PATCH 2/4] msdasql: Implement ISourcesRowset GetSourcesRowset for enumeration
by Alistair Leslie-Hughes 03 Nov '21

03 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 137 +++++++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index ff16413004e..7402b505270 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -26,6 +26,7 @@ #include "oledb.h" #include "rpcproxy.h" #include "wine/debug.h" +#include "oledberr.h" #include "initguid.h" #include "msdasql.h" @@ -605,13 +606,145 @@ static ULONG WINAPI msdasql_enum_Release(ISourcesRowset *iface) return ref; } +struct msdasql_enum_rowset +{ + IRowset IRowset_iface; + LONG ref; +}; + +static inline struct msdasql_enum_rowset *msdasql_rs_from_IRowset(IRowset *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql_enum_rowset, IRowset_iface); +} + +static HRESULT WINAPI enum_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + TRACE( "%p, %s, %p\n", rowset, debugstr_guid(riid), ppv ); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IRowset, riid)) + { + *ppv = &rowset->IRowset_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 enum_rowset_AddRef(IRowset *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + LONG refs = InterlockedIncrement( &rowset->ref ); + TRACE( "%p new refcount %d\n", rowset, refs ); + return refs; +} + +static ULONG WINAPI enum_rowset_Release(IRowset *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + LONG refs = InterlockedDecrement( &rowset->ref ); + TRACE( "%p new refcount %d\n", rowset, refs ); + if (!refs) + { + TRACE( "destroying %p\n", rowset ); + free( rowset ); + } + return refs; +} + +static HRESULT WINAPI enum_rowset_AddRefRows(IRowset *iface, DBCOUNTITEM count, + const HROW rows[], DBREFCOUNT ref_counts[], DBROWSTATUS status[]) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %p, %p, %p\n", rowset, count, rows, ref_counts, status); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rowset_GetData(IRowset *iface, HROW row, HACCESSOR accessor, void *data) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %ld, %p\n", rowset, row, accessor, data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rowset_GetNextRows(IRowset *iface, HCHAPTER reserved, DBROWOFFSET offset, + DBROWCOUNT count, DBCOUNTITEM *obtained, HROW **rows) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %ld, %ld, %p, %p\n", rowset, reserved, offset, count, obtained, rows); + + if (!obtained || !rows) + return E_INVALIDARG; + + *obtained = 0; + + if (!count) + return S_OK; + + return DB_S_ENDOFROWSET; +} + +static HRESULT WINAPI enum_rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM count, + const HROW rows[], DBROWOPTIONS options[], DBREFCOUNT ref_counts[], DBROWSTATUS status[]) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status); + + return S_OK; +} + +static HRESULT WINAPI enum_rowset_RestartPosition(IRowset *iface, HCHAPTER reserved) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld\n", rowset, reserved); + + return S_OK; +} + +static const struct IRowsetVtbl enum_rowset_vtbl = +{ + enum_rowset_QueryInterface, + enum_rowset_AddRef, + enum_rowset_Release, + enum_rowset_AddRefRows, + enum_rowset_GetData, + enum_rowset_GetNextRows, + enum_rowset_ReleaseRows, + enum_rowset_RestartPosition +}; + static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnknown *outer, REFIID riid, ULONG sets, DBPROPSET properties[], IUnknown **rowset) { struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface); - FIXME("(%p) %p, %s, %d, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset); + struct msdasql_enum_rowset *enum_rs; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p) %p, %s, %d, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset); + + enum_rs = malloc(sizeof(*enum_rs)); + enum_rs->IRowset_iface.lpVtbl = &enum_rowset_vtbl; + enum_rs->ref = 1; + + hr = IRowset_QueryInterface(&enum_rs->IRowset_iface, riid, (void**)rowset); + IRowset_Release(&enum_rs->IRowset_iface); + return hr; } static const ISourcesRowsetVtbl msdsqlenum_vtbl = -- 2.33.0

1 0

[PATCH 1/4] msdasql: Support CLSID_MSDASQL interface
by Alistair Leslie-Hughes 03 Nov '21

03 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 112 ++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index a2d40e14b96..ff16413004e 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -72,6 +72,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) } static HRESULT create_msdasql_provider(REFIID riid, void **ppv); +static HRESULT create_msdasql_enumerator(REFIID riid, void **ppv); HRESULT WINAPI msdasql_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { @@ -94,7 +95,24 @@ static const IClassFactoryVtbl cfmsdasqlVtbl = { ClassFactory_LockServer }; +HRESULT WINAPI enumerationcf_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + + return create_msdasql_enumerator(riid, ppv); +} + +static const IClassFactoryVtbl enumfactoryVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + enumerationcf_CreateInstance, + ClassFactory_LockServer +}; + static IClassFactory cfmsdasql = { &cfmsdasqlVtbl }; +static IClassFactory enumfactory = { &enumfactoryVtbl }; HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) { @@ -102,6 +120,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) if (IsEqualGUID(&CLSID_MSDASQL, rclsid)) return IClassFactory_QueryInterface(&cfmsdasql, riid, ppv); + else if (IsEqualGUID(&CLSID_MSDASQL_ENUMERATOR, rclsid)) + return IClassFactory_QueryInterface(&enumfactory, riid, ppv); return CLASS_E_CLASSNOTAVAILABLE; } @@ -526,3 +546,95 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) IUnknown_Release(&provider->MSDASQL_iface); return hr; } + +struct msdasql_enum +{ + ISourcesRowset ISourcesRowset_iface; + LONG ref; +}; + +static inline struct msdasql_enum *msdasql_enum_from_ISourcesRowset(ISourcesRowset *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql_enum, ISourcesRowset_iface); +} + +static HRESULT WINAPI msdasql_enum_QueryInterface(ISourcesRowset *iface, REFIID riid, void **out) +{ + struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface); + + TRACE("(%p)->(%s %p)\n", enumerator, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ISourcesRowset ) ) + { + *out = &enumerator->ISourcesRowset_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI msdasql_enum_AddRef(ISourcesRowset *iface) +{ + struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface); + ULONG ref = InterlockedIncrement(&enumerator->ref); + + TRACE("(%p) ref=%u\n", enumerator, ref); + + return ref; +} + +static ULONG WINAPI msdasql_enum_Release(ISourcesRowset *iface) +{ + struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface); + ULONG ref = InterlockedDecrement(&enumerator->ref); + + TRACE("(%p) ref=%u\n", enumerator, ref); + + if (!ref) + { + free(enumerator); + } + + return ref; +} + +static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnknown *outer, REFIID riid, ULONG sets, + DBPROPSET properties[], IUnknown **rowset) +{ + struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface); + FIXME("(%p) %p, %s, %d, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset); + + return E_NOTIMPL; +} + +static const ISourcesRowsetVtbl msdsqlenum_vtbl = +{ + msdasql_enum_QueryInterface, + msdasql_enum_AddRef, + msdasql_enum_Release, + msdasql_enum_GetSourcesRowset +}; + +static HRESULT create_msdasql_enumerator(REFIID riid, void **ppv) +{ + struct msdasql_enum *enumerator; + HRESULT hr; + + enumerator = malloc(sizeof(*enumerator)); + if (!enumerator) + return E_OUTOFMEMORY; + + enumerator->ISourcesRowset_iface.lpVtbl = &msdsqlenum_vtbl; + enumerator->ref = 1; + + hr = IUnknown_QueryInterface(&enumerator->ISourcesRowset_iface, riid, ppv); + IUnknown_Release(&enumerator->ISourcesRowset_iface); + return hr; +} -- 2.33.0

1 0

[PATCH v2 1/5] wmvcore/tests: Add tests for asynchronous reader streaming.
by Zebediah Figura 03 Nov '21

03 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wmvcore/tests/wmvcore.c | 291 ++++++++++++++++++++++++++++++++++- 1 file changed, 283 insertions(+), 8 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index eae320c4d2e..2a337648761 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -420,6 +420,14 @@ static const IStreamVtbl stream_vtbl = stream_Clone, }; +static void teststream_init(struct teststream *stream, HANDLE file) +{ + memset(stream, 0, sizeof(*stream)); + stream->IStream_iface.lpVtbl = &stream_vtbl; + stream->refcount = 1; + stream->file = file; +} + static void test_reader_attributes(IWMProfile *profile) { WORD size, stream_number, ret_stream_number; @@ -578,7 +586,7 @@ static void test_sync_reader_streaming(void) WORD stream_numbers[2], stream_number; IWMStreamConfig *config, *config2; bool eos[2] = {0}, first = true; - struct teststream stream = {{0}}; + struct teststream stream; ULONG i, j, count, ref; IWMSyncReader *reader; IWMProfile *profile; @@ -592,9 +600,7 @@ static void test_sync_reader_streaming(void) file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); - stream.IStream_iface.lpVtbl = &stream_vtbl; - stream.refcount = 1; - stream.file = file; + teststream_init(&stream, file); hr = WMCreateSyncReader(NULL, 0, &reader); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -816,7 +822,7 @@ static void test_sync_reader_types(void) bool got_video = false, got_audio = false; DWORD size, ret_size, output_number; WORD stream_number, stream_number2; - struct teststream stream = {{0}}; + struct teststream stream; IWMStreamConfig *config; ULONG count, ref, i, j; IWMSyncReader *reader; @@ -829,9 +835,7 @@ static void test_sync_reader_types(void) file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); - stream.IStream_iface.lpVtbl = &stream_vtbl; - stream.refcount = 1; - stream.file = file; + teststream_init(&stream, file); hr = WMCreateSyncReader(NULL, 0, &reader); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1051,6 +1055,276 @@ static void test_sync_reader_file(void) ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); } +struct callback +{ + IWMReaderCallback IWMReaderCallback_iface; + LONG refcount; + HANDLE got_opened, got_stopped, eof_event; + unsigned int got_closed, got_started, got_sample, got_end_of_streaming, got_eof; +}; + +static struct callback *impl_from_IWMReaderCallback(IWMReaderCallback *iface) +{ + return CONTAINING_RECORD(iface, struct callback, IWMReaderCallback_iface); +} + +static HRESULT WINAPI callback_QueryInterface(IWMReaderCallback *iface, REFIID iid, void **out) +{ + if (winetest_debug > 1) + trace("%04x: IWMReaderCallback::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); + + if (!IsEqualGUID(iid, &IID_IWMReaderCallbackAdvanced) && !IsEqualGUID(iid, &IID_IWMCredentialCallback)) + ok(0, "Unexpected IID %s.\n", debugstr_guid(iid)); + + return E_NOINTERFACE; +} + +static ULONG WINAPI callback_AddRef(IWMReaderCallback *iface) +{ + struct callback *callback = impl_from_IWMReaderCallback(iface); + + return InterlockedIncrement(&callback->refcount); +} + +static ULONG WINAPI callback_Release(IWMReaderCallback *iface) +{ + struct callback *callback = impl_from_IWMReaderCallback(iface); + + return InterlockedDecrement(&callback->refcount); +} + +static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS status, + HRESULT hr, WMT_ATTR_DATATYPE type, BYTE *value, void *context) +{ + struct callback *callback = impl_from_IWMReaderCallback(iface); + + if (winetest_debug > 1) + trace("%u: %04x: IWMReaderCallback::OnStatus(status %u, hr %#x, type %#x, value %p)\n", + GetTickCount(), GetCurrentThreadId(), status, hr, type, value); + + switch (status) + { + case WMT_OPENED: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xdeadbeef, "Got unexpected context %p.\n", context); + SetEvent(callback->got_opened); + break; + + case WMT_STARTED: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + ++callback->got_started; + break; + + case WMT_STOPPED: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + SetEvent(callback->got_stopped); + break; + + case WMT_CLOSED: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + todo_wine ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + ++callback->got_closed; + break; + + case WMT_END_OF_STREAMING: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); + ++callback->got_end_of_streaming; + break; + + case WMT_EOF: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + ok(callback->got_sample > 0, "Got no samples.\n"); + ok(callback->got_end_of_streaming == 1, "Got %u WMT_END_OF_STREAMING callbacks.\n", + callback->got_end_of_streaming); + ++callback->got_eof; + SetEvent(callback->eof_event); + break; + + /* Not sent when not using IWMReaderAdvanced::DeliverTime(). */ + case WMT_END_OF_SEGMENT: + ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); + ok(*(QWORD *)value == 3000, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + ok(callback->got_sample > 0, "Got no samples.\n"); + ok(callback->got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback->got_eof); + break; + + default: + ok(0, "Unexpected status %#x.\n", status); + } + + ok(hr == S_OK, "Got hr %#x.\n", hr); + return S_OK; +} + +static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, + QWORD time, QWORD duration, DWORD flags, INSSBuffer *sample, void *context) +{ + struct callback *callback = impl_from_IWMReaderCallback(iface); + HRESULT hr; + DWORD size; + BYTE *data; + + if (winetest_debug > 1) + trace("%u: %04x: IWMReaderCallback::OnSample(output %u, time %I64u, duration %I64u, flags %#x)\n", + GetTickCount(), GetCurrentThreadId(), output, time, duration, flags); + + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + + hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(callback->got_started > 0, "Got %u WMT_STARTED callbacks.\n", callback->got_started); + ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); + ++callback->got_sample; + + return S_OK; +} + +static const IWMReaderCallbackVtbl callback_vtbl = +{ + callback_QueryInterface, + callback_AddRef, + callback_Release, + callback_OnStatus, + callback_OnSample, +}; + +static void callback_init(struct callback *callback) +{ + memset(callback, 0, sizeof(*callback)); + callback->IWMReaderCallback_iface.lpVtbl = &callback_vtbl; + callback->refcount = 1; + callback->got_opened = CreateEventW(NULL, FALSE, FALSE, NULL); + callback->got_stopped = CreateEventW(NULL, FALSE, FALSE, NULL); + callback->eof_event = CreateEventW(NULL, FALSE, FALSE, NULL); +} + +static void callback_cleanup(struct callback *callback) +{ + CloseHandle(callback->got_opened); + CloseHandle(callback->got_stopped); + CloseHandle(callback->eof_event); +} + +static void test_async_reader_streaming(void) +{ + const WCHAR *filename = load_resource(L"test.wmv"); + IWMReaderAdvanced2 *advanced; + struct teststream stream; + struct callback callback; + IWMStreamConfig *config; + WORD stream_numbers[2]; + IWMProfile *profile; + ULONG i, count, ref; + IWMReader *reader; + HANDLE file; + HRESULT hr; + BOOL ret; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + + teststream_init(&stream, file); + callback_init(&callback); + + hr = WMCreateReader(NULL, 0, &reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced); + + hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) + goto out; + ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + ok(callback.refcount > 1, "Got refcount %d.\n", callback.refcount); + ret = WaitForSingleObject(callback.got_opened, 1000); + ok(!ret, "Wait timed out.\n"); + + count = 0xdeadbeef; + hr = IWMReader_GetOutputCount(reader, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(count == 2, "Got count %u.\n", count); + + for (i = 0; i < 2; ++i) + { + hr = IWMProfile_GetStream(profile, i, &config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + stream_numbers[i] = 0xdead; + hr = IWMStreamConfig_GetStreamNumber(config, &stream_numbers[i]); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream_numbers[i] == i + 1, "Got stream number %u.\n", stream_numbers[i]); + + ref = IWMStreamConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + + hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + /* By default the reader will time itself, and attempt to deliver samples + * according to their presentation time. Call DeliverTime with the file + * duration in order to request all samples as fast as possible. */ + hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); + ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + hr = IWMReaderAdvanced2_SetUserProvidedClock(advanced, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = WaitForSingleObject(callback.eof_event, 1000); + ok(!ret, "Wait timed out.\n"); + ok(callback.got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback.got_eof); + + hr = IWMReader_Stop(reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = WaitForSingleObject(callback.got_stopped, 1000); + ok(!ret, "Wait timed out.\n"); + + hr = IWMReader_Stop(reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = WaitForSingleObject(callback.got_stopped, 1000); + ok(!ret, "Wait timed out.\n"); + } + + test_reader_attributes(profile); + + hr = IWMReader_Close(reader); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); + ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); + callback_cleanup(&callback); + +out: + ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + CloseHandle(stream.file); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + + hr = IWMReader_Close(reader); + todo_wine ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + + IWMReaderAdvanced2_Release(advanced); + IWMProfile_Release(profile); + ref = IWMReader_Release(reader); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(wmvcore) { HRESULT hr; @@ -1070,6 +1344,7 @@ START_TEST(wmvcore) test_sync_reader_streaming(); test_sync_reader_types(); test_sync_reader_file(); + test_async_reader_streaming(); CoUninitialize(); } -- 2.33.0

1 4

[PATCH 1/5] wmvcore/tests: Add tests for asynchronous reader streaming.
by Zebediah Figura 03 Nov '21

03 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wmvcore/tests/wmvcore.c | 291 ++++++++++++++++++++++++++++++++++- 1 file changed, 283 insertions(+), 8 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index eae320c4d2e..ac4239f1d24 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -420,6 +420,14 @@ static const IStreamVtbl stream_vtbl = stream_Clone, }; +static void teststream_init(struct teststream *stream, HANDLE file) +{ + memset(stream, 0, sizeof(*stream)); + stream->IStream_iface.lpVtbl = &stream_vtbl; + stream->refcount = 1; + stream->file = file; +} + static void test_reader_attributes(IWMProfile *profile) { WORD size, stream_number, ret_stream_number; @@ -578,7 +586,7 @@ static void test_sync_reader_streaming(void) WORD stream_numbers[2], stream_number; IWMStreamConfig *config, *config2; bool eos[2] = {0}, first = true; - struct teststream stream = {{0}}; + struct teststream stream; ULONG i, j, count, ref; IWMSyncReader *reader; IWMProfile *profile; @@ -592,9 +600,7 @@ static void test_sync_reader_streaming(void) file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); - stream.IStream_iface.lpVtbl = &stream_vtbl; - stream.refcount = 1; - stream.file = file; + teststream_init(&stream, file); hr = WMCreateSyncReader(NULL, 0, &reader); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -816,7 +822,7 @@ static void test_sync_reader_types(void) bool got_video = false, got_audio = false; DWORD size, ret_size, output_number; WORD stream_number, stream_number2; - struct teststream stream = {{0}}; + struct teststream stream; IWMStreamConfig *config; ULONG count, ref, i, j; IWMSyncReader *reader; @@ -829,9 +835,7 @@ static void test_sync_reader_types(void) file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); - stream.IStream_iface.lpVtbl = &stream_vtbl; - stream.refcount = 1; - stream.file = file; + teststream_init(&stream, file); hr = WMCreateSyncReader(NULL, 0, &reader); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1051,6 +1055,276 @@ static void test_sync_reader_file(void) ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); } +struct callback +{ + IWMReaderCallback IWMReaderCallback_iface; + LONG refcount; + HANDLE got_opened, got_stopped, eof_event; + unsigned int got_closed, got_started, got_sample, got_end_of_streaming, got_eof; +}; + +static struct callback *impl_from_IWMReaderCallback(IWMReaderCallback *iface) +{ + return CONTAINING_RECORD(iface, struct callback, IWMReaderCallback_iface); +} + +static HRESULT WINAPI callback_QueryInterface(IWMReaderCallback *iface, REFIID iid, void **out) +{ + if (winetest_debug > 1) + trace("%04x: IWMReaderCallback::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); + + if (!IsEqualGUID(iid, &IID_IWMReaderCallbackAdvanced) && !IsEqualGUID(iid, &IID_IWMCredentialCallback)) + ok(0, "Unexpected IID %s.\n", debugstr_guid(iid)); + + return E_NOINTERFACE; +} + +static ULONG WINAPI callback_AddRef(IWMReaderCallback *iface) +{ + struct callback *callback = impl_from_IWMReaderCallback(iface); + + return InterlockedIncrement(&callback->refcount); +} + +static ULONG WINAPI callback_Release(IWMReaderCallback *iface) +{ + struct callback *callback = impl_from_IWMReaderCallback(iface); + + return InterlockedDecrement(&callback->refcount); +} + +static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS status, + HRESULT hr, WMT_ATTR_DATATYPE type, BYTE *value, void *context) +{ + struct callback *callback = impl_from_IWMReaderCallback(iface); + + if (winetest_debug > 1) + trace("%u: %04x: IWMReaderCallback::OnStatus(status %u, hr %#x, type %#x, value %p)\n", + GetTickCount(), GetCurrentThreadId(), status, hr, type, value); + + switch (status) + { + case WMT_OPENED: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xdeadbeef, "Got unexpected context %p.\n", context); + SetEvent(callback->got_opened); + break; + + case WMT_STARTED: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + ++callback->got_started; + break; + + case WMT_STOPPED: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + SetEvent(callback->got_stopped); + break; + + case WMT_CLOSED: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + todo_wine ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + ++callback->got_closed; + break; + + case WMT_END_OF_STREAMING: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); + ++callback->got_end_of_streaming; + break; + + case WMT_EOF: + ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); + ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + ok(callback->got_sample > 0, "Got no samples.\n"); + ok(callback->got_end_of_streaming == 1, "Got %u WMT_END_OF_STREAMING callbacks.\n", + callback->got_end_of_streaming); + ++callback->got_eof; + SetEvent(callback->eof_event); + break; + + /* Not sent when not using IWMReaderAdvanced::DeliverTime(). */ + case WMT_END_OF_SEGMENT: + ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); + ok(*(QWORD *)value == 3000, "Got value %#x.\n", *(DWORD *)value); + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + ok(callback->got_sample > 0, "Got no samples.\n"); + ok(callback->got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback->got_eof); + break; + + default: + ok(0, "Unexpected status %#x.\n", status); + } + + ok(hr == S_OK, "Got hr %#x.\n", hr); + return S_OK; +} + +static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, + QWORD time, QWORD duration, DWORD flags, INSSBuffer *sample, void *context) +{ + struct callback *callback = impl_from_IWMReaderCallback(iface); + HRESULT hr; + DWORD size; + BYTE *data; + + if (winetest_debug > 1) + trace("%u: %04x: IWMReaderCallback::OnSample(output %u, time %I64u, duration %I64u, flags %#x)\n", + GetTickCount(), GetCurrentThreadId(), output, time, duration, flags); + + ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + + hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(callback->got_started > 0, "Got %u WMT_STARTED callbacks.\n", callback->got_started); + ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); + ++callback->got_sample; + + return S_OK; +} + +static const IWMReaderCallbackVtbl callback_vtbl = +{ + callback_QueryInterface, + callback_AddRef, + callback_Release, + callback_OnStatus, + callback_OnSample, +}; + +static void callback_init(struct callback *callback) +{ + memset(callback, 0, sizeof(*callback)); + callback->IWMReaderCallback_iface.lpVtbl = &callback_vtbl; + callback->refcount = 1; + callback->got_opened = CreateEventW(NULL, FALSE, FALSE, NULL); + callback->got_stopped = CreateEventW(NULL, FALSE, FALSE, NULL); + callback->eof_event = CreateEventW(NULL, FALSE, FALSE, NULL); +} + +static void callback_cleanup(struct callback *callback) +{ + CloseHandle(callback->got_opened); + CloseHandle(callback->got_stopped); + CloseHandle(callback->eof_event); +} + +static void test_async_reader_streaming(void) +{ + const WCHAR *filename = load_resource(L"test.wmv"); + IWMReaderAdvanced2 *advanced; + struct teststream stream; + struct callback callback; + IWMStreamConfig *config; + WORD stream_numbers[2]; + IWMProfile *profile; + ULONG i, count, ref; + IWMReader *reader; + HANDLE file; + HRESULT hr; + BOOL ret; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + + teststream_init(&stream, file); + callback_init(&callback); + + hr = WMCreateReader(NULL, 0, &reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced); + + hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) + goto out; + ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + ok(callback.refcount > 1, "Got refcount %d.\n", callback.refcount); + ret = WaitForSingleObject(callback.got_opened, 1000); + ok(!ret, "Wait timed out.\n"); + + count = 0xdeadbeef; + hr = IWMReader_GetOutputCount(reader, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(count == 2, "Got count %u.\n", count); + + for (i = 0; i < 2; ++i) + { + hr = IWMProfile_GetStream(profile, i, &config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + stream_numbers[i] = 0xdead; + hr = IWMStreamConfig_GetStreamNumber(config, &stream_numbers[i]); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream_numbers[i] == i + 1, "Got stream number %u.\n", stream_numbers[i]); + + ref = IWMStreamConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + + hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + /* By default the reader will time itself, and attempt to deliver samples + * according to their presentation time. Call DeliverTime with the file + * duration in order to request all samples as fast as possible. */ + hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); + ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + hr = IWMReaderAdvanced2_SetUserProvidedClock(advanced, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = WaitForSingleObject(callback.eof_event, 20000); + ok(!ret, "Wait timed out.\n"); + ok(callback.got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback.got_eof); + + hr = IWMReader_Stop(reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = WaitForSingleObject(callback.got_stopped, 5000); + ok(!ret, "Wait timed out.\n"); + + hr = IWMReader_Stop(reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = WaitForSingleObject(callback.got_stopped, 1000); + ok(!ret, "Wait timed out.\n"); + } + + test_reader_attributes(profile); + + hr = IWMReader_Close(reader); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); + ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); + callback_cleanup(&callback); + +out: + ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + CloseHandle(stream.file); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + + hr = IWMReader_Close(reader); + todo_wine ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + + IWMReaderAdvanced2_Release(advanced); + IWMProfile_Release(profile); + ref = IWMReader_Release(reader); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(wmvcore) { HRESULT hr; @@ -1070,6 +1344,7 @@ START_TEST(wmvcore) test_sync_reader_streaming(); test_sync_reader_types(); test_sync_reader_file(); + test_async_reader_streaming(); CoUninitialize(); } -- 2.33.0

2 8

[PATCH 2/2] dmime: Skip Segment header only if too much data
by Alistair Leslie-Hughes 03 Nov '21

03 Nov '21

Tron 2.0 has a segment header of 56, so is missing the rtPlayStart field. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/segment.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index f5dbf4b9959..67522c0edb6 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -743,9 +743,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *strea switch (chunk.id) { case DMUS_FOURCC_SEGMENT_CHUNK: /* DX7, DX8 and DX9 structure sizes */ - if (chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLength) && - chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart) && - chunk.size != sizeof(DMUS_IO_SEGMENT_HEADER)) { + if (chunk.size > sizeof(DMUS_IO_SEGMENT_HEADER)) { WARN("Invalid size of %s\n", debugstr_chunk(&chunk)); break; } -- 2.33.0

2 1

[PATCH] dmime: Accept a DMUS_IO_SEGMENT_HEADER without rtPlayStart field
by Michael Stefaniuc 02 Nov '21

02 Nov '21

Tron 2.0 has a segment header of 56, so is missing the rtPlayStart field. Based on a patch by Alistair Leslie-Hughes. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- The demo shows the same problem. All 112 segments that get loaded for me have a segment header of 56 bytes. dlls/dmime/segment.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index f5dbf4b9959..326ffe98e18 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -727,7 +727,8 @@ static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size) if (dx == 9) { TRACE("\trtLoopStart: %s\n", wine_dbgstr_longlong(h->rtLoopStart)); TRACE("\trtLoopEnd: %s\n", wine_dbgstr_longlong(h->rtLoopEnd)); - TRACE("\trtPlayStart: %s\n", wine_dbgstr_longlong(h->rtPlayStart)); + if (size > offsetof(DMUS_IO_SEGMENT_HEADER, rtPlayStart)) + TRACE("\trtPlayStart: %s\n", wine_dbgstr_longlong(h->rtPlayStart)); } } @@ -742,8 +743,11 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *strea while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { switch (chunk.id) { case DMUS_FOURCC_SEGMENT_CHUNK: + /* DX9 without rtPlayStart field */ + if (chunk.size == offsetof(DMUS_IO_SEGMENT_HEADER, rtPlayStart)) + WARN("Missing rtPlayStart field in %s\n", debugstr_chunk(&chunk)); /* DX7, DX8 and DX9 structure sizes */ - if (chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLength) && + else if (chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLength) && chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart) && chunk.size != sizeof(DMUS_IO_SEGMENT_HEADER)) { WARN("Invalid size of %s\n", debugstr_chunk(&chunk)); -- 2.31.1

1 0

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Define a symbolic constant to represent the D3D_SIF_TEXTURE_COMPONENTS shift.
by Zebediah Figura 02 Nov '21

02 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 2 +- libs/vkd3d-shader/sm4.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9d45e1633..f8eb0a1ef 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -561,7 +561,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) put_u32(&buffer, sm4_resource_format(var->data_type)); put_u32(&buffer, sm4_rdef_resource_dimension(var->data_type)); put_u32(&buffer, ~0u); /* FIXME: multisample count */ - flags |= (var->data_type->e.resource_format->dimx - 1) << 2; + flags |= (var->data_type->e.resource_format->dimx - 1) << VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT; } put_u32(&buffer, var->reg.id); put_u32(&buffer, 1); /* bind count */ diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index ddcb9a861..17a08ee27 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -526,4 +526,7 @@ enum vkd3d_sm4_shader_data_type VKD3D_SM4_SHADER_DATA_MESSAGE = 0x4, }; +/* The shift that corresponds to the D3D_SIF_TEXTURE_COMPONENTS mask. */ +#define VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT 2 + #endif /* __VKD3D_SM4_H */ -- 2.33.1

3 11

[PATCH 1/3] evr/mixer: Fix number of substreams in CreateVideoProcessor().
by Nikolay Sivov 02 Nov '21

02 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 30b4ed31b3f..3a2b6830782 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -35,7 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); -#define MAX_MIXER_INPUT_STREAMS 16 +#define MAX_MIXER_INPUT_SUBSTREAMS (15) +#define MAX_MIXER_INPUT_STREAMS (MAX_MIXER_INPUT_SUBSTREAMS + 1) struct input_stream { @@ -932,7 +933,7 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D rt_format = subtype.Data1; if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &mixer->output.rt_formats[i].device, - &video_desc, rt_format, MAX_MIXER_INPUT_STREAMS, &mixer->processor))) + &video_desc, rt_format, MAX_MIXER_INPUT_SUBSTREAMS, &mixer->processor))) { if (mixer->output.media_type) IMFMediaType_Release(mixer->output.media_type); -- 2.33.0

1 2

[PATCH] gdi32: use 7-bit ascii for unhandled encodings
by Aurélien Inacio 02 Nov '21

02 Nov '21

Signed-off-by: Aurélien Inacio <aur36(a)mailo.com> --- dlls/gdi32/opentype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 10234c6d5aa..c206d6dae57 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -344,8 +344,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_MAC_ENCODING_THAI: return 10021; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; case OPENTYPE_PLATFORM_WIN: @@ -366,8 +366,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_WIN_ENCODING_JOHAB: return 1361; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; default: -- 2.30.2

2 1

[PATCH] mshtml: Implement HTMLAnchorElement_get_pathname().
by Hans Leidekker 02 Nov '21

02 Nov '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlanchor.c | 31 +++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a3608abbeb1..a9c5844d440 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -476,8 +476,35 @@ static HRESULT WINAPI HTMLAnchorElement_put_pathname(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_get_pathname(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IUri *uri; + HRESULT hres; + BSTR path; + + TRACE("(%p)->(%p)\n", This, p); + + uri = get_anchor_uri(This); + if(!uri) { + WARN("Could not create IUri\n"); + *p = NULL; + return S_OK; + } + + hres = IUri_GetPath(uri, &path); + IUri_Release(uri); + if(FAILED(hres)) + return hres; + + if(path[0] == '/') { + BSTR str = SysAllocString(path + 1); + SysFreeString(path); + if (!str) + return E_OUTOFMEMORY; + *p = str; + } + else + *p = path; + + return S_OK; } static HRESULT WINAPI HTMLAnchorElement_put_port(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 03f5c0431ea..2e5fd58cdfb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1689,6 +1689,22 @@ static void _test_anchor_port(unsigned line, IUnknown *unk, const WCHAR *port) SysFreeString(str); } +#define test_anchor_pathname(a,p) _test_anchor_pathname(__LINE__,a,p) +static void _test_anchor_pathname(unsigned line, IUnknown *unk, const WCHAR *pathname) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_pathname(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_pathname failed: %08x\n", hres); + if(pathname) + ok_(__FILE__,line)(!lstrcmpW(str, pathname), "pathname = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(pathname)); + else + ok_(__FILE__,line)(str == NULL, "pathname = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + #define test_anchor_search(a,h,n) _test_anchor_search(__LINE__,a,h,n) static void _test_anchor_search(unsigned line, IUnknown *elem, const WCHAR *search, BOOL allowbroken) { @@ -9220,12 +9236,14 @@ static void test_elems(IHTMLDocument2 *doc) if(elem) { test_anchor_href((IUnknown*)elem, L"http://test/"); test_anchor_port((IUnknown*)elem, L"80"); + test_anchor_pathname((IUnknown*)elem, L""); /* Change the href */ - test_anchor_put_href((IUnknown*)elem, L"http://test1:8080/"); - test_anchor_href((IUnknown*)elem, L"http://test1:8080/"); + test_anchor_put_href((IUnknown*)elem, L"http://test1:8080/path"); + test_anchor_href((IUnknown*)elem, L"http://test1:8080/path"); test_anchor_hostname((IUnknown*)elem, L"test1"); test_anchor_port((IUnknown*)elem, L"8080"); + test_anchor_pathname((IUnknown*)elem, L"path"); /* Restore the href */ test_anchor_put_href((IUnknown*)elem, L"http://test/"); -- 2.30.2

3 2

[PATCH 1/9] include/wine/mscvpdb.h: update symbol header for linetab2's block size
by Eric Pouech 02 Nov '21

02 Nov '21

Fixed tools/winedump and dlls/dbghelp to use that information (instead of trying to guess it, with an erroneous result) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 7 ++++--- include/wine/mscvpdb.h | 4 ++-- tools/winedump/pdb.c | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a1f009cf678..4aaee196370 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2424,6 +2424,7 @@ static void pdb_convert_symbol_file(const PDB_SYMBOLS* symbols, sfile->range.index = sym_file->range.index; sfile->symbol_size = sym_file->symbol_size; sfile->lineno_size = sym_file->lineno_size; + sfile->lineno2_size = sym_file->lineno2_size; *size = sizeof(PDB_SYMBOL_FILE) - 1; } else @@ -2818,14 +2819,14 @@ static BOOL pdb_process_internal(const struct process* pcs, codeview_snarf(msc_dbg, modimage, sizeof(DWORD), sfile.symbol_size, TRUE); + if (sfile.lineno_size && sfile.lineno2_size) FIXME("Both line info present... only supporting first\n"); if (sfile.lineno_size) codeview_snarf_linetab(msc_dbg, modimage + sfile.symbol_size, sfile.lineno_size, pdb_file->kind == PDB_JG); - if (files_image) - codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size + sfile.lineno_size, - pdb_get_file_size(pdb_file, sfile.file) - sfile.symbol_size - sfile.lineno_size, + else if (sfile.lineno2_size && files_image) + codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size, sfile.lineno2_size, files_image + 12, files_size); pdb_free(modimage); diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 1ede937abc4..53eeec96916 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2343,7 +2343,7 @@ typedef struct _PDB_SYMBOL_FILE WORD file; DWORD symbol_size; DWORD lineno_size; - DWORD unknown2; + DWORD lineno2_size; DWORD nSrcFiles; DWORD attribute; CHAR filename[1]; @@ -2357,7 +2357,7 @@ typedef struct _PDB_SYMBOL_FILE_EX WORD file; DWORD symbol_size; DWORD lineno_size; - DWORD unknown2; + DWORD lineno2_size; DWORD nSrcFiles; DWORD attribute; DWORD reserved[2]; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 71a2bc49cc8..bbaf1cb94e8 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -466,7 +466,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file = (const char*)symbols + sizeof(PDB_SYMBOLS); while (file - (const char*)symbols < sizeof(PDB_SYMBOLS) + symbols->module_size) { - int file_nr, symbol_size, lineno_size; + int file_nr, symbol_size, lineno_size, lineno2_size; const char* file_name; if (symbols->version < 19970000) @@ -476,6 +476,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file_name = sym_file->filename; symbol_size = sym_file->symbol_size; lineno_size = sym_file->lineno_size; + lineno2_size = sym_file->lineno2_size; printf("\t--------symbol file----------- %s\n", file_name); printf("\tgot symbol_file\n" "\t\tunknown1: %08x\n" @@ -491,7 +492,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tfile: %04x\n" "\t\tsymb size: %08x\n" "\t\tline size: %08x\n" - "\t\tunknown2: %08x\n" + "\t\tline2 size: %08x\n" "\t\tnSrcFiles: %08x\n" "\t\tattribute: %08x\n", sym_file->unknown1, @@ -506,7 +507,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx sym_file->file, sym_file->symbol_size, sym_file->lineno_size, - sym_file->unknown2, + sym_file->lineno2_size, sym_file->nSrcFiles, sym_file->attribute); } @@ -517,6 +518,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file_name = sym_file->filename; symbol_size = sym_file->symbol_size; lineno_size = sym_file->lineno_size; + lineno2_size = sym_file->lineno2_size; printf("\t--------symbol file----------- %s\n", file_name); printf("\t\tunknown1: %08x\n" "\t\trange\n" @@ -533,7 +535,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tfile: %04x\n" "\t\tsymb size: %08x\n" "\t\tline size: %08x\n" - "\t\tunknown2: %08x\n" + "\t\tline2 size: %08x\n" "\t\tnSrcFiles: %08x\n" "\t\tattribute: %08x\n" "\t\treserved/0: %08x\n" @@ -552,7 +554,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx sym_file->file, sym_file->symbol_size, sym_file->lineno_size, - sym_file->unknown2, + sym_file->lineno2_size, sym_file->nSrcFiles, sym_file->attribute, sym_file->reserved[0], @@ -569,15 +571,13 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx /* line number info */ if (lineno_size) codeview_dump_linetab((const char*)modimage + symbol_size, TRUE, " "); - /* anyway, lineno_size doesn't see to really be the size of the line number information, and - * it's not clear yet when to call for linetab2... - */ - codeview_dump_linetab2((const char*)modimage + symbol_size + lineno_size, - total_size - (symbol_size + lineno_size), - filesimage ? filesimage + 12 : NULL, filessize, " "); + else if (lineno2_size) /* actually, only one of the 2 lineno should be present */ + codeview_dump_linetab2((const char*)modimage + symbol_size, lineno2_size, + filesimage ? filesimage + 12 : NULL, filessize, " "); /* what's that part ??? */ if (0) - dump_data(modimage + symbol_size + lineno_size, total_size - (symbol_size + lineno_size), " "); + dump_data(modimage + symbol_size + lineno_size + lineno2_size, + total_size - (symbol_size + lineno_size + lineno2_size), " "); free(modimage); }

1 8

[v2 PATCH] d3d11: Correctly handle optional arguments in OMGetBlendState().
by Nikolay Sivov 02 Nov '21

02 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 14 ++++++++++++ dlls/d3d11/device.c | 37 ++++++++++++++++++++++---------- dlls/d3d11/tests/d3d11.c | 14 ++++++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 6ec398269fa..b8338152bb7 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5533,6 +5533,20 @@ float4 main(float4 color : COLOR) : SV_TARGET blend_factor[2] = 0.3f; blend_factor[3] = 0.4f; ID3D10Device_OMSetBlendState(device, blend_state, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + /* OMGetBlendState() arguments are optional */ + ID3D10Device_OMGetBlendState(device, NULL, NULL, NULL); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, NULL, NULL); + ID3D10BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D10Device_OMGetBlendState(device, NULL, NULL, &sample_mask); + ok(sample_mask == D3D10_DEFAULT_SAMPLE_MASK, "Unexpected sample mask %#x.\n", sample_mask); + memset(tmp_blend_factor, 0, sizeof(tmp_blend_factor)); + ID3D10Device_OMGetBlendState(device, NULL, tmp_blend_factor, NULL); + ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f + && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8d88ee26222..417638bf314 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2190,20 +2190,26 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetBlendState(ID3D11DeviceC struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_blend_state *wined3d_state; struct d3d_blend_state *blend_state_impl; + unsigned int tmp_sample_mask; + float tmp_blend_factor[4]; TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, - (struct wined3d_color *)blend_factor, sample_mask))) + if (!blend_factor) blend_factor = tmp_blend_factor; + if (!sample_mask) sample_mask = &tmp_sample_mask; + wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, + (struct wined3d_color *)blend_factor, sample_mask); + if (blend_state) { - blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); - ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); - } - else - { - *blend_state = NULL; + if (wined3d_state) + { + blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); + ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); + } + else + *blend_state = NULL; } wined3d_mutex_unlock(); } @@ -5541,10 +5547,19 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, d3d11_device_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_blend_state, blend_factor, sample_mask); + if (blend_state) + { + if (d3d11_blend_state) + { + *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; + ID3D10BlendState_AddRef(*blend_state); + } + else + *blend_state = NULL; + } + if (d3d11_blend_state) - *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; - else - *blend_state = NULL; + ID3D11BlendState_Release(d3d11_blend_state); } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 553caa10e46..2ed9aed490e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12608,6 +12608,20 @@ static void test_clear_state(void) ID3D11DeviceContext_OMGetDepthStencilState(context, &tmp_ds_state, NULL); ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D11DepthStencilState_Release(tmp_ds_state); + /* OMGetBlendState() arguments are optional */ + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, NULL); + ID3D11DeviceContext_OMGetBlendState(context, &tmp_blend_state, NULL, NULL); + ok(tmp_blend_state == blend_state, "Got unexpected blend state %p, expected %p.\n", tmp_blend_state, blend_state); + ID3D11BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, &sample_mask); + ok(sample_mask == 0xff00ff00, "Got unexpected sample mask %#x.\n", sample_mask); + memset(blend_factor, 0, sizeof(blend_factor)); + ID3D11DeviceContext_OMGetBlendState(context, NULL, blend_factor, NULL); + ok(blend_factor[0] == 0.1f && blend_factor[1] == 0.2f + && blend_factor[2] == 0.3f && blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); ID3D11DeviceContext_OMGetRenderTargets(context, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i) -- 2.33.0

3 2

[PATCH] kernel32: Correctly restore protection in set_entry_point().
by Paul Gofman 02 Nov '21

02 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Passing NULL old protection results in VirtualProtect failure. dlls/kernel32/kernel_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 89394e16430..4467af739e0 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -65,7 +65,7 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) TRACE( "setting %s at %p to %08x\n", name, &functions[ordinal], rva ); VirtualProtect( functions + ordinal, sizeof(*functions), PAGE_READWRITE, &oldprot ); functions[ordinal] = rva; - VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, NULL ); + VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, &oldprot ); return; } if (res > 0) max = pos - 1; -- 2.31.1

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.197.
by Georg Lehmann 02 Nov '21

02 Nov '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 0a22834dc4d..e84442d7a79 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.196" +VK_XML_VERSION = "1.2.197" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.33.1

1 0

[PATCH 1/5] ntdll: Allocate DDAG node for module.
by Paul Gofman 02 Nov '21

02 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/module.c | 6 +++--- dlls/ntdll/loader.c | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index fd369ff33e9..7c4b690fb39 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1358,7 +1358,7 @@ static void test_ddag_node(void) if (!(node = mod->DdagNode)) { - skip( "DdagNode is NULL, skipping tests.\n" ); + win_skip( "DdagNode is NULL, skipping tests.\n" ); return; } @@ -1376,11 +1376,11 @@ static void test_ddag_node(void) ok( !node->IncomingDependencies.Tail, "Expected empty incoming dependencies list.\n" ); /* node->Dependencies.Tail is NULL on Windows 10 1507-1607 32 bit test, maybe due to broken structure layout. */ - ok( !!node->Dependencies.Tail || broken( sizeof(void *) == 4 && !node->Dependencies.Tail), + todo_wine ok( !!node->Dependencies.Tail || broken( sizeof(void *) == 4 && !node->Dependencies.Tail ), "Expected nonempty dependencies list.\n" ); if (!node->Dependencies.Tail) { - win_skip( "Empty dependencies list.\n" ); + skip( "Empty dependencies list.\n" ); return; } ok( node->LoadCount == -1, "Got unexpected LoadCount %d.\n", node->LoadCount ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index dd41d6b66d2..c946b39574a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1203,7 +1203,6 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) return status; } - /************************************************************************* * alloc_module * @@ -1232,6 +1231,16 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name RtlFreeHeap( GetProcessHeap(), 0, wm ); return NULL; } + + if (!(wm->ldr.DdagNode = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wm->ldr.DdagNode) ))) + { + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + RtlFreeHeap( GetProcessHeap(), 0, wm ); + return NULL; + } + InitializeListHead(&wm->ldr.DdagNode->Modules); + InsertTailList(&wm->ldr.DdagNode->Modules, &wm->ldr.NodeModuleLink); + memcpy( buffer, nt_name->Buffer + 4 /* \??\ prefix */, nt_name->Length - 4 * sizeof(WCHAR) ); buffer[nt_name->Length/sizeof(WCHAR) - 4] = 0; if ((p = wcsrchr( buffer, '\\' ))) p++; @@ -3518,6 +3527,10 @@ static void free_modref( WINE_MODREF *wm ) if (wm->ldr.InInitializationOrderLinks.Flink) RemoveEntryList(&wm->ldr.InInitializationOrderLinks); + RemoveEntryList(&wm->ldr.NodeModuleLink); + if (IsListEmpty(&wm->ldr.DdagNode->Modules)) + RtlFreeHeap( GetProcessHeap(), 0, wm->ldr.DdagNode ); + TRACE(" unloading %s\n", debugstr_w(wm->ldr.FullDllName.Buffer)); if (!TRACE_ON(module)) TRACE_(loaddll)("Unloaded module %s : %s\n", -- 2.31.1

1 4

libFAudio-dev -build requirement
by Sveinar Søpler 02 Nov '21

02 Nov '21

Hi I see now as of wine-devel-6.20, wine is built with /libs/faudio source as PE. I know the overall plan is to get distro's to provide the PE packages, but i would think this is still a bit ahead in time (atleast for some distro's) ref: [ https://github.com/wine-mirror/wine/commit/6b45777121fcd50d9b7d5b649c671006… | https://github.com/wine-mirror/wine/commit/6b45777121fcd50d9b7d5b649c671006… ] [ https://github.com/wine-mirror/wine/commit/d8be85863fedf6982944d06ebd1ce590… | https://github.com/wine-mirror/wine/commit/d8be85863fedf6982944d06ebd1ce590… ] and libs: Import code from upstream FAudio 21.10. xaudio: Use the bundled FAudio and build with msvcrt. Does this mean that libFAudio-dev requirement for package build on OBS can be dropped? Distro(s) in question is then Debian/Ubuntu, and packages would be wine-devel-6.21+ and wine-staging-6.21+ The note on libFAudio-21.11 also sais this: Deprecated Features: * GStreamer support is now deprecated. o Wine users should migrate to 6.20 and newer, and everyone else should move to codecs that are not patent-encumbered. o GStreamer support will be fully removed in the first release after Wine 7.0. Removed Features: * Removed the C++ wrapper. Use the headers/PE binaries found in Wine 6.20 and newer. PS. I am aware that libFAudio.so.0 would still be required for < wine-devel/staging-6.19 and wine-stable-6.0, but the above would (to me) indicate that configure no longer checks for the systemlib development package, and thus build-depends: libFAudio-dev could be dropped when building packages. Sveinar

2 1

[PATCH 2/2] comctl32/button: Use BS_PUSHLIKE instead of WS_EX_RIGHT in BUTTON_PositionRect().
by Zhiyi Zhang 02 Nov '21

02 Nov '21

BS_PUSHLIKE and WS_EX_RIGHT have the same value and it was a typo to use WS_EX_RIGHT. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b3331e179cd..fbe060513d2 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1122,7 +1122,7 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe INT width = innerRect->right - innerRect->left; INT height = innerRect->bottom - innerRect->top; - if ((style & WS_EX_RIGHT) && !(style & BS_CENTER)) style |= BS_CENTER; + if ((style & BS_PUSHLIKE) && !(style & BS_CENTER)) style |= BS_CENTER; if (!(style & BS_CENTER)) { -- 2.32.0

1 0

[PATCH 1/2] comctl32/button: Remove useless calculation for drawing group boxes.
by Zhiyi Zhang 02 Nov '21

02 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b576e6c6db6..b3331e179cd 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2113,10 +2113,6 @@ static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) labelRect.right++; labelRect.bottom++; FillRect(hDC, &labelRect, hbr); - labelRect.left++; - labelRect.right--; - labelRect.bottom--; - BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); } SelectClipRgn( hDC, hrgn ); -- 2.32.0

1 0

[PATCH 6/6] uxtheme: Implement GetThemeTransitionDuration().
by Zhiyi Zhang 02 Nov '21

02 Nov '21

Fix Nokia SDK 2.0 for Java installer buttons not changing state after clicking. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/metric.c | 30 +++++++++++++++++++++++++++--- dlls/uxtheme/tests/system.c | 22 ++++------------------ 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index b7c173740d7..3ef199bcca7 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -228,8 +228,32 @@ HRESULT WINAPI GetThemeSysString(HTHEME hTheme, int iStringID, HRESULT WINAPI GetThemeTransitionDuration(HTHEME hTheme, int iPartId, int iStateIdFrom, int iStateIdTo, int iPropId, DWORD *pdwDuration) { - FIXME("(%p, %u, %u, %u, %u, %p) stub\n", hTheme, iPartId, iStateIdFrom, iStateIdTo, - iPropId, pdwDuration); + INTLIST intlist; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %d, %d, %d, %d, %p)\n", hTheme, iPartId, iStateIdFrom, iStateIdTo, iPropId, + pdwDuration); + + if (!pdwDuration || iStateIdFrom < 1 || iStateIdTo < 1) + return E_INVALIDARG; + + hr = GetThemeIntList(hTheme, iPartId, 0, iPropId, &intlist); + if (FAILED(hr)) + { + if (hr == E_PROP_ID_UNSUPPORTED) + *pdwDuration = 0; + + return hr; + } + + if (intlist.iValueCount < 1 || iStateIdFrom > intlist.iValues[0] + || iStateIdTo > intlist.iValues[0] + || intlist.iValueCount != 1 + intlist.iValues[0] * intlist.iValues[0]) + { + *pdwDuration = 0; + return E_INVALIDARG; + } + + *pdwDuration = intlist.iValues[1 + intlist.iValues[0] * (iStateIdFrom - 1) + (iStateIdTo - 1)]; + return S_OK; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 57901e6affb..10857115061 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1329,74 +1329,64 @@ static void test_GetThemeTransitionDuration(void) duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(NULL, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + /* Crash on Wine. HTHEME is not a pointer that can be directly referenced. */ + if (strcmp(winetest_platform, "wine")) + { duration = 0xdeadbeef; hr = pGetThemeTransitionDuration((HTHEME)0xdeadbeef, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); todo_wine ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + } duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, 0xdeadbeef, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL - 1, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_NORMAL - 1, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING + 1, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_BACKGROUND, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, 0xdeadbeef, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, NULL); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); /* Parts that don't have TMT_TRANSITIONDURATIONS */ @@ -1406,9 +1396,7 @@ static void test_GetThemeTransitionDuration(void) duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_GROUPBOX, GBS_NORMAL, GBS_DISABLED, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); /* Test parsing TMT_TRANSITIONDURATIONS property. TMT_TRANSITIONDURATIONS is a vista+ property */ @@ -1436,10 +1424,8 @@ static void test_GetThemeTransitionDuration(void) duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, from_state, to_state, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == S_OK, "GetThemeTransitionDuration failed, hr %#x.\n", hr); expected = intlist.iValues[1 + intlist.iValues[0] * (from_state - 1) + (to_state - 1)]; - todo_wine ok(duration == expected, "Expected duration %d, got %d.\n", expected, duration); winetest_pop_context(); -- 2.32.0

1 0

[PATCH 5/6] uxtheme/tests: Add GetThemeTransitionDuration() tests.
by Zhiyi Zhang 02 Nov '21

02 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 154 ++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 541d46deeaa..57901e6affb 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -43,6 +43,7 @@ static HDC (WINAPI *pGetBufferedPaintDC)(HPAINTBUFFER); static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); static HRESULT (WINAPI *pGetThemeIntList)(HTHEME, int, int, int, INTLIST *); +static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int, DWORD *); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -81,6 +82,7 @@ static void init_funcs(void) GET_PROC(uxtheme, GetBufferedPaintTargetDC) GET_PROC(uxtheme, GetBufferedPaintTargetRect) GET_PROC(uxtheme, GetThemeIntList) + GET_PROC(uxtheme, GetThemeTransitionDuration) GET_PROC(uxtheme, OpenThemeDataEx) GET_PROC(uxtheme, OpenThemeDataForDpi) @@ -1299,6 +1301,157 @@ static void test_GetThemeIntList(void) DestroyWindow(hwnd); } +static void test_GetThemeTransitionDuration(void) +{ + int from_state, to_state, expected; + INTLIST intlist; + DWORD duration; + HTHEME theme; + HRESULT hr; + HWND hwnd; + + if (!pGetThemeTransitionDuration || !pGetThemeIntList) + { + win_skip("GetThemeTransitionDuration or GetThemeIntList is unavailable.\n"); + return; + } + + hwnd = CreateWindowA("static", "", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); + theme = OpenThemeData(hwnd, L"Button"); + if (!theme) + { + skip("Theming is not active.\n"); + DestroyWindow(hwnd); + return; + } + + /* Invalid parameter tests */ + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(NULL, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration((HTHEME)0xdeadbeef, BP_PUSHBUTTON, PBS_NORMAL, + PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, 0xdeadbeef, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL - 1, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, + PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_NORMAL - 1, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING + 1, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_BACKGROUND, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + 0xdeadbeef, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, NULL); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + + /* Parts that don't have TMT_TRANSITIONDURATIONS */ + hr = GetThemeIntList(theme, BP_GROUPBOX, GBS_NORMAL, TMT_TRANSITIONDURATIONS, &intlist); + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeIntList failed, hr %#x.\n", hr); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_GROUPBOX, GBS_NORMAL, GBS_DISABLED, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + /* Test parsing TMT_TRANSITIONDURATIONS property. TMT_TRANSITIONDURATIONS is a vista+ property */ + if (LOBYTE(LOWORD(GetVersion())) < 6) + goto done; + + hr = pGetThemeIntList(theme, BP_PUSHBUTTON, PBS_NORMAL, TMT_TRANSITIONDURATIONS, &intlist); + ok(hr == S_OK, "GetThemeIntList failed, hr %#x.\n", hr); + /* The first value is the theme part state count. The following are the values from every state + * to every state. So the total value count should be 1 + state ^ 2 */ + expected = PBS_DEFAULTED_ANIMATING - PBS_NORMAL + 1; + ok(intlist.iValues[0] == expected, "Expected the first value %d, got %d.\n", expected, + intlist.iValues[0]); + expected = 1 + intlist.iValues[0] * intlist.iValues[0]; + ok(intlist.iValueCount == expected, "Expected value count %d, got %d.\n", expected, + intlist.iValueCount); + if (hr == S_OK) + { + for (from_state = PBS_NORMAL; from_state <= PBS_DEFAULTED_ANIMATING; ++from_state) + { + for (to_state = PBS_NORMAL; to_state <= PBS_DEFAULTED_ANIMATING; ++to_state) + { + winetest_push_context("from state %d to %d", from_state, to_state); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, from_state, to_state, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == S_OK, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + expected = intlist.iValues[1 + intlist.iValues[0] * (from_state - 1) + (to_state - 1)]; + todo_wine + ok(duration == expected, "Expected duration %d, got %d.\n", expected, duration); + + winetest_pop_context(); + } + } + } + +done: + CloseThemeData(theme); + DestroyWindow(hwnd); +} + START_TEST(system) { init_funcs(); @@ -1319,6 +1472,7 @@ START_TEST(system) test_CloseThemeData(); test_buffered_paint(); test_GetThemeIntList(); + test_GetThemeTransitionDuration(); /* Test EnableTheming() in the end because it may disable theming */ test_EnableTheming(); -- 2.32.0

1 0

[PATCH 4/6] light.msstyles: Add TMT_TRANSITIONDURATIONS property.
by Zhiyi Zhang 02 Nov '21

02 Nov '21

Set all transition duration to 100ms for different states and 0ms for the same state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 193 +++++++++++++++++++++++++++++++++++ dlls/uxtheme/tests/system.c | 1 - 2 files changed, 193 insertions(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index cf9271cb612..aad8aa51d09 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -194,6 +194,13 @@ BLUE_INI TEXTFILE "ImageLayout = Vertical\r\n" "TextColor = 0 0 0\r\n" "MinSize = 10, 5\r\n" +"TransitionDurations = 6, " +"0, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 0\r\n" "[Button.Pushbutton(Pressed)]\r\n" "TextColor = 255 255 255\r\n" @@ -227,6 +234,27 @@ BLUE_INI TEXTFILE "MinDpi5 = 192\r\n" "MinDpi6 = 216\r\n" "MinDpi7 = 240\r\n" +"TransitionDurations = 20, " +"0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Button.Checkbox(Checkeddisabled)]\r\n" "TextColor = 189 189 189\r\n" @@ -262,6 +290,15 @@ BLUE_INI TEXTFILE "MinDpi5 = 192\r\n" "MinDpi6 = 216\r\n" "MinDpi7 = 240\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Button.Radiobutton(Checkeddisabled)]\r\n" "TextColor = 189 189 189\r\n" @@ -292,6 +329,13 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "TextColor = 0 0 0\r\n" "MinSize = 10, 5\r\n" +"TransitionDurations = 6, " +"0, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 0\r\n" "[Button.Commandlink(Hot)]\r\n" "TextColor = 48 150 250\r\n" @@ -333,6 +377,11 @@ BLUE_INI TEXTFILE "BorderSize = 1\r\n" "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "[ComboBox(Disabled)]\r\n" "BorderColor = 228 228 228\r\n" @@ -350,6 +399,11 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_combobutton_glyph.bmp\r\n" "GlyphTransparent = True\r\n" "Transparent = True\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "\r\n; Edit\r\n" "[Edit]\r\n" @@ -492,6 +546,14 @@ BLUE_INI TEXTFILE "VAlign = Top\r\n" "\r\n; Scroll Bar\r\n" +"[ScrollBar]\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" + "[ScrollBar.ArrowBtn]\r\n" "BgType = ImageFile\r\n" "SizingMargins = 5, 5, 5, 5\r\n" @@ -601,6 +663,11 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_spin_glyph_up.bmp\r\n" "GlyphTransparent = True\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "[Spin.Down]\r\n" "BgType = ImageFile\r\n" @@ -613,6 +680,11 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_spin_glyph_down.bmp\r\n" "GlyphTransparent = True\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "[Spin.Uphorz]\r\n" "BgType = ImageFile\r\n" @@ -625,6 +697,11 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_spin_glyph_right.bmp\r\n" "GlyphTransparent = True\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "[Spin.Downhorz]\r\n" "BgType = ImageFile\r\n" @@ -637,6 +714,11 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_spin_glyph_left.bmp\r\n" "GlyphTransparent = True\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "\r\n; Status\r\n" "[Status]\r\n" @@ -703,6 +785,12 @@ BLUE_INI TEXTFILE "ImageFile = blue_tab_item.bmp\r\n" "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TabItemLeftEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -712,6 +800,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TabItemRightEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -721,6 +815,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TabItemBothEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -729,6 +829,12 @@ BLUE_INI TEXTFILE "ImageFile = blue_tab_item.bmp\r\n" "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TopTabItem]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -738,6 +844,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TopTabItemLeftEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -747,6 +859,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TopTabItemRightEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -756,6 +874,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TopTabItemBothEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -765,6 +889,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.Body]\r\n" "BgType = ImageFile\r\n" @@ -776,6 +906,15 @@ BLUE_INI TEXTFILE "BorderSize = 0\r\n" "FillColor = 244 244 244\r\n" "TextColor = 0 0 0\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar(Pressed)]\r\n" "TextColor = 0 0 0\r\n" @@ -789,6 +928,15 @@ BLUE_INI TEXTFILE "ImageCount = 6\r\n" "SizingType = Stretch\r\n" "Transparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar.Separator]\r\n" "SizingMargins = 5, 2, 2, 1\r\n" @@ -797,6 +945,15 @@ BLUE_INI TEXTFILE "ImageCount = 1\r\n" "SizingType = Tile\r\n" "Transparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar.SeparatorVert]\r\n" "SizingMargins = 2, 1, 5, 1\r\n" @@ -805,6 +962,15 @@ BLUE_INI TEXTFILE "ImageCount = 1\r\n" "SizingType = Tile\r\n" "Transparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar.DropdownButton]\r\n" "SizingMargins = 4, 4, 4, 4\r\n" @@ -815,6 +981,15 @@ BLUE_INI TEXTFILE "ImageCount = 6\r\n" "SizingType = Stretch\r\n" "Transparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar.SplitButton]\r\n" "SizingMargins = 3, 2, 3, 3\r\n" @@ -824,6 +999,15 @@ BLUE_INI TEXTFILE "ImageCount = 6\r\n" "SizingType = Stretch\r\n" "Transparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar.SplitButtonDropdown]\r\n" "SizingMargins = 1, 3, 3, 3\r\n" @@ -836,6 +1020,15 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_toolbar_buttons_split_dropdown_glyph.bmp\r\n" "GlyphTransparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "\r\n; TrackBar\r\n" "[TrackBar]\r\n" diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 7992911bc19..541d46deeaa 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1293,7 +1293,6 @@ static void test_GetThemeIntList(void) if (LOBYTE(LOWORD(GetVersion())) < 6) ok(hr == E_PROP_ID_UNSUPPORTED, "Expected %#x, got %#x.\n", E_PROP_ID_UNSUPPORTED, hr); else - todo_wine ok(hr == S_OK, "GetThemeIntList failed, hr %#x.\n", hr); CloseThemeData(theme); -- 2.32.0

1 0

[PATCH 3/6] uxtheme: Support TMT_TRANSITIONDURATIONS property.
by Zhiyi Zhang 02 Nov '21

02 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index a7928348304..c9a23429511 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -257,6 +257,7 @@ static const MSSTYLES_PROPERTY_MAP mapProperty[] = { {TMT_BOOL, TMT_USERPICTURE, L"USERPICTURE"}, {TMT_RECT, TMT_DEFAULTPANESIZE, L"DEFAULTPANESIZE"}, {TMT_COLOR, TMT_BLENDCOLOR, L"BLENDCOLOR"}, + {TMT_INTLIST, TMT_TRANSITIONDURATIONS, L"TRANSITIONDURATIONS"}, {0, 0, L""} }; -- 2.32.0

1 0

[PATCH 2/6] uxtheme: Use vssym32.h instead of tmschema.h.
by Zhiyi Zhang 02 Nov '21

02 Nov '21

tmschema.h is obsolete and missing some definitions. The deleted global and menu classes are not used anywhere and not in Windows headers. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 2 +- dlls/uxtheme/metric.c | 2 +- dlls/uxtheme/msstyles.c | 2 +- dlls/uxtheme/property.c | 2 +- dlls/uxtheme/stylemap.c | 62 ++++++----------------------------------- dlls/uxtheme/system.c | 2 +- include/tmschema.h | 28 ------------------- include/vsstyle.h | 7 +++++ 8 files changed, 20 insertions(+), 87 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index a03217b65cf..bf294ed3cc8 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -32,7 +32,7 @@ #include "commoncontrols.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" #include "uxthemedll.h" diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index 2d5a09d0256..b7c173740d7 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -26,7 +26,7 @@ #include "winuser.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index f129d998d65..c0f626d54aa 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -28,7 +28,7 @@ #include "winnls.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 93a72ab9189..188f13836e2 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -26,7 +26,7 @@ #include "wingdi.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 4fe254c1e7a..a7928348304 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -23,9 +23,10 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "tmschema.h" +#include "vssym32.h" #define TMT_ENUM 200 +#define TMT_STOCKIMAGEFILE 3007 typedef struct _MSSTYLES_PROPERTY_MAP { WORD dwPrimitiveType; @@ -332,24 +333,6 @@ static const MSSTYLES_ENUM_MAP mapEnum[] = { * Defined as PartID,StateID,TextName * If StateID == 0 then its a part being defined */ - -/* These are globals to all classes, but its treated as a separate class */ -static const MSSTYLES_CLASS_MAP classGlobals[] = { - {GP_BORDER, 0, L"BORDER"}, - {GP_BORDER, BSS_FLAT, L"FLAT"}, - {GP_BORDER, BSS_RAISED, L"RAISED"}, - {GP_BORDER, BSS_SUNKEN, L"SUNKEN"}, - {GP_LINEHORZ, 0, L"LINEHORZ"}, - {GP_LINEHORZ, LHS_FLAT, L"FLAT"}, - {GP_LINEHORZ, LHS_RAISED, L"RAISED"}, - {GP_LINEHORZ, LHS_SUNKEN, L"SUNKEN"}, - {GP_LINEVERT, 0, L"LINEVERT"}, - {GP_LINEVERT, LVS_FLAT, L"FLAT"}, - {GP_LINEVERT, LVS_RAISED, L"RAISED"}, - {GP_LINEVERT, LVS_SUNKEN, L"SUNKEN"}, - {0, 0, L""} -}; - static const MSSTYLES_CLASS_MAP classButton[] = { {BP_PUSHBUTTON, 0, L"PUSHBUTTON"}, {BP_PUSHBUTTON, PBS_NORMAL, L"NORMAL"}, @@ -488,11 +471,12 @@ static const MSSTYLES_CLASS_MAP classHeader[] = { static const MSSTYLES_CLASS_MAP classListview[] = { {LVP_LISTITEM, 0, L"LISTITEM"}, - {LVP_LISTITEM, LIS_NORMAL, L"NORMAL"}, - {LVP_LISTITEM, LIS_HOT, L"HOT"}, - {LVP_LISTITEM, LIS_SELECTED, L"SELECTED"}, - {LVP_LISTITEM, LIS_DISABLED, L"DISABLED"}, - {LVP_LISTITEM, LIS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"}, + {LVP_LISTITEM, LISS_NORMAL, L"NORMAL"}, + {LVP_LISTITEM, LISS_HOT, L"HOT"}, + {LVP_LISTITEM, LISS_SELECTED, L"SELECTED"}, + {LVP_LISTITEM, LISS_DISABLED, L"DISABLED"}, + {LVP_LISTITEM, LISS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"}, + {LVP_LISTITEM, LISS_HOTSELECTED, L"HOTSELECTED"}, {LVP_LISTGROUP, 0, L"LISTGROUP"}, {LVP_LISTDETAIL, 0, L"LISTDETAIL"}, {LVP_LISTSORTEDDETAIL, 0, L"LISTSORTEDDETAIL"}, @@ -500,34 +484,6 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {0, 0, L""} }; -static const MSSTYLES_CLASS_MAP classMenu[] = { - {MP_MENUITEM, 0, L"MENUITEM"}, - {MP_MENUITEM, MS_NORMAL, L"NORMAL"}, - {MP_MENUITEM, MS_SELECTED, L"SELECTED"}, - {MP_MENUITEM, MS_DEMOTED, L"DEMOTED"}, - {MP_MENUDROPDOWN, 0, L"MENUDROPDOWN"}, - {MP_MENUDROPDOWN, MS_NORMAL, L"NORMAL"}, - {MP_MENUDROPDOWN, MS_SELECTED, L"SELECTED"}, - {MP_MENUDROPDOWN, MS_DEMOTED, L"DEMOTED"}, - {MP_MENUBARITEM, 0, L"MENUBARITEM"}, - {MP_MENUBARITEM, MS_NORMAL, L"NORMAL"}, - {MP_MENUBARITEM, MS_SELECTED, L"SELECTED"}, - {MP_MENUBARITEM, MS_DEMOTED, L"DEMOTED"}, - {MP_MENUBARDROPDOWN, 0, L"MENUBARDROPDOWN"}, - {MP_MENUBARDROPDOWN, MS_NORMAL, L"NORMAL"}, - {MP_MENUBARDROPDOWN, MS_SELECTED, L"SELECTED"}, - {MP_MENUBARDROPDOWN, MS_DEMOTED, L"DEMOTED"}, - {MP_CHEVRON, 0, L"CHEVRON"}, - {MP_CHEVRON, MS_NORMAL, L"NORMAL"}, - {MP_CHEVRON, MS_SELECTED, L"SELECTED"}, - {MP_CHEVRON, MS_DEMOTED, L"DEMOTED"}, - {MP_SEPARATOR, 0, L"SEPARATOR"}, - {MP_SEPARATOR, MS_NORMAL, L"NORMAL"}, - {MP_SEPARATOR, MS_SELECTED, L"SELECTED"}, - {MP_SEPARATOR, MS_DEMOTED, L"DEMOTED"}, - {0, 0, L""} -}; - static const MSSTYLES_CLASS_MAP classMenuband[] = { {MDP_NEWAPPBUTTON, 0, L"NEWAPPBUTTON"}, {MDP_NEWAPPBUTTON, MDS_NORMAL, L"NORMAL"}, @@ -1036,7 +992,6 @@ static const MSSTYLES_CLASS_MAP classWindow[] = { /* Map class names to part/state maps */ static const MSSTYLES_CLASS_NAME mapClass[] = { - {classGlobals, L"GLOBALS"}, {classButton, L"BUTTON"}, {classClock, L"CLOCK"}, {classCombobox, L"COMBOBOX"}, @@ -1044,7 +999,6 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classExplorerbar, L"EXPLORERBAR"}, {classHeader, L"HEADER"}, {classListview, L"LISTVIEW"}, - {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"}, diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 0298fe61d4a..ba579a02edc 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -28,7 +28,7 @@ #include "winreg.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "uxthemedll.h" #include "msstyles.h" diff --git a/include/tmschema.h b/include/tmschema.h index 47eb146ebdc..81bd606d11b 100644 --- a/include/tmschema.h +++ b/include/tmschema.h @@ -594,34 +594,6 @@ BEGIN_TM_PART_STATES(SPECIALGROUPEXPAND) TM_STATE(3, EBSGE, PRESSED) END_TM_PART_STATES() -/* GLOBALS parts */ -BEGIN_TM_CLASS_PARTS(GLOBALS) - TM_PART(1, GP, BORDER) - TM_PART(2, GP, LINEHORZ) - TM_PART(3, GP, LINEVERT) -END_TM_CLASS_PARTS() - -/* GLOBALS - BORDER states */ -BEGIN_TM_PART_STATES(BORDER) - TM_STATE(1, BSS, FLAT) - TM_STATE(2, BSS, RAISED) - TM_STATE(3, BSS, SUNKEN) -END_TM_PART_STATES() - -/* GLOBALS - LINEHORZ states */ -BEGIN_TM_PART_STATES(LINEHORZ) - TM_STATE(1, LHS, FLAT) - TM_STATE(2, LHS, RAISED) - TM_STATE(3, LHS, SUNKEN) -END_TM_PART_STATES() - -/* GLOBAL - LINEVERT states */ -BEGIN_TM_PART_STATES(LINEVERT) - TM_STATE(1, LVS, FLAT) - TM_STATE(2, LVS, RAISED) - TM_STATE(3, LVS, SUNKEN) -END_TM_PART_STATES() - /* HEADER parts */ BEGIN_TM_CLASS_PARTS(HEADER) TM_PART(1, HP, HEADERITEM) diff --git a/include/vsstyle.h b/include/vsstyle.h index c5850111fb3..d6ea9071f64 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1632,6 +1632,13 @@ enum MINBUTTONSTATES { MINBS_DISABLED = 4, }; +enum MAXBUTTONSTATES { + MAXBS_NORMAL = 1, + MAXBS_HOT = 2, + MAXBS_PUSHED = 3, + MAXBS_DISABLED = 4, +}; + enum RESTOREBUTTONSTATES { RBS_NORMAL = 1, RBS_HOT = 2, -- 2.32.0

1 0

[PATCH 1/6] uxtheme/tests: Add GetThemeIntList() tests.
by Zhiyi Zhang 02 Nov '21

02 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 40 ++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index f56c3d2c273..7992911bc19 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -28,7 +28,7 @@ #include "ddk/d3dkmthk.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "vsstyle.h" +#include "vssym32.h" #include "msg.h" #include "wine/test.h" @@ -42,6 +42,7 @@ static HRESULT (WINAPI *pGetBufferedPaintBits)(HPAINTBUFFER, RGBQUAD **, int *); static HDC (WINAPI *pGetBufferedPaintDC)(HPAINTBUFFER); static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); +static HRESULT (WINAPI *pGetThemeIntList)(HTHEME, int, int, int, INTLIST *); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -79,6 +80,7 @@ static void init_funcs(void) GET_PROC(uxtheme, GetBufferedPaintDC) GET_PROC(uxtheme, GetBufferedPaintTargetDC) GET_PROC(uxtheme, GetBufferedPaintTargetRect) + GET_PROC(uxtheme, GetThemeIntList) GET_PROC(uxtheme, OpenThemeDataEx) GET_PROC(uxtheme, OpenThemeDataForDpi) @@ -1263,6 +1265,41 @@ static void test_EnableTheming(void) } } +static void test_GetThemeIntList(void) +{ + INTLIST intlist; + HTHEME theme; + HRESULT hr; + HWND hwnd; + + if (!pGetThemeIntList) + { + win_skip("GetThemeIntList is unavailable.\n"); + return; + } + + hwnd = CreateWindowA("static", "", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); + theme = OpenThemeData(hwnd, L"Button"); + if (!theme) + { + skip("Theming is not active.\n"); + DestroyWindow(hwnd); + return; + } + + /* Check properties */ + /* TMT_TRANSITIONDURATIONS is a vista+ property */ + hr = pGetThemeIntList(theme, BP_PUSHBUTTON, PBS_NORMAL, TMT_TRANSITIONDURATIONS, &intlist); + if (LOBYTE(LOWORD(GetVersion())) < 6) + ok(hr == E_PROP_ID_UNSUPPORTED, "Expected %#x, got %#x.\n", E_PROP_ID_UNSUPPORTED, hr); + else + todo_wine + ok(hr == S_OK, "GetThemeIntList failed, hr %#x.\n", hr); + + CloseThemeData(theme); + DestroyWindow(hwnd); +} + START_TEST(system) { init_funcs(); @@ -1282,6 +1319,7 @@ START_TEST(system) test_GetThemePartSize(); test_CloseThemeData(); test_buffered_paint(); + test_GetThemeIntList(); /* Test EnableTheming() in the end because it may disable theming */ test_EnableTheming(); -- 2.32.0

1 0

[PATCH v8 1/3] robocopy/tests: Add basic conformance tests
by Florian Eder 02 Nov '21

02 Nov '21

Basic conformance tests create test source directories with files and sub folders, execute robocopy on it, checking whether the resulting destination directory, the remaining source directory and the exit code is as expected Signed-off-by: Florian Eder <others.meder(a)gmail.com> --- v8: Added helper functions to check the source folder to reduce amount of duplicated code, use only the relative path for DeleteFileW / RemoveDirectoryW and used string arrays to reduce the amount of code necessary for the tests. The remaining tests that are not using an array / loop structure either break not completly identical with the other tests or will not be fixed with the same patch (which would in turn break the tests when implementing the feature, as the test would succeed for most cmd strings, but not for all). For the cmd return value, this could be fixed with a todo_wine_if and hard coding the array entries that fail, but then the check_*_test functions would still fail as there are also differences in the resulting files. Another solution to this problem would be to also give the id of the specific array entry that is checked as an argument to the check_*_test functions, so that todo_wine_if could be used, but this would a) require hardcoding array entry ids, which could easily change if tests are added from the top instead of the end of the array, b) make the tests more complex, as an additional function is linked to the content of the cmd string array, c) deviate even further from other tests that are (AFAIK) seen as the "gold standard". However, if you prefer this solution, feel free to tell me. :-) Also, basic_copy_tests and absolute_copy_tests could be theoretically merged, as it should not hurt to use the strings in basic_copy_tests as format strings for swprintf (they don't contain any format specifiers, causing swprintf to do nothing). I think it's reasonable to seperate those tests anyway, as it's not directly visible what strings are added to the strings otherwise (it's IMO much more clear when talking about a test for absolute paths, which requires information only available at runtime), but if you think otherwise, I'll change it immediately. :-) --- configure | 1 + configure.ac | 1 + programs/robocopy/tests/Makefile.in | 4 + programs/robocopy/tests/robocopy.c | 342 ++++++++++++++++++++++++++++ 4 files changed, 348 insertions(+) create mode 100644 programs/robocopy/tests/Makefile.in create mode 100644 programs/robocopy/tests/robocopy.c diff --git a/configure b/configure index 0156a507439..542d0fb7233 100755 --- a/configure +++ b/configure @@ -19782,6 +19782,7 @@ wine_fn_config_makefile programs/regini enable_regini wine_fn_config_makefile programs/regsvcs enable_regsvcs wine_fn_config_makefile programs/regsvr32 enable_regsvr32 wine_fn_config_makefile programs/robocopy enable_robocopy +wine_fn_config_makefile programs/robocopy/tests enable_tests wine_fn_config_makefile programs/rpcss enable_rpcss wine_fn_config_makefile programs/rundll.exe16 enable_win16 wine_fn_config_makefile programs/rundll32 enable_rundll32 diff --git a/configure.ac b/configure.ac index ab55c72a238..c5913721a3a 100644 --- a/configure.ac +++ b/configure.ac @@ -3679,6 +3679,7 @@ WINE_CONFIG_MAKEFILE(programs/regini) WINE_CONFIG_MAKEFILE(programs/regsvcs) WINE_CONFIG_MAKEFILE(programs/regsvr32) WINE_CONFIG_MAKEFILE(programs/robocopy) +WINE_CONFIG_MAKEFILE(programs/robocopy/tests) WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) diff --git a/programs/robocopy/tests/Makefile.in b/programs/robocopy/tests/Makefile.in new file mode 100644 index 00000000000..d86e70f4c43 --- /dev/null +++ b/programs/robocopy/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = robocopy.exe + +C_SRCS = \ + robocopy.c diff --git a/programs/robocopy/tests/robocopy.c b/programs/robocopy/tests/robocopy.c new file mode 100644 index 00000000000..48075709cf5 --- /dev/null +++ b/programs/robocopy/tests/robocopy.c @@ -0,0 +1,342 @@ +/* + * Copyright 2021 Florian Eder + * + * 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 WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <wchar.h> +#include <wine/test.h> + +WCHAR temp_path[MAX_PATH]; + +static BOOL run_cmd(const WCHAR *cmd, DWORD *exit_code) +{ + STARTUPINFOW startup_info; + PROCESS_INFORMATION process_info; + WCHAR cmd_copy[256]; + + memset(&startup_info, 0, sizeof(STARTUPINFOW)); + startup_info.dwFlags = STARTF_USESTDHANDLES; + startup_info.hStdInput = INVALID_HANDLE_VALUE; + startup_info.hStdOutput = INVALID_HANDLE_VALUE; + startup_info.hStdError = INVALID_HANDLE_VALUE; + + swprintf(cmd_copy, ARRAY_SIZE(cmd_copy), L"%s", cmd); + + if (!CreateProcessW(NULL, cmd_copy, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info)) + return FALSE; + + if (WaitForSingleObject(process_info.hProcess, 30000) == WAIT_TIMEOUT) + return FALSE; + + GetExitCodeProcess(process_info.hProcess, exit_code); + + CloseHandle(process_info.hThread); + CloseHandle(process_info.hProcess); + + return TRUE; +} + +static void create_test_file(const WCHAR *relative_path, size_t size) +{ + HANDLE handle; + WCHAR path[MAX_PATH]; + swprintf(path, ARRAY_SIZE(path), L"%s%s", temp_path, relative_path); + handle = CreateFileW(path, FILE_GENERIC_WRITE | FILE_GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, 0, NULL); + ok(handle != INVALID_HANDLE_VALUE, "creation of %s failed (0x%08x)\n", debugstr_w(path), GetLastError()); + if (size != 0) + { + BYTE *data; + DWORD bytes_written; + data = calloc(size, sizeof(BYTE)); + ok(WriteFile(handle, data, size, &bytes_written, NULL), "writing to %s failed (%d)\n", debugstr_w(path), GetLastError()); + } + CloseHandle(handle); +} + +static void create_test_folder(const WCHAR *relative_path) +{ + WCHAR path[MAX_PATH]; + swprintf(path, ARRAY_SIZE(path), L"%s%s", temp_path, relative_path); + + CreateDirectoryW(path, NULL); +} + +static void create_test_source_folder(void) +{ + create_test_folder(L"source"); + create_test_folder(L"source\\folderA"); + create_test_folder(L"source\\folderB"); + create_test_folder(L"source\\folderC"); + create_test_folder(L"source\\folderA\\folderD"); + create_test_folder(L"source\\folderA\\folderE"); + create_test_file(L"source\\fileA.a", 4000); + create_test_file(L"source\\fileB.b", 8000); + create_test_file(L"source\\folderA\\fileC.c", 60); + create_test_file(L"source\\folderA\\fileD.d", 80); + create_test_file(L"source\\folderA\\folderD\\fileE.e", 10000); + create_test_file(L"source\\folderB\\fileF.f", 10000); + create_test_file(L"source\\folderB\\fileG.g", 200); +} + +static void check_file(const WCHAR *relative_path, BOOL should_exist) +{ + ok (DeleteFileW(relative_path) == should_exist, "file %s expected exist to be %d, but is %d\n", debugstr_w(relative_path), should_exist, !should_exist); + if (!should_exist) + ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_PATH_NOT_FOUND, + "file %s DeleteFileW returned error %d, should not exist\n", + debugstr_w(relative_path), + GetLastError()); +} + +static void check_folder(const WCHAR *relative_path, BOOL should_exist) +{ + ok (RemoveDirectoryW(relative_path) == should_exist, "folder %s expected exist to be %d, but is %d\n", debugstr_w(relative_path), should_exist, !should_exist); + if (!should_exist) + ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_PATH_NOT_FOUND, + "folder %s RemoveDirectoryW returned error %d, should not exist\n", + debugstr_w(relative_path), + GetLastError()); +} + +static void check_source_folder_unchanged(void) +{ + check_file(L"source\\fileA.a", TRUE); + check_file(L"source\\fileB.b", TRUE); + check_file(L"source\\folderA\\fileC.c", TRUE); + check_file(L"source\\folderA\\fileD.d", TRUE); + check_file(L"source\\folderA\\folderD\\fileE.e", TRUE); + check_file(L"source\\folderB\\fileF.f", TRUE); + check_file(L"source\\folderB\\fileG.g", TRUE); + check_folder(L"source\\folderA\\folderD", TRUE); + check_folder(L"source\\folderA\\folderE", TRUE); + check_folder(L"source\\folderA", TRUE); + check_folder(L"source\\folderB", TRUE); + check_folder(L"source\\folderC", TRUE); + check_folder(L"source", TRUE); +} + +static void check_basic_copy_1_test(void) +{ + check_source_folder_unchanged(); + todo_wine check_file(L"destination\\fileA.a", TRUE); + todo_wine check_file(L"destination\\fileB.b", TRUE); + check_file(L"destination\\folderA\\fileC.c", FALSE); + check_file(L"destination\\folderA\\fileD.d", FALSE); + check_file(L"destination\\folderA\\folderD\\fileE.e", FALSE); + check_file(L"destination\\folderB\\fileF.f", FALSE); + check_file(L"destination\\folderB\\fileG.g", FALSE); + check_folder(L"destination\\folderA\\folderD", FALSE); + check_folder(L"destination\\folderA\\folderE", FALSE); + check_folder(L"destination\\folderA", FALSE); + check_folder(L"destination\\folderB", FALSE); + check_folder(L"destination\\folderC", FALSE); + todo_wine check_folder(L"destination", TRUE); +} + +static void check_basic_copy_2_test(void) +{ + check_source_folder_unchanged(); + check_file(L"destination\\fileA.a", TRUE); + todo_wine check_file(L"destination\\fileB.b", TRUE); + check_file(L"destination\\folderA\\fileC.c", FALSE); + check_file(L"destination\\folderA\\fileD.d", FALSE); + check_file(L"destination\\folderA\\folderD\\fileE.e", FALSE); + check_file(L"destination\\folderB\\fileF.f", FALSE); + check_file(L"destination\\folderB\\fileG.g", FALSE); + check_folder(L"destination\\folderA\\folderD", FALSE); + check_folder(L"destination\\folderA\\folderE", FALSE); + check_folder(L"destination\\folderA", FALSE); + check_folder(L"destination\\folderB", FALSE); + check_folder(L"destination\\folderC", FALSE); + check_folder(L"destination", TRUE); +} + +static void check_no_copy_test(void) +{ + check_source_folder_unchanged(); + check_file(L"destination\\fileA.a", FALSE); + check_file(L"destination\\fileB.b", FALSE); + check_file(L"destination\\folderA\\fileC.c", FALSE); + check_file(L"destination\\folderA\\fileD.d", FALSE); + check_file(L"destination\\folderA\\folderD\\fileE.e", FALSE); + check_file(L"destination\\folderB\\fileF.f", FALSE); + check_file(L"destination\\folderB\\fileG.g", FALSE); + check_folder(L"destination\\folderA\\folderD", FALSE); + check_folder(L"destination\\folderA\\folderE", FALSE); + check_folder(L"destination\\folderA", FALSE); + check_folder(L"destination\\folderB", FALSE); + check_folder(L"destination\\folderC", FALSE); + check_folder(L"destination", FALSE); +} + +static void check_wildcard_1_test(void) +{ + check_source_folder_unchanged(); + todo_wine check_file(L"destination\\fileA.a", TRUE); + check_file(L"destination\\fileB.b", FALSE); + check_file(L"destination\\folderA\\fileC.c", FALSE); + check_file(L"destination\\folderA\\fileD.d", FALSE); + check_file(L"destination\\folderA\\folderD\\fileE.e", FALSE); + check_file(L"destination\\folderB\\fileF.f", FALSE); + check_file(L"destination\\folderB\\fileG.g", FALSE); + check_folder(L"destination\\folderA\\folderD", FALSE); + check_folder(L"destination\\folderA\\folderE", FALSE); + check_folder(L"destination\\folderA", FALSE); + check_folder(L"destination\\folderB", FALSE); + check_folder(L"destination\\folderC", FALSE); + todo_wine check_folder(L"destination", TRUE); +} + +START_TEST(robocopy) +{ + DWORD exit_code; + WCHAR temp_cmd[512]; + int i; + static const WCHAR *invalid_syntax_tests[] = + { + L"robocopy", + L"robocopy invalid_folder", + L"robocopy -flag invalid_folder", + L"robocopy invalid_folder destination", + L"robocopy -?", + L"robocopy invalid_folder -?", + L"robocopy invalid_folder /?", + }; + static const WCHAR *basic_copy_tests[] = + { + L"robocopy source destination /r:1 /w:0", + L"robocopy ./source destination /r:1 /w:0", + L"robocopy source ./destination /r:1 /w:0", + L"robocopy ./source ./destination /r:1 /w:0", + L"robocopy source third_folder/../destination /r:1 /w:0", + L"robocopy ./source third_folder/../destination /r:1 /w:0", + L"robocopy ./third_folder/../source third_folder/../destination /r:1 /w:0", + L"robocopy ./third_folder/../source ./destination /r:1 /w:0", + L"robocopy source destination *le?.? /r:1 /w:0", + L"robocopy source destination file?.? /r:1 /w:0", + L"robocopy source destination ?ile?.* /r:1 /w:0", + L"robocopy source destination f??e* /r:1 /w:0", + L"robocopy source destination file* /r:1 /w:0", + }; + static const WCHAR *absolute_copy_tests[] = + { + L"robocopy %s\\source %s\\destination /r:1 /w:0", + L"robocopy %s\\source destination /r:1 /w:0", + L"robocopy source %s\\destination /r:1 /w:0", + L"robocopy %s\\third_folder\\..\\source %s\\third_folder\\..\\destination /r:1 /w:0", + }; + static const WCHAR *parser_tests[] = + { + L"robocopy source /r:1 destination /r:1 /w:0", + L"robocopy /r:1 source destination /r:1 /w:0", + L"robocopy /r:1 /r:1 source destination /r:1 /w:0", + L"robocopy /r:1 source /r:1 destination /r:1 /w:0", + }; + + /* robocopy is only available from Vista onwards, abort test if not available */ + if (!run_cmd(L"robocopy", &exit_code)) return; + + ok(GetTempPathW(ARRAY_SIZE(temp_path), temp_path) != 0, "couldn't get temp folder path\n"); + wcscat(temp_path, L"robocopy_test\\"); + ok(CreateDirectoryW(temp_path, NULL), "couldn't create temp test folder %s, error %d\n", debugstr_w(temp_path), GetLastError()); + ok(SetCurrentDirectoryW(temp_path), "couldn't set CWD to temp folder %s\n", debugstr_w(temp_path)); + + for (i = 0; i < ARRAY_SIZE(invalid_syntax_tests); i++) + { + run_cmd(invalid_syntax_tests[i], &exit_code); + ok(exit_code == 16, "unexpected exit code %d from command %s\n", exit_code, debugstr_w(invalid_syntax_tests[i])); + } + + for (i = 0; i < ARRAY_SIZE(basic_copy_tests); i++) + { + winetest_push_context("basic copy test %d", i + 1); + create_test_source_folder(); + run_cmd(basic_copy_tests[i], &exit_code); + todo_wine ok(exit_code == 1, "unexpected exit code %d from command %s\n", exit_code, debugstr_w(basic_copy_tests[i])); + check_basic_copy_1_test(); + winetest_pop_context(); + } + + winetest_push_context("basic copy test %d", ARRAY_SIZE(basic_copy_tests) + 1); + create_test_source_folder(); + create_test_folder(L"destination"); + create_test_file(L"destination\\fileA.a", 9000); + run_cmd(L"robocopy ./source source/../destination /r:1 /w:0", &exit_code); + todo_wine ok(exit_code == 1, "unexpected exit code %d\n", exit_code); + check_basic_copy_2_test(); + winetest_pop_context(); + + for (i = 0; i < ARRAY_SIZE(absolute_copy_tests); i++) + { + winetest_push_context("absolute copy test %d", i + 1); + create_test_source_folder(); + swprintf(temp_cmd, ARRAY_SIZE(temp_cmd), absolute_copy_tests[i], temp_path, temp_path); + run_cmd(temp_cmd, &exit_code); + todo_wine ok(exit_code == 1, "unexpected exit code %d from command %s\n", exit_code, debugstr_w(absolute_copy_tests[i])); + check_basic_copy_1_test(); + winetest_pop_context(); + } + + for (i = 0; i < ARRAY_SIZE(parser_tests); i++) + { + winetest_push_context("parser test %d", i + 1); + create_test_source_folder(); + run_cmd(parser_tests[i], &exit_code); + todo_wine ok(exit_code == 1, "unexpected exit code %d from command %s\n", exit_code, debugstr_w(parser_tests[i])); + check_basic_copy_1_test(); + winetest_pop_context(); + } + + winetest_push_context("invalid copy test 1"); + create_test_source_folder(); + run_cmd(L"robocopy source source /r:1 /w:0", &exit_code); + todo_wine ok(exit_code == 0, "unexpected exit code %d\n", exit_code); + check_no_copy_test(); + winetest_pop_context(); + + winetest_push_context("invalid copy test 2"); + create_test_source_folder(); + run_cmd(L"robocopy invalid_folder destination /r:1 /w:0", &exit_code); + ok(exit_code == 16, "unexpected exit code %d\n", exit_code); + check_no_copy_test(); + winetest_pop_context(); + + winetest_push_context("wildcard test 1"); + create_test_source_folder(); + run_cmd(L"robocopy source destination *A.? /r:1 /w:0", &exit_code); + todo_wine ok(exit_code == 1, "unexpected exit code %d\n", exit_code); + check_wildcard_1_test(); + winetest_pop_context(); + + winetest_push_context("wildcard test 2"); + create_test_source_folder(); + run_cmd(L"robocopy sour?e destination /r:1 /w:0", &exit_code); + ok(exit_code == 16, "unexpected exit code %d\n", exit_code); + check_no_copy_test(); + winetest_pop_context(); + + winetest_push_context("wildcard test 3"); + create_test_source_folder(); + run_cmd(L"robocopy s* destination /r:1 /w:0", &exit_code); + ok(exit_code == 16, "unexpected exit code %d\n", exit_code); + check_no_copy_test(); + winetest_pop_context(); + + SetCurrentDirectoryW(L".."); + ok(RemoveDirectoryW(temp_path), "could not remove temp path %s, error %d\n", debugstr_w(temp_path), GetLastError()); +} -- 2.32.0

2 4

[PATCH 1/7] winegstreamer: Set rcSource and rcTarget for WMF video formats.
by Zebediah Figura 02 Nov '21

02 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/quartz_parser.c | 29 +++++++++++++++++------------ dlls/winegstreamer/wm_reader.c | 4 ++-- dlls/wmvcore/tests/wmvcore.c | 4 ++-- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 109ce6ab28f..f11543d7fb2 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -101,7 +101,7 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format); +bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm); bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format); BOOL init_gstreamer(void) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 4e7e22a64ea..77a186bbb26 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -275,7 +275,7 @@ static unsigned int get_image_size(const struct wg_format *format) return 0; } -static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format *format) +static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm) { static const struct { @@ -322,6 +322,11 @@ static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format * memset(video_format, 0, sizeof(*video_format)); + if (wm) + { + SetRect(&video_format->rcSource, 0, 0, format->u.video.width, format->u.video.height); + video_format->rcTarget = video_format->rcSource; + } if ((frame_time = MulDiv(10000000, format->u.video.fps_d, format->u.video.fps_n)) != -1) video_format->AvgTimePerFrame = frame_time; video_format->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -343,7 +348,7 @@ static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format * return true; } -bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format) +bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm) { memset(mt, 0, sizeof(*mt)); @@ -356,7 +361,7 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format) return amt_from_wg_format_audio(mt, format); case WG_MAJOR_TYPE_VIDEO: - return amt_from_wg_format_video(mt, format); + return amt_from_wg_format_video(mt, format, wm); } assert(0); @@ -1076,7 +1081,7 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, memset(mt, 0, sizeof(AM_MEDIA_TYPE)); - if (amt_from_wg_format(mt, &format)) + if (amt_from_wg_format(mt, &format, false)) { if (!index--) return S_OK; @@ -1086,14 +1091,14 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, if (format.major_type == WG_MAJOR_TYPE_VIDEO && index < ARRAY_SIZE(video_formats)) { format.u.video.format = video_formats[index]; - if (!amt_from_wg_format(mt, &format)) + if (!amt_from_wg_format(mt, &format, false)) return E_OUTOFMEMORY; return S_OK; } else if (format.major_type == WG_MAJOR_TYPE_AUDIO && !index) { format.u.audio.format = WG_AUDIO_FORMAT_S16LE; - if (!amt_from_wg_format(mt, &format)) + if (!amt_from_wg_format(mt, &format, false)) return E_OUTOFMEMORY; return S_OK; } @@ -1613,7 +1618,7 @@ static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const HRESULT hr; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(&pad_mt, &format)) + if (!amt_from_wg_format(&pad_mt, &format, false)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1628,7 +1633,7 @@ static HRESULT wave_parser_source_get_media_type(struct parser_source *pin, if (index > 0) return VFW_S_NO_MORE_ITEMS; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(mt, &format)) + if (!amt_from_wg_format(mt, &format, false)) return E_OUTOFMEMORY; return S_OK; } @@ -1699,7 +1704,7 @@ static HRESULT avi_splitter_source_query_accept(struct parser_source *pin, const HRESULT hr; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(&pad_mt, &format)) + if (!amt_from_wg_format(&pad_mt, &format, false)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1714,7 +1719,7 @@ static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin, if (index > 0) return VFW_S_NO_MORE_ITEMS; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(mt, &format)) + if (!amt_from_wg_format(mt, &format, false)) return E_OUTOFMEMORY; return S_OK; } @@ -1783,7 +1788,7 @@ static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, cons HRESULT hr; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(&pad_mt, &format)) + if (!amt_from_wg_format(&pad_mt, &format, false)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1798,7 +1803,7 @@ static HRESULT mpeg_splitter_source_get_media_type(struct parser_source *pin, if (index > 0) return VFW_S_NO_MORE_ITEMS; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(mt, &format)) + if (!amt_from_wg_format(mt, &format, false)) return E_OUTOFMEMORY; return S_OK; } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 82f74318062..1d46db3fb0d 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -157,7 +157,7 @@ static IWMOutputMediaProps *output_props_create(const struct wg_format *format) object->IWMOutputMediaProps_iface.lpVtbl = &output_props_vtbl; object->refcount = 1; - if (!amt_from_wg_format(&object->mt, format)) + if (!amt_from_wg_format(&object->mt, format, true)) { free(object); return NULL; @@ -338,7 +338,7 @@ static HRESULT WINAPI stream_config_GetStreamType(IWMStreamConfig *iface, GUID * EnterCriticalSection(&reader->cs); - if (!amt_from_wg_format(&mt, &config->stream->format)) + if (!amt_from_wg_format(&mt, &config->stream->format, true)) { LeaveCriticalSection(&reader->cs); return E_OUTOFMEMORY; diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 6e196234208..469666161a4 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -629,8 +629,8 @@ static void check_video_type(const WM_MEDIA_TYPE *mt) todo_wine ok(!mt->bTemporalCompression, "Got temporal compression %d.\n", mt->bTemporalCompression); ok(!mt->pUnk, "Got pUnk %p.\n", mt->pUnk); - todo_wine ok(EqualRect(&video_info->rcSource, &rect), "Got source rect %s.\n", wine_dbgstr_rect(&rect)); - todo_wine ok(EqualRect(&video_info->rcTarget, &rect), "Got target rect %s.\n", wine_dbgstr_rect(&rect)); + ok(EqualRect(&video_info->rcSource, &rect), "Got source rect %s.\n", wine_dbgstr_rect(&rect)); + ok(EqualRect(&video_info->rcTarget, &rect), "Got target rect %s.\n", wine_dbgstr_rect(&rect)); ok(!video_info->dwBitRate, "Got bit rate %u.\n", video_info->dwBitRate); ok(!video_info->dwBitErrorRate, "Got bit error rate %u.\n", video_info->dwBitErrorRate); ok(video_info->bmiHeader.biSize == sizeof(video_info->bmiHeader), -- 2.33.0

1 6

[PATCH 1/2] user32/tests: Add ALT+letter hotkey tests.
by Ziqing Hui 02 Nov '21

02 Nov '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/user32/tests/msg.c | 81 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4b2495f4197..73737eab98b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17359,6 +17359,29 @@ static const struct message WmHotkeyNew[] = { { WM_KEYUP, sent, 0, 0x80000001 }, /* lparam not checked so the sequence isn't a todo */ { 0 } }; +static const struct message WmHotkeyPressALT[] = { + { WM_SYSKEYDOWN, kbd_hook|wparam|lparam, VK_LMENU, LLKHF_INJECTED|LLKHF_ALTDOWN }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0x20000001 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, VK_MENU, 0x20000001 }, + { 0 } +}; +static const struct message WmHotkeyPressWithALT[] = { + { WM_SYSKEYDOWN, kbd_hook, 0, LLKHF_INJECTED|LLKHF_ALTDOWN }, /* lparam not checked */ + { WM_HOTKEY, sent|wparam, 6 }, + { 0 } +}; +static const struct message WmHotkeyReleaseWithALT[] = { + { WM_SYSKEYUP, kbd_hook|lparam, 0, LLKHF_INJECTED|LLKHF_UP|LLKHF_ALTDOWN }, + { HCBT_KEYSKIPPED, hook|lparam|optional, 0, 0xa0000001 }, + { WM_SYSKEYUP, sent|lparam, 0, 0xa0000001 }, + { 0 } +}; +static const struct message WmHotkeyReleaseALT[] = { + { WM_KEYUP, kbd_hook|wparam|lparam, VK_LMENU, LLKHF_INJECTED|LLKHF_UP }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_MENU, 0xc0000001 }, + { 0 } +}; static int hotkey_letter; @@ -17378,9 +17401,12 @@ static LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam msg.descr = "KeyboardHookProc"; add_message(&msg); - if (wParam == WM_KEYUP || wParam == WM_KEYDOWN) + if (wParam == WM_KEYUP || wParam == WM_KEYDOWN || + wParam == WM_SYSKEYUP || wParam == WM_SYSKEYDOWN) { - ok(kdbhookstruct->vkCode == VK_LWIN || kdbhookstruct->vkCode == hotkey_letter, + ok(kdbhookstruct->vkCode == VK_LWIN || + kdbhookstruct->vkCode == VK_LMENU || + kdbhookstruct->vkCode == hotkey_letter, "unexpected keycode %x\n", kdbhookstruct->vkCode); } } @@ -17635,6 +17661,56 @@ static void test_hotkey(void) } ok_sequence(WmHotkeyReleaseLWIN, "thread hotkey release LWIN", FALSE); + /* Search for an ALT + letter combination that hasn't been registered */ + for (hotkey_letter = 0x41; hotkey_letter <= 0x51; hotkey_letter ++) + { + SetLastError(0xdeadbeef); + ret = RegisterHotKey(test_window, 6, MOD_ALT, hotkey_letter); + + if (ret == TRUE) + { + break; + } + else + { + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); + } + } + + if (hotkey_letter == 0x52) + { + ok(0, "Couldn't find any free ALT + letter combination\n"); + goto end; + } + + keybd_event(VK_LMENU, 0, 0, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + ok_sequence(WmHotkeyPressALT, "window hotkey press ALT", TRUE); + + keybd_event(hotkey_letter, 0, 0, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_HOTKEY) + { + ok(msg.hwnd == test_window, "unexpected hwnd %p\n", msg.hwnd); + ok(msg.lParam == MAKELPARAM(MOD_ALT, hotkey_letter), "unexpected WM_HOTKEY lparam %lx\n", msg.lParam); + } + DispatchMessageA(&msg); + } + ok_sequence(WmHotkeyPressWithALT, "window hotkey press with ALT", TRUE); + + keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + ok_sequence(WmHotkeyReleaseWithALT, "window hotkey release with ALT", TRUE); + + keybd_event(VK_LMENU, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + ok_sequence(WmHotkeyReleaseALT, "window hotkey release ALT", FALSE); + /* Unregister thread hotkey */ ret = UnregisterHotKey(NULL, 5); ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); @@ -17645,6 +17721,7 @@ static void test_hotkey(void) end: UnregisterHotKey(NULL, 5); UnregisterHotKey(test_window, 5); + UnregisterHotKey(test_window, 6); DestroyWindow(test_window); flush_sequence(); } -- 2.25.1

2 2

[PATCH 6/6] msdasql: Trace unsupported rowset interfaces.
by Alistair Leslie-Hughes 02 Nov '21

02 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 15 +++++++++++++++ dlls/msdasql/tests/provider.c | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 5345701a35e..0298c7e7424 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -472,6 +472,21 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } + else if (IsEqualGUID(&IID_IRowsetChange, riid)) + { + TRACE("IID_IRowsetChange not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetUpdate, riid)) + { + TRACE("IID_IRowsetUpdate not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetLocate, riid)) + { + TRACE("IID_IRowsetLocate not supported\n"); + return E_NOINTERFACE; + } if(*ppv) { diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index f10156aacfa..8b076ed4479 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -228,6 +228,7 @@ static void test_rowset_interfaces(IRowset *rowset) IColumnsInfo *col_info; IColumnsRowset *col_rs; IAccessor *accessor; + IUnknown *unk; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); @@ -245,6 +246,15 @@ static void test_rowset_interfaces(IRowset *rowset) hr = IRowset_QueryInterface(rowset, &IID_IColumnsRowset, (void**)&col_rs); ok(hr == S_OK, "got 0x%08x\n", hr); IColumnsRowset_Release(col_rs); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetChange, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetUpdate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetLocate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); } static void test_command_rowset(IUnknown *cmd) -- 2.33.0

1 0

[PATCH 5/6] msdasql: Add IColumnsRowset support to rowset
by Alistair Leslie-Hughes 02 Nov '21

02 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 55 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 60 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index f1e4eecb1ac..5345701a35e 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -415,6 +415,7 @@ struct msdasql_rowset IRowsetInfo IRowsetInfo_iface; IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; + IColumnsRowset IColumnsRowset_iface; LONG refs; }; @@ -438,6 +439,11 @@ static inline struct msdasql_rowset *impl_from_IAccessor ( IAccessor *iface ) return CONTAINING_RECORD( iface, struct msdasql_rowset, IAccessor_iface ); } +static inline struct msdasql_rowset *impl_from_IColumnsRowset ( IColumnsRowset *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsRowset_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -462,6 +468,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IAccessor_iface; } + else if(IsEqualGUID(&IID_IColumnsRowset, riid)) + { + *ppv = &rowset->IColumnsRowset_iface; + } if(*ppv) { @@ -700,6 +710,50 @@ struct IAccessorVtbl accessor_vtbl = rowset_accessor_ReleaseAccessor }; +static HRESULT WINAPI column_rs_QueryInterface(IColumnsRowset *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI column_rs_AddRef(IColumnsRowset *iface) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI column_rs_Release(IColumnsRowset *iface) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI column_rs_GetAvailableColumns(IColumnsRowset *iface, DBORDINAL *count, DBID **columns) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + FIXME("%p, %p, %p\n", rowset, count, columns); + return E_NOTIMPL; +} + +static HRESULT WINAPI column_rs_GetColumnsRowset(IColumnsRowset *iface, IUnknown *outer, DBORDINAL count, + const DBID columns[], REFIID riid, ULONG property_cnt, DBPROPSET property_sets[], IUnknown **unk_rs) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + FIXME("(%p)->(%p %ld %p %s %u, %p %p): stub\n", rowset, outer, count, columns, debugstr_guid(riid), + property_cnt, property_sets, unk_rs); + return E_NOTIMPL; +} + +struct IColumnsRowsetVtbl columnrs_rs_vtbl = +{ + column_rs_QueryInterface, + column_rs_AddRef, + column_rs_Release, + column_rs_GetAvailableColumns, + column_rs_GetColumnsRowset +}; + + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -717,6 +771,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; + msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 8acac93ddd8..f10156aacfa 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -226,6 +226,7 @@ static void test_rowset_interfaces(IRowset *rowset) { IRowsetInfo *info; IColumnsInfo *col_info; + IColumnsRowset *col_rs; IAccessor *accessor; HRESULT hr; @@ -240,6 +241,10 @@ static void test_rowset_interfaces(IRowset *rowset) hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void**)&accessor); ok(hr == S_OK, "got 0x%08x\n", hr); IAccessor_Release(accessor); + + hr = IRowset_QueryInterface(rowset, &IID_IColumnsRowset, (void**)&col_rs); + ok(hr == S_OK, "got 0x%08x\n", hr); + IColumnsRowset_Release(col_rs); } static void test_command_rowset(IUnknown *cmd) -- 2.33.0

1 0

[PATCH 4/6] msdasql: Add IAccessor to rowset
by Alistair Leslie-Hughes 02 Nov '21

02 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 71 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 +++ 2 files changed, 76 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 898cf6fa864..f1e4eecb1ac 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -414,6 +414,7 @@ struct msdasql_rowset IRowset IRowset_iface; IRowsetInfo IRowsetInfo_iface; IColumnsInfo IColumnsInfo_iface; + IAccessor IAccessor_iface; LONG refs; }; @@ -432,6 +433,11 @@ static inline struct msdasql_rowset *rowset_impl_from_IColumnsInfo( IColumnsInfo return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsInfo_iface ); } +static inline struct msdasql_rowset *impl_from_IAccessor ( IAccessor *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IAccessor_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -452,6 +458,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsInfo_iface; } + else if(IsEqualGUID(&IID_IAccessor, riid)) + { + *ppv = &rowset->IAccessor_iface; + } if(*ppv) { @@ -630,6 +640,66 @@ static struct IColumnsInfoVtbl rowset_columninfo_vtbll = rowset_colsinfo_MapColumnIDs }; +static HRESULT WINAPI rowset_accessor_QueryInterface(IAccessor *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI rowset_accessor_AddRef(IAccessor *iface) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_accessor_Release(IAccessor *iface) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_accessor_AddRefAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p, %lu, %p\n", rowset, accessor, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_accessor_CreateAccessor(IAccessor *iface, DBACCESSORFLAGS flags, + DBCOUNTITEM count, const DBBINDING bindings[], DBLENGTH row_size, HACCESSOR *accessor, + DBBINDSTATUS status[]) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p 0x%08x, %lu, %p, %lu, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_accessor_GetBindings(IAccessor *iface, HACCESSOR accessor, + DBACCESSORFLAGS *flags, DBCOUNTITEM *count, DBBINDING **bindings) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p %lu, %p, %p, %p\n", rowset, accessor, flags, count, bindings); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_accessor_ReleaseAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p, %lu, %p\n", rowset, accessor, count); + return E_NOTIMPL; +} + +struct IAccessorVtbl accessor_vtbl = +{ + rowset_accessor_QueryInterface, + rowset_accessor_AddRef, + rowset_accessor_Release, + rowset_accessor_AddRefAccessor, + rowset_accessor_CreateAccessor, + rowset_accessor_GetBindings, + rowset_accessor_ReleaseAccessor +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -646,6 +716,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; + msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 708d6d22ed3..8acac93ddd8 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -226,6 +226,7 @@ static void test_rowset_interfaces(IRowset *rowset) { IRowsetInfo *info; IColumnsInfo *col_info; + IAccessor *accessor; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); @@ -235,6 +236,10 @@ static void test_rowset_interfaces(IRowset *rowset) hr = IRowset_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&col_info); ok(hr == S_OK, "got 0x%08x\n", hr); IColumnsInfo_Release(col_info); + + hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void**)&accessor); + ok(hr == S_OK, "got 0x%08x\n", hr); + IAccessor_Release(accessor); } static void test_command_rowset(IUnknown *cmd) -- 2.33.0

1 0

[PATCH 3/6] msdasql: Support IColumnsInfo in Rowset
by Alistair Leslie-Hughes 02 Nov '21

02 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 56 ++++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 85b11670687..898cf6fa864 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -413,6 +413,7 @@ struct msdasql_rowset { IRowset IRowset_iface; IRowsetInfo IRowsetInfo_iface; + IColumnsInfo IColumnsInfo_iface; LONG refs; }; @@ -426,6 +427,11 @@ static inline struct msdasql_rowset *impl_from_IRowsetInfo( IRowsetInfo *iface ) return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowsetInfo_iface ); } +static inline struct msdasql_rowset *rowset_impl_from_IColumnsInfo( IColumnsInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsInfo_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -442,6 +448,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IRowsetInfo_iface; } + else if (IsEqualGUID(&IID_IColumnsInfo, riid)) + { + *ppv = &rowset->IColumnsInfo_iface; + } if(*ppv) { @@ -547,7 +557,7 @@ static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets) { struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); - FIXME("%p, %ld, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); + FIXME("%p, %d, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); return E_NOTIMPL; } @@ -577,6 +587,49 @@ struct IRowsetInfoVtbl rowset_info_vtbl = rowset_info_GetSpecification }; +static HRESULT WINAPI rowset_colsinfo_QueryInterface(IColumnsInfo *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI rowset_colsinfo_AddRef(IColumnsInfo *iface) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_colsinfo_Release(IColumnsInfo *iface) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDINAL *columns, + DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + FIXME("%p, %p, %p, %p\n", rowset, columns, colinfo, stringsbuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_colsinfo_MapColumnIDs(IColumnsInfo *iface, DBORDINAL column_ids, + const DBID *dbids, DBORDINAL *columns) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + FIXME("%p, %lu, %p, %p\n", rowset, column_ids, dbids, columns); + return E_NOTIMPL; +} + +static struct IColumnsInfoVtbl rowset_columninfo_vtbll = +{ + rowset_colsinfo_QueryInterface, + rowset_colsinfo_AddRef, + rowset_colsinfo_Release, + rowset_colsinfo_GetColumnInfo, + rowset_colsinfo_MapColumnIDs +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -592,6 +645,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; + msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 604815b1ee5..708d6d22ed3 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -225,11 +225,16 @@ static void test_command_dbsession(IUnknown *cmd, IUnknown *session) static void test_rowset_interfaces(IRowset *rowset) { IRowsetInfo *info; + IColumnsInfo *col_info; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); ok(hr == S_OK, "got 0x%08x\n", hr); IRowsetInfo_Release(info); + + hr = IRowset_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&col_info); + ok(hr == S_OK, "got 0x%08x\n", hr); + IColumnsInfo_Release(col_info); } static void test_command_rowset(IUnknown *cmd) -- 2.33.0

1 0

[PATCH 2/6] msdasql: Support IRowsetInfo in IRowset interface
by Alistair Leslie-Hughes 02 Nov '21

02 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 63 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 12 +++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 6a1e6bb8e0d..85b11670687 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -412,6 +412,7 @@ static HRESULT WINAPI command_Cancel(ICommandText *iface) struct msdasql_rowset { IRowset IRowset_iface; + IRowsetInfo IRowsetInfo_iface; LONG refs; }; @@ -420,6 +421,11 @@ static inline struct msdasql_rowset *impl_from_IRowset( IRowset *iface ) return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowset_iface ); } +static inline struct msdasql_rowset *impl_from_IRowsetInfo( IRowsetInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowsetInfo_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -432,6 +438,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IRowset_iface; } + else if (IsEqualGUID(&IID_IRowsetInfo, riid)) + { + *ppv = &rowset->IRowsetInfo_iface; + } if(*ppv) { @@ -515,6 +525,58 @@ static const struct IRowsetVtbl msdasql_rowset_vtbl = msdasql_rowset_RestartPosition }; +static HRESULT WINAPI rowset_info_QueryInterface(IRowsetInfo *iface, REFIID riid, void **ppv) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, ppv); +} + +static ULONG WINAPI rowset_info_AddRef(IRowsetInfo *iface) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_info_Release(IRowsetInfo *iface) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + FIXME("%p, %ld, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_info_GetReferencedRowset(IRowsetInfo *iface, DBORDINAL ordinal, + REFIID riid, IUnknown **unk) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + FIXME("%p, %ld, %s, %p\n", rowset, ordinal, debugstr_guid(riid), unk); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_info_GetSpecification(IRowsetInfo *iface, REFIID riid, + IUnknown **specification) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + FIXME("%p, %s, %p\n", rowset, debugstr_guid(riid), specification); + return E_NOTIMPL; +} + +struct IRowsetInfoVtbl rowset_info_vtbl = +{ + rowset_info_QueryInterface, + rowset_info_AddRef, + rowset_info_Release, + rowset_info_GetProperties, + rowset_info_GetReferencedRowset, + rowset_info_GetSpecification +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -529,6 +591,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI return E_OUTOFMEMORY; msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; + msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 8b8d8e4b494..604815b1ee5 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -222,6 +222,16 @@ static void test_command_dbsession(IUnknown *cmd, IUnknown *session) ICommandText_Release(comand_text); } +static void test_rowset_interfaces(IRowset *rowset) +{ + IRowsetInfo *info; + HRESULT hr; + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); + ok(hr == S_OK, "got 0x%08x\n", hr); + IRowsetInfo_Release(info); +} + static void test_command_rowset(IUnknown *cmd) { ICommandText *comand_text; @@ -258,6 +268,8 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr); + test_rowset_interfaces(rowset); + IRowset_Release(rowset); IUnknown_Release(unk); } -- 2.33.0

1 0

[PATCH 1/6] msdasql: Correct ICommandText Execute test
by Alistair Leslie-Hughes 02 Nov '21

02 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index df642a6a637..8b8d8e4b494 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -244,12 +244,16 @@ static void test_command_rowset(IUnknown *cmd) if (unk) IUnknown_Release(unk); - affected = 9999; hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK && unk) + + affected = 9999; + hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(unk != NULL, "Unexepcted value\n"); + if (hr == S_OK) { - ok(affected == 0, "wrong affected value\n"); + ok(affected == -1, "wrong affected value\n"); hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.33.0

1 0

[PATCH vkd3d 1/7] vkd3d-shader/hlsl: Use last_read for resource loads.
by Zebediah Figura 01 Nov '21

01 Nov '21

This fixes DCE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- I'm sure I had a reason for using a separate field here, but I can't remember it now, nor find any reason why it would matter. libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl_codegen.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 31b7ddbb6..93191e56b 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -240,7 +240,6 @@ struct hlsl_ir_var uint32_t is_output_semantic : 1; uint32_t is_uniform : 1; uint32_t is_param : 1; - uint32_t has_resource_access : 1; }; struct hlsl_ir_function diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index bf93a03df..b7b0cd1b8 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -591,6 +591,8 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) { + const unsigned int var_last_read = loop_last ? max(instr->index, loop_last) : instr->index; + switch (instr->type) { case HLSL_IR_STORE: @@ -628,7 +630,7 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs struct hlsl_ir_load *load = hlsl_ir_load(instr); var = load->src.var; - var->last_read = max(var->last_read, loop_last ? max(instr->index, loop_last) : instr->index); + var->last_read = max(var->last_read, var_last_read); if (load->src.offset.node) load->src.offset.node->last_read = instr->index; break; @@ -645,7 +647,8 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs { struct hlsl_ir_resource_load *load = hlsl_ir_resource_load(instr); - load->resource.var->has_resource_access = 1; + var = load->resource.var; + var->last_read = max(var->last_read, var_last_read); if (load->resource.offset.node) load->resource.offset.node->last_read = instr->index; load->coords.node->last_read = instr->index; @@ -676,10 +679,7 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl LIST_FOR_EACH_ENTRY(scope, &ctx->scopes, struct hlsl_scope, entry) { LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) - { var->first_write = var->last_read = 0; - var->has_resource_access = 0; - } } LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) @@ -1203,7 +1203,7 @@ static const struct hlsl_ir_var *get_reserved_texture(struct hlsl_ctx *ctx, uint LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) { - if (var->has_resource_access && var->reg_reservation.type == 't' && var->reg_reservation.index == index) + if (var->last_read && var->reg_reservation.type == 't' && var->reg_reservation.index == index) return var; } return NULL; @@ -1216,7 +1216,7 @@ static void allocate_textures(struct hlsl_ctx *ctx) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (!var->has_resource_access || var->data_type->type != HLSL_CLASS_OBJECT + if (!var->last_read || var->data_type->type != HLSL_CLASS_OBJECT || var->data_type->base_type != HLSL_TYPE_TEXTURE) continue; -- 2.33.0

6 27

Add xinputuap.dll
by Yusuf Khan 01 Nov '21

01 Nov '21

2 1

[PATCH 1/4] mfreadwrite/tests: Add some audio media type attributes tests.
by Rémi Bernon 01 Nov '21

01 Nov '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 222 ++++++++++++++++++++++++++ dlls/mfreadwrite/tests/resource.rc | 4 + dlls/mfreadwrite/tests/test-48000.wav | Bin 0 -> 2104 bytes 3 files changed, 226 insertions(+) create mode 100644 dlls/mfreadwrite/tests/test-48000.wav diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index e3ff7f6e7aa..8c2aab6714d 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1230,6 +1230,227 @@ done: DestroyWindow(window); } +struct audio_format +{ + GUID subtype; + UINT32 bits; + UINT32 rate; +}; + +static void test_audio_media_type(const char *resource_name, IMFMediaType *media_type, struct audio_format *expect) +{ + UINT32 uint32_value, buffer_value_size; + BYTE buffer_value[512]; + double double_value; + GUID guid_value; + HRESULT hr; + + memset(&guid_value, 0xcd, sizeof(guid_value)); + hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &guid_value); + ok(hr == S_OK, "missing MF_MT_MAJOR_TYPE, hr %#x\n", hr); + ok(IsEqualGUID(&guid_value, &MFMediaType_Audio), "got MF_MT_MAJOR_TYPE %s\n", debugstr_guid(&guid_value)); + + memset(&guid_value, 0xcd, sizeof(guid_value)); + hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid_value); + ok(hr == S_OK, "missing MF_MT_SUBTYPE, hr %#x\n", hr); + ok(IsEqualGUID(&guid_value, &expect->subtype), "got MF_MT_SUBTYPE %s\n", debugstr_guid(&guid_value)); + + uint32_value = 0xdeadbeef; + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &uint32_value); + ok(hr == S_OK, "missing MF_MT_ALL_SAMPLES_INDEPENDENT, hr %#x\n", hr); + ok(uint32_value == 1, "got MF_MT_ALL_SAMPLES_INDEPENDENT %u\n", uint32_value); + + hr = IMFMediaType_GetGUID(media_type, &MF_MT_AM_FORMAT_TYPE, &guid_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AM_FORMAT_TYPE, hr %#x\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_COMPRESSED, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_COMPRESSED, hr %#x\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_FIXED_SIZE_SAMPLES, hr %#x\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_SAMPLE_SIZE, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_SAMPLE_SIZE, hr %#x\n", hr); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, buffer_value, sizeof(buffer_value), &buffer_value_size); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_USER_DATA, hr %#x\n", hr); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_WRAPPED_TYPE, buffer_value, sizeof(buffer_value), &buffer_value_size); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_WRAPPED_TYPE, hr %#x\n", hr); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, hr %#x\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AAC_PAYLOAD_TYPE, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AAC_PAYLOAD_TYPE, hr %#x\n", hr); + + uint32_value = 0xdeadbeef; + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &uint32_value); + todo_wine + ok(hr == S_OK, "missing MF_MT_AUDIO_AVG_BYTES_PER_SECOND, hr %#x\n", hr); + todo_wine + ok(uint32_value == expect->rate * expect->bits / 8, "got MF_MT_AUDIO_AVG_BYTES_PER_SECOND %u\n", uint32_value); + + uint32_value = 0xdeadbeef; + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &uint32_value); + ok(hr == S_OK, "missing MF_MT_AUDIO_BITS_PER_SAMPLE, hr %#x\n", hr); + ok(uint32_value == expect->bits, "got MF_MT_AUDIO_BITS_PER_SAMPLE %u\n", uint32_value); + + uint32_value = 0xdeadbeef; + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &uint32_value); + todo_wine + ok(hr == S_OK, "missing MF_MT_AUDIO_BLOCK_ALIGNMENT, hr %#x\n", hr); + todo_wine + ok(uint32_value == expect->bits / 8, "got MF_MT_AUDIO_BLOCK_ALIGNMENT %u\n", uint32_value); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_CHANNEL_MASK, &uint32_value); + todo_wine + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AUDIO_CHANNEL_MASK, hr %#x\n", hr); + hr = IMFMediaType_GetDouble(media_type, &MF_MT_AUDIO_FLOAT_SAMPLES_PER_SECOND, &double_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AUDIO_FLOAT_SAMPLES_PER_SECOND, hr %#x\n", hr); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_AUDIO_FOLDDOWN_MATRIX, buffer_value, sizeof(buffer_value), &buffer_value_size); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AUDIO_FOLDDOWN_MATRIX, hr %#x\n", hr); + + uint32_value = 0xdeadbeef; + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_NUM_CHANNELS, &uint32_value); + ok(hr == S_OK, "missing MF_MT_AUDIO_NUM_CHANNELS, hr %#x\n", hr); + ok(uint32_value == 1, "got MF_MT_AUDIO_NUM_CHANNELS %u\n", uint32_value); + + uint32_value = 0xdeadbeef; + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, &uint32_value); + todo_wine + ok(hr == S_OK, "missing MF_MT_AUDIO_PREFER_WAVEFORMATEX, hr %#x\n", hr); + todo_wine + ok(uint32_value == 1, "got MF_MT_AUDIO_PREFER_WAVEFORMATEX %u\n", uint32_value); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_BLOCK, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AUDIO_SAMPLES_PER_BLOCK, hr %#x\n", hr); + + uint32_value = 0xdeadbeef; + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &uint32_value); + ok(hr == S_OK, "missing MF_MT_AUDIO_SAMPLES_PER_SECOND, hr %#x\n", hr); + ok(uint32_value == expect->rate, "got MF_MT_AUDIO_SAMPLES_PER_SECOND %u\n", uint32_value); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, hr %#x\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_WMADRC_AVGREF, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AUDIO_WMADRC_AVGREF, hr %#x\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_WMADRC_AVGTARGET, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AUDIO_WMADRC_AVGTARGET, hr %#x\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_WMADRC_PEAKREF, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AUDIO_WMADRC_PEAKREF, hr %#x\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_WMADRC_PEAKTARGET, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_AUDIO_WMADRC_PEAKTARGET, hr %#x\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ORIGINAL_WAVE_FORMAT_TAG, &uint32_value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got MF_MT_ORIGINAL_WAVE_FORMAT_TAG, hr %#x\n", hr); +} + +struct test_media_types_params +{ + const char *resource; + BOOL has_audio; + struct audio_format audio_format; +}; + +static void test_media_types(void) +{ + struct test_media_types_params tests[] = + { + {.resource = "test.wav", .has_audio = TRUE, .audio_format = + {.subtype = MFAudioFormat_PCM, .bits = 8, .rate = 44100} + }, + {.resource = "test-48000.wav", .has_audio = TRUE, .audio_format = + {.subtype = MFAudioFormat_PCM, .bits = 16, .rate = 48000} + }, + }; + + struct audio_format test_audio_formats[] = + { + {.subtype = MFAudioFormat_PCM, .bits = 8, .rate = 44100}, + {.subtype = MFAudioFormat_Float, .bits = 32, .rate = 44100}, + {.subtype = MFAudioFormat_PCM, .bits = 8, .rate = 48000}, + {.subtype = MFAudioFormat_Float, .bits = 32, .rate = 48000}, + }; + + int i, j, old_mute_threshold; + IMFMediaType *media_type; + IMFSourceReader *reader; + IMFByteStream *stream; + HRESULT hr; + + if (!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); + return; + } + + /* FIXME: remove this when enough todo_wine are fixed */ + old_mute_threshold = winetest_mute_threshold; + winetest_mute_threshold = 1; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context(tests[i].resource); + + for (j = 0; tests[i].has_audio && j < ARRAY_SIZE(test_audio_formats); ++j) + { + stream = get_resource_stream(tests[i].resource); + if (FAILED(hr = MFCreateSourceReaderFromByteStream(stream, NULL, &reader))) + { + todo_wine + win_skip("MFCreateSourceReaderFromByteStream() failed\n"); + IMFByteStream_Release(stream); + continue; + } + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + + hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &media_type); + ok(hr == S_OK, "Failed to get native mediatype, hr %#x.\n", hr); + winetest_push_context("native audio"); + test_audio_media_type(tests[i].resource, media_type, &tests[i].audio_format); + IMFMediaType_Release(media_type); + winetest_pop_context(); + + hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 1, &media_type); + todo_wine + ok(hr == MF_E_NO_MORE_TYPES, "Expected only one native mediatype, hr %#x.\n", hr); + if (hr == S_OK) IMFMediaType_Release(media_type); + + hr = IMFSourceReader_SetStreamSelection(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &test_audio_formats[j].subtype); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, test_audio_formats[j].bits); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, test_audio_formats[j].rate); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, test_audio_formats[j].bits / 8); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, test_audio_formats[j].rate * test_audio_formats[j].bits / 8); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFSourceReader_SetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, NULL, media_type); + todo_wine + ok(hr == S_OK || broken(hr == MF_E_TOPO_CODEC_NOT_FOUND) /* <= win7 */, "Failed setting current media type %u, hr %#x.\n", j, hr); + IMFMediaType_Release(media_type); + if (hr != S_OK) continue; + + hr = IMFSourceReader_GetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, &media_type); + ok(hr == S_OK, "Failed to get current mediatype, hr %#x.\n", hr); + winetest_push_context("current audio %u", j); + test_audio_media_type(tests[i].resource, media_type, &test_audio_formats[j]); + winetest_pop_context(); + IMFMediaType_Release(media_type); + + IMFSourceReader_Release(reader); + IMFByteStream_Release(stream); + } + + winetest_pop_context(); + } + + winetest_mute_threshold = old_mute_threshold; +} + START_TEST(mfplat) { HRESULT hr; @@ -1242,6 +1463,7 @@ START_TEST(mfplat) test_factory(); test_source_reader(); test_source_reader_from_media_source(); + test_media_types(); test_reader_d3d9(); hr = MFShutdown(); diff --git a/dlls/mfreadwrite/tests/resource.rc b/dlls/mfreadwrite/tests/resource.rc index f54212a8c8f..5b3269fef1d 100644 --- a/dlls/mfreadwrite/tests/resource.rc +++ b/dlls/mfreadwrite/tests/resource.rc @@ -20,3 +20,7 @@ /* @makedep: test.wav */ test.wav RCDATA test.wav + +/* @makedep: test-48000.wav */ +test-48000.wav RCDATA test-48000.wav + diff --git a/dlls/mfreadwrite/tests/test-48000.wav b/dlls/mfreadwrite/tests/test-48000.wav new file mode 100644 index 0000000000000000000000000000000000000000..dedd660bb9a97a9cacedabaddc1b1bafd2f4a176 GIT binary patch literal 2104 zcmV-82*>wQNk&F62mk<AK~_a(ZFC?I000010097iy8r+HcL4wb01yCVVRT^t2mk=& z1;h)Q5n&e<9j_uRD2FY(GQ>BYJVimYMdwM}O^;FiR3ljZT8mxDU$$XSW0houWgli@ zW=>|~Wg=w@WS?T-V9s7_T)SDmR(DhBPZ&%FNVh{SKX5vLHDfRwE3qXeAb=Xf6!i`o z2{!{${crb^@x$u{=3L;;+F;cd(Dljz#y-KYyj-|Mv~952tc<CMrqH8ip-rELof4e$ znk$;PnVgx}nQEF+n~<C$o(G^lqQs<_r?;veuFJ8ywdlE0zVpJ#$Ii_D(N@>c+-Tw% z=-%zK^ON~^|62t-3lkCC7Lgn-BCaP4EkrU=H!nQfKu<-8NrO#1QLt3pSH4<PU6@~t zVJ>5PWOHQ{W?yDgX7Ob=Whi9CVhmvcU#49ASq4|eQ$J92OlL?QM4CU~I`uW&Fqtbc zCaE9=8%h;@526Xc1Kj=i_Z#v`?1|>z;7;4!)sWC@%W}r6!5F>1xS_Peuqmz8smrDe zq?@67pRAoQoC=#cn!lNwna`P7nmL<qocf*Dp9i9bq*JGBs?4o&v0Sx;x#_)y!dAyu z%!JX{)=%8!;gsiB?JM&N`R@MG1hfi_5LOlq9IPQPCy*@6G2J%6J8(eiL?}rqP3TZ# zRF+qMS{hwuUt(bkV_;-pWeH|nW>{wZWlUv6WawfyVKiUhTs~S(R~1y0P|r-rNQ6WM zKv6qsHdHYcEU+dkA&DE%6$B6~3P}WI{(<<T^3m)L=VIZ{+gjEN(c#PF#u&nYy&<{& zv>UN{tstror%9yIp{bwJoll%0n@O6+nVXr$nMs-<n@^n5ovEMEp-H3<ry#0&tsAla zv>~~Gy%@se#^K8f(OTBe+hXAk=h5t=@`3ne{z(KY3Iq_)6^R=wA+RPDEL1URHc>kT zK!ildNY6}^P!&{8S3X+cTr^)dVd!E+WK3oKWmslhW(j6sWng3rV`5=uUm9J0T9#L1 zROnDCO(;p~L~uaBJKZ+SF_0`TC#)e2999;L5VQ)?1n&L{`785R?Ud)`;ZNMy)`Zbl z%vQ&R!s)$)xm>k!vCOS&s#B+iqz9tcpZc9|oH?6Wn$MY=nZKDinhKjRoUEOCpPQi! zq|2t&sVS|)u%WcRxEQ^w!E(lH%aG9B)lS>r;ECo+>>Kj<_uT!!1EL9i4@wmU8>t{M zCYdYTF!eRyI+{NoL}y5JOg~V@QwCT3S*Bb8UkqWyVkl%cW$|TGW?yC$W^-kGWG-Wj zVVGZ2UA|h}SFlt(QG-p0Nl!)FKrcK|H$*ZFEv_dnB9R>2784OX3tI(u|C9N%^WN<l z=xE~5+*a5A(ay}t$MeEczUaBSwac*{uD7a~r^KW_q6eTNo{*eUn`)ZanVgxpnJb#} zni8CbolT!+q0pm<ri`iCtZlGFv|PBbygtDJ#`Ve;&|uZh+FalT=ELig@o)E1{Wk*| z3H1)c6o48gAh9JJD`PN#HE=pEKes~$NEl4%Pj^$kR=ZhjT+UwLV4q?OWFlqbWlm;d zW*=sSWtC)4W42+*UyEJ+S|eEfRF6^IP3K9pMMXiLJj6G<GKVcJD6b+F9bp%m5yT7R z1pojX`aJYz?w{!E;!)ky*Ll)K%{<6r!@Isrx*4`4vT?2htKFvqrFEh=ph}*xoNJqV zn&FwAnX;K3n%<iAn_-<GpE9A8qeZ4dsfnx?u;{b;w@JLxz>vj&%AL>T)KA*l-+<*k z>kIMb_R0LN0+9%94m}k68KfUFC7>$mFAFvQIl?|rL!?K%OOsD0Q*>5%Suk9hUbA3& zV(w!NWz}U!W@Kh4W|n2HWN>5NVfkOeT|8T8SV>jlQ8i9RN*G42K@B}OI5IN=E~+Rn zBbXiM7a|f(3~dI90HylG^zH5>>2KrG-BQ@}(!9;D$kD?kzp=V_wtce1u28Eas6wT! zqG+IWp3<C!n~j?6nW34jnGc%Dn%J8>o%Ejnpjx8@ruwKltii90vzfQzyJo;3#S6+L z&u7%n*;n8D<hJUA@Lu*n{3HSh2;~j76L%RQAF?DPDsV5AG>$n{KIlS1M_)@lPuEf_ zRyA4lTV-B`U{qqzWA<dnWkF_TW-(@`WyfTZV+LX=VEJ8oTdi1?RWwqLPNYhFMi)YR zJ*qgVGkh*6DX}9P9&8w?64ea$1`+`-`%Lw8@2ctZ<5b?!*l^P{&Lhb{#E`!hyV$nZ zvKX(Ot7@o%rRJiVpq`%foS>Van)jKcnW&iqnzWj{n;4zRp3I;iqr#=KsOzh2uQ9VY zw|u+%zpuoX$*j)n(@@#f-go3M>iqB3^|$+*0e=Tw4KEY&7@i(6B&I3$E*~@;Ip{rr zLf=LLOXW_6Qs7nbShrg*URPi)VzFc2WVdBHW@TnNX18VEWU*r|Vpm`<UbkEESm0HL zQsqtpOW#I-Lg+mlIUh9kE~Y6lB%U7f7%vlD4Sxrl0k`|r_5ANJ>UZST-cZ@=)2z;y z$*;uwzkItmw=uJ9uj{L_sKTWnqs*Ymo*13Ho3xq(ny8tinfIBXnxLEYoSvSVpyr~2 zrD~|1s~E4>ve>p3yO6&?#3RWx&T!Mw*i_#0<ErU&?@aYB`w{{62GtCy5^NY79<d`R zDSR%eGpaayJr_cJMx;uPPBc=LRjpWhTlrlnU<P85W5;BtWie)DW<h4hW%gvyV^m^> iU}awPTQylLR@YKJPhU$yN9aOKNmEn=0000<PDW1*?f;Je literal 0 HcmV?d00001 -- 2.33.0

2 5

[PATCH 1/3] wined3d: Make wined3d_buffer_gl_binding_from_bind_flags() static.
by Zebediah Figura 01 Nov '21

01 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 56 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 854fa71aefe..54291f1d9dd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -136,6 +136,34 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w wined3d_context_gl_bind_bo(context_gl, buffer_gl->bo.binding, buffer_gl->bo.id); } +static GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) +{ + if (!bind_flags) + return GL_PIXEL_UNPACK_BUFFER; + + if (bind_flags == WINED3D_BIND_INDEX_BUFFER) + return GL_ELEMENT_ARRAY_BUFFER; + + if (bind_flags & (WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_UNORDERED_ACCESS) + && gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + return GL_TEXTURE_BUFFER; + + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + return GL_UNIFORM_BUFFER; + + if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) + return GL_TRANSFORM_FEEDBACK_BUFFER; + + if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER + && gl_info->supported[ARB_DRAW_INDIRECT]) + return GL_DRAW_INDIRECT_BUFFER; + + if (bind_flags & ~(WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER)) + FIXME("Unhandled bind flags %#x.\n", bind_flags); + + return GL_ARRAY_BUFFER; +} + /* Context activation is done by the caller. */ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) @@ -1116,34 +1144,6 @@ static const struct wined3d_resource_ops buffer_resource_ops = buffer_resource_sub_resource_unmap, }; -GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) -{ - if (!bind_flags) - return GL_PIXEL_UNPACK_BUFFER; - - if (bind_flags == WINED3D_BIND_INDEX_BUFFER) - return GL_ELEMENT_ARRAY_BUFFER; - - if (bind_flags & (WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_UNORDERED_ACCESS) - && gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) - return GL_TEXTURE_BUFFER; - - if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) - return GL_UNIFORM_BUFFER; - - if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) - return GL_TRANSFORM_FEEDBACK_BUFFER; - - if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER - && gl_info->supported[ARB_DRAW_INDIRECT]) - return GL_DRAW_INDIRECT_BUFFER; - - if (bind_flags & ~(WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER)) - FIXME("Unhandled bind flags %#x.\n", bind_flags); - - return GL_ARRAY_BUFFER; -} - static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_buffer_ops *buffer_ops) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 588e39db9b2..9ece1954018 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5055,8 +5055,6 @@ static inline const struct wined3d_buffer_gl *wined3d_buffer_gl_const(const stru return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); } -GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, - uint32_t bind_flags) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -- 2.33.0

4 6

[PATCH 1/7] jscript: Fix some refcount leaks.
by Gabriel Ivăncescu 01 Nov '21

01 Nov '21

In particular, most leak when jsdisp->ctx is not the current ctx. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index c7e4ba9..4c57a69 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2028,6 +2028,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns if(jsdisp && jsdisp->ctx == ctx) { if(flags & DISPATCH_PROPERTYPUT) { FIXME("disp_call(propput) on builtin object\n"); + jsdisp_release(jsdisp); return E_FAIL; } @@ -2037,6 +2038,8 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns jsdisp_release(jsdisp); return hres; } + if(jsdisp) + jsdisp_release(jsdisp); flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(ret && argc) @@ -2106,6 +2109,8 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W jsdisp_release(jsdisp); return hres; } + if(jsdisp) + jsdisp_release(jsdisp); flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(r && argc && flags == DISPATCH_METHOD) @@ -2205,6 +2210,8 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) VARIANT var; DISPPARAMS dp = {&var, &dispid, 1, 1}; + if(jsdisp) + jsdisp_release(jsdisp); hres = jsval_to_variant(val, &var); if(FAILED(hres)) return hres; @@ -2230,6 +2237,8 @@ HRESULT disp_propput_name(script_ctx_t *ctx, IDispatch *disp, const WCHAR *name, BSTR str; DISPID id; + if(jsdisp) + jsdisp_release(jsdisp); if(!(str = SysAllocString(name))) return E_OUTOFMEMORY; @@ -2248,7 +2257,9 @@ HRESULT disp_propput_name(script_ctx_t *ctx, IDispatch *disp, const WCHAR *name, return disp_propput(ctx, disp, id, val); } - return jsdisp_propput_name(jsdisp, name, val); + hres = jsdisp_propput_name(jsdisp, name, val); + jsdisp_release(jsdisp); + return hres; } HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, jsval_t *val) @@ -2312,6 +2323,8 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val jsdisp_release(jsdisp); return hres; } + if(jsdisp) + jsdisp_release(jsdisp); V_VT(&var) = VT_EMPTY; hres = disp_invoke(ctx, disp, id, INVOKE_PROPERTYGET, &dp, &var); -- 2.31.1

3 17

[PATCH v2] msvcrt: Don't use GetDaylightFlag function in _ftime64.
by Piotr Caban 01 Nov '21

01 Nov '21

The function is not available on current Windows releases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51959 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

4 4

[PATCH] configure.ac: allow expressing dwarf version in CFLAGS and CROSSCFLAGS
by Eric Pouech 01 Nov '21

01 Nov '21

usage: configure CFLAGS="-gdwarf-4 -O2" will enable dwarf4 compilation for ELF parts (and CROSSCFLAGS="-gdwarf-4 -O2" for PE parts) evolution from current behavior: - when CFLAGS contains "-gdwarf-X", -gdwarf-X option is not tested with WINE_TRY_CFLAGS (the option remains anyway in CFLAGS -so WINE_TRY is useless- and is not copied in EXTRACFLAGS) (ditto for CROSSCFLAGS) - using CROSSCFLAGS=-gdwarf is no longer converted to Wine's preferred format, but is kepts as is, hence will boil down to compiler's preferred dwarf version what remains undone (and could be improved): - no test that the final configuration is suitable for Wine (ie if WINE_TRY_CFLAGS fails on -gdwarf-2, compilation is done with compilers's default format => dwarf5 on Linux) - using CROSSDEBUG=dwarf-split will compile in dwarf-2, while CROSSDEBUG=split will compile in compiler's default (likely dwarf-5 currently) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- configure.ac | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 913692c828a..e0ec8fd17d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1024,21 +1024,26 @@ then dnl Determine debug info format AC_SUBST(CROSSDEBUG) + ac_debug_format_seen= if test -z "$CROSSDEBUG" then for ac_flag in $CROSSCFLAGS; do case $ac_flag in - -gdwarf*) CROSSDEBUG=dwarf ;; + -gdwarf-*) ac_debug_format_seen=yes ;; + -g) ac_debug_format_seen=${ac_debug_format_seen:-default} ;; -gcodeview) CROSSDEBUG=pdb ;; - -g) CROSSDEBUG=${CROSSDEBUG:-dwarf} ;; esac done fi case $CROSSDEBUG in - *dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-2]) - WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;; + *dwarf) ac_debug_format_seen=default ;; pdb) WINE_TRY_CROSSCFLAGS([-gcodeview]) ;; esac + if test "x$ac_debug_format_seen" = "xdefault" + then + WINE_TRY_CROSSCFLAGS([-gdwarf-2]) + WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) + fi WINE_TRY_CROSSCFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) @@ -2031,13 +2036,18 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= *) EXTRACFLAGS="$EXTRACFLAGS $wine_cv_64bit_compare_swap" ;; esac - dnl Default to dwarf-2 debug info + dnl Determine debug info format + ac_debug_format_seen= for ac_flag in $CFLAGS; do case $ac_flag in - -g) WINE_TRY_CFLAGS([-gdwarf-2]) - WINE_TRY_CFLAGS([-gstrict-dwarf]) ;; + -gdwarf-*) ac_debug_format_seen=yes ;; + -g) ac_debug_format_seen=${ac_debug_format_seen:-default} ;; esac done + if test "x$ac_debug_format_seen" = "xdefault"; then + WINE_TRY_CFLAGS([-gdwarf-2]) + WINE_TRY_CFLAGS([-gstrict-dwarf]) + fi dnl Disable gcc builtins except for Mingw AC_SUBST(MSVCRTFLAGS,"")

4 4

[PATCH] winebuild: Rename delay import libs .text$2 section to .data$2.
by Rémi Bernon 01 Nov '21

01 Nov '21

GNU dlltool outputs the DELAY_IMPORT_DESCRIPTOR of delay import libs in a .text$2 section, which is then merged into .text and changes its flags to add the DATA flag. This is incorrect and breaks some DRMs, which are then validating that .text sections doesn't have the IMAGE_SCN_CNT_INITIALIZED_DATA flag set. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is actually more some kind of RFC, as I'm not sure at all what this change really implies and why the descriptor has to be in .text in the first place. It seems like some GNU specific thing, as it seems from internet comments that MSVC places the descriptor in .data section? As far as I could test, this works fine and removes the incorrect IMAGE_SCN_CNT_INITIALIZED_DATA flag from .text section of DLLs with delay imports. Also, changing instead the .text$2 section flags to mark it as code instead doesn't work. In Proton we have some post-processing step to remove that flag, and I think it was required by Forza Horizon 4 DRM. tools/winebuild/import.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index bba87b1e02c..1a7b59e6678 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1665,6 +1665,15 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec ) } spawn( args ); + + if (strendswith( lib_name, ".delay.a" )) + { + args = find_tool( "objcopy", NULL ); + strarray_add( &args, "--rename-section" ); + strarray_add( &args, ".text$2=.data$2" ); + strarray_add( &args, lib_name ); + spawn( args ); + } } /* create a Unix-style import library */ -- 2.33.0

3 2

[PATCH] winhttp: Handle TLS close notify in netconn_is_alive().
by Paul Gofman 01 Nov '21

01 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Server may decide to close the connection that we have cached. In that case it may send 'Close notify' encrypted alert and then close the connection. Gnutls processes that [1] and returns zero length record from gnutls_record_recv(). We currently check for EOF on socket in netconn_is_alive(). But in that case the socket has 31 byte of data in the buffer while the socket is de facto closed already. read_ssl_chunk() will process this message leaving the socket in the EOF state. If there is some unrelated message it should stay in peek_msg buffer. read_ssl_chunk() should not block on receiving the data as the socket is in the non blocking state. 1. https://gitlab.com/gnutls/gnutls/-/blob/3.7.2/lib/record.c#L881 dlls/winhttp/net.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 8597179dc3e..3016608404a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -616,11 +616,31 @@ DWORD netconn_set_timeout( struct netconn *netconn, BOOL send, int value ) BOOL netconn_is_alive( struct netconn *netconn ) { + SIZE_T size; int len; char b; DWORD err; + BOOL eof; set_blocking( netconn, FALSE ); + if (netconn->secure) + { + while (!netconn->peek_msg && !(err = read_ssl_chunk( netconn, NULL, 0, &size, &eof )) && !eof) + ; + + TRACE("Checking secure connection, err %d.\n", err); + + if (netconn->peek_msg || err == WSAEWOULDBLOCK) + { + set_blocking( netconn, TRUE ); + return TRUE; + } + if (err != SEC_E_OK && err != SEC_E_INCOMPLETE_MESSAGE) + { + set_blocking( netconn, TRUE ); + return FALSE; + } + } len = sock_recv( netconn->socket, &b, 1, MSG_PEEK ); err = WSAGetLastError(); set_blocking( netconn, TRUE ); -- 2.31.1

2 1

[PATCH] d3d11: Correctly handle optional arguments in OMGetBlendState().
by Nikolay Sivov 01 Nov '21

01 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 14 ++++++++++++ dlls/d3d11/device.c | 37 ++++++++++++++++++++++---------- dlls/d3d11/tests/d3d11.c | 14 ++++++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 6ec398269fa..b8338152bb7 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5533,6 +5533,20 @@ float4 main(float4 color : COLOR) : SV_TARGET blend_factor[2] = 0.3f; blend_factor[3] = 0.4f; ID3D10Device_OMSetBlendState(device, blend_state, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + /* OMGetBlendState() arguments are optional */ + ID3D10Device_OMGetBlendState(device, NULL, NULL, NULL); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, NULL, NULL); + ID3D10BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D10Device_OMGetBlendState(device, NULL, NULL, &sample_mask); + ok(sample_mask == D3D10_DEFAULT_SAMPLE_MASK, "Unexpected sample mask %#x.\n", sample_mask); + memset(tmp_blend_factor, 0, sizeof(tmp_blend_factor)); + ID3D10Device_OMGetBlendState(device, NULL, tmp_blend_factor, NULL); + ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f + && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8d88ee26222..2e62223e189 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2190,20 +2190,26 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetBlendState(ID3D11DeviceC struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_blend_state *wined3d_state; struct d3d_blend_state *blend_state_impl; + FLOAT tmp_blend_factor[4]; + UINT tmp_sample_mask; TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, - (struct wined3d_color *)blend_factor, sample_mask))) + if (!blend_factor) blend_factor = tmp_blend_factor; + if (!sample_mask) sample_mask = &tmp_sample_mask; + wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, + (struct wined3d_color *)blend_factor, sample_mask); + if (blend_state) { - blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); - ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); - } - else - { - *blend_state = NULL; + if (wined3d_state) + { + blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); + ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); + } + else + *blend_state = NULL; } wined3d_mutex_unlock(); } @@ -5541,10 +5547,19 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, d3d11_device_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_blend_state, blend_factor, sample_mask); + if (blend_state) + { + if (d3d11_blend_state) + { + *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; + ID3D10BlendState_AddRef(*blend_state); + } + else + *blend_state = NULL; + } + if (d3d11_blend_state) - *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; - else - *blend_state = NULL; + ID3D11BlendState_Release(d3d11_blend_state); } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 553caa10e46..2ed9aed490e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12608,6 +12608,20 @@ static void test_clear_state(void) ID3D11DeviceContext_OMGetDepthStencilState(context, &tmp_ds_state, NULL); ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D11DepthStencilState_Release(tmp_ds_state); + /* OMGetBlendState() arguments are optional */ + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, NULL); + ID3D11DeviceContext_OMGetBlendState(context, &tmp_blend_state, NULL, NULL); + ok(tmp_blend_state == blend_state, "Got unexpected blend state %p, expected %p.\n", tmp_blend_state, blend_state); + ID3D11BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, &sample_mask); + ok(sample_mask == 0xff00ff00, "Got unexpected sample mask %#x.\n", sample_mask); + memset(blend_factor, 0, sizeof(blend_factor)); + ID3D11DeviceContext_OMGetBlendState(context, NULL, blend_factor, NULL); + ok(blend_factor[0] == 0.1f && blend_factor[1] == 0.2f + && blend_factor[2] == 0.3f && blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); ID3D11DeviceContext_OMGetRenderTargets(context, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i) -- 2.33.0

3 2

[PATCH] wined3d: Reduce locking of device context operations.
by Jan Sikorski 01 Nov '21

01 Nov '21

Only actually take the lock for the immediate context. According to the d3d11 documentation, operations on device contexts are not thread safe, and testing on Windows confirms this. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/cs.c | 18 ++-- dlls/wined3d/device.c | 152 ++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 12 +++ 3 files changed, 97 insertions(+), 85 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f266e59b4b5..bcd26b6fbb1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1019,7 +1019,7 @@ void CDECL wined3d_device_context_dispatch(struct wined3d_device_context *contex { struct wined3d_cs_dispatch *op; - wined3d_mutex_lock(); + wined3d_device_context_lock(context); op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DISPATCH; op->parameters.indirect = FALSE; @@ -1030,7 +1030,7 @@ void CDECL wined3d_device_context_dispatch(struct wined3d_device_context *contex acquire_compute_pipeline_resources(context); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_dispatch_indirect(struct wined3d_device_context *context, @@ -1038,7 +1038,7 @@ void CDECL wined3d_device_context_dispatch_indirect(struct wined3d_device_contex { struct wined3d_cs_dispatch *op; - wined3d_mutex_lock(); + wined3d_device_context_lock(context); op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DISPATCH; op->parameters.indirect = TRUE; @@ -1049,7 +1049,7 @@ void CDECL wined3d_device_context_dispatch_indirect(struct wined3d_device_contex wined3d_device_context_acquire_resource(context, &buffer->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) @@ -1206,7 +1206,7 @@ void CDECL wined3d_device_context_draw_indirect(struct wined3d_device_context *c const struct wined3d_state *state = context->state; struct wined3d_cs_draw *op; - wined3d_mutex_lock(); + wined3d_device_context_lock(context); op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DRAW; op->primitive_type = state->primitive_type; @@ -1220,7 +1220,7 @@ void CDECL wined3d_device_context_draw_indirect(struct wined3d_device_context *c wined3d_device_context_acquire_resource(context, &buffer->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) @@ -3824,7 +3824,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device TRACE("context %p, list %p.\n", context, list); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); memory = heap_alloc(sizeof(*object) + deferred->resource_count * sizeof(*object->resources) + deferred->upload_count * sizeof(*object->uploads) + deferred->command_list_count * sizeof(*object->command_lists) @@ -3833,7 +3833,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device if (!memory) { - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); return E_OUTOFMEMORY; } @@ -3886,7 +3886,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device TRACE("Created command list %p.\n", object); *list = object; - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); return S_OK; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1c584b93fe0..c5de58c29c9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1649,11 +1649,11 @@ void CDECL wined3d_device_context_reset_state(struct wined3d_device_context *con { TRACE("context %p.\n", context); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); state_cleanup(context->state); wined3d_state_reset(context->state, &context->device->adapter->d3d_info); wined3d_device_context_emit_reset_state(context, true); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_state(struct wined3d_device_context *context, struct wined3d_state *state) @@ -1663,7 +1663,7 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte TRACE("context %p, state %p.\n", context, state); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); context->state = state; wined3d_device_context_emit_set_feature_level(context, state->feature_level); @@ -1760,7 +1760,7 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte wined3d_device_context_emit_set_blend_state(context, state->blend_state, &state->blend_factor, state->sample_mask); wined3d_device_context_emit_set_depth_stencil_state(context, state->depth_stencil_state, state->stencil_ref); wined3d_device_context_emit_set_rasterizer_state(context, state->rasterizer_state); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } struct wined3d_state * CDECL wined3d_device_get_state(struct wined3d_device *device) @@ -1793,7 +1793,7 @@ void CDECL wined3d_device_context_set_shader(struct wined3d_device_context *cont TRACE("context %p, type %#x, shader %p.\n", context, type, shader); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); prev = state->shader[type]; if (shader == prev) goto out; @@ -1805,7 +1805,7 @@ void CDECL wined3d_device_context_set_shader(struct wined3d_device_context *cont if (prev) wined3d_shader_decref(prev); out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } struct wined3d_shader * CDECL wined3d_device_context_get_shader(const struct wined3d_device_context *context, @@ -1831,7 +1831,7 @@ void CDECL wined3d_device_context_set_constant_buffers(struct wined3d_device_con return; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); if (!memcmp(buffers, &state->cb[type][start_idx], count * sizeof(*buffers))) goto out; @@ -1848,7 +1848,7 @@ void CDECL wined3d_device_context_set_constant_buffers(struct wined3d_device_con wined3d_buffer_decref(prev); } out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_blend_state(struct wined3d_device_context *context, @@ -1860,7 +1860,7 @@ void CDECL wined3d_device_context_set_blend_state(struct wined3d_device_context TRACE("context %p, blend_state %p, blend_factor %p, sample_mask %#x.\n", context, blend_state, blend_factor, sample_mask); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); prev = state->blend_state; if (prev == blend_state && !memcmp(blend_factor, &state->blend_factor, sizeof(*blend_factor)) && sample_mask == state->sample_mask) @@ -1875,7 +1875,7 @@ void CDECL wined3d_device_context_set_blend_state(struct wined3d_device_context if (prev) wined3d_blend_state_decref(prev); out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context, @@ -1886,7 +1886,7 @@ void CDECL wined3d_device_context_set_depth_stencil_state(struct wined3d_device_ TRACE("context %p, depth_stencil_state %p, stencil_ref %u.\n", context, depth_stencil_state, stencil_ref); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); prev = state->depth_stencil_state; if (prev == depth_stencil_state && state->stencil_ref == stencil_ref) goto out; @@ -1899,7 +1899,7 @@ void CDECL wined3d_device_context_set_depth_stencil_state(struct wined3d_device_ if (prev) wined3d_depth_stencil_state_decref(prev); out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_context *context, @@ -1910,7 +1910,7 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con TRACE("context %p, rasterizer_state %p.\n", context, rasterizer_state); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); prev = state->rasterizer_state; if (prev == rasterizer_state) goto out; @@ -1922,7 +1922,7 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con if (prev) wined3d_rasterizer_state_decref(prev); out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, @@ -1939,7 +1939,7 @@ void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *c viewports[i].width, viewports[i].height, viewports[i].min_z, viewports[i].max_z); } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); if (viewport_count) memcpy(state->viewports, viewports, viewport_count * sizeof(*viewports)); else @@ -1947,7 +1947,7 @@ void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *c state->viewport_count = viewport_count; wined3d_device_context_emit_set_viewports(context, viewport_count, viewports); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_scissor_rects(struct wined3d_device_context *context, unsigned int rect_count, @@ -1963,7 +1963,7 @@ void CDECL wined3d_device_context_set_scissor_rects(struct wined3d_device_contex TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); if (state->scissor_rect_count == rect_count && !memcmp(state->scissor_rects, rects, rect_count * sizeof(*rects))) { @@ -1979,7 +1979,7 @@ void CDECL wined3d_device_context_set_scissor_rects(struct wined3d_device_contex wined3d_device_context_emit_set_scissor_rects(context, rect_count, rects); out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_shader_resource_views(struct wined3d_device_context *context, @@ -1999,7 +1999,7 @@ void CDECL wined3d_device_context_set_shader_resource_views(struct wined3d_devic return; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); if (!memcmp(views, &state->shader_resource_view[type][start_idx], count * sizeof(*views))) goto out; @@ -2037,7 +2037,7 @@ void CDECL wined3d_device_context_set_shader_resource_views(struct wined3d_devic } } out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_samplers(struct wined3d_device_context *context, enum wined3d_shader_type type, @@ -2054,7 +2054,7 @@ void CDECL wined3d_device_context_set_samplers(struct wined3d_device_context *co return; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); if (!memcmp(samplers, &state->sampler[type][start_idx], count * sizeof(*samplers))) goto out; @@ -2071,7 +2071,7 @@ void CDECL wined3d_device_context_set_samplers(struct wined3d_device_context *co wined3d_sampler_decref(prev); } out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_unordered_access_views(struct wined3d_device_context *context, @@ -2090,7 +2090,7 @@ void CDECL wined3d_device_context_set_unordered_access_views(struct wined3d_devi return; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); if (!memcmp(uavs, &state->unordered_access_view[pipeline][start_idx], count * sizeof(*uavs)) && !initial_counts) goto out; @@ -2107,7 +2107,7 @@ void CDECL wined3d_device_context_set_unordered_access_views(struct wined3d_devi wined3d_unordered_access_view_decref(prev); } out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_render_targets_and_unordered_access_views(struct wined3d_device_context *context, @@ -2115,7 +2115,7 @@ void CDECL wined3d_device_context_set_render_targets_and_unordered_access_views( struct wined3d_rendertarget_view *depth_stencil_view, UINT uav_count, struct wined3d_unordered_access_view *const *unordered_access_views, const unsigned int *initial_counts) { - wined3d_mutex_lock(); + wined3d_device_context_lock(context); if (rtv_count != ~0u) { if (depth_stencil_view && !(depth_stencil_view->resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL)) @@ -2138,7 +2138,7 @@ void CDECL wined3d_device_context_set_render_targets_and_unordered_access_views( unordered_access_views, initial_counts); } out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } static void wined3d_device_context_unbind_srv_for_rtv(struct wined3d_device_context *context, @@ -2200,7 +2200,7 @@ HRESULT CDECL wined3d_device_context_set_rendertarget_views(struct wined3d_devic } } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); /* Set the viewport and scissor rectangles, if requested. Tests show that * stateblock recording is ignored, the change goes directly into the * primary stateblock. */ @@ -2246,7 +2246,7 @@ HRESULT CDECL wined3d_device_context_set_rendertarget_views(struct wined3d_devic wined3d_device_context_unbind_srv_for_rtv(context, view, FALSE); } out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); return WINED3D_OK; } @@ -2265,7 +2265,7 @@ HRESULT CDECL wined3d_device_context_set_depth_stencil_view(struct wined3d_devic return WINED3DERR_INVALIDCALL; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); prev = fb->depth_stencil; if (prev == view) { @@ -2280,7 +2280,7 @@ HRESULT CDECL wined3d_device_context_set_depth_stencil_view(struct wined3d_devic wined3d_rendertarget_view_decref(prev); wined3d_device_context_unbind_srv_for_rtv(context, view, TRUE); out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); return WINED3D_OK; } @@ -2292,7 +2292,7 @@ void CDECL wined3d_device_context_set_predication(struct wined3d_device_context TRACE("context %p, predicate %p, value %#x.\n", context, predicate, value); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); prev = state->predicate; if (predicate) { @@ -2304,7 +2304,7 @@ void CDECL wined3d_device_context_set_predication(struct wined3d_device_context wined3d_device_context_emit_set_predication(context, predicate, value); if (prev) wined3d_query_decref(prev); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } HRESULT CDECL wined3d_device_context_set_stream_sources(struct wined3d_device_context *context, @@ -2332,7 +2332,7 @@ HRESULT CDECL wined3d_device_context_set_stream_sources(struct wined3d_device_co } } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); if (!memcmp(streams, &state->streams[start_idx], count * sizeof(*streams))) goto out; @@ -2350,7 +2350,7 @@ HRESULT CDECL wined3d_device_context_set_stream_sources(struct wined3d_device_co wined3d_buffer_decref(prev); } out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); return WINED3D_OK; } @@ -2365,7 +2365,7 @@ void CDECL wined3d_device_context_set_index_buffer(struct wined3d_device_context TRACE("context %p, buffer %p, format %s, offset %u.\n", context, buffer, debug_d3dformat(format_id), offset); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); prev_buffer = state->index_buffer; prev_format = state->index_format; prev_offset = state->index_offset; @@ -2382,7 +2382,7 @@ void CDECL wined3d_device_context_set_index_buffer(struct wined3d_device_context if (prev_buffer) wined3d_buffer_decref(prev_buffer); out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_vertex_declaration(struct wined3d_device_context *context, @@ -2393,7 +2393,7 @@ void CDECL wined3d_device_context_set_vertex_declaration(struct wined3d_device_c TRACE("context %p, declaration %p.\n", context, declaration); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); prev = state->vertex_declaration; if (declaration == prev) goto out; @@ -2405,7 +2405,7 @@ void CDECL wined3d_device_context_set_vertex_declaration(struct wined3d_device_c if (prev) wined3d_vertex_declaration_decref(prev); out: - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_set_stream_outputs(struct wined3d_device_context *context, @@ -2416,7 +2416,7 @@ void CDECL wined3d_device_context_set_stream_outputs(struct wined3d_device_conte TRACE("context %p, outputs %p.\n", context, outputs); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_set_stream_outputs(context, outputs); for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) { @@ -2429,7 +2429,7 @@ void CDECL wined3d_device_context_set_stream_outputs(struct wined3d_device_conte if (prev_buffer) wined3d_buffer_decref(prev_buffer); } - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, @@ -2440,10 +2440,10 @@ void CDECL wined3d_device_context_draw(struct wined3d_device_context *context, u TRACE("context %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", context, start_vertex, vertex_count, start_instance, instance_count); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_draw(context, state->primitive_type, state->patch_vertex_count, 0, start_vertex, vertex_count, start_instance, instance_count, false); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, @@ -2454,10 +2454,10 @@ void CDECL wined3d_device_context_draw_indexed(struct wined3d_device_context *co TRACE("context %p, base_vertex_index %d, start_index %u, index_count %u, start_instance %u, instance_count %u.\n", context, base_vertex_index, start_index, index_count, start_instance, instance_count); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_draw(context, state->primitive_type, state->patch_vertex_count, base_vertex_index, start_index, index_count, start_instance, instance_count, true); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_get_constant_buffer(const struct wined3d_device_context *context, @@ -4150,10 +4150,10 @@ void CDECL wined3d_device_context_set_primitive_type(struct wined3d_device_conte TRACE("context %p, primitive_type %s, patch_vertex_count %u.\n", context, debug_d3dprimitivetype(primitive_type), patch_vertex_count); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); state->primitive_type = primitive_type; state->patch_vertex_count = patch_vertex_count; - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_get_primitive_type(const struct wined3d_device_context *context, @@ -4471,9 +4471,9 @@ void CDECL wined3d_device_context_copy_uav_counter(struct wined3d_device_context TRACE("context %p, dst_buffer %p, offset %u, uav %p.\n", context, dst_buffer, offset, uav); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_copy_uav_counter(context, dst_buffer, offset, uav); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } static bool resources_format_compatible(const struct wined3d_resource *src_resource, @@ -4548,10 +4548,10 @@ void CDECL wined3d_device_context_copy_resource(struct wined3d_device_context *c if (dst_resource->type == WINED3D_RTYPE_BUFFER) { wined3d_box_set(&src_box, 0, 0, src_resource->size, 1, 0, 1); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_blt_sub_resource(context, dst_resource, 0, &src_box, src_resource, 0, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); return; } @@ -4567,7 +4567,7 @@ void CDECL wined3d_device_context_copy_resource(struct wined3d_device_context *c return; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); for (i = 0; i < dst_texture->level_count; ++i) { wined3d_texture_get_level_box(src_texture, i, &src_box); @@ -4580,7 +4580,7 @@ void CDECL wined3d_device_context_copy_resource(struct wined3d_device_context *c src_resource, idx, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); } } - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } HRESULT CDECL wined3d_device_context_copy_sub_resource_region(struct wined3d_device_context *context, @@ -4737,10 +4737,10 @@ HRESULT CDECL wined3d_device_context_copy_sub_resource_region(struct wined3d_dev } } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_blt_sub_resource(context, dst_resource, dst_sub_resource_idx, &dst_box, src_resource, src_sub_resource_idx, src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); return WINED3D_OK; } @@ -4780,10 +4780,10 @@ void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_cont return; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_update_sub_resource(context, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_resolve_sub_resource(struct wined3d_device_context *context, @@ -4820,7 +4820,7 @@ void CDECL wined3d_device_context_resolve_sub_resource(struct wined3d_device_con return; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); fx.resolve_format_id = format_id; dst_texture = texture_from_resource(dst_resource); @@ -4834,7 +4834,7 @@ void CDECL wined3d_device_context_resolve_sub_resource(struct wined3d_device_con wined3d_texture_get_level_height(src_texture, src_level)); wined3d_device_context_blt(context, dst_texture, dst_sub_resource_idx, &dst_rect, src_texture, src_sub_resource_idx, &src_rect, 0, &fx, WINED3D_TEXF_POINT); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } HRESULT CDECL wined3d_device_context_clear_rendertarget_view(struct wined3d_device_context *context, @@ -4871,9 +4871,9 @@ HRESULT CDECL wined3d_device_context_clear_rendertarget_view(struct wined3d_devi return hr; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_clear_rendertarget_view(context, view, rect, flags, color, depth, stencil); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); return WINED3D_OK; } @@ -4889,9 +4889,9 @@ void CDECL wined3d_device_context_clear_uav_float(struct wined3d_device_context return; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_clear_uav(context, view, (const struct wined3d_uvec4 *)clear_value, true); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_clear_uav_uint(struct wined3d_device_context *context, @@ -4899,9 +4899,9 @@ void CDECL wined3d_device_context_clear_uav_uint(struct wined3d_device_context * { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_clear_uav(context, view, clear_value, false); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } static unsigned int sanitise_map_flags(const struct wined3d_resource *resource, unsigned int flags) @@ -4989,9 +4989,9 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, return WINED3DERR_INVALIDCALL; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); hr = wined3d_device_context_emit_map(context, resource, sub_resource_idx, map_desc, box, flags); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); return hr; } @@ -5001,9 +5001,9 @@ HRESULT CDECL wined3d_device_context_unmap(struct wined3d_device_context *contex HRESULT hr; TRACE("context %p, resource %p, sub_resource_idx %u.\n", context, resource, sub_resource_idx); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); hr = wined3d_device_context_emit_unmap(context, resource, sub_resource_idx); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); return hr; } @@ -5012,9 +5012,9 @@ void CDECL wined3d_device_context_issue_query(struct wined3d_device_context *con { TRACE("context %p, query %p, flags %#x.\n", context, query, flags); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); context->ops->issue_query(context, query, flags); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } void CDECL wined3d_device_context_execute_command_list(struct wined3d_device_context *context, @@ -5022,9 +5022,9 @@ void CDECL wined3d_device_context_execute_command_list(struct wined3d_device_con { TRACE("context %p, list %p, restore_state %d.\n", context, list, restore_state); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_execute_command_list(context, list, restore_state); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget_view( @@ -5072,9 +5072,9 @@ void CDECL wined3d_device_context_generate_mipmaps(struct wined3d_device_context return; } - wined3d_mutex_lock(); + wined3d_device_context_lock(context); wined3d_device_context_emit_generate_mipmaps(context, view); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, @@ -5298,9 +5298,9 @@ void CDECL wined3d_device_context_flush(struct wined3d_device_context *context) { TRACE("context %p.\n", context); - wined3d_mutex_lock(); + wined3d_device_context_lock(context); context->ops->flush(context); - wined3d_mutex_unlock(); + wined3d_device_context_unlock(context); } static void update_swapchain_flags(struct wined3d_texture *texture) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 588e39db9b2..6a6c84ee02f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4839,6 +4839,18 @@ struct wined3d_cs LONG pending_presents; }; +static inline void wined3d_device_context_lock(struct wined3d_device_context *context) +{ + if (context == &context->device->cs->c) + wined3d_mutex_lock(); +} + +static inline void wined3d_device_context_unlock(struct wined3d_device_context *context) +{ + if (context == &context->device->cs->c) + wined3d_mutex_unlock(); +} + struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, const enum wined3d_feature_level *levels, unsigned int level_count) DECLSPEC_HIDDEN; void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; -- 2.32.0

2 1

[PATCH] wined3d: Validate pitch against the new format in wined3d_texture_update_desc().
by Paul Gofman 01 Nov '21

01 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51907 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f031daef373..df42f2d766b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1887,7 +1887,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, unsig * requires a 4-byte aligned pitch and doesn't support texture formats * larger than 4 bytes per pixel nor any format using 3 bytes per pixel. * This check is here to verify that the assumption holds. */ - if (pitch % texture->resource.format->byte_count) + if (pitch % format->byte_count) { WARN("Pitch unsupported, not a multiple of the texture format byte width.\n"); return WINED3DERR_INVALIDCALL; -- 2.31.1

2 1

[PATCH] wined3d: Add a trailing linefeed to an ERR().
by Francois Gouget 01 Nov '21

01 Nov '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wined3d/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 94bbe27bd5c..374e693b17d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -2021,7 +2021,7 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view if (format_id == WINED3DFMT_UNKNOWN) { - ERR("Unsupported format %s.", debug_d3dformat(view_format->id)); + ERR("Unsupported format %s.\n", debug_d3dformat(view_format->id)); return; } -- 2.30.2

2 1

[PATCH 01/35] wined3d: Make reference count decrementing functions thread safe.
by Jan Sikorski 01 Nov '21

01 Nov '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- Including wined3d_decref, wined3d_shader_decref, wined3d_stateblock_decref. --- dlls/wined3d/buffer.c | 2 ++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 2 ++ dlls/wined3d/directx.c | 2 ++ dlls/wined3d/palette.c | 4 ++++ dlls/wined3d/query.c | 2 ++ dlls/wined3d/sampler.c | 2 ++ dlls/wined3d/shader.c | 2 ++ dlls/wined3d/state.c | 6 ++++++ dlls/wined3d/stateblock.c | 2 ++ dlls/wined3d/texture.c | 7 +++++++ dlls/wined3d/vertexdeclaration.c | 2 ++ dlls/wined3d/view.c | 12 ++++++++++++ 13 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e1a5ec26c29..b4fbb6300ef 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -708,8 +708,10 @@ ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) if (!refcount) { + wined3d_mutex_lock(); buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); buffer->resource.device->adapter->adapter_ops->adapter_destroy_buffer(buffer); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f828a2e045d..a77b1b983c1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -99,7 +99,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) { SIZE_T i; - wined3d_mutex_lock(); for (i = 0; i < list->command_list_count; ++i) wined3d_command_list_decref(list->command_lists[i]); for (i = 0; i < list->resource_count; ++i) @@ -109,6 +108,7 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) for (i = 0; i < list->query_count; ++i) wined3d_query_decref(list->queries[i].query); + wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b8c1630ee25..6b2f18c6996 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -263,8 +263,10 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) if (!refcount) { + wined3d_mutex_lock(); device->adapter->adapter_ops->adapter_destroy_device(device); TRACE("Destroyed device %p.\n", device); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 990164fd68d..ccaae9d355d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -187,6 +187,7 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) { unsigned int i; + wined3d_mutex_lock(); for (i = 0; i < wined3d->adapter_count; ++i) { struct wined3d_adapter *adapter = wined3d->adapters[i]; @@ -194,6 +195,7 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) adapter->adapter_ops->adapter_destroy(adapter); } heap_free(wined3d); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 85105d1f8de..4bc453bde79 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -47,7 +47,11 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) TRACE("%p decreasing refcount to %u.\n", palette, refcount); if (!refcount) + { + wined3d_mutex_lock(); wined3d_cs_destroy_object(palette->device->cs, wined3d_palette_destroy_object, palette); + wined3d_mutex_unlock(); + } return refcount; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 8ee7ae07886..1b38eb5e311 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -444,9 +444,11 @@ ULONG CDECL wined3d_query_decref(struct wined3d_query *query) { struct wined3d_device *device = query->device; + wined3d_mutex_lock(); query->parent_ops->wined3d_object_destroyed(query->parent); wined3d_cs_destroy_object(device->cs, wined3d_query_destroy_object, query); device->adapter->adapter_ops->adapter_destroy_query(query); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 7eb3a2ae0be..bba3165316e 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -41,8 +41,10 @@ ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) if (!refcount) { + wined3d_mutex_lock(); sampler->parent_ops->wined3d_object_destroyed(sampler->parent); sampler->device->adapter->adapter_ops->adapter_destroy_sampler(sampler); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index fb7115a26dd..957710dbd43 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3439,8 +3439,10 @@ ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader) if (!refcount) { + wined3d_mutex_lock(); shader->parent_ops->wined3d_object_destroyed(shader->parent); wined3d_cs_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8316269afcf..c7f041066d1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -62,8 +62,10 @@ ULONG CDECL wined3d_blend_state_decref(struct wined3d_blend_state *state) if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_blend_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; @@ -136,8 +138,10 @@ ULONG CDECL wined3d_depth_stencil_state_decref(struct wined3d_depth_stencil_stat if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_depth_stencil_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; @@ -199,8 +203,10 @@ ULONG CDECL wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *sta if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_rasterizer_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 39a19984498..8590a2a1c1f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -585,8 +585,10 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { + wined3d_mutex_lock(); wined3d_stateblock_state_cleanup(&stateblock->stateblock_state); heap_free(stateblock); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 339bf4e205a..f031daef373 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1536,6 +1536,11 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) if (!refcount) { + bool in_cs_thread = GetCurrentThreadId() == texture->resource.device->cs->thread_id; + + /* This is called from the CS thread to destroy temporary textures. */ + if (!in_cs_thread) + wined3d_mutex_lock(); /* Wait for the texture to become idle if it's using user memory, * since the application is allowed to free that memory once the * texture is destroyed. Note that this implies that @@ -1550,6 +1555,8 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) } } texture->resource.device->adapter->adapter_ops->adapter_destroy_texture(texture); + if (!in_cs_thread) + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 45a01f4bdd4..a778352d2cf 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -68,9 +68,11 @@ ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration if (!refcount) { + wined3d_mutex_lock(); declaration->parent_ops->wined3d_object_destroyed(declaration->parent); wined3d_cs_destroy_object(declaration->device->cs, wined3d_vertex_declaration_destroy_object, declaration); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a8b3a7b4f75..94bbe27bd5c 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -376,7 +376,11 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_rendertarget_view(view); + wined3d_mutex_unlock(); + } return refcount; } @@ -923,7 +927,11 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_shader_resource_view(view); + wined3d_mutex_unlock(); + } return refcount; } @@ -1441,7 +1449,11 @@ ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_unordered_access_view(view); + wined3d_mutex_unlock(); + } return refcount; } -- 2.30.2

4 82

[PATCH] mshtml: Implement HTMLAnchorElement_get_port().
by Hans Leidekker 01 Nov '21

01 Nov '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlanchor.c | 31 +++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 44166246139..a3608abbeb1 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -490,8 +490,35 @@ static HRESULT WINAPI HTMLAnchorElement_put_port(IHTMLAnchorElement *iface, BSTR static HRESULT WINAPI HTMLAnchorElement_get_port(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IUri *uri; + HRESULT hres; + DWORD port; + WCHAR buf[11]; + int len; + BSTR str; + + TRACE("(%p)->(%p)\n", This, p); + + uri = get_anchor_uri(This); + if(!uri) { + WARN("Could not create IUri\n"); + *p = NULL; + return S_OK; + } + + hres = IUri_GetPort(uri, &port); + IUri_Release(uri); + if(FAILED(hres)) + return hres; + + len = swprintf(buf, ARRAY_SIZE(buf), L"%u", port); + str = SysAllocStringLen(buf, len); + if (str) + *p = str; + else + hres = E_OUTOFMEMORY; + + return hres; } static HRESULT WINAPI HTMLAnchorElement_put_protocol(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9daaf9de51d..03f5c0431ea 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1673,6 +1673,22 @@ static void _test_anchor_hostname(unsigned line, IUnknown *unk, const WCHAR *hos SysFreeString(str); } +#define test_anchor_port(a,p) _test_anchor_port(__LINE__,a,p) +static void _test_anchor_port(unsigned line, IUnknown *unk, const WCHAR *port) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_port(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_port failed: %08x\n", hres); + if(port) + ok_(__FILE__,line)(!lstrcmpW(str, port), "port = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(port)); + else + ok_(__FILE__,line)(str == NULL, "port = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + #define test_anchor_search(a,h,n) _test_anchor_search(__LINE__,a,h,n) static void _test_anchor_search(unsigned line, IUnknown *elem, const WCHAR *search, BOOL allowbroken) { @@ -9203,11 +9219,13 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, L"a", TRUE); if(elem) { test_anchor_href((IUnknown*)elem, L"http://test/"); + test_anchor_port((IUnknown*)elem, L"80"); /* Change the href */ - test_anchor_put_href((IUnknown*)elem, L"http://test1/"); - test_anchor_href((IUnknown*)elem, L"http://test1/"); + test_anchor_put_href((IUnknown*)elem, L"http://test1:8080/"); + test_anchor_href((IUnknown*)elem, L"http://test1:8080/"); test_anchor_hostname((IUnknown*)elem, L"test1"); + test_anchor_port((IUnknown*)elem, L"8080"); /* Restore the href */ test_anchor_put_href((IUnknown*)elem, L"http://test/"); -- 2.30.2

2 1

[PATCH] mshtml: Always report available data before stop_binding.
by Rémi Bernon 01 Nov '21

01 Nov '21

Even if custom protocol handlers call ReportResult in LockRequest. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46213 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/urlmon/binding.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index a74970033b3..708b81194c7 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1177,6 +1177,14 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + /* Make sure we don't call stop_binding before available data has been reported, + as some custom protocol handlers call ReportResult within LockRequest */ + if (!(This->state & BINDING_LOCKED) && hrResult == S_OK) + { + This->download_state = END_DOWNLOAD; + return S_OK; + } + stop_binding(This, hrResult, szResult); IInternetProtocolEx_Terminate(&This->protocol->IInternetProtocolEx_iface, 0); -- 2.33.0

3 3

[PATCH] mshtml: Only treat resource://gre(-resources)/ as special.
by Rémi Bernon 01 Nov '21

01 Nov '21

Instead of everything starting with resource:, some application use the resource: prefix for their internal resources, and we fail to load them. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46213 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index abf05aaa41b..f921acf4dce 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3799,7 +3799,7 @@ static nsresult NSAPI nsIOServiceHook_GetProtocolHandler(nsIIOServiceHook *iface static BOOL is_gecko_special_uri(const char *spec) { - static const char *special_schemes[] = {"chrome:", "data:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; + static const char *special_schemes[] = {"chrome:", "data:", "jar:", "moz-safe-about", "resource://gre/", "resource://gre-resources/", "javascript:", "wyciwyg:"}; unsigned int i; for(i=0; i < ARRAY_SIZE(special_schemes); i++) { -- 2.33.0

2 1

[PATCH] msvcrt: Don't use GetDaylightFlag function in _ftime64.
by Piotr Caban 01 Nov '21

01 Nov '21

The function is not available on current Windows releases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51959 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH vkd3d v2 01/10] vkd3d-shader/hlsl: Introduce a helper for getting numeric types.
by Giovanni Mascellani 01 Nov '21

01 Nov '21

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

5 40

[PATCH] vbscript: Avoid negating SUCCEEDED()
by Michael Stefaniuc 01 Nov '21

01 Nov '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/lex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 09b073fb773..5e81deab6ca 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -237,7 +237,7 @@ static int parse_date_literal(parser_ctx_t *ctx, DATE *ret) rptr[len] = 0; res = VarDateFromStr(rptr, ctx->lcid, 0, ret); heap_free(rptr); - if (!SUCCEEDED(res)) { + if (FAILED(res)) { FIXME("Invalid date literal\n"); return 0; } -- 2.31.1

2 1

[PATCH 1/3] include: Rename LDR_WINE_INTERNAL to LDR_WINE_BUILTIN.
by Zebediah Figura 01 Nov '21

01 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This series makes it possible to use dynamic libraries from an external path without needing to first copy them into a prefix. To do this I used the following configure line on Debian: configure --enable-win64 ZLIB_PE_CFLAGS="$(x86_64-w64-mingw32-pkg-config --cflags zlib)" ZLIB_PE_LIBS="$(x86_64-w64-mingw32-pkg-config --libs zlib)" SYSTEMDLLDIR=/usr/x86_64-w64-mingw32/lib/ I would like to submit patches in the future to allow the use of pkg-config for automatically detecting compile flags and libraries. I would also like to find some way to obviate manual specification of DLL bindirs. dlls/kernel32/kernel_main.c | 2 +- dlls/krnl386.exe16/ne_module.c | 2 +- dlls/ntdll/loader.c | 10 +++++----- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- include/winternl.h | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 89394e16430..83c4ebf2130 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -136,7 +136,7 @@ static BOOL process_attach( HMODULE module ) { LDR_DATA_TABLE_ENTRY *ldr; - if (LdrFindEntryForAddress( GetModuleHandleW( 0 ), &ldr ) || !(ldr->Flags & LDR_WINE_INTERNAL)) + if (LdrFindEntryForAddress( GetModuleHandleW( 0 ), &ldr ) || !(ldr->Flags & LDR_WINE_BUILTIN)) LoadLibraryA( "krnl386.exe16" ); } #endif diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index c26fe778253..108e88e5546 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -982,7 +982,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ return ERROR_FILE_NOT_FOUND; } /* check if module was loaded native */ - if (LdrFindEntryForAddress( main_owner, &ldr ) || !(ldr->Flags & LDR_WINE_INTERNAL)) + if (LdrFindEntryForAddress( main_owner, &ldr ) || !(ldr->Flags & LDR_WINE_BUILTIN)) { FreeLibrary( mod32 ); descr = NULL; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index dd41d6b66d2..26192e48fba 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -988,7 +988,7 @@ static BOOL is_dll_native_subsystem( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_NT_H if (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_NATIVE) return FALSE; if (nt->OptionalHeader.SectionAlignment < page_size) return TRUE; - if (mod->Flags & LDR_WINE_INTERNAL) return TRUE; + if (mod->Flags & LDR_WINE_BUILTIN) return TRUE; if ((imports = RtlImageDirectoryEntryToData( mod->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) @@ -1221,7 +1221,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name wm->ldr.DllBase = hModule; wm->ldr.SizeOfImage = nt->OptionalHeader.SizeOfImage; - wm->ldr.Flags = LDR_DONT_RESOLVE_REFS | (builtin ? LDR_WINE_INTERNAL : 0); + wm->ldr.Flags = LDR_DONT_RESOLVE_REFS | (builtin ? LDR_WINE_BUILTIN : 0); wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; wm->CheckSum = nt->OptionalHeader.CheckSum; @@ -1355,7 +1355,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, reason ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL && reason == DLL_PROCESS_ATTACH) + if (wm->ldr.Flags & LDR_WINE_BUILTIN && reason == DLL_PROCESS_ATTACH) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (!entry) return STATUS_SUCCESS; @@ -3522,7 +3522,7 @@ static void free_modref( WINE_MODREF *wm ) if (!TRACE_ON(module)) TRACE_(loaddll)("Unloaded module %s : %s\n", debugstr_w(wm->ldr.FullDllName.Buffer), - (wm->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native" ); + (wm->ldr.Flags & LDR_WINE_BUILTIN) ? "builtin" : "native" ); free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); @@ -3955,7 +3955,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR } release_address_space(); if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); + if (wm->ldr.Flags & LDR_WINE_BUILTIN) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); process_breakpoint(); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 290639b676b..bfbaeab47c9 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -191,7 +191,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX /* then look for host system exception information */ - if (!module || (module->Flags & LDR_WINE_INTERNAL)) + if (!module || (module->Flags & LDR_WINE_BUILTIN)) { status = unix_funcs->unwind_builtin_dll( type, dispatch, context ); if (status != STATUS_SUCCESS) return status; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ef32eba68b7..8515b176e5d 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -275,7 +275,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX /* then look for host system exception information */ - if (!module || (module->Flags & LDR_WINE_INTERNAL)) + if (!module || (module->Flags & LDR_WINE_BUILTIN)) { status = unix_funcs->unwind_builtin_dll( type, dispatch, context ); diff --git a/include/winternl.h b/include/winternl.h index 7a34629edb0..5da3e010bf0 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3394,7 +3394,7 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT /* these ones is Wine specific */ #define LDR_DONT_RESOLVE_REFS 0x40000000 -#define LDR_WINE_INTERNAL 0x80000000 +#define LDR_WINE_BUILTIN 0x80000000 /* flag for LdrAddRefDll */ #define LDR_ADDREF_DLL_PIN 0x00000001 -- 2.33.0

1 2

[PATCH v2 0/8] winedbg: improve winedbg gdb experience (esp. with esoteric module names)
by Jinoh Kang 01 Nov '21

01 Nov '21

Changelog: v1 -> v2: address review comments so far Jinoh Kang (8): winedbg: crash when allocation fails in packet_realloc(). winedbg: free buffer and return NULL if size==0 in packet_realloc(). winedbg: generalise packet_realloc(), rename to buffer_realloc(). winedbg: Use unsigned int for offset/length in GDB qXfer handler. winedbg: escape special characters in GDB packet reply. winedbg: buffer and escape output of GDB qXfer commands. winedbg: cache GDB qXfer command result for chunked fetching and define handler table. winedbg: Implement GDB qXfer object exec-file. programs/winedbg/gdbproxy.c | 565 ++++++++++++++++++++++++++++-------- 1 file changed, 452 insertions(+), 113 deletions(-) -- 2.31.1

1 8

[PATCH v2 1/5] evr/tests: Test receiving EC_COMPLETE when not connected.
by Zebediah Figura 01 Nov '21

01 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/evr/tests/evr.c | 106 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6a711e30581..8bfeb987352 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -84,6 +84,16 @@ static IBaseFilter *create_evr(void) return filter; } +static IFilterGraph2 *create_graph(void) +{ + IFilterGraph2 *ret; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret); + ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr); + return ret; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -438,6 +448,100 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG expected_code, LONG_PTR expected1, LONG_PTR expected2) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == expected_code) + { + ok(param1 == expected1, "Got param1 %#lx.\n", param1); + ok(param2 == expected2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + return check_event_code(eventsrc, timeout, EC_COMPLETE, S_OK, 0); +} + +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_evr(); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static IMFMediaType * create_video_type(const GUID *subtype) { IMFMediaType *video_type; @@ -2952,6 +3056,8 @@ START_TEST(evr) test_enum_pins(); test_find_pin(); test_pin_info(); + test_unconnected_eos(); + test_default_mixer(); test_default_mixer_type_negotiation(); test_surface_sample(); -- 2.33.0

2 6

[PATCH 1/6] winegstreamer: Implement IWMSyncReader::SetOutputProps().
by Zebediah Figura 01 Nov '21

01 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 3 ++ dlls/winegstreamer/quartz_parser.c | 2 +- dlls/winegstreamer/wm_reader.c | 47 ++++++++++++++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 10 ++++--- dlls/wmvcore/tests/wmvcore.c | 9 +----- 5 files changed, 58 insertions(+), 13 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 9219a86c094..278fc132ccf 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -102,6 +102,7 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format); +bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format); BOOL init_gstreamer(void) DECLSPEC_HIDDEN; @@ -160,5 +161,7 @@ HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps **props); void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); +HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, + IWMOutputMediaProps *props); #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 0862a75b7ef..4e7e22a64ea 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -540,7 +540,7 @@ static bool amt_to_wg_format_video(const AM_MEDIA_TYPE *mt, struct wg_format *fo return false; } -static bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format) +bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format) { memset(format, 0, sizeof(*format)); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 79a89c9a332..21e08b5834f 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -140,6 +140,14 @@ static const struct IWMOutputMediaPropsVtbl output_props_vtbl = output_props_GetConnectionName, }; +static struct output_props *unsafe_impl_from_IWMOutputMediaProps(IWMOutputMediaProps *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &output_props_vtbl); + return impl_from_IWMOutputMediaProps(iface); +} + static IWMOutputMediaProps *output_props_create(const struct wg_format *format) { struct output_props *object; @@ -1382,6 +1390,45 @@ HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output, return *props ? S_OK : E_OUTOFMEMORY; } +HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, + IWMOutputMediaProps *props_iface) +{ + struct output_props *props = unsafe_impl_from_IWMOutputMediaProps(props_iface); + struct wg_format format, pref_format; + struct wm_stream *stream; + + strmbase_dump_media_type(&props->mt); + + if (!amt_to_wg_format(&props->mt, &format)) + { + ERR("Failed to convert media type to winegstreamer format.\n"); + return E_FAIL; + } + + EnterCriticalSection(&reader->cs); + + if (!(stream = get_stream_by_output_number(reader, output))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + wg_parser_stream_get_preferred_format(stream->wg_stream, &pref_format); + if (pref_format.major_type != format.major_type) + { + /* R.U.S.E sets the type of the wrong stream, apparently by accident. */ + LeaveCriticalSection(&reader->cs); + WARN("Major types don't match; returning NS_E_INCOMPATIBLE_FORMAT.\n"); + return NS_E_INCOMPATIBLE_FORMAT; + } + + stream->format = format; + wg_parser_stream_enable(stream->wg_stream, &format); + + LeaveCriticalSection(&reader->cs); + return S_OK; +} + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 54c53dee3bd..f9728211661 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -186,11 +186,13 @@ static HRESULT WINAPI WMSyncReader_OpenStream(IWMSyncReader2 *iface, IStream *st return wm_reader_open_stream(&reader->reader, stream); } -static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps *output) +static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader2 *iface, DWORD output, IWMOutputMediaProps *props) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); - return E_NOTIMPL; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, output %u, props %p.\n", reader, output, props); + + return wm_reader_set_output_props(&reader->reader, output, props); } static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name, diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index ebfdfdf0107..e07e6241a4c 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -789,14 +789,7 @@ static void test_sync_reader_types(void) check_video_type(mt); hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - { - ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); - winetest_pop_context(); - continue; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, 1 - output_number, output_props); if (!i) todo_wine ok(hr == ASF_E_BADMEDIATYPE, "Got hr %#x.\n", hr); -- 2.33.0

2 6

[PATCH 1/8] evr/tests: Move the DirectShow filter tests to a separate file.
by Zebediah Figura 31 Oct '21

31 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/evr/tests/Makefile.in | 3 +- dlls/evr/tests/evr.c | 337 +------------------------------- dlls/evr/tests/filter.c | 390 +++++++++++++++++++++++++++++++++++++ 3 files changed, 394 insertions(+), 336 deletions(-) create mode 100644 dlls/evr/tests/filter.c diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index c5db2226ebc..45440da90e8 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = evr.dll IMPORTS = dxva2 mfplat mfuuid mf strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 C_SRCS = \ - evr.c + evr.c \ + filter.c diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5bf03fa49f8..f56ec156be4 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1,7 +1,7 @@ /* - * Enhanced Video Renderer filter unit tests + * Enhanced Video Renderer mixer and presenter unit tests * - * Copyright 2018 Zebediah Figura + * Copyright 2020-2021 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,8 +29,6 @@ #include "initguid.h" #include "evr9.h" -static const WCHAR sink_id[] = L"EVR Input0"; - static void set_rect(MFVideoNormalizedRect *rect, float left, float top, float right, float bottom) { rect->left = left; @@ -75,15 +73,6 @@ static IDirect3DDevice9 *create_device(HWND focus_window) return device; } -static IBaseFilter *create_evr(void) -{ - IBaseFilter *filter = NULL; - HRESULT hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, NULL, CLSCTX_INPROC_SERVER, - &IID_IBaseFilter, (void **)&filter); - ok(hr == S_OK, "Got hr %#x.\n", hr); - return filter; -} - static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -91,137 +80,6 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } -static const GUID test_iid = {0x33333333}; -static LONG outer_ref = 1; - -static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) -{ - if (IsEqualGUID(iid, &IID_IUnknown) - || IsEqualGUID(iid, &IID_IBaseFilter) - || IsEqualGUID(iid, &test_iid)) - { - *out = (IUnknown *)0xdeadbeef; - return S_OK; - } - ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI outer_AddRef(IUnknown *iface) -{ - return InterlockedIncrement(&outer_ref); -} - -static ULONG WINAPI outer_Release(IUnknown *iface) -{ - return InterlockedDecrement(&outer_ref); -} - -static const IUnknownVtbl outer_vtbl = -{ - outer_QueryInterface, - outer_AddRef, - outer_Release, -}; - -static IUnknown test_outer = {&outer_vtbl}; - -static void test_aggregation(void) -{ - IBaseFilter *filter, *filter2; - IMFVideoPresenter *presenter; - IUnknown *unk, *unk2; - IMFTransform *mixer; - HRESULT hr; - ULONG ref; - - filter = (IBaseFilter *)0xdeadbeef; - hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, &test_outer, CLSCTX_INPROC_SERVER, - &IID_IBaseFilter, (void **)&filter); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - ok(!filter, "Got interface %p.\n", filter); - - hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, &test_outer, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); - ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); - ref = get_refcount(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); - - ref = IUnknown_AddRef(unk); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); - - ref = IUnknown_Release(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); - - hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); - IUnknown_Release(unk2); - - hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); - - hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2); - - hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); - - hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); - - IBaseFilter_Release(filter); - ref = IUnknown_Release(unk); - ok(!ref, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); - - /* Default presenter. */ - presenter = (void *)0xdeadbeef; - hr = CoCreateInstance(&CLSID_MFVideoPresenter9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, - (void **)&presenter); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); - ok(!presenter, "Got interface %p.\n", presenter); - - hr = CoCreateInstance(&CLSID_MFVideoPresenter9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); - ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); - ref = get_refcount(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); - - IUnknown_Release(unk); - } - - /* Default mixer. */ - presenter = (void *)0xdeadbeef; - hr = CoCreateInstance(&CLSID_MFVideoMixer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMFTransform, - (void **)&mixer); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); - ok(!mixer, "Got interface %p.\n", mixer); - - hr = CoCreateInstance(&CLSID_MFVideoMixer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); - ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); - ref = get_refcount(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); - - IUnknown_Release(unk); -} - #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -252,192 +110,6 @@ static void check_service_interface_(unsigned int line, void *iface_ptr, REFGUID IUnknown_Release(unk); } -static void test_interfaces(void) -{ - IBaseFilter *filter = create_evr(); - ULONG ref; - - todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); - check_interface(filter, &IID_IBaseFilter, TRUE); - check_interface(filter, &IID_IEVRFilterConfig, TRUE); - check_interface(filter, &IID_IMediaFilter, TRUE); - check_interface(filter, &IID_IMediaPosition, TRUE); - check_interface(filter, &IID_IMediaSeeking, TRUE); - check_interface(filter, &IID_IPersist, TRUE); - check_interface(filter, &IID_IUnknown, TRUE); - - check_interface(filter, &IID_IBasicAudio, FALSE); - check_interface(filter, &IID_IBasicVideo, FALSE); - check_interface(filter, &IID_IDirectXVideoMemoryConfiguration, FALSE); - check_interface(filter, &IID_IMemInputPin, FALSE); - check_interface(filter, &IID_IPersistPropertyBag, FALSE); - check_interface(filter, &IID_IPin, FALSE); - check_interface(filter, &IID_IReferenceClock, FALSE); - check_interface(filter, &IID_IVideoWindow, FALSE); - - ref = IBaseFilter_Release(filter); - ok(!ref, "Got unexpected refcount %d.\n", ref); -} - -static void test_enum_pins(void) -{ - IBaseFilter *filter = create_evr(); - IEnumPins *enum1, *enum2; - ULONG count, ref; - IPin *pins[2]; - HRESULT hr; - - ref = get_refcount(filter); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); - - hr = IBaseFilter_EnumPins(filter, NULL); - ok(hr == E_POINTER, "Got hr %#x.\n", hr); - - hr = IBaseFilter_EnumPins(filter, &enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ref = get_refcount(filter); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); - ref = get_refcount(enum1); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); - - hr = IEnumPins_Next(enum1, 1, NULL, NULL); - ok(hr == E_POINTER, "Got hr %#x.\n", hr); - - hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ref = get_refcount(filter); - ok(ref == 3, "Got unexpected refcount %d.\n", ref); - ref = get_refcount(pins[0]); - ok(ref == 3, "Got unexpected refcount %d.\n", ref); - ref = get_refcount(enum1); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); - IPin_Release(pins[0]); - ref = get_refcount(filter); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); - - hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - - hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IEnumPins_Next(enum1, 1, pins, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 1, "Got count %u.\n", count); - IPin_Release(pins[0]); - - hr = IEnumPins_Next(enum1, 1, pins, &count); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - ok(!count, "Got count %u.\n", count); - - hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IEnumPins_Next(enum1, 2, pins, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - - hr = IEnumPins_Next(enum1, 2, pins, &count); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - ok(count == 1, "Got count %u.\n", count); - IPin_Release(pins[0]); - - hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IEnumPins_Clone(enum1, &enum2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IEnumPins_Skip(enum1, 2); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - - hr = IEnumPins_Skip(enum1, 1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IEnumPins_Skip(enum1, 1); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - - hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - - hr = IEnumPins_Next(enum2, 1, pins, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - IPin_Release(pins[0]); - - IEnumPins_Release(enum2); - IEnumPins_Release(enum1); - ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); -} - -static void test_find_pin(void) -{ - IBaseFilter *filter = create_evr(); - IEnumPins *enum_pins; - IPin *pin, *pin2; - HRESULT hr; - ULONG ref; - - hr = IBaseFilter_EnumPins(filter, &enum_pins); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IBaseFilter_FindPin(filter, sink_id, &pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); - IPin_Release(pin2); - IPin_Release(pin); - - IEnumPins_Release(enum_pins); - ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); -} - -static void test_pin_info(void) -{ - IBaseFilter *filter = create_evr(); - PIN_DIRECTION dir; - PIN_INFO info; - HRESULT hr; - WCHAR *id; - ULONG ref; - IPin *pin; - - hr = IBaseFilter_FindPin(filter, sink_id, &pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ref = get_refcount(filter); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); - ref = get_refcount(pin); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); - - hr = IPin_QueryPinInfo(pin, &info); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); - ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); - ref = get_refcount(filter); - ok(ref == 3, "Got unexpected refcount %d.\n", ref); - ref = get_refcount(pin); - ok(ref == 3, "Got unexpected refcount %d.\n", ref); - IBaseFilter_Release(info.pFilter); - - hr = IPin_QueryDirection(pin, &dir); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); - - hr = IPin_QueryId(pin, &id); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); - CoTaskMemFree(id); - - hr = IPin_QueryInternalConnections(pin, NULL, NULL); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - - IPin_Release(pin); - ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); -} - static IMFMediaType * create_video_type(const GUID *subtype) { IMFMediaType *video_type; @@ -2768,11 +2440,6 @@ START_TEST(evr) { CoInitialize(NULL); - test_aggregation(); - test_interfaces(); - test_enum_pins(); - test_find_pin(); - test_pin_info(); test_default_mixer(); test_default_mixer_type_negotiation(); test_surface_sample(); diff --git a/dlls/evr/tests/filter.c b/dlls/evr/tests/filter.c new file mode 100644 index 00000000000..4f52dd5c238 --- /dev/null +++ b/dlls/evr/tests/filter.c @@ -0,0 +1,390 @@ +/* + * Enhanced Video Renderer filter unit tests + * + * Copyright 2018 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 + */ + +#define COBJMACROS + +#include "dshow.h" +#include "wine/test.h" +#include "d3d9.h" +#include "evr.h" +#include "evr9.h" + +static const WCHAR sink_id[] = L"EVR Input0"; + +static IBaseFilter *create_evr(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IBaseFilter) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + IBaseFilter *filter, *filter2; + IMFVideoPresenter *presenter; + IUnknown *unk, *unk2; + IMFTransform *mixer; + HRESULT hr; + ULONG ref; + + filter = (IBaseFilter *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!filter, "Got interface %p.\n", filter); + + hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IBaseFilter_Release(filter); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + /* Default presenter. */ + presenter = (void *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_MFVideoPresenter9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, + (void **)&presenter); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(!presenter, "Got interface %p.\n", presenter); + + hr = CoCreateInstance(&CLSID_MFVideoPresenter9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + IUnknown_Release(unk); + } + + /* Default mixer. */ + presenter = (void *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_MFVideoMixer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMFTransform, + (void **)&mixer); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(!mixer, "Got interface %p.\n", mixer); + + hr = CoCreateInstance(&CLSID_MFVideoMixer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + IUnknown_Release(unk); +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_evr(); + ULONG ref; + + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IEVRFilterConfig, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMediaPosition, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IDirectXVideoMemoryConfiguration, FALSE); + check_interface(filter, &IID_IMemInputPin, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got unexpected refcount %d.\n", ref); +} + +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_evr(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[2]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_find_pin(void) +{ + IBaseFilter *filter = create_evr(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_pin_info(void) +{ + IBaseFilter *filter = create_evr(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +START_TEST(filter) +{ + CoInitialize(NULL); + + test_aggregation(); + test_interfaces(); + test_enum_pins(); + test_find_pin(); + test_pin_info(); + + CoUninitialize(); +} -- 2.33.0

4 13

[PATCH] include/commctrl: ListView_SetItemState should be character width agnostic
by David Kahurani 31 Oct '21

31 Oct '21

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- include/commctrl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 41abceb..d67f5f7 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3939,8 +3939,8 @@ typedef struct tagLVITEMINDEX (INT)SNDMSGW((hwnd),LVM_SETITEMW,0,(LPARAM)(const LVITEMW *)(pitem)) #define ListView_SetItem WINELIB_NAME_AW(ListView_SetItem) #define ListView_SetItemState(hwnd,i,data,dataMask) \ -{ LVITEM _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\ - SNDMSG(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEM)&_LVi);} +{ LVITEMW _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\ + SNDMSGW(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEMW)&_LVi);} #define ListView_GetItemState(hwnd,i,mask) \ (UINT)SNDMSG((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) #define ListView_SetCheckState(hwndLV, i, bCheck) \ -- 2.25.1

2 6

[PATCH 7/7] server: use internal paths instead of /proc lookups for inotify
by Damjan Jovanovic 31 Oct '21

31 Oct '21

The inotify code uses the /proc/self/fd/<FD> symlinks to translate file descriptors to filesystem paths. This is Linux-specific and unnecessary, as we already store the paths internally, in our 'struct fd'. Use those instead, which gets the file change notifications to also work on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- server/change.c | 88 ++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 45 deletions(-)

1 0

[PATCH 6/7] ntdll: populate MEMORY_WORKING_SET_EX_INFORMATION on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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

1 0

[PATCH 5/7] ntdll: implement vm counters on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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

1 0

[PATCH 4/7] server: implement vm counters on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

Does not regenerate ./configure or include/config.h. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- configure.ac | 2 ++ include/config.h.in | 6 ++++++ server/Makefile.in | 2 +- server/process.c | 47 +++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 54 insertions(+), 3 deletions(-)

1 0

[PATCH 3/7] ntdll: implement get_device_mount_point() on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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

1 0

[PATCH 2/7] ntdll: implement setting SYSTEM_PERFORMANCE_INFORMATION.IdleTime on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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

1 0

[PATCH 1/7] ntdll: implement setting SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION.IdleTime on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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

1 0

[PATCH 5/5] msdasql: Return valid object from ICommandText Execute.
by Alistair Leslie-Hughes 31 Oct '21

31 Oct '21

Until we query ODBC, we aren't able workout if we need a recordset or not. As a start, always return an interface, this way we can add the required interface for a rowset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 127 +++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 41 +++++++++++ 2 files changed, 166 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 8b96620cc41..61be9e8505f 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -409,12 +409,135 @@ static HRESULT WINAPI command_Cancel(ICommandText *iface) return E_NOTIMPL; } +struct msdasql_rowset +{ + IRowset IRowset_iface; + LONG refs; +}; + +static inline struct msdasql_rowset *impl_from_IRowset( IRowset *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowset_iface ); +} + +static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + + TRACE( "%p, %s, %p\n", rowset, debugstr_guid(riid), ppv ); + + *ppv = NULL; + if(IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IRowset, riid)) + { + *ppv = &rowset->IRowset_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 msdasql_rowset_AddRef(IRowset *iface) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + LONG refs = InterlockedIncrement( &rowset->refs ); + TRACE( "%p new refcount %d\n", rowset, refs ); + return refs; +} + +static ULONG WINAPI msdasql_rowset_Release(IRowset *iface) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + LONG refs = InterlockedDecrement( &rowset->refs ); + TRACE( "%p new refcount %d\n", rowset, refs ); + if (!refs) + { + TRACE( "destroying %p\n", rowset ); + heap_free( rowset ); + } + return refs; +} + +static HRESULT WINAPI msdasql_rowset_AddRefRows(IRowset *iface, DBCOUNTITEM count, + const HROW rows[], DBREFCOUNT ref_counts[], DBROWSTATUS status[]) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + FIXME("%p, %ld, %p, %p, %p\n", rowset, count, rows, ref_counts, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI msdasql_rowset_GetData(IRowset *iface, HROW row, HACCESSOR accessor, void *data) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + FIXME("%p, %ld, %ld, %p\n", rowset, row, accessor, data); + return E_NOTIMPL; +} + +static HRESULT WINAPI msdasql_rowset_GetNextRows(IRowset *iface, HCHAPTER reserved, DBROWOFFSET offset, + DBROWCOUNT count, DBCOUNTITEM *obtained, HROW **rows) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + FIXME("%p, %ld, %ld, %ld, %p, %p\n", rowset, reserved, offset, count, obtained, rows); + return E_NOTIMPL; +} + +static HRESULT WINAPI msdasql_rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM count, + const HROW rows[], DBROWOPTIONS options[], DBREFCOUNT ref_counts[], DBROWSTATUS status[]) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + + FIXME("%p, %ld, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI msdasql_rowset_RestartPosition(IRowset *iface, HCHAPTER reserved) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + FIXME("%p, %ld\n", rowset, reserved); + return E_NOTIMPL; +} + +static const struct IRowsetVtbl msdasql_rowset_vtbl = +{ + msdasql_rowset_QueryInterface, + msdasql_rowset_AddRef, + msdasql_rowset_Release, + msdasql_rowset_AddRefRows, + msdasql_rowset_GetData, + msdasql_rowset_GetNextRows, + msdasql_rowset_ReleaseRows, + msdasql_rowset_RestartPosition +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { struct command *command = impl_from_ICommandText( iface ); - FIXME("%p, %p, %s, %p %p %p\n", command, outer, debugstr_guid(riid), params, affected, rowset); - return E_NOTIMPL; + struct msdasql_rowset *msrowset; + HRESULT hr; + + FIXME("%p, %p, %s, %p %p %p Semi Stub\n", command, outer, debugstr_guid(riid), params, affected, rowset); + + msrowset = heap_alloc(sizeof(*msrowset)); + if (!msrowset) + return E_OUTOFMEMORY; + + msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; + msrowset->refs = 1; + + if (affected) + *affected = 0; /* FIXME */ + + hr = IRowset_QueryInterface(&msrowset->IRowset_iface, riid, (void**)rowset); + IRowset_Release(&msrowset->IRowset_iface); + + return hr; } static HRESULT WINAPI command_GetDBSession(ICommandText *iface, REFIID riid, IUnknown **session) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 35dfeb10d3d..df642a6a637 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -222,6 +222,46 @@ static void test_command_dbsession(IUnknown *cmd, IUnknown *session) ICommandText_Release(comand_text); } +static void test_command_rowset(IUnknown *cmd) +{ + ICommandText *comand_text; + HRESULT hr; + IUnknown *unk = NULL; + IRowset *rowset; + DBROWCOUNT affected; + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); + ok(hr == S_OK, "got 0x%08x\n", hr); + + affected = 9999; + hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(unk == NULL, "Unexepcted value\n"); + todo_wine ok(affected == -1, "got %ld\n", affected); + if (unk) + IUnknown_Release(unk); + + affected = 9999; + hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK && unk) + { + ok(affected == 0, "wrong affected value\n"); + + hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IRowset_Release(rowset); + IUnknown_Release(unk); + } + + ICommandText_Release(comand_text); +} + + static void test_sessions(void) { IDBProperties *props; @@ -298,6 +338,7 @@ static void test_sessions(void) test_command_interfaces(cmd); test_command_text(cmd); test_command_dbsession(cmd, session); + test_command_rowset(cmd); IUnknown_Release(cmd); } -- 2.33.0

1 0

[PATCH 4/5] msdasql: Implement ICommandText GetDBSession
by Alistair Leslie-Hughes 31 Oct '21

31 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 19 +++++++++++++++++-- dlls/msdasql/tests/provider.c | 17 +++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index c0deb32d8ad..8b96620cc41 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -285,6 +285,7 @@ struct command ICommandPrepare ICommandPrepare_iface; LONG refs; WCHAR *query; + IUnknown *session; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -393,6 +394,8 @@ static ULONG WINAPI command_Release(ICommandText *iface) if (!refs) { TRACE( "destroying %p\n", command ); + if (command->session) + IUnknown_Release(command->session); heap_free( command->query ); heap_free( command ); } @@ -417,8 +420,18 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI static HRESULT WINAPI command_GetDBSession(ICommandText *iface, REFIID riid, IUnknown **session) { struct command *command = impl_from_ICommandText( iface ); - FIXME("%p, %s, %p\n", command, debugstr_guid(riid), session); - return E_NOTIMPL; + + TRACE("%p, %s, %p\n", command, debugstr_guid(riid), session); + + if (!session) + return E_INVALIDARG; + + *session = NULL; + + if (!command->session) + return S_FALSE; + + return IUnknown_QueryInterface(command->session, riid, (void**)session);; } static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, LPOLESTR *commandstr) @@ -656,6 +669,8 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; command->refs = 1; + IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); + hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); ICommandText_Release(&command->ICommandText_iface); return hr; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 09a4b69c31d..35dfeb10d3d 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -206,6 +206,22 @@ if (0) ICommandText_Release(comand_text); } +static void test_command_dbsession(IUnknown *cmd, IUnknown *session) +{ + ICommandText *comand_text; + HRESULT hr; + IUnknown *sess; + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_GetDBSession(comand_text, &IID_IUnknown, &sess); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(session == sess, "different session pointers\n"); + + ICommandText_Release(comand_text); +} + static void test_sessions(void) { IDBProperties *props; @@ -281,6 +297,7 @@ static void test_sessions(void) { test_command_interfaces(cmd); test_command_text(cmd); + test_command_dbsession(cmd, session); IUnknown_Release(cmd); } -- 2.33.0

1 0

[PATCH 3/5] msdasql: Implement ICommandText Get/Set CommandText
by Alistair Leslie-Hughes 31 Oct '21

31 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 2 ++ dlls/msdasql/session.c | 35 +++++++++++++++++++++--- dlls/msdasql/tests/provider.c | 50 +++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 79feacb83aa..a2d40e14b96 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index da148fd7ca6..c0deb32d8ad 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "msdasql.h" +#include "oledberr.h" #include "msdasql_private.h" @@ -283,6 +284,7 @@ struct command IConvertType IConvertType_iface; ICommandPrepare ICommandPrepare_iface; LONG refs; + WCHAR *query; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -391,6 +393,7 @@ static ULONG WINAPI command_Release(ICommandText *iface) if (!refs) { TRACE( "destroying %p\n", command ); + heap_free( command->query ); heap_free( command ); } return refs; @@ -421,14 +424,40 @@ static HRESULT WINAPI command_GetDBSession(ICommandText *iface, REFIID riid, IUn static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, LPOLESTR *commandstr) { struct command *command = impl_from_ICommandText( iface ); - FIXME("%p, %p, %p\n", command, dialect, commandstr); - return E_NOTIMPL; + HRESULT hr = S_OK; + TRACE("%p, %p, %p\n", command, dialect, commandstr); + + if (!command->query) + return DB_E_NOCOMMAND; + + if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + hr = DB_S_DIALECTIGNORED; + + *commandstr = heap_alloc((lstrlenW(command->query)+1)*sizeof(WCHAR)); + wcscpy(*commandstr, command->query); + return hr; } static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialect, LPCOLESTR commandstr) { struct command *command = impl_from_ICommandText( iface ); - FIXME("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); + TRACE("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); + + if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + FIXME("Currently non Default Dialect isn't supported\n"); + + heap_free(command->query); + + if (commandstr) + { + command->query = heap_alloc((lstrlenW(commandstr)+1)*sizeof(WCHAR)); + if (!command->query) + return E_OUTOFMEMORY; + + wcscpy(command->query, commandstr); + } + else + command->query = NULL; return S_OK; } diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index bb624bd9848..09a4b69c31d 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -27,12 +27,15 @@ #include "initguid.h" #include "msdasql.h" +#include "oledberr.h" #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); +DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + static BOOL db_created; static char mdbpath[MAX_PATH]; @@ -157,6 +160,52 @@ static void test_command_interfaces(IUnknown *cmd) ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); } +static void test_command_text(IUnknown *cmd) +{ + ICommandText *comand_text; + HRESULT hr; + OLECHAR *str; + GUID dialect; + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); + +if (0) +{ + /* Crashes under windows */ + hr = ICommandText_SetCommandText(comand_text, NULL, L"select * from testing"); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + + hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); + + hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* dialect empty value */ + hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + ok(hr == DB_S_DIALECTIGNORED, "got 0x%08x\n", hr); + ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); + ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); + HeapFree(GetProcessHeap(), 0, str); + + dialect = DBGUID_DEFAULT; + hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); + ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); + HeapFree(GetProcessHeap(), 0, str); + + ICommandText_Release(comand_text); +} + static void test_sessions(void) { IDBProperties *props; @@ -231,6 +280,7 @@ static void test_sessions(void) if (hr == S_OK) { test_command_interfaces(cmd); + test_command_text(cmd); IUnknown_Release(cmd); } -- 2.33.0

1 0

[PATCH 2/5] msdasql: Add ICommandPrepare interface for ICommandText
by Alistair Leslie-Hughes 31 Oct '21

31 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 52 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++-- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 3ee4b72a1d1..da148fd7ca6 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -281,6 +281,7 @@ struct command ICommandProperties ICommandProperties_iface; IColumnsInfo IColumnsInfo_iface; IConvertType IConvertType_iface; + ICommandPrepare ICommandPrepare_iface; LONG refs; }; @@ -304,6 +305,11 @@ static inline struct command *impl_from_IConvertType( IConvertType *iface ) return CONTAINING_RECORD( iface, struct command, IConvertType_iface ); } +static inline struct command *impl_from_ICommandPrepare( ICommandPrepare *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandPrepare_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -329,6 +335,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->IConvertType_iface; } + else if(IsEqualGUID(&IID_ICommandPrepare, riid)) + { + *ppv = &command->ICommandPrepare_iface; + } if(*ppv) { @@ -553,6 +563,47 @@ static struct IConvertTypeVtbl converttypeVtbl = converttype_CanConvert }; +static HRESULT WINAPI commandprepare_QueryInterface(ICommandPrepare *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_ICommandPrepare( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI commandprepare_AddRef(ICommandPrepare *iface) +{ + struct command *command = impl_from_ICommandPrepare( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI commandprepare_Release(ICommandPrepare *iface) +{ + struct command *command = impl_from_ICommandPrepare( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) +{ + struct command *command = impl_from_ICommandPrepare( iface ); + FIXME("%p, %u\n", command, runs); + return E_NOTIMPL; +} + +static HRESULT WINAPI commandprepare_Unprepare(ICommandPrepare *iface) +{ + struct command *command = impl_from_ICommandPrepare( iface ); + FIXME("%p\n", command); + return E_NOTIMPL; +} + +struct ICommandPrepareVtbl commandprepareVtbl = +{ + commandprepare_QueryInterface, + commandprepare_AddRef, + commandprepare_Release, + commandprepare_Prepare, + commandprepare_Unprepare +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -573,6 +624,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandProperties_iface.lpVtbl = &commonpropsVtbl; command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; command->IConvertType_iface.lpVtbl = &converttypeVtbl; + command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; command->refs = 1; hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 7d14928e50b..bb624bd9848 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -134,9 +134,8 @@ static void test_command_interfaces(IUnknown *cmd) IConvertType_Release(convertype); hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - ICommandPrepare_Release(commandprepare); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandPrepare_Release(commandprepare); hr = IUnknown_QueryInterface(cmd, &IID_IColumnsInfo, (void**)&colinfo); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.33.0

1 0

[PATCH 1/5] include: Add more DB_* defines
by Alistair Leslie-Hughes 31 Oct '21

31 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledberr.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/oledberr.h b/include/oledberr.h index c0eccba1e97..1ca5446d06e 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -30,7 +30,17 @@ #define DB_E_BADCHAPTER 0x80040e06 #define DB_E_CANTCONVERTVALUE 0x80040e07 #define DB_E_BADBINDINFO 0x80040e08 - +#define DB_SEC_E_PERMISSIONDENIED 0x80040e09 +#define DB_E_NOTAREFERENCECOLUMN 0x80040e0a +#define DB_E_LIMITREJECTED 0x80040e0b +#define DB_E_NOCOMMAND 0x80040e0c +#define DB_E_COSTLIMIT 0x80040e0d +#define DB_E_BADBOOKMARK 0x80040e0e +#define DB_E_BADLOCKMODE 0x80040e0f +#define DB_E_PARAMNOTOPTIONAL 0x80040e10 +#define DB_E_BADCOLUMNID 0x80040e11 +#define DB_E_BADRATIO 0x80040e12 +#define DB_E_BADVALUES 0x80040e13 #define DB_E_ERRORSINCOMMAND 0x80040e14 #define DB_E_CANTCANCEL 0x80040e15 #define DB_E_DIALECTNOTSUPPORTED 0x80040e16 @@ -86,6 +96,7 @@ #define DB_S_BOOKMARKSKIPPED 0x00040ec3 #define DB_S_NONEXTROWSET 0x00040ec5 #define DB_S_ENDOFROWSET 0x00040ec6 +#define DB_S_DIALECTIGNORED 0x00040ecd #define DB_S_ERRORSOCCURRED 0x00040eda #endif /* __WINE_OLEDBERR_H */ -- 2.33.0

1 0

Add xinputuap.dll
by Yusuf Khan 31 Oct '21

31 Oct '21

2 1

[PATCH] vkd3d-shader: Fix array size for dimension strings
by Joshua Ashton 30 Oct '21

30 Oct '21

Encountered this while I was messing around adding 2DMS support. Signed-off-by: Joshua Ashton <joshua(a)froggi.es> --- libs/vkd3d-shader/hlsl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9bce6be..82c021a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -911,7 +911,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru case HLSL_CLASS_OBJECT: { - static const char dimensions[5][HLSL_SAMPLER_DIM_MAX + 1] = + static const char dimensions[HLSL_SAMPLER_DIM_MAX + 1][5] = { [HLSL_SAMPLER_DIM_1D] = "1D", [HLSL_SAMPLER_DIM_2D] = "2D", -- 2.33.1

2 1

[PATCH] dmime: Parse Wave track stream
by Alistair Leslie-Hughes 30 Oct '21

30 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/dmime_private.h | 6 ++ dlls/dmime/wavetrack.c | 196 ++++++++++++++++++++++++++++++++++++- 2 files changed, 200 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index c2221a15fd2..6ab47292b39 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -86,6 +86,12 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM { DMUS_IO_TEMPO_ITEM item; } DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM; +struct wave_item { + struct list entry; + DMUS_IO_WAVE_TRACK_HEADER header; + IDirectMusicObject *object; +}; + typedef struct _DMUS_PRIVATE_GRAPH_TOOL { struct list entry; /* for listing elements */ DWORD dwIndex; diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 1c6b08b5235..92419729fce 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -20,6 +20,8 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** @@ -32,6 +34,8 @@ typedef struct IDirectMusicWaveTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; + + struct list items; } IDirectMusicWaveTrack; /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ @@ -40,6 +44,11 @@ static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, IDirectMusicTrack8_iface); } +static inline IDirectMusicWaveTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI wave_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { @@ -81,6 +90,19 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + struct list *cursor, *cursor2; + struct wave_item *item; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->items) { + item = LIST_ENTRY(cursor, struct wave_item, entry); + list_remove(cursor); + + if (item->object) + IDirectMusicObject_Release(item->object); + + heap_free(item); + } + HeapFree(GetProcessHeap(), 0, This); DMIME_UnlockModule(); } @@ -280,10 +302,179 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { wave_track_Join }; +static HRESULT parse_wave_item(IDirectMusicWaveTrack *This, IStream *stream, + struct chunk_entry *wave, struct wave_item *item) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = wave}; + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if(chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVE_LIST) + { + struct chunk_entry child = {.parent = &chunk}; + DMUS_IO_WAVE_ITEM_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != DMUS_FOURCC_WAVEITEM_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - rtTime %s\n", wine_dbgstr_longlong(header.rtTime)); + TRACE(" - rtStartOffset %s\n", wine_dbgstr_longlong(header.rtStartOffset)); + TRACE(" - rtReserved %s\n", wine_dbgstr_longlong(header.rtReserved)); + TRACE(" - rtDuration %s\n", wine_dbgstr_longlong(header.rtDuration)); + TRACE(" - dwLoopStart %d\n", header.dwLoopStart); + TRACE(" - dwLoopEnd %d\n", header.dwLoopEnd); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - wVolumeRange %d\n", header.wVolumeRange); + TRACE(" - wPitchRange %d\n", header.wPitchRange); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id == FOURCC_LIST && child.type == DMUS_FOURCC_REF_LIST) + { + struct chunk_entry dmrf = {.parent = &child}; + IDirectMusicGetLoader *getloader; + IDirectMusicLoader *loader; + DMUS_IO_REFERENCE reference; + + if (FAILED(hr = stream_next_chunk(stream, &dmrf))) + return hr; + + if(dmrf.id != DMUS_FOURCC_REF_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &dmrf, &reference, dmrf.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&dmrf)); + return hr; + } + + TRACE("REFERENCE guidClassID %s, dwValidData 0x%08x\n", debugstr_dmguid(&reference.guidClassID), + reference.dwValidData); + + This->dmobj.desc.guidClass = reference.guidClassID; + This->dmobj.desc.dwValidData = DMUS_OBJ_CLASS; + + hr = dmobj_parsedescriptor(stream, &child, &This->dmobj.desc, reference.dwValidData); + if (FAILED(hr)) + return hr; + + dump_DMUS_OBJECTDESC(&This->dmobj.desc); + + hr = IStream_QueryInterface (stream, &IID_IDirectMusicGetLoader, (void**)&getloader); + if (FAILED(hr)) + return hr; + + hr = IDirectMusicGetLoader_GetLoader (getloader, &loader); + if (FAILED(hr)) + return hr; + IDirectMusicGetLoader_Release (getloader); + + hr = IDirectMusicLoader_GetObject (loader, &This->dmobj.desc, &IID_IDirectMusicObject, + (void**)&item->object); + IDirectMusicLoader_Release (loader); + } + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + +static HRESULT parse_wavetrack_list(IDirectMusicWaveTrack *This, IStream *stream, + struct chunk_entry *wave) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = wave}; + struct wave_item *item = NULL; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(wave)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id != DMUS_FOURCC_WAVETRACK_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + item = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct wave_item)); + if (!item) + return E_OUTOFMEMORY; + + list_add_tail (&This->items, &item->entry); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVEPART_LIST) + { + struct chunk_entry child = {.parent = wave}; + DMUS_IO_WAVE_PART_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_WAVEPART_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - dwPChannel %d\n", header.dwPChannel); + TRACE(" - dwLockToPart %d\n", header.dwLockToPart); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - dwIndex %d\n", header.dwIndex); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != FOURCC_LIST || child.type != DMUS_FOURCC_WAVEITEM_LIST) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = parse_wave_item(This, stream, &child, item); + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicWaveTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVETRACK_LIST) + hr = parse_wavetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { @@ -313,6 +504,7 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) dmobject_init(&track->dmobj, &CLSID_DirectMusicWaveTrack, (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + list_init(&track->items); DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); -- 2.33.0

2 1

WWN Patch
by Cressida Silver 30 Oct '21

30 Oct '21

Good Morning, I believe I need to send this to this email. Let me know if I need to try again. Still learning. ;-) -- Cressida (CJ) Silver Technical Writer CodeWeavers, Inc. 700 Raymond Ave, Suite 120 St. Paul, MN 55114

2 1

[PATCH 1/5] d3d10/effect: Remove a cast in IsValid() for SRV variables.
by Nikolay Sivov 29 Oct '21

29 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 22a09f45e14..23374fdb48f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6411,9 +6411,11 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderResource static BOOL STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_IsValid(ID3D10EffectShaderResourceVariable *iface) { - TRACE("iface %p\n", iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderResourceVariable(iface); + + TRACE("iface %p.\n", iface); - return (struct d3d10_effect_variable *)iface != &null_shader_resource_variable; + return v != &null_shader_resource_variable; } static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_GetType( -- 2.33.0

3 12

[PATCH 1/2] server: Clear dr7 before setting other registers.
by Rémi Bernon 29 Oct '21

29 Oct '21

Resetting their length to make sure we pass alignment checks both for their current values and for the new values we'll write. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46472 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- server/ptrace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index bcd0fe48f16..b9dd9e9539a 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -633,8 +633,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign switch (context->machine) { case IMAGE_FILE_MACHINE_I386: - /* Linux 2.6.33+ does DR0-DR3 alignment validation, so it has to know LEN bits first */ - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 & 0xffff0000 ) == -1) goto error; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), 0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.i386_regs.dr0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.i386_regs.dr1 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.i386_regs.dr2 ) == -1) goto error; @@ -646,7 +645,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; break; case IMAGE_FILE_MACHINE_AMD64: - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 & 0xffff0000 ) == -1) goto error; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), 0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.x86_64_regs.dr0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.x86_64_regs.dr1 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.x86_64_regs.dr2 ) == -1) goto error; -- 2.33.0

1 1

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

29 Oct '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- v2: Applied suggestions from review for v1. po/zh_TW.po | 1522 ++++++++++++++++++--------------------------------- 1 file changed, 547 insertions(+), 975 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index b63c99dac3b..27a3db412f0 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-10-27 11:45+0800\n" +"PO-Revision-Date: 2021-10-29 21:40+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -430,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 @@ -4193,7 +4193,7 @@ msgstr "要求未被接受。\n" #: dlls/kernel32/winerror.mc:328 msgid "Redirector paused.\n" -msgstr "已暫停重新導向。\n" +msgstr "重新導向器已暫停。\n" #: dlls/kernel32/winerror.mc:333 msgid "File exists.\n" @@ -5361,7 +5361,7 @@ msgstr "協定無法連線。\n" #: dlls/kernel32/winerror.mc:1803 msgid "Port unreachable.\n" -msgstr "通訊埠無法連線。\n" +msgstr "連接埠無法連線。\n" #: dlls/kernel32/winerror.mc:1808 msgid "Request aborted.\n" @@ -6617,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" @@ -6625,7 +6625,7 @@ msgstr "印表機驅動程式已安裝。\n" #: dlls/kernel32/winerror.mc:3393 msgid "Unknown port.\n" -msgstr "不明通訊埠。\n" +msgstr "不明的連接埠。\n" #: dlls/kernel32/winerror.mc:3398 msgid "Unknown printer driver.\n" @@ -6941,557 +6941,468 @@ msgid "Normal" msgstr "標準" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "代號" +msgstr "Letter" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "代號" +msgstr "Letter Small" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "表格(&T)" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "狀態" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "執行(&E)..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "小" +msgstr "A4 Small" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "記事本" +msgstr "Note" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "Envelope #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "Envelope #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "Envelope #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "Envelope #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "Envelope #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C 尺寸紙張" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D 尺寸紙張" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E 尺寸紙張" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "Envelope DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "Envelope C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "Envelope C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "Envelope C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "Envelope C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "Envelope C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "Envelope B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "Envelope B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "Envelope B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "PKCS 7 封套" +msgstr "Envelope" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "Envelope Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "PKCS 7 封套" +msgstr "6 3/4 Envelope" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "美國標準 Fanfold" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "德國標準 Fanfold" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "德國法定 Fanfold" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "日語" +msgstr "日本明信片" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "Envelope Invite" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "代號" +msgstr "Letter Extra" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "Legal Extra" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "Tabloid Extra" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "其他(&X)" +msgstr "A4 Extra" #: dlls/localspl/localspl.rc:88 msgid "Letter Transverse" -msgstr "" +msgstr "Letter Transverse" #: dlls/localspl/localspl.rc:89 msgid "A4 Transverse" -msgstr "" +msgstr "A4 Transverse" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "Letter Extra Transverse" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "Super A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "Super B" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "代號" +msgstr "Letter Plus" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 Plus" #: dlls/localspl/localspl.rc:95 msgid "A5 Transverse" -msgstr "" +msgstr "A5 Transverse" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) Transverse" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "其他(&X)" +msgstr "A3 Extra" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "其他(&X)" +msgstr "A5 Extra" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) Extra" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 msgid "A3 Transverse" -msgstr "" +msgstr "A3 Transverse" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 Extra Transverse" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "日本雙面明信片" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "日本角形信封 #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "日本角形信封 #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "日本長形信封 #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "日本長形信封 #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Letter 旋轉" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 旋轉" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 旋轉" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 旋轉" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) 旋轉" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) 旋轉" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "日本明信片旋轉" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "日本雙面明信片旋轉" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 旋轉" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "日本角形信封 #2 旋轉" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "日本角形信封 #3 旋轉" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "日本長形信封 #3 旋轉" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "日本長形信封 #4 旋轉" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) 旋轉" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "日本洋形信封 #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "日本洋形信封 #4 旋轉" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "中國 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "中國 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "中國 32K (大)" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "PKCS 7 封套" +msgstr "中國信封 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "中國 16K 旋轉" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "中國 32K 旋轉" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "中國 32K (大) 旋轉" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #1 旋轉" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2 旋轉" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3 旋轉" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4 旋轉" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5 旋轉" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6 旋轉" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7 旋轉" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8 旋轉" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9 旋轉" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10 旋轉" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7516,7 +7427,7 @@ msgstr "設定並列埠" #: dlls/localui/localui.rc:54 msgid "Timeout (seconds)" -msgstr "超時(秒)" +msgstr "超時 (秒)" #: dlls/localui/localui.rc:55 msgid "&Transmission Retry:" @@ -7524,7 +7435,7 @@ msgstr "重試傳送(&T):" #: dlls/localui/localui.rc:32 msgid "'%s' is not a valid port name" -msgstr "%s 不是有效的連接埠名稱" +msgstr "'%s' 不是有效的連接埠名稱" #: dlls/localui/localui.rc:33 msgid "Port %s already exists" @@ -7544,553 +7455,395 @@ msgstr "傳送郵件" #: dlls/mferror/mferror.mc:249 dlls/mferror/mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "已建立開始要求。\n" #: dlls/mferror/mferror.mc:599 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Sink has not been finalized.\n" -msgstr "找不到物件 UUID。\n" +msgstr "接收器尚未結束。\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock was stopped\n" -msgstr "類別已存在。\n" +msgstr "時鐘已停止\n" #: dlls/mferror/mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "不受支援的安裝平臺。\n" +msgstr "Media Foundation 平臺尚未初始化。\n" #: dlls/mferror/mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "位元組數量太小。\n" +msgstr "緩衝區太小。\n" #: dlls/mferror/mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "無效的查詢語法。\n" +msgstr "無效的要求。\n" #: dlls/mferror/mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "無效的資料段編號。\n" +msgstr "無效的資料流號碼。\n" #: dlls/mferror/mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "無效的資料類型。\n" +msgstr "無效的媒體類型。\n" #: dlls/mferror/mferror.mc:67 -#, fuzzy -#| msgid "No more entries.\n" msgid "No more input is accepted.\n" -msgstr "已無更多條目。\n" +msgstr "不接受更多輸入。\n" #: dlls/mferror/mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "找不到物件 UUID。\n" +msgstr "物件未初始化。\n" #: dlls/mferror/mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "操作不受支援。\n" +msgstr "不支援重展示。\n" #: dlls/mferror/mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "建議媒體類型清單中沒有其他類型。\n" #: dlls/mferror/mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的服務。\n" #: dlls/mferror/mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "未預期的網路錯誤。\n" +msgstr "未預期的錯誤。\n" #: dlls/mferror/mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "無效的時間。\n" +msgstr "無效的類型。\n" #: dlls/mferror/mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "無效的像素格式。\n" +msgstr "無效的檔案格式。\n" #: dlls/mferror/mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "無效的時間。\n" +msgstr "無效的時間戳記。\n" #: dlls/mferror/mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的配置。\n" #: dlls/mferror/mferror.mc:151 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported bytestream type.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的位元組流類型。\n" #: dlls/mferror/mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的時間格式。\n" #: dlls/mferror/mferror.mc:165 msgid "Timestamp is not set for the sample.\n" -msgstr "" +msgstr "樣本尚未設定時間戳記。\n" #: dlls/mferror/mferror.mc:172 msgid "No duration set for the sample.\n" -msgstr "" +msgstr "樣本尚未設定持續時間。\n" #: dlls/mferror/mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "無效的資料。\n" +msgstr "無效的資料流資料。\n" #: dlls/mferror/mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "無法使用即時支援。\n" #: dlls/mferror/mferror.mc:193 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的速率。\n" #: dlls/mferror/mferror.mc:200 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported thinning.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的薄切。\n" #: dlls/mferror/mferror.mc:207 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Reversing is not supported.\n" -msgstr "要求不受支援。\n" +msgstr "不支援反向。\n" #: dlls/mferror/mferror.mc:214 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported rate transition.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的速率轉換。\n" #: dlls/mferror/mferror.mc:221 msgid "Rate change was preempted.\n" -msgstr "" +msgstr "速率變更被佔用。\n" #: dlls/mferror/mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "找不到物件 UUID。\n" +msgstr "找不到物件或值。\n" #: dlls/mferror/mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "值不可用。\n" #: dlls/mferror/mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "時鐘不可用。\n" #: dlls/mferror/mferror.mc:263 -#, fuzzy -#| msgid "Extended attributes not supported.\n" msgid "Multiple subscribers are not supported.\n" -msgstr "不支援進階屬性。\n" +msgstr "不支援多訂閱者。\n" #: dlls/mferror/mferror.mc:270 -#, fuzzy -#| msgid "The driver was not enabled." msgid "The timer was orphaned.\n" -msgstr "驅動程式未被啟用。" +msgstr "計時器被孤立。\n" #: dlls/mferror/mferror.mc:277 -#, fuzzy -#| msgid "Character translation table open failed.\n" msgid "State transition is pending.\n" -msgstr "開啟字元翻譯表格時失敗。\n" +msgstr "狀態轉換擱置中。\n" #: dlls/mferror/mferror.mc:284 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported state transition.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的狀態轉換。\n" #: dlls/mferror/mferror.mc:291 -#, fuzzy -#| msgid "A printer error occurred." msgid "Unrecoverable error occurred.\n" -msgstr "印表機發生錯誤。" +msgstr "發生致命錯誤。\n" #: dlls/mferror/mferror.mc:298 msgid "Sample has too many buffers.\n" -msgstr "" +msgstr "樣本包含太多緩衝區。\n" #: dlls/mferror/mferror.mc:305 -#, fuzzy -#| msgid "Temporary directory not writable.\n" msgid "Sample is not writable.\n" -msgstr "無法寫入暫存資料夾。\n" +msgstr "無法寫入樣本。\n" #: dlls/mferror/mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "路徑無效。\n" +msgstr "無效的鍵值。\n" #: dlls/mferror/mferror.mc:319 -#, fuzzy -#| msgid "Wrong stub version.\n" msgid "Bad startup version.\n" -msgstr "錯誤的殘餘版本。\n" +msgstr "錯誤的啟動版本。\n" #: dlls/mferror/mferror.mc:326 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported caption.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的標題。\n" #: dlls/mferror/mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "無效的工作站。\n" +msgstr "無效的位置。\n" #: dlls/mferror/mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "找不到檔案。\n" +msgstr "找不到屬性。\n" #: dlls/mferror/mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許使用屬性類型。\n" #: dlls/mferror/mferror.mc:354 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Property type is not supported.\n" -msgstr "操作不受支援。\n" +msgstr "不支援屬性類型。\n" #: dlls/mferror/mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "目錄不是空的。\n" +msgstr "屬性為空。\n" #: dlls/mferror/mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "目錄不是空的。\n" +msgstr "屬性非空。\n" #: dlls/mferror/mferror.mc:375 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Vector property is not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許使用向量屬性。\n" #: dlls/mferror/mferror.mc:382 msgid "Vector property is required.\n" -msgstr "" +msgstr "需要使用向量屬性。\n" #: dlls/mferror/mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "作業被使用者取消。\n" +msgstr "操作已取消。\n" #: dlls/mferror/mferror.mc:396 -#, fuzzy -#| msgid "Server not disabled.\n" msgid "Bytestream is not seekable.\n" -msgstr "伺服器未停用。\n" +msgstr "找不到位元組流。\n" #: dlls/mferror/mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "平臺已在安全模式下停用。\n" #: dlls/mferror/mferror.mc:410 -#, fuzzy -#| msgid "Cannot create service thread.\n" msgid "Cannot parse bytestream.\n" -msgstr "無法建立服務執行緒。\n" +msgstr "無法解析位元組流。\n" #: dlls/mferror/mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "" +msgstr "互斥的旗標被傳送到來源解析器。\n" #: dlls/mferror/mferror.mc:424 -#, fuzzy -#| msgid "Unknown interface.\n" msgid "Unknown bytestream length.\n" -msgstr "未知的介面。\n" +msgstr "不明位元組流長度。\n" #: dlls/mferror/mferror.mc:431 -#, fuzzy -#| msgid "Invalid index.\n" msgid "Invalid work queue index.\n" -msgstr "無效的索引。\n" +msgstr "無效的工作佇列索引。\n" #: dlls/mferror/mferror.mc:438 -#, fuzzy -#| msgid "No logon servers available.\n" msgid "No events available.\n" -msgstr "沒有可用的登錄伺服器。\n" +msgstr "沒有可用的事件。\n" #: dlls/mferror/mferror.mc:445 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Invalid media source state transition.\n" -msgstr "不受支援的授權等級。\n" +msgstr "無效的媒體來源狀態轉換。\n" #: dlls/mferror/mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "註冊表已復原。\n" +msgstr "到達了媒體流的結尾。\n" #: dlls/mferror/mferror.mc:459 msgid "Shutdown() was called.\n" -msgstr "" +msgstr "Shutdown() 函式已被呼叫。\n" #: dlls/mferror/mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "註冊表已復原。\n" +msgstr "沒有設定媒體流持續時間。\n" #: dlls/mferror/mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "媒體格式已被識別，但格式無效。\n" #: dlls/mferror/mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "找不到屬性集。\n" +msgstr "找不到屬性。\n" #: dlls/mferror/mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "目錄不是空的。\n" +msgstr "屬性為唯讀。\n" #: dlls/mferror/mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許使用屬性。\n" #: dlls/mferror/mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "資源使用中。\n" +msgstr "媒體來源尚未啟動。\n" #: dlls/mferror/mferror.mc:508 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media format.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的媒體格式。\n" #: dlls/mferror/mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "資源使用中。\n" +msgstr "媒體來源狀態錯誤。\n" #: dlls/mferror/mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "偵測不到資料。\n" +msgstr "未選取媒體流。\n" #: dlls/mferror/mferror.mc:529 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media source characteristics.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的媒體來源特性。\n" #: dlls/mferror/mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "資料流接收器已被移除。\n" #: dlls/mferror/mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "資料流接收器不同步。\n" #: dlls/mferror/mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "註冊表已復原。\n" +msgstr "媒體接收器的資料流集已固定。\n" #: dlls/mferror/mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "網域已經存在。\n" +msgstr "資料流接收器已存在。\n" #: dlls/mferror/mferror.mc:564 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Sample allocation was canceled.\n" -msgstr "作業被使用者取消。\n" +msgstr "樣本分配已取消。\n" #: dlls/mferror/mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "目錄不是空的。\n" +msgstr "樣本分配器為空。\n" #: dlls/mferror/mferror.mc:578 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Sink was already stopped.\n" -msgstr "類別已存在。\n" +msgstr "接收器已經停止。\n" #: dlls/mferror/mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "ASF 檔案接收器所接收的位元速率不明。\n" #: dlls/mferror/mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "偵測不到資料。\n" +msgstr "沒有為接收器選取任何資料流。\n" #: dlls/mferror/mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "檔案名稱過長。\n" +msgstr "元資料過長。\n" #: dlls/mferror/mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "接收器未處理任何樣本。\n" #: dlls/mferror/mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "沒有提供必要的標頭給接收器。\n" #: dlls/mferror/mferror.mc:627 -#, fuzzy -#| msgid "Connection invalid.\n" msgid "Optional node is invalid.\n" -msgstr "連線無效。\n" +msgstr "無效的選用節點。\n" #: dlls/mferror/mferror.mc:634 -#, fuzzy -#| msgid "Cannot find the printer." msgid "Cannot find decryptor.\n" -msgstr "找不到印表機。" +msgstr "無法找到解碼器。\n" #: dlls/mferror/mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "找不到模組。\n" +msgstr "無法找到編解碼器。\n" #: dlls/mferror/mferror.mc:648 -#, fuzzy -#| msgid "Cannot get call handle.\n" msgid "Cannot connect topology nodes.\n" -msgstr "無法提取呼叫控柄。\n" +msgstr "無法連線至拓撲節點。\n" #: dlls/mferror/mferror.mc:655 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Topology request is not supported.\n" -msgstr "要求不受支援。\n" +msgstr "不支援拓撲要求。\n" #: dlls/mferror/mferror.mc:662 -#, fuzzy -#| msgid "Invalid group attributes.\n" msgid "Invalid topology time attributes.\n" -msgstr "無效的群組屬性。\n" +msgstr "無效的拓撲時間屬性。\n" #: dlls/mferror/mferror.mc:669 msgid "Found loops in topology.\n" -msgstr "" +msgstr "在拓撲中找到迴圈。\n" #: dlls/mferror/mferror.mc:676 -#, fuzzy -#| msgid "Installation source is missing.\n" msgid "Presentation descriptor is missing.\n" -msgstr "本功能的安裝來源不存在。\n" +msgstr "找不到呈現方式描述項。\n" #: dlls/mferror/mferror.mc:683 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Stream descriptor is missing.\n" -msgstr "索引遺失。\n" +msgstr "找不到資料流描述項。\n" #: dlls/mferror/mferror.mc:690 -#, fuzzy -#| msgid "The device is not connected.\n" msgid "Stream descriptor is not selected.\n" -msgstr "裝置未連接。\n" +msgstr "未選取串流描述項。\n" #: dlls/mferror/mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "索引遺失。\n" +msgstr "找不到來源。\n" #: dlls/mferror/mferror.mc:704 msgid "Topology loader does not support sink activates.\n" -msgstr "" +msgstr "拓撲載入程式不支援接收啟用。\n" #: dlls/mferror/mferror.mc:711 msgid "Clock has no time source set.\n" -msgstr "" +msgstr "時鐘尚未設定時間來源。\n" #: dlls/mferror/mferror.mc:718 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock state was already set.\n" -msgstr "類別已存在。\n" +msgstr "已經設定時鐘狀態。\n" #: dlls/mferror/mferror.mc:725 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not simple\n" -msgstr "沒有可用的說明資訊。" +msgstr "時鐘並不簡單\n" #: dlls/mpr/mpr.rc:35 dlls/wininet/wininet.rc:48 msgid "Enter Network Password" @@ -8126,7 +7879,7 @@ msgstr "聲音選擇" #: dlls/msacm32/msacm32.rc:39 programs/winedbg/winedbg.rc:77 msgid "&Save As..." -msgstr "另存為(&S)..." +msgstr "另存新檔(&S)..." #: dlls/msacm32/msacm32.rc:42 msgid "&Format:" @@ -8146,7 +7899,7 @@ msgstr "超連結資訊" #: dlls/mshtml/mshtml.rc:43 programs/winecfg/winecfg.rc:243 msgid "&Type:" -msgstr "類型(&T)：" +msgstr "類型(&T):" #: dlls/mshtml/mshtml.rc:45 msgid "&URL:" @@ -8154,7 +7907,7 @@ msgstr "網址(&U):" #: dlls/mshtml/mshtml.rc:34 msgid "HTML Document" -msgstr "HTML 檔案" +msgstr "HTML 文件" #: dlls/mshtml/mshtml.rc:29 msgid "Downloading from %s..." @@ -8168,7 +7921,7 @@ msgstr "已完成" msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." -msgstr "無法開啟指定的安裝套件。請檢查檔案路徑後再試。" +msgstr "無法開啟指定的安裝套件。請檢查檔案路徑後再試。" #: dlls/msi/msi.rc:32 msgid "path %s not found" @@ -8212,37 +7965,37 @@ msgid "" msgstr "" "Windows 安裝程式 %s\n" "\n" -"用法：\n" +"用法:\n" "msiexec 命令 {必要參數} [可選參數]\n" "\n" -"安裝產品：\n" +"安裝產品:\n" "\t/i {套件|產品編號} [內容]\n" "\t/package {套件|產品編號} [內容]\n" "\t/a 套件 [內容]\n" -"修復安裝：\n" +"修復安裝:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {套件|產品編號}\n" -"解除安裝產品：\n" +"解除安裝產品:\n" "\t/uninstall {套件|產品編號} [內容]\n" "\t/x {套件|產品編號} [內容]\n" -"通告產品：\n" +"通告產品:\n" "\t/j[u|m] 套件 [/t 變換] [/g 語言識別號]\n" -"套用修補程式：\n" +"套用修補程式:\n" "\t/p 修補套件 [內容]\n" "\t/p 修補套件/a 套件 [內容]\n" "用於以上命令的記錄檔和 UI 修飾鍵：\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] 日誌檔案\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" -"註冊 MSI 服務：\n" +"註冊 MSI 服務:\n" "\t/y\n" "移除註冊 MSI 服務：\n" "\t/z\n" -"顯示這份說明：\n" +"顯示這份說明:\n" "\t/help\n" "\t/?\n" #: dlls/msi/msi.rc:61 msgid "enter which folder contains %s" -msgstr "輸入包含 %s 的檔案夾" +msgstr "輸入包含 %s 的資料夾" #: dlls/msi/msi.rc:62 msgid "install source for feature missing" @@ -8254,335 +8007,271 @@ msgstr "本功能的網路儲存裝置不存在" #: dlls/msi/msi.rc:64 msgid "feature from:" -msgstr "功能來自：" +msgstr "功能來自:" #: dlls/msi/msi.rc:65 msgid "choose which folder contains %s" -msgstr "選擇包含 %s 的檔案夾" +msgstr "選擇包含 %s 的資料夾" #: dlls/msi/msi.rc:66 dlls/shell32/shell32.rc:236 msgid "New Folder" msgstr "新資料夾" #: dlls/msi/msi.rc:91 -#, fuzzy -#| msgid "No registry log space.\n" msgid "Allocating registry space" -msgstr "沒有註冊表記錄檔空間。\n" +msgstr "正在分配註冊表空間" #: dlls/msi/msi.rc:92 -#, fuzzy -#| msgid "Single-instance application.\n" msgid "Searching for installed applications" -msgstr "單一實體應用程式。\n" +msgstr "正在搜尋已安裝的應用程式" #: dlls/msi/msi.rc:93 msgid "Binding executables" -msgstr "" +msgstr "正在繫結可執行檔" #: dlls/msi/msi.rc:94 dlls/msi/msi.rc:137 -#, fuzzy -#| msgid "Searching for %s" msgid "Searching for qualifying products" -msgstr "搜尋 %s" +msgstr "正在搜尋可用的產品" #: dlls/msi/msi.rc:95 dlls/msi/msi.rc:96 dlls/msi/msi.rc:101 msgid "Computing space requirements" -msgstr "" +msgstr "正在計算所需空間" #: dlls/msi/msi.rc:97 -#, fuzzy -#| msgid "New Folder" msgid "Creating folders" -msgstr "新資料夾" +msgstr "正在建立資料夾" #: dlls/msi/msi.rc:98 -#, fuzzy -#| msgid "Create Shor&tcut" msgid "Creating shortcuts" -msgstr "建立捷徑(&T)" +msgstr "正在建立捷徑" #: dlls/msi/msi.rc:99 -#, fuzzy -#| msgid "Exception in service.\n" msgid "Deleting services" -msgstr "服務發生異常。\n" +msgstr "正在刪除服務" #: dlls/msi/msi.rc:100 -#, fuzzy -#| msgid "Creation date" msgid "Creating duplicate files" -msgstr "建立日期" +msgstr "正在建立重複的檔案" #: dlls/msi/msi.rc:102 -#, fuzzy -#| msgid "No associated application.\n" msgid "Searching for related applications" -msgstr "無關聯的應用程式。\n" +msgstr "正在搜尋關聯的應用程式" #: dlls/msi/msi.rc:103 msgid "Copying network install files" -msgstr "" +msgstr "正在複製網路安裝檔案" #: dlls/msi/msi.rc:104 -#, fuzzy -#| msgid "Copying Files..." msgid "Copying new files" -msgstr "複製檔案..." +msgstr "正在複製新檔案" #: dlls/msi/msi.rc:105 -#, fuzzy -#| msgid "Installation of component failed: %08x" msgid "Installing ODBC components" -msgstr "無法安裝組成：%08x" +msgstr "正在安裝 ODBC 元件" #: dlls/msi/msi.rc:106 -#, fuzzy -#| msgid "Installer service failed.\n" msgid "Installing new services" -msgstr "安裝服務失敗。\n" +msgstr "正在安裝新服務" #: dlls/msi/msi.rc:107 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Installing system catalog" -msgstr "安裝/移除" +msgstr "正在安裝系統目錄" #: dlls/msi/msi.rc:108 -#, fuzzy -#| msgid "Wine Application Uninstaller" msgid "Validating install" -msgstr "Wine 應用程式移除程式" +msgstr "正在驗證安裝" #: dlls/msi/msi.rc:109 msgid "Evaluating launch conditions" -msgstr "" +msgstr "正在檢驗啟動條件" #: dlls/msi/msi.rc:110 msgid "Migrating feature states from related applications" -msgstr "" +msgstr "正在從相關應用程式移轉功能狀態" #: dlls/msi/msi.rc:111 -#, fuzzy -#| msgid "Icon files" msgid "Moving files" -msgstr "圖示檔案" +msgstr "正在移動檔案" #: dlls/msi/msi.rc:112 -#, fuzzy -#| msgid "Version information" msgid "Publishing assembly information" -msgstr "版本資訊" +msgstr "正在發佈組合資訊" #: dlls/msi/msi.rc:113 msgid "Unpublishing assembly information" -msgstr "" +msgstr "正在解除發佈組合資訊" #: dlls/msi/msi.rc:114 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "圖示檔案" +msgstr "正在修補檔案" #: dlls/msi/msi.rc:115 msgid "Updating component registration" -msgstr "" +msgstr "正在更新元件登錄" #: dlls/msi/msi.rc:116 msgid "Publishing Qualified Components" -msgstr "" +msgstr "正在發佈合格的元件" #: dlls/msi/msi.rc:117 msgid "Publishing Product Features" -msgstr "" +msgstr "正在發佈產品功能" #: dlls/msi/msi.rc:118 -#, fuzzy -#| msgid "Client Information" msgid "Publishing product information" -msgstr "客戶端資訊" +msgstr "正在發佈產品資訊" #: dlls/msi/msi.rc:119 msgid "Registering Class servers" -msgstr "" +msgstr "正在登錄類別伺服器" #: dlls/msi/msi.rc:120 msgid "Registering COM+ Applications and Components" -msgstr "" +msgstr "正在登錄 COM+ 應用程式和元件" #: dlls/msi/msi.rc:121 msgid "Registering extension servers" -msgstr "" +msgstr "正在登錄延伸伺服器" #: dlls/msi/msi.rc:122 msgid "Registering fonts" -msgstr "" +msgstr "正在登錄字型" #: dlls/msi/msi.rc:123 -#, fuzzy -#| msgid "Registry Editor" msgid "Registering MIME info" -msgstr "註冊表編輯器" +msgstr "正在登錄 MIME 資訊" #: dlls/msi/msi.rc:124 -#, fuzzy -#| msgid "Registry is corrupt.\n" msgid "Registering product" -msgstr "註冊表損毀。\n" +msgstr "正在登錄產品" #: dlls/msi/msi.rc:125 msgid "Registering program identifiers" -msgstr "" +msgstr "正在登錄程式識別碼" #: dlls/msi/msi.rc:126 -#, fuzzy -#| msgid "Type Libraries" msgid "Registering type libraries" -msgstr "類型函式庫" +msgstr "正在登錄型別程式庫" #: dlls/msi/msi.rc:127 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Registering user" -msgstr "資源使用中。\n" +msgstr "正在登錄使用者" #: dlls/msi/msi.rc:128 -#, fuzzy -#| msgid "&Remove doubles" msgid "Removing duplicated files" -msgstr "刪除連續相同的指令(&R)" +msgstr "正在移除重複的檔案" #: dlls/msi/msi.rc:129 dlls/msi/msi.rc:153 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "字型設定套用中" +msgstr "正在更新環境字串" #: dlls/msi/msi.rc:130 -#, fuzzy -#| msgid "&Remove application" msgid "Removing applications" -msgstr "移除程式設定(&R)" +msgstr "正在移除程式" #: dlls/msi/msi.rc:131 -#, fuzzy -#| msgid "Icon files" msgid "Removing files" -msgstr "圖示檔案" +msgstr "正在移除檔案" #: dlls/msi/msi.rc:132 msgid "Removing folders" -msgstr "" +msgstr "正在移除資料夾" #: dlls/msi/msi.rc:133 msgid "Removing INI files entries" -msgstr "" +msgstr "正在移除 INI 檔案項目" #: dlls/msi/msi.rc:134 -#, fuzzy -#| msgid "Domain Component" msgid "Removing ODBC components" -msgstr "區域部分" +msgstr "正在移除 ODBC 元件" #: dlls/msi/msi.rc:135 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Removing system registry values" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "正在移除系統登錄值" #: dlls/msi/msi.rc:136 msgid "Removing shortcuts" -msgstr "" +msgstr "正在移除捷徑" #: dlls/msi/msi.rc:138 msgid "Registering modules" -msgstr "" +msgstr "正在登錄模組" #: dlls/msi/msi.rc:139 msgid "Unregistering modules" -msgstr "" +msgstr "正在解除登錄模組" #: dlls/msi/msi.rc:140 -#, fuzzy -#| msgid "Initializing; " msgid "Initializing ODBC directories" -msgstr "正在初始化；" +msgstr "正在初始化 ODBC 目錄" #: dlls/msi/msi.rc:141 -#, fuzzy -#| msgid "Starting Wordpad failed" msgid "Starting services" -msgstr "啟動 Wordpad 時失敗" +msgstr "正在啟動服務" #: dlls/msi/msi.rc:142 -#, fuzzy -#| msgid "Stopping dependent service: %1\n" msgid "Stopping services" -msgstr "正在停止附屬服務：%1\n" +msgstr "正在停止服務" #: dlls/msi/msi.rc:143 msgid "Unpublishing Qualified Components" -msgstr "" +msgstr "正在解除發佈合格的元件" #: dlls/msi/msi.rc:144 msgid "Unpublishing Product Features" -msgstr "" +msgstr "正在解除發佈產品功能" #: dlls/msi/msi.rc:145 -#, fuzzy -#| msgid "Client Information" msgid "Unpublishing product information" -msgstr "客戶端資訊" +msgstr "正在解除發佈產品資訊" #: dlls/msi/msi.rc:146 msgid "Unregister Class servers" -msgstr "" +msgstr "解除登錄類別伺服器" #: dlls/msi/msi.rc:147 msgid "Unregistering COM+ Applications and Components" -msgstr "" +msgstr "正在解除登錄 COM+ 應用程式和元件" #: dlls/msi/msi.rc:148 msgid "Unregistering extension servers" -msgstr "" +msgstr "正在解除登錄延伸伺服器" #: dlls/msi/msi.rc:149 msgid "Unregistering fonts" -msgstr "" +msgstr "正在解除登錄字型" #: dlls/msi/msi.rc:150 msgid "Unregistering MIME info" -msgstr "" +msgstr "正在解除登錄 MIME 資訊" #: dlls/msi/msi.rc:151 msgid "Unregistering program identifiers" -msgstr "" +msgstr "正在解除登錄程式識別碼" #: dlls/msi/msi.rc:152 msgid "Unregistering type libraries" -msgstr "" +msgstr "正在解除登錄型別程式庫" #: dlls/msi/msi.rc:154 msgid "Writing INI files values" -msgstr "" +msgstr "正在寫入 INI 檔案項目" #: dlls/msi/msi.rc:155 -#, fuzzy -#| msgid "Warning: system library" msgid "Writing system registry values" -msgstr "警告：系統函式庫" +msgstr "正在寫入系統登錄值" #: dlls/msi/msi.rc:161 msgid "Free space: [1]" -msgstr "" +msgstr "可用空間: [1]" #: dlls/msi/msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "屬性: [1]，簽章: [2]" #: dlls/msi/msi.rc:163 msgid "File: [1]" -msgstr "檔案： [1]" +msgstr "檔案: [1]" #: dlls/msi/msi.rc:164 dlls/msi/msi.rc:191 msgid "Folder: [1]" @@ -8590,137 +8279,127 @@ msgstr "資料夾: [1]" #: dlls/msi/msi.rc:165 dlls/msi/msi.rc:194 msgid "Shortcut: [1]" -msgstr "" +msgstr "捷徑: [1]" #: dlls/msi/msi.rc:166 dlls/msi/msi.rc:197 dlls/msi/msi.rc:198 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [1]" -msgstr "裝置(&V)：" +msgstr "服務: [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "檔案: [1]，目錄: [9]，大小: [6]" #: dlls/msi/msi.rc:168 -#, fuzzy -#| msgid "application" msgid "Found application: [1]" -msgstr "應用程式" +msgstr "找到的應用程式: [1]" #: dlls/msi/msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "檔案: [1]，目錄: [9]，大小: [6]" #: dlls/msi/msi.rc:171 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [2]" -msgstr "裝置(&V)：" +msgstr "服務: [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "" +msgstr "檔案: [1]，相依性: [2]" #: dlls/msi/msi.rc:173 -#, fuzzy -#| msgid "Applications" msgid "Application: [1]" -msgstr "應用程式" +msgstr "應用程式: [1]" #: dlls/msi/msi.rc:175 dlls/msi/msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "應用程式內容: [1]，組件名稱: [2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "" +msgstr "檔案: [1]，目錄: [2]，大小: [3]" #: dlls/msi/msi.rc:178 dlls/msi/msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "元件識別碼: [1]，辨識符號: [2]" #: dlls/msi/msi.rc:179 dlls/msi/msi.rc:200 msgid "Feature: [1]" -msgstr "" +msgstr "功能: [1]" #: dlls/msi/msi.rc:180 dlls/msi/msi.rc:201 msgid "Class Id: [1]" -msgstr "" +msgstr "類別識別碼: [1]" #: dlls/msi/msi.rc:181 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "應用程式識別碼: [1]{{，應用程式類型: [2]，使用者: [3]，RSN: [4]}}" #: dlls/msi/msi.rc:182 dlls/msi/msi.rc:203 -#, fuzzy -#| msgid "Extensions Only" msgid "Extension: [1]" -msgstr "只有進階屬性" +msgstr "延伸: [1]" #: dlls/msi/msi.rc:183 dlls/msi/msi.rc:204 msgid "Font: [1]" -msgstr "字型： [1]" +msgstr "字型: [1]" #: dlls/msi/msi.rc:184 dlls/msi/msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "MIME 內容類型: [1]，延伸: [2]" #: dlls/msi/msi.rc:185 dlls/msi/msi.rc:206 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgId: [1]" #: dlls/msi/msi.rc:186 dlls/msi/msi.rc:207 msgid "LibID: [1]" -msgstr "" +msgstr "LibID: [1]" #: dlls/msi/msi.rc:187 dlls/msi/msi.rc:190 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "檔案: [1]，目錄: [9]" #: dlls/msi/msi.rc:188 dlls/msi/msi.rc:208 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "名稱: [1]，值: [2]，動作 [3]" #: dlls/msi/msi.rc:189 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "應用程式: [1]，命令列: [2]" #: dlls/msi/msi.rc:192 dlls/msi/msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "檔案: [1]，區段︰[2]，機碼: [3]，值: [4]" #: dlls/msi/msi.rc:193 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "機碼: [1]，名稱: [2]" #: dlls/msi/msi.rc:195 dlls/msi/msi.rc:196 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "檔案: [1]，資料夾: [2]" #: dlls/msi/msi.rc:202 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppId: [1]{{，AppType: [2]}}" #: dlls/msi/msi.rc:210 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "機碼: [1]，名稱: [2]，值: [3]" #: dlls/msi/msi.rc:72 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{嚴重錯誤: }}" #: dlls/msi/msi.rc:73 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{錯誤 [1]。}}" #: dlls/msi/msi.rc:74 msgid "Warning [1]." -msgstr "" +msgstr "警告 [1]。" #: dlls/msi/msi.rc:75 msgid "Info [1]." -msgstr "" +msgstr "資訊 [1]。" #: dlls/msi/msi.rc:76 msgid "" @@ -8728,6 +8407,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"安裝程式在安裝這個封裝時發生意外的錯誤。" +"這表示這個封裝可能有問題。錯誤碼: [1]。" +"{{引數: [2], [3], [4]}}" #: dlls/msi/msi.rc:77 msgid "{{Disk full: }}" @@ -8735,33 +8417,35 @@ msgstr "{{磁碟已滿： }}" #: dlls/msi/msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "動作 [Time]: [1]。[2]" #: dlls/msi/msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "訊息類型: [1]，引數: [2]{，[3]}" #: dlls/msi/msi.rc:82 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== 開啟記錄時間: [Date] [Time] ===" #: dlls/msi/msi.rc:80 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "動作開始 [Time]: [1]。" #: dlls/msi/msi.rc:81 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "動作結束 [Time]: [1]。傳回的值 [2]。" #: dlls/msi/msi.rc:84 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "請插入磁片: [2]" #: dlls/msi/msi.rc:85 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"找不到來源檔案{{(cabinet)}}: [2]。請確認檔案是否存在，" +"以及您是否有存取它的權限。" #: dlls/msrle32/msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8781,11 +8465,11 @@ msgstr "視訊壓縮" #: dlls/msvfw32/msvfw32.rc:39 msgid "&Compressor:" -msgstr "壓縮器(&C)：" +msgstr "壓縮器(&C):" #: dlls/msvfw32/msvfw32.rc:42 msgid "Con&figure..." -msgstr "組態(&F)..." +msgstr "設定(&F)..." #: dlls/msvfw32/msvfw32.rc:43 msgid "&About" @@ -8793,11 +8477,11 @@ msgstr "關於(&A)" #: dlls/msvfw32/msvfw32.rc:47 msgid "Compression &Quality:" -msgstr "壓縮品質(&Q)：" +msgstr "壓縮品質(&Q):" #: dlls/msvfw32/msvfw32.rc:49 msgid "&Key Frame Every" -msgstr "關鍵影格/每(&K)" +msgstr "畫面間隔(&K)" #: dlls/msvfw32/msvfw32.rc:53 msgid "&Data Rate" @@ -8809,7 +8493,7 @@ msgstr "kB/s" #: dlls/msvfw32/msvfw32.rc:28 msgid "Full Frames (Uncompressed)" -msgstr "完整影格(未壓縮)" +msgstr "完整影格 (未壓縮)" #: dlls/msvidc32/msvidc32.rc:29 msgid "Wine Video 1 video codec" @@ -8833,7 +8517,7 @@ msgstr "捲軸" #: dlls/oleacc/oleacc.rc:35 msgid "grip" -msgstr "握把" +msgstr "底框" #: dlls/oleacc/oleacc.rc:36 msgid "sound" @@ -8845,7 +8529,7 @@ msgstr "游標" #: dlls/oleacc/oleacc.rc:38 msgid "caret" -msgstr "插字符號" +msgstr "插入點" #: dlls/oleacc/oleacc.rc:39 msgid "alert" @@ -8857,11 +8541,11 @@ msgstr "視窗" #: dlls/oleacc/oleacc.rc:41 msgid "client" -msgstr "客戶端" +msgstr "用戶端" #: dlls/oleacc/oleacc.rc:42 msgid "popup menu" -msgstr "彈出式選單" +msgstr "快顯功能表" #: dlls/oleacc/oleacc.rc:43 msgid "menu item" @@ -8893,15 +8577,15 @@ msgstr "對話框" #: dlls/oleacc/oleacc.rc:50 msgid "border" -msgstr "邊框" +msgstr "邊界" #: dlls/oleacc/oleacc.rc:51 msgid "grouping" -msgstr "分組" +msgstr "群組" #: dlls/oleacc/oleacc.rc:52 msgid "separator" -msgstr "分隔線" +msgstr "分隔字元" #: dlls/oleacc/oleacc.rc:53 msgid "tool bar" @@ -8917,15 +8601,15 @@ msgstr "表格" #: dlls/oleacc/oleacc.rc:56 msgid "column header" -msgstr "行首" +msgstr "欄標題" #: dlls/oleacc/oleacc.rc:57 msgid "row header" -msgstr "列首" +msgstr "列標題" #: dlls/oleacc/oleacc.rc:58 msgid "column" -msgstr "行" +msgstr "欄" #: dlls/oleacc/oleacc.rc:59 msgid "row" @@ -8937,11 +8621,11 @@ msgstr "儲存格" #: dlls/oleacc/oleacc.rc:61 msgid "link" -msgstr "鏈結" +msgstr "連結" #: dlls/oleacc/oleacc.rc:62 msgid "help balloon" -msgstr "說明泡泡" +msgstr "說明提示氣球" #: dlls/oleacc/oleacc.rc:63 msgid "character" @@ -8957,15 +8641,15 @@ msgstr "清單項目" #: dlls/oleacc/oleacc.rc:66 msgid "outline" -msgstr "描邊" +msgstr "邊框" #: dlls/oleacc/oleacc.rc:67 msgid "outline item" -msgstr "描邊項目" +msgstr "邊框項目" #: dlls/oleacc/oleacc.rc:68 msgid "page tab" -msgstr "頁面頁標" +msgstr "索引標籤" #: dlls/oleacc/oleacc.rc:69 msgid "property page" @@ -8993,23 +8677,23 @@ msgstr "按鈕" #: dlls/oleacc/oleacc.rc:75 msgid "check button" -msgstr "檢查按鈕" +msgstr "核取按鈕" #: dlls/oleacc/oleacc.rc:76 msgid "radio button" -msgstr "單選按鈕" +msgstr "選項按鈕" #: dlls/oleacc/oleacc.rc:77 msgid "combo box" -msgstr "複合方塊" +msgstr "下拉式方塊" #: dlls/oleacc/oleacc.rc:78 msgid "drop down" -msgstr "下拉選單" +msgstr "下拉" #: dlls/oleacc/oleacc.rc:79 msgid "progress bar" -msgstr "進度條" +msgstr "進度列" #: dlls/oleacc/oleacc.rc:80 msgid "dial" @@ -9021,11 +8705,11 @@ msgstr "快速鍵欄位" #: dlls/oleacc/oleacc.rc:82 msgid "slider" -msgstr "滑動軸" +msgstr "滑桿" #: dlls/oleacc/oleacc.rc:83 msgid "spin box" -msgstr "數值調整框" +msgstr "調整方塊" #: dlls/oleacc/oleacc.rc:84 msgid "diagram" @@ -9053,11 +8737,11 @@ msgstr "格線下拉按鈕" #: dlls/oleacc/oleacc.rc:90 msgid "white space" -msgstr "空白" +msgstr "白色空格" #: dlls/oleacc/oleacc.rc:91 msgid "page tab list" -msgstr "頁面頁標清單" +msgstr "索引標籤清單" #: dlls/oleacc/oleacc.rc:92 msgid "clock" @@ -9073,72 +8757,54 @@ msgstr "IP 位址" #: dlls/oleacc/oleacc.rc:95 msgid "outline button" -msgstr "描邊按鈕" +msgstr "外框按鈕" #: dlls/oleacc/oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "中" +msgstr "一般" #: dlls/oleacc/oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "不得使用" +msgstr "無法使用" #: dlls/oleacc/oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "選擇" +msgstr "已選取" #: dlls/oleacc/oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "已暫停" +msgstr "已設定焦點" #: dlls/oleacc/oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "壓縮(&C)" +msgstr "已按下" #: dlls/oleacc/oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "已核取" #: dlls/oleacc/oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "混雜" +msgstr "已混和" #: dlls/oleacc/oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "唯讀(&R)" +msgstr "唯讀" #: dlls/oleacc/oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "熱門軌段的項目" +msgstr "熱點追蹤" #: dlls/oleacc/oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" msgstr "預設" @@ -9146,31 +8812,29 @@ msgstr "預設" #: dlls/oleacc/oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "已展開" #: dlls/oleacc/oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "已摺疊" #: dlls/oleacc/oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "忙碌" #: dlls/oleacc/oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "飄浮" #: dlls/oleacc/oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "跑馬燈" #: dlls/oleacc/oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" msgstr "動畫" @@ -9178,104 +8842,82 @@ msgstr "動畫" #: dlls/oleacc/oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "隱藏" #: dlls/oleacc/oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "螢幕不可見" #: dlls/oleacc/oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "啟用(&E)" +msgstr "可調大小" #: dlls/oleacc/oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "啟用(&E)" +msgstr "可移動" #: dlls/oleacc/oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "自動發聲" #: dlls/oleacc/oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "已暫停" +msgstr "可設定焦點" #: dlls/oleacc/oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "表格" +msgstr "可選取" #: dlls/oleacc/oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "鏈結" +msgstr "已連結" #: dlls/oleacc/oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "可測定" #: dlls/oleacc/oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "表格" +msgstr "可多重選取" #: dlls/oleacc/oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "請選取檔案。" +msgstr "可擴充選取" #: dlls/oleacc/oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "警示" +msgstr "低度警示" #: dlls/oleacc/oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "警示" +msgstr "中度警示" #: dlls/oleacc/oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "警示" +msgstr "高度警示" #: dlls/oleacc/oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "防止寫入的。\n" +msgstr "保護" #: dlls/oleacc/oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "有快顯" #: dlls/oleaut32/oleaut32.rc:30 programs/oleview/oleview.rc:146 msgid "True" @@ -9294,206 +8936,158 @@ msgid "Off" msgstr "關" #: dlls/oledb32/version.rc:56 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "視訊" +msgstr "提供者" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "請選擇您要使用的格式：" +msgstr "選擇您要連線的資料:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "LAN Connection" msgid "Connection" -msgstr "區域網路連線" +msgstr "連線" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "請選擇您要使用的格式：" +msgstr "指定下列項目以連接至 ODBC 資料:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. 指定資料來源:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "請輸入您的姓名" +msgstr "使用資料來源名稱(&D)" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "重置的連線" +msgstr "使用連線字串(&O)" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "LAN Connection" msgid "&Connection string:" -msgstr "區域網路連線" +msgstr "連線字串(&C):" #: dlls/oledb32/version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "加入(&D)..." +msgstr "建立(&U)..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. 輸入資訊以登入至伺服器" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "使用者名稱(&U)：" +msgstr "使用者名稱(&N):" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "空白頁面(&B)" +msgstr "空白密碼(&B)" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "密碼錯誤。\n" +msgstr "允許儲存密碼(&S)" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. 輸入要使用的初始目錄(&I):" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "重置的連線" +msgstr "測試連線(&T)" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "進階" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "網路分享" +msgstr "網路設定" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "不當的假冒等級。\n" +msgstr "模擬等級(&I):" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "保護等級(&R):" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "已連線" +msgstr "連線:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "&Seconds" msgid "seconds." -msgstr "秒(&S)" +msgstr "秒。" #: dlls/oledb32/version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "成功" +msgstr "存取(&C):" #: dlls/oledb32/version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "全部(&A)" +msgstr "全部" #: dlls/oledb32/version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"這些是此類型資料的初始化內容。要編輯值，請選擇內容，" +"然後選擇下方的 [編輯值]。" #: dlls/oledb32/version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "編輯(&E)..." +msgstr "編輯值(&E)..." #: dlls/oledb32/version.rc:49 -#, fuzzy -#| msgid "Properties" msgid "Data Link Error" -msgstr "屬性" +msgstr "資料連結錯誤" #: dlls/oledb32/version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "請選取檔案。" +msgstr "請選取提供者。" #: dlls/oledb32/version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." -msgstr "" +msgstr "無法再使用提供者。請確保提供者已正確安裝。" #: dlls/oledb32/version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "屬性" +msgstr "資料連結內容" #: dlls/oledb32/version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE 資料庫提供者" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "待命" +msgstr "讀取" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "產品說明：" +msgstr "讀取與寫入" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "共享，不拒絕" #: dlls/oledb32/version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "共享，拒絕讀取" #: dlls/oledb32/version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "共享，拒絕寫入" #: dlls/oledb32/version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "共享，排除" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "I/O 寫入次數" +msgstr "寫入" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -9501,7 +9095,7 @@ msgstr "插入物件" #: dlls/oledlg/oledlg.rc:61 msgid "Object Type:" -msgstr "物件類型：" +msgstr "物件類型:" #: dlls/oledlg/oledlg.rc:64 dlls/oledlg/oledlg.rc:102 msgid "Result" @@ -9509,7 +9103,7 @@ msgstr "結果" #: dlls/oledlg/oledlg.rc:65 msgid "Create New" -msgstr "新增" +msgstr "新建" #: dlls/oledlg/oledlg.rc:67 msgid "Create Control" @@ -9517,7 +9111,7 @@ msgstr "建立控制項" #: dlls/oledlg/oledlg.rc:69 msgid "Create From File" -msgstr "建立於檔案" +msgstr "從檔案建立" #: dlls/oledlg/oledlg.rc:72 msgid "&Add Control..." @@ -9533,7 +9127,7 @@ msgstr "瀏覽..." #: dlls/oledlg/oledlg.rc:76 msgid "File:" -msgstr "檔案：" +msgstr "檔案:" #: dlls/oledlg/oledlg.rc:82 msgid "Paste Special" @@ -9541,7 +9135,7 @@ msgstr "特殊貼上" #: dlls/oledlg/oledlg.rc:85 dlls/setupapi/setupapi.rc:43 msgid "Source:" -msgstr "原始檔案：" +msgstr "原始檔案:" #: dlls/oledlg/oledlg.rc:86 dlls/shdoclc/shdoclc.rc:50 #: dlls/shdoclc/shdoclc.rc:82 dlls/shdoclc/shdoclc.rc:95 @@ -9557,7 +9151,7 @@ msgstr "貼上連結(&L)" #: dlls/oledlg/oledlg.rc:90 msgid "&As:" -msgstr "為(&A)：" +msgstr "為(&A):" #: dlls/oledlg/oledlg.rc:97 msgid "&Display As Icon" @@ -9575,7 +9169,9 @@ msgstr "在您的文件中插入一個新的 %s 物件" msgid "" "Insert the contents of the file as an object into your document so that you " "may activate it using the program which created it." -msgstr "將檔案的內容以物件的方式插入到您的文件以便您可以用程式來啟動它。" +msgstr "" +"將這個檔案的內容以物件的方式插入到您的文件中，" +"以便您使用建立該檔案的程式來啟動它。" #: dlls/oledlg/oledlg.rc:30 dlls/shell32/shell32.rc:195 msgid "Browse" @@ -9585,29 +9181,23 @@ msgstr "瀏覽" msgid "" "File does not appear to be a valid OLE module. Unable to register OLE " "control." -msgstr "該檔案不像是一個有效的 OLE 模組。無法註冊 OLE 元件。" +msgstr "該檔案不像是一個有效的 OLE 模組。無法註冊 OLE 元件。" #: dlls/oledlg/oledlg.rc:32 msgid "Add Control" -msgstr "加入控制項" +msgstr "新增控制項" #: dlls/oledlg/oledlg.rc:35 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "字型(&F)..." +msgstr "轉換(&C)..." #: dlls/oledlg/oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "物件(&O)" +msgstr "%1 %2 物件(&O)" #: dlls/oledlg/oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "物件(&O)" +msgstr "%1 物件(&O)" #: dlls/oledlg/oledlg.rc:33 programs/oleview/oleview.rc:40 msgid "&Object" @@ -9621,13 +9211,15 @@ msgstr "將剪貼簿的內容以 %s 插入至您的檔案。" msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." -msgstr "將剪貼簿的內容插入到您的檔案以便您可以使用 %s。" +msgstr "將剪貼簿的內容插入至您的檔案，以便您可以使用 %s 啟動它。" #: dlls/oledlg/oledlg.rc:43 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." -msgstr "將剪貼簿的內容插入到您的文件以便您可以用 %s 啟動它, 一般顯示為圖示。" +msgstr "" +"將剪貼簿的內容插入至您的檔案，以便您可以使用 %s 啟動它。" +"它將顯示為圖示。" #: dlls/oledlg/oledlg.rc:44 msgid "" @@ -9635,8 +9227,8 @@ msgid "" "linked to the source file so that changes to the file will be reflected in " "your document." msgstr "" -"將剪貼簿的內容以 %s 插入到您的文件。資料是連結到來源檔案的, 對來源檔案的任何" -"變更都會影響到您的文件。" +"將剪貼簿的內容以 %s 插入至您的檔案。資料會連結到來源檔案，" +"以便將所做的變更反應到您的文件。" #: dlls/oledlg/oledlg.rc:45 msgid "" @@ -9644,8 +9236,8 @@ msgid "" "is linked to the source file so that changes to the file will be reflected " "in your document." msgstr "" -"將剪貼簿的圖片插入到您的文件。圖片是連結到來源檔案的, 對來源檔案的任何變更都" -"會影響到您的文件。" +"將剪貼簿的圖片插入到您的文件。圖片會連結到來源檔案，" +"以便將所做的變更反應到您的文件。" #: dlls/oledlg/oledlg.rc:46 msgid "" @@ -9653,8 +9245,8 @@ msgid "" "The shortcut is linked to the source file so that changes to the file will " "be reflected in your document." msgstr "" -"將剪貼簿的捷徑插入到您的檔案。捷徑是連結到來源檔案的, 對來源檔案的任何變更都" -"會影響到您的檔案。" +"將指向剪貼簿內容所在位置的捷徑插入到您的檔案。捷徑會連結到來源檔案，" +"以便將所做的變更反應到您的文件。" #: dlls/oledlg/oledlg.rc:47 msgid "Inserts the contents of the clipboard into your document." @@ -9670,7 +9262,7 @@ msgstr "不明來源" #: dlls/oledlg/oledlg.rc:50 msgid "the program which created it" -msgstr "不明應用程式" +msgstr "建立該檔案的程式" #: dlls/sane.ds/sane.rc:41 msgid "Scanning" @@ -9683,28 +9275,28 @@ msgstr "正在掃描... 請稍候" #: dlls/sane.ds/sane.rc:31 msgctxt "unit: pixels" msgid "px" -msgstr "像素" +msgstr "px" #: dlls/sane.ds/sane.rc:32 msgctxt "unit: bits" msgid "b" -msgstr "位元" +msgstr "b" #: dlls/sane.ds/sane.rc:34 dlls/wineps.drv/wineps.rc:49 #: programs/winecfg/winecfg.rc:182 msgctxt "unit: dots/inch" msgid "dpi" -msgstr "點/英吋" +msgstr "dpi" #: dlls/sane.ds/sane.rc:35 msgctxt "unit: percent" msgid "%" -msgstr "百分比" +msgstr "%" #: dlls/sane.ds/sane.rc:36 msgctxt "unit: microseconds" msgid "us" -msgstr "微秒" +msgstr "µs" #: dlls/serialui/serialui.rc:28 msgid "Settings for %s" @@ -9712,7 +9304,7 @@ msgstr "%s 的設定值" #: dlls/serialui/serialui.rc:31 msgid "Baud Rate" -msgstr "鮑率" +msgstr "傳輸速率" #: dlls/serialui/serialui.rc:33 msgid "Parity" @@ -9732,11 +9324,11 @@ msgstr "停止位元" #: dlls/setupapi/setupapi.rc:39 msgid "Copying Files..." -msgstr "複製檔案..." +msgstr "正在複製檔案..." #: dlls/setupapi/setupapi.rc:45 msgid "Destination:" -msgstr "目標檔案：" +msgstr "目標檔案:" #: dlls/setupapi/setupapi.rc:52 msgid "Files Needed" @@ -9747,36 +9339,36 @@ msgid "" "Insert the manufacturer's installation disk, and then\n" "make sure the correct drive is selected below" msgstr "" -"插入原廠安裝光碟\n" -"並確認選擇了正確的磁碟" +"請插入製造廠商的安裝磁片\n" +"並確認從下方選取了正確的磁碟" #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" -msgstr "複製原廠檔案：" +msgstr "製造廠商的檔案複製來源:" #: dlls/setupapi/setupapi.rc:31 msgid "The file '%1' on %2 is needed" -msgstr "需要檔案 %1 存於 %2" +msgstr "需要 %2 的檔案 '%1'" #: dlls/setupapi/setupapi.rc:32 programs/ipconfig/ipconfig.rc:34 msgid "Unknown" -msgstr "未知" +msgstr "不明" #: dlls/setupapi/setupapi.rc:33 msgid "Copy files from:" -msgstr "從複製檔案：" +msgstr "檔案複製來源:" #: dlls/setupapi/setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." -msgstr "輸入檔案位置，並選擇確認。" +msgstr "輸入檔案所在的路徑，然後按 [確定]。" #: dlls/shdoclc/shdoclc.rc:42 msgid "F&orward" -msgstr "向前(&O)" +msgstr "下一頁(&O)" #: dlls/shdoclc/shdoclc.rc:44 msgid "&Save Background As..." -msgstr "將背景存為(&S)..." +msgstr "另存背景為(&S)..." #: dlls/shdoclc/shdoclc.rc:45 msgid "Set As Back&ground" @@ -9788,7 +9380,7 @@ msgstr "複製背景(&C)" #: dlls/shdoclc/shdoclc.rc:47 msgid "Set as &Desktop Item" -msgstr "設定到桌面(&D)" +msgstr "設定為桌面項目(&D)" #: dlls/shdoclc/shdoclc.rc:52 msgid "Create Shor&tcut" @@ -9867,7 +9459,7 @@ msgstr "複製捷徑(&T)" #: dlls/shdoclc/shdoclc.rc:86 dlls/shdoclc/shdoclc.rc:139 #: dlls/shdoclc/shdoclc.rc:168 dlls/shdoclc/shdoclc.rc:194 msgid "P&roperties" -msgstr "屬性(&R)" +msgstr "內容(&R)" #: dlls/shdoclc/shdoclc.rc:91 dlls/user32/user32.rc:58 msgid "&Undo" @@ -9884,7 +9476,7 @@ msgstr "選擇(&S)" #: dlls/shdoclc/shdoclc.rc:105 msgid "&Cell" -msgstr "格(&C)" +msgstr "儲存格(&C)" #: dlls/shdoclc/shdoclc.rc:106 msgid "&Row" @@ -9900,11 +9492,11 @@ msgstr "表格(&T)" #: dlls/shdoclc/shdoclc.rc:111 msgid "&Cell Properties" -msgstr "格屬性(&C)" +msgstr "儲存格內容(&C)" #: dlls/shdoclc/shdoclc.rc:112 msgid "&Table Properties" -msgstr "表格屬性(&T)" +msgstr "表格內容(&T)" #: dlls/shdoclc/shdoclc.rc:128 msgid "Open in &New Window" @@ -9916,7 +9508,7 @@ msgstr "剪下" #: dlls/shdoclc/shdoclc.rc:155 msgid "&Save Video As..." -msgstr "將視訊另存為(&S)..." +msgstr "另存視訊為(&S)..." #: dlls/shdoclc/shdoclc.rc:166 dlls/shdoclc/shdoclc.rc:190 msgid "Play" @@ -9988,7 +9580,7 @@ msgstr "編輯檢視(&E)" #: dlls/shdoclc/shdoclc.rc:219 dlls/shdoclc/shdoclc.rc:233 msgid "Scroll Here" -msgstr "滾動這裡" +msgstr "捲動到這裡" #: dlls/shdoclc/shdoclc.rc:221 msgid "Top" @@ -10070,7 +9662,7 @@ msgstr "清單(&L)" #: programs/taskmgr/taskmgr.rc:67 programs/taskmgr/taskmgr.rc:112 #: programs/taskmgr/taskmgr.rc:254 msgid "&Details" -msgstr "詳細清單(&D)" +msgstr "詳細資料(&D)" #: dlls/shell32/shell32.rc:51 programs/winefile/winefile.rc:78 msgid "Arrange &Icons" @@ -10119,7 +9711,7 @@ msgstr "新增連結(&L)" #: dlls/shell32/shell32.rc:74 msgid "Properties" -msgstr "屬性" +msgstr "內容" #: dlls/shell32/shell32.rc:85 msgctxt "recycle bin" @@ -10132,7 +9724,7 @@ msgstr "清除(&E)" #: dlls/shell32/shell32.rc:98 msgid "E&xplore" -msgstr "檔案管理員(&X)" +msgstr "瀏覽(&X)" #: dlls/shell32/shell32.rc:101 msgid "C&ut" @@ -10184,7 +9776,7 @@ msgstr "關於 %s" #: dlls/shell32/shell32.rc:321 msgid "Wine &license" -msgstr "使用許可(&L)" +msgstr "Wine 使用許可(&L)" #: dlls/shell32/shell32.rc:326 msgid "Running on %s" @@ -10195,16 +9787,14 @@ msgid "Wine was brought to you by:" msgstr "Wine 開發人員:" #: dlls/shell32/shell32.rc:332 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "執行(&R)..." +msgstr "執行" #: dlls/shell32/shell32.rc:336 msgid "" "Type the name of a program, folder, document, or Internet resource, and Wine " "will open it for you." -msgstr "輸入程式，目錄，檔案或者 Internet 資源名，Wine 將為您開啟它。" +msgstr "輸入程式、資料夾、文件或網際網路資源名稱。Wine 將為您開啟它。" #: dlls/shell32/shell32.rc:337 msgid "&Open:" @@ -10217,32 +9807,26 @@ msgid "&Browse..." msgstr "瀏覽(&B)..." #: dlls/shell32/shell32.rc:353 dlls/shell32/shell32.rc:382 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "檔案類型" +msgstr "檔案類型:" #: dlls/shell32/shell32.rc:357 dlls/shell32/shell32.rc:390 #: dlls/urlmon/urlmon.rc:37 programs/explorer/explorer.rc:33 msgid "Location:" -msgstr "位址：" +msgstr "位置:" #: dlls/shell32/shell32.rc:359 dlls/shell32/shell32.rc:392 #: programs/winefile/winefile.rc:169 msgid "Size:" -msgstr "大小：" +msgstr "大小:" #: dlls/shell32/shell32.rc:363 dlls/shell32/shell32.rc:396 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "建立日期" +msgstr "建立日期:" #: dlls/shell32/shell32.rc:367 dlls/shell32/shell32.rc:404 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "屬性(&A):" +msgstr "屬性:" #: dlls/shell32/shell32.rc:369 dlls/shell32/shell32.rc:406 #: programs/winefile/winefile.rc:173 @@ -10252,31 +9836,23 @@ msgstr "隱藏(&I)" #: dlls/shell32/shell32.rc:370 dlls/shell32/shell32.rc:407 #: programs/winefile/winefile.rc:174 msgid "&Archive" -msgstr "保存(&A)" +msgstr "封存(&A)" #: dlls/shell32/shell32.rc:384 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "開啟：" +msgstr "開啟檔案:" #: dlls/shell32/shell32.rc:387 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "變更圖示(&I)..." +msgstr "變更(&C)..." #: dlls/shell32/shell32.rc:398 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "已修改" +msgstr "上次修改日期:" #: dlls/shell32/shell32.rc:400 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "最後修改：" +msgstr "上次存取日期:" #: dlls/shell32/shell32.rc:138 dlls/shell32/shell32.rc:142 #: programs/winefile/winefile.rc:107 @@ -10324,7 +9900,7 @@ msgstr "我的電腦" #: dlls/shell32/shell32.rc:157 msgid "Control Panel" -msgstr "Wine 控制臺" +msgstr "控制臺" #: dlls/shell32/shell32.rc:164 msgid "Select" @@ -10336,7 +9912,7 @@ msgstr "重新啟動" #: dlls/shell32/shell32.rc:188 msgid "Do you want to simulate a Windows reboot?" -msgstr "您要模擬視窗重新開機？" +msgstr "您確定要模擬 Windows 的重新開機程序嗎?" #: dlls/shell32/shell32.rc:189 msgid "Shutdown" @@ -10344,7 +9920,7 @@ msgstr "關機" #: dlls/shell32/shell32.rc:190 msgid "Do you want to shutdown your Wine session?" -msgstr "您確定要關閉您的 Wine 工作階段嗎？" +msgstr "您確定要關閉您的 Wine 工作階段嗎?" #: dlls/shell32/shell32.rc:201 programs/progman/progman.rc:83 msgid "Programs" @@ -10382,23 +9958,23 @@ msgstr "桌面" #: dlls/shell32/shell32.rc:209 msgid "NetHood" -msgstr "網路上的芳鄰" +msgstr "NetHood" #: dlls/shell32/shell32.rc:210 msgid "Templates" -msgstr "樣板" +msgstr "範本" #: dlls/shell32/shell32.rc:211 msgid "PrintHood" -msgstr "印表套頁" +msgstr "PrintHood" #: dlls/shell32/shell32.rc:212 programs/winhlp32/winhlp32.rc:49 msgid "History" -msgstr "歷程" +msgstr "歷程記錄" #: dlls/shell32/shell32.rc:213 msgid "Program Files" -msgstr "程式檔案" +msgstr "Program Files" #: dlls/shell32/shell32.rc:215 dlls/shell32/shell32.rc:220 msgid "Pictures" @@ -10406,7 +9982,7 @@ msgstr "圖片" #: dlls/shell32/shell32.rc:216 msgid "Common Files" -msgstr "共同檔案" +msgstr "Common Files" #: dlls/shell32/shell32.rc:218 msgid "Administrative Tools" @@ -10414,7 +9990,7 @@ msgstr "系統管理工具" #: dlls/shell32/shell32.rc:214 msgid "Program Files (x86)" -msgstr "程式檔案 (x86)" +msgstr "Program Files (x86)" #: dlls/shell32/shell32.rc:222 msgid "Contacts" @@ -10438,7 +10014,7 @@ msgstr "狀態" #: dlls/shell32/shell32.rc:151 msgid "Model" -msgstr "式樣" +msgstr "型號" #: dlls/shell32/shell32.rc:226 msgid "Sample Music" @@ -10474,31 +10050,31 @@ msgstr "下載" #: dlls/shell32/shell32.rc:167 msgid "Unable to create new Folder: Permission denied." -msgstr "無法建立新的資料夾：權限被拒絕。" +msgstr "無法建立新的資料夾: 權限被拒絕。" #: dlls/shell32/shell32.rc:168 msgid "Error during creation of a new folder" -msgstr "在建立新資料夾的期間發生錯誤" +msgstr "在建立新資料夾時發生錯誤" #: dlls/shell32/shell32.rc:169 msgid "Confirm file deletion" -msgstr "確認檔案的刪除" +msgstr "確認刪除檔案" #: dlls/shell32/shell32.rc:170 msgid "Confirm folder deletion" -msgstr "確認資料夾的刪除" +msgstr "確認刪除資料夾" #: dlls/shell32/shell32.rc:171 msgid "Are you sure you want to delete '%1'?" -msgstr "確定要刪除 %1？" +msgstr "您確定要刪除 '%1' 嗎?" #: dlls/shell32/shell32.rc:172 msgid "Are you sure you want to delete these %1 items?" -msgstr "確定要刪除這 %1 個項目？" +msgstr "您確定要刪除 %1 個項目嗎?" #: dlls/shell32/shell32.rc:179 msgid "Confirm file overwrite" -msgstr "確認檔案的覆寫" +msgstr "確認覆寫檔案" #: dlls/shell32/shell32.rc:178 msgid "" @@ -10506,30 +10082,30 @@ msgid "" "\n" "Do you want to replace it?" msgstr "" -"這個資料夾已經含有名為 %1 的檔案。\n" +"這個資料夾已經含有名為 '%1' 的檔案。\n" "\n" -"您要置換它嗎？" +"您要取代它嗎?" #: dlls/shell32/shell32.rc:173 msgid "Are you sure you want to delete the selected item(s)?" -msgstr "確定要刪除已選項目？" +msgstr "您確定要刪除已選取的項目嗎?" #: dlls/shell32/shell32.rc:175 msgid "" "Are you sure that you want to send '%1' and all its content to the Trash?" -msgstr "您確定要將 %1 和它的所有內容送到回收筒？" +msgstr "您確定要將 '%1' 和它的所有內容送到回收筒嗎?" #: dlls/shell32/shell32.rc:174 msgid "Are you sure that you want to send '%1' to the Trash?" -msgstr "您確定要將 %1 送到回收筒？" +msgstr "您確定要將 '%1' 送到回收筒嗎?" #: dlls/shell32/shell32.rc:176 msgid "Are you sure that you want to send these %1 items to the Trash?" -msgstr "您確定要將這 %1 個項目送到回收筒？" +msgstr "您確定要將 %1 個項目送到回收筒嗎?" #: dlls/shell32/shell32.rc:177 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" -msgstr "項目 %1 未送到回收筒。您要代之以刪除它嗎？" +msgstr "無法將項目 '%1' 送到回收筒。您要改為刪除它嗎?" #: dlls/shell32/shell32.rc:184 msgid "" @@ -10539,25 +10115,23 @@ msgid "" "selected folder they will be replaced. Do you still want to move or copy\n" "the folder?" msgstr "" -"這個資料夾已經含有名為 %1 的資料夾。\n" +"這個資料夾已經含有名為 '%1' 的資料夾。\n" "\n" "如果在目的資料夾中的檔案，和在已選資料夾中\n" -"的檔案同名，那麼它們將被置換。您仍然要移動或複製\n" -"資料夾嗎？" +"的檔案同名，那麼它們將被取代。您仍然要移動或複製\n" +"資料夾嗎?" #: dlls/shell32/shell32.rc:238 msgid "Wine Control Panel" msgstr "Wine 控制臺" #: dlls/shell32/shell32.rc:193 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "無法顯示「執行檔案」對話方塊 (內部錯誤)" +msgstr "無法顯示 [執行] 對話方塊 (內部錯誤)" #: dlls/shell32/shell32.rc:194 msgid "Unable to display Browse dialog box (internal error)" -msgstr "無法顯示「瀏覽」對話方塊 (內部錯誤)" +msgstr "無法顯示 [瀏覽] 對話方塊 (內部錯誤)" #: dlls/shell32/shell32.rc:196 msgid "Executable files (*.exe)" @@ -10565,15 +10139,15 @@ msgstr "可執行檔 (*.exe)" #: dlls/shell32/shell32.rc:242 msgid "There is no Windows program configured to open this type of file." -msgstr "沒有任何 Windows 程式被組配以開啟這種型態的檔案。" +msgstr "沒有設定開啟這種類型的檔案的 Windows 程式。" #: dlls/shell32/shell32.rc:244 msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "您確定希望永久刪除 %1？" +msgstr "您確定要永久刪除 '%1' 嗎?" #: dlls/shell32/shell32.rc:245 msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "您確定希望永久刪除這 %1 個項目？" +msgstr "您確定要永久刪除 %1 個項目嗎?" #: dlls/shell32/shell32.rc:246 msgid "Confirm deletion" @@ -10587,7 +10161,7 @@ msgid "" msgstr "" "檔案已經存在於路徑 %1。\n" "\n" -"您要置換它嗎？" +"您要取代它嗎?" #: dlls/shell32/shell32.rc:248 msgid "" @@ -10597,7 +10171,7 @@ msgid "" msgstr "" "資料夾已經存在於路徑 %1。\n" "\n" -"您要置換它嗎？" +"您要取代它嗎?" #: dlls/shell32/shell32.rc:249 msgid "Confirm overwrite" @@ -10619,16 +10193,16 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine 是自由軟體；您可以遵循由自由軟體基金會發布的 GNU 較寬鬆通用公共授權，再" -"次散布它和/或修改它；您可以採用版本 2.1 的授權，或 (您自行選擇的) 任何後續的" +"Wine 是自由軟體; 您可以遵循由自由軟體基金會發布的 GNU 較寬鬆通用公共授權，再" +"次散布它和/或修改它; 您可以採用版本 2.1 的授權，或 (您自行選擇的) 任何後續的" "版本。\n" "\n" -"Wine 的發行是希望它能夠有用，但是沒有任何擔保；亦無對於某一特定目的之適售性與" +"Wine 的發行是希望它能夠有用，但是沒有任何擔保; 亦無對於某一特定目的之適售性與" "適用性的暗示性擔保。參看 GNU 較寬鬆通用公共授權以獲得更多細節。\n" "\n" -"您應該已收到隨附於 Wine 的 GNU 較寬鬆通用公共授權複本；若無則請寫信到 Free " +"您應該已收到隨附於 Wine 的 GNU 較寬鬆通用公共授權複本; 若無則請寫信到 Free " "Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA " -"02110-1301, USA." +"02110-1301, USA。" #: dlls/shell32/shell32.rc:254 msgid "Wine License" @@ -10646,7 +10220,7 @@ msgstr "錯誤" #: dlls/shlwapi/shlwapi.rc:43 msgid "Don't show me th&is message again" -msgstr "不要再顯示這個訊息" +msgstr "不要再顯示這個訊息(&I)" #: dlls/shlwapi/shlwapi.rc:30 msgid "%d bytes" @@ -10668,10 +10242,8 @@ msgid " sec" msgstr " 秒" #: dlls/twain_32/twain.rc:29 -#, fuzzy -#| msgid "New Folder" msgid "Select Source" -msgstr "新資料夾" +msgstr "選擇來源" #: dlls/tzres/tzres.rc:126 msgid "China Standard Time" -- 2.33.0.windows.2

2 1

[PATCH 0/7] Source info and inline sites
by Eric Pouech 29 Oct '21

29 Oct '21

The following series implements file and file number information for inline sitesi (and cleans up and fixes a couple of issue wrt source information). A+ --- Eric Pouech (7): dbghelp: rename line_info's pc_offset field into address dbghelp: let symt_add_func_line() last parameter be an absolute address dbghelp: in SymGetLine* family, compute displacement relative to line_info's address dbghelp: implement SymGetLineFromInlineContext(W) for inlined frame dbghelp/dwarf: store line numbers and file info for inlined functions dbghelp: silence a couple of C++ oriented requests in SymGetTypeInfo() dbghelp: silence a couple more CV entries dlls/dbghelp/coff.c | 7 +-- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/dwarf.c | 16 ++++++- dlls/dbghelp/msc.c | 7 +-- dlls/dbghelp/stabs.c | 4 +- dlls/dbghelp/symbol.c | 78 ++++++++++++++++++++-------------- dlls/dbghelp/type.c | 22 ++++++++-- 7 files changed, 87 insertions(+), 49 deletions(-)

1 7

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

29 Oct '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 131 +++++++++++++++++++++++++++++- 2 files changed, 130 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..01d5ba67a88 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,12 +16,134 @@ * 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_obj_marshal_wrapper +{ + IUnknown IUnknown_iface; + LONG refcount; + + IUnknown *marshaler; + IUnknown *marshal_object; +}; + +static struct uia_rsrv_obj_marshal_wrapper *impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct uia_rsrv_obj_marshal_wrapper, IUnknown_iface); +} + +static HRESULT WINAPI uia_rsrv_obj_marshal_wrapper_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper = impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(iface); + return IUnknown_QueryInterface(wrapper->marshal_object, riid, ppv); +} + +static ULONG WINAPI uia_rsrv_obj_marshal_wrapper_AddRef(IUnknown *iface) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper = impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI uia_rsrv_obj_marshal_wrapper_Release(IUnknown *iface) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper = impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + if (!refcount) + { + IUnknown_Release(wrapper->marshaler); + heap_free(wrapper); + } + + return refcount; +} + +static const IUnknownVtbl uia_rsrv_obj_marshal_wrapper_vtbl = { + uia_rsrv_obj_marshal_wrapper_QueryInterface, + uia_rsrv_obj_marshal_wrapper_AddRef, + uia_rsrv_obj_marshal_wrapper_Release, +}; + +/* + * When passing the ReservedNotSupportedValue/ReservedMixedAttributeValue + * interface pointers across apartments within the same process, create a free + * threaded marshaler so that the pointer value is preserved. + */ +static HRESULT uia_rsrv_obj_create_marshal_wrapper(IUnknown *reserved, void **ppv) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper; + HRESULT hr; + + TRACE("%p, %p\n", reserved, ppv); + + wrapper = heap_alloc(sizeof(*wrapper)); + if (!wrapper) + return E_OUTOFMEMORY; + + wrapper->IUnknown_iface.lpVtbl = &uia_rsrv_obj_marshal_wrapper_vtbl; + wrapper->marshal_object = reserved; + wrapper->refcount = 1; + + if (FAILED(hr = CoCreateFreeThreadedMarshaler(&wrapper->IUnknown_iface, &wrapper->marshaler))) + { + heap_free(wrapper); + return hr; + } + + hr = IUnknown_QueryInterface(wrapper->marshaler, &IID_IMarshal, ppv); + IUnknown_Release(&wrapper->IUnknown_iface); + + return hr; +} + +/* + * 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)) + return uia_rsrv_obj_create_marshal_wrapper(iface, ppv); + 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 +168,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 4

[PATCH 1/2] evr/mixer: Implement stream rectangle scaling.
by Nikolay Sivov 29 Oct '21

29 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 62 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 631ee1ba645..30b4ed31b3f 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1245,17 +1245,29 @@ static void video_mixer_scale_rect(RECT *rect, unsigned int width, unsigned int } } +static void video_mixer_normalize_rect(const RECT *full, const RECT *part, MFVideoNormalizedRect *ret) +{ + float width = full->right - full->left; + float height = full->bottom - full->top; + + ret->left = (part->left - full->left) / width; + ret->right = (part->right - full->left) / width; + ret->bottom = (part->bottom - full->top) / height; + ret->top = (part->top - full->top) / height; +} + static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) { DXVA2_VideoSample samples[MAX_MIXER_INPUT_STREAMS] = {{ 0 }}; DXVA2_VideoProcessBltParams params = { 0 }; - MFVideoNormalizedRect zoom_rect; + MFVideoNormalizedRect zoom_rect, norm; + unsigned int i, sample_count = 0; + D3DSURFACE_DESC desc, rt_desc; struct input_stream *stream; - D3DSURFACE_DESC desc; HRESULT hr = S_OK; - unsigned int i; + RECT dst; - IDirect3DSurface9_GetDesc(rt, &desc); + IDirect3DSurface9_GetDesc(rt, &rt_desc); if (FAILED(IMFAttributes_GetBlob(mixer->attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&zoom_rect, sizeof(zoom_rect), NULL))) @@ -1264,10 +1276,13 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) zoom_rect.right = zoom_rect.bottom = 1.0f; } - video_mixer_scale_rect(&params.TargetRect, desc.Width, desc.Height, &zoom_rect); + SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); + video_mixer_scale_rect(&dst, rt_desc.Width, rt_desc.Height, &zoom_rect); for (i = 0; i < mixer->input_count; ++i) { + RECT stream_dst, stream_vis; + IDirect3DSurface9 *surface; stream = mixer->zorder[i]; @@ -1280,22 +1295,47 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) IDirect3DSurface9_GetDesc(surface, &desc); - samples[i].SampleFormat.SampleFormat = stream->id == 0 ? DXVA2_SampleProgressiveFrame : DXVA2_SampleSubStream; - samples[i].SrcSurface = surface; - SetRect(&samples[i].SrcRect, 0, 0, desc.Width, desc.Height); - video_mixer_scale_rect(&samples[i].DstRect, desc.Width, desc.Height, &stream->rect); + /* In order to compute source/destination rectangles for each stream: + + * per-stream rectangle is used to get destination rectangle in target coordinates; + * destination per-stream rectangle is clipped with zoom rectangle, applied to target coordinates; + * visible rectangle is scaled back to get source area of the stream that would be visible; + * visible rectangle is scaled back to get destination area in target coordinates for given steam. + + */ + + video_mixer_scale_rect(&stream_dst, rt_desc.Width, rt_desc.Height, &stream->rect); + + /* Part of the stream that's visible after zooming. */ + if (!IntersectRect(&stream_vis, &stream_dst, &dst)) + { + IDirect3DSurface9_Release(surface); + continue; + } + + samples[sample_count].SampleFormat.SampleFormat = stream->id == 0 ? + DXVA2_SampleProgressiveFrame : DXVA2_SampleSubStream; + samples[sample_count].SrcSurface = surface; + + video_mixer_normalize_rect(&stream_dst, &stream_vis, &norm); + video_mixer_scale_rect(&samples[sample_count].SrcRect, desc.Width, desc.Height, &norm); + + video_mixer_normalize_rect(&dst, &stream_vis, &norm); + video_mixer_scale_rect(&samples[sample_count].DstRect, rt_desc.Width, rt_desc.Height, &norm); + + sample_count++; } if (SUCCEEDED(hr)) { if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, - mixer->input_count, NULL))) + sample_count, NULL))) { WARN("Failed to process samples, hr %#x.\n", hr); } } - for (i = 0; i < mixer->input_count; ++i) + for (i = 0; i < sample_count; ++i) { if (samples[i].SrcSurface) IDirect3DSurface9_Release(samples[i].SrcSurface); -- 2.33.0

1 1

[PATCH] dxva2: Remove AYUV from accepted input formats.
by Nikolay Sivov 29 Oct '21

29 Oct '21

It was added for completeness only, and it appears to be not universally support on Windows via regular d3d9 API. DXVA might be using different path to present video frames, but we don't make such distinction at the moment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 3 +-- dlls/dxva2/tests/dxva2.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index f91b033055c..2fab82ff476 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -381,8 +381,7 @@ static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc) { return video_desc->Format == D3DFMT_A8R8G8B8 || video_desc->Format == D3DFMT_X8R8G8B8 || - video_desc->Format == D3DFMT_YUY2 || - video_desc->Format == MAKEFOURCC('A','Y','U','V'); + video_desc->Format == D3DFMT_YUY2; } static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 4b09e93e87a..ab0a2769bd2 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -356,7 +356,9 @@ static void test_device_manager(void) count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) continue; ok(count > 0, "Unexpected device count.\n"); CoTaskMemFree(guids); -- 2.33.0

1 0

[PATCH 1/4] include: Add IMapView interface.
by Jactry Zeng 29 Oct '21

29 Oct '21

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/windows.foundation.collections.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index b0b9430048b..876e15336a2 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -74,6 +74,18 @@ cpp_quote("#endif") namespace Collections { + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(e480ce40-a338-4ada-adcf-272272e48cb9) + ] + interface IMapView<K, V> : IInspectable + { + HRESULT Lookup([in] K key, [out] V *value); + [propget] HRESULT Size([out] unsigned int *size); + HRESULT HasKey([in] K key, [out] boolean *found); + HRESULT Split([out] IMapView<K, V> **first, [out] IMapView<K, V> **second); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(6a79e863-4300-459a-9966-cbb660963ee1) -- 2.33.0

1 3

[PATCH v2 2/6] secur32/tests: Check supported DTLS protocols.
by Hans Leidekker 29 Oct '21

29 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/tests/schannel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index aeb38096f0c..b7f9d409d41 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -203,6 +203,8 @@ static void test_supported_protocols(CredHandle *handle, unsigned exprots) X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client"); X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client"); X(SP_PROT_TLS1_3_CLIENT, "TLS 1.3 client"); + X(SP_PROT_DTLS1_0_CLIENT, "DTLS 1.0 client"); + X(SP_PROT_DTLS1_2_CLIENT, "DTLS 1.2 client"); #undef X if(protocols.grbitProtocol) -- 2.30.2

2 2

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

29 Oct '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- po/zh_TW.po | 1522 ++++++++++++++++++--------------------------------- 1 file changed, 547 insertions(+), 975 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index b63c99dac3b..f3acc38cfd7 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-10-27 11:45+0800\n" +"PO-Revision-Date: 2021-10-28 15:23+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -430,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 @@ -4193,7 +4193,7 @@ msgstr "要求未被接受。\n" #: dlls/kernel32/winerror.mc:328 msgid "Redirector paused.\n" -msgstr "已暫停重新導向。\n" +msgstr "重新導向器已暫停。\n" #: dlls/kernel32/winerror.mc:333 msgid "File exists.\n" @@ -5361,7 +5361,7 @@ msgstr "協定無法連線。\n" #: dlls/kernel32/winerror.mc:1803 msgid "Port unreachable.\n" -msgstr "通訊埠無法連線。\n" +msgstr "連接埠無法連線。\n" #: dlls/kernel32/winerror.mc:1808 msgid "Request aborted.\n" @@ -6617,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" @@ -6625,7 +6625,7 @@ msgstr "印表機驅動程式已安裝。\n" #: dlls/kernel32/winerror.mc:3393 msgid "Unknown port.\n" -msgstr "不明通訊埠。\n" +msgstr "不明的連接埠。\n" #: dlls/kernel32/winerror.mc:3398 msgid "Unknown printer driver.\n" @@ -6941,557 +6941,468 @@ msgid "Normal" msgstr "標準" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "代號" +msgstr "Letter" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "代號" +msgstr "Letter Small" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "表格(&T)" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "狀態" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "執行(&E)..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "小" +msgstr "A4 Small" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "記事本" +msgstr "Note" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "Envelope #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "Envelope #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "Envelope #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "Envelope #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "Envelope #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C 尺寸紙張" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D 尺寸紙張" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E 尺寸紙張" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "Envelope DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "Envelope C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "Envelope C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "Envelope C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "Envelope C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "Envelope C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "Envelope B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "Envelope B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "Envelope B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "PKCS 7 封套" +msgstr "Envelope" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "Envelope Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "PKCS 7 封套" +msgstr "6 3/4 Envelope" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "美國標準 Fanfold" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "德國標準 Fanfold" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "德國法定 Fanfold" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "日語" +msgstr "日本明信片" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "Envelope Invite" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "代號" +msgstr "Letter Extra" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "Legal Extra" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "Tabloid Extra" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "其他(&X)" +msgstr "A4 Extra" #: dlls/localspl/localspl.rc:88 msgid "Letter Transverse" -msgstr "" +msgstr "Letter Transverse" #: dlls/localspl/localspl.rc:89 msgid "A4 Transverse" -msgstr "" +msgstr "A4 Transverse" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "Letter Extra Transverse" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "Super A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "Super B" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "代號" +msgstr "Letter Plus" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 Plus" #: dlls/localspl/localspl.rc:95 msgid "A5 Transverse" -msgstr "" +msgstr "A5 Transverse" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) Transverse" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "其他(&X)" +msgstr "A3 Extra" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "其他(&X)" +msgstr "A5 Extra" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) Extra" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 msgid "A3 Transverse" -msgstr "" +msgstr "A3 Transverse" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 Extra Transverse" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "日本雙面明信片" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "日本角形信封 #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "日本角形信封 #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "日本長形信封 #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "日本長形信封 #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Letter 旋轉" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 旋轉" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 旋轉" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 旋轉" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) 旋轉" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) 旋轉" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "日本明信片旋轉" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "日本雙面明信片旋轉" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 旋轉" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "日本角形信封 #2 旋轉" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "日本角形信封 #3 旋轉" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "日本長形信封 #3 旋轉" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "日本長形信封 #4 旋轉" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) 旋轉" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "日本洋形信封 #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "日本洋形信封 #4 旋轉" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "中國 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "中國 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "PRC 32K (大)" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "PKCS 7 封套" +msgstr "中國信封 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "中國 16K 旋轉" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "中國 32K 旋轉" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "PRC 32K (大) 旋轉" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #1 旋轉" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2 旋轉" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3 旋轉" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4 旋轉" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5 旋轉" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6 旋轉" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7 旋轉" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8 旋轉" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9 旋轉" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10 旋轉" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7516,7 +7427,7 @@ msgstr "設定並列埠" #: dlls/localui/localui.rc:54 msgid "Timeout (seconds)" -msgstr "超時(秒)" +msgstr "超時 (秒)" #: dlls/localui/localui.rc:55 msgid "&Transmission Retry:" @@ -7524,7 +7435,7 @@ msgstr "重試傳送(&T):" #: dlls/localui/localui.rc:32 msgid "'%s' is not a valid port name" -msgstr "%s 不是有效的連接埠名稱" +msgstr "'%s' 不是有效的連接埠名稱" #: dlls/localui/localui.rc:33 msgid "Port %s already exists" @@ -7544,553 +7455,395 @@ msgstr "傳送郵件" #: dlls/mferror/mferror.mc:249 dlls/mferror/mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "已建立開始要求。\n" #: dlls/mferror/mferror.mc:599 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Sink has not been finalized.\n" -msgstr "找不到物件 UUID。\n" +msgstr "接收器尚未結束。\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock was stopped\n" -msgstr "類別已存在。\n" +msgstr "時鐘已停止\n" #: dlls/mferror/mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "不受支援的安裝平臺。\n" +msgstr "Media Foundation 平臺尚未初始化。\n" #: dlls/mferror/mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "位元組數量太小。\n" +msgstr "緩衝區太小。\n" #: dlls/mferror/mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "無效的查詢語法。\n" +msgstr "無效的要求。\n" #: dlls/mferror/mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "無效的資料段編號。\n" +msgstr "無效的資料流號碼。\n" #: dlls/mferror/mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "無效的資料類型。\n" +msgstr "無效的媒體類型。\n" #: dlls/mferror/mferror.mc:67 -#, fuzzy -#| msgid "No more entries.\n" msgid "No more input is accepted.\n" -msgstr "已無更多條目。\n" +msgstr "不接受更多輸入。\n" #: dlls/mferror/mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "找不到物件 UUID。\n" +msgstr "物件未初始化。\n" #: dlls/mferror/mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "操作不受支援。\n" +msgstr "不支援重展示。\n" #: dlls/mferror/mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "建議媒體類型清單中沒有其他類型。\n" #: dlls/mferror/mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的服務。\n" #: dlls/mferror/mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "未預期的網路錯誤。\n" +msgstr "未預期的錯誤。\n" #: dlls/mferror/mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "無效的時間。\n" +msgstr "無效的類型。\n" #: dlls/mferror/mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "無效的像素格式。\n" +msgstr "無效的檔案格式。\n" #: dlls/mferror/mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "無效的時間。\n" +msgstr "無效的時間戳記。\n" #: dlls/mferror/mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的配置。\n" #: dlls/mferror/mferror.mc:151 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported bytestream type.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的位元組流類型。\n" #: dlls/mferror/mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的時間格式。\n" #: dlls/mferror/mferror.mc:165 msgid "Timestamp is not set for the sample.\n" -msgstr "" +msgstr "樣本尚未設定時間戳記。\n" #: dlls/mferror/mferror.mc:172 msgid "No duration set for the sample.\n" -msgstr "" +msgstr "樣本尚未設定持續時間。\n" #: dlls/mferror/mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "無效的資料。\n" +msgstr "無效的資料流資料。\n" #: dlls/mferror/mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "無法使用即時支援。\n" #: dlls/mferror/mferror.mc:193 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的速率。\n" #: dlls/mferror/mferror.mc:200 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported thinning.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的薄切。\n" #: dlls/mferror/mferror.mc:207 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Reversing is not supported.\n" -msgstr "要求不受支援。\n" +msgstr "不支援反向。\n" #: dlls/mferror/mferror.mc:214 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported rate transition.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的速率轉換。\n" #: dlls/mferror/mferror.mc:221 msgid "Rate change was preempted.\n" -msgstr "" +msgstr "速率變更被佔用。\n" #: dlls/mferror/mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "找不到物件 UUID。\n" +msgstr "找不到物件或值。\n" #: dlls/mferror/mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "值不可用。\n" #: dlls/mferror/mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "時鐘不可用。\n" #: dlls/mferror/mferror.mc:263 -#, fuzzy -#| msgid "Extended attributes not supported.\n" msgid "Multiple subscribers are not supported.\n" -msgstr "不支援進階屬性。\n" +msgstr "不支援多訂閱者。\n" #: dlls/mferror/mferror.mc:270 -#, fuzzy -#| msgid "The driver was not enabled." msgid "The timer was orphaned.\n" -msgstr "驅動程式未被啟用。" +msgstr "計時器被孤立。\n" #: dlls/mferror/mferror.mc:277 -#, fuzzy -#| msgid "Character translation table open failed.\n" msgid "State transition is pending.\n" -msgstr "開啟字元翻譯表格時失敗。\n" +msgstr "狀態轉換擱置中。\n" #: dlls/mferror/mferror.mc:284 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported state transition.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的狀態轉換。\n" #: dlls/mferror/mferror.mc:291 -#, fuzzy -#| msgid "A printer error occurred." msgid "Unrecoverable error occurred.\n" -msgstr "印表機發生錯誤。" +msgstr "發生致命錯誤。\n" #: dlls/mferror/mferror.mc:298 msgid "Sample has too many buffers.\n" -msgstr "" +msgstr "樣本包含太多緩衝區。\n" #: dlls/mferror/mferror.mc:305 -#, fuzzy -#| msgid "Temporary directory not writable.\n" msgid "Sample is not writable.\n" -msgstr "無法寫入暫存資料夾。\n" +msgstr "無法寫入樣本。\n" #: dlls/mferror/mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "路徑無效。\n" +msgstr "無效的鍵值。\n" #: dlls/mferror/mferror.mc:319 -#, fuzzy -#| msgid "Wrong stub version.\n" msgid "Bad startup version.\n" -msgstr "錯誤的殘餘版本。\n" +msgstr "錯誤的啟動版本。\n" #: dlls/mferror/mferror.mc:326 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported caption.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的標題。\n" #: dlls/mferror/mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "無效的工作站。\n" +msgstr "無效的位置。\n" #: dlls/mferror/mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "找不到檔案。\n" +msgstr "找不到屬性。\n" #: dlls/mferror/mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許使用屬性類型。\n" #: dlls/mferror/mferror.mc:354 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Property type is not supported.\n" -msgstr "操作不受支援。\n" +msgstr "不支援屬性類型。\n" #: dlls/mferror/mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "目錄不是空的。\n" +msgstr "屬性為空。\n" #: dlls/mferror/mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "目錄不是空的。\n" +msgstr "屬性非空。\n" #: dlls/mferror/mferror.mc:375 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Vector property is not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許使用向量屬性。\n" #: dlls/mferror/mferror.mc:382 msgid "Vector property is required.\n" -msgstr "" +msgstr "需要使用向量屬性。\n" #: dlls/mferror/mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "作業被使用者取消。\n" +msgstr "操作已取消。\n" #: dlls/mferror/mferror.mc:396 -#, fuzzy -#| msgid "Server not disabled.\n" msgid "Bytestream is not seekable.\n" -msgstr "伺服器未停用。\n" +msgstr "找不到位元組流。\n" #: dlls/mferror/mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "平臺已在安全模式下停用。\n" #: dlls/mferror/mferror.mc:410 -#, fuzzy -#| msgid "Cannot create service thread.\n" msgid "Cannot parse bytestream.\n" -msgstr "無法建立服務執行緒。\n" +msgstr "無法解析位元組流。\n" #: dlls/mferror/mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "" +msgstr "互斥的旗標被傳送到來源解析器。\n" #: dlls/mferror/mferror.mc:424 -#, fuzzy -#| msgid "Unknown interface.\n" msgid "Unknown bytestream length.\n" -msgstr "未知的介面。\n" +msgstr "不明位元組流長度。\n" #: dlls/mferror/mferror.mc:431 -#, fuzzy -#| msgid "Invalid index.\n" msgid "Invalid work queue index.\n" -msgstr "無效的索引。\n" +msgstr "無效的工作佇列索引。\n" #: dlls/mferror/mferror.mc:438 -#, fuzzy -#| msgid "No logon servers available.\n" msgid "No events available.\n" -msgstr "沒有可用的登錄伺服器。\n" +msgstr "沒有可用的事件。\n" #: dlls/mferror/mferror.mc:445 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Invalid media source state transition.\n" -msgstr "不受支援的授權等級。\n" +msgstr "無效的媒體來源狀態轉換。\n" #: dlls/mferror/mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "註冊表已復原。\n" +msgstr "到達了媒體流的結尾。\n" #: dlls/mferror/mferror.mc:459 msgid "Shutdown() was called.\n" -msgstr "" +msgstr "Shutdown() 函式已被呼叫。\n" #: dlls/mferror/mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "註冊表已復原。\n" +msgstr "沒有設定媒體流持續時間。\n" #: dlls/mferror/mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "媒體格式已被識別，但格式無效。\n" #: dlls/mferror/mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "找不到屬性集。\n" +msgstr "找不到屬性。\n" #: dlls/mferror/mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "目錄不是空的。\n" +msgstr "屬性為唯讀。\n" #: dlls/mferror/mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許使用屬性。\n" #: dlls/mferror/mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "資源使用中。\n" +msgstr "媒體來源尚未啟動。\n" #: dlls/mferror/mferror.mc:508 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media format.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的媒體格式。\n" #: dlls/mferror/mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "資源使用中。\n" +msgstr "媒體來源狀態錯誤。\n" #: dlls/mferror/mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "偵測不到資料。\n" +msgstr "未選取媒體流。\n" #: dlls/mferror/mferror.mc:529 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media source characteristics.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的媒體來源特性。\n" #: dlls/mferror/mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "資料流接收器已被移除。\n" #: dlls/mferror/mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "資料流接收器不同步。\n" #: dlls/mferror/mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "註冊表已復原。\n" +msgstr "媒體接收器的資料流集已固定。\n" #: dlls/mferror/mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "網域已經存在。\n" +msgstr "資料流接收器已存在。\n" #: dlls/mferror/mferror.mc:564 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Sample allocation was canceled.\n" -msgstr "作業被使用者取消。\n" +msgstr "樣本分配已取消。\n" #: dlls/mferror/mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "目錄不是空的。\n" +msgstr "樣本分配器為空。\n" #: dlls/mferror/mferror.mc:578 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Sink was already stopped.\n" -msgstr "類別已存在。\n" +msgstr "接收器已經停止。\n" #: dlls/mferror/mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "ASF 檔案接收器所接收的位元速率不明。\n" #: dlls/mferror/mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "偵測不到資料。\n" +msgstr "沒有為接收器選取任何資料流。\n" #: dlls/mferror/mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "檔案名稱過長。\n" +msgstr "元資料過長。\n" #: dlls/mferror/mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "接收器未處理任何樣本。\n" #: dlls/mferror/mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "沒有提供必要的標頭給接收器。\n" #: dlls/mferror/mferror.mc:627 -#, fuzzy -#| msgid "Connection invalid.\n" msgid "Optional node is invalid.\n" -msgstr "連線無效。\n" +msgstr "無效的選用節點。\n" #: dlls/mferror/mferror.mc:634 -#, fuzzy -#| msgid "Cannot find the printer." msgid "Cannot find decryptor.\n" -msgstr "找不到印表機。" +msgstr "無法找到解碼器。\n" #: dlls/mferror/mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "找不到模組。\n" +msgstr "無法找到編解碼器。\n" #: dlls/mferror/mferror.mc:648 -#, fuzzy -#| msgid "Cannot get call handle.\n" msgid "Cannot connect topology nodes.\n" -msgstr "無法提取呼叫控柄。\n" +msgstr "無法連線至拓撲節點。\n" #: dlls/mferror/mferror.mc:655 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Topology request is not supported.\n" -msgstr "要求不受支援。\n" +msgstr "不支援拓撲要求。\n" #: dlls/mferror/mferror.mc:662 -#, fuzzy -#| msgid "Invalid group attributes.\n" msgid "Invalid topology time attributes.\n" -msgstr "無效的群組屬性。\n" +msgstr "無效的拓撲時間屬性。\n" #: dlls/mferror/mferror.mc:669 msgid "Found loops in topology.\n" -msgstr "" +msgstr "在拓撲中找到迴圈。\n" #: dlls/mferror/mferror.mc:676 -#, fuzzy -#| msgid "Installation source is missing.\n" msgid "Presentation descriptor is missing.\n" -msgstr "本功能的安裝來源不存在。\n" +msgstr "找不到呈現方式描述項。\n" #: dlls/mferror/mferror.mc:683 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Stream descriptor is missing.\n" -msgstr "索引遺失。\n" +msgstr "找不到資料流描述項。\n" #: dlls/mferror/mferror.mc:690 -#, fuzzy -#| msgid "The device is not connected.\n" msgid "Stream descriptor is not selected.\n" -msgstr "裝置未連接。\n" +msgstr "未選取串流描述項。\n" #: dlls/mferror/mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "索引遺失。\n" +msgstr "找不到來源。\n" #: dlls/mferror/mferror.mc:704 msgid "Topology loader does not support sink activates.\n" -msgstr "" +msgstr "拓撲載入程式不支援接收啟用。\n" #: dlls/mferror/mferror.mc:711 msgid "Clock has no time source set.\n" -msgstr "" +msgstr "時鐘尚未設定時間來源。\n" #: dlls/mferror/mferror.mc:718 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock state was already set.\n" -msgstr "類別已存在。\n" +msgstr "已經設定時鐘狀態。\n" #: dlls/mferror/mferror.mc:725 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not simple\n" -msgstr "沒有可用的說明資訊。" +msgstr "時鐘並不簡單\n" #: dlls/mpr/mpr.rc:35 dlls/wininet/wininet.rc:48 msgid "Enter Network Password" @@ -8126,7 +7879,7 @@ msgstr "聲音選擇" #: dlls/msacm32/msacm32.rc:39 programs/winedbg/winedbg.rc:77 msgid "&Save As..." -msgstr "另存為(&S)..." +msgstr "另存新檔(&S)..." #: dlls/msacm32/msacm32.rc:42 msgid "&Format:" @@ -8146,7 +7899,7 @@ msgstr "超連結資訊" #: dlls/mshtml/mshtml.rc:43 programs/winecfg/winecfg.rc:243 msgid "&Type:" -msgstr "類型(&T)：" +msgstr "類型(&T):" #: dlls/mshtml/mshtml.rc:45 msgid "&URL:" @@ -8154,7 +7907,7 @@ msgstr "網址(&U):" #: dlls/mshtml/mshtml.rc:34 msgid "HTML Document" -msgstr "HTML 檔案" +msgstr "HTML 文件" #: dlls/mshtml/mshtml.rc:29 msgid "Downloading from %s..." @@ -8168,7 +7921,7 @@ msgstr "已完成" msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." -msgstr "無法開啟指定的安裝套件。請檢查檔案路徑後再試。" +msgstr "無法開啟指定的安裝套件。請檢查檔案路徑後再試。" #: dlls/msi/msi.rc:32 msgid "path %s not found" @@ -8212,37 +7965,37 @@ msgid "" msgstr "" "Windows 安裝程式 %s\n" "\n" -"用法：\n" +"用法:\n" "msiexec 命令 {必要參數} [可選參數]\n" "\n" -"安裝產品：\n" +"安裝產品:\n" "\t/i {套件|產品編號} [內容]\n" "\t/package {套件|產品編號} [內容]\n" "\t/a 套件 [內容]\n" -"修復安裝：\n" +"修復安裝:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {套件|產品編號}\n" -"解除安裝產品：\n" +"解除安裝產品:\n" "\t/uninstall {套件|產品編號} [內容]\n" "\t/x {套件|產品編號} [內容]\n" -"通告產品：\n" +"通告產品:\n" "\t/j[u|m] 套件 [/t 變換] [/g 語言識別號]\n" -"套用修補程式：\n" +"套用修補程式:\n" "\t/p 修補套件 [內容]\n" "\t/p 修補套件/a 套件 [內容]\n" "用於以上命令的記錄檔和 UI 修飾鍵：\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] 日誌檔案\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" -"註冊 MSI 服務：\n" +"註冊 MSI 服務:\n" "\t/y\n" "移除註冊 MSI 服務：\n" "\t/z\n" -"顯示這份說明：\n" +"顯示這份說明:\n" "\t/help\n" "\t/?\n" #: dlls/msi/msi.rc:61 msgid "enter which folder contains %s" -msgstr "輸入包含 %s 的檔案夾" +msgstr "輸入包含 %s 的資料夾" #: dlls/msi/msi.rc:62 msgid "install source for feature missing" @@ -8254,335 +8007,271 @@ msgstr "本功能的網路儲存裝置不存在" #: dlls/msi/msi.rc:64 msgid "feature from:" -msgstr "功能來自：" +msgstr "功能來自:" #: dlls/msi/msi.rc:65 msgid "choose which folder contains %s" -msgstr "選擇包含 %s 的檔案夾" +msgstr "選擇包含 %s 的資料夾" #: dlls/msi/msi.rc:66 dlls/shell32/shell32.rc:236 msgid "New Folder" msgstr "新資料夾" #: dlls/msi/msi.rc:91 -#, fuzzy -#| msgid "No registry log space.\n" msgid "Allocating registry space" -msgstr "沒有註冊表記錄檔空間。\n" +msgstr "正在分配註冊表空間" #: dlls/msi/msi.rc:92 -#, fuzzy -#| msgid "Single-instance application.\n" msgid "Searching for installed applications" -msgstr "單一實體應用程式。\n" +msgstr "正在搜尋已安裝的應用程式" #: dlls/msi/msi.rc:93 msgid "Binding executables" -msgstr "" +msgstr "正在繫結可執行檔" #: dlls/msi/msi.rc:94 dlls/msi/msi.rc:137 -#, fuzzy -#| msgid "Searching for %s" msgid "Searching for qualifying products" -msgstr "搜尋 %s" +msgstr "正在搜尋可用的產品" #: dlls/msi/msi.rc:95 dlls/msi/msi.rc:96 dlls/msi/msi.rc:101 msgid "Computing space requirements" -msgstr "" +msgstr "正在計算所需空間" #: dlls/msi/msi.rc:97 -#, fuzzy -#| msgid "New Folder" msgid "Creating folders" -msgstr "新資料夾" +msgstr "正在建立資料夾" #: dlls/msi/msi.rc:98 -#, fuzzy -#| msgid "Create Shor&tcut" msgid "Creating shortcuts" -msgstr "建立捷徑(&T)" +msgstr "正在建立捷徑" #: dlls/msi/msi.rc:99 -#, fuzzy -#| msgid "Exception in service.\n" msgid "Deleting services" -msgstr "服務發生異常。\n" +msgstr "正在刪除服務" #: dlls/msi/msi.rc:100 -#, fuzzy -#| msgid "Creation date" msgid "Creating duplicate files" -msgstr "建立日期" +msgstr "正在建立重複的檔案" #: dlls/msi/msi.rc:102 -#, fuzzy -#| msgid "No associated application.\n" msgid "Searching for related applications" -msgstr "無關聯的應用程式。\n" +msgstr "正在搜尋關聯的應用程式" #: dlls/msi/msi.rc:103 msgid "Copying network install files" -msgstr "" +msgstr "正在複製網路安裝檔案" #: dlls/msi/msi.rc:104 -#, fuzzy -#| msgid "Copying Files..." msgid "Copying new files" -msgstr "複製檔案..." +msgstr "正在複製新檔案" #: dlls/msi/msi.rc:105 -#, fuzzy -#| msgid "Installation of component failed: %08x" msgid "Installing ODBC components" -msgstr "無法安裝組成：%08x" +msgstr "正在安裝 ODBC 元件" #: dlls/msi/msi.rc:106 -#, fuzzy -#| msgid "Installer service failed.\n" msgid "Installing new services" -msgstr "安裝服務失敗。\n" +msgstr "正在安裝新服務" #: dlls/msi/msi.rc:107 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Installing system catalog" -msgstr "安裝/移除" +msgstr "正在安裝系統目錄" #: dlls/msi/msi.rc:108 -#, fuzzy -#| msgid "Wine Application Uninstaller" msgid "Validating install" -msgstr "Wine 應用程式移除程式" +msgstr "正在驗證安裝" #: dlls/msi/msi.rc:109 msgid "Evaluating launch conditions" -msgstr "" +msgstr "正在檢驗啟動條件" #: dlls/msi/msi.rc:110 msgid "Migrating feature states from related applications" -msgstr "" +msgstr "正在從相關應用程式移轉功能狀態" #: dlls/msi/msi.rc:111 -#, fuzzy -#| msgid "Icon files" msgid "Moving files" -msgstr "圖示檔案" +msgstr "正在移動檔案" #: dlls/msi/msi.rc:112 -#, fuzzy -#| msgid "Version information" msgid "Publishing assembly information" -msgstr "版本資訊" +msgstr "正在發佈組合資訊" #: dlls/msi/msi.rc:113 msgid "Unpublishing assembly information" -msgstr "" +msgstr "正在解除發佈組合資訊" #: dlls/msi/msi.rc:114 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "圖示檔案" +msgstr "正在修補檔案" #: dlls/msi/msi.rc:115 msgid "Updating component registration" -msgstr "" +msgstr "正在更新元件登錄" #: dlls/msi/msi.rc:116 msgid "Publishing Qualified Components" -msgstr "" +msgstr "正在發佈合格的元件" #: dlls/msi/msi.rc:117 msgid "Publishing Product Features" -msgstr "" +msgstr "正在發佈產品功能" #: dlls/msi/msi.rc:118 -#, fuzzy -#| msgid "Client Information" msgid "Publishing product information" -msgstr "客戶端資訊" +msgstr "正在發佈產品資訊" #: dlls/msi/msi.rc:119 msgid "Registering Class servers" -msgstr "" +msgstr "正在登錄類別伺服器" #: dlls/msi/msi.rc:120 msgid "Registering COM+ Applications and Components" -msgstr "" +msgstr "正在登錄 COM+ 應用程式和元件" #: dlls/msi/msi.rc:121 msgid "Registering extension servers" -msgstr "" +msgstr "正在登錄延伸伺服器" #: dlls/msi/msi.rc:122 msgid "Registering fonts" -msgstr "" +msgstr "正在登錄字型" #: dlls/msi/msi.rc:123 -#, fuzzy -#| msgid "Registry Editor" msgid "Registering MIME info" -msgstr "註冊表編輯器" +msgstr "正在登錄 MIME 資訊" #: dlls/msi/msi.rc:124 -#, fuzzy -#| msgid "Registry is corrupt.\n" msgid "Registering product" -msgstr "註冊表損毀。\n" +msgstr "正在登錄產品" #: dlls/msi/msi.rc:125 msgid "Registering program identifiers" -msgstr "" +msgstr "正在登錄程式識別碼" #: dlls/msi/msi.rc:126 -#, fuzzy -#| msgid "Type Libraries" msgid "Registering type libraries" -msgstr "類型函式庫" +msgstr "正在登錄型別程式庫" #: dlls/msi/msi.rc:127 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Registering user" -msgstr "資源使用中。\n" +msgstr "正在登錄使用者" #: dlls/msi/msi.rc:128 -#, fuzzy -#| msgid "&Remove doubles" msgid "Removing duplicated files" -msgstr "刪除連續相同的指令(&R)" +msgstr "正在移除重複的檔案" #: dlls/msi/msi.rc:129 dlls/msi/msi.rc:153 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "字型設定套用中" +msgstr "正在更新環境字串" #: dlls/msi/msi.rc:130 -#, fuzzy -#| msgid "&Remove application" msgid "Removing applications" -msgstr "移除程式設定(&R)" +msgstr "正在移除程式" #: dlls/msi/msi.rc:131 -#, fuzzy -#| msgid "Icon files" msgid "Removing files" -msgstr "圖示檔案" +msgstr "正在移除檔案" #: dlls/msi/msi.rc:132 msgid "Removing folders" -msgstr "" +msgstr "正在移除資料夾" #: dlls/msi/msi.rc:133 msgid "Removing INI files entries" -msgstr "" +msgstr "正在移除 INI 檔案項目" #: dlls/msi/msi.rc:134 -#, fuzzy -#| msgid "Domain Component" msgid "Removing ODBC components" -msgstr "區域部分" +msgstr "正在移除 ODBC 元件" #: dlls/msi/msi.rc:135 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Removing system registry values" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "正在移除系統登錄值" #: dlls/msi/msi.rc:136 msgid "Removing shortcuts" -msgstr "" +msgstr "正在移除捷徑" #: dlls/msi/msi.rc:138 msgid "Registering modules" -msgstr "" +msgstr "正在登錄模組" #: dlls/msi/msi.rc:139 msgid "Unregistering modules" -msgstr "" +msgstr "正在解除登錄模組" #: dlls/msi/msi.rc:140 -#, fuzzy -#| msgid "Initializing; " msgid "Initializing ODBC directories" -msgstr "正在初始化；" +msgstr "正在初始化 ODBC 目錄" #: dlls/msi/msi.rc:141 -#, fuzzy -#| msgid "Starting Wordpad failed" msgid "Starting services" -msgstr "啟動 Wordpad 時失敗" +msgstr "正在啟動服務" #: dlls/msi/msi.rc:142 -#, fuzzy -#| msgid "Stopping dependent service: %1\n" msgid "Stopping services" -msgstr "正在停止附屬服務：%1\n" +msgstr "正在停止服務" #: dlls/msi/msi.rc:143 msgid "Unpublishing Qualified Components" -msgstr "" +msgstr "正在解除發佈合格的元件" #: dlls/msi/msi.rc:144 msgid "Unpublishing Product Features" -msgstr "" +msgstr "正在解除發佈產品功能" #: dlls/msi/msi.rc:145 -#, fuzzy -#| msgid "Client Information" msgid "Unpublishing product information" -msgstr "客戶端資訊" +msgstr "正在解除發佈產品資訊" #: dlls/msi/msi.rc:146 msgid "Unregister Class servers" -msgstr "" +msgstr "解除登錄類別伺服器" #: dlls/msi/msi.rc:147 msgid "Unregistering COM+ Applications and Components" -msgstr "" +msgstr "正在解除登錄 COM+ 應用程式和元件" #: dlls/msi/msi.rc:148 msgid "Unregistering extension servers" -msgstr "" +msgstr "正在解除登錄延伸伺服器" #: dlls/msi/msi.rc:149 msgid "Unregistering fonts" -msgstr "" +msgstr "正在解除登錄字型" #: dlls/msi/msi.rc:150 msgid "Unregistering MIME info" -msgstr "" +msgstr "正在解除登錄 MIME 資訊" #: dlls/msi/msi.rc:151 msgid "Unregistering program identifiers" -msgstr "" +msgstr "正在解除登錄程式識別碼" #: dlls/msi/msi.rc:152 msgid "Unregistering type libraries" -msgstr "" +msgstr "正在解除登錄型別程式庫" #: dlls/msi/msi.rc:154 msgid "Writing INI files values" -msgstr "" +msgstr "正在寫入 INI 檔案項目" #: dlls/msi/msi.rc:155 -#, fuzzy -#| msgid "Warning: system library" msgid "Writing system registry values" -msgstr "警告：系統函式庫" +msgstr "正在寫入系統登錄值" #: dlls/msi/msi.rc:161 msgid "Free space: [1]" -msgstr "" +msgstr "可用空間: [1]" #: dlls/msi/msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "屬性: [1]，簽章: [2]" #: dlls/msi/msi.rc:163 msgid "File: [1]" -msgstr "檔案： [1]" +msgstr "檔案: [1]" #: dlls/msi/msi.rc:164 dlls/msi/msi.rc:191 msgid "Folder: [1]" @@ -8590,137 +8279,127 @@ msgstr "資料夾: [1]" #: dlls/msi/msi.rc:165 dlls/msi/msi.rc:194 msgid "Shortcut: [1]" -msgstr "" +msgstr "捷徑: [1]" #: dlls/msi/msi.rc:166 dlls/msi/msi.rc:197 dlls/msi/msi.rc:198 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [1]" -msgstr "裝置(&V)：" +msgstr "服務: [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "檔案: [1]，目錄: [9]，大小: [6]" #: dlls/msi/msi.rc:168 -#, fuzzy -#| msgid "application" msgid "Found application: [1]" -msgstr "應用程式" +msgstr "找到的應用程式: [1]" #: dlls/msi/msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "檔案: [1]，目錄: [9]，大小: [6]" #: dlls/msi/msi.rc:171 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [2]" -msgstr "裝置(&V)：" +msgstr "服務: [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "" +msgstr "檔案: [1]，相依性: [2]" #: dlls/msi/msi.rc:173 -#, fuzzy -#| msgid "Applications" msgid "Application: [1]" -msgstr "應用程式" +msgstr "應用程式: [1]" #: dlls/msi/msi.rc:175 dlls/msi/msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "應用程式內容: [1]，組件名稱: [2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "" +msgstr "檔案: [1]，目錄: [2]，大小: [3]" #: dlls/msi/msi.rc:178 dlls/msi/msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "元件識別碼: [1]，辨識符號: [2]" #: dlls/msi/msi.rc:179 dlls/msi/msi.rc:200 msgid "Feature: [1]" -msgstr "" +msgstr "功能: [1]" #: dlls/msi/msi.rc:180 dlls/msi/msi.rc:201 msgid "Class Id: [1]" -msgstr "" +msgstr "類別識別碼: [1]" #: dlls/msi/msi.rc:181 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "應用程式識別碼: [1]{{，應用程式類型: [2]，使用者: [3]，RSN: [4]}}" #: dlls/msi/msi.rc:182 dlls/msi/msi.rc:203 -#, fuzzy -#| msgid "Extensions Only" msgid "Extension: [1]" -msgstr "只有進階屬性" +msgstr "延伸: [1]" #: dlls/msi/msi.rc:183 dlls/msi/msi.rc:204 msgid "Font: [1]" -msgstr "字型： [1]" +msgstr "字型: [1]" #: dlls/msi/msi.rc:184 dlls/msi/msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "MIME 內容類型: [1]，延伸: [2]" #: dlls/msi/msi.rc:185 dlls/msi/msi.rc:206 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgId: [1]" #: dlls/msi/msi.rc:186 dlls/msi/msi.rc:207 msgid "LibID: [1]" -msgstr "" +msgstr "LibID: [1]" #: dlls/msi/msi.rc:187 dlls/msi/msi.rc:190 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "檔案: [1]，目錄: [9]" #: dlls/msi/msi.rc:188 dlls/msi/msi.rc:208 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "名稱: [1]，值: [2]，動作 [3]" #: dlls/msi/msi.rc:189 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "應用程式: [1]，命令列: [2]" #: dlls/msi/msi.rc:192 dlls/msi/msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "檔案: [1]，區段︰[2]，機碼: [3]，值: [4]" #: dlls/msi/msi.rc:193 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "機碼: [1]，名稱: [2]" #: dlls/msi/msi.rc:195 dlls/msi/msi.rc:196 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "檔案: [1]，資料夾: [2]" #: dlls/msi/msi.rc:202 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppId: [1]{{，AppType: [2]}}" #: dlls/msi/msi.rc:210 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "機碼: [1]，名稱: [2]，值: [3]" #: dlls/msi/msi.rc:72 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{嚴重錯誤: }}" #: dlls/msi/msi.rc:73 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{錯誤 [1]。}}" #: dlls/msi/msi.rc:74 msgid "Warning [1]." -msgstr "" +msgstr "警告 [1]。" #: dlls/msi/msi.rc:75 msgid "Info [1]." -msgstr "" +msgstr "資訊 [1]。" #: dlls/msi/msi.rc:76 msgid "" @@ -8728,6 +8407,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"安裝程式在安裝這個封裝時發生意外的錯誤。" +"這表示這個封裝可能有問題。錯誤碼: [1]。" +"{{引數: [2], [3], [4]}}" #: dlls/msi/msi.rc:77 msgid "{{Disk full: }}" @@ -8735,33 +8417,35 @@ msgstr "{{磁碟已滿： }}" #: dlls/msi/msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "動作 [Time]: [1]。[2]" #: dlls/msi/msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "訊息類型: [1]，引數: [2]{，[3]}" #: dlls/msi/msi.rc:82 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== 開啟記錄時間: [Date] [Time] ===" #: dlls/msi/msi.rc:80 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "動作開始 [Time]: [1]。" #: dlls/msi/msi.rc:81 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "動作結束 [Time]: [1]。傳回的值 [2]。" #: dlls/msi/msi.rc:84 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "請插入磁片: [2]" #: dlls/msi/msi.rc:85 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"找不到來源檔案{{(cabinet)}}: [2]。請確認檔案是否存在，" +"以及您是否有存取它的權限。" #: dlls/msrle32/msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8781,11 +8465,11 @@ msgstr "視訊壓縮" #: dlls/msvfw32/msvfw32.rc:39 msgid "&Compressor:" -msgstr "壓縮器(&C)：" +msgstr "壓縮器(&C):" #: dlls/msvfw32/msvfw32.rc:42 msgid "Con&figure..." -msgstr "組態(&F)..." +msgstr "設定(&F)..." #: dlls/msvfw32/msvfw32.rc:43 msgid "&About" @@ -8793,11 +8477,11 @@ msgstr "關於(&A)" #: dlls/msvfw32/msvfw32.rc:47 msgid "Compression &Quality:" -msgstr "壓縮品質(&Q)：" +msgstr "壓縮品質(&Q):" #: dlls/msvfw32/msvfw32.rc:49 msgid "&Key Frame Every" -msgstr "關鍵影格/每(&K)" +msgstr "畫面間隔(&K)" #: dlls/msvfw32/msvfw32.rc:53 msgid "&Data Rate" @@ -8809,7 +8493,7 @@ msgstr "kB/s" #: dlls/msvfw32/msvfw32.rc:28 msgid "Full Frames (Uncompressed)" -msgstr "完整影格(未壓縮)" +msgstr "完整影格 (未壓縮)" #: dlls/msvidc32/msvidc32.rc:29 msgid "Wine Video 1 video codec" @@ -8833,7 +8517,7 @@ msgstr "捲軸" #: dlls/oleacc/oleacc.rc:35 msgid "grip" -msgstr "握把" +msgstr "底框" #: dlls/oleacc/oleacc.rc:36 msgid "sound" @@ -8845,7 +8529,7 @@ msgstr "游標" #: dlls/oleacc/oleacc.rc:38 msgid "caret" -msgstr "插字符號" +msgstr "插入點" #: dlls/oleacc/oleacc.rc:39 msgid "alert" @@ -8857,11 +8541,11 @@ msgstr "視窗" #: dlls/oleacc/oleacc.rc:41 msgid "client" -msgstr "客戶端" +msgstr "用戶端" #: dlls/oleacc/oleacc.rc:42 msgid "popup menu" -msgstr "彈出式選單" +msgstr "快顯功能表" #: dlls/oleacc/oleacc.rc:43 msgid "menu item" @@ -8893,15 +8577,15 @@ msgstr "對話框" #: dlls/oleacc/oleacc.rc:50 msgid "border" -msgstr "邊框" +msgstr "邊界" #: dlls/oleacc/oleacc.rc:51 msgid "grouping" -msgstr "分組" +msgstr "群組" #: dlls/oleacc/oleacc.rc:52 msgid "separator" -msgstr "分隔線" +msgstr "分隔字元" #: dlls/oleacc/oleacc.rc:53 msgid "tool bar" @@ -8917,15 +8601,15 @@ msgstr "表格" #: dlls/oleacc/oleacc.rc:56 msgid "column header" -msgstr "行首" +msgstr "欄標題" #: dlls/oleacc/oleacc.rc:57 msgid "row header" -msgstr "列首" +msgstr "列標題" #: dlls/oleacc/oleacc.rc:58 msgid "column" -msgstr "行" +msgstr "欄" #: dlls/oleacc/oleacc.rc:59 msgid "row" @@ -8937,11 +8621,11 @@ msgstr "儲存格" #: dlls/oleacc/oleacc.rc:61 msgid "link" -msgstr "鏈結" +msgstr "連結" #: dlls/oleacc/oleacc.rc:62 msgid "help balloon" -msgstr "說明泡泡" +msgstr "說明提示氣球" #: dlls/oleacc/oleacc.rc:63 msgid "character" @@ -8957,15 +8641,15 @@ msgstr "清單項目" #: dlls/oleacc/oleacc.rc:66 msgid "outline" -msgstr "描邊" +msgstr "邊框" #: dlls/oleacc/oleacc.rc:67 msgid "outline item" -msgstr "描邊項目" +msgstr "邊框項目" #: dlls/oleacc/oleacc.rc:68 msgid "page tab" -msgstr "頁面頁標" +msgstr "索引標籤" #: dlls/oleacc/oleacc.rc:69 msgid "property page" @@ -8993,23 +8677,23 @@ msgstr "按鈕" #: dlls/oleacc/oleacc.rc:75 msgid "check button" -msgstr "檢查按鈕" +msgstr "核取按鈕" #: dlls/oleacc/oleacc.rc:76 msgid "radio button" -msgstr "單選按鈕" +msgstr "選項按鈕" #: dlls/oleacc/oleacc.rc:77 msgid "combo box" -msgstr "複合方塊" +msgstr "下拉式方塊" #: dlls/oleacc/oleacc.rc:78 msgid "drop down" -msgstr "下拉選單" +msgstr "下拉" #: dlls/oleacc/oleacc.rc:79 msgid "progress bar" -msgstr "進度條" +msgstr "進度列" #: dlls/oleacc/oleacc.rc:80 msgid "dial" @@ -9021,11 +8705,11 @@ msgstr "快速鍵欄位" #: dlls/oleacc/oleacc.rc:82 msgid "slider" -msgstr "滑動軸" +msgstr "滑桿" #: dlls/oleacc/oleacc.rc:83 msgid "spin box" -msgstr "數值調整框" +msgstr "調整方塊" #: dlls/oleacc/oleacc.rc:84 msgid "diagram" @@ -9053,11 +8737,11 @@ msgstr "格線下拉按鈕" #: dlls/oleacc/oleacc.rc:90 msgid "white space" -msgstr "空白" +msgstr "白色空格" #: dlls/oleacc/oleacc.rc:91 msgid "page tab list" -msgstr "頁面頁標清單" +msgstr "索引標籤清單" #: dlls/oleacc/oleacc.rc:92 msgid "clock" @@ -9073,72 +8757,54 @@ msgstr "IP 位址" #: dlls/oleacc/oleacc.rc:95 msgid "outline button" -msgstr "描邊按鈕" +msgstr "外框按鈕" #: dlls/oleacc/oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "中" +msgstr "一般" #: dlls/oleacc/oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "不得使用" +msgstr "無法使用" #: dlls/oleacc/oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "選擇" +msgstr "已選取" #: dlls/oleacc/oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "已暫停" +msgstr "已設定焦點" #: dlls/oleacc/oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "壓縮(&C)" +msgstr "已按下" #: dlls/oleacc/oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "已核取" #: dlls/oleacc/oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "混雜" +msgstr "已混和" #: dlls/oleacc/oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "唯讀(&R)" +msgstr "唯讀" #: dlls/oleacc/oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "熱門軌段的項目" +msgstr "熱點追蹤" #: dlls/oleacc/oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" msgstr "預設" @@ -9146,31 +8812,29 @@ msgstr "預設" #: dlls/oleacc/oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "已展開" #: dlls/oleacc/oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "已摺疊" #: dlls/oleacc/oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "忙碌" #: dlls/oleacc/oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "飄浮" #: dlls/oleacc/oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "跑馬燈" #: dlls/oleacc/oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" msgstr "動畫" @@ -9178,104 +8842,82 @@ msgstr "動畫" #: dlls/oleacc/oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "隱藏" #: dlls/oleacc/oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "螢幕不可見" #: dlls/oleacc/oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "啟用(&E)" +msgstr "可調大小" #: dlls/oleacc/oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "啟用(&E)" +msgstr "可移動" #: dlls/oleacc/oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "自動發聲" #: dlls/oleacc/oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "已暫停" +msgstr "可設定焦點" #: dlls/oleacc/oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "表格" +msgstr "可選取" #: dlls/oleacc/oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "鏈結" +msgstr "已連結" #: dlls/oleacc/oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "可測定" #: dlls/oleacc/oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "表格" +msgstr "可多重選取" #: dlls/oleacc/oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "請選取檔案。" +msgstr "可擴充選取" #: dlls/oleacc/oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "警示" +msgstr "低度警示" #: dlls/oleacc/oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "警示" +msgstr "中度警示" #: dlls/oleacc/oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "警示" +msgstr "高度警示" #: dlls/oleacc/oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "防止寫入的。\n" +msgstr "保護" #: dlls/oleacc/oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "有快顯" #: dlls/oleaut32/oleaut32.rc:30 programs/oleview/oleview.rc:146 msgid "True" @@ -9294,206 +8936,158 @@ msgid "Off" msgstr "關" #: dlls/oledb32/version.rc:56 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "視訊" +msgstr "提供者" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "請選擇您要使用的格式：" +msgstr "選擇您要連線的資料:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "LAN Connection" msgid "Connection" -msgstr "區域網路連線" +msgstr "連線" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "請選擇您要使用的格式：" +msgstr "指定下列項目以連接至 ODBC 資料:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. 指定資料來源:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "請輸入您的姓名" +msgstr "使用資料來源名稱(&D)" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "重置的連線" +msgstr "使用連線字串(&O)" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "LAN Connection" msgid "&Connection string:" -msgstr "區域網路連線" +msgstr "連線字串(&C):" #: dlls/oledb32/version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "加入(&D)..." +msgstr "建立(&U)..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. 輸入資訊以登入至伺服器" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "使用者名稱(&U)：" +msgstr "使用者名稱(&N):" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "空白頁面(&B)" +msgstr "空白密碼(&B)" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "密碼錯誤。\n" +msgstr "允許儲存密碼(&S)" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. 輸入要使用的初始目錄(&I):" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "重置的連線" +msgstr "測試連線(&T)" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "進階" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "網路分享" +msgstr "網路設定" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "不當的假冒等級。\n" +msgstr "模擬等級(&I):" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "保護等級(&R):" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "已連線" +msgstr "連線:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "&Seconds" msgid "seconds." -msgstr "秒(&S)" +msgstr "秒。" #: dlls/oledb32/version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "成功" +msgstr "存取(&C):" #: dlls/oledb32/version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "全部(&A)" +msgstr "全部" #: dlls/oledb32/version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"這些是此類型資料的初始化內容。要編輯值，請選擇內容，" +"然後選擇下方的 [編輯值]。" #: dlls/oledb32/version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "編輯(&E)..." +msgstr "編輯值(&E)..." #: dlls/oledb32/version.rc:49 -#, fuzzy -#| msgid "Properties" msgid "Data Link Error" -msgstr "屬性" +msgstr "資料連結錯誤" #: dlls/oledb32/version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "請選取檔案。" +msgstr "請選取提供者。" #: dlls/oledb32/version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." -msgstr "" +msgstr "無法再使用提供者。請確保提供者已正確安裝。" #: dlls/oledb32/version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "屬性" +msgstr "資料連結內容" #: dlls/oledb32/version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE 資料庫提供者" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "待命" +msgstr "讀取" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "產品說明：" +msgstr "讀取與寫入" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "共享，不拒絕" #: dlls/oledb32/version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "共享，拒絕讀取" #: dlls/oledb32/version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "共享，拒絕寫入" #: dlls/oledb32/version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "共享，排除" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "I/O 寫入次數" +msgstr "寫入" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -9501,7 +9095,7 @@ msgstr "插入物件" #: dlls/oledlg/oledlg.rc:61 msgid "Object Type:" -msgstr "物件類型：" +msgstr "物件類型:" #: dlls/oledlg/oledlg.rc:64 dlls/oledlg/oledlg.rc:102 msgid "Result" @@ -9509,7 +9103,7 @@ msgstr "結果" #: dlls/oledlg/oledlg.rc:65 msgid "Create New" -msgstr "新增" +msgstr "新建" #: dlls/oledlg/oledlg.rc:67 msgid "Create Control" @@ -9517,7 +9111,7 @@ msgstr "建立控制項" #: dlls/oledlg/oledlg.rc:69 msgid "Create From File" -msgstr "建立於檔案" +msgstr "從檔案建立" #: dlls/oledlg/oledlg.rc:72 msgid "&Add Control..." @@ -9533,7 +9127,7 @@ msgstr "瀏覽..." #: dlls/oledlg/oledlg.rc:76 msgid "File:" -msgstr "檔案：" +msgstr "檔案:" #: dlls/oledlg/oledlg.rc:82 msgid "Paste Special" @@ -9541,7 +9135,7 @@ msgstr "特殊貼上" #: dlls/oledlg/oledlg.rc:85 dlls/setupapi/setupapi.rc:43 msgid "Source:" -msgstr "原始檔案：" +msgstr "原始檔案:" #: dlls/oledlg/oledlg.rc:86 dlls/shdoclc/shdoclc.rc:50 #: dlls/shdoclc/shdoclc.rc:82 dlls/shdoclc/shdoclc.rc:95 @@ -9557,7 +9151,7 @@ msgstr "貼上連結(&L)" #: dlls/oledlg/oledlg.rc:90 msgid "&As:" -msgstr "為(&A)：" +msgstr "為(&A):" #: dlls/oledlg/oledlg.rc:97 msgid "&Display As Icon" @@ -9575,7 +9169,9 @@ msgstr "在您的文件中插入一個新的 %s 物件" msgid "" "Insert the contents of the file as an object into your document so that you " "may activate it using the program which created it." -msgstr "將檔案的內容以物件的方式插入到您的文件以便您可以用程式來啟動它。" +msgstr "" +"將這個檔案的內容以物件的方式插入到您的文件中，" +"以便您使用建立該檔案的程式來啟動它。" #: dlls/oledlg/oledlg.rc:30 dlls/shell32/shell32.rc:195 msgid "Browse" @@ -9585,29 +9181,23 @@ msgstr "瀏覽" msgid "" "File does not appear to be a valid OLE module. Unable to register OLE " "control." -msgstr "該檔案不像是一個有效的 OLE 模組。無法註冊 OLE 元件。" +msgstr "該檔案不像是一個有效的 OLE 模組。無法註冊 OLE 元件。" #: dlls/oledlg/oledlg.rc:32 msgid "Add Control" -msgstr "加入控制項" +msgstr "新增控制項" #: dlls/oledlg/oledlg.rc:35 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "字型(&F)..." +msgstr "轉換(&C)..." #: dlls/oledlg/oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "物件(&O)" +msgstr "%1 %2 物件(&O)" #: dlls/oledlg/oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "物件(&O)" +msgstr "%1 物件(&O)" #: dlls/oledlg/oledlg.rc:33 programs/oleview/oleview.rc:40 msgid "&Object" @@ -9621,13 +9211,15 @@ msgstr "將剪貼簿的內容以 %s 插入至您的檔案。" msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." -msgstr "將剪貼簿的內容插入到您的檔案以便您可以使用 %s。" +msgstr "將剪貼簿的內容插入至您的檔案，以便您可以使用 %s 啟動它。" #: dlls/oledlg/oledlg.rc:43 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." -msgstr "將剪貼簿的內容插入到您的文件以便您可以用 %s 啟動它, 一般顯示為圖示。" +msgstr "" +"將剪貼簿的內容插入至您的檔案，以便您可以使用 %s 啟動它。" +"它將顯示為圖示。" #: dlls/oledlg/oledlg.rc:44 msgid "" @@ -9635,8 +9227,8 @@ msgid "" "linked to the source file so that changes to the file will be reflected in " "your document." msgstr "" -"將剪貼簿的內容以 %s 插入到您的文件。資料是連結到來源檔案的, 對來源檔案的任何" -"變更都會影響到您的文件。" +"將剪貼簿的內容以 %s 插入至您的檔案。資料會連結到來源檔案，" +"以便將所做的變更反應到您的文件。" #: dlls/oledlg/oledlg.rc:45 msgid "" @@ -9644,8 +9236,8 @@ msgid "" "is linked to the source file so that changes to the file will be reflected " "in your document." msgstr "" -"將剪貼簿的圖片插入到您的文件。圖片是連結到來源檔案的, 對來源檔案的任何變更都" -"會影響到您的文件。" +"將剪貼簿的圖片插入到您的文件。圖片會連結到來源檔案，" +"以便將所做的變更反應到您的文件。" #: dlls/oledlg/oledlg.rc:46 msgid "" @@ -9653,8 +9245,8 @@ msgid "" "The shortcut is linked to the source file so that changes to the file will " "be reflected in your document." msgstr "" -"將剪貼簿的捷徑插入到您的檔案。捷徑是連結到來源檔案的, 對來源檔案的任何變更都" -"會影響到您的檔案。" +"將指向剪貼簿內容所在位置的捷徑插入到您的檔案。捷徑會連結到來源檔案，" +"以便將所做的變更反應到您的文件。" #: dlls/oledlg/oledlg.rc:47 msgid "Inserts the contents of the clipboard into your document." @@ -9670,7 +9262,7 @@ msgstr "不明來源" #: dlls/oledlg/oledlg.rc:50 msgid "the program which created it" -msgstr "不明應用程式" +msgstr "建立該檔案的程式" #: dlls/sane.ds/sane.rc:41 msgid "Scanning" @@ -9683,28 +9275,28 @@ msgstr "正在掃描... 請稍候" #: dlls/sane.ds/sane.rc:31 msgctxt "unit: pixels" msgid "px" -msgstr "像素" +msgstr "px" #: dlls/sane.ds/sane.rc:32 msgctxt "unit: bits" msgid "b" -msgstr "位元" +msgstr "b" #: dlls/sane.ds/sane.rc:34 dlls/wineps.drv/wineps.rc:49 #: programs/winecfg/winecfg.rc:182 msgctxt "unit: dots/inch" msgid "dpi" -msgstr "點/英吋" +msgstr "dpi" #: dlls/sane.ds/sane.rc:35 msgctxt "unit: percent" msgid "%" -msgstr "百分比" +msgstr "%" #: dlls/sane.ds/sane.rc:36 msgctxt "unit: microseconds" msgid "us" -msgstr "微秒" +msgstr "µs" #: dlls/serialui/serialui.rc:28 msgid "Settings for %s" @@ -9712,7 +9304,7 @@ msgstr "%s 的設定值" #: dlls/serialui/serialui.rc:31 msgid "Baud Rate" -msgstr "鮑率" +msgstr "傳輸速率" #: dlls/serialui/serialui.rc:33 msgid "Parity" @@ -9732,11 +9324,11 @@ msgstr "停止位元" #: dlls/setupapi/setupapi.rc:39 msgid "Copying Files..." -msgstr "複製檔案..." +msgstr "正在複製檔案..." #: dlls/setupapi/setupapi.rc:45 msgid "Destination:" -msgstr "目標檔案：" +msgstr "目標檔案:" #: dlls/setupapi/setupapi.rc:52 msgid "Files Needed" @@ -9747,36 +9339,36 @@ msgid "" "Insert the manufacturer's installation disk, and then\n" "make sure the correct drive is selected below" msgstr "" -"插入原廠安裝光碟\n" -"並確認選擇了正確的磁碟" +"請插入製造廠商的安裝磁片\n" +"並確認從下方選取了正確的磁碟" #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" -msgstr "複製原廠檔案：" +msgstr "製造廠商的檔案複製來源:" #: dlls/setupapi/setupapi.rc:31 msgid "The file '%1' on %2 is needed" -msgstr "需要檔案 %1 存於 %2" +msgstr "需要 %2 的檔案 '%1'" #: dlls/setupapi/setupapi.rc:32 programs/ipconfig/ipconfig.rc:34 msgid "Unknown" -msgstr "未知" +msgstr "不明" #: dlls/setupapi/setupapi.rc:33 msgid "Copy files from:" -msgstr "從複製檔案：" +msgstr "檔案複製來源:" #: dlls/setupapi/setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." -msgstr "輸入檔案位置，並選擇確認。" +msgstr "輸入檔案所在的路徑，然後按 [確定]。" #: dlls/shdoclc/shdoclc.rc:42 msgid "F&orward" -msgstr "向前(&O)" +msgstr "下一頁(&O)" #: dlls/shdoclc/shdoclc.rc:44 msgid "&Save Background As..." -msgstr "將背景存為(&S)..." +msgstr "另存背景為(&S)..." #: dlls/shdoclc/shdoclc.rc:45 msgid "Set As Back&ground" @@ -9788,7 +9380,7 @@ msgstr "複製背景(&C)" #: dlls/shdoclc/shdoclc.rc:47 msgid "Set as &Desktop Item" -msgstr "設定到桌面(&D)" +msgstr "設定為桌面項目(&D)" #: dlls/shdoclc/shdoclc.rc:52 msgid "Create Shor&tcut" @@ -9867,7 +9459,7 @@ msgstr "複製捷徑(&T)" #: dlls/shdoclc/shdoclc.rc:86 dlls/shdoclc/shdoclc.rc:139 #: dlls/shdoclc/shdoclc.rc:168 dlls/shdoclc/shdoclc.rc:194 msgid "P&roperties" -msgstr "屬性(&R)" +msgstr "內容(&R)" #: dlls/shdoclc/shdoclc.rc:91 dlls/user32/user32.rc:58 msgid "&Undo" @@ -9884,7 +9476,7 @@ msgstr "選擇(&S)" #: dlls/shdoclc/shdoclc.rc:105 msgid "&Cell" -msgstr "格(&C)" +msgstr "儲存格(&C)" #: dlls/shdoclc/shdoclc.rc:106 msgid "&Row" @@ -9900,11 +9492,11 @@ msgstr "表格(&T)" #: dlls/shdoclc/shdoclc.rc:111 msgid "&Cell Properties" -msgstr "格屬性(&C)" +msgstr "儲存格內容(&C)" #: dlls/shdoclc/shdoclc.rc:112 msgid "&Table Properties" -msgstr "表格屬性(&T)" +msgstr "表格內容(&T)" #: dlls/shdoclc/shdoclc.rc:128 msgid "Open in &New Window" @@ -9916,7 +9508,7 @@ msgstr "剪下" #: dlls/shdoclc/shdoclc.rc:155 msgid "&Save Video As..." -msgstr "將視訊另存為(&S)..." +msgstr "另存視訊為(&S)..." #: dlls/shdoclc/shdoclc.rc:166 dlls/shdoclc/shdoclc.rc:190 msgid "Play" @@ -9988,7 +9580,7 @@ msgstr "編輯檢視(&E)" #: dlls/shdoclc/shdoclc.rc:219 dlls/shdoclc/shdoclc.rc:233 msgid "Scroll Here" -msgstr "滾動這裡" +msgstr "捲動到這裡" #: dlls/shdoclc/shdoclc.rc:221 msgid "Top" @@ -10070,7 +9662,7 @@ msgstr "清單(&L)" #: programs/taskmgr/taskmgr.rc:67 programs/taskmgr/taskmgr.rc:112 #: programs/taskmgr/taskmgr.rc:254 msgid "&Details" -msgstr "詳細清單(&D)" +msgstr "詳細資料(&D)" #: dlls/shell32/shell32.rc:51 programs/winefile/winefile.rc:78 msgid "Arrange &Icons" @@ -10119,7 +9711,7 @@ msgstr "新增連結(&L)" #: dlls/shell32/shell32.rc:74 msgid "Properties" -msgstr "屬性" +msgstr "內容" #: dlls/shell32/shell32.rc:85 msgctxt "recycle bin" @@ -10132,7 +9724,7 @@ msgstr "清除(&E)" #: dlls/shell32/shell32.rc:98 msgid "E&xplore" -msgstr "檔案管理員(&X)" +msgstr "瀏覽(&X)" #: dlls/shell32/shell32.rc:101 msgid "C&ut" @@ -10184,7 +9776,7 @@ msgstr "關於 %s" #: dlls/shell32/shell32.rc:321 msgid "Wine &license" -msgstr "使用許可(&L)" +msgstr "Wine 使用許可(&L)" #: dlls/shell32/shell32.rc:326 msgid "Running on %s" @@ -10195,16 +9787,14 @@ msgid "Wine was brought to you by:" msgstr "Wine 開發人員:" #: dlls/shell32/shell32.rc:332 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "執行(&R)..." +msgstr "執行" #: dlls/shell32/shell32.rc:336 msgid "" "Type the name of a program, folder, document, or Internet resource, and Wine " "will open it for you." -msgstr "輸入程式，目錄，檔案或者 Internet 資源名，Wine 將為您開啟它。" +msgstr "輸入程式、資料夾，文件或網際網路資源名稱。Wine 將為您開啟它。" #: dlls/shell32/shell32.rc:337 msgid "&Open:" @@ -10217,32 +9807,26 @@ msgid "&Browse..." msgstr "瀏覽(&B)..." #: dlls/shell32/shell32.rc:353 dlls/shell32/shell32.rc:382 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "檔案類型" +msgstr "檔案類型:" #: dlls/shell32/shell32.rc:357 dlls/shell32/shell32.rc:390 #: dlls/urlmon/urlmon.rc:37 programs/explorer/explorer.rc:33 msgid "Location:" -msgstr "位址：" +msgstr "位置:" #: dlls/shell32/shell32.rc:359 dlls/shell32/shell32.rc:392 #: programs/winefile/winefile.rc:169 msgid "Size:" -msgstr "大小：" +msgstr "大小:" #: dlls/shell32/shell32.rc:363 dlls/shell32/shell32.rc:396 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "建立日期" +msgstr "建立日期:" #: dlls/shell32/shell32.rc:367 dlls/shell32/shell32.rc:404 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "屬性(&A):" +msgstr "屬性:" #: dlls/shell32/shell32.rc:369 dlls/shell32/shell32.rc:406 #: programs/winefile/winefile.rc:173 @@ -10252,31 +9836,23 @@ msgstr "隱藏(&I)" #: dlls/shell32/shell32.rc:370 dlls/shell32/shell32.rc:407 #: programs/winefile/winefile.rc:174 msgid "&Archive" -msgstr "保存(&A)" +msgstr "封存(&A)" #: dlls/shell32/shell32.rc:384 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "開啟：" +msgstr "開啟檔案:" #: dlls/shell32/shell32.rc:387 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "變更圖示(&I)..." +msgstr "變更(&C)..." #: dlls/shell32/shell32.rc:398 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "已修改" +msgstr "上次修改日期:" #: dlls/shell32/shell32.rc:400 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "最後修改：" +msgstr "上次存取日期:" #: dlls/shell32/shell32.rc:138 dlls/shell32/shell32.rc:142 #: programs/winefile/winefile.rc:107 @@ -10324,7 +9900,7 @@ msgstr "我的電腦" #: dlls/shell32/shell32.rc:157 msgid "Control Panel" -msgstr "Wine 控制臺" +msgstr "控制臺" #: dlls/shell32/shell32.rc:164 msgid "Select" @@ -10336,7 +9912,7 @@ msgstr "重新啟動" #: dlls/shell32/shell32.rc:188 msgid "Do you want to simulate a Windows reboot?" -msgstr "您要模擬視窗重新開機？" +msgstr "您確定要模擬 Windows 的重新開機程序嗎?" #: dlls/shell32/shell32.rc:189 msgid "Shutdown" @@ -10344,7 +9920,7 @@ msgstr "關機" #: dlls/shell32/shell32.rc:190 msgid "Do you want to shutdown your Wine session?" -msgstr "您確定要關閉您的 Wine 工作階段嗎？" +msgstr "您確定要關閉您的 Wine 工作階段嗎?" #: dlls/shell32/shell32.rc:201 programs/progman/progman.rc:83 msgid "Programs" @@ -10382,23 +9958,23 @@ msgstr "桌面" #: dlls/shell32/shell32.rc:209 msgid "NetHood" -msgstr "網路上的芳鄰" +msgstr "NetHood" #: dlls/shell32/shell32.rc:210 msgid "Templates" -msgstr "樣板" +msgstr "範本" #: dlls/shell32/shell32.rc:211 msgid "PrintHood" -msgstr "印表套頁" +msgstr "PrintHood" #: dlls/shell32/shell32.rc:212 programs/winhlp32/winhlp32.rc:49 msgid "History" -msgstr "歷程" +msgstr "歷程記錄" #: dlls/shell32/shell32.rc:213 msgid "Program Files" -msgstr "程式檔案" +msgstr "Program Files" #: dlls/shell32/shell32.rc:215 dlls/shell32/shell32.rc:220 msgid "Pictures" @@ -10406,7 +9982,7 @@ msgstr "圖片" #: dlls/shell32/shell32.rc:216 msgid "Common Files" -msgstr "共同檔案" +msgstr "Common Files" #: dlls/shell32/shell32.rc:218 msgid "Administrative Tools" @@ -10414,7 +9990,7 @@ msgstr "系統管理工具" #: dlls/shell32/shell32.rc:214 msgid "Program Files (x86)" -msgstr "程式檔案 (x86)" +msgstr "Program Files (x86)" #: dlls/shell32/shell32.rc:222 msgid "Contacts" @@ -10438,7 +10014,7 @@ msgstr "狀態" #: dlls/shell32/shell32.rc:151 msgid "Model" -msgstr "式樣" +msgstr "型號" #: dlls/shell32/shell32.rc:226 msgid "Sample Music" @@ -10474,31 +10050,31 @@ msgstr "下載" #: dlls/shell32/shell32.rc:167 msgid "Unable to create new Folder: Permission denied." -msgstr "無法建立新的資料夾：權限被拒絕。" +msgstr "無法建立新的資料夾: 權限被拒絕。" #: dlls/shell32/shell32.rc:168 msgid "Error during creation of a new folder" -msgstr "在建立新資料夾的期間發生錯誤" +msgstr "在建立新資料夾時發生錯誤" #: dlls/shell32/shell32.rc:169 msgid "Confirm file deletion" -msgstr "確認檔案的刪除" +msgstr "確認刪除檔案" #: dlls/shell32/shell32.rc:170 msgid "Confirm folder deletion" -msgstr "確認資料夾的刪除" +msgstr "確認刪除資料夾" #: dlls/shell32/shell32.rc:171 msgid "Are you sure you want to delete '%1'?" -msgstr "確定要刪除 %1？" +msgstr "您確定要刪除 '%1' 嗎?" #: dlls/shell32/shell32.rc:172 msgid "Are you sure you want to delete these %1 items?" -msgstr "確定要刪除這 %1 個項目？" +msgstr "您確定要刪除 %1 個項目嗎?" #: dlls/shell32/shell32.rc:179 msgid "Confirm file overwrite" -msgstr "確認檔案的覆寫" +msgstr "確認覆寫檔案" #: dlls/shell32/shell32.rc:178 msgid "" @@ -10506,30 +10082,30 @@ msgid "" "\n" "Do you want to replace it?" msgstr "" -"這個資料夾已經含有名為 %1 的檔案。\n" +"這個資料夾已經含有名為 '%1' 的檔案。\n" "\n" -"您要置換它嗎？" +"您要取代它嗎?" #: dlls/shell32/shell32.rc:173 msgid "Are you sure you want to delete the selected item(s)?" -msgstr "確定要刪除已選項目？" +msgstr "您確定要刪除已選取的項目嗎?" #: dlls/shell32/shell32.rc:175 msgid "" "Are you sure that you want to send '%1' and all its content to the Trash?" -msgstr "您確定要將 %1 和它的所有內容送到回收筒？" +msgstr "您確定要將 '%1' 和它的所有內容送到回收筒嗎?" #: dlls/shell32/shell32.rc:174 msgid "Are you sure that you want to send '%1' to the Trash?" -msgstr "您確定要將 %1 送到回收筒？" +msgstr "您確定要將 '%1' 送到回收筒嗎?" #: dlls/shell32/shell32.rc:176 msgid "Are you sure that you want to send these %1 items to the Trash?" -msgstr "您確定要將這 %1 個項目送到回收筒？" +msgstr "您確定要將 %1 個項目送到回收筒嗎?" #: dlls/shell32/shell32.rc:177 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" -msgstr "項目 %1 未送到回收筒。您要代之以刪除它嗎？" +msgstr "無法將項目 '%1' 送到回收筒。您要改為刪除它嗎?" #: dlls/shell32/shell32.rc:184 msgid "" @@ -10539,25 +10115,23 @@ msgid "" "selected folder they will be replaced. Do you still want to move or copy\n" "the folder?" msgstr "" -"這個資料夾已經含有名為 %1 的資料夾。\n" +"這個資料夾已經含有名為 '%1' 的資料夾。\n" "\n" "如果在目的資料夾中的檔案，和在已選資料夾中\n" -"的檔案同名，那麼它們將被置換。您仍然要移動或複製\n" -"資料夾嗎？" +"的檔案同名，那麼它們將被取代。您仍然要移動或複製\n" +"資料夾嗎?" #: dlls/shell32/shell32.rc:238 msgid "Wine Control Panel" msgstr "Wine 控制臺" #: dlls/shell32/shell32.rc:193 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "無法顯示「執行檔案」對話方塊 (內部錯誤)" +msgstr "無法顯示 [執行] 對話方塊 (內部錯誤)" #: dlls/shell32/shell32.rc:194 msgid "Unable to display Browse dialog box (internal error)" -msgstr "無法顯示「瀏覽」對話方塊 (內部錯誤)" +msgstr "無法顯示 [瀏覽] 對話方塊 (內部錯誤)" #: dlls/shell32/shell32.rc:196 msgid "Executable files (*.exe)" @@ -10565,15 +10139,15 @@ msgstr "可執行檔 (*.exe)" #: dlls/shell32/shell32.rc:242 msgid "There is no Windows program configured to open this type of file." -msgstr "沒有任何 Windows 程式被組配以開啟這種型態的檔案。" +msgstr "沒有設定開啟這種類型的檔案的 Windows 程式。" #: dlls/shell32/shell32.rc:244 msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "您確定希望永久刪除 %1？" +msgstr "您確定要永久刪除 '%1' 嗎?" #: dlls/shell32/shell32.rc:245 msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "您確定希望永久刪除這 %1 個項目？" +msgstr "您確定要永久刪除 %1 個項目嗎?" #: dlls/shell32/shell32.rc:246 msgid "Confirm deletion" @@ -10587,7 +10161,7 @@ msgid "" msgstr "" "檔案已經存在於路徑 %1。\n" "\n" -"您要置換它嗎？" +"您要取代它嗎?" #: dlls/shell32/shell32.rc:248 msgid "" @@ -10597,7 +10171,7 @@ msgid "" msgstr "" "資料夾已經存在於路徑 %1。\n" "\n" -"您要置換它嗎？" +"您要取代它嗎?" #: dlls/shell32/shell32.rc:249 msgid "Confirm overwrite" @@ -10619,16 +10193,16 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine 是自由軟體；您可以遵循由自由軟體基金會發布的 GNU 較寬鬆通用公共授權，再" -"次散布它和/或修改它；您可以採用版本 2.1 的授權，或 (您自行選擇的) 任何後續的" +"Wine 是自由軟體; 您可以遵循由自由軟體基金會發布的 GNU 較寬鬆通用公共授權，再" +"次散布它和/或修改它; 您可以採用版本 2.1 的授權，或 (您自行選擇的) 任何後續的" "版本。\n" "\n" -"Wine 的發行是希望它能夠有用，但是沒有任何擔保；亦無對於某一特定目的之適售性與" +"Wine 的發行是希望它能夠有用，但是沒有任何擔保; 亦無對於某一特定目的之適售性與" "適用性的暗示性擔保。參看 GNU 較寬鬆通用公共授權以獲得更多細節。\n" "\n" -"您應該已收到隨附於 Wine 的 GNU 較寬鬆通用公共授權複本；若無則請寫信到 Free " +"您應該已收到隨附於 Wine 的 GNU 較寬鬆通用公共授權複本;若無則請寫信到 Free " "Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA " -"02110-1301, USA." +"02110-1301, USA。" #: dlls/shell32/shell32.rc:254 msgid "Wine License" @@ -10646,7 +10220,7 @@ msgstr "錯誤" #: dlls/shlwapi/shlwapi.rc:43 msgid "Don't show me th&is message again" -msgstr "不要再顯示這個訊息" +msgstr "不要再顯示這個訊息(&I)" #: dlls/shlwapi/shlwapi.rc:30 msgid "%d bytes" @@ -10668,10 +10242,8 @@ msgid " sec" msgstr " 秒" #: dlls/twain_32/twain.rc:29 -#, fuzzy -#| msgid "New Folder" msgid "Select Source" -msgstr "新資料夾" +msgstr "選擇來源" #: dlls/tzres/tzres.rc:126 msgid "China Standard Time" -- 2.33.0.windows.2

2 1

[PATCH 1/3] dinput: Use user object data format array to keep user offsets.
by Rémi Bernon 29 Oct '21

29 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 229 +++++++++++++---------------------- dlls/dinput/device_private.h | 4 - dlls/dinput/joystick_hid.c | 21 ++-- dlls/dinput8/tests/hid.c | 1 - 4 files changed, 99 insertions(+), 156 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6601d705462..ed9bdee98ea 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -334,73 +334,9 @@ BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) return disable; } -/* Conversion between internal data buffer and external data buffer */ -static void fill_DataFormat( void *out, DWORD size, const void *in, const DataFormat *df ) -{ - int i; - const char *in_c = in; - char *out_c = out; - - memset(out, 0, size); - for (i = 0; i < df->size; i++) { - if (df->dt[i].offset_in >= 0) { - switch (df->dt[i].size) { - case 1: - TRACE("Copying (c) to %d from %d (value %d)\n", - df->dt[i].offset_out, df->dt[i].offset_in, *(in_c + df->dt[i].offset_in)); - *(out_c + df->dt[i].offset_out) = *(in_c + df->dt[i].offset_in); - break; - - case 2: - TRACE("Copying (s) to %d from %d (value %d)\n", - df->dt[i].offset_out, df->dt[i].offset_in, *((const short *)(in_c + df->dt[i].offset_in))); - *((short *)(out_c + df->dt[i].offset_out)) = *((const short *)(in_c + df->dt[i].offset_in)); - break; - - case 4: - TRACE("Copying (i) to %d from %d (value %d)\n", - df->dt[i].offset_out, df->dt[i].offset_in, *((const int *)(in_c + df->dt[i].offset_in))); - *((int *)(out_c + df->dt[i].offset_out)) = *((const int *)(in_c + df->dt[i].offset_in)); - break; - - default: - memcpy((out_c + df->dt[i].offset_out), (in_c + df->dt[i].offset_in), df->dt[i].size); - break; - } - } else { - switch (df->dt[i].size) { - case 1: - TRACE("Copying (c) to %d default value %d\n", - df->dt[i].offset_out, df->dt[i].value); - *(out_c + df->dt[i].offset_out) = (char) df->dt[i].value; - break; - - case 2: - TRACE("Copying (s) to %d default value %d\n", - df->dt[i].offset_out, df->dt[i].value); - *((short *) (out_c + df->dt[i].offset_out)) = (short) df->dt[i].value; - break; - - case 4: - TRACE("Copying (i) to %d default value %d\n", - df->dt[i].offset_out, df->dt[i].value); - *((int *) (out_c + df->dt[i].offset_out)) = df->dt[i].value; - break; - - default: - memset((out_c + df->dt[i].offset_out), 0, df->dt[i].size); - break; - } - } - } -} - static void dinput_device_release_user_format( struct dinput_device *impl ) { - free( impl->data_format.dt ); - impl->data_format.dt = NULL; - free( impl->data_format.offsets ); - impl->data_format.offsets = NULL; + if (impl->user_format) free( impl->user_format->rgodf ); free( impl->user_format ); impl->user_format = NULL; } @@ -436,33 +372,35 @@ LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const DIDATAFORMAT *asked_format ) { + DIOBJECTDATAFORMAT *device_obj, *user_obj; DataFormat *format = &impl->data_format; - DataTransform *dt; + DIDATAFORMAT *user_format = NULL; unsigned int i, j; int *done; - int index = 0; - DWORD next = 0; if (!format->wine_df) return DIERR_INVALIDPARAM; done = calloc( asked_format->dwNumObjs, sizeof(int) ); - dt = malloc( asked_format->dwNumObjs * sizeof(DataTransform) ); - if (!dt || !done) goto failed; + if (!done) goto failed; - if (!(format->offsets = malloc( format->wine_df->dwNumObjs * sizeof(int) ))) goto failed; - if (!(impl->user_format = malloc( asked_format->dwSize ))) goto failed; - memcpy( impl->user_format, asked_format, asked_format->dwSize ); + if (!(user_format = malloc( sizeof(DIDATAFORMAT) ))) goto failed; + *user_format = *format->wine_df; + user_format->dwFlags = asked_format->dwFlags; + user_format->dwDataSize = asked_format->dwDataSize; + user_format->dwNumObjs += asked_format->dwNumObjs; + if (!(user_format->rgodf = calloc( user_format->dwNumObjs, sizeof(DIOBJECTDATAFORMAT) ))) goto failed; TRACE("Creating DataTransform :\n"); for (i = 0; i < format->wine_df->dwNumObjs; i++) { - format->offsets[i] = -1; + device_obj = format->wine_df->rgodf + i; + user_obj = user_format->rgodf + i; - for (j = 0; j < asked_format->dwNumObjs; j++) { - if (done[j] == 1) - continue; - - if (/* Check if the application either requests any GUID and if not, it if matches + for (j = 0; j < asked_format->dwNumObjs; j++) + { + if (done[j] == 1) continue; + + if (/* Check if the application either requests any GUID and if not, it if matches * the GUID of the Wine object. */ ((asked_format->rgodf[j].pguid == NULL) || @@ -501,26 +439,19 @@ static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const TRACE(" "); _dump_EnumObjects_flags(format->wine_df->rgodf[i].dwType); TRACE("\n"); TRACE(" * dwFlags: 0x%08x\n", format->wine_df->rgodf[i].dwFlags); TRACE(" "); _dump_ObjectDataFormat_flags(format->wine_df->rgodf[i].dwFlags); TRACE("\n"); - - if (format->wine_df->rgodf[i].dwType & DIDFT_BUTTON) - dt[index].size = sizeof(BYTE); - else - dt[index].size = sizeof(DWORD); - dt[index].offset_in = format->wine_df->rgodf[i].dwOfs; - dt[index].offset_out = asked_format->rgodf[j].dwOfs; - format->offsets[i] = asked_format->rgodf[j].dwOfs; - dt[index].value = 0; - next = next + dt[index].size; - index++; - break; - } - } + *user_obj = *device_obj; + user_obj->dwOfs = asked_format->rgodf[j].dwOfs; + break; + } + } } TRACE("Setting to default value :\n"); for (j = 0; j < asked_format->dwNumObjs; j++) { - if (done[j] == 0) { + user_obj = user_format->rgodf + format->wine_df->dwNumObjs + j; + + if (done[j] == 0) { TRACE(" - Asked (%d) :\n", j); TRACE(" * GUID: %s ('%s')\n", debugstr_guid(asked_format->rgodf[j].pguid), @@ -534,55 +465,40 @@ static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const if (!(asked_format->rgodf[j].dwType & DIDFT_POV)) continue; /* fill_DataFormat memsets the buffer to 0 */ - if (asked_format->rgodf[j].dwType & DIDFT_BUTTON) - dt[index].size = sizeof(BYTE); - else - dt[index].size = sizeof(DWORD); - dt[index].offset_in = -1; - dt[index].offset_out = asked_format->rgodf[j].dwOfs; - dt[index].value = -1; - index++; - } + *user_obj = asked_format->rgodf[j]; + } } - format->size = index; - format->dt = dt; - free( done ); + impl->user_format = user_format; return DI_OK; failed: free( done ); - free( dt ); - format->dt = NULL; - free( format->offsets ); - format->offsets = NULL; - free( impl->user_format ); - impl->user_format = NULL; + if (user_format) free( user_format->rgodf ); + free( user_format ); return DIERR_OUTOFMEMORY; } -static int id_to_object( LPCDIDATAFORMAT df, int id ) +static int id_to_offset( struct dinput_device *impl, int id ) { - int i; + DIDATAFORMAT *device_format = impl->data_format.wine_df, *user_format = impl->user_format; + DIOBJECTDATAFORMAT *user_obj; - id &= 0x00ffffff; - for (i = 0; i < df->dwNumObjs; i++) - if ((dataformat_to_odf(df, i)->dwType & 0x00ffffff) == id) - return i; + if (!user_format) return -1; + + user_obj = user_format->rgodf + device_format->dwNumObjs; + while (user_obj-- > user_format->rgodf) + { + if (!user_obj->dwType) continue; + if ((user_obj->dwType & 0x00ffffff) == (id & 0x00ffffff)) return user_obj->dwOfs; + } return -1; } -static int id_to_offset(const DataFormat *df, int id) -{ - int obj = id_to_object(df->wine_df, id); - - return obj >= 0 && df->offsets ? df->offsets[obj] : -1; -} - static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic ) { DWORD type = (0x0000ff00 & dwSemantic) >> 8; @@ -769,7 +685,7 @@ void queue_event( IDirectInputDevice8W *iface, int inst_id, DWORD data, DWORD ti { static ULONGLONG notify_ms = 0; struct dinput_device *This = impl_from_IDirectInputDevice8W( iface ); - int next_pos, ofs = id_to_offset(&This->data_format, inst_id); + int next_pos, ofs = id_to_offset( This, inst_id ); ULONGLONG time_ms = GetTickCount64(); if (time_ms - notify_ms > 1000) @@ -1138,19 +1054,25 @@ static HRESULT WINAPI dinput_device_EnumObjects( IDirectInputDevice8W *iface, static HRESULT enum_object_filter_init( struct dinput_device *impl, DIPROPHEADER *filter ) { - DIDATAFORMAT *format = impl->data_format.wine_df; - int i, *offsets = impl->data_format.offsets; + DIDATAFORMAT *device_format = impl->data_format.wine_df, *user_format = impl->user_format; + DIOBJECTDATAFORMAT *device_obj, *user_obj; if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; if (filter->dwHow == DIPH_BYUSAGE && !(impl->instance.dwDevType & DIDEVTYPE_HID)) return DIERR_UNSUPPORTED; if (filter->dwHow != DIPH_BYOFFSET) return DI_OK; - if (!offsets) return DIERR_NOTFOUND; + if (!impl->user_format) return DIERR_NOTFOUND; - for (i = 0; i < format->dwNumObjs; ++i) if (offsets[i] == filter->dwObj) break; - if (i == format->dwNumObjs) return DIERR_NOTFOUND; + user_obj = user_format->rgodf + device_format->dwNumObjs; + device_obj = device_format->rgodf + device_format->dwNumObjs; + while (user_obj-- > user_format->rgodf && device_obj-- > device_format->rgodf) + { + if (!user_obj->dwType) continue; + if (user_obj->dwOfs == filter->dwObj) break; + } + if (user_obj < user_format->rgodf) return DIERR_NOTFOUND; - filter->dwObj = format->rgodf[i].dwOfs; + filter->dwObj = device_obj->dwOfs; return DI_OK; } @@ -1397,7 +1319,7 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_OBJECTNOTFOUND; - if ((user_offset = id_to_offset( &impl->data_format, instance.dwType )) < 0) return DIERR_OBJECTNOTFOUND; + if ((user_offset = id_to_offset( impl, instance.dwType )) < 0) return DIERR_OBJECTNOTFOUND; if (!set_app_data( impl, user_offset, value->uData )) return DIERR_OUTOFMEMORY; return DI_OK; } @@ -1469,15 +1391,12 @@ static HRESULT WINAPI dinput_device_GetObjectInfo( IDirectInputDevice8W *iface, return DI_OK; } -static BOOL CALLBACK reset_axis_data( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) -{ - *(ULONG *)((char *)data + instance->dwOfs) = 0; - return DIENUM_CONTINUE; -} - static HRESULT WINAPI dinput_device_GetDeviceState( IDirectInputDevice8W *iface, DWORD size, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); + DIDATAFORMAT *device_format = impl->data_format.wine_df, *user_format; + DIOBJECTDATAFORMAT *device_obj, *user_obj; + BYTE *user_state = data; DIPROPHEADER filter = { .dwSize = sizeof(filter), @@ -1496,13 +1415,37 @@ static HRESULT WINAPI dinput_device_GetDeviceState( IDirectInputDevice8W *iface, EnterCriticalSection( &impl->crit ); if (!impl->acquired) hr = DIERR_NOTACQUIRED; - else if (size != impl->user_format->dwDataSize) + else if (!(user_format = impl->user_format)) + hr = DIERR_INVALIDPARAM; + else if (size != user_format->dwDataSize) hr = DIERR_INVALIDPARAM; else { - fill_DataFormat( data, size, impl->device_state, &impl->data_format ); - if (!(impl->user_format->dwFlags & DIDF_ABSAXIS)) - impl->vtbl->enum_objects( iface, &filter, DIDFT_RELAXIS, reset_axis_data, impl->device_state ); + memset( user_state, 0, size ); + + user_obj = user_format->rgodf + device_format->dwNumObjs; + device_obj = device_format->rgodf + device_format->dwNumObjs; + while (user_obj-- > user_format->rgodf && device_obj-- > device_format->rgodf) + { + if (user_obj->dwType & DIDFT_BUTTON) + user_state[user_obj->dwOfs] = impl->device_state[device_obj->dwOfs]; + } + + /* reset optional POVs to their default */ + user_obj = user_format->rgodf + user_format->dwNumObjs; + while (user_obj-- > user_format->rgodf + device_format->dwNumObjs) + if (user_obj->dwType & DIDFT_POV) *(ULONG *)(user_state + user_obj->dwOfs) = 0xffffffff; + + user_obj = user_format->rgodf + device_format->dwNumObjs; + device_obj = device_format->rgodf + device_format->dwNumObjs; + while (user_obj-- > user_format->rgodf && device_obj-- > device_format->rgodf) + { + if (user_obj->dwType & (DIDFT_POV | DIDFT_AXIS)) + *(ULONG *)(user_state + user_obj->dwOfs) = *(ULONG *)(impl->device_state + device_obj->dwOfs); + if (!(user_format->dwFlags & DIDF_ABSAXIS) && (device_obj->dwType & DIDFT_RELAXIS)) + *(ULONG *)(impl->device_state + device_obj->dwOfs) = 0; + } + hr = DI_OK; } LeaveCriticalSection( &impl->crit ); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 1b81a374058..3f07a3a0f8a 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -38,10 +38,6 @@ typedef struct typedef struct { - int size; - DataTransform *dt; - - int *offsets; /* object offsets */ LPDIDATAFORMAT wine_df; /* wine internal data format */ } DataFormat; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3a8c7213ebc..13d71a270b6 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2009,16 +2009,21 @@ static BOOL get_parameters_object_id( struct hid_joystick *impl, struct hid_valu static BOOL get_parameters_object_ofs( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; - ULONG i; + DIDATAFORMAT *device_format = impl->base.data_format.wine_df, *user_format = impl->base.user_format; + DIOBJECTDATAFORMAT *device_obj, *user_obj; - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (format->rgodf[i].dwOfs == instance->dwOfs) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - *(DWORD *)data = offsets[i]; + if (!user_format) return DIENUM_CONTINUE; + user_obj = user_format->rgodf + device_format->dwNumObjs; + device_obj = device_format->rgodf + device_format->dwNumObjs; + while (user_obj-- > user_format->rgodf && device_obj-- > device_format->rgodf) + { + if (!user_obj->dwType) continue; + if (device_obj->dwType == instance->dwType) break; + } + if (user_obj < user_format->rgodf) return DIENUM_CONTINUE; + + *(DWORD *)data = user_obj->dwOfs; return DIENUM_STOP; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 2f2efbe09e3..dab6ea4478e 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4539,7 +4539,6 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetDeviceState( device, dataformat.dwDataSize, buffer ); ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); - todo_wine ok( ((ULONG *)buffer)[0] == 0x512b, "got %#x, expected %#x\n", ((ULONG *)buffer)[0], 0x512b ); ok( ((ULONG *)buffer)[1] == 0, "got %#x, expected %#x\n", ((ULONG *)buffer)[1], 0 ); ok( ((ULONG *)buffer)[2] == 0x7fff, "got %#x, expected %#x\n", ((ULONG *)buffer)[2], 0x7fff ); -- 2.33.0

1 2

[PATCH] combase: Clarify stream data format used by FT marshaler.
by Nikolay Sivov 29 Oct '21

29 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Removes additional read/write on 32 bit, and unused path on 64 bit. dlls/combase/marshal.c | 56 +++++++++++++------------------------- dlls/ole32/tests/marshal.c | 8 ++++++ 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index 51b4ce24115..f3ea3fcad50 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -271,6 +271,12 @@ static HRESULT WINAPI ftmarshaler_GetUnmarshalClass(IMarshal *iface, REFIID riid return S_OK; } +union ftmarshaler_data +{ + UINT64 value; + IUnknown *object; +}; + static HRESULT WINAPI ftmarshaler_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv, DWORD dest_context, void *pvDestContext, DWORD mshlflags, DWORD *size) { @@ -283,7 +289,7 @@ static HRESULT WINAPI ftmarshaler_GetMarshalSizeMax(IMarshal *iface, REFIID riid copied between the apartments */ if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX) { - *size = sizeof(mshlflags) + sizeof(pv) + sizeof(DWORD) + sizeof(GUID); + *size = sizeof(mshlflags) + sizeof(union ftmarshaler_data) + sizeof(GUID); return S_OK; } @@ -307,30 +313,24 @@ static HRESULT WINAPI ftmarshaler_MarshalInterface(IMarshal *iface, IStream *str copied between the apartments */ if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX) { - void *object; - DWORD constant = 0; + union ftmarshaler_data data; GUID unknown_guid = { 0 }; - hr = IUnknown_QueryInterface((IUnknown *)pv, riid, &object); + data.value = 0; + hr = IUnknown_QueryInterface((IUnknown *)pv, riid, (void **)&data.object); if (FAILED(hr)) return hr; /* don't hold a reference to table-weak marshaled interfaces */ if (mshlflags & MSHLFLAGS_TABLEWEAK) - IUnknown_Release((IUnknown *)object); + IUnknown_Release(data.object); hr = IStream_Write(stream, &mshlflags, sizeof(mshlflags), NULL); if (hr != S_OK) return STG_E_MEDIUMFULL; - hr = IStream_Write(stream, &object, sizeof(object), NULL); + hr = IStream_Write(stream, &data, sizeof(data), NULL); if (hr != S_OK) return STG_E_MEDIUMFULL; - if (sizeof(object) == sizeof(DWORD)) - { - hr = IStream_Write(stream, &constant, sizeof(constant), NULL); - if (hr != S_OK) return STG_E_MEDIUMFULL; - } - hr = IStream_Write(stream, &unknown_guid, sizeof(unknown_guid), NULL); if (hr != S_OK) return STG_E_MEDIUMFULL; @@ -346,9 +346,8 @@ static HRESULT WINAPI ftmarshaler_MarshalInterface(IMarshal *iface, IStream *str static HRESULT WINAPI ftmarshaler_UnmarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, void **ppv) { + union ftmarshaler_data data; DWORD mshlflags; - IUnknown *object; - DWORD constant; GUID unknown_guid; HRESULT hr; @@ -357,32 +356,23 @@ static HRESULT WINAPI ftmarshaler_UnmarshalInterface(IMarshal *iface, IStream *s hr = IStream_Read(stream, &mshlflags, sizeof(mshlflags), NULL); if (hr != S_OK) return STG_E_READFAULT; - hr = IStream_Read(stream, &object, sizeof(object), NULL); + hr = IStream_Read(stream, &data, sizeof(data), NULL); if (hr != S_OK) return STG_E_READFAULT; - if (sizeof(object) == sizeof(DWORD)) - { - hr = IStream_Read(stream, &constant, sizeof(constant), NULL); - if (hr != S_OK) return STG_E_READFAULT; - if (constant != 0) - FIXME("constant is 0x%x instead of 0\n", constant); - } - hr = IStream_Read(stream, &unknown_guid, sizeof(unknown_guid), NULL); if (hr != S_OK) return STG_E_READFAULT; - hr = IUnknown_QueryInterface(object, riid, ppv); + hr = IUnknown_QueryInterface(data.object, riid, ppv); if (!(mshlflags & (MSHLFLAGS_TABLEWEAK | MSHLFLAGS_TABLESTRONG))) - IUnknown_Release(object); + IUnknown_Release(data.object); return hr; } static HRESULT WINAPI ftmarshaler_ReleaseMarshalData(IMarshal *iface, IStream *stream) { + union ftmarshaler_data data; DWORD mshlflags; - IUnknown *object; - DWORD constant; GUID unknown_guid; HRESULT hr; @@ -391,21 +381,13 @@ static HRESULT WINAPI ftmarshaler_ReleaseMarshalData(IMarshal *iface, IStream *s hr = IStream_Read(stream, &mshlflags, sizeof(mshlflags), NULL); if (hr != S_OK) return STG_E_READFAULT; - hr = IStream_Read(stream, &object, sizeof(object), NULL); + hr = IStream_Read(stream, &data, sizeof(data), NULL); if (hr != S_OK) return STG_E_READFAULT; - if (sizeof(object) == sizeof(DWORD)) - { - hr = IStream_Read(stream, &constant, sizeof(constant), NULL); - if (hr != S_OK) return STG_E_READFAULT; - if (constant != 0) - FIXME("constant is 0x%x instead of 0\n", constant); - } - hr = IStream_Read(stream, &unknown_guid, sizeof(unknown_guid), NULL); if (hr != S_OK) return STG_E_READFAULT; - IUnknown_Release(object); + IUnknown_Release(data.object); return S_OK; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 891df59c54b..e05ed937df2 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -3181,6 +3181,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * static void test_freethreadedmarshaler(void) { + DWORD size, expected_size; HRESULT hr; IUnknown *pFTUnknown; IMarshal *pFTMarshal; @@ -3201,6 +3202,13 @@ static void test_freethreadedmarshaler(void) /* inproc normal marshaling */ + size = 0; + expected_size = sizeof(DWORD) /* flags */ + sizeof(UINT64) + sizeof(GUID); + hr = IMarshal_GetMarshalSizeMax(pFTMarshal, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_INPROC, + NULL, MSHLFLAGS_NORMAL, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size == expected_size, "Unexpected marshal size %u, expected %u.\n", size, expected_size); + hr = IMarshal_GetUnmarshalClass(pFTMarshal, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL, &clsid); ok_ole_success(hr, IMarshal_GetUnmarshalClass); -- 2.33.0

2 1

[PATCH] include: Define WMADecMediaObject
by Alistair Leslie-Hughes 29 Oct '21

29 Oct '21

The SDK headers have it defined in both places. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/mfidl.idl | 2 ++ include/wmcodecdsp.idl | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index d23995fbc18..511f97e3ac6 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1629,3 +1629,5 @@ cpp_quote("EXTERN_GUID(CLSID_MSH264EncoderMFT, 0x6ca50344, 0x051a, 0x4ded, 0x97, cpp_quote("EXTERN_GUID(CLSID_MSH265DecoderMFT, 0x420a51a3, 0xd605, 0x430c, 0xb4, 0xfc, 0x45, 0x27, 0x4f, 0xa6, 0xc5, 0x62);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") cpp_quote("EXTERN_GUID(CLSID_WMVDecoderMFT, 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);") + +cpp_quote("EXTERN_GUID(CLSID_WMADecMediaObject, 0x2eeb4adf, 0x4578, 0x4d10, 0xbc, 0xa7, 0xbb, 0x95, 0x5f, 0x56, 0x32, 0x0a);") diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index fd21ad54a40..1e43766a358 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -35,3 +35,8 @@ coclass CResamplerMediaObject {} uuid(62ce7e72-4c71-4d20-b15d-452831a87d9d) ] coclass CMSH264DecoderMFT {} + +[ + uuid(2eeb4adf-4578-4d10-bca7-bb955f56320a) +] +coclass CWMADecMediaObject {}; -- 2.33.0

1 0

[PATCH 5/5] msdasql: Add IConvertType interface for ICommandText
by Alistair Leslie-Hughes 29 Oct '21

29 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 44 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++-- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index eabdcacc968..3ee4b72a1d1 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -280,6 +280,7 @@ struct command ICommandText ICommandText_iface; ICommandProperties ICommandProperties_iface; IColumnsInfo IColumnsInfo_iface; + IConvertType IConvertType_iface; LONG refs; }; @@ -298,6 +299,11 @@ static inline struct command *impl_from_IColumnsInfo( IColumnsInfo *iface ) return CONTAINING_RECORD( iface, struct command, IColumnsInfo_iface ); } +static inline struct command *impl_from_IConvertType( IConvertType *iface ) +{ + return CONTAINING_RECORD( iface, struct command, IConvertType_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -319,6 +325,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->IColumnsInfo_iface; } + else if(IsEqualGUID(&IID_IConvertType, riid)) + { + *ppv = &command->IConvertType_iface; + } if(*ppv) { @@ -510,6 +520,39 @@ static struct IColumnsInfoVtbl columninfoVtbl = colsinfo_MapColumnIDs }; +static HRESULT WINAPI converttype_QueryInterface(IConvertType *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_IConvertType( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI converttype_AddRef(IConvertType *iface) +{ + struct command *command = impl_from_IConvertType( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI converttype_Release(IConvertType *iface) +{ + struct command *command = impl_from_IConvertType( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI converttype_CanConvert(IConvertType *iface, DBTYPE from, DBTYPE to, DBCONVERTFLAGS flags) +{ + struct command *command = impl_from_IConvertType( iface ); + FIXME("%p, %u, %d, 0x%08x\n", command, from, to, flags); + return E_NOTIMPL; +} + +static struct IConvertTypeVtbl converttypeVtbl = +{ + converttype_QueryInterface, + converttype_AddRef, + converttype_Release, + converttype_CanConvert +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -529,6 +572,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandText_iface.lpVtbl = &commandVtbl; command->ICommandProperties_iface.lpVtbl = &commonpropsVtbl; command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; + command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->refs = 1; hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index d4c6930bc8e..7d14928e50b 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -130,9 +130,8 @@ static void test_command_interfaces(IUnknown *cmd) ICommandText_Release(comand_text); hr = IUnknown_QueryInterface(cmd, &IID_IConvertType, (void**)&convertype); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - IConvertType_Release(convertype); + ok(hr == S_OK, "got 0x%08x\n", hr); + IConvertType_Release(convertype); hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.33.0

1 0

[PATCH 4/5] msdasql: Add IColumnsInfo interface for ICommandText
by Alistair Leslie-Hughes 29 Oct '21

29 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 54 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 85e79e00108..eabdcacc968 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -279,6 +279,7 @@ struct command { ICommandText ICommandText_iface; ICommandProperties ICommandProperties_iface; + IColumnsInfo IColumnsInfo_iface; LONG refs; }; @@ -292,6 +293,11 @@ static inline struct command *impl_from_ICommandProperties( ICommandProperties * return CONTAINING_RECORD( iface, struct command, ICommandProperties_iface ); } +static inline struct command *impl_from_IColumnsInfo( IColumnsInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct command, IColumnsInfo_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -309,6 +315,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandProperties_iface; } + else if(IsEqualGUID(&IID_IColumnsInfo, riid)) + { + *ppv = &command->IColumnsInfo_iface; + } if(*ppv) { @@ -457,6 +467,49 @@ static const ICommandPropertiesVtbl commonpropsVtbl = command_prop_SetProperties }; +static HRESULT WINAPI colsinfo_QueryInterface(IColumnsInfo *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI colsinfo_AddRef(IColumnsInfo *iface) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI colsinfo_Release(IColumnsInfo *iface) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDINAL *columns, + DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + FIXME("%p, %p, %p, %p\n", command, columns, colinfo, stringsbuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI colsinfo_MapColumnIDs(IColumnsInfo *iface, DBORDINAL column_ids, + const DBID *dbids, DBORDINAL *columns) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + FIXME("%p, %lu, %p, %p\n", command, column_ids, dbids, columns); + return E_NOTIMPL; +} + +static struct IColumnsInfoVtbl columninfoVtbl = +{ + colsinfo_QueryInterface, + colsinfo_AddRef, + colsinfo_Release, + colsinfo_GetColumnInfo, + colsinfo_MapColumnIDs +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -475,6 +528,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandText_iface.lpVtbl = &commandVtbl; command->ICommandProperties_iface.lpVtbl = &commonpropsVtbl; + command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; command->refs = 1; hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 184e5d3b1e8..d4c6930bc8e 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -140,9 +140,8 @@ static void test_command_interfaces(IUnknown *cmd) ICommandPrepare_Release(commandprepare); hr = IUnknown_QueryInterface(cmd, &IID_IColumnsInfo, (void**)&colinfo); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - IColumnsInfo_Release(colinfo); + ok(hr == S_OK, "got 0x%08x\n", hr); + IColumnsInfo_Release(colinfo); hr = IUnknown_QueryInterface(cmd, &IID_ICommandStream, (void**)&commandstream); ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); -- 2.33.0

1 0

[PATCH 3/5] msdasql: Trace unsupported interfaces.
by Alistair Leslie-Hughes 29 Oct '21

29 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 25 +++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 10 ++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 42b40349f1b..85e79e00108 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -315,6 +315,31 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } + else if (IsEqualGUID(&IID_IMultipleResults, riid)) + { + TRACE("IID_IMultipleResults not supported\n"); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_ICommandStream, riid)) + { + TRACE("ICommandStream not support\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetChange, riid)) + { + TRACE("IID_IRowsetChange not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetUpdate, riid)) + { + TRACE("IID_IRowsetUpdate not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetLocate, riid)) + { + TRACE("IID_IRowsetLocate not supported\n"); + return E_NOINTERFACE; + } FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); return E_NOINTERFACE; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 0d9630070b3..184e5d3b1e8 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -119,6 +119,7 @@ static void test_command_interfaces(IUnknown *cmd) ICommandStream *commandstream; IColumnsInfo *colinfo; IMultipleResults *multiple; + IUnknown *unk; hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -148,6 +149,15 @@ static void test_command_interfaces(IUnknown *cmd) hr = IUnknown_QueryInterface(cmd, &IID_IMultipleResults, (void**)&multiple); ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IRowsetChange, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IRowsetUpdate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IRowsetLocate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); } static void test_sessions(void) -- 2.33.0

1 0

[PATCH 2/5] msdasql: Add ICommandProperties interface to ICommandText
by Alistair Leslie-Hughes 29 Oct '21

29 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index afdbccb5a03..42b40349f1b 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -278,6 +278,7 @@ static ULONG WINAPI createcommand_Release(IDBCreateCommand *iface) struct command { ICommandText ICommandText_iface; + ICommandProperties ICommandProperties_iface; LONG refs; }; @@ -286,6 +287,11 @@ static inline struct command *impl_from_ICommandText( ICommandText *iface ) return CONTAINING_RECORD( iface, struct command, ICommandText_iface ); } +static inline struct command *impl_from_ICommandProperties( ICommandProperties *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandProperties_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -299,6 +305,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandText_iface; } + else if(IsEqualGUID(&IID_ICommandProperties, riid)) + { + *ppv = &command->ICommandProperties_iface; + } if(*ppv) { @@ -379,6 +389,49 @@ static const ICommandTextVtbl commandVtbl = command_SetCommandText }; +static HRESULT WINAPI command_prop_QueryInterface(ICommandProperties *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_ICommandProperties( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI command_prop_AddRef(ICommandProperties *iface) +{ + struct command *command = impl_from_ICommandProperties( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI command_prop_Release(ICommandProperties *iface) +{ + struct command *command = impl_from_ICommandProperties( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI command_prop_GetProperties(ICommandProperties *iface, ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *sets_cnt, DBPROPSET **propertyset) +{ + struct command *command = impl_from_ICommandProperties( iface ); + FIXME("%p %d %p %p %p\n", command, count, propertyidsets, sets_cnt, propertyset); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULONG count, + DBPROPSET propertyset[]) +{ + struct command *command = impl_from_ICommandProperties( iface ); + FIXME("%p %p\n", command, propertyset); + return S_OK; +} + +static const ICommandPropertiesVtbl commonpropsVtbl = +{ + command_prop_QueryInterface, + command_prop_AddRef, + command_prop_Release, + command_prop_GetProperties, + command_prop_SetProperties +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -396,6 +449,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn return E_OUTOFMEMORY; command->ICommandText_iface.lpVtbl = &commandVtbl; + command->ICommandProperties_iface.lpVtbl = &commonpropsVtbl; command->refs = 1; hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); -- 2.33.0

1 0

[PATCH 1/5] msdasql: Implement IDBCreateCommand CreateCommand
by Alistair Leslie-Hughes 29 Oct '21

29 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 123 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index e01dcf7ab7e..afdbccb5a03 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -275,13 +275,132 @@ static ULONG WINAPI createcommand_Release(IDBCreateCommand *iface) return IUnknown_Release(&session->session_iface); } +struct command +{ + ICommandText ICommandText_iface; + LONG refs; +}; + +static inline struct command *impl_from_ICommandText( ICommandText *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandText_iface ); +} + +static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) +{ + struct command *command = impl_from_ICommandText( iface ); + + TRACE( "%p, %s, %p\n", command, debugstr_guid(riid), ppv ); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_ICommand, riid) || + IsEqualGUID(&IID_ICommandText, riid)) + { + *ppv = &command->ICommandText_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 command_AddRef(ICommandText *iface) +{ + struct command *command = impl_from_ICommandText( iface ); + LONG refs = InterlockedIncrement( &command->refs ); + TRACE( "%p new refcount %d\n", command, refs ); + return refs; +} + +static ULONG WINAPI command_Release(ICommandText *iface) +{ + struct command *command = impl_from_ICommandText( iface ); + LONG refs = InterlockedDecrement( &command->refs ); + TRACE( "%p new refcount %d\n", command, refs ); + if (!refs) + { + TRACE( "destroying %p\n", command ); + heap_free( command ); + } + return refs; +} + +static HRESULT WINAPI command_Cancel(ICommandText *iface) +{ + struct command *command = impl_from_ICommandText( iface ); + FIXME("%p\n", command); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, + DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) +{ + struct command *command = impl_from_ICommandText( iface ); + FIXME("%p, %p, %s, %p %p %p\n", command, outer, debugstr_guid(riid), params, affected, rowset); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_GetDBSession(ICommandText *iface, REFIID riid, IUnknown **session) +{ + struct command *command = impl_from_ICommandText( iface ); + FIXME("%p, %s, %p\n", command, debugstr_guid(riid), session); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, LPOLESTR *commandstr) +{ + struct command *command = impl_from_ICommandText( iface ); + FIXME("%p, %p, %p\n", command, dialect, commandstr); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialect, LPCOLESTR commandstr) +{ + struct command *command = impl_from_ICommandText( iface ); + FIXME("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); + return S_OK; +} + +static const ICommandTextVtbl commandVtbl = +{ + command_QueryInterface, + command_AddRef, + command_Release, + command_Cancel, + command_Execute, + command_GetDBSession, + command_GetCommandText, + command_SetCommandText +}; + 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); + struct command *command; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %s, %p\n", session, outer, debugstr_guid(riid), out); + + if (outer) + FIXME("Outer not currently supported\n"); + + command = heap_alloc(sizeof(*command)); + if (!command) + return E_OUTOFMEMORY; + + command->ICommandText_iface.lpVtbl = &commandVtbl; + command->refs = 1; + + hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); + ICommandText_Release(&command->ICommandText_iface); + return hr; } static const IDBCreateCommandVtbl createcommandVtbl = -- 2.33.0

1 0

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

29 Oct '21

Add tests for various paths and undefined behavior with regards to LdrGetDllPath with LOAD_ALTERED_SEARCH_PATH and relative module names. Also update the build_search_path helper function to correctly build the search path when LOAD_WITH_ALTERED_SEARCH_PATH is set. Signed-off-by: Nick Fox <nick(a)foxsec.net> --- v5: use helper function to duplicate less code per julliard's feedback --- dlls/kernel32/tests/path.c | 93 +++++++++++++++++++++++++++++++------- 1 file changed, 77 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f49af6d5bfe..2737910931c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2409,12 +2409,16 @@ static void test_SetSearchPathMode(void) static const WCHAR pathW[] = {'P','A','T','H',0}; -static void build_search_path( WCHAR *buffer, UINT size, const WCHAR *dlldir, BOOL safe ) +static void build_search_path( const WCHAR *path, WCHAR *buffer, UINT size, const WCHAR *dlldir, BOOL safe, ULONG flags ) { WCHAR *p; - GetModuleFileNameW( NULL, buffer, size ); - if (!(p = wcsrchr( buffer, '\\' ))) return; + if (path && (flags & LOAD_WITH_ALTERED_SEARCH_PATH) && (p = wcsrchr( path, L'\\' ))) + lstrcpynW( buffer, path, p - path + 2 ); + else + GetModuleFileNameW( NULL, buffer, size ); + if (!(p = wcsrchr( buffer, L'\\' ))) return; *p++ = ';'; + if (dlldir) { lstrcpyW( p, dlldir ); @@ -2471,7 +2475,7 @@ static void test_RtlGetSearchPath(void) GetWindowsDirectoryW( buffer, ARRAY_SIZE(buffer) ); lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, TRUE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2479,7 +2483,7 @@ static void test_RtlGetSearchPath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, TRUE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2489,7 +2493,7 @@ static void test_RtlGetSearchPath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, TRUE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2520,14 +2524,14 @@ static void test_RtlGetExePath(void) lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); SetEnvironmentVariableA( "NoDefaultCurrentDirectoryInExePath", NULL ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, FALSE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, FALSE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW + 1, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2536,14 +2540,14 @@ static void test_RtlGetExePath(void) SetEnvironmentVariableA( "NoDefaultCurrentDirectoryInExePath", "yes" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, FALSE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); - build_search_path( buffer, ARRAY_SIZE(buffer), emptyW, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), emptyW, TRUE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW + 1, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2551,7 +2555,7 @@ static void test_RtlGetExePath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, FALSE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2561,7 +2565,7 @@ static void test_RtlGetExePath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, FALSE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2578,7 +2582,7 @@ static void test_LdrGetDllPath(void) static const WCHAR fooW[] = {'f','o','o',0}; NTSTATUS ret; WCHAR *path, *unknown_ptr, *p; - WCHAR buffer[2048], old_path[2048], dlldir[4]; + WCHAR buffer[2048], old_path[2048], module_path[2048], dlldir[4]; if (!pLdrGetDllPath) { @@ -2589,7 +2593,7 @@ static void test_LdrGetDllPath(void) GetWindowsDirectoryW( buffer, ARRAY_SIZE(buffer) ); lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, TRUE, 0 ); path = unknown_ptr = (WCHAR *)0xdeadbeef; ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); @@ -2599,7 +2603,7 @@ static void test_LdrGetDllPath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, TRUE, 0 ); ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); @@ -2609,7 +2613,7 @@ static void test_LdrGetDllPath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), dlldir, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), dlldir, TRUE, 0 ); ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); @@ -2654,6 +2658,63 @@ static void test_LdrGetDllPath(void) ok( !lstrcmpW( path, L"\\\\?\\c:" ), "got %s expected \\\\?\\c:\n", wine_dbgstr_w(path)); pRtlReleasePath( path ); + lstrcpyW( module_path, fooW ); + ret = pLdrGetDllPath( module_path, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( module_path, buffer, ARRAY_SIZE(buffer), NULL, TRUE, LOAD_WITH_ALTERED_SEARCH_PATH ); + todo_wine + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( module_path, L"temp" ); + p = module_path + lstrlenW( module_path ); + *p++ = '/'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( module_path, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( module_path, buffer, ARRAY_SIZE(buffer), NULL, TRUE, LOAD_WITH_ALTERED_SEARCH_PATH ); + todo_wine + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( module_path, L".\\foo\\foobar" ); + ret = pLdrGetDllPath( module_path, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( module_path, buffer, ARRAY_SIZE(buffer), NULL, TRUE, LOAD_WITH_ALTERED_SEARCH_PATH ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( module_path, L"temp" ); + p = module_path + lstrlenW( module_path ); + *p++ = '\\'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( module_path, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( module_path, buffer, ARRAY_SIZE(buffer), NULL, TRUE,LOAD_WITH_ALTERED_SEARCH_PATH ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( module_path, L"c:\\temp" ); + p = module_path + lstrlenW(module_path); + *p++ = '\\'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( module_path, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( module_path, buffer, ARRAY_SIZE(buffer), NULL, TRUE, LOAD_WITH_ALTERED_SEARCH_PATH ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( ret == STATUS_INVALID_PARAMETER, "got %x expected %x\n", ret, STATUS_INVALID_PARAMETER ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + pRtlReleasePath( path ); + lstrcpyW( buffer, dlldir ); p = buffer + lstrlenW(buffer); *p++ = '\\'; -- 2.33.1

2 2

[PATCH 1/6] user32/tests: Cleanup and rewrite test_EnumDisplayDevices.
by Rémi Bernon 28 Oct '21

28 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- A refresh and continuation of the null graphics driver improvements, as I've finally been able to make all monitor tests (and thus all user32 tests) to pass with it too, without duplicating the driver adapter and monitor initialization code and initializing the device cache with some defaults instead. dlls/user32/tests/monitor.c | 230 ++++++++++++++++-------------------- 1 file changed, 103 insertions(+), 127 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bd348576726..131721d7ec1 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -105,148 +105,124 @@ static int get_bitmap_stride(int width, int bpp) return ((width * bpp + 15) >> 3) & ~1; } -static int adapter_count = 0; -static int monitor_count = 0; - -static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *device, DWORD flags) +static void test_EnumDisplayDevices(void) { - char buffer[128]; - int number; - int vendor_id; - int device_id; - int subsys_id; - int revision_id; + DISPLAY_DEVICEW dd = {.cb = sizeof(DISPLAY_DEVICEW)}, adapter = dd, adapter_iface = dd, monitor = dd, monitor_iface = dd; + DWORD number, monitor_num, adapter_index, monitor_index, adapter_count = 0, monitor_count = 0; + WCHAR buffer[MAX_PATH], monitor_id[MAX_PATH]; + BOOL ret; HDC hdc; - adapter_count++; - - /* DeviceName */ - ok(sscanf(device->DeviceName, "\\\\.\\DISPLAY%d", &number) == 1, "#%d: wrong DeviceName %s\n", index, - device->DeviceName); - - /* DeviceKey */ - /* \Device\Video? value in HLKM\HARDWARE\DEVICEMAP\VIDEO are not necessarily in order with adapter index. - * Check format only */ - ok(sscanf(device->DeviceKey, "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Video\\%[^\\]\\%04d", buffer, &number) == 2, - "#%d: wrong DeviceKey %s\n", index, device->DeviceKey); - - /* DeviceString */ - ok(broken(!*device->DeviceString) || /* XP on Testbot will return an empty string, whereas XP on real machine doesn't. Probably a bug in virtual adapter driver */ - *device->DeviceString, "#%d: expect DeviceString not empty\n", index); + /* Doesn't accept \\.\DISPLAY */ + dd.cb = sizeof(dd); + ret = EnumDisplayDevicesW( L"\\\\.\\DISPLAY", 0, &dd, 0 ); + ok( !ret, "EnumDisplayDevicesW succeeded\n" ); - /* StateFlags */ - if (device->StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + adapter_index = -1; + while (EnumDisplayDevicesW( NULL, ++adapter_index, &adapter, 0 )) { - /* Test creating DC */ - hdc = CreateDCA(device->DeviceName, NULL, NULL, NULL); - ok(hdc != NULL, "#%d: failed to CreateDC(\"%s\") err=%d\n", index, device->DeviceName, GetLastError()); - DeleteDC(hdc); - } + winetest_push_context( "adapter %u", adapter_index ); - /* DeviceID */ - /* DeviceID should equal to the first string of HardwareID value data in PCI GPU instance. You can verify this - * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on - * userland. So here we check the expected format instead. */ - if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - ok(strlen(device->DeviceID) == 0 || /* vista+ */ - sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", - &vendor_id, &device_id, &subsys_id, &revision_id) == 4, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ - "#%d: got %s\n", index, device->DeviceID); - else - { - ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ - sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, - &revision_id) == 4, "#%d: wrong DeviceID %s\n", index, device->DeviceID); - } -} + ret = EnumDisplayDevicesW( NULL, adapter_index, &adapter_iface, EDD_GET_DEVICE_INTERFACE_NAME ); + ok( ret, "EnumDisplayDevicesW failed, error %u\n", GetLastError() ); -static void test_enumdisplaydevices_monitor(int monitor_index, const char *adapter_name, - DISPLAY_DEVICEA *device, DWORD flags) -{ - static const char device_key_prefix[] = "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class" - "\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\"; - char monitor_name[32]; - char buffer[128]; - int number; - - monitor_count++; - - /* DeviceName */ - lstrcpyA(monitor_name, adapter_name); - sprintf(monitor_name + strlen(monitor_name), "\\Monitor%d", monitor_index); - ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); - - /* DeviceString */ - ok(*device->DeviceString, "#%d: expect DeviceString not empty\n", monitor_index); - - /* StateFlags */ - ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), - "#%d wrong state %#x\n", monitor_index, device->StateFlags); - - /* DeviceID */ - CharLowerA(device->DeviceID); - if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\[monitor name]\[instance id] GUID_DEVINTERFACE_MONITOR - * ^ ^ ^ - * Expect format \\?\DISPLAY#[monitor name]#[instance id]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ - ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ - sscanf(device->DeviceID, "\\\\?\\display#%[^#]#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer, buffer) == 2 || /* win8+ */ - sscanf(device->DeviceID, "monitor\\%[^\\]\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04d", buffer, &number) == 2, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ - "#%d: wrong DeviceID : %s\n", monitor_index, device->DeviceID); - } - else - { - /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\[monitor name]\{instance} */ - /* But we don't know which monitor instance this belongs to, so check format instead */ - ok(sscanf(device->DeviceID, "monitor\\%[^\\]\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04d", buffer, &number) == 2, - "#%d: wrong DeviceID : %s\n", monitor_index, device->DeviceID); - } + ok( !wcscmp( adapter.DeviceName, adapter_iface.DeviceName ), "got DeviceName %s expected %s\n", + debugstr_w(adapter.DeviceName), debugstr_w(adapter_iface.DeviceName) ); + ok( !wcscmp( adapter.DeviceString, adapter_iface.DeviceString ), "got DeviceString %s expected %s\n", + debugstr_w(adapter.DeviceString), debugstr_w(adapter_iface.DeviceString) ); + ok( adapter.StateFlags == adapter_iface.StateFlags, "got StateFlags %#x expected %#x\n", + adapter.StateFlags, adapter_iface.StateFlags ); + ok( !wcscmp( adapter.DeviceKey, adapter_iface.DeviceKey ), "got DeviceKey %s expected %s\n", + debugstr_w(adapter.DeviceKey), debugstr_w(adapter_iface.DeviceKey) ); - /* DeviceKey */ - lstrcpynA(buffer, device->DeviceKey, sizeof(device_key_prefix)); - ok(!lstrcmpiA(buffer, device_key_prefix), "#%d: wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); - ok(sscanf(device->DeviceKey + sizeof(device_key_prefix) - 1, "%04d", &number) == 1, - "#%d wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); -} - -static void test_enumdisplaydevices(void) -{ - static const DWORD flags[] = {0, EDD_GET_DEVICE_INTERFACE_NAME}; - DISPLAY_DEVICEA dd; - char adapter_name[32]; - int number; - int flag_index; - int adapter_index; - int monitor_index; - BOOL ret; + if (swscanf( adapter.DeviceName, L"\\\\.\\DISPLAYV%u", &number ) == 1) + { + skip( "Skipping software devices %s %s\n", debugstr_w(adapter.DeviceName), debugstr_w(adapter.DeviceString) ); + winetest_pop_context(); + continue; + } - /* Doesn't accept \\.\DISPLAY */ - dd.cb = sizeof(dd); - ret = EnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); - ok(!ret, "Expect failure\n"); + swprintf( buffer, MAX_PATH, L"\\\\.\\DISPLAY%u", adapter_count + 1 ); + ok( !wcscmp( adapter.DeviceName, buffer ), "got DeviceName %s expected %s\n", + debugstr_w(adapter.DeviceName), debugstr_w(buffer) ); - /* Enumeration */ - for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++) - for (adapter_index = 0; EnumDisplayDevicesA(NULL, adapter_index, &dd, flags[flag_index]); adapter_index++) + ok( *adapter.DeviceString, "got empty DeviceString\n" ); + if (adapter.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) { - lstrcpyA(adapter_name, dd.DeviceName); - - if (sscanf(adapter_name, "\\\\.\\DISPLAYV%d", &number) == 1) - { - skip("Skipping software devices %s:%s\n", adapter_name, dd.DeviceString); - continue; - } + /* Test creating DC */ + hdc = CreateDCW( adapter.DeviceName, NULL, NULL, NULL ); + ok( hdc != 0, "CreateDCW failed error %u\n", GetLastError() ); + DeleteDC( hdc ); + } - test_enumdisplaydevices_adapter(adapter_index, &dd, flags[flag_index]); + ok( swscanf( adapter.DeviceKey, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\" + "Video\\%[^\\]\\%04u", buffer, &number ) == 2, + "got DeviceKey %s\n", debugstr_w(adapter.DeviceKey) ); - for (monitor_index = 0; EnumDisplayDevicesA(adapter_name, monitor_index, &dd, flags[flag_index]); - monitor_index++) - test_enumdisplaydevices_monitor(monitor_index, adapter_name, &dd, flags[flag_index]); + /* DeviceID should equal to the first string of HardwareID value data in PCI GPU instance. You can verify this + * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on + * userland. So here we check the expected format instead. */ + todo_wine + ok( broken( !*adapter_iface.DeviceID ) || + swscanf( adapter_iface.DeviceID, L"PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", + &number, &number, &number, &number ) == 4, + "got interface DeviceID %s\n", debugstr_w(adapter_iface.DeviceID) ); + ok( swscanf( adapter.DeviceID, L"PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &number, + &number, &number, &number ) == 4, + "got interface DeviceID %s\n", debugstr_w(adapter.DeviceID) ); + + monitor_index = -1; + while (EnumDisplayDevicesW( adapter.DeviceName, ++monitor_index, &monitor, 0 )) + { + winetest_push_context( "monitor %u", monitor_index ); + + ret = EnumDisplayDevicesW( adapter.DeviceName, monitor_index, &monitor_iface, EDD_GET_DEVICE_INTERFACE_NAME ); + ok( ret, "EnumDisplayDevicesW failed, error %u\n", GetLastError() ); + + ok( !wcscmp( monitor.DeviceName, monitor_iface.DeviceName ), "got DeviceName %s expected %s\n", + debugstr_w(monitor.DeviceName), debugstr_w(monitor_iface.DeviceName) ); + ok( !wcscmp( monitor.DeviceString, monitor_iface.DeviceString ), "got DeviceString %s expected %s\n", + debugstr_w(monitor.DeviceString), debugstr_w(monitor_iface.DeviceString) ); + ok( monitor.StateFlags == monitor_iface.StateFlags, "got StateFlags %#x expected %#x\n", + monitor.StateFlags, monitor_iface.StateFlags ); + ok( !wcscmp( monitor.DeviceKey, monitor_iface.DeviceKey ), "got DeviceKey %s expected %s\n", + debugstr_w(monitor.DeviceKey), debugstr_w(monitor_iface.DeviceKey) ); + + swprintf( buffer, MAX_PATH, L"%s\\Monitor%u", adapter.DeviceName, monitor_index ); + ok( !wcscmp( monitor.DeviceName, buffer ), "got DeviceName %s expected %s\n", + debugstr_w(monitor.DeviceName), debugstr_w(buffer) ); + + ok( *monitor.DeviceString, "got empty DeviceString\n" ); + ok( !(monitor.StateFlags & ~(DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE)), + "got unexpected StateFlags %#x\n", monitor.StateFlags ); + + CharLowerW( monitor.DeviceKey ); + ok( swscanf( monitor.DeviceKey, L"\\registry\\machine\\system\\currentcontrolset\\control\\" + "class\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04u", &monitor_num ) == 1, + "got DeviceKey %s\n", debugstr_w(monitor.DeviceKey) ); + + ok( broken( !*monitor_iface.DeviceID ) || + swscanf( monitor_iface.DeviceID, L"\\\\?\\DISPLAY#%[^#]#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", + monitor_id, buffer ) == 2, + "got interface DeviceID %s\n", debugstr_w(monitor_iface.DeviceID) ); + if (!*monitor_iface.DeviceID) wcscpy( monitor_id, L"default_monitor" ); + + swprintf( buffer, MAX_PATH, L"monitor\\%s\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04u", + monitor_id, monitor_num ); + ok( !wcsicmp( monitor.DeviceID, buffer ), "got DeviceID %s expected %s\n", + debugstr_w(monitor.DeviceID), debugstr_w(buffer) ); + + winetest_pop_context(); } - ok(adapter_count > 0, "Expect at least one adapter found\n"); + adapter_count += 1; + monitor_count += monitor_index; + winetest_pop_context(); + } + + ok( adapter_index > 0, "Expect at least one adapter found\n" ); /* XP on Testbot doesn't report a monitor, whereas XP on real machine does */ - ok(broken(monitor_count == 0) || monitor_count > 0, "Expect at least one monitor found\n"); + ok( broken( monitor_count == 0 ) || monitor_count > 0, "Expect at least one monitor found\n" ); } struct vid_mode @@ -2356,7 +2332,7 @@ static void test_display_dc(void) START_TEST(monitor) { init_function_pointers(); - test_enumdisplaydevices(); + test_EnumDisplayDevices(); test_ChangeDisplaySettingsEx(); test_DisplayConfigSetDeviceInfo(); test_EnumDisplayMonitors(); -- 2.33.0

3 9

[PATCH v2 6/6] secur32/tests: Add DTLS tests.
by Hans Leidekker 28 Oct '21

28 Oct '21

v2: Fix test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/tests/schannel.c | 71 +++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b7f9d409d41..7cb3871193c 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1517,6 +1517,76 @@ static void test_application_protocol_negotiation(void) closesocket(sock); } +static void test_dtls(void) +{ + SECURITY_STATUS status; + TimeStamp exp; + SCHANNEL_CRED cred; + CredHandle cred_handle; + CtxtHandle ctx_handle; + SecBufferDesc buffers[3]; + ULONG flags_req, flags_ret, attr; + + init_cred( &cred ); + cred.grbitEnabledProtocols = SP_PROT_DTLS_CLIENT | SP_PROT_DTLS1_2_CLIENT; + cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS; + + status = AcquireCredentialsHandleA( NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &cred, NULL, NULL, + &cred_handle, &exp ); + if (status == SEC_E_ALGORITHM_MISMATCH) + { + win_skip( "no DTLS support\n" ); + return; + } + ok( status == SEC_E_OK, "got %08x\n", status ); + + flags_req = ISC_REQ_MANUAL_CRED_VALIDATION | ISC_REQ_EXTENDED_ERROR | ISC_REQ_DATAGRAM | ISC_REQ_USE_SUPPLIED_CREDS | + ISC_REQ_CONFIDENTIALITY | ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT; + + init_buffers( &buffers[0], 1, 128 ); + buffers[0].pBuffers[0].BufferType = SECBUFFER_DTLS_MTU; + *(WORD *)(buffers[0].pBuffers[0].pvBuffer) = 1024; + buffers[0].pBuffers[0].cbBuffer = 2; + + init_buffers( &buffers[1], 2, 2048 ); + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[1].pBuffers[0].cbBuffer = 1420; + buffers[1].pBuffers[1].BufferType = SECBUFFER_ALERT; + buffers[1].pBuffers[1].cbBuffer = 1024; + buffers[1].pBuffers[1].pvBuffer = HeapAlloc( GetProcessHeap(), 0, 1024 ); + + attr = 0; + exp.LowPart = exp.HighPart = 0xdeadbeef; + status = InitializeSecurityContextA( &cred_handle, NULL, (SEC_CHAR *)"winetest", flags_req, 0, 16, &buffers[0], 0, + &ctx_handle, &buffers[1], &attr, &exp ); + ok( status == SEC_I_CONTINUE_NEEDED, "got %08x\n", status ); + + flags_ret = ISC_RET_MANUAL_CRED_VALIDATION | ISC_RET_STREAM | ISC_RET_EXTENDED_ERROR | ISC_RET_DATAGRAM | + ISC_RET_USED_SUPPLIED_CREDS | ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; + ok( attr == flags_ret, "got %08x\n", attr ); + ok( !exp.LowPart, "got %08x\n", exp.LowPart ); + ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[1].pBuffers[0].cbBuffer = 1420; + + attr = 0; + exp.LowPart = exp.HighPart = 0xdeadbeef; + status = InitializeSecurityContextA( &cred_handle, &ctx_handle, (SEC_CHAR *)"winetest", flags_req, 0, 16, NULL, 0, + &ctx_handle, &buffers[1], &attr, &exp ); + ok( status == SEC_E_INSUFFICIENT_MEMORY, "got %08x\n", status ); + + flags_ret = ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; + todo_wine ok( attr == flags_ret, "got %08x\n", attr ); + ok( !exp.LowPart, "got %08x\n", exp.LowPart ); + ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + + free_buffers( &buffers[0] ); + free_buffers( &buffers[1] ); + DeleteSecurityContext( &ctx_handle ); + FreeCredentialsHandle( &cred_handle ); +} + START_TEST(schannel) { WSADATA wsa_data; @@ -1529,4 +1599,5 @@ START_TEST(schannel) test_InitializeSecurityContext(); test_communication(); test_application_protocol_negotiation(); + test_dtls(); } -- 2.30.2

2 1

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

28 Oct '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 147 +++++++++++++++++++++++++++++- 2 files changed, 146 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..51c220c6041 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,12 +16,150 @@ * 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 +{ + IUnknown IUnknown_iface; + LONG refcount; + + IUnknown *inner; + IUnknown *rsrv_val; +}; + +static struct uia_rsrv_ftmarshaler *uia_rsrv_ns_val_ftmarshaler = NULL; + +static struct uia_rsrv_ftmarshaler *impl_uia_rsrv_ftmarshaler_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct uia_rsrv_ftmarshaler, IUnknown_iface); +} + +static HRESULT WINAPI uia_rsrv_ftmarshaler_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ftmarshaler_from_IUnknown(iface); + + return IUnknown_QueryInterface(marshaler->rsrv_val, riid, ppv); +} + +static ULONG WINAPI uia_rsrv_ftmarshaler_AddRef(IUnknown *iface) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ftmarshaler_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&marshaler->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI uia_rsrv_ftmarshaler_Release(IUnknown *iface) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ftmarshaler_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&marshaler->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + if (!refcount) + { + if (marshaler == uia_rsrv_ns_val_ftmarshaler) + uia_rsrv_ns_val_ftmarshaler = NULL; + + IUnknown_Release(marshaler->inner); + heap_free(marshaler); + } + + return refcount; +} + +static const IUnknownVtbl uia_rsrv_ftmarshaler_vtbl = { + uia_rsrv_ftmarshaler_QueryInterface, + uia_rsrv_ftmarshaler_AddRef, + uia_rsrv_ftmarshaler_Release, +}; + +/* + * When passing the ReservedNotSupportedValue/ReservedMixedAttributeValue + * interface pointers across apartments within the same process, create a free + * threaded marshaler so that the pointer value is preserved. + */ +static HRESULT uia_rsrv_val_create_ftmarshaler(IUnknown *reserved, struct uia_rsrv_ftmarshaler **marshaler) +{ + struct uia_rsrv_ftmarshaler *object; + HRESULT hr; + + TRACE("%p, %p\n", reserved, marshaler); + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IUnknown_iface.lpVtbl = &uia_rsrv_ftmarshaler_vtbl; + object->refcount = 1; + + hr = CoCreateFreeThreadedMarshaler(&object->IUnknown_iface, &object->inner); + if (FAILED(hr = CoCreateFreeThreadedMarshaler(&object->IUnknown_iface, &object->inner))) + { + heap_free(object); + return hr; + } + + *marshaler = object; + + return hr; +} + +/* + * 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)) + { + if (!uia_rsrv_ns_val_ftmarshaler) + { + if (FAILED(uia_rsrv_val_create_ftmarshaler(iface, &uia_rsrv_ns_val_ftmarshaler))) + return E_NOINTERFACE; + } + + if (FAILED(IUnknown_QueryInterface(uia_rsrv_ns_val_ftmarshaler->inner, riid, ppv))) + return E_NOINTERFACE; + + IUnknown_Release(&uia_rsrv_ns_val_ftmarshaler->IUnknown_iface); + } + 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 +184,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 4

[PATCH v2 5/6] secur32: Fix error return for DTLS contexts in schan_InitializeSecurityContextW().
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 46 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5b1a910a361..895364a3fc7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -880,6 +880,11 @@ static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) return (buf[header_size - 2] << 8) | buf[header_size - 1]; } +static inline BOOL is_dtls_context(const struct schan_context *ctx) +{ + return ctx->header_size == HEADER_SIZE_DTLS; +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -985,35 +990,28 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( unsigned char *ptr; if (!(ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX))) return SEC_E_INVALID_HANDLE; - if (pInput) - { - idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN); - if (idx == -1) - return SEC_E_INCOMPLETE_MESSAGE; - - buffer = &pInput->pBuffers[idx]; - ptr = buffer->pvBuffer; - expected_size = 0; + if (!pInput) return is_dtls_context(ctx) ? SEC_E_INSUFFICIENT_MEMORY : SEC_E_INCOMPLETE_MESSAGE; + if ((idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN)) == -1) return SEC_E_INCOMPLETE_MESSAGE; - while (buffer->cbBuffer > expected_size + ctx->header_size) - { - record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); + buffer = &pInput->pBuffers[idx]; + ptr = buffer->pvBuffer; + expected_size = 0; - if (buffer->cbBuffer < expected_size + record_size) - break; + while (buffer->cbBuffer > expected_size + ctx->header_size) + { + record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); - expected_size += record_size; - ptr += record_size; - } + if (buffer->cbBuffer < expected_size + record_size) break; + expected_size += record_size; + ptr += record_size; + } - if (!expected_size) - { - TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", - max(ctx->header_size + 1, record_size), buffer->cbBuffer); - return SEC_E_INCOMPLETE_MESSAGE; - } + if (!expected_size) + { + TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", + max(ctx->header_size + 1, record_size), buffer->cbBuffer); + return SEC_E_INCOMPLETE_MESSAGE; } - else return SEC_E_INCOMPLETE_MESSAGE; TRACE("Using expected_size %lu.\n", expected_size); } -- 2.30.2

1 0

[PATCH v2 4/6] secur32: Validate the context handle in schan_InitializeSecurityContextW().
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index fdf8e990f62..5b1a910a361 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -984,7 +984,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( SIZE_T record_size = 0; unsigned char *ptr; - ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX); + if (!(ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX))) return SEC_E_INVALID_HANDLE; if (pInput) { idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN); -- 2.30.2

1 0

[PATCH v2 3/6] secur32: Clear expiry timestamp in schan_InitializeSecurityContextW().
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 885fabfac13..fdf8e990f62 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -904,6 +904,12 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( dump_buffer_desc(pInput); dump_buffer_desc(pOutput); + if (ptsExpiry) + { + ptsExpiry->LowPart = 0; + ptsExpiry->HighPart = 0; + } + if (!phContext) { ULONG_PTR handle; -- 2.30.2

1 0

[PATCH v2 1/6] secur32: Fix expected buffer size in trace message.
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index eb8106e88c7..885fabfac13 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1003,7 +1003,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( if (!expected_size) { TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", - max(6, record_size), buffer->cbBuffer); + max(ctx->header_size + 1, record_size), buffer->cbBuffer); return SEC_E_INCOMPLETE_MESSAGE; } } -- 2.30.2

1 0

[PATCH 6/6] secur32/tests: Add DTLS tests.
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/tests/schannel.c | 82 +++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b7f9d409d41..935f63ae727 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -574,12 +574,17 @@ static const char http_request[] = "GET /tests/clientcert/ HTTP/1.1\r\nHost: tes static void init_buffers(SecBufferDesc *desc, unsigned count, unsigned size) { + unsigned int i; + desc->ulVersion = SECBUFFER_VERSION; desc->cBuffers = count; desc->pBuffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count*sizeof(SecBuffer)); - desc->pBuffers[0].cbBuffer = size; - desc->pBuffers[0].pvBuffer = HeapAlloc(GetProcessHeap(), 0, size); + for (i = 0; i < count; i++) + { + desc->pBuffers[i].cbBuffer = size; + desc->pBuffers[i].pvBuffer = HeapAlloc(GetProcessHeap(), 0, size); + } } static void reset_buffers(SecBufferDesc *desc) @@ -599,7 +604,8 @@ static void reset_buffers(SecBufferDesc *desc) static void free_buffers(SecBufferDesc *desc) { - HeapFree(GetProcessHeap(), 0, desc->pBuffers[0].pvBuffer); + unsigned int i; + for (i = 0; i < desc->cBuffers; i++) HeapFree(GetProcessHeap(), 0, desc->pBuffers[i].pvBuffer); HeapFree(GetProcessHeap(), 0, desc->pBuffers); } @@ -1517,6 +1523,75 @@ static void test_application_protocol_negotiation(void) closesocket(sock); } +static void test_dtls(void) +{ + SECURITY_STATUS status; + TimeStamp exp; + SCHANNEL_CRED cred; + CredHandle cred_handle; + CtxtHandle ctx_handle; + SecBufferDesc buffers[3]; + ULONG flags_req, flags_ret, attr; + + init_cred( &cred ); + cred.grbitEnabledProtocols = SP_PROT_DTLS_CLIENT | SP_PROT_DTLS1_2_CLIENT; + cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS; + + status = AcquireCredentialsHandleA( NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &cred, NULL, NULL, + &cred_handle, &exp ); + if (status == SEC_E_ALGORITHM_MISMATCH) + { + win_skip( "no DTLS support\n" ); + return; + } + ok( status == SEC_E_OK, "got %08x\n", status ); + + flags_req = ISC_REQ_MANUAL_CRED_VALIDATION | ISC_REQ_EXTENDED_ERROR | ISC_REQ_DATAGRAM | ISC_REQ_USE_SUPPLIED_CREDS | + ISC_REQ_CONFIDENTIALITY | ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT; + + init_buffers( &buffers[0], 1, 128 ); + buffers[0].pBuffers[0].BufferType = SECBUFFER_DTLS_MTU; + *(WORD *)(buffers[0].pBuffers[0].pvBuffer) = 1024; + buffers[0].pBuffers[0].cbBuffer = 2; + + init_buffers( &buffers[1], 2, 2048 ); + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[1].pBuffers[0].cbBuffer = 1420; + buffers[1].pBuffers[1].BufferType = SECBUFFER_ALERT; + buffers[1].pBuffers[1].cbBuffer = 1024; + + attr = 0; + exp.LowPart = exp.HighPart = 0xdeadbeef; + status = InitializeSecurityContextA( &cred_handle, NULL, (SEC_CHAR *)"winetest", flags_req, 0, 16, &buffers[0], 0, + &ctx_handle, &buffers[1], &attr, &exp ); + ok( status == SEC_I_CONTINUE_NEEDED, "got %08x\n", status ); + + flags_ret = ISC_RET_MANUAL_CRED_VALIDATION | ISC_RET_STREAM | ISC_RET_EXTENDED_ERROR | ISC_RET_DATAGRAM | + ISC_RET_USED_SUPPLIED_CREDS | ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; + ok( attr == flags_ret, "got %08x\n", attr ); + ok( !exp.LowPart, "got %08x\n", exp.LowPart ); + ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[1].pBuffers[0].cbBuffer = 1420; + + attr = 0; + exp.LowPart = exp.HighPart = 0xdeadbeef; + status = InitializeSecurityContextA( &cred_handle, &ctx_handle, (SEC_CHAR *)"winetest", flags_req, 0, 16, NULL, 0, + &ctx_handle, &buffers[1], &attr, &exp ); + ok( status == SEC_E_INSUFFICIENT_MEMORY, "got %08x\n", status ); + + flags_ret = ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; + todo_wine ok( attr == flags_ret, "got %08x\n", attr ); + ok( !exp.LowPart, "got %08x\n", exp.LowPart ); + ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + + free_buffers( &buffers[0] ); + free_buffers( &buffers[1] ); + DeleteSecurityContext( &ctx_handle ); + FreeCredentialsHandle( &cred_handle ); +} + START_TEST(schannel) { WSADATA wsa_data; @@ -1529,4 +1604,5 @@ START_TEST(schannel) test_InitializeSecurityContext(); test_communication(); test_application_protocol_negotiation(); + test_dtls(); } -- 2.30.2

2 1

[PATCH 2/6] secur32/tests: Check supported DTLS protocols.
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/tests/schannel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index aeb38096f0c..b7f9d409d41 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -203,6 +203,8 @@ static void test_supported_protocols(CredHandle *handle, unsigned exprots) X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client"); X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client"); X(SP_PROT_TLS1_3_CLIENT, "TLS 1.3 client"); + X(SP_PROT_DTLS1_0_CLIENT, "DTLS 1.0 client"); + X(SP_PROT_DTLS1_2_CLIENT, "DTLS 1.2 client"); #undef X if(protocols.grbitProtocol) -- 2.30.2

2 1

[PATCH v3 1/4] ntdll: Implement RtlWalkFrameChain() for x86 and x86_64.
by Paul Gofman 28 Oct '21

28 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - implement on top of RtlCaptureStackBackTrace() and don't make implementation arch specific; - test skip count and requested frame count in more details; - fix some corner cases around returned frame count weirdness. v3: - fix loop in test. dlls/ntdll/exception.c | 27 ++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/exception.c | 83 +++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 3 ++ include/winnt.h | 2 + 6 files changed, 117 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c3714e8369b..9d174ecf36d 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "ddk/ntddk.h" #include "ddk/wdm.h" #include "wine/exception.h" #include "wine/list.h" @@ -1065,3 +1066,29 @@ NTSTATUS WINAPI RtlCopyExtendedContext( CONTEXT_EX *dst, ULONG context_flags, CO memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); return STATUS_SUCCESS; } + + +/********************************************************************** + * RtlWalkFrameChain (NTDLL.@) + */ +ULONG WINAPI RtlWalkFrameChain( void **callers, ULONG count, ULONG skip ) +{ + void *buffer[256]; + ULONG frame_count; + + TRACE( "callers %p, count %u, skip %#x.\n", callers, count, skip ); + + if (skip & ~(0xff << RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT)) + { + WARN( "Invalid flags %#x.\n", skip ); + return 0; + } + skip >>= RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT; + + frame_count = RtlCaptureStackBackTrace( 1, min( count, ARRAY_SIZE(buffer) ), buffer, NULL ); + if (frame_count == ARRAY_SIZE(buffer)) + FIXME( "Frame count exceeds buffer size.\n" ); + if (skip < frame_count) + memcpy( callers, buffer + skip, sizeof(*callers) * (frame_count - skip) ); + return frame_count; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 13e65f65139..c54b2e205aa 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1073,7 +1073,7 @@ @ stdcall RtlWakeAddressSingle(ptr) @ stdcall RtlWakeAllConditionVariable(ptr) @ stdcall RtlWakeConditionVariable(ptr) -@ stub RtlWalkFrameChain +@ stdcall RtlWalkFrameChain(ptr long long) @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 6af68317732..d73e75ee529 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -28,6 +28,7 @@ #include "winnt.h" #include "winreg.h" #include "winternl.h" +#include "ddk/ntddk.h" #include "ddk/wdm.h" #include "excpt.h" #include "wine/test.h" @@ -9113,6 +9114,87 @@ static void test_copy_context(void) } #endif +static void test_walk_stack(void) +{ + ULONG count, expected, frame_count, requested_count, skip_count; + void *addrs[256], *addrs2[256]; + void *start, *end; + unsigned int i, j; + + memset(addrs, 0xcc, sizeof(addrs)); + memset(addrs2, 0xcc, sizeof(addrs2)); + + frame_count = RtlCaptureStackBackTrace(0, ARRAY_SIZE(addrs), addrs, NULL); + count = RtlWalkFrameChain(addrs2, ARRAY_SIZE(addrs2), 0); + + trace("frame_count %u.\n", frame_count); + + ok(frame_count > 1, "Got zero frame_count.\n"); + ok(count == frame_count, "Got unexpected frame_count %u, count %u.\n", frame_count, count); + + start = test_walk_stack; + end = (BYTE *)start + 0x1000; + todo_wine_if(sizeof(void *) == 4) + ok(addrs[0] >= start && addrs[0] < end, "Address is not inside test function, start %p, end %p, addr %p.\n", + start, end, addrs[0]); + todo_wine_if(sizeof(void *) == 4) + ok(addrs2[0] >= start && addrs2[0] < end, "Address is not inside test function, start %p, end %p, addr %p.\n", + start, end, addrs2[0]); + + for (i = 1; i < frame_count; ++i) + { + ok(addrs[i] == addrs2[i], "i %u, addresses do not match, %p vs %p.\n", i, addrs[i], addrs2[i]); + } + todo_wine ok(!!addrs[frame_count - 1], "Expected non-NULL last address.\n"); + + for (requested_count = frame_count - 1; requested_count < frame_count + 1; ++requested_count) + { + for (i = 0; i < 32; ++i) + { + winetest_push_context("requested_count %u, i %u", requested_count, i); + skip_count = (1 << i) >> 8; + + if (i < RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT + || i >= RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT + 8) + expected = 0; + else + expected = min(frame_count, requested_count); + + memset(addrs2, 0xcc, sizeof(addrs2)); + count = RtlWalkFrameChain(addrs2, requested_count, 1 << i); + ok(count == expected, "Got unexpected frame_count %u, expected %u.\n", count, expected); + + if (skip_count < count) + count -= skip_count; + else + count = 0; + + for (j = 0; j < count; ++j) + ok( addrs2[j] != (void *)(ULONG_PTR)0xcccccccccccccccc, "Address is not set, j %u.\n", j ); + for (; j < ARRAY_SIZE(addrs2); ++j) + ok( addrs2[j] == (void *)(ULONG_PTR)0xcccccccccccccccc, "Address is set, j %u.\n", j ); + + if (!count) + { + winetest_pop_context(); + continue; + } + + memset(addrs, 0xcc, sizeof(addrs)); + expected = skip_count > frame_count ? 0 : min(frame_count - skip_count, requested_count); + count = RtlCaptureStackBackTrace(skip_count, requested_count, addrs, NULL); + ok(count == expected, "Got unexpected frame_count %u, expected %u. i %u.\n", count, expected, i); + + count = min(frame_count, requested_count) - skip_count; + for (j = 0; j < count; ++j) + { + ok(addrs[j] == addrs2[j], "Addresses do not match, j %u, %p, %p.\n", j, addrs[j], addrs2[j]); + } + winetest_pop_context(); + } + } +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -9339,5 +9421,6 @@ START_TEST(exception) test_suspend_thread(); test_suspend_process(); test_unload_trace(); + test_walk_stack(); VirtualFree(code_mem, 0, MEM_RELEASE); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0208e2f633f..b94e58ccb26 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1300,7 +1300,7 @@ @ stdcall RtlVerifyVersionInfo(ptr long int64) @ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) @ stub RtlVolumeDeviceToDosName -@ stub RtlWalkFrameChain +@ stdcall RtlWalkFrameChain(ptr long long) @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 41ad3d721bd..ce558139aa6 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -245,6 +245,8 @@ typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; typedef GUID UUID; #endif +#define RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT 8 + NTSTATUS WINAPI ExUuidCreate(UUID*); NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG, PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); @@ -267,5 +269,6 @@ NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); +ULONG WINAPI RtlWalkFrameChain(void **,ULONG,ULONG); #endif diff --git a/include/winnt.h b/include/winnt.h index ef731e29c52..eb1bd165720 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1840,6 +1840,8 @@ NTSYSAPI PVOID WINAPI RtlVirtualUnwind(DWORD,ULONG_PTR,ULONG_PTR,RUNTIME_FUNCT #endif +NTSYSAPI USHORT WINAPI RtlCaptureStackBackTrace(ULONG,ULONG,void **,ULONG *); + /* * Product types */ -- 2.31.1

1 3

[PATCH 1/5] winegstreamer: Implement IWMStreamConfig::GetStreamType().
by Zebediah Figura 28 Oct '21

28 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 3 +++ dlls/winegstreamer/quartz_parser.c | 2 +- dlls/winegstreamer/wm_reader.c | 23 +++++++++++++++++++++-- dlls/wmvcore/tests/wmvcore.c | 6 +++--- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 8b5183a95ee..7d5828a15d6 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -101,6 +101,8 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format); + BOOL init_gstreamer(void) DECLSPEC_HIDDEN; extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; @@ -118,6 +120,7 @@ struct wm_stream struct wm_reader *reader; struct wg_parser_stream *wg_stream; WORD index; + struct wg_format format; }; struct wm_reader diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 6d79d2ef129..0862a75b7ef 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -343,7 +343,7 @@ static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format * return true; } -static bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format) +bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format) { memset(mt, 0, sizeof(*mt)); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 682f9a2ae50..feb000c96ed 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -80,8 +80,26 @@ static ULONG WINAPI stream_config_Release(IWMStreamConfig *iface) static HRESULT WINAPI stream_config_GetStreamType(IWMStreamConfig *iface, GUID *type) { - FIXME("iface %p, type %p, stub!\n", iface, type); - return E_NOTIMPL; + struct stream_config *config = impl_from_IWMStreamConfig(iface); + struct wm_reader *reader = config->stream->reader; + AM_MEDIA_TYPE mt; + + TRACE("config %p, type %p.\n", config, type); + + EnterCriticalSection(&reader->cs); + + if (!amt_from_wg_format(&mt, &config->stream->format)) + { + LeaveCriticalSection(&reader->cs); + return E_OUTOFMEMORY; + } + + *type = mt.majortype; + FreeMediaType(&mt); + + LeaveCriticalSection(&reader->cs); + + return S_OK; } static HRESULT WINAPI stream_config_GetStreamNumber(IWMStreamConfig *iface, WORD *number) @@ -1047,6 +1065,7 @@ HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream) stream->wg_stream = wg_parser_get_stream(reader->wg_parser, i); stream->reader = reader; stream->index = i; + wg_parser_stream_get_preferred_format(stream->wg_stream, &stream->format); } LeaveCriticalSection(&reader->cs); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 385cda74aba..031a1841360 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -704,11 +704,11 @@ static void test_sync_reader_types(void) ok(stream_number == i + 1, "Got stream number %u.\n", stream_number); hr = IWMStreamConfig_GetStreamType(config, &majortype); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); if (!i) - todo_wine ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); else - todo_wine ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype)); + ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype)); ref = IWMStreamConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.33.0

1 4

[PATCH v2 1/4] ntdll: Implement RtlWalkFrameChain() for x86 and x86_64.
by Paul Gofman 28 Oct '21

28 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - implement on top of RtlCaptureStackBackTrace() and don't make implementation arch specific; - test skip count and requested frame count in more details; - fix some corner cases around returned frame count weirdness. dlls/ntdll/exception.c | 27 ++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/exception.c | 83 +++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 3 ++ include/winnt.h | 2 + 6 files changed, 117 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c3714e8369b..9d174ecf36d 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "ddk/ntddk.h" #include "ddk/wdm.h" #include "wine/exception.h" #include "wine/list.h" @@ -1065,3 +1066,29 @@ NTSTATUS WINAPI RtlCopyExtendedContext( CONTEXT_EX *dst, ULONG context_flags, CO memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); return STATUS_SUCCESS; } + + +/********************************************************************** + * RtlWalkFrameChain (NTDLL.@) + */ +ULONG WINAPI RtlWalkFrameChain( void **callers, ULONG count, ULONG skip ) +{ + void *buffer[256]; + ULONG frame_count; + + TRACE( "callers %p, count %u, skip %#x.\n", callers, count, skip ); + + if (skip & ~(0xff << RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT)) + { + WARN( "Invalid flags %#x.\n", skip ); + return 0; + } + skip >>= RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT; + + frame_count = RtlCaptureStackBackTrace( 1, min( count, ARRAY_SIZE(buffer) ), buffer, NULL ); + if (frame_count == ARRAY_SIZE(buffer)) + FIXME( "Frame count exceeds buffer size.\n" ); + if (skip < frame_count) + memcpy( callers, buffer + skip, sizeof(*callers) * (frame_count - skip) ); + return frame_count; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 13e65f65139..c54b2e205aa 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1073,7 +1073,7 @@ @ stdcall RtlWakeAddressSingle(ptr) @ stdcall RtlWakeAllConditionVariable(ptr) @ stdcall RtlWakeConditionVariable(ptr) -@ stub RtlWalkFrameChain +@ stdcall RtlWalkFrameChain(ptr long long) @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 6af68317732..f7f05dc5799 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -28,6 +28,7 @@ #include "winnt.h" #include "winreg.h" #include "winternl.h" +#include "ddk/ntddk.h" #include "ddk/wdm.h" #include "excpt.h" #include "wine/test.h" @@ -9113,6 +9114,87 @@ static void test_copy_context(void) } #endif +static void test_walk_stack(void) +{ + ULONG count, expected, frame_count, requested_count, skip_count; + void *addrs[256], *addrs2[256]; + void *start, *end; + unsigned int i, j; + + memset(addrs, 0xcc, sizeof(addrs)); + memset(addrs2, 0xcc, sizeof(addrs2)); + + frame_count = RtlCaptureStackBackTrace(0, ARRAY_SIZE(addrs), addrs, NULL); + count = RtlWalkFrameChain(addrs2, ARRAY_SIZE(addrs2), 0); + + trace("frame_count %u.\n", frame_count); + + ok(frame_count > 1, "Got zero frame_count.\n"); + ok(count == frame_count, "Got unexpected frame_count %u, count %u.\n", frame_count, count); + + start = test_walk_stack; + end = (BYTE *)start + 0x1000; + todo_wine_if(sizeof(void *) == 4) + ok(addrs[0] >= start && addrs[0] < end, "Address is not inside test function, start %p, end %p, addr %p.\n", + start, end, addrs[0]); + todo_wine_if(sizeof(void *) == 4) + ok(addrs2[0] >= start && addrs2[0] < end, "Address is not inside test function, start %p, end %p, addr %p.\n", + start, end, addrs2[0]); + + for (i = 1; i < frame_count; ++i) + { + ok(addrs[i] == addrs2[i], "i %u, addresses do not match, %p vs %p.\n", i, addrs[i], addrs2[i]); + } + todo_wine ok(!!addrs[frame_count - 1], "Expected non-NULL last address.\n"); + + for (requested_count = frame_count - 1; requested_count != ARRAY_SIZE(addrs); requested_count = ARRAY_SIZE(addrs)) + { + for (i = 0; i < 32; ++i) + { + winetest_push_context("requested_count %u, i %u", requested_count, i); + skip_count = (1 << i) >> 8; + + if (i < RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT + || i >= RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT + 8) + expected = 0; + else + expected = min(frame_count, requested_count); + + memset(addrs2, 0xcc, sizeof(addrs2)); + count = RtlWalkFrameChain(addrs2, requested_count, 1 << i); + ok(count == expected, "Got unexpected frame_count %u, expected %u.\n", count, expected); + + if (skip_count < count) + count -= skip_count; + else + count = 0; + + for (j = 0; j < count; ++j) + ok( addrs2[j] != (void *)(ULONG_PTR)0xcccccccccccccccc, "Address is not set, j %u.\n", j ); + for (; j < ARRAY_SIZE(addrs2); ++j) + ok( addrs2[j] == (void *)(ULONG_PTR)0xcccccccccccccccc, "Address is set, j %u.\n", j ); + + if (!count) + { + winetest_pop_context(); + continue; + } + + memset(addrs, 0xcc, sizeof(addrs)); + expected = skip_count > frame_count ? 0 : min(frame_count - skip_count, requested_count); + count = RtlCaptureStackBackTrace(skip_count, requested_count, addrs, NULL); + ok(count == expected, "Got unexpected frame_count %u, expected %u. i %u.\n", count, expected, i); + + count = min(frame_count, requested_count) - skip_count; + for (j = 0; j < count; ++j) + { + ok(addrs[j] == addrs2[j], "Addresses do not match, j %u, %p, %p.\n", j, addrs[j], addrs2[j]); + } + winetest_pop_context(); + } + } +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -9339,5 +9421,6 @@ START_TEST(exception) test_suspend_thread(); test_suspend_process(); test_unload_trace(); + test_walk_stack(); VirtualFree(code_mem, 0, MEM_RELEASE); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0208e2f633f..b94e58ccb26 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1300,7 +1300,7 @@ @ stdcall RtlVerifyVersionInfo(ptr long int64) @ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) @ stub RtlVolumeDeviceToDosName -@ stub RtlWalkFrameChain +@ stdcall RtlWalkFrameChain(ptr long long) @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 41ad3d721bd..ce558139aa6 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -245,6 +245,8 @@ typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; typedef GUID UUID; #endif +#define RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT 8 + NTSTATUS WINAPI ExUuidCreate(UUID*); NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG, PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); @@ -267,5 +269,6 @@ NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); +ULONG WINAPI RtlWalkFrameChain(void **,ULONG,ULONG); #endif diff --git a/include/winnt.h b/include/winnt.h index ef731e29c52..eb1bd165720 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1840,6 +1840,8 @@ NTSYSAPI PVOID WINAPI RtlVirtualUnwind(DWORD,ULONG_PTR,ULONG_PTR,RUNTIME_FUNCT #endif +NTSYSAPI USHORT WINAPI RtlCaptureStackBackTrace(ULONG,ULONG,void **,ULONG *); + /* * Product types */ -- 2.31.1

1 3

[PATCH 5/6] secur32: Fix error return for DTLS contexts in schan_InitializeSecurityContextW().
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 46 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5b1a910a361..895364a3fc7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -880,6 +880,11 @@ static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) return (buf[header_size - 2] << 8) | buf[header_size - 1]; } +static inline BOOL is_dtls_context(const struct schan_context *ctx) +{ + return ctx->header_size == HEADER_SIZE_DTLS; +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -985,35 +990,28 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( unsigned char *ptr; if (!(ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX))) return SEC_E_INVALID_HANDLE; - if (pInput) - { - idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN); - if (idx == -1) - return SEC_E_INCOMPLETE_MESSAGE; - - buffer = &pInput->pBuffers[idx]; - ptr = buffer->pvBuffer; - expected_size = 0; + if (!pInput) return is_dtls_context(ctx) ? SEC_E_INSUFFICIENT_MEMORY : SEC_E_INCOMPLETE_MESSAGE; + if ((idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN)) == -1) return SEC_E_INCOMPLETE_MESSAGE; - while (buffer->cbBuffer > expected_size + ctx->header_size) - { - record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); + buffer = &pInput->pBuffers[idx]; + ptr = buffer->pvBuffer; + expected_size = 0; - if (buffer->cbBuffer < expected_size + record_size) - break; + while (buffer->cbBuffer > expected_size + ctx->header_size) + { + record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); - expected_size += record_size; - ptr += record_size; - } + if (buffer->cbBuffer < expected_size + record_size) break; + expected_size += record_size; + ptr += record_size; + } - if (!expected_size) - { - TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", - max(ctx->header_size + 1, record_size), buffer->cbBuffer); - return SEC_E_INCOMPLETE_MESSAGE; - } + if (!expected_size) + { + TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", + max(ctx->header_size + 1, record_size), buffer->cbBuffer); + return SEC_E_INCOMPLETE_MESSAGE; } - else return SEC_E_INCOMPLETE_MESSAGE; TRACE("Using expected_size %lu.\n", expected_size); } -- 2.30.2

1 0

[PATCH 4/6] secur32: Validate the context handle in schan_InitializeSecurityContextW().
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index fdf8e990f62..5b1a910a361 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -984,7 +984,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( SIZE_T record_size = 0; unsigned char *ptr; - ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX); + if (!(ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX))) return SEC_E_INVALID_HANDLE; if (pInput) { idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN); -- 2.30.2

1 0

[PATCH 3/6] secur32: Clear expiry timestamp in schan_InitializeSecurityContextW().
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 885fabfac13..fdf8e990f62 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -904,6 +904,12 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( dump_buffer_desc(pInput); dump_buffer_desc(pOutput); + if (ptsExpiry) + { + ptsExpiry->LowPart = 0; + ptsExpiry->HighPart = 0; + } + if (!phContext) { ULONG_PTR handle; -- 2.30.2

1 0

[PATCH 1/6] secur32: Fix expected buffer size in trace message.
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index eb8106e88c7..885fabfac13 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1003,7 +1003,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( if (!expected_size) { TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", - max(6, record_size), buffer->cbBuffer); + max(ctx->header_size + 1, record_size), buffer->cbBuffer); return SEC_E_INCOMPLETE_MESSAGE; } } -- 2.30.2

1 0

[PATCH] dbghelp: correct type of exported function addresses in PE module
by Eric Pouech 28 Oct '21

28 Oct '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/pe_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 278f3c71c98..35db3edf40f 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -688,7 +688,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* IMAGE_DIRECTORY_ENTRY_EXPORT, &size))) { const WORD* ordinals = NULL; - const DWORD_PTR* functions = NULL; + const DWORD* functions = NULL; const DWORD* names = NULL; unsigned int j; char buffer[16];

1 0

[PATCH 1/2] evr/presenter: Handle shutdown state in more methods.
by Nikolay Sivov 28 Oct '21

28 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 68 ++++++++++++++++++++++++++++++++++++++------ dlls/evr/tests/evr.c | 6 ---- 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 027d0338896..a91510b13bc 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -31,9 +31,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); +/* + Initial state represents just created object, presenter never returns to this state. + Shutdown state is entered on ReleaseServicePointers(), terminal state. + Started/stopped/paused states are controlled by clock state changes. +*/ + enum presenter_state { - PRESENTER_STATE_SHUT_DOWN = 0, + PRESENTER_STATE_INITIAL = 0, + PRESENTER_STATE_SHUT_DOWN, PRESENTER_STATE_STARTED, PRESENTER_STATE_STOPPED, PRESENTER_STATE_PAUSED, @@ -603,6 +610,9 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) IMFSample *sample; DWORD status; + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + return MF_E_SHUTDOWN; + if (!presenter->media_type) return S_OK; @@ -708,6 +718,9 @@ static HRESULT video_presenter_start_streaming(struct video_presenter *presenter { HRESULT hr; + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + return MF_E_SHUTDOWN; + if (presenter->thread.hthread) return S_OK; @@ -968,7 +981,12 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M switch (message) { case MFVP_MESSAGE_INVALIDATEMEDIATYPE: - hr = presenter->mixer ? video_presenter_invalidate_media_type(presenter) : MF_E_INVALIDREQUEST; + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!presenter->mixer) + hr = MF_E_INVALIDREQUEST; + else + hr = video_presenter_invalidate_media_type(presenter); break; case MFVP_MESSAGE_BEGINSTREAMING: hr = video_presenter_start_streaming(presenter); @@ -1238,6 +1256,7 @@ static HRESULT WINAPI video_presenter_control_GetNativeVideoSize(IMFVideoDisplay SIZE *aspect_ratio) { struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + HRESULT hr = S_OK; TRACE("%p, %p, %p.\n", iface, video_size, aspect_ratio); @@ -1245,21 +1264,40 @@ static HRESULT WINAPI video_presenter_control_GetNativeVideoSize(IMFVideoDisplay return E_POINTER; EnterCriticalSection(&presenter->cs); - if (video_size) - *video_size = presenter->native_size; - if (aspect_ratio) - *aspect_ratio = presenter->native_ratio; + + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + if (video_size) + *video_size = presenter->native_size; + if (aspect_ratio) + *aspect_ratio = presenter->native_ratio; + } + LeaveCriticalSection(&presenter->cs); - return S_OK; + return hr; } static HRESULT WINAPI video_presenter_control_GetIdealVideoSize(IMFVideoDisplayControl *iface, SIZE *min_size, SIZE *max_size) { + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + HRESULT hr; + FIXME("%p, %p, %p.\n", iface, min_size, max_size); - return E_NOTIMPL; + EnterCriticalSection(&presenter->cs); + + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = E_NOTIMPL; + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayControl *iface, @@ -1425,9 +1463,21 @@ static HRESULT WINAPI video_presenter_control_GetVideoWindow(IMFVideoDisplayCont static HRESULT WINAPI video_presenter_control_RepaintVideo(IMFVideoDisplayControl *iface) { + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + HRESULT hr; + FIXME("%p.\n", iface); - return E_NOTIMPL; + EnterCriticalSection(&presenter->cs); + + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = E_NOTIMPL; + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayControl *iface, BITMAPINFOHEADER *header, diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index b7e3ad174df..6a711e30581 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2353,18 +2353,15 @@ static void test_presenter_shutdown(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_BEGINSTREAMING, 0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_ENDSTREAMING, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_GetCurrentMediaType(presenter, &media_type); @@ -2374,11 +2371,9 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &size); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetIdealVideoSize(display_control, &size, &size); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); SetRect(&rect, 0, 0, 10, 10); @@ -2404,7 +2399,6 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_RepaintVideo(display_control); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); -- 2.33.0

1 1

[PATCH] mf/session: Forward MR_STREAM_VOLUME_SERVICE requests to SAR node.
by Nikolay Sivov 28 Oct '21

28 Oct '21

From: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 0377b19c51f..e3d77864494 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2080,7 +2080,8 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { hr = session_get_video_render_service(session, service, riid, obj); } - else if (IsEqualGUID(service, &MR_POLICY_VOLUME_SERVICE)) + else if (IsEqualGUID(service, &MR_POLICY_VOLUME_SERVICE) || + IsEqualGUID(service, &MR_STREAM_VOLUME_SERVICE)) { hr = session_get_audio_render_service(session, service, riid, obj); } -- 2.33.0

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel