April 2020 - Wine-commits - list.winehq.org

Chip Davis : winemac.drv: Build with GL_SILENCE_DEPRECATION.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: c66b51b36a19939680f8cb6799160748df44a3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c66b51b36a19939680f8cb67… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 17:04:25 2020 -0500 winemac.drv: Build with GL_SILENCE_DEPRECATION. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 5197e15fbb..c60a22719a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -32,6 +32,7 @@ #include "wine/wgl.h" #include "wine/wgl_driver.h" +#define GL_SILENCE_DEPRECATION #define __gl_h_ #define __gltypes_h_ #include <OpenGL/OpenGL.h>

1 0

Brendan Shanks : winevulkan: Enable VK_KHR_get_surface_capabilities2.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 086c686e817a596e35c41dd5b37f3c28587af9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=086c686e817a596e35c41dd5… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 6 16:58:40 2020 -0700 winevulkan: Enable VK_KHR_get_surface_capabilities2. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 32 ++++++++++++++++++++++ dlls/winevulkan/make_vulkan | 7 +++-- dlls/winevulkan/vulkan_thunks.c | 46 +++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 20 ++++++++++++++ dlls/winex11.drv/vulkan.c | 60 +++++++++++++++++++++++++++++++++++++++++ include/wine/vulkan.h | 38 +++++++++++++++++++++++--- include/wine/vulkan_driver.h | 8 +++++- 7 files changed, 204 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=086c686e817a596e35c4…

1 0

Alexandre Julliard : netapi32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 1938ddc65181642d68022784c3e3732c536db4c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1938ddc65181642d68022784… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:37:50 2020 +0200 netapi32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index f86e033c21..4cbd02f9d3 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -57,7 +57,6 @@ #include "dsgetdc.h" #include "davclnt.h" #include "wine/debug.h" -#include "wine/library.h" #include "wine/list.h" #include "wine/unicode.h" #include "initguid.h" @@ -134,19 +133,17 @@ static BOOL init_context(void) static BOOL libnetapi_init(void) { - char buf[200]; - if (libnetapi_handle) return TRUE; - if (!(libnetapi_handle = wine_dlopen( SONAME_LIBNETAPI, RTLD_NOW, buf, sizeof(buf) ))) + if (!(libnetapi_handle = dlopen( SONAME_LIBNETAPI, RTLD_NOW ))) { - WARN( "Failed to load libnetapi: %s\n", buf ); + WARN( "Failed to load libnetapi: %s\n", dlerror() ); return FALSE; } #define LOAD_FUNCPTR(f) \ - if (!(p##f = wine_dlsym( libnetapi_handle, #f, buf, sizeof(buf) ))) \ + if (!(p##f = dlsym( libnetapi_handle, #f ))) \ { \ - ERR( "Failed to load %s: %s\n", #f, buf ); \ + ERR( "Failed to load %s: %s\n", #f, dlerror() ); \ goto error; \ } @@ -167,7 +164,7 @@ static BOOL libnetapi_init(void) if (init_context()) return TRUE; error: - wine_dlclose( libnetapi_handle, NULL, 0 ); + dlclose( libnetapi_handle ); libnetapi_handle = NULL; return FALSE; }

1 0

