February 2016 - Wine-commits

Jacek Caban : user32: Don't use window' s parent as an owner if WS_CHILD style is not set.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: d13a44e4aa12fa5ad3498c39934e88a7dcd30916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13a44e4aa12fa5ad3498c399… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 22 12:54:59 2016 +0100 user32: Don't use window's parent as an owner if WS_CHILD style is not set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 25 +++++++++++++++++++++++++ server/window.c | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 71459e1..988aa6c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -652,6 +652,31 @@ static void test_parent_owner(void) DestroyWindow( child ); DestroyWindow( test ); DestroyWindow( owner ); + + /* Test that owner window takes into account WS_CHILD flag even if parent is set by SetParent. */ + owner = create_tool_window( WS_VISIBLE | WS_OVERLAPPEDWINDOW, desktop ); + SetParent(owner, hwndMain); + check_parents( owner, hwndMain, hwndMain, NULL, NULL, hwndMain, owner ); + test = create_tool_window( WS_VISIBLE | WS_OVERLAPPEDWINDOW, owner ); + check_parents( test, desktop, owner, NULL, owner, test, test ); + DestroyWindow( owner ); + DestroyWindow( test ); + + owner = create_tool_window( WS_VISIBLE | WS_CHILD, desktop ); + SetParent(owner, hwndMain); + check_parents( owner, hwndMain, hwndMain, hwndMain, NULL, hwndMain, hwndMain ); + test = create_tool_window( WS_VISIBLE | WS_OVERLAPPEDWINDOW, owner ); + check_parents( test, desktop, hwndMain, NULL, hwndMain, test, test ); + DestroyWindow( owner ); + DestroyWindow( test ); + + owner = create_tool_window( WS_VISIBLE | WS_POPUP | WS_CHILD, desktop ); + SetParent(owner, hwndMain); + check_parents( owner, hwndMain, hwndMain, NULL, NULL, hwndMain, owner ); + test = create_tool_window( WS_VISIBLE | WS_OVERLAPPEDWINDOW, owner ); + check_parents( test, desktop, owner, NULL, owner, test, test ); + DestroyWindow( owner ); + DestroyWindow( test ); } static BOOL CALLBACK enum_proc( HWND hwnd, LPARAM lParam) diff --git a/server/window.c b/server/window.c index 9328211..143b60c 100644 --- a/server/window.c +++ b/server/window.c @@ -1901,7 +1901,8 @@ DECL_HANDLER(create_window) return; } else /* owner must be a top-level window */ - while (!is_desktop_window(owner->parent)) owner = owner->parent; + while ((owner->style & (WS_POPUP|WS_CHILD)) == WS_CHILD && !is_desktop_window(owner->parent)) + owner = owner->parent; } atom = cls_name.len ? find_global_atom( NULL, &cls_name ) : req->atom;

1 0

