wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Jörg Höhle : dsound: Vista/ XP SP2 reworked the Speaker Configuration.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 999423d34e896192f7cf57016baa92cbf38bf9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=999423d34e896192f7cf57016… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Sep 24 21:11:45 2011 +0200 dsound: Vista/XP SP2 reworked the Speaker Configuration. --- dlls/dsound/dsound.c | 2 +- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- include/dsound.h | 5 +++++ include/ksmedia.h | 2 ++ 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index fbfb4f8..b3475ad 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1172,7 +1172,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) device->ref = 1; device->priolevel = DSSCL_NORMAL; device->state = STATE_STOPPED; - device->speaker_config = DSSPEAKER_STEREO | (DSSPEAKER_GEOMETRY_NARROW << 16); + device->speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); /* 3D listener initial parameters */ device->ds3dl.dwSize = sizeof(DS3DLISTENER); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8e79c6e..0cb7b9b 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1206,7 +1206,7 @@ static DWORD get_channel_mask(unsigned int channels) case 7: return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; case 8: - return KSAUDIO_SPEAKER_7POINT1; /* not 7POINT1_SURROUND */ + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ } FIXME("Unknown speaker configuration: %u\n", channels); return 0; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 19a505c..5d69e3c 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -700,7 +700,7 @@ static DWORD get_channel_mask(unsigned int channels) case 7: return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; case 8: - return KSAUDIO_SPEAKER_7POINT1; /* not 7POINT1_SURROUND */ + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ } FIXME("Unknown speaker configuration: %u\n", channels); return 0; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index aaa94ee..89c9adf 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -657,7 +657,7 @@ static DWORD get_channel_mask(unsigned int channels) case 7: return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; case 8: - return KSAUDIO_SPEAKER_7POINT1; /* not 7POINT1_SURROUND */ + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ } FIXME("Unknown speaker configuration: %u\n", channels); return 0; diff --git a/include/dsound.h b/include/dsound.h index 372fabf..cd284aa 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -301,13 +301,18 @@ typedef struct _DSBPOSITIONNOTIFY } DSBPOSITIONNOTIFY,*LPDSBPOSITIONNOTIFY; typedef const DSBPOSITIONNOTIFY *LPCDSBPOSITIONNOTIFY; +#define DSSPEAKER_DIRECTOUT 0 #define DSSPEAKER_HEADPHONE 1 #define DSSPEAKER_MONO 2 #define DSSPEAKER_QUAD 3 #define DSSPEAKER_STEREO 4 #define DSSPEAKER_SURROUND 5 #define DSSPEAKER_5POINT1 6 +#define DSSPEAKER_5POINT1_BACK 6 #define DSSPEAKER_7POINT1 7 +#define DSSPEAKER_7POINT1_WIDE 7 +#define DSSPEAKER_7POINT1_SURROUND 8 +#define DSSPEAKER_5POINT1_SURROUND 9 #define DSSPEAKER_GEOMETRY_MIN 0x00000005 /* 5 degrees */ #define DSSPEAKER_GEOMETRY_NARROW 0x0000000A /* 10 degrees */ diff --git a/include/ksmedia.h b/include/ksmedia.h index 44834bb..dec2866 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -34,8 +34,10 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0 #define KSAUDIO_SPEAKER_QUAD (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) #define KSAUDIO_SPEAKER_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER) #define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +/* 5:1 SIDE or BACK is not distinguished, only 0x3F shall be used (BACK) */ #define KSAUDIO_SPEAKER_5POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) #define KSAUDIO_SPEAKER_7POINT1 (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER) +/* 7:1 home theater 0x63F */ #define KSAUDIO_SPEAKER_7POINT1_SURROUND (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) #ifndef REFERENCE_TIME_DEFINED

1 0

