July 2017 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : wmvcore: Support IWMReaderPlaylistBurn interface in IWMReader.
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: 73f80669c6c6012e185b844c1a462473c1307403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f80669c6c6012e185b844c1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 16 09:49:09 2017 +0000 wmvcore: Support IWMReaderPlaylistBurn interface in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 6 ++++ dlls/wmvcore/wmvcore_main.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 83c19da9..7099549 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -81,6 +81,7 @@ static void test_wmreader_interfaces(void) IWMDRMReader *drmreader; IWMDRMReader2 *drmreader2; IWMDRMReader3 *drmreader3; + IWMReaderPlaylistBurn *playlist; hr = WMCreateReader( NULL, 0, &reader ); ok(hr == S_OK, "WMCreateReader failed 0x%08x\n", hr); @@ -147,6 +148,9 @@ static void test_wmreader_interfaces(void) hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader3, (void **)&drmreader3); ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + if(packet) IWMPacketSize_Release(packet); if(packet2) @@ -179,6 +183,8 @@ static void test_wmreader_interfaces(void) IWMReaderStreamClock_Release(clock); if(negotiation) IWMReaderTypeNegotiation_Release(negotiation); + if(playlist) + IWMReaderPlaylistBurn_Release(playlist); IWMReader_Release(reader); } diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index f048b9b..980d51e 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -71,6 +71,7 @@ typedef struct { IWMReaderStreamClock IWMReaderStreamClock_iface; IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; IWMReaderTimecode IWMReaderTimecode_iface; + IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; LONG ref; } WMReader; @@ -125,6 +126,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_IWMReaderTimecode)) { TRACE("(%p)->(IWMReaderTimecode %p)\n", This, ppv); *ppv = &This->IWMReaderTimecode_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderPlaylistBurn)) { + TRACE("(%p)->(IWMReaderPlaylistBurn %p)\n", This, ppv); + *ppv = &This->IWMReaderPlaylistBurn_iface; }else { *ppv = NULL; FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -1283,6 +1287,70 @@ static const IWMReaderTimecodeVtbl WMReaderTimecodeVtbl = timecode_GetTimecodeRangeBounds }; + +static inline WMReader *impl_from_IWMReaderPlaylistBurn(IWMReaderPlaylistBurn *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderPlaylistBurn_iface); +} + +static HRESULT WINAPI playlist_QueryInterface(IWMReaderPlaylistBurn *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI playlist_AddRef(IWMReaderPlaylistBurn *iface) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI playlist_Release(IWMReaderPlaylistBurn *iface) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI playlist_InitPlaylistBurn(IWMReaderPlaylistBurn *iface, DWORD count, + LPCWSTR_WMSDK_TYPE_SAFE *filenames, IWMStatusCallback *callback, void *context) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p, %d, %p, %p, %p\n", This, count, filenames, callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_GetInitResults(IWMReaderPlaylistBurn *iface, DWORD count, HRESULT *stat) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p, %d, %p\n", This, count, stat); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_Cancel(IWMReaderPlaylistBurn *iface) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_EndPlaylistBurn(IWMReaderPlaylistBurn *iface, HRESULT result) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p, 0x%08x\n", This, result); + return E_NOTIMPL; +} + +static const IWMReaderPlaylistBurnVtbl WMReaderPlaylistBurnVtbl = +{ + playlist_QueryInterface, + playlist_AddRef, + playlist_Release, + playlist_InitPlaylistBurn, + playlist_GetInitResults, + playlist_Cancel, + playlist_EndPlaylistBurn +}; + HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) { WMReader *reader; @@ -1300,6 +1368,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; + reader->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl; reader->ref = 1; *ret_reader = &reader->IWMReader_iface;

1 0

