wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Nikolay Sivov : evr/presenter: Use correct sample size attribute value when setting output mixer type.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: a00a09c470322875ff7db58e3376c30ff08b7793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a00a09c470322875ff7db58e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:31:13 2021 +0300 evr/presenter: Use correct sample size attribute value when setting output mixer type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 414ba5bcaa0..e9890c9f6e4 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -334,7 +334,7 @@ static HRESULT video_presenter_configure_output_type(struct video_presenter *pre if (SUCCEEDED(hr)) hr = IMFMediaType_SetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, stride); if (SUCCEEDED(hr)) - hr = IMFMediaType_SetUINT32(media_type, &MF_MT_SAMPLE_SIZE, stride); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_SAMPLE_SIZE, size); } return hr;

1 0

Nikolay Sivov : evr/mixer: Set aperture attributes for output type candidates.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 5d83662217364447dab7278610068e055673d510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d83662217364447dab72786… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:31:12 2021 +0300 evr/mixer: Set aperture attributes for output type candidates. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c18bf0450bf..187a13be364 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -664,6 +664,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const unsigned int i, j, format_count, count; struct rt_format *rt_formats = NULL, *ptr; HRESULT hr = MF_E_INVALIDMEDIATYPE; + MFVideoArea aperture; D3DFORMAT *formats; GUID subtype; @@ -691,29 +692,32 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const if (count && !(flags & MFT_SET_TYPE_TEST_ONLY)) { + if (!(mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) + { + free(rt_formats); + return E_OUTOFMEMORY; + } + memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); - if ((mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) + memset(&aperture, 0, sizeof(aperture)); + aperture.Area.cx = video_desc->SampleWidth; + aperture.Area.cy = video_desc->SampleHeight; + for (i = 0; i < count; ++i) { - for (i = 0; i < count; ++i) - { - IMFMediaType *rt_media_type; + IMFMediaType *rt_media_type; - subtype.Data1 = rt_formats[i].format; - mixer->output.rt_formats[i] = rt_formats[i]; + subtype.Data1 = rt_formats[i].format; + mixer->output.rt_formats[i] = rt_formats[i]; - MFCreateMediaType(&rt_media_type); - IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)rt_media_type); - IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); + MFCreateMediaType(&rt_media_type); + IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)rt_media_type); + IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); + IMFMediaType_SetBlob(rt_media_type, &MF_MT_GEOMETRIC_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); + IMFMediaType_SetBlob(rt_media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); - mixer->output.rt_formats[i].media_type = rt_media_type; - } - mixer->output.rt_formats_count = count; - } - else - { - hr = E_OUTOFMEMORY; - count = 0; + mixer->output.rt_formats[i].media_type = rt_media_type; } + mixer->output.rt_formats_count = count; } free(rt_formats);

1 0

