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

Christian Costa : amstream: Implement AddMediaStream and GetMediaStream in media stream filter.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 76d69cdb91b5325af9ad1be1f14ee54d985df28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d69cdb91b5325af9ad1be1f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Mar 27 23:45:55 2012 +0200 amstream: Implement AddMediaStream and GetMediaStream in media stream filter. --- dlls/amstream/mediastreamfilter.c | 43 ++++++++++++++++++++++++++++++++---- 1 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index d576b49..cd08490 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -37,7 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { BaseFilter filter; - + ULONG nb_streams; + IMediaStream** streams; } IMediaStreamFilterImpl; static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) @@ -89,7 +90,12 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) TRACE("(%p)->() Release from %d\n", iface, refCount + 1); if (!refCount) + { + int i; + for (i = 0; i < This->nb_streams; i++) + IMediaStream_Release(This->streams[i]); HeapFree(GetProcessHeap(), 0, This); + } return refCount; } @@ -170,16 +176,43 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryVendorInfo(IMediaStreamFilter * static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* iface, IAMMediaStream *pAMMediaStream) { - FIXME("(%p)->(%p): Stub!\n", iface, pAMMediaStream); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + IMediaStream** streams; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, pAMMediaStream); + + streams = CoTaskMemRealloc(This->streams, (This->nb_streams + 1) * sizeof(IMediaStream*)); + if (!streams) + return E_OUTOFMEMORY; + This->streams = streams; + This->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream; + This->nb_streams++; + + IMediaStream_AddRef((IMediaStream*)pAMMediaStream); + + return S_OK; } static HRESULT WINAPI MediaStreamFilterImpl_GetMediaStream(IMediaStreamFilter* iface, REFMSPID idPurpose, IMediaStream **ppMediaStream) { - FIXME("(%p)->(%s,%p): Stub!\n", iface, debugstr_guid(idPurpose), ppMediaStream); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + MSPID purpose_id; + unsigned int i; - return E_NOTIMPL; + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(idPurpose), ppMediaStream); + + for (i = 0; i < This->nb_streams; i++) + { + IMediaStream_GetInformation(This->streams[i], &purpose_id, NULL); + if (IsEqualIID(&purpose_id, idPurpose)) + { + *ppMediaStream = This->streams[i]; + IMediaStream_AddRef(*ppMediaStream); + return S_OK; + } + } + + return MS_E_NOSTREAM; } static HRESULT WINAPI MediaStreamFilterImpl_EnumMediaStreams(IMediaStreamFilter* iface, LONG Index, IMediaStream **ppMediaStream)

1 0

