wine-devel

wine-devel@winehq.org

8 participants
84486 discussions

[PATCH v5 2/2] msvcrt: Test .{O|A}CP locale string.
by Piotr Caban 18 Sep '20

18 Sep '20

From: Paul Gofman <pgofman(a)codeweavers.com> Used by Marvel's Avengers. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/locale.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)

1 0

[PATCH v5 1/2] msvcrt: Use default user locale when only codepage is passed to setlocale.
by Piotr Caban 18 Sep '20

18 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v5: - fix implementation and tests for Unicode only locales dlls/msvcrt/locale.c | 172 ++++++++++++++++++------------------------- 1 file changed, 71 insertions(+), 101 deletions(-)

1 0

[PATCH] msasn1: Fix buffer allocations.
by Piotr Caban 18 Sep '20

18 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msasn1/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH v4 1/2] msvcrt: Use default user locale when only codepage is passed to setlocale.
by Piotr Caban 18 Sep '20

18 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- Supersedes 192842. dlls/msvcrt/locale.c | 174 ++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 101 deletions(-)

2 2

[PATCH] msvcp90: Add manifest.
by Dmitry Timoshkov 18 Sep '20

18 Sep '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msvcp90/Makefile.in | 2 ++ dlls/msvcp90/msvcp90.manifest | 7 +++++++ dlls/msvcp90/msvcp90.rc | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 dlls/msvcp90/msvcp90.manifest create mode 100644 dlls/msvcp90/msvcp90.rc diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in index b7e7b73423..b4034fc3f0 100644 --- a/dlls/msvcp90/Makefile.in +++ b/dlls/msvcp90/Makefile.in @@ -13,3 +13,5 @@ C_SRCS = \ misc.c \ msvcp_main.c \ string.c + +RC_SRCS = msvcp90.rc diff --git a/dlls/msvcp90/msvcp90.manifest b/dlls/msvcp90/msvcp90.manifest new file mode 100644 index 0000000000..588a0fd7b4 --- /dev/null +++ b/dlls/msvcp90/msvcp90.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.6161" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <file name="msvcr90.dll"/> + <file name="msvcp90.dll"/> + <file name="msvcm90.dll"/> +</assembly> diff --git a/dlls/msvcp90/msvcp90.rc b/dlls/msvcp90/msvcp90.rc new file mode 100644 index 0000000000..61a58daf45 --- /dev/null +++ b/dlls/msvcp90/msvcp90.rc @@ -0,0 +1,22 @@ +/* + * Resource file for msvcp90 + * + * Copyright 2020 Dmitry Timoshkov + * + * 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 + */ + +/* @makedep: msvcp90.manifest */ +WINE_MANIFEST 24 msvcp90.manifest -- 2.26.2

1 0

[PATCH] sxs: Return correct path from IAssemblyCache::QueryAssemblyInfo().
by Dmitry Timoshkov 18 Sep '20

18 Sep '20

Some applications call IAssemblyCache::QueryAssemblyInfo(), then append DLL name to the returned path, and call GetFileAttributes() to check DLL existence. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/sxs/cache.c | 18 ++++++++---------- dlls/sxs/tests/cache.c | 2 ++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 1b0e1e8908..bb203f50c0 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -122,23 +122,22 @@ static WCHAR *build_assembly_name( const WCHAR *arch, const WCHAR *name, const W return wcslwr( ret ); } -static WCHAR *build_manifest_path( const WCHAR *arch, const WCHAR *name, const WCHAR *token, - const WCHAR *version ) +static WCHAR *build_dll_path( const WCHAR *arch, const WCHAR *name, const WCHAR *token, + const WCHAR *version ) { - static const WCHAR fmtW[] = - {'%','s','m','a','n','i','f','e','s','t','s','\\','%','s','.','m','a','n','i','f','e','s','t',0}; WCHAR *path = NULL, *ret, sxsdir[MAX_PATH]; unsigned int len; if (!(path = build_assembly_name( arch, name, token, version, &len ))) return NULL; - len += ARRAY_SIZE(fmtW); - len += build_sxs_path( sxsdir ); + len += build_sxs_path( sxsdir ) + 1; if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) { HeapFree( GetProcessHeap(), 0, path ); return NULL; } - swprintf( ret, len, fmtW, sxsdir, path ); + lstrcpyW( ret, sxsdir ); + lstrcatW( ret, path ); + lstrcatW( ret, L"\\" ); HeapFree( GetProcessHeap(), 0, path ); return ret; } @@ -202,7 +201,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( struct cache *cache = impl_from_IAssemblyCache( iface ); IAssemblyName *name_obj; const WCHAR *arch, *name, *token, *type, *version; - WCHAR *p, *path = NULL; + WCHAR *path = NULL; unsigned int len; HRESULT hr; @@ -232,7 +231,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( } cache_lock( cache ); - if (!wcscmp( type, win32W )) path = build_manifest_path( arch, name, token, version ); + if (!wcscmp( type, win32W )) path = build_dll_path( arch, name, token, version ); else if (!wcscmp( type, win32_policyW )) path = build_policy_path( arch, name, token, version ); else { @@ -250,7 +249,6 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( info->dwAssemblyFlags = ASSEMBLYINFO_FLAG_INSTALLED; TRACE("assembly is installed\n"); } - if ((p = wcsrchr( path, '\\' ))) *p = 0; len = lstrlenW( path ) + 1; if (info->pszCurrentAssemblyPathBuf) { diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index 19dd4b865e..59c51ad886 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -162,6 +162,8 @@ static void test_QueryAssemblyInfo( void ) ok( !info.uliAssemblySizeInKB.u.LowPart, "got %u\n", info.uliAssemblySizeInKB.u.LowPart ); ok( info.cchBuf == ARRAY_SIZE( path ), "got %u\n", info.cchBuf ); ok( path[0], "empty path\n" ); + lstrcatW( path, L"comctl32.dll" ); + ok( GetFileAttributesW( path ) != INVALID_FILE_ATTRIBUTES, "%s should exist\n", wine_dbgstr_w( path )); memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); -- 2.26.2

1 0

[PATCH] d3d10core/tests: Add test for NULL resource parameters for _CopySubresourceRegion().
by Paul Gofman 18 Sep '20

18 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index deb6144a4be..b37e5a43a8c 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -9819,6 +9819,11 @@ static void test_copy_subresource_region(void) ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, + 1, 1, 0, NULL, 0, &box); + ID3D10Device_CopySubresourceRegion(device, NULL, 0, + 1, 1, 0, (ID3D10Resource *)src_texture, 0, &box); + set_box(&box, 0, 0, 0, 2, 2, 1); ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 1, 1, 0, (ID3D10Resource *)src_texture, 0, &box); -- 2.26.2

2 1

[PATCH v2 3/3] d3dx10: Implement D3DX10GetImageInfoFromFileA().
by Ziqing Hui 18 Sep '20

18 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: * Formatting * Dynamically allocate file name buffer. dlls/d3dx10_43/d3dx10_43_main.c | 24 ++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 4 +--- 2 files changed, 23 insertions(+), 5 deletions(-)

2 1

[PATCH v2 2/3] d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileA().
by Ziqing Hui 18 Sep '20

18 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 40 +++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 7 deletions(-)

2 1

[PATCH v2 1/3] d3dx10: Implement D3DX10GetImageInfoFromFileW().
by Ziqing Hui 18 Sep '20

18 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Formatting. dlls/d3dx10_43/d3dx10_43_main.c | 56 +++++++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 6 ++-- 2 files changed, 57 insertions(+), 5 deletions(-)

2 1

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