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

André Hentschel : d3drm: Implement IDirect3DRMMaterial2_GetClassName.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 029318107bf7a07092caa2b2eccd2a2e23694057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=029318107bf7a07092caa2b2e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 15:37:05 2012 +0200 d3drm: Implement IDirect3DRMMaterial2_GetClassName. --- dlls/d3drm/material.c | 10 ++++- dlls/d3drm/tests/d3drm.c | 90 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 94 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 1eb04a9..6ac08e3 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -160,9 +160,15 @@ static HRESULT WINAPI IDirect3DRMMaterial2Impl_GetName(IDirect3DRMMaterial2* ifa static HRESULT WINAPI IDirect3DRMMaterial2Impl_GetClassName(IDirect3DRMMaterial2* iface, LPDWORD size, LPSTR name) { - FIXME("(%p)->(%p, %p): stub\n", iface, size, name); + TRACE("(%p)->(%p, %p)\n", iface, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Material") || !name) + return E_INVALIDARG; + + strcpy(name, "Material"); + *size = sizeof("Material"); + + return D3DRM_OK; } /*** IDirect3DRMMaterial methods ***/ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5a66d54..8753653 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -208,7 +208,7 @@ static void test_MeshBuilder(void) size = sizeof(cname); hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, &size, cname); ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(size == sizeof("Builder"), "wrong strlen: %u\n", size); + ok(size == sizeof("Builder"), "wrong size: %u\n", size); ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); info.lpMemory = data_bad_version; @@ -478,7 +478,7 @@ static void test_MeshBuilder3(void) size = sizeof(cname); hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, &size, cname); ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(size == sizeof("Builder"), "wrong strlen: %u\n", size); + ok(size == sizeof("Builder"), "wrong size: %u\n", size); ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); info.lpMemory = data_bad_version; @@ -621,7 +621,7 @@ static void test_Frame(void) count = sizeof(cname); hr = IDirect3DRMFrame_GetClassName(pFrameC, &count, cname); ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(count == sizeof("Frame"), "wrong strlen: %u\n", count); + ok(count == sizeof("Frame"), "wrong size: %u\n", count); ok(!strcmp(cname, "Frame"), "Expected cname to be \"Frame\", but got \"%s\"\n", cname); hr = IDirect3DRMFrame_GetParent(pFrameC, NULL); @@ -931,7 +931,7 @@ static void test_Light(void) size = sizeof(cname); hr = IDirect3DRMLight_GetClassName(pLight, &size, cname); ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(size == sizeof("Light"), "wrong strlen: %u\n", size); + ok(size == sizeof("Light"), "wrong size: %u\n", size); ok(!strcmp(cname, "Light"), "Expected cname to be \"Light\", but got \"%s\"\n", cname); type = IDirect3DRMLight_GetType(pLight); @@ -960,6 +960,87 @@ static void test_Light(void) IDirect3DRM_Release(pD3DRM); } +static void test_Material2(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECT3DRM3 pD3DRM3; + LPDIRECT3DRMMATERIAL2 pMaterial2; + D3DVALUE r, g, b; + DWORD size; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_QueryInterface(pD3DRM, &IID_IDirect3DRM3, (LPVOID*)&pD3DRM3); + if (FAILED(hr)) + { + win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(pD3DRM); + return; + } + + hr = IDirect3DRM3_CreateMaterial(pD3DRM3, 18.5f, &pMaterial2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface (hr = %x)\n", hr); + + hr = IDirect3DRMMaterial2_GetClassName(pMaterial2, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMMaterial2_GetClassName(pMaterial2, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMMaterial2_GetClassName(pMaterial2, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMMaterial2_GetClassName(pMaterial2, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Material"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Material"), "Expected cname to be \"Material\", but got \"%s\"\n", cname); + + r = IDirect3DRMMaterial2_GetPower(pMaterial2); + ok(r == 18.5f, "wrong power (%f)\n", r); + + hr = IDirect3DRMMaterial2_GetEmissive(pMaterial2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr); + ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong emissive r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b); + + hr = IDirect3DRMMaterial2_GetSpecular(pMaterial2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr); + todo_wine ok(r == 1.0f && g == 1.0f && b == 1.0f, "wrong specular r=%f g=%f b=%f, expected r=1.0 g=1.0 b=1.0\n", r, g, b); + + hr = IDirect3DRMMaterial2_GetAmbient(pMaterial2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr); + ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong ambient r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b); + + hr = IDirect3DRMMaterial2_SetPower(pMaterial2, 5.87f); + ok(hr == D3DRM_OK, "Cannot set power (hr = %x)\n", hr); + r = IDirect3DRMMaterial2_GetPower(pMaterial2); + ok(r == 5.87f, "wrong power (%f)\n", r); + + hr = IDirect3DRMMaterial2_SetEmissive(pMaterial2, 0.5f, 0.5f, 0.5f); + ok(hr == D3DRM_OK, "Cannot set emissive (hr = %x)\n", hr); + hr = IDirect3DRMMaterial2_GetEmissive(pMaterial2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr); + ok(r == 0.5f && g == 0.5f && b == 0.5f, "wrong emissive r=%f g=%f b=%f, expected r=0.5 g=0.5 b=0.5\n", r, g, b); + + hr = IDirect3DRMMaterial2_SetSpecular(pMaterial2, 0.6f, 0.6f, 0.6f); + ok(hr == D3DRM_OK, "Cannot set specular (hr = %x)\n", hr); + hr = IDirect3DRMMaterial2_GetSpecular(pMaterial2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get specular (hr = %x)\n", hr); + ok(r == 0.6f && g == 0.6f && b == 0.6f, "wrong specular r=%f g=%f b=%f, expected r=0.6 g=0.6 b=0.6\n", r, g, b); + + hr = IDirect3DRMMaterial2_SetAmbient(pMaterial2, 0.7f, 0.7f, 0.7f); + ok(hr == D3DRM_OK, "Cannot set ambient (hr = %x)\n", hr); + hr = IDirect3DRMMaterial2_GetAmbient(pMaterial2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get ambient (hr = %x)\n", hr); + ok(r == 0.7f && g == 0.7f && b == 0.7f, "wrong ambient r=%f g=%f b=%f, expected r=0.7 g=0.7 b=0.7\n", r, g, b); + + IDirect3DRMMaterial2_Release(pMaterial2); + + IDirect3DRM3_Release(pD3DRM3); + IDirect3DRM_Release(pD3DRM); +} + static void test_frame_transform(void) { HRESULT hr; @@ -1026,6 +1107,7 @@ START_TEST(d3drm) test_Mesh(); test_Frame(); test_Light(); + test_Material2(); test_frame_transform(); test_d3drm_load();

1 0

André Hentschel : d3drm: Implement IDirect3DRMX_CreateTexture.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: d71bf7fdb701f093fcad605e401b7bf76f6b211b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71bf7fdb701f093fcad605e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 15:37:59 2012 +0200 d3drm: Implement IDirect3DRMX_CreateTexture. --- dlls/d3drm/d3drm.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3c1c20d..0919a6b 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -191,13 +191,14 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateAnimationSet(IDirect3DRM* iface, LPD return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_CreateTexture(IDirect3DRM* iface, LPD3DRMIMAGE pImage, LPDIRECT3DRMTEXTURE * ppTexture) +static HRESULT WINAPI IDirect3DRMImpl_CreateTexture(IDirect3DRM* iface, LPD3DRMIMAGE pImage, + LPDIRECT3DRMTEXTURE * ppTexture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, pImage, ppTexture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, pImage, ppTexture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown**)ppTexture); } static HRESULT WINAPI IDirect3DRMImpl_CreateLight(IDirect3DRM* iface, D3DRMLIGHTTYPE type, @@ -567,9 +568,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateTexture(IDirect3DRM2* iface, LPD3DR { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, pImage, ppTexture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, pImage, ppTexture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown**)ppTexture); } static HRESULT WINAPI IDirect3DRM2Impl_CreateLight(IDirect3DRM2* iface, D3DRMLIGHTTYPE type, @@ -992,9 +993,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateTexture(IDirect3DRM3* iface, LPD3DR { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, Image, Texture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, Image, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown**)Texture); } static HRESULT WINAPI IDirect3DRM3Impl_CreateLight(IDirect3DRM3* iface, D3DRMLIGHTTYPE type,

1 0

André Hentschel : d3drm: Fix initial specular value of the Material2 interface.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: b2de41308ef095f6b854c1027c23d59d45643f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2de41308ef095f6b854c1027… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 15:38:50 2012 +0200 d3drm: Fix initial specular value of the Material2 interface. --- dlls/d3drm/material.c | 4 ++++ dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 6ac08e3..0c1fa8c 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -320,6 +320,10 @@ HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) object->IDirect3DRMMaterial2_iface.lpVtbl = &Direct3DRMMaterial2_Vtbl; object->ref = 1; + object->specular.r = 1.0f; + object->specular.g = 1.0f; + object->specular.b = 1.0f; + *ret_iface = &object->IDirect3DRMMaterial2_iface; return S_OK; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8753653..dbfd7d1 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1006,7 +1006,7 @@ static void test_Material2(void) hr = IDirect3DRMMaterial2_GetSpecular(pMaterial2, &r, &g, &b); ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr); - todo_wine ok(r == 1.0f && g == 1.0f && b == 1.0f, "wrong specular r=%f g=%f b=%f, expected r=1.0 g=1.0 b=1.0\n", r, g, b); + ok(r == 1.0f && g == 1.0f && b == 1.0f, "wrong specular r=%f g=%f b=%f, expected r=1.0 g=1.0 b=1.0\n", r, g, b); hr = IDirect3DRMMaterial2_GetAmbient(pMaterial2, &r, &g, &b); ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);

