April 2014 - Wine-Commits - list.winehq.org

Alexandre Julliard : wrc: Allow specifying the default message font in dialogs by setting DS_SETFONT.
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 03167b43698ad49c9c2dd90fb927e96fb3af9aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03167b43698ad49c9c2dd90fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 15 19:50:11 2014 +0200 wrc: Allow specifying the default message font in dialogs by setting DS_SETFONT. --- tools/wrc/genres.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 61b2b29..9cea432 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -682,6 +682,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) } put_string(res, dlg->font->name, str_unicode, TRUE, dlg->lvc.language); } + else if (dlg->style->or_mask & DS_SETFONT) put_word( res, 0x7fff ); put_pad(res); while(ctrl)

1 0

Hans Leidekker : netprofm: Add a stub implementation of INetworkCostManager.
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: c7690c70bab5f2a34bf30dd66821206811ba6af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7690c70bab5f2a34bf30dd66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 15 13:34:24 2014 +0200 netprofm: Add a stub implementation of INetworkCostManager. --- dlls/netprofm/list.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ dlls/netprofm/tests/list.c | 18 +++++++++++ include/netlistmgr.idl | 57 +++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 7c0b9e1..d5940f4 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -33,9 +33,76 @@ WINE_DEFAULT_DEBUG_CHANNEL(netprofm); struct list_manager { INetworkListManager INetworkListManager_iface; + INetworkCostManager INetworkCostManager_iface; LONG refs; }; +static inline struct list_manager *impl_from_INetworkCostManager( + INetworkCostManager *iface ) +{ + return CONTAINING_RECORD( iface, struct list_manager, INetworkCostManager_iface ); +} + +static HRESULT WINAPI cost_manager_QueryInterface( + INetworkCostManager *iface, + REFIID riid, + void **obj ) +{ + struct list_manager *mgr = impl_from_INetworkCostManager( iface ); + return INetworkListManager_QueryInterface( &mgr->INetworkListManager_iface, riid, obj ); +} + +static ULONG WINAPI cost_manager_AddRef( + INetworkCostManager *iface ) +{ + struct list_manager *mgr = impl_from_INetworkCostManager( iface ); + return INetworkListManager_AddRef( &mgr->INetworkListManager_iface ); +} + +static ULONG WINAPI cost_manager_Release( + INetworkCostManager *iface ) +{ + struct list_manager *mgr = impl_from_INetworkCostManager( iface ); + return INetworkListManager_Release( &mgr->INetworkListManager_iface ); +} + +static HRESULT WINAPI cost_manager_GetCost( + INetworkCostManager *iface, DWORD *pCost, NLM_SOCKADDR *pDestIPAddr) +{ + FIXME( "%p, %p, %p\n", iface, pCost, pDestIPAddr ); + + if (!pCost) return E_POINTER; + + *pCost = NLM_CONNECTION_COST_UNRESTRICTED; + return S_OK; +} + +static HRESULT WINAPI cost_manager_GetDataPlanStatus( + INetworkCostManager *iface, NLM_DATAPLAN_STATUS *pDataPlanStatus, + NLM_SOCKADDR *pDestIPAddr) +{ + FIXME( "%p, %p, %p\n", iface, pDataPlanStatus, pDestIPAddr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI cost_manager_SetDestinationAddresses( + INetworkCostManager *iface, UINT32 length, NLM_SOCKADDR *pDestIPAddrList, + VARIANT_BOOL bAppend) +{ + FIXME( "%p, %u, %p, %x\n", iface, length, pDestIPAddrList, bAppend ); + return E_NOTIMPL; +} + +static const INetworkCostManagerVtbl cost_manager_vtbl = +{ + cost_manager_QueryInterface, + cost_manager_AddRef, + cost_manager_Release, + cost_manager_GetCost, + cost_manager_GetDataPlanStatus, + cost_manager_SetDestinationAddresses +}; + static inline struct list_manager *impl_from_INetworkListManager( INetworkListManager *iface ) { @@ -76,6 +143,10 @@ static HRESULT WINAPI list_manager_QueryInterface( { *obj = iface; } + else if (IsEqualGUID( riid, &IID_INetworkCostManager )) + { + *obj = &mgr->INetworkCostManager_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -222,6 +293,7 @@ HRESULT list_manager_create( void **obj ) if (!(mgr = HeapAlloc( GetProcessHeap(), 0, sizeof(*mgr) ))) return E_OUTOFMEMORY; mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; + mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; mgr->refs = 1; *obj = &mgr->INetworkListManager_iface; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 9ac427e..453856f 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -27,6 +27,7 @@ static void test_INetworkListManager( void ) { INetworkListManager *mgr; + INetworkCostManager *cost_mgr; NLM_CONNECTIVITY connectivity; VARIANT_BOOL connected; HRESULT hr; @@ -55,6 +56,23 @@ static void test_INetworkListManager( void ) ok( hr == S_OK, "got %08x\n", hr ); ok( connected == VARIANT_TRUE || connected == VARIANT_FALSE, "expected boolean value\n" ); + INetworkListManager_QueryInterface( mgr, &IID_INetworkCostManager, (void **)&cost_mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr == S_OK) + { + DWORD cost; + + hr = INetworkCostManager_GetCost( cost_mgr, NULL, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + cost = 0xdeadbeef; + hr = INetworkCostManager_GetCost( cost_mgr, &cost, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cost != 0xdeadbeef, "cost not set\n" ); + + INetworkCostManager_Release( cost_mgr ); + } + INetworkListManager_Release( mgr ); } diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index 6adca14..5be6e28 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -27,6 +27,7 @@ interface IEnumNetworks; interface IEnumNetworkConnections; interface INetwork; interface INetworkConnection; +interface INetworkCostManager; interface INetworkListManager; typedef [v1_enum] enum NLM_CONNECTIVITY @@ -49,6 +50,62 @@ typedef [v1_enum] enum NLM_ENUM_NETWORK NLM_ENUM_NETWORK_ALL = 0x03 } NLM_ENUM_NETWORK; +typedef [v1_enum] enum NLM_CONNECTION_COST +{ + NLM_CONNECTION_COST_UNKNOWN = 0x0, + NLM_CONNECTION_COST_UNRESTRICTED = 0x1, + NLM_CONNECTION_COST_FIXED = 0x2, + NLM_CONNECTION_COST_VARIABLE = 0x4, + NLM_CONNECTION_COST_OVERDATALIMIT = 0x10000, + NLM_CONNECTION_COST_CONGESTED = 0x20000, + NLM_CONNECTION_COST_ROAMING = 0x40000, + NLM_CONNECTION_COST_APPROACHINGDATALIMIT = 0x80000 +} NLM_CONNECTION_COST; + +typedef struct NLM_SOCKADDR +{ + BYTE data[128]; +} NLM_SOCKADDR; + +typedef struct NLM_USAGE_DATA +{ + DWORD UsageInMegabytes; + FILETIME LastSyncTime; +} NLM_USAGE_DATA; + +typedef struct NLM_DATAPLAN_STATUS +{ + GUID InterfaceGuid; + NLM_USAGE_DATA UsageData; + DWORD DataLimitInMegabytes; + DWORD InboundBandwidthInKbps; + DWORD OutboundBandwidthInKbps; + FILETIME NextBillingCycle; + DWORD MaxTransferSizeInMegabytes; + DWORD Reserved; +} NLM_DATAPLAN_STATUS; + +[ + object, + pointer_default(unique), + uuid(dcb00008-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkCostManager : IUnknown +{ + HRESULT GetCost( + [out] DWORD *pCost, + [in, unique] NLM_SOCKADDR *pDestIPAddr); + + HRESULT GetDataPlanStatus( + [out] NLM_DATAPLAN_STATUS *pDataPlanStatus, + [in, unique] NLM_SOCKADDR *pDestIPAddr); + + HRESULT SetDestinationAddresses( + [in] UINT32 length, + [in, unique, size_is(length)] NLM_SOCKADDR *pDestIPAddrList, + [in] VARIANT_BOOL bAppend); +} + [ dual, object,

1 0

Austin English : ntdll: Make sure flags are preserved in raise_trap_exception().
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 1a988fa46580250bd7640f8f0f3c4c06ea5053c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a988fa46580250bd7640f8f0… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Apr 12 13:20:55 2014 -0700 ntdll: Make sure flags are preserved in raise_trap_exception(). --- dlls/ntdll/signal_i386.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 63bf088..5f8b8fd 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1868,9 +1868,10 @@ static void WINAPI raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context if( !(context->EFlags & 0x100) || (ntdll_get_thread_data()->dr7 & 0xff) ) { /* (possible) hardware breakpoint, fetch the debug registers */ + DWORD saved_flags = context->ContextFlags; context->ContextFlags = CONTEXT_DEBUG_REGISTERS; NtGetContextThread(GetCurrentThread(), context); - context->ContextFlags |= CONTEXT_FULL; /* restore flags */ + context->ContextFlags |= saved_flags; /* restore flags */ } context->EFlags &= ~0x100; /* clear single-step flag */

1 0

Piotr Caban : user32/tests: Fix DrawMenuBar test failures.
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 179957d5a909fd0a47f360970d0d9e5ee7cde3a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179957d5a909fd0a47f360970… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 15 15:01:10 2014 +0200 user32/tests: Fix DrawMenuBar test failures. --- dlls/user32/tests/msg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a209492..684347d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4559,6 +4559,7 @@ static void test_messages(void) HMENU hmenu; MSG msg; LRESULT res; + POINT pos; flush_sequence(); @@ -4819,6 +4820,9 @@ static void test_messages(void) after_end_dialog = FALSE; test_def_id = FALSE; + ok(GetCursorPos(&pos), "GetCursorPos failed\n"); + ok(SetCursorPos(109, 109), "SetCursorPos failed\n"); + hwnd = CreateWindowExA(0, "TestDialogClass", NULL, WS_POPUP|WS_CHILD, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL); ok(hwnd != 0, "Failed to create custom dialog window\n"); @@ -4832,6 +4836,7 @@ static void test_messages(void) ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); flush_events(); ok_sequence(WmDrawMenuBarSeq, "DrawMenuBar", FALSE); + ok(SetCursorPos(pos.x, pos.y), "SetCursorPos failed\n"); DestroyWindow(hwnd); flush_sequence();

1 0

Jacek Caban : wscript: Added WScript.CreateObject implementation.
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 6617f27004039860ac5d487c5ec0e112890deaed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6617f27004039860ac5d487c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 15 09:34:53 2014 +0200 wscript: Added WScript.CreateObject implementation. --- programs/wscript/host.c | 25 +++++++++++++++++++++++-- programs/wscript/tests/run.js | 8 ++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 2a47ed8..55d4010 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -236,8 +236,29 @@ static HRESULT WINAPI Host_put_Timeout(IHost *iface, LONG v) static HRESULT WINAPI Host_CreateObject(IHost *iface, BSTR ProgID, BSTR Prefix, IDispatch **out_Dispatch) { - WINE_FIXME("(%s %s %p)\n", wine_dbgstr_w(ProgID), wine_dbgstr_w(Prefix), out_Dispatch); - return E_NOTIMPL; + IUnknown *unk; + GUID guid; + HRESULT hres; + + TRACE("(%s %s %p)\n", wine_dbgstr_w(ProgID), wine_dbgstr_w(Prefix), out_Dispatch); + + if(Prefix && *Prefix) { + FIXME("Prefix %s not supported\n", debugstr_w(Prefix)); + return E_NOTIMPL; + } + + hres = CLSIDFromProgID(ProgID, &guid); + if(FAILED(hres)) + return hres; + + hres = CoCreateInstance(&guid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER|CLSCTX_REMOTE_SERVER, + &IID_IUnknown, (void**)&unk); + if(FAILED(hres)) + return hres; + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)out_Dispatch); + IUnknown_Release(unk); + return hres; } static HRESULT WINAPI Host_Echo(IHost *iface, SAFEARRAY *args) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 8c75d0a..db0d6f9 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -49,4 +49,12 @@ WScript.Interactive = true; ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); ok(WScript.Application === WScript, "WScript.Application = " + WScript.Application); +var obj = WScript.CreateObject("Wine.Test"); +obj.ok(true, "Broken WScript.CreateObject object?"); + +try { + obj = WScript.CreateObject("nonexistent"); + ok(false, "Expected exception for CreateObject('nonexistent')"); +}catch(e) {} + winetest.reportSuccess();

1 0

Hans Leidekker : netprofm: Fix a memory leak.
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 06fd202a20ffc18dec43b76b11cdc8f88e1af80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=06fd202a20ffc18dec43b76b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 15 13:33:57 2014 +0200 netprofm: Fix a memory leak. --- dlls/netprofm/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index d6e9537..9808dee 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/main.c @@ -96,9 +96,6 @@ static HRESULT WINAPI netprofm_cf_CreateInstance( IClassFactory *iface, LPUNKNOW return r; r = IUnknown_QueryInterface( unk, riid, obj ); - if (FAILED( r )) - return r; - IUnknown_Release( unk ); return r; }

1 0

Henri Verbeet : wined3d: Set the WINED3DPBLENDCAPS_SRCALPHASAT destination blend cap when ARB_blend_func_extended is supported.
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 5b8d3a0c70e7b800317aeda7c698f991eece1ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8d3a0c70e7b800317aeda7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 15 09:15:20 2014 +0200 wined3d: Set the WINED3DPBLENDCAPS_SRCALPHASAT destination blend cap when ARB_blend_func_extended is supported. --- dlls/wined3d/directx.c | 12 ++++++------ dlls/wined3d/wined3d_gl.h | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 132dad1..f3331bf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -93,6 +93,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422 }, /* ARB */ + {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, @@ -4239,6 +4240,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPCMPCAPS_NEVER | WINED3DPCMPCAPS_NOTEQUAL; + /* WINED3DPBLENDCAPS_BOTHINVSRCALPHA and WINED3DPBLENDCAPS_BOTHSRCALPHA + * are legacy settings for srcblend only. */ caps->SrcBlendCaps = WINED3DPBLENDCAPS_BOTHINVSRCALPHA | WINED3DPBLENDCAPS_BOTHSRCALPHA | WINED3DPBLENDCAPS_DESTALPHA | @@ -4263,12 +4266,9 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPBLENDCAPS_SRCALPHA | WINED3DPBLENDCAPS_SRCCOLOR | WINED3DPBLENDCAPS_ZERO; - /* NOTE: WINED3DPBLENDCAPS_SRCALPHASAT is not supported as dest blend factor, - * according to the glBlendFunc manpage - * - * WINED3DPBLENDCAPS_BOTHINVSRCALPHA and WINED3DPBLENDCAPS_BOTHSRCALPHA are - * legacy settings for srcblend only - */ + + if (gl_info->supported[ARB_BLEND_FUNC_EXTENDED]) + caps->DestBlendCaps |= WINED3DPBLENDCAPS_SRCALPHASAT; if (gl_info->supported[EXT_BLEND_COLOR]) { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b357bb1..7331592 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -43,6 +43,7 @@ enum wined3d_gl_extension APPLE_FLUSH_BUFFER_RANGE, APPLE_YCBCR_422, /* ARB */ + ARB_BLEND_FUNC_EXTENDED, ARB_COLOR_BUFFER_FLOAT, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, @@ -180,6 +181,9 @@ enum wined3d_gl_extension /* GL_APPLE_flush_buffer_range */ \ USE_GL_FUNC(glBufferParameteriAPPLE) \ USE_GL_FUNC(glFlushMappedBufferRangeAPPLE) \ + /* GL_ARB_blend_func_extended */ \ + USE_GL_FUNC(glBindFragDataLocationIndexed) \ + USE_GL_FUNC(glGetFragDataIndex) \ /* GL_ARB_color_buffer_float */ \ USE_GL_FUNC(glClampColorARB) \ /* GL_ARB_debug_output */ \

1 0

Nikolay Sivov : riched20: GetClientSite() is implemented for IRichEditOle so uncomment related code (Coverity).
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 601738dfb56282b7b98a8dd6a181e54ead287a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601738dfb56282b7b98a8dd6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 08:49:41 2014 +0400 riched20: GetClientSite() is implemented for IRichEditOle so uncomment related code (Coverity). --- dlls/riched20/editor.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1235a16..bc5bc08 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1198,11 +1198,8 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm } if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && -#if 0 - /* FIXME: enable it when rich-edit properly implements this method */ IRichEditOle_GetClientSite(info->lpRichEditOle, &lpClientSite) == S_OK && IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK && -#endif IOleObject_GetUserClassID(lpObject, &clsid) == S_OK && IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK && IOleCache_Cache(lpOleCache, &fm, 0, &conn) == S_OK &&

1 0

Henri Verbeet : d3d8/tests: Use a separate device for add_dirty_rect_test( ).
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 29680b685a28bdf0cf2c32597885755ea9d5ea67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29680b685a28bdf0cf2c32597… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 15 09:15:22 2014 +0200 d3d8/tests: Use a separate device for add_dirty_rect_test(). --- dlls/d3d8/tests/visual.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a421579..c395355 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4333,10 +4333,10 @@ static void add_dirty_rect_test_draw(IDirect3DDevice8 *device) } quad[] = { - {{-1.0, -1.0, 0.0}, {0.0, 0.0}}, - {{ 1.0, -1.0, 0.0}, {1.0, 0.0}}, - {{-1.0, 1.0, 0.0}, {0.0, 1.0}}, - {{ 1.0, 1.0, 0.0}, {1.0, 1.0}}, + {{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 1.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, }; hr = IDirect3DDevice8_BeginScene(device); @@ -4347,16 +4347,31 @@ static void add_dirty_rect_test_draw(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); } -static void add_dirty_rect_test(IDirect3DDevice8 *device) +static void add_dirty_rect_test(void) { - HRESULT hr; - IDirect3DTexture8 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; IDirect3DSurface8 *surface_dst2, *surface_src_green, *surface_src_red, *surface_managed; + IDirect3DTexture8 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; + D3DLOCKED_RECT locked_rect; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; unsigned int i; + D3DCOLOR color; + ULONG refcount; DWORD *texel; - D3DLOCKED_RECT locked_rect; + HWND window; + HRESULT hr; + static const RECT part_rect = {96, 96, 160, 160}; - DWORD color; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex_dst1); @@ -4632,10 +4647,6 @@ static void add_dirty_rect_test(IDirect3DDevice8 *device) hr = IDirect3DTexture8_AddDirtyRect(tex_managed, NULL); ok(SUCCEEDED(hr), "Failed to add dirty rect, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); IDirect3DSurface8_Release(surface_dst2); IDirect3DSurface8_Release(surface_managed); IDirect3DSurface8_Release(surface_src_red); @@ -4645,6 +4656,11 @@ static void add_dirty_rect_test(IDirect3DDevice8 *device) IDirect3DTexture8_Release(tex_dst1); IDirect3DTexture8_Release(tex_dst2); IDirect3DTexture8_Release(tex_managed); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } START_TEST(visual) @@ -4721,11 +4737,12 @@ START_TEST(visual) fog_special_test(device_ptr); volume_dxt5_test(device_ptr); volume_v16u16_test(device_ptr); - add_dirty_rect_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + + add_dirty_rect_test(); }

1 0

Henri Verbeet : wined3d: Set VTF filter caps when VTF is supported.
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 7f2ae9889d4b30912b01511e0bc489acbb5d1695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2ae9889d4b30912b01511e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 15 09:15:19 2014 +0200 wined3d: Set VTF filter caps when VTF is supported. --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 62ad4c8..132dad1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4546,6 +4546,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */ caps->MaxVertexShader30InstructionSlots = max(512, adapter->gl_info.limits.arb_vs_instructions); + caps->VertexTextureFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT; } else if (caps->VertexShaderVersion == 2) {

1 0