May 2013 - Wine-commits - list.winehq.org

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreatePredicate().
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: c97c51120cd0a419527c7438df222e614eb09187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97c51120cd0a419527c7438d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 30 22:34:17 2013 +0200 d3d10core/tests: Add a small test for ID3D10Device_CreatePredicate(). --- dlls/d3d10core/tests/device.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1ed99a0..63b65bc 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -762,6 +762,42 @@ static void test_create_rasterizer_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_predicate(void) +{ + D3D10_QUERY_DESC query_desc; + ID3D10Predicate *predicate; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_CreatePredicate(device, NULL, &predicate); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + query_desc.Query = D3D10_QUERY_OCCLUSION; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + query_desc.Query = D3D10_QUERY_OCCLUSION_PREDICATE; + hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); + ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + ID3D10Predicate_Release(predicate); + + query_desc.Query = D3D10_QUERY_SO_OVERFLOW_PREDICATE; + hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); + ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + ID3D10Predicate_Release(predicate); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_device_interfaces(); @@ -775,4 +811,5 @@ START_TEST(device) test_create_blend_state(); test_create_depthstencil_state(); test_create_rasterizer_state(); + test_create_predicate(); }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMANIMATIONSET.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 78afa17fbe95a77c5dad9c0a9f4860716f885006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78afa17fbe95a77c5dad9c0a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 30 22:34:18 2013 +0200 d3drm: Avoid LPDIRECT3DRMANIMATIONSET. --- dlls/d3drm/d3drm.c | 13 ++++--------- include/d3drm.h | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 07b4a46..de6945b 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -175,11 +175,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateAnimation(IDirect3DRM *iface, IDirec return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_CreateAnimationSet(IDirect3DRM* iface, LPDIRECT3DRMANIMATIONSET * ppAnimationSet) +static HRESULT WINAPI IDirect3DRMImpl_CreateAnimationSet(IDirect3DRM *iface, IDirect3DRMAnimationSet **set) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppAnimationSet); + FIXME("iface %p, set %p stub!\n", iface, set); return E_NOTIMPL; } @@ -549,12 +547,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimation(IDirect3DRM2 *iface, IDir return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimationSet(IDirect3DRM2* iface, - LPDIRECT3DRMANIMATIONSET * ppAnimationSet) +static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimationSet(IDirect3DRM2 *iface, IDirect3DRMAnimationSet **set) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppAnimationSet); + FIXME("iface %p, set %p stub!\n", iface, set); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index b3b120e..e33a67b 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -63,7 +63,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD(CreateAnimation)(THIS_ IDirect3DRMAnimation **animation) PURE; - STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; + STDMETHOD(CreateAnimationSet)(THIS_ IDirect3DRMAnimationSet **set) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE type, D3DCOLOR color, IDirect3DRMLight **light) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE type, D3DVALUE r, D3DVALUE g, D3DVALUE b, @@ -202,7 +202,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD(CreateAnimation)(THIS_ IDirect3DRMAnimation **animation) PURE; - STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; + STDMETHOD(CreateAnimationSet)(THIS_ IDirect3DRMAnimationSet **set) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE type, D3DCOLOR color, IDirect3DRMLight **light) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE type, D3DVALUE r, D3DVALUE g, D3DVALUE b,

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMANIMATIONSET2.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 007d50e9836c9cfc679fa044147525a9afc99ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=007d50e9836c9cfc679fa0441… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 30 22:34:19 2013 +0200 d3drm: Avoid LPDIRECT3DRMANIMATIONSET2. --- dlls/d3drm/d3drm.c | 7 ++----- include/d3drm.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index de6945b..df3b9cc 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -931,12 +931,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateAnimation(IDirect3DRM3 *iface, IDir return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateAnimationSet(IDirect3DRM3* iface, - LPDIRECT3DRMANIMATIONSET2* AnimationSet) +static HRESULT WINAPI IDirect3DRM3Impl_CreateAnimationSet(IDirect3DRM3 *iface, IDirect3DRMAnimationSet2 **set) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, AnimationSet); + FIXME("iface %p, set %p stub!\n", iface, set); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index e33a67b..4a6ae4c 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -345,7 +345,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace2 **face) PURE; STDMETHOD(CreateAnimation)(THIS_ IDirect3DRMAnimation2 **animation) PURE; - STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE; + STDMETHOD(CreateAnimationSet)(THIS_ IDirect3DRMAnimationSet2 **set) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE type, D3DCOLOR color, IDirect3DRMLight **light) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE type, D3DVALUE r, D3DVALUE g, D3DVALUE b,

1 0

