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

Michael Stefaniuc : strmbase: Don' t cast IQualityControl to the COM object.
by Alexandre Julliard 18 Jul '16

18 Jul '16

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

Michael Stefaniuc : strmbase: Avoid a COM object to interface cast.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: d7f332020ca07eb2ae2a3c997f7d9f2c7d2860c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f332020ca07eb2ae2a3c997… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 18 11:20:26 2016 +0200 strmbase: Avoid a COM object to interface cast. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index b756ae3..970164e 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -324,7 +324,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) q.Late = priv->current_jitter; q.TimeStamp = priv->current_rstart; TRACE("Late: %i from %i, rate: %g\n", (int)(q.Late/10000), (int)(q.TimeStamp/10000), 1./priv->avg_rate); - hr = IQualityControl_Notify((IQualityControl *)priv, priv->self, q); + hr = IQualityControl_Notify(&priv->IQualityControl_iface, priv->self, q); priv->qos_handled = hr == S_OK; }

1 0

Michael Stefaniuc : amstream: Avoid using the LPUNKNOWN COM iface type.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 8185c9f0245b9615766143c8c437a29c227a1b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8185c9f0245b9615766143c8c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 18 11:20:57 2016 +0200 amstream: Avoid using the LPUNKNOWN COM iface type. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 1149584..2cadf9c 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -117,8 +117,8 @@ static HRESULT WINAPI AMCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter { IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; - LPUNKNOWN punk; - + IUnknown *punk; + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); *ppobj = NULL;

1 0

Huw Davies : gdi32: Add helpers to allocate, grow and free regions.
by Alexandre Julliard 18 Jul '16

18 Jul '16

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

Huw Davies : gdi32: Add a small rectangle buffer to reduce memory allocation.
by Alexandre Julliard 18 Jul '16

18 Jul '16

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

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

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

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