April 2011 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Don' t bother unsetting texture resources in IWineD3DDeviceImpl_Uninit3D().
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: e30a05748722c0d9d8dc1bd0c6a2e70781463a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30a05748722c0d9d8dc1bd0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 00:07:58 2011 +0200 wined3d: Don't bother unsetting texture resources in IWineD3DDeviceImpl_Uninit3D(). Releasing the stateblock already takes care of this. --- dlls/wined3d/device.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c1ac76..8c443fe 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2136,7 +2136,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface) const struct wined3d_gl_info *gl_info; struct IWineD3DSurfaceImpl *surface; struct wined3d_context *context; - int sampler; UINT i; TRACE("(%p)\n", This); @@ -2174,13 +2173,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface) This->cursorTexture = 0; } - for (sampler = 0; sampler < MAX_FRAGMENT_SAMPLERS; ++sampler) { - IWineD3DDevice_SetTexture(iface, sampler, NULL); - } - for (sampler = 0; sampler < MAX_VERTEX_SAMPLERS; ++sampler) { - IWineD3DDevice_SetTexture(iface, WINED3DVERTEXTEXTURESAMPLER0 + sampler, NULL); - } - /* Destroy the depth blt resources, they will be invalid after the reset. Also free shader * private data, it might contain opengl pointers */

1 0

