wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Alexandre Julliard : libwine: Remove wine/library.h.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: a9a08dbc3dd8b595888f6c6b066e6c8fd389771a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9a08dbc3dd8b595888f6c6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 8 09:56:03 2020 +0200 libwine: Remove wine/library.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 1 - dlls/mscms/mscms_main.c | 1 - dlls/opencl/opencl.c | 1 - dlls/winecoreaudio.drv/coreaudio.c | 1 - include/Makefile.in | 1 - include/wine/library.h | 67 -------------------------------------- include/wine/test.h | 3 -- libs/wine/config.c | 1 - libs/wine/debug.c | 1 - libs/wine/loader.c | 5 ++- libs/wine/mmap.c | 3 +- libs/wine/port.c | 1 - programs/winecfg/drive.c | 1 - programs/winedbg/winedbg.c | 1 - tools/make_makefiles | 1 - 15 files changed, 6 insertions(+), 83 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 43b303fa25..16253a685c 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -33,7 +33,6 @@ #include "winternl.h" #include "shlwapi.h" #include "wine/unicode.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(profile); diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index e4c5f28b7f..da2c504dd1 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -22,7 +22,6 @@ #include "wine/port.h" #include "wine/debug.h" -#include "wine/library.h" #include <stdarg.h> diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 06b8d78a40..f79345a188 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -26,7 +26,6 @@ #include "winbase.h" #include "wine/debug.h" -#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(opencl); diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 8c82088cc9..321c24b477 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -29,7 +29,6 @@ #include "winuser.h" #include "mmddk.h" #include "coreaudio.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); diff --git a/include/Makefile.in b/include/Makefile.in index 49b174ed31..91a02645c3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -739,7 +739,6 @@ SOURCES = \ wine/exception.h \ wine/fil_data.idl \ wine/itss.idl \ - wine/library.h \ wine/orpc.idl \ wine/svcctl.idl \ wine/winedxgi.idl \ diff --git a/include/wine/library.h b/include/wine/library.h deleted file mode 100644 index 405ce0d9da..0000000000 --- a/include/wine/library.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Definitions for the Wine library - * - * Copyright 2000 Alexandre Julliard - * - * 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 - */ - -#ifndef __WINE_WINE_LIBRARY_H -#define __WINE_WINE_LIBRARY_H - -#include <stdarg.h> -#include <sys/types.h> - -#include <windef.h> -#include <winbase.h> - -#ifdef __WINE_WINE_TEST_H -#error This file should not be used in Wine tests -#endif - -#ifdef __WINE_USE_MSVCRT -#error This file should not be used with msvcrt headers -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* configuration */ - -extern void wine_init_argv0_path( const char *argv0 ); -extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ); - -/* dll loading */ - -typedef void (*load_dll_callback_t)( void *, const char * ); -extern void wine_dll_set_callback( load_dll_callback_t load ); -extern void __wine_dll_register( const IMAGE_NT_HEADERS *header, const char *filename ); -extern void wine_init( int argc, char *argv[], char *error, int error_size ); - -/* memory mappings */ - -extern void *wine_anon_mmap( void *start, size_t size, int prot, int flags ); -extern void wine_mmap_add_reserved_area( void *addr, size_t size ); -extern void wine_mmap_remove_reserved_area( void *addr, size_t size, int unmap ); -extern int wine_mmap_is_in_reserved_area( void *addr, size_t size ); -extern int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, void *arg), - void *arg, int top_down ); - -#ifdef __cplusplus -} -#endif - -#endif /* __WINE_WINE_LIBRARY_H */ diff --git a/include/wine/test.h b/include/wine/test.h index 869d8f8e33..38c8922458 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -30,9 +30,6 @@ #ifdef __WINE_CONFIG_H #error config.h should not be used in Wine tests #endif -#ifdef __WINE_WINE_LIBRARY_H -#error wine/library.h should not be used in Wine tests -#endif #ifdef __WINE_WINE_UNICODE_H #error wine/unicode.h should not be used in Wine tests #endif diff --git a/libs/wine/config.c b/libs/wine/config.c index f5b4c0de9a..f46ed4df08 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -41,7 +41,6 @@ #endif #endif #include "wine/asm.h" -#include "wine/library.h" static char *bindir; static char *dlldir; diff --git a/libs/wine/debug.c b/libs/wine/debug.c index d3f277cb39..95e6fe6e58 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -34,7 +34,6 @@ #endif #include "wine/debug.h" -#include "wine/library.h" struct __wine_debug_functions { diff --git a/libs/wine/loader.c b/libs/wine/loader.c index c3b59d9022..9c31fb3c3d 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -63,7 +63,6 @@ extern char **environ; #include "windef.h" #include "winbase.h" #include "wine/asm.h" -#include "wine/library.h" /* argc/argv for the Windows application */ int __wine_main_argc = 0; @@ -92,6 +91,7 @@ static int nb_dlls; static const IMAGE_NT_HEADERS *main_exe; +typedef void (*load_dll_callback_t)( void *, const char * ); static load_dll_callback_t load_dll_callback; extern const char *build_dir; @@ -100,6 +100,9 @@ static const char **dll_paths; static unsigned int nb_dll_paths; static int dll_path_maxlen; +extern void *wine_anon_mmap( void *start, size_t size, int prot, int flags ); +extern void wine_init_argv0_path( const char *argv0 ); +extern void wine_init( int argc, char *argv[], char *error, int error_size ); extern void mmap_init(void); extern const char *get_dlldir( const char **default_dlldir ); diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index af91b3e352..33d21c7fbb 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -42,7 +42,6 @@ # include <stdint.h> #endif -#include "wine/library.h" #include "wine/list.h" struct reserved_area @@ -67,6 +66,8 @@ static const unsigned int granularity_mask = 0xffff; /* reserved areas have 64k #define MAP_ANON 0 #endif +void wine_mmap_add_reserved_area( void *addr, size_t size ); + static inline int get_fdzero(void) { static int fd = -1; diff --git a/libs/wine/port.c b/libs/wine/port.c index 618b280881..259ff084e8 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -30,7 +30,6 @@ #define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" -#include "wine/library.h" /* functions from libwine_port that are also exported from libwine for backwards compatibility, * on platforms that require it */ diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index ecd0d9aff4..a5fc3bfd73 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -44,7 +44,6 @@ #include <shlobj.h> #define WINE_MOUNTMGR_EXTENSIONS #include <ddk/mountmgr.h> -#include <wine/library.h> #include "winecfg.h" #include "resource.h" diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index abad9ef998..538367926e 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -27,7 +27,6 @@ #include "winternl.h" #include "wine/exception.h" -#include "wine/library.h" #include "wine/debug.h" diff --git a/tools/make_makefiles b/tools/make_makefiles index c18fa90e2d..a92987c2ab 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -41,7 +41,6 @@ my %modules16 = my %exported_wine_headers = ( "wine/debug.h" => 1, "wine/exception.h" => 1, - "wine/library.h" => 1, "wine/itss.idl" => 1, "wine/svcctl.idl" => 1, );

