wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Jacek Caban : mshtml: Added tests for returning ActiveX object' s interfaces from object element's QueryInterface.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: d73b1b6d8fb493bece9446bed89357ce156824c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73b1b6d8fb493bece9446bed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 5 17:31:14 2011 +0100 mshtml: Added tests for returning ActiveX object's interfaces from object element's QueryInterface. --- dlls/mshtml/tests/activex.c | 126 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index d9e9c1f..0972392 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -86,6 +86,10 @@ DEFINE_EXPECT(QueryService_TestActiveX); DEFINE_EXPECT(GetMiscStatus); DEFINE_EXPECT(SetAdvise); DEFINE_EXPECT(GetViewStatus); +DEFINE_EXPECT(QI_ITestActiveX); +DEFINE_EXPECT(wrapped_AddRef); +DEFINE_EXPECT(wrapped_Release); +DEFINE_EXPECT(wrapped_func); #define DISPID_SCRIPTPROP 1000 @@ -102,6 +106,9 @@ static int plugin_behavior; static const GUID CLSID_TestActiveX = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xf6,0x68,0x07,0x46}}; +static const GUID IID_ITestActiveX = + {0x178fc663,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xf6,0x68,0x07,0x46}}; + static const char object_ax_str[] = "<html><head></head><body>" "<object classid=\"clsid:" TESTACTIVEX_CLSID "\" width=\"300\" height=\"200\" id=\"objid\">" @@ -1143,6 +1150,57 @@ static const IOleInPlaceObjectWindowlessVtbl OleInPlaceObjectWindowlessVtbl = { static IOleInPlaceObjectWindowless OleInPlaceObjectWindowless = { &OleInPlaceObjectWindowlessVtbl }; +static void *wrapped_iface_vtbl[100]; +static IUnknown wrapped_iface = { (IUnknownVtbl*)wrapped_iface_vtbl }; + +static HRESULT WINAPI wrapped_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected wrapped_QueryInterface call\n"); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI wrapped_AddRef(IUnknown *iface) +{ + CHECK_EXPECT(wrapped_AddRef); + return 2; +} + +static ULONG WINAPI wrapped_Release(IUnknown *iface) +{ + CHECK_EXPECT(wrapped_Release); + return 1; +} + +static HRESULT WINAPI wrapped_func_nocall(IUnknown *iface, int i, double d) +{ + ok(0, "unexpected call\n"); + return E_FAIL; +} + +static HRESULT WINAPI wrapped_func(IUnknown *iface, int i, double d) +{ + CHECK_EXPECT(wrapped_func); + ok(iface == &wrapped_iface, "iface != wrapped_iface\n"); + ok(i == 10, "i = %d\n", i); + ok(d == 32.0, "d = %lf\n", d); + return S_OK; +} + +static void init_wrapped_iface(void) +{ + unsigned i; + + wrapped_iface_vtbl[0] = wrapped_QueryInterface; + wrapped_iface_vtbl[1] = wrapped_AddRef; + wrapped_iface_vtbl[2] = wrapped_Release; + + for(i=3; i<100; i++) + wrapped_iface_vtbl[i] = wrapped_func_nocall; + + wrapped_iface_vtbl[63] = wrapped_func; +} + static HRESULT ax_qi(REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { @@ -1158,6 +1216,9 @@ static HRESULT ax_qi(REFIID riid, void **ppv) *ppv = &ViewObjectEx; }else if(IsEqualGUID(riid, &IID_IOleObject)) { *ppv = &OleObject; + }else if(IsEqualGUID(riid, &IID_ITestActiveX)) { + CHECK_EXPECT(QI_ITestActiveX); + *ppv = &wrapped_iface; }else if(IsEqualGUID(riid, &IID_IOleWindow) || IsEqualGUID(riid, &IID_IOleInPlaceObject) || IsEqualGUID(&IID_IOleInPlaceObjectWindowless, riid)) { *ppv = &OleInPlaceObjectWindowless; @@ -1257,6 +1318,68 @@ static void test_elem_dispex(IDispatchEx *dispex) CHECK_CALLED(Invoke_SCRIPTPROP); } +static void test_iface_wrapping(IHTMLObjectElement *elem) +{ + IHTMLObjectElement *elem2; + IUnknown *unk, *unk2; + ULONG ref; + void **vtbl; + HRESULT hres; + + SET_EXPECT(QI_ITestActiveX); + SET_EXPECT(wrapped_AddRef); + SET_EXPECT(wrapped_Release); + unk = (void*)0xdeadbeef; + hres = IHTMLObjectElement_QueryInterface(elem, &IID_ITestActiveX, (void**)&unk); + ok(hres == S_OK, "QueryInerface(IID_ITestActiveX failed: %08x\n", hres); + CHECK_CALLED(QI_ITestActiveX); + CHECK_CALLED(wrapped_AddRef); + CHECK_CALLED(wrapped_Release); + + /* See dlls/mshtml/ifacewrap.c */ + ok(unk != &wrapped_iface, "Unexpected unk %p, expected %p (%p, %p)\n", unk, &ViewObjectEx, unk->lpVtbl, &ViewObjectExVtbl); + ok(unk->lpVtbl != wrapped_iface.lpVtbl, "unk->lpVtbl == wrapped_iface->lpVtbl\n"); + ok(unk->lpVtbl->QueryInterface != wrapped_QueryInterface, "QueryInterface not wrapped\n"); + ok(unk->lpVtbl->AddRef != wrapped_AddRef, "AddRef not wrapped\n"); + ok(unk->lpVtbl->Release != wrapped_Release, "Release not wrapped\n"); + + vtbl = (void**)unk->lpVtbl; + ok(vtbl[4] != wrapped_func_nocall, "func not wrapped\n"); + ok(vtbl[63] != wrapped_func, "func not wrapped\n"); + + SET_EXPECT(wrapped_func); + hres = ((HRESULT (WINAPI*)(IUnknown*,int,double))vtbl[63])(unk, 10, 32.0); + ok(hres == S_OK, "wrapped_func returned %08x\n", hres); + CHECK_CALLED(wrapped_func); + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLObjectElement, (void**)&elem2); + ok(hres == S_OK, "Could not get IHTMLObjectElement from wrapped iface: %08x\n", hres); + ok(iface_cmp((IUnknown*)elem2, (IUnknown*)elem), "elem2 != elem\n"); + IHTMLObjectElement_Release(elem2); + + SET_EXPECT(wrapped_Release); + ref = IUnknown_Release(unk); + ok(!ref, "ref=%d\n", ref); + CHECK_CALLED(wrapped_Release); + + SET_EXPECT(QI_ITestActiveX); + SET_EXPECT(wrapped_AddRef); + SET_EXPECT(wrapped_Release); + unk = (void*)0xdeadbeef; + hres = IHTMLObjectElement_QueryInterface(elem, &IID_ITestActiveX, (void**)&unk2); + ok(hres == S_OK, "QueryInerface(IID_ITestActiveX failed: %08x\n", hres); + CHECK_CALLED(QI_ITestActiveX); + CHECK_CALLED(wrapped_AddRef); + CHECK_CALLED(wrapped_Release); + + ok(unk != unk2, "unk == unk2\n"); + + SET_EXPECT(wrapped_Release); + ref = IUnknown_Release(unk2); + ok(!ref, "ref=%d\n", ref); + CHECK_CALLED(wrapped_Release); +} + static void test_object_elem(IHTMLDocument2 *doc) { IHTMLObjectElement *objelem; @@ -1293,6 +1416,8 @@ static void test_object_elem(IHTMLDocument2 *doc) test_elem_dispex(dispex); IDispatchEx_Release(dispex); + test_iface_wrapping(objelem); + IHTMLObjectElement_Release(objelem); } @@ -2171,6 +2296,7 @@ START_TEST(activex) return; } + init_wrapped_iface(); container_hwnd = create_container_window(); ShowWindow(container_hwnd, SW_SHOW);

