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

Jacek Caban : oleaut32/tests: Use proper helpers for iface calls.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 5a31c1a8814f7de78fe3430fa5a527c450c77f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a31c1a8814f7de78fe3430fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:12:24 2012 +0200 oleaut32/tests: Use proper helpers for iface calls. --- dlls/oleaut32/tests/olefont.c | 2 +- dlls/oleaut32/tests/typelib.c | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 6fc1520..2482554 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -236,7 +236,7 @@ static HRESULT WINAPI FontEventsDisp_QueryInterface( { if (IsEqualIID(riid, &IID_IFontEventsDisp) || IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) { - IUnknown_AddRef(iface); + IFontEventsDisp_AddRef(iface); *ppvObject = iface; return S_OK; } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 631f6d8..85fd965 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1404,7 +1404,7 @@ static void test_CreateTypeLib(void) { hres = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); ok(hres == S_OK, "got %08x\n", hres); - hres = ICreateTypeLib_QueryInterface(createtl, &IID_ITypeLib, (void**)&tl); + hres = ICreateTypeLib2_QueryInterface(createtl, &IID_ITypeLib, (void**)&tl); ok(hres == S_OK, "got %08x\n", hres); hres = ITypeLib_GetTypeInfo(tl, 0, NULL); @@ -1443,10 +1443,10 @@ static void test_CreateTypeLib(void) { hres = ITypeLib_GetDocumentation(tl, 0, &name, NULL, NULL, NULL); ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); - hres = ICreateTypeLib_SetName(createtl, typelibW); + hres = ICreateTypeLib2_SetName(createtl, typelibW); ok(hres == S_OK, "got %08x\n", hres); - hres = ICreateTypeLib_SetHelpFileName(createtl, helpfileW); + hres = ICreateTypeLib2_SetHelpFileName(createtl, helpfileW); ok(hres == S_OK, "got %08x\n", hres); hres = ITypeLib_GetDocumentation(tl, -1, NULL, NULL, NULL, NULL); @@ -1461,16 +1461,16 @@ static void test_CreateTypeLib(void) { SysFreeString(helpfile); /* invalid parameters */ - hres = ICreateTypeLib_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, &createti); ok(hres == E_INVALIDARG, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, NULL); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, NULL); ok(hres == E_INVALIDARG, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, NULL); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, NULL); ok(hres == E_INVALIDARG, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&interface1); @@ -1977,10 +1977,10 @@ static void test_CreateTypeLib(void) { ITypeInfo2_Release(ti2); ICreateTypeInfo_Release(createti); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); ok(hres == TYPE_E_NAMECONFLICT, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface2W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface2W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&interface2); @@ -2030,7 +2030,7 @@ static void test_CreateTypeLib(void) { VariantInit(&cust_data); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface3W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface3W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_QueryInterface(createti, &IID_ICreateTypeInfo2, (void**)&createti2); @@ -2116,7 +2116,7 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo2_Release(createti2); ICreateTypeInfo_Release(createti); - hres = ICreateTypeLib_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_AddRefTypeInfo(createti, interface1, &hreftype); @@ -2183,7 +2183,7 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo_Release(createti); - hres = ICreateTypeLib_CreateTypeInfo(createtl, dualW, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, dualW, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_SetTypeFlags(createti, TYPEFLAG_FDUAL); @@ -2967,18 +2967,18 @@ static void test_SetVarHelpContext(void) V_VT(&v) = VT_INT; V_INT(&v) = 1; U(desc).lpvarValue = &v; - hr = ICreateTypeInfo2_AddVarDesc(cti, 0, &desc); + hr = ICreateTypeInfo_AddVarDesc(cti, 0, &desc); ok(hr == S_OK, "got %08x\n", hr); - hr = ICreateTypeInfo2_SetVarHelpContext(cti, 0, 0); + hr = ICreateTypeInfo_SetVarHelpContext(cti, 0, 0); ok(hr == S_OK, "got %08x\n", hr); /* another time */ - hr = ICreateTypeInfo2_SetVarHelpContext(cti, 0, 1); + hr = ICreateTypeInfo_SetVarHelpContext(cti, 0, 1); ok(hr == S_OK, "got %08x\n", hr); /* wrong index now */ - hr = ICreateTypeInfo2_SetVarHelpContext(cti, 1, 0); + hr = ICreateTypeInfo_SetVarHelpContext(cti, 1, 0); ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); ICreateTypeInfo_Release(cti); @@ -3090,7 +3090,7 @@ static void test_SetVarDocString(void) V_VT(&v) = VT_INT; V_INT(&v) = 1; U(desc).lpvarValue = &v; - hr = ICreateTypeInfo2_AddVarDesc(cti, 0, &desc); + hr = ICreateTypeInfo_AddVarDesc(cti, 0, &desc); ok(hr == S_OK, "got %08x\n", hr); hr = ICreateTypeInfo_SetVarDocString(cti, 0, NULL); @@ -3104,7 +3104,7 @@ static void test_SetVarDocString(void) ok(hr == S_OK, "got %08x\n", hr); /* wrong index now */ - hr = ICreateTypeInfo2_SetVarDocString(cti, 1, doc1W); + hr = ICreateTypeInfo_SetVarDocString(cti, 1, doc1W); ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); ICreateTypeInfo_Release(cti);

