wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Konstantin L. Metlov : gdi32: Handle pre-Unicode symbol TTFs with symbols at U+00XX.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: fb787da66afe35e3c5e2a3508d60bb38fbf21ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb787da66afe35e3c5e2a3508… Author: Konstantin L. Metlov <metlov(a)fti.dn.ua> Date: Wed May 11 19:01:59 2011 +0300 gdi32: Handle pre-Unicode symbol TTFs with symbols at U+00XX. --- dlls/gdi32/freetype.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a3e9cec..79073a6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4553,12 +4553,13 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) return get_GSUB_vert_glyph(font,ret); } - if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL && glyph < 0x100) + if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) { + if (glyph < 0x100) glyph += 0xf000; /* there is a number of old pre-Unicode "broken" TTFs, which do have symbols at U+00XX instead of U+f0XX */ - if (!(glyphId = pFT_Get_Char_Index(font->ft_face, glyph + 0xf000))) - glyphId = pFT_Get_Char_Index(font->ft_face, glyph); + if (!(glyphId = pFT_Get_Char_Index(font->ft_face, glyph))) + glyphId = pFT_Get_Char_Index(font->ft_face, glyph-0xf000); } else glyphId = pFT_Get_Char_Index(font->ft_face, glyph);

1 0

Vincent Povirk : mscoree: State the . NET and Mono versions when a runtime is missing.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 92563de3ea5165e071ae44bc1b97040b80d52d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92563de3ea5165e071ae44bc1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 11 10:07:23 2011 -0500 mscoree: State the .NET and Mono versions when a runtime is missing. --- dlls/mscoree/metahost.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 878cdee..98f1cbb 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -97,6 +97,16 @@ static void CDECL do_nothing(void) { } +static void missing_runtime_message(const CLRRuntimeInfo *This) +{ + if (This->major == 1) + MESSAGE("wine: Install Mono 2.6 for Windows to run .NET 1.1 applications.\n"); + else if (This->major == 2) + MESSAGE("wine: Install Mono for Windows to run .NET 2.0 applications.\n"); + else if (This->major == 4) + MESSAGE("wine: Install Mono 2.8 or greater for Windows to run .NET 4.0 applications.\n"); +} + static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) { static const WCHAR bin[] = {'\\','b','i','n',0}; @@ -109,11 +119,11 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) int trace_size; char trace_setting[256]; - if (This->mono_abi_version == -1) - MESSAGE("wine: Install the Windows version of Mono to run .NET executables\n"); - if (This->mono_abi_version <= 0 || This->mono_abi_version > NUM_ABI_VERSIONS) + { + missing_runtime_message(This); return E_FAIL; + } *result = &loaded_monos[This->mono_abi_version-1]; @@ -1015,7 +1025,7 @@ static HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, return IUnknown_QueryInterface((IUnknown*)&runtimes[i], iid, ppRuntime); else { - ERR("Mono is missing %s runtime\n", debugstr_w(pwzVersion)); + missing_runtime_message(&runtimes[i]); return CLR_E_SHIM_RUNTIME; } } @@ -1309,7 +1319,10 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, &IID_ICLRRuntimeInfo, (void**)result); } - ERR("No %s.NET runtime installed\n", legacy ? "legacy " : ""); + if (legacy) + missing_runtime_message(&runtimes[1]); + else + missing_runtime_message(&runtimes[NUM_RUNTIMES-1]); return CLR_E_SHIM_RUNTIME; }

1 0

Aric Stewart : usp10/tests: Test ScriptItemizeOpenType.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 4d8012795f8b5a6d3f45f83b94a382bc9daba0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8012795f8b5a6d3f45f83b9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 10 13:09:57 2011 -0500 usp10/tests: Test ScriptItemizeOpenType. --- dlls/usp10/tests/usp10.c | 107 ++++++++++++++++++++++++++++++---------------- 1 files changed, 70 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d8012795f8b5a6d3f45f…

1 0