André Hentschel : d3drm: Implement GetVertices for IDirect3DRMMeshBuilder3.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 33c7a865cb9087f2c0fc289211e0d7e216a1aee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c7a865cb9087f2c0fc28921… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:22:04 2012 +0100 d3drm: Implement GetVertices for IDirect3DRMMeshBuilder3. --- dlls/d3drm/meshbuilder.c | 14 ++++++++++---- dlls/d3drm/tests/d3drm.c | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 409e659..34a8d4c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1845,14 +1845,20 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetVertices(IDirect3DRMMeshBui } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetVertices(IDirect3DRMMeshBuilder3* iface, - DWORD IndexFirst, LPDWORD count, - LPD3DVECTOR vector) + DWORD IndexFirst, LPDWORD vcount, + LPD3DVECTOR vertices) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + DWORD count = This->nb_vertices - IndexFirst; - FIXME("(%p)->(%u,%p,%p): stub\n", This, IndexFirst, count, vector); + TRACE("(%p)->(%u,%p,%p)\n", This, IndexFirst, vcount, vertices); - return E_NOTIMPL; + if (vcount) + *vcount = count; + if (vertices && This->nb_vertices) + memcpy(vertices, This->pVertices + IndexFirst, count * sizeof(D3DVECTOR)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetNormals(IDirect3DRMMeshBuilder3* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d4bb77d..f021e2c 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -208,8 +208,8 @@ static void test_MeshBuilder3(void) ok(val == 3, "Wrong number of faces %d (must be 3)\n", val); hr = IDirect3DRMMeshBuilder3_GetVertices(pMeshBuilder3, 0, &val1, NULL); - todo_wine ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); - todo_wine ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1); valu = 1.23f; valv = 3.21f;

1 0

André Hentschel : d3drm/tests: Add refcount testing.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 1b3c8aaf069fdaacb3961de1faf3638cf2b42657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3c8aaf069fdaacb3961de1f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:21:05 2012 +0100 d3drm/tests: Add refcount testing. --- dlls/d3drm/tests/d3drm.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8f3c01c..d4bb77d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "d3drm.h" +#define COBJMACROS +#include <d3drm.h> +#include <initguid.h> #include "wine/test.h" @@ -24,6 +26,13 @@ static HMODULE d3drm_handle = 0; static HRESULT (WINAPI * pDirect3DRMCreate)(LPDIRECT3DRM* ppDirect3DRM); +#define CHECK_REFCOUNT(obj,rc) \ + { \ + int rc_new = rc; \ + int count = get_refcount( (IUnknown *)obj ); \ + ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ + } + #define D3DRM_GET_PROC(func) \ p ## func = (void*)GetProcAddress(d3drm_handle, #func); \ if(!p ## func) { \ @@ -47,6 +56,12 @@ static BOOL InitFunctionPtrs(void) return TRUE; } +static int get_refcount(IUnknown *object) +{ + IUnknown_AddRef( object ); + return IUnknown_Release( object ); +} + static char data_bad_version[] = "xof 0302txt 0064\n" "Header Object\n" @@ -236,11 +251,13 @@ static void test_Frame(void) hr = IDirect3DRM_CreateFrame(pD3DRM, NULL, &pFrameC); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameC, 1); pFrameTmp = (void*)0xdeadbeef; hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); todo_wine ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + CHECK_REFCOUNT(pFrameC, 1); pArray = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameC, &pArray); @@ -264,6 +281,8 @@ static void test_Frame(void) hr = IDirect3DRMFrame_AddChild(pFrameP1, pFrameC); todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 1); + todo_wine CHECK_REFCOUNT(pFrameC, 2); pArray = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP1, &pArray); @@ -279,6 +298,7 @@ static void test_Frame(void) hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); todo_wine ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp); + todo_wine CHECK_REFCOUNT(pFrameP1, 2); /* Add child to second parent */ hr = IDirect3DRM_CreateFrame(pD3DRM, NULL, &pFrameP2); @@ -286,6 +306,7 @@ static void test_Frame(void) hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameC, 2); pArray = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray); @@ -311,10 +332,13 @@ static void test_Frame(void) hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); todo_wine ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp); + todo_wine CHECK_REFCOUNT(pFrameP2, 2); + todo_wine CHECK_REFCOUNT(pFrameC, 2); /* Add child again */ hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameC, 2); pArray = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray); @@ -329,6 +353,7 @@ static void test_Frame(void) /* Delete child */ hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC); todo_wine ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameC, 1); pArray = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray);