Henri Verbeet : ddraw: Verify the viewport belongs to the device in IDirect3DDeviceImpl_3_SetCurrentViewport ().
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 9edeb22c345904daa68b8d99b3d4530c11c6345c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9edeb22c345904daa68b8d99b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 00:07:59 2011 +0200 ddraw: Verify the viewport belongs to the device in IDirect3DDeviceImpl_3_SetCurrentViewport(). --- dlls/ddraw/device.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2c85659..80ee926 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1742,7 +1742,12 @@ IDirect3DDeviceImpl_3_SetCurrentViewport(IDirect3DDevice3 *iface, return D3D_OK; } - /* Should check if the viewport was added or not */ + if (vp->active_device != This) + { + WARN("Viewport %p active device is %p.\n", vp, vp->active_device); + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; + } /* Release previous viewport and AddRef the new one */ if (This->current_viewport) @@ -1757,7 +1762,6 @@ IDirect3DDeviceImpl_3_SetCurrentViewport(IDirect3DDevice3 *iface, This->current_viewport = vp; /* Activate this viewport */ - This->current_viewport->active_device = This; viewport_activate(This->current_viewport, FALSE); LeaveCriticalSection(&ddraw_cs);

1 0

Henri Verbeet : ddraw: Verify the viewport belongs to the device on execute buffer execution.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: d429aaa9e9d03e644914ae7fad4f3bef82f8f8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d429aaa9e9d03e644914ae7fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 00:08:00 2011 +0200 ddraw: Verify the viewport belongs to the device on execute buffer execution. --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 5 +++-- dlls/ddraw/executebuffer.c | 16 +++++++++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a6cab70..5cc09dd 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -515,8 +515,8 @@ HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer, IDirect3DDeviceImpl *device, D3DEXECUTEBUFFERDESC *desc) DECLSPEC_HIDDEN; /* The execute function */ -void IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, - IDirect3DDeviceImpl *Device, IDirect3DViewportImpl *ViewportImpl) DECLSPEC_HIDDEN; +HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *execute_buffer, + IDirect3DDeviceImpl *device, IDirect3DViewportImpl *viewport) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVertexBuffer diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 80ee926..984afc3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -718,6 +718,7 @@ IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, IDirect3DDeviceImpl *This = device_from_device1(iface); IDirect3DExecuteBufferImpl *Direct3DExecuteBufferImpl = (IDirect3DExecuteBufferImpl *)ExecuteBuffer; IDirect3DViewportImpl *Direct3DViewportImpl = (IDirect3DViewportImpl *)Viewport; + HRESULT hr; TRACE("iface %p, buffer %p, viewport %p, flags %#x.\n", iface, ExecuteBuffer, Viewport, Flags); @@ -726,10 +727,10 @@ IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, /* Execute... */ EnterCriticalSection(&ddraw_cs); - IDirect3DExecuteBufferImpl_Execute(Direct3DExecuteBufferImpl, This, Direct3DViewportImpl); + hr = d3d_execute_buffer_execute(Direct3DExecuteBufferImpl, This, Direct3DViewportImpl); LeaveCriticalSection(&ddraw_cs); - return D3D_OK; + return hr; } /***************************************************************************** diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index d4d2dd0..070cdc7 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -68,10 +68,8 @@ static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) { * Viewport: Viewport for this operation * *****************************************************************************/ -void -IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, - IDirect3DDeviceImpl *lpDevice, - IDirect3DViewportImpl *lpViewport) +HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This, + IDirect3DDeviceImpl *lpDevice, IDirect3DViewportImpl *lpViewport) { /* DWORD bs = This->desc.dwBufferSize; */ DWORD vs = This->data.dwVertexOffset; @@ -81,10 +79,14 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, char *instr = (char *)This->desc.lpData + is; - /* Should check if the viewport was added or not to the device */ + if (lpViewport->active_device != lpDevice) + { + WARN("Viewport %p active device is %p.\n", + lpViewport, lpViewport->active_device); + return DDERR_INVALIDPARAMS; + } /* Activate the viewport */ - lpViewport->active_device = lpDevice; viewport_activate(lpViewport, FALSE); TRACE("ExecuteData :\n"); @@ -551,7 +553,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, } end_of_buffer: - ; + return D3D_OK; } /*****************************************************************************

1 0

Jacek Caban : shdocvw: Properly handle IEDocHost refcount.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: ef9bb15192a9b3919bc23e68842306abb7835121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9bb15192a9b3919bc23e688… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 10:35:11 2011 +0200 shdocvw: Properly handle IEDocHost refcount. --- dlls/shdocvw/ie.c | 4 +++- dlls/shdocvw/iexplore.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 491f025..757cbb5 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -81,8 +81,10 @@ static ULONG WINAPI InternetExplorer_Release(IWebBrowser2 *iface) if(!ref) { if(This->doc_host) { DocHost_Release(&This->doc_host->doc_host); - if(This->doc_host) + if(This->doc_host) { This->doc_host->ie = NULL; + This->doc_host->doc_host.container_vtbl->release(&This->doc_host->doc_host); + } } if(This->frame_hwnd) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index aebe7c9..f079e62 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -718,7 +718,7 @@ static ULONG IEDocHost_release(DocHost *iface) if(!ref) { if(This->ie) - This->ie->doc_host = NULL; + ERR("This->ie is not NULL\n"); heap_free(This); } @@ -777,6 +777,7 @@ static HRESULT create_ie(InternetExplorer **ret_obj) } ret->ref = 1; + ret->doc_host->ref = 1; ret->doc_host->ie = ret; DocHost_Init(&ret->doc_host->doc_host, (IDispatch*)&ret->IWebBrowser2_iface, &DocHostContainerVtbl);

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTechnique().
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 6f824e171c27dadb3ea428cac61061d07c690dbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f824e171c27dadb3ea428cac… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:48 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetTechnique(). --- dlls/d3dx9_36/effect.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d35978c..f11b755 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -589,9 +589,17 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechnique(ID3DXBaseEffect *iface { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - FIXME("iface %p, index %u stub\n", This, index); + TRACE("iface %p, index %u\n", This, index); - return NULL; + if (index >= This->technique_count) + { + WARN("Invalid argument specified.\n"); + return NULL; + } + + TRACE("Returning technique %p\n", This->technique_handles[index]); + + return This->technique_handles[index]; } static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechniqueByName(ID3DXBaseEffect *iface, LPCSTR name)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTechniqueByName().
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: fa608e247a114a266e7eff213d8eda9b2451612a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa608e247a114a266e7eff213… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:53 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetTechniqueByName(). --- dlls/d3dx9_36/effect.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f11b755..fefb3b4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -605,8 +605,28 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechnique(ID3DXBaseEffect *iface static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechniqueByName(ID3DXBaseEffect *iface, LPCSTR name) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + unsigned int i; - FIXME("iface %p, name %s stub\n", This, debugstr_a(name)); + TRACE("iface %p, name %s stub\n", This, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified.\n"); + return NULL; + } + + for (i = 0; i < This->technique_count; ++i) + { + struct d3dx_technique *tech = get_technique_struct(This->technique_handles[i]); + + if (!strcmp(tech->name, name)) + { + TRACE("Returning technique %p\n", This->technique_handles[i]); + return This->technique_handles[i]; + } + } + + WARN("Invalid argument specified.\n"); return NULL; }

1 0

Huw Davies : gdi32: Clip solid brush fills.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 402f200c874f9a4b6f8c2ae8d60f0d98b3943727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402f200c874f9a4b6f8c2ae8d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 16:25:58 2011 +0100 gdi32: Clip solid brush fills. --- dlls/gdi32/dibdrv/objects.c | 40 ++++++++++++++----- dlls/gdi32/tests/dib.c | 88 +++++++++++++++++++++++++++++++----------- 2 files changed, 94 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 2d006aa..c8fb7fe 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -275,20 +275,38 @@ COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) */ static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) { - int i; - DC *dc = get_dibdrv_dc( &pdev->dev ); - - if(get_clip_region(dc)) return FALSE; + int i, j; + const WINEREGION *clip = get_wine_region(pdev->clip); - for(i = 0; i < num; i++) /* simple clip to extents */ + for(i = 0; i < num; i++) { - if(rects[i].left < dc->vis_rect.left) rects[i].left = dc->vis_rect.left; - if(rects[i].top < dc->vis_rect.top) rects[i].top = dc->vis_rect.top; - if(rects[i].right > dc->vis_rect.right) rects[i].right = dc->vis_rect.right; - if(rects[i].bottom > dc->vis_rect.bottom) rects[i].bottom = dc->vis_rect.bottom; - } + for(j = 0; j < clip->numRects; j++) + { + RECT rect = rects[i]; + + /* Optimize unclipped case */ + if(clip->rects[j].top <= rect.top && clip->rects[j].bottom >= rect.bottom && + clip->rects[j].left <= rect.left && clip->rects[j].right >= rect.right) + { + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, pdev->brush_and, pdev->brush_xor); + break; + } + + if(clip->rects[j].top >= rect.bottom) break; + if(clip->rects[j].bottom <= rect.top) continue; + + if(clip->rects[j].right > rect.left && clip->rects[j].left < rect.right) + { + rect.left = max(rect.left, clip->rects[j].left); + rect.top = max(rect.top, clip->rects[j].top); + rect.right = min(rect.right, clip->rects[j].right); + rect.bottom = min(rect.bottom, clip->rects[j].bottom); - pdev->dib.funcs->solid_rects(&pdev->dib, num, rects, pdev->brush_and, pdev->brush_xor); + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, pdev->brush_and, pdev->brush_xor); + } + } + } + release_wine_region(pdev->clip); return TRUE; } diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 90eb008..784d8d5 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -78,9 +78,10 @@ static const char *sha1_graphics_a8r8g8b8[] = "a3cadd34d95d3d5cc23344f69aab1c2e55935fcf", "2426172d9e8fec27d9228088f382ef3c93717da9", "9e8f27ca952cdba01dbf25d07c34e86a7820c012", - "76343ceb04e6295e0560019249d3c0318a23c8a6", - "6ecee6ba1c06dcb6b70ff42a8ea2df7803847860", "17b2c177bdce5e94433574a928bda5c94a8cdfa5", + "fe6cc678fb13a3ead67839481bf22348adc69f52", + "d51bd330cec510cdccf5394328bd8e5411901e9e", + "f2af53dd073a09b1031d0032d28da35c82adc566", NULL }; @@ -144,7 +145,7 @@ static void compare_hash(BITMAPINFO *bmi, BYTE *bits, const char ***sha1, const bmi->bmiHeader.biBitCount, info, **sha1, hash); (*sha1)++; } - else trace("\"%s\",\n", hash); + else ok(**sha1 != NULL, "missing hash, got \"%s\",\n", hash); HeapFree(GetProcessHeap(), 0, hash); } @@ -161,7 +162,11 @@ static const RECT hline_clips[] = {120, 99, 140, 99}, /* t edgecase clipped */ {120, 199, 140, 199}, /* b edgecase */ {120, 200, 140, 200}, /* b edgecase clipped */ - {120, 132, 310, 132} /* inside two clip rects */ + {120, 132, 310, 132}, /* inside two clip rects */ + { 10, 134, 101, 134}, /* r end on l edgecase */ + { 10, 136, 100, 136}, /* r end on l edgecase clipped */ + {199, 138, 220, 138}, /* l end on r edgecase */ + {200, 140, 220, 200} /* l end on r edgecase clipped */ }; static const RECT vline_clips[] = @@ -176,7 +181,32 @@ static const RECT vline_clips[] = {126, 99, 126, 140}, /* t edgecase clipped */ {128, 120, 128, 200}, /* b edgecase */ {130, 120, 130, 201}, /* b edgecase clipped */ - {132, 12, 132, 140} /* inside two clip rects */ + {132, 12, 132, 140}, /* inside two clip rects */ + {134, 90, 134, 101}, /* b end on t edgecase */ + {136, 90, 136, 100}, /* b end on t edgecase clipped */ + {138, 199, 138, 220}, /* t end on b edgecase */ + {140, 200, 140, 220} /* t end on b edgecase clipped */ +}; + +static const RECT patblt_clips[] = +{ + {120, 120, 140, 126}, /* unclipped */ + {100, 130, 140, 136}, /* l edgecase */ + { 99, 140, 140, 146}, /* l edgecase clipped */ + {180, 130, 200, 136}, /* r edgecase */ + {180, 140, 201, 146}, /* r edgecase clipped */ + {120, 100, 130, 110}, /* t edgecase */ + {140, 99, 150, 110}, /* t edgecase clipped */ + {120, 180, 130, 200}, /* b edgecase */ + {140, 180, 150, 201}, /* b edgecase */ + {199, 150, 210, 156}, /* l edge on r edgecase */ + {200, 160, 210, 166}, /* l edge on r edgecase clipped */ + { 90, 150, 101, 156}, /* r edge on l edgecase */ + { 90, 160, 100, 166}, /* r edge on l edgecase clipped */ + {160, 90, 166, 101}, /* b edge on t edgecase */ + {170, 90, 176, 101}, /* b edge on t edgecase clipped */ + {160, 199, 166, 210}, /* t edge on b edgecase */ + {170, 200, 176, 210}, /* t edge on b edgecase clipped */ }; static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) @@ -221,6 +251,29 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "diagonal solid lines"); memset(bits, 0xcc, dib_size); + /* solid brush PatBlt */ + solid_brush = CreateSolidBrush(RGB(0x33, 0xaa, 0xff)); + orig_brush = SelectObject(hdc, solid_brush); + + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + ret = PatBlt(hdc, 10, y, 100, 10, rop3[i]); + + if(rop_uses_src(rop3[i])) + ok(ret == FALSE, "got TRUE for %x\n", rop3[i]); + else + { + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 20; + } + + } + compare_hash(bmi, bits, sha1, "solid patblt"); + memset(bits, 0xcc, dib_size); + + /* clipped lines */ hrgn = CreateRectRgn(10, 10, 200, 20); hrgn2 = CreateRectRgn(100, 100, 200, 200); CombineRgn(hrgn, hrgn, hrgn2, RGN_OR); @@ -246,27 +299,16 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "clipped solid vlines"); memset(bits, 0xcc, dib_size); - ExtSelectClipRgn(hdc, NULL, RGN_COPY); - - solid_brush = CreateSolidBrush(RGB(0x33, 0xaa, 0xff)); - orig_brush = SelectObject(hdc, solid_brush); - - for(i = 0, y = 10; i < 256; i++) + for(i = 0; i < sizeof(patblt_clips) / sizeof(patblt_clips[0]); i++) { - BOOL ret; - - ret = PatBlt(hdc, 10, y, 100, 10, rop3[i]); + PatBlt(hdc, patblt_clips[i].left, patblt_clips[i].top, + patblt_clips[i].right - patblt_clips[i].left, + patblt_clips[i].bottom - patblt_clips[i].top, PATCOPY); + } + compare_hash(bmi, bits, sha1, "clipped patblt"); - if(rop_uses_src(rop3[i])) - ok(ret == FALSE, "got TRUE for %x\n", rop3[i]); - else - { - ok(ret, "got FALSE for %x\n", rop3[i]); - y += 20; - } + ExtSelectClipRgn(hdc, NULL, RGN_COPY); - } - compare_hash(bmi, bits, sha1, "solid patblt"); SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen);

