August 2012 - Wine-commits - list.winehq.org

Michael Stefaniuc : strmbase: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: c4cdc50739f4d9d8456c87e6ded2883a58e56ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4cdc50739f4d9d8456c87e6d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 20 11:57:31 2012 +0200 strmbase: COM cleanup for the IClassFactory iface. --- dlls/strmbase/dllfunc.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 202cd81..d36c919 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -235,39 +235,40 @@ BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * DLL ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; LPFNNewCOMObject pfnCreateInstance; } IClassFactoryImpl; -static HRESULT WINAPI -DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} +static HRESULT WINAPI DSCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) +{ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p), not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -276,10 +277,10 @@ static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) return ref; } -static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres = ERROR_SUCCESS; LPUNKNOWN punk; @@ -313,9 +314,9 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter return hres; } -static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) +static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%d)\n",This, dolock); if (dolock) @@ -378,12 +379,12 @@ HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * if (!factory) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = pList->m_lpfnNew; - *ppv = &(factory->ITF_IClassFactory); + *ppv = &factory->IClassFactory_iface; return S_OK; }

1 0

Michael Stefaniuc : mlang: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 34ed785ff0fa1604675e322c151bf3a8b54be29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ed785ff0fa1604675e322c1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 20 12:00:03 2012 +0200 mlang: COM cleanup for the IClassFactory iface. --- dlls/mlang/mlang.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 775a723..e9f48a0 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1277,12 +1277,16 @@ HRESULT WINAPI Rfc1766ToLcidA(LCID *lcid, LPCSTR rfc1766A) * MLANG ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + struct object_creation_info { const CLSID *clsid; @@ -1295,35 +1299,32 @@ static const struct object_creation_info object_creation[] = { &CLSID_CMultiLanguage, "CLSID_CMultiLanguage", MultiLanguage_create }, }; -static HRESULT WINAPI -MLANGCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI MLANGCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - TRACE("%s\n", debugstr_guid(riid) ); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + *ppobj = NULL; + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI MLANGCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI MLANGCF_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI MLANGCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI MLANGCF_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -1335,10 +1336,10 @@ static ULONG WINAPI MLANGCF_Release(LPCLASSFACTORY iface) return ref; } -static HRESULT WINAPI MLANGCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI MLANGCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -1354,7 +1355,7 @@ static HRESULT WINAPI MLANGCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOu return hres; } -static HRESULT WINAPI MLANGCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) +static HRESULT WINAPI MLANGCF_LockServer(IClassFactory *iface, BOOL dolock) { if (dolock) LockModule(); @@ -1404,14 +1405,14 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &MLANGCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &MLANGCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &(factory->ITF_IClassFactory); + *ppv = &factory->IClassFactory_iface; - TRACE("(%p) <- %p\n", ppv, &(factory->ITF_IClassFactory) ); + TRACE("(%p) <- %p\n", ppv, &factory->IClassFactory_iface); return S_OK; }

1 0

Michael Stefaniuc : amstream: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 84efd5985512c3c9c0bae5784ba788afc01b57ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=84efd5985512c3c9c0bae5784… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 20 12:01:24 2012 +0200 amstream: COM cleanup for the IClassFactory iface. --- dlls/amstream/main.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 79142e5..9c2d8b2 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -59,12 +59,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * Multimedia Streams ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + struct object_creation_info { const CLSID *clsid; @@ -79,33 +83,30 @@ static const struct object_creation_info object_creation[] = { &CLSID_MediaStreamFilter, MediaStreamFilter_create } }; -static HRESULT WINAPI -AMCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI AMCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + *ppobj = NULL; + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI AMCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI AMCF_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI AMCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI AMCF_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -115,10 +116,10 @@ static ULONG WINAPI AMCF_Release(LPCLASSFACTORY iface) } -static HRESULT WINAPI AMCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI AMCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -133,9 +134,9 @@ static HRESULT WINAPI AMCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter return hres; } -static HRESULT WINAPI AMCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) +static HRESULT WINAPI AMCF_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } @@ -192,12 +193,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &(factory->ITF_IClassFactory); + *ppv = &factory->IClassFactory_iface; return S_OK; }

1 0

