Wine-Commits

wine-commits@list.winehq.org

July 2012

2 participants
712 discussions

Michael Stefaniuc : d3drm: Make IDirect3DRMx_CreateFrame() more forgiving about the parent frame.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 9e183990f2d1c2b25e2fd132f4d63f81f6a7ff02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e183990f2d1c2b25e2fd132f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jun 30 01:13:56 2012 +0200 d3drm: Make IDirect3DRMx_CreateFrame() more forgiving about the parent frame. --- dlls/d3drm/frame.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 10ddb72..025c955 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2671,6 +2671,7 @@ static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3D HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_iface) { IDirect3DRMFrameImpl* object; + HRESULT hr; TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), parent, ret_iface); @@ -2687,18 +2688,18 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa memcpy(&object->transform[0][0], &identity[0][0], sizeof(D3DRMMATRIX4D)); - if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) + if (parent) { - if (parent) - IDirect3DRMFrame3_AddChild((IDirect3DRMFrame3*)parent, &object->IDirect3DRMFrame3_iface); - *ret_iface = (IUnknown*)&object->IDirect3DRMFrame3_iface; - } - else - { - if (parent) - IDirect3DRMFrame2_AddChild((IDirect3DRMFrame2*)parent, (IDirect3DRMFrame*)&object->IDirect3DRMFrame2_iface); - *ret_iface = (IUnknown*)&object->IDirect3DRMFrame2_iface; + IDirect3DRMFrame3 *p; + + hr = IDirect3DRMFrame_QueryInterface(parent, &IID_IDirect3DRMFrame3, (void**)&p); + if (hr != S_OK) + return hr; + IDirect3DRMFrame_Release(parent); + IDirect3DRMFrame3_AddChild(p, &object->IDirect3DRMFrame3_iface); } + hr = IDirect3DRMFrame3_QueryInterface(&object->IDirect3DRMFrame3_iface, riid, (void**)ret_iface); + IDirect3DRMFrame3_Release(&object->IDirect3DRMFrame3_iface); return S_OK; }

1 0

Francois Gouget : start: Fix the name of the open verb for the / ProgIDOpen option.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 65f686c8cde5c3fb108533fb43feae642a926ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f686c8cde5c3fb108533fb4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 29 23:31:27 2012 +0200 start: Fix the name of the open verb for the /ProgIDOpen option. --- programs/start/start.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 8eb7148..f3d934e 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -207,7 +207,7 @@ int wmain (int argc, WCHAR *argv[]) static const WCHAR unixW[] = { '/', 'u', 'n', 'i', 'x', 0 }; static const WCHAR progIDOpenW[] = { '/', 'p', 'r', 'o', 'g', 'I', 'D', 'O', 'p', 'e', 'n', 0}; - static const WCHAR openW[] = { '/', 'o', 'p', 'e', 'n', 0 }; + static const WCHAR openW[] = { 'o', 'p', 'e', 'n', 0 }; static const WCHAR cmdW[] = { 'c', 'm', 'd', '.', 'e', 'x', 'e', 0 }; memset(&sei, 0, sizeof(sei));

1 0

Jump to page: