April 2021 - Wine-Devel - list.winehq.org

[PATCH 2/6] include: Add IHTMLStyleElement2 declaration.
by Jacek Caban April 5, 2021

April 5, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 3 +++ include/mshtml.idl | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)

1 0

[PATCH 1/6] mshtml: Add IHTMLStyleElement::onload and onerror implementation.
by Jacek Caban April 5, 2021

April 5, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyleelem.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

1 0

[PATCH] mfreadwrite/tests: Fix testing of a source with one stream.
by Giovanni Mascellani April 5, 2021

April 5, 2021

Even when a lower stream count was requested, most of the implementation still used ARRAY_SIZE(source->streams) as actual count, so the implemented behaviour was not the desired one. Also, it implied undefined behaviour. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index c27806f699e..8ea4e5038f6 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -255,6 +255,7 @@ struct test_source IMFMediaEventQueue *event_queue; IMFPresentationDescriptor *pd; struct test_media_stream *streams[TEST_SOURCE_NUM_STREAMS]; + unsigned stream_count; enum source_state state; CRITICAL_SECTION cs; }; @@ -352,7 +353,7 @@ static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *i } else { - for (i = 0; i < ARRAY_SIZE(source->streams); ++i) + for (i = 0; i < source->stream_count; ++i) { hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); @@ -368,9 +369,9 @@ static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *i IMFMediaType_Release(media_type); } - hr = MFCreatePresentationDescriptor(ARRAY_SIZE(sds), sds, &source->pd); + hr = MFCreatePresentationDescriptor(source->stream_count, sds, &source->pd); ok(hr == S_OK, "Failed to create presentation descriptor, hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(sds); ++i) + for (i = 0; i < source->stream_count; ++i) IMFStreamDescriptor_Release(sds[i]); *pd = source->pd; @@ -413,7 +414,7 @@ static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDe hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL); ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(source->streams); ++i) + for (i = 0; i < source->stream_count; ++i) { if (!is_stream_selected(pd, i)) continue; @@ -501,7 +502,7 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia return stream; } -static IMFMediaSource *create_test_source(int stream_num) +static IMFMediaSource *create_test_source(int stream_count) { struct test_source *source; int i; @@ -509,9 +510,10 @@ static IMFMediaSource *create_test_source(int stream_num) source = heap_alloc_zero(sizeof(*source)); source->IMFMediaSource_iface.lpVtbl = &test_source_vtbl; source->refcount = 1; + source->stream_count = stream_count; MFCreateEventQueue(&source->event_queue); InitializeCriticalSection(&source->cs); - for (i = 0; i < stream_num; ++i) + for (i = 0; i < source->stream_count; ++i) source->streams[i] = create_test_stream(i, &source->IMFMediaSource_iface); return &source->IMFMediaSource_iface; -- 2.31.0

3 2

[PATCH v3 1/5] wined3d: Introduce wined3d_device_context_draw_indexed().
by Zebediah Figura April 5, 2021

April 5, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 19 +++++++++++++++---- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e578e51de68..278bc8677e6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2409,6 +2409,18 @@ void CDECL wined3d_device_context_draw(struct wined3d_device_context *context, u 0, start_vertex, vertex_count, start_instance, instance_count, false); } +void CDECL wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, + unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count) +{ + struct wined3d_state *state = context->state; + + 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_device_context_emit_draw(context, state->primitive_type, state->patch_vertex_count, + base_vertex_index, start_index, index_count, start_instance, instance_count, true); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); @@ -4486,8 +4498,7 @@ void CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - state->base_vertex_index, start_idx, index_count, 0, 0, true); + wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, start_idx, index_count, 0, 0); } void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, @@ -4498,8 +4509,8 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - state->base_vertex_index, start_idx, index_count, start_instance, instance_count, true); + wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, + start_idx, index_count, start_instance, instance_count); } void CDECL wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 087a6bead13..bae5a6d42f0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -167,6 +167,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_device_context_draw(ptr long long long long) +@ cdecl wined3d_device_context_draw_indexed(ptr long long long long long) @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3316d6f6653..ee02914b0fe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2562,6 +2562,8 @@ void __cdecl wined3d_device_context_dispatch_indirect(struct wined3d_device_cont struct wined3d_buffer *buffer, unsigned int offset); void __cdecl wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, unsigned int vertex_count, unsigned int start_instance, unsigned int instance_count); +void __cdecl wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, + unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, -- 2.30.2

2 9

[v2 PATCH] d2d1: Implement ID2D1Multithread.
by Nikolay Sivov April 5, 2021