1 0

Jacek Caban : ole32: Use proper helpers for iface calls.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 153b94b3c5f71b4e8bfcf1d4344c14e27b070ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=153b94b3c5f71b4e8bfcf1d43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:40:33 2012 +0200 ole32: Use proper helpers for iface calls. --- dlls/ole32/antimoniker.c | 5 ++--- dlls/ole32/classmoniker.c | 5 ++--- dlls/ole32/comcat.c | 2 +- dlls/ole32/compobj.c | 8 ++++---- dlls/ole32/compositemoniker.c | 5 ++--- dlls/ole32/datacache.c | 2 +- dlls/ole32/defaulthandler.c | 2 +- dlls/ole32/filemoniker.c | 2 +- dlls/ole32/ftmarshal.c | 2 +- dlls/ole32/ifs.c | 2 +- dlls/ole32/itemmoniker.c | 5 ++--- dlls/ole32/marshal.c | 4 ++-- dlls/ole32/moniker.c | 4 ++-- dlls/ole32/ole2.c | 9 +++------ dlls/ole32/oleobj.c | 2 +- dlls/ole32/pointermoniker.c | 2 +- dlls/ole32/rpc.c | 4 ++-- dlls/ole32/stubmanager.c | 2 +- 18 files changed, 30 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=153b94b3c5f71b4e8bfcf…

1 0

Jacek Caban : ole32/tests: Use proper helpers for iface calls.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: df4f0272388f0480ce87da976ca86dd8fc3edbc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4f0272388f0480ce87da976… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:40:46 2012 +0200 ole32/tests: Use proper helpers for iface calls. --- dlls/ole32/tests/dragdrop.c | 2 +- dlls/ole32/tests/hglobalstream.c | 2 +- dlls/ole32/tests/marshal.c | 18 ++++++------ dlls/ole32/tests/moniker.c | 2 +- dlls/ole32/tests/ole2.c | 54 +++++++++++++++++++------------------- dlls/ole32/tests/storage32.c | 18 ++++++------ 6 files changed, 48 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df4f0272388f0480ce87d…

1 0

