July 2016 - Wine-commits - list.winehq.org

Jan Schmidt : winegstreamer: Don't replace internal bus.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 22bdf774869e08bad14d9ff885ba293753f788d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22bdf774869e08bad14d9ff88… Author: Jan Schmidt <jan(a)centricular.com> Date: Sun Jul 17 14:58:19 2016 +1000 winegstreamer: Don't replace internal bus. Don't replace the bus on the decodebin inside our container, as it causes problems with internal GStreamer element management. Put the bus only on the top-level container. Signed-off-by: Jan Schmidt <jan(a)centricular.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1de9b41..e7ff2b4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1103,6 +1103,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI } This->container = gst_bin_new(NULL); + gst_element_set_bus(This->container, This->bus); This->gstfilter = gst_element_factory_make("decodebin", NULL); if (!This->gstfilter) { @@ -1113,7 +1114,6 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_bin_add(GST_BIN(This->container), This->gstfilter); - gst_element_set_bus(This->gstfilter, This->bus); g_signal_connect(This->gstfilter, "pad-added", G_CALLBACK(existing_new_pad_wrapper), This); g_signal_connect(This->gstfilter, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), This); g_signal_connect(This->gstfilter, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), This); @@ -1902,7 +1902,6 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) if (!This->container) return S_OK; - gst_element_set_bus(This->gstfilter, NULL); gst_element_set_state(This->container, GST_STATE_NULL); gst_pad_unlink(This->my_src, This->their_sink); gst_object_unref(This->my_src); @@ -1918,6 +1917,7 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) This->ppPins = NULL; gst_object_unref(This->gstfilter); This->gstfilter = NULL; + gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL; BaseFilterImpl_IncrementPinVersion((BaseFilter*)This);

1 0

Jan Schmidt : winegstreamer: Don't store decodebin explicitly.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 1db3b0bd25688aa98af567acf1bb873ad4ef26ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db3b0bd25688aa98af567acf… Author: Jan Schmidt <jan(a)centricular.com> Date: Sun Jul 17 14:58:20 2016 +1000 winegstreamer: Don't store decodebin explicitly. Once placed inside the container, decodebin will be managed and destroyed by the container. There's no need to store it, or (especially) unref it. Signed-off-by: Jan Schmidt <jan(a)centricular.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e7ff2b4..21385d7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -65,7 +65,6 @@ typedef struct GSTImpl { BOOL discont, initial, ignore_flush; GstElement *container; - GstElement *gstfilter; GstPad *my_src, *their_sink; GstBus *bus; guint64 start, nextofs, nextpullofs, stop; @@ -1091,6 +1090,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); + GstElement *gstfilter; TRACE("%p %p %p\n", pPin, pConnectPin, props); @@ -1105,19 +1105,19 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI This->container = gst_bin_new(NULL); gst_element_set_bus(This->container, This->bus); - This->gstfilter = gst_element_factory_make("decodebin", NULL); - if (!This->gstfilter) { + gstfilter = gst_element_factory_make("decodebin", NULL); + if (!gstfilter) { FIXME("Could not make source filter, are gstreamer-plugins-* installed for %u bits?\n", 8 * (int)sizeof(void*)); return E_FAIL; } - gst_bin_add(GST_BIN(This->container), This->gstfilter); + gst_bin_add(GST_BIN(This->container), gstfilter); - g_signal_connect(This->gstfilter, "pad-added", G_CALLBACK(existing_new_pad_wrapper), This); - g_signal_connect(This->gstfilter, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), This); - g_signal_connect(This->gstfilter, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), This); - g_signal_connect(This->gstfilter, "unknown-type", G_CALLBACK(unknown_type_wrapper), This); + g_signal_connect(gstfilter, "pad-added", G_CALLBACK(existing_new_pad_wrapper), This); + g_signal_connect(gstfilter, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), This); + g_signal_connect(gstfilter, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), This); + g_signal_connect(gstfilter, "unknown-type", G_CALLBACK(unknown_type_wrapper), This); This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src_wrapper); @@ -1125,9 +1125,9 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); gst_pad_set_event_function(This->my_src, event_src_wrapper); gst_pad_set_element_private (This->my_src, This); - This->their_sink = gst_element_get_static_pad(This->gstfilter, "sink"); + This->their_sink = gst_element_get_static_pad(gstfilter, "sink"); - g_signal_connect(This->gstfilter, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), This); + g_signal_connect(gstfilter, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), This); ret = gst_pad_link(This->my_src, This->their_sink); if (ret < 0) { ERR("Returns: %i\n", ret); @@ -1915,8 +1915,6 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) } This->cStreams = 0; This->ppPins = NULL; - gst_object_unref(This->gstfilter); - This->gstfilter = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL;