Aric Stewart : usp10: Implement ScriptItemizeOpenType.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: f221aea66c5bf9c5e2f2a0cae950ffccd46a2c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f221aea66c5bf9c5e2f2a0cae… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 10 13:09:47 2011 -0500 usp10: Implement ScriptItemizeOpenType. --- dlls/usp10/shape.c | 6 -- dlls/usp10/usp10.c | 129 +++++++++++++++++++++++++++++++----------- dlls/usp10/usp10.spec | 2 +- dlls/usp10/usp10_internal.h | 6 ++ 4 files changed, 102 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f221aea66c5bf9c5e2f2a…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXEffect::Get/ SetStateManager() test.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 1ac8f4d472d7c59b630ddace9473193c6beb6996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac8f4d472d7c59b630ddace9… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 11 16:47:10 2011 +0200 d3dx9/tests: Add ID3DXEffect::Get/SetStateManager() test. --- dlls/d3dx9_36/tests/effect.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 483efd4..6a8f04f 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -33,6 +33,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ID3DXBaseEffect *base; ULONG count; IDirect3DDevice9 *device2; + LPD3DXEFFECTSTATEMANAGER manager = (LPD3DXEFFECTSTATEMANAGER)0xdeadbeef; ID3DXEffectPool *pool = (ID3DXEffectPool *)0xdeadbeef, *pool2; hr = D3DXCreateEffect(NULL, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL, NULL); @@ -53,6 +54,31 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3DXBaseEffect, (void **)&base); ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x (E_NOINTERFACE)\n", hr, E_NOINTERFACE); + hr = effect->lpVtbl->GetStateManager(effect, NULL); + ok(hr == D3DERR_INVALIDCALL, "GetStateManager failed, got %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->GetStateManager(effect, &manager); + ok(hr == D3D_OK, "GetStateManager failed, got %x, expected 0 (D3D_OK)\n", hr); + ok(!manager, "GetStateManager failed, got %p\n", manager); + + /* this works, but it is not recommended! */ + hr = effect->lpVtbl->SetStateManager(effect, (LPD3DXEFFECTSTATEMANAGER) device); + ok(hr == D3D_OK, "SetStateManager failed, got %x, expected 0 (D3D_OK)\n", hr); + + hr = effect->lpVtbl->GetStateManager(effect, &manager); + ok(hr == D3D_OK, "GetStateManager failed, got %x, expected 0 (D3D_OK)\n", hr); + ok(manager != NULL, "GetStateManager failed\n"); + + IDirect3DDevice9_AddRef(device); + count = IDirect3DDevice9_Release(device); + ok(count == 4, "Release failed, got %u, expected 4\n", count); + + count = IUnknown_Release(manager); + ok(count == 3, "Release failed, got %u, expected 3\n", count); + + hr = effect->lpVtbl->SetStateManager(effect, NULL); + ok(hr == D3D_OK, "SetStateManager failed, got %x, expected 0 (D3D_OK)\n", hr); + hr = effect->lpVtbl->GetPool(effect, &pool); ok(hr == D3D_OK, "GetPool failed, got %x, expected 0 (D3D_OK)\n", hr); ok(!pool, "GetPool failed, got %p\n", pool);

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect:: GetStateManager().
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 72d3ee3ab606bbc7ff22567697c567e675c1573b URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d3ee3ab606bbc7ff2256769… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 11 16:47:06 2011 +0200 d3dx9: Implement ID3DXEffect::GetStateManager(). --- dlls/d3dx9_36/effect.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f513a90..d8877c0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2445,13 +2445,22 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DX return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect* iface, LPD3DXEFFECTSTATEMANAGER* manager) +static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, LPD3DXEFFECTSTATEMANAGER *manager) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(%p): stub\n", This, manager); + TRACE("iface %p, manager %p\n", This, manager); - return E_NOTIMPL; + if (!manager) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + if (This->manager) IUnknown_AddRef(This->manager); + *manager = This->manager; + + return D3D_OK; } static HRESULT WINAPI ID3DXEffectImpl_BeginParameterBlock(ID3DXEffect* iface)

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect:: SetStateManager().
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: cd121b10d6a896825cb412c61c6fc9496a6eedd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd121b10d6a896825cb412c61… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 11 16:47:02 2011 +0200 d3dx9: Implement ID3DXEffect::SetStateManager(). --- dlls/d3dx9_36/effect.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 44f6b19..f513a90 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -95,6 +95,7 @@ struct ID3DXEffectImpl ID3DXEffect ID3DXEffect_iface; LONG ref; + LPD3DXEFFECTSTATEMANAGER manager; LPDIRECT3DDEVICE9 device; LPD3DXEFFECTPOOL pool; @@ -449,6 +450,11 @@ static void free_effect(struct ID3DXEffectImpl *effect) effect->pool->lpVtbl->Release(effect->pool); } + if (effect->manager) + { + IUnknown_Release(effect->manager); + } + IDirect3DDevice9_Release(effect->device); } @@ -2425,13 +2431,18 @@ static HRESULT WINAPI ID3DXEffectImpl_OnResetDevice(ID3DXEffect* iface) return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect* iface, LPD3DXEFFECTSTATEMANAGER manager) +static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DXEFFECTSTATEMANAGER manager) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(%p): stub\n", This, manager); + TRACE("iface %p, manager %p\n", This, manager); - return E_NOTIMPL; + if (This->manager) IUnknown_Release(This->manager); + if (manager) IUnknown_AddRef(manager); + + This->manager = manager; + + return D3D_OK; } static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect* iface, LPD3DXEFFECTSTATEMANAGER* manager)