Marcus Meissner : gameux: Avoid freeing uninitialized interfaces (Coverity ).
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: 08193ed72b2b134a2079d261944f456438460c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=08193ed72b2b134a2079d2619… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 15 10:16:12 2017 +0200 gameux: Avoid freeing uninitialized interfaces (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/gamestatistics.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index b9e913e..0ee449a 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -111,9 +111,9 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) static const WCHAR sValue[] = {'V','a','l','u','e',0}; HRESULT hr = S_OK; - IXMLDOMDocument *document; - IXMLDOMElement *root, *statisticsElement; - IXMLDOMNode *categoryNode, *statisticsNode; + IXMLDOMDocument *document = NULL; + IXMLDOMElement *root = NULL, *statisticsElement = NULL; + IXMLDOMNode *categoryNode = NULL, *statisticsNode = NULL; VARIANT vStatsFilePath, vValue; BSTR bstrStatistics = NULL, bstrCategory = NULL, bstrIndex = NULL, bstrStatistic = NULL, bstrName = NULL, bstrValue = NULL; @@ -209,8 +209,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) hr = IXMLDOMElement_setAttribute(categoryElement, bstrName, vValue); } - if (categoryElement) - IXMLDOMElement_Release(categoryElement); + if (categoryElement) IXMLDOMElement_Release(categoryElement); SysFreeString(V_BSTR(&vValue)); @@ -266,15 +265,16 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMNode_appendChild(categoryNode, statisticsNode, NULL); - IXMLDOMElement_Release(statisticsElement); - IXMLDOMNode_Release(statisticsNode); + if (statisticsElement) IXMLDOMElement_Release(statisticsElement); + if (statisticsNode) IXMLDOMNode_Release(statisticsNode); } } if(SUCCEEDED(hr)) hr = IXMLDOMElement_appendChild(root, categoryNode, &categoryNode); - IXMLDOMNode_Release(categoryNode); + if (categoryNode) + IXMLDOMNode_Release(categoryNode); if(FAILED(hr)) break; @@ -283,7 +283,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMDocument_putref_documentElement(document, root); - IXMLDOMElement_Release(root); + if (root) IXMLDOMElement_Release(root); TRACE("saving game statistics in %s file\n", debugstr_w(stats->sStatsFile)); if(SUCCEEDED(hr)) @@ -292,7 +292,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMDocument_save(document, vStatsFilePath); - IXMLDOMDocument_Release(document); + if (document) IXMLDOMDocument_Release(document); SysFreeString(bstrValue); SysFreeString(bstrName); @@ -426,9 +426,9 @@ static HRESULT GAMEUX_loadStatisticsFromFile(struct GAMEUX_STATS *data) HRESULT hr = S_OK; IXMLDOMDocument *document = NULL; - IXMLDOMElement *root = NULL, *categoryElement, *statisticElement; - IXMLDOMNode *categoryNode, *statisticNode; - IXMLDOMNodeList *rootChildren = NULL, *categoryChildren; + IXMLDOMElement *root = NULL, *categoryElement = NULL, *statisticElement = NULL; + IXMLDOMNode *categoryNode = NULL, *statisticNode = NULL; + IXMLDOMNodeList *rootChildren = NULL, *categoryChildren = NULL; VARIANT vStatsFilePath, vValue; BSTR bstrStatistics = NULL, bstrCategory = NULL, bstrIndex = NULL, bstrStatistic = NULL, bstrName = NULL, bstrValue = NULL; @@ -571,22 +571,22 @@ static HRESULT GAMEUX_loadStatisticsFromFile(struct GAMEUX_STATS *data) debugstr_w(data->categories[i].stats[j].sName), debugstr_w(data->categories[i].stats[j].sValue)); } - IXMLDOMElement_Release(statisticElement); + if (statisticElement) IXMLDOMElement_Release(statisticElement); } - IXMLDOMNode_Release(statisticNode); + if (statisticNode) IXMLDOMNode_Release(statisticNode); } } - IXMLDOMNodeList_Release(categoryChildren); + if (categoryChildren) IXMLDOMNodeList_Release(categoryChildren); if(SUCCEEDED(hr)) hr = S_OK; } - IXMLDOMElement_Release(categoryElement); + if (categoryElement) IXMLDOMElement_Release(categoryElement); } - IXMLDOMNode_Release(categoryNode); + if (categoryNode) IXMLDOMNode_Release(categoryNode); } } if(SUCCEEDED(hr))

