wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Stefan Dösinger : wined3d: Disable the depth stencil if it is smaller than the primary color buffer.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 82f6410bfcc5395bd2d5d58945402d0d736253f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f6410bfcc5395bd2d5d5894… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 11:28:19 2011 +0100 wined3d: Disable the depth stencil if it is smaller than the primary color buffer. This way we get correct behavior if the application has depth and stencil related tests disabled. If we attach the depth stencil GL limits the framebuffer size to the smallest surface, making some parts of the framebuffer inaccessible. --- dlls/wined3d/context.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 86ab77b..499c3d1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -399,6 +399,16 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry; + if (depth_stencil && render_targets && render_targets[0]) + { + if (depth_stencil->resource.width < render_targets[0]->resource.width || + depth_stencil->resource.height < render_targets[0]->resource.height) + { + WARN("Depth stencil is smaller than the primary color buffer, disabling\n"); + depth_stencil = NULL; + } + } + LIST_FOR_EACH_ENTRY(entry, &context->fbo_list, struct fbo_entry, entry) { if (!memcmp(entry->render_targets,

1 0

Stefan Dösinger : wined3d: Check the framebuffer setup in ValidateDevice.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 0fc6381bc77c67c838062cf6d963124b3940ceb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc6381bc77c67c838062cf6d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 11:49:01 2011 +0100 wined3d: Check the framebuffer setup in ValidateDevice. --- dlls/wined3d/device.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index be6f900..f121503 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5222,43 +5222,58 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ValidateDevice(IWineD3DDevice *iface, IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DBaseTextureImpl *texture; DWORD i; + const struct wined3d_state *state = &This->stateBlock->state; TRACE("(%p) : %p\n", This, pNumPasses); for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) { - if (This->stateBlock->state.sampler_states[i][WINED3DSAMP_MINFILTER] == WINED3DTEXF_NONE) + if (state->sampler_states[i][WINED3DSAMP_MINFILTER] == WINED3DTEXF_NONE) { WARN("Sampler state %u has minfilter D3DTEXF_NONE, returning D3DERR_UNSUPPORTEDTEXTUREFILTER\n", i); return WINED3DERR_UNSUPPORTEDTEXTUREFILTER; } - if (This->stateBlock->state.sampler_states[i][WINED3DSAMP_MAGFILTER] == WINED3DTEXF_NONE) + if (state->sampler_states[i][WINED3DSAMP_MAGFILTER] == WINED3DTEXF_NONE) { WARN("Sampler state %u has magfilter D3DTEXF_NONE, returning D3DERR_UNSUPPORTEDTEXTUREFILTER\n", i); return WINED3DERR_UNSUPPORTEDTEXTUREFILTER; } - texture = This->stateBlock->state.textures[i]; + texture = state->textures[i]; if (!texture || texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) continue; - if (This->stateBlock->state.sampler_states[i][WINED3DSAMP_MAGFILTER] != WINED3DTEXF_POINT) + if (state->sampler_states[i][WINED3DSAMP_MAGFILTER] != WINED3DTEXF_POINT) { WARN("Non-filterable texture and mag filter enabled on samper %u, returning E_FAIL\n", i); return E_FAIL; } - if (This->stateBlock->state.sampler_states[i][WINED3DSAMP_MINFILTER] != WINED3DTEXF_POINT) + if (state->sampler_states[i][WINED3DSAMP_MINFILTER] != WINED3DTEXF_POINT) { WARN("Non-filterable texture and min filter enabled on samper %u, returning E_FAIL\n", i); return E_FAIL; } - if (This->stateBlock->state.sampler_states[i][WINED3DSAMP_MIPFILTER] != WINED3DTEXF_NONE - && This->stateBlock->state.sampler_states[i][WINED3DSAMP_MIPFILTER] != WINED3DTEXF_POINT) + if (state->sampler_states[i][WINED3DSAMP_MIPFILTER] != WINED3DTEXF_NONE + && state->sampler_states[i][WINED3DSAMP_MIPFILTER] != WINED3DTEXF_POINT) { WARN("Non-filterable texture and mip filter enabled on samper %u, returning E_FAIL\n", i); return E_FAIL; } } + if (state->render_states[WINED3DRS_ZENABLE] || state->render_states[WINED3DRS_ZWRITEENABLE] || + state->render_states[WINED3DRS_STENCILENABLE]) + { + IWineD3DSurfaceImpl *ds = This->depth_stencil; + IWineD3DSurfaceImpl *target = This->render_targets[0]; + + if(ds && target + && (ds->resource.width < target->resource.width || ds->resource.height < target->resource.height)) + { + WARN("Depth stencil is smaller than the color buffer, returning D3DERR_CONFLICTINGRENDERSTATE\n"); + return WINED3DERR_CONFLICTINGRENDERSTATE; + } + } + /* return a sensible default */ *pNumPasses = 1;

1 0

Stefan Dösinger : wined3d: Ignore clears when the framebuffer setup is broken.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 38c213ecda04b8b78278481fa47e47c3da8f1857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c213ecda04b8b78278481fa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 11:15:25 2011 +0100 wined3d: Ignore clears when the framebuffer setup is broken. --- dlls/wined3d/device.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 735cbca..be6f900 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4780,11 +4780,24 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD rect TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, depth %.8e, stencil %u.\n", iface, rect_count, rects, flags, color, depth, stencil); - if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) && !device->depth_stencil) + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { - WARN("Clearing depth and/or stencil without a depth stencil buffer attached, returning WINED3DERR_INVALIDCALL\n"); - /* TODO: What about depth stencil buffers without stencil bits? */ - return WINED3DERR_INVALIDCALL; + IWineD3DSurfaceImpl *ds = device->depth_stencil; + if (!ds) + { + WARN("Clearing depth and/or stencil without a depth stencil buffer attached, returning WINED3DERR_INVALIDCALL\n"); + /* TODO: What about depth stencil buffers without stencil bits? */ + return WINED3DERR_INVALIDCALL; + } + else if (flags & WINED3DCLEAR_TARGET) + { + if(ds->resource.width < device->render_targets[0]->resource.width || + ds->resource.height < device->render_targets[0]->resource.height) + { + WARN("Silently ignoring depth and target clear with mismatching sizes\n"); + return WINED3D_OK; + } + } } device_get_draw_rect(device, &draw_rect);

1 0

Francois Gouget : kernel32: Some spelling tweaks and fixes for the error messages.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 2d441f52ddfb6e761639777bbc19c021486ee93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d441f52ddfb6e761639777bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:11:08 2011 +0100 kernel32: Some spelling tweaks and fixes for the error messages. --- dlls/kernel32/winerror.mc | 18 +++++----- po/ar.po | 50 +++++++++++++------------ po/bg.po | 58 ++++++++++++++++------------- po/ca.po | 47 ++++++++++++------------ po/cs.po | 61 ++++++++++++++++++------------- po/da.po | 59 +++++++++++++++++++----------- po/de.po | 59 +++++++++++++++++++----------- po/el.po | 53 ++++++++++++++------------- po/en.po | 86 ++++++++++++++++++++++---------------------- po/en_US.po | 88 ++++++++++++++++++++++---------------------- po/eo.po | 57 ++++++++++++++++------------- po/es.po | 59 +++++++++++++++++------------- po/fa.po | 50 +++++++++++++------------ po/fi.po | 58 ++++++++++++++++------------- po/fr.po | 60 +++++++++++++++++++----------- po/he.po | 57 ++++++++++++++++------------- po/hi.po | 44 +++++++++++----------- po/hu.po | 53 +++++++++++++++------------ po/it.po | 59 +++++++++++++++++++----------- po/ja.po | 60 +++++++++++++++++++----------- po/ko.po | 60 +++++++++++++++++++----------- po/lt.po | 60 +++++++++++++++++++----------- po/ml.po | 44 +++++++++++----------- po/nb_NO.po | 59 +++++++++++++++++++----------- po/nl.po | 59 +++++++++++++++++++----------- po/or.po | 44 +++++++++++----------- po/pa.po | 44 +++++++++++----------- po/pl.po | 60 +++++++++++++++++++----------- po/pt_BR.po | 59 +++++++++++++++++++----------- po/pt_PT.po | 59 +++++++++++++++++++----------- po/rm.po | 44 +++++++++++----------- po/ro.po | 57 +++++++++++++++++------------ po/ru.po | 60 +++++++++++++++++++----------- po/sk.po | 55 +++++++++++++++------------- po/sl.po | 60 ++++++++++++++++++------------- po/sr_RS(a)cyrillic.po | 54 +++++++++++++++------------- po/sr_RS(a)latin.po | 55 +++++++++++++++------------- po/sv.po | 59 +++++++++++++++++++----------- po/te.po | 44 +++++++++++----------- po/th.po | 56 +++++++++++++++------------- po/tr.po | 57 +++++++++++++++++------------ po/uk.po | 62 ++++++++++++++++++++------------ po/wa.po | 50 +++++++++++++------------ po/wine.pot | 44 +++++++++++----------- po/zh_CN.po | 56 ++++++++++++++++------------- po/zh_TW.po | 56 ++++++++++++++++------------- 46 files changed, 1450 insertions(+), 1103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d441f52ddfb6e7616397…

1 0

Francois Gouget : qcap: Make VfwPin_GetMediaTypeVersion() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: a3029f01d7b3a2d1ff3687645511539458530fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3029f01d7b3a2d1ff3687645… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:32:51 2011 +0100 qcap: Make VfwPin_GetMediaTypeVersion() static. --- dlls/qcap/vfwcapture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 4492eab..8997480 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -684,7 +684,7 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDI return hr; } -LONG WINAPI VfwPin_GetMediaTypeVersion(BasePin *iface) +static LONG WINAPI VfwPin_GetMediaTypeVersion(BasePin *iface) { return 1; }

1 0

Francois Gouget : mscoree: Force_get_runtime_info() is not used so remove it.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: d007d9feeaecee144802648e85011cc81c1fe20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d007d9feeaecee144802648e8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:59:13 2011 +0100 mscoree: Force_get_runtime_info() is not used so remove it. --- dlls/mscoree/metahost.c | 5 ----- dlls/mscoree/mscoree_private.h | 2 -- 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index fb03fb1..878cdee 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1316,8 +1316,3 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, return CLR_E_SHIM_RUNTIME; } - -HRESULT force_get_runtime_info(ICLRRuntimeInfo **result) -{ - return IUnknown_QueryInterface((IUnknown*)&runtimes[0], &IID_ICLRRuntimeInfo, (void**)result); -} diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index aa0ee2e..5428f17 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -51,8 +51,6 @@ typedef struct CLRRuntimeInfo extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result); -extern HRESULT force_get_runtime_info(ICLRRuntimeInfo **result); - extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result); extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk);