April 5, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: should fix test crashes dlls/d2d1/factory.c | 102 ++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 68 +++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2a9de448c6e..b65727d3a32 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -30,12 +30,15 @@ struct d2d_settings d2d_settings = struct d2d_factory { ID2D1Factory2 ID2D1Factory2_iface; + ID2D1Multithread ID2D1Multithread_iface; LONG refcount; ID3D10Device1 *device; float dpi_x; float dpi_y; + + CRITICAL_SECTION cs; }; static inline struct d2d_factory *impl_from_ID2D1Factory2(ID2D1Factory2 *iface) @@ -43,6 +46,11 @@ static inline struct d2d_factory *impl_from_ID2D1Factory2(ID2D1Factory2 *iface) return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory2_iface); } +static inline struct d2d_factory *impl_from_ID2D1Multithread(ID2D1Multithread *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Multithread_iface); +} + static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) { HDC hdc; @@ -63,6 +71,8 @@ static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface, REFIID iid, void **out) { + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if ((IsEqualGUID(iid, &IID_ID2D1Factory2) && d2d_settings.max_version_factory >= 2) @@ -74,6 +84,12 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface *out = iface; return S_OK; } + else if (IsEqualGUID(iid, &IID_ID2D1Multithread)) + { + ID2D1Factory2_AddRef(iface); + *out = &factory->ID2D1Multithread_iface; + return S_OK; + } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -102,6 +118,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory2 *iface) { if (factory->device) ID3D10Device1_Release(factory->device); + DeleteCriticalSection(&factory->cs); heap_free(factory); } @@ -593,17 +610,92 @@ static const struct ID2D1Factory2Vtbl d2d_factory_vtbl = d2d_factory_ID2D1Factory1_CreateDevice, }; +static HRESULT STDMETHODCALLTYPE d2d_factory_mt_QueryInterface(ID2D1Multithread *iface, REFIID iid, void **out) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_QueryInterface(&factory->ID2D1Factory2_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d2d_factory_mt_AddRef(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_AddRef(&factory->ID2D1Factory2_iface); +} + +static ULONG STDMETHODCALLTYPE d2d_factory_mt_Release(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_Release(&factory->ID2D1Factory2_iface); +} + +static BOOL STDMETHODCALLTYPE d2d_factory_mt_GetMultithreadProtected(ID2D1Multithread *iface) +{ + return TRUE; +} + +static void STDMETHODCALLTYPE d2d_factory_mt_Enter(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + + TRACE("%p.\n", iface); + + return EnterCriticalSection(&factory->cs); +} + +static void STDMETHODCALLTYPE d2d_factory_mt_Leave(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + + TRACE("%p.\n", iface); + + return LeaveCriticalSection(&factory->cs); +} + +static BOOL STDMETHODCALLTYPE d2d_factory_st_GetMultithreadProtected(ID2D1Multithread *iface) +{ + return FALSE; +} + +static void STDMETHODCALLTYPE d2d_factory_st_Enter(ID2D1Multithread *iface) +{ +} + +static void STDMETHODCALLTYPE d2d_factory_st_Leave(ID2D1Multithread *iface) +{ +} + +static const struct ID2D1MultithreadVtbl d2d_factory_multithread_vtbl = +{ + d2d_factory_mt_QueryInterface, + d2d_factory_mt_AddRef, + d2d_factory_mt_Release, + d2d_factory_mt_GetMultithreadProtected, + d2d_factory_mt_Enter, + d2d_factory_mt_Leave, +}; + +static const struct ID2D1MultithreadVtbl d2d_factory_multithread_noop_vtbl = +{ + d2d_factory_mt_QueryInterface, + d2d_factory_mt_AddRef, + d2d_factory_mt_Release, + d2d_factory_st_GetMultithreadProtected, + d2d_factory_st_Enter, + d2d_factory_st_Leave, +}; + static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE factory_type, const D2D1_FACTORY_OPTIONS *factory_options) { - if (factory_type != D2D1_FACTORY_TYPE_SINGLE_THREADED) - FIXME("Ignoring factory type %#x.\n", factory_type); if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE) WARN("Ignoring debug level %#x.\n", factory_options->debugLevel); factory->ID2D1Factory2_iface.lpVtbl = &d2d_factory_vtbl; + factory->ID2D1Multithread_iface.lpVtbl = factory_type == D2D1_FACTORY_TYPE_SINGLE_THREADED ? + &d2d_factory_multithread_noop_vtbl : &d2d_factory_multithread_vtbl; factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); + InitializeCriticalSection(&factory->cs); } HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, @@ -615,6 +707,12 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("factory_type %#x, iid %s, factory_options %p, factory %p.\n", factory_type, debugstr_guid(iid), factory_options, factory); + if (factory_type != D2D1_FACTORY_TYPE_SINGLE_THREADED && + factory_type != D2D1_FACTORY_TYPE_MULTI_THREADED) + { + return E_INVALIDARG; + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a046a21c7f6..8dbad9c5ecc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9614,6 +9614,73 @@ static void test_geometry_group(BOOL d3d11) ID2D1Factory_Release(factory); } +static DWORD WINAPI mt_factory_test_thread_func(void *param) +{ + ID2D1Multithread *multithread = param; + + ID2D1Multithread_Enter(multithread); + + return 0; +} + +static void test_mt_factory(BOOL d3d11) +{ + ID2D1Multithread *multithread; + ID2D1Factory *factory; + HANDLE thread; + HRESULT hr; + DWORD ret; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED + 1, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + hr = ID2D1Factory_QueryInterface(factory, &IID_ID2D1Multithread, (void **)&multithread); + if (hr == E_NOINTERFACE) + { + win_skip("ID2D1Multithread is not supported.\n"); + ID2D1Factory_Release(factory); + return; + } + ok(SUCCEEDED(hr), "Failed to get interface, hr %#x.\n", hr); + + ret = ID2D1Multithread_GetMultithreadProtected(multithread); + ok(!ret, "Unexpected return value.\n"); + + ID2D1Multithread_Enter(multithread); + thread = CreateThread(NULL, 0, mt_factory_test_thread_func, multithread, 0, NULL); + ok(!!thread, "Failed to create a thread.\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + ID2D1Multithread_Release(multithread); + ID2D1Factory_Release(factory); + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + hr = ID2D1Factory_QueryInterface(factory, &IID_ID2D1Multithread, (void **)&multithread); + ok(SUCCEEDED(hr), "Failed to get interface, hr %#x.\n", hr); + + ret = ID2D1Multithread_GetMultithreadProtected(multithread); + ok(!!ret, "Unexpected return value.\n"); + + ID2D1Multithread_Enter(multithread); + thread = CreateThread(NULL, 0, mt_factory_test_thread_func, multithread, 0, NULL); + ok(!!thread, "Failed to create a thread.\n"); + ret = WaitForSingleObject(thread, 10); + ok(ret == WAIT_TIMEOUT, "Expected timeout.\n"); + ID2D1Multithread_Leave(multithread); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + ID2D1Multithread_Release(multithread); + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9674,6 +9741,7 @@ START_TEST(d2d1) queue_d3d10_test(test_math); queue_d3d10_test(test_colour_space); queue_test(test_geometry_group); + queue_test(test_mt_factory); run_queued_tests(); } -- 2.30.2

2 1

[PATCH v2 1/2] msxml3/tests: Add a test for saving XML with not default encoding.
by Dmitry Timoshkov April 5, 2021

April 5, 2021

v2: Use encoding="windows-1252" instead of encoding="iso-8859-1" to avoid a test failure caused by a Vista bug. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/tests/domdoc.c | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e94a2c88a81..5bc2fe1d5c3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8522,10 +8522,19 @@ static void test_events(void) static void test_createProcessingInstruction(void) { + static const WCHAR xml1[] = L"<?xml version=\"1.0\"?>\r\n<test/>\r\n"; + static const char xml2[] = "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\r\n<test/>\r\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; + IXMLDOMNode *node; + IXMLDOMElement *element; WCHAR buff[10]; + BSTR xml; + VARIANT var; HRESULT hr; + IStream *stream; + HGLOBAL global; + char *p; doc = create_document(&IID_IXMLDOMDocument); @@ -8538,6 +8547,47 @@ static void test_createProcessingInstruction(void) IXMLDOMProcessingInstruction_Release(pi); IXMLDOMDocument_Release(doc); + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\""), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNode_Release(node); + IXMLDOMProcessingInstruction_Release(pi); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("test"), &element); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode *)element, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMElement_Release(element); + + hr = IXMLDOMDocument_get_xml(doc, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(!wcscmp(xml, xml1), "got %s\n", wine_dbgstr_w(xml)); + SysFreeString(xml); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; + hr = IXMLDOMDocument_save(doc, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &global); + ok(hr == S_OK, "got 0x%08x\n", hr); + p = GlobalLock(global); + p[GlobalSize(global)] = 0; +todo_wine + ok(!strcmp(p, xml2), "got %s\n", wine_dbgstr_a(p)); + GlobalUnlock(global); + IStream_Release(stream); + + IXMLDOMDocument_Release(doc); } static void test_put_nodeTypedValue(void) -- 2.30.2

2 1

[PATCH] po: Update Polish translation.
by Łukasz Wojniłowicz April 5, 2021

April 5, 2021

