October 2012 - Wine-Commits

Alexandre Julliard : user32: Also call set_window_pos when the WS_EX_LAYERED bit is changed.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 61f9789c3127a2a3ac3bf2d679caac94523bfce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f9789c3127a2a3ac3bf2d67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 13:17:40 2012 +0200 user32: Also call set_window_pos when the WS_EX_LAYERED bit is changed. --- dlls/user32/win.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0dbe29e..6845369 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2472,9 +2472,10 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B } SERVER_END_REQ; - if (offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) + if ((offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) || + (offset == GWL_EXSTYLE && ((style.styleOld ^ style.styleNew) & WS_EX_LAYERED))) { - needs_show = !(wndPtr->flags & WIN_HIDDEN) && (style.styleNew & WS_VISIBLE); + needs_show = !(wndPtr->flags & WIN_HIDDEN) && (wndPtr->dwStyle & WS_VISIBLE); invalidate_dce( wndPtr, NULL ); } WIN_ReleasePtr( wndPtr );

1 0

Jacek Caban : vbscript: Added Left() implementation.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 3e45fbcb6b210ebf32118b6bace4baf0dd8b9f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e45fbcb6b210ebf32118b6ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 1 12:59:56 2012 +0200 vbscript: Added Left() implementation. --- dlls/vbscript/global.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 10 ++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 3f88207..98eb047 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -632,10 +632,42 @@ static HRESULT Global_LenB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI return E_NOTIMPL; } -static HRESULT Global_Left(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Left(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, ret, conv_str = NULL; + int len, str_len; + HRESULT hres; + + TRACE("(%s %s)\n", debugstr_variant(args+1), debugstr_variant(args)); + + if(V_VT(args+1) == VT_BSTR) { + str = V_BSTR(args+1); + }else { + hres = to_string(args+1, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + hres = to_int(args, &len); + if(FAILED(hres)) + return hres; + + if(len < 0) { + FIXME("len = %d\n", len); + return E_FAIL; + } + + str_len = SysStringLen(str); + if(len > str_len) + len = str_len; + + ret = SysAllocStringLen(str, len); + SysFreeString(conv_str); + if(!ret) + return E_OUTOFMEMORY; + + return return_bstr(res, ret); } static HRESULT Global_LeftB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 9e39a0f..c6f8536 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -205,6 +205,16 @@ TestStrReverse "", "" TestStrReverse 123, "321" if isEnglishLang then TestStrReverse true, "eurT" +Sub TestLeft(str, len, ex) + Call ok(Left(str, len) = ex, "Left(" & str & ", " & len & ") = " & Left(str, len)) +End Sub + +TestLeft "test", 2, "te" +TestLeft "test", 5, "test" +TestLeft "test", 0, "" +TestLeft 123, 2, "12" +if isEnglishLang then TestLeft true, 2, "Tr" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0

Alexandre Julliard : user32: Create a dummy window surface for windows that shouldn't be painted to.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 72337011db113386ac293ca70768c5a467539cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72337011db113386ac293ca70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 13:08:51 2012 +0200 user32: Create a dummy window surface for windows that shouldn't be painted to. --- dlls/user32/painting.c | 5 +--- dlls/user32/win.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/win.h | 1 + 3 files changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 1a6de87..2a634fb 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -191,12 +191,9 @@ static void reset_dce_attrs( struct dce *dce ) */ static void release_dce( struct dce *dce ) { - RECT vis_rect; - if (!dce->hwnd) return; /* already released */ - vis_rect = get_virtual_screen_rect(); - __wine_set_visible_region( dce->hdc, 0, &vis_rect, &vis_rect, NULL ); + __wine_set_visible_region( dce->hdc, 0, &dummy_surface.rect, &dummy_surface.rect, &dummy_surface ); USER_Driver->pReleaseDC( dce->hwnd, dce->hdc ); if (dce->clip_rgn) DeleteObject( dce->clip_rgn ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8818868..0faf02d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -487,6 +487,67 @@ BOOL is_desktop_window( HWND hwnd ) /******************************************************************* + * Dummy window surface for windows that shouldn't get painted. + */ + +static void dummy_surface_lock( struct window_surface *window_surface ) +{ + /* nothing to do */ +} + +static void dummy_surface_unlock( struct window_surface *window_surface ) +{ + /* nothing to do */ +} + +static void *dummy_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) +{ + static DWORD dummy_data; + + info->bmiHeader.biSize = sizeof( info->bmiHeader ); + info->bmiHeader.biWidth = dummy_surface.rect.right; + info->bmiHeader.biHeight = dummy_surface.rect.bottom; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = 0; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + return &dummy_data; +} + +static RECT *dummy_surface_get_bounds( struct window_surface *window_surface ) +{ + static RECT dummy_bounds; + return &dummy_bounds; +} + +static void dummy_surface_flush( struct window_surface *window_surface ) +{ + /* nothing to do */ +} + +static void dummy_surface_destroy( struct window_surface *window_surface ) +{ + /* nothing to do */ +} + +static const struct window_surface_funcs dummy_surface_funcs = +{ + dummy_surface_lock, + dummy_surface_unlock, + dummy_surface_get_bitmap_info, + dummy_surface_get_bounds, + dummy_surface_flush, + dummy_surface_destroy +}; + +struct window_surface dummy_surface = { &dummy_surface_funcs, { NULL, NULL }, 1, { 0, 0, 1, 1 } }; + + +/******************************************************************* * register_window_surface * * Register a window surface in the global list, possibly replacing another one. @@ -495,8 +556,8 @@ void register_window_surface( struct window_surface *old, struct window_surface { if (old == new) return; EnterCriticalSection( &surfaces_section ); - if (old) list_remove( &old->entry ); - if (new) list_add_tail( &window_surfaces, &new->entry ); + if (old && old != &dummy_surface) list_remove( &old->entry ); + if (new && new != &dummy_surface) list_add_tail( &window_surfaces, &new->entry ); LeaveCriticalSection( &surfaces_section ); } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 4bbe7ae..b35fc00 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -80,6 +80,7 @@ typedef struct tagWND /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern struct window_surface dummy_surface DECLSPEC_HIDDEN; extern void register_window_surface( struct window_surface *old, struct window_surface *new ) DECLSPEC_HIDDEN; extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Oleg Bosis : wined3d: Add correct detection of GeForce GT 650M video card.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 81525453f116abbdc368686280ab3b6200d311cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=81525453f116abbdc36868628… Author: Oleg Bosis <olelukoie(a)mail.ru> Date: Sun Sep 30 14:07:21 2012 +0400 wined3d: Add correct detection of GeForce GT 650M video card. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 48a6ef4..1120a9e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1110,6 +1110,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1510,6 +1511,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl { {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ + {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5fd4f0..6db495f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1409,6 +1409,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, + CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180,

1 0

Marcus Meissner : wined3d: Move texture reference decrement to end of usage (Coverity).
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 8ec6ebe4fb3fbd30dca46c28c381209f711c89d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec6ebe4fb3fbd30dca46c28c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 29 11:14:54 2012 +0200 wined3d: Move texture reference decrement to end of usage (Coverity). --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6927f9f..fa35105 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3524,8 +3524,6 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, { LONG bind_count = InterlockedDecrement(&prev->resource.bind_count); - wined3d_texture_decref(prev); - if (!texture && stage < gl_info->limits.texture_stages) { device_invalidate_state(device, STATE_TEXTURESTAGE(stage, WINED3D_TSS_COLOR_OP)); @@ -3549,6 +3547,8 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, } } } + + wined3d_texture_decref(prev); } device_invalidate_state(device, STATE_SAMPLER(stage));

1 0

Daniel Jelinski : comctl32: Use GetWindowLong to check for scrollbar.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 0edb0233a46e7105cb8c88093ca07c741123c8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edb0233a46e7105cb8c88093… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Sep 21 21:58:43 2012 +0200 comctl32: Use GetWindowLong to check for scrollbar. dwStyle is updated only in WM_STYLECHANGED, which is not sent when displaying and hiding scrollbars. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7a11557..0ef8bc4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10878,7 +10878,7 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) * The "2" is there to mimic the native control. I think it may be * related to either padding or edges. (GLA 7/2002) */ - if (!(infoPtr->dwStyle & WS_HSCROLL)) + if (!(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_HSCROLL)) infoPtr->rcList.bottom -= GetSystemMetrics(SM_CYHSCROLL); infoPtr->rcList.bottom = max (infoPtr->rcList.bottom - 2, 0); }

1 0

Dmitry Timoshkov : ieframe: Recognize the CGID_ShellDocView command group.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 3dc0d93f4d9a53dcfbeeb0caa00fad9fda53361d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc0d93f4d9a53dcfbeeb0caa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 28 20:51:24 2012 +0900 ieframe: Recognize the CGID_ShellDocView command group. --- dlls/ieframe/dochost.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index d966ea0..0449f24 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -597,6 +597,14 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, } } + if(IsEqualGUID(pguidCmdGroup, &CGID_ShellDocView)) { + switch(nCmdID) { + default: + FIXME("Unimplemented cmdid %d of CGID_ShellDocView\n", nCmdID); + return E_NOTIMPL; + } + } + FIXME("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; }

1 0

Daniel Jelinski : comctl32: Clean up listview resizing code.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: ae72b216416f3155ab1f3053bacae6d8b9a5ba4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae72b216416f3155ab1f3053b… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Sep 29 00:20:45 2012 +0200 comctl32: Clean up listview resizing code. --- dlls/comctl32/listview.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0ef8bc4..2525dfe 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11619,9 +11619,6 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { if (notify_measureitem(infoPtr)) LISTVIEW_InvalidateList(infoPtr); } - - LISTVIEW_UpdateSize(infoPtr); - LISTVIEW_UpdateScroll(infoPtr); } return DefWindowProcW(hwnd, uMsg, wParam, lParam);

1 0

Alexandre Julliard : Mark all lexers as never-interactive.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 2763a983fe812a731d654195b76f0ab212bdd756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2763a983fe812a731d654195b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 12:19:25 2012 +0200 Mark all lexers as never-interactive. --- dlls/d3dcompiler_43/asmshader.l | 2 +- dlls/d3dcompiler_43/hlsl.l | 2 +- dlls/msxml3/xslpattern.l | 2 +- programs/winedbg/debug.l | 2 +- programs/winhlp32/macro.lex.l | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.l b/dlls/d3dcompiler_43/asmshader.l index 8b3bf49..35a4048 100644 --- a/dlls/d3dcompiler_43/asmshader.l +++ b/dlls/d3dcompiler_43/asmshader.l @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(asmshader); %option noyywrap %option prefix="asmshader_" -%option noinput nounput +%option noinput nounput never-interactive /* Swizzles and writemasks consist of a dot and up to 4 x, y, z or w characters, * or up to 4 a, r, g, b characters. There are different rules for swizzles and diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index 1e3b4a9..49fb042 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); %} -%option noyywrap nounput noinput +%option noyywrap nounput noinput never-interactive %option prefix="hlsl_" %x pp pp_line pp_pragma pp_ignore diff --git a/dlls/msxml3/xslpattern.l b/dlls/msxml3/xslpattern.l index eb84e40..bda3836 100644 --- a/dlls/msxml3/xslpattern.l +++ b/dlls/msxml3/xslpattern.l @@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); %option reentrant bison-bridge %option noyywrap %option prefix="xslpattern_" -%option noinput nounput +%option noinput nounput never-interactive /* From the w3c XML standard * <http://www.w3.org/TR/REC-xml/> */ diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 30c8aea..ab1f865 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%option noinput nounput interactive 8bit prefix="dbg_" +%option noinput nounput never-interactive 8bit prefix="dbg_" %{ #include "config.h" diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index abc04d3..4d679e1 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ %} -%option noinput nounput interactive 8bit +%option noinput nounput never-interactive 8bit %x quote %{ #include "config.h"

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_depth_stencil_variable_GetDepthStencilState().
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 14b9f3d295329f0b5f9dd1c0120d4a46b1f51acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b9f3d295329f0b5f9dd1c01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 11:05:19 2012 +0200 d3d10: Implement d3d10_effect_depth_stencil_variable_GetDepthStencilState(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 27 ++++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 65ec465..e47ea27 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -111,6 +111,7 @@ struct d3d10_effect_state_object_variable } desc; union { + ID3D10DepthStencilState *depth_stencil; ID3D10BlendState *blend; } object; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7d14620..c7617e2 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1568,13 +1568,18 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) switch (v->type->basetype) { + case D3D10_SVT_DEPTHSTENCIL: + if (FAILED(hr = ID3D10Device_CreateDepthStencilState(device, + &v->u.state.desc.depth_stencil, &v->u.state.object.depth_stencil))) + return hr; + break; + case D3D10_SVT_BLEND: if (FAILED(hr = ID3D10Device_CreateBlendState(device, &v->u.state.desc.blend, &v->u.state.object.blend))) return hr; break; - case D3D10_SVT_DEPTHSTENCIL: case D3D10_SVT_RASTERIZER: case D3D10_SVT_SAMPLER: break; @@ -6247,9 +6252,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetRawValue static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetDepthStencilState(ID3D10EffectDepthStencilVariable *iface, UINT index, ID3D10DepthStencilState **depth_stencil_state) { - FIXME("iface %p, index %u, depth_stencil_state %p stub!\n", iface, index, depth_stencil_state); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, depth_stencil_state %p.\n", iface, index, depth_stencil_state); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + else if (index) + return E_FAIL; + + if (v->type->basetype != D3D10_SVT_DEPTHSTENCIL) + { + WARN("Variable is not a depth stencil state.\n"); + return E_FAIL; + } + + if ((*depth_stencil_state = v->u.state.object.depth_stencil)) + ID3D10DepthStencilState_AddRef(*depth_stencil_state); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingStore(ID3D10EffectDepthStencilVariable *iface,

1 0