1 0

André Hentschel : d3drm: Implement IDirect3DRMTextureX_GetClassName.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: e5de199289a2de2cb62bb9c5afcb192ae7f6eafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5de199289a2de2cb62bb9c5a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 15:39:36 2012 +0200 d3drm: Implement IDirect3DRMTextureX_GetClassName. --- dlls/d3drm/tests/d3drm.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/texture.c | 18 ++++++++++++++---- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index dbfd7d1..e975289 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1041,6 +1041,45 @@ static void test_Material2(void) IDirect3DRM_Release(pD3DRM); } +static void test_Texture(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECT3DRMTEXTURE pTexture; + D3DRMIMAGE initimg = { + 2, 2, 1, 1, 32, + TRUE, 2 * sizeof(DWORD), NULL, NULL, + 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, 0, NULL + }; + DWORD pixel[4] = { 20000, 30000, 10000, 0 }; + DWORD size; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + initimg.buffer1 = &pixel; + hr = IDirect3DRM_CreateTexture(pD3DRM, &initimg, &pTexture); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMTexture interface (hr = %x)\n", hr); + + hr = IDirect3DRMTexture_GetClassName(pTexture, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMTexture_GetClassName(pTexture, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMTexture_GetClassName(pTexture, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMTexture_GetClassName(pTexture, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Texture"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Texture"), "Expected cname to be \"Texture\", but got \"%s\"\n", cname); + + IDirect3DRMTexture_Release(pTexture); + + IDirect3DRM_Release(pD3DRM); +} + static void test_frame_transform(void) { HRESULT hr; @@ -1108,6 +1147,7 @@ START_TEST(d3drm) test_Frame(); test_Light(); test_Material2(); + test_Texture(); test_frame_transform(); test_d3drm_load(); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 44a9061..cfa7e85 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -160,9 +160,11 @@ static HRESULT WINAPI IDirect3DRMTexture2Impl_GetName(IDirect3DRMTexture2* iface static HRESULT WINAPI IDirect3DRMTexture2Impl_GetClassName(IDirect3DRMTexture2* iface, LPDWORD size, LPSTR name) { - FIXME("(%p)->(%p, %p): stub\n", iface, size, name); + IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + + return IDirect3DRMTexture3_GetClassName(&This->IDirect3DRMTexture3_iface, size, name); } /*** IDirect3DRMTexture3 methods ***/ @@ -522,9 +524,17 @@ static HRESULT WINAPI IDirect3DRMTexture3Impl_GetName(IDirect3DRMTexture3* iface static HRESULT WINAPI IDirect3DRMTexture3Impl_GetClassName(IDirect3DRMTexture3* iface, LPDWORD size, LPSTR name) { - FIXME("(%p)->(%p, %p): stub\n", iface, size, name); + IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture3(iface); - return E_NOTIMPL; + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + + if (!size || *size < strlen("Texture") || !name) + return E_INVALIDARG; + + strcpy(name, "Texture"); + *size = sizeof("Texture"); + + return D3DRM_OK; } /*** IDirect3DRMTexture3 methods ***/

1 0

André Hentschel : d3drm: Implement IDirect3DRMDeviceX_GetClassName.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 069e93f715162e401a1fa49f31ce96e165799c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=069e93f715162e401a1fa49f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 19:02:53 2012 +0200 d3drm: Implement IDirect3DRMDeviceX_GetClassName. --- dlls/d3drm/device.c | 18 ++++++++++----- dlls/d3drm/tests/Makefile.in | 2 +- dlls/d3drm/tests/d3drm.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 8dca026..60fbe98 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -191,13 +191,13 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_GetName(IDirect3DRMDevice2* iface, } static HRESULT WINAPI IDirect3DRMDevice2Impl_GetClassName(IDirect3DRMDevice2* iface, - LPDWORD size, LPSTR name) + LPDWORD size, LPSTR name) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetClassName(&This->IDirect3DRMDevice3_iface, size, name); } /*** IDirect3DRMDevice methods ***/ @@ -613,13 +613,19 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_GetName(IDirect3DRMDevice3* iface, } static HRESULT WINAPI IDirect3DRMDevice3Impl_GetClassName(IDirect3DRMDevice3* iface, - LPDWORD size, LPSTR name) + LPDWORD size, LPSTR name) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Device") || !name) + return E_INVALIDARG; + + strcpy(name, "Device"); + *size = sizeof("Device"); + + return D3DRM_OK; } /*** IDirect3DRMDevice methods ***/ diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in index 5393742..67571c0 100644 --- a/dlls/d3drm/tests/Makefile.in +++ b/dlls/d3drm/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3drm.dll -IMPORTS = dxguid +IMPORTS = dxguid ddraw user32 C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index e975289..f304346 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1080,6 +1080,54 @@ static void test_Texture(void) IDirect3DRM_Release(pD3DRM); } +static void test_Device(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECTDRAWCLIPPER pClipper; + LPDIRECT3DRMDEVICE pDevice; + GUID driver; + HWND window; + RECT rc; + DWORD size; + CHAR cname[64] = {0}; + + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + GetClientRect(window, &rc); + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = DirectDrawCreateClipper(0, &pClipper, NULL); + ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr); + + hr = IDirectDrawClipper_SetHWnd(pClipper, 0, window); + ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr); + + memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID)); + hr = IDirect3DRM3_CreateDeviceFromClipper(pD3DRM, pClipper, &driver, rc.right, rc.bottom, &pDevice); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr); + + hr = IDirect3DRMDevice_GetClassName(pDevice, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMDevice_GetClassName(pDevice, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMDevice_GetClassName(pDevice, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMDevice_GetClassName(pDevice, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Device"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); + + IDirect3DRMDevice_Release(pDevice); + IDirectDrawClipper_Release(pClipper); + + IDirect3DRM_Release(pD3DRM); + DestroyWindow(window); +} + static void test_frame_transform(void) { HRESULT hr; @@ -1145,6 +1193,7 @@ START_TEST(d3drm) test_MeshBuilder3(); test_Mesh(); test_Frame(); + test_Device(); test_Light(); test_Material2(); test_Texture();

1 0

André Hentschel : d3drm: Implement IDirect3DRMWinDevice_GetClassName.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: d9ec2b6dfddb1dbc6f38b93a25cebd7a6a2a24d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ec2b6dfddb1dbc6f38b93a2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 19:04:50 2012 +0200 d3drm: Implement IDirect3DRMWinDevice_GetClassName. --- dlls/d3drm/device.c | 6 +++--- dlls/d3drm/tests/d3drm.c | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 60fbe98..d85670a 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1115,13 +1115,13 @@ static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetName(IDirect3DRMWinDevice* ifa } static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetClassName(IDirect3DRMWinDevice* iface, - LPDWORD size, LPSTR name) + LPDWORD size, LPSTR name) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetClassName(&This->IDirect3DRMDevice3_iface, size, name); } /*** IDirect3DRMWinDevice methods ***/ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f304346..e71d89f 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <d3drm.h> #include <initguid.h> +#include <d3drmwin.h> #include "wine/test.h" @@ -1086,6 +1087,7 @@ static void test_Device(void) LPDIRECT3DRM pD3DRM; LPDIRECTDRAWCLIPPER pClipper; LPDIRECT3DRMDEVICE pDevice; + LPDIRECT3DRMWINDEVICE pWinDevice; GUID driver; HWND window; RECT rc; @@ -1121,6 +1123,30 @@ static void test_Device(void) ok(size == sizeof("Device"), "wrong size: %u\n", size); ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); + /* WinDevice */ + hr = IDirect3DRMDevice_QueryInterface(pDevice, &IID_IDirect3DRMWinDevice, (LPVOID*)&pWinDevice); + if (FAILED(hr)) + { + win_skip("Cannot get IDirect3DRMWinDevice interface (hr = %x), skipping tests\n", hr); + goto cleanup; + } + + hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Device"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); + + IDirect3DRMWinDevice_Release(pWinDevice); + +cleanup: IDirect3DRMDevice_Release(pDevice); IDirectDrawClipper_Release(pClipper);