1 0

Jacek Caban : mshtml: Return wrapped ActiveX object' s interface from object element's QueryInterface.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: fc504c9117e09661ac52da0cd81acb5c995a2321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc504c9117e09661ac52da0cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 5 17:29:43 2011 +0100 mshtml: Return wrapped ActiveX object's interface from object element's QueryInterface. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlobject.c | 21 +++- dlls/mshtml/ifacewrap.c | 340 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 4 files changed, 363 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc504c9117e09661ac52d…

1 0

Marcus Meissner : ole32: Output more information in OleCreateStaticFromData .
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: cfe49e3697b95c1cc198d2477ce67f02a103c5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe49e3697b95c1cc198d2477… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 4 23:52:55 2011 +0100 ole32: Output more information in OleCreateStaticFromData. --- dlls/ole32/ole2stubs.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index b029a86..16ac8d1 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -90,7 +90,8 @@ HRESULT WINAPI OleCreateStaticFromData(LPDATAOBJECT pSrcDataObj, REFIID iid, DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj) { - FIXME("(not shown), stub!\n"); + FIXME("(srcdata=%p, refiid=%s, renderopt=%x, formatetc=%p, client=%p, storage=%p, ppv=%p), stub!\n", + pSrcDataObj,debugstr_guid(iid),renderopt,pFormatEtc,pClientSite,pStg,ppvObj ); return E_NOTIMPL; }

