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

Lucas Zawacki : dinput/tests: Added a test for DIPROP_JOYSTICKID.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: e3d243861c3bced6fd7e8e68696cc4b11be3f5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d243861c3bced6fd7e8e686… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue May 29 13:42:28 2012 -0300 dinput/tests: Added a test for DIPROP_JOYSTICKID. --- dlls/dinput/tests/joystick.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index c2f63c2..a49ee2e 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -180,6 +180,7 @@ static BOOL CALLBACK EnumJoysticks( ULONG ref; DIDEVICEINSTANCE inst; DIDEVICEINSTANCE_DX3 inst3; + DIPROPDWORD dipw; HWND hWnd = get_hwnd(); char oldstate[248], curstate[248]; @@ -205,6 +206,16 @@ static BOOL CALLBACK EnumJoysticks( trace("---- %s ----\n", lpddi->tszProductName); + /* Test for joystick ID property */ + ZeroMemory(&dipw, sizeof(dipw)); + dipw.diph.dwSize = sizeof(DIPROPDWORD); + dipw.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dipw.diph.dwObj = 0; + dipw.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_JOYSTICKID, &dipw.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() for DIPROP_JOYSTICKID failed\n"); + hr = IDirectInputDevice_SetDataFormat(pJoystick, NULL); ok(hr==E_POINTER,"IDirectInputDevice_SetDataFormat() should have returned " "E_POINTER, returned: %08x\n", hr);

1 0

Christian Costa : d3drm: Implement IDirect3DRMMesh_GetGroupTexture.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: b340501a93478d79e223c6933a8a1646d7ad8b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b340501a93478d79e223c6933… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 27 17:44:42 2012 +0200 d3drm: Implement IDirect3DRMMesh_GetGroupTexture. --- dlls/d3drm/meshbuilder.c | 20 +++++++++++++++++--- dlls/d3drm/tests/d3drm.c | 6 +++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 97f85c9..2074702 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -43,6 +43,7 @@ typedef struct { unsigned vertex_per_face; DWORD face_data_size; unsigned* face_data; + IDirect3DRMTexture3* texture; } mesh_group; typedef struct { @@ -2451,6 +2452,8 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_AddGroup(IDirect3DRMMesh* iface, memcpy(group->face_data, face_data, group->face_data_size * sizeof(unsigned)); + group->texture = NULL; + *return_id = This->nb_groups++; return D3DRM_OK; @@ -2630,13 +2633,24 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroupMaterial(IDirect3DRMMesh* ifac } static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroupTexture(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE *returnPtr) + D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE *texture) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%p): stub\n", This, id, returnPtr); + TRACE("(%p)->(%u,%p)\n", This, id, texture); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if (!texture) + return E_POINTER; + + if (This->groups[id].texture) + IDirect3DRMTexture_QueryInterface(This->groups[id].texture, &IID_IDirect3DRMTexture, (void**)texture); + else + *texture = NULL; + + return D3DRM_OK; } static const struct IDirect3DRMMeshVtbl Direct3DRMMesh_Vtbl = diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index c22804d..f9940c1 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -354,7 +354,7 @@ static void test_MeshBuilder(void) unsigned nb_vertices, nb_faces, nb_face_vertices; DWORD data_size; LPDIRECT3DRMMATERIAL material; - LPDIRECT3DRMTEXTURE texture; + LPDIRECT3DRMTEXTURE texture = (LPDIRECT3DRMTEXTURE)0xdeadbeef; D3DVALUE values[3]; nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); @@ -368,8 +368,8 @@ static void test_MeshBuilder(void) todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture); - todo_wine ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); - todo_wine ok(texture == NULL, "No texture should be present\n"); + ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); + ok(texture == NULL, "No texture should be present\n"); hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); todo_wine ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); todo_wine ok(material != NULL, "No material should be present\n");

1 0

Piotr Caban : msvcrt: Handle rethrown exception in cxx_frame_handler.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 5e418f0ccfa307af3a6adbebfdedf01093f99ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e418f0ccfa307af3a6adbebf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 25 19:42:51 2012 +0200 msvcrt: Handle rethrown exception in cxx_frame_handler. --- dlls/msvcrt/except_i386.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index d8b03a4..7c3265c 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -373,7 +373,9 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG if(rec->ExceptionCode == CXX_EXCEPTION) { PEXCEPTION_RECORD prev_rec = nested_frame->rec; - if(rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) + if((rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) || + (rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && + rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2])) { /* exception was rethrown */ rec->ExceptionInformation[1] = prev_rec->ExceptionInformation[1]; @@ -381,6 +383,13 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG TRACE("detect rethrow: re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } + else if (nested_frame->prev_rec && + nested_frame->prev_rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && + nested_frame->prev_rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2]) + { + TRACE("detect threw new exception in catch block - not owning old(obj: %lx type: %lx)\n", + prev_rec->ExceptionInformation[1], prev_rec->ExceptionInformation[2]); + } else { /* new exception in exception handler, destroy old */ void *object = (void*)prev_rec->ExceptionInformation[1]; @@ -506,6 +515,15 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if(rec->ExceptionCode == CXX_EXCEPTION) { + if (rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) + { + EXCEPTION_RECORD *exc_record = msvcrt_get_thread_data()->exc_record; + rec->ExceptionInformation[1] = exc_record->ExceptionInformation[1]; + rec->ExceptionInformation[2] = exc_record->ExceptionInformation[2]; + TRACE("detect rethrow: obj: %lx, type: %lx\n", + rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + } + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 &&

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshImpl_GetGroupMaterial.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 3fbe4914bded91d0fb9a22e542a1a8ab4ab69b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbe4914bded91d0fb9a22e54… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 27 17:44:51 2012 +0200 d3drm: Implement IDirect3DRMMeshImpl_GetGroupMaterial. --- dlls/d3drm/meshbuilder.c | 19 ++++++++++++++++--- dlls/d3drm/tests/d3drm.c | 6 +++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 2074702..4401a56 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -43,6 +43,7 @@ typedef struct { unsigned vertex_per_face; DWORD face_data_size; unsigned* face_data; + IDirect3DRMMaterial2* material; IDirect3DRMTexture3* texture; } mesh_group; @@ -2452,6 +2453,7 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_AddGroup(IDirect3DRMMesh* iface, memcpy(group->face_data, face_data, group->face_data_size * sizeof(unsigned)); + group->material = NULL; group->texture = NULL; *return_id = This->nb_groups++; @@ -2623,13 +2625,24 @@ static D3DRMRENDERQUALITY WINAPI IDirect3DRMMeshImpl_GetGroupQuality(IDirect3DRM } static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroupMaterial(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL *returnPtr) + D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL *material) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%p): stub\n", This, id, returnPtr); + TRACE("(%p)->(%u,%p)\n", This, id, material); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if (!material) + return E_POINTER; + + if (This->groups[id].material) + IDirect3DRMTexture_QueryInterface(This->groups[id].material, &IID_IDirect3DRMMaterial, (void**)material); + else + *material = NULL; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroupTexture(IDirect3DRMMesh* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f9940c1..fdf4e90 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -353,7 +353,7 @@ static void test_MeshBuilder(void) DWORD nb_groups; unsigned nb_vertices, nb_faces, nb_face_vertices; DWORD data_size; - LPDIRECT3DRMMATERIAL material; + LPDIRECT3DRMMATERIAL material = (LPDIRECT3DRMMATERIAL)0xdeadbeef; LPDIRECT3DRMTEXTURE texture = (LPDIRECT3DRMTEXTURE)0xdeadbeef; D3DVALUE values[3]; @@ -371,8 +371,8 @@ static void test_MeshBuilder(void) ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); ok(texture == NULL, "No texture should be present\n"); hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); - todo_wine ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); - todo_wine ok(material != NULL, "No material should be present\n"); + ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); + todo_wine ok(material != NULL, "No material present\n"); if ((hr == D3DRM_OK) && material) { hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]);

1 0

Michael Geddes : kernel32: Add timed wait capability flag to COMM Port properties.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: d7dc0e6066de8a1cfe721e85bd187774709dcd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7dc0e6066de8a1cfe721e85b… Author: Michael Geddes <michael(a)frog.wheelycreek.net> Date: Wed May 2 19:36:51 2012 +0800 kernel32: Add timed wait capability flag to COMM Port properties. --- dlls/kernel32/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 096bc42..30fd44f 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -1154,7 +1154,7 @@ BOOL WINAPI GetCommProperties( lpCommProp->dwMaxRxQueue = 4096; lpCommProp->dwMaxBaud = BAUD_115200; lpCommProp->dwProvSubType = PST_RS232; - lpCommProp->dwProvCapabilities = PCF_DTRDSR | PCF_PARITY_CHECK | PCF_RTSCTS | PCF_TOTALTIMEOUTS; + lpCommProp->dwProvCapabilities = PCF_DTRDSR | PCF_PARITY_CHECK | PCF_RTSCTS | PCF_TOTALTIMEOUTS | PCF_INTTIMEOUTS; lpCommProp->dwSettableParams = SP_BAUD | SP_DATABITS | SP_HANDSHAKING | SP_PARITY | SP_PARITY_CHECK | SP_STOPBITS ; lpCommProp->dwSettableBaud = BAUD_075 | BAUD_110 | BAUD_134_5 | BAUD_150 |

1 0

Lucas Zawacki : dinput: Implement GetProperty for JOYSTICKID ( LinuxInput driver).
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 2cd3b908ad97696ff4abdbb39636c992f8f04554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd3b908ad97696ff4abdbb39… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue May 29 13:42:27 2012 -0300 dinput: Implement GetProperty for JOYSTICKID (LinuxInput driver). --- dlls/dinput/joystick_linuxinput.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2902f9f..3cab015 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -965,6 +965,15 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF break; } + case (DWORD_PTR) DIPROP_JOYSTICKID: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + pd->dwData = get_joystick_index(&This->generic.base.guid); + TRACE("DIPROP_JOYSTICKID(%d)\n", pd->dwData); + break; + } + default: return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); }