Signed-off-by: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> --- po/pl.po | 360 ++++++++++++++++++++++--------------------------------- 1 file changed, 144 insertions(+), 216 deletions(-) diff --git a/po/pl.po b/po/pl.po index f2ddc11..4b50889 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,6 +1,6 @@ # Polish translations for Wine # -# Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014. +# Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014, 2021. # Adam "Saibamen" Stachowicz <saibamenppl(a)gmail.com>, 2015. # Marcin Mikołajczak <me(a)m4sk.in>, 2017, 2018. msgid "" @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-02-24 13:47+0100\n" -"Last-Translator: Marcin Mikołajczak <me(a)m4sk.in>\n" +"PO-Revision-Date: 2021-04-05 10:02+0200\n" +"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"X-Generator: Lokalize 20.12.1\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10" +" || n%100>=20) ? 1 : 2);\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 #: programs/winefile/winefile.rc:114 @@ -25,30 +25,27 @@ msgid "Security" msgstr "Prawa dostępu" #: dlls/aclui/aclui.rc:32 -#, fuzzy #| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Użytkownik:" +msgstr "Nazwy &grup lub użytkowników:" #: dlls/aclui/aclui.rc:38 -#, fuzzy #| msgid "Yellow" msgid "Allow" -msgstr "Żółty" +msgstr "Zezwól" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Odmów" #: dlls/aclui/aclui.rc:47 -#, fuzzy #| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "Dostęp zastrzeżony.\n" +msgstr "Uprawnienia dla %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" -msgstr "Zainstaluj/Odinstaluj" +msgstr "Wgraj/Usuń" #: dlls/appwiz.cpl/appwiz.rc:61 msgid "" @@ -56,11 +53,11 @@ msgid "" "drive, click Install." msgstr "" "Aby dodać program z dysku, płyty CD-ROM lub dyskietki, kliknij przycisk " -"Zainstaluj." +"Wgraj." #: dlls/appwiz.cpl/appwiz.rc:62 msgid "&Install..." -msgstr "Za&instaluj..." +msgstr "&Wgraj..." #: dlls/appwiz.cpl/appwiz.rc:65 msgid "" @@ -190,7 +187,7 @@ msgstr "" #: dlls/appwiz.cpl/appwiz.rc:109 dlls/appwiz.cpl/appwiz.rc:124 msgid "&Install" -msgstr "Za&instaluj" +msgstr "&Wgraj" #: dlls/appwiz.cpl/appwiz.rc:110 dlls/appwiz.cpl/appwiz.rc:125 #: dlls/avifil32/avifil32.rc:55 dlls/browseui/browseui.rc:45 @@ -400,18 +397,17 @@ msgid "%1!u! %2 and %3!u! %4 remaining" msgstr "" #: dlls/browseui/browseui.rc:31 -#, fuzzy #| msgid "&Seconds" msgid "seconds" -msgstr "&Sekundy" +msgstr "sekundy" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minuty" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "godziny" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" @@ -456,7 +452,7 @@ msgstr "&Zamknij" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "Z&resetuj" +msgstr "Wyze&ruj" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -526,16 +522,14 @@ msgid "&Retry" msgstr "&Ponów próbę" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy #| msgid "Hide &Tabs" msgid "Hide details" -msgstr "Ukryj &karty" +msgstr "Ukryj szczegóły" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy #| msgid "Details" msgid "See details" -msgstr "Szczegóły" +msgstr "Obejrzyj szczegóły" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -742,8 +736,9 @@ msgid "&Custom Colors:" msgstr "Własne &kolory:" #: dlls/comdlg32/comdlg32.rc:289 +#, fuzzy msgid "|S&olid" -msgstr "" +msgstr "Ciągła" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -780,11 +775,10 @@ msgid "&Define Custom Colors >>" msgstr "Z&definiuj własne kolory >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy #| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "&Nie" +msgstr "&o" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -897,7 +891,7 @@ msgstr "&Sortuj" #: dlls/comdlg32/comdlg32.rc:414 programs/winecfg/winecfg.rc:298 msgid "Si&ze:" -msgstr "Wielkość:" +msgstr "Ro&zmiar:" #: dlls/comdlg32/comdlg32.rc:416 msgid "&Source:" @@ -1143,7 +1137,7 @@ msgid "" "Please reenter margins." msgstr "" "Marginesy znajdują się poza stroną.\n" -"Wprowadź inną wielkość marginesu." +"Wprowadź inny rozmiar marginesu." #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -2256,7 +2250,7 @@ msgstr "Ogólne" #: dlls/cryptui/cryptui.rc:196 msgid "&Install Certificate..." -msgstr "&Zainstaluj certyfikat..." +msgstr "Wgraj certyf&ikat..." #: dlls/cryptui/cryptui.rc:197 msgid "Issuer &Statement" @@ -2272,7 +2266,7 @@ msgstr "&Edytuj właściwości..." #: dlls/cryptui/cryptui.rc:211 msgid "&Copy to File..." -msgstr "&Kopiuj do pliku..." +msgstr "&Skopiuj do pliku..." #: dlls/cryptui/cryptui.rc:215 msgid "Certification Path" @@ -2601,10 +2595,9 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "Praca kreatora eksportu certyfikatów została zakończona pomyślnie." #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy #| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Wybór magazynu certyfikatów" +msgstr "Wybierz certyfikat" #: dlls/cryptui/cryptui.rc:459 #, fuzzy @@ -3146,10 +3139,9 @@ msgstr "" "eksportu." #: dlls/cryptui/cryptui.rc:177 -#, fuzzy #| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Zamierzone cele:" +msgstr "Zamiar użycia" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:152 msgid "Location" @@ -3289,7 +3281,7 @@ msgstr "Pliki w aparacie" #: dlls/gphoto2.ds/gphoto2.rc:34 msgid "Import Selected" -msgstr "Skopiuj wybrane" +msgstr "Zaimportuj zaznaczone" #: dlls/gphoto2.ds/gphoto2.rc:35 msgid "Preview" @@ -3297,7 +3289,7 @@ msgstr "Podgląd" #: dlls/gphoto2.ds/gphoto2.rc:36 msgid "Import All" -msgstr "Skopiuj wszystkie" +msgstr "Zaimportuj wszystkie" #: dlls/gphoto2.ds/gphoto2.rc:37 msgid "Skip This Dialog" @@ -3383,7 +3375,7 @@ msgstr "Wy&tnij" #: dlls/user32/user32.rc:61 programs/conhost/conhost.rc:36 #: programs/winhlp32/winhlp32.rc:40 programs/wordpad/wordpad.rc:113 msgid "&Copy" -msgstr "&Kopiuj" +msgstr "&Skopiuj" #: dlls/hhctrl.ocx/hhctrl.rc:89 dlls/shdoclc/shdoclc.rc:119 #: dlls/shell32/shell32.rc:64 @@ -3671,10 +3663,9 @@ msgid "Publishers..." msgstr "Wydawcy..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy #| msgid "LAN Connection" msgid "Connections" -msgstr "Połączenie LAN" +msgstr "Połączenia" #: dlls/inetcpl.cpl/inetcpl.rc:125 #, fuzzy @@ -3691,26 +3682,23 @@ msgid "Use Proxy Auto-Config (PAC) script" msgstr "" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy #| msgid "Address" msgid "Address:" -msgstr "Adres" +msgstr "Adres:" #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy #| msgid "&Local server" msgid "Proxy server" -msgstr "Serwer &lokalny" +msgstr "Serwer pośredniczący" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" msgstr "" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy #| msgid "No Ports" msgid "Port:" -msgstr "Brak portów" +msgstr "Port:" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3730,7 +3718,7 @@ msgstr "Dostosuj" #: dlls/inetcpl.cpl/inetcpl.rc:35 msgid "Very Low" -msgstr "Najniższy" +msgstr "Bardzo nisko" #: dlls/inetcpl.cpl/inetcpl.rc:36 dlls/wininet/wininet.rc:42 msgid "Low" @@ -3821,10 +3809,9 @@ msgid "Subscript out of range" msgstr "Indeks dolny poza zakresem" #: dlls/jscript/jscript.rc:31 -#, fuzzy #| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Brak papieru; " +msgstr "Wyczerpano pamięć stosu" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -7000,16 +6987,14 @@ msgid "Connection reset by peer.\n" msgstr "Połączenie wyzerowane przez uczestnika.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy #| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Nie zaimplementowane" +msgstr "Niezaimplementowane.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy #| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "Wywołanie RPC nieudane.\n" +msgstr "Nie udało się wywołać.\n" #: dlls/kernel32/winerror.mc:3760 #, fuzzy @@ -7018,10 +7003,9 @@ msgid "No Signature found in file.\n" msgstr "Nie znaleziono wiadomości 0x%1 w pliku %2.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy #| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Niepoprawny poziom.\n" +msgstr "Nieprawidłowe wywołanie.\n" #: dlls/kernel32/winerror.mc:3781 #, fuzzy @@ -7091,10 +7075,9 @@ msgid "Sink has not been finalized.\n" msgstr "Nie znaleziono UUID obiektu.\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy #| msgid "Class already exists.\n" msgid "Clock was stopped\n" -msgstr "Klasa już istnieje.\n" +msgstr "Zegar został zatrzymany\n" #: dlls/mferror/mferror.mc:32 #, fuzzy @@ -7103,16 +7086,14 @@ msgid "Media Foundation platform is not initialized.\n" msgstr "Platforma instalacyjna niewspierana.\n" #: dlls/mferror/mferror.mc:39 -#, fuzzy #| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "Liczba bajtów zbyt mała.\n" +msgstr "Zbyt mały bufor.\n" #: dlls/mferror/mferror.mc:46 -#, fuzzy #| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "Niepoprawne składnia kwerendy.\n" +msgstr "Nieprawidłowe żądanie.\n" #: dlls/mferror/mferror.mc:53 #, fuzzy @@ -7149,28 +7130,24 @@ msgid "No more types in the list of suggested media types.\n" msgstr "" #: dlls/mferror/mferror.mc:95 -#, fuzzy #| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "Niewspierany typ.\n" +msgstr "Nieobsługiwana usługa.\n" #: dlls/mferror/mferror.mc:102 -#, fuzzy #| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Nieoczekiwany błąd sieciowy.\n" +msgstr "Nieoczekiwany błąd.\n" #: dlls/mferror/mferror.mc:116 -#, fuzzy #| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "Niepoprawny czas.\n" +msgstr "Niepoprawny rodzaj.\n" #: dlls/mferror/mferror.mc:123 -#, fuzzy #| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "Niepoprawny format piksela.\n" +msgstr "Nieprawidłowy format pliku.\n" #: dlls/mferror/mferror.mc:137 #, fuzzy @@ -7217,10 +7194,9 @@ msgid "Realtime support is not available.\n" msgstr "Pomoc nie jest dostępna." #: dlls/mferror/mferror.mc:193 -#, fuzzy #| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "Niewspierany typ.\n" +msgstr "Nieobsługiwana szybkość.\n" #: dlls/mferror/mferror.mc:200 #, fuzzy @@ -7303,10 +7279,9 @@ msgid "Sample is not writable.\n" msgstr "Katalog tymczasowy jest nie do zapisu.\n" #: dlls/mferror/mferror.mc:312 -#, fuzzy #| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "Niepoprawna ścieżka.\n" +msgstr "Nieprawidłowy klucz.\n" #: dlls/mferror/mferror.mc:319 #, fuzzy @@ -7321,10 +7296,9 @@ msgid "Unsupported caption.\n" msgstr "Niewspierany typ.\n" #: dlls/mferror/mferror.mc:333 -#, fuzzy #| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "Niepoprawna stacja robocza.\n" +msgstr "Nieprawidłowe położenie.\n" #: dlls/mferror/mferror.mc:340 #, fuzzy @@ -7605,10 +7579,9 @@ msgid "Stream descriptor is not selected.\n" msgstr "Urządzenie jest niepodłączone.\n" #: dlls/mferror/mferror.mc:697 -#, fuzzy #| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Brakuje wskaźnika.\n" +msgstr "Brakuje źródła.\n" #: dlls/mferror/mferror.mc:704 msgid "Topology loader does not support sink activates.\n" @@ -8723,10 +8696,9 @@ msgid "Off" msgstr "Wyłączone" #: dlls/oledb32/version.rc:56 -#, fuzzy #| msgid "video" msgid "Provider" -msgstr "obraz" +msgstr "Dostawca" #: dlls/oledb32/version.rc:59 #, fuzzy @@ -8735,10 +8707,9 @@ msgid "Select the data you want to connect to:" msgstr "Wybierz format, którego chcesz użyć:" #: dlls/oledb32/version.rc:66 -#, fuzzy #| msgid "LAN Connection" msgid "Connection" -msgstr "Połączenie LAN" +msgstr "Połączenie" #: dlls/oledb32/version.rc:69 #, fuzzy @@ -8763,32 +8734,28 @@ msgid "Use c&onnection string" msgstr "Wyzerowane połączenia" #: dlls/oledb32/version.rc:75 -#, fuzzy #| msgid "LAN Connection" msgid "&Connection string:" -msgstr "Połączenie LAN" +msgstr "&Ciąg znaków połączenia:" #: dlls/oledb32/version.rc:77 -#, fuzzy #| msgid "A&dd..." msgid "B&uild..." -msgstr "&Dodaj..." +msgstr "B&uduj..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" msgstr "" #: dlls/oledb32/version.rc:79 -#, fuzzy #| msgid "&User name:" msgid "User &name:" -msgstr "&Użytkownik:" +msgstr "&Nazwa użytkownika:" #: dlls/oledb32/version.rc:83 -#, fuzzy #| msgid "&Blank page" msgid "&Blank password" -msgstr "Użyj pu&stej" +msgstr "&Puste hasło" #: dlls/oledb32/version.rc:84 #, fuzzy @@ -8801,20 +8768,18 @@ msgid "3. Enter the &initial catalog to use:" msgstr "" #: dlls/oledb32/version.rc:87 -#, fuzzy #| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Wyzerowane połączenia" +msgstr "&Testuj połączenie" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Zaawansowany" #: dlls/oledb32/version.rc:95 -#, fuzzy #| msgid "Network share" msgid "Network settings" -msgstr "Zasób sieciowy" +msgstr "Ustawienia sieciowe" #: dlls/oledb32/version.rc:96 #, fuzzy @@ -8827,28 +8792,24 @@ msgid "P&rotection level:" msgstr "" #: dlls/oledb32/version.rc:101 -#, fuzzy #| msgid "Connected" msgid "Connect:" -msgstr "Włączone" +msgstr "Połącz:" #: dlls/oledb32/version.rc:103 -#, fuzzy #| msgid "&Seconds" msgid "seconds." -msgstr "&Sekundy" +msgstr "sekund." #: dlls/oledb32/version.rc:104 -#, fuzzy #| msgid "Success" msgid "A&ccess:" -msgstr "Powodzenie" +msgstr "&Dostęp:" #: dlls/oledb32/version.rc:110 -#, fuzzy #| msgid "&All" msgid "All" -msgstr "&Cały rejestr" +msgstr "Wszystkie" #: dlls/oledb32/version.rc:114 msgid "" @@ -8857,16 +8818,14 @@ msgid "" msgstr "" #: dlls/oledb32/version.rc:115 -#, fuzzy #| msgid "&Edit..." msgid "&Edit Value..." -msgstr "&Edycja..." +msgstr "Zmi&eń wartość..." #: dlls/oledb32/version.rc:49 -#, fuzzy #| msgid "Properties" msgid "Data Link Error" -msgstr "Właściwości" +msgstr "Błąd odnośnika danych" #: dlls/oledb32/version.rc:50 #, fuzzy @@ -8891,16 +8850,14 @@ msgid "OLE DB Provider(s)" msgstr "" #: dlls/oledb32/version.rc:41 -#, fuzzy #| msgid "Ready" msgid "Read" -msgstr "Gotowe" +msgstr "Odczyt" #: dlls/oledb32/version.rc:42 -#, fuzzy #| msgid "Readme:" msgid "ReadWrite" -msgstr "CzytajTo:" +msgstr "OdczytZapis" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" @@ -8919,10 +8876,9 @@ msgid "Share Exclusive" msgstr "" #: dlls/oledb32/version.rc:47 -#, fuzzy #| msgid "I/O Writes" msgid "Write" -msgstr "Zapisy We/Wy" +msgstr "Zapis" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -8970,7 +8926,7 @@ msgstr "Wklej specjalnie" #: dlls/oledlg/oledlg.rc:85 dlls/setupapi/setupapi.rc:43 msgid "Source:" -msgstr "Kopiuj pliki z:" +msgstr "Skopiuj pliki z:" #: dlls/oledlg/oledlg.rc:86 dlls/shdoclc/shdoclc.rc:50 #: dlls/shdoclc/shdoclc.rc:82 dlls/shdoclc/shdoclc.rc:95 @@ -9170,7 +9126,7 @@ msgstr "Kopiowanie plików..." #: dlls/setupapi/setupapi.rc:45 msgid "Destination:" -msgstr "Kopiuj pliki do:" +msgstr "Skopiuj pliki do:" #: dlls/setupapi/setupapi.rc:52 msgid "Files Needed" @@ -9186,7 +9142,7 @@ msgstr "" #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" -msgstr "Kopiuj pliki producenta z:" +msgstr "Skopiuj pliki producenta z:" #: dlls/setupapi/setupapi.rc:31 msgid "The file '%1' on %2 is needed" @@ -9198,7 +9154,7 @@ msgstr "Nieznane" #: dlls/setupapi/setupapi.rc:33 msgid "Copy files from:" -msgstr "Kopiuj pliki z:" +msgstr "Skopiuj pliki z:" #: dlls/setupapi/setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." @@ -9218,7 +9174,7 @@ msgstr "&Ustaw jako tło" #: dlls/shdoclc/shdoclc.rc:46 msgid "&Copy Background" -msgstr "Kop&iuj tło" +msgstr "Skop&iuj tło" #: dlls/shdoclc/shdoclc.rc:47 msgid "Set as &Desktop Item" @@ -9296,7 +9252,7 @@ msgstr "Ustaw jako &element pulpitu..." #: dlls/shdoclc/shdoclc.rc:81 dlls/shdoclc/shdoclc.rc:134 #: dlls/shdoclc/shdoclc.rc:161 dlls/shdoclc/shdoclc.rc:185 msgid "Copy Shor&tcut" -msgstr "Kopiuj &skrót" +msgstr "Skopiuj &skrót" #: dlls/shdoclc/shdoclc.rc:86 dlls/shdoclc/shdoclc.rc:139 #: dlls/shdoclc/shdoclc.rc:168 dlls/shdoclc/shdoclc.rc:194 @@ -9650,10 +9606,9 @@ msgid "&Browse..." msgstr "&Przeglądaj..." #: dlls/shell32/shell32.rc:355 dlls/shell32/shell32.rc:384 -#, fuzzy #| msgid "File type" msgid "File type:" -msgstr "Typ pliku" +msgstr "Rodzaj pliku:" #: dlls/shell32/shell32.rc:359 dlls/shell32/shell32.rc:392 #: dlls/urlmon/urlmon.rc:37 programs/explorer/explorer.rc:32 @@ -9663,19 +9618,17 @@ msgstr "Położenie:" #: dlls/shell32/shell32.rc:361 dlls/shell32/shell32.rc:394 #: programs/winefile/winefile.rc:169 msgid "Size:" -msgstr "Wie&lkość:" +msgstr "Rozmiar:" #: dlls/shell32/shell32.rc:365 dlls/shell32/shell32.rc:398 -#, fuzzy #| msgid "Creation date" msgid "Creation date:" -msgstr "Data utworzenia" +msgstr "Data utworzenia:" #: dlls/shell32/shell32.rc:369 dlls/shell32/shell32.rc:406 -#, fuzzy #| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Atrybuty:" +msgstr "Atrybuty:" #: dlls/shell32/shell32.rc:371 dlls/shell32/shell32.rc:408 #: programs/winefile/winefile.rc:173 @@ -9688,28 +9641,24 @@ msgid "&Archive" msgstr "&Archiwalny" #: dlls/shell32/shell32.rc:386 -#, fuzzy #| msgid "Open:" msgid "Open with:" -msgstr "Otwórz:" +msgstr "Otwórz za pomocą:" #: dlls/shell32/shell32.rc:389 -#, fuzzy #| msgid "Change &Icon..." msgid "&Change..." -msgstr "Zmień &ikonę..." +msgstr "&Zmień..." #: dlls/shell32/shell32.rc:400 -#, fuzzy #| msgid "Modified" msgid "Last modified:" -msgstr "Zmieniony" +msgstr "Ostatnio zmieniony:" #: dlls/shell32/shell32.rc:402 -#, fuzzy #| msgid "Last Change:" msgid "Last accessed:" -msgstr "Ostatnio zmieniony:" +msgstr "Ostatnio otwierany:" #: dlls/shell32/shell32.rc:138 dlls/shell32/shell32.rc:142 #: programs/winefile/winefile.rc:107 @@ -9731,7 +9680,7 @@ msgstr "Atrybuty" #: dlls/shell32/shell32.rc:143 msgid "Size available" -msgstr "Dostępna wielkość" +msgstr "Dostępny rozmiar" #: dlls/shell32/shell32.rc:145 msgid "Comments" @@ -10137,7 +10086,7 @@ msgstr "Zaznacz źródło" #: dlls/tzres/tzres.rc:90 msgid "China Standard Time" -msgstr "" +msgstr "Czas urzędowy chiński" #: dlls/tzres/tzres.rc:91 msgid "China Daylight Time" @@ -10176,10 +10125,9 @@ msgid "Cape Verde Daylight Time" msgstr "" #: dlls/tzres/tzres.rc:126 -#, fuzzy #| msgid "Date and time" msgid "Haiti Standard Time" -msgstr "Data i godzina" +msgstr "Czas urzędowy Haiti" #: dlls/tzres/tzres.rc:127 #, fuzzy @@ -10264,10 +10212,9 @@ msgid "Mountain Daylight Time (Mexico)" msgstr "" #: dlls/tzres/tzres.rc:118 -#, fuzzy #| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "Pasek &standardowy" +msgstr "Czas urzędowy GMT" #: dlls/tzres/tzres.rc:119 msgid "GMT Daylight Time" @@ -10327,7 +10274,7 @@ msgstr "" #: dlls/tzres/tzres.rc:186 msgid "Pacific Standard Time" -msgstr "" +msgstr "Czas urzędowy pacyficzny" #: dlls/tzres/tzres.rc:187 msgid "Pacific Daylight Time" @@ -10402,10 +10349,9 @@ msgid "Line Islands Daylight Time" msgstr "" #: dlls/tzres/tzres.rc:92 -#, fuzzy #| msgid "Date and time" msgid "Cuba Standard Time" -msgstr "Data i godzina" +msgstr "Czas urzędowy kubański" #: dlls/tzres/tzres.rc:93 #, fuzzy @@ -10423,7 +10369,7 @@ msgstr "" #: dlls/tzres/tzres.rc:84 msgid "Central Standard Time" -msgstr "" +msgstr "Czas urzędowy środkowy" #: dlls/tzres/tzres.rc:85 msgid "Central Daylight Time" @@ -10447,7 +10393,7 @@ msgstr "" #: dlls/tzres/tzres.rc:42 msgid "Argentina Standard Time" -msgstr "" +msgstr "Czas urzędowy argentyński" #: dlls/tzres/tzres.rc:43 msgid "Argentina Daylight Time" @@ -10479,17 +10425,16 @@ msgstr "" #: dlls/tzres/tzres.rc:130 msgid "India Standard Time" -msgstr "" +msgstr "Czas urzędowy indyjski" #: dlls/tzres/tzres.rc:131 msgid "India Daylight Time" msgstr "" #: dlls/tzres/tzres.rc:124 -#, fuzzy #| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "Pasek &standardowy" +msgstr "Czas urzędowy GTB" #: dlls/tzres/tzres.rc:125 msgid "GTB Daylight Time" @@ -10577,7 +10522,7 @@ msgstr "" #: dlls/tzres/tzres.rc:104 msgid "Eastern Standard Time" -msgstr "" +msgstr "Czas urzędowy wschodni" #: dlls/tzres/tzres.rc:105 msgid "Eastern Daylight Time" @@ -10601,7 +10546,7 @@ msgstr "" #: dlls/tzres/tzres.rc:162 msgid "Mountain Standard Time" -msgstr "" +msgstr "Czas urzędowy górski" #: dlls/tzres/tzres.rc:163 msgid "Mountain Daylight Time" @@ -10805,7 +10750,7 @@ msgstr "" #: dlls/tzres/tzres.rc:58 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "Czas urzędowy bangladeski" #: dlls/tzres/tzres.rc:59 msgid "Bangladesh Daylight Time" @@ -10907,7 +10852,7 @@ msgstr "" #: dlls/tzres/tzres.rc:174 msgid "New Zealand Standard Time" -msgstr "" +msgstr "Czas urzędowy nowozelandzki " #: dlls/tzres/tzres.rc:175 msgid "New Zealand Daylight Time" @@ -10971,7 +10916,7 @@ msgstr "Data i godzina" #: dlls/tzres/tzres.rc:108 msgid "Egypt Standard Time" -msgstr "" +msgstr "Czas urzędowy egipski" #: dlls/tzres/tzres.rc:109 msgid "Egypt Daylight Time" @@ -11042,10 +10987,9 @@ msgid "E. Africa Daylight Time" msgstr "" #: dlls/tzres/tzres.rc:114 -#, fuzzy #| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "Pasek &standardowy" +msgstr "Czas urzędowy FLE" #: dlls/tzres/tzres.rc:115 msgid "FLE Daylight Time" @@ -11109,7 +11053,7 @@ msgstr "Czy chcesz zainstalować to oprogramowanie?" #: dlls/urlmon/urlmon.rc:39 msgid "Don't install" -msgstr "Nie instaluj" +msgstr "Nie wgrywaj" #: dlls/urlmon/urlmon.rc:43 msgid "" @@ -11117,7 +11061,7 @@ msgid "" "not click install unless you have absolute trust in the above source." msgstr "" "Składnik ActiveX ma pełny dostęp do twojego komputera, jeśli jest " -"zainstalowany. Nie klikaj zainstaluj dopóki nie masz pełnego zaufania do " +"wgrany. Nie klikaj wgraj dopóki nie masz pełnego zaufania do " "powyższego źródła." #: dlls/urlmon/urlmon.rc:51 @@ -11126,11 +11070,11 @@ msgstr "Nieudana instalacja składnika: %08x" #: dlls/urlmon/urlmon.rc:52 msgid "Install (%d)" -msgstr "Zainstaluj (%d)" +msgstr "Wgraj (%d)" #: dlls/urlmon/urlmon.rc:53 msgid "Install" -msgstr "Zainstaluj" +msgstr "Wgraj" #: dlls/user32/user32.rc:30 dlls/user32/user32.rc:43 #: programs/taskmgr/taskmgr.rc:138 @@ -11179,7 +11123,7 @@ msgstr "&Zaniechaj" #: dlls/user32/user32.rc:85 msgid "&Ignore" -msgstr "&Ignoruj" +msgstr "Pom&iń" #: dlls/user32/user32.rc:86 msgid "&Try Again" @@ -11199,75 +11143,65 @@ msgstr "&Więcej okien..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Przepełnienie w górę" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy #| msgid "Out of memory." msgid "Out of memory" -msgstr "Za mało pamięci dla tej operacji." +msgstr "Brak pamięci" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" msgstr "" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy #| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Niezgodność typu danych.\n" +msgstr "Niezgodność rodzajów" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy #| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "Błąd WE/WY urządzenia.\n" +msgstr "Błąd WE/WY urządzenia." #: dlls/vbscript/vbscript.rc:37 -#, fuzzy #| msgid "File already exists.\n" msgid "File already exists" -msgstr "Plik już istnieje.\n" +msgstr "Plik już istnieje" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy #| msgid "Disk full.\n" msgid "Disk full" -msgstr "Dysk pełen.\n" +msgstr "Dysk pełen" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy #| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Zbyt dużo otwartych plików.\n" +msgstr "Zbyt wiele plików" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy #| msgid "Access denied.\n" msgid "Permission denied" -msgstr "Dostęp zastrzeżony.\n" +msgstr "Odmówiono dostępu" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" msgstr "" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy #| msgid "Path not found.\n" msgid "Path not found" -msgstr "Nie znaleziono ścieżki.\n" +msgstr "Nie znaleziono ścieżki" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy #| msgid "(value not set)" msgid "Object variable not set" -msgstr "(wartość nie ustalona)" +msgstr "Nie ustawiono zmiennej obiektu" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy #| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Niepoprawny bufor użytkownika.\n" +msgstr "Nieprawidłowe użycie Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" @@ -11312,10 +11246,9 @@ msgid "Wrong number of arguments or invalid property assignment" msgstr "" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy #| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Naruszenie klasy obiektu" +msgstr "Obiekt nie jest zbiorem" #: dlls/vbscript/vbscript.rc:57 #, fuzzy @@ -11438,25 +11371,22 @@ msgstr "Wystąpił przynajmniej jeden nieokreślony problem z tym certyfikatem." #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Data obowiązywania" #: dlls/wininet/wininet.rc:37 -#, fuzzy #| msgid "Security" msgid "Security Protocol" -msgstr "Prawa dostępu" +msgstr "Protokół zabezpieczeń" #: dlls/wininet/wininet.rc:38 -#, fuzzy #| msgid "Signature" msgid "Signature Type" -msgstr "Podpis" +msgstr "Rodzaj podpisu" #: dlls/wininet/wininet.rc:39 -#, fuzzy #| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Szyfrowanie systemu plików" +msgstr "Rodzaj szyfrowania" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" @@ -11464,7 +11394,7 @@ msgstr "" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "bity" #: dlls/wininet/winineterror.mc:26 #, fuzzy @@ -12359,7 +12289,7 @@ msgstr "Błąd podczas dekodowania" #: dlls/wldap32/wldap32.rc:117 msgid "Timeout" -msgstr "Limit czasu" +msgstr "Czas oczekiwania" #: dlls/wldap32/wldap32.rc:118 msgid "Auth Unknown" @@ -13320,7 +13250,7 @@ msgstr "" #: programs/conhost/conhost.rc:54 msgid "Cursor size" -msgstr "Wielkość kursora" +msgstr "Rozmiar kursora" #: programs/conhost/conhost.rc:55 msgid "&Small" @@ -13472,7 +13402,7 @@ msgstr "Błąd ustawiania" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "Wielkość bufora ekranu musi być większa lub równa rozmiarowi okna." +msgstr "Rozmiar bufora ekranu musi być większa lub równa rozmiarowi okna." #: programs/conhost/conhost.rc:41 msgid "Each character is %1!u! pixels wide and %2!u! pixels high" @@ -13892,7 +13822,7 @@ msgstr "Wy&tnij\tCtrl+X" #: programs/notepad/notepad.rc:45 programs/wordpad/wordpad.rc:48 msgid "&Copy\tCtrl+C" -msgstr "&Kopiuj\tCtrl+C" +msgstr "&Skopiuj\tCtrl+C" #: programs/notepad/notepad.rc:46 programs/wordpad/wordpad.rc:49 msgid "&Paste\tCtrl+V" @@ -14109,7 +14039,7 @@ msgstr "Ustawienia &systemu" #: programs/oleview/oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "&Uruchom Edytor Rejestrów" +msgstr "&Uruchom Edytor Rejestru" #: programs/oleview/oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -14149,11 +14079,11 @@ msgstr "&Zwolnij instancję" #: programs/oleview/oleview.rc:56 msgid "Copy C&LSID to clipboard" -msgstr "Kopiuj C&LSID do schowka" +msgstr "Skopiuj C&LSID do schowka" #: programs/oleview/oleview.rc:57 msgid "Copy &HTML object Tag to clipboard" -msgstr "Kopiuj tag obiektu &HTML do schowka" +msgstr "Skopiuj znacznik obiektu &HTML do schowka" #: programs/oleview/oleview.rc:63 msgid "&Expert mode" @@ -14286,7 +14216,7 @@ msgstr "Zmień ustawienia Distributed COM tego komputera" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" -msgstr "Uruchom Edytor Rejestrów Wine" +msgstr "Uruchom Edytor Rejestru Wine" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" @@ -14448,7 +14378,7 @@ msgstr "&Przenieś...\tF7" #: programs/progman/progman.rc:36 programs/winefile/winefile.rc:31 msgid "&Copy...\tF8" -msgstr "&Kopiuj...\tF8" +msgstr "&Skopiuj...\tF8" #: programs/progman/progman.rc:38 msgid "&Properties\tAlt+Enter" @@ -14526,7 +14456,7 @@ msgstr "&Do grupy:" #: programs/progman/progman.rc:134 msgid "Copy Program" -msgstr "Kopiuj program" +msgstr "Skopiuj program" #: programs/progman/progman.rc:136 msgid "Copy program:" @@ -16986,7 +16916,7 @@ msgstr "Wys&trój:" #: programs/winecfg/winecfg.rc:289 msgid "&Install theme..." -msgstr "Za&instaluj wystrój..." +msgstr "&Wgraj wystrój..." #: programs/winecfg/winecfg.rc:294 msgid "It&em:" @@ -16998,11 +16928,11 @@ msgstr "K&olor:" #: programs/winecfg/winecfg.rc:302 msgid "MIME types" -msgstr "" +msgstr "Typy MIME" #: programs/winecfg/winecfg.rc:303 msgid "Manage file &associations" -msgstr "" +msgstr "Z&arządzaj skojarzeniami plików" #: programs/winecfg/winecfg.rc:306 msgid "Folders" @@ -17502,11 +17432,11 @@ msgstr "Wybór celu" #: programs/winefile/winefile.rc:134 msgid "By File Type" -msgstr "Według typu pliku" +msgstr "Wg rodzaju pliku" #: programs/winefile/winefile.rc:139 msgid "File type" -msgstr "Typ pliku" +msgstr "Rodzaj pliku" #: programs/winefile/winefile.rc:140 msgid "&Directories" @@ -17618,14 +17548,13 @@ msgid "&Beginner" msgstr "&Początkujący" #: programs/winemine/winemine.rc:45 -#, fuzzy #| msgid "Interface" msgid "&Intermediate" -msgstr "Interfejs" +msgstr "Dośw&iadczony" #: programs/winemine/winemine.rc:46 msgid "&Expert" -msgstr "&Ekspert" +msgstr "&Mistrz" #: programs/winemine/winemine.rc:47 msgid "&Custom..." @@ -17641,25 +17570,24 @@ msgstr "Saper Wine - i&nformacje" #: programs/winemine/winemine.rc:61 msgid "Fastest Times" -msgstr "Najlepsze Wyniki" +msgstr "Najszybsze czasy" #: programs/winemine/winemine.rc:63 msgid "Fastest times" -msgstr "Najlepsze wyniki" +msgstr "Najszybsze czasy" #: programs/winemine/winemine.rc:64 msgid "Beginner" msgstr "Początkujący" #: programs/winemine/winemine.rc:65 -#, fuzzy #| msgid "Interface" msgid "Intermediate" -msgstr "Interfejs" +msgstr "Doświadczony" #: programs/winemine/winemine.rc:66 msgid "Expert" -msgstr "Ekspert" +msgstr "Mistrz" #: programs/winemine/winemine.rc:74 programs/winemine/winemine.rc:33 msgid "Reset Results" @@ -17671,7 +17599,7 @@ msgstr "Gratulacje!" #: programs/winemine/winemine.rc:82 msgid "Please enter your name" -msgstr "Podaj swoje imię" +msgstr "Wpisz swoje imię" #: programs/winemine/winemine.rc:90 msgid "Custom Game" @@ -17755,7 +17683,7 @@ msgstr "Adnotacja..." #: programs/winhlp32/winhlp32.rc:68 msgid "Copy" -msgstr "Kopiuj" +msgstr "Skopiuj" #: programs/winhlp32/winhlp32.rc:100 msgid "Index" -- 2.30.2

