December 2007 - Wine-Commits

Jacek Caban : mshtml: Move HTMLTextContainerEvents connection point to HTMLTextContainer object.
by Alexandre Julliard Dec. 4, 2007

Dec. 4, 2007

Module: wine Branch: master Commit: cd68aacbbc3e307b5d5c9ed99fb69bf0daf9c4cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd68aacbbc3e307b5d5c9ed99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 4 13:38:31 2007 +0100 mshtml: Move HTMLTextContainerEvents connection point to HTMLTextContainer object. --- dlls/mshtml/htmlbody.c | 3 --- dlls/mshtml/htmltextcont.c | 2 ++ dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 5077638..e3fb732 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -41,7 +41,6 @@ typedef struct { const IHTMLBodyElementVtbl *lpHTMLBodyElementVtbl; ConnectionPoint cp_propnotif; - ConnectionPoint cp_txtcontevents; nsIDOMHTMLBodyElement *nsbody; } HTMLBodyElement; @@ -502,8 +501,6 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) ret->textcont.element.node.vtbl = &HTMLBodyElementImplVtbl; ConnectionPoint_Init(&ret->cp_propnotif, &ret->textcont.element.cp_container, &IID_IPropertyNotifySink); - ConnectionPoint_Init(&ret->cp_txtcontevents, &ret->textcont.element.cp_container, - &DIID_HTMLTextContainerEvents); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLBodyElement, (void**)&ret->nsbody); diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index 8076646..f6f7c8b 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -216,4 +216,6 @@ void HTMLTextContainer_Init(HTMLTextContainer *This) HTMLElement_Init(&This->element); This->lpHTMLTextContainerVtbl = &HTMLTextContainerVtbl; + + ConnectionPoint_Init(&This->cp, &This->element.cp_container, &DIID_HTMLTextContainerEvents); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b2bba95..8d45752 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -297,6 +297,8 @@ typedef struct { HTMLElement element; const IHTMLTextContainerVtbl *lpHTMLTextContainerVtbl; + + ConnectionPoint cp; } HTMLTextContainer; #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl)

1 0

Jacek Caban : mshtml: Make IConnectionPointContainer more flexible.
by Alexandre Julliard Dec. 4, 2007

Dec. 4, 2007

