wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Iván Matellanes : msvcirt: Implement istream:: getline.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: a7db5514e57a263fcf7362134c061c0942a8ae88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7db5514e57a263fcf7362134… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 16:00:16 2016 +0100 msvcirt: Implement istream::getline. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 12 +++++-- dlls/msvcirt/tests/msvcirt.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 13b61b6..ae07cd3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3244,7 +3244,14 @@ istream* __thiscall istream_get_sb(istream *this, streambuf *sb, char delim) DEFINE_THISCALL_WRAPPER(istream_getline, 16) istream* __thiscall istream_getline(istream *this, char *str, int count, char delim) { - FIXME("(%p %p %d %c) stub\n", this, str, count, delim); + ios *base = istream_get_ios(this); + + TRACE("(%p %p %d %c)\n", this, str, count, delim); + + ios_lock(base); + this->extract_delim++; + istream_get_str_delim(this, str, count, (unsigned char) delim); + ios_unlock(base); return this; } @@ -3253,8 +3260,7 @@ istream* __thiscall istream_getline(istream *this, char *str, int count, char de DEFINE_THISCALL_WRAPPER(istream_getline_unsigned, 16) istream* __thiscall istream_getline_unsigned(istream *this, unsigned char *str, int count, char delim) { - FIXME("(%p %p %d %c) stub\n", this, str, count, delim); - return this; + return istream_getline(this, (char*) str, count, delim); } /* ?ignore@istream@@QAEAAV1@HH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2c0e4d2..d194adc 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -316,6 +316,7 @@ static istream* (*__thiscall p_istream_get_str)(istream*, char*, int, char); static int (*__thiscall p_istream_get)(istream*); static istream* (*__thiscall p_istream_get_char)(istream*, char*); static istream* (*__thiscall p_istream_get_sb)(istream*, streambuf*, char); +static istream* (*__thiscall p_istream_getline)(istream*, char*, int, char); /* Emulate a __thiscall */ #ifdef __i386__ @@ -520,6 +521,7 @@ static BOOL init(void) SET(p_istream_get, "?get@istream@@QEAAHXZ"); SET(p_istream_get_char, "?get@istream@@QEAAAEAV1@AEAD@Z"); SET(p_istream_get_sb, "?get@istream@@QEAAAEAV1@AEAVstreambuf@@D@Z"); + SET(p_istream_getline, "?getline@istream@@QEAAAEAV1@PEADHD@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3@YAXPAX@Z"); @@ -646,6 +648,7 @@ static BOOL init(void) SET(p_istream_get, "?get@istream@@QAEHXZ"); SET(p_istream_get_char, "?get@istream@@QAEAAV1@AAD@Z"); SET(p_istream_get_sb, "?get@istream@@QAEAAV1@AAVstreambuf@@D@Z"); + SET(p_istream_getline, "?getline@istream@@QAEAAV1@PADHD@Z"); } SET(p_ios_static_lock, "?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc@ios@@KAXXZ"); @@ -4194,6 +4197,83 @@ if (0) /* crashes on native */ ok(fb2.base.pptr == fb2.base.base + 46, "wrong put pointer, expected %p got %p\n", fb2.base.base + 46, fb2.base.pptr); ok(fb2.base.epptr == fb2.base.ebuf, "wrong put end, expected %p got %p\n", fb2.base.ebuf, fb2.base.epptr); + /* getline */ + is1.extract_delim = is1.count = 0xabababab; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 10, 0); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); + ok(buffer[0] == 0, "expected 0 got %d\n", buffer[0]); + is1.extract_delim = is1.count = 0xabababab; + is1.base_ios.state = IOSTATE_goodbit; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 10, 0); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); + ok(buffer[0] == 0, "expected 0 got %d\n", buffer[0]); + is1.base_ios.state = IOSTATE_goodbit; + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 30; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 10, 'r'); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 7, "expected 7 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 7, "wrong get pointer, expected %p got %p\n", fb1.base.base + 7, fb1.base.gptr); + ok(!strncmp(buffer, fb1.base.base, 6), "unexpected buffer content, got '%s'\n", buffer); + ok(buffer[6] == 0, "expected 0 got %d\n", buffer[6]); + is1.extract_delim = -1; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 10, -50); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 7, "expected 7 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 14, "wrong get pointer, expected %p got %p\n", fb1.base.base + 14, fb1.base.gptr); + ok(!strncmp(buffer, fb1.base.base + 7, 7), "unexpected buffer content, got '%s'\n", buffer); + ok(buffer[7] == 0, "expected 0 got %d\n", buffer[7]); + is1.extract_delim = -1; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 10, 206); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 14, "wrong get pointer, expected %p got %p\n", fb1.base.base + 14, fb1.base.gptr); + ok(buffer[0] == 0, "expected 0 got %d\n", buffer[0]); + is1.extract_delim = -2; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 20, '\r'); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 10, "expected 10 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 24, "wrong get pointer, expected %p got %p\n", fb1.base.base + 24, fb1.base.gptr); + ok(!strncmp(buffer, fb1.base.base + 14, 9), "unexpected buffer content, got '%s'\n", buffer); + ok(buffer[9] == 0, "expected 0 got %d\n", buffer[9]); + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, NULL, 20, '?'); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 6, "expected 6 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 30, "wrong get pointer, expected %p got %p\n", fb1.base.base + 30, fb1.base.gptr); + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 0, 0); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 30, "wrong get pointer, expected %p got %p\n", fb1.base.base + 30, fb1.base.gptr); + ok(buffer[0] == 'A', "expected 'A' got %d\n", buffer[0]); + call_func1(p_istream_vbase_dtor, &is1); call_func1(p_istream_vbase_dtor, &is2); call_func1(p_ostream_vbase_dtor, &os);

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

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: 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: 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

Jacek Caban : kernel32: Make MapViewOfFile and VirtualAlloc hotpatchable.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: f000189b8a2042b4d39b78348114e2b32528b4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f000189b8a2042b4d39b78348… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 18 13:20:45 2016 +0200 kernel32: Make MapViewOfFile and VirtualAlloc hotpatchable. Both are patched by Firefox. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index f443020..37ab264 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -63,7 +63,7 @@ WINE_DECLARE_DEBUG_CHANNEL(file); * Success: Base address of allocated region of pages. * Failure: NULL. */ -LPVOID WINAPI VirtualAlloc( LPVOID addr, SIZE_T size, DWORD type, DWORD protect ) +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc( void *addr, SIZE_T size, DWORD type, DWORD protect ) { return VirtualAllocEx( GetCurrentProcess(), addr, size, type, protect ); } @@ -504,7 +504,7 @@ HANDLE WINAPI OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name) * Success: Starting address of mapped view. * Failure: NULL. */ -LPVOID WINAPI MapViewOfFile( HANDLE mapping, DWORD access, +LPVOID WINAPI DECLSPEC_HOTPATCH MapViewOfFile( HANDLE mapping, DWORD access, DWORD offset_high, DWORD offset_low, SIZE_T count ) { return MapViewOfFileEx( mapping, access, offset_high,

1 0

Iván Matellanes : msvcirt: Implement istream:: get for streambufs.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 5c691f3f09b1d7c7db06d732780556c4c852f358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c691f3f09b1d7c7db06d7327… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 09:13:03 2016 +0100 msvcirt: Implement istream::get for streambufs. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 18 ++++++- dlls/msvcirt/tests/msvcirt.c | 125 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c691f3f09b1d7c7db06d…

1 0

Iván Matellanes : msvcirt: Implement istream:: get for single characters.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: a3313793e0a11b59064b368b3865015d7893e2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3313793e0a11b59064b368b3… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 09:13:02 2016 +0100 msvcirt: Implement istream::get for single characters. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 29 ++++++++++-- dlls/msvcirt/tests/msvcirt.c | 105 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 129 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3313793e0a11b59064b3…

1 0

Iván Matellanes : msvcirt: Implement istream:: get for strings.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 14722ba20a0e1a711f3201ff1b6e03bf3daf4d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14722ba20a0e1a711f3201ff1… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 09:13:01 2016 +0100 msvcirt: Implement istream::get for strings. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 38 ++++++- dlls/msvcirt/tests/msvcirt.c | 235 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14722ba20a0e1a711f320…

1 0

Huw Davies : gdi32: Use an internal version of LPtoDP that takes a DC * where possible.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: f4bc213ce5aa6b814d110deafbc17fc193e245a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4bc213ce5aa6b814d110deaf… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 18 11:32:56 2016 +0100 gdi32: Use an internal version of LPtoDP that takes a DC * where possible. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/clipping.c | 6 +++--- dlls/gdi32/dc.c | 2 +- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/font.c | 10 +++++----- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/mapping.c | 21 ++++++++++++++++----- 7 files changed, 34 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index ed011fc..7e9a096 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -112,7 +112,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, rect.top = dst->log_y; rect.right = dst->log_x + dst->log_width; rect.bottom = dst->log_y + dst->log_height; - LPtoDP( dc_dst->hSelf, (POINT *)&rect, 2 ); + lp_to_dp( dc_dst, (POINT *)&rect, 2 ); dst->x = rect.left; dst->y = rect.top; dst->width = rect.right - rect.left; @@ -134,7 +134,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, rect.top = src->log_y; rect.right = src->log_x + src->log_width; rect.bottom = src->log_y + src->log_height; - LPtoDP( dc_src->hSelf, (POINT *)&rect, 2 ); + lp_to_dp( dc_src, (POINT *)&rect, 2 ); src->x = rect.left; src->y = rect.top; src->width = rect.right - rect.left; @@ -420,7 +420,7 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, pts[i].x = vert_array[i].x; pts[i].y = vert_array[i].y; } - LPtoDP( dev->hdc, pts, nvert ); + lp_to_dp( dc, pts, nvert ); /* compute bounding rect of all the rectangles/triangles */ reset_bounds( &dst.visrect ); @@ -496,7 +496,7 @@ COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) src.visrect.left = x; src.visrect.top = y; - LPtoDP( dev->hdc, (POINT *)&src.visrect, 1 ); + lp_to_dp( dc, (POINT *)&src.visrect, 1 ); src.visrect.right = src.visrect.left + 1; src.visrect.bottom = src.visrect.top + 1; src.x = src.visrect.left; diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index ccd61d0..0dc7896 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -50,7 +50,7 @@ static inline RECT get_clip_rect( DC * dc, int left, int top, int right, int bot rect.top = top; rect.right = right; rect.bottom = bottom; - LPtoDP( dc->hSelf, (POINT *)&rect, 2 ); + lp_to_dp( dc, (POINT *)&rect, 2 ); if (dc->layout & LAYOUT_RTL) { int tmp = rect.left; @@ -375,7 +375,7 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) pt.x = x; pt.y = y; - LPtoDP( hdc, &pt, 1 ); + lp_to_dp( dc, &pt, 1 ); update_dc( dc ); ret = (!get_dc_device_rect( dc, &visrect ) || (pt.x >= visrect.left && pt.x < visrect.right && @@ -398,7 +398,7 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) TRACE("%p %s\n", hdc, wine_dbgstr_rect( rect )); tmpRect = *rect; - LPtoDP( hdc, (POINT *)&tmpRect, 2 ); + lp_to_dp( dc, (POINT *)&tmpRect, 2 ); order_rect( &tmpRect ); update_dc( dc ); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 2e54671..01572b8 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1535,7 +1535,7 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) { RECT rc = *rect; - LPtoDP( hdc, (POINT *)&rc, 2 ); + lp_to_dp( dc, (POINT *)&rc, 2 ); add_bounds_rect( &dc->bounds, &rc ); } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index fbeeb5b..9a1414e 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -490,7 +490,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he rect.top = yDst; rect.right = xDst + widthDst; rect.bottom = yDst + heightDst; - LPtoDP( dc->hSelf, (POINT *)&rect, 2 ); + lp_to_dp( dc, (POINT *)&rect, 2 ); dst.x = rect.left; dst.y = rect.top; dst.width = rect.right - rect.left; @@ -848,7 +848,7 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR pt.x = x_dst; pt.y = y_dst; - LPtoDP( dev->hdc, &pt, 1 ); + lp_to_dp( dc, &pt, 1 ); dst.x = pt.x; dst.y = pt.y; dst.width = cx; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fade4df..700b5e2 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -87,7 +87,7 @@ static inline INT INTERNAL_YWSTODS(DC *dc, INT height) pt[0].x = pt[0].y = 0; pt[1].x = 0; pt[1].y = height; - LPtoDP(dc->hSelf, pt, 2); + lp_to_dp(dc, pt, 2); return pt[1].y - pt[0].y; } @@ -2258,7 +2258,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if (lprect && (flags & (ETO_OPAQUE | ETO_CLIPPED))) { rc = *lprect; - LPtoDP(hdc, (POINT*)&rc, 2); + lp_to_dp(dc, (POINT*)&rc, 2); order_rect( &rc ); if (flags & ETO_OPAQUE) physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL ); @@ -2273,7 +2273,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, pt.x = x; pt.y = y; - LPtoDP(hdc, &pt, 1); + lp_to_dp(dc, &pt, 1); x = pt.x; y = pt.y; @@ -2335,7 +2335,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, desired[1].x = cosEsc * total.x + sinEsc * total.y; desired[1].y = -sinEsc * total.x + cosEsc * total.y; - LPtoDP(hdc, desired, 2); + lp_to_dp(dc, desired, 2); desired[1].x -= desired[0].x; desired[1].y -= desired[0].y; @@ -2365,7 +2365,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, desired[0].x = desired[0].y = 0; desired[1].x = sz.cx; desired[1].y = 0; - LPtoDP(hdc, desired, 2); + lp_to_dp(dc, desired, 2); desired[1].x -= desired[0].x; desired[1].y -= desired[0].y; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index cbe66a8..5524c2e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -309,6 +309,9 @@ extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; +/* mapping.c */ +extern void lp_to_dp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; + /* metafile.c */ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; extern METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mr, LPCVOID filename, BOOL unicode ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 665042a..5a1941b 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -350,13 +350,12 @@ BOOL WINAPI DPtoLP( HDC hdc, LPPOINT points, INT count ) /*********************************************************************** - * LPtoDP (GDI32.@) + * lp_to_dp + * + * Internal version of LPtoDP that takes a DC *. */ -BOOL WINAPI LPtoDP( HDC hdc, LPPOINT points, INT count ) +void lp_to_dp( DC *dc, POINT *points, INT count ) { - DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; - while (count--) { double x = points->x; @@ -369,6 +368,18 @@ BOOL WINAPI LPtoDP( HDC hdc, LPPOINT points, INT count ) dc->xformWorld2Vport.eDy + 0.5 ); points++; } +} + +/*********************************************************************** + * LPtoDP (GDI32.@) + */ +BOOL WINAPI LPtoDP( HDC hdc, POINT *points, INT count ) +{ + DC * dc = get_dc_ptr( hdc ); + if (!dc) return FALSE; + + lp_to_dp( dc, points, count ); + release_dc_ptr( dc ); return TRUE; }

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
68
Older →

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 July 2016