wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 4e9b1faed9c5d0642a91133ed322dfd0f90f8a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9b1faed9c5d0642a91133ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 30 10:36:02 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 74 +++++++++++++++++++++--------------------- dlls/msvcp60/msvcp60.spec | 66 +++++++++++++++++++------------------- dlls/msvcp70/msvcp70.spec | 74 +++++++++++++++++++++--------------------- dlls/msvcp71/msvcp71.spec | 74 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 74 +++++++++++++++++++++--------------------- 5 files changed, 181 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e9b1faed9c5d0642a911…

1 0

Piotr Caban : msvcp90: Added partial basic_ios<short> implementation.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 9aebf52c8c1efd9a89d5f3c0f95cec963a676ad6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aebf52c8c1efd9a89d5f3c0f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 30 10:35:49 2012 +0200 msvcp90: Added partial basic_ios<short> implementation. --- dlls/msvcp90/ios.c | 64 ++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 74 ++++++++++++++++++++++---------------------- 2 files changed, 101 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9aebf52c8c1efd9a89d5f…

1 0

Piotr Caban : msvcp90: Added partial basic_ios<wchar> implementation.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 3174caa2b453a20416757fa7c5143165040b05a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3174caa2b453a20416757fa7c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 30 10:35:33 2012 +0200 msvcp90: Added partial basic_ios<wchar> implementation. --- dlls/msvcp90/ios.c | 130 +++++++++++++++++++++++++++++++-------------- dlls/msvcp90/msvcp90.spec | 4 +- 2 files changed, 92 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3174caa2b453a20416757…

1 0

Piotr Caban : msvcp90: Added partial basic_ios<char> implementation.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: cee8e2b9e507b56211911dda2f554ab169720603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee8e2b9e507b56211911dda2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 30 10:35:20 2012 +0200 msvcp90: Added partial basic_ios<char> implementation. --- dlls/msvcp90/ios.c | 124 ++++++++++++++++++++++++++++++--------------- dlls/msvcp90/msvcp90.spec | 4 +- 2 files changed, 85 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cee8e2b9e507b56211911…

1 0

Hans Leidekker : msi: Detect installed side-by-side assemblies.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 8ea52669155a396d52bc0f2cfd33d850b988d428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea52669155a396d52bc0f2cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:22:05 2012 +0200 msi: Detect installed side-by-side assemblies. --- dlls/msi/assembly.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 6ce020e..af23c4a 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -262,13 +262,13 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); - hr = IAssemblyCache_QueryAssemblyInfo( cache, QUERYASMINFO_FLAG_GETSIZE, display_name, &info ); - if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) + hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); + if (hr == S_OK /* sxs version */ || hr == HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) { - TRACE("QueryAssemblyInfo returned 0x%08x\n", hr); - return FALSE; + return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); } - return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); + TRACE("QueryAssemblyInfo returned 0x%08x\n", hr); + return FALSE; } static const WCHAR clr_version_v10[] = {'v','1','.','0','.','3','7','0','5',0};

1 0

Hans Leidekker : fusion/tests: Add another test for IAssemblyCache:: QueryAssemblyInfo.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: aa53a8f005645234a5bfa9d7a287a3480ddb62e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa53a8f005645234a5bfa9d7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:21:42 2012 +0200 fusion/tests: Add another test for IAssemblyCache::QueryAssemblyInfo. --- dlls/fusion/tests/asmcache.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 46c1db9..3910488 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1485,6 +1485,21 @@ static void test_QueryAssemblyInfo(void) ok(info.cchBuf == lstrlenW(asmpath) + 1, "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); + /* no flags, display name is "wine, Version=1.0.0.0" */ + INIT_ASM_INFO(); + info.pszCurrentAssemblyPathBuf = NULL; + info.cchBuf = 0; + lstrcpyW(name, wine); + lstrcatW(name, commasep); + lstrcatW(name, ver); + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), + "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); + ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, + "Expected ASSEMBLYINFO_FLAG_INSTALLED, got %08x\n", info.dwAssemblyFlags); + /* uninstall the assembly from the GAC */ disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp);

1 0

Hans Leidekker : sxs: Add tests for IAssemblyCache::QueryAssemblyInfo.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 0a648d76f1a089b6c985e0c7b830ca3daa76f348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a648d76f1a089b6c985e0c7b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:21:26 2012 +0200 sxs: Add tests for IAssemblyCache::QueryAssemblyInfo. --- dlls/sxs/tests/Makefile.in | 1 + dlls/sxs/tests/cache.c | 211 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a648d76f1a089b6c985e…

1 0

Hans Leidekker : sxs: Implement IAssemblyCache::QueryAssemblyInfo.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: f2ce0cdabfbdb1136fbc6b7a81e0791d78add4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ce0cdabfbdb1136fbc6b7a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:21:11 2012 +0200 sxs: Implement IAssemblyCache::QueryAssemblyInfo. --- dlls/sxs/cache.c | 211 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 141 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2ce0cdabfbdb1136fbc6…

1 0

Aric Stewart : quartz: Update null renderer to use the BaseRenderer from strmbase.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 3b85b13e27b4f5bb7a6d179619b231301dfcbcae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b85b13e27b4f5bb7a6d17961… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 29 19:21:54 2012 -0500 quartz: Update null renderer to use the BaseRenderer from strmbase. --- dlls/quartz/nullrenderer.c | 297 ++++++-------------------------------------- 1 files changed, 36 insertions(+), 261 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b85b13e27b4f5bb7a6d1…

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DSurface9Impl_QueryInterface ().
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: fa3838e9deb0495a667f9306b84c1fdeca7ab24e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3838e9deb0495a667f9306b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 01:08:38 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DSurface9Impl_QueryInterface(). --- dlls/d3d9/surface.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index eb78a01..e453ed8 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -34,19 +34,19 @@ static inline IDirect3DSurface9Impl *impl_from_IDirect3DSurface9(IDirect3DSurfac static HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(IDirect3DSurface9 *iface, REFIID riid, void **ppobj) { - IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DSurface9)) { + if (IsEqualGUID(riid, &IID_IDirect3DSurface9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DSurface9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

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 2012