Jacek Caban : user32: Added debug traces to SetParent.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 3ece2ab7eef49cb274f4fe37448b01252774738f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ece2ab7eef49cb274f4fe374… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 22 12:55:04 2016 +0100 user32: Added debug traces to SetParent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2ef49fa..33aedbd 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2984,6 +2984,8 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) POINT pt; BOOL ret; + TRACE("(%p %p)\n", hwnd, parent); + if (is_broadcast(hwnd) || is_broadcast(parent)) { SetLastError(ERROR_INVALID_PARAMETER);

1 0

Jacek Caban : mshtml: Added HTMLXMLHttpRequestFactory DISPID_VALUE implementation.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 5996de5c2e5b8f1b27aa345714cb9dca401333d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5996de5c2e5b8f1b27aa34571… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 15:21:14 2016 +0100 mshtml: Added HTMLXMLHttpRequestFactory DISPID_VALUE implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index d188478..ba6dc05 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -828,12 +828,44 @@ static const IHTMLXMLHttpRequestFactoryVtbl HTMLXMLHttpRequestFactoryVtbl = { HTMLXMLHttpRequestFactory_create }; +static inline HTMLXMLHttpRequestFactory *factory_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLXMLHttpRequestFactory, dispex); +} + +static HRESULT HTMLXMLHttpRequestFactory_value(DispatchEx *iface, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLXMLHttpRequestFactory *This = factory_from_DispatchEx(iface); + IHTMLXMLHttpRequest *xhr; + HRESULT hres; + + TRACE("\n"); + + if(flags != DISPATCH_CONSTRUCT) { + FIXME("flags %x not supported\n", flags); + return E_NOTIMPL; + } + + hres = IHTMLXMLHttpRequestFactory_create(&This->IHTMLXMLHttpRequestFactory_iface, &xhr); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)xhr; + return S_OK; +} + +static const dispex_static_data_vtbl_t HTMLXMLHttpRequestFactory_dispex_vtbl = { + HTMLXMLHttpRequestFactory_value +}; + static const tid_t HTMLXMLHttpRequestFactory_iface_tids[] = { IHTMLXMLHttpRequestFactory_tid, 0 }; static dispex_static_data_t HTMLXMLHttpRequestFactory_dispex = { - NULL, + &HTMLXMLHttpRequestFactory_dispex_vtbl, IHTMLXMLHttpRequestFactory_tid, NULL, HTMLXMLHttpRequestFactory_iface_tids

1 0

Jacek Caban : mshtml: Expose XMLHttpRequest constructor to scripts.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: c0fda9824e213e5a779bddfba6052dfc20b9c8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fda9824e213e5a779bddfba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 15:21:24 2016 +0100 mshtml: Expose XMLHttpRequest constructor to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 52 +++++++++++++++++++++++++++---------------- dlls/mshtml/htmlwindow.c | 3 ++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 24 ++++++++++++++++++++ dlls/mshtml/tests/jstest.html | 9 ++++++++ 5 files changed, 69 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 3980daf..90e5c72 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -241,8 +241,8 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN if(info == data->funcs+data->func_cnt) { if(data->func_cnt == *size) data->funcs = heap_realloc_zero(data->funcs, (*size <<= 1)*sizeof(func_info_t)); - info = data->funcs+data->func_cnt; + hres = ITypeInfo_GetDocumentation(dti, desc->memid, &info->name, NULL, NULL, NULL); if(FAILED(hres)) return; @@ -315,6 +315,31 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN } } +static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp_typeinfo, DWORD *size) +{ + unsigned i = 7; /* skip IDispatch functions */ + ITypeInfo *typeinfo; + FUNCDESC *funcdesc; + HRESULT hres; + + hres = get_typeinfo(tid, &typeinfo); + if(FAILED(hres)) + return hres; + + while(1) { + hres = ITypeInfo_GetFuncDesc(typeinfo, i++, &funcdesc); + if(FAILED(hres)) + break; + + TRACE("adding...\n"); + + add_func_info(data, size, tid, funcdesc, disp_typeinfo ? disp_typeinfo : typeinfo); + ITypeInfo_ReleaseFuncDesc(typeinfo, funcdesc); + } + + return S_OK; +} + static int dispid_cmp(const void *p1, const void *p2) { return ((const func_info_t*)p1)->id - ((const func_info_t*)p2)->id; @@ -327,11 +352,10 @@ static int func_name_cmp(const void *p1, const void *p2) static dispex_data_t *preprocess_dispex_data(DispatchEx *This) { - const tid_t *tid = This->data->iface_tids; - FUNCDESC *funcdesc; + const tid_t *tid; dispex_data_t *data; DWORD size = 16, i; - ITypeInfo *ti, *dti; + ITypeInfo *dti; HRESULT hres; TRACE("(%p)\n", This); @@ -359,24 +383,15 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) } list_add_tail(&dispex_data_list, &data->entry); - while(*tid) { - hres = get_typeinfo(*tid, &ti); + for(tid = This->data->iface_tids; *tid; tid++) { + hres = process_interface(data, *tid, dti, &size); if(FAILED(hres)) break; - - i=7; - while(1) { - hres = ITypeInfo_GetFuncDesc(ti, i++, &funcdesc); - if(FAILED(hres)) - break; - - add_func_info(data, &size, *tid, funcdesc, dti); - ITypeInfo_ReleaseFuncDesc(ti, funcdesc); - } - - tid++; } + if(This->data->additional_tid) + process_interface(data, This->data->additional_tid, NULL, &size); + if(!data->func_cnt) { heap_free(data->funcs); data->name_table = NULL; @@ -392,7 +407,6 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) for(i=0; i < data->func_cnt; i++) data->name_table[i] = data->funcs+i; qsort(data->name_table, data->func_cnt, sizeof(func_info_t*), func_name_cmp); - return data; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d7d133a..f203405 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2939,7 +2939,8 @@ static dispex_static_data_t HTMLWindow_dispex = { &HTMLWindow_dispex_vtbl, DispHTMLWindow2_tid, NULL, - HTMLWindow_iface_tids + HTMLWindow_iface_tids, + IHTMLWindow5_tid }; static void *alloc_window(size_t size) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1f0255f..f4e6668 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -248,6 +248,7 @@ typedef struct { const tid_t disp_tid; dispex_data_t *data; const tid_t* const iface_tids; + const tid_t additional_tid; } dispex_static_data_t; struct DispatchEx { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4b2b825..e27339a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6598,6 +6598,28 @@ static void test_dom_implementation(IHTMLDocument2 *doc) IHTMLDOMImplementation_Release(dom_implementation); } +static void test_xhr(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + IDispatchEx *dispex; + DISPID id; + BSTR str; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + str = a2bstr("XMLHttpRequest"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &id); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + SysFreeString(str); + + IHTMLWindow2_Release(window); +} + static void test_defaults(IHTMLDocument2 *doc) { IHTMLStyleSheetsCollection *stylesheetcol; @@ -6670,6 +6692,8 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLElementCollection_Release(collection); } + test_xhr(doc); + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); ok(hres == S_OK, "Could not get IHTMBodyElement: %08x\n", hres); test_default_body(body); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index f0d3e3b..2a5a447 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -354,6 +354,14 @@ function test_text_node() { ok(text2.data == "testing", "text2.data = " + text2.data); } +function test_xhr() { + ok("XMLHttpRequest" in window, "XMLHttpRequest not found in window object\n"); + ok(typeof(XMLHttpRequest) === "object", "typeof(XMLHttpRequest) = " + typeof(XMLHttpRequest)); + + var xhr = new XMLHttpRequest(); + ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); +} + var globalVar = false; function runTests() { @@ -379,6 +387,7 @@ function runTests() { test_whitespace_nodes(); test_language_attribute(); test_text_node(); + test_xhr(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Jacek Caban : mshtml/tests: Fixed tests on some IE versions.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: b652c119690afe8b89b8ce9cddde34b4c1589a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b652c119690afe8b89b8ce9cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 16:12:24 2016 +0100 mshtml/tests: Fixed tests on some IE versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 5a0bbfb..64e03f5 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -160,8 +160,8 @@ function test_string_event_handler() { window.onload = function() { try { ok(inlscr_complete_called, "onreadystatechange not fired"); - ok(extern_res_script_rs === "eval,complete1,", - "extern_res_script_rs = " + extern_res_script_rs + " expected eval,complete1,"); + ok(extern_res_script_rs === "eval,complete1," || extern_res_script_rs == "loaded0,eval,complete1,", + "extern_res_script_rs = " + extern_res_script_rs + " expected (loaded0)?,eval,complete1,"); ok(extern_http_script_rs === "loading,loaded,complete,", "extern_http_script_rs = " + extern_http_script_rs + " expected loading,loaded,complete,");

1 0

Alexandre Julliard : shlwapi: Use the standard WideCharToMultiByte instead of wine_utf8_wcstombs.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 262a41ca4a9eb581c94088b94fa8aae118451b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262a41ca4a9eb581c94088b94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 12:40:59 2016 +0900 shlwapi: Use the standard WideCharToMultiByte instead of wine_utf8_wcstombs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/url.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 0680a55..85fa3c1 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1200,16 +1200,15 @@ HRESULT WINAPI UrlEscapeW( if ((cur >= 0xd800 && cur <= 0xdfff) && (src[1] >= 0xdc00 && src[1] <= 0xdfff)) { - WCHAR sur[2]; - - sur[0] = cur; - sur[1] = *++src; - len = wine_utf8_wcstombs(WC_ERR_INVALID_CHARS, sur, 2, utf, sizeof(utf)); + len = WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, src, 2, + utf, sizeof(utf), NULL, NULL ); + src++; } else - len = wine_utf8_wcstombs(WC_ERR_INVALID_CHARS, &cur, 1, utf, sizeof(utf)); + len = WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, &cur, 1, + utf, sizeof(utf), NULL, NULL ); - if(len < 0) { + if (!len) { utf[0] = 0xef; utf[1] = 0xbf; utf[2] = 0xbd;

1 0

Alexandre Julliard : makefiles: Explicitly import libwine only for Windows builds.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 3ebbfd5b6b96877c06de5fab9ec88fd6252d7787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebbfd5b6b96877c06de5fab9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 13:17:37 2016 +0900 makefiles: Explicitly import libwine only for Windows builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e1897bc..9da665a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2545,13 +2545,12 @@ static struct strarray output_sources( const struct makefile *make ) strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 0 )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0 )); add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ - for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] )); - strarray_add( &all_libs, "-lwine" ); strarray_addall( &all_libs, add_default_libraries( make, &dep_libs )); if (*dll_ext) { + for (i = 0; i < make->delayimports.count; i++) + strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] )); strarray_add( &all_targets, strmake( "%s%s", make->module, dll_ext )); strarray_add( &all_targets, strmake( "%s.fake", make->module )); add_install_rule( make, install_rules, make->module, strmake( "%s%s", make->module, dll_ext ), @@ -2562,6 +2561,7 @@ static struct strarray output_sources( const struct makefile *make ) } else { + strarray_add( &all_libs, "-lwine" ); strarray_add( &all_targets, make->module ); add_install_rule( make, install_rules, make->module, make->module, strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module ));