1 0

Dylan Smith : d3dx9: Implement D3DXMESHOPT_ATTRSORT|D3DXMESHOPT_IGNOREVERTS .
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: f203aa1746027885ceb0ce46f4274ca8d61ded22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f203aa1746027885ceb0ce46f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed May 11 05:30:55 2011 -0400 d3dx9: Implement D3DXMESHOPT_ATTRSORT|D3DXMESHOPT_IGNOREVERTS. --- dlls/d3dx9_36/mesh.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 181 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f203aa1746027885ceb0c…

1 0

Dylan Smith : d3dx9: Create compact_mesh helper function for OptimizeInplace.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 4ed3930e276f59061e26cdbc6ac14cfb0030433d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed3930e276f59061e26cdbc6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed May 11 05:30:41 2011 -0400 d3dx9: Create compact_mesh helper function for OptimizeInplace. --- dlls/d3dx9_36/mesh.c | 78 +++++++++++++++++++++++++++++-------------------- 1 files changed, 46 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index eca9332..95b967b 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -652,6 +652,48 @@ static HRESULT WINAPI ID3DXMeshImpl_Optimize(ID3DXMesh *iface, DWORD flags, CONS return E_NOTIMPL; } +/* Creates a vertex_remap that removes unused vertices. + * Indices are updated according to the vertex_remap. */ +static HRESULT compact_mesh(ID3DXMeshImpl *This, DWORD *indices, DWORD *new_num_vertices, ID3DXBuffer **vertex_remap) +{ + HRESULT hr; + DWORD *vertex_remap_ptr; + DWORD num_used_vertices; + DWORD i; + + hr = D3DXCreateBuffer(This->numvertices * sizeof(DWORD), vertex_remap); + if (FAILED(hr)) return hr; + vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(*vertex_remap); + + for (i = 0; i < This->numfaces * 3; i++) + vertex_remap_ptr[indices[i]] = 1; + + /* create old->new vertex mapping */ + num_used_vertices = 0; + for (i = 0; i < This->numvertices; i++) { + if (vertex_remap_ptr[i]) + vertex_remap_ptr[i] = num_used_vertices++; + else + vertex_remap_ptr[i] = -1; + } + /* convert indices */ + for (i = 0; i < This->numfaces * 3; i++) + indices[i] = vertex_remap_ptr[indices[i]]; + + /* create new->old vertex mapping */ + num_used_vertices = 0; + for (i = 0; i < This->numvertices; i++) { + if (vertex_remap_ptr[i] != -1) + vertex_remap_ptr[num_used_vertices++] = i; + } + for (i = num_used_vertices; i < This->numvertices; i++) + vertex_remap_ptr[i] = -1; + + *new_num_vertices = num_used_vertices; + + return D3D_OK; +} + static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flags, CONST DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap_out, LPD3DXBUFFER *vertex_remap_out) { @@ -661,7 +703,7 @@ static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flag ID3DXBuffer *vertex_remap = NULL; DWORD *dword_indices = NULL; DWORD new_num_vertices = 0; - DWORD new_vertex_buffer_size = 0; + DWORD new_num_alloc_vertices = 0; IDirect3DVertexBuffer9 *vertex_buffer = NULL; DWORD i; @@ -700,36 +742,9 @@ static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flag if ((flags & (D3DXMESHOPT_COMPACT | D3DXMESHOPT_IGNOREVERTS)) == D3DXMESHOPT_COMPACT) { - /* Remove unused vertices. */ - DWORD *vertex_remap_ptr; - - new_vertex_buffer_size = This->numvertices; - hr = D3DXCreateBuffer(This->numvertices * sizeof(DWORD), &vertex_remap); + new_num_alloc_vertices = This->numvertices; + hr = compact_mesh(This, dword_indices, &new_num_vertices, &vertex_remap); if (FAILED(hr)) goto cleanup; - vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(vertex_remap); - - for (i = 0; i < This->numfaces * 3; i++) - vertex_remap_ptr[dword_indices[i]] = 1; - - /* create old->new vertex mapping */ - for (i = 0; i < This->numvertices; i++) { - if (vertex_remap_ptr[i]) - vertex_remap_ptr[i] = new_num_vertices++; - else - vertex_remap_ptr[i] = -1; - } - /* convert indices */ - for (i = 0; i < This->numfaces * 3; i++) - dword_indices[i] = vertex_remap_ptr[dword_indices[i]]; - - /* create new->old vertex mapping */ - new_num_vertices = 0; - for (i = 0; i < This->numvertices; i++) { - if (vertex_remap_ptr[i] != -1) - vertex_remap_ptr[new_num_vertices++] = i; - } - for (i = new_num_vertices; i < This->numvertices; i++) - vertex_remap_ptr[i] = -1; } if (vertex_remap) @@ -744,8 +759,7 @@ static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flag hr = IDirect3DVertexBuffer9_GetDesc(This->vertex_buffer, &vertex_desc); if (FAILED(hr)) goto cleanup; - new_vertex_buffer_size *= vertex_size; - hr = IDirect3DDevice9_CreateVertexBuffer(This->device, new_vertex_buffer_size, + hr = IDirect3DDevice9_CreateVertexBuffer(This->device, new_num_alloc_vertices * vertex_size, vertex_desc.Usage, This->fvf, vertex_desc.Pool, &vertex_buffer, NULL); if (FAILED(hr)) goto cleanup;

1 0

Marcus Meissner : krnl386.exe16: Fixed if that always succeeds (Coverity).
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 428e0312b7254fda023432d096a0d1a87ff5aa30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428e0312b7254fda023432d09… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 11 14:36:16 2011 +0200 krnl386.exe16: Fixed if that always succeeds (Coverity). --- dlls/krnl386.exe16/ne_segment.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/ne_segment.c b/dlls/krnl386.exe16/ne_segment.c index d231fb9..1ceb714 100644 --- a/dlls/krnl386.exe16/ne_segment.c +++ b/dlls/krnl386.exe16/ne_segment.c @@ -533,7 +533,8 @@ static void NE_FixupSegmentPrologs(NE_MODULE *pModule, WORD segnum) if (!pModule->ne_autodata) return; - if (!(dgroup = SEL(pSegTable[pModule->ne_autodata-1].hSeg))) return; + if (!pSegTable[pModule->ne_autodata-1].hSeg) return; + dgroup = SEL(pSegTable[pModule->ne_autodata-1].hSeg); pSeg = MapSL( MAKESEGPTR(sel, 0) );

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
95
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 May 2011