1 0

Alexandre Julliard : user32/tests: Add some tests for WindowFromDC and destroyed windows.
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: 52d90e3ce0ed5a35bcb10723379a1702f8706cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d90e3ce0ed5a35bcb107233… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 09:54:45 2017 +0200 user32/tests: Add some tests for WindowFromDC and destroyed windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 103 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 87 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 382d10a..25b0153 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -52,11 +52,14 @@ static void test_dc_attributes(void) rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( hdc ) == hwnd_cache, "wrong window\n" ); ReleaseDC( hwnd_cache, hdc ); + ok( WindowFromDC( hdc ) == 0, "wrong window\n" ); hdc = GetDC( hwnd_cache ); rop = GetROP2( hdc ); ok( rop == def_rop, "wrong ROP2 %d after release\n", rop ); SetROP2( hdc, R2_WHITE ); + ok( WindowFromDC( hdc ) == hwnd_cache, "wrong window\n" ); ReleaseDC( hwnd_cache, hdc ); old_hdc = hdc; @@ -115,6 +118,7 @@ static void test_dc_attributes(void) ok( rop == 0, "got %d\n", rop ); rop = GetROP2( old_hdc ); ok( rop == 0, "got %d\n", rop ); + ok( WindowFromDC( old_hdc ) == 0, "wrong window\n" ); /* test own DC */ @@ -124,11 +128,14 @@ static void test_dc_attributes(void) ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); old_hdc = hdc; + ok( WindowFromDC( hdc ) == hwnd_owndc, "wrong window\n" ); ReleaseDC( hwnd_owndc, hdc ); + ok( WindowFromDC( hdc ) == hwnd_owndc, "wrong window\n" ); hdc = GetDC( hwnd_owndc ); ok( old_hdc == hdc, "didn't get same DC %p/%p\n", old_hdc, hdc ); rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d after release\n", rop ); + ok( WindowFromDC( hdc ) == hwnd_owndc, "wrong window\n" ); ReleaseDC( hwnd_owndc, hdc ); rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d after second release\n", rop ); @@ -141,11 +148,14 @@ static void test_dc_attributes(void) ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); old_hdc = hdc; + ok( WindowFromDC( hdc ) == hwnd_classdc, "wrong window\n" ); ReleaseDC( hwnd_classdc, hdc ); + ok( WindowFromDC( hdc ) == hwnd_classdc, "wrong window\n" ); hdc = GetDC( hwnd_classdc ); ok( old_hdc == hdc, "didn't get same DC %p/%p\n", old_hdc, hdc ); rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d after release\n", rop ); + ok( WindowFromDC( hdc ) == hwnd_classdc, "wrong window\n" ); ReleaseDC( hwnd_classdc, hdc ); rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d after second release\n", rop ); @@ -154,12 +164,15 @@ static void test_dc_attributes(void) old_hdc = GetDC( hwnd_classdc ); SetROP2( old_hdc, R2_BLACK ); + ok( WindowFromDC( old_hdc ) == hwnd_classdc, "wrong window\n" ); hdc = GetDC( hwnd_classdc2 ); ok( old_hdc == hdc, "didn't get same DC %p/%p\n", old_hdc, hdc ); rop = GetROP2( hdc ); ok( rop == R2_BLACK, "wrong ROP2 %d for other window\n", rop ); + ok( WindowFromDC( hdc ) == hwnd_classdc2, "wrong window\n" ); ReleaseDC( hwnd_classdc, old_hdc ); ReleaseDC( hwnd_classdc, hdc ); + ok( WindowFromDC( hdc ) == hwnd_classdc2, "wrong window\n" ); rop = GetROP2( hdc ); ok( rop == R2_BLACK, "wrong ROP2 %d after release\n", rop ); } @@ -597,19 +610,83 @@ static void test_dc_layout(void) static void test_destroyed_window(void) { - HDC dc; + HDC dc, old_dc; + HDC hdcs[30]; + int i, rop; - dc = GetDCEx(hwnd_cache, 0, DCX_USESTYLE); - ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); + dc = GetDC( hwnd_cache ); + SetROP2( dc, R2_WHITE ); + rop = GetROP2( dc ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == hwnd_cache, "wrong window\n" ); + old_dc = dc; + + DestroyWindow( hwnd_cache ); + rop = GetROP2( dc ); + todo_wine ok( rop == 0, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( !ReleaseDC( hwnd_cache, dc ), "ReleaseDC succeeded\n" ); + dc = GetDC( hwnd_cache ); + ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); + + for (i = 0; i < 30; i++) + { + dc = hdcs[i] = GetDCEx( hwnd_parent, 0, DCX_CACHE | DCX_USESTYLE ); + if (dc == old_dc) break; + } + ok( i < 30, "DC for destroyed window not reused\n" ); + while (i > 0) ReleaseDC( hwnd_parent, hdcs[--i] ); + + dc = GetDC( hwnd_classdc ); + SetROP2( dc, R2_WHITE ); + rop = GetROP2( dc ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == hwnd_classdc, "wrong window\n" ); + old_dc = dc; + + dc = GetDC( hwnd_classdc2 ); + ok( old_dc == dc, "wrong DC\n" ); + rop = GetROP2( dc ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == hwnd_classdc2, "wrong window\n" ); + DestroyWindow( hwnd_classdc2 ); - dc = GetDCEx(hwnd_owndc, 0, DCX_USESTYLE); - ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); + rop = GetROP2( dc ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + todo_wine ok( !ReleaseDC( hwnd_classdc2, dc ), "ReleaseDC succeeded\n" ); + dc = GetDC( hwnd_classdc2 ); + ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); + + dc = GetDC( hwnd_classdc ); + ok( dc != 0, "Got NULL DC\n" ); + rop = GetROP2( dc ); + todo_wine ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == hwnd_classdc, "wrong window\n" ); + DestroyWindow( hwnd_classdc ); + + rop = GetROP2( dc ); + todo_wine ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + todo_wine ok( !ReleaseDC( hwnd_classdc, dc ), "ReleaseDC succeeded\n" ); + dc = GetDC( hwnd_classdc ); + ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); + + dc = GetDC( hwnd_owndc ); + ok( dc != 0, "Got NULL DC\n" ); + rop = GetROP2( dc ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == hwnd_owndc, "wrong window\n" ); + DestroyWindow( hwnd_owndc ); - dc = GetDCEx(hwnd_classdc, 0, DCX_USESTYLE); - ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); + rop = GetROP2( dc ); + ok( rop == 0, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( !ReleaseDC( hwnd_owndc, dc ), "ReleaseDC succeeded\n" ); + dc = GetDC( hwnd_owndc ); + ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); - dc = GetDCEx(hwnd_classdc2, 0, DCX_USESTYLE); - ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); + DestroyWindow( hwnd_parent ); } START_TEST(dce) @@ -661,12 +738,6 @@ START_TEST(dce) test_scroll_window(); test_invisible_create(); test_dc_layout(); - - DestroyWindow(hwnd_parent); - DestroyWindow(hwnd_classdc2); - DestroyWindow(hwnd_classdc); - DestroyWindow(hwnd_owndc); - DestroyWindow(hwnd_cache); - + /* this should be last */ test_destroyed_window(); }

