May 2011 - Wine-commits - list.winehq.org

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

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

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/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

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

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

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

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

Jacek Caban : kernel32: Moved QueryWorkingSet and QueryWorkingSetEx implementation to kernel32.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: c1c70c62cba78e11d342de9c66c73fbdd91dbaa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c70c62cba78e11d342de9c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 13:06:45 2011 +0000 kernel32: Moved QueryWorkingSet and QueryWorkingSetEx implementation to kernel32. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/process.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 4 ++-- dlls/psapi/psapi_main.c | 38 -------------------------------------- 4 files changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 01939c9..a4e45d6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -772,6 +772,8 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall K32EnumProcessModules(long ptr long ptr) @ stdcall K32EnumProcesses(ptr long ptr) +@ stdcall K32QueryWorkingSet(long ptr long) +@ stdcall K32QueryWorkingSetEx(long ptr long) @ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog @ stdcall -i386 -private -register K32Thk1632Prolog() krnl386.exe16.K32Thk1632Prolog @ stdcall LCIDToLocaleName(long ptr long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6ca1279..5436c06 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3584,6 +3584,44 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, } /*********************************************************************** + * K32QueryWorkingSet (KERNEL32.@) + */ +BOOL WINAPI K32QueryWorkingSet( HANDLE process, LPVOID buffer, DWORD size ) +{ + NTSTATUS status; + + TRACE( "(%p, %p, %d)\n", process, buffer, size ); + + status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL ); + + if (status) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** + * K32QueryWorkingSetEx (KERNEL32.@) + */ +BOOL WINAPI K32QueryWorkingSetEx( HANDLE process, LPVOID buffer, DWORD size ) +{ + NTSTATUS status; + + TRACE( "(%p, %p, %d)\n", process, buffer, size ); + + status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL ); + + if (status) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** * ProcessIdToSessionId (KERNEL32.@) * This function is available on Terminal Server 4SP4 and Windows 2000 */ diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 70f1144..37d6e80 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -21,5 +21,5 @@ @ stdcall GetProcessMemoryInfo(long ptr long) @ stdcall GetWsChanges(long ptr long) @ stdcall InitializeProcessForWsWatch(long) -@ stdcall QueryWorkingSet(long ptr long) -@ stdcall QueryWorkingSetEx(long ptr long) +@ stdcall QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet +@ stdcall QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 34dfeed..909e7ce 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -475,41 +475,3 @@ BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess) return TRUE; } - -/*********************************************************************** - * QueryWorkingSet (PSAPI.@) - */ -BOOL WINAPI QueryWorkingSet( HANDLE process, LPVOID buffer, DWORD size ) -{ - NTSTATUS status; - - TRACE( "(%p, %p, %d)\n", process, buffer, size ); - - status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL ); - - if (status) - { - SetLastError( RtlNtStatusToDosError( status ) ); - return FALSE; - } - return TRUE; -} - -/*********************************************************************** - * QueryWorkingSetEx (PSAPI.@) - */ -BOOL WINAPI QueryWorkingSetEx( HANDLE process, LPVOID buffer, DWORD size ) -{ - NTSTATUS status; - - TRACE( "(%p, %p, %d)\n", process, buffer, size ); - - status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL ); - - if (status) - { - SetLastError( RtlNtStatusToDosError( status ) ); - return FALSE; - } - return TRUE; -}

1 0

Jacek Caban : mshtml: Ignore more dispID values in OnChanged notifications to fix tests on some IE installations .
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 75916ffe7ac82b11758559ba4de1ed83a6762475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75916ffe7ac82b11758559ba4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 13:21:24 2011 +0000 mshtml: Ignore more dispID values in OnChanged notifications to fix tests on some IE installations. --- dlls/mshtml/tests/htmldoc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index b0ceea0..33078e9 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -851,6 +851,8 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D CHECK_EXPECT(OnChanged_1012); return S_OK; case 1030: + case 3000022: + case 3000023: case 3000024: case 3000025: case 3000028:

1 0