Jacek Caban : ole32: Added ISynchronizeHandle implementation.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: c6793a2e27d4e6ce093b23592fb59553f2da26ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6793a2e27d4e6ce093b23592… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:41:02 2012 +0200 ole32: Added ISynchronizeHandle implementation. --- dlls/ole32/compobj.c | 63 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 51 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d0ae995..0055d15 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -464,7 +464,8 @@ static void COM_RevokeAllClasses(const struct apartment *apt) */ typedef struct ManualResetEvent { - ISynchronize ISynchronize_iface; + ISynchronize ISynchronize_iface; + ISynchronizeHandle ISynchronizeHandle_iface; LONG ref; HANDLE event; } MREImpl; @@ -477,22 +478,21 @@ static inline MREImpl *impl_from_ISynchronize(ISynchronize *iface) static HRESULT WINAPI ISynchronize_fnQueryInterface(ISynchronize *iface, REFIID riid, void **ppv) { MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p (%s, %p)\n", This, debugstr_guid(riid), ppv); - *ppv = NULL; - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ISynchronize)) - *ppv = This; - else + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ISynchronize)) { + *ppv = &This->ISynchronize_iface; + }else if(IsEqualGUID(riid, &IID_ISynchronizeHandle)) { + *ppv = &This->ISynchronizeHandle_iface; + }else { ERR("Unknown interface %s requested.\n", debugstr_guid(riid)); - - if(*ppv) - { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + return E_NOINTERFACE; } - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI ISynchronize_fnAddRef(ISynchronize *iface) @@ -552,6 +552,44 @@ static ISynchronizeVtbl vt_ISynchronize = { ISynchronize_fnReset }; +static inline MREImpl *impl_from_ISynchronizeHandle(ISynchronizeHandle *iface) +{ + return CONTAINING_RECORD(iface, MREImpl, ISynchronizeHandle_iface); +} + +static HRESULT WINAPI SynchronizeHandle_QueryInterface(ISynchronizeHandle *iface, REFIID riid, void **ppv) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + return ISynchronize_QueryInterface(&This->ISynchronize_iface, riid, ppv); +} + +static ULONG WINAPI SynchronizeHandle_AddRef(ISynchronizeHandle *iface) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + return ISynchronize_AddRef(&This->ISynchronize_iface); +} + +static ULONG WINAPI SynchronizeHandle_Release(ISynchronizeHandle *iface) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + return ISynchronize_Release(&This->ISynchronize_iface); +} + +static HRESULT WINAPI SynchronizeHandle_GetHandle(ISynchronizeHandle *iface, HANDLE *ph) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + + *ph = This->event; + return S_OK; +} + +static const ISynchronizeHandleVtbl SynchronizeHandleVtbl = { + SynchronizeHandle_QueryInterface, + SynchronizeHandle_AddRef, + SynchronizeHandle_Release, + SynchronizeHandle_GetHandle +}; + static HRESULT ManualResetEvent_Construct(IUnknown *punkouter, REFIID iid, void **ppv) { MREImpl *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MREImpl)); @@ -562,6 +600,7 @@ static HRESULT ManualResetEvent_Construct(IUnknown *punkouter, REFIID iid, void This->ref = 1; This->ISynchronize_iface.lpVtbl = &vt_ISynchronize; + This->ISynchronizeHandle_iface.lpVtbl = &SynchronizeHandleVtbl; This->event = CreateEventW(NULL, TRUE, FALSE, NULL); hr = ISynchronize_QueryInterface(&This->ISynchronize_iface, iid, ppv);

1 0

Jacek Caban : ole32: Added ISynchronizeHandle tests.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: b3b390d8acc7964bd4faa1eee3bac84200abb962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b390d8acc7964bd4faa1eee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:41:12 2012 +0200 ole32: Added ISynchronizeHandle tests. --- dlls/ole32/tests/marshal.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e0213b9..2baec4b 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2853,8 +2853,10 @@ static void test_globalinterfacetable(void) static void test_manualresetevent(void) { + ISynchronizeHandle *sync_handle; ISynchronize *psync1, *psync2; IUnknown *punk; + HANDLE handle; LONG ref; HRESULT hr; @@ -2887,6 +2889,17 @@ static void test_manualresetevent(void) ok(hr == S_OK, "Got 0x%08x\n", hr); ok(!!psync2, "Got NULL.\n"); ok(psync1 != psync2, "psync1 == psync2.\n"); + + hr = ISynchronize_QueryInterface(psync2, &IID_ISynchronizeHandle, (void**)&sync_handle); + ok(hr == S_OK, "QueryInterface(IID_ISynchronizeHandle) failed: %08x\n", hr); + + handle = NULL; + hr = ISynchronizeHandle_GetHandle(sync_handle, &handle); + ok(hr == S_OK, "GetHandle failed: %08x\n", hr); + ok(handle != NULL && handle != INVALID_HANDLE_VALUE, "handle = %p\n", handle); + + ISynchronizeHandle_Release(sync_handle); + hr = ISynchronize_Wait(psync2, 0, 5); ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr);

1 0

Henri Verbeet : winex11: Don' t set MWM decorations either for fullscreen virtual desktops.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 13820b6f948b4447ed8d73e2e6975155441a8653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13820b6f948b4447ed8d73e2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 13 11:39:41 2012 +0200 winex11: Don't set MWM decorations either for fullscreen virtual desktops. --- dlls/winex11.drv/desktop.c | 5 +++++ dlls/winex11.drv/window.c | 5 +++-- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index c75c54c..66b1e11 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -203,6 +203,11 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam return TRUE; } +BOOL is_desktop_fullscreen(void) +{ + return screen_width == max_width && screen_height == max_height; +} + static void update_desktop_fullscreen( unsigned int width, unsigned int height) { Display *display = thread_display(); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b202586..46e2cdb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1063,8 +1063,9 @@ static void set_mwm_hints( Display *display, struct x11drv_win_data *data, DWORD if (data->hwnd == GetDesktopWindow()) { - mwm_hints.decorations = MWM_DECOR_TITLE | MWM_DECOR_BORDER | MWM_DECOR_MENU | MWM_DECOR_MINIMIZE; - mwm_hints.functions = MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE; + if (is_desktop_fullscreen()) mwm_hints.decorations = 0; + else mwm_hints.decorations = MWM_DECOR_TITLE | MWM_DECOR_BORDER | MWM_DECOR_MENU | MWM_DECOR_MINIMIZE; + mwm_hints.functions = MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE; } else { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 32d7772..59bc672 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -649,6 +649,7 @@ struct x11drv_mode_info extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; +BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : winex11: Explicitly clear virtual desktop maximized state.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 292869b969a3f59a44f0b5b121e51c833ee29ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=292869b969a3f59a44f0b5b12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 13 11:39:42 2012 +0200 winex11: Explicitly clear virtual desktop maximized state. --- dlls/winex11.drv/desktop.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 66b1e11..6572845 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -235,6 +235,11 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) wine_tsx11_lock(); XSendEvent( display, DefaultRootWindow(display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev ); + + xev.xclient.data.l[1] = x11drv_atom(_NET_WM_STATE_MAXIMIZED_VERT); + xev.xclient.data.l[2] = x11drv_atom(_NET_WM_STATE_MAXIMIZED_HORZ); + XSendEvent( display, DefaultRootWindow(display), False, + SubstructureRedirectMask | SubstructureNotifyMask, &xev ); wine_tsx11_unlock(); }

1 0

André Hentschel : d3drm: Add SceneBackground handling.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: c10d95b64ac4ac77998bacd5cec9cf20185c3132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c10d95b64ac4ac77998bacd5c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 5 17:44:46 2012 +0200 d3drm: Add SceneBackground handling. --- dlls/d3drm/frame.c | 32 ++++++++++++++++++++------------ dlls/d3drm/tests/d3drm.c | 15 +++++++++++++++ 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 025c955..6cab5fa 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -55,6 +55,7 @@ struct IDirect3DRMFrameImpl { ULONG lights_capacity; IDirect3DRMLight** lights; D3DRMMATRIX4D transform; + D3DCOLOR scenebackground; }; typedef struct { @@ -981,9 +982,9 @@ static D3DCOLOR WINAPI IDirect3DRMFrame2Impl_GetSceneBackground(IDirect3DRMFrame { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return IDirect3DRMFrame3_GetSceneBackground(&This->IDirect3DRMFrame3_iface); } static HRESULT WINAPI IDirect3DRMFrame2Impl_GetSceneBackgroundDepth(IDirect3DRMFrame2* iface, @@ -1040,9 +1041,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSceneBackground(IDirect3DRMFrame2 { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, color); + TRACE("(%p/%p)->(%u)\n", iface, This, color); - return E_NOTIMPL; + return IDirect3DRMFrame3_SetSceneBackground(&This->IDirect3DRMFrame3_iface, color); } static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSceneBackgroundRGB(IDirect3DRMFrame2* iface, @@ -1051,9 +1052,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSceneBackgroundRGB(IDirect3DRMFra { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%f,%f,%f): stub\n", iface, This, red, green, blue); + TRACE("(%p/%p)->(%f,%f,%f)\n", iface, This, red, green, blue); - return E_NOTIMPL; + return IDirect3DRMFrame3_SetSceneBackgroundRGB(&This->IDirect3DRMFrame3_iface, red, green, blue); } static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSceneBackgroundDepth(IDirect3DRMFrame2* iface, @@ -2078,9 +2079,9 @@ static D3DCOLOR WINAPI IDirect3DRMFrame3Impl_GetSceneBackground(IDirect3DRMFrame { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return This->scenebackground; } static HRESULT WINAPI IDirect3DRMFrame3Impl_GetSceneBackgroundDepth(IDirect3DRMFrame3* iface, @@ -2137,9 +2138,11 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetSceneBackground(IDirect3DRMFrame3 { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, color); + TRACE("(%p/%p)->(%u)\n", iface, This, color); - return E_NOTIMPL; + This->scenebackground = color; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_SetSceneBackgroundRGB(IDirect3DRMFrame3* iface, @@ -2148,9 +2151,13 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetSceneBackgroundRGB(IDirect3DRMFra { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - FIXME("(%p/%p)->(%f,%f,%f): stub\n", iface, This, red, green, blue); + TRACE("(%p/%p)->(%f,%f,%f)\n", iface, This, red, green, blue); - return E_NOTIMPL; + This->scenebackground = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), + (BYTE)(green * 255.0f), + (BYTE)(blue * 255.0f)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_SetSceneBackgroundDepth(IDirect3DRMFrame3* iface, @@ -2685,6 +2692,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa object->IDirect3DRMFrame2_iface.lpVtbl = &Direct3DRMFrame2_Vtbl; object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl; object->ref = 1; + object->scenebackground = D3DCOLOR_ARGB(0xff, 0, 0, 0); memcpy(&object->transform[0][0], &identity[0][0], sizeof(D3DRMMATRIX4D)); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 91dd095..a257aea 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -602,6 +602,7 @@ static void test_Frame(void) LPDIRECT3DRMLIGHT pLight1; LPDIRECT3DRMLIGHT pLightTmp; LPDIRECT3DRMLIGHTARRAY pLightArray; + D3DCOLOR color; DWORD count; CHAR cname[64] = {0}; @@ -895,6 +896,20 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 3); IDirect3DRMLight_Release(pLight1); + /* Test SceneBackground on first parent */ + color = IDirect3DRMFrame_GetSceneBackground(pFrameP1); + ok(color == 0xff000000, "wrong color (%x)\n", color); + + hr = IDirect3DRMFrame_SetSceneBackground(pFrameP1, 0xff180587); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + color = IDirect3DRMFrame_GetSceneBackground(pFrameP1); + ok(color == 0xff180587, "wrong color (%x)\n", color); + + hr = IDirect3DRMFrame_SetSceneBackgroundRGB(pFrameP1, 0.5, 0.5, 0.5); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + color = IDirect3DRMFrame_GetSceneBackground(pFrameP1); + ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + /* Cleanup */ IDirect3DRMFrame_Release(pFrameP2); CHECK_REFCOUNT(pFrameC, 2);

1 0

Józef Kucia : d3dx9/tests: Clean up device state after tests.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: c51bf7b08247d3f78b1a09b8ffc2a45a22ce97e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51bf7b08247d3f78b1a09b8f… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:37 2012 +0200 d3dx9/tests: Clean up device state after tests. --- dlls/d3dx9_36/tests/core.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index cb5c7ec..eb1e769 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -927,6 +927,8 @@ static void test_ID3DXRenderToSurface_device_state(IDirect3DDevice9 *device) compare_device_state(&current_state, &pre_state, FALSE); release_device_state(&current_state); + check_release((IUnknown *)render, 0); + /* if EndScene isn't called, the device state isn't restored */ hr = retrieve_device_state(device, &current_state); ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); @@ -936,7 +938,7 @@ static void test_ID3DXRenderToSurface_device_state(IDirect3DDevice9 *device) hr = apply_device_state(device, &pre_state); ok(SUCCEEDED(hr), "Failed to restore previous device state\n"); - check_release((IUnknown *)render, 0); + IDirect3DDevice9_EndScene(device); } release_device_state(&pre_state);

1 0

Józef Kucia : d3dx9: Introduce separate functions for restoring and capturing device state.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 8c4adc06176b8f6187585528f3ce023d7a224191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4adc06176b8f6187585528f… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:38 2012 +0200 d3dx9: Introduce separate functions for restoring and capturing device state. --- dlls/d3dx9_36/render.c | 156 ++++++++++++++++++++++++++++-------------------- 1 files changed, 92 insertions(+), 64 deletions(-) diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index 7994a8b..97a2916 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -22,50 +22,108 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -struct render_to_surface +struct device_state { - ID3DXRenderToSurface ID3DXRenderToSurface_iface; - LONG ref; + DWORD num_render_targets; + IDirect3DSurface9 **render_targets; + IDirect3DSurface9 *depth_stencil; + D3DVIEWPORT9 viewport; +}; - IDirect3DDevice9 *device; - D3DXRTS_DESC desc; +static HRESULT device_state_init(IDirect3DDevice9 *device, struct device_state *state) +{ + HRESULT hr; + D3DCAPS9 caps; + unsigned int i; - IDirect3DSurface9 *dst_surface; + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + if (FAILED(hr)) return hr; - IDirect3DSurface9 *render_target; - IDirect3DSurface9 *depth_stencil; + state->num_render_targets = caps.NumSimultaneousRTs; + state->render_targets = HeapAlloc(GetProcessHeap(), 0, + state->num_render_targets * sizeof(IDirect3DSurface9 *)); + if (!state->render_targets) + return E_OUTOFMEMORY; - DWORD num_render_targets; - D3DVIEWPORT9 previous_viewport; - IDirect3DSurface9 **previous_render_targets; - IDirect3DSurface9 *previous_depth_stencil; -}; + for (i = 0; i < state->num_render_targets; i++) + state->render_targets[i] = NULL; + state->depth_stencil = NULL; + return D3D_OK; +} -static inline struct render_to_surface *impl_from_ID3DXRenderToSurface(ID3DXRenderToSurface *iface) +static void device_state_capture(IDirect3DDevice9 *device, struct device_state *state) { - return CONTAINING_RECORD(iface, struct render_to_surface, ID3DXRenderToSurface_iface); + HRESULT hr; + unsigned int i; + + IDirect3DDevice9_GetViewport(device, &state->viewport); + + for (i = 0; i < state->num_render_targets; i++) + { + hr = IDirect3DDevice9_GetRenderTarget(device, i, &state->render_targets[i]); + if (FAILED(hr)) state->render_targets[i] = NULL; + } + + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &state->depth_stencil); + if (FAILED(hr)) state->depth_stencil = NULL; } -static void restore_previous_device_state(struct render_to_surface *render) +static void device_state_restore(IDirect3DDevice9 *device, struct device_state *state) { unsigned int i; - for (i = 0; i < render->num_render_targets; i++) + for (i = 0; i < state->num_render_targets; i++) { - IDirect3DDevice9_SetRenderTarget(render->device, i, render->previous_render_targets[i]); - if (render->previous_render_targets[i]) - IDirect3DSurface9_Release(render->previous_render_targets[i]); - render->previous_render_targets[i] = NULL; + IDirect3DDevice9_SetRenderTarget(device, i, state->render_targets[i]); + if (state->render_targets[i]) + IDirect3DSurface9_Release(state->render_targets[i]); + state->render_targets[i] = NULL; } - IDirect3DDevice9_SetDepthStencilSurface(render->device, render->previous_depth_stencil); - if (render->previous_depth_stencil) + IDirect3DDevice9_SetDepthStencilSurface(device, state->depth_stencil); + if (state->depth_stencil) + { + IDirect3DSurface9_Release(state->depth_stencil); + state->depth_stencil = NULL; + } + + IDirect3DDevice9_SetViewport(device, &state->viewport); +} + +static void device_state_release(struct device_state *state) +{ + unsigned int i; + + for (i = 0; i < state->num_render_targets; i++) { - IDirect3DSurface9_Release(render->previous_depth_stencil); - render->previous_depth_stencil = NULL; + if (state->render_targets[i]) + IDirect3DSurface9_Release(state->render_targets[i]); } - IDirect3DDevice9_SetViewport(render->device, &render->previous_viewport); + HeapFree(GetProcessHeap(), 0, state->render_targets); + + if (state->depth_stencil) IDirect3DSurface9_Release(state->depth_stencil); +} + +struct render_to_surface +{ + ID3DXRenderToSurface ID3DXRenderToSurface_iface; + LONG ref; + + IDirect3DDevice9 *device; + D3DXRTS_DESC desc; + + IDirect3DSurface9 *dst_surface; + + IDirect3DSurface9 *render_target; + IDirect3DSurface9 *depth_stencil; + + struct device_state previous_state; +}; + +static inline struct render_to_surface *impl_from_ID3DXRenderToSurface(ID3DXRenderToSurface *iface) +{ + return CONTAINING_RECORD(iface, struct render_to_surface, ID3DXRenderToSurface_iface); } static HRESULT WINAPI D3DXRenderToSurface_QueryInterface(ID3DXRenderToSurface *iface, @@ -102,7 +160,6 @@ static ULONG WINAPI D3DXRenderToSurface_Release(ID3DXRenderToSurface *iface) { struct render_to_surface *render = impl_from_ID3DXRenderToSurface(iface); ULONG ref = InterlockedDecrement(&render->ref); - unsigned int i; TRACE("%p decreasing refcount to %u\n", iface, ref); @@ -113,15 +170,7 @@ static ULONG WINAPI D3DXRenderToSurface_Release(ID3DXRenderToSurface *iface) if (render->render_target) IDirect3DSurface9_Release(render->render_target); if (render->depth_stencil) IDirect3DSurface9_Release(render->depth_stencil); - for (i = 0; i < render->num_render_targets; i++) - { - if (render->previous_render_targets[i]) - IDirect3DSurface9_Release(render->previous_render_targets[i]); - } - - HeapFree(GetProcessHeap(), 0, render->previous_render_targets); - - if (render->previous_depth_stencil) IDirect3DSurface9_Release(render->previous_depth_stencil); + device_state_release(&render->previous_state); IDirect3DDevice9_Release(render->device); @@ -196,20 +245,10 @@ static HRESULT WINAPI D3DXRenderToSurface_BeginScene(ID3DXRenderToSurface *iface device = render->device; - /* save device state */ - IDirect3DDevice9_GetViewport(device, &render->previous_viewport); - - for (i = 0; i < render->num_render_targets; i++) - { - hr = IDirect3DDevice9_GetRenderTarget(device, i, &render->previous_render_targets[i]); - if (FAILED(hr)) render->previous_render_targets[i] = NULL; - } - - hr = IDirect3DDevice9_GetDepthStencilSurface(device, &render->previous_depth_stencil); - if (FAILED(hr)) render->previous_depth_stencil = NULL; + device_state_capture(device, &render->previous_state); /* prepare for rendering to surface */ - for (i = 1; i < render->num_render_targets; i++) + for (i = 1; i < render->previous_state.num_render_targets; i++) IDirect3DDevice9_SetRenderTarget(device, i, NULL); if (surface_desc.Usage & D3DUSAGE_RENDERTARGET) @@ -249,7 +288,7 @@ static HRESULT WINAPI D3DXRenderToSurface_BeginScene(ID3DXRenderToSurface *iface return IDirect3DDevice9_BeginScene(device); cleanup: - restore_previous_device_state(render); + device_state_restore(device, &render->previous_state); if (render->dst_surface) IDirect3DSurface9_Release(render->dst_surface); render->dst_surface = NULL; @@ -282,7 +321,7 @@ static HRESULT WINAPI D3DXRenderToSurface_EndScene(ID3DXRenderToSurface *iface, if (FAILED(hr)) ERR("Copying render target data to surface failed %#x\n", hr); } - restore_previous_device_state(render); + device_state_restore(render->device, &render->previous_state); /* release resources */ if (render->render_target) @@ -339,18 +378,13 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, ID3DXRenderToSurface **out) { HRESULT hr; - D3DCAPS9 caps; struct render_to_surface *render; - unsigned int i; TRACE("(%p, %u, %u, %#x, %d, %#x, %p)\n", device, width, height, format, depth_stencil, depth_stencil_format, out); if (!device || !out) return D3DERR_INVALIDCALL; - hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - if (FAILED(hr)) return hr; - render = HeapAlloc(GetProcessHeap(), 0, sizeof(struct render_to_surface)); if (!render) return E_OUTOFMEMORY; @@ -367,19 +401,13 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, render->render_target = NULL; render->depth_stencil = NULL; - render->num_render_targets = caps.NumSimultaneousRTs; - render->previous_render_targets = HeapAlloc(GetProcessHeap(), 0, - render->num_render_targets * sizeof(IDirect3DSurface9 *)); - if (!render->previous_render_targets) + hr = device_state_init(device, &render->previous_state); + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, render); - return E_OUTOFMEMORY; + return hr; } - for (i = 0; i < render->num_render_targets; i++) - render->previous_render_targets[i] = NULL; - render->previous_depth_stencil = NULL; - IDirect3DDevice9_AddRef(device); render->device = device;

1 0