wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Zebediah Figura : vkd3d-shader: Use the same message context for scanning and compiling in vkd3d_shader_compile().
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: vkd3d Branch: master Commit: c78fe643a85cfd1cc95778ce5dd2603f3b599100 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c78fe643a85cfd1cc95778c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 25 16:52:58 2020 -0500 vkd3d-shader: Use the same message context for scanning and compiling in vkd3d_shader_compile(). So that messages from scanning are not lost. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 98 ++++++++++++++++++++--------------- 1 file changed, 55 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c78fe643a85cfd1cc95…

1 0

Alexandre Julliard : wine_release: Update for non-recursive makefile.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: tools Branch: master Commit: 4ab66d52642e6cc282573426574bd6c3de5a824c URL: https://source.winehq.org/git/tools.git/?a=commit;h=4ab66d52642e6cc28257342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 22:09:21 2020 +0200 wine_release: Update for non-recursive makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- wine_release | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wine_release b/wine_release index 7b8def1..2bee22b 100755 --- a/wine_release +++ b/wine_release @@ -56,11 +56,11 @@ then tools/wmc/wmc.man \ tools/wrc/wrc.man" + make -s $manpages + for f in $manpages do name=`basename $f .man` - make -s -C `dirname $f` $name.man - lang=`echo $name | cut -d . -f 2` if [ "$lang" = "$name" ] then lang="en"

1 0

Alexandre Julliard : Wine release 5.18
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: website Branch: master Commit: 158dbaef5bc2c69f0514a4b1234072d0bceddcce URL: https://source.winehq.org/git/website.git/?a=commit;h=158dbaef5bc2c69f0514a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 21:54:00 2020 +0200 Wine release 5.18 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020092501.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2020092501.xml b/news/en/2020092501.xml new file mode 100644 index 00000000..fa716720 --- /dev/null +++ b/news/en/2020092501.xml @@ -0,0 +1,18 @@ +<news> +<date>September 25, 2020</date> +<title>Wine 5.18 Released</title> +<body> + The Wine development release 5.18 is now available. + <a href="{$root}/announce/5.18">What's new</a> in this release: +<ul> + <li>Vulkan shader compilation using the new vkd3d-shader library.</li> + <li>USER32 library converted to PE.</li> + <li>Console no longer requires the curses library.</li> + <li>Support for display modes with various orientations.</li> + <li>A number of syntax fixes in the WIDL compiler.</li> + <li>Non-recursive makefiles.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.18.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-5.18 : Alexandre Julliard : Release 5.18
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: refs/tags/wine-5.18 Tag: c720a42ffeb4e0f234dd6e5aad7e9c46ce54cef0 URL: https://source.winehq.org/git/wine.git/?a=tag;h=c720a42ffeb4e0f234dd6e5aad7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 21:51:10 2020 +0200 Release 5.18

1 0

Alexandre Julliard : Release 5.18.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 9a6e5b23293fbad3bbdcd52007402a3b9a1cb99d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a6e5b23293fbad3bbdcd520… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 21:51:10 2020 +0200 Release 5.18. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 755 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 407 insertions(+), 373 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a6e5b23293fbad3bbdc…

1 0

Gijs Vermeulen : dwmapi: Implement DwmIsCompositionEnabled.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 53375d0f7a32b8b95d8c717356b7223c6d68b262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53375d0f7a32b8b95d8c7173… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Sep 22 17:56:37 2020 +0200 dwmapi: Implement DwmIsCompositionEnabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44055 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 8408a2efed..eb11ecb6b7 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -51,19 +51,20 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) { - static int once; - if (!once) - { - FIXME("%p\n", enabled); - once = 1; - } - else - TRACE("%p\n", enabled); + OSVERSIONINFOW version; + + TRACE("%p\n", enabled); if (!enabled) return E_INVALIDARG; - *enabled = FALSE; + version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + + if (!GetVersionExW(&version)) + *enabled = FALSE; + else + *enabled = (version.dwMajorVersion > 6 || (version.dwMajorVersion == 6 && version.dwMinorVersion >= 3)); + return S_OK; }

1 0