1 0

Alexandre Julliard : winex11: Store the process name at startup to avoid grabbing the loader lock again.
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: fc21a83a91c527d85a7b7be1d54700b9b88058d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc21a83a91c527d85a7b7be1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:12:48 2017 +0200 winex11: Store the process name at startup to avoid grabbing the loader lock again. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 33 --------------------------------- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 21 ++++++++++++++------- 3 files changed, 15 insertions(+), 40 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index eaf6dcf..d35328c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -803,38 +803,6 @@ static void set_style_hints( struct x11drv_win_data *data, DWORD style, DWORD ex /*********************************************************************** - * get_process_name - * - * get the name of the current process for setting class hints - */ -static char *get_process_name(void) -{ - static char *name; - - if (!name) - { - WCHAR module[MAX_PATH]; - DWORD len = GetModuleFileNameW( 0, module, MAX_PATH ); - if (len && len < MAX_PATH) - { - char *ptr; - WCHAR *p, *appname = module; - - if ((p = strrchrW( appname, '/' ))) appname = p + 1; - if ((p = strrchrW( appname, '\\' ))) appname = p + 1; - len = WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, NULL, 0, NULL, NULL ); - if ((ptr = HeapAlloc( GetProcessHeap(), 0, len ))) - { - WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, ptr, len, NULL, NULL ); - name = ptr; - } - } - } - return name; -} - - -/*********************************************************************** * set_initial_wm_hints * * Set the window manager hints that don't change over the lifetime of a window. @@ -845,7 +813,6 @@ static void set_initial_wm_hints( Display *display, Window window ) Atom protocols[3]; Atom dndVersion = WINE_XDND_VERSION; XClassHint *class_hints; - char *process_name = get_process_name(); /* wm protocols */ i = 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f125289..721c082 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -395,6 +395,7 @@ extern int copy_default_colors DECLSPEC_HIDDEN; extern int alloc_system_colors DECLSPEC_HIDDEN; extern int xrender_error_base DECLSPEC_HIDDEN; extern HMODULE x11drv_module DECLSPEC_HIDDEN; +extern char *process_name DECLSPEC_HIDDEN; extern Display *clipboard_display DECLSPEC_HIDDEN; /* atoms */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2127df4..65ef59b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -49,6 +49,7 @@ #include "x11drv.h" #include "xcomposite.h" #include "wine/server.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "wine/library.h" @@ -84,6 +85,7 @@ int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; int xrender_error_base = 0; HMODULE x11drv_module = 0; +char *process_name = NULL; static x11drv_error_callback err_callback; /* current callback for error */ static Display *err_callback_display; /* display callback is set for */ @@ -323,7 +325,9 @@ static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, */ static void setup_options(void) { - char buffer[MAX_PATH+16]; + static const WCHAR x11driverW[] = {'\\','X','1','1',' ','D','r','i','v','e','r',0}; + char buffer[64]; + WCHAR bufferW[MAX_PATH+16]; HKEY hkey, appkey = 0; DWORD len; @@ -332,18 +336,21 @@ static void setup_options(void) /* open the app-specific key */ - len = (GetModuleFileNameA( 0, buffer, MAX_PATH )); + len = (GetModuleFileNameW( 0, bufferW, MAX_PATH )); if (len && len < MAX_PATH) { HKEY tmpkey; - char *p, *appname = buffer; - if ((p = strrchr( appname, '/' ))) appname = p + 1; - if ((p = strrchr( appname, '\\' ))) appname = p + 1; - strcat( appname, "\\X11 Driver" ); + WCHAR *p, *appname = bufferW; + if ((p = strrchrW( appname, '/' ))) appname = p + 1; + if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + len = WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, NULL, 0, NULL, NULL ); + if ((process_name = HeapAlloc( GetProcessHeap(), 0, len ))) + WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, process_name, len, NULL, NULL ); + strcatW( appname, x11driverW ); /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\X11 Driver */ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey )) { - if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0; + if (RegOpenKeyW( tmpkey, appname, &appkey )) appkey = 0; RegCloseKey( tmpkey ); } }