1 0

Oleksij Rempel : shell32: Return empty list instead of NULL.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 83196d0cb3dedd00254d13e3be9a8be7f2f8eb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=83196d0cb3dedd00254d13e3b… Author: Oleksij Rempel <bug-track(a)fisher-privat.net> Date: Tue May 29 23:10:07 2012 +0200 shell32: Return empty list instead of NULL. --- dlls/shell32/dde.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 2e04bd7..144470b 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -82,6 +82,14 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, FIXME( "returning fake program groups list\n" ); return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszGroups, uFmt, 0 ); } + else if (hszTopic == hszProgmanTopic && hszItem == hszProgmanService && uFmt == CF_TEXT) + { + static BYTE groups_data[] = "\r\n"; + FIXME( "returning empty groups list\n" ); + /* this is an workaround for an app wich expect some data + * and cant handle NULL. */ + return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszProgmanService, uFmt, 0 ); + } FIXME( "%u %p %s %s: stub\n", uFmt, hconv, debugstr_hsz(hszTopic), debugstr_hsz(hszItem) ); return NULL; }

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrameXImpl_GetLights and IDirect3DRMLightArray interface .
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 6e15d91927c6b855d9c9058d18cdee9804f64795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e15d91927c6b855d9c9058d1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 27 17:44:19 2012 +0200 d3drm: Implement IDirect3DRMFrameXImpl_GetLights and IDirect3DRMLightArray interface. --- dlls/d3drm/frame.c | 164 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 161 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 574e2f8..f0e1cd0 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -71,8 +71,16 @@ typedef struct { LPDIRECT3DRMVISUAL* visuals; } IDirect3DRMVisualArrayImpl; +typedef struct { + IDirect3DRMLightArray IDirect3DRMLightArray_iface; + LONG ref; + ULONG size; + LPDIRECT3DRMLIGHT* lights; +} IDirect3DRMLightArrayImpl; + HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj); HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface); +HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** ret_iface); static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) { @@ -87,6 +95,11 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface); static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); +static inline IDirect3DRMLightArrayImpl *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DRMLightArrayImpl, IDirect3DRMLightArray_iface); +} + /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMFrame2Impl_QueryInterface(IDirect3DRMFrame2* iface, REFIID riid, void** object) @@ -348,9 +361,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetLights(IDirect3DRMFrame2* iface, { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, lights); + TRACE("(%p/%p)->(%p)\n", iface, This, lights); - return E_NOTIMPL; + return IDirect3DRMFrame3_GetLights(&This->IDirect3DRMFrame3_iface, lights); } static D3DRMMATERIALMODE WINAPI IDirect3DRMFrame2Impl_GetMaterialMode(IDirect3DRMFrame2* iface) @@ -1401,10 +1414,33 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetLights(IDirect3DRMFrame3* iface, LPDIRECT3DRMLIGHTARRAY *lights) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); + IDirect3DRMLightArrayImpl* obj; + HRESULT hr; - FIXME("(%p/%p)->(%p): stub\n", iface, This, lights); + TRACE("(%p/%p)->(%p)\n", iface, This, lights); - return E_NOTIMPL; + if (!lights) + return D3DRMERR_BADVALUE; + + hr = Direct3DRMLightArray_create(lights); + + if (hr != D3DRM_OK) + return hr; + + obj = (IDirect3DRMLightArrayImpl*)*lights; + + obj->size = This->nb_lights; + if (This->nb_lights) + { + ULONG i; + obj->lights = HeapAlloc(GetProcessHeap(), 0, This->nb_lights * sizeof(LPDIRECT3DRMLIGHT)); + if (!obj->lights) + return E_OUTOFMEMORY; + for (i = 0; i < This->nb_lights; i++) + IDirect3DRMLight_QueryInterface(This->lights[i], &IID_IDirect3DRMLight, (void**)&obj->lights[i]); + } + + return D3DRM_OK; } static D3DRMMATERIALMODE WINAPI IDirect3DRMFrame3Impl_GetMaterialMode(IDirect3DRMFrame3* iface) @@ -2544,3 +2580,123 @@ HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) return S_OK; } + +/*** IUnknown methods ***/ +static HRESULT WINAPI IDirect3DRMLightArrayImpl_QueryInterface(IDirect3DRMLightArray* iface, + REFIID riid, void** object) +{ + IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + + TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_guid(riid), object); + + *object = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirect3DRMLightArray)) + { + *object = &This->IDirect3DRMLightArray_iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IDirect3DRMLightArray_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI IDirect3DRMLightArrayImpl_AddRef(IDirect3DRMLightArray* iface) +{ + IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", This, ref); + + return ref; +} + +static ULONG WINAPI IDirect3DRMLightArrayImpl_Release(IDirect3DRMLightArray* iface) +{ + IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; + + TRACE("(%p)->(): new ref = %u\n", This, ref); + + if (!ref) + { + for (i = 0; i < This->size; i++) + IDirect3DRMLight_Release(This->lights[i]); + HeapFree(GetProcessHeap(), 0, This->lights); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +/*** IDirect3DRMArray methods ***/ +static DWORD WINAPI IDirect3DRMLightArrayImpl_GetSize(IDirect3DRMLightArray* iface) +{ + IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + + TRACE("(%p)->() = %d\n", This, This->size); + + return This->size; +} + +/*** IDirect3DRMLightArray methods ***/ +static HRESULT WINAPI IDirect3DRMLightArrayImpl_GetElement(IDirect3DRMLightArray* iface, DWORD index, LPDIRECT3DRMLIGHT* light) +{ + IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + + TRACE("(%p)->(%u, %p)\n", This, index, light); + + if (!light) + return D3DRMERR_BADVALUE; + + *light = NULL; + + if (index >= This->size) + return D3DRMERR_BADVALUE; + + IDirect3DRMLight_AddRef(This->lights[index]); + *light = This->lights[index]; + + return D3DRM_OK; +} + +static const struct IDirect3DRMLightArrayVtbl Direct3DRMLightArray_Vtbl = +{ + /*** IUnknown methods ***/ + IDirect3DRMLightArrayImpl_QueryInterface, + IDirect3DRMLightArrayImpl_AddRef, + IDirect3DRMLightArrayImpl_Release, + /*** IDirect3DRMArray methods ***/ + IDirect3DRMLightArrayImpl_GetSize, + /*** IDirect3DRMLightArray methods ***/ + IDirect3DRMLightArrayImpl_GetElement +}; + +HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** obj) +{ + IDirect3DRMLightArrayImpl* object; + + TRACE("(%p)\n", obj); + + *obj = NULL; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMLightArrayImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirect3DRMLightArray_iface.lpVtbl = &Direct3DRMLightArray_Vtbl; + object->ref = 1; + + *obj = &object->IDirect3DRMLightArray_iface; + + return S_OK; +} diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index b6ed51a..c22804d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -795,7 +795,7 @@ static void test_Frame(void) pLightArray = NULL; hr = IDirect3DRMFrame_GetLights(pFrameP1, &pLightArray); - todo_wine ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr); if (pLightArray) { count = IDirect3DRMLightArray_GetSize(pLightArray);

1 0

Christian Costa : d3drm: Generate normals automatically when there are not present in the x file.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 8d9d97be0fc6beec7f7e8451e2f191d5ec4f5a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9d97be0fc6beec7f7e8451e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 27 17:44:59 2012 +0200 d3drm: Generate normals automatically when there are not present in the x file. --- dlls/d3drm/meshbuilder.c | 55 +++++++++++++++++++++++++++++++++++++++++---- dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4401a56..22aec7e 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1118,6 +1118,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); + This->nb_normals = 0; + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) goto end; @@ -1211,10 +1213,19 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) pData2 = NULL; } + if (!This->nb_normals) + { + /* Allocate normals, one per vertex */ + This->pNormals = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->nb_vertices * sizeof(D3DVECTOR)); + if (!This->pNormals) + goto end; + } + for (i = 0; i < This->nb_faces; i++) { DWORD j; DWORD nb_face_indexes; + D3DVECTOR face_normal; if (faces_vertex_idx_size < sizeof(DWORD)) WARN("Not enough data to read number of indices of face %d\n", i); @@ -1227,22 +1238,46 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) if (faces_vertex_idx_size < (nb_face_indexes * sizeof(DWORD))) WARN("Not enough data to read all indices of face %d\n", i); + if (!This->nb_normals) + { + /* Compute face normal */ + if (nb_face_indexes > 2) + { + D3DVECTOR a, b; + + D3DRMVectorSubtract(&a, &This->pVertices[faces_vertex_idx_ptr[2]], &This->pVertices[faces_vertex_idx_ptr[1]]); + D3DRMVectorSubtract(&a, &This->pVertices[faces_vertex_idx_ptr[1]], &This->pVertices[faces_vertex_idx_ptr[0]]); + D3DRMVectorCrossProduct(&face_normal, &a, &b); + D3DRMVectorNormalize(&face_normal); + } + else + { + face_normal.u1.x = 0.0f; + face_normal.u2.y = 0.0f; + face_normal.u3.z = 0.0f; + } + } + for (j = 0; j < nb_face_indexes; j++) { /* Copy vertex index */ - *(faces_data_ptr + faces_data_size++) = *(faces_vertex_idx_ptr++); + *(faces_data_ptr + faces_data_size++) = *faces_vertex_idx_ptr; /* Copy normal index */ - if (faces_normal_idx_data) + if (This->nb_normals) { /* Read from x file */ *(faces_data_ptr + faces_data_size++) = *(faces_normal_idx_ptr++); } else { - FIXME("No normal available, generate a fake normal index\n"); - /* Must be generated, put 0 for now */ - *(faces_data_ptr + faces_data_size++) = 0; + DWORD vertex_idx = *faces_vertex_idx_ptr; + if (vertex_idx > This->nb_vertices) + vertex_idx = 0; + *(faces_data_ptr + faces_data_size++) = vertex_idx; + /* Add face normal to vertex normal */ + D3DRMVectorAdd(&This->pNormals[vertex_idx], &This->pNormals[vertex_idx], &face_normal); } + faces_vertex_idx_ptr++; } faces_vertex_idx_size -= nb_face_indexes; } @@ -1253,6 +1288,16 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) /* Set size (in number of DWORD) of all faces data */ This->face_data_size = faces_data_size; + if (!This->nb_normals) + { + /* Normalize all normals */ + for (i = 0; i < This->nb_vertices; i++) + { + D3DRMVectorNormalize(&This->pNormals[i]); + } + This->nb_normals = This->nb_vertices; + } + /* If there is no texture coordinates, generate default texture coordinates (0.0f, 0.0f) for each vertex */ if (!This->pCoords2d) { diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index fdf4e90..8d35802 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -240,7 +240,7 @@ static void test_MeshBuilder(void) hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, NULL, &val2, NULL, &val3, NULL); 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); - todo_wine ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); + ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3); /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */

1 0

Piotr Caban : msvcrt: Fixed typo in DEFINE_EXCEPTION_TYPE_INFO macro.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 482159a2349706ed07f5bc84b21f328d44fe4a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=482159a2349706ed07f5bc84b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 30 09:41:28 2012 +0200 msvcrt: Fixed typo in DEFINE_EXCEPTION_TYPE_INFO macro. --- dlls/msvcrt/cpp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 9564ff3..baf20b2 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -761,8 +761,8 @@ static const cxx_type_info_table name ## _type_info_table = \ base_classes+1, \ { \ &name ## _cxx_type_info, \ - cl2, \ - cl1 \ + cl1, \ + cl2 \ } \ }; \ \

1 0