Michael Stefaniuc : quartz: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 645e15894633e77d6cc856dd9736c459d44b0925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645e15894633e77d6cc856dd9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 20 12:03:14 2012 +0200 quartz: COM cleanup for the IClassFactory iface. --- dlls/quartz/main.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index edb9cbc..2a4071c 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -46,12 +46,16 @@ static HRESULT SeekingPassThru_create(IUnknown *pUnkOuter, LPVOID *ppObj) * DirectShow ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + struct object_creation_info { const CLSID *clsid; @@ -81,34 +85,30 @@ static const struct object_creation_info object_creation[] = { &CLSID_WAVEParser, WAVEParser_create } }; -static HRESULT WINAPI -DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI DSCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } *ppobj = NULL; - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -118,10 +118,10 @@ static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) } -static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -139,9 +139,9 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter return hres; } -static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) +static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } @@ -187,12 +187,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) IClassFactoryImpl *factory = CoTaskMemAlloc(sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &factory->ITF_IClassFactory; + *ppv = &factory->IClassFactory_iface; return S_OK; } }

1 0

Piotr Caban : msvcrt: Fixed vector destructors implementation on 64-bit systems.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: fef8a52fc9daefcf66f72dda9d9bbccad0bf7da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef8a52fc9daefcf66f72dda9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 20 12:47:04 2012 +0200 msvcrt: Fixed vector destructors implementation on 64-bit systems. --- dlls/msvcp100/exception.c | 10 ++++---- dlls/msvcp100/ios.c | 58 ++++++++++++++++++++++---------------------- dlls/msvcp100/locale.c | 34 +++++++++++++------------- dlls/msvcp60/exception.c | 8 +++--- dlls/msvcp90/exception.c | 10 ++++---- dlls/msvcp90/ios.c | 58 ++++++++++++++++++++++---------------------- dlls/msvcp90/locale.c | 34 +++++++++++++------------- dlls/msvcrt/cpp.c | 10 ++++---- 8 files changed, 111 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fef8a52fc9daefcf66f72…

1 0

Piotr Caban : msvcrt/tests: Execute c++ related tests on 64-bit systems.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 83024db0aef79da80237cd8b6fd776d5ca57c81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83024db0aef79da80237cd8b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 20 12:47:51 2012 +0200 msvcrt/tests: Execute c++ related tests on 64-bit systems. --- dlls/msvcrt/tests/cpp.c | 401 +++++++++++++++++++++++++---------------------- 1 files changed, 214 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83024db0aef79da80237c…

1 0

Dmitry Timoshkov : gdiplus: If there is no hbitmap associated with GpBitmap then create one.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 466dfee115c49b0d6f81bd42aa4513730eb2b0f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=466dfee115c49b0d6f81bd42a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:07:32 2012 +0900 gdiplus: If there is no hbitmap associated with GpBitmap then create one. --- dlls/gdiplus/graphics.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2b7a87b..c8fad68 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3094,7 +3094,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (imageAttributes || (graphics->image && graphics->image->type == ImageTypeBitmap) || - !((GpBitmap*)image)->hbitmap || ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X || ptf[1].X - ptf[0].X != srcwidth || ptf[2].Y - ptf[0].Y != srcheight || srcx < 0 || srcy < 0 || @@ -3281,7 +3280,14 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image } else { - hbitmap = bitmap->hbitmap; + if (bitmap->hbitmap) + hbitmap = bitmap->hbitmap; + else + { + GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0); + temp_bitmap = 1; + } + hdc = bitmap->hdc; temp_hdc = (hdc == 0); }

1 0