1 0

Marcus Meissner : ole32: Handle VT_BLOB in PropertyStorage_ReadProperty.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 48ae8e9ced8475127bb83625d62dd641b88b9c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ae8e9ced8475127bb83625d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 4 23:52:44 2011 +0100 ole32: Handle VT_BLOB in PropertyStorage_ReadProperty. --- dlls/ole32/stg_prop.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 53c2a99..53f57c1 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1111,6 +1111,22 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This, } break; } + case VT_BLOB: + { + DWORD count; + + StorageUtl_ReadDWord(data, 0, &count); + prop->u.blob.cbSize = count; + prop->u.blob.pBlobData = CoTaskMemAlloc(count); + if (prop->u.blob.pBlobData) + { + memcpy(prop->u.blob.pBlobData, data + sizeof(DWORD), count); + TRACE("Read blob value of size %d\n", count); + } + else + hr = STG_E_INSUFFICIENTMEMORY; + break; + } case VT_LPWSTR: { DWORD count;

1 0

Stefan Dösinger : ddraw/tests: Update a copyright line .
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: ea151da3cdc23bbbba562d05522b6e5983448443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea151da3cdc23bbbba562d055… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 5 00:07:22 2011 +0100 ddraw/tests: Update a copyright line. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ae057bc..5efe718 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2,7 +2,7 @@ * Some unit tests for d3d functions * * Copyright (C) 2005 Antoine Chavasse - * Copyright (C) 2006 Stefan Dösinger for CodeWeavers + * Copyright (C) 2006,2011 Stefan Dösinger for CodeWeavers * Copyright (C) 2008 Alexander Dorofeyev * * This library is free software; you can redistribute it and/or

1 0

Stefan Dösinger : ddraw/tests: Add a IDirect3DDevice7 GetCaps test.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: d4f504c698541826e665034fe2a1d75ae1be9742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f504c698541826e665034fe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 5 00:07:21 2011 +0100 ddraw/tests: Add a IDirect3DDevice7 GetCaps test. --- dlls/ddraw/device.c | 6 ++++++ dlls/ddraw/tests/d3d.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2c48ec1..c978d45 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -459,6 +459,12 @@ IDirect3DDeviceImpl_7_GetCaps(IDirect3DDevice7 *iface, TRACE("iface %p, device_desc %p.\n", iface, Desc); + if (!Desc) + { + WARN("Desc is NULL, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } + /* Call the same function used by IDirect3D, this saves code */ return IDirect3DImpl_GetCaps(This->ddraw->wined3d, &OldDesc, Desc); } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d94fd7e..ae057bc 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4980,6 +4980,21 @@ static void test_get_caps1(void) ok(hr == D3D_OK, "GetCaps with different sizes returned hr %#x, expected D3D_OK.\n", hr); } +static void test_get_caps7(void) +{ + HRESULT hr; + D3DDEVICEDESC7 desc; + + hr = IDirect3DDevice7_GetCaps(lpD3DDevice, NULL); + ok(hr == DDERR_INVALIDPARAMS, "IDirect3DDevice7::GetCaps(NULL) returned hr %#x, expected INVALIDPARAMS.\n", hr); + + memset(&desc, 0, sizeof(desc)); + hr = IDirect3DDevice7_GetCaps(lpD3DDevice, &desc); + ok(hr == D3D_OK, "IDirect3DDevice7::GetCaps(non-NULL) returned hr %#x, expected D3D_OK.\n", hr); + + /* There's no dwSize in D3DDEVICEDESC7 */ +} + START_TEST(d3d) { init_function_pointers(); @@ -5007,6 +5022,7 @@ START_TEST(d3d) SetRenderTargetTest(); VertexBufferLockRest(); z_format_test(); + test_get_caps7(); ReleaseDirect3D(); }

1 0

Stefan Dösinger : ddraw: Size handling fixes for IDirect3DDevice::GetCaps.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: cc06d182fb433c7009dfb640b33d4ecd27bbd4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc06d182fb433c7009dfb640b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 5 00:07:20 2011 +0100 ddraw: Size handling fixes for IDirect3DDevice::GetCaps. --- dlls/ddraw/device.c | 49 ++++++++++++++++++++++++++- dlls/ddraw/tests/d3d.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e9e7744..2c48ec1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -500,21 +500,66 @@ IDirect3DDeviceImpl_7_GetCaps_FPUPreserve(IDirect3DDevice7 *iface, * D3DERR_* if a problem occurs. See WineD3D * *****************************************************************************/ + +/* There are 3 versions of D3DDEVICEDESC. All 3 share the same name because + * Microsoft just expanded the existing structure without naming them + * D3DDEVICEDESC2 and D3DDEVICEDESC3. Which version is used have depends + * on the version of the DirectX SDK. DirectX 6+ and Wine use the latest + * one with 252 bytes. + * + * All 3 versions are allowed as parameters and only the specified amount of + * bytes is written. + * + * Note that Direct3D7 and earlier are not available in native Win64 + * ddraw.dll builds, so possible size differences between 32 bit and + * 64 bit are a non-issue. + */ +static inline BOOL check_d3ddevicedesc_size(DWORD size) +{ + if (size == FIELD_OFFSET(D3DDEVICEDESC, dwMinTextureWidth) /* 172 */ + || size == FIELD_OFFSET(D3DDEVICEDESC, dwMaxTextureRepeat) /* 204 */ + || size == sizeof(D3DDEVICEDESC) /* 252 */) return TRUE; + return FALSE; +} + static HRESULT WINAPI IDirect3DDeviceImpl_3_GetCaps(IDirect3DDevice3 *iface, D3DDEVICEDESC *HWDesc, D3DDEVICEDESC *HelDesc) { IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface); + D3DDEVICEDESC oldDesc; D3DDEVICEDESC7 newDesc; HRESULT hr; TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, HWDesc, HelDesc); - hr = IDirect3DImpl_GetCaps(This->ddraw->wined3d, HWDesc, &newDesc); + if (!HWDesc) + { + WARN("HWDesc is NULL, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } + if (!check_d3ddevicedesc_size(HWDesc->dwSize)) + { + WARN("HWDesc->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", HWDesc->dwSize); + return DDERR_INVALIDPARAMS; + } + if (!HelDesc) + { + WARN("HelDesc is NULL, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } + if (!check_d3ddevicedesc_size(HelDesc->dwSize)) + { + WARN("HelDesc->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", HelDesc->dwSize); + return DDERR_INVALIDPARAMS; + } + + hr = IDirect3DImpl_GetCaps(This->ddraw->wined3d, &oldDesc, &newDesc); if(hr != D3D_OK) return hr; - *HelDesc = *HWDesc; + DD_STRUCT_COPY_BYSIZE(HWDesc, &oldDesc); + DD_STRUCT_COPY_BYSIZE(HelDesc, &oldDesc); return D3D_OK; } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 153d39f..d94fd7e 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4895,6 +4895,91 @@ static void test_coop_level_surf_create(void) IDirectDraw7_Release(ddraw7); } +static void test_get_caps1(void) +{ + D3DDEVICEDESC hw_caps, hel_caps; + HRESULT hr; + unsigned int i; + + memset(&hw_caps, 0, sizeof(hw_caps)); + hw_caps.dwSize = sizeof(hw_caps); + hw_caps.dwFlags = 0xdeadbeef; + memset(&hel_caps, 0, sizeof(hel_caps)); + hel_caps.dwSize = sizeof(hel_caps); + hel_caps.dwFlags = 0xdeadc0de; + + /* NULL pointers */ + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, NULL); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with NULL hel caps returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hw_caps.dwFlags == 0xdeadbeef, "hw_caps.dwFlags was modified: %#x.\n", hw_caps.dwFlags); + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, NULL, &hel_caps); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with NULL hw caps returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hel_caps.dwFlags == 0xdeadc0de, "hel_caps.dwFlags was modified: %#x.\n", hel_caps.dwFlags); + + /* Successful call: Both are modified */ + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, &hel_caps); + ok(hr == D3D_OK, "GetCaps with correct size returned hr %#x, expected D3D_OK.\n", hr); + ok(hw_caps.dwFlags != 0xdeadbeef, "hw_caps.dwFlags was not modified: %#x.\n", hw_caps.dwFlags); + ok(hel_caps.dwFlags != 0xdeadc0de, "hel_caps.dwFlags was not modified: %#x.\n", hel_caps.dwFlags); + + memset(&hw_caps, 0, sizeof(hw_caps)); + hw_caps.dwSize = sizeof(hw_caps); + hw_caps.dwFlags = 0xdeadbeef; + memset(&hel_caps, 0, sizeof(hel_caps)); + /* Keep dwSize at 0 */ + hel_caps.dwFlags = 0xdeadc0de; + + /* If one is invalid the call fails */ + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, &hel_caps); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with invalid hel_caps size returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hw_caps.dwFlags == 0xdeadbeef, "hw_caps.dwFlags was modified: %#x.\n", hw_caps.dwFlags); + ok(hel_caps.dwFlags == 0xdeadc0de, "hel_caps.dwFlags was modified: %#x.\n", hel_caps.dwFlags); + hel_caps.dwSize = sizeof(hel_caps); + hw_caps.dwSize = sizeof(hw_caps) + 1; + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, &hel_caps); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with invalid hw_caps size returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hw_caps.dwFlags == 0xdeadbeef, "hw_caps.dwFlags was modified: %#x.\n", hw_caps.dwFlags); + ok(hel_caps.dwFlags == 0xdeadc0de, "hel_caps.dwFlags was modified: %#x.\n", hel_caps.dwFlags); + + for (i = 0; i < 1024; i++) + { + memset(&hw_caps, 0xfe, sizeof(hw_caps)); + memset(&hel_caps, 0xfe, sizeof(hel_caps)); + hw_caps.dwSize = hel_caps.dwSize = i; + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, &hel_caps); + switch (i) + { + /* D3DDEVICEDESCSIZE in old sdk versions */ + case FIELD_OFFSET(D3DDEVICEDESC, dwMinTextureWidth): /* 172, DirectX 3, IDirect3DDevice1 */ + ok(hw_caps.dwMinTextureWidth == 0xfefefefe, "hw_caps.dwMinTextureWidth was modified: %#x.\n", + hw_caps.dwMinTextureWidth); + ok(hel_caps.dwMinTextureWidth == 0xfefefefe, "hel_caps.dwMinTextureWidth was modified: %#x.\n", + hel_caps.dwMinTextureWidth); + /* drop through */ + case FIELD_OFFSET(D3DDEVICEDESC, dwMaxTextureRepeat): /* 204, DirectX 5, IDirect3DDevice2 */ + ok(hw_caps.dwMaxTextureRepeat == 0xfefefefe, "hw_caps.dwMaxTextureRepeat was modified: %#x.\n", + hw_caps.dwMaxTextureRepeat); + ok(hel_caps.dwMaxTextureRepeat == 0xfefefefe, "hel_caps.dwMaxTextureRepeat was modified: %#x.\n", + hel_caps.dwMaxTextureRepeat); + /* drop through */ + case sizeof(D3DDEVICEDESC): /* 252, DirectX 6, IDirect3DDevice3 */ + ok(hr == D3D_OK, "GetCaps with size %u returned hr %#x, expected D3D_OK.\n", i, hr); + break; + + default: + ok(hr == DDERR_INVALIDPARAMS, + "GetCaps with size %u returned hr %#x, expected DDERR_INVALIDPARAMS.\n", i, hr); + break; + } + } + + /* Different valid sizes are OK */ + hw_caps.dwSize = 172; + hel_caps.dwSize = sizeof(D3DDEVICEDESC); + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, &hel_caps); + ok(hr == D3D_OK, "GetCaps with different sizes returned hr %#x, expected D3D_OK.\n", hr); +} + START_TEST(d3d) { init_function_pointers(); @@ -4934,6 +5019,7 @@ START_TEST(d3d) FindDevice(); BackBuffer3DCreateSurfaceTest(); BackBuffer3DAttachmentTest(); + test_get_caps1(); D3D1_releaseObjects(); }

