August 2010 - Wine-Commits - list.winehq.org

Rico Schüller : d3d10: Forward D3D10CreateBlob to d3dcompiler_43.dll.
by Alexandre Julliard Aug. 17, 2010

Aug. 17, 2010

Module: wine Branch: master Commit: 1394627fccc48958c340768f605139522ad1f0e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1394627fccc48958c340768f6… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Aug 15 17:05:43 2010 +0200 d3d10: Forward D3D10CreateBlob to d3dcompiler_43.dll. --- dlls/d3d10/d3d10.spec | 2 +- include/d3d10misc.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 97ac7a9..e108a5c 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -1,6 +1,6 @@ @ stub D3D10CompileEffectFromMemory @ stub D3D10CompileShader -@ stub D3D10CreateBlob +@ stdcall D3D10CreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob @ stdcall D3D10CreateDevice(ptr long ptr long long ptr) @ stdcall D3D10CreateDeviceAndSwapChain(ptr long ptr long long ptr ptr ptr) @ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) diff --git a/include/d3d10misc.h b/include/d3d10misc.h index 58a6d26..9f7f8e9 100644 --- a/include/d3d10misc.h +++ b/include/d3d10misc.h @@ -39,6 +39,8 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER HMODULE swrast, UINT flags, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device **device); +HRESULT WINAPI D3D10CreateBlob(SIZE_T data_size, ID3D10Blob **blob); + #ifdef __cplusplus } #endif

1 0

Rico Schüller : d3d10: Fix d3dcommon.h inclusion.
by Alexandre Julliard Aug. 17, 2010

Aug. 17, 2010