1 0

André Hentschel : d3drm: Implement IDirect3DRMViewportX_GetClassName.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 4dc0ee57f6f153532430b512f932ceb6de789af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc0ee57f6f153532430b512f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 19:07:14 2012 +0200 d3drm: Implement IDirect3DRMViewportX_GetClassName. --- dlls/d3drm/tests/d3drm.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/viewport.c | 18 +++++++++---- 2 files changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index e71d89f..a86c719 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -906,6 +906,63 @@ static void test_Frame(void) IDirect3DRM_Release(pD3DRM); } +static void test_Viewport(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECTDRAWCLIPPER pClipper; + LPDIRECT3DRMDEVICE pDevice; + LPDIRECT3DRMFRAME pFrame; + LPDIRECT3DRMVIEWPORT pViewport; + GUID driver; + HWND window; + RECT rc; + DWORD size; + CHAR cname[64] = {0}; + + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + GetClientRect(window, &rc); + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = DirectDrawCreateClipper(0, &pClipper, NULL); + ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr); + + hr = IDirectDrawClipper_SetHWnd(pClipper, 0, window); + ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr); + + memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID)); + hr = IDirect3DRM3_CreateDeviceFromClipper(pD3DRM, pClipper, &driver, rc.right, rc.bottom, &pDevice); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateFrame(pD3DRM, NULL, &pFrame); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateViewport(pD3DRM, pDevice, pFrame, rc.left, rc.top, rc.right, rc.bottom, &pViewport); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_GetClassName(pViewport, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMViewport_GetClassName(pViewport, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMViewport_GetClassName(pViewport, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMViewport_GetClassName(pViewport, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Viewport"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Viewport"), "Expected cname to be \"Viewport\", but got \"%s\"\n", cname); + + IDirect3DRMViewport_Release(pViewport); + IDirect3DRMFrame_Release(pFrame); + IDirect3DRMDevice_Release(pDevice); + IDirectDrawClipper_Release(pClipper); + + IDirect3DRM_Release(pD3DRM); +} + static void test_Light(void) { HRESULT hr; @@ -1220,6 +1277,7 @@ START_TEST(d3drm) test_Mesh(); test_Frame(); test_Device(); + test_Viewport(); test_Light(); test_Material2(); test_Texture(); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 33fde1f..fb93dc6 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -177,13 +177,13 @@ static HRESULT WINAPI IDirect3DRMViewportImpl_GetName(IDirect3DRMViewport* iface } static HRESULT WINAPI IDirect3DRMViewportImpl_GetClassName(IDirect3DRMViewport* iface, - LPDWORD size, LPSTR name) + LPDWORD size, LPSTR name) { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + return IDirect3DRMViewport2_GetClassName(&This->IDirect3DRMViewport2_iface, size, name); } /*** IDirect3DRMViewport methods ***/ @@ -598,13 +598,19 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetName(IDirect3DRMViewport2* ifa } static HRESULT WINAPI IDirect3DRMViewport2Impl_GetClassName(IDirect3DRMViewport2* iface, - LPDWORD size, LPSTR name) + LPDWORD size, LPSTR name) { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Viewport") || !name) + return E_INVALIDARG; + + strcpy(name, "Viewport"); + *size = sizeof("Viewport"); + + return D3DRM_OK; } /*** IDirect3DRMViewport methods ***/

1 0

Thomas Faber : ws2_32/tests: Add missing parentheses to ok() output.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: c574ab9680f69c9c443c6ec61829621bd1fd8bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c574ab9680f69c9c443c6ec61… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jun 17 15:03:50 2012 +0200 ws2_32/tests: Add missing parentheses to ok() output. --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2543873..6fa4249 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1182,14 +1182,14 @@ static void test_set_getsockopt(void) SetLastError(0xdeadbeef); err = setsockopt(s, 0xffffffff, SO_RCVTIMEO, (char *) &timeout, size); ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), - "got %d with %d (expected SOCKET_ERROR with WSAEINVAL\n", + "got %d with %d (expected SOCKET_ERROR with WSAEINVAL)\n", err, WSAGetLastError()); timeout = SOCKTIMEOUT1; SetLastError(0xdeadbeef); err = setsockopt(s, 0x00008000, SO_RCVTIMEO, (char *) &timeout, size); ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), - "got %d with %d (expected SOCKET_ERROR with WSAEINVAL\n", + "got %d with %d (expected SOCKET_ERROR with WSAEINVAL)\n", err, WSAGetLastError()); closesocket(s);