1 0

André Hentschel : d3drm: Move GetTextureCoordinates from IDirect3DRMMeshBuilder2 to IDirect3DRMMeshBuilder3 .
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 5aa43a2bfbad2d25d8669291462d5a292b761394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa43a2bfbad2d25d86692914… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:19:58 2012 +0100 d3drm: Move GetTextureCoordinates from IDirect3DRMMeshBuilder2 to IDirect3DRMMeshBuilder3. --- dlls/d3drm/meshbuilder.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 62c3149..409e659 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -772,15 +772,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetTextureCoordinates(IDirect3 { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%d,%p,%p): stub\n", This, index, u, v); + TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v); - if (index >= This->nb_coords2d) - return D3DRMERR_NOTFOUND; - - *u = This->pCoords2d[index].u; - *v = This->pCoords2d[index].v; - - return D3DRM_OK; + return IDirect3DRMMeshBuilder2_GetTextureCoordinates(&This->IDirect3DRMMeshBuilder3_iface, + index, u, v); } static int WINAPI IDirect3DRMMeshBuilder2Impl_AddVertex(IDirect3DRMMeshBuilder2* iface, @@ -1579,9 +1574,15 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetTextureCoordinates(IDirect3 { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%d,%p,%p): stub\n", This, index, u, v); + TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v); - return E_NOTIMPL; + if (index >= This->nb_coords2d) + return D3DRMERR_NOTFOUND; + + *u = This->pCoords2d[index].u; + *v = This->pCoords2d[index].v; + + return D3DRM_OK; }

1 0