Dmitry Timoshkov : gdiplus: Add a test for measuring string that doesn' t fit into layout rectangle.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 003333e6cbd54ae5c230381b570a712fc44811a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003333e6cbd54ae5c230381b5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:07:47 2012 +0900 gdiplus: Add a test for measuring string that doesn't fit into layout rectangle. --- dlls/gdiplus/tests/graphics.c | 126 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index ded80be..881f697 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -36,6 +36,14 @@ static const REAL mm_per_inch = 25.4; static const REAL point_per_inch = 72.0; static HWND hwnd; +static void set_rect_empty(RectF *rc) +{ + rc->X = 0.0; + rc->Y = 0.0; + rc->Width = 0.0; + rc->Height = 0.0; +} + /* converts a given unit to its value in pixels */ static REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) { @@ -3769,6 +3777,123 @@ static void test_font_height_scaling(void) status = GdipDeleteGraphics(graphics); expect(Ok, status); DeleteDC(hdc); + + GdipDeleteFontFamily(family); + GdipDeleteStringFormat(format); +} + +static void test_measure_string(void) +{ + static const WCHAR tahomaW[] = { 'T','a','h','o','m','a',0 }; + static const WCHAR string[] = { 'A','0','1',0 }; + HDC hdc; + GpStringFormat *format; + GpGraphics *graphics; + GpFontFamily *family; + GpFont *font; + GpStatus status; + RectF bounds, rect; + REAL width, height, width_1, width_2; + int lines, glyphs; + + status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); + expect(Ok, status); + + status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); + expect(Ok, status); + + hdc = CreateCompatibleDC(0); + status = GdipCreateFromHDC(hdc, &graphics); + + status = GdipCreateFont(family, 20, FontStyleRegular, UnitPixel, &font); + expect(Ok, status); + + 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); + width = bounds.Width; + height = bounds.Height; + + 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(width, bounds.Width); +todo_wine + expectf(height / 2.0, 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); + ok(bounds.Width < width / 2.0, "width of 1 glyph is wrong\n"); + expectf(height, bounds.Height); + width_1 = bounds.Width; + + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, 2, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(2, glyphs); + expect(1, lines); + 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); + width_2 = bounds.Width; + + set_rect_empty(&rect); + rect.Width = width / 2.0; + 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_(width_1, bounds.Width, 0.01); + expectf(height, bounds.Height); + + set_rect_empty(&rect); + rect.Height = height; + rect.Width = width - 0.05; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); +todo_wine + expect(2, glyphs); + expect(1, lines); +todo_wine + expectf_(width_2, bounds.Width, 0.01); + expectf(height, bounds.Height); + + set_rect_empty(&rect); + rect.Height = height; + rect.Width = width_2 - 0.05; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); +todo_wine + expect(1, glyphs); + expect(1, lines); +todo_wine + expectf_(width_1, bounds.Width, 0.01); + expectf(height, bounds.Height); + + status = GdipDeleteFont(font); + expect(Ok, status); + + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + DeleteDC(hdc); + + GdipDeleteFontFamily(family); + GdipDeleteStringFormat(format); } START_TEST(graphics) @@ -3797,6 +3922,7 @@ START_TEST(graphics) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_measure_string(); test_font_height_scaling(); test_transform(); test_GdipMeasureString();

1 0

Dmitry Timoshkov : gdiplus: Round the layout rectangle down instead of up in gdip_format_string().
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: e9aef40c269cef91c81eebd0bfd43a30b730a041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9aef40c269cef91c81eebd0b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:07:57 2012 +0900 gdiplus: Round the layout rectangle down instead of up in gdip_format_string(). --- dlls/gdiplus/graphics.c | 4 ++-- dlls/gdiplus/tests/graphics.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c8fad68..a04446b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4728,8 +4728,8 @@ GpStatus gdip_format_string(HDC hdc, stringdup = GdipAlloc((length + 1) * sizeof(WCHAR)); if(!stringdup) return OutOfMemory; - nwidth = roundr(rect->Width); - nheight = roundr(rect->Height); + nwidth = rect->Width; + nheight = rect->Height; if (rect->Width >= INT_MAX || rect->Width < 0.5) nwidth = INT_MAX; if (rect->Height >= INT_MAX || rect->Height < 0.5) nheight = INT_MAX; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 881f697..1288678 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3865,10 +3865,8 @@ todo_wine set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); -todo_wine expect(2, glyphs); expect(1, lines); -todo_wine expectf_(width_2, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -3878,10 +3876,8 @@ todo_wine set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); -todo_wine expect(1, glyphs); expect(1, lines); -todo_wine expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height);

1 0

Dmitry Timoshkov : gdiplus: Return error code of the failed API to the caller.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 62724c9d574a0d3d3b84abe6dd32794bd8979ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62724c9d574a0d3d3b84abe6d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:08:05 2012 +0900 gdiplus: Return error code of the failed API to the caller. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a04446b..e46cf48 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3188,7 +3188,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GdipFree(src_data); GdipFree(dst_data); GdipDeleteMatrix(dst_to_src); - return OutOfMemory; + return stat; } apply_image_attributes(imageAttributes, src_data,

1 0