1 0

Thomas Faber : wininet: Use the correct struct in a sizeof.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 7d24e5922937beb0a2c2b47d6fab86c5c19ec1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d24e5922937beb0a2c2b47d6… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jun 17 16:18:36 2012 +0200 wininet: Use the correct struct in a sizeof. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3d0ae34..1788bf2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2129,7 +2129,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe INTERNET_CERTIFICATE_INFOA *info = (INTERNET_CERTIFICATE_INFOA*)buffer; DWORD len; - memset(info, 0, sizeof(INTERNET_CERTIFICATE_INFOW)); + memset(info, 0, sizeof(*info)); info->ftExpiry = context->pCertInfo->NotAfter; info->ftStart = context->pCertInfo->NotBefore; len = CertNameToStrA(context->dwCertEncodingType,

1 0

Thomas Faber : port.h: Add INFINITY macro.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: cb8af0152c97082503d38de2a498727df2feed77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8af0152c97082503d38de2a… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jun 17 15:59:25 2012 +0200 port.h: Add INFINITY macro. --- include/wine/port.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 4b653c7..9030aab 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -199,6 +199,15 @@ struct statvfs #define M_PI_2 1.570796326794896619 #endif +#ifndef INFINITY +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() +#endif + #ifndef NAN static inline float __port_nan(void) {

1 0