March 2013 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : gdiplus: Add some tests for string format alignment.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 464b8b4160862076aa2fad3cb58c7a49f62267e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464b8b4160862076aa2fad3cb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 4 17:52:59 2013 +0900 gdiplus: Add some tests for string format alignment. --- dlls/gdiplus/tests/graphics.c | 142 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index c37d33f..08b2465 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3909,16 +3909,24 @@ static void test_measure_string(void) static const WCHAR string[] = { 'A','0','1',0 }; HDC hdc; GpStringFormat *format; + CharacterRange range = { 0, 3 }; + GpRegion *region; GpGraphics *graphics; GpFontFamily *family; GpFont *font; GpStatus status; RectF bounds, rect; REAL width, height, width_1, width_2; + REAL margin_x, margin_y, width_rgn, height_rgn; int lines, glyphs; status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); expect(Ok, status); + expect(Ok, status); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + status = GdipCreateRegion(&region); + expect(Ok, status); status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); expect(Ok, status); @@ -3929,12 +3937,17 @@ static void test_measure_string(void) status = GdipCreateFont(family, 20, FontStyleRegular, UnitPixel, &font); expect(Ok, status); + margin_x = 20.0 / 6.0; + margin_y = 20.0 / 8.0; + set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); expect(3, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); width = bounds.Width; height = bounds.Height; @@ -3945,16 +3958,35 @@ static void test_measure_string(void) expect(Ok, status); expect(3, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf(width, bounds.Width); todo_wine expectf(height / 2.0, bounds.Height); + status = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap | StringFormatFlagsNoClip); + + set_rect_empty(&rect); + rect.Height = height / 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(width, bounds.Width); +todo_wine + expectf(height, bounds.Height); + set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, 1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); ok(bounds.Width < width / 2.0, "width of 1 glyph is wrong\n"); expectf(height, bounds.Height); width_1 = bounds.Width; @@ -3965,6 +3997,8 @@ todo_wine expect(Ok, status); expect(2, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); ok(bounds.Width < width, "width of 2 glyphs is wrong\n"); ok(bounds.Width > width_1, "width of 2 glyphs is wrong\n"); expectf(height, bounds.Height); @@ -3977,6 +4011,8 @@ todo_wine expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -3988,6 +4024,8 @@ todo_wine expect(Ok, status); expect(2, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_2, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -3999,9 +4037,112 @@ todo_wine expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + expectf(5.0, bounds.X); + expectf(5.0, bounds.Y); + expectf(width, bounds.Width); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf_(width - margin_x*2.0, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + + width_rgn = bounds.Width; + height_rgn = bounds.Height; + + GdipSetStringFormatAlign(format, StringAlignmentCenter); + GdipSetStringFormatLineAlign(format, StringAlignmentCenter); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 + width/2.0, bounds.X, 0.01); +todo_wine + expectf(5.0 + height/2.0, bounds.Y); + expectf(width, bounds.Width); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn * 2.0; + rect.Height = height_rgn * 2.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + width_rgn/2.0, bounds.X, 1.0); +todo_wine + expectf_(5.0 + height_rgn/2.0, bounds.Y, 1.0); + expectf_(width_rgn, bounds.Width, 1.0); + expectf_(height_rgn, bounds.Height, 1.0); + + GdipSetStringFormatAlign(format, StringAlignmentFar); + GdipSetStringFormatLineAlign(format, StringAlignmentFar); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf(5.0 + width, bounds.X); +todo_wine + expectf(5.0 + height, bounds.Y); + expectf(width, bounds.Width); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn * 2.0; + rect.Height = height_rgn * 2.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + width_rgn, bounds.X, 2.0); +todo_wine + expectf_(5.0 + height_rgn, bounds.Y, 1.0); + expectf_(width_rgn, bounds.Width, 1.0); + expectf_(height_rgn, bounds.Height, 1.0); + status = GdipDeleteFont(font); expect(Ok, status); @@ -4010,6 +4151,7 @@ todo_wine DeleteDC(hdc); GdipDeleteFontFamily(family); + GdipDeleteRegion(region); GdipDeleteStringFormat(format); }

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IStream iface.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 9a436a98f4ca6a24c320c4fcb7a5d81da3919e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a436a98f4ca6a24c320c4fcb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:36:06 2013 +0100 inetcomm: COM cleanup for the IStream iface. --- dlls/inetcomm/mimeole.c | 62 +++++++++++++++++++---------------------------- 1 files changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 62d42b9..4c61f72 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -572,19 +572,14 @@ static HRESULT WINAPI MimeBody_IsDirty( return E_NOTIMPL; } -static HRESULT WINAPI MimeBody_Load( - IMimeBody* iface, - LPSTREAM pStm) +static HRESULT WINAPI MimeBody_Load(IMimeBody *iface, IStream *pStm) { MimeBody *This = impl_from_IMimeBody(iface); TRACE("(%p)->(%p)\n", iface, pStm); return parse_headers(This, pStm); } -static HRESULT WINAPI MimeBody_Save( - IMimeBody* iface, - LPSTREAM pStm, - BOOL fClearDirty) +static HRESULT WINAPI MimeBody_Save(IMimeBody *iface, IStream *pStm, BOOL fClearDirty) { FIXME("stub\n"); return E_NOTIMPL; @@ -1150,62 +1145,58 @@ HRESULT MimeBody_create(IUnknown *outer, void **ppv) typedef struct { - IStreamVtbl *lpVtbl; - LONG refs; - + IStream IStream_iface; + LONG ref; IStream *base; ULARGE_INTEGER pos, start, length; } sub_stream_t; -static inline sub_stream_t *impl_from_IStream( IStream *iface ) +static inline sub_stream_t *impl_from_IStream(IStream *iface) { - return (sub_stream_t *)((char*)iface - FIELD_OFFSET(sub_stream_t, lpVtbl)); + return CONTAINING_RECORD(iface, sub_stream_t, IStream_iface); } -static HRESULT WINAPI sub_stream_QueryInterface( - IStream* iface, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI sub_stream_QueryInterface(IStream *iface, REFIID riid, void **ppv) { sub_stream_t *This = impl_from_IStream(iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); - *ppvObject = NULL; + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ISequentialStream) || IsEqualIID(riid, &IID_IStream)) { IStream_AddRef(iface); - *ppvObject = iface; + *ppv = iface; return S_OK; } return E_NOINTERFACE; } -static ULONG WINAPI sub_stream_AddRef( - IStream* iface) +static ULONG WINAPI sub_stream_AddRef(IStream *iface) { sub_stream_t *This = impl_from_IStream(iface); + LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); - return InterlockedIncrement(&This->refs); + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } -static ULONG WINAPI sub_stream_Release( - IStream* iface) +static ULONG WINAPI sub_stream_Release(IStream *iface) { sub_stream_t *This = impl_from_IStream(iface); - LONG refs; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); - refs = InterlockedDecrement(&This->refs); - if(!refs) + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { IStream_Release(This->base); HeapFree(GetProcessHeap(), 0, This); } - return refs; + return ref; } static HRESULT WINAPI sub_stream_Read( @@ -1422,15 +1413,15 @@ static HRESULT create_sub_stream(IStream *stream, ULARGE_INTEGER start, ULARGE_I This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if(!This) return E_OUTOFMEMORY; - This->lpVtbl = &sub_stream_vtbl; - This->refs = 1; + This->IStream_iface.lpVtbl = &sub_stream_vtbl; + This->ref = 1; This->start = start; This->length = length; This->pos.QuadPart = 0; IStream_AddRef(stream); This->base = stream; - *out = (IStream*)&This->lpVtbl; + *out = &This->IStream_iface; return S_OK; } @@ -1733,10 +1724,7 @@ static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) return S_OK; } -static HRESULT WINAPI MimeMessage_Save( - IMimeMessage *iface, - LPSTREAM pStm, - BOOL fClearDirty) +static HRESULT WINAPI MimeMessage_Save(IMimeMessage *iface, IStream *pStm, BOOL fClearDirty) { FIXME("(%p)->(%p, %s)\n", iface, pStm, fClearDirty ? "TRUE" : "FALSE"); return E_NOTIMPL;

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeMessage iface.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: f18d156352e9b7f9d7675fdd5846c8cbd7846c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18d156352e9b7f9d7675fdd5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:28:47 2013 +0100 inetcomm: COM cleanup for the IMimeMessage iface. --- dlls/inetcomm/mimeole.c | 85 +++++++++++++++++++++-------------------------- 1 files changed, 38 insertions(+), 47 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index ac4142a..3e23fc0 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1428,15 +1428,19 @@ typedef struct body_t typedef struct MimeMessage { - const IMimeMessageVtbl *lpVtbl; - - LONG refs; + IMimeMessage IMimeMessage_iface; + LONG ref; IStream *stream; struct list body_tree; DWORD next_index; } MimeMessage; +static inline MimeMessage *impl_from_IMimeMessage(IMimeMessage *iface) +{ + return CONTAINING_RECORD(iface, MimeMessage, IMimeMessage_iface); +} + static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID riid, void **ppv) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); @@ -1459,9 +1463,12 @@ static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID rii static ULONG WINAPI MimeMessage_AddRef(IMimeMessage *iface) { - MimeMessage *This = (MimeMessage *)iface; - TRACE("(%p)->()\n", iface); - return InterlockedIncrement(&This->refs); + MimeMessage *This = impl_from_IMimeMessage(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static void empty_body_list(struct list *list) @@ -1478,13 +1485,12 @@ static void empty_body_list(struct list *list) static ULONG WINAPI MimeMessage_Release(IMimeMessage *iface) { - MimeMessage *This = (MimeMessage *)iface; - ULONG refs; + MimeMessage *This = impl_from_IMimeMessage(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n", iface); + TRACE("(%p) ref=%d\n", This, ref); - refs = InterlockedDecrement(&This->refs); - if (!refs) + if (!ref) { empty_body_list(&This->body_tree); @@ -1492,7 +1498,7 @@ static ULONG WINAPI MimeMessage_Release(IMimeMessage *iface) HeapFree(GetProcessHeap(), 0, This); } - return refs; + return ref; } /*** IPersist methods ***/ @@ -1674,11 +1680,9 @@ static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *off return body; } -static HRESULT WINAPI MimeMessage_Load( - IMimeMessage *iface, - LPSTREAM pStm) +static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *root_body; BODYOFFSETS offsets; ULARGE_INTEGER cur; @@ -1734,12 +1738,11 @@ static HRESULT WINAPI MimeMessage_InitNew( } /*** IMimeMessageTree methods ***/ -static HRESULT WINAPI MimeMessage_GetMessageSource( - IMimeMessage *iface, - IStream **ppStream, - DWORD dwFlags) +static HRESULT WINAPI MimeMessage_GetMessageSource(IMimeMessage *iface, IStream **ppStream, + DWORD dwFlags) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); + FIXME("(%p)->(%p, 0x%x)\n", iface, ppStream, dwFlags); IStream_AddRef(This->stream); @@ -1822,13 +1825,10 @@ static HRESULT find_body(struct list *list, HBODY hbody, body_t **body) return S_FALSE; } -static HRESULT WINAPI MimeMessage_BindToObject( - IMimeMessage *iface, - const HBODY hBody, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI MimeMessage_BindToObject(IMimeMessage *iface, const HBODY hBody, REFIID riid, + void **ppvObject) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); HRESULT hr; body_t *body; @@ -1933,13 +1933,10 @@ static HRESULT WINAPI MimeMessage_InsertBody( return E_NOTIMPL; } -static HRESULT WINAPI MimeMessage_GetBody( - IMimeMessage *iface, - BODYLOCATION location, - HBODY hPivot, - LPHBODY phBody) +static HRESULT WINAPI MimeMessage_GetBody(IMimeMessage *iface, BODYLOCATION location, HBODY hPivot, + HBODY *phBody) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *body; HRESULT hr; @@ -1981,14 +1978,11 @@ static void count_children(body_t *body, boolean recurse, ULONG *count) } } -static HRESULT WINAPI MimeMessage_CountBodies( - IMimeMessage *iface, - HBODY hParent, - boolean fRecurse, - ULONG *pcBodies) +static HRESULT WINAPI MimeMessage_CountBodies(IMimeMessage *iface, HBODY hParent, boolean fRecurse, + ULONG *pcBodies) { HRESULT hr; - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *body; TRACE("(%p)->(%p, %s, %p)\n", iface, hParent, fRecurse ? "TRUE" : "FALSE", pcBodies); @@ -2044,12 +2038,9 @@ static HRESULT WINAPI MimeMessage_FindFirst( return find_next( iface, NULL, pFindBody, phBody ); } -static HRESULT WINAPI MimeMessage_FindNext( - IMimeMessage *iface, - LPFINDBODY pFindBody, - LPHBODY phBody) +static HRESULT WINAPI MimeMessage_FindNext(IMimeMessage *iface, FINDBODY *pFindBody, HBODY *phBody) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *body; HRESULT hr; @@ -2561,13 +2552,13 @@ HRESULT MimeMessage_create(IUnknown *outer, void **obj) This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MimeMessageVtbl; - This->refs = 1; + This->IMimeMessage_iface.lpVtbl = &MimeMessageVtbl; + This->ref = 1; This->stream = NULL; list_init(&This->body_tree); This->next_index = 1; - *obj = &This->lpVtbl; + *obj = &This->IMimeMessage_iface; return S_OK; }

1 0

Andrew Talbot : winealsa.drv: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 23bf25b0c0c08427e2f65af2c16020afcfc788d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bf25b0c0c08427e2f65af2c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:50 2013 +0000 winealsa.drv: Avoid signed-unsigned integer comparisons. --- dlls/winealsa.drv/mmdevdrv.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8c905e9..2948366 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -3396,7 +3396,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( IAudioStreamVolume *iface, UINT32 count, const float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3422,7 +3422,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( IAudioStreamVolume *iface, UINT32 count, float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3558,7 +3558,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - int i; + unsigned int i; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, wine_dbgstr_guid(context)); @@ -3589,7 +3589,7 @@ static HRESULT WINAPI ChannelAudioVolume_GetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", session, count, levels);

1 0

Vincent Povirk : gdiplus: Store the image type on a Graphics object in case the image is freed.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 7b004c17149af7b9bedc72ff1ee30ea6f6f755c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b004c17149af7b9bedc72ff1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 2 14:28:01 2013 -0600 gdiplus: Store the image type on a Graphics object in case the image is freed. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index cb7330e..87f3b8b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -154,6 +154,7 @@ struct GpGraphics{ BOOL owndc; BOOL alpha_hdc; GpImage *image; + ImageType image_type; SmoothingMode smoothing; CompositingQuality compqual; InterpolationMode interpolation; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 853027c..1150675 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2195,6 +2195,9 @@ GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) (*graphics)->hwnd = NULL; (*graphics)->owndc = FALSE; (*graphics)->image = image; + /* We have to store the image type here because the image may be freed + * before GdipDeleteGraphics is called, and metafiles need special treatment. */ + (*graphics)->image_type = image->type; (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; (*graphics)->interpolation = InterpolationModeBilinear; @@ -2389,7 +2392,7 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if(!graphics) return InvalidParameter; if(graphics->busy) return ObjectBusy; - if (graphics->image && graphics->image->type == ImageTypeMetafile) + if (graphics->image && graphics->image_type == ImageTypeMetafile) { stat = METAFILE_GraphicsDeleted((GpMetafile*)graphics->image); if (stat != Ok)

1 0

Piotr Caban : msvcrt: Added stdin close/open tests.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: cd7b71d3f416fcf34814af7b69bdb869375fca25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7b71d3f416fcf34814af7b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:31 2013 +0100 msvcrt: Added stdin close/open tests. --- dlls/msvcrt/tests/file.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 392b1a0..938161c 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1964,6 +1964,42 @@ static void test_dup2(void) ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); } +static void test_stdin(void) +{ + HANDLE stdinh = GetStdHandle(STD_INPUT_HANDLE); + int stdin_dup, fd; + HANDLE h; + DWORD r; + + stdin_dup = _dup(STDIN_FILENO); + ok(stdin_dup != -1, "_dup(STDIN_FILENO) failed\n"); + + ok(stdinh == (HANDLE)_get_osfhandle(STDIN_FILENO), + "GetStdHandle(STD_INPUT_HANDLE) != _get_osfhandle(STDIN_FILENO)\n"); + + r = SetStdHandle(STD_INPUT_HANDLE, INVALID_HANDLE_VALUE); + ok(r == TRUE, "SetStdHandle returned %x, expected TRUE\n", r); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h == INVALID_HANDLE_VALUE, "h = %p\n", h); + + close(STDIN_FILENO); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h == NULL, "h != NULL\n"); + + fd = open("stdin.tst", O_WRONLY | O_CREAT, _S_IREAD |_S_IWRITE); + ok(fd != -1, "open failed\n"); + ok(fd == STDIN_FILENO, "fd = %d, expected STDIN_FILENO\n", fd); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h != NULL, "h == NULL\n"); + close(fd); + unlink("stdin.tst"); + + r = _dup2(stdin_dup, STDIN_FILENO); + ok(r != -1, "_dup2 failed\n"); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h != NULL, "h == NULL\n"); +} + START_TEST(file) { int arg_c; @@ -2019,6 +2055,7 @@ START_TEST(file) test_get_osfhandle(); test_setmaxstdio(); test_pipes(arg_v[0]); + test_stdin(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Piotr Caban : msvcrt: Reuse standard file descriptors after closing them.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: db92137f83671204f4a9f188a6a432f98ef6648b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db92137f83671204f4a9f188a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:21 2013 +0100 msvcrt: Reuse standard file descriptors after closing them. --- dlls/msvcrt/file.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c730bd7..5b3bf5e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -251,40 +251,37 @@ static HANDLE msvcrt_fdtoh(int fd) /* INTERNAL: free a file entry fd */ static void msvcrt_free_fd(int fd) { - HANDLE old_handle; ioinfo *fdinfo; LOCK_FILES(); fdinfo = msvcrt_get_ioinfo(fd); - old_handle = fdinfo->handle; if(fdinfo != &MSVCRT___badioinfo) { fdinfo->handle = INVALID_HANDLE_VALUE; fdinfo->wxflag = 0; } TRACE(":fd (%d) freed\n",fd); - if (fd < 3) /* don't use 0,1,2 for user files */ + + if (fd < 3) { switch (fd) { case 0: - if (GetStdHandle(STD_INPUT_HANDLE) == old_handle) SetStdHandle(STD_INPUT_HANDLE, 0); + SetStdHandle(STD_INPUT_HANDLE, 0); break; case 1: - if (GetStdHandle(STD_OUTPUT_HANDLE) == old_handle) SetStdHandle(STD_OUTPUT_HANDLE, 0); + SetStdHandle(STD_OUTPUT_HANDLE, 0); break; case 2: - if (GetStdHandle(STD_ERROR_HANDLE) == old_handle) SetStdHandle(STD_ERROR_HANDLE, 0); + SetStdHandle(STD_ERROR_HANDLE, 0); break; } } - else - { - if (fd == MSVCRT_fdend - 1) - MSVCRT_fdend--; - if (fd < MSVCRT_fdstart) - MSVCRT_fdstart = fd; - } + + if (fd == MSVCRT_fdend - 1) + MSVCRT_fdend--; + if (fd < MSVCRT_fdstart) + MSVCRT_fdstart = fd; UNLOCK_FILES(); }

1 0

Andrew Talbot : windowscodecs: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 81afb28818338a1511f5eaf3db80d1365c17f7da URL: http://source.winehq.org/git/wine.git/?a=commit;h=81afb28818338a1511f5eaf3d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:47 2013 +0000 windowscodecs: Avoid signed-unsigned integer comparisons. --- dlls/windowscodecs/icoformat.c | 2 +- dlls/windowscodecs/info.c | 7 ++++--- dlls/windowscodecs/jpegformat.c | 5 +++-- dlls/windowscodecs/main.c | 2 +- dlls/windowscodecs/metadatahandler.c | 4 ++-- dlls/windowscodecs/palette.c | 2 +- dlls/windowscodecs/scaler.c | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index ec09aa6..d245031 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -293,7 +293,7 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) { /* If the alpha channel is fully transparent, we should ignore it. */ int nonzero_alpha = 0; - int i; + UINT i; for (i=0; i<(result->height*result->width); i++) { diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 3da5b20..7c87c5d 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -539,7 +539,8 @@ static HRESULT WINAPI BitmapDecoderInfo_MatchesPattern(IWICBitmapDecoderInfo *if WICBitmapPattern *patterns; UINT pattern_count=0, patterns_size=0; HRESULT hr; - int i, pos; + UINT i; + ULONG pos; BYTE *data=NULL; ULONG datasize=0; ULONG bytesread; @@ -1900,7 +1901,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) { ComponentEnum *This = impl_from_IEnumUnknown(iface); - int num_fetched=0; + ULONG num_fetched=0; ComponentEnumItem *item; HRESULT hr=S_OK; @@ -1929,7 +1930,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, static HRESULT WINAPI ComponentEnum_Skip(IEnumUnknown *iface, ULONG celt) { ComponentEnum *This = impl_from_IEnumUnknown(iface); - int i; + ULONG i; HRESULT hr=S_OK; TRACE("(%p,%u)\n", iface, celt); diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 1aca6d1..6f2653d 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -998,7 +998,8 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); jmp_buf jmpbuf; BYTE *swapped_data = NULL, *current_row; - int line, row_size; + UINT line; + int row_size; TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); EnterCriticalSection(&This->lock); @@ -1061,7 +1062,7 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface { if (This->format->swap_rgb) { - int x; + UINT x; memcpy(swapped_data, pbPixels + (cbStride * line), row_size); diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index b63edf5..967f80b 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -98,7 +98,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, if (row_offset % 8 == 0) { /* everything lines up on a byte boundary */ - UINT row; + INT row; const BYTE *src; BYTE *dst; diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 6b19f84..7615a6d 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -60,7 +60,7 @@ static inline MetadataHandler *impl_from_IWICPersistStream(IWICPersistStream *if static void MetadataHandler_FreeItems(MetadataHandler *This) { - int i; + DWORD i; for (i=0; i<This->item_count; i++) { @@ -555,7 +555,7 @@ static HRESULT WINAPI MetadataHandlerEnum_Next(IWICEnumMetadataItem *iface, MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); ULONG new_index; HRESULT hr=S_FALSE; - int i; + ULONG i; TRACE("(%p,%i)\n", iface, celt); diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 045f795..e21a073 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -592,7 +592,7 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) { PaletteImpl *This = impl_from_IWICPalette(iface); - int i; + UINT i; TRACE("(%p,%p)\n", iface, pfHasAlpha); diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 5470d2b..03410e8 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -178,7 +178,7 @@ static void NearestNeighbor_CopyScanline(BitmapScaler *This, UINT dst_x, UINT dst_y, UINT dst_width, BYTE **src_data, UINT src_data_x, UINT src_data_y, BYTE *pbBuffer) { - int i; + UINT i; UINT bytesperpixel = This->bpp/8; UINT src_x, src_y;

1 0

Andrew Talbot : mscoree: Remove unneeded address-of operator from function name.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: edea85dea684a8440dd758dabc24fe9722ac7cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edea85dea684a8440dd758dab… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:44 2013 +0000 mscoree: Remove unneeded address-of operator from function name. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 6906075..fe529fd 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -318,7 +318,7 @@ void unload_all_runtimes(void) /* If the only references to mscoree are through dll's that were loaded by * Mono, shutting down the Mono runtime will free mscoree, so take a * reference to prevent that from happening. */ - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&unload_all_runtimes, &handle); + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)unload_all_runtimes, &handle); for (i=0; i<NUM_ABI_VERSIONS; i++) {

1 0

Piotr Caban : msvcrt: Don' t duplicate standard handles during initialization.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: f565e4a3157d38b50a25fc3b90014474b59fceba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f565e4a3157d38b50a25fc3b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:07 2013 +0100 msvcrt: Don't duplicate standard handles during initialization. --- dlls/msvcrt/file.c | 50 +++++++++----------------------------------------- 1 files changed, 9 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 612f470..c730bd7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -486,53 +486,21 @@ void msvcrt_init_io(void) if (msvcrt_get_ioinfo(MSVCRT_fdstart)->handle == INVALID_HANDLE_VALUE) break; } - if(!MSVCRT___pioinfo[0]) - msvcrt_alloc_fd_from(INVALID_HANDLE_VALUE, 0, 3); - - fdinfo = msvcrt_get_ioinfo(0); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_INPUT_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); - fdinfo = msvcrt_get_ioinfo(1); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_OUTPUT_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); - fdinfo = msvcrt_get_ioinfo(2); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_ERROR_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); - TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(0)->handle, - msvcrt_get_ioinfo(1)->handle, msvcrt_get_ioinfo(2)->handle); + TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO)->handle, + msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO)->handle, + msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO)->handle); memset(MSVCRT__iob,0,3*sizeof(MSVCRT_FILE)); for (i = 0; i < 3; i++)

1 0