February 2007 - Wine-Commits

Marcus Meissner : bin2res: Use fstat, handle errors.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: da7c2f5f3621ce93cb50c014eb7eda20c6e2ea7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7c2f5f3621ce93cb50c014e… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Feb 13 13:25:34 2007 +0100 bin2res: Use fstat, handle errors. --- tools/bin2res.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/bin2res.c b/tools/bin2res.c index 3ccabb0..d52aebc 100644 --- a/tools/bin2res.c +++ b/tools/bin2res.c @@ -149,7 +149,10 @@ static int process_resources(const char* input_file_name, const char* specific_f int fd, c; if (!(fin = fopen(input_file_name, "r"))) return 0; - if (stat(input_file_name, &st) < 0) return 0; + if (fstat(fileno(fin), &st) < 0) { + fclose (fin); + return 0; + } rc_last_update = st.st_mtime; if (inserting)

1 0

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

Feb. 14, 2007

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 Feb. 14, 2007

Feb. 14, 2007

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 Feb. 14, 2007

Feb. 14, 2007

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 : d3d8: Move loading local d3d8 vertex shader constants from wined3d to d3d8.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

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 : d3d9: Don't store the d3d9 declaration in the wined3d object.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

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 : wined3d: Get rid of the vertexDeclaration field in IWineD3DVertexShaderImpl.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

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 Feb. 14, 2007

Feb. 14, 2007

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 Feb. 14, 2007

Feb. 14, 2007

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: Add WINED3DDECLUSAGE, use it.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 8f0884066f1d61c0268fc62269d2f3cbc4e35ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0884066f1d61c0268fc6226… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 23:12:14 2007 +0100 wined3d: Add WINED3DDECLUSAGE, use it. --- dlls/wined3d/baseshader.c | 28 ++++++++++++++-------------- dlls/wined3d/drawprim.c | 36 ++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 18 +++++++++--------- dlls/wined3d/utils.c | 28 ++++++++++++++-------------- dlls/wined3d/vertexdeclaration.c | 34 +++++++++++++++++----------------- include/wine/wined3d_types.h | 17 +++++++++++++++++ 6 files changed, 89 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f0884066f1d61c0268fc…

1 0