André Hentschel : ntdll: Actually store PC in RtlCaptureContext on ARM.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: ef856a29efeb16f1a3a16c6edbf67bf92797c3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef856a29efeb16f1a3a16c6ed… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 30 22:49:41 2013 +0200 ntdll: Actually store PC in RtlCaptureContext on ARM. --- dlls/ntdll/signal_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index bf144a0..6334a6e 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -221,7 +221,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, "str IP, [r0, #0x34]\n\t" /* context->Ip */ "str SP, [r0, #0x38]\n\t" /* context->Sp */ "str LR, [r0, #0x3c]\n\t" /* context->Lr */ - "str LR, [r0, #0x40]\n\t" /* context->Pc */ + "str PC, [r0, #0x40]\n\t" /* context->Pc */ "mrs r1, CPSR\n\t" "str r1, [r0, #0x44]\n\t" /* context->Cpsr */ "mov PC, LR\n"

1 0

Andrew Eikum : oleaut32: Load and store all of the strings in a typelib.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: dc9cd02264dc07c424c816093f48e6e67fbda853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9cd02264dc07c424c816093… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 30 16:42:38 2013 -0500 oleaut32: Load and store all of the strings in a typelib. This lets us easily avoid duplicate strings in the typelib. --- dlls/oleaut32/typelib.c | 248 ++++++++++++++++++++++++++++++----------------- 1 files changed, 158 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc9cd02264dc07c424c81…

1 0

Andrew Eikum : oleaut32: Store all Names in typelibs, too.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 379e1c035a4c4f838c75945d775c885560486c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=379e1c035a4c4f838c75945d7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 30 16:42:50 2013 -0500 oleaut32: Store all Names in typelibs, too. --- dlls/oleaut32/typelib.c | 248 +++++++++++++++++++++++++++-------------------- 1 files changed, 144 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=379e1c035a4c4f838c759…

1 0

Andrew Eikum : oleaut32: Pull TLIBATTR struct contents out.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 3a16568f41e1a89da1b779d9071f9836b9a1dc49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a16568f41e1a89da1b779d90… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 30 16:43:18 2013 -0500 oleaut32: Pull TLIBATTR struct contents out. So we can store GUIDs outside of the structs. --- dlls/oleaut32/typelib.c | 53 ++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index de09a5a..e28f2c1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -995,8 +995,13 @@ typedef struct tagITypeLibImpl ITypeComp ITypeComp_iface; ICreateTypeLib2 ICreateTypeLib2_iface; LONG ref; - TLIBATTR LibAttr; /* guid,lcid,syskind,version,flags */ + GUID guid; LCID lcid; + SYSKIND syskind; + WORD ver_major; + WORD ver_minor; + WORD libflags; + LCID set_lcid; /* strings can be stored in tlb as multibyte strings BUT they are *always* * exported to the application as a UNICODE string. @@ -2512,7 +2517,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( /* fill in the typeattr fields */ MSFT_ReadGuid(&ptiRet->TypeAttr.guid, tiBase.posguid, pcx); - ptiRet->TypeAttr.lcid=pLibInfo->LibAttr.lcid; /* FIXME: correct? */ + ptiRet->TypeAttr.lcid=pLibInfo->set_lcid; /* FIXME: correct? */ ptiRet->TypeAttr.lpstrSchema=NULL; /* reserved */ ptiRet->TypeAttr.cbSizeInstance=tiBase.size; ptiRet->TypeAttr.typekind=tiBase.typekind & 0xF; @@ -3276,14 +3281,14 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) /* now fill our internal data */ /* TLIBATTR fields */ - MSFT_ReadGuid(&pTypeLibImpl->LibAttr.guid, tlbHeader.posguid, &cx); + MSFT_ReadGuid(&pTypeLibImpl->guid, tlbHeader.posguid, &cx); - pTypeLibImpl->LibAttr.lcid = tlbHeader.lcid2; - pTypeLibImpl->LibAttr.syskind = tlbHeader.varflags & 0x0f; /* check the mask */ - pTypeLibImpl->LibAttr.wMajorVerNum = LOWORD(tlbHeader.version); - pTypeLibImpl->LibAttr.wMinorVerNum = HIWORD(tlbHeader.version); - pTypeLibImpl->LibAttr.wLibFlags = (WORD) tlbHeader.flags & 0xffff;/* check mask */ + pTypeLibImpl->syskind = tlbHeader.varflags & 0x0f; /* check the mask */ + pTypeLibImpl->ver_major = LOWORD(tlbHeader.version); + pTypeLibImpl->ver_minor = HIWORD(tlbHeader.version); + pTypeLibImpl->libflags = (WORD) tlbHeader.flags & 0xffff;/* check mask */ + pTypeLibImpl->set_lcid = tlbHeader.lcid2; pTypeLibImpl->lcid = tlbHeader.lcid; /* name, eventually add to a hash table */ @@ -3527,27 +3532,27 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl) pTypeLibImpl->dwHelpContext = *(DWORD*)ptr; ptr += 4; - pTypeLibImpl->LibAttr.syskind = *(WORD*)ptr; + pTypeLibImpl->syskind = *(WORD*)ptr; ptr += 2; if(SUBLANGID(*(WORD*)ptr) == SUBLANG_NEUTRAL) - pTypeLibImpl->lcid = pTypeLibImpl->LibAttr.lcid = MAKELCID(MAKELANGID(PRIMARYLANGID(*(WORD*)ptr),0),0); + pTypeLibImpl->lcid = pTypeLibImpl->set_lcid = MAKELCID(MAKELANGID(PRIMARYLANGID(*(WORD*)ptr),0),0); else - pTypeLibImpl->lcid = pTypeLibImpl->LibAttr.lcid = 0; + pTypeLibImpl->lcid = pTypeLibImpl->set_lcid = 0; ptr += 2; ptr += 4; /* skip res12 */ - pTypeLibImpl->LibAttr.wLibFlags = *(WORD*)ptr; + pTypeLibImpl->libflags = *(WORD*)ptr; ptr += 2; - pTypeLibImpl->LibAttr.wMajorVerNum = *(WORD*)ptr; + pTypeLibImpl->ver_major = *(WORD*)ptr; ptr += 2; - pTypeLibImpl->LibAttr.wMinorVerNum = *(WORD*)ptr; + pTypeLibImpl->ver_minor = *(WORD*)ptr; ptr += 2; - memcpy(&pTypeLibImpl->LibAttr.guid, ptr, sizeof(GUID)); + memcpy(&pTypeLibImpl->guid, ptr, sizeof(GUID)); ptr += sizeof(GUID); return ptr - (char*)pLibBlk; @@ -4661,7 +4666,13 @@ static HRESULT WINAPI ITypeLib2_fnGetLibAttr( *attr = heap_alloc(sizeof(**attr)); if (!*attr) return E_OUTOFMEMORY; - **attr = This->LibAttr; + (*attr)->guid = This->guid; + (*attr)->lcid = This->set_lcid; + (*attr)->syskind = This->syskind; + (*attr)->wMajorVerNum = This->ver_major; + (*attr)->wMinorVerNum = This->ver_minor; + (*attr)->wLibFlags = This->libflags; + return S_OK; } @@ -8382,8 +8393,8 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetVersion(ICreateTypeLib2 *iface, TRACE("%p %d %d\n", This, majorVerNum, minorVerNum); - This->LibAttr.wMajorVerNum = majorVerNum; - This->LibAttr.wMinorVerNum = minorVerNum; + This->ver_major = majorVerNum; + This->ver_minor = minorVerNum; return S_OK; } @@ -8395,7 +8406,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetGuid(ICreateTypeLib2 *iface, TRACE("%p %s\n", This, debugstr_guid(guid)); - memcpy(&This->LibAttr.guid, guid, sizeof(GUID)); + memcpy(&This->guid, guid, sizeof(GUID)); return S_OK; } @@ -8449,7 +8460,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 *iface, TRACE("%p %x\n", This, lcid); - This->LibAttr.lcid = lcid; + This->set_lcid = lcid; return S_OK; } @@ -8461,7 +8472,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLibFlags(ICreateTypeLib2 *iface, TRACE("%p %x\n", This, libFlags); - This->LibAttr.wLibFlags = libFlags; + This->libflags = libFlags; return S_OK; }

