September 2009 - Wine-Commits

Henri Verbeet : wined3d: Mark internal symbols hidden.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 689984b425df6ff57b1864123c18f23744242b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689984b425df6ff57b1864123… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 11 19:01:19 2009 +0200 wined3d: Mark internal symbols hidden. --- dlls/wined3d/wined3d_gl.h | 710 ++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 604 ++++++++++++++++++---------------- 2 files changed, 684 insertions(+), 630 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=689984b425df6ff57b186…

1 0

Henri Verbeet : wined3d: Make some variables static.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 9880cd7504969ea2da9907426a8c1de4b009a693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9880cd7504969ea2da9907426… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 11 19:01:18 2009 +0200 wined3d: Make some variables static. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_main.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5c971d2..b2d7806 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4442,7 +4442,7 @@ static int sig_tree_compare(const void *key, const struct wine_rb_entry *entry) return compare_sig(key, e->sig); } -struct wine_rb_functions sig_tree_functions = +static const struct wine_rb_functions sig_tree_functions = { wined3d_rb_alloc, wined3d_rb_realloc, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 129cbba..1ac8b11 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -789,7 +789,7 @@ struct driver_quirk const char *description; }; -struct driver_quirk quirk_table[] = +static const struct driver_quirk quirk_table[] = { { match_ati_r300_to_500, diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index bdb544a..67b1acd 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -32,7 +32,7 @@ int num_lock = 0; void (*CDECL wine_tsx11_lock_ptr)(void) = NULL; void (*CDECL wine_tsx11_unlock_ptr)(void) = NULL; -CRITICAL_SECTION wined3d_cs; +static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = { 0, 0, &wined3d_cs, @@ -40,7 +40,7 @@ static CRITICAL_SECTION_DEBUG wined3d_cs_debug = &wined3d_cs_debug.ProcessLocksList}, 0, 0, {(DWORD_PTR)(__FILE__ ": wined3d_cs")} }; -CRITICAL_SECTION wined3d_cs = {&wined3d_cs_debug, -1, 0, 0, 0, 0}; +static CRITICAL_SECTION wined3d_cs = {&wined3d_cs_debug, -1, 0, 0, 0, 0}; /* When updating default value here, make sure to update winecfg as well, * where appropriate. */

1 0

Henri Verbeet : d3d8: Add a separate function for surface initialization.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: e02f7b20625ab99403e72458d9c0715a64400c5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02f7b20625ab99403e72458d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 11 19:01:17 2009 +0200 d3d8: Add a separate function for surface initialization. --- dlls/d3d8/d3d8_private.h | 9 +++---- dlls/d3d8/device.c | 53 ++++++++++++++------------------------------- dlls/d3d8/surface.c | 35 +++++++++++++++++++++++++++++- 3 files changed, 55 insertions(+), 42 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 52abb84..ba58cc3 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -265,11 +265,6 @@ struct IDirect3DSwapChain8Impl /* ----------------- */ /***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3DSurface8Vtbl Direct3DSurface8_Vtbl; - -/***************************************************************************** * IDirect3DSurface8 implementation structure */ struct IDirect3DSurface8Impl @@ -294,6 +289,10 @@ struct IDirect3DSurface8Impl BOOL isImplicit; }; +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); + /* ------------------ */ /* IDirect3DResource8 */ /* ------------------ */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 30195c6..76cfe88 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -858,51 +858,32 @@ static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface8 **ppSurface, UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality) { - HRESULT hrc; + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DSurface8Impl *object; - IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - TRACE("(%p) Relay\n", This); + HRESULT hr; - if(MultisampleQuality > 0){ - FIXME("MultisampleQuality set to %d, substituting 0\n" , MultisampleQuality); - /* - MultisampleQuality - [in] Quality level. The valid range is between zero and one less than the level returned by pQualityLevels used by IDirect3D8::CheckDeviceMultiSampleType. Passing a larger value returns the error D3DERR_INVALIDCALL. The MultisampleQuality values of paired render targets, depth stencil surfaces, and the MultiSample type must all match. - */ - MultisampleQuality=0; - } - /*FIXME: Check MAX bounds of MultisampleQuality*/ + TRACE("(%p) : w(%d) h(%d) fmt(%d) surf@%p\n", This, Width, Height, Format, *ppSurface); - /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface8Impl)); - if (NULL == object) { - FIXME("Allocation of memory failed\n"); - *ppSurface = NULL; + if (!object) + { + FIXME("Failed to allocate surface memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &Direct3DSurface8_Vtbl; - object->ref = 1; - - TRACE("(%p) : w(%d) h(%d) fmt(%d) surf@%p\n", This, Width, Height, Format, *ppSurface); - - wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreateSurface(This->WineD3DDevice, Width, Height, wined3dformat_from_d3dformat(Format), - Lockable, Discard, Level, &object->wineD3DSurface, Usage & WINED3DUSAGE_MASK, (WINED3DPOOL)Pool, - MultiSample, MultisampleQuality, SURFACE_OPENGL, (IUnknown *)object); - wined3d_mutex_unlock(); - - if (hrc != D3D_OK || NULL == object->wineD3DSurface) { - /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateSurface failed\n", This); + hr = surface_init(object, This, Width, Height, Format, Lockable, Discard, + Level, Usage, Pool, MultiSample, MultisampleQuality); + if (FAILED(hr)) + { + WARN("Failed to initialize surface, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *ppSurface = NULL; - } else { - IUnknown_AddRef(iface); - object->parentDevice = iface; - *ppSurface = (LPDIRECT3DSURFACE8) object; + return hr; } - return hrc; + + TRACE("Created surface %p.\n", object); + *ppSurface = (IDirect3DSurface8 *)object; + + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, BOOL Lockable, IDirect3DSurface8** ppSurface) { diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 3185a1f..4cbe1c6 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -229,7 +229,7 @@ static HRESULT WINAPI IDirect3DSurface8Impl_UnlockRect(LPDIRECT3DSURFACE8 iface) } } -const IDirect3DSurface8Vtbl Direct3DSurface8_Vtbl = +static const IDirect3DSurface8Vtbl Direct3DSurface8_Vtbl = { /* IUnknown */ IDirect3DSurface8Impl_QueryInterface, @@ -246,3 +246,36 @@ const IDirect3DSurface8Vtbl Direct3DSurface8_Vtbl = IDirect3DSurface8Impl_LockRect, IDirect3DSurface8Impl_UnlockRect }; + +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) +{ + HRESULT hr; + + surface->lpVtbl = &Direct3DSurface8_Vtbl; + surface->ref = 1; + + /* FIXME: Check MAX bounds of MultisampleQuality. */ + if (multisample_quality > 0) + { + FIXME("Multisample quality set to %u, substituting 0.\n", multisample_quality); + multisample_quality = 0; + } + + wined3d_mutex_lock(); + hr = IWineD3DDevice_CreateSurface(device->WineD3DDevice, width, height, wined3dformat_from_d3dformat(format), + lockable, discard, level, &surface->wineD3DSurface, usage & WINED3DUSAGE_MASK, (WINED3DPOOL)pool, + multisample_type, multisample_quality, SURFACE_OPENGL, (IUnknown *)surface); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d surface, hr %#x.\n", hr); + return hr; + } + + surface->parentDevice = (IDirect3DDevice8 *)device; + IUnknown_AddRef(surface->parentDevice); + + return D3D_OK; +}

1 0

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

Sept. 15, 2009

Module: wine Branch: master Commit: 52e45865bdcfd8401e57e7604f9c7b0f6d9221a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e45865bdcfd8401e57e7604… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 11 19:01:16 2009 +0200 d3d9: Add a separate function for surface initialization. --- dlls/d3d9/d3d9_private.h | 9 +++--- dlls/d3d9/device.c | 63 +++++++++++----------------------------------- dlls/d3d9/surface.c | 52 ++++++++++++++++++++++++++++++++++++- 3 files changed, 69 insertions(+), 55 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 381e3af..5c30024 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -281,11 +281,6 @@ typedef struct IDirect3DSwapChain9Impl /* ----------------- */ /***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3DSurface9Vtbl Direct3DSurface9_Vtbl; - -/***************************************************************************** * IDirect3DSurface9 implementation structure */ typedef struct IDirect3DSurface9Impl @@ -312,6 +307,10 @@ typedef struct IDirect3DSurface9Impl BOOL getdc_supported; } IDirect3DSurface9Impl; +HRESULT surface_init(IDirect3DSurface9Impl *surface, IDirect3DDevice9Impl *device, + UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level, + DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality); + /* ---------------------- */ /* IDirect3DVertexBuffer9 */ /* ---------------------- */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a5c0c5d..f57eb4d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -644,69 +644,36 @@ static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9EX iface, wined3d_mutex_unlock(); } - 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) { - HRESULT hrc; + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *object; - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - TRACE("(%p) Relay\n", This); + HRESULT hr; - if (MultisampleQuality > 0) - { - FIXME("MultisampleQuality set to %d, bstituting 0\n", MultisampleQuality); - MultisampleQuality = 0; - } - /*FIXME: Check MAX bounds of MultisampleQuality*/ + TRACE("(%p) : w(%d) h(%d) fmt(%d) surf@%p\n", This, Width, Height, Format, *ppSurface); - /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface9Impl)); - if (NULL == object) { - FIXME("Allocation of memory failed\n"); + if (!object) + { + FIXME("Failed to allocate surface memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &Direct3DSurface9_Vtbl; - object->ref = 1; - - switch(Format) + hr = surface_init(object, This, Width, Height, Format, Lockable, Discard, + Level, Usage, Pool, MultiSample, MultisampleQuality); + if (FAILED(hr)) { - case D3DFMT_A8R8G8B8: - case D3DFMT_X8R8G8B8: - case D3DFMT_R5G6B5: - case D3DFMT_X1R5G5B5: - case D3DFMT_A1R5G5B5: - case D3DFMT_R8G8B8: - object->getdc_supported = TRUE; - break; - - default: - object->getdc_supported = FALSE; - break; + WARN("Failed to initialize surface, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; } - TRACE("(%p) : w(%d) h(%d) fmt(%d) surf@%p\n", This, Width, Height, Format, *ppSurface); + TRACE("Created surface %p.\n", object); + *ppSurface = (IDirect3DSurface9 *)object; - wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreateSurface(This->WineD3DDevice, Width, Height, wined3dformat_from_d3dformat(Format), - Lockable, Discard, Level, &object->wineD3DSurface, Usage & WINED3DUSAGE_MASK, (WINED3DPOOL)Pool, - MultiSample, MultisampleQuality, SURFACE_OPENGL, (IUnknown *)object); - wined3d_mutex_unlock(); - - if (hrc != D3D_OK || NULL == object->wineD3DSurface) { - - /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateSurface failed\n", This); - HeapFree(GetProcessHeap(), 0, object); - } else { - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - TRACE("(%p) : Created surface %p\n", This, object); - *ppSurface = (LPDIRECT3DSURFACE9) object; - } - return hrc; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateRenderTarget(IDirect3DDevice9Ex *iface, UINT Width, UINT Height, diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 4079ea3..adb0420 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -298,8 +298,7 @@ static HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, } } - -const IDirect3DSurface9Vtbl Direct3DSurface9_Vtbl = +static const IDirect3DSurface9Vtbl Direct3DSurface9_Vtbl = { /* IUnknown */ IDirect3DSurface9Impl_QueryInterface, @@ -322,3 +321,52 @@ const IDirect3DSurface9Vtbl Direct3DSurface9_Vtbl = IDirect3DSurface9Impl_GetDC, IDirect3DSurface9Impl_ReleaseDC }; + +HRESULT surface_init(IDirect3DSurface9Impl *surface, IDirect3DDevice9Impl *device, + UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level, + DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) +{ + HRESULT hr; + + surface->lpVtbl = &Direct3DSurface9_Vtbl; + surface->ref = 1; + + switch (format) + { + case D3DFMT_A8R8G8B8: + case D3DFMT_X8R8G8B8: + case D3DFMT_R5G6B5: + case D3DFMT_X1R5G5B5: + case D3DFMT_A1R5G5B5: + case D3DFMT_R8G8B8: + surface->getdc_supported = TRUE; + break; + + default: + surface->getdc_supported = FALSE; + break; + } + + /* FIXME: Check MAX bounds of MultisampleQuality. */ + if (multisample_quality > 0) + { + FIXME("Multisample quality set to %u, substituting 0.\n", multisample_quality); + multisample_quality = 0; + } + + wined3d_mutex_lock(); + hr = IWineD3DDevice_CreateSurface(device->WineD3DDevice, width, height, wined3dformat_from_d3dformat(format), + lockable, discard, level, &surface->wineD3DSurface, usage & WINED3DUSAGE_MASK, (WINED3DPOOL)pool, + multisample_type, multisample_quality, SURFACE_OPENGL, (IUnknown *)surface); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d surface, hr %#x.\n", hr); + return hr; + } + + surface->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(surface->parentDevice); + + return D3D_OK; +}