1 0

[PATCH 1/5] mf: Add MFRequireProtectedEnvironment().
by Nikolay Sivov April 5, 2021

April 5, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/main.c | 19 +++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 39 +++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index bf7066ad032..b59ad466c73 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1460,3 +1460,22 @@ HRESULT WINAPI MFCreateSimpleTypeHandler(IMFMediaTypeHandler **handler) return S_OK; } + +HRESULT WINAPI MFRequireProtectedEnvironment(IMFPresentationDescriptor *pd) +{ + BOOL selected, protected = FALSE; + unsigned int i = 0, value; + IMFStreamDescriptor *sd; + + TRACE("%p.\n", pd); + + while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, i++, &selected, &sd))) + { + value = 0; + protected = SUCCEEDED(IMFStreamDescriptor_GetUINT32(sd, &MF_SD_PROTECTED, &value)) && value; + IMFStreamDescriptor_Release(sd); + if (protected) break; + } + + return protected ? S_OK : S_FALSE; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 2927d9f8a88..8f340243fc2 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -77,7 +77,7 @@ @ stdcall MFGetSupportedSchemes(ptr) @ stdcall MFGetTopoNodeCurrentType(ptr long long ptr) @ stub MFReadSequencerSegmentOffset -@ stub MFRequireProtectedEnvironment +@ stdcall MFRequireProtectedEnvironment(ptr) @ stdcall MFShutdownObject(ptr) @ stub MFTranscodeGetAudioOutputAvailableTypes @ stub MergePropertyStore diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 40d8561bb06..df286db6385 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5185,6 +5185,44 @@ static void init_functions(void) #undef X } +static void test_MFRequireProtectedEnvironment(void) +{ + IMFPresentationDescriptor *pd; + IMFMediaType *mediatype; + IMFStreamDescriptor *sd; + HRESULT hr; + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateStreamDescriptor(0, 1, &mediatype, &sd); + ok(hr == S_OK, "Failed to create stream descriptor, hr %#x.\n", hr); + + hr = MFCreatePresentationDescriptor(1, &sd, &pd); + ok(hr == S_OK, "Failed to create presentation descriptor, hr %#x.\n", hr); + + hr = IMFPresentationDescriptor_SelectStream(pd, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFRequireProtectedEnvironment(pd); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamDescriptor_SetUINT32(sd, &MF_SD_PROTECTED, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFRequireProtectedEnvironment(pd); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationDescriptor_DeselectStream(pd, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFRequireProtectedEnvironment(pd); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFStreamDescriptor_Release(sd); + IMFPresentationDescriptor_Release(pd); +} + START_TEST(mf) { init_functions(); @@ -5216,4 +5254,5 @@ START_TEST(mf) test_sample_copier(); test_sample_copier_output_processing(); test_MFGetTopoNodeCurrentType(); + test_MFRequireProtectedEnvironment(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 46c715a3752..138b899ffdb 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -698,6 +698,7 @@ cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") cpp_quote("HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type);") cpp_quote("HRESULT WINAPI MFShutdownObject(IUnknown *object);") cpp_quote("HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample);") +cpp_quote("HRESULT WINAPI MFRequireProtectedEnvironment(IMFPresentationDescriptor *pd);") typedef enum _MFMEDIASOURCE_CHARACTERISTICS { -- 2.30.2