Module: wine Branch: master Commit: a1bdef2d62ca0575c0a8ca7d03ef7bdb73cda25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1bdef2d62ca0575c0a8ca7d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 4 13:36:27 2007 +0100 mshtml: Make IConnectionPointContainer more flexible. --- dlls/mshtml/conpoint.c | 24 +++++++++++------------- dlls/mshtml/htmlbody.c | 8 +++----- dlls/mshtml/htmldoc.c | 11 ++++------- dlls/mshtml/mshtml_private.h | 6 +++--- 4 files changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index b5c969c..a8e3d56 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -93,7 +93,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *i if(!pIID) return E_POINTER; - memcpy(pIID, &This->iid, sizeof(IID)); + memcpy(pIID, This->iid, sizeof(IID)); return S_OK; } @@ -122,8 +122,8 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * TRACE("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); - hres = IUnknown_QueryInterface(pUnkSink, &This->iid, (void**)&sink); - if(FAILED(hres) && !IsEqualGUID(&IID_IPropertyNotifySink, &This->iid)) + hres = IUnknown_QueryInterface(pUnkSink, This->iid, (void**)&sink); + if(FAILED(hres) && !IsEqualGUID(&IID_IPropertyNotifySink, This->iid)) hres = IUnknown_QueryInterface(pUnkSink, &IID_IDispatch, (void**)&sink); if(FAILED(hres)) return CONNECT_E_CANNOTCONNECT; @@ -184,18 +184,17 @@ static const IConnectionPointVtbl ConnectionPointVtbl = ConnectionPoint_EnumConnections }; -void ConnectionPoint_Init(ConnectionPoint *cp, IConnectionPointContainer *container, - REFIID riid, ConnectionPoint *prev) +void ConnectionPoint_Init(ConnectionPoint *cp, ConnectionPointContainer *container, REFIID riid) { cp->lpConnectionPointVtbl = &ConnectionPointVtbl; - cp->container = container; + cp->container = CONPTCONT(container); cp->sinks = NULL; cp->sinks_size = 0; - cp->iid = *riid; + cp->iid = riid; cp->next = NULL; - if(prev) - prev->next = cp; + cp->next = container->cp_list; + container->cp_list = cp; } static void ConnectionPoint_Destroy(ConnectionPoint *This) @@ -250,7 +249,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo *ppCP = NULL; for(iter = This->cp_list; iter; iter = iter->next) { - if(IsEqualGUID(&iter->iid, riid)) + if(IsEqualGUID(iter->iid, riid)) *ppCP = CONPOINT(iter); } @@ -273,11 +272,10 @@ static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { #undef CONPTCONT_THIS -void ConnectionPointContainer_Init(ConnectionPointContainer *This, ConnectionPoint *cp_list, - IUnknown *outer) +void ConnectionPointContainer_Init(ConnectionPointContainer *This, IUnknown *outer) { This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; - This->cp_list = cp_list; + This->cp_list = NULL; This->outer = outer; } diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e475d5d..b1b6c4c 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -506,11 +506,9 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) HTMLTextContainer_Init(&ret->textcont); - ConnectionPoint_Init(&ret->cp_propnotif, CONPTCONT(&ret->cp_container), - &IID_IPropertyNotifySink, NULL); - ConnectionPoint_Init(&ret->cp_txtcontevents, CONPTCONT(&ret->cp_container), - &DIID_HTMLTextContainerEvents, &ret->cp_propnotif); - ConnectionPointContainer_Init(&ret->cp_container, &ret->cp_propnotif, (IUnknown*)HTMLBODY(ret)); + ConnectionPointContainer_Init(&ret->cp_container, (IUnknown*)HTMLBODY(ret)); + ConnectionPoint_Init(&ret->cp_propnotif, &ret->cp_container, &IID_IPropertyNotifySink); + ConnectionPoint_Init(&ret->cp_txtcontevents, &ret->cp_container, &DIID_HTMLTextContainerEvents); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLBodyElement, (void**)&ret->nsbody); diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6ad153a..f3ca63b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1207,13 +1207,10 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) HTMLDocument_Service_Init(ret); HTMLDocument_Hlink_Init(ret); - ConnectionPoint_Init(&ret->cp_propnotif, CONPTCONT(&ret->cp_container), - &IID_IPropertyNotifySink, NULL); - ConnectionPoint_Init(&ret->cp_htmldocevents, CONPTCONT(&ret->cp_container), - &DIID_HTMLDocumentEvents, &ret->cp_propnotif); - ConnectionPoint_Init(&ret->cp_htmldocevents2, CONPTCONT(&ret->cp_container), - &DIID_HTMLDocumentEvents2, &ret->cp_htmldocevents); - ConnectionPointContainer_Init(&ret->cp_container, &ret->cp_propnotif, (IUnknown*)HTMLDOC(ret)); + ConnectionPointContainer_Init(&ret->cp_container, (IUnknown*)HTMLDOC(ret)); + ConnectionPoint_Init(&ret->cp_propnotif, &ret->cp_container, &IID_IPropertyNotifySink); + ConnectionPoint_Init(&ret->cp_htmldocevents, &ret->cp_container, &DIID_HTMLDocumentEvents); + ConnectionPoint_Init(&ret->cp_htmldocevents2, &ret->cp_container, &DIID_HTMLDocumentEvents2); ret->nscontainer = NSContainer_Create(ret, NULL); ret->window = HTMLWindow_Create(ret); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 55d1a91..b284d86 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -90,7 +90,7 @@ struct ConnectionPoint { } *sinks; DWORD sinks_size; - IID iid; + const IID *iid; ConnectionPoint *next; }; @@ -372,8 +372,8 @@ void HTMLDocument_Window_Init(HTMLDocument*); void HTMLDocument_Service_Init(HTMLDocument*); void HTMLDocument_Hlink_Init(HTMLDocument*); -void ConnectionPoint_Init(ConnectionPoint*,IConnectionPointContainer*,REFIID,ConnectionPoint*); -void ConnectionPointContainer_Init(ConnectionPointContainer*,ConnectionPoint*,IUnknown*); +void ConnectionPoint_Init(ConnectionPoint*,ConnectionPointContainer*,REFIID); +void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*); void ConnectionPointContainer_Destroy(ConnectionPointContainer*); NSContainer *NSContainer_Create(HTMLDocument*,NSContainer*);

1 0

James Hawkins : msi: Test the CompLocator subset of the AppSearch action.
by Alexandre Julliard Dec. 4, 2007

Dec. 4, 2007

Module: wine Branch: master Commit: 440af1732201910f04a88f79df6f1feca3d5e4ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=440af1732201910f04a88f79d… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 3 22:10:11 2007 -0600 msi: Test the CompLocator subset of the AppSearch action. --- dlls/msi/tests/package.c | 492 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 489 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=440af1732201910f04a88…

1 0

Stefan Dösinger : wined3d: Clear honors the viewport.
by Alexandre Julliard Dec. 4, 2007

Dec. 4, 2007

Module: wine Branch: master Commit: fce9abd0950c0882636bbcda25c355c5d6b95bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fce9abd0950c0882636bbcda2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 1 15:49:42 2007 +0100 wined3d: Clear honors the viewport. --- dlls/d3d9/tests/visual.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 57 ++++++++++++++++++++++++++--------------- 2 files changed, 100 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c624962..2403881 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -276,6 +276,7 @@ static void clear_test(IDirect3DDevice9 *device) D3DRECT rect[2]; D3DRECT rect_negneg; DWORD color; + D3DVIEWPORT9 old_vp, vp; hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); @@ -315,6 +316,69 @@ static void clear_test(IDirect3DDevice9 *device) ok(color == 0x00ffffff, "Clear rectangle 4(NULL) has color %08x\n", color); color = getPixelColor(device, 480, 120); /* upper right quad */ ok(color == 0x00ffffff, "Clear rectangle 4(neg, neg) has color %08x\n", color); + + /* Test how the viewport affects clears */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_GetViewport(device, &old_vp); + ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %s\n", DXGetErrorString9(hr)); + + vp.X = 160; + vp.Y = 120; + vp.Width = 160; + vp.Height = 120; + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(hr == D3D_OK, "IDirect3DDevice9_SetViewport failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + vp.X = 320; + vp.Y = 240; + vp.Width = 320; + vp.Height = 240; + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(hr == D3D_OK, "IDirect3DDevice9_SetViewport failed with %s\n", DXGetErrorString9(hr)); + rect[0].x1 = 160; + rect[0].y1 = 120; + rect[0].x2 = 480; + rect[0].y2 = 360; + hr = IDirect3DDevice9_Clear(device, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetViewport(device, &old_vp); + ok(hr == D3D_OK, "IDirect3DDevice9_SetViewport failed with %s\n", DXGetErrorString9(hr)); + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 158, 118); + ok(color == 0x00ffffff, "(158,118) has color %08x\n", color); + color = getPixelColor(device, 162, 118); + ok(color == 0x00ffffff, "(162,118) has color %08x\n", color); + color = getPixelColor(device, 158, 122); + ok(color == 0x00ffffff, "(158,122) has color %08x\n", color); + color = getPixelColor(device, 162, 122); + ok(color == 0x000000ff, "(162,122) has color %08x\n", color); + + color = getPixelColor(device, 318, 238); + ok(color == 0x000000ff, "(318,238) has color %08x\n", color); + color = getPixelColor(device, 322, 238); + ok(color == 0x00ffffff, "(322,328) has color %08x\n", color); + color = getPixelColor(device, 318, 242); + ok(color == 0x00ffffff, "(318,242) has color %08x\n", color); + color = getPixelColor(device, 322, 242); + ok(color == 0x0000ff00, "(322,242) has color %08x\n", color); + + color = getPixelColor(device, 478, 358); + ok(color == 0x0000ff00, "(478,358 has color %08x\n", color); + color = getPixelColor(device, 482, 358); + ok(color == 0x00ffffff, "(482,358) has color %08x\n", color); + color = getPixelColor(device, 478, 362); + ok(color == 0x00ffffff, "(478,362) has color %08x\n", color); + color = getPixelColor(device, 482, 362); + ok(color == 0x00ffffff, "(482,362) has color %08x\n", color); } typedef struct { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b1fe251..b0e8dc4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4786,7 +4786,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun GLbitfield glMask = 0; unsigned int i; - CONST WINED3DRECT* curRect; + WINED3DRECT curRect; + RECT vp_rect; + WINED3DVIEWPORT *vp = &This->stateBlock->viewport; TRACE("(%p) Count (%d), pRects (%p), Flags (%x), Color (0x%08x), Z (%f), Stencil (%d)\n", This, Count, pRects, Flags, Color, Z, Stencil); @@ -4803,19 +4805,25 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun * * If we're clearing the whole target there is no need to copy it into the drawable, it will be overwritten * anyway. If we're not clearing the color buffer we don't have to copy either since we're not going to set - * the drawable up to date + * the drawable up to date. We have to check all settings that limit the clear area though. Do not bother + * checking all this if the dest surface is in the drawable anyway. */ - if (Count > 0 && pRects) { - if(Flags & WINED3DCLEAR_TARGET) { - if(pRects[0].x1 > 0 || pRects[0].y1 > 0 || + if((Flags & WINED3DCLEAR_TARGET) && !(target->Flags & SFLAG_INDRAWABLE)) { + while(1) { + if(vp->X != 0 || vp->Y != 0 || + vp->Width < target->currentDesc.Width || vp->Height < target->currentDesc.Height) { + IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); + break; + } + if(Count > 0 && pRects && ( + pRects[0].x1 > 0 || pRects[0].y1 > 0 || pRects[0].x2 < target->currentDesc.Width || - pRects[0].y2 < target->currentDesc.Height) { + pRects[0].y2 < target->currentDesc.Height)) { IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); + break; } + break; } - curRect = pRects; - } else { - curRect = NULL; } /* This is for offscreen rendering as well as for multithreading, thus activate the set render target @@ -4857,9 +4865,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun glMask = glMask | GL_COLOR_BUFFER_BIT; } - if (!curRect) { - /* In drawable flag is set below */ - + if (!(Count > 0 && pRects)) { if (This->render_offscreen) { glScissor(This->stateBlock->viewport.X, This->stateBlock->viewport.Y, @@ -4876,29 +4882,38 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun glClear(glMask); checkGLcall("glClear"); } else { + /* The viewport cap still applies, we have to intersect each clear rect with the viewport + * range because glClear ignores the viewport(and the viewport isn't even applied in this state) + */ + vp_rect.left = vp->X; + vp_rect.top = vp->Y; + vp_rect.right = vp->X + vp->Width; + vp_rect.bottom = vp->Y + vp->Height; + /* Now process each rect in turn */ for (i = 0; i < Count; i++) { /* Note gl uses lower left, width/height */ - TRACE("(%p) %p Rect=(%d,%d)->(%d,%d) glRect=(%d,%d), len=%d, hei=%d\n", This, curRect, - curRect[i].x1, curRect[i].y1, curRect[i].x2, curRect[i].y2, - curRect[i].x1, (target->currentDesc.Height - curRect[i].y2), - curRect[i].x2 - curRect[i].x1, curRect[i].y2 - curRect[i].y1); + IntersectRect((RECT *) &curRect, &vp_rect, (RECT *) &pRects[i]); + TRACE("(%p) Rect=(%d,%d)->(%d,%d) glRect=(%d,%d), len=%d, hei=%d\n", This, + pRects[i].x1, pRects[i].y1, pRects[i].x2, pRects[i].y2, + curRect.x1, (target->currentDesc.Height - curRect.y2), + curRect.x2 - curRect.x1, curRect.y2 - curRect.y1); /* Tests show that rectangles where x1 > x2 or y1 > y2 are ignored silently. * The rectangle is not cleared, no error is returned, but further rectanlges are * still cleared if they are valid */ - if(curRect[i].x1 > curRect[i].x2 || curRect[i].y1 > curRect[i].y2) { + if(curRect.x1 > curRect.x2 || curRect.y1 > curRect.y2) { TRACE("Rectangle with negative dimensions, ignoring\n"); continue; } if(This->render_offscreen) { - glScissor(curRect[i].x1, curRect[i].y1, - curRect[i].x2 - curRect[i].x1, curRect[i].y2 - curRect[i].y1); + glScissor(curRect.x1, curRect.y1, + curRect.x2 - curRect.x1, curRect.y2 - curRect.y1); } else { - glScissor(curRect[i].x1, target->currentDesc.Height - curRect[i].y2, - curRect[i].x2 - curRect[i].x1, curRect[i].y2 - curRect[i].y1); + glScissor(curRect.x1, target->currentDesc.Height - curRect.y2, + curRect.x2 - curRect.x1, curRect.y2 - curRect.y1); } checkGLcall("glScissor");

1 0

Stefan Dösinger : wined3d: Use the proper drawable size when clearing.
by Alexandre Julliard Dec. 4, 2007

Dec. 4, 2007

Module: wine Branch: master Commit: 1ac109e5a02551bb739a23385c6c27edabec7efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac109e5a02551bb739a23385… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 1 15:52:08 2007 +0100 wined3d: Use the proper drawable size when clearing. --- dlls/wined3d/device.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b0e8dc4..1e53bcc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4789,6 +4789,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun WINED3DRECT curRect; RECT vp_rect; WINED3DVIEWPORT *vp = &This->stateBlock->viewport; + UINT drawable_width, drawable_height; TRACE("(%p) Count (%d), pRects (%p), Flags (%x), Color (0x%08x), Z (%f), Stencil (%d)\n", This, Count, pRects, Flags, Color, Z, Stencil); @@ -4826,6 +4827,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun } } + target->get_drawable_size(target, &drawable_width, &drawable_height); + /* This is for offscreen rendering as well as for multithreading, thus activate the set render target * and not the last active one. */ @@ -4873,7 +4876,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun This->stateBlock->viewport.Height); } else { glScissor(This->stateBlock->viewport.X, - (((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height - + (drawable_height - (This->stateBlock->viewport.Y + This->stateBlock->viewport.Height)), This->stateBlock->viewport.Width, This->stateBlock->viewport.Height); @@ -4912,7 +4915,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun glScissor(curRect.x1, curRect.y1, curRect.x2 - curRect.x1, curRect.y2 - curRect.y1); } else { - glScissor(curRect.x1, target->currentDesc.Height - curRect.y2, + glScissor(curRect.x1, drawable_height - curRect.y2, curRect.x2 - curRect.x1, curRect.y2 - curRect.y1); } checkGLcall("glScissor");

1 0

Stefan Dösinger : wined3d: Fixes for drawable handling in Clear.
by Alexandre Julliard Dec. 4, 2007

Dec. 4, 2007

Module: wine Branch: master Commit: bd10d5261f4b2d3b8295a5918958481e98fb159d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd10d5261f4b2d3b8295a5918… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 1 01:19:51 2007 +0100 wined3d: Fixes for drawable handling in Clear. --- dlls/wined3d/device.c | 56 ++++++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6d40cae..b1fe251 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4797,6 +4797,27 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun return WINED3DERR_INVALIDCALL; } + /* When we're clearing parts of the drawable, make sure that the target surface is well up to date in the + * drawable. After the clear we'll mark the drawable up to date, so we have to make sure that this is true + * for the cleared parts, and the untouched parts. + * + * If we're clearing the whole target there is no need to copy it into the drawable, it will be overwritten + * anyway. If we're not clearing the color buffer we don't have to copy either since we're not going to set + * the drawable up to date + */ + if (Count > 0 && pRects) { + if(Flags & WINED3DCLEAR_TARGET) { + if(pRects[0].x1 > 0 || pRects[0].y1 > 0 || + pRects[0].x2 < target->currentDesc.Width || + pRects[0].y2 < target->currentDesc.Height) { + IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); + } + } + curRect = pRects; + } else { + curRect = NULL; + } + /* This is for offscreen rendering as well as for multithreading, thus activate the set render target * and not the last active one. */ @@ -4807,12 +4828,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun apply_fbo_state(iface); } - if (Count > 0 && pRects) { - curRect = pRects; - } else { - curRect = NULL; - } - /* Only set the values up once, as they are not changing */ if (Flags & WINED3DCLEAR_STENCIL) { glClearStencil(Stencil); @@ -4861,17 +4876,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun glClear(glMask); checkGLcall("glClear"); } else { - if(!(target->Flags & SFLAG_INDRAWABLE) && - !(wined3d_settings.offscreen_rendering_mode == ORM_FBO && This->render_offscreen && target->Flags & SFLAG_INTEXTURE)) { - - if(curRect[0].x1 > 0 || curRect[0].y1 > 0 || - curRect[0].x2 < target->currentDesc.Width || - curRect[0].y2 < target->currentDesc.Height) { - TRACE("Partial clear, and surface not in drawable. Blitting texture to drawable\n"); - IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); - } - } - /* Now process each rect in turn */ for (i = 0; i < Count; i++) { /* Note gl uses lower left, width/height */ @@ -4913,18 +4917,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun mask & WINED3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE, mask & WINED3DCOLORWRITEENABLE_BLUE ? GL_TRUE : GL_FALSE, mask & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE); - } + /* Dirtify the target surface for now. If the surface is locked regularly, and an up to date sysmem copy exists, + * it is most likely more efficient to perform a clear on the sysmem copy too instead of downloading it + */ + IWineD3DSurface_ModifyLocation(This->lastActiveRenderTarget, SFLAG_INDRAWABLE, TRUE); + /* TODO: Move the fbo logic into ModifyLocation() */ + if(This->render_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + target->Flags |= SFLAG_INTEXTURE; + } + } LEAVE_GL(); - /* Dirtify the target surface for now. If the surface is locked regularly, and an up to date sysmem copy exists, - * it is most likely more efficient to perform a clear on the sysmem copy too instead of downloading it - */ - IWineD3DSurface_ModifyLocation(This->lastActiveRenderTarget, SFLAG_INDRAWABLE, TRUE); - /* TODO: Move the fbo logic into ModifyLocation() */ - if(This->render_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - target->Flags |= SFLAG_INTEXTURE; - } return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Disable the scissor test when blitting.
by Alexandre Julliard Dec. 4, 2007

Dec. 4, 2007

Module: wine Branch: master Commit: a4461e03f713c6afe71d230432133b3cc34407a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4461e03f713c6afe71d23043… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 1 01:10:37 2007 +0100 wined3d: Disable the scissor test when blitting. --- dlls/wined3d/context.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5e1bdc6..db8f13b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -585,6 +585,9 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex glDisable(GL_STENCIL_TEST); checkGLcall("glDisable GL_STENCIL_TEST"); Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_STENCILENABLE)); + glDisable(GL_SCISSOR_TEST); + checkGLcall("glDisable GL_SCISSOR_TEST"); + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); if(GL_SUPPORT(ARB_POINT_SPRITE)) { glDisable(GL_POINT_SPRITE_ARB); checkGLcall("glDisable GL_POINT_SPRITE_ARB");

1 0

Stefan Dösinger : wined3d: Use the proper drawable size when setting the scissor rect.
by Alexandre Julliard Dec. 4, 2007

Dec. 4, 2007

Module: wine Branch: master Commit: 8689fe32c6602c55a5cc275834ac26b51eba616c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8689fe32c6602c55a5cc27583… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 30 20:28:13 2007 +0100 wined3d: Use the proper drawable size when setting the scissor rect. --- dlls/wined3d/state.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 787f3ea..cd801d7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3668,25 +3668,21 @@ static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContex static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { RECT *pRect = &stateblock->scissorRect; - RECT windowRect; - UINT winHeight; - - windowRect.left = 0; - windowRect.top = 0; - windowRect.right = ((IWineD3DSurfaceImpl *) stateblock->wineD3DDevice->render_targets[0])->currentDesc.Width; - windowRect.bottom = ((IWineD3DSurfaceImpl *) stateblock->wineD3DDevice->render_targets[0])->currentDesc.Height; + UINT height; + UINT width; + IWineD3DSurfaceImpl *target = (IWineD3DSurfaceImpl *) stateblock->wineD3DDevice->render_targets[0]; + target->get_drawable_size(target, &width, &height); /* Warning: glScissor uses window coordinates, not viewport coordinates, so our viewport correction does not apply * Warning2: Even in windowed mode the coords are relative to the window, not the screen */ - winHeight = windowRect.bottom - windowRect.top; - TRACE("(%p) Setting new Scissor Rect to %d:%d-%d:%d\n", stateblock->wineD3DDevice, pRect->left, pRect->bottom - winHeight, + TRACE("(%p) Setting new Scissor Rect to %d:%d-%d:%d\n", stateblock->wineD3DDevice, pRect->left, pRect->bottom - height, pRect->right - pRect->left, pRect->bottom - pRect->top); if (stateblock->wineD3DDevice->render_offscreen) { glScissor(pRect->left, pRect->top, pRect->right - pRect->left, pRect->bottom - pRect->top); } else { - glScissor(pRect->left, winHeight - pRect->bottom, pRect->right - pRect->left, pRect->bottom - pRect->top); + glScissor(pRect->left, height - pRect->bottom, pRect->right - pRect->left, pRect->bottom - pRect->top); } checkGLcall("glScissor"); }

1 0

Stefan Dösinger : wined3d: Retrieve the height properly when setting the viewport.
by Alexandre Julliard Dec. 4, 2007

Dec. 4, 2007

Module: wine Branch: master Commit: fcb49934d0f4a521f5a8c2df2a19433c6fb3a47f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb49934d0f4a521f5a8c2df2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 30 21:01:29 2007 +0100 wined3d: Retrieve the height properly when setting the viewport. --- dlls/wined3d/state.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index cd801d7..9ff392c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3525,6 +3525,9 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W } static void viewport(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + UINT width, height; + IWineD3DSurfaceImpl *target; + glDepthRange(stateblock->viewport.MinZ, stateblock->viewport.MaxZ); checkGLcall("glDepthRange"); /* Note: GL requires lower left, DirectX supplies upper left. This is reversed when using offscreen rendering @@ -3534,8 +3537,11 @@ static void viewport(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon stateblock->viewport.Y, stateblock->viewport.Width, stateblock->viewport.Height); } else { + target = (IWineD3DSurfaceImpl *) stateblock->wineD3DDevice->render_targets[0]; + target->get_drawable_size(target, &width, &height); + glViewport(stateblock->viewport.X, - (((IWineD3DSurfaceImpl *)stateblock->wineD3DDevice->render_targets[0])->currentDesc.Height - (stateblock->viewport.Y + stateblock->viewport.Height)), + (height - (stateblock->viewport.Y + stateblock->viewport.Height)), stateblock->viewport.Width, stateblock->viewport.Height); }

1 0

Jonathan Ernst : browseui: Updated French translation.
by Alexandre Julliard Dec. 4, 2007

Dec. 4, 2007

Module: wine Branch: master Commit: 4723cf938b5c837428e9473b0339cf37741543ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4723cf938b5c837428e9473b0… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Dec 3 17:54:40 2007 +0100 browseui: Updated French translation. --- dlls/browseui/rsrc.rc | 1 + dlls/browseui/rsrc_Fr.rc | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc index a3d78ba..9bc248c 100644 --- a/dlls/browseui/rsrc.rc +++ b/dlls/browseui/rsrc.rc @@ -25,4 +25,5 @@ #include "version.rc" #include "rsrc_En.rc" +#include "rsrc_Fr.rc" #include "rsrc_Ko.rc" diff --git a/dlls/browseui/rsrc_Fr.rc b/dlls/browseui/rsrc_Fr.rc new file mode 100644 index 0000000..85bca2f --- /dev/null +++ b/dlls/browseui/rsrc_Fr.rc @@ -0,0 +1,38 @@ +/* + * Copyright 2007 Jonathan Ernst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CANCELLING "Annulation..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "&Annuler", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +}

1 0