1 0

Henri Verbeet : d3d10core: Add a separate function for d3d10_texture2d initialization.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 57b196b2e41d8aed9f05d8b3fed188eabe61d79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b196b2e41d8aed9f05d8b3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 11 19:01:15 2009 +0200 d3d10core: Add a separate function for d3d10_texture2d initialization. --- dlls/d3d10core/d3d10core_private.h | 4 ++- dlls/d3d10core/device.c | 44 +++---------------------------- dlls/d3d10core/texture2d.c | 49 +++++++++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 41 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 3074bdb..4257b2e 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -82,7 +82,6 @@ struct d3d10_device }; /* ID3D10Texture2D */ -extern const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl; struct d3d10_texture2d { const struct ID3D10Texture2DVtbl *vtbl; @@ -93,6 +92,9 @@ struct d3d10_texture2d D3D10_TEXTURE2D_DESC desc; }; +HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device, + const D3D10_TEXTURE2D_DESC *desc); + /* ID3D10Buffer */ extern const struct ID3D10BufferVtbl d3d10_buffer_vtbl; struct d3d10_buffer diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3808dfb..9026b75 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -682,46 +682,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac return E_OUTOFMEMORY; } - object->vtbl = &d3d10_texture2d_vtbl; - object->refcount = 1; - object->desc = *desc; - - if (desc->MipLevels == 1 && desc->ArraySize == 1) + hr = d3d10_texture2d_init(object, This, desc); + if (FAILED(hr)) { - IWineDXGIDevice *wine_device; - - hr = ID3D10Device_QueryInterface(iface, &IID_IWineDXGIDevice, (void **)&wine_device); - if (FAILED(hr)) - { - ERR("Device should implement IWineDXGIDevice\n"); - HeapFree(GetProcessHeap(), 0, object); - return E_FAIL; - } - - hr = IWineDXGIDevice_create_surface(wine_device, NULL, 0, NULL, - (IUnknown *)object, (void **)&object->dxgi_surface); - IWineDXGIDevice_Release(wine_device); - if (FAILED(hr)) - { - ERR("Failed to create DXGI surface, returning %#x\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - FIXME("Implement DXGI<->wined3d usage conversion\n"); - - hr = IWineD3DDevice_CreateSurface(This->wined3d_device, desc->Width, desc->Height, - wined3dformat_from_dxgi_format(desc->Format), FALSE, FALSE, 0, - &object->wined3d_surface, desc->Usage, WINED3DPOOL_DEFAULT, - desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3DMULTISAMPLE_NONE, - desc->SampleDesc.Quality, SURFACE_OPENGL, (IUnknown *)object); - if (FAILED(hr)) - { - ERR("CreateSurface failed, returning %#x\n", hr); - IDXGISurface_Release(object->dxgi_surface); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } + WARN("Failed to initialize texture, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; } *texture = (ID3D10Texture2D *)object; diff --git a/dlls/d3d10core/texture2d.c b/dlls/d3d10core/texture2d.c index 8119e19..edb2329 100644 --- a/dlls/d3d10core/texture2d.c +++ b/dlls/d3d10core/texture2d.c @@ -161,7 +161,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3 *desc = This->desc; } -const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl = +static const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl = { /* IUnknown methods */ d3d10_texture2d_QueryInterface, @@ -181,3 +181,50 @@ const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl = d3d10_texture2d_Unmap, d3d10_texture2d_GetDesc, }; + +HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device, + const D3D10_TEXTURE2D_DESC *desc) +{ + HRESULT hr; + + texture->vtbl = &d3d10_texture2d_vtbl; + texture->refcount = 1; + texture->desc = *desc; + + if (desc->MipLevels == 1 && desc->ArraySize == 1) + { + IWineDXGIDevice *wine_device; + + hr = ID3D10Device_QueryInterface((ID3D10Device *)device, &IID_IWineDXGIDevice, (void **)&wine_device); + if (FAILED(hr)) + { + ERR("Device should implement IWineDXGIDevice\n"); + return E_FAIL; + } + + hr = IWineDXGIDevice_create_surface(wine_device, NULL, 0, NULL, + (IUnknown *)texture, (void **)&texture->dxgi_surface); + IWineDXGIDevice_Release(wine_device); + if (FAILED(hr)) + { + ERR("Failed to create DXGI surface, returning %#x\n", hr); + return hr; + } + + FIXME("Implement DXGI<->wined3d usage conversion\n"); + + hr = IWineD3DDevice_CreateSurface(device->wined3d_device, desc->Width, desc->Height, + wined3dformat_from_dxgi_format(desc->Format), FALSE, FALSE, 0, + &texture->wined3d_surface, desc->Usage, WINED3DPOOL_DEFAULT, + desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3DMULTISAMPLE_NONE, + desc->SampleDesc.Quality, SURFACE_OPENGL, (IUnknown *)texture); + if (FAILED(hr)) + { + ERR("CreateSurface failed, returning %#x\n", hr); + IDXGISurface_Release(texture->dxgi_surface); + return hr; + } + } + + return S_OK; +}

1 0

Henri Verbeet : dxgi: Implement IDXGIAdapter::EnumOutputs().
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 9ed19bc61a05d5f92ef29027f1733a3cf739fb37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed19bc61a05d5f92ef29027f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 11 19:01:14 2009 +0200 dxgi: Implement IDXGIAdapter::EnumOutputs(). Just a single output for each adapter so far, wined3d doesn't do multihead yet. --- dlls/dxgi/Makefile.in | 1 + dlls/dxgi/adapter.c | 32 ++++++- dlls/dxgi/dxgi_main.c | 16 +++- dlls/dxgi/dxgi_private.h | 12 +++- dlls/dxgi/output.c | 224 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 280 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ed19bc61a05d5f92ef29…

1 0

Jacek Caban : jscript: Fixed to_primitive for null dispatch.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: e7f2754c322d9ffffdb190ab5208a67d2ea66aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f2754c322d9ffffdb190ab5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 18:47:50 2009 +0200 jscript: Fixed to_primitive for null dispatch. --- dlls/jscript/jsutils.c | 5 +++++ dlls/jscript/tests/lang.js | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 5d56661..a51518c 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -198,6 +198,11 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; + if(!V_DISPATCH(v)) { + V_VT(ret) = VT_NULL; + break; + } + jsdisp = iface_to_jsdisp((IUnknown*)V_DISPATCH(v)); if(!jsdisp) { V_VT(ret) = VT_EMPTY; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 342f3e9..08caa73 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -942,6 +942,7 @@ ok(nullDisp == null, "nullDisp == null"); ok(getVT(true && nullDisp) === "VT_DISPATCH", "getVT(0 && nullDisp) = " + getVT(true && nullDisp)); ok(!nullDisp === true, "!nullDisp = " + !nullDisp); +ok(String(nullDisp) === "null", "String(nullDisp) = " + String(nullDisp)); function do_test() {} function nosemicolon() {} nosemicolon();

1 0

Jacek Caban : jscript: Fixed null dispatch comparison.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 3e1430e0e4c702312db2eb80453431f3e26f9564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1430e0e4c702312db2eb804… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 18:47:14 2009 +0200 jscript: Fixed null dispatch comparison. --- dlls/jscript/engine.c | 20 +++++++++++++++----- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index efd5e46..783b6e5 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -245,6 +245,11 @@ static HRESULT put_value(script_ctx_t *ctx, exprval_t *ref, VARIANT *v, jsexcept return disp_propput(ref->u.idref.disp, ref->u.idref.id, ctx->lcid, v, ei, NULL/*FIXME*/); } +static inline BOOL is_null(const VARIANT *v) +{ + return V_VT(v) == VT_NULL || (V_VT(v) == VT_DISPATCH && !V_DISPATCH(v)); +} + static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) { IObjectIdentity *identity; @@ -256,6 +261,11 @@ static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) return S_OK; } + if(!disp1) { + *ret = !disp2; + return S_OK; + } + hres = IDispatch_QueryInterface(disp1, &IID_IUnknown, (void**)&unk1); if(FAILED(hres)) return hres; @@ -290,12 +300,12 @@ static HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) TRACE("\n"); if(V_VT(lval) != V_VT(rval)) { - if(is_num_vt(V_VT(lval)) && is_num_vt(V_VT(rval))) { + if(is_num_vt(V_VT(lval)) && is_num_vt(V_VT(rval))) *ret = num_val(lval) == num_val(rval); - return S_OK; - } - - *ret = FALSE; + else if(is_null(lval)) + *ret = is_null(rval); + else + *ret = FALSE; return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b53a224..342f3e9 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -935,6 +935,13 @@ ok(createNullBSTR() === '', "createNullBSTR() !== ''"); ok(getVT(nullDisp) === "VT_DISPATCH", "getVT(nullDisp) = " + getVT(nullDisp)); ok(typeof(nullDisp) === "object", "typeof(nullDisp) = " + typeof(nullDisp)); +ok(nullDisp === nullDisp, "nullDisp !== nullDisp"); +ok(nullDisp !== re, "nullDisp === re"); +ok(nullDisp === null, "nullDisp === null"); +ok(nullDisp == null, "nullDisp == null"); +ok(getVT(true && nullDisp) === "VT_DISPATCH", + "getVT(0 && nullDisp) = " + getVT(true && nullDisp)); +ok(!nullDisp === true, "!nullDisp = " + !nullDisp); function do_test() {} function nosemicolon() {} nosemicolon();

1 0

Jacek Caban : jscript: Added Array.splice implementation.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 176ba8cf95013f414ecdec6c510df6fdf24cbdb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=176ba8cf95013f414ecdec6c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 18:46:42 2009 +0200 jscript: Added Array.splice implementation. --- dlls/jscript/array.c | 114 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 72 ++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index abef9df..f723931 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -750,11 +750,118 @@ static HRESULT Array_sort(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return S_OK; } +/* ECMA-262 3rd Edition 15.4.4.12 */ static HRESULT Array_splice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + DWORD length, start=0, delete_cnt=0, argc, i, add_args = 0; + DispatchEx *ret_array = NULL; + VARIANT v; + HRESULT hres = S_OK; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_ARRAY)) { + length = ((ArrayInstance*)dispex)->length; + }else { + hres = get_jsdisp_length(dispex, lcid, ei, &length); + if(FAILED(hres)) + return hres; + } + + argc = arg_cnt(dp); + if(argc >= 1) { + hres = to_integer(dispex->ctx, get_arg(dp,0), ei, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) == VT_I4) { + if(V_I4(&v) >= 0) + start = min(V_I4(&v), length); + else + start = -V_I4(&v) > length ? 0 : length + V_I4(&v); + }else { + start = V_R8(&v) < 0.0 ? 0 : length; + } + } + + if(argc >= 2) { + hres = to_integer(dispex->ctx, get_arg(dp,1), ei, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) == VT_I4) { + if(V_I4(&v) > 0) + delete_cnt = min(V_I4(&v), length-start); + }else if(V_R8(&v) > 0.0) { + delete_cnt = length-start; + } + + add_args = argc-2; + } + + if(retv) { + hres = create_array(dispex->ctx, 0, &ret_array); + if(FAILED(hres)) + return hres; + + for(i=0; SUCCEEDED(hres) && i < delete_cnt; i++) { + hres = jsdisp_propget_idx(dispex, start+i, lcid, &v, ei, caller); + if(hres == DISP_E_UNKNOWNNAME) + hres = S_OK; + else if(SUCCEEDED(hres)) + hres = jsdisp_propput_idx(ret_array, i, lcid, &v, ei, caller); + } + + if(SUCCEEDED(hres)) { + V_VT(&v) = VT_I4; + V_I4(&v) = delete_cnt; + + hres = jsdisp_propput_name(ret_array, lengthW, lcid, &v, ei, caller); + } + } + + if(add_args < delete_cnt) { + for(i = start; SUCCEEDED(hres) && i < length-delete_cnt; i++) { + hres = jsdisp_propget_idx(dispex, i+delete_cnt, lcid, &v, ei, caller); + if(hres == DISP_E_UNKNOWNNAME) + hres = jsdisp_delete_idx(dispex, i+add_args); + else if(SUCCEEDED(hres)) + hres = jsdisp_propput_idx(dispex, i+add_args, lcid, &v, ei, caller); + } + + for(i=length; SUCCEEDED(hres) && i != length-delete_cnt+add_args; i--) + hres = jsdisp_delete_idx(dispex, i-1); + }else if(add_args > delete_cnt) { + for(i=length-delete_cnt; SUCCEEDED(hres) && i != start; i--) { + hres = jsdisp_propget_idx(dispex, i+delete_cnt-1, lcid, &v, ei, caller); + if(hres == DISP_E_UNKNOWNNAME) + hres = jsdisp_delete_idx(dispex, i+add_args-1); + else if(SUCCEEDED(hres)) + hres = jsdisp_propput_idx(dispex, i+add_args-1, lcid, &v, ei, caller); + } + } + + for(i=0; SUCCEEDED(hres) && i < add_args; i++) + hres = jsdisp_propput_idx(dispex, start+i, lcid, get_arg(dp,i+2), ei, caller); + + if(SUCCEEDED(hres)) { + V_VT(&v) = VT_I4; + V_I4(&v) = length-delete_cnt+add_args; + hres = jsdisp_propput_name(dispex, lengthW, lcid, &v, ei, caller); + } + + if(FAILED(hres)) { + if(ret_array) + jsdisp_release(ret_array); + return hres; + } + + if(retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(ret_array); + } + return S_OK; } /* ECMA-262 3rd Edition 15.4.4.2 */ @@ -778,6 +885,7 @@ static HRESULT Array_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, D return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.4.4.13 */ static HRESULT Array_unshift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 42d0683..5ece7d5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -668,6 +668,78 @@ arr[12] = 2; ok(arr.slice(5).toString() === "a,,,,,,,2", "arr.slice(5).toString() = " + arr.slice(5).toString()); ok(arr.slice(5).length === 8, "arr.slice(5).length = " + arr.slice(5).length); +arr = [1,2,3,4,5]; +tmp = arr.splice(2,2); +ok(tmp.toString() == "3,4", "arr.splice(2,2) returned " + tmp.toString()); +ok(arr.toString() == "1,2,5", "arr.splice(2,2) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(2,2,"a"); +ok(tmp.toString() == "3,4", "arr.splice(2,2,'a') returned " + tmp.toString()); +ok(arr.toString() == "1,2,a,5", "arr.splice(2,2,'a') is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(2,2,'a','b','c'); +ok(tmp.toString() == "3,4", "arr.splice(2,2,'a','b','c') returned " + tmp.toString()); +ok(arr.toString() == "1,2,a,b,c,5", "arr.splice(2,2,'a','b','c') is " + arr.toString()); + +arr = [1,2,3,4,]; +tmp = arr.splice(2,2,'a','b','c'); +ok(tmp.toString() == "3,4", "arr.splice(2,2,'a','b','c') returned " + tmp.toString()); +ok(arr.toString() == "1,2,a,b,c,", "arr.splice(2,2,'a','b','c') is " + arr.toString()); + +arr = [1,2,3,4,]; +arr.splice(2,2,'a','b','c'); +ok(arr.toString() == "1,2,a,b,c,", "arr.splice(2,2,'a','b','c') is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(2,2,'a','b'); +ok(tmp.toString() == "3,4", "arr.splice(2,2,'a','b') returned " + tmp.toString()); +ok(arr.toString() == "1,2,a,b,5", "arr.splice(2,2,'a','b') is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(-1,2); +ok(tmp.toString() == "5", "arr.splice(-1,2) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4", "arr.splice(-1,2) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(-10,3); +ok(tmp.toString() == "1,2,3", "arr.splice(-10,3) returned " + tmp.toString()); +ok(arr.toString() == "4,5", "arr.splice(-10,3) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(-10,100); +ok(tmp.toString() == "1,2,3,4,5", "arr.splice(-10,100) returned " + tmp.toString()); +ok(arr.toString() == "", "arr.splice(-10,100) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(2,-1); +ok(tmp.toString() == "", "arr.splice(2,-1) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(2,-1) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(2); +ok(tmp.toString() == "", "arr.splice(2,-1) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(2,-1) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(); +ok(tmp.toString() == "", "arr.splice(2,-1) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(2,-1) is " + arr.toString()); + +obj = new Object(); +obj.length = 3; +obj[0] = 1; +obj[1] = 2; +obj[2] = 3; +tmp = Array.prototype.splice.call(obj, 1, 1, 'a', 'b'); +ok(tmp.toString() === "2", "obj.splice returned " + tmp); +ok(obj.length === 4, "obj.length = " + obj.length); +ok(obj[0] === 1, "obj[0] = " + obj[0]); +ok(obj[1] === 'a', "obj[1] = " + obj[1]); +ok(obj[2] === 'b', "obj[2] = " + obj[2]); +ok(obj[3] === 3, "obj[3] = " + obj[3]); + obj = new Object(); obj.length = 3; obj[0] = 1;

1 0

Jacek Caban : mshtml: Fixed tests.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: a7e8cdf3732086b9e3f7ddeb1503e3b4d64e135a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e8cdf3732086b9e3f7ddeb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 18:41:45 2009 +0200 mshtml: Fixed tests. Based on Paul Vriens's feedback. --- dlls/mshtml/tests/htmldoc.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 15aeca4..1eb0cea 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2763,7 +2763,12 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) test_readyState((IUnknown*)persist); } -static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) +#define DWL_VERBDONE 0x0001 +#define DWL_CSS 0x0002 +#define DWL_TRYCSS 0x0004 +#define DWL_HTTP 0x0008 + +static void test_download(DWORD flags) { HWND hwnd; MSG msg; @@ -2773,17 +2778,16 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) test_readyState(NULL); - if(verb_done) { + if(flags & (DWL_VERBDONE|DWL_HTTP)) SET_EXPECT(Exec_SETPROGRESSMAX); - if(!load_from_stream) - SET_EXPECT(GetHostInfo); - } + if((flags & DWL_VERBDONE) && !load_from_stream) + SET_EXPECT(GetHostInfo); SET_EXPECT(SetStatusText); SET_EXPECT(Exec_SETDOWNLOADSTATE_1); SET_EXPECT(GetDropTarget); - if(css_try_dwl) + if(flags & DWL_TRYCSS) SET_EXPECT(Exec_ShellDocView_84); - if(css_dwl) { + if(flags & DWL_CSS) { SET_EXPECT(CreateInstance); SET_EXPECT(Start); SET_EXPECT(LockRequest); @@ -2817,17 +2821,18 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) DispatchMessage(&msg); } - if(verb_done) { + if(flags & DWL_VERBDONE) CHECK_CALLED(Exec_SETPROGRESSMAX); - if(!load_from_stream) - CHECK_CALLED(GetHostInfo); - } + if(flags & DWL_HTTP) + SET_CALLED(Exec_SETPROGRESSMAX); + if((flags & DWL_VERBDONE) && !load_from_stream) + CHECK_CALLED(GetHostInfo); CHECK_CALLED(SetStatusText); CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); CHECK_CALLED(GetDropTarget); - if(css_try_dwl) + if(flags & DWL_TRYCSS) SET_CALLED(Exec_ShellDocView_84); - if(css_dwl) { + if(flags & DWL_CSS) { if(called_CreateInstance) { CHECK_CALLED(CreateInstance); CHECK_CALLED(Start); @@ -3878,7 +3883,7 @@ static void test_HTMLDocument(BOOL do_load) test_Activate(unk, CLIENTSITE_EXPECTPATH); if(do_load) { - test_download(FALSE, TRUE, TRUE); + test_download(DWL_CSS|DWL_TRYCSS); test_GetCurMoniker(unk, &Moniker, NULL); } @@ -3973,7 +3978,7 @@ static void test_HTMLDocument_hlink(void) return; } - test_download(FALSE, TRUE, TRUE); + test_download(DWL_CSS|DWL_TRYCSS); test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); @@ -4025,7 +4030,7 @@ static void test_HTMLDocument_http(void) return; } - test_download(FALSE, FALSE, FALSE); + test_download(DWL_HTTP); test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); @@ -4077,7 +4082,7 @@ static void test_HTMLDocument_StreamLoad(void) test_GetCurMoniker(unk, NULL, NULL); test_StreamLoad(unk); - test_download(TRUE, FALSE, TRUE); + test_download(DWL_VERBDONE|DWL_TRYCSS); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_UIDeactivate(); @@ -4158,7 +4163,7 @@ static void test_editing_mode(BOOL do_load) IOleObject_Release(oleobj); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); - test_download(TRUE, do_load, do_load); + test_download(DWL_VERBDONE | (do_load ? DWL_CSS|DWL_TRYCSS : 0)); SET_EXPECT(SetStatusText); /* ignore race in native mshtml */ test_timer(EXPECT_UPDATEUI);

1 0