September 2013 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLStyle6::outline property implementation.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: 6d13dd697c99ebf6fa603c637234a09b14315720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d13dd697c99ebf6fa603c637… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 16:05:34 2013 +0200 mshtml: Added IHTMLStyle6::outline property implementation. --- dlls/mshtml/htmlstyle.c | 5 ++++- dlls/mshtml/htmlstyle.h | 2 ++ dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 053c326..5ed2f93 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -135,6 +135,8 @@ static const WCHAR attrMarginTop[] = {'m','a','r','g','i','n','-','t','o','p',0}; static const WCHAR attrMinHeight[] = {'m','i','n','-','h','e','i','g','h','t',0}; +static const WCHAR attrOutline[] = + {'o','u','t','l','i','n','e',0}; static const WCHAR attrOverflow[] = {'o','v','e','r','f','l','o','w',0}; static const WCHAR attrOverflowX[] = @@ -241,6 +243,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, + {attrOutline, DISPID_IHTMLSTYLE6_OUTLINE}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, {attrOverflowX, DISPID_IHTMLSTYLE2_OVERFLOWX}, {attrOverflowY, DISPID_IHTMLSTYLE2_OVERFLOWY}, @@ -464,7 +467,7 @@ static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) DWORD len; if(!*val) { - *p = NULL; + *p = (flags & ATTR_NO_NULL) ? SysAllocStringLen(NULL, 0) : NULL; return S_OK; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 4f2e5ab..646375f 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -83,6 +83,7 @@ typedef enum { STYLEID_MARGIN_RIGHT, STYLEID_MARGIN_TOP, STYLEID_MIN_HEIGHT, + STYLEID_OUTLINE, STYLEID_OVERFLOW, STYLEID_OVERFLOW_X, STYLEID_OVERFLOW_Y, @@ -123,3 +124,4 @@ HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, #define ATTR_STR_TO_INT 0x0004 #define ATTR_HEX_INT 0x0008 #define ATTR_REMOVE_COMMA 0x0010 +#define ATTR_NO_NULL 0x0020 diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 912d80c..116181c 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -702,15 +702,19 @@ static HRESULT WINAPI HTMLStyle6_get_counterReset(IHTMLStyle6 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle6_put_outline(IHTMLStyle6 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_OUTLINE, v, 0); } static HRESULT WINAPI HTMLStyle6_get_outline(IHTMLStyle6 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_OUTLINE, p, ATTR_NO_NULL); } static HRESULT WINAPI HTMLStyle6_put_outlineWidth(IHTMLStyle6 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e42bcb7..71eb955 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -37,6 +37,13 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } +static BOOL wstr_contains(const WCHAR *strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return strstr(buf, stra) != NULL; +} + static BSTR a2bstr(const char *str) { BSTR ret; @@ -464,11 +471,35 @@ static void test_style4(IHTMLStyle4 *style4) VariantClear(&vdefault); } +static void test_style6(IHTMLStyle6 *style) +{ + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLStyle6_get_outline(style, &str); + ok(hres == S_OK, "get_outline failed: %08x\n", hres); + ok(str && !*str, "outline = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("1px"); + hres = IHTMLStyle6_put_outline(style, str); + ok(hres == S_OK, "put_outline failed: %08x\n", hres); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle6_get_outline(style, &str); + ok(hres == S_OK, "get_outline failed: %08x\n", hres); + ok(wstr_contains(str, "1px"), "outline = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_body_style(IHTMLStyle *style) { IHTMLStyle2 *style2; IHTMLStyle3 *style3; IHTMLStyle4 *style4; + IHTMLStyle6 *style6; VARIANT_BOOL b; VARIANT v; BSTR str; @@ -2064,6 +2095,14 @@ static void test_body_style(IHTMLStyle *style) test_style4(style4); IHTMLStyle4_Release(style4); } + + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle6, (void**)&style6); + if(SUCCEEDED(hres)) { + test_style6(style6); + IHTMLStyle6_Release(style6); + }else { + win_skip("IHTMLStyle6 not available\n"); + } } #define test_style_filter(a,b) _test_style_filter(__LINE__,a,b)

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::x implementation.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: c24767262b296514c42defe14de2a4a4637b1f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24767262b296514c42defe14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 14:18:04 2013 +0200 mshtml: Added IHTMLEventObj::x implementation. --- dlls/mshtml/htmlevent.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9ea1708..ec56029 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -621,10 +622,24 @@ static HRESULT WINAPI HTMLEventObj_get_reason(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); + LONG x = 0; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - *p = -1; + if(This->nsevent) { + nsIDOMUIEvent *ui_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); + if(NS_SUCCEEDED(nsres)) { + /* NOTE: pageX is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageX(ui_event, &x); + assert(nsres == NS_OK); + nsIDOMUIEvent_Release(ui_event); + } + } + + *p = x; return S_OK; }

1 0

Sebastian Lackner : winex11: Call destroy_gl_drawable before destroying the window.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: e915cfd4e7ca78369a17172891b5a5f8e442d880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e915cfd4e7ca78369a1717289… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Sep 28 04:35:17 2013 +0200 winex11: Call destroy_gl_drawable before destroying the window. --- dlls/winex11.drv/window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1ff36eb..741a303 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1598,6 +1598,8 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; + destroy_gl_drawable( hwnd ); + if (!(data = get_win_data( hwnd ))) return; destroy_whole_window( data, FALSE ); @@ -1609,7 +1611,6 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); release_win_data( data ); HeapFree( GetProcessHeap(), 0, data ); - destroy_gl_drawable( hwnd ); }

1 0

Dmitry Timoshkov : ntdll: Don't use asynchronous file IO in the loader.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: c7afb0bb882fd0ca6656b9c6a503b4465916a927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7afb0bb882fd0ca6656b9c6a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 30 20:19:39 2013 +0900 ntdll: Don't use asynchronous file IO in the loader. --- dlls/ntdll/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b3abad0..b1c7600 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1881,7 +1881,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; goto found; } @@ -1916,7 +1916,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; } found: RtlFreeUnicodeString( &nt_name );

1 0

Thomas Faber : mmdevapi: Fix build with MSVC.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: 513f8286cbeff8d7e226229b8fb08bc8ea963a31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513f8286cbeff8d7e226229b8… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Sep 30 14:13:13 2013 +0200 mmdevapi: Fix build with MSVC. --- dlls/mmdevapi/devenum.c | 3 ++- dlls/mmdevapi/mmdevapi.h | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 21a3530..eebf4ed 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -569,7 +569,8 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls { /* ::Load cannot assume the interface stays alive after the function returns, * so just create the interface on the stack, saves a lot of complicated code */ - IPropertyBagImpl bag = { { &PB_Vtbl }, This->devguid }; + IPropertyBagImpl bag = { { &PB_Vtbl } }; + bag.devguid = This->devguid; hr = IPersistPropertyBag_Load(ppb, &bag.IPropertyBag_iface, NULL); IPersistPropertyBag_Release(ppb); if (FAILED(hr)) diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index c511240..2a04780 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -41,18 +41,18 @@ typedef struct _DriverFuncs { * If multiple drivers think they are valid, they will return a * priority value reflecting the likelihood that they are actually * valid. See enum _DriverPriority. */ - int WINAPI (*pGetPriority)(void); + int (WINAPI *pGetPriority)(void); /* ids gets an array of human-friendly endpoint names * keys gets an array of driver-specific stuff that is used * in GetAudioEndpoint to identify the endpoint * it is the caller's responsibility to free both arrays, and * all of the elements in both arrays with HeapFree() */ - HRESULT WINAPI (*pGetEndpointIDs)(EDataFlow flow, WCHAR ***ids, + HRESULT (WINAPI *pGetEndpointIDs)(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, UINT *default_index); - HRESULT WINAPI (*pGetAudioEndpoint)(void *key, IMMDevice *dev, + HRESULT (WINAPI *pGetAudioEndpoint)(void *key, IMMDevice *dev, IAudioClient **out); - HRESULT WINAPI (*pGetAudioSessionManager)(IMMDevice *device, + HRESULT (WINAPI *pGetAudioSessionManager)(IMMDevice *device, IAudioSessionManager2 **out); } DriverFuncs;

1 0

Daniel Jelinski : include: Define ERROR_REQUEST_PAUSED.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: d15416a563c77e76ca483893e0bc8e8e1ab61793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15416a563c77e76ca483893e… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Sep 20 22:46:59 2013 +0200 include: Define ERROR_REQUEST_PAUSED. --- include/winerror.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index edd8af0..9d988fb 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1147,6 +1147,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_PRINTER_NOT_FOUND 3012 #define ERROR_PRINTER_DRIVER_WARNED 3013 #define ERROR_PRINTER_DRIVER_BLOCKED 3014 +#define ERROR_REQUEST_PAUSED 3050 #define ERROR_WINS_INTERNAL 4000 #define ERROR_CAN_NOT_DEL_LOCAL_WINS 4001 #define ERROR_STATIC_INIT 4002

1 0

Frédéric Delanoy : wmc: Use BOOL type where appropriate.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: bf36cf284eb97e19f8e271b3bd8e66fdab11b8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf36cf284eb97e19f8e271b3b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 28 08:44:58 2013 +0200 wmc: Use BOOL type where appropriate. --- tools/wmc/po.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index de15e24..489c7d4 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -297,7 +297,7 @@ static void po_xerror2( int severity, po_message_t message1, static const struct po_xerror_handler po_xerror_handler = { po_xerror, po_xerror2 }; -static int is_english( int lan ) +static BOOL is_english( int lan ) { return lan == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); }

1 0

Qian Hong : atl80: Add a WinSxS manifest resource.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: 55f31701ab975d51351051b197a5d847c872ba47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f31701ab975d51351051b19… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Sep 28 06:11:24 2013 +0800 atl80: Add a WinSxS manifest resource. --- dlls/atl80/Makefile.in | 2 ++ dlls/atl80/atl80.manifest | 5 +++++ dlls/atl80/atl80.rc | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 5cf626e..74ee460 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -6,4 +6,6 @@ EXTRADEFS = -D_ATL_VER=_ATL_VER_80 C_SRCS = atl80.c +RC_SRCS = atl80.rc + @MAKE_DLL_RULES@ diff --git a/dlls/atl80/atl80.manifest b/dlls/atl80/atl80.manifest new file mode 100644 index 0000000..039a3d6 --- /dev/null +++ b/dlls/atl80/atl80.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.VC80.ATL" version="8.0.50727.4053" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <file name="atl80.dll"/> +</assembly> diff --git a/dlls/atl80/atl80.rc b/dlls/atl80/atl80.rc new file mode 100644 index 0000000..b6ea3d4 --- /dev/null +++ b/dlls/atl80/atl80.rc @@ -0,0 +1,22 @@ +/* + * Resource file for atl80 + * + * Copyright 2011 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: atl80.manifest */ +WINE_MANIFEST 24 atl80.manifest

1 0

Alexandre Julliard : makefiles: Clean files from the top-level makefile where possible.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: 8355887560016be29258159bb828b2a668eae7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8355887560016be29258159bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 30 12:11:42 2013 +0200 makefiles: Clean files from the top-level makefile where possible. --- Make.rules.in | 3 +- aclocal.m4 | 76 ++++++++++-- configure | 319 +++++++++++++++++++++++++++++-------------------- configure.ac | 220 +++++++++++++++++----------------- libs/wine/Makefile.in | 3 +- tools/make_makefiles | 21 ++-- 6 files changed, 381 insertions(+), 261 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8355887560016be292581…

1 0

Henri Verbeet : wined3d: Send scissor rect updates through the command stream.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: 077606043930690172cba4c27959efba96c98487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=077606043930690172cba4c27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 30 09:40:41 2013 +0200 wined3d: Send scissor rect updates through the command stream. --- dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bf88f9f..b9f2929 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -29,6 +29,7 @@ enum wined3d_cs_op WINED3D_CS_OP_CLEAR, WINED3D_CS_OP_DRAW, WINED3D_CS_OP_SET_VIEWPORT, + WINED3D_CS_OP_SET_SCISSOR_RECT, }; struct wined3d_cs_present @@ -69,6 +70,12 @@ struct wined3d_cs_set_viewport const struct wined3d_viewport *viewport; }; +struct wined3d_cs_set_scissor_rect +{ + enum wined3d_cs_op opcode; + const RECT *rect; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -172,12 +179,32 @@ void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_vi cs->ops->submit(cs); } +static void wined3d_cs_exec_set_scissor_rect(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_scissor_rect *op = data; + + cs->state.scissor_rect = *op->rect; + device_invalidate_state(cs->device, STATE_SCISSORRECT); +} + +void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) +{ + struct wined3d_cs_set_scissor_rect *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECT; + op->rect = rect; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, /* WINED3D_CS_OP_CLEAR */ wined3d_cs_exec_clear, /* WINED3D_CS_OP_DRAW */ wined3d_cs_exec_draw, /* WINED3D_CS_OP_SET_VIEWPORT */ wined3d_cs_exec_set_viewport, + /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d7ef129..5f4cafb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2060,7 +2060,7 @@ void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const return; } - device_invalidate_state(device, STATE_SCISSORRECT); + wined3d_cs_emit_set_scissor_rect(device->cs, rect); } void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) @@ -4021,7 +4021,7 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, state->scissor_rect.left = 0; state->scissor_rect.right = render_target->resource.width; state->scissor_rect.bottom = render_target->resource.height; - device_invalidate_state(device, STATE_SCISSORRECT); + wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } @@ -4728,7 +4728,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state->scissor_rect.left = 0; state->scissor_rect.right = rt->resource.width; state->scissor_rect.bottom = rt->resource.height; - device_invalidate_state(device, STATE_SCISSORRECT); + wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } swapchain_update_render_to_fbo(swapchain); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5fd759a..f5665dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2486,6 +2486,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state

1 0