Ziqing Hui : kernel32: Use uppercase name in UpdateResourceW().
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 2698591a19b21a3e0869bc7c37664eefb36158e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2698591a19b21a3e0869bc7c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 16 15:20:14 2020 +0800 kernel32: Use uppercase name in UpdateResourceW(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/resource.c | 35 +++++++++++++++++++++++++++++++++-- dlls/kernel32/tests/resource.c | 1 - 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index b81ab3de5a..944f78efa9 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -36,6 +36,7 @@ #include "wine/exception.h" #include "wine/unicode.h" #include "wine/list.h" +#include "kernel_private.h" WINE_DEFAULT_DEBUG_CHANNEL(resource); @@ -62,6 +63,26 @@ static NTSTATUS get_res_nameA( LPCSTR name, UNICODE_STRING *str ) return STATUS_SUCCESS; } +static NTSTATUS get_res_nameW( LPCWSTR name, UNICODE_STRING *str ) +{ + if (IS_INTRESOURCE(name)) + { + str->Buffer = ULongToPtr( LOWORD(name) ); + return STATUS_SUCCESS; + } + if (name[0] == '#') + { + ULONG value; + RtlInitUnicodeString( str, name + 1 ); + if (RtlUnicodeStringToInteger( str, 10, &value ) != STATUS_SUCCESS || HIWORD(value)) + return STATUS_INVALID_PARAMETER; + str->Buffer = ULongToPtr(value); + return STATUS_SUCCESS; + } + RtlCreateUnicodeString( str, name ); + RtlUpcaseUnicodeString( str, str, FALSE ); + return STATUS_SUCCESS; +} /********************************************************************** * FindResourceExA (KERNEL32.@) @@ -1290,27 +1311,37 @@ BOOL WINAPI UpdateResourceW( HANDLE hUpdate, LPCWSTR lpType, LPCWSTR lpName, WORD wLanguage, LPVOID lpData, DWORD cbData) { QUEUEDUPDATES *updates; + UNICODE_STRING nameW, typeW; BOOL ret = FALSE; TRACE("%p %s %s %08x %p %d\n", hUpdate, debugstr_w(lpType), debugstr_w(lpName), wLanguage, lpData, cbData); + nameW.Buffer = typeW.Buffer = NULL; updates = GlobalLock(hUpdate); if (updates) { + if (!set_ntstatus( get_res_nameW( lpName, &nameW ))) goto done; + if (!set_ntstatus( get_res_nameW( lpType, &typeW ))) goto done; + if (lpData == NULL && cbData == 0) /* remove resource */ { - ret = update_add_resource( updates, lpType, lpName, wLanguage, NULL, TRUE ); + ret = update_add_resource( updates, typeW.Buffer, nameW.Buffer, wLanguage, NULL, TRUE ); } else { struct resource_data *data; data = allocate_resource_data( wLanguage, 0, lpData, cbData, TRUE ); if (data) - ret = update_add_resource( updates, lpType, lpName, wLanguage, data, TRUE ); + ret = update_add_resource( updates, typeW.Buffer, nameW.Buffer, wLanguage, data, TRUE ); } + + done: GlobalUnlock(hUpdate); } + + if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); + if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); return ret; } diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index acb95249d8..bca0298044 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -382,7 +382,6 @@ static void update_resources_name( void ) if ( !module ) return; rsrc = FindResourceA( module, res_name, res_type ); - todo_wine ok( rsrc != NULL || broken( GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND ) /* win2008 */, "FindResource failed: %u\n", GetLastError() );

1 0

Ziqing Hui : kernel32/tests: Add more tests for UpdateResource.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: a9d73e97f2e42d30fe9c87bf5cc09f8af28bddbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9d73e97f2e42d30fe9c87bf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 16 15:20:01 2020 +0800 kernel32/tests: Add more tests for UpdateResource. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/resource.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index cd3921426b..acb95249d8 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -201,6 +201,7 @@ static int build_exe( const sec_build* sec_descr ) opt->SectionAlignment = page_size; opt->FileAlignment = page_size; + opt->NumberOfRvaAndSizes = IMAGE_FILE_RESOURCE_DIRECTORY + 1; opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].VirtualAddress = rva_rsrc_start; opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].Size = page_size; @@ -357,6 +358,39 @@ static void update_resources_bigdata( void ) ok( r, "EndUpdateResource failed\n"); } +static void update_resources_name( void ) +{ + char foo[] = "resource data", res_name[] = "name", res_type[] = "type"; + HANDLE res = NULL; + HMODULE module; + HRSRC rsrc; + BOOL ret; + + res = BeginUpdateResourceA( filename, TRUE ); + ok( res != NULL, "BeginUpdateResource failed: %u\n", GetLastError() ); + if ( !res ) return; + + ret = UpdateResourceA( res, res_type, res_name, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), foo, sizeof(foo) ); + ok( ret == TRUE, "UpdateResource failed: %u\n", GetLastError() ); + + ret = EndUpdateResourceA( res, FALSE ); + ok( ret, "EndUpdateResource failed: %u\n", GetLastError() ); + if ( !ret ) return; + + module = LoadLibraryExA( filename, NULL, LOAD_LIBRARY_AS_DATAFILE ); + ok( module != NULL, "LoadLibraryEx failed: %u\n", GetLastError() ); + if ( !module ) return; + + rsrc = FindResourceA( module, res_name, res_type ); + todo_wine + ok( rsrc != NULL || + broken( GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND ) /* win2008 */, + "FindResource failed: %u\n", GetLastError() ); + + ret = FreeLibrary(module); + ok( ret, "FreeLibrary failed: %u\n", GetLastError() ); +} + static void check_exe( const sec_verify *verify ) { int i; @@ -515,6 +549,7 @@ START_TEST(resource) check_exe( &sec->chk_version ); update_resources_bigdata(); check_exe( &sec->chk_bigdata ); + update_resources_name(); DeleteFileA( filename ); } test_find_resource();

