October 2014 - Wine-commits

Jacek Caban : mshtml: Moved BOM enum to binding.h.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: 7e4db7df488f946406d920224bfc14f07c72050b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4db7df488f946406d920224… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:07:33 2014 +0200 mshtml: Moved BOM enum to binding.h. --- dlls/mshtml/binding.h | 8 +++++++- dlls/mshtml/navigate.c | 8 ++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 63ac882..764ae61 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -25,6 +25,12 @@ typedef enum { METHOD_POST } REQUEST_METHOD; +typedef enum { + BOM_NONE, + BOM_UTF8, + BOM_UTF16 +} binding_bom_t; + typedef struct { nsIHttpChannel nsIHttpChannel_iface; nsIUploadChannel nsIUploadChannel_iface; @@ -71,7 +77,7 @@ struct BSCallback { ULONG readed; DWORD bindf; BOOL bindinfo_ready; - int bom; + binding_bom_t bom; IMoniker *mon; IBinding *binding; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 195f82e..8234c02 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -52,12 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR emptyW[] = {0}; static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; -enum { - BOM_NONE, - BOM_UTF8, - BOM_UTF16 -}; - struct nsProtocolStream { nsIInputStream nsIInputStream_iface; @@ -1203,6 +1197,8 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) break; case BOM_UTF16: This->nschannel->charset = heap_strdupA(UTF16_STR); + case BOM_NONE: + /* FIXME: Get charset from HTTP headers */; } if(!This->nschannel->content_type) {

1 0

Jacek Caban : mshtml: Moved script binding callback to script.c.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: 87efdc304717936fca392c000b16838e2d31671b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87efdc304717936fca392c000… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:01 2014 +0200 mshtml: Moved script binding callback to script.c. --- dlls/mshtml/binding.h | 16 ++++- dlls/mshtml/navigate.c | 182 +------------------------------------------------ dlls/mshtml/script.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 191 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87efdc304717936fca392…

1 0

Jacek Caban : mshtml: Moved READYSTATE to string conversion to separated function.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: 845f5cccf039acaec939dd8dfc97e308c57490f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=845f5cccf039acaec939dd8df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:15 2014 +0200 mshtml: Moved READYSTATE to string conversion to separated function. --- dlls/mshtml/htmldoc.c | 16 +--------------- dlls/mshtml/htmlelem.c | 21 +++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a8d6d76..c91298f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -592,27 +592,13 @@ static HRESULT WINAPI HTMLDocument_get_readyState(IHTMLDocument2 *iface, BSTR *p { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - static const WCHAR wszUninitialized[] = {'u','n','i','n','i','t','i','a','l','i','z','e','d',0}; - static const WCHAR wszLoading[] = {'l','o','a','d','i','n','g',0}; - static const WCHAR wszLoaded[] = {'l','o','a','d','e','d',0}; - static const WCHAR wszInteractive[] = {'i','n','t','e','r','a','c','t','i','v','e',0}; - static const WCHAR wszComplete[] = {'c','o','m','p','l','e','t','e',0}; - - static const LPCWSTR readystate_str[] = { - wszUninitialized, - wszLoading, - wszLoaded, - wszInteractive, - wszComplete - }; TRACE("(%p)->(%p)\n", iface, p); if(!p) return E_POINTER; - *p = SysAllocString(readystate_str[This->window->readystate]); - return S_OK; + return get_readystate_string(This->window->readystate, p); } static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFramesCollection2 **p) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3037c10..2906581 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -218,6 +218,27 @@ HRESULT elem_string_attr_setter(HTMLElement *elem, const WCHAR *name, const WCHA return S_OK; } +HRESULT get_readystate_string(READYSTATE readystate, BSTR *p) +{ + static const WCHAR uninitializedW[] = {'u','n','i','n','i','t','i','a','l','i','z','e','d',0}; + static const WCHAR loadingW[] = {'l','o','a','d','i','n','g',0}; + static const WCHAR loadedW[] = {'l','o','a','d','e','d',0}; + static const WCHAR interactiveW[] = {'i','n','t','e','r','a','c','t','i','v','e',0}; + static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; + + static const LPCWSTR readystate_strs[] = { + uninitializedW, + loadingW, + loadedW, + interactiveW, + completeW + }; + + assert(readystate <= READYSTATE_COMPLETE); + *p = SysAllocString(readystate_strs[readystate]); + return *p ? S_OK : E_OUTOFMEMORY; +} + typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 78d61f0..31c08ad 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -851,6 +851,7 @@ void set_download_state(HTMLDocumentObj*,int) DECLSPEC_HIDDEN; void call_docview_84(HTMLDocumentObj*) DECLSPEC_HIDDEN; void set_ready_state(HTMLOuterWindow*,READYSTATE) DECLSPEC_HIDDEN; +HRESULT get_readystate_string(READYSTATE,BSTR*) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Use IUri for script binding.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: 8a9d4cf147ebdfbab807fbbcd5a5dfc041d7fea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9d4cf147ebdfbab807fbbcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:31 2014 +0200 mshtml: Use IUri for script binding. --- dlls/mshtml/script.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 790bac1..a4bd47f 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -826,17 +826,25 @@ static const BSCallbackVtbl ScriptBSCVtbl = { }; -static HRESULT bind_script_to_text(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) +static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **ret) { ScriptBSC *bsc; + IMoniker *mon; WCHAR *text; HRESULT hres; + hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); + if(FAILED(hres)) + return hres; + bsc = heap_alloc_zero(sizeof(*bsc)); - if(!bsc) + if(!bsc) { + IMoniker_Release(mon); return E_OUTOFMEMORY; + } init_bscallback(&bsc->bsc, &ScriptBSCVtbl, mon, 0); + IMoniker_Release(mon); bsc->hres = E_FAIL; hres = start_binding(window, &bsc->bsc, NULL); @@ -892,13 +900,12 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IMoniker *mon, WCHAR *ret = text; return S_OK; - } static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) { - IMoniker *mon; WCHAR *text; + IUri *uri; HRESULT hres; static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; @@ -906,12 +913,12 @@ static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) if(strlenW(src) > sizeof(wine_schemaW)/sizeof(WCHAR) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) src += sizeof(wine_schemaW)/sizeof(WCHAR); - hres = CreateURLMoniker(NULL, src, &mon); + hres = create_uri(src, 0, &uri); if(FAILED(hres)) return; - hres = bind_script_to_text(script_host->window, mon, &text); - IMoniker_Release(mon); + hres = bind_script_to_text(script_host->window, uri, &text); + IUri_Release(uri); if(FAILED(hres) || !text) return;

