January 2010 - Wine-commits

Vincent Povirk : gdiplus: Reset the lock count when unlocking a bitmap in write mode.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 7afd9603b5c2cb452484f2d07ef3839d60dbd94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afd9603b5c2cb452484f2d07… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 1 14:55:54 2010 -0600 gdiplus: Reset the lock count when unlocking a bitmap in write mode. --- dlls/gdiplus/image.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 41030ed..9227751 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -578,6 +578,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, { /* we passed a direct reference; no need to do anything */ bitmap->lockmode = 0; + bitmap->numlocks = 0; return Ok; } @@ -608,6 +609,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, GdipFree(bitmap->bitmapbits); bitmap->bitmapbits = NULL; bitmap->lockmode = 0; + bitmap->numlocks = 0; return Ok; }

1 0

Marcus Meissner : krnl386.exe: Removed unused owner_exists variable ( Coverity).
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: b53b7f1ec3f5286c3e855baccb25e3d48030a2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53b7f1ec3f5286c3e855bacc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 3 13:33:56 2010 +0100 krnl386.exe: Removed unused owner_exists variable (Coverity). --- dlls/krnl386.exe16/ne_module.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 08ed94c..15d43bf 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -967,7 +967,6 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ const char *file_name = NULL; char dllname[32], *p; const char *basename, *main_module; - int owner_exists = FALSE; /* strip path information */ @@ -1042,7 +1041,6 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ TRACE("Trying native dll '%s'\n", libname); hinst = NE_LoadModule(libname, lib_only); if (hinst > 32) TRACE_(loaddll)("Loaded module %s : native\n", debugstr_a(libname)); - if (hinst == ERROR_FILE_NOT_FOUND && owner_exists) hinst = 21; /* win32 module */ } if (hinst > 32 && !implicit)

1 0

