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

Alex Villacís Lasso : uxtheme: Skip creation of temporary bitmap when painting a single tile.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 4165a1f696213fc6af67fd8abfb0e5d74729cc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4165a1f696213fc6af67fd8ab… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Apr 23 09:48:44 2008 -0500 uxtheme: Skip creation of temporary bitmap when painting a single tile. --- dlls/uxtheme/draw.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 3650113..9c7d62b 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -345,6 +345,18 @@ static inline BOOL UXTHEME_SizedBlt (HDC hdcDst, int nXOriginDst, int nYOriginDs if (!nWidthSrc || !nHeightSrc) return TRUE; + /* For destination width/height less than or equal to source + width/height, do not bother with memory bitmap optimization */ + if (nWidthSrc >= nWidthDst && nHeightSrc >= nHeightDst) + { + int bltWidth = min (nWidthDst, nWidthSrc); + int bltHeight = min (nHeightDst, nHeightSrc); + + return UXTHEME_Blt (hdcDst, nXOriginDst, nYOriginDst, bltWidth, bltHeight, + hdcSrc, nXOriginSrc, nYOriginSrc, + transparent, transcolor); + } + /* Create a DC with a bitmap consisting of a tiling of the source bitmap, with standard GDI functions. This is faster than an iteration with UXTHEME_Blt(). */

1 0

Alex Villacís Lasso : uxtheme: Fix nasty regression with painting of themed progress bar.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 6a422640530592116cb3fd48d8cb1ddb436bcce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a422640530592116cb3fd48d… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Apr 23 09:45:53 2008 -0500 uxtheme: Fix nasty regression with painting of themed progress bar. --- dlls/uxtheme/draw.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 493cf0b..3650113 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -343,6 +343,8 @@ static inline BOOL UXTHEME_SizedBlt (HDC hdcDst, int nXOriginDst, int nYOriginDs HDC hdcTemp; BOOL result = FALSE; + if (!nWidthSrc || !nHeightSrc) return TRUE; + /* Create a DC with a bitmap consisting of a tiling of the source bitmap, with standard GDI functions. This is faster than an iteration with UXTHEME_Blt(). */

1 0

Jacek Caban : mshtml: Added elements IDispatchEx implementation.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: d5059b8303b084ab13bb9eb042e161f12b32d164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5059b8303b084ab13bb9eb04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 16:45:52 2008 +0200 mshtml: Added elements IDispatchEx implementation. --- dlls/mshtml/dispex.c | 4 ++++ dlls/mshtml/htmlelem.c | 14 ++++++++++++++ dlls/mshtml/htmlnode.c | 8 ++++++++ dlls/mshtml/mshtml_private.h | 5 +++++ 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 26be1e8..e42649c 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -52,11 +52,15 @@ static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { &IID_NULL, &DIID_DispHTMLDocument, + &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, &IID_IHTMLDocument2, &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IHTMLDOMNode, + &IID_IHTMLElement, + &IID_IHTMLElement2, &IID_IHTMLWindow2, &IID_IHTMLWindow3, &IID_IOmNavigator diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8777870..748faf6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1282,6 +1282,17 @@ static const NodeImplVtbl HTMLElementImplVtbl = { HTMLElement_destructor }; +static dispex_static_data_t HTMLElement_dispex = { + DispHTMLUnknownElement_tid, + NULL, + { + IHTMLDOMNode_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + 0 + } +}; + void HTMLElement_Init(HTMLElement *This) { This->node.vtbl = &HTMLElementImplVtbl; @@ -1344,6 +1355,9 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) ret->nselem = nselem; + if(!ret->node.dispex.data) + init_dispex(&ret->node.dispex, (IUnknown*)HTMLELEM(ret), &HTMLElement_dispex); + return ret; } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index f009411..d3a9b72 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -313,6 +313,14 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = HTMLDOMNODE(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + if(This->dispex.data) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = DISPATCHEX(&This->dispex); + }else { + FIXME("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + return E_NOINTERFACE; + } }else if(IsEqualGUID(&IID_IHTMLDOMNode, riid)) { TRACE("(%p)->(IID_IHTMLDOMNode %p)\n", This, ppv); *ppv = HTMLDOMNODE(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 73169f7..5fb37da 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -62,11 +62,15 @@ typedef struct event_target_t event_target_t; typedef enum { NULL_tid, DispHTMLDocument_tid, + DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, IHTMLDocument2_tid, IHTMLDocument3_tid, IHTMLDocument4_tid, IHTMLDocument5_tid, + IHTMLDOMNode_tid, + IHTMLElement_tid, + IHTMLElement2_tid, IHTMLWindow2_tid, IHTMLWindow3_tid, IOmNavigator_tid, @@ -293,6 +297,7 @@ typedef struct { } NodeImplVtbl; struct HTMLDOMNode { + DispatchEx dispex; const IHTMLDOMNodeVtbl *lpHTMLDOMNodeVtbl; const NodeImplVtbl *vtbl;

1 0

Jacek Caban : mshtml.idl: Added DispHTMLUnknownElement declaration.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 22eb495aaf0bf0d4d3374e0e6f5890badb351bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=22eb495aaf0bf0d4d3374e0e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 16:45:21 2008 +0200 mshtml.idl: Added DispHTMLUnknownElement declaration. --- include/mshtmdid.h | 44 +++- include/mshtml.idl | 834 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 877 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22eb495aaf0bf0d4d3374…

1 0

Jacek Caban : mshtml: Use heap_alloc_zero for allocating node objects.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 38b14274fb507d1b6d387b38875f85720a5ee78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b14274fb507d1b6d387b388… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 16:44:21 2008 +0200 mshtml: Use heap_alloc_zero for allocating node objects. --- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlnode.c | 3 +-- dlls/mshtml/htmloption.c | 2 +- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmltable.c | 2 +- dlls/mshtml/htmltextarea.c | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index d404925..8663291 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -481,7 +481,7 @@ static const NodeImplVtbl HTMLAnchorElementImplVtbl = { HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement *nselem) { - HTMLAnchorElement *ret = heap_alloc(sizeof(HTMLAnchorElement)); + HTMLAnchorElement *ret = heap_alloc_zero(sizeof(HTMLAnchorElement)); HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 2ca3f28..8e1f70c 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -598,7 +598,7 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) { - HTMLBodyElement *ret = heap_alloc(sizeof(HTMLBodyElement)); + HTMLBodyElement *ret = heap_alloc_zero(sizeof(HTMLBodyElement)); nsresult nsres; TRACE("(%p)->(%p)\n", ret, nselem); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6dab3a1..8777870 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1336,7 +1336,7 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) ret = HTMLTextAreaElement_Create(nselem); if(!ret) { - ret = heap_alloc(sizeof(HTMLElement)); + ret = heap_alloc_zero(sizeof(HTMLElement)); HTMLElement_Init(ret); } diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 9c390c8..e580bb6 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1055,7 +1055,7 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement *nselem) { - HTMLInputElement *ret = heap_alloc(sizeof(HTMLInputElement)); + HTMLInputElement *ret = heap_alloc_zero(sizeof(HTMLInputElement)); nsresult nsres; HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 64cabe4..f009411 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -352,14 +352,13 @@ static HTMLDOMNode *create_node(HTMLDocument *doc, nsIDOMNode *nsnode) ret = &HTMLElement_Create(nsnode)->node; break; default: - ret = heap_alloc(sizeof(HTMLDOMNode)); + ret = heap_alloc_zero(sizeof(HTMLDOMNode)); ret->vtbl = &HTMLDOMNodeImplVtbl; } ret->lpHTMLDOMNodeVtbl = &HTMLDOMNodeVtbl; ret->ref = 1; ret->doc = doc; - ret->event_target = NULL; nsIDOMNode_AddRef(nsnode); ret->nsnode = nsnode; diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 20a35ae..7252dde 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -333,7 +333,7 @@ static const NodeImplVtbl HTMLOptionElementImplVtbl = { HTMLElement *HTMLOptionElement_Create(nsIDOMHTMLElement *nselem) { - HTMLOptionElement *ret = heap_alloc(sizeof(HTMLOptionElement)); + HTMLOptionElement *ret = heap_alloc_zero(sizeof(HTMLOptionElement)); nsresult nsres; HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 6c49af5..36512ad 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -288,7 +288,7 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLElement *HTMLScriptElement_Create(nsIDOMHTMLElement *nselem) { - HTMLScriptElement *ret = heap_alloc(sizeof(HTMLScriptElement)); + HTMLScriptElement *ret = heap_alloc_zero(sizeof(HTMLScriptElement)); nsresult nsres; HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 3718e8a..03fcb8f 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -422,7 +422,7 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = { HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement *nselem) { - HTMLSelectElement *ret = heap_alloc(sizeof(HTMLSelectElement)); + HTMLSelectElement *ret = heap_alloc_zero(sizeof(HTMLSelectElement)); nsresult nsres; HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 66d55d0..88f6e75 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -546,7 +546,7 @@ static const NodeImplVtbl HTMLTableImplVtbl = { HTMLElement *HTMLTable_Create(nsIDOMHTMLElement *nselem) { - HTMLTable *ret = heap_alloc(sizeof(HTMLTable)); + HTMLTable *ret = heap_alloc_zero(sizeof(HTMLTable)); HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 64245e7..6e94174 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -402,7 +402,7 @@ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement *nselem) { - HTMLTextAreaElement *ret = heap_alloc(sizeof(HTMLTextAreaElement)); + HTMLTextAreaElement *ret = heap_alloc_zero(sizeof(HTMLTextAreaElement)); nsresult nsres; HTMLElement_Init(&ret->element);

1 0

Stefan Dösinger : d3d9: Add a test for NP2 stretchrect .
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 5d49dea3735b1904fa27b1a22237a5b4ce4be719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d49dea3735b1904fa27b1a22… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 23 16:19:19 2008 +0200 d3d9: Add a test for NP2 stretchrect. --- dlls/d3d9/tests/visual.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 7 ++- 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e977930..4fe3cd9 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8951,6 +8951,109 @@ out: if(shader)IDirect3DVertexShader9_Release(shader); } +static void np2_stretch_rect_test(IDirect3DDevice9 *device) { + IDirect3DSurface9 *src = NULL, *dst = NULL, *backbuffer = NULL; + IDirect3DTexture9 *dsttex = NULL; + HRESULT hr; + DWORD color; + D3DRECT r1 = {0, 0, 50, 50 }; + D3DRECT r2 = {50, 0, 100, 50 }; + D3DRECT r3 = {50, 50, 100, 100}; + D3DRECT r4 = {0, 50, 50, 100}; + const float quad[] = { + -1.0, -1.0, 0.1, 0.0, 0.0, + 1.0, -1.0, 0.1, 1.0, 0.0, + -1.0, 1.0, 0.1, 0.0, 1.0, + 1.0, 1.0, 0.1, 1.0, 1.0, + }; + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3D_OK, "IDirect3DDevice9_GetBackBuffer failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 100, 100, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &src, NULL ); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateRenderTarget failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_CreateTexture(device, 25, 25, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &dsttex, NULL); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture failed with %s\n", DXGetErrorString9(hr)); + + if(!src || !dsttex) { + skip("One or more test resources could not be created\n"); + goto cleanup; + } + + hr = IDirect3DTexture9_GetSurfaceLevel(dsttex, 0, &dst); + ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_Clear(device, 1, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + /* Clear the StretchRect destination for debugging */ + hr = IDirect3DDevice9_SetRenderTarget(device, 0, dst); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Clear(device, 1, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, src); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_Clear(device, 1, &r1, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Clear(device, 1, &r2, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Clear(device, 1, &r3, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Clear(device, 1, &r4, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + /* Stretchrect before setting the render target back to the backbuffer. This will make Wine use + * the target -> texture GL blit path + */ + hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst, NULL, D3DTEXF_POINT); + ok(hr == D3D_OK, "IDirect3DDevice9_StretchRect failed with %s\n", DXGetErrorString9(hr)); + IDirect3DSurface9_Release(dst); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) dsttex); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(float) * 5); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %s\n", DXGetErrorString9(hr)); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + color = getPixelColor(device, 160, 360); + ok(color == 0x00ff0000, "stretchrect: Pixel 160,360 has color 0x%08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 480, 360); + ok(color == 0x0000ff00, "stretchrect: Pixel 480,360 has color 0x%08x, expected 0x0000ff00\n", color); + color = getPixelColor(device, 480, 120); + ok(color == 0x000000ff, "stretchrect: Pixel 480,120 has color 0x%08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x00000000, "stretchrect: Pixel 160,120 has color 0x%08x, expected 0x00000000\n", color); + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + +cleanup: + if(src) IDirect3DSurface9_Release(src); + if(backbuffer) IDirect3DSurface9_Release(backbuffer); + if(dsttex) IDirect3DTexture9_Release(dsttex); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -9045,6 +9148,7 @@ START_TEST(visual) } pointsize_test(device_ptr); tssargtemp_test(device_ptr); + np2_stretch_rect_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a52e822..c462bd2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2791,8 +2791,11 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine Src->Flags &= ~SFLAG_INTEXTURE; } - glReadBuffer(GL_BACK); - checkGLcall("glReadBuffer(GL_BACK)"); + if(swapchain) { + glReadBuffer(surface_get_gl_buffer(SrcSurface, (IWineD3DSwapChain *)swapchain)); + } else { + glReadBuffer(myDevice->offscreenBuffer); + } /* TODO: Only back up the part that will be overwritten */ glCopyTexSubImage2D(texture_target, 0,

1 0

Jacek Caban : mshtml: Added IHTMLDocument3::getElementById implementation.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: e610d2ff12fbb52ecd0fd17a4ade034de9b22d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e610d2ff12fbb52ecd0fd17a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 16:43:50 2008 +0200 mshtml: Added IHTMLDocument3::getElementById implementation. --- dlls/mshtml/htmldoc3.c | 33 +++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 3b109e9..4fbd131 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -407,8 +407,37 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v IHTMLElement **pel) { HTMLDocument *This = HTMLDOC3_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - return E_NOTIMPL; + nsIDOMDocument *nsdoc = NULL; + nsIDOMElement *nselem = NULL; + HTMLDOMNode *node; + nsAString id_str; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + *pel = NULL; + + if(!This->nscontainer) + return S_OK; + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres) || !nsdoc) + return S_OK; + + nsAString_Init(&id_str, v); + nsIDOMDocument_GetElementById(nsdoc, &id_str, &nselem); + nsIDOMDocument_Release(nsdoc); + nsAString_Finish(&id_str); + + if(!nselem) { + *pel = NULL; + return S_OK; + } + + node = get_node(This, (nsIDOMNode*)nselem, TRUE); + nsIDOMElement_Release(nselem); + + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)pel); } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 59c2a17..ae716d9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -777,6 +777,26 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id, BOOL expect return elem; } +static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id) +{ + IHTMLDocument3 *doc3; + IHTMLElement *elem; + BSTR tmp; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + + tmp = SysAllocString(id); + hres = IHTMLDocument3_getElementById(doc3, tmp, &elem); + SysFreeString(tmp); + ok(hres == S_OK, "getElementById(%s) failed: %08x\n", dbgstr_w(id), hres); + + IHTMLDocument3_Release(doc3); + + return elem; +} + static void test_select_elem(IHTMLSelectElement *select) { test_select_length(select, 2); @@ -1357,6 +1377,15 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElementCollection_Release(col); get_elem_by_id(doc, xxxW, FALSE); + elem = get_doc_elem_by_id(doc, xxxW); + ok(!elem, "elem != NULL\n"); + + elem = get_doc_elem_by_id(doc, sW); + ok(elem != NULL, "elem == NULL\n"); + test_elem_type((IUnknown*)elem, ET_SELECT); + if(elem) + IHTMLElement_Release(elem); + elem = get_elem_by_id(doc, sW, TRUE); if(elem) { IHTMLSelectElement *select;

1 0

Stefan Dösinger : wined3d: Support framebuffer reading from texture_rectangle sources.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 1c9f1f8ddd5fa7ab8cae6dc510b01087895f8ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c9f1f8ddd5fa7ab8cae6dc51… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 23 02:48:55 2008 +0200 wined3d: Support framebuffer reading from texture_rectangle sources. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 26 +++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 33f4180..89eb835 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -663,7 +663,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U object->glDescription.level = Level; /* Flags */ - object->Flags = 0; + object->Flags = SFLAG_NORMCOORD; /* Default to normalized coords */ object->Flags |= Discard ? SFLAG_DISCARD : 0; object->Flags |= (WINED3DFMT_D16_LOCKABLE == Format) ? SFLAG_LOCKABLE : 0; object->Flags |= Lockable ? SFLAG_LOCKABLE : 0; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7d4eea9..a52e822 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -626,6 +626,11 @@ void WINAPI IWineD3DSurfaceImpl_SetGlTextureDesc(IWineD3DSurface *iface, UINT te IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); IWineD3DSurface_AddDirtyRect(iface, NULL); } + if(target == GL_TEXTURE_RECTANGLE_ARB && This->glDescription.target != target) { + This->Flags &= ~SFLAG_NORMCOORD; + } else if(This->glDescription.target == GL_TEXTURE_RECTANGLE_ARB && target != GL_TEXTURE_RECTANGLE_ARB) { + This->Flags |= SFLAG_NORMCOORD; + } This->glDescription.textureName = textureName; This->glDescription.target = target; This->Flags &= ~SFLAG_ALLOCATED; @@ -2845,15 +2850,22 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine } checkGLcall("glEnd and previous"); - left = (float) srect->x1 / (float) Src->pow2Width; - right = (float) srect->x2 / (float) Src->pow2Width; + left = srect->x1; + right = srect->x2; if(upsidedown) { - top = (float) (Src->currentDesc.Height - srect->y1) / (float) Src->pow2Height; - bottom = (float) (Src->currentDesc.Height - srect->y2) / (float) Src->pow2Height; + top = Src->currentDesc.Height - srect->y1; + bottom = Src->currentDesc.Height - srect->y2; } else { - top = (float) (Src->currentDesc.Height - srect->y2) / (float) Src->pow2Height; - bottom = (float) (Src->currentDesc.Height - srect->y1) / (float) Src->pow2Height; + top = Src->currentDesc.Height - srect->y2; + bottom = Src->currentDesc.Height - srect->y1; + } + + if(Src->Flags & SFLAG_NORMCOORD) { + left /= Src->pow2Width; + right /= Src->pow2Width; + top /= Src->pow2Height; + bottom /= Src->pow2Height; } /* draw the source texture stretched and upside down. The correct surface is bound already */ @@ -3774,7 +3786,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->glDescription.target = GL_TEXTURE_RECTANGLE_ARB; This->pow2Width = This->currentDesc.Width; This->pow2Height = This->currentDesc.Height; - This->Flags &= ~SFLAG_NONPOW2; + This->Flags &= ~(SFLAG_NONPOW2 | SFLAG_NORMCOORD); } /* No oversize, gl rect is the full texture size */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bdad91b..2404505 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1365,6 +1365,7 @@ void get_drawable_size_fbo(IWineD3DSurfaceImpl *This, UINT *width, UINT *height) #define SFLAG_CLIENT 0x00010000 /* GL_APPLE_client_storage is used on that texture */ #define SFLAG_ALLOCATED 0x00020000 /* A gl texture is allocated for this surface */ #define SFLAG_PBO 0x00040000 /* Has a PBO attached for speeding up data transfers for dynamically locked surfaces */ +#define SFLAG_NORMCOORD 0x00080000 /* Set if the GL texture coords are normalized(non-texture rectangle) */ /* In some conditions the surface memory must not be freed: * SFLAG_OVERSIZE: Not all data can be kept in GL

1 0

Stefan Dösinger : wined3d: Use the shader backend to enable / disable atifs and nvts.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: e3bd5b6dcdae9018f4f148aa6c964d0bb3be21d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3bd5b6dcdae9018f4f148aa6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 11 08:19:04 2008 +0200 wined3d: Use the shader backend to enable / disable atifs and nvts. The previous logic assumed that if NVTS or ATIFS are available they will be used. This happens to be true for NVTS, but ATIFS is only used if neither ARBFP nor GLSL are supported. This breaks fixed function fragment processing on ATI r300 and newer cards --- dlls/wined3d/arb_program_shader.c | 5 +++ dlls/wined3d/ati_fragment_shader.c | 11 ++++++++ dlls/wined3d/baseshader.c | 17 ++++++++++++ dlls/wined3d/context.c | 50 ++++++----------------------------- dlls/wined3d/glsl_shader.c | 5 +++ dlls/wined3d/wined3d_private.h | 1 + 6 files changed, 48 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a165b9c..6bed3c5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2081,6 +2081,10 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info static void shader_arb_load_init(void) { } +static void shader_arb_fragment_enable(IWineD3DDevice *iface, BOOL enable) { + none_shader_backend.shader_fragment_enable(iface, enable); +} + const shader_backend_t arb_program_shader_backend = { &shader_arb_select, &shader_arb_select_depth_blt, @@ -2096,5 +2100,6 @@ const shader_backend_t arb_program_shader_backend = { &shader_arb_generate_vshader, &shader_arb_get_caps, &shader_arb_load_init, + &shader_arb_fragment_enable, FFPStateTable }; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index cd5a11b..0d3687e 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1026,6 +1026,16 @@ static void shader_atifs_generate_vshader(IWineD3DVertexShader *iface, SHADER_BU arb_program_shader_backend.shader_generate_vshader(iface, buffer); } +static void shader_atifs_fragment_enable(IWineD3DDevice *iface, BOOL enable) { + if(enable) { + glEnable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } else { + glDisable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glDisable(GL_FRAGMENT_SHADER_ATI)"); + } +} + const shader_backend_t atifs_shader_backend = { shader_atifs_select, shader_atifs_select_depth_blt, @@ -1041,5 +1051,6 @@ const shader_backend_t atifs_shader_backend = { shader_atifs_generate_vshader, shader_atifs_get_caps, shader_atifs_load_init, + shader_atifs_fragment_enable, ATIFSStateTable }; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 37ddd78..174f2ea 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1182,6 +1182,22 @@ static void shader_none_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_inf #endif } + +static void shader_none_fragment_enable(IWineD3DDevice *iface, BOOL enable) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + WineD3D_GL_Info *gl_info = &This->adapter->gl_info; + + if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { + if(enable) { + glEnable(GL_TEXTURE_SHADER_NV); + checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); + } else { + glDisable(GL_TEXTURE_SHADER_NV); + checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)"); + } + } +} + #undef GLINFO_LOCATION const shader_backend_t none_shader_backend = { @@ -1199,6 +1215,7 @@ const shader_backend_t none_shader_backend = { &shader_none_generate_vshader, &shader_none_get_caps, &shader_none_load_init, + &shader_none_fragment_enable, FFPStateTable }; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 67baee5..6e19cae 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -351,10 +351,9 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar /* Set up the context defaults */ oldCtx = pwglGetCurrentContext(); oldDrawable = pwglGetCurrentDC(); - if(oldCtx && oldDrawable && GL_SUPPORT(ATI_FRAGMENT_SHADER)) { + if(oldCtx && oldDrawable) { /* See comment in ActivateContext context switching */ - glDisable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, FALSE); } if(pwglMakeCurrent(hdc, ctx) == FALSE) { ERR("Cannot activate context to set up defaults\n"); @@ -439,10 +438,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar if(oldDrawable && oldCtx) { pwglMakeCurrent(oldDrawable, oldCtx); } - if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); - } + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, TRUE); out: return ret; @@ -687,13 +683,7 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex checkGLcall("glViewport"); Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); - if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { - glDisable(GL_TEXTURE_SHADER_NV); - checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)"); - } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - glDisable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glDisable(GL_FRAGMENT_SHADER_ATI)"); - } + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, FALSE); } /***************************************************************************** @@ -941,22 +931,12 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU else { TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); - if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - /* Mesa crashes when enabling a context with GL_FRAGMENT_SHADER_ATI enabled. - * Thus we disable it before deactivating any context, and re-enable it afterwards. - * - * This bug is filed as bug #15269 on bugs.freedesktop.org - */ - glDisable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); - } - + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, FALSE); ret = pwglMakeCurrent(context->hdc, context->glCtx); if(ret == FALSE) { ERR("Failed to activate the new context\n"); - } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER) && !context->last_was_blit) { - glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } else if(!context->last_was_blit) { + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, TRUE); } } if(This->activeContext->vshader_const_dirty) { @@ -988,13 +968,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU case CTXUSAGE_CLEAR: if(context->last_was_blit) { - if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { - glEnable(GL_TEXTURE_SHADER_NV); - checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); - } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); - } + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, TRUE); } /* Blending and clearing should be orthogonal, but tests on the nvidia driver show that disabling @@ -1013,13 +987,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU case CTXUSAGE_DRAWPRIM: /* This needs all dirty states applied */ if(context->last_was_blit) { - if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { - glEnable(GL_TEXTURE_SHADER_NV); - checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); - } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); - } + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, TRUE); } IWineD3DDeviceImpl_FindTexUnitMap(This); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1c5a97f..cc0c2e0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3583,6 +3583,10 @@ static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_inf static void shader_glsl_load_init(void) {} +static void shader_glsl_fragment_enable(IWineD3DDevice *iface, BOOL enable) { + none_shader_backend.shader_fragment_enable(iface, enable); +} + const shader_backend_t glsl_shader_backend = { &shader_glsl_select, &shader_glsl_select_depth_blt, @@ -3598,5 +3602,6 @@ const shader_backend_t glsl_shader_backend = { &shader_glsl_generate_vshader, &shader_glsl_get_caps, &shader_glsl_load_init, + &shader_glsl_fragment_enable, FFPStateTable }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 92387ed..bdad91b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -300,6 +300,7 @@ typedef struct { void (*shader_generate_vshader)(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer); void (*shader_get_caps)(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *caps); void (*shader_dll_load_init)(void); + void (*shader_fragment_enable)(IWineD3DDevice *iface, BOOL enable); const struct StateEntry *StateTable; } shader_backend_t;

1 0

Alexandre Julliard : explorer: Convert the command line parsing to Unicode.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 9bbbebc2ce807885c5fc1fe927b14af27d8f1421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bbbebc2ce807885c5fc1fe92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 23 18:04:43 2008 +0200 explorer: Convert the command line parsing to Unicode. --- programs/explorer/Makefile.in | 2 +- programs/explorer/desktop.c | 63 +++++++++++++++++----------- programs/explorer/explorer.c | 75 ++++++++++++++++------------------ programs/explorer/explorer_private.h | 8 +--- 4 files changed, 76 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bbbebc2ce807885c5fc1…

1 0