wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Henri Verbeet : build: Add ANNOUNCE to EXTRA_DIST.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: vkd3d Branch: master Commit: db8ab36464cf3a2e8ba53573face2a18c963bfc5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=db8ab36464cf3a2e8ba5357… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 22 02:23:47 2020 +0330 build: Add ANNOUNCE to EXTRA_DIST. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ca0f616..deea567 100644 --- a/Makefile.am +++ b/Makefile.am @@ -129,7 +129,7 @@ libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map endif -EXTRA_DIST = LICENSE +EXTRA_DIST = ANNOUNCE LICENSE pkgconfigdir = $(libdir)/pkgconfig pkginclude_HEADERS = $(vkd3d_public_headers)

1 0

Henri Verbeet : build: Install vkd3d-compiler.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: vkd3d Branch: master Commit: a6c43294152a71a7ca631755548c03c72463841d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a6c43294152a71a7ca63175… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 22 02:23:46 2020 +0330 build: Install vkd3d-compiler. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index dd62485..ca0f616 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,7 +140,7 @@ EXTRA_DIST += \ libs/vkd3d-shader/libvkd3d-shader.pc.in \ libs/vkd3d-utils/libvkd3d-utils.pc.in -noinst_PROGRAMS = vkd3d-compiler +bin_PROGRAMS = vkd3d-compiler vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c vkd3d_compiler_LDADD = libvkd3d-shader.la @@ -158,7 +158,7 @@ endif if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ -noinst_PROGRAMS += $(vkd3d_demos) +noinst_PROGRAMS = $(vkd3d_demos) demos_gears_CFLAGS = $(DEMOS_CFLAGS) demos_gears_LDADD = $(DEMOS_LDADD) -lm

1 0

Zhipeng Zhao : winex11.drv: If the end of the sequence is '\r\n', there is no need to add extra '\r'.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 05d9df73d12d202d51b784f1d5eadc55f8448f16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05d9df73d12d202d51b784f1… Author: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Date: Sun Sep 20 21:42:09 2020 +0800 winex11.drv: If the end of the sequence is '\r\n', there is no need to add extra '\r'. Signed-off-by: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 8ced781f66..695c0406a8 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -673,7 +673,7 @@ static HANDLE unicode_text_from_string( UINT codepage, const void *data, size_t MultiByteToWideChar( codepage, 0, data, size, strW + count, count ); for (i = j = 0; i < count; i++) { - if (strW[i + count] == '\n') strW[j++] = '\r'; + if (strW[i + count] == '\n' && (!i || strW[i + count - 1] != '\r')) strW[j++] = '\r'; strW[j++] = strW[i + count]; } strW[j++] = 0;

1 0

Haidong Yu : ws2_32: Add missing LeaveCriticalSection.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 1e198e17de96d13caa8cf94780e27641364c3f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e198e17de96d13caa8cf947… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Mon Sep 21 17:57:36 2020 +0800 ws2_32: Add missing LeaveCriticalSection. Signed-off-by: Haidong Yu <yuhaidong(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0ed1af3092..4162549d8b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -494,7 +494,10 @@ static BOOL socket_list_add(SOCKET socket) } new_size = max(socket_list_size * 2, 8); if (!(new_array = heap_realloc(socket_list, new_size * sizeof(*socket_list)))) + { + LeaveCriticalSection(&cs_socket_list); return FALSE; + } socket_list = new_array; memset(socket_list + socket_list_size, 0, (new_size - socket_list_size) * sizeof(*socket_list)); socket_list[socket_list_size] = socket;

1 0

Haidong Yu : conhost: Add missing LeaveCriticalSection.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 4eb3ab95c75eb4eb33c01d22affdfd303590d87a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb3ab95c75eb4eb33c01d22… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Mon Sep 21 17:55:35 2020 +0800 conhost: Add missing LeaveCriticalSection. Signed-off-by: Haidong Yu <yuhaidong(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index c637b16379..c0a0e08e6d 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1659,6 +1659,7 @@ static DWORD WINAPI tty_input( void *param ) switch (ch) { case 3: /* end of text */ + LeaveCriticalSection( &console_section ); return 0; case '\n': key_press( console, '\n', VK_RETURN, LEFT_CTRL_PRESSED );

1 0

Paul Gofman : kernel32: Add string for DXGI_ERROR_NOT_CURRENTLY_AVAILABLE error.
by Alexandre Julliard 21 Sep '20

21 Sep '20

1 0

Paul Gofman : kernel32: Add string for DXGI_INVALID_CALL error.
by Alexandre Julliard 21 Sep '20

21 Sep '20

1 0

Paul Gofman : wmc: Add Dxgi facility.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: b936df428dc3f30f03c854abac8860888a983d67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b936df428dc3f30f03c854ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 21 14:20:02 2020 +0300 wmc: Add Dxgi facility. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/mcl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 579d4b8788..93e666fed7 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -85,6 +85,7 @@ static const WCHAR ustr_language[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 0 static const WCHAR ustr_languagenames[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 'N', 'a', 'm', 'e', 's', 0}; static const WCHAR ustr_messageid[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 0 }; static const WCHAR ustr_messageidtypedef[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 'T', 'y', 'p', 'e', 'd', 'e', 'f', 0 }; +static const WCHAR ustr_dxgi[] = { 'D', 'x', 'g', 'i', 0 }; static const WCHAR ustr_null[] = { 'N', 'u', 'l', 'l', 0 }; static const WCHAR ustr_outputbase[] = { 'O', 'u', 't', 'p', 'u', 't', 'B', 'a', 's', 'e', 0 }; static const WCHAR ustr_severity[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 0 }; @@ -552,6 +553,7 @@ int mcy_lex(void) add_token(tok_severity, ustr_success, 0x00, 0, NULL, 0); add_token(tok_facility, ustr_application, 0xFFF, 0, NULL, 0); add_token(tok_facility, ustr_system, 0x0FF, 0, NULL, 0); + add_token(tok_facility, ustr_dxgi, 0x87a, 0, NULL, 0); add_token(tok_facility, ustr_null, 0x000, 0, NULL, 0); add_token(tok_language, ustr_english, 0x409, 437, ustr_msg00001, 0); }

1 0

Dmitry Timoshkov : sxs: Return correct path from IAssemblyCache::QueryAssemblyInfo().
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: c460d4ff35e69052a917a8d75f97f39d36747e52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c460d4ff35e69052a917a8d7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 18 12:58:33 2020 +0300 sxs: Return correct path from IAssemblyCache::QueryAssemblyInfo(). 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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);

1 0

Jacek Caban : kernel32: Remove no longer used bare console support.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 43f822bca27b983e6ecca11f4204348a38ba7147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f822bca27b983e6ecca11f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 21 17:07:42 2020 +0200 kernel32: Remove no longer used bare console support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 2 - dlls/kernel32/console.c | 317 +-------------------------- dlls/kernel32/console_private.h | 6 - dlls/kernel32/kernel_main.c | 1 - dlls/kernel32/kernel_private.h | 4 - dlls/kernel32/term.c | 471 ---------------------------------------- 6 files changed, 2 insertions(+), 799 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43f822bca27b983e6ecc…

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
71
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 September 2020