Marcus Meissner : kernel32: Check if buffer is NULL before derefencing it ( Coverity).
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: a55399f5b65942a4959b1b5aeab34a47192be7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55399f5b65942a4959b1b5ae… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 3 14:46:07 2010 +0100 kernel32: Check if buffer is NULL before derefencing it (Coverity). --- dlls/kernel32/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index b5f7c0f..26c6736 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1171,7 +1171,7 @@ INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, retW = GetPrivateProfileStringW( sectionW.Buffer, entryW.Buffer, def_valW.Buffer, bufferW, len, filenameW.Buffer); - if (len) + if (len && buffer) { if (retW) {

1 0

Gerald Pfeifer : wined3d: Introduce WINED3DFMT_INST and use it in CheckTextureCapability().
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 0cf44ae02ef4f6169d28dd23beaf76719e8cc247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf44ae02ef4f6169d28dd23b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 3 17:23:43 2010 +0100 wined3d: Introduce WINED3DFMT_INST and use it in CheckTextureCapability(). --- dlls/wined3d/directx.c | 2 +- include/wine/wined3d.idl | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e0e6880..c4c272a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3124,7 +3124,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, * * With Shader Model 3.0 capable cards Instancing 'just works' in Windows. */ - case WINEMAKEFOURCC('I','N','S','T'): + case WINED3DFMT_INST: TRACE("ATI Instancing check hack\n"); if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_VERTEX_SHADER]) { diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 16ae443..c91437a 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -266,6 +266,7 @@ typedef enum _WINED3DFORMAT WINED3DFMT_G8R8_G8B8 = 0x42475247, /* GRGB */ WINED3DFMT_R8G8_B8G8 = 0x47424752, /* RGBG */ WINED3DFMT_ATI2N = 0x32495441, /* ATI2 */ + WINED3DFMT_INST = 0x54534e49, /* INST */ WINED3DFMT_NVHU = 0x5548564e, /* NVHU */ WINED3DFMT_NVHS = 0x5348564e, /* NVHS */

1 0

Henri Verbeet : wined3d: Add a geometry shader object.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 41401fb8cffb895b66648ed31fb5266e8121d665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41401fb8cffb895b66648ed31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:23 2010 +0100 wined3d: Add a geometry shader object. This is just the object used to store the byte code, the shader compiler doesn't know how to handle geometry shaders yet. --- dlls/wined3d/device.c | 31 +++++++++++++ dlls/wined3d/shader.c | 98 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 10 ++++ include/wine/wined3d.idl | 16 +++++++ 4 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d0660b4..78db960 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1181,6 +1181,36 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac return WINED3D_OK; } +static HRESULT WINAPI IWineD3DDeviceImpl_CreateGeometryShader(IWineD3DDevice *iface, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + IWineD3DGeometryShader **shader, IUnknown *parent, + const struct wined3d_parent_ops *parent_ops) +{ + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + struct wined3d_geometryshader *object; + HRESULT hr; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate shader memory.\n"); + return E_OUTOFMEMORY; + } + + hr = geometryshader_init(object, This, byte_code, output_signature, parent, parent_ops); + if (FAILED(hr)) + { + WARN("Failed to initialize geometry shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created geometry shader %p.\n", object); + *shader = (IWineD3DGeometryShader *)object; + + return WINED3D_OK; +} + static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface, const DWORD *pFunction, const struct wined3d_shader_signature *output_signature, IWineD3DPixelShader **ppPixelShader, IUnknown *parent, @@ -6804,6 +6834,7 @@ static const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_CreateVertexDeclaration, IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF, IWineD3DDeviceImpl_CreateVertexShader, + IWineD3DDeviceImpl_CreateGeometryShader, IWineD3DDeviceImpl_CreatePixelShader, IWineD3DDeviceImpl_CreatePalette, /*** Odd functions **/ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 01ddfe6..398ea64 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -400,6 +400,104 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * return WINED3D_OK; } +static HRESULT STDMETHODCALLTYPE geometryshader_QueryInterface(IWineD3DGeometryShader *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IWineD3DGeometryShader) + || IsEqualGUID(riid, &IID_IWineD3DBaseShader) + || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DGeometryShader *iface) +{ + struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; + ULONG refcount = InterlockedIncrement(&shader->base_shader.ref); + + TRACE("%p increasing refcount to %u.\n", shader, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DGeometryShader *iface) +{ + struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; + ULONG refcount = InterlockedDecrement(&shader->base_shader.ref); + + TRACE("%p decreasing refcount to %u.\n", shader, refcount); + + if (!refcount) + { + shader_cleanup((IWineD3DBaseShader *)iface); + shader->base_shader.parent_ops->wined3d_object_destroyed(shader->base_shader.parent); + HeapFree(GetProcessHeap(), 0, shader); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE geometryshader_GetParent(IWineD3DGeometryShader *iface, IUnknown **parent) +{ + TRACE("iface %p, parent %p.\n", iface, parent); + + shader_get_parent((IWineD3DBaseShaderImpl *)iface, parent); + + return WINED3D_OK; +} + +static HRESULT STDMETHODCALLTYPE geometryshader_GetFunction(IWineD3DGeometryShader *iface, void *data, UINT *data_size) +{ + TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size); + + return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); +} + +static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = +{ + /* IUnknown methods */ + geometryshader_QueryInterface, + geometryshader_AddRef, + geometryshader_Release, + /* IWineD3DBase methods */ + geometryshader_GetParent, + /* IWineD3DBaseShader methods */ + geometryshader_GetFunction, +}; + +HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + IUnknown *parent, const struct wined3d_parent_ops *parent_ops) +{ + HRESULT hr; + + shader->vtbl = &wined3d_geometryshader_vtbl; + shader_init(&shader->base_shader, device, parent, parent_ops); + + hr = shader_set_function((IWineD3DBaseShaderImpl *)shader, byte_code, output_signature, 0); + if (FAILED(hr)) + { + WARN("Failed to set function, hr %#x.\n", hr); + shader_cleanup((IWineD3DBaseShader *)shader); + return hr; + } + + shader->base_shader.load_local_constsF = FALSE; + + return WINED3D_OK; +} + static HRESULT STDMETHODCALLTYPE pixelshader_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3cb0942..e95cbdf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2749,6 +2749,16 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, IUnknown *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +struct wined3d_geometryshader +{ + const struct IWineD3DGeometryShaderVtbl *vtbl; + IWineD3DBaseShaderClass base_shader; +}; + +HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + IUnknown *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + /***************************************************************************** * IDirect3DPixelShader implementation structure */ diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7c44b5e..16ae443 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2844,6 +2844,15 @@ interface IWineD3DVertexShader : IWineD3DBaseShader [ object, local, + uuid(8276c113-388b-49d1-ad8b-c9dd8bcbabcd) +] +interface IWineD3DGeometryShader : IWineD3DBaseShader +{ +} + +[ + object, + local, uuid(818503da-6f30-11d9-c687-00046142c14f) ] interface IWineD3DPixelShader : IWineD3DBaseShader @@ -2981,6 +2990,13 @@ interface IWineD3DDevice : IWineD3DBase [in] IUnknown *parent, [in] const struct wined3d_parent_ops *parent_ops ); + HRESULT CreateGeometryShader( + [in] const DWORD *byte_code, + [in] const struct wined3d_shader_signature *output_signature, + [out] IWineD3DGeometryShader **shader, + [in] IUnknown *parent, + [in] const struct wined3d_parent_ops *parent_ops + ); HRESULT CreatePixelShader( [in] const DWORD *function, [in] const struct wined3d_shader_signature *output_signature,

1 0

Henri Verbeet : d3d10core: Add a wined3d geoemtry shader to struct d3d10_geometry_shader.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 73c6355d75b4cc0c415f02bfc6f4b6818fd0df35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c6355d75b4cc0c415f02bfc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:24 2010 +0100 d3d10core: Add a wined3d geoemtry shader to struct d3d10_geometry_shader. --- dlls/d3d10core/d3d10core_private.h | 6 ++++- dlls/d3d10core/device.c | 3 +- dlls/d3d10core/shader.c | 38 ++++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 058d8dc..d0bc584 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -168,9 +168,13 @@ struct d3d10_geometry_shader { const struct ID3D10GeometryShaderVtbl *vtbl; LONG refcount; + + IWineD3DGeometryShader *wined3d_shader; + struct wined3d_shader_signature output_signature; }; -HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader); +HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d10_device *device, + const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; /* ID3D10PixelShader */ struct d3d10_pixel_shader diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 39be2ef..191e681 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -848,6 +848,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10GeometryShader **shader) { + struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_geometry_shader *object; HRESULT hr; @@ -861,7 +862,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device return E_OUTOFMEMORY; } - hr = d3d10_geometry_shader_init(object); + hr = d3d10_geometry_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) { WARN("Failed to initialize geometry shader, hr %#x.\n", hr); diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index e8602b5..256f281 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -313,7 +313,7 @@ static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShade if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + IWineD3DGeometryShader_Release(This->wined3d_shader); } return refcount; @@ -365,11 +365,45 @@ static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = d3d10_geometry_shader_SetPrivateDataInterface, }; -HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader) +static void STDMETHODCALLTYPE d3d10_geometry_shader_wined3d_object_destroyed(void *parent) { + struct d3d10_geometry_shader *shader = parent; + shader_free_signature(&shader->output_signature); + HeapFree(GetProcessHeap(), 0, shader); +} + +static const struct wined3d_parent_ops d3d10_geometry_shader_wined3d_parent_ops = +{ + d3d10_geometry_shader_wined3d_object_destroyed, +}; + +HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d10_device *device, + const void *byte_code, SIZE_T byte_code_length) +{ + struct d3d10_shader_info shader_info; + HRESULT hr; + shader->vtbl = &d3d10_geometry_shader_vtbl; shader->refcount = 1; + shader_info.output_signature = &shader->output_signature; + hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); + if (FAILED(hr)) + { + ERR("Failed to extract shader, hr %#x.\n", hr); + return hr; + } + + hr = IWineD3DDevice_CreateGeometryShader(device->wined3d_device, + shader_info.shader_code, &shader->output_signature, &shader->wined3d_shader, + (IUnknown *)shader, &d3d10_geometry_shader_wined3d_parent_ops); + if (FAILED(hr)) + { + WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); + shader_free_signature(&shader->output_signature); + return hr; + } + return S_OK; }