1 0

Alexandre Julliard : libport: Mark codepage tables as hidden.
by Alexandre Julliard 24 Feb '16

24 Feb '16

1 0

Stefan Dösinger : wined3d: Keep track of FBOs through the GL names.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: b76fcbe0da45329ff784b027457b4c14c691e215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76fcbe0da45329ff784b0274… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 21 21:29:57 2016 +0000 wined3d: Keep track of FBOs through the GL names. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 280 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 17 ++- 2 files changed, 186 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b76fcbe0da45329ff784b…

1 0

Stefan Dösinger : wined3d: Better integrate the fixed up DS in the new FBO cache handling.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: bcd9291615f48fd900893d88575ce2dc0dbabf0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd9291615f48fd900893d885… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 21 21:29:58 2016 +0000 wined3d: Better integrate the fixed up DS in the new FBO cache handling. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6862fe3..76d4a29 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -121,7 +121,7 @@ static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_inf /* Context activation is done by the caller. */ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, - DWORD format_flags, GLuint rb_override) + DWORD format_flags) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -129,12 +129,7 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, { TRACE("Attach depth stencil %u.\n", resource->object); - if (rb_override) - { - context_attach_depth_stencil_rb(gl_info, fbo_target, - format_flags, rb_override); - } - else if (rb_namespace) + if (rb_namespace) { context_attach_depth_stencil_rb(gl_info, fbo_target, format_flags, resource->object); @@ -354,6 +349,12 @@ static inline void context_set_fbo_key_for_surface(const struct wined3d_context key->objects[idx].object = 0; key->objects[idx].level = key->objects[idx].target = 0; } + else if (surface->current_renderbuffer) + { + key->objects[idx].object = surface->current_renderbuffer->id; + key->objects[idx].level = key->objects[idx].target = 0; + key->rb_namespace |= 1 << idx; + } else { switch (location) @@ -472,6 +473,8 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, WARN("Depth stencil is smaller than the primary color buffer, disabling\n"); depth_stencil = NULL; } + else + surface_set_compatible_renderbuffer(depth_stencil, render_targets[0]); } context_generate_fbo_key(context, context->fbo_key, render_targets, depth_stencil, color_location, @@ -570,15 +573,13 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ if (depth_stencil) { DWORD format_flags = depth_stencil->container->resource.format_flags; - surface_set_compatible_renderbuffer(depth_stencil, entry->d3d_render_targets[0]); context_attach_depth_stencil_fbo(context, target, &entry->key.objects[0], - entry->key.rb_namespace & 0x1, format_flags, - depth_stencil->current_renderbuffer ? depth_stencil->current_renderbuffer->id : 0); + entry->key.rb_namespace & 0x1, format_flags); } else { static const struct wined3d_fbo_resource resource = {0}; - context_attach_depth_stencil_fbo(context, target, &resource, FALSE, 0, 0); + context_attach_depth_stencil_fbo(context, target, &resource, FALSE, 0); } /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility

1 0