André Hentschel : include: Add new ARM defines to winnt.h.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 1de185efbaae6545e993461794ff973889aa15a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de185efbaae6545e99346179… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 27 21:37:44 2012 +0200 include: Add new ARM defines to winnt.h. --- include/winnt.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 5cde0f4..a6b0cf2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -790,6 +790,11 @@ typedef enum _HEAP_INFORMATION_CLASS { #define PF_COMPARE64_EXCHANGE128 15 #define PF_CHANNELS_ENABLED 16 #define PF_XSAVE_ENABLED 17 +#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18 +#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19 +#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20 +#define PF_VIRT_FIRMWARE_ENABLED 21 +#define PF_RDWRFSGSBASE_AVAILABLE 22 /* Execution state flags */ @@ -1541,9 +1546,11 @@ typedef struct _CONTEXT /* The following flags control the contents of the CONTEXT structure. */ -#define CONTEXT_ARM 0x0000040 +#define CONTEXT_ARM 0x0200000 #define CONTEXT_CONTROL (CONTEXT_ARM | 0x00000001) #define CONTEXT_INTEGER (CONTEXT_ARM | 0x00000002) +#define CONTEXT_FLOATING_POINT (CONTEXT_ARM | 0x00000004) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM | 0x00000008) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER)

1 0

Michael Stefaniuc : riched20/tests: Add COM aggregation tests for CreateTextServices().
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 39f416cd9d771381184a01b2639f125f675ba4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f416cd9d771381184a01b26… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 28 00:35:47 2012 +0200 riched20/tests: Add COM aggregation tests for CreateTextServices(). --- dlls/riched20/tests/txtsrv.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index e55f5ef..fbd1f6b 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -21,6 +21,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <stdio.h> #include <stdarg.h> @@ -811,6 +812,69 @@ static void test_IIDs(void) "unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2)); } +/* Outer IUnknown for COM aggregation tests */ +struct unk_impl { + IUnknown IUnknown_iface; + LONG ref; + IUnknown *inner_unk; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return IUnknown_QueryInterface(This->inner_unk, riid, ppv); +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + +static void test_COM(void) +{ + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + struct ITextHostTestImpl texthost = {{&itextHostVtbl}, 1}; + ITextServices *textsrv; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = pCreateTextServices(&unk_obj.IUnknown_iface, &texthost.ITextHost_iface, + &unk_obj.inner_unk); + ok(hr == S_OK, "CreateTextServices failed: %08x\n", hr); + hr = IUnknown_QueryInterface(unk_obj.inner_unk, pIID_ITextServices, (void**)&textsrv); + ok(hr == S_OK, "QueryInterface for IID_ITextServices failed: %08x\n", hr); + refcount = ITextServices_AddRef(textsrv); + ok(refcount == unk_obj.ref, "CreateTextServices just pretends to support COM aggregation\n"); + refcount = ITextServices_Release(textsrv); + ok(refcount == unk_obj.ref, "CreateTextServices just pretends to support COM aggregation\n"); + refcount = ITextServices_Release(textsrv); + ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); + + IUnknown_Release(unk_obj.inner_unk); +} START_TEST( txtsrv ) { @@ -827,6 +891,7 @@ START_TEST( txtsrv ) pCreateTextServices = (void*)GetProcAddress(hmoduleRichEdit, "CreateTextServices"); test_IIDs(); + test_COM(); if (init_texthost()) {

1 0

André Hentschel : include: Add peARM to fusion.idl.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 82290556929caa1a198f86dd10efa7b4344d41bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=82290556929caa1a198f86dd1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 27 21:38:51 2012 +0200 include: Add peARM to fusion.idl. --- include/fusion.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/fusion.idl b/include/fusion.idl index 9963838..d645662 100644 --- a/include/fusion.idl +++ b/include/fusion.idl @@ -38,6 +38,7 @@ typedef enum peI386 = 0x00000002, peIA64 = 0x00000003, peAMD64 = 0x00000004, + peARM = 0x00000005, peInvalid = 0xffffffff } PEKIND;

1 0

Michael Stefaniuc : riched20/tests: Get the CreateTextServices() pointer only once.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 67389533bcb46f5281d074bd115d5278c39340e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67389533bcb46f5281d074bd1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 28 00:34:31 2012 +0200 riched20/tests: Get the CreateTextServices() pointer only once. --- dlls/riched20/tests/txtsrv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 8d126ea..e55f5ef 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -38,6 +38,7 @@ static HMODULE hmoduleRichEdit; static IID *pIID_ITextServices; static IID *pIID_ITextHost; static IID *pIID_ITextHost2; +static PCreateTextServices pCreateTextServices; static const char *debugstr_guid(REFIID riid) { @@ -620,7 +621,6 @@ static BOOL init_texthost(void) { IUnknown *init; HRESULT result; - PCreateTextServices pCreateTextServices; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { @@ -633,7 +633,6 @@ static BOOL init_texthost(void) /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a ITextServices object. */ - pCreateTextServices = (void*)GetProcAddress(hmoduleRichEdit, "CreateTextServices"); result = (*pCreateTextServices)(NULL, &dummyTextHost->ITextHost_iface, &init); ok(result == S_OK, "Did not return S_OK when created (result = %x)\n", result); if (result != S_OK) { @@ -825,6 +824,8 @@ START_TEST( txtsrv ) pIID_ITextServices = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextServices"); pIID_ITextHost = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost"); pIID_ITextHost2 = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost2"); + pCreateTextServices = (void*)GetProcAddress(hmoduleRichEdit, "CreateTextServices"); + test_IIDs(); if (init_texthost())

1 0

Bruno Jesus : kernel32: Avoid ini cache if file does not exist anymore.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 40f0145d002404ca75c3f998437df1556df45677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40f0145d002404ca75c3f9984… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Mar 28 02:30:27 2012 -0300 kernel32: Avoid ini cache if file does not exist anymore. --- dlls/kernel32/profile.c | 2 +- dlls/kernel32/tests/profile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 89b96a1..3d00c29 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -817,10 +817,10 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) CurProfile->LastWriteTime = LastWriteTime; } CloseHandle(hFile); + return TRUE; } else TRACE("(%s): already opened, not yet created (mru=%d)\n", debugstr_w(buffer), i); - return TRUE; } } diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 745f3b5..211d0c6 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -504,7 +504,7 @@ static void test_profile_refresh(void) /* Cache must be invalidated if file no longer exists and default must be returned */ SetLastError(0xdeadbeef); res = GetPrivateProfileInt(SECTION, KEY, 421, testfile); - todo_wine ok( res == 421 || + ok( res == 421 || broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "Got %d instead of 421\n", res); }