1 0

Henri Verbeet : wined3d: Add support for source and destination rectangles to swapchain_blit().
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: b5907e23cc595de1f0aba2a615c8c4510b433d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5907e23cc595de1f0aba2a61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:25 2010 +0100 wined3d: Add support for source and destination rectangles to swapchain_blit(). --- dlls/wined3d/swapchain.c | 51 ++++++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 445fbbf..c6b0b01 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -96,19 +96,23 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) } /* A GL context is provided by the caller */ -static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *context) +static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *context, + const RECT *src_rect, const RECT *dst_rect) { - RECT window; IWineD3DDeviceImpl *device = This->device; IWineD3DSurfaceImpl *backbuffer = ((IWineD3DSurfaceImpl *) This->backBuffer[0]); - UINT w = backbuffer->currentDesc.Width; - UINT h = backbuffer->currentDesc.Height; + UINT src_w = src_rect->right - src_rect->left; + UINT src_h = src_rect->bottom - src_rect->top; GLenum gl_filter; const struct wined3d_gl_info *gl_info = context->gl_info; - GetClientRect(This->win_handle, &window); - if(w == window.right && h == window.bottom) gl_filter = GL_NEAREST; - else gl_filter = GL_LINEAR; + TRACE("swapchain %p, context %p, src_rect %s, dst_rect %s.\n", + This, context, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); + + if (src_w == dst_rect->right - dst_rect->left && src_h == dst_rect->bottom - dst_rect->top) + gl_filter = GL_NEAREST; + else + gl_filter = GL_LINEAR; if (gl_info->fbo_ops.glBlitFramebuffer) { @@ -124,8 +128,8 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co IWineD3DDeviceImpl_MarkStateDirty(This->device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); /* Note that the texture is upside down */ - gl_info->fbo_ops.glBlitFramebuffer(0, 0, w, h, - window.left, window.bottom, window.right, window.top, + gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, + dst_rect->left, dst_rect->bottom, dst_rect->right, dst_rect->top, GL_COLOR_BUFFER_BIT, gl_filter); checkGLcall("Swapchain present blit(EXT_framebuffer_blit)\n"); LEAVE_GL(); @@ -133,19 +137,19 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co else { struct wined3d_context *context2; - float tex_left = 0; - float tex_top = 0; - float tex_right = w; - float tex_bottom = h; + float tex_left = src_rect->left; + float tex_top = src_rect->top; + float tex_right = src_rect->right; + float tex_bottom = src_rect->bottom; context2 = context_acquire(This->device, This->backBuffer[0], CTXUSAGE_BLIT); if(backbuffer->Flags & SFLAG_NORMCOORD) { - tex_left /= w; - tex_right /= w; - tex_top /= h; - tex_bottom /= h; + tex_left /= src_w; + tex_right /= src_w; + tex_top /= src_h; + tex_bottom /= src_h; } ENTER_GL(); @@ -171,7 +175,7 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co * size - we want the GL drawable(=window) size. */ glPushAttrib(GL_VIEWPORT_BIT); - glViewport(window.left, window.top, window.right, window.bottom); + glViewport(dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom); glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity(); @@ -208,6 +212,7 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; struct wined3d_context *context; + RECT src_rect, dst_rect; unsigned int sync; int retval; @@ -316,7 +321,15 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO { FIXME("Render-to-fbo with WINED3DSWAPEFFECT_FLIP\n"); } - swapchain_blit(This, context); + + src_rect.left = 0; + src_rect.top = 0; + src_rect.right = This->presentParms.BackBufferWidth; + src_rect.bottom = This->presentParms.BackBufferHeight; + + GetClientRect(This->win_handle, &dst_rect); + + swapchain_blit(This, context, &src_rect, &dst_rect); } SwapBuffers(This->context[0]->hdc); /* TODO: cycle through the swapchain buffers */

1 0

Henri Verbeet : wined3d: Handle source and destination rectangles in IWineD3DSwapChainImpl_Present( ).
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: ce2c3ea6c74f7c28f0ec55e097d582b68c080d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2c3ea6c74f7c28f0ec55e09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:26 2010 +0100 wined3d: Handle source and destination rectangles in IWineD3DSwapChainImpl_Present(). --- dlls/wined3d/swapchain.c | 63 +++++++++++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c6b0b01..6493704 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -213,6 +213,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; struct wined3d_context *context; RECT src_rect, dst_rect; + BOOL render_to_fbo; unsigned int sync; int retval; @@ -271,8 +272,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSurface_BltFast(This->backBuffer[0], 0, 0, This->device->logo_surface, NULL, WINEDDBLTFAST_SRCCOLORKEY); } - if (pSourceRect || pDestRect) FIXME("Unhandled present rects %s/%s\n", wine_dbgstr_rect(pSourceRect), wine_dbgstr_rect(pDestRect)); - /* TODO: If only source rect or dest rect are supplied then clip the window to match */ TRACE("presetting HDC %p\n", This->context[0]->hdc); /* Don't call checkGLcall, as glGetError is not applicable here */ @@ -280,6 +279,36 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); } + render_to_fbo = This->render_to_fbo; + + if (pSourceRect) + { + src_rect = *pSourceRect; + if (!render_to_fbo && (src_rect.left || src_rect.top + || src_rect.right != This->presentParms.BackBufferWidth + || src_rect.bottom != This->presentParms.BackBufferHeight)) + { + render_to_fbo = TRUE; + } + } + else + { + src_rect.left = 0; + src_rect.top = 0; + src_rect.right = This->presentParms.BackBufferWidth; + src_rect.bottom = This->presentParms.BackBufferHeight; + } + + if (pDestRect) dst_rect = *pDestRect; + else GetClientRect(This->win_handle, &dst_rect); + + if (!render_to_fbo && (dst_rect.left || dst_rect.top + || dst_rect.right != This->presentParms.BackBufferWidth + || dst_rect.bottom != This->presentParms.BackBufferHeight)) + { + render_to_fbo = TRUE; + } + /* Rendering to a window of different size, presenting partial rectangles, * or rendering to a different window needs help from FBO_blit or a textured * draw. Render the swapchain to a FBO in the future. @@ -287,25 +316,14 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO * Note that FBO_blit from the backbuffer to the frontbuffer cannot solve * all these issues - this fails if the window is smaller than the backbuffer. */ - if(This->presentParms.Windowed && !This->render_to_fbo && - wined3d_settings.offscreen_rendering_mode == ORM_FBO) + if (!This->render_to_fbo && render_to_fbo && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - RECT window_size; - GetClientRect(This->win_handle, &window_size); - if(window_size.bottom != This->presentParms.BackBufferHeight || - window_size.right != This->presentParms.BackBufferWidth) - { - TRACE("Window size changed from %ux%u to %ux%u, switching to render-to-fbo mode\n", - This->presentParms.BackBufferWidth, This->presentParms.BackBufferHeight, - window_size.right, window_size.bottom); - - IWineD3DSurface_LoadLocation(This->backBuffer[0], SFLAG_INTEXTURE, NULL); - IWineD3DSurface_ModifyLocation(This->backBuffer[0], SFLAG_INDRAWABLE, FALSE); - This->render_to_fbo = TRUE; + IWineD3DSurface_LoadLocation(This->backBuffer[0], SFLAG_INTEXTURE, NULL); + IWineD3DSurface_ModifyLocation(This->backBuffer[0], SFLAG_INDRAWABLE, FALSE); + This->render_to_fbo = TRUE; - /* Force the context manager to update the render target configuration next draw */ - context->current_rt = NULL; - } + /* Force the context manager to update the render target configuration next draw. */ + context->current_rt = NULL; } if(This->render_to_fbo) @@ -322,13 +340,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO FIXME("Render-to-fbo with WINED3DSWAPEFFECT_FLIP\n"); } - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = This->presentParms.BackBufferWidth; - src_rect.bottom = This->presentParms.BackBufferHeight; - - GetClientRect(This->win_handle, &dst_rect); - swapchain_blit(This, context, &src_rect, &dst_rect); }