1 0

Nikolay Sivov : msacm32/tests: Fix a memory leak in tests (Valgrind).
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: f03b8a42f97f87bfaac1e30a37e6e18b9bd48c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03b8a42f97f87bfaac1e30a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 14 08:23:37 2017 +0300 msacm32/tests: Fix a memory leak in tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 337e20c..959ec7f 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1272,6 +1272,8 @@ static void test_acmFormatChoose(void) rc = acmFormatChooseW(&afc); ok(rc == MMSYSERR_INVALPARAM, "expected 0xb, got 0x%x\n", rc); afc.pwfx = pwfx; + + HeapFree(GetProcessHeap(), 0, pwfx); } static struct

1 0

Stefan Dösinger : msvcp140: Implement _Stat and _Lstat.
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: 621e96bfdb55182dbaf89a1500971ebcf547c0b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621e96bfdb55182dbaf89a150… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 17 14:23:50 2017 +0200 msvcp140: Implement _Stat and _Lstat. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 +- dlls/msvcp140/tests/msvcp140.c | 149 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 59 +++++++++++++++- 3 files changed, 207 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=621e96bfdb55182dbaf89…

1 0

Stefan Dösinger : msvcp140/tests: Port test_dir_operation to msvcp140.
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: 8f0ff15ec7c429ee7ce847ee84a9aa9e58ee9dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0ff15ec7c429ee7ce847ee8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 17 14:23:51 2017 +0200 msvcp140/tests: Port test_dir_operation to msvcp140. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 1 + dlls/msvcp140/tests/msvcp140.c | 123 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 0e3293f..cd7d457 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1461,6 +1461,7 @@ static void test_tr2_sys__dir_operation(void) } file_name = p_tr2_sys__Read_dir(dest, result_handle, &type); } + ok(type == status_unknown, "p_tr2_sys__Read_dir(): expect: status_unknown, got %d\n", type); p_tr2_sys__Close_dir(result_handle); ok(result_handle != NULL, "tr2_sys__Open_dir(): expect: not NULL, got %p\n", result_handle); ok(num_of_f1 == 1, "found f1 %d times\n", num_of_f1); diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index dd2255d..94f87dc 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -165,10 +165,13 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static void (__cdecl *p_Close_dir)(void*); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); static enum file_type (__cdecl *p_Lstat)(WCHAR const *, int *); +static void* (__cdecl *p_Open_dir)(WCHAR*, WCHAR const*, int *, enum file_type*); +static WCHAR* (__cdecl *p_Read_dir)(WCHAR*, void*, enum file_type*); static enum file_type (__cdecl *p_Stat)(WCHAR const *, int *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); @@ -238,10 +241,13 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); } + SET(p_Close_dir, "_Close_dir"); SET(p_Current_get, "_Current_get"); SET(p_Current_set, "_Current_set"); SET(p_File_size, "_File_size"); SET(p_Lstat, "_Lstat"); + SET(p_Open_dir, "_Open_dir"); + SET(p_Read_dir, "_Read_dir"); SET(p_Stat, "_Stat"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); @@ -839,6 +845,122 @@ static void test_Stat(void) ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } +static void test_dir_operation(void) +{ + WCHAR *file_name, first_file_name[MAX_PATH], dest[MAX_PATH], longer_path[MAX_PATH]; + WCHAR origin_path[MAX_PATH], temp_path[MAX_PATH]; + HANDLE file, result_handle; + enum file_type type; + int err, num_of_f1 = 0, num_of_f2 = 0, num_of_sub_dir = 0, num_of_other_files = 0; + WCHAR test_dirW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; + WCHAR test_f1W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; + WCHAR test_f2W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','2',0}; + WCHAR test_sub_dirW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','s','u','b','_','d','i','r',0}; + WCHAR test_sub_dir_f1W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r', + '/','s','u','b','_','d','i','r','/','f','1',0}; + WCHAR backslashW[] = {'\\',0}; + WCHAR sW[] = {'s',0}; + WCHAR f1W[] = {'f','1',0}; + WCHAR f2W[] = {'f','2',0}; + WCHAR sub_dirW[] = {'s','u','b','_','d','i','r',0}; + WCHAR not_existW[] = {'n','o','t','_','e','x','i','s','t',0}; + WCHAR emtpy_dirW[] = {'e','m','p','t','y','_','d','i','r',0}; + + memset(origin_path, 0, sizeof(origin_path)); + memset(origin_path, 0, sizeof(temp_path)); + GetCurrentDirectoryW(MAX_PATH, origin_path); + GetTempPathW(MAX_PATH, temp_path); + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + + CreateDirectoryW(test_dirW, NULL); + file = CreateFileW(test_f1W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + file = CreateFileW(test_f2W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + CreateDirectoryW(test_sub_dirW, NULL); + file = CreateFileW(test_sub_dir_f1W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + + memcpy(longer_path, temp_path, sizeof(longer_path)); + wcscat(longer_path, backslashW); + wcscat(longer_path, test_dirW); + wcscat(longer_path, backslashW); + while(lstrlenW(longer_path) < MAX_PATH-1) + wcscat(longer_path, sW); + memset(first_file_name, 0, sizeof(first_file_name)); + type = err = 0xdeadbeef; + result_handle = NULL; + result_handle = p_Open_dir(first_file_name, longer_path, &err, &type); + ok(result_handle == NULL, "_Open_dir(): expect NULL, got %p\n", result_handle); + ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); + ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok((int)type == 0xdeadbeef, "_Open_dir(): expect 0xdeadbeef, got %d\n", type); + + memset(first_file_name, 0, sizeof(first_file_name)); + memset(dest, 0, sizeof(dest)); + err = type = 0xdeadbeef; + result_handle = NULL; + result_handle = p_Open_dir(first_file_name, test_dirW, &err, &type); + ok(result_handle != NULL, "_Open_dir(): expect: not NULL, got %p\n", result_handle); + ok(err == ERROR_SUCCESS, "_Open_dir(): expect: ERROR_SUCCESS, got %d\n", err); + file_name = first_file_name; + while(*file_name) { + if (!wcscmp(file_name, f1W)) { + ++num_of_f1; + ok(type == regular_file, "expect regular_file, got %d\n", type); + }else if(!wcscmp(file_name, f2W)) { + ++num_of_f2; + ok(type == regular_file, "expect regular_file, got %d\n", type); + }else if(!wcscmp(file_name, sub_dirW)) { + ++num_of_sub_dir; + ok(type == directory_file, "expect directory_file, got %d\n", type); + }else { + ++num_of_other_files; + } + file_name = p_Read_dir(dest, result_handle, &type); + } + ok(type == status_unknown, "_Read_dir(): expect: status_unknown, got %d\n", type); + p_Close_dir(result_handle); + ok(result_handle != NULL, "_Open_dir(): expect: not NULL, got %p\n", result_handle); + ok(num_of_f1 == 1, "found f1 %d times\n", num_of_f1); + ok(num_of_f2 == 1, "found f2 %d times\n", num_of_f2); + ok(num_of_sub_dir == 1, "found sub_dir %d times\n", num_of_sub_dir); + ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); + + memset(first_file_name, 0, sizeof(first_file_name)); + err = type = 0xdeadbeef; + result_handle = file; + result_handle = p_Open_dir(first_file_name, not_existW, &err, &type); + ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); + todo_wine ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok((int)type == 0xdeadbeef, "_Open_dir(): expect: 0xdeadbeef, got %d\n", type); + ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); + + CreateDirectoryW(emtpy_dirW, NULL); + memset(first_file_name, 0, sizeof(first_file_name)); + err = type = 0xdeadbeef; + result_handle = file; + result_handle = p_Open_dir(first_file_name, emtpy_dirW, &err, &type); + ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); + ok(err == ERROR_SUCCESS, "_Open_dir(): expect: ERROR_SUCCESS, got %d\n", err); + ok(type == status_unknown, "_Open_dir(): expect: status_unknown, got %d\n", type); + ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); + p_Close_dir(result_handle); + ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); + + ok(RemoveDirectoryW(emtpy_dirW), "expect empty_dir to exist\n"); + ok(DeleteFileW(test_sub_dir_f1W), "expect wine_test_dir/sub_dir/sub_f1 to exist\n"); + ok(RemoveDirectoryW(test_sub_dirW), "expect wine_test_dir/sub_dir to exist\n"); + ok(DeleteFileW(test_f1W), "expect wine_test_dir/f1 to exist\n"); + ok(DeleteFileW(test_f2W), "expect wine_test_dir/f2 to exist\n"); + ok(RemoveDirectoryW(test_dirW), "expect wine_test_dir to exist\n"); + + ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -854,5 +976,6 @@ START_TEST(msvcp140) test_Current_get(); test_Current_set(); test_Stat(); + test_dir_operation(); FreeLibrary(msvcp); }