1 0

Dmitry Timoshkov : crypt32: Fix conversion of CRYPT_KEY_PROV_INFO between store and certificate property.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 7f8f424f38717d6a26a2b55e2ea7582a98dbc419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f8f424f38717d6a26a2b55e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 15 19:00:11 2020 +0300 crypt32: Fix conversion of CRYPT_KEY_PROV_INFO between store and certificate property. Store uses relative offsets while certificate property uses pointers. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 13d8df9258..ef871155b9 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -566,7 +566,7 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO buf) if (store->pwszContainerName) { - info.pwszContainerName = (LPWSTR)p; + info.pwszContainerName = (LPWSTR)((BYTE *)store + store->pwszContainerName); p += (lstrlenW(info.pwszContainerName) + 1) * sizeof(WCHAR); } else @@ -574,7 +574,7 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO buf) if (store->pwszProvName) { - info.pwszProvName = (LPWSTR)p; + info.pwszProvName = (LPWSTR)((BYTE *)store + store->pwszProvName); p += (lstrlenW(info.pwszProvName) + 1) * sizeof(WCHAR); } else @@ -705,6 +705,7 @@ static void CRYPT_CopyKeyProvInfo(store_CRYPT_KEY_PROV_INFO *to, const CRYPT_KEY to->dwProvType = from->dwProvType; to->dwFlags = from->dwFlags; to->cProvParam = from->cProvParam; + to->rgProvParam = 0; to->dwKeySpec = from->dwKeySpec; for (i = 0; i < to->cProvParam; i++) @@ -713,6 +714,7 @@ static void CRYPT_CopyKeyProvInfo(store_CRYPT_KEY_PROV_INFO *to, const CRYPT_KEY p += sizeof(*param); param->dwParam = from->rgProvParam[i].dwParam; + param->pbData = 0; param->cbData = from->rgProvParam[i].cbData; param->dwFlags = from->rgProvParam[i].dwFlags; memcpy(p, from->rgProvParam[i].pbData, from->rgProvParam[i].cbData);

1 0

Anton Baskanov : amstream: Implement AMDirectDrawStream::Receive and IDirectDrawStreamSample::Update.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: dca38a84fbfa805f980da5a9f3873d48c2273701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dca38a84fbfa805f980da5a9… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Sep 25 02:07:48 2020 +0700 amstream: Implement AMDirectDrawStream::Receive and IDirectDrawStreamSample::Update. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 189 +++++++++++++++-- dlls/amstream/tests/amstream.c | 446 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 594 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dca38a84fbfa805f980d…

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
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