wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

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

17 Aug '10

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 : d3dcompiler: Implement ID3DBlob:: GetBufferSize().
by Alexandre Julliard 17 Aug '10

17 Aug '10

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 17 Aug '10

17 Aug '10

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 17 Aug '10

17 Aug '10

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

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

17 Aug '10

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

Jacek Caban : dbghelp: Silence template related dwarf FIXMEs.
by Alexandre Julliard 16 Aug '10

16 Aug '10

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

Matteo Bruni : wined3d: Remove isInDraw hack from context_setup_target.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: b6637eb89f14ac65efedfa4fda191b52fd5d330e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6637eb89f14ac65efedfa4fd… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Aug 7 22:37:11 2010 +0200 wined3d: Remove isInDraw hack from context_setup_target. It is conceptually wrong and actually broken too (as the comment there said). Just remove the hack now and properly fix any regression that may come up later by explicitely acquiring the right context where needed (so, in surface_internal_preload and its callees). --- dlls/wined3d/context.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 72b84c9..d7f2cf3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2321,19 +2321,6 @@ static void context_setup_target(IWineD3DDeviceImpl *device, if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && old_render_offscreen && context->current_rt != target) { - BOOL oldInDraw = device->isInDraw; - - /* surface_internal_preload() requires a context to load the - * texture, so it will call context_acquire(). Set isInDraw to true - * to signal surface_internal_preload() that it has a context. */ - - /* FIXME: This is just broken. There's no guarantee whatsoever - * that the currently active context, if any, is appropriate for - * reading back the render target. We should probably call - * context_set_current(context) here and then rely on - * context_acquire() doing the right thing. */ - device->isInDraw = TRUE; - /* Read the back buffer of the old drawable into the destination texture. */ if (context->current_rt->texture_name_srgb) { @@ -2345,8 +2332,6 @@ static void context_setup_target(IWineD3DDeviceImpl *device, } surface_modify_location(context->current_rt, SFLAG_INDRAWABLE, FALSE); - - device->isInDraw = oldInDraw; } }

1 0

Matteo Bruni : wined3d: Fix context_apply_clear_state with ORM = backbuffer .
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: c1450356a7a7c01a607a9031200be0ba9c03b437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1450356a7a7c01a607a90312… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Aug 7 15:29:41 2010 +0200 wined3d: Fix context_apply_clear_state with ORM = backbuffer. --- dlls/wined3d/context.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 93b4228..72b84c9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1972,7 +1972,7 @@ static void context_apply_draw_buffer(struct wined3d_context *context, BOOL blit { ENTER_GL(); glDrawBuffer(surface_get_gl_buffer(rt)); - checkGLcall("glDrawBuffers()"); + checkGLcall("glDrawBuffer()"); LEAVE_GL(); } else @@ -2172,22 +2172,29 @@ void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm } else { - const struct wined3d_gl_info *gl_info = context->gl_info; + ENTER_GL(); - for (i = 0; i < gl_info->limits.buffers; ++i) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (i < rt_count && rts[i]) - context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; - else - context->draw_buffers[i] = GL_NONE; + const struct wined3d_gl_info *gl_info = context->gl_info; + for (i = 0; i < gl_info->limits.buffers; ++i) + { + if (i < rt_count && rts[i]) + context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; + else + context->draw_buffers[i] = GL_NONE; + } + GL_EXTCALL(glDrawBuffersARB(gl_info->limits.buffers, context->draw_buffers)); + checkGLcall("glDrawBuffers()"); + context->draw_buffer_dirty = TRUE; + } + else + { + glDrawBuffer(device->offscreenBuffer); + checkGLcall("glDrawBuffer()"); } - ENTER_GL(); - GL_EXTCALL(glDrawBuffersARB(gl_info->limits.buffers, context->draw_buffers)); - checkGLcall("glDrawBuffers()"); LEAVE_GL(); - - context->draw_buffer_dirty = TRUE; } if (context->last_was_blit)

1 0

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

16 Aug '10

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

Piotr Caban : msvcp90: Added 64-bit char_traits tests.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 084d4ec6525771a33ab226a5a90ae3909926951a URL: http://source.winehq.org/git/wine.git/?a=commit;h=084d4ec6525771a33ab226a5a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 16 11:06:28 2010 +0200 msvcp90: Added 64-bit char_traits tests. --- dlls/msvcp90/tests/misc.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index ab154e9..a3f7401 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -32,7 +32,7 @@ static BYTE (__cdecl *p_char_eq)(const void*, const void*); static BYTE (__cdecl *p_wchar_eq)(const void*, const void*); static BYTE (__cdecl *p_short_eq)(const void*, const void*); -static char* (__cdecl *p_Copy_s)(char*, unsigned int, const char*, unsigned int); +static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -64,15 +64,27 @@ static BOOL init(void) p_set_invalid_parameter_handler(test_invalid_parameter_handler); - p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); - p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); - p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@G@std@@SAXAAGABG@Z"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ + p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@D@std@@SAXAEADAEBD@Z"); + p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@_W@std@@SAXAEA_WAEB_W@Z"); + p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@G@std@@SAXAEAGAEBG@Z"); - p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@D@std@@SA_NABD0@Z"); - p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@_W@std@@SA_NAB_W0@Z"); - p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@G@std@@SA_NABG0@Z"); + p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@D@std@@SA_NAEBD0@Z"); + p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@_W@std@@SA_NAEB_W0@Z"); + p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@G@std@@SA_NAEBG0@Z"); - p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits@D@std@@SAPADPADIPBDI@Z"); + p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits@D@std@@SAPEADPEAD_KPEBD1@Z"); + } else { + p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); + p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); + p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@G@std@@SAXAAGABG@Z"); + + p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@D@std@@SA_NABD0@Z"); + p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@_W@std@@SA_NAB_W0@Z"); + p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@G@std@@SA_NABG0@Z"); + + p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits@D@std@@SAPADPADIPBDI@Z"); + } return TRUE; } @@ -83,7 +95,7 @@ static void test_assign(void) char out[4]; if(!p_char_assign || !p_wchar_assign || !p_short_assign) { - skip("assign tests skipped\n"); + win_skip("assign tests skipped\n"); return; } @@ -114,7 +126,7 @@ static void test_equal(void) BYTE ret; if(!p_char_eq || !p_wchar_eq || !p_short_eq) { - skip("equal tests skipped\n"); + win_skip("equal tests skipped\n"); return; } @@ -146,7 +158,7 @@ static void test_Copy_s(void) char dest[32], *ret; if(!p_Copy_s) { - skip("Copy_s tests skipped\n"); + win_skip("Copy_s tests skipped\n"); return; }

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010