1 0

Henri Verbeet : wined3d: Make a FIXME in cpu_blitter_clear() slightly more accurate.
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: 864bef4c193276eefc8198ea2b91b5339d210db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864bef4c193276eefc8198ea2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:36 2017 +0200 wined3d: Make a FIXME in cpu_blitter_clear() slightly more accurate. The issue isn't so much stencil clears as clearing either depth or stencil on formats that contain both. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c1bb53e..c914e8d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3499,12 +3499,15 @@ static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } } - if ((flags & WINED3DCLEAR_ZBUFFER) && (view = fb->depth_stencil)) + if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && (view = fb->depth_stencil)) + { + if ((view->format->depth_size && !(flags & WINED3DCLEAR_ZBUFFER)) + || (view->format->stencil_size && !(flags & WINED3DCLEAR_STENCIL))) + FIXME("Clearing %#x on %s.\n", flags, debug_d3dformat(view->format->id)); + surface_cpu_blt_colour_fill(view, &box, &c); + } } - - if (flags & ~(WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER)) - FIXME("flags %#x not implemented.\n", flags); } static void cpu_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op,

1 0

Henri Verbeet : wined3d: Handle WINED3D_POOL_SYSTEM_MEM resources in ffp_blitter_use_cpu_clear().
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: 95e42a8d19a748af012bd0194035e0463a8d050e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95e42a8d19a748af012bd0194… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:37 2017 +0200 wined3d: Handle WINED3D_POOL_SYSTEM_MEM resources in ffp_blitter_use_cpu_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c914e8d..d000e5c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2551,6 +2551,9 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) struct wined3d_texture *texture; resource = view->resource; + if (resource->pool == WINED3D_POOL_SYSTEM_MEM) + return TRUE; + if (resource->type == WINED3D_RTYPE_BUFFER) return FALSE; @@ -2578,9 +2581,6 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de continue; resource = view->resource; - if (resource->pool == WINED3D_POOL_SYSTEM_MEM) - goto next; - if (!(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && ffp_blitter_use_cpu_clear(view)) goto next; @@ -2601,13 +2601,9 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } } - if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - { - view = fb->depth_stencil; - if (view && (view->resource->pool == WINED3D_POOL_SYSTEM_MEM - || ffp_blitter_use_cpu_clear(view))) - goto next; - } + if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + && (view = fb->depth_stencil) && ffp_blitter_use_cpu_clear(view)) + goto next; device_clear_render_targets(device, rt_count, fb, rect_count, clear_rects, draw_rect, flags, colour, depth, stencil);

1 0

Henri Verbeet : wined3d: Simplify the render target check in ffp_blitter_clear().
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: b8e0af67f5443bf123667fb91798b68c251deb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e0af67f5443bf123667fb91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:38 2017 +0200 wined3d: Simplify the render target check in ffp_blitter_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d000e5c..632a42b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2569,7 +2569,6 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_rendertarget_view *view; - struct wined3d_resource *resource; struct wined3d_blitter *next; unsigned int i; @@ -2580,22 +2579,13 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if (!(view = fb->render_targets[i])) continue; - resource = view->resource; - if (!(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + if ((!(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && ffp_blitter_use_cpu_clear(view)) + || (!(view->resource->usage & WINED3DUSAGE_RENDERTARGET) + && (wined3d_settings.offscreen_rendering_mode != ORM_FBO + || !(view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE)))) goto next; - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - if (!((view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (resource->usage & WINED3DUSAGE_RENDERTARGET))) - goto next; - } - else if (!(resource->usage & WINED3DUSAGE_RENDERTARGET)) - { - goto next; - } - /* FIXME: We should reject colour fills on formats with fixups, * but this would break P8 colour fills for example. */ }

1 0