September 2009 - Wine-Commits

Henri Verbeet : d3d9: Add a separate function for texture initialization.
by Alexandre Julliard Sept. 17, 2009

Sept. 17, 2009

Module: wine Branch: master Commit: 75f005ebf97816548dfc4c67f1f08f2b0f0bb798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75f005ebf97816548dfc4c67f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 12:35:29 2009 +0200 d3d9: Add a separate function for texture initialization. --- dlls/d3d9/d3d9_private.h | 6 ++-- dlls/d3d9/device.c | 32 ++++++++++++++++++++++++++++ dlls/d3d9/texture.c | 51 +++++++++++++++------------------------------ 3 files changed, 52 insertions(+), 37 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index e373af8..e80d1a2 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -197,9 +197,6 @@ extern HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDe extern HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(IDirect3DDevice9Ex *iface, UINT iSwapChain, IDirect3DSwapChain9 **pSwapChain) DECLSPEC_HIDDEN; extern UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(IDirect3DDevice9Ex *iface, - UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, - IDirect3DTexture9 **ppTexture, HANDLE *pSharedHandle) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(IDirect3DDevice9Ex *iface, UINT Length, DWORD Usage, DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer9 **ppVertexBuffer, HANDLE *pSharedHandle) DECLSPEC_HIDDEN; @@ -441,6 +438,9 @@ typedef struct IDirect3DTexture9Impl LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DTexture9Impl; +HRESULT texture_init(IDirect3DTexture9Impl *texture, IDirect3DDevice9Impl *device, + UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; + /* ----------------------- */ /* IDirect3DVolumeTexture9 */ /* ----------------------- */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 06cfcee..7ddc0d6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -644,6 +644,38 @@ static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9EX iface, wined3d_mutex_unlock(); } +static HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(IDirect3DDevice9Ex *iface, + UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, + D3DPOOL pool, IDirect3DTexture9 **texture, HANDLE *shared_handle) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DTexture9Impl *object; + HRESULT hr; + + TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", + iface, width, height, levels, usage, format, pool, texture, shared_handle); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate texture memory.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + + hr = texture_init(object, This, width, height, levels, usage, format, pool); + if (FAILED(hr)) + { + WARN("Failed to initialize texture, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created texture %p.\n", object); + *texture = (IDirect3DTexture9 *)object; + + return D3D_OK; +} + static HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(IDirect3DDevice9Ex *iface, UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool, IDirect3DVolumeTexture9 **texture, HANDLE *shared_handle) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index ea1cde8..c3a3232 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -350,43 +350,26 @@ static const IDirect3DTexture9Vtbl Direct3DTexture9_Vtbl = IDirect3DTexture9Impl_AddDirtyRect }; +HRESULT texture_init(IDirect3DTexture9Impl *texture, IDirect3DDevice9Impl *device, + UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) +{ + HRESULT hr; -/* IDirect3DDevice9 IDirect3DTexture9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, UINT Levels, DWORD Usage, - D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9** ppTexture, HANDLE* pSharedHandle) { - IDirect3DTexture9Impl *object; - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hrc = D3D_OK; - - TRACE("(%p) : W(%d) H(%d), Lvl(%d) d(%d), Fmt(%#x), Pool(%d)\n", This, Width, Height, Levels, Usage, Format, Pool); - - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DTexture9Impl)); - - if (NULL == object) { - ERR("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } - - object->lpVtbl = &Direct3DTexture9_Vtbl; - object->ref = 1; + texture->lpVtbl = &Direct3DTexture9_Vtbl; + texture->ref = 1; wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreateTexture(This->WineD3DDevice, Width, Height, Levels, Usage & WINED3DUSAGE_MASK, - wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DTexture, (IUnknown *)object); + hr = IWineD3DDevice_CreateTexture(device->WineD3DDevice, width, height, levels, usage & WINED3DUSAGE_MASK, + wined3dformat_from_d3dformat(format), pool, &texture->wineD3DTexture, (IUnknown *)texture); wined3d_mutex_unlock(); - - if (FAILED(hrc)) + if (FAILED(hr)) { - /* free up object */ - WARN("(%p) call to IWineD3DDevice_CreateTexture failed\n", This); - HeapFree(GetProcessHeap(), 0, object); - } else { - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - *ppTexture= (LPDIRECT3DTEXTURE9) object; - TRACE("(%p) Created Texture %p, %p\n", This, object, object->wineD3DTexture); - } - - return hrc; + WARN("Failed to create wined3d texture, hr %#x.\n", hr); + return hr; + } + + texture->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(texture->parentDevice); + + return D3D_OK; }

1 0

Henri Verbeet : ddraw: Mark internal symbols hidden.
by Alexandre Julliard Sept. 17, 2009

Sept. 17, 2009

Module: wine Branch: master Commit: 6c8636c3375ecb22e5514645c15adba4396219a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8636c3375ecb22e5514645c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 12:35:28 2009 +0200 ddraw: Mark internal symbols hidden. --- dlls/ddraw/ddraw_private.h | 147 ++++++++++++++++++++----------------------- 1 files changed, 68 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c8636c3375ecb22e5514…

1 0

Henri Verbeet : wined3d: Get rid of the unused DeviceType parameter to select_shader_mode().
by Alexandre Julliard Sept. 17, 2009

Sept. 17, 2009

Module: wine Branch: master Commit: 4aaf47f27722f5b7bb722ff6cc21c2b1cd5d6458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aaf47f27722f5b7bb722ff6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 12:35:27 2009 +0200 wined3d: Get rid of the unused DeviceType parameter to select_shader_mode(). --- dlls/wined3d/directx.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6b92c0c..d2ffaed 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -377,11 +377,9 @@ static ULONG WINAPI IWineD3DImpl_Release(IWineD3D *iface) { return ref; } -/* Set the shader type for this device, depending on the given capabilities, - * the device type, and the user preferences in wined3d_settings */ - -static void select_shader_mode(const struct wined3d_gl_info *gl_info, - WINED3DDEVTYPE DeviceType, int *ps_selected, int *vs_selected) +/* Set the shader type for this device, depending on the given capabilities + * and the user preferences in wined3d_settings. */ +static void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) { if (wined3d_settings.vs_mode == VS_NONE) { *vs_selected = SHADER_NONE; @@ -2716,7 +2714,7 @@ static BOOL CheckSrgbWriteCapability(struct WineD3DAdapter *adapter, { int vs_selected_mode; int ps_selected_mode; - select_shader_mode(&adapter->gl_info, DeviceType, &ps_selected_mode, &vs_selected_mode); + select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); if((ps_selected_mode == SHADER_ARB) || (ps_selected_mode == SHADER_GLSL)) { TRACE_(d3d_caps)("[OK]\n"); @@ -3577,7 +3575,7 @@ static const shader_backend_t *select_shader_backend(struct WineD3DAdapter *adap int vs_selected_mode; int ps_selected_mode; - select_shader_mode(&adapter->gl_info, DeviceType, &ps_selected_mode, &vs_selected_mode); + select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) { ret = &glsl_shader_backend; } else if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) { @@ -3595,7 +3593,7 @@ static const struct fragment_pipeline *select_fragment_implementation(struct Win int vs_selected_mode; int ps_selected_mode; - select_shader_mode(&adapter->gl_info, DeviceType, &ps_selected_mode, &vs_selected_mode); + select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); if((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { return &arbfp_fragment_pipeline; } else if(ps_selected_mode == SHADER_ATI) { @@ -3615,7 +3613,7 @@ static const struct blit_shader *select_blit_implementation(struct WineD3DAdapte int vs_selected_mode; int ps_selected_mode; - select_shader_mode(&adapter->gl_info, DeviceType, &ps_selected_mode, &vs_selected_mode); + select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); if((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { return &arbfp_blit; } else { @@ -3645,7 +3643,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, return WINED3DERR_INVALIDCALL; } - select_shader_mode(&adapter->gl_info, DeviceType, &ps_selected_mode, &vs_selected_mode); + select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); /* This function should *not* be modifying GL caps * TODO: move the functionality where it belongs */ @@ -4263,8 +4261,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, object->adapterNo = Adapter; object->devType = DeviceType; - select_shader_mode(&adapter->gl_info, DeviceType, - &object->ps_selected_mode, &object->vs_selected_mode); + select_shader_mode(&adapter->gl_info, &object->ps_selected_mode, &object->vs_selected_mode); object->shader_backend = select_shader_backend(adapter, DeviceType); memset(&shader_caps, 0, sizeof(shader_caps)); @@ -4762,7 +4759,7 @@ BOOL InitAdapters(IWineD3DImpl *This) WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - select_shader_mode(&adapter->gl_info, WINED3DDEVTYPE_HAL, &ps_selected_mode, &vs_selected_mode); + select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); select_shader_max_constants(ps_selected_mode, vs_selected_mode, &adapter->gl_info); fillGLAttribFuncs(&adapter->gl_info); adapter->opengl = TRUE;

1 0

Henri Verbeet : wined3d: Get rid of some redundant checks for ORM_FBO.
by Alexandre Julliard Sept. 17, 2009

Sept. 17, 2009

Module: wine Branch: master Commit: 4ba16b84a9e60ffcc98fc4b4c303c975589b59e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba16b84a9e60ffcc98fc4b4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 12:35:26 2009 +0200 wined3d: Get rid of some redundant checks for ORM_FBO. ORM_FBO is already implied by surface_can_stretch_rect() because WINED3DFMT_FLAG_FBO_ATTACHABLE can only be set when ORM_FBO is. --- dlls/wined3d/surface.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c3aff86..86e6da1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3583,8 +3583,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const * FBO support, so it doesn't really make sense to try and make it work with different offscreen rendering * backends. */ - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) - && surface_can_stretch_rect(Src, This)) + if (GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && surface_can_stretch_rect(Src, This)) { stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &srect, (IWineD3DSurface *)This, &rect, Filter, upsideDown); @@ -3647,9 +3646,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const Src->palette = This->palette; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) - && !(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) - && surface_can_stretch_rect(Src, This)) + if (GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && surface_can_stretch_rect(Src, This) + && !(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE))) { TRACE("Using stretch_rect_fbo\n"); /* The source is always a texture, but never the currently active render target, and the texture

1 0

Henri Verbeet : wined3d: Don' t free D3D cube textures until the wined3d cube texture is destroyed.
by Alexandre Julliard Sept. 17, 2009

Sept. 17, 2009

Module: wine Branch: master Commit: de3bd86fb6eb9f6f6f15a6c8b2c338de6e442845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3bd86fb6eb9f6f6f15a6c8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 12:35:25 2009 +0200 wined3d: Don't free D3D cube textures until the wined3d cube texture is destroyed. --- dlls/d3d8/cubetexture.c | 27 ++++++++++++++++++++++----- dlls/d3d9/cubetexture.c | 27 ++++++++++++++++++++++----- dlls/ddraw/ddraw.c | 5 +++-- dlls/wined3d/cubetexture.c | 22 +++++++++------------- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 6 ++++-- include/wine/wined3d.idl | 5 ++--- 7 files changed, 66 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de3bd86fb6eb9f6f6f15a…

1 0

Henri Verbeet : d3d8: Add a separate function for cube texture initialization.
by Alexandre Julliard Sept. 17, 2009

Sept. 17, 2009

Module: wine Branch: master Commit: b5b58e423d32666581f69046c74bb19902c35c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b58e423d32666581f69046c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 12:35:24 2009 +0200 d3d8: Add a separate function for cube texture initialization. --- dlls/d3d8/cubetexture.c | 27 +++++++++++++++++++++++++-- dlls/d3d8/d3d8_private.h | 8 +++----- dlls/d3d8/device.c | 45 +++++++++++++++++---------------------------- 3 files changed, 45 insertions(+), 35 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 4377693..97454d0 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -286,8 +286,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_AddDirtyRect(LPDIRECT3DCUBETEXTU return hr; } - -const IDirect3DCubeTexture8Vtbl Direct3DCubeTexture8_Vtbl = +static const IDirect3DCubeTexture8Vtbl Direct3DCubeTexture8_Vtbl = { /* IUnknown */ IDirect3DCubeTexture8Impl_QueryInterface, @@ -313,3 +312,27 @@ const IDirect3DCubeTexture8Vtbl Direct3DCubeTexture8_Vtbl = IDirect3DCubeTexture8Impl_UnlockRect, IDirect3DCubeTexture8Impl_AddDirtyRect }; + +HRESULT cubetexture_init(IDirect3DCubeTexture8Impl *texture, IDirect3DDevice8Impl *device, + UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) +{ + HRESULT hr; + + texture->lpVtbl = &Direct3DCubeTexture8_Vtbl; + texture->ref = 1; + + wined3d_mutex_lock(); + hr = IWineD3DDevice_CreateCubeTexture(device->WineD3DDevice, edge_length, levels, usage & WINED3DUSAGE_MASK, + wined3dformat_from_d3dformat(format), pool, &texture->wineD3DCubeTexture, (IUnknown *)texture); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d cube texture, hr %#x.\n", hr); + return hr; + } + + texture->parentDevice = (IDirect3DDevice8 *)device; + IDirect3DDevice8_AddRef(texture->parentDevice); + + return D3D_OK; +} diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index f1c7ded..5d1587e 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -390,11 +390,6 @@ struct IDirect3DBaseTexture8Impl /* --------------------- */ /***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3DCubeTexture8Vtbl Direct3DCubeTexture8_Vtbl DECLSPEC_HIDDEN; - -/***************************************************************************** * IDirect3DCubeTexture8 implementation structure */ struct IDirect3DCubeTexture8Impl @@ -410,6 +405,9 @@ struct IDirect3DCubeTexture8Impl LPDIRECT3DDEVICE8 parentDevice; }; +HRESULT cubetexture_init(IDirect3DCubeTexture8Impl *texture, IDirect3DDevice8Impl *device, + UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; + /* ----------------- */ /* IDirect3DTexture8 */ /* ----------------- */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8e63108..f7c56db 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -726,45 +726,34 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVolumeTexture(IDirect3DDevice8 return D3D_OK; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(IDirect3DDevice8 *iface, UINT EdgeLength, - UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture8 **ppCubeTexture) +static HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(IDirect3DDevice8 *iface, UINT edge_length, + UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool, IDirect3DCubeTexture8 **texture) { - IDirect3DCubeTexture8Impl *object; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - HRESULT hr = D3D_OK; + IDirect3DCubeTexture8Impl *object; + HRESULT hr; - TRACE("(%p) : ELen(%d) Lvl(%d) Usage(%d) fmt(%u), Pool(%d)\n" , This, EdgeLength, Levels, Usage, Format, Pool); + TRACE("iface %p, edge_length %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", + iface, edge_length, levels, usage, format, pool, texture); - /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - - if (NULL == object) { - FIXME("(%p) allocation of CubeTexture failed\n", This); - *ppCubeTexture = NULL; + if (!object) + { + ERR("Failed to allocate cube texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &Direct3DCubeTexture8_Vtbl; - object->ref = 1; - - wined3d_mutex_lock(); - hr = IWineD3DDevice_CreateCubeTexture(This->WineD3DDevice, EdgeLength, Levels, Usage & WINED3DUSAGE_MASK, - wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DCubeTexture, (IUnknown *)object); - wined3d_mutex_unlock(); - - if (hr != D3D_OK){ - - /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateCubeTexture failed\n", This); + hr = cubetexture_init(object, This, edge_length, levels, usage, format, pool); + if (FAILED(hr)) + { + WARN("Failed to initialize cube texture, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *ppCubeTexture = NULL; - } else { - IUnknown_AddRef(iface); - object->parentDevice = iface; - *ppCubeTexture = (LPDIRECT3DCUBETEXTURE8) object; + return hr; } - TRACE("(%p) returning %p\n",This, *ppCubeTexture); + TRACE("Created cube texture %p.\n", object); + *texture = (IDirect3DCubeTexture8 *)object; + return hr; }

1 0

Henri Verbeet : d3d9: Add a separate function for cube texture initialization.
by Alexandre Julliard Sept. 17, 2009

Sept. 17, 2009

Module: wine Branch: master Commit: c51fbe9293cbc2a5dbb237fbb1545bde4e8d374f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51fbe9293cbc2a5dbb237fbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 12:35:23 2009 +0200 d3d9: Add a separate function for cube texture initialization. --- dlls/d3d9/cubetexture.c | 54 +++++++++++++-------------------------------- dlls/d3d9/d3d9_private.h | 5 +-- dlls/d3d9/device.c | 32 +++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 41 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 8ab29fd..4727051 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -352,48 +352,26 @@ static const IDirect3DCubeTexture9Vtbl Direct3DCubeTexture9_Vtbl = IDirect3DCubeTexture9Impl_AddDirtyRect }; +HRESULT cubetexture_init(IDirect3DCubeTexture9Impl *texture, IDirect3DDevice9Impl *device, + UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) +{ + HRESULT hr; - - -/* IDirect3DDevice9 IDirect3DCubeTexture9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(LPDIRECT3DDEVICE9EX iface, - UINT EdgeLength, UINT Levels, DWORD Usage, - D3DFORMAT Format, D3DPOOL Pool, - IDirect3DCubeTexture9** ppCubeTexture, HANDLE* pSharedHandle) { - - IDirect3DCubeTexture9Impl *object; - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hr = D3D_OK; - - TRACE("(%p) : ELen(%d) Lvl(%d) Usage(%d) fmt(%u), Pool(%d) Shared(%p)\n", This, EdgeLength, Levels, Usage, Format, Pool, pSharedHandle); - - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - - if (NULL == object) { - ERR("(%p) allocation of CubeTexture failed\n", This); - return D3DERR_OUTOFVIDEOMEMORY; - } - object->lpVtbl = &Direct3DCubeTexture9_Vtbl; - object->ref = 1; + texture->lpVtbl = &Direct3DCubeTexture9_Vtbl; + texture->ref = 1; wined3d_mutex_lock(); - hr = IWineD3DDevice_CreateCubeTexture(This->WineD3DDevice, EdgeLength, Levels, Usage, - wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DCubeTexture, (IUnknown *)object); + hr = IWineD3DDevice_CreateCubeTexture(device->WineD3DDevice, edge_length, levels, usage, + wined3dformat_from_d3dformat(format), pool, &texture->wineD3DCubeTexture, (IUnknown *)texture); wined3d_mutex_unlock(); - - if (hr != D3D_OK){ - - /* free up object */ - WARN("(%p) call to IWineD3DDevice_CreateCubeTexture failed\n", This); - HeapFree(GetProcessHeap(), 0, object); - } else { - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - *ppCubeTexture = (LPDIRECT3DCUBETEXTURE9) object; - TRACE("(%p) : Created cube texture %p\n", This, object); + if (FAILED(hr)) + { + WARN("Failed to create wined3d cube texture, hr %#x.\n", hr); + return hr; } - TRACE("(%p) returning %p\n",This, *ppCubeTexture); - return hr; + texture->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(texture->parentDevice); + + return D3D_OK; } diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 9158590..e373af8 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -200,9 +200,6 @@ extern UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex extern HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(IDirect3DDevice9Ex *iface, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9 **ppTexture, HANDLE *pSharedHandle) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(IDirect3DDevice9Ex *iface, - UINT EdgeLength, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, - IDirect3DCubeTexture9 **ppCubeTexture, HANDLE *pSharedHandle) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(IDirect3DDevice9Ex *iface, UINT Length, DWORD Usage, DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer9 **ppVertexBuffer, HANDLE *pSharedHandle) DECLSPEC_HIDDEN; @@ -421,6 +418,8 @@ typedef struct IDirect3DCubeTexture9Impl LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DCubeTexture9Impl; +HRESULT cubetexture_init(IDirect3DCubeTexture9Impl *texture, IDirect3DDevice9Impl *device, + UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; /* ----------------- */ /* IDirect3DTexture9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2137e1f..06cfcee 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -678,6 +678,38 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(IDirect3DDevice9E return D3D_OK; } +static HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(IDirect3DDevice9Ex *iface, + UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool, + IDirect3DCubeTexture9 **texture, HANDLE *shared_handle) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DCubeTexture9Impl *object; + HRESULT hr; + + TRACE("iface %p, edge_length %u, levels %u, usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", + iface, edge_length, levels, usage, format, pool, texture, shared_handle); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate cube texture memory.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + + hr = cubetexture_init(object, This, edge_length, levels, usage, format, pool); + if (FAILED(hr)) + { + WARN("Failed to initialize cube texture, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created cube texture %p.\n", object); + *texture = (IDirect3DCubeTexture9 *)object; + + return D3D_OK; +} + static HRESULT IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface9 **ppSurface, UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality)

1 0

Henri Verbeet : d3d8: Mark internal symbols hidden.
by Alexandre Julliard Sept. 17, 2009

Sept. 17, 2009

Module: wine Branch: master Commit: d84e2fa7471d2d530b06278aa6a5383736992970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84e2fa7471d2d530b06278aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 12:35:22 2009 +0200 d3d8: Mark internal symbols hidden. --- dlls/d3d8/d3d8_private.h | 47 +++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 501aba6..f1c7ded 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -97,7 +97,7 @@ _pD3D8Caps->PixelShaderVersion = _pWineCaps->PixelShaderVersion; \ _pD3D8Caps->MaxPixelShaderValue = _pWineCaps->PixelShader1xMaxValue; -void fixup_caps(WINED3DCAPS *pWineCaps); +void fixup_caps(WINED3DCAPS *pWineCaps) DECLSPEC_HIDDEN; /* Direct3D8 Interfaces: */ typedef struct IDirect3DBaseTexture8Impl IDirect3DBaseTexture8Impl; @@ -133,7 +133,7 @@ typedef struct IDirect3DVertexShader8Impl IDirect3DVertexShader8Impl; /***************************************************************************** * Predeclare the interface implementation structures */ -extern const IDirect3D8Vtbl Direct3D8_Vtbl; +extern const IDirect3D8Vtbl Direct3D8_Vtbl DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3D implementation structure @@ -155,8 +155,8 @@ struct IDirect3D8Impl /***************************************************************************** * Predeclare the interface implementation structures */ -extern const IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl; -extern const IWineD3DDeviceParentVtbl d3d8_wined3d_device_parent_vtbl; +extern const IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl DECLSPEC_HIDDEN; +extern const IWineD3DDeviceParentVtbl d3d8_wined3d_device_parent_vtbl DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DDevice8 implementation structure @@ -235,7 +235,7 @@ struct IDirect3DVolume8Impl }; HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, UINT width, UINT height, - UINT depth, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool); + UINT depth, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool) DECLSPEC_HIDDEN; /* ------------------- */ /* IDirect3DSwapChain8 */ @@ -244,7 +244,7 @@ HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, /***************************************************************************** * Predeclare the interface implementation structures */ -extern const IDirect3DSwapChain8Vtbl Direct3DSwapChain8_Vtbl; +extern const IDirect3DSwapChain8Vtbl Direct3DSwapChain8_Vtbl DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DSwapChain8 implementation structure @@ -290,7 +290,7 @@ struct IDirect3DSurface8Impl HRESULT surface_init(IDirect3DSurface8Impl *surface, IDirect3DDevice8Impl *device, UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level, - DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality); + DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) DECLSPEC_HIDDEN; /* ------------------ */ /* IDirect3DResource8 */ @@ -299,7 +299,7 @@ HRESULT surface_init(IDirect3DSurface8Impl *surface, IDirect3DDevice8Impl *devic /***************************************************************************** * Predeclare the interface implementation structures */ -extern const IDirect3DResource8Vtbl Direct3DResource8_Vtbl; +extern const IDirect3DResource8Vtbl Direct3DResource8_Vtbl DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DResource8 implementation structure @@ -321,7 +321,7 @@ struct IDirect3DResource8Impl /***************************************************************************** * Predeclare the interface implementation structures */ -extern const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl; +extern const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVertexBuffer8 implementation structure @@ -348,7 +348,7 @@ struct IDirect3DVertexBuffer8Impl /***************************************************************************** * Predeclare the interface implementation structures */ -extern const IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl; +extern const IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DIndexBuffer8 implementation structure @@ -392,7 +392,7 @@ struct IDirect3DBaseTexture8Impl /***************************************************************************** * Predeclare the interface implementation structures */ -extern const IDirect3DCubeTexture8Vtbl Direct3DCubeTexture8_Vtbl; +extern const IDirect3DCubeTexture8Vtbl Direct3DCubeTexture8_Vtbl DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DCubeTexture8 implementation structure @@ -417,7 +417,7 @@ struct IDirect3DCubeTexture8Impl /***************************************************************************** * Predeclare the interface implementation structures */ -extern const IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl; +extern const IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DTexture8 implementation structure @@ -456,7 +456,7 @@ struct IDirect3DVolumeTexture8Impl }; HRESULT volumetexture_init(IDirect3DVolumeTexture8Impl *texture, IDirect3DDevice8Impl *device, - UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool); + UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; /* ----------------------- */ /* IDirect3DStateBlockImpl */ @@ -506,7 +506,7 @@ DECLARE_INTERFACE_(IDirect3DStateBlock8, IUnknown) /***************************************************************************** * Predeclare the interface implementation structures */ -extern const IDirect3DStateBlock8Vtbl Direct3DStateBlock8_Vtbl; +extern const IDirect3DStateBlock8Vtbl Direct3DStateBlock8_Vtbl DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DStateBlock implementation structure @@ -539,7 +539,7 @@ DECLARE_INTERFACE_(IDirect3DVertexDeclaration8, IUnknown) #define IDirect3DVertexDeclaration8_Release(p) (p)->lpVtbl->Release(p) /*** Implementation ***/ -extern const IDirect3DVertexDeclaration8Vtbl Direct3DVertexDeclaration8_Vtbl; +extern const IDirect3DVertexDeclaration8Vtbl Direct3DVertexDeclaration8_Vtbl DECLSPEC_HIDDEN; typedef struct { const IDirect3DVertexDeclaration8Vtbl *lpVtbl; @@ -596,7 +596,7 @@ DECLARE_INTERFACE_(IDirect3DPixelShader8,IUnknown) /***************************************************************************** * Predeclare the interface implementation structures */ -extern const IDirect3DVertexShader8Vtbl Direct3DVertexShader8_Vtbl; +extern const IDirect3DVertexShader8Vtbl Direct3DVertexShader8_Vtbl DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVertexShader implementation structure @@ -621,7 +621,7 @@ struct IDirect3DVertexShader8Impl { /***************************************************************************** * Predeclare the interface implementation structures */ -extern const IDirect3DPixelShader8Vtbl Direct3DPixelShader8_Vtbl; +extern const IDirect3DPixelShader8Vtbl Direct3DPixelShader8_Vtbl DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DPixelShader implementation structure @@ -639,13 +639,14 @@ typedef struct IDirect3DPixelShader8Impl { * * to see how not defined it here */ -D3DFORMAT d3dformat_from_wined3dformat(WINED3DFORMAT format); -WINED3DFORMAT wined3dformat_from_d3dformat(D3DFORMAT format); -void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader *wined3d_vertex_shader); -UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements); -size_t parse_token(const DWORD* pToken); +D3DFORMAT d3dformat_from_wined3dformat(WINED3DFORMAT format) DECLSPEC_HIDDEN; +WINED3DFORMAT wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; +void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader *wined3d_vertex_shader) DECLSPEC_HIDDEN; +UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, + WINED3DVERTEXELEMENT **wined3d_elements) DECLSPEC_HIDDEN; +size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; /* Callbacks */ -extern ULONG WINAPI D3D8CB_DestroySwapChain (IWineD3DSwapChain *pSwapChain); +extern ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) DECLSPEC_HIDDEN; #endif /* __WINE_D3DX8_PRIVATE_H */

1 0

Henri Verbeet : wined3d: Get rid of a redundant strcpy().
by Alexandre Julliard Sept. 17, 2009

Sept. 17, 2009

Module: wine Branch: master Commit: 21241432f1e062d4d08f97c9a2d2caf498e46c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21241432f1e062d4d08f97c9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 12:35:21 2009 +0200 wined3d: Get rid of a redundant strcpy(). --- dlls/wined3d/wined3d_main.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 67b1acd..5f19c26 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -5,6 +5,7 @@ * Copyright 2002-2003 Raphael Junqueira * Copyright 2004 Jason Edmeades * Copyright 2007-2008 Stefan Dösinger for CodeWeavers + * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -293,8 +294,11 @@ static BOOL wined3d_init(HINSTANCE hInstDLL) } if ( !get_config_key( hkey, appkey, "WineLogo", buffer, size) ) { - wined3d_settings.logo = HeapAlloc(GetProcessHeap(), 0, strlen(buffer) + 1); - if(wined3d_settings.logo) strcpy(wined3d_settings.logo, buffer); + size_t len = strlen(buffer) + 1; + + wined3d_settings.logo = HeapAlloc(GetProcessHeap(), 0, len); + if (!wined3d_settings.logo) ERR("Failed to allocate logo path memory.\n"); + else memcpy(wined3d_settings.logo, buffer, len); } if ( !get_config_key( hkey, appkey, "Multisampling", buffer, size) ) {

1 0

Paul Vriens : winetest: Fix winetest to cope with com dlls.
by Alexandre Julliard Sept. 17, 2009

Sept. 17, 2009

Module: wine Branch: master Commit: 5b600b57c4714ed4c6c77b3ebf1f879dac572afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b600b57c4714ed4c6c77b3eb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Sep 17 11:47:47 2009 +0200 winetest: Fix winetest to cope with com dlls. --- programs/winetest/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 10804a6..4287066 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -589,7 +589,7 @@ static HMODULE load_com_dll(const char *name) { LONG size = sizeof(dllname); if(RegQueryValueA(hkey, NULL, dllname, &size) == ERROR_SUCCESS) - dll = LoadLibraryExA(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE); + dll = LoadLibraryA(dllname); RegCloseKey(hkey); }

1 0