André Hentschel : d3drm: Add more partial stubs for device creation.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: e27d3c0ea5e8c949fa907efc50a9d7fb208e6046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27d3c0ea5e8c949fa907efc5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:18:59 2012 +0100 d3drm: Add more partial stubs for device creation. --- dlls/d3drm/d3drm.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 771ae62..959c1cb 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -249,27 +249,29 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromSurface(IDirect3DRM* iface { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%s,%p,%p,%p): stub\n", iface, This, debugstr_guid(pGUID), pDD, pDDSBack, ppDevice); + FIXME("(%p/%p)->(%s,%p,%p,%p): partial stub\n", iface, This, debugstr_guid(pGUID), pDD, + pDDSBack, ppDevice); - return E_NOTIMPL; + return Direct3DRMDevice_create((IUnknown**)ppDevice); } static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM* iface, LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE * ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p,%p,%p): stub\n", iface, This, pD3D, pD3DDev, ppDevice); + FIXME("(%p/%p)->(%p,%p,%p): partial stub\n", iface, This, pD3D, pD3DDev, ppDevice); - return E_NOTIMPL; + return Direct3DRMDevice_create((IUnknown**)ppDevice); } static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromClipper(IDirect3DRM* iface, LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, LPDIRECT3DRMDEVICE * ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p,%s,%d,%d,%p): stub\n", iface, This, pDDClipper, debugstr_guid(pGUID), width, height, ppDevice); + FIXME("(%p/%p)->(%p,%s,%d,%d,%p): partial stub\n", iface, This, pDDClipper, + debugstr_guid(pGUID), width, height, ppDevice); - return E_NOTIMPL; + return Direct3DRMDevice_create((IUnknown**)ppDevice); } static HRESULT WINAPI IDirect3DRMImpl_CreateTextureFromSurface(IDirect3DRM* iface, LPDIRECTDRAWSURFACE pDDS, LPDIRECT3DRMTEXTURE * ppTexture) @@ -629,9 +631,10 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromSurface(IDirect3DRM2* ifa { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%s,%p,%p,%p): stub\n", iface, This, debugstr_guid(pGUID), pDD, pDDSBack, ppDevice); + FIXME("(%p/%p)->(%s,%p,%p,%p): partial stub\n", iface, This, debugstr_guid(pGUID), + pDD, pDDSBack, ppDevice); - return E_NOTIMPL; + return Direct3DRMDevice_create((IUnknown**)ppDevice); } static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2* iface, LPDIRECT3D2 pD3D, @@ -640,9 +643,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2* iface, { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%p,%p,%p): stub\n", iface, This, pD3D, pD3DDev, ppDevice); + FIXME("(%p/%p)->(%p,%p,%p): partial stub\n", iface, This, pD3D, pD3DDev, ppDevice); - return E_NOTIMPL; + return Direct3DRMDevice_create((IUnknown**)ppDevice); } static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromClipper(IDirect3DRM2* iface, @@ -652,10 +655,10 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromClipper(IDirect3DRM2* ifa { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%p,%s,%d,%d,%p): stub\n", iface, This, pDDClipper, debugstr_guid(pGUID), width, - height, ppDevice); + FIXME("(%p/%p)->(%p,%s,%d,%d,%p): partial stub\n", iface, This, pDDClipper, + debugstr_guid(pGUID), width, height, ppDevice); - return E_NOTIMPL; + return Direct3DRMDevice_create((IUnknown**)ppDevice); } static HRESULT WINAPI IDirect3DRM2Impl_CreateTextureFromSurface(IDirect3DRM2* iface,

1 0

André Hentschel : d3drm: Add IDirect3DRMViewport interface.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 7a96cb4e672b390e646432a40c5f1ade74424138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a96cb4e672b390e646432a40… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:17:02 2012 +0100 d3drm: Add IDirect3DRMViewport interface. --- dlls/d3drm/Makefile.in | 3 +- dlls/d3drm/d3drm.c | 5 +- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/viewport.c | 508 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 514 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a96cb4e672b390e64643…

1 0

André Hentschel : d3drm: Add IDirect3DRMDevice2 interface.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: f018a861377edb96fecc7df644e04b0e9499897e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f018a861377edb96fecc7df64… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:16:02 2012 +0100 d3drm: Add IDirect3DRMDevice2 interface. --- dlls/d3drm/Makefile.in | 1 + dlls/d3drm/d3drm.c | 8 +- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/device.c | 508 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 514 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f018a861377edb96fecc7…

1 0

André Hentschel : d3drm: Move Load implementation to IDirect3DRMMeshBuilder3.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 3931338eca81c89e401aa4b084468a8c9e1c223e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3931338eca81c89e401aa4b08… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:15:16 2012 +0100 d3drm: Move Load implementation to IDirect3DRMMeshBuilder3. --- dlls/d3drm/meshbuilder.c | 423 +++++++++++++++++++++++----------------------- dlls/d3drm/tests/d3drm.c | 10 +- 2 files changed, 217 insertions(+), 216 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3931338eca81c89e401aa…

1 0

André Hentschel : d3drm: Add more Frame tests.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: d16806e3fb34a5da76b452d2efd470ace0cd2835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16806e3fb34a5da76b452d2e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:14:31 2012 +0100 d3drm: Add more Frame tests. --- dlls/d3drm/tests/d3drm.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index b965242..67c6d8c 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -220,6 +220,138 @@ static void test_MeshBuilder3(void) IDirect3DRM_Release(pD3DRM3); } +static void test_Frame(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECT3DRMFRAME pFrameC; + LPDIRECT3DRMFRAME pFrameP1; + LPDIRECT3DRMFRAME pFrameP2; + LPDIRECT3DRMFRAME pFrameTmp; + LPDIRECT3DRMFRAMEARRAY pArray; + DWORD count; + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateFrame(pD3DRM, NULL, &pFrameC); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + todo_wine ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameC, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + todo_wine ok(pArray != NULL, "pArray = %p\n", pArray); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 0, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + /* Add child to first parent */ + hr = IDirect3DRM_CreateFrame(pD3DRM, NULL, &pFrameP1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameP1, &pFrameTmp); + todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + todo_wine ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + + hr = IDirect3DRMFrame_AddChild(pFrameP1, pFrameC); + todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP1, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 1, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + todo_wine ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp); + + /* Add child to second parent */ + hr = IDirect3DRM_CreateFrame(pD3DRM, NULL, &pFrameP2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); + todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 1, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP1, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 0, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + todo_wine ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp); + + /* Add child again */ + hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); + todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 1, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + /* Delete child */ + hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC); + todo_wine ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr); + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 0, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + todo_wine ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + + IDirect3DRMMeshBuilder_Release(pFrameC); + IDirect3DRMMeshBuilder_Release(pFrameP1); + IDirect3DRMMeshBuilder_Release(pFrameP2); + + IDirect3DRM_Release(pD3DRM); +} + START_TEST(d3drm) { if (!InitFunctionPtrs()) @@ -227,6 +359,7 @@ START_TEST(d3drm) test_MeshBuilder(); test_MeshBuilder3(); + test_Frame(); FreeLibrary(d3drm_handle); }