Nikolay Sivov : propsys: Add support for VT_VECTOR|VT_UI1 type in PropVariantCompareEx().
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: e91b05bb5be6fd70a767bea9991e818a49cc5547 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91b05bb5be6fd70a767bea9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:31:11 2021 +0300 propsys: Add support for VT_VECTOR|VT_UI1 type in PropVariantCompareEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 13 +++++++- dlls/propsys/tests/propsys.c | 75 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index a18d83eabab..977fbebb918 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -798,7 +798,10 @@ static BOOL isemptyornull(const PROPVARIANT *propvar) if (propvar->vt == VT_CLSID) return !propvar->puuid; - /* FIXME: vectors, byrefs, errors? */ + if (propvar->vt & VT_VECTOR) + return !propvar->caub.cElems; + + /* FIXME: byrefs, errors? */ return FALSE; } @@ -807,6 +810,7 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 { const PROPVARIANT *propvar2_converted; PROPVARIANT propvar2_static; + unsigned int count; HRESULT hr; INT res=-1; @@ -894,6 +898,13 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 res = memcmp(propvar1->puuid, propvar2->puuid, sizeof(*propvar1->puuid)); if (res) res = res > 0 ? 1 : -1; break; + case VT_VECTOR | VT_UI1: + count = min(propvar1->caub.cElems, propvar2->caub.cElems); + res = count ? memcmp(propvar1->caub.pElems, propvar2->caub.pElems, sizeof(*propvar1->caub.pElems) * count) : 0; + if (res) res = res > 0 ? 1 : -1; + if (!res && propvar1->caub.cElems != propvar2->caub.cElems) + res = propvar1->caub.cElems > propvar2->caub.cElems ? 1 : -1; + break; default: FIXME("vartype %#x not handled\n", propvar1->vt); res = -1; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 07d035376d9..9ffa048a8b7 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -666,15 +666,18 @@ static void test_PropVariantToStringAlloc(void) CoTaskMemFree(str); } -static void test_PropVariantCompare(void) +static void test_PropVariantCompareEx(void) { PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b; PROPVARIANT clsid_null, clsid, clsid2, r4_0, r4_2, r8_0, r8_2; + PROPVARIANT var1, var2; INT res; static const WCHAR str_2W[] = {'2', 0}; static const WCHAR str_02W[] = {'0', '2', 0}; static const WCHAR str_bW[] = {'b', 0}; SAFEARRAY emptysafearray; + unsigned char bytevector1[] = {1,2,3}; + unsigned char bytevector2[] = {4,5,6}; PropVariantInit(&empty); PropVariantInit(&null); @@ -847,6 +850,74 @@ todo_wine res = PropVariantCompareEx(&r8_2, &r8_0, 0, 0); ok(res == 1, "res=%i\n", res); + /* VT_VECTOR | VT_UI1 */ + var1.vt = VT_VECTOR | VT_UI1; + var1.caub.cElems = 1; + var1.caub.pElems = bytevector1; + var2.vt = VT_VECTOR | VT_UI1; + var2.caub.cElems = 1; + var2.caub.pElems = bytevector2; + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + /* Vector length mismatch */ + var1.caub.cElems = 2; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.pElems = bytevector2; + var2.caub.pElems = bytevector1; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.pElems = bytevector1; + var2.caub.pElems = bytevector2; + + var1.caub.cElems = 1; + var2.caub.cElems = 2; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + /* Length mismatch over same data */ + var1.caub.pElems = bytevector1; + var2.caub.pElems = bytevector1; + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.cElems = 1; + var2.caub.cElems = 1; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 0, "res=%i\n", res); + + var1.caub.cElems = 0; + res = PropVariantCompareEx(&var1, &var2, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == 1, "res=%i\n", res); + res = PropVariantCompareEx(&var2, &var1, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var2.caub.cElems = 0; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 0, "res=%i\n", res); + SysFreeString(str_2.bstrVal); SysFreeString(str_02.bstrVal); SysFreeString(str_b.bstrVal); @@ -1957,7 +2028,7 @@ START_TEST(propsys) test_InitPropVariantFromBuffer(); test_PropVariantToGUID(); test_PropVariantToStringAlloc(); - test_PropVariantCompare(); + test_PropVariantCompareEx(); test_intconversions(); test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean();

1 0

