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

Dmitry Timoshkov : windowscodecs: Remove not reachable code in the TIFF decoder.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: a16f7044a44b35246185cb4153f202efd2ac3256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16f7044a44b35246185cb415… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 18 14:32:04 2012 +0900 windowscodecs: Remove not reachable code in the TIFF decoder. --- dlls/windowscodecs/tiffformat.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 66f65d1..669351d 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -440,12 +440,6 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { decode_info->tiled = 1; - if (!ret) - { - WARN("missing tile width\n"); - return E_FAIL; - } - ret = pTIFFGetField(tiff, TIFFTAG_TILELENGTH, &decode_info->tile_height); if (!ret) {

1 0

Nikolay Sivov : msxml3: Revert: msxml3: Reuse MXAttributes implementation for SAX reader attributes reporting.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 16ef649b5fd9f7c42de482f8528b5681fe45b430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ef649b5fd9f7c42de482f85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 17 16:37:45 2012 +0400 msxml3: Revert: msxml3: Reuse MXAttributes implementation for SAX reader attributes reporting. This reverts commit c2c8b9e771a1eb80cab4b142a3bc3ed5434a4a47 and adds a comment for uri reporting feature that some application use, for example Office 2010. The problem is that namespace uri pointer should stay the same and we keep it in element stack for that, MXAttributes allocates new string for each attribute and won't work as needed unfortunately. --- dlls/msxml3/saxreader.c | 533 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 391 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16ef649b5fd9f7c42de48…

1 0

André Hentschel : d3drm: Implement IDirect3DRMViewportX_GetClassName.
by Alexandre Julliard June 18, 2012

June 18, 2012

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

Akihiro Sagawa : gdi32: Fix East-Asian font parameters.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 2bb416baa88c28f57bb0f65aa9af9fff603ba60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb416baa88c28f57bb0f65aa… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 16 23:15:53 2012 +0900 gdi32: Fix East-Asian font parameters. --- dlls/gdi32/gdiobj.c | 18 +++++++++--------- dlls/gdi32/tests/font.c | 7 ------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index d87515f..6514cab 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -328,12 +328,12 @@ static const struct DefaultFontInfo default_fonts[] = }, { SHIFTJIS_CHARSET, { /* System */ - 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, + 18, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'S','y','s','t','e','m','\0'} }, { /* Device Default */ - 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, + 18, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'S','y','s','t','e','m','\0'} }, @@ -343,7 +343,7 @@ static const struct DefaultFontInfo default_fonts[] = {'C','o','u','r','i','e','r','\0'} }, { /* DefaultGuiFont */ - -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, + -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, @@ -365,19 +365,19 @@ static const struct DefaultFontInfo default_fonts[] = {'C','o','u','r','i','e','r','\0'} }, { /* DefaultGuiFont */ - -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, GB2312_CHARSET, + -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, GB2312_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, }, { HANGEUL_CHARSET, { /* System */ - 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, HANGEUL_CHARSET, + 16, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'S','y','s','t','e','m','\0'} }, { /* Device Default */ - 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, HANGEUL_CHARSET, + 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'S','y','s','t','e','m','\0'} }, @@ -387,7 +387,7 @@ static const struct DefaultFontInfo default_fonts[] = {'C','o','u','r','i','e','r','\0'} }, { /* DefaultGuiFont */ - -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, + -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, @@ -409,7 +409,7 @@ static const struct DefaultFontInfo default_fonts[] = {'C','o','u','r','i','e','r','\0'} }, { /* DefaultGuiFont */ - -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET, + -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, @@ -431,7 +431,7 @@ static const struct DefaultFontInfo default_fonts[] = {'C','o','u','r','i','e','r','\0'} }, { /* DefaultGuiFont */ - -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, JOHAB_CHARSET, + -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, JOHAB_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 218b980..d14160b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4460,14 +4460,7 @@ static void test_stock_fonts(void) continue; } - if ((font[i] == DEVICE_DEFAULT_FONT || font[i] == SYSTEM_FONT) && td[i][j].charset != DEFAULT_CHARSET) - todo_wine ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); - else ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); - if ((font[i] == DEFAULT_GUI_FONT && td[i][j].charset != DEFAULT_CHARSET) || - ((font[i] == DEVICE_DEFAULT_FONT || font[i] == SYSTEM_FONT) && td[i][j].charset == SHIFTJIS_CHARSET)) - todo_wine ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight); - else ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight); if (td[i][j].face_name[0] == '?') {

1 0

Akihiro Sagawa : gdi32: Remove an outdated comment in struct DefaultFontInfo.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: f503afd86ff9df9467eb1351cffd904ab3674285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f503afd86ff9df9467eb1351c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 16 23:15:55 2012 +0900 gdi32: Remove an outdated comment in struct DefaultFontInfo. --- dlls/gdi32/gdiobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 6514cab..14ac692 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -123,7 +123,7 @@ struct DefaultFontInfo LOGFONTW SystemFont; LOGFONTW DeviceDefaultFont; LOGFONTW SystemFixedFont; - LOGFONTW DefaultGuiFont; /* Note for this font the lfHeight member should be the point size */ + LOGFONTW DefaultGuiFont; }; static const struct DefaultFontInfo default_fonts[] =