1 0

Henri Verbeet : wined3d: Recognise AMD HD 6770M and HD 6750M with closed drivers.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 426535a7dd35aae347c586e721116a3d0fb55252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426535a7dd35aae347c586e72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 27 20:35:53 2012 +0200 wined3d: Recognise AMD HD 6770M and HD 6750M with closed drivers. --- dlls/wined3d/directx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e5be4ad..3ae0945 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1709,6 +1709,8 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in /* Northern Islands */ {"HD 6900", CARD_AMD_RADEON_HD6900}, {"HD 6800", CARD_AMD_RADEON_HD6800}, + {"HD 6770M",CARD_AMD_RADEON_HD6600M}, + {"HD 6750M",CARD_AMD_RADEON_HD6600M}, {"HD 6630M",CARD_AMD_RADEON_HD6600M}, {"HD 6600M",CARD_AMD_RADEON_HD6600M}, {"HD 6600", CARD_AMD_RADEON_HD6600},

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DVolume9Impl_QueryInterface ().
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: ad0980c65541b9ab04e684b9615fdeb1465e0fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad0980c65541b9ab04e684b96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 27 20:35:52 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DVolume9Impl_QueryInterface(). --- dlls/d3d9/volume.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 58e7827..7814b93 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -32,18 +32,18 @@ static inline IDirect3DVolume9Impl *impl_from_IDirect3DVolume9(IDirect3DVolume9 static HRESULT WINAPI IDirect3DVolume9Impl_QueryInterface(IDirect3DVolume9 *iface, REFIID riid, void **ppobj) { - IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DVolume9)) { + if (IsEqualGUID(riid, &IID_IDirect3DVolume9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DVolume9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d9: Store an implementation pointer to the d3d9 structure in IDirect3DDevice9Impl .
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: cbc3e9985c92658ad786be12f878e6862841a80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc3e9985c92658ad786be12f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 27 20:35:50 2012 +0200 d3d9: Store an implementation pointer to the d3d9 structure in IDirect3DDevice9Impl. --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 5886618..7d1821c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -165,7 +165,7 @@ typedef struct IDirect3DDevice9Impl struct wined3d_device_parent device_parent; LONG ref; struct wined3d_device *wined3d_device; - IDirect3D9Ex *d3d_parent; + struct IDirect3D9Impl *d3d_parent; /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 39cd740..ab96d79 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -190,8 +190,6 @@ static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *if void **ppobj) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - IDirect3D9 *d3d; - IDirect3D9Impl *d3dimpl; TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -203,20 +201,16 @@ static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *if return S_OK; } else if(IsEqualGUID(riid, &IID_IDirect3DDevice9Ex)) { /* Find out if the creating d3d9 interface was created with Direct3DCreate9Ex. - * It doesn't matter with which function the device was created. - */ - IDirect3DDevice9_GetDirect3D(iface, &d3d); - d3dimpl = (IDirect3D9Impl *) d3d; + * It doesn't matter with which function the device was created. */ - if(d3dimpl->extended) { + if (This->d3d_parent->extended) + { *ppobj = iface; IDirect3DDevice9Ex_AddRef((IDirect3DDevice9Ex *) *ppobj); - IDirect3D9_Release(d3d); TRACE("Returning IDirect3DDevice9Ex interface at %p\n", *ppobj); return S_OK; } else { WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE\n"); - IDirect3D9_Release(d3d); *ppobj = NULL; return E_NOINTERFACE; } @@ -265,7 +259,7 @@ static ULONG WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Release(IDirect3DDevi wined3d_device_decref(This->wined3d_device); wined3d_mutex_unlock(); - IDirect3D9_Release(This->d3d_parent); + IDirect3D9Ex_Release(&This->d3d_parent->IDirect3D9Ex_iface); HeapFree(GetProcessHeap(), 0, This); } @@ -325,7 +319,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(IDirect3DDevice9Ex *iface return D3DERR_INVALIDCALL; } - return IDirect3D9Ex_QueryInterface(This->d3d_parent, &IID_IDirect3D9, (void **)ppD3D9); + return IDirect3D9Ex_QueryInterface(&This->d3d_parent->IDirect3D9Ex_iface, + &IID_IDirect3D9, (void **)ppD3D9); } static HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCAPS9 *pCaps) @@ -3513,8 +3508,8 @@ HRESULT device_init(IDirect3DDevice9Impl *device, IDirect3D9Impl *parent, struct return E_OUTOFMEMORY; } - device->d3d_parent = &parent->IDirect3D9Ex_iface; - IDirect3D9_AddRef(device->d3d_parent); + IDirect3D9Ex_AddRef(&parent->IDirect3D9Ex_iface); + device->d3d_parent = parent; return D3D_OK; }

1 0

Vincent Povirk : gdiplus: Measure strings at device size, then rescale to world size.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: e2e77545fff96e52d6b3f931e40e622586777ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e77545fff96e52d6b3f931e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 27 11:44:52 2012 -0500 gdiplus: Measure strings at device size, then rescale to world size. --- dlls/gdiplus/graphics.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 89ed61b..f46d1ce 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4943,6 +4943,7 @@ struct measure_string_args { RectF *bounds; INT *codepointsfitted; INT *linesfilled; + REAL rel_width, rel_height; }; static GpStatus measure_string_callback(HDC hdc, @@ -4952,12 +4953,16 @@ static GpStatus measure_string_callback(HDC hdc, INT underlined_index_count, void *user_data) { struct measure_string_args *args = user_data; + REAL new_width, new_height; + + new_width = bounds->Width / args->rel_width; + new_height = (bounds->Height + bounds->Y - args->bounds->Y) / args->rel_height; - if (bounds->Width > args->bounds->Width) - args->bounds->Width = bounds->Width; + if (new_width > args->bounds->Width) + args->bounds->Width = new_width; - if (bounds->Height + bounds->Y > args->bounds->Height + args->bounds->Y) - args->bounds->Height = bounds->Height + bounds->Y - args->bounds->Y; + if (new_height > args->bounds->Height) + args->bounds->Height = new_height; if (args->codepointsfitted) *args->codepointsfitted = index + length; @@ -4977,9 +4982,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, RectF *bounds, INT *codepointsfitted, INT *linesfilled) { - HFONT oldfont; + HFONT oldfont, gdifont; struct measure_string_args args; HDC temp_hdc=NULL, hdc; + GpPointF pt[3]; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -5002,7 +5008,20 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(format) TRACE("may be ignoring some format flags: attr %x\n", format->attr); - oldfont = SelectObject(hdc, CreateFontIndirectW(&font->lfw)); + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 0.0; + pt[2].X = 0.0; + pt[2].Y = 1.0; + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + args.rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ + (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); + args.rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ + (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + + get_font_hfont(graphics, font, &gdifont); + oldfont = SelectObject(hdc, gdifont); bounds->X = rect->X; bounds->Y = rect->Y; @@ -5016,7 +5035,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, gdip_format_string(hdc, string, length, font, rect, format, measure_string_callback, &args); - DeleteObject(SelectObject(hdc, oldfont)); + SelectObject(hdc, oldfont); + DeleteObject(gdifont); if (temp_hdc) DeleteDC(temp_hdc);

1 0