Module: wine Branch: master Commit: 09b347aedac459184e4b002107385423ce7db9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b347aedac459184e4b00210… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Aug 15 17:05:19 2010 +0200 d3d10: Fix d3dcommon.h inclusion. --- include/d3d10.idl | 1 + include/d3dcommon.idl | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index 6205917..ce3807b 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -19,6 +19,7 @@ import "oaidl.idl"; import "ocidl.idl"; import "dxgi.idl"; +import "d3dcommon.idl"; cpp_quote("#ifndef _D3D10_CONSTANTS") cpp_quote("#define _D3D10_CONSTANTS") diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 6cba9d2..217b365 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -35,12 +35,13 @@ typedef struct _D3D_SHADER_MACRO* LPD3D_SHADER_MACRO; interface ID3D10Blob : IUnknown { void *GetBufferPointer(); - DWORD GetBufferSize(); + SIZE_T GetBufferSize(); } typedef ID3D10Blob* LPD3D10BLOB; typedef ID3D10Blob ID3DBlob; typedef ID3DBlob* LPD3DBLOB; +cpp_quote("#define IID_ID3DBlob IID_ID3D10Blob") typedef enum _D3D_INCLUDE_TYPE {

1 0

Rico Schüller : d3dcompiler: Implement ID3DBlob:: GetBufferSize().
by Alexandre Julliard Aug. 17, 2010

Aug. 17, 2010

Module: wine Branch: master Commit: fa456a61bc289c9f3bc19cd7ef13482742e4fe7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa456a61bc289c9f3bc19cd7e… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Aug 15 17:05:40 2010 +0200 d3dcompiler: Implement ID3DBlob::GetBufferSize(). --- dlls/d3dcompiler_43/blob.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 9fb7b4b..dd3c388 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -86,9 +86,11 @@ static void * STDMETHODCALLTYPE d3dcompiler_blob_GetBufferPointer(ID3DBlob *ifac static SIZE_T STDMETHODCALLTYPE d3dcompiler_blob_GetBufferSize(ID3DBlob *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface; + + TRACE("iface %p\n", iface); - return 0; + return blob->size; } const struct ID3D10BlobVtbl d3dcompiler_blob_vtbl =

1 0

Rico Schüller : d3dcompiler: Implement ID3DBlob:: GetBufferPointer().
by Alexandre Julliard Aug. 17, 2010

Aug. 17, 2010

Module: wine Branch: master Commit: d889800bebd74f1a168f7b570f9feb411c2e440c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d889800bebd74f1a168f7b570… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Aug 15 17:05:34 2010 +0200 d3dcompiler: Implement ID3DBlob::GetBufferPointer(). --- dlls/d3dcompiler_43/blob.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index e5d11e5..9fb7b4b 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -77,9 +77,11 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_Release(ID3DBlob *iface) static void * STDMETHODCALLTYPE d3dcompiler_blob_GetBufferPointer(ID3DBlob *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface; + + TRACE("iface %p\n", iface); - return NULL; + return blob->data; } static SIZE_T STDMETHODCALLTYPE d3dcompiler_blob_GetBufferSize(ID3DBlob *iface)

1 0

Rico Schüller : d3dcompiler: Implement D3DCreateBlob() .
by Alexandre Julliard Aug. 17, 2010

Aug. 17, 2010

Module: wine Branch: master Commit: d511f18f9e97299f64757dff9eb7756f8d262c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d511f18f9e97299f64757dff9… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Aug 15 17:05:31 2010 +0200 d3dcompiler: Implement D3DCreateBlob(). --- dlls/d3dcompiler_43/Makefile.in | 2 + dlls/d3dcompiler_43/blob.c | 117 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 37 +++++++++ dlls/d3dcompiler_43/d3dcompiler_private.h | 50 ++++++++++++ 5 files changed, 207 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index 2510af4..806cb08 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -4,8 +4,10 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dcompiler_43.dll IMPORTLIB = d3dcompiler +IMPORTS = dxguid uuid C_SRCS = \ + blob.c \ d3dcompiler_43_main.c RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c new file mode 100644 index 0000000..e5d11e5 --- /dev/null +++ b/dlls/d3dcompiler_43/blob.c @@ -0,0 +1,117 @@ +/* + * Direct3D blob file + * + * Copyright 2010 Rico Schüller + * + * 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 + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3dcompiler_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3dcompiler_blob_QueryInterface(ID3DBlob *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10Blob) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3dcompiler_blob_AddRef(ID3DBlob *iface) +{ + struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface; + ULONG refcount = InterlockedIncrement(&blob->refcount); + + TRACE("%p increasing refcount to %u\n", blob, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3dcompiler_blob_Release(ID3DBlob *iface) +{ + struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface; + ULONG refcount = InterlockedDecrement(&blob->refcount); + + TRACE("%p decreasing refcount to %u\n", blob, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, blob->data); + HeapFree(GetProcessHeap(), 0, blob); + } + + return refcount; +} + +/* ID3DBlob methods */ + +static void * STDMETHODCALLTYPE d3dcompiler_blob_GetBufferPointer(ID3DBlob *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static SIZE_T STDMETHODCALLTYPE d3dcompiler_blob_GetBufferSize(ID3DBlob *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +const struct ID3D10BlobVtbl d3dcompiler_blob_vtbl = +{ + /* IUnknown methods */ + d3dcompiler_blob_QueryInterface, + d3dcompiler_blob_AddRef, + d3dcompiler_blob_Release, + /* ID3DBlob methods */ + d3dcompiler_blob_GetBufferPointer, + d3dcompiler_blob_GetBufferSize, +}; + +HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) +{ + blob->vtbl = &d3dcompiler_blob_vtbl; + blob->refcount = 1; + blob->size = data_size; + + blob->data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data_size); + if (!blob->data) + { + ERR("Failed to allocate D3D blob data memory\n"); + return E_OUTOFMEMORY; + } + + return S_OK; +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index ab6e1d7..13c13a6 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -2,7 +2,7 @@ @ stub DebugSetMute @ stub D3DCompile @ stub D3DCompressShaders -@ stub D3DCreateBlob +@ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders @ stub D3DDisassemble10Effect @ stub D3DDisassemble diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index cdf69b7..fa331b9 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -27,6 +27,8 @@ #include "winbase.h" #include "wine/debug.h" +#include "d3dcompiler_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) @@ -43,3 +45,38 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) +{ + struct d3dcompiler_blob *object; + HRESULT hr; + + TRACE("data_size %lu, blob %p\n", data_size, blob); + + if (!blob) + { + WARN("Invalid blob specified.\n"); + return D3DERR_INVALIDCALL; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D blob object memory\n"); + return E_OUTOFMEMORY; + } + + hr = d3dcompiler_blob_init(object, data_size); + if (FAILED(hr)) + { + WARN("Failed to initialize blob, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + *blob = (ID3DBlob *)object; + + TRACE("Created ID3DBlob %p\n", object); + + return S_OK; +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h new file mode 100644 index 0000000..0c7cba1 --- /dev/null +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -0,0 +1,50 @@ +/* + * Copyright 2010 Rico Schüller + * + * 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 + */ + +#ifndef __WINE_D3DCOMPILER_PRIVATE_H +#define __WINE_D3DCOMPILER_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +#include "d3dcompiler.h" + +/* + * This doesn't belong here, but for some functions it is possible to return that value, + * see http://msdn.microsoft.com/en-us/library/bb205278%28v=VS.85%29.aspx + * The original definition is in D3DX10core.h. + */ +#define D3DERR_INVALIDCALL 0x8876086c + +/* ID3DBlob */ +struct d3dcompiler_blob +{ + const struct ID3D10BlobVtbl *vtbl; + LONG refcount; + + SIZE_T size; + void *data; +}; + +HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) DECLSPEC_HIDDEN; + +#endif /* __WINE_D3DCOMPILER_PRIVATE_H */

1 0

Jacek Caban : dbghelp: Silence template related dwarf FIXMEs.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 1a1ffe60fdb0fa0e5e23e3c2b7247bfecbfcbae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1ffe60fdb0fa0e5e23e3c2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 15:12:46 2010 +0200 dbghelp: Silence template related dwarf FIXMEs. --- dlls/dbghelp/dwarf.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4fec9cc..a0fcc12 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1300,6 +1300,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, /* FIXME: we need to handle nested udt definitions */ case DW_TAG_inheritance: case DW_TAG_subprogram: + case DW_TAG_template_type_param: + case DW_TAG_template_value_param: case DW_TAG_variable: /* FIXME: some C++ related stuff */ break; @@ -1771,6 +1773,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, /* the type referred to will be loaded when we need it, so skip it */ break; case DW_TAG_unspecified_parameters: + case DW_TAG_template_type_param: + case DW_TAG_template_value_param: /* FIXME: no support in dbghelp's internals so far */ break; default:

1 0

Piotr Caban : msvcp90: Added char_traits<unsigned short> 64-bit exports.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 96c622dfc895814bdfd0b344f797307cc3a1360d URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c622dfc895814bdfd0b344f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 16 11:06:17 2010 +0200 msvcp90: Added char_traits<unsigned short> 64-bit exports. --- dlls/msvcp90/msvcp90.spec | 30 +++++++++++++++--------------- dlls/msvcp90/string.c | 39 +++++++++++++++++++++++++++------------ 2 files changed, 42 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96c622dfc895814bdfd0b…

1 0

Gerald Pfeifer : d3dx9_36: minwidth and minheight are set but not used in point_filter_simple_data; remove them.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: f781be07fc2927bc8e6693053782f0e6068c55f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f781be07fc2927bc8e6693053… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 15 23:52:30 2010 +0200 d3dx9_36: minwidth and minheight are set but not used in point_filter_simple_data; remove them. --- dlls/d3dx9_36/surface.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 82881bc..487f06f 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -573,15 +573,11 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT sr struct argb_conversion_info conv_info; DWORD channels[4]; - UINT minwidth, minheight; UINT x, y; ZeroMemory(channels, sizeof(channels)); init_argb_conversion_info(srcformat, destformat, &conv_info); - minwidth = (srcsize.x < destsize.x) ? srcsize.x : destsize.x; - minheight = (srcsize.y < destsize.y) ? srcsize.y : destsize.y; - for(y = 0;y < destsize.y;y++) { BYTE *destptr = dest + y * destpitch; const BYTE *bufptr = src + srcpitch * (y * srcsize.y / destsize.y);

1 0

Piotr Caban : msvcp90: Added char_traits<char> 64-bit exports.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 2ef0077d6b87c07113b7715d9fc9ca35d752e97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef0077d6b87c07113b7715d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 16 11:05:39 2010 +0200 msvcp90: Added char_traits<char> 64-bit exports. --- dlls/msvcp90/msvcp90.spec | 30 +++++++++++++++--------------- dlls/msvcp90/string.c | 33 ++++++++++++++++++++++++--------- 2 files changed, 39 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ef0077d6b87c07113b77…

1 0

Matteo Bruni : wined3d: Call set_render_offscreen at the end of context_setup_target.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: e0528084b19a6f3c27d1af20aabfd512c0dca95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0528084b19a6f3c27d1af20a… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Aug 7 22:35:31 2010 +0200 wined3d: Call set_render_offscreen at the end of context_setup_target. This fixes a regression caused by 20f51c29a99299384e840e148f02aae66bfb45be. --- dlls/wined3d/context.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e22149c..93b4228 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2278,8 +2278,6 @@ static void context_setup_target(IWineD3DDeviceImpl *device, render_offscreen = surface_is_offscreen(target); if (context->current_rt == target && render_offscreen == old_render_offscreen) return; - context_set_render_offscreen(context, StateTable, render_offscreen); - /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers * the alpha blend state changes with different render target formats. */ if (!context->current_rt) @@ -2347,6 +2345,7 @@ static void context_setup_target(IWineD3DDeviceImpl *device, context->draw_buffer_dirty = TRUE; context->current_rt = target; + context_set_render_offscreen(context, StateTable, render_offscreen); } /*****************************************************************************

1 0