Nikolay Sivov : mfmediaengine: Add missing initialization of vertex buffer components (Coverity).
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: c7339d62813b9b911c746160350b1bfc6172758f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7339d62813b9b911c746160… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:29:36 2021 +0300 mfmediaengine: Add missing initialization of vertex buffer components (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4f01f6ddada..510b1c5885f 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2054,15 +2054,19 @@ static HRESULT media_engine_transfer_to_d3d11_texture(struct media_engine *engin quad[0].x = 2.0f * rect.left / desc.Width - 1.0f; quad[0].y = -2.0f * rect.bottom / desc.Height + 1.0f; + quad[0].z = 0.0f; quad[1].x = quad[0].x; quad[1].y = -2.0f * rect.top / desc.Height + 1.0f; + quad[1].z = 0.0f; quad[2].x = 2.0f * rect.right / desc.Width - 1.0f; quad[2].y = quad[0].y; + quad[2].z = 0.0f; quad[3].x = quad[2].x; quad[3].y = quad[1].y; + quad[3].z = 0.0f; set_rect(&dst, dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom); }

1 0

Nikolay Sivov : mf/topology: Implement MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES connection method.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 33ea3fc8060b55b074a6234c3cb681685a023580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ea3fc8060b55b074a6234c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:28:45 2021 +0300 mf/topology: Implement MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES connection method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 99 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 81 insertions(+), 18 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index bbed2cba893..a054eca27e1 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2010,7 +2010,10 @@ struct connect_context IMFTopologyNode *upstream_node; IMFTopologyNode *sink; IMFMediaTypeHandler *sink_handler; - const GUID *converter_category; + unsigned int output_index; + unsigned int input_index; + GUID converter_category; + GUID decoder_category; }; typedef HRESULT (*p_connect_func)(struct transform_output_type *output_type, struct connect_context *context); @@ -2142,7 +2145,7 @@ static HRESULT connect_to_converter(struct transform_output_type *output_type, s sink_ctx = *context; sink_ctx.upstream_node = node; - if (SUCCEEDED(hr = topology_loader_enumerate_output_types(context->converter_category, output_type->type, + if (SUCCEEDED(hr = topology_loader_enumerate_output_types(&context->converter_category, output_type->type, connect_to_sink, &sink_ctx))) { hr = IMFTopology_AddNode(context->context->output_topology, node); @@ -2225,13 +2228,62 @@ static HRESULT topology_loader_get_mft_categories(IMFMediaTypeHandler *handler, return S_OK; } +static HRESULT topology_loader_connect(IMFMediaTypeHandler *sink_handler, unsigned int sink_method, + struct connect_context *sink_ctx, struct connect_context *convert_ctx, IMFMediaType *media_type) +{ + HRESULT hr; + + if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(sink_handler, media_type, NULL)) + && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(sink_handler, media_type))) + { + hr = IMFTopologyNode_ConnectOutput(sink_ctx->upstream_node, sink_ctx->output_index, sink_ctx->sink, sink_ctx->input_index); + } + + if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_CONVERTER) + { + hr = topology_loader_enumerate_output_types(&convert_ctx->converter_category, media_type, connect_to_sink, sink_ctx); + } + + if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_DECODER) + { + hr = topology_loader_enumerate_output_types(&convert_ctx->decoder_category, media_type, + connect_to_converter, convert_ctx); + } + + return hr; +} + +static HRESULT topology_loader_foreach_source_type(IMFMediaTypeHandler *sink_handler, IMFMediaTypeHandler *source_handler, + unsigned int sink_method, struct connect_context *sink_ctx, struct connect_context *convert_ctx) +{ + unsigned int index = 0; + IMFMediaType *media_type; + HRESULT hr; + + while (SUCCEEDED(hr = IMFMediaTypeHandler_GetMediaTypeByIndex(source_handler, index++, &media_type))) + { + hr = topology_loader_connect(sink_handler, sink_method, sink_ctx, convert_ctx, media_type); + if (SUCCEEDED(hr)) break; + IMFMediaType_Release(media_type); + media_type = NULL; + } + + if (media_type) + { + hr = IMFMediaTypeHandler_SetCurrentMediaType(source_handler, media_type); + IMFMediaType_Release(media_type); + } + + return hr; +} + static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context *context, IMFTopologyNode *source, unsigned int output_index, IMFTopologyNode *sink, unsigned int input_index) { IMFMediaTypeHandler *source_handler = NULL, *sink_handler = NULL; struct connect_context convert_ctx, sink_ctx; MF_CONNECT_METHOD source_method, sink_method; - GUID decode_cat, convert_cat; + unsigned int enumerate_source_types = 0; IMFMediaType *media_type; HRESULT hr; @@ -2248,35 +2300,46 @@ static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context if (FAILED(IMFTopologyNode_GetUINT32(sink, &MF_TOPONODE_CONNECT_METHOD, &sink_method))) sink_method = MF_CONNECT_ALLOW_DECODER; - if (FAILED(hr = topology_loader_get_mft_categories(source_handler, &decode_cat, &convert_cat))) - goto done; - sink_ctx.context = context; sink_ctx.upstream_node = source; sink_ctx.sink = sink; sink_ctx.sink_handler = sink_handler; + sink_ctx.output_index = output_index; + sink_ctx.input_index = input_index; convert_ctx = sink_ctx; - convert_ctx.converter_category = &convert_cat; + if (FAILED(hr = topology_loader_get_mft_categories(source_handler, &convert_ctx.decoder_category, + &convert_ctx.converter_category))) + goto done; - if (SUCCEEDED(hr = IMFMediaTypeHandler_GetCurrentMediaType(source_handler, &media_type))) + IMFTopology_GetUINT32(context->output_topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, &enumerate_source_types); + + if (enumerate_source_types) { - /* Direct connection. */ - if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(sink_handler, media_type, NULL)) - && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(sink_handler, media_type))) + if (source_method & MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES) { - hr = IMFTopologyNode_ConnectOutput(source, output_index, sink, input_index); + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_DECODER, + &sink_ctx, &convert_ctx); } - if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_CONVERTER) + else { - hr = topology_loader_enumerate_output_types(&convert_cat, media_type, connect_to_sink, &sink_ctx); + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_DIRECT, + &sink_ctx, &convert_ctx); + if (FAILED(hr)) + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_CONVERTER, + &sink_ctx, &convert_ctx); + if (FAILED(hr)) + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_DECODER, + &sink_ctx, &convert_ctx); } - if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_DECODER) + } + else + { + if (SUCCEEDED(hr = IMFMediaTypeHandler_GetCurrentMediaType(source_handler, &media_type))) { - hr = topology_loader_enumerate_output_types(&decode_cat, media_type, connect_to_converter, &convert_ctx); + hr = topology_loader_connect(sink_handler, sink_method, &sink_ctx, &convert_ctx, media_type); + IMFMediaType_Release(media_type); } - - IMFMediaType_Release(media_type); } done:

1 0

Hugh McMaster : reg: Fail if the source and destination keys are the same when copying.
by Alexandre Julliard 31 May '21

31 May '21

1 0

Hugh McMaster : reg: Support recursion in the 'copy' command.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 8d9a228e99e1252a0d82c88e6a64635548c478a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d9a228e99e1252a0d82c88e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 31 19:45:23 2021 +1000 reg: Support recursion in the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/copy.c | 19 +++++++++++++++++++ programs/reg/tests/copy.c | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/programs/reg/copy.c b/programs/reg/copy.c index 29ada63da56..34abf8ade18 100644 --- a/programs/reg/copy.c +++ b/programs/reg/copy.c @@ -90,6 +90,25 @@ static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) } } + for (i = 0; recurse; i++) + { + struct key subkey_src, subkey_dest; + + name_len = max_name_len; + + rc = RegEnumKeyExW(src->hkey, i, name, &name_len, NULL, NULL, NULL, NULL); + if (rc) break; + + subkey_src.root = src->hkey; + subkey_src.subkey = name; + + subkey_dest.root = dest->hkey; + subkey_dest.subkey = name; + + rc = run_copy(&subkey_src, &subkey_dest, TRUE, force); + if (rc) goto cleanup; + } + cleanup: free(name); free(data); diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index ef4a5f6acb8..70f9496b149 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -322,7 +322,7 @@ static void test_copy_complex_data(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", complex_data_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", complex_data_test, 0), "compare_export() failed\n"); } static void test_copy_key_order(void) @@ -347,7 +347,7 @@ static void test_copy_key_order(void) run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", key_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); } static void test_copy_value_order(void)

1 0

Hugh McMaster : reg: Partially implement the 'copy' command.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: b1ccb87d9debb1a07e35263a76b6e34a7dd6ee49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ccb87d9debb1a07e35263a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 31 19:45:22 2021 +1000 reg: Partially implement the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/copy.c | 129 +++++++++++++++++++++++++++++++++ programs/reg/tests/copy.c | 178 +++++++++++++++++++++++----------------------- 2 files changed, 218 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1ccb87d9debb1a07e35…

1 0

Hugh McMaster : reg: Group resource IDs by source location.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 8f997a8b9b75320449711d3b05241b5f1f580ac3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f997a8b9b75320449711d3b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 31 19:45:21 2021 +1000 reg: Group resource IDs by source location. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 344 ++++++++++++++++----------------- po/ast.po | 314 +++++++++++++++--------------- po/bg.po | 318 +++++++++++++++--------------- po/ca.po | 342 ++++++++++++++++---------------- po/cs.po | 338 ++++++++++++++++---------------- po/da.po | 354 +++++++++++++++++----------------- po/de.po | 504 ++++++++++++++++++++++++------------------------ po/el.po | 310 ++++++++++++++--------------- po/en.po | 444 +++++++++++++++++++++--------------------- po/en_US.po | 444 +++++++++++++++++++++--------------------- po/eo.po | 330 +++++++++++++++---------------- po/es.po | 338 ++++++++++++++++---------------- po/fa.po | 298 ++++++++++++++-------------- po/fi.po | 490 +++++++++++++++++++++++----------------------- po/fr.po | 344 ++++++++++++++++----------------- po/he.po | 346 ++++++++++++++++----------------- po/hi.po | 286 +++++++++++++-------------- po/hr.po | 350 ++++++++++++++++----------------- po/hu.po | 348 ++++++++++++++++----------------- po/it.po | 354 +++++++++++++++++----------------- po/ja.po | 478 ++++++++++++++++++++++----------------------- po/ko.po | 330 +++++++++++++++---------------- po/lt.po | 446 +++++++++++++++++++++--------------------- po/ml.po | 286 +++++++++++++-------------- po/nb_NO.po | 336 ++++++++++++++++---------------- po/nl.po | 456 +++++++++++++++++++++---------------------- po/or.po | 286 +++++++++++++-------------- po/pa.po | 286 +++++++++++++-------------- po/pl.po | 502 +++++++++++++++++++++++------------------------ po/pt_BR.po | 452 +++++++++++++++++++++---------------------- po/pt_PT.po | 344 ++++++++++++++++----------------- po/rm.po | 296 ++++++++++++++-------------- po/ro.po | 340 ++++++++++++++++---------------- po/ru.po | 330 +++++++++++++++---------------- po/si.po | 322 +++++++++++++++---------------- po/sk.po | 330 +++++++++++++++---------------- po/sl.po | 344 ++++++++++++++++----------------- po/sr_RS(a)cyrillic.po | 328 +++++++++++++++---------------- po/sr_RS(a)latin.po | 334 ++++++++++++++++---------------- po/sv.po | 336 ++++++++++++++++---------------- po/ta.po | 286 +++++++++++++-------------- po/te.po | 286 +++++++++++++-------------- po/th.po | 302 ++++++++++++++--------------- po/tr.po | 336 ++++++++++++++++---------------- po/uk.po | 330 +++++++++++++++---------------- po/wa.po | 296 ++++++++++++++-------------- po/wine.pot | 286 +++++++++++++-------------- po/zh_CN.po | 330 +++++++++++++++---------------- po/zh_TW.po | 344 ++++++++++++++++----------------- programs/reg/resource.h | 98 ++++++---- 50 files changed, 8633 insertions(+), 8619 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f997a8b9b7532044971…

