February 2007 - Wine-commits

Mike McCormack : msi: Find pending custom actions by GUID.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: d50c62884a4bbd5835f0ab9aaaa1598fa13cf022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50c62884a4bbd5835f0ab9aa… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 13 22:48:05 2007 +0900 msi: Find pending custom actions by GUID. --- dlls/msi/custom.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++----- dlls/msi/msipriv.h | 1 - dlls/msi/package.c | 1 - 3 files changed, 74 insertions(+), 11 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 4fc1ea9..ba5c825 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -61,12 +61,24 @@ static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, typedef UINT (WINAPI *MsiCustomActionEntryPoint)( MSIHANDLE ); +static CRITICAL_SECTION msi_custom_action_cs; +static CRITICAL_SECTION_DEBUG msi_custom_action_cs_debug = +{ + 0, 0, &msi_custom_action_cs, + { &msi_custom_action_cs_debug.ProcessLocksList, + &msi_custom_action_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": msi_custom_action_cs") } +}; +static CRITICAL_SECTION msi_custom_action_cs = { &msi_custom_action_cs_debug, -1, 0, 0, 0, 0 }; + +static struct list msi_pending_custom_actions = LIST_INIT( msi_pending_custom_actions ); + static BOOL check_execution_scheduling_options(MSIPACKAGE *package, LPCWSTR action, UINT options) { if (!package->script) return TRUE; - if ((options & msidbCustomActionTypeClientRepeat) == + if ((options & msidbCustomActionTypeClientRepeat) == msidbCustomActionTypeClientRepeat) { if (!(package->script->InWhatSequence & SEQUENCE_UI && @@ -405,11 +417,14 @@ typedef struct _msi_custom_action_info { HANDLE handle; LPWSTR action; INT type; + GUID guid; } msi_custom_action_info; static void free_custom_action_data( msi_custom_action_info *info ) { + EnterCriticalSection( &msi_custom_action_cs ); list_remove( &info->entry ); + LeaveCriticalSection( &msi_custom_action_cs ); if (info->handle) CloseHandle( info->handle ); msi_free( info->action ); @@ -445,15 +460,46 @@ static UINT wait_thread_handle( msi_custom_action_info *info ) return rc; } +static msi_custom_action_info *find_action_by_guid( const LPGUID guid ) +{ + msi_custom_action_info *info; + BOOL found = FALSE; + + EnterCriticalSection( &msi_custom_action_cs ); + + LIST_FOR_EACH_ENTRY( info, &msi_pending_custom_actions, msi_custom_action_info, entry ) + { + if (IsEqualGUID( &info->guid, guid )) + { + found = TRUE; + break; + } + } + + LeaveCriticalSection( &msi_custom_action_cs ); + + if (!found) + return NULL; + + return info; +} -static DWORD WINAPI ACTION_CallDllFunction( msi_custom_action_info *info ) +static DWORD WINAPI ACTION_CallDllFunction( const LPGUID guid ) { + msi_custom_action_info *info; MsiCustomActionEntryPoint fn; MSIHANDLE hPackage; HANDLE hModule; LPSTR proc; UINT r = ERROR_FUNCTION_FAILED; + info = find_action_by_guid( guid ); + if (!info) + { + ERR("failed to find action %s\n", debugstr_guid( guid) ); + return r; + } + TRACE("%s %s\n", debugstr_w( info->dllname ), debugstr_w( info->function ) ); hModule = LoadLibraryW( info->dllname ); @@ -488,12 +534,12 @@ static DWORD WINAPI ACTION_CallDllFunction( msi_custom_action_info *info ) static DWORD WINAPI DllThread( LPVOID arg ) { - msi_custom_action_info *info = arg; + LPGUID guid = arg; DWORD rc = 0; TRACE("custom action (%x) started\n", GetCurrentThreadId() ); - rc = ACTION_CallDllFunction( info ); + rc = ACTION_CallDllFunction( guid ); TRACE("custom action (%x) returned %i\n", GetCurrentThreadId(), rc ); @@ -516,9 +562,13 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( info->function = strdupW( function ); info->dllname = strdupW( dllname ); info->action = strdupW( action ); - list_add_tail( &package->pending_custom_actions, &info->entry ); + CoCreateGuid( &info->guid ); + + EnterCriticalSection( &msi_custom_action_cs ); + list_add_tail( &msi_pending_custom_actions, &info->entry ); + LeaveCriticalSection( &msi_custom_action_cs ); - info->handle = CreateThread( NULL, 0, DllThread, info, 0, NULL ); + info->handle = CreateThread( NULL, 0, DllThread, &info->guid, 0, NULL ); if (!info->handle) { free_custom_action_data( info ); @@ -823,12 +873,27 @@ void ACTION_FinishCustomActions(MSIPACKAGE* package) msi_free( action ); } - while ((item = list_head( &package->pending_custom_actions ))) + while (1) { + HANDLE handle; msi_custom_action_info *info; + EnterCriticalSection( &msi_custom_action_cs ); + item = list_head( &msi_pending_custom_actions ); info = LIST_ENTRY( item, msi_custom_action_info, entry ); - msi_dialog_check_messages( info->handle ); - free_custom_action_data( info ); + + if (item && info->package == package ) + { + handle = info->handle; + free_custom_action_data( info ); + } + else + handle = NULL; + LeaveCriticalSection( &msi_custom_action_cs ); + + if (!item) + break; + + msi_dialog_check_messages( handle ); } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 09a3e55..b01bb27 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -230,7 +230,6 @@ typedef struct tagMSIPACKAGE struct tagMSISCRIPT *script; struct list RunningActions; - struct list pending_custom_actions; LPWSTR BaseURL; LPWSTR PackagePath; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f0163c4..b78910d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -490,7 +490,6 @@ static MSIPACKAGE *msi_alloc_package( void ) list_init( &package->extensions ); list_init( &package->progids ); list_init( &package->RunningActions ); - list_init( &package->pending_custom_actions ); for (i=0; i<PROPERTY_HASH_SIZE; i++) list_init( &package->props[i] );

1 0

Lei Zhang : tools/wineshelllink: Create links with WINEPREFIX.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 9a3a144896e2acf6c40e8e90a17b3478622d8450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a3a144896e2acf6c40e8e90a… Author: Lei Zhang <thestig(a)google.com> Date: Tue Feb 13 15:01:26 2007 -0800 tools/wineshelllink: Create links with WINEPREFIX. --- tools/wineshelllink | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index ad11b8c..55a1942 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -87,7 +87,7 @@ desktop_entry() cat <<EOF [Desktop Entry] Name=$linkname -Exec=wine "$path" $args +Exec=env WINEPREFIX="${WINEPREFIX:-$HOME/.wine}" wine "$path" $args Type=Application EOF [ -z "$descr" ] || echo "Comment=$descr"

1 0

Dmitry Timoshkov : user32: Avoid sending unwanted DM_GETDEFID/ DM_SETDEFID messages.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: f407e9a05d587216655360d3659f7ffcdbd95066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f407e9a05d587216655360d36… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 14 18:45:45 2007 +0800 user32: Avoid sending unwanted DM_GETDEFID/DM_SETDEFID messages. --- dlls/user32/tests/msg.c | 85 +++++++++------------------------------------- 1 files changed, 17 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f407e9a05d58721665536…

1 0

H. Verbeet : d3d8: Don't store the d3d8 declaration in the wined3d object.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 157205c0856a0dc5ecd8d859f64f111c21c54c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157205c0856a0dc5ecd8d859f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 23:12:45 2007 +0100 d3d8: Don't store the d3d8 declaration in the wined3d object. --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 8 +- dlls/d3d8/vertexdeclaration.c | 105 ++++++++++++ dlls/wined3d/vertexdeclaration.c | 340 ++------------------------------------ dlls/wined3d/wined3d_private.h | 4 - 5 files changed, 130 insertions(+), 328 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=157205c0856a0dc5ecd8d…

1 0

H. Verbeet : d3d9: Don't store the d3d9 declaration in the wined3d object.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: dea795f7ac6bfabe0c90f6d36d295a33d36996dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea795f7ac6bfabe0c90f6d36… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 23:12:36 2007 +0100 d3d9: Don't store the d3d9 declaration in the wined3d object. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/d3d9_private.h | 3 + dlls/d3d9/vertexdeclaration.c | 72 +++++++++++++++++++++++--- dlls/wined3d/device.c | 10 +++- dlls/wined3d/vertexdeclaration.c | 105 ++++++++++---------------------------- dlls/wined3d/wined3d_private.h | 4 -- include/wine/wined3d_interface.h | 10 ++-- 7 files changed, 109 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dea795f7ac6bfabe0c90f…

1 0

H. Verbeet : d3d8: Move loading local d3d8 vertex shader constants from wined3d to d3d8.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: efed9aea1ff7a5cf724a7a3dbe6d0c8498611a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=efed9aea1ff7a5cf724a7a3db… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 23:12:40 2007 +0100 d3d8: Move loading local d3d8 vertex shader constants from wined3d to d3d8. --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 2 + dlls/d3d8/vertexdeclaration.c | 156 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/arb_program_shader.c | 40 ++------- dlls/wined3d/glsl_shader.c | 56 ++++---------- dlls/wined3d/vertexdeclaration.c | 30 ------- dlls/wined3d/vertexshader.c | 29 +++++++- dlls/wined3d/wined3d_private.h | 3 - include/wine/wined3d_interface.h | 20 +++-- 9 files changed, 221 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efed9aea1ff7a5cf724a7…

1 0

H. Verbeet : wined3d: Get rid of the vertexDeclaration field in IWineD3DVertexShaderImpl.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 32e5cac2bee2a1a01504deb1fb2e7661e0031439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32e5cac2bee2a1a01504deb1f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 23:12:29 2007 +0100 wined3d: Get rid of the vertexDeclaration field in IWineD3DVertexShaderImpl. --- dlls/d3d8/device.c | 9 +++++++-- dlls/wined3d/arb_program_shader.c | 4 +--- dlls/wined3d/device.c | 17 +++-------------- dlls/wined3d/drawprim.c | 11 +---------- dlls/wined3d/glsl_shader.c | 5 +---- dlls/wined3d/state.c | 4 +--- dlls/wined3d/vertexshader.c | 36 +++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d_interface.h | 4 +++- 9 files changed, 32 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32e5cac2bee2a1a01504d…

1 0

H. Verbeet : d3d8: Add an IDirect3DVertexDeclaration8 class to hold the wined3d vertex declaration .
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: a0b417725a1f55589078c9de5194faf5effb3491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b417725a1f55589078c9de5… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 23:12:19 2007 +0100 d3d8: Add an IDirect3DVertexDeclaration8 class to hold the wined3d vertex declaration. --- dlls/d3d8/Makefile.in | 1 + dlls/d3d8/d3d8_private.h | 32 +++++++++++++++++ dlls/d3d8/vertexdeclaration.c | 76 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in index 87f4812..15bc92a 100644 --- a/dlls/d3d8/Makefile.in +++ b/dlls/d3d8/Makefile.in @@ -21,6 +21,7 @@ C_SRCS = \ swapchain.c \ texture.c \ vertexbuffer.c \ + vertexdeclaration.c \ vertexshader.c \ volume.c \ volumetexture.c diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 0466137..0af3c56 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -437,6 +437,9 @@ struct IDirect3DVolumeTexture8Impl DEFINE_GUID(IID_IDirect3DStateBlock8, 0x83b073ce, 0x6f30, 0x11d9, 0xc6, 0x87, 0x0, 0x4, 0x61, 0x42, 0xc1, 0x4f); +DEFINE_GUID(IID_IDirect3DVertexDeclaration8, +0x5dd7478d, 0xcbf3, 0x41a6, 0x8c, 0xfd, 0xfd, 0x19, 0x2b, 0x11, 0xc7, 0x90); + DEFINE_GUID(IID_IDirect3DVertexShader8, 0xefc5557e, 0x6265, 0x4613, 0x8a, 0x94, 0x43, 0x85, 0x78, 0x89, 0xeb, 0x36); @@ -488,6 +491,35 @@ typedef struct IDirect3DStateBlock8Impl { } IDirect3DStateBlock8Impl; /***************************************************************************** + * IDirect3DVertexDeclaration8 interface + */ +#define INTERFACE IDirect3DVertexDeclaration8 +DECLARE_INTERFACE_(IDirect3DVertexDeclaration8, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** obj_ptr) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; +}; +#undef INTERFACE + +/*** IUnknown methods ***/ +#define IDirect3DVertexDeclaration8_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DVertexDeclaration8_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DVertexDeclaration8_Release(p) (p)->lpVtbl->Release(p) + +/*** Implementation ***/ +extern const IDirect3DVertexDeclaration8Vtbl Direct3DVertexDeclaration8_Vtbl; + +typedef struct { + const IDirect3DVertexDeclaration8Vtbl *lpVtbl; + LONG ref_count; + + IWineD3DVertexDeclaration *wined3d_vertex_declaration; +} IDirect3DVertexDeclaration8Impl; + + +/***************************************************************************** * IDirect3DVertexShader9 interface */ #define INTERFACE IDirect3DVertexShader8 diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c new file mode 100644 index 0000000..8f1e91b --- /dev/null +++ b/dlls/d3d8/vertexdeclaration.c @@ -0,0 +1,76 @@ +/* + * IDirect3DVertexDeclaration8 implementation + * + * Copyright 2007 Henri Verbeet + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* IDirect3DVertexDeclaration8 is internal to our implementation. + * It's not visible in the API. */ + +#include "config.h" +#include "d3d8_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d8); + +/* IUnknown */ +static HRESULT WINAPI IDirect3DVertexDeclaration8Impl_QueryInterface(IDirect3DVertexDeclaration8 *iface, REFIID riid, void **obj_ptr) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj_ptr); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDirect3DVertexDeclaration8)) + { + IUnknown_AddRef(iface); + *obj_ptr = iface; + return S_OK; + } + + *obj_ptr = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI IDirect3DVertexDeclaration8Impl_AddRef(IDirect3DVertexDeclaration8 *iface) +{ + IDirect3DVertexDeclaration8Impl *This = (IDirect3DVertexDeclaration8Impl *)iface; + + ULONG ref_count = InterlockedIncrement(&This->ref_count); + TRACE("(%p) : AddRef increasing to %d\n", This, ref_count); + + return ref_count; +} + +static ULONG WINAPI IDirect3DVertexDeclaration8Impl_Release(IDirect3DVertexDeclaration8 *iface) +{ + IDirect3DVertexDeclaration8Impl *This = (IDirect3DVertexDeclaration8Impl *)iface; + + ULONG ref_count = InterlockedDecrement(&This->ref_count); + TRACE("(%p) : Releasing to %d\n", This, ref_count); + + if (!ref_count) { + IWineD3DVertexDeclaration_Release(This->wined3d_vertex_declaration); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref_count; +} + +const IDirect3DVertexDeclaration8Vtbl Direct3DVertexDeclaration8_Vtbl = +{ + IDirect3DVertexDeclaration8Impl_QueryInterface, + IDirect3DVertexDeclaration8Impl_AddRef, + IDirect3DVertexDeclaration8Impl_Release +};

1 0

H. Verbeet : d3d8: Store the d3d8 vertex declaration in the d3d8 vertex shader.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 5ad6766c85d4978ad535e5ec4c066f6bec5d7e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad6766c85d4978ad535e5ec4… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 23:12:24 2007 +0100 d3d8: Store the d3d8 vertex declaration in the d3d8 vertex shader. --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/d3d8/vertexshader.c | 1 + 3 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 0af3c56..d35f351 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -586,6 +586,7 @@ struct IDirect3DVertexShader8Impl { LONG ref; shader_handle *handle; + IDirect3DVertexDeclaration8 *vertex_declaration; IWineD3DVertexShader *wineD3DVertexShader; }; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 18b79ce..d82919c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1162,6 +1162,35 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ProcessVertices(LPDIRECT3DDEVICE8 ifa return IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, ((IDirect3DVertexBuffer8Impl *)pDestBuffer)->wineD3DVertexBuffer, NULL, Flags); } +static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexDeclaration(IDirect3DDevice8 *iface, CONST DWORD *declaration, IDirect3DVertexDeclaration8 **decl_ptr) { + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + IDirect3DVertexDeclaration8Impl *object; + HRESULT hr = D3D_OK; + + TRACE("(%p) : declaration %p\n", This, declaration); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) { + ERR("Memory allocation failed\n"); + *decl_ptr = NULL; + return D3DERR_OUTOFVIDEOMEMORY; + } + + object->ref_count = 1; + object->lpVtbl = &Direct3DVertexDeclaration8_Vtbl; + + hr = IWineD3DDevice_CreateVertexDeclaration(This->WineD3DDevice, declaration, &object->wined3d_vertex_declaration, (IUnknown *)object); + if (FAILED(hr)) { + ERR("(%p) : IWineD3DDevice_CreateVertexDeclaration call failed\n", This); + HeapFree(GetProcessHeap(), 0, object); + } else { + *decl_ptr = (IDirect3DVertexDeclaration8 *)object; + TRACE("(%p) : Created vertex declaration %p\n", This, object); + } + + return hr; +} + static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 iface, CONST DWORD* pDeclaration, CONST DWORD* pFunction, DWORD* ppShader, DWORD Usage) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hrc = D3D_OK; @@ -1178,6 +1207,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 object->ref = 1; object->lpVtbl = &Direct3DVertexShader8_Vtbl; + + hrc = IDirect3DDevice8Impl_CreateVertexDeclaration(iface, pDeclaration, &object->vertex_declaration); + if (FAILED(hrc)) { + ERR("(%p) : IDirect3DDeviceImpl_CreateVertexDeclaration call failed\n", This); + HeapFree(GetProcessHeap(), 0, object); + *ppShader = 0; + return D3DERR_INVALIDCALL; + } + /* Usage is missing ..*/ hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, pDeclaration, pFunction, &object->wineD3DVertexShader, (IUnknown *)object); diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c index 2f22e31..89555bd 100644 --- a/dlls/d3d8/vertexshader.c +++ b/dlls/d3d8/vertexshader.c @@ -56,6 +56,7 @@ static ULONG WINAPI IDirect3DVertexShader8Impl_Release(IDirect3DVertexShader8 *i TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + IDirect3DVertexDeclaration8_Release(This->vertex_declaration); IWineD3DVertexShader_Release(This->wineD3DVertexShader); HeapFree(GetProcessHeap(), 0, This); }

1 0

H. Verbeet : wined3d: Get rid of WINED3DSHADERDECLUSAGE.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 942bef9e8681116857b84344c7ff823246b382e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=942bef9e8681116857b84344c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 23:12:10 2007 +0100 wined3d: Get rid of WINED3DSHADERDECLUSAGE. --- include/wine/wined3d_types.h | 41 ----------------------------------------- 1 files changed, 0 insertions(+), 41 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 587b7cd..2784ff8 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1310,47 +1310,6 @@ typedef struct _WINEDDOVERLAYFX DWORD dwFlags; /* flags */ } WINEDDOVERLAYFX; -/**************************** - * * Vertex Shaders Declaration - * */ - -typedef enum _WINED3DDECLUSAGE { - WINED3DSHADERDECLUSAGE_POSITION = 0, - WINED3DSHADERDECLUSAGE_BLENDWEIGHT, - WINED3DSHADERDECLUSAGE_BLENDINDICES, - WINED3DSHADERDECLUSAGE_NORMAL, - WINED3DSHADERDECLUSAGE_PSIZE , - WINED3DSHADERDECLUSAGE_TEXCOORD0, - WINED3DSHADERDECLUSAGE_TEXCOORD1, - WINED3DSHADERDECLUSAGE_TEXCOORD2, - WINED3DSHADERDECLUSAGE_TEXCOORD3, - WINED3DSHADERDECLUSAGE_TEXCOORD4, - WINED3DSHADERDECLUSAGE_TEXCOORD5, - WINED3DSHADERDECLUSAGE_TEXCOORD6, - WINED3DSHADERDECLUSAGE_TEXCOORD7, - WINED3DSHADERDECLUSAGE_TANGENT, - WINED3DSHADERDECLUSAGE_BINORMAL, - WINED3DSHADERDECLUSAGE_TESSFACTOR, - WINED3DSHADERDECLUSAGE_POSITIONT, - WINED3DSHADERDECLUSAGE_DIFFUSE, - WINED3DSHADERDECLUSAGE_SPECULAR, - WINED3DSHADERDECLUSAGE_FOG, - WINED3DSHADERDECLUSAGE_DEPTH, - WINED3DSHADERDECLUSAGE_SAMPLE, - WINED3DSHADERDECLUSAGE_POSITION2, - WINED3DSHADERDECLUSAGE_POSITION21, - WINED3DSHADERDECLUSAGE_POSITION22, - WINED3DSHADERDECLUSAGE_POSITION23, - WINED3DSHADERDECLUSAGE_POSITION24, - WINED3DSHADERDECLUSAGE_POSITION25, - WINED3DSHADERDECLUSAGE_POSITION26, - WINED3DSHADERDECLUSAGE_POSITION27, - WINED3DSHADERDECLUSAGE_POSITION28, - WINED3DSHADERDECLUSAGE_NORMAL2, - WINED3DSHADERDECLUSAGE_POSITIONT2, - WINED3DSHADERDECLUSAGE_MAX_USAGE -} WINED3DSHADERDECLUSAGE; - #define WINED3DUSAGE_RENDERTARGET 0x00000001L #define WINED3DUSAGE_DEPTHSTENCIL 0x00000002L #define WINED3DUSAGE_WRITEONLY 0x00000008L

1 0