1 0

Huw Davies : gdi32: Make sure that pattern brush bitmap' s are created with the correct physdev.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 94fbcd7ce286ee7c88d1a2ee0e02b9f1e7a4f4d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94fbcd7ce286ee7c88d1a2ee0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 18 11:23:27 2011 +0100 gdi32: Make sure that pattern brush bitmap's are created with the correct physdev. --- dlls/gdi32/brush.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index a1d22fc..781e446 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -390,7 +390,15 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); if (brush->logbrush.lbStyle == BS_PATTERN) - BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, physdev ); + { + PHYSDEV pattern_dev = physdev; + /* FIXME: This will go away once the dib driver implements + pattern brushes */ + if(pattern_dev == &dc->dibdrv.dev) + pattern_dev = GET_NEXT_PHYSDEV( physdev, pSelectBrush ); + + BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, pattern_dev ); + } GDI_inc_ref_count( handle ); GDI_ReleaseObj( handle );

1 0

Alexandre Julliard : server: Check sharing options when duplicating an fd object.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 35431ed0e7dece8676f5b4c01cbedbf7dee3df6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35431ed0e7dece8676f5b4c01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 18 13:41:32 2011 +0200 server: Check sharing options when duplicating an fd object. --- server/fd.c | 92 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 48 insertions(+), 44 deletions(-) diff --git a/server/fd.c b/server/fd.c index e0ec708..1743952 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1471,6 +1471,48 @@ static void fd_destroy( struct object *obj ) } } +/* check if the desired access is possible without violating */ +/* the sharing mode of other opens of the same file */ +static unsigned int check_sharing( struct fd *fd, unsigned int access, unsigned int sharing, + unsigned int open_flags, unsigned int options ) +{ + unsigned int existing_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + unsigned int existing_access = 0; + struct list *ptr; + + fd->access = access; + fd->sharing = sharing; + + LIST_FOR_EACH( ptr, &fd->inode->open ) + { + struct fd *fd_ptr = LIST_ENTRY( ptr, struct fd, inode_entry ); + if (fd_ptr != fd) + { + /* if access mode is 0, sharing mode is ignored */ + if (fd_ptr->access) existing_sharing &= fd_ptr->sharing; + existing_access |= fd_ptr->access; + } + } + + if (((access & FILE_UNIX_READ_ACCESS) && !(existing_sharing & FILE_SHARE_READ)) || + ((access & FILE_UNIX_WRITE_ACCESS) && !(existing_sharing & FILE_SHARE_WRITE)) || + ((access & DELETE) && !(existing_sharing & FILE_SHARE_DELETE))) + return STATUS_SHARING_VIOLATION; + if (((existing_access & FILE_MAPPING_WRITE) && !(sharing & FILE_SHARE_WRITE)) || + ((existing_access & FILE_MAPPING_IMAGE) && (access & FILE_UNIX_WRITE_ACCESS))) + return STATUS_SHARING_VIOLATION; + if ((existing_access & FILE_MAPPING_IMAGE) && (options & FILE_DELETE_ON_CLOSE)) + return STATUS_CANNOT_DELETE; + if ((existing_access & FILE_MAPPING_ACCESS) && (open_flags & O_TRUNC)) + return STATUS_USER_MAPPED_FILE; + if (!access) return 0; /* if access mode is 0, sharing mode is ignored (except for mappings) */ + if (((existing_access & FILE_UNIX_READ_ACCESS) && !(sharing & FILE_SHARE_READ)) || + ((existing_access & FILE_UNIX_WRITE_ACCESS) && !(sharing & FILE_SHARE_WRITE)) || + ((existing_access & DELETE) && !(sharing & FILE_SHARE_DELETE))) + return STATUS_SHARING_VIOLATION; + return 0; +} + /* set the events that select waits for on this fd */ void set_fd_events( struct fd *fd, int events ) { @@ -1581,13 +1623,12 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use /* duplicate an fd object for a different user */ struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sharing, unsigned int options ) { + unsigned int err; struct fd *fd = alloc_fd_object(); if (!fd) return NULL; - fd->access = access; fd->options = options; - fd->sharing = sharing; fd->cacheable = orig->cacheable; if (orig->unix_name) @@ -1611,6 +1652,11 @@ struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sha fd->closed = closed; fd->inode = (struct inode *)grab_object( orig->inode ); list_add_head( &fd->inode->open, &fd->inode_entry ); + if ((err = check_sharing( fd, access, sharing, 0, options ))) + { + set_error( err ); + goto failed; + } } else if ((fd->unix_fd = dup( orig->unix_fd )) == -1) { @@ -1630,48 +1676,6 @@ void set_no_fd_status( struct fd *fd, unsigned int status ) fd->no_fd_status = status; } -/* check if the desired access is possible without violating */ -/* the sharing mode of other opens of the same file */ -static unsigned int check_sharing( struct fd *fd, unsigned int access, unsigned int sharing, - unsigned int open_flags, unsigned int options ) -{ - unsigned int existing_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; - unsigned int existing_access = 0; - struct list *ptr; - - fd->access = access; - fd->sharing = sharing; - - LIST_FOR_EACH( ptr, &fd->inode->open ) - { - struct fd *fd_ptr = LIST_ENTRY( ptr, struct fd, inode_entry ); - if (fd_ptr != fd) - { - /* if access mode is 0, sharing mode is ignored */ - if (fd_ptr->access) existing_sharing &= fd_ptr->sharing; - existing_access |= fd_ptr->access; - } - } - - if (((access & FILE_UNIX_READ_ACCESS) && !(existing_sharing & FILE_SHARE_READ)) || - ((access & FILE_UNIX_WRITE_ACCESS) && !(existing_sharing & FILE_SHARE_WRITE)) || - ((access & DELETE) && !(existing_sharing & FILE_SHARE_DELETE))) - return STATUS_SHARING_VIOLATION; - if (((existing_access & FILE_MAPPING_WRITE) && !(sharing & FILE_SHARE_WRITE)) || - ((existing_access & FILE_MAPPING_IMAGE) && (access & FILE_SHARE_WRITE))) - return STATUS_SHARING_VIOLATION; - if ((existing_access & FILE_MAPPING_IMAGE) && (options & FILE_DELETE_ON_CLOSE)) - return STATUS_CANNOT_DELETE; - if ((existing_access & FILE_MAPPING_ACCESS) && (open_flags & O_TRUNC)) - return STATUS_USER_MAPPED_FILE; - if (!access) return 0; /* if access mode is 0, sharing mode is ignored (except for mappings) */ - if (((existing_access & FILE_UNIX_READ_ACCESS) && !(sharing & FILE_SHARE_READ)) || - ((existing_access & FILE_UNIX_WRITE_ACCESS) && !(sharing & FILE_SHARE_WRITE)) || - ((existing_access & DELETE) && !(sharing & FILE_SHARE_DELETE))) - return STATUS_SHARING_VIOLATION; - return 0; -} - /* sets the user of an fd that previously had no user */ void set_fd_user( struct fd *fd, const struct fd_ops *user_ops, struct object *user ) {

1 0

Alexandre Julliard : server: Add support for opening a new file handle from a mapping object.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: eb2fe39d63dfd6fe0ad7a11f55657f42cabff070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2fe39d63dfd6fe0ad7a11f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 18 13:41:54 2011 +0200 server: Add support for opening a new file handle from a mapping object. --- server/file.c | 25 +++++++++++++++++++++++++ server/file.h | 9 +++++++++ server/mapping.c | 25 +++++++++++++++++++++---- server/object.h | 4 ---- 4 files changed, 55 insertions(+), 8 deletions(-) diff --git a/server/file.c b/server/file.c index 8cf474b..ce95576 100644 --- a/server/file.c +++ b/server/file.c @@ -141,6 +141,31 @@ struct file *create_file_for_fd( int fd, unsigned int access, unsigned int shari return file; } +/* create a file by duplicating an fd object */ +struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigned int sharing ) +{ + struct file *file; + struct stat st; + + if (fstat( get_unix_fd(fd), &st ) == -1) + { + file_set_error(); + return NULL; + } + + if ((file = alloc_object( &file_ops ))) + { + file->mode = st.st_mode; + file->access = default_fd_map_access( &file->obj, access ); + if (!(file->fd = dup_fd_object( fd, access, sharing, FILE_SYNCHRONOUS_IO_NONALERT ))) + { + release_object( file ); + return NULL; + } + } + return file; +} + static struct object *create_file_obj( struct fd *fd, unsigned int access, mode_t mode ) { struct file *file = alloc_object( &file_ops ); diff --git a/server/file.h b/server/file.h index 26290a3..772c9b8 100644 --- a/server/file.h +++ b/server/file.h @@ -116,11 +116,20 @@ extern struct file *get_file_obj( struct process *process, obj_handle_t handle, extern int get_file_unix_fd( struct file *file ); extern int is_same_file( struct file *file1, struct file *file2 ); extern struct file *create_file_for_fd( int fd, unsigned int access, unsigned int sharing ); +extern struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigned int sharing ); extern struct file *grab_file_unless_removable( struct file *file ); extern void file_set_error(void); extern struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID *group ); extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ); +/* file mapping functions */ + +extern struct mapping *get_mapping_obj( struct process *process, obj_handle_t handle, + unsigned int access ); +extern obj_handle_t open_mapping_file( struct process *process, struct mapping *mapping, + unsigned int access, unsigned int sharing ); +extern int get_page_size(void); + /* change notification functions */ extern void do_change_notify( int unix_fd ); diff --git a/server/mapping.c b/server/mapping.c index 5c77989..01622e8 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -565,6 +565,24 @@ static struct object *create_mapping( struct directory *root, const struct unico return NULL; } +struct mapping *get_mapping_obj( struct process *process, obj_handle_t handle, unsigned int access ) +{ + return (struct mapping *)get_handle_obj( process, handle, access, &mapping_ops ); +} + +/* open a new file handle to the file backing the mapping */ +obj_handle_t open_mapping_file( struct process *process, struct mapping *mapping, + unsigned int access, unsigned int sharing ) +{ + obj_handle_t handle; + struct file *file = create_file_for_fd_obj( mapping->fd, access, sharing ); + + if (!file) return 0; + handle = alloc_handle( process, file, access, 0 ); + release_object( file ); + return handle; +} + static void mapping_dump( struct object *obj, int verbose ) { struct mapping *mapping = (struct mapping *)obj; @@ -682,8 +700,7 @@ DECL_HANDLER(get_mapping_info) struct mapping *mapping; struct fd *fd; - if ((mapping = (struct mapping *)get_handle_obj( current->process, req->handle, - req->access, &mapping_ops ))) + if ((mapping = get_mapping_obj( current->process, req->handle, req->access ))) { reply->size = mapping->size; reply->protect = mapping->protect; @@ -713,7 +730,7 @@ DECL_HANDLER(get_mapping_committed_range) { struct mapping *mapping; - if ((mapping = (struct mapping *)get_handle_obj( current->process, req->handle, 0, &mapping_ops ))) + if ((mapping = get_mapping_obj( current->process, req->handle, 0 ))) { if (!(req->offset & page_mask) && req->offset < mapping->size) reply->committed = find_committed_range( mapping, req->offset, &reply->size ); @@ -729,7 +746,7 @@ DECL_HANDLER(add_mapping_committed_range) { struct mapping *mapping; - if ((mapping = (struct mapping *)get_handle_obj( current->process, req->handle, 0, &mapping_ops ))) + if ((mapping = get_mapping_obj( current->process, req->handle, 0 ))) { if (!(req->size & page_mask) && !(req->offset & page_mask) && diff --git a/server/object.h b/server/object.h index 172c3f7..a8cb327 100644 --- a/server/object.h +++ b/server/object.h @@ -180,10 +180,6 @@ extern void generate_debug_event( struct thread *thread, int code, const void *a extern void generate_startup_debug_events( struct process *process, client_ptr_t entry ); extern void debug_exit_thread( struct thread *thread ); -/* mapping functions */ - -extern int get_page_size(void); - /* registry functions */ extern unsigned int get_prefix_cpu_mask(void);

1 0