2 7

[PATCH] ole32: Add support for writing VT_BLOB properties.
by Nikolay Sivov April 5, 2021

April 5, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50917 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/stg_prop.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 63e93c0b8c9..cd30dad8c99 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2267,6 +2267,16 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count; break; } + case VT_BLOB: + { + StorageUtl_WriteDWord(&dwTemp, 0, var->blob.cbSize); + hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); + if (FAILED(hr)) + goto end; + hr = IStream_Write(This->stm, var->blob.pBlobData, var->blob.cbSize, &count); + bytesWritten = count + sizeof(DWORD); + break; + } default: FIXME("unsupported type: %d\n", var->vt); return STG_E_INVALIDPARAMETER; -- 2.30.2

1 0

[PATCH] kernelbase: Cache last used locale->sortguid mapping.
by Torge Matthies April 5, 2021

April 5, 2021

get_language_sort reads from the registry, which is not particularly fast. Staging's implementation of CompareStringEx calls this function, and if CompareStringEx is used in a loop over many elements, it will slow down the application by a lot (> 30 seconds vs a few hundred ms in osu!, depends on the CPU and the number of installed beatmaps). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50923 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- This could be put into the Staging patchset libs-Unicode_Collation, if deemed not appropriate for vanilla. I could also make it cache all requested locales in an rbtree, if desired. However most applications should only ever need one locale. dlls/kernelbase/locale.c | 42 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c58c2cbe434..3b4191078ad 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -618,6 +618,21 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION locale_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static struct +{ + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; /* The locale name */ + const struct sortguid *guid; /* The cached associated GUID */ +} sortguid_cache; + +static CRITICAL_SECTION sortguid_cache_section; +static CRITICAL_SECTION_DEBUG sortguid_cache_section_debug = +{ + 0, 0, &sortguid_cache_section, + { &sortguid_cache_section_debug.ProcessLocksList, &sortguid_cache_section_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": sortguid_cache_section") } +}; +static CRITICAL_SECTION sortguid_cache_section = { &sortguid_cache_section_debug, -1, 0, 0, 0, 0 }; + static void init_sortkeys( DWORD *ptr ) { @@ -655,7 +670,7 @@ static const struct sortguid *find_sortguid( const GUID *guid ) } -static const struct sortguid *get_language_sort( const WCHAR *locale ) +static const struct sortguid *get_language_sort_uncached( const WCHAR *locale ) { WCHAR *p, *end, buffer[LOCALE_NAME_MAX_LENGTH], guidstr[39]; const struct sortguid *ret; @@ -698,6 +713,31 @@ done: } +static const struct sortguid *get_language_sort( const WCHAR *locale ) +{ + const struct sortguid *ret = NULL; + + if (!locale) return get_language_sort_uncached( locale ); + + RtlEnterCriticalSection( &sortguid_cache_section ); + + if (sortguid_cache.guid && !wcsncmp( sortguid_cache.locale, locale, LOCALE_NAME_MAX_LENGTH )) + { + ret = sortguid_cache.guid; + goto done; + } + + ret = get_language_sort_uncached( locale ); + + lstrcpynW( sortguid_cache.locale, locale, LOCALE_NAME_MAX_LENGTH ); + sortguid_cache.guid = ret; + +done: + RtlLeaveCriticalSection( &sortguid_cache_section ); + return ret; +} + + static LCID locale_to_lcid( WCHAR *win_name ) { WCHAR *p; -- 2.31.1

1 0