1 0

Jacek Caban : mshtml: Store ConnectionPointContainer pointer in ConnectionPoint.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: b0bb5e6a787f30ed1fa51a61d564f0efb5d4b7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0bb5e6a787f30ed1fa51a61d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:37:09 2010 +0100 mshtml: Store ConnectionPointContainer pointer in ConnectionPoint. --- dlls/mshtml/conpoint.c | 8 ++++---- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 0f49601..3d78827 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -89,13 +89,13 @@ static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) { ConnectionPoint *This = CONPOINT_THIS(iface); - return IConnectionPointContainer_AddRef(This->container); + return IConnectionPointContainer_AddRef(CONPTCONT(This->container)); } static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) { ConnectionPoint *This = CONPOINT_THIS(iface); - return IConnectionPointContainer_Release(This->container); + return IConnectionPointContainer_Release(CONPTCONT(This->container)); } static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) @@ -121,7 +121,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi if(!ppCPC) return E_POINTER; - *ppCPC = This->container; + *ppCPC = CONPTCONT(This->container); IConnectionPointContainer_AddRef(*ppCPC); return S_OK; } @@ -201,7 +201,7 @@ static const IConnectionPointVtbl ConnectionPointVtbl = void ConnectionPoint_Init(ConnectionPoint *cp, ConnectionPointContainer *container, REFIID riid, cp_static_data_t *data) { cp->lpConnectionPointVtbl = &ConnectionPointVtbl; - cp->container = CONPTCONT(container); + cp->container = container; cp->sinks = NULL; cp->sinks_size = 0; cp->iid = riid; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fcdb916..2df6a45 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -286,7 +286,7 @@ typedef struct ConnectionPointContainer { struct ConnectionPoint { const IConnectionPointVtbl *lpConnectionPointVtbl; - IConnectionPointContainer *container; + ConnectionPointContainer *container; union { IUnknown *unk;

1 0

Jacek Caban : mshtml: Make sure that event listeners of connection point are set.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 8c5baf3a09b2047e98010e138d34fa9bb183ed0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5baf3a09b2047e98010e138… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:37:47 2010 +0100 mshtml: Make sure that event listeners of connection point are set. --- dlls/mshtml/conpoint.c | 3 ++ dlls/mshtml/htmldoc.c | 12 +++++++++- dlls/mshtml/htmlevent.c | 50 ++++++++++++++++++++++++++--------------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/mshtml_private.h | 3 +- 5 files changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 3d78827..da775ad 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -159,6 +159,9 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * This->sinks[i].unk = sink; *pdwCookie = i+1; + if(!i && This->data && This->data->on_advise) + This->data->on_advise(This->container->outer, This->data); + return S_OK; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 732fd52..54d3ca3 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1466,6 +1466,16 @@ static const IHTMLDocument2Vtbl HTMLDocumentVtbl = { HTMLDocument_createStyleSheet }; +static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) +{ + HTMLDocument *This = HTMLDOC_THIS(iface); + + if(This->window) + update_cp_events(This->window, cp); +} + +#undef HTMLDOC_THIS + #define SUPPINFO_THIS(iface) DEFINE_THIS(HTMLDocument, SupportErrorInfo, iface) static HRESULT WINAPI SupportErrorInfo_QueryInterface(ISupportErrorInfo *iface, REFIID riid, void **ppv) @@ -1772,7 +1782,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) return TRUE; } -static cp_static_data_t HTMLDocumentEvents_data = { HTMLDocumentEvents_tid }; +static cp_static_data_t HTMLDocumentEvents_data = { HTMLDocumentEvents_tid, HTMLDocument_on_advise }; static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9b01f26..2e2f1c9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -782,13 +782,11 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid) return hres; } -static BOOL is_cp_event(ConnectionPoint *cp, DISPID dispid) +static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) { - cp_static_data_t *data; int min, max, i; HRESULT hres; - data = cp->data; if(!data) return FALSE; @@ -866,7 +864,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, IHTMLEventObj *event_obj, cp_container = cp_container->forward_container; for(cp = cp_container->cp_list; cp; cp = cp->next) { - if(cp->sinks_size && is_cp_event(cp, event_info[eid].dispid)) { + if(cp->sinks_size && is_cp_event(cp->data, event_info[eid].dispid)) { for(i=0; i < cp->sinks_size; i++) { TRACE("cp %s [%d] >>>\n", debugstr_w(event_info[eid].name), i); hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid); @@ -1019,6 +1017,25 @@ static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, in return TRUE; } +static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) +{ + if(!doc->nsdoc || !(event_info[eid].flags & EVENT_DEFAULTLISTENER)) + return S_OK; + + if(!doc->event_vector) { + doc->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); + if(!doc->event_vector) + return E_OUTOFMEMORY; + } + + if(!doc->event_vector[eid]) { + doc->event_vector[eid] = TRUE; + add_nsevent_listener(doc, event_info[eid].name); + } + + return S_OK; +} + static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLDocumentNode *doc, eventid_t eid, IDispatch *disp) { @@ -1039,20 +1056,7 @@ static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLDoc return S_OK; IDispatch_AddRef(disp); - if(doc->nsdoc && (event_info[eid].flags & EVENT_DEFAULTLISTENER)) { - if(!doc->event_vector) { - doc->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); - if(!doc->event_vector) - return E_OUTOFMEMORY; - } - - if(!doc->event_vector[eid]) { - doc->event_vector[eid] = TRUE; - add_nsevent_listener(doc, event_info[eid].name); - } - } - - return S_OK; + return ensure_nsevent_handler(doc, eid); } HRESULT set_event_handler(event_target_t **event_target, HTMLDocumentNode *doc, eventid_t eid, VARIANT *var) @@ -1123,6 +1127,16 @@ HRESULT attach_event(event_target_t **event_target_ptr, HTMLDocument *doc, BSTR return S_OK; } +void update_cp_events(HTMLWindow *window, cp_static_data_t *cp) +{ + int i; + + for(i=0; i < EVENTID_LAST; i++) { + if((event_info[i].flags & EVENT_DEFAULTLISTENER) && is_cp_event(cp, event_info[i].dispid)) + ensure_nsevent_handler(window->doc, i); + } +} + void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) { const PRUnichar *attr_value; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 5de023d..a0fb198 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -48,6 +48,7 @@ HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*); HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*); HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*); HRESULT call_event(HTMLDOMNode*,eventid_t); +void update_cp_events(HTMLWindow*,cp_static_data_t*); static inline event_target_t **get_node_event_target(HTMLDOMNode *node) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2df6a45..81cb3c8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -269,8 +269,9 @@ typedef enum { EDITMODE } USERMODE; -typedef struct { +typedef struct _cp_static_data_t { tid_t tid; + void (*on_advise)(IUnknown*,struct _cp_static_data_t*); DWORD id_cnt; DISPID *ids; } cp_static_data_t;

1 0