Alexandre Julliard : ntdll: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: f64e34b01456de26e5a8f60e8494cbe839964071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f64e34b01456de26e5a8f60e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:38:00 2020 +0200 ntdll: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 23fde1f516..79165c2dac 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2596,7 +2596,6 @@ done: static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, const char *so_name, WINE_MODREF** pwm ) { - char error[256]; void *handle; struct builtin_load_info info, *prev_info; ANSI_STRING unix_name; @@ -2620,7 +2619,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, prev_info = builtin_load_info; builtin_load_info = &info; - handle = wine_dlopen( so_name ? so_name : unix_name.Buffer, RTLD_NOW, error, sizeof(error) ); + handle = dlopen( so_name ? so_name : unix_name.Buffer, RTLD_NOW ); builtin_load_info = prev_info; RtlFreeHeap( GetProcessHeap(), 0, unix_name.Buffer ); @@ -2628,10 +2627,10 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, { if (so_name) { - ERR("failed to load .so lib %s: %s\n", debugstr_a(so_name), error ); + ERR("failed to load .so lib %s: %s\n", debugstr_a(so_name), dlerror() ); return STATUS_PROCEDURE_NOT_FOUND; } - WARN( "failed to load .so lib %s: %s\n", debugstr_us(nt_name), error ); + WARN( "failed to load .so lib %s: %s\n", debugstr_us(nt_name), dlerror() ); return STATUS_INVALID_IMAGE_FORMAT; } @@ -2651,7 +2650,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress, debugstr_us(nt_name) ); if (info.wm->ldr.LoadCount != -1) info.wm->ldr.LoadCount++; - wine_dlclose( handle, NULL, 0 ); /* release the libdl refcount */ + dlclose( handle ); /* release the libdl refcount */ } else { @@ -2664,7 +2663,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, return STATUS_SUCCESS; failed: - wine_dlclose( handle, NULL, 0 ); + dlclose( handle ); return info.status; } @@ -3588,8 +3587,7 @@ static void free_modref( WINE_MODREF *wm ) free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); - if ((wm->ldr.Flags & LDR_WINE_INTERNAL) && wm->ldr.SectionHandle) - wine_dlclose( wm->ldr.SectionHandle, NULL, 0 ); + if ((wm->ldr.Flags & LDR_WINE_INTERNAL) && wm->ldr.SectionHandle) dlclose( wm->ldr.SectionHandle ); NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (cached_modref == wm) cached_modref = NULL; RtlFreeUnicodeString( &wm->ldr.FullDllName );

1 0

Alexandre Julliard : odbc32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 28e2e287d286de718b6be335c4209f67d742278b URL: https://source.winehq.org/git/wine.git/?a=commit;h=28e2e287d286de718b6be335… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:38:38 2020 +0200 odbc32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 041d4dbf01..b28fb8928b 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -38,7 +38,6 @@ #include "winbase.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/library.h" #include "wine/unicode.h" #include "sql.h" @@ -493,7 +492,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) case DLL_PROCESS_DETACH: if (reserved) break; - if (dmHandle) wine_dlclose(dmHandle,NULL,0); + if (dmHandle) dlclose(dmHandle); } return TRUE; @@ -512,14 +511,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) static BOOL ODBC_LoadDriverManager(void) { const char *s = getenv("LIB_ODBC_DRIVER_MANAGER"); - char error[256]; #ifdef SONAME_LIBODBC if (!s || !s[0]) s = SONAME_LIBODBC; #endif if (!s || !s[0]) goto failed; - dmHandle = wine_dlopen(s, RTLD_LAZY | RTLD_GLOBAL, error, sizeof(error)); + dmHandle = dlopen( s, RTLD_LAZY | RTLD_GLOBAL ); if (dmHandle != NULL) { @@ -528,7 +526,7 @@ static BOOL ODBC_LoadDriverManager(void) return TRUE; } failed: - ERR_(winediag)("failed to open library %s: %s\n", debugstr_a(s), error); + ERR_(winediag)("failed to open library %s: %s\n", debugstr_a(s), dlerror()); nErrorType = ERROR_LIBRARY_NOT_FOUND; return FALSE; } @@ -546,14 +544,12 @@ failed: static BOOL ODBC_LoadDMFunctions(void) { - char error[256]; - if (dmHandle == NULL) return FALSE; #define LOAD_FUNC(name) \ - if ((p##name = wine_dlsym( dmHandle, #name, error, sizeof(error) ))); \ - else WARN( "Failed to load %s: %s\n", #name, error ) + if ((p##name = dlsym( dmHandle, #name ))); \ + else WARN( "Failed to load %s: %s\n", #name, dlerror() ) LOAD_FUNC(SQLAllocConnect); LOAD_FUNC(SQLAllocEnv);

1 0