1 0

Aric Stewart : usp10: Correct issues with LTR logclust indexing after Multiple substitution.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 66736948475bf909cfb3bdfc9ffa428d61909f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66736948475bf909cfb3bdfc9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 5 09:50:10 2011 -0600 usp10: Correct issues with LTR logclust indexing after Multiple substitution. --- dlls/usp10/shape.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 04f0ff4..2189b92 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1360,9 +1360,13 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch int replacing_glyph = -1; int changed = 0; - if (changeCount > 0) - target_glyph = nextIndex - ((changeCount+1)*write_dir); + { + if (write_dir > 0) + target_glyph = nextIndex - changeCount; + else + target_glyph = nextIndex + (changeCount + 1); + } seeking_glyph = target_glyph;

1 0

Andrew Eikum : wineoss.drv: Don't set volume in IAudioClient::Initialize.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: eed756c8dd352c35958c5ee5534eefc76cb82504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed756c8dd352c35958c5ee55… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 5 06:37:29 2011 -0600 wineoss.drv: Don't set volume in IAudioClient::Initialize. --- dlls/wineoss.drv/mmdevdrv.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index bb3297b..571495d 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -931,10 +931,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_FAIL; } - mask = (100 << 8) | 100; - if(ioctl(This->fd, SNDCTL_DSP_SETPLAYVOL, &mask) < 0) - WARN("SETPLAYVOL failed: %d (%s)\n", errno, strerror(errno)); - This->fmt = clone_format(fmt); if(!This->fmt){ LeaveCriticalSection(&This->lock);

1 0

Alexandre Julliard : winex11: Always refresh the picture clipping when we have an additional clip region .
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: abd5d5a3a95c01c3b010ecad9cc960013e1e5924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd5d5a3a95c01c3b010ecad9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 17:21:17 2011 +0100 winex11: Always refresh the picture clipping when we have an additional clip region. --- dlls/winex11.drv/xrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 3853cd8..1c15d2a 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -594,7 +594,7 @@ static Picture get_xrender_picture( struct xrender_physdev *dev, HRGN clip_rgn, dev->update_clip = TRUE; } - if (dev->update_clip) + if (dev->update_clip || clip_rect || clip_rgn) { RGNDATA *clip_data; HRGN rgn = 0;

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011