1 0

Jan Schmidt : winegstreamer: Do conversion before flipping.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 4aefacd16239659724e4449b7184a44ee6ae09f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aefacd16239659724e4449b7… Author: Jan Schmidt <jan(a)centricular.com> Date: Sun Jul 17 14:58:21 2016 +1000 winegstreamer: Do conversion before flipping. The videoflip element doesn't handle all formats, so some formats like Intel Indeo 3 will cause errors and fail. Add videoconvert before videoflip to do format conversion when it's needed. Signed-off-by: Jan Schmidt <jan(a)centricular.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 21385d7..6f98521 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -831,11 +831,20 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) gst_segment_init(pin->segment, GST_FORMAT_TIME); if (isvid) { + GstElement *vconv; + TRACE("setting up videoflip filter for pin %p, my_sink: %p, their_src: %p\n", pin, pin->my_sink, pad); /* gstreamer outputs video top-down, but dshow expects bottom-up, so * make new transform filter to invert video */ + vconv = gst_element_factory_make("videoconvert", NULL); + if(!vconv){ + ERR("Missing videoconvert filter?\n"); + ret = -1; + goto exit; + } + pin->flipfilter = gst_element_factory_make("videoflip", NULL); if(!pin->flipfilter){ ERR("Missing videoflip filter?\n"); @@ -845,10 +854,14 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) gst_util_set_object_arg(G_OBJECT(pin->flipfilter), "method", "vertical-flip"); - gst_bin_add(GST_BIN(This->container), pin->flipfilter); + gst_bin_add(GST_BIN(This->container), vconv); /* bin takes ownership */ + gst_element_sync_state_with_parent(vconv); + gst_bin_add(GST_BIN(This->container), pin->flipfilter); /* bin takes ownership */ gst_element_sync_state_with_parent(pin->flipfilter); - pin->flip_sink = gst_element_get_static_pad(pin->flipfilter, "sink"); + gst_element_link (vconv, pin->flipfilter); + + pin->flip_sink = gst_element_get_static_pad(vconv, "sink"); if(!pin->flip_sink){ WARN("Couldn't find sink on flip filter\n"); gst_object_unref(pin->flipfilter);

1 0

Jan Schmidt : winegstreamer: Fix refcounting for videoflip.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: adde9fadebe07c30ecc9f12685751fb78b3473c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adde9fadebe07c30ecc9f1268… Author: Jan Schmidt <jan(a)centricular.com> Date: Sun Jul 17 14:58:22 2016 +1000 winegstreamer: Fix refcounting for videoflip. Creating an element and placing it in a bin gives overship of the element refcount to the bin. Don't explicitly unref it after that. Signed-off-by: Jan Schmidt <jan(a)centricular.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6f98521..f257202 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -864,7 +864,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) pin->flip_sink = gst_element_get_static_pad(vconv, "sink"); if(!pin->flip_sink){ WARN("Couldn't find sink on flip filter\n"); - gst_object_unref(pin->flipfilter); pin->flipfilter = NULL; ret = -1; goto exit; @@ -875,7 +874,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) WARN("gst_pad_link failed: %d\n", ret); gst_object_unref(pin->flip_sink); pin->flip_sink = NULL; - gst_object_unref(pin->flipfilter); pin->flipfilter = NULL; goto exit; } @@ -885,7 +883,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) WARN("Couldn't find src on flip filter\n"); gst_object_unref(pin->flip_sink); pin->flip_sink = NULL; - gst_object_unref(pin->flipfilter); pin->flipfilter = NULL; ret = -1; goto exit; @@ -898,7 +895,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) pin->flip_src = NULL; gst_object_unref(pin->flip_sink); pin->flip_sink = NULL; - gst_object_unref(pin->flipfilter); pin->flipfilter = NULL; goto exit; } @@ -1760,7 +1756,8 @@ static ULONG WINAPI GSTOutPin_Release(IPin *iface) gst_pad_unlink(This->flip_src, This->my_sink); gst_object_unref(This->flip_src); gst_object_unref(This->flip_sink); - gst_object_unref(This->flipfilter); + This->flipfilter = NULL; + This->flip_src = This->flip_sink = NULL; } else gst_pad_unlink(This->their_src, This->my_sink); gst_object_unref(This->their_src);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 4a081b8898375bb6ee9de833b3f7b60415d797bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a081b8898375bb6ee9de833b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 15 23:56:24 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 53 ++++++++++++++++------------------------------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/po/ru.po b/po/ru.po index ad723f7..e67ae36 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-07-07 13:26+0300\n" +"PO-Revision-Date: 2016-07-15 23:49+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11979,85 +11979,64 @@ msgstr "regedit: операция не поддерживается.\n" #: regedit.rc:367 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: недостаточно памяти! (%1!S!, строка %2!u!)\n" #: regedit.rc:368 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "reg: неверное имя раздела\n" +msgstr "regedit: неверное шестнадцатеричное значение.\n" #: regedit.rc:369 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: не удалось преобразовать данные в шестнадцатеричном формате. " +"Неверное значение «%1».\n" #: regedit.rc:370 -#, fuzzy -#| msgid "regedit: Invalid or unrecognized switch [%1]\n" msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: неверный или неизвестный параметр [%1]\n" +msgstr "regedit: неизвестная управляющая последовательность [\\%1!c!]\n" #: regedit.rc:371 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "reg: тип данных [%1] не поддерживается\n" +msgstr "regedit: тип данных [%1!u!] не поддерживается\n" #: regedit.rc:372 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "regedit: не удалось открыть файл «%1».\n" +msgstr "regedit: неожиданный конец строки в «%1».\n" #: regedit.rc:373 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "regedit: The line '%1' was not recognized.\n" -msgstr "regedit: файл «%1» не найден.\n" +msgstr "regedit: строка «%1» не распознана.\n" #: regedit.rc:374 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "regedit: не удалось открыть файл «%1».\n" +msgstr "regedit: не удалось добавить значение «%1» в «%2».\n" #: regedit.rc:375 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: не удалось открыть файл «%1».\n" +msgstr "regedit: не удалось открыть ключ «%1».\n" #: regedit.rc:376 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "reg: тип данных [%1] не поддерживается\n" +msgstr "regedit: «%2» содержит неподдерживаемый тип данных [%1!u!].\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "" +msgstr "regedit: значение «%1» будет экспортировано в бинарном виде.\n" #: regedit.rc:378 -#, fuzzy -#| msgid "regedit: No registry key was specified for removal.\n" msgid "regedit: Incorrect registry class specification in '%1'.\n" -msgstr "regedit: не указан удаляемый ключ.\n" +msgstr "regedit: неверный формат имени ключа «%1».\n" #: regedit.rc:379 -#, fuzzy -#| msgid "" -#| "reg: 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 "reg: не удалось найти указанный раздел реестра или значение\n" +msgstr "regedit: не удалось экспортировать «%1». Указанный ключ не найден.\n" #: regedit.rc:380 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to delete the registry class '%1'.\n" -msgstr "regedit: не удалось открыть файл «%1».\n" +msgstr "regedit: не удалось удалить класс «%1».\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Michael Stefaniuc : usp10/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: ac740f17dcf3037cf485df4e261a12ae02aa223e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac740f17dcf3037cf485df4e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 11 09:57:03 2016 +0200 usp10/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index bb044ce..6b2152f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2450,10 +2450,7 @@ static void test_ScriptTextOut(HDC hdc) ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); /* Test Rect Rgn is acceptable */ - rect.top = 10; - rect.bottom = 20; - rect.left = 10; - rect.right = 40; + SetRect(&rect, 10, 10, 40, 20); hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); @@ -2616,10 +2613,7 @@ static void test_ScriptTextOut3(HDC hdc) ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); /* Test Rect Rgn is acceptable */ - rect.top = 10; - rect.bottom = 20; - rect.left = 10; - rect.right = 40; + SetRect(&rect, 10, 10, 40, 20); hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr);

1 0

Alistair Leslie-Hughes : inetcomm: Improve IMimeBody GetHandle return value.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: b8b7db8be81640c9045200ef042e7ace134dd42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b7db8be81640c9045200ef0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 12 08:02:34 2016 +0000 inetcomm: Improve IMimeBody GetHandle return value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 5 +++++ dlls/inetcomm/tests/mimeole.c | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f4537f3..23bd930 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1314,6 +1314,9 @@ static HRESULT WINAPI MimeBody_GetHandle( MimeBody *This = impl_from_IMimeBody(iface); TRACE("(%p)->(%p)\n", iface, phBody); + if(!phBody) + return E_INVALIDARG; + *phBody = This->handle; return This->handle ? S_OK : MIME_E_NO_DATA; } @@ -1819,6 +1822,8 @@ static body_t *new_body_entry(MimeBody *mime_body, DWORD index, body_t *parent) body->index = index; list_init(&body->children); body->parent = parent; + + mime_body->handle = UlongToHandle(body->index); } return body; } diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 84b2c8d..58d0520 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -220,6 +220,7 @@ static void test_CreateMessage(void) ULONG count; FINDBODY find_struct; HCHARSET hcs; + HBODY handle = NULL; char text[] = "text"; HBODY *body_list; @@ -258,6 +259,13 @@ static void test_CreateMessage(void) hr = IMimeMessage_GetBody(msg, IBL_ROOT, NULL, &hbody); ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_GetHandle(body, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hr = IMimeBody_GetHandle(body, &handle); + ok(hr == S_OK, "ret %08x\n", hr); + ok(handle != NULL, "handle %p\n", handle); + PropVariantInit(&prop); hr = IMimeMessage_GetBodyProp(msg, hbody, att_pritype, 0, &prop); ok(hr == S_OK, "ret %08x\n", hr); @@ -269,6 +277,11 @@ static void test_CreateMessage(void) ok(hr == S_OK, "ret %08x\n", hr); hr = IMimeMessage_BindToObject(msg, hbody, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_GetHandle(body, &handle); + ok(hr == S_OK, "ret %08x\n", hr); + ok(handle == hbody, "handle %p\n", handle); + hr = IMimeBody_GetOffsets(body, &offsets); ok(hr == S_OK, "ret %08x\n", hr); ok(offsets.cbBoundaryStart == 405, "got %d\n", offsets.cbBoundaryStart); @@ -289,6 +302,11 @@ static void test_CreateMessage(void) ok(hr == S_OK, "ret %08x\n", hr); hr = IMimeMessage_BindToObject(msg, hbody, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_GetHandle(body, &handle); + ok(hr == S_OK, "ret %08x\n", hr); + ok(handle == hbody, "handle %p\n", handle); + hr = IMimeBody_GetOffsets(body, &offsets); ok(hr == S_OK, "ret %08x\n", hr); ok(offsets.cbBoundaryStart == 525, "got %d\n", offsets.cbBoundaryStart);

1 0

Alistair Leslie-Hughes : inetcomm: GetBody returns MIME_E_NOT_FOUND when no parent found.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: ed880969b37c873ce6d46bcc1e03177228e4061e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed880969b37c873ce6d46bcc1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 12 08:02:46 2016 +0000 inetcomm: GetBody returns MIME_E_NOT_FOUND when no parent found. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 10 +++++++++- dlls/inetcomm/tests/mimeole.c | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 23bd930..6046c74 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2175,7 +2175,10 @@ static HRESULT get_body(MimeMessage *msg, BODYLOCATION location, HBODY pivot, bo switch(location) { case IBL_PARENT: - *out = body->parent; + if(body->parent) + *out = body->parent; + else + hr = MIME_E_NOT_FOUND; break; case IBL_FIRST: @@ -2239,6 +2242,11 @@ static HRESULT WINAPI MimeMessage_GetBody(IMimeMessage *iface, BODYLOCATION loca TRACE("(%p)->(%d, %p, %p)\n", iface, location, hPivot, phBody); + if(!phBody) + return E_INVALIDARG; + + *phBody = NULL; + hr = get_body(This, location, hPivot, &body); if(hr == S_OK) *phBody = UlongToHandle(body->index); diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 58d0520..011c19f 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -214,7 +214,7 @@ static void test_CreateMessage(void) IStream *stream; LARGE_INTEGER pos; LONG ref; - HBODY hbody; + HBODY hbody, hbody2; IMimeBody *body; BODYOFFSETS offsets; ULONG count; @@ -266,6 +266,14 @@ static void test_CreateMessage(void) ok(hr == S_OK, "ret %08x\n", hr); ok(handle != NULL, "handle %p\n", handle); + hr = IMimeMessage_GetBody(msg, IBL_PARENT, hbody, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hbody2 = (HBODY)0xdeadbeef; + hr = IMimeMessage_GetBody(msg, IBL_PARENT, hbody, &hbody2); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + ok(hbody2 == NULL, "hbody2 %p\n", hbody2); + PropVariantInit(&prop); hr = IMimeMessage_GetBodyProp(msg, hbody, att_pritype, 0, &prop); ok(hr == S_OK, "ret %08x\n", hr);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 11e6898e34fcaed8cfca7276bc354b2020771f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e6898e34fcaed8cfca7276b… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jul 16 12:23:21 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 53 +++++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/po/lt.po b/po/lt.po index 8c7820f..d695575 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-07-06 11:31+0300\n" +"PO-Revision-Date: 2016-07-16 12:20+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11982,85 +11982,66 @@ msgstr "regedit: Neapdorojamas veiksmas.\n" #: regedit.rc:367 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: Trūksta atminties! (%1!S!, eilutė %2!u!)\n" #: regedit.rc:368 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "reg: Netinkamas rakto vardas\n" +msgstr "regedit: Netinkama šešioliktainė reikšmė.\n" #: regedit.rc:369 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: Nepavyko konvertuoti šešioliktainių duomenų. Neteisinga reikšmė " +"sutikta „%1“.\n" #: regedit.rc:370 -#, fuzzy -#| msgid "regedit: Invalid or unrecognized switch [%1]\n" msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Netinkamas arba neatpažintas parametras [%1]\n" +msgstr "regedit: Neatpažinta kaitos seka [\\%1!c!]\n" #: regedit.rc:371 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "reg: Nepalaikomas registro duomenų tipas [%1]\n" +msgstr "regedit: Nepalaikomas registro duomenų tipas [%1!u!]\n" #: regedit.rc:372 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "regedit: Nepavyko atverti failo „%1“.\n" +msgstr "regedit: Netikėta eilutės pabaiga „%1“.\n" #: regedit.rc:373 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "regedit: The line '%1' was not recognized.\n" -msgstr "regedit: Failas „%1“ nerastas.\n" +msgstr "regedit: Eilutė „%1“ neatpažinta.\n" #: regedit.rc:374 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "regedit: Nepavyko atverti failo „%1“.\n" +msgstr "regedit: Nepavyko pridėti registro reikšmės „%1“ į „%2“.\n" #: regedit.rc:375 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: Nepavyko atverti failo „%1“.\n" +msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" #: regedit.rc:376 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "reg: Nepalaikomas registro duomenų tipas [%1]\n" +msgstr "regedit: Nepalaikomas registro duomenų tipas [%1!u!] sutiktas „%2“.\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "" +"regedit: Registro reikšmė „%1“ bus eksportuota kaip dvejetainiai duomenys.\n" #: regedit.rc:378 -#, fuzzy -#| msgid "regedit: No registry key was specified for removal.\n" msgid "regedit: Incorrect registry class specification in '%1'.\n" -msgstr "regedit: Nenurodytas registro raktas šalinimui.\n" +msgstr "regedit: Neteisinga registro klasės specifikacija „%1“.\n" #: regedit.rc:379 -#, fuzzy -#| msgid "" -#| "reg: 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 "reg: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n" +msgstr "" +"regedit: Nepavyko eksportuoti „%1“. Nurodytas registro raktas nerastas.\n" #: regedit.rc:380 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to delete the registry class '%1'.\n" -msgstr "regedit: Nepavyko atverti failo „%1“.\n" +msgstr "regedit: Nepavyko pašalinti registro klasės „%1“.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 456dab89194e288183e5a23240e32b320ea951e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=456dab89194e288183e5a2324… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jul 16 20:54:37 2016 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 53 +++++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/po/uk.po b/po/uk.po index 503955c..c350b51 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-05 21:44+0200\n" +"PO-Revision-Date: 2016-07-16 20:50+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -12064,85 +12064,66 @@ msgstr "regedit: Непідтримувана операція.\n" #: regedit.rc:367 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: Недостатньо пам'яті! (%1!S!, рядок %2!u!)\n" #: regedit.rc:368 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "reg: невірне ім'я ключа\n" +msgstr "regedit: Невірне шістнадцяткове значення.\n" #: regedit.rc:369 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: Неможливо конвертувати дані у шістнадцятковому форматі. Невірне " +"значення '%1'.\n" #: regedit.rc:370 -#, fuzzy -#| msgid "regedit: Invalid or unrecognized switch [%1]\n" msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Невірний або нерозпізнаний параметр [%1]\n" +msgstr "regedit: Нерозпізнана послідовність [\\%1!c!]\n" #: regedit.rc:371 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "reg: непідтримуваний тип даних [%1]\n" +msgstr "regedit: Непідтримуваний тип даних [%1!u!]\n" #: regedit.rc:372 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "regedit: Неможливо відкрити файл '%1'.\n" +msgstr "regedit: Неочікуваний кінець рядка у '%1'.\n" #: regedit.rc:373 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "regedit: The line '%1' was not recognized.\n" -msgstr "regedit: Файл '%1' не знайдено.\n" +msgstr "regedit: Рядок '%1' не був розпізнаний.\n" #: regedit.rc:374 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "regedit: Неможливо відкрити файл '%1'.\n" +msgstr "regedit: Неможливо додати значення '%1' у '%2'.\n" #: regedit.rc:375 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: Неможливо відкрити файл '%1'.\n" +msgstr "regedit: Неможливо відкрити ключ '%1'.\n" #: regedit.rc:376 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "reg: непідтримуваний тип даних [%1]\n" +msgstr "regedit: '%2' містить непідтримуваний тип даних [%1!u!].\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "" +"regedit: Значення реєстру '%1' буде експортоване у двійковому вигляді.\n" #: regedit.rc:378 -#, fuzzy -#| msgid "regedit: No registry key was specified for removal.\n" msgid "regedit: Incorrect registry class specification in '%1'.\n" -msgstr "regedit: Не вказано ключ реєстру для видалення.\n" +msgstr "regedit: Невірний формат ключа реєстру у '%1'.\n" #: regedit.rc:379 -#, fuzzy -#| msgid "" -#| "reg: 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 "reg: не вдалось знайти вказаний ключ реєстру чи значення\n" +msgstr "" +"regedit: Неможливо експортувати '%1'. Вказаний ключ не був знайдений.\n" #: regedit.rc:380 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to delete the registry class '%1'.\n" -msgstr "regedit: Неможливо відкрити файл '%1'.\n" +msgstr "regedit: Неможливо видалити клас реєстру '%1'.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0