1 0

Alexandre Julliard : loader: No longer depend on libwine.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 4826900a30a431faa8bcc9e3f0007f794d8d15bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4826900a30a431faa8bcc9e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 8 09:55:38 2020 +0200 loader: No longer depend on libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/Makefile.in | 4 +- loader/main.c | 159 +---------------------------------------------------- 2 files changed, 5 insertions(+), 158 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index cb38a7f545..1cb9ab6bf7 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -22,11 +22,11 @@ main_EXTRADEFS = -DDLLDIR=\"${dlldir}\" -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindi wine_OBJS = main.o wine_DEPS = $(WINELOADER_DEPENDS) -wine_LDFLAGS = $(WINELOADER_LDFLAGS) $(LDEXECFLAGS) -lwine $(PTHREAD_LIBS) +wine_LDFLAGS = $(WINELOADER_LDFLAGS) $(LDEXECFLAGS) $(PTHREAD_LIBS) wine64_OBJS = main.o wine64_DEPS = $(WINELOADER_DEPENDS) -wine64_LDFLAGS = $(WINELOADER_LDFLAGS) $(LDEXECFLAGS) -lwine $(PTHREAD_LIBS) +wine64_LDFLAGS = $(WINELOADER_LDFLAGS) $(LDEXECFLAGS) $(PTHREAD_LIBS) wine_preloader_OBJS = preloader.o preloader_mac.o wine_preloader_DEPS = $(WINELOADER_DEPENDS) diff --git a/loader/main.c b/loader/main.c index a92276fa41..fb40e90f97 100644 --- a/loader/main.c +++ b/loader/main.c @@ -21,147 +21,17 @@ #include "config.h" #include "wine/port.h" -#include <errno.h> +#include <pthread.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif -#ifdef HAVE_SYS_RESOURCE_H -# include <sys/resource.h> -#endif -#ifdef HAVE_SYS_SYSCALL_H -# include <sys/syscall.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include "wine/library.h" #include "main.h" extern char **environ; -extern const char *wine_get_build_id(void); - /* the preloader will set this variable */ const struct wine_preload_info *wine_main_preload_info = NULL; -/*********************************************************************** - * check_command_line - * - * Check if command line is one that needs to be handled specially. - */ -static void check_command_line( int argc, char *argv[] ) -{ - static const char usage[] = - "Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n" - " wine --help Display this help and exit\n" - " wine --version Output version information and exit"; - - if (argc <= 1) - { - fprintf( stderr, "%s\n", usage ); - exit(1); - } - if (!strcmp( argv[1], "--help" )) - { - printf( "%s\n", usage ); - exit(0); - } - if (!strcmp( argv[1], "--version" )) - { - printf( "%s\n", wine_get_build_id() ); - exit(0); - } -} - - -#ifdef __ANDROID__ - -static int pre_exec(void) -{ -#if defined(__i386__) || defined(__x86_64__) - return 1; /* we have a preloader */ -#else - return 0; /* no exec needed */ -#endif -} - -#elif defined(__linux__) && (defined(__i386__) || defined(__arm__)) - -static void check_vmsplit( void *stack ) -{ - if (stack < (void *)0x80000000) - { - /* if the stack is below 0x80000000, assume we can safely try a munmap there */ - if (munmap( (void *)0x80000000, 1 ) == -1 && errno == EINVAL) - fprintf( stderr, - "Warning: memory above 0x80000000 doesn't seem to be accessible.\n" - "Wine requires a 3G/1G user/kernel memory split to work properly.\n" ); - } -} - -static void set_max_limit( int limit ) -{ - struct rlimit rlimit; - - if (!getrlimit( limit, &rlimit )) - { - rlimit.rlim_cur = rlimit.rlim_max; - setrlimit( limit, &rlimit ); - } -} - -static int pre_exec(void) -{ - int temp; - - check_vmsplit( &temp ); - set_max_limit( RLIMIT_AS ); -#ifdef __i386__ - return 1; /* we have a preloader on x86 */ -#else - return 0; -#endif -} - -#elif defined(__linux__) && (defined(__x86_64__) || defined(__aarch64__)) - -static int pre_exec(void) -{ - return 1; /* we have a preloader on x86-64/arm64 */ -} - -#elif defined(__APPLE__) && (defined(__i386__) || defined(__x86_64__)) - -static int pre_exec(void) -{ - return 1; /* we have a preloader */ -} - -#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) - -static int pre_exec(void) -{ - struct rlimit rl; - - rl.rlim_cur = 0x02000000; - rl.rlim_max = 0x02000000; - setrlimit( RLIMIT_DATA, &rl ); - return 1; -} - -#else - -static int pre_exec(void) -{ - return 0; /* no exec needed */ -} - -#endif - - /* canonicalize path and return its directory name */ static char *realpath_dirname( const char *name ) { @@ -279,8 +149,6 @@ static void *load_ntdll( char *argv0 ) */ int main( int argc, char *argv[] ) { - char error[1024]; - int i; void *handle; if ((handle = load_ntdll( argv[0] ))) @@ -291,28 +159,7 @@ int main( int argc, char *argv[] ) exit(1); } - if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ - { - static char noexec[] = "WINELOADERNOEXEC=1"; - - putenv( noexec ); - check_command_line( argc, argv ); - if (pre_exec()) - { - wine_init_argv0_path( argv[0] ); - wine_exec_wine_binary( NULL, argv, getenv( "WINELOADER" )); - fprintf( stderr, "wine: could not exec the wine loader\n" ); - exit(1); - } - } - - if (wine_main_preload_info) - { - for (i = 0; wine_main_preload_info[i].size; i++) - wine_mmap_add_reserved_area( wine_main_preload_info[i].addr, wine_main_preload_info[i].size ); - } - - wine_init( argc, argv, error, sizeof(error) ); - fprintf( stderr, "wine: failed to initialize: %s\n", error ); + fprintf( stderr, "wine: could not load ntdll.so: %s\n", dlerror() ); + pthread_detach( pthread_self() ); /* force importing libpthread for OpenGL */ exit(1); }