Francois Gouget : testbot/build: Don't compile Wine with -Werror.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: tools Branch: master Commit: 360bd7fd13f65ac3fc43311b778de62dad5c2a2b URL: https://source.winehq.org/git/tools.git/?a=commit;h=360bd7fd13f65ac3fc43311… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 7 01:49:55 2020 +0200 testbot/build: Don't compile Wine with -Werror. While the mailing list patches should be compiled with -Werror, the manually submitted jobs should be given more leeway so developers are not hampered when just doing a quick test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 1 - testbot/bin/build/WineReconfig.pl | 1 - 2 files changed, 2 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index b72fa73..458b5da 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -55,7 +55,6 @@ sub UpdateWineBuilds($$) { my ($TaskMissions, $Flags) = @_; - $Flags |= $Build::Utils::TRY_WERROR; my $Configure = "--without-x --without-freetype --disable-winetest"; return BuildWine($TaskMissions, $Flags, "exe32", $Configure, "buildtests") && diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 0c64fc3..f9f6792 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -54,7 +54,6 @@ sub UpdateWineBuilds($$) { my ($TaskMissions, $Flags) = @_; - $Flags |= $Build::Utils::TRY_WERROR; return BuildWine($TaskMissions, $Flags, "win32", "") && BuildWine($TaskMissions, $Flags, "wow64", "--enable-win64") && BuildWine($TaskMissions, $Flags, "wow32", "--with-wine64=".

1 0

Francois Gouget : testbot/Janitor: Allow 31 character session ids.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: tools Branch: master Commit: 7171288cf54f9cb7d6b236867022df7ea4dde8c1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7171288cf54f9cb7d6b2368… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 7 01:50:03 2020 +0200 testbot/Janitor: Allow 31 character session ids. Some users still have obsolete 31 character session ids that have not expired yet. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 8fa1782..35a7e5d 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -272,7 +272,8 @@ if (opendir(my $dh, "$DataDir/staging")) my $Age = int((-M $FileName) + 0.5); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; - if ($Entry =~ /^[0-9a-f]{32}-websubmit2?_/) + # FIXME: There are still some obsolete unexpired 31 characters session ids. + if ($Entry =~ /^[0-9a-f]{31,32}-websubmit2?_/) { # We get these files whenever a developer abandons a job submission. # So just delete them silently after a day.

1 0

Nikolay Sivov : mfreadwrite: Add support for seeking in Source Reader.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: f540d1615fe66c95a3824e86e5292a026511749e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f540d1615fe66c95a3824e86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 6 17:19:30 2020 +0300 mfreadwrite: Add support for seeking in Source Reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 147 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 115 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f540d1615fe66c95a382…

1 0

Andrew Eikum : kernel32/tests: Actually run OpenFile tests.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 2cd776fffdf7a85dcfe13fdef70a1c817ef83dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cd776fffdf7a85dcfe13fde… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 6 11:00:07 2020 -0500 kernel32/tests: Actually run OpenFile tests. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index e8a31c6e74..29620654bd 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3352,17 +3352,6 @@ static void test_OpenFile(void) ofs.szPathName ); } - length = GetCurrentDirectoryA(MAX_PATH, buff) + sizeof(filename); - - if (length >= MAX_PATH) - { - trace("Buffer too small, requested length = %d, but MAX_PATH = %d. Skipping test.\n", length, MAX_PATH); - return; - } - p = buff + strlen(buff); - if (p > buff && p[-1] != '\\') *p++ = '\\'; - strcpy( p, filename ); - memset(&ofs, 0xA5, sizeof(ofs)); SetLastError(0xfaceabee); /* Create an empty file */ @@ -3389,8 +3378,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3404,8 +3393,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3419,8 +3408,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3434,8 +3423,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); memset(&ofs, 0xA5, sizeof(ofs)); SetLastError(0xfaceabee); @@ -3447,8 +3436,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); retval = GetFileAttributesA(filename); ok( retval == INVALID_FILE_ATTRIBUTES, "GetFileAttributesA succeeded on deleted file\n" );

1 0

Jactry Zeng : qasf: Implement WM ASF reader stub.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: b15298c2daf2ebd6bd46a759db6b7d6a5597b463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b15298c2daf2ebd6bd46a759… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Apr 6 11:54:05 2020 -0500 qasf: Implement WM ASF reader stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/Makefile.in | 1 + dlls/qasf/asfreader.c | 67 ++++++++++++++++ dlls/qasf/qasf_classes.idl | 7 ++ dlls/qasf/qasf_main.c | 3 + dlls/qasf/qasf_private.h | 1 + dlls/qasf/tests/Makefile.in | 1 + dlls/qasf/tests/asfreader.c | 192 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 272 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b15298c2daf2ebd6bd46…

1 0