1 0

Francois Gouget : d3dx9_36/tests: Replace a malloc() with HeapAlloc() +HeapFree().
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: cb5e480fafe55a14c79af59e20746d3e86f652f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5e480fafe55a14c79af59e2… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:57:16 2011 +0100 d3dx9_36/tests: Replace a malloc() with HeapAlloc()+HeapFree(). --- dlls/d3dx9_36/tests/mesh.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4f4adcf..b54a92b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2852,7 +2852,7 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, LPCSTR text, FLOA char name[256]; OUTLINETEXTMETRIC otm; GLYPHMETRICS gm; - GLYPHMETRICSFLOAT *glyphmetrics_float = malloc(sizeof(GLYPHMETRICSFLOAT) * strlen(text)); + GLYPHMETRICSFLOAT *glyphmetrics_float = HeapAlloc(GetProcessHeap(), 0, sizeof(GLYPHMETRICSFLOAT) * strlen(text)); int i; LOGFONT lf; HFONT font = NULL, oldfont = NULL; @@ -2913,6 +2913,7 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, LPCSTR text, FLOA d3dxmesh->lpVtbl->Release(d3dxmesh); SelectObject(hdc, oldfont); + HeapFree(GetProcessHeap(), 0, glyphmetrics_float); } static void D3DXCreateTextTest(void)