1 0

André Hentschel : d3drm: Add more MeshBuilder tests.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 455edb1870fcf3c38ba71def757158deff00d16a URL: http://source.winehq.org/git/wine.git/?a=commit;h=455edb1870fcf3c38ba71def7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:12:47 2012 +0100 d3drm: Add more MeshBuilder tests. --- dlls/d3drm/tests/Makefile.in | 1 + dlls/d3drm/tests/d3drm.c | 98 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in index f403d0e..5393742 100644 --- a/dlls/d3drm/tests/Makefile.in +++ b/dlls/d3drm/tests/Makefile.in @@ -1,4 +1,5 @@ TESTDLL = d3drm.dll +IMPORTS = dxguid C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 267bd2d..b965242 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -80,7 +80,7 @@ static char data_ok[] = "3; 3, 1, 2;;\n" "}\n"; -static void MeshBuilderTest(void) +static void test_MeshBuilder(void) { HRESULT hr; LPDIRECT3DRM pD3DRM; @@ -88,6 +88,7 @@ static void MeshBuilderTest(void) D3DRMLOADMEMORY info; int val; DWORD val1, val2, val3; + D3DVALUE valu, valv; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -122,17 +123,110 @@ static void MeshBuilderTest(void) todo_wine ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); todo_wine ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv); + todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + todo_wine ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + todo_wine ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 1, valu, valv); + todo_wine ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + + valu = 0.0f; + valv = 0.0f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv); + todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + todo_wine ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); + todo_wine ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); + IDirect3DRMMeshBuilder_Release(pMeshBuilder); IDirect3DRM_Release(pD3DRM); } +static void test_MeshBuilder3(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECT3DRM3 pD3DRM3; + LPDIRECT3DRMMESHBUILDER3 pMeshBuilder3; + D3DRMLOADMEMORY info; + int val; + DWORD val1; + D3DVALUE valu, valv; + + 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); + return; + } + + hr = IDirect3DRM_CreateMeshBuilder(pD3DRM3, &pMeshBuilder3); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); + + info.lpMemory = data_bad_version; + info.dSize = strlen(data_bad_version); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + todo_wine ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr); + + info.lpMemory = data_no_mesh; + info.dSize = strlen(data_no_mesh); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + todo_wine ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr); + + info.lpMemory = data_ok; + info.dSize = strlen(data_ok); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + todo_wine ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + + val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder3); + todo_wine ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val); + + val = IDirect3DRMMeshBuilder_GetFaceCount(pMeshBuilder3); + todo_wine ok(val == 3, "Wrong number of faces %d (must be 3)\n", val); + + hr = IDirect3DRMMeshBuilder3_GetVertices(pMeshBuilder3, 0, &val1, NULL); + todo_wine ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + todo_wine ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1); + + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv); + todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + todo_wine ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + todo_wine ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 1, valu, valv); + todo_wine ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + + valu = 0.0f; + valv = 0.0f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv); + todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + todo_wine ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); + todo_wine ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); + + IDirect3DRMMeshBuilder_Release(pMeshBuilder3); + + IDirect3DRM_Release(pD3DRM3); +} + START_TEST(d3drm) { if (!InitFunctionPtrs()) return; - MeshBuilderTest(); + test_MeshBuilder(); + test_MeshBuilder3(); FreeLibrary(d3drm_handle); }

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
98
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 January 2012