1 0

Zebediah Figura : wintrust: Translate CRYPTCAT_OPEN_CREATENEW to CREATE_ALWAYS.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 20f6f612124828c356d24973855345d0445476a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20f6f612124828c356d24973… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 7 23:13:30 2020 -0500 wintrust: Translate CRYPTCAT_OPEN_CREATENEW to CREATE_ALWAYS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 2 +- dlls/wintrust/tests/crypt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 307eda3248..975d51f14f 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -873,7 +873,7 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, if (flags == CRYPTCAT_OPEN_EXISTING) open_mode = OPEN_EXISTING; if (flags & CRYPTCAT_OPEN_CREATENEW) - open_mode = CREATE_NEW; + open_mode = CREATE_ALWAYS; file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, open_mode, 0, NULL); if (file == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index e992847033..1b436e9f4a 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -451,7 +451,7 @@ static void test_CryptCATOpen(void) file = _wfopen(filename, L"r"); ret = fread(buffer, 1, sizeof(buffer), file); if (flags & CRYPTCAT_OPEN_CREATENEW) - todo_wine ok(!ret, "flags %#x: got %s\n", flags, debugstr_an(buffer, ret)); + ok(!ret, "flags %#x: got %s\n", flags, debugstr_an(buffer, ret)); else ok(ret == 9 && !strncmp(buffer, "test text", ret), "flags %#x: got %s\n", flags, debugstr_an(buffer, ret)); fclose(file);

1 0

Zebediah Figura : wintrust: Translate a lack of open mode flags to OPEN_ALWAYS.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 699e0a55ea71e2506917e38fc85cb4ae23a9cd1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=699e0a55ea71e2506917e38f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 7 23:13:29 2020 -0500 wintrust: Translate a lack of open mode flags to OPEN_ALWAYS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 4eef9d1bcb..307eda3248 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -856,7 +856,7 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, { HANDLE file, hmsg; BYTE *buffer = NULL; - DWORD size, open_mode = OPEN_EXISTING; + DWORD size, open_mode = OPEN_ALWAYS; struct cryptcat *cc; TRACE("filename %s, flags %#x, provider %#lx, version %#x, type %#x\n", @@ -870,8 +870,8 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, if (!dwEncodingType) dwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; - if (flags & CRYPTCAT_OPEN_ALWAYS) - open_mode = OPEN_ALWAYS; + if (flags == CRYPTCAT_OPEN_EXISTING) + open_mode = OPEN_EXISTING; if (flags & CRYPTCAT_OPEN_CREATENEW) open_mode = CREATE_NEW;

1 0

Zebediah Figura : wintrust: Assign the file open mode directly instead of treating it as a bitmask.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 092cf0a06d4c4035c4c32048de30b08badfd4bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=092cf0a06d4c4035c4c32048… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 7 23:13:28 2020 -0500 wintrust: Assign the file open mode directly instead of treating it as a bitmask. Found when debugging the "inf2cat" tool from the Windows 10 DDK. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 20 +++++++++++--------- dlls/wintrust/tests/crypt.c | 3 +-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index b454c8b885..4eef9d1bcb 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -851,18 +851,18 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info /*********************************************************************** * CryptCATOpen (WINTRUST.@) */ -HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV hProv, +HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, DWORD dwPublicVersion, DWORD dwEncodingType) { HANDLE file, hmsg; BYTE *buffer = NULL; - DWORD size, flags = OPEN_EXISTING; + DWORD size, open_mode = OPEN_EXISTING; struct cryptcat *cc; - TRACE("%s, %x, %lx, %x, %x\n", debugstr_w(pwszFileName), fdwOpenFlags, - hProv, dwPublicVersion, dwEncodingType); + TRACE("filename %s, flags %#x, provider %#lx, version %#x, type %#x\n", + debugstr_w(filename), flags, hProv, dwPublicVersion, dwEncodingType); - if (!pwszFileName) + if (!filename) { SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; @@ -870,10 +870,12 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h if (!dwEncodingType) dwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; - if (fdwOpenFlags & CRYPTCAT_OPEN_ALWAYS) flags |= OPEN_ALWAYS; - if (fdwOpenFlags & CRYPTCAT_OPEN_CREATENEW) flags |= CREATE_NEW; + if (flags & CRYPTCAT_OPEN_ALWAYS) + open_mode = OPEN_ALWAYS; + if (flags & CRYPTCAT_OPEN_CREATENEW) + open_mode = CREATE_NEW; - file = CreateFileW(pwszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, flags, 0, NULL); + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, open_mode, 0, NULL); if (file == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; size = GetFileSize(file, NULL); @@ -951,7 +953,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h p += size; } cc->inner = decode_inner_content(hmsg, dwEncodingType, &cc->inner_len); - if (!cc->inner || !CryptSIPRetrieveSubjectGuid(pwszFileName, NULL, &cc->subject)) + if (!cc->inner || !CryptSIPRetrieveSubjectGuid(filename, NULL, &cc->subject)) { CryptMsgClose(hmsg); HeapFree(GetProcessHeap(), 0, cc->attr); diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index dfa411548f..e992847033 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -434,8 +434,7 @@ static void test_CryptCATOpen(void) ret = pCryptCATClose(cat); todo_wine ok(ret, "flags %#x: failed to close file\n", flags); ret = DeleteFileW(filename); - todo_wine_if (flags & (CRYPTCAT_OPEN_ALWAYS | CRYPTCAT_OPEN_CREATENEW)) - ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); + ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); } file = _wfopen(filename, L"w");

1 0

Zebediah Figura : wintrust/tests: Add more tests for CryptCATOpen() file modes.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: e07539d1ce1bdb0077d26eb3fbf40ffa1f12a842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e07539d1ce1bdb0077d26eb3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 7 23:13:27 2020 -0500 wintrust/tests: Add more tests for CryptCATOpen() file modes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/crypt.c | 76 ++++++++++++++++++++++++++++++++------------- 1 file changed, 54 insertions(+), 22 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 5a4344bc93..dfa411548f 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -401,33 +401,65 @@ static void test_calchash(void) static void test_CryptCATOpen(void) { - HANDLE hcat; - char empty[MAX_PATH]; - WCHAR emptyW[MAX_PATH]; - HANDLE file; + WCHAR filename[MAX_PATH], temp_path[MAX_PATH]; + HANDLE cat; + DWORD flags; BOOL ret; + FILE *file; + char buffer[10]; - SetLastError(0xdeadbeef); - hcat = pCryptCATOpen(NULL, 0, 0, 0, 0); - ok(hcat == INVALID_HANDLE_VALUE, "CryptCATOpen succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); - - if (!GetTempFileNameA(CURR_DIR, "cat", 0, empty)) return; + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); + GetTempFileNameW(temp_path, L"cat", 0, filename); - file = CreateFileA(empty, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); - CloseHandle(file); - MultiByteToWideChar(CP_ACP, 0, empty, -1, emptyW, MAX_PATH); + SetLastError(0xdeadbeef); + cat = pCryptCATOpen(NULL, 0, 0, 0, 0); + ok(cat == INVALID_HANDLE_VALUE, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); - hcat = pCryptCATOpen(emptyW, 0, 0, 0, 0); - todo_wine - ok(hcat != INVALID_HANDLE_VALUE, "Expected a correct handle\n"); + for (flags = 0; flags < 8; ++flags) + { + SetLastError(0xdeadbeef); + cat = pCryptCATOpen(filename, flags, 0, 0, 0); + if (flags == CRYPTCAT_OPEN_EXISTING) + { + ok(cat == INVALID_HANDLE_VALUE, "flags %#x: expected failure\n", flags); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "flags %#x: got error %u\n", flags, GetLastError()); + ret = DeleteFileW(filename); + ok(!ret, "flags %#x: expected failure\n", flags); + } + else + { + todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ret = pCryptCATClose(cat); + todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + ret = DeleteFileW(filename); + todo_wine_if (flags & (CRYPTCAT_OPEN_ALWAYS | CRYPTCAT_OPEN_CREATENEW)) + ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); + } + + file = _wfopen(filename, L"w"); + fputs("test text", file); + fclose(file); - ret = pCryptCATClose(hcat); - todo_wine - ok(ret, "CryptCATClose failed\n"); - DeleteFileA(empty); + SetLastError(0xdeadbeef); + cat = pCryptCATOpen(filename, flags, 0, 0, 0); + todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ret = pCryptCATClose(cat); + todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + + file = _wfopen(filename, L"r"); + ret = fread(buffer, 1, sizeof(buffer), file); + if (flags & CRYPTCAT_OPEN_CREATENEW) + todo_wine ok(!ret, "flags %#x: got %s\n", flags, debugstr_an(buffer, ret)); + else + ok(ret == 9 && !strncmp(buffer, "test text", ret), "flags %#x: got %s\n", flags, debugstr_an(buffer, ret)); + fclose(file); + + ret = DeleteFileW(filename); + ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); + } } static DWORD error_area;

1 0

Henri Verbeet : vkd3d-shader: Use proper variables for epilogue arguments.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: vkd3d Branch: master Commit: 5e523cedca074e546a4125afa72a533234f3b30b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5e523cedca074e546a4125a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 4 20:49:17 2020 +0430 vkd3d-shader: Use proper variables for epilogue arguments. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9a6b632..ec6987b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6946,14 +6946,22 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(struct vkd3d_dxb { if (compiler->private_output_variable[i]) { + uint32_t argument_id = compiler->private_output_variable[i]; unsigned int argument_idx = count++; - arguments[argument_idx] = compiler->private_output_variable[i]; if (compiler->private_output_variable_array_idx[i]) { - arguments[argument_idx] = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, - arguments[argument_idx], compiler->private_output_variable_array_idx[i]); + uint32_t tmp_id; + + tmp_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, + argument_id, compiler->private_output_variable_array_idx[i]); + tmp_id = vkd3d_spirv_build_op_load(builder, type_id, tmp_id, SpvMemoryAccessMaskNone); + argument_id = vkd3d_spirv_build_op_variable(builder, + &builder->global_stream, ptr_type_id, SpvStorageClassPrivate, 0); + vkd3d_spirv_build_op_store(builder, argument_id, tmp_id, SpvMemoryAccessMaskNone); } + + arguments[argument_idx] = argument_id; } }

1 0

Henri Verbeet : vkd3d-shader: Do not use built-ins for hull shader clip/cull distance built-ins.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: vkd3d Branch: master Commit: e339cc0edb953ab486e537e1acee0e94ba876faf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e339cc0edb953ab486e537e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 4 20:49:16 2020 +0430 vkd3d-shader: Do not use built-ins for hull shader clip/cull distance built-ins. We need these to be per-vertex. This fixes the Wine d3d11 test_clip_distance() test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc87a87..9a6b632 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5046,9 +5046,11 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp } if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) + { vkd3d_spirv_builder_begin_main_function(builder); - vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); + vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); + } } static size_t vkd3d_dxbc_compiler_get_current_function_location(struct vkd3d_dxbc_compiler *compiler)

