winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2012
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
541 discussions
Start a n
N
ew thread
Michael Stefaniuc : comctl32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: 175eaf10748f424374ca41fa1c4468100148148d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=175eaf10748f424374ca41fa1…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:00:22 2012 +0200 comctl32: Avoid TRUE:FALSE conditional expressions. --- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/monthcal.c | 4 ++-- dlls/comctl32/tests/imagelist.c | 2 +- dlls/comctl32/toolbar.c | 2 +- dlls/comctl32/treeview.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 710ef79..a72f897 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -720,7 +720,7 @@ COMBOEX_SetExtendedStyle (COMBOEX_INFO *infoPtr, DWORD mask, DWORD style) /* see if we need to change the word break proc on the edit */ if ((infoPtr->dwExtStyle ^ dwTemp) & CBES_EX_PATHWORDBREAKPROC) SetPathWordBreakProc(infoPtr->hwndEdit, - (infoPtr->dwExtStyle & CBES_EX_PATHWORDBREAKPROC) ? TRUE : FALSE); + (infoPtr->dwExtStyle & CBES_EX_PATHWORDBREAKPROC) != 0); /* test if the control's appearance has changed */ mask = CBES_EX_NOEDITIMAGE | CBES_EX_NOEDITIMAGEINDENT; diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index bfd5d5e..d36032f 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -586,7 +586,7 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) /* Ensure time is within bounds */ limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM) &range); - min = ((delta < 0) ? TRUE : FALSE); + min = delta < 0; if (limits & (min ? GDTR_MIN : GDTR_MAX)) { diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a7722ee..c5b6d91 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -372,7 +372,7 @@ static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr, date->wMonth = fix_st->wMonth; } - return fix_st ? FALSE : TRUE; + return !fix_st; } /* Checks passed range width with configured maximum selection count @@ -1276,7 +1276,7 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, UINT index, COLORREF color) infoPtr->pens[PenText] = CreatePen(PS_SOLID, 1, infoPtr->colors[index]); } - InvalidateRect(infoPtr->hwndSelf, NULL, index == MCSC_BACKGROUND ? TRUE : FALSE); + InvalidateRect(infoPtr->hwndSelf, NULL, index == MCSC_BACKGROUND); return prev; } diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index b920b9a..2e316f7 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -619,7 +619,7 @@ static BOOL allocate_storage(struct my_IStream *my_is, ULONG add) else my_is->iml_data = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, my_is->iml_data, my_is->iml_data_size); - return my_is->iml_data ? TRUE : FALSE; + return my_is->iml_data != NULL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Write(IStream *iface, const void *pv, ULONG cb, diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 382161c..c26d70e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3140,7 +3140,7 @@ TOOLBAR_CheckButton (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) btnPtr = &infoPtr->buttons[nIndex]; - bChecked = (btnPtr->fsState & TBSTATE_CHECKED) ? TRUE : FALSE; + bChecked = (btnPtr->fsState & TBSTATE_CHECKED) != 0; if (LOWORD(lParam) == FALSE) btnPtr->fsState &= ~TBSTATE_CHECKED; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 79de8aa..d8fe635 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1612,7 +1612,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM item) static LRESULT TREEVIEW_SetRedraw(TREEVIEW_INFO* infoPtr, WPARAM wParam) { - infoPtr->bRedraw = wParam ? TRUE : FALSE; + infoPtr->bRedraw = wParam != 0; if (infoPtr->bRedraw) {
1
0
0
0
Michael Stefaniuc : comctl32: Get rid of two macros.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: 11d35ef8e72ef5cfb676fb57d0c102f79bec7347 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=11d35ef8e72ef5cfb676fb57d…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 20:58:35 2012 +0200 comctl32: Get rid of two macros. --- dlls/comctl32/toolbar.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index cd19a58..382161c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -217,9 +217,6 @@ typedef enum #define TOOLBAR_NOWHERE (-1) -#define TOOLBAR_HasText(x, y) (TOOLBAR_GetText(x, y) ? TRUE : FALSE) -#define TOOLBAR_HasDropDownArrows(exStyle) ((exStyle & TBSTYLE_EX_DRAWDDARROWS) ? TRUE : FALSE) - /* Used to find undocumented extended styles */ #define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \ TBSTYLE_EX_UNDOC1 | \ @@ -258,6 +255,11 @@ static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); } +static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle) +{ + return (exStyle & TBSTYLE_EX_DRAWDDARROWS) != 0; +} + static LPWSTR TOOLBAR_GetText(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *btnPtr) { @@ -1247,7 +1249,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize) btnPtr = infoPtr->buttons; for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) { - if(TOOLBAR_HasText(infoPtr, btnPtr)) + if(TOOLBAR_GetText(infoPtr, btnPtr)) { TOOLBAR_MeasureString(infoPtr, btnPtr, hdc, &sz); if (sz.cx > lpSize->cx)
1
0
0
0
Alistair Leslie-Hughes : scrrun: Implement IFileSystem3 FolderExists.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: e6d9f824dcc9a46613b4439750b51838a74c47bf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e6d9f824dcc9a46613b443975…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 30 09:02:39 2012 +1000 scrrun: Implement IFileSystem3 FolderExists. --- dlls/scrrun/filesystem.c | 13 +++++++++---- dlls/scrrun/tests/filesystem.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5c8fb7d..a4e6f26 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -223,12 +223,17 @@ static HRESULT WINAPI filesys_FileExists(IFileSystem3 *iface, BSTR path, VARIANT return S_OK; } -static HRESULT WINAPI filesys_FolderExists(IFileSystem3 *iface, BSTR FolderSpec, - VARIANT_BOOL *pfExists) +static HRESULT WINAPI filesys_FolderExists(IFileSystem3 *iface, BSTR path, VARIANT_BOOL *ret) { - FIXME("%p %s %p\n", iface, debugstr_w(FolderSpec), pfExists); + DWORD attrs; + TRACE("%p %s %p\n", iface, debugstr_w(path), ret); - return E_NOTIMPL; + if (!ret) return E_POINTER; + + attrs = GetFileAttributesW(path); + *ret = attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY) ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } static HRESULT WINAPI filesys_GetDrive(IFileSystem3 *iface, BSTR DriveSpec, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index ff1856e..a19a835 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -33,6 +33,10 @@ static void test_interfaces(void) { static const WCHAR pathW[] = {'p','a','t','h',0}; + static const WCHAR nonexistent_dirW[] = { + 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', 0}; + static const WCHAR file_kernel32W[] = { + '\\', 'k', 'e', 'r', 'n', 'e', 'l', '3', '2', '.', 'd', 'l', 'l', 0}; HRESULT hr; IDispatch *disp; IDispatchEx *dispex; @@ -40,6 +44,8 @@ static void test_interfaces(void) IObjectWithSite *site; VARIANT_BOOL b; BSTR path; + WCHAR windows_path[MAX_PATH]; + WCHAR file_path[MAX_PATH]; hr = CoCreateInstance(&CLSID_FileSystemObject, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); @@ -48,6 +54,10 @@ static void test_interfaces(void) return; } + GetSystemDirectoryW(windows_path, MAX_PATH); + lstrcpyW(file_path, windows_path); + lstrcatW(file_path, file_kernel32W); + hr = IDispatch_QueryInterface(disp, &IID_IFileSystem3, (void**)&fs3); ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); @@ -72,6 +82,28 @@ static void test_interfaces(void) ok(b == VARIANT_FALSE, "got %x\n", b); SysFreeString(path); + /* Folder Exists */ + hr = IFileSystem3_FolderExists(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x, expected 0x%08x\n", hr, E_POINTER); + + path = SysAllocString(windows_path); + hr = IFileSystem3_FolderExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_TRUE, "Folder doesn't exists\n"); + SysFreeString(path); + + path = SysAllocString(nonexistent_dirW); + hr = IFileSystem3_FolderExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_FALSE, "Folder exists\n"); + SysFreeString(path); + + path = SysAllocString(file_path); + hr = IFileSystem3_FolderExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_FALSE, "Folder exists\n"); + SysFreeString(path); + IFileSystem3_Release(fs3); IDispatch_Release(disp); }
1
0
0
0
Józef Kucia : d3dx9/tests: Add cube texture tests for ID3DXRenderToEnvMap.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: dcc09efe80941f547b233455842217f4a4a7e7c2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dcc09efe80941f547b2334558…
Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:41 2012 +0200 d3dx9/tests: Add cube texture tests for ID3DXRenderToEnvMap. --- dlls/d3dx9_36/tests/core.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 92c114a..ba0f065 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1084,10 +1084,73 @@ static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) ID3DXRenderToEnvMap_Release(render); } +static void test_ID3DXRenderToEnvMap_cube_map(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DCubeTexture9 *cube_texture = NULL; + ID3DXRenderToEnvMap *render = NULL; + struct device_state pre_state; + struct device_state current_state; + + hr = IDirect3DDevice9_CreateCubeTexture(device, 256, 0, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, + &cube_texture, NULL); + if (FAILED(hr)) + { + skip("Failed to create cube texture\n"); + return; + } + + hr = retrieve_device_state(device, &pre_state); + + hr = D3DXCreateRenderToEnvMap(device, 256, 0, D3DFMT_A8R8G8B8, TRUE, D3DFMT_D24X8, &render); + ok(hr == D3D_OK, "D3DCreateRenderToEnvMap returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + DWORD face; + + hr = ID3DXRenderToEnvMap_End(render, D3DX_FILTER_NONE); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::End returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_BeginCube(render, cube_texture); + ok(hr == D3D_OK, "ID3DXRenderToEnvMap::BeginCube returned %#x, expected %#x\n", hr, D3D_OK); + + hr = retrieve_device_state(device, ¤t_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(¤t_state, &pre_state, TRUE); + release_device_state(¤t_state); + + for (face = D3DCUBEMAP_FACE_POSITIVE_X; face <= D3DCUBEMAP_FACE_NEGATIVE_Z; face++) + { + hr = ID3DXRenderToEnvMap_Face(render, face, D3DX_FILTER_POINT); + ok(hr == D3D_OK, "ID3DXRenderToEnvMap::Face returned %#x, expected %#x\n", hr, D3D_OK); + + hr = retrieve_device_state(device, ¤t_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(¤t_state, &pre_state, FALSE); + release_device_state(¤t_state); + } + + hr = ID3DXRenderToEnvMap_End(render, D3DX_FILTER_POINT); + ok(hr == D3D_OK, "ID3DXRenderToEnvMap::End returned %#x, expected %#x\n", hr, D3D_OK); + + hr = retrieve_device_state(device, ¤t_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(¤t_state, &pre_state, TRUE); + release_device_state(¤t_state); + + check_release((IUnknown *)render, 0); + } + + release_device_state(&pre_state); + + check_release((IUnknown *)cube_texture, 0); +} + static void test_ID3DXRenderToEnvMap(IDirect3DDevice9 *device) { HRESULT hr; ID3DXRenderToEnvMap *render; + IDirect3DSurface9 *depth_stencil_surface; hr = D3DXCreateRenderToEnvMap(device, 256, 0, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); if (SUCCEEDED(hr)) @@ -1124,6 +1187,34 @@ static void test_ID3DXRenderToEnvMap(IDirect3DDevice9 *device) check_release((IUnknown *)render, 0); } else skip("Failed to create ID3DXRenderToEnvMap\n"); + + /* make sure there is a depth stencil surface present */ + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &depth_stencil_surface); + if (SUCCEEDED(hr)) + { + IDirect3DSurface9_Release(depth_stencil_surface); + depth_stencil_surface = NULL; + } + else if (hr == D3DERR_NOTFOUND) + { + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 256, 256, D3DFMT_D24X8, + D3DMULTISAMPLE_NONE, 0, TRUE, &depth_stencil_surface, NULL); + if (SUCCEEDED(hr)) IDirect3DDevice9_SetDepthStencilSurface(device, depth_stencil_surface); + } + + if (FAILED(hr)) + { + skip("Failed to create depth stencil surface\n"); + return; + } + + test_ID3DXRenderToEnvMap_cube_map(device); + + if (depth_stencil_surface) + { + IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + IDirect3DSurface9_Release(depth_stencil_surface); + } } START_TEST(core)
1
0
0
0
Józef Kucia : d3dx9/tests: Add basic tests for ID3DXRenderToEnvMap.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: 5a99be321bbffb168c0403de1aa472aacd7db2df URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5a99be321bbffb168c0403de1…
Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:40 2012 +0200 d3dx9/tests: Add basic tests for ID3DXRenderToEnvMap. --- dlls/d3dx9_36/tests/core.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index eb1e769..92c114a 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1084,6 +1084,48 @@ static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) ID3DXRenderToEnvMap_Release(render); } +static void test_ID3DXRenderToEnvMap(IDirect3DDevice9 *device) +{ + HRESULT hr; + ID3DXRenderToEnvMap *render; + + hr = D3DXCreateRenderToEnvMap(device, 256, 0, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); + if (SUCCEEDED(hr)) + { + ULONG ref_count; + IDirect3DDevice9 *out_device; + + hr = ID3DXRenderToEnvMap_GetDesc(render, NULL); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::GetDesc returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_GetDevice(render, NULL); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::GetDevice returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + ref_count = get_ref((IUnknown *)device); + hr = ID3DXRenderToEnvMap_GetDevice(render, &out_device); + ok(hr == D3D_OK, "ID3DXRenderToEnvMap::GetDevice returned %#x, expected %#x\n", hr, D3D_OK); + ok(out_device == device, "ID3DXRenderToEnvMap::GetDevice returned different device\n"); + check_release((IUnknown *)device, ref_count); + + hr = ID3DXRenderToEnvMap_End(render, D3DX_FILTER_NONE); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::End returned %#x, expected %#x\n", hr, D3D_OK); + + hr = ID3DXRenderToEnvMap_BeginCube(render, NULL); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginCube returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_BeginHemisphere(render, NULL, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginHemisphere returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_BeginParabolic(render, NULL, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginParabolic returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_BeginSphere(render, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginSphere returned %#x, exected %#x\n", hr, D3DERR_INVALIDCALL); + + check_release((IUnknown *)render, 0); + } else skip("Failed to create ID3DXRenderToEnvMap\n"); +} + START_TEST(core) { HWND wnd; @@ -1121,6 +1163,7 @@ START_TEST(core) test_D3DXCreateRenderToSurface(device); test_ID3DXRenderToSurface(device); test_D3DXCreateRenderToEnvMap(device); + test_ID3DXRenderToEnvMap(device); check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0);
1
0
0
0
Józef Kucia : d3dx9: Implement rendering to cube textures in ID3DXRenderToEnvMap.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: 17d92f3b8f508a37163c8d0e91c456594c17f3f2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=17d92f3b8f508a37163c8d0e9…
Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:39 2012 +0200 d3dx9: Implement rendering to cube textures in ID3DXRenderToEnvMap. --- dlls/d3dx9_36/render.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 180 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index 97a2916..cca6b44 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -416,6 +416,14 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, } +enum render_state +{ + INITIAL, + + CUBE_BEGIN, + CUBE_FACE +}; + struct render_to_envmap { ID3DXRenderToEnvMap ID3DXRenderToEnvMap_iface; @@ -423,8 +431,33 @@ struct render_to_envmap IDirect3DDevice9 *device; D3DXRTE_DESC desc; + + enum render_state state; + struct device_state previous_device_state; + + D3DCUBEMAP_FACES face; + DWORD filter; + + IDirect3DSurface9 *render_target; + IDirect3DSurface9 *depth_stencil; + + IDirect3DCubeTexture9 *dst_cube_texture; }; +static void copy_render_target_to_cube_texture_face(IDirect3DCubeTexture9 *cube_texture, + D3DCUBEMAP_FACES face, IDirect3DSurface9 *render_target, DWORD filter) +{ + HRESULT hr; + IDirect3DSurface9 *cube_surface; + + IDirect3DCubeTexture9_GetCubeMapSurface(cube_texture, face, 0, &cube_surface); + + hr = D3DXLoadSurfaceFromSurface(cube_surface, NULL, NULL, render_target, NULL, NULL, filter, 0); + if (FAILED(hr)) ERR("Copying render target data to surface failed %#x\n", hr); + + IDirect3DSurface9_Release(cube_surface); +} + static inline struct render_to_envmap *impl_from_ID3DXRenderToEnvMap(ID3DXRenderToEnvMap *iface) { return CONTAINING_RECORD(iface, struct render_to_envmap, ID3DXRenderToEnvMap_iface); @@ -469,6 +502,13 @@ static ULONG WINAPI D3DXRenderToEnvMap_Release(ID3DXRenderToEnvMap *iface) if (!ref) { + if (render->dst_cube_texture) IDirect3DSurface9_Release(render->dst_cube_texture); + + if (render->render_target) IDirect3DSurface9_Release(render->render_target); + if (render->depth_stencil) IDirect3DSurface9_Release(render->depth_stencil); + + device_state_release(&render->previous_device_state); + IDirect3DDevice9_Release(render->device); HeapFree(GetProcessHeap(), 0, render); @@ -507,8 +547,52 @@ static HRESULT WINAPI D3DXRenderToEnvMap_GetDesc(ID3DXRenderToEnvMap *iface, static HRESULT WINAPI D3DXRenderToEnvMap_BeginCube(ID3DXRenderToEnvMap *iface, IDirect3DCubeTexture9 *texture) { - FIXME("(%p)->(%p): stub\n", iface, texture); - return E_NOTIMPL; + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + HRESULT hr; + D3DSURFACE_DESC level_desc; + + TRACE("(%p)->(%p)\n", iface, texture); + + if (!texture) return D3DERR_INVALIDCALL; + + if (render->state != INITIAL) return D3DERR_INVALIDCALL; + + IDirect3DCubeTexture9_GetLevelDesc(texture, 0, &level_desc); + if (level_desc.Format != render->desc.Format || level_desc.Width != render->desc.Size) + return D3DERR_INVALIDCALL; + + if (!(level_desc.Usage & D3DUSAGE_RENDERTARGET)) + { + hr = IDirect3DDevice9_CreateRenderTarget(render->device, level_desc.Width, level_desc.Height, + level_desc.Format, level_desc.MultiSampleType, level_desc.MultiSampleQuality, + TRUE, &render->render_target, NULL); + if (FAILED(hr)) goto cleanup; + IDirect3DCubeTexture9_GetLevelDesc(texture, 0, &level_desc); + } + + if (render->desc.DepthStencil) + { + hr = IDirect3DDevice9_CreateDepthStencilSurface(render->device, level_desc.Width, level_desc.Height, + render->desc.DepthStencilFormat, level_desc.MultiSampleType, level_desc.MultiSampleQuality, + TRUE, &render->depth_stencil, NULL); + if (FAILED(hr)) goto cleanup; + } + + IDirect3DCubeTexture9_AddRef(texture); + render->dst_cube_texture = texture; + render->state = CUBE_BEGIN; + return D3D_OK; + +cleanup: + if (render->dst_cube_texture) IDirect3DSurface9_Release(render->dst_cube_texture); + render->dst_cube_texture = NULL; + + if (render->render_target) IDirect3DSurface9_Release(render->render_target); + render->render_target = NULL; + if (render->depth_stencil) IDirect3DSurface9_Release(render->depth_stencil); + render->depth_stencil = NULL; + + return hr; } static HRESULT WINAPI D3DXRenderToEnvMap_BeginSphere(ID3DXRenderToEnvMap *iface, @@ -538,17 +622,94 @@ static HRESULT WINAPI D3DXRenderToEnvMap_Face(ID3DXRenderToEnvMap *iface, D3DCUBEMAP_FACES face, DWORD filter) { - FIXME("(%p)->(%u, %#x): stub\n", iface, face, filter); - return E_NOTIMPL; + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + HRESULT hr; + unsigned int i; + + TRACE("(%p)->(%u, %#x)\n", iface, face, filter); + + if (render->state == CUBE_FACE) + { + IDirect3DDevice9_EndScene(render->device); + if (render->render_target) + copy_render_target_to_cube_texture_face(render->dst_cube_texture, render->face, + render->render_target, render->filter); + + device_state_restore(render->device, &render->previous_device_state); + + render->state = CUBE_BEGIN; + } + else if (render->state != CUBE_BEGIN) + return D3DERR_INVALIDCALL; + + device_state_capture(render->device, &render->previous_device_state); + + for (i = 1; i < render->previous_device_state.num_render_targets; i++) + IDirect3DDevice9_SetRenderTarget(render->device, i, NULL); + + if (!render->render_target) + { + IDirect3DSurface9 *render_target; + IDirect3DCubeTexture9_GetCubeMapSurface(render->dst_cube_texture, face, 0, &render_target); + hr = IDirect3DDevice9_SetRenderTarget(render->device, 0, render_target); + IDirect3DSurface9_Release(render_target); + } + else hr = IDirect3DDevice9_SetRenderTarget(render->device, 0, render->render_target); + + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DDevice9_SetDepthStencilSurface(render->device, render->depth_stencil); + if (FAILED(hr)) goto cleanup; + + render->state = CUBE_FACE; + render->face = face; + render->filter = filter; + return IDirect3DDevice9_BeginScene(render->device); + +cleanup: + device_state_restore(render->device, &render->previous_device_state); + return hr; } static HRESULT WINAPI D3DXRenderToEnvMap_End(ID3DXRenderToEnvMap *iface, DWORD filter) { - FIXME("(%p)->(%#x): stub\n", iface, filter); - return E_NOTIMPL; -} + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + + TRACE("(%p)->(%#x)\n", iface, filter); + if (render->state == INITIAL) return D3DERR_INVALIDCALL; + + if (render->state == CUBE_FACE) + { + IDirect3DDevice9_EndScene(render->device); + if (render->render_target) + copy_render_target_to_cube_texture_face(render->dst_cube_texture, render->face, + render->render_target, render->filter); + + device_state_restore(render->device, &render->previous_device_state); + } + + D3DXFilterTexture((IDirect3DBaseTexture9 *)render->dst_cube_texture, NULL, 0, filter); + + if (render->render_target) + { + IDirect3DSurface9_Release(render->render_target); + render->render_target = NULL; + } + + if (render->depth_stencil) + { + IDirect3DSurface9_Release(render->depth_stencil); + render->depth_stencil = NULL; + } + + IDirect3DSurface9_Release(render->dst_cube_texture); + render->dst_cube_texture = NULL; + + render->state = INITIAL; + return D3D_OK; +} static HRESULT WINAPI D3DXRenderToEnvMap_OnLostDevice(ID3DXRenderToEnvMap *iface) { @@ -613,6 +774,18 @@ HRESULT WINAPI D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device, render->desc.DepthStencil = depth_stencil; render->desc.DepthStencilFormat = depth_stencil_format; + render->state = INITIAL; + render->render_target = NULL; + render->depth_stencil = NULL; + render->dst_cube_texture = NULL; + + hr = device_state_init(device, &render->previous_device_state); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, render); + return hr; + } + IDirect3DDevice9_AddRef(device); render->device = device;
1
0
0
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
0
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(¤t_state, &pre_state, FALSE); release_device_state(¤t_state); + check_release((IUnknown *)render, 0); + /* if EndScene isn't called, the device state isn't restored */ hr = retrieve_device_state(device, ¤t_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
0
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
0
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
0
0
← Newer
1
...
46
47
48
49
50
51
52
...
55
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
Results per page:
10
25
50
100
200