1 0

Andrew Eikum : oleaut32: Pull TYPEATTR struct contents out.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: f7dbebef6695ea765754363a420453bd339476e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7dbebef6695ea765754363a4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 30 16:43:23 2013 -0500 oleaut32: Pull TYPEATTR struct contents out. --- dlls/oleaut32/typelib.c | 464 +++++++++++++++++++++++++---------------------- 1 files changed, 248 insertions(+), 216 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7dbebef6695ea7657543…

1 0

Andrew Eikum : oleaut32: Store all GUIDs in typelibs.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 35342cef6078ba8cccfcac60ca9fc3b8f48fdf7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=35342cef6078ba8cccfcac60c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 30 16:43:27 2013 -0500 oleaut32: Store all GUIDs in typelibs. --- dlls/oleaut32/typelib.c | 169 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 119 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35342cef6078ba8cccfca…

1 0

Vincent Povirk : gdiplus: Add test for measuring a single line that exactly fits.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: e21af554b5602af5497c28ed336b42964cef6204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21af554b5602af5497c28ed3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 30 14:47:13 2013 -0500 gdiplus: Add test for measuring a single line that exactly fits. --- dlls/gdiplus/tests/graphics.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index cbe0b9d..5de0602 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3042,6 +3042,23 @@ static void test_string_functions(void) expect(2, linesfilled); char_height = bounds.Height - char_bounds.Height; + /* Measure the first line. */ + status = GdipMeasureString(graphics, teststring, 4, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expect(4, codepointsfitted); + expect(1, linesfilled); + + /* Give just enough space to fit the first line. */ + rc.Width = bounds.Width; + status = GdipMeasureString(graphics, teststring, 5, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + todo_wine expect(5, codepointsfitted); + todo_wine expect(1, linesfilled); + /* Cut off everything after the first space. */ rc.Width = char_bounds.Width + char_width * 2.1;

1 0