1 0

Henri Verbeet : vkd3d-shader: Enable the corresponding capabilities when using the clip/cull distance built-ins.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: vkd3d Branch: master Commit: 56b042d1faa7bcdc6e34e6eb47e38790b262a283 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56b042d1faa7bcdc6e34e6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 4 20:49:15 2020 +0430 vkd3d-shader: Enable the corresponding capabilities when using the clip/cull distance built-ins. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 913b017..cc87a87 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3628,6 +3628,12 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com case SpvBuiltInSampleId: vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); break; + case SpvBuiltInClipDistance: + vkd3d_spirv_enable_capability(builder, SpvCapabilityClipDistance); + break; + case SpvBuiltInCullDistance: + vkd3d_spirv_enable_capability(builder, SpvCapabilityCullDistance); + break; default: break; }

1 0

Henri Verbeet : vkd3d-shader: Add some TRACEs.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: vkd3d Branch: master Commit: a10ecbc289138ccc604cc5842129f1b3cd6081f4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a10ecbc289138ccc604cc58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 4 20:49:14 2020 +0430 vkd3d-shader: Add some TRACEs. 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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6984843..16d895f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -294,6 +294,8 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ void vkd3d_shader_free_messages(char *messages) { + TRACE("messages %p.\n", messages); + vkd3d_free(messages); } @@ -912,11 +914,15 @@ done: void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { + TRACE("scan_descriptor_info %p.\n", scan_descriptor_info); + vkd3d_free(scan_descriptor_info->descriptors); } void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) { + TRACE("shader_code %p.\n", shader_code); + vkd3d_free((void *)shader_code->code); } @@ -956,6 +962,8 @@ static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_shader_root_sign void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *desc) { + TRACE("desc %p.\n", desc); + if (desc->version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0) { vkd3d_shader_free_root_signature_v_1_0(&desc->u.v_1_0);

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
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