1 0

Jacek Caban : mshtml: Added support for onreadystatechange event for script elements.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: d11abc0992053f3cda7b89263c5fcd95910956e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11abc0992053f3cda7b89263… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:47 2014 +0200 mshtml: Added support for onreadystatechange event for script elements. --- dlls/mshtml/htmlscript.h | 1 + dlls/mshtml/script.c | 55 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index 8a0c1e5..8698be8 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -24,6 +24,7 @@ typedef struct { nsIDOMHTMLScriptElement *nsscript; BOOL parsed; BOOL parse_on_bind; + READYSTATE readystate; } HTMLScriptElement; typedef struct { diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index a4bd47f..6630047 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "activscp.h" #include "activdbg.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -701,7 +702,15 @@ static ScriptHost *create_script_host(HTMLInnerWindow *window, const GUID *guid) return ret; } -static void parse_text(ScriptHost *script_host, LPCWSTR text) +static void set_script_elem_readystate(HTMLScriptElement *script_elem, READYSTATE readystate) +{ + script_elem->readystate = readystate; + + if(readystate != READYSTATE_INTERACTIVE) + fire_event(script_elem->element.node.doc, EVENTID_READYSTATECHANGE, FALSE, script_elem->element.node.nsnode, NULL, NULL); +} + +static void parse_elem_text(ScriptHost *script_host, HTMLScriptElement *script_elem, LPCWSTR text) { EXCEPINFO excepinfo; VARIANT var; @@ -709,6 +718,8 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) TRACE("%s\n", debugstr_w(text)); + set_script_elem_readystate(script_elem, READYSTATE_INTERACTIVE); + VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); TRACE(">>>\n"); @@ -725,6 +736,9 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) typedef struct { BSCallback bsc; + HTMLScriptElement *script_elem; + DWORD scheme; + DWORD size; char *buf; HRESULT hres; @@ -739,6 +753,11 @@ static void ScriptBSC_destroy(BSCallback *bsc) { ScriptBSC *This = impl_from_BSCallback(bsc); + if(This->script_elem) { + IHTMLScriptElement_Release(&This->script_elem->IHTMLScriptElement_iface); + This->script_elem = NULL; + } + heap_free(This->buf); heap_free(This); } @@ -750,6 +769,12 @@ static HRESULT ScriptBSC_init_bindinfo(BSCallback *bsc) static HRESULT ScriptBSC_start_binding(BSCallback *bsc) { + ScriptBSC *This = impl_from_BSCallback(bsc); + + /* FIXME: We should find a better to decide if 'loading' state is supposed to be used by the protocol. */ + if(This->scheme == URL_SCHEME_HTTPS || This->scheme == URL_SCHEME_HTTP) + set_script_elem_readystate(This->script_elem, READYSTATE_LOADING); + return S_OK; } @@ -759,13 +784,18 @@ static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) This->hres = result; - if(FAILED(result)) { + if(SUCCEEDED(result)) { + if(This->script_elem->readystate == READYSTATE_LOADING) + set_script_elem_readystate(This->script_elem, READYSTATE_LOADED); + }else { FIXME("binding failed %08x\n", result); heap_free(This->buf); This->buf = NULL; This->size = 0; } + IHTMLScriptElement_Release(&This->script_elem->IHTMLScriptElement_iface); + This->script_elem = NULL; return S_OK; } @@ -826,7 +856,7 @@ static const BSCallbackVtbl ScriptBSCVtbl = { }; -static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **ret) +static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, HTMLScriptElement *script_elem, WCHAR **ret) { ScriptBSC *bsc; IMoniker *mon; @@ -847,6 +877,13 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **r IMoniker_Release(mon); bsc->hres = E_FAIL; + hres = IUri_GetScheme(uri, &bsc->scheme); + if(FAILED(hres)) + bsc->scheme = URL_SCHEME_UNKNOWN; + + IHTMLScriptElement_AddRef(&script_elem->IHTMLScriptElement_iface); + bsc->script_elem = script_elem; + hres = start_binding(window, &bsc->bsc, NULL); if(SUCCEEDED(hres)) hres = bsc->hres; @@ -902,7 +939,7 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **r return S_OK; } -static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) +static void parse_extern_script(ScriptHost *script_host, HTMLScriptElement *script_elem, LPCWSTR src) { WCHAR *text; IUri *uri; @@ -917,12 +954,12 @@ static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) if(FAILED(hres)) return; - hres = bind_script_to_text(script_host->window, uri, &text); + hres = bind_script_to_text(script_host->window, uri, script_elem, &text); IUri_Release(uri); if(FAILED(hres) || !text) return; - parse_text(script_host, text); + parse_elem_text(script_host, script_elem, text); heap_free(text); } @@ -940,7 +977,7 @@ static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *scri if(NS_FAILED(nsres)) { ERR("GetText failed: %08x\n", nsres); }else if(*text) { - parse_text(script_host, text); + parse_elem_text(script_host, script_elem, text); } nsAString_Finish(&text_str); @@ -976,12 +1013,14 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script ERR("GetSrc failed: %08x\n", nsres); }else if(*src) { script_elem->parsed = TRUE; - parse_extern_script(script_host, src); + parse_extern_script(script_host, script_elem, src); }else { parse_inline_script(script_host, script_elem); } nsAString_Finish(&src_str); + + set_script_elem_readystate(script_elem, READYSTATE_COMPLETE); } static GUID get_default_script_guid(HTMLInnerWindow *window)

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement:: get_readyState implementation.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: 37869b7a08913e19864dc00026cdba0ce28929cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=37869b7a08913e19864dc0002… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:09:07 2014 +0200 mshtml: Added IHTMLScriptElement::get_readyState implementation. --- dlls/mshtml/htmlscript.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 1a61398..61e1ee3 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -281,8 +281,10 @@ static HRESULT WINAPI HTMLScriptElement_get_defer(IHTMLScriptElement *iface, VAR static HRESULT WINAPI HTMLScriptElement_get_readyState(IHTMLScriptElement *iface, BSTR *p) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_readystate_string(This->readystate, p); } static HRESULT WINAPI HTMLScriptElement_put_onerror(IHTMLScriptElement *iface, VARIANT v)

1 0

Matteo Bruni : gdi32: Don't overflow the buffer in GetGlyphOutline.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: 112a7f7f97168c7afe73f38351e9345bc2a7657a URL: http://source.winehq.org/git/wine.git/?a=commit;h=112a7f7f97168c7afe73f3835… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 9 18:00:55 2014 +0200 gdi32: Don't overflow the buffer in GetGlyphOutline. --- dlls/gdi32/freetype.c | 401 ++++++++++++++++++++++++++++---------------------- 1 file changed, 229 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=112a7f7f97168c7afe73f…

1 0

Matteo Bruni : gdi32/tests: Add a test for GetGlyphOutline with an insufficient buffer.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: a71f25d239ed7dd65f9fa7a3b7baa371e74f2ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71f25d239ed7dd65f9fa7a3b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 9 18:00:56 2014 +0200 gdi32/tests: Add a test for GetGlyphOutline with an insufficient buffer. --- dlls/gdi32/tests/font.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 852c858..eff1793 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4365,7 +4365,11 @@ static void test_GetGlyphOutline(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineW(hdc, ' ', GGO_NATIVE, &gm, 0, NULL, &mat); if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { ok(ret == 0, "GetGlyphOutlineW should return 0 buffer size for space char\n"); + ok(gm.gmBlackBoxX == 1, "Expected 1, got %u\n", gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "Expected 1, got %u\n", gm.gmBlackBoxY); + } /* requesting buffer size for space char + error */ memset(&gm, 0, sizeof(gm)); @@ -4375,8 +4379,16 @@ static void test_GetGlyphOutline(void) { ok(ret == GDI_ERROR, "GetGlyphOutlineW should return GDI_ERROR\n"); ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + ok(gm.gmBlackBoxX == 0, "Expected 0, got %u\n", gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 0, "Expected 0, got %u\n", gm.gmBlackBoxY); } + /* test GetGlyphOutline with a buffer too small */ + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineA(hdc, 'A', GGO_NATIVE, &gm, sizeof(i), &i, &mat); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + ok(ret == GDI_ERROR, "GetGlyphOutlineW should return an error when the buffer size is too small.\n"); + for (i = 0; i < sizeof(fmt) / sizeof(fmt[0]); ++i) { DWORD dummy;

1 0

Henri Verbeet : wined3d: Track system memory pinning per-texture.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: d6a511e0220c5cb2c2b1c18d9698d46d342affb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a511e0220c5cb2c2b1c18d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:45 2014 +0200 wined3d: Track system memory pinning per-texture. --- dlls/wined3d/surface.c | 23 ++++++++++++----------- dlls/wined3d/texture.c | 23 +++++++++++++---------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 527601f..3339c5b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -592,8 +592,8 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) * SFLAG_DYNLOCK: Avoid freeing the data for performance * SFLAG_CLIENT: OpenGL uses our memory as backup */ if (surface->resource.map_count - || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT | SFLAG_PIN_SYSMEM) - || surface->container->flags & WINED3D_TEXTURE_CONVERTED) + || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT) + || surface->container->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM)) return; wined3d_resource_free_sysmem(&surface->resource); @@ -625,12 +625,14 @@ static void surface_release_client_storage(struct wined3d_surface *surface) static BOOL surface_use_pbo(const struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + struct wined3d_texture *texture = surface->container; - return surface->resource.pool == WINED3D_POOL_DEFAULT + return texture->resource.pool == WINED3D_POOL_DEFAULT && surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] - && !surface->resource.format->convert - && !(surface->flags & (SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)); + && !texture->resource.format->convert + && !(texture->flags & WINED3D_TEXTURE_PIN_SYSMEM) + && !(surface->flags & SFLAG_NONPOW2); } static HRESULT surface_private_setup(struct wined3d_surface *surface) @@ -1481,8 +1483,8 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi if (surface->resource.map_count) { - WARN("Uploading a surface that is currently mapped, setting SFLAG_PIN_SYSMEM.\n"); - surface->flags |= SFLAG_PIN_SYSMEM; + WARN("Uploading a surface that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); + surface->container->flags |= WINED3D_TEXTURE_PIN_SYSMEM; } if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) @@ -2742,7 +2744,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) if (FAILED(hr)) return WINED3DERR_INVALIDCALL; if (!(surface->resource.map_binding == WINED3D_LOCATION_USER_MEMORY - || surface->flags & SFLAG_PIN_SYSMEM + || surface->container->flags & WINED3D_TEXTURE_PIN_SYSMEM || surface->pbo)) surface->resource.map_binding = WINED3D_LOCATION_DIB; } @@ -2776,7 +2778,8 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) surface->resource.map_count--; surface->flags &= ~SFLAG_DCINUSE; - if (surface->resource.map_binding == WINED3D_LOCATION_USER_MEMORY || (surface->flags & SFLAG_PIN_SYSMEM + if (surface->resource.map_binding == WINED3D_LOCATION_USER_MEMORY + || (surface->container->flags & WINED3D_TEXTURE_PIN_SYSMEM && surface->resource.map_binding != WINED3D_LOCATION_DIB)) { /* The game Salammbo modifies the surface contents without mapping the surface between @@ -5546,8 +5549,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text surface->flags |= SFLAG_NORMCOORD; if (flags & WINED3D_SURFACE_DISCARD) surface->flags |= SFLAG_DISCARD; - if (flags & WINED3D_SURFACE_PIN_SYSMEM) - surface->flags |= SFLAG_PIN_SYSMEM; if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE) surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fb0f0e8..420355b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -28,19 +28,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); WINE_DECLARE_DEBUG_CHANNEL(winediag); static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, - UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, struct wined3d_device *device, - void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) + UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, DWORD surface_flags, + struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, + const struct wined3d_resource_ops *resource_ops) { const struct wined3d_format *format = wined3d_get_format(&device->adapter->gl_info, desc->format); HRESULT hr; TRACE("texture %p, texture_ops %p, layer_count %u, level_count %u, resource_type %s, format %s, " "multisample_type %#x, multisample_quality %#x, usage %s, pool %s, width %u, height %u, depth %u, " - "device %p, parent %p, parent_ops %p, resource_ops %p.\n", + "surface_flags %#x, device %p, parent %p, parent_ops %p, resource_ops %p.\n", texture, texture_ops, layer_count, level_count, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format), desc->multisample_type, desc->multisample_quality, debug_d3dusage(desc->usage), debug_d3dpool(desc->pool), desc->width, desc->height, desc->depth, - device, parent, parent_ops, resource_ops); + surface_flags, device, parent, parent_ops, resource_ops); if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY)) == WINED3DFMT_FLAG_BLOCKS) { @@ -81,6 +82,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->filter_type = (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; texture->lod = 0; texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; + if (surface_flags & WINED3D_SURFACE_PIN_SYSMEM) + texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) { @@ -1053,8 +1056,8 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi } } - if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, - desc, device, parent, parent_ops, &texture_resource_ops))) + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, desc, + surface_flags, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x\n", hr); return hr; @@ -1178,8 +1181,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 TRACE("Calculated levels = %u.\n", levels); } - if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, - desc, device, parent, parent_ops, &texture_resource_ops))) + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, desc, + surface_flags, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -1404,8 +1407,8 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } } - if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, - desc, device, parent, parent_ops, &texture_resource_ops))) + if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, desc, + 0, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 810da0f..dd4668e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2129,6 +2129,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000020 #define WINED3D_TEXTURE_SRGB_VALID 0x00000040 #define WINED3D_TEXTURE_CONVERTED 0x00000080 +#define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 struct wined3d_texture { @@ -2351,11 +2352,10 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ #define SFLAG_DYNLOCK 0x00000010 /* Surface is often locked by the application. */ -#define SFLAG_PIN_SYSMEM 0x00000020 /* Keep the surface in sysmem, at the same address. */ +#define SFLAG_CLIENT 0x00000020 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ #define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ -#define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ struct wined3d_sampler {

1 0

Henri Verbeet : wined3d: Track SFLAG_DYNLOCK per-texture.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: c5459881a30c8e7d4d6c9bb8fd2d73e040c54e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5459881a30c8e7d4d6c9bb8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:46 2014 +0200 wined3d: Track SFLAG_DYNLOCK per-texture. --- dlls/wined3d/surface.c | 20 +++++++++++--------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3339c5b..8019a11 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -589,11 +589,11 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) { /* In some conditions the surface memory must not be freed: * WINED3D_TEXTURE_CONVERTED: Converting the data back would take too long - * SFLAG_DYNLOCK: Avoid freeing the data for performance + * WINED3D_TEXTURE_DYNAMIC_MAP: Avoid freeing the data for performance * SFLAG_CLIENT: OpenGL uses our memory as backup */ - if (surface->resource.map_count - || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT) - || surface->container->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM)) + if (surface->resource.map_count || surface->flags & SFLAG_CLIENT + || surface->container->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM + | WINED3D_TEXTURE_DYNAMIC_MAP)) return; wined3d_resource_free_sysmem(&surface->resource); @@ -1450,8 +1450,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * get a boxed texture with width pow2width and not a texture of width resource.width. * * Performance should not be an issue, because applications normally do not lock the surfaces when - * rendering. If an app does, the SFLAG_DYNLOCK flag will kick in and the memory copy won't be released, - * and doesn't have to be re-read. */ + * rendering. If an app does, the WINED3D_TEXTURE_DYNAMIC_MAP flag will kick in and the memory copy + * won't be released, and doesn't have to be re-read. */ src_data = mem; dst_data = data.addr; TRACE("(%p) : Repacking the surface data from pitch %d to pitch %d\n", surface, src_pitch, dst_pitch); @@ -2617,13 +2617,15 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, /* Performance optimization: Count how often a surface is mapped, if it is * mapped regularly do not throw away the system memory copy. This avoids * the need to download the surface from OpenGL all the time. The surface - * is still downloaded if the OpenGL texture is changed. */ - if (!(surface->flags & SFLAG_DYNLOCK) && surface->resource.map_binding == WINED3D_LOCATION_SYSMEM) + * is still downloaded if the OpenGL texture is changed. Note that this + * only really makes sense for managed textures.*/ + if (!(surface->container->flags & WINED3D_TEXTURE_DYNAMIC_MAP) + && surface->resource.map_binding == WINED3D_LOCATION_SYSMEM) { if (++surface->lockCount > MAXLOCKCOUNT) { TRACE("Surface is mapped regularly, not freeing the system memory copy any more.\n"); - surface->flags |= SFLAG_DYNLOCK; + surface->container->flags |= WINED3D_TEXTURE_DYNAMIC_MAP; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd4668e..d7e8fb4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2130,6 +2130,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_VALID 0x00000040 #define WINED3D_TEXTURE_CONVERTED 0x00000080 #define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 +#define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000200 struct wined3d_texture { @@ -2351,11 +2352,10 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ -#define SFLAG_DYNLOCK 0x00000010 /* Surface is often locked by the application. */ +#define SFLAG_GLCKEY 0x00000010 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000020 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ #define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ -#define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ struct wined3d_sampler {

1 0