1 0

André Hentschel : d3drm: Implement IDirect3DRMX_CreateMesh.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: ac5b932363ecc954dcfb49c24a027ac14f47e88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5b932363ecc954dcfb49c24… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 15:35:18 2012 +0200 d3drm: Implement IDirect3DRMX_CreateMesh. --- dlls/d3drm/d3drm.c | 12 ++++++------ dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/meshbuilder.c | 4 +--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 923a05c..3c1c20d 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -150,9 +150,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMesh(IDirect3DRM* iface, LPDIRECT3DR { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppMesh); + TRACE("(%p/%p)->(%p)\n", iface, This, ppMesh); - return E_NOTIMPL; + return IDirect3DRM3_CreateMesh(&This->IDirect3DRM3_iface, ppMesh); } static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM* iface, LPDIRECT3DRMMESHBUILDER * ppMeshBuilder) @@ -518,9 +518,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMesh(IDirect3DRM2* iface, LPDIRECT3 { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppMesh); + TRACE("(%p/%p)->(%p)\n", iface, This, ppMesh); - return E_NOTIMPL; + return IDirect3DRM3_CreateMesh(&This->IDirect3DRM3_iface, ppMesh); } static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2* iface, @@ -943,9 +943,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMesh(IDirect3DRM3* iface, LPDIRECT3 { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, Mesh); + TRACE("(%p/%p)->(%p)\n", iface, This, Mesh); - return E_NOTIMPL; + return Direct3DRMMesh_create(Mesh); } static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3* iface, diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 939304c..95eca5f 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -30,6 +30,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; +HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index a05c597..589ebc7 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -static HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj); - typedef struct { unsigned nb_vertices; D3DRMVERTEX* vertices; @@ -2983,7 +2981,7 @@ static const struct IDirect3DRMMeshVtbl Direct3DRMMesh_Vtbl = IDirect3DRMMeshImpl_GetGroupTexture }; -static HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) +HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) { IDirect3DRMMeshImpl* object;

1 0

André Hentschel : d3drm: Implement IDirect3DRMMesh_GetClassName.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 00773feafd73006b1f2b4d958413f13075f6f417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00773feafd73006b1f2b4d958… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 15:36:14 2012 +0200 d3drm: Implement IDirect3DRMMesh_GetClassName. --- dlls/d3drm/meshbuilder.c | 12 +++++++++--- dlls/d3drm/tests/d3drm.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 589ebc7..455bb32 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2584,13 +2584,19 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_GetName(IDirect3DRMMesh* iface, } static HRESULT WINAPI IDirect3DRMMeshImpl_GetClassName(IDirect3DRMMesh* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p, %p)\n", This, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Mesh") || !name) + return E_INVALIDARG; + + strcpy(name, "Mesh"); + *size = sizeof("Mesh"); + + return D3DRM_OK; } /*** IDirect3DRMMesh methods ***/ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 2766098..5a66d54 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -553,6 +553,38 @@ static void test_MeshBuilder3(void) IDirect3DRM_Release(pD3DRM); } +static void test_Mesh(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECT3DRMMESH pMesh; + DWORD size; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateMesh(pD3DRM, &pMesh); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface (hr = %x)\n", hr); + + hr = IDirect3DRMMesh_GetClassName(pMesh, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMMesh_GetClassName(pMesh, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMMesh_GetClassName(pMesh, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMMesh_GetClassName(pMesh, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Mesh"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Mesh"), "Expected cname to be \"Mesh\", but got \"%s\"\n", cname); + + IDirect3DRMMesh_Release(pMesh); + + IDirect3DRM_Release(pD3DRM); +} + static void test_Frame(void) { HRESULT hr; @@ -991,6 +1023,7 @@ START_TEST(d3drm) test_MeshBuilder(); test_MeshBuilder3(); + test_Mesh(); test_Frame(); test_Light(); test_frame_transform();

1 0

André Hentschel : d3drm: Implement IDirect3DRMMaterial2_GetClassName.
by Alexandre Julliard June 18, 2012

June 18, 2012

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 June 18, 2012

June 18, 2012

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 June 18, 2012

June 18, 2012

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