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

Jacek Caban : kernel32: Make MapViewOfFile and VirtualAlloc hotpatchable.
by Alexandre Julliard July 18, 2016

July 18, 2016

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

Michael Stefaniuc : strmbase: Don' t cast IQualityControl to the COM object.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 4c224eaba11929f5164f0b94da07c71466acba99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c224eaba11929f5164f0b94d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 18 11:19:17 2016 +0200 strmbase: Don't cast IQualityControl to the COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 46e0193..b756ae3 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -61,28 +61,33 @@ void QualityControlImpl_Destroy(QualityControlImpl *This) HeapFree(GetProcessHeap(),0,This); } +static inline QualityControlImpl *impl_from_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, QualityControlImpl, IQualityControl_iface); +} + HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { - QualityControlImpl *This = (QualityControlImpl*)iface; + QualityControlImpl *This = impl_from_IQualityControl(iface); return IBaseFilter_QueryInterface(This->self, riid, ppv); } ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) { - QualityControlImpl *This = (QualityControlImpl*)iface; + QualityControlImpl *This = impl_from_IQualityControl(iface); return IBaseFilter_AddRef(This->self); } ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) { - QualityControlImpl *This = (QualityControlImpl*)iface; + QualityControlImpl *This = impl_from_IQualityControl(iface); return IBaseFilter_Release(This->self); } HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { + QualityControlImpl *This = impl_from_IQualityControl(iface); HRESULT hr = S_FALSE; - QualityControlImpl *This = (QualityControlImpl*)iface; TRACE("%p %p { 0x%x %u " XTIME_FMT " " XTIME_FMT " }\n", This, sender, qm.Type, qm.Proportion, @@ -110,7 +115,7 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { - QualityControlImpl *This = (QualityControlImpl*)iface; + QualityControlImpl *This = impl_from_IQualityControl(iface); TRACE("%p %p\n", This, tonotify); This->tonotify = tonotify; return S_OK;

1 0

Nikolay Sivov : dwrite: Validate CreateTextFormat() arguments.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: fee64bed4526ffb73fcdc0ba05601ca75a11d44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee64bed4526ffb73fcdc0ba0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 13:03:45 2016 +0300 dwrite: Validate CreateTextFormat() arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 8 ++++++++ dlls/dwrite/tests/layout.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 48d0816..d292764 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5133,6 +5133,14 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle *format = NULL; + if (size <= 0.0f) + return E_INVALIDARG; + + if (((UINT32)weight > DWRITE_FONT_WEIGHT_ULTRA_BLACK) || + ((UINT32)stretch > DWRITE_FONT_STRETCH_ULTRA_EXPANDED) || + ((UINT32)style > DWRITE_FONT_STYLE_ITALIC)) + return E_INVALIDARG; + This = heap_alloc(sizeof(struct dwrite_textformat)); if (!This) return E_OUTOFMEMORY; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ddc63d6..689b3b4 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -933,6 +933,7 @@ static void test_CreateGdiCompatibleTextLayout(void) static void test_CreateTextFormat(void) { + static const WCHAR emptyW[] = {0}; IDWriteFontCollection *collection, *syscoll; DWRITE_PARAGRAPH_ALIGNMENT paralign; DWRITE_READING_DIRECTION readdir; @@ -949,6 +950,34 @@ static void test_CreateTextFormat(void) factory = create_factory(); + /* zero/negative font size */ + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 0.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, -10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid font properties */ + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, 1000, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_ITALIC + 1, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_ITALIC, + 10, 10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* empty family name */ + hr = IDWriteFactory_CreateTextFormat(factory, emptyW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : dwrite: Use more intuitive naming for layout stages.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 84a36f27b88c4d4598aaa58e8855f59ab829103a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a36f27b88c4d4598aaa58e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 13:03:44 2016 +0300 dwrite: Use more intuitive naming for layout stages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8a736f9..48d0816 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -224,10 +224,10 @@ struct layout_cluster { }; enum layout_recompute_mask { - RECOMPUTE_NOMINAL_RUNS = 1 << 0, - RECOMPUTE_MINIMAL_WIDTH = 1 << 1, - RECOMPUTE_EFFECTIVE_RUNS = 1 << 2, - RECOMPUTE_EVERYTHING = 0xffff + RECOMPUTE_CLUSTERS = 1 << 0, + RECOMPUTE_MINIMAL_WIDTH = 1 << 1, + RECOMPUTE_LINES = 1 << 2, + RECOMPUTE_EVERYTHING = 0xffff }; struct dwrite_textlayout { @@ -1037,7 +1037,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) { HRESULT hr; - if (!(layout->recompute & RECOMPUTE_NOMINAL_RUNS)) + if (!(layout->recompute & RECOMPUTE_CLUSTERS)) return S_OK; /* nominal breakpoints are evaluated only once, because string never changes */ @@ -1076,7 +1076,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) } } - layout->recompute &= ~RECOMPUTE_NOMINAL_RUNS; + layout->recompute &= ~RECOMPUTE_CLUSTERS; return hr; } @@ -1714,7 +1714,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) UINT32 i, start, line, textpos; HRESULT hr; - if (!(layout->recompute & RECOMPUTE_EFFECTIVE_RUNS)) + if (!(layout->recompute & RECOMPUTE_LINES)) return S_OK; hr = layout_compute(layout); @@ -1910,7 +1910,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) layout->metrics.heightIncludingTrailingWhitespace = layout->metrics.height; /* FIXME: not true for vertical text */ - layout->recompute &= ~RECOMPUTE_EFFECTIVE_RUNS; + layout->recompute &= ~RECOMPUTE_LINES; return hr; } @@ -3765,7 +3765,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetTextAlignment(IDWriteTextFormat return hr; /* if layout is not ready there's nothing to align */ - if (changed && !(This->recompute & RECOMPUTE_EFFECTIVE_RUNS)) + if (changed && !(This->recompute & RECOMPUTE_LINES)) layout_apply_text_alignment(This); return S_OK; @@ -3784,7 +3784,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetParagraphAlignment(IDWriteTextF return hr; /* if layout is not ready there's nothing to align */ - if (changed && !(This->recompute & RECOMPUTE_EFFECTIVE_RUNS)) + if (changed && !(This->recompute & RECOMPUTE_LINES)) layout_apply_par_alignment(This); return S_OK; @@ -3803,7 +3803,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetWordWrapping(IDWriteTextFormat1 return hr; if (changed) - This->recompute |= RECOMPUTE_EFFECTIVE_RUNS; + This->recompute |= RECOMPUTE_LINES; return S_OK; }

1 0

Sebastian Lackner : dmsynth: Fix a module refcounting regression.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: a1ee6fa8dd9506cf2b117aeff080d72e199ecd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ee6fa8dd9506cf2b117aeff… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jul 16 17:31:16 2016 +0200 dmsynth: Fix a module refcounting regression. Fixes a regression introduced by 165f8d1fff39df4d51599bf31008c962d4867cd9. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synthsink.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index cb397ef..18ef50f 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -291,6 +291,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(LPCGUID riid, LPVOID* ret_i return hr; } + DMSYNTH_LockModule(); hr = IDirectMusicSynthSink_QueryInterface(&obj->IDirectMusicSynthSink_iface, riid, ret_iface); IDirectMusicSynthSink_Release(&obj->IDirectMusicSynthSink_iface);

1 0

Jan Schmidt : winegstreamer: Fix refcounting for videoflip.
by Alexandre Julliard July 18, 2016

July 18, 2016

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: Don't store decodebin explicitly.
by Alexandre Julliard July 18, 2016

July 18, 2016

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

Huw Davies : gdi32: Use an internal version of LPtoDP that takes a DC * where possible.
by Alexandre Julliard July 18, 2016

July 18, 2016

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

Huw Davies : gdi32: Add a small rectangle buffer to reduce memory allocation.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: af5014f4c8332d1f717f11690d12bcd739004bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5014f4c8332d1f717f11690… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 18 11:32:27 2016 +0100 gdi32: Add a small rectangle buffer to reduce memory allocation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/region.c | 49 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b476864..cbe66a8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -355,12 +355,14 @@ extern BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) DECLSPEC_HIDDEN; extern INT mirror_region( HRGN dst, HRGN src, INT width ) DECLSPEC_HIDDEN; extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y ) DECLSPEC_HIDDEN; +#define RGN_DEFAULT_RECTS 4 typedef struct { INT size; INT numRects; RECT *rects; RECT extents; + RECT rects_buf[RGN_DEFAULT_RECTS]; } WINEREGION; /* return the region data without making a copy */ diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index a5dc2ff..a4cf733 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -131,8 +131,17 @@ static BOOL grow_region( WINEREGION *rgn, int size ) if (size <= rgn->size) return TRUE; - new_rects = HeapReAlloc( GetProcessHeap(), 0, rgn->rects, size * sizeof(RECT) ); - if (!new_rects) return FALSE; + if (rgn->rects == rgn->rects_buf) + { + new_rects = HeapAlloc( GetProcessHeap(), 0, size * sizeof(RECT) ); + if (!new_rects) return FALSE; + memcpy( new_rects, rgn->rects, rgn->numRects * sizeof(RECT) ); + } + else + { + new_rects = HeapReAlloc( GetProcessHeap(), 0, rgn->rects, size * sizeof(RECT) ); + if (!new_rects) return FALSE; + } rgn->rects = new_rects; rgn->size = size; return TRUE; @@ -406,9 +415,6 @@ static BOOL REGION_SubtractRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2) static BOOL REGION_XorRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2); static BOOL REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn); -#define RGN_DEFAULT_RECTS 2 - - /*********************************************************************** * get_region_type */ @@ -445,7 +451,16 @@ static void REGION_DumpRegion(WINEREGION *pReg) */ static BOOL init_region( WINEREGION *pReg, INT n ) { - if (!(pReg->rects = HeapAlloc(GetProcessHeap(), 0, n * sizeof( RECT )))) return FALSE; + n = max( n, RGN_DEFAULT_RECTS ); + + if (n > RGN_DEFAULT_RECTS) + { + if (!(pReg->rects = HeapAlloc( GetProcessHeap(), 0, n * sizeof( RECT ) ))) + return FALSE; + } + else + pReg->rects = pReg->rects_buf; + pReg->size = n; empty_region(pReg); return TRUE; @@ -456,7 +471,8 @@ static BOOL init_region( WINEREGION *pReg, INT n ) */ static void destroy_region( WINEREGION *pReg ) { - HeapFree( GetProcessHeap(), 0, pReg->rects ); + if (pReg->rects != pReg->rects_buf) + HeapFree( GetProcessHeap(), 0, pReg->rects ); } /*********************************************************************** @@ -491,12 +507,16 @@ static WINEREGION *alloc_region( INT n ) static inline void move_rects( WINEREGION *dst, WINEREGION *src ) { destroy_region( dst ); - dst->rects = src->rects; + if (src->rects == src->rects_buf) + { + dst->rects = dst->rects_buf; + memcpy( dst->rects, src->rects, src->numRects * sizeof(RECT) ); + } + else + dst->rects = src->rects; dst->size = src->size; dst->numRects = src->numRects; - src->rects = NULL; - src->size = 0; - src->numRects = 0; + init_region( src, 0 ); } /*********************************************************************** @@ -1176,10 +1196,9 @@ static BOOL REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn) { WINEREGION region; - region.rects = &region.extents; + init_region( &region, 1 ); region.numRects = 1; - region.size = 1; - region.extents = *rect; + region.extents = *region.rects = *rect; return REGION_UnionRegion(rgn, rgn, &region); } @@ -1625,7 +1644,7 @@ static INT REGION_Coalesce ( */ static void REGION_compact( WINEREGION *reg ) { - if ((reg->numRects < reg->size / 2) && (reg->numRects > 2)) + if ((reg->numRects < reg->size / 2) && (reg->numRects > RGN_DEFAULT_RECTS)) { RECT *new_rects = HeapReAlloc( GetProcessHeap(), 0, reg->rects, reg->numRects * sizeof(RECT) ); if (new_rects)

1 0

Huw Davies : gdi32: Add helpers to allocate, grow and free regions.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 01c33fb98361f2fd34e161c4447901d73cdd2461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c33fb98361f2fd34e161c44… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 18 11:32:26 2016 +0100 gdi32: Add helpers to allocate, grow and free regions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 186 ++++++++++++++++++++++++++++------------------------ 1 file changed, 101 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01c33fb98361f2fd34e16…

1 0