1 0

Francois Gouget : msxml3: Make ConnectionPoint_Init() and BindStatusCallback_Detach() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 462d325eb24a13d1f3be5c3e427a1f1686adbab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462d325eb24a13d1f3be5c3e4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:30:45 2011 +0100 msxml3: Make ConnectionPoint_Init() and BindStatusCallback_Detach() static. --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/httprequest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 43bcb77..a634750 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -3295,7 +3295,7 @@ static const IConnectionPointVtbl ConnectionPointVtbl = ConnectionPoint_EnumConnections }; -void ConnectionPoint_Init(ConnectionPoint *cp, struct domdoc *doc, REFIID riid) +static void ConnectionPoint_Init(ConnectionPoint *cp, struct domdoc *doc, REFIID riid) { cp->lpVtblConnectionPoint = &ConnectionPointVtbl; cp->doc = doc; diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index f6ee116..d49840f 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -152,7 +152,7 @@ static inline BindStatusCallback *impl_from_IHttpNegotiate( IHttpNegotiate *ifac return CONTAINING_RECORD(iface, BindStatusCallback, IHttpNegotiate_iface); } -void BindStatusCallback_Detach(BindStatusCallback *bsc) +static void BindStatusCallback_Detach(BindStatusCallback *bsc) { if (bsc) {

1 0

Francois Gouget : mscoree/tests: Make the test and cleanup functions static .
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 3b69102011297ceb1c82b7afec1bc6ae1055d50b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b69102011297ceb1c82b7afe… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:32:24 2011 +0100 mscoree/tests: Make the test and cleanup functions static. --- dlls/mscoree/tests/metahost.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index bf9e383..665ee65 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -56,14 +56,14 @@ BOOL init_pointers(void) return TRUE; } -void cleanup(void) +static void cleanup(void) { ICLRMetaHost_Release(metahost); FreeLibrary(hmscoree); } -void test_enumruntimes(void) +static void test_enumruntimes(void) { IEnumUnknown *runtime_enum; IUnknown *unk; @@ -108,7 +108,7 @@ void test_enumruntimes(void) IEnumUnknown_Release(runtime_enum); } -void test_getruntime(void) +static void test_getruntime(void) { static const WCHAR twodotzero[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR twodotzerodotzero[] = {'v','2','.','0','.','0',0};

1 0

Francois Gouget : msvcrt: Export _wcsupr_s_l().
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: c075968baf534ecfd1733eab42c2d6e449e0d2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c075968baf534ecfd1733eab4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:33:35 2011 +0100 msvcrt: Export _wcsupr_s_l(). --- dlls/msvcrt/msvcrt.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 68eab2e..2ac0804 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1093,7 +1093,7 @@ @ cdecl _wcsupr(wstr) ntdll._wcsupr # stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s -# stub _wcsupr_s_l +@ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l # stub _wcsxfrm_l @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime32(ptr) MSVCRT__wctime32

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
85
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 March 2011