1 0

Hugh McMaster : reg: Remove two unused string resources.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: e4f3d51fdde4b762d2317ce7b2aa140ac030989b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f3d51fdde4b762d2317ce7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 31 19:45:20 2021 +1000 reg: Remove two unused string resources. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 44 ++++++++++++++++---------------------------- po/ast.po | 42 ++++++++++++++++-------------------------- po/bg.po | 44 ++++++++++++++++---------------------------- po/ca.po | 44 ++++++++++++++++---------------------------- po/cs.po | 44 ++++++++++++++++---------------------------- po/da.po | 44 ++++++++++++++++---------------------------- po/de.po | 44 ++++++++++++++++---------------------------- po/el.po | 42 ++++++++++++++++-------------------------- po/en.po | 44 ++++++++++++++++---------------------------- po/en_US.po | 44 ++++++++++++++++---------------------------- po/eo.po | 44 ++++++++++++++++---------------------------- po/es.po | 42 ++++++++++++++++-------------------------- po/fa.po | 43 ++++++++++++++++--------------------------- po/fi.po | 44 ++++++++++++++++---------------------------- po/fr.po | 46 ++++++++++++++++------------------------------ po/he.po | 44 ++++++++++++++++---------------------------- po/hi.po | 42 ++++++++++++++++-------------------------- po/hr.po | 44 ++++++++++++++++---------------------------- po/hu.po | 44 ++++++++++++++++---------------------------- po/it.po | 44 ++++++++++++++++---------------------------- po/ja.po | 43 ++++++++++++++++--------------------------- po/ko.po | 43 ++++++++++++++++--------------------------- po/lt.po | 42 ++++++++++++++++-------------------------- po/ml.po | 42 ++++++++++++++++-------------------------- po/nb_NO.po | 44 ++++++++++++++++---------------------------- po/nl.po | 44 ++++++++++++++++---------------------------- po/or.po | 42 ++++++++++++++++-------------------------- po/pa.po | 42 ++++++++++++++++-------------------------- po/pl.po | 44 ++++++++++++++++---------------------------- po/pt_BR.po | 44 ++++++++++++++++---------------------------- po/pt_PT.po | 44 ++++++++++++++++---------------------------- po/rm.po | 43 ++++++++++++++++--------------------------- po/ro.po | 44 ++++++++++++++++---------------------------- po/ru.po | 42 ++++++++++++++++-------------------------- po/si.po | 42 ++++++++++++++++-------------------------- po/sk.po | 44 ++++++++++++++++---------------------------- po/sl.po | 44 ++++++++++++++++---------------------------- po/sr_RS(a)cyrillic.po | 44 ++++++++++++++++---------------------------- po/sr_RS(a)latin.po | 44 ++++++++++++++++---------------------------- po/sv.po | 43 ++++++++++++++++--------------------------- po/ta.po | 42 ++++++++++++++++-------------------------- po/te.po | 42 ++++++++++++++++-------------------------- po/th.po | 43 ++++++++++++++++--------------------------- po/tr.po | 42 ++++++++++++++++-------------------------- po/uk.po | 43 ++++++++++++++++--------------------------- po/wa.po | 43 ++++++++++++++++--------------------------- po/wine.pot | 42 ++++++++++++++++-------------------------- po/zh_CN.po | 42 ++++++++++++++++-------------------------- po/zh_TW.po | 44 ++++++++++++++++---------------------------- programs/reg/reg.rc | 2 -- programs/reg/resource.h | 2 -- 51 files changed, 784 insertions(+), 1340 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4f3d51fdde4b762d231…

1 0

Jump to page:

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-commits May 2021