March 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : libport: Get rid of memcpy_unaligned().
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 25e4cfbdb37d58743ece53e120cf258f1cd0ae46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25e4cfbdb37d58743ece53e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 19:30:33 2019 +0100 libport: Get rid of memcpy_unaligned(). The code that uses it is no longer built on non-i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/ne_module.c | 2 +- dlls/krnl386.exe16/resource.c | 7 +++---- include/wine/port.h | 10 ---------- libs/port/Makefile.in | 1 - libs/port/memcpy_unaligned.c | 29 ----------------------------- 5 files changed, 4 insertions(+), 45 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 14f8075..d494585 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -333,7 +333,7 @@ static void NE_InitResourceHandler( HMODULE16 hModule ) pTypeInfo = (NE_TYPEINFO *)((char *)pModule + pModule->ne_rsrctab + 2); while(pTypeInfo->type_id) { - memcpy_unaligned( &pTypeInfo->resloader, &proc, sizeof(FARPROC16) ); + pTypeInfo->resloader = proc; pTypeInfo = (NE_TYPEINFO *)((char*)(pTypeInfo + 1) + pTypeInfo->count * sizeof(NE_NAMEINFO)); } } diff --git a/dlls/krnl386.exe16/resource.c b/dlls/krnl386.exe16/resource.c index da54f6d..2f606fa 100644 --- a/dlls/krnl386.exe16/resource.c +++ b/dlls/krnl386.exe16/resource.c @@ -380,8 +380,8 @@ FARPROC16 WINAPI SetResourceHandler16( HMODULE16 hModule, LPCSTR typeId, FARPROC { if (!(pTypeInfo = NE_FindTypeSection( pResTab, pTypeInfo, typeId ))) break; - memcpy_unaligned( &prevHandler, &pTypeInfo->resloader, sizeof(FARPROC16) ); - memcpy_unaligned( &pTypeInfo->resloader, &resourceHandler, sizeof(FARPROC16) ); + prevHandler = pTypeInfo->resloader; + pTypeInfo->resloader = resourceHandler; pTypeInfo = next_typeinfo(pTypeInfo); } if (!prevHandler) prevHandler = get_default_res_handler(); @@ -1031,8 +1031,7 @@ HGLOBAL16 WINAPI LoadResource16( HMODULE16 hModule, HRSRC16 hRsrc ) } else { - FARPROC16 resloader; - memcpy_unaligned( &resloader, &pTypeInfo->resloader, sizeof(FARPROC16) ); + FARPROC16 resloader = pTypeInfo->resloader; if (resloader && resloader != get_default_res_handler()) { WORD args[3]; diff --git a/include/wine/port.h b/include/wine/port.h index fb7251e..600d78d 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -368,15 +368,6 @@ int symlink(const char *from, const char *to); int usleep (unsigned int useconds); #endif /* !defined(HAVE_USLEEP) */ -#ifdef __i386__ -static inline void *memcpy_unaligned( void *dst, const void *src, size_t size ) -{ - return memcpy( dst, src, size ); -} -#else -extern void *memcpy_unaligned( void *dst, const void *src, size_t size ); -#endif /* __i386__ */ - extern int mkstemps(char *template, int suffix_len); /* Process creation flags */ @@ -532,7 +523,6 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa #define interlocked_xchg_ptr __WINE_NOT_PORTABLE(interlocked_xchg_ptr) #define interlocked_xchg_add __WINE_NOT_PORTABLE(interlocked_xchg_add) #define lstat __WINE_NOT_PORTABLE(lstat) -#define memcpy_unaligned __WINE_NOT_PORTABLE(memcpy_unaligned) #undef memmove #define memmove __WINE_NOT_PORTABLE(memmove) #define pread __WINE_NOT_PORTABLE(pread) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 8d16741..239f20f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -90,7 +90,6 @@ C_SRCS = \ isnan.c \ lstat.c \ mbtowc.c \ - memcpy_unaligned.c \ memmove.c \ mkstemps.c \ normalize.c \ diff --git a/libs/port/memcpy_unaligned.c b/libs/port/memcpy_unaligned.c deleted file mode 100644 index 35fbacb..0000000 --- a/libs/port/memcpy_unaligned.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Unaligned memcpy wrapper to defeat gcc optimizations. - * - * Copyright 1996 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 - */ - -#include "config.h" -#include "wine/port.h" - -#ifndef __i386__ -void *memcpy_unaligned( void *dst, const void *src, size_t size ) -{ - return memcpy( dst, src, size ); -} -#endif

1 0

Alexandre Julliard : libport: Simplify configuration checks in getopt.c.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 96b815fcca044ffd30808d21890023f4bb0b92fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b815fcca044ffd30808d21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 19:33:49 2019 +0100 libport: Simplify configuration checks in getopt.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 - libs/port/getopt.c | 148 ++++++-------------------------------- libs/port/getopt.h | 129 --------------------------------- libs/port/getopt1.c | 192 -------------------------------------------------- 4 files changed, 21 insertions(+), 449 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96b815fcca044ffd3080…

1 0

Alexandre Julliard : libport: Remove checks for gettimeofday().
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: cba41d9bfd1e5efbbddcb8e4181e912c579e1d96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cba41d9bfd1e5efbbddcb8e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 19:32:22 2019 +0100 libport: Remove checks for gettimeofday(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- libs/port/mkstemps.c | 26 +++----------------------- 4 files changed, 3 insertions(+), 28 deletions(-) diff --git a/configure b/configure index 8a07748..365df4e 100755 --- a/configure +++ b/configure @@ -16744,7 +16744,6 @@ for ac_func in \ getifaddrs \ getopt_long_only \ getpwuid \ - gettimeofday \ getuid \ kqueue \ lstat \ diff --git a/configure.ac b/configure.ac index db8bb6c..5c9980b 100644 --- a/configure.ac +++ b/configure.ac @@ -2162,7 +2162,6 @@ AC_CHECK_FUNCS(\ getifaddrs \ getopt_long_only \ getpwuid \ - gettimeofday \ getuid \ kqueue \ lstat \ diff --git a/include/config.h.in b/include/config.h.in index 1d69e2e..7db97d3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -264,9 +264,6 @@ /* Define to 1 if you have the <gettext-po.h> header file. */ #undef HAVE_GETTEXT_PO_H -/* Define to 1 if you have the `gettimeofday' function. */ -#undef HAVE_GETTIMEOFDAY - /* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID diff --git a/libs/port/mkstemps.c b/libs/port/mkstemps.c index 3ca71e8..5c8c7a3 100644 --- a/libs/port/mkstemps.c +++ b/libs/port/mkstemps.c @@ -31,16 +31,6 @@ #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif -#ifdef HAVE_PROCESS_H -#include <process.h> -#endif - -/* We need to provide a type for gcc_uint64_t. */ -#ifdef __GNUC__ -__extension__ typedef unsigned long long gcc_uint64_t; -#else -typedef unsigned long gcc_uint64_t; -#endif #ifndef TMP_MAX #define TMP_MAX 16384 @@ -74,10 +64,8 @@ mkstemps ( { static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - static gcc_uint64_t value; -#ifdef HAVE_GETTIMEOFDAY + static unsigned __int64 value; struct timeval tv; -#endif char *XXXXXX; size_t len; int count; @@ -92,17 +80,13 @@ mkstemps ( XXXXXX = &template[len - 6 - suffix_len]; -#ifdef HAVE_GETTIMEOFDAY /* Get some more or less random data. */ gettimeofday (&tv, NULL); - value += ((gcc_uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid (); -#else - value += getpid (); -#endif + value += ((unsigned __int64) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid (); for (count = 0; count < TMP_MAX; ++count) { - gcc_uint64_t v = value; + unsigned __int64 v = value; int fd; /* Fill in the random bits. */ @@ -118,11 +102,7 @@ mkstemps ( v /= 62; XXXXXX[5] = letters[v % 62]; -#ifdef VMS - fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600, "fop=tmd"); -#else fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600); -#endif if (fd >= 0) /* The file does not exist. */ return fd;

1 0

Alexandre Julliard : libport: Remove checks for memmove().
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 4fcd86e17d2b5a4826fd2604c08edbe27f46f3a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fcd86e17d2b5a4826fd2604… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 19:44:08 2019 +0100 libport: Remove checks for memmove(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 6 ------ libs/port/Makefile.in | 1 - libs/port/memmove.c | 48 ------------------------------------------------ 6 files changed, 60 deletions(-) diff --git a/configure b/configure index 365df4e..273d70a 100755 --- a/configure +++ b/configure @@ -16747,7 +16747,6 @@ for ac_func in \ getuid \ kqueue \ lstat \ - memmove \ mmap \ pclose \ pipe2 \ diff --git a/configure.ac b/configure.ac index 5c9980b..f3e8d65 100644 --- a/configure.ac +++ b/configure.ac @@ -2165,7 +2165,6 @@ AC_CHECK_FUNCS(\ getuid \ kqueue \ lstat \ - memmove \ mmap \ pclose \ pipe2 \ diff --git a/include/config.h.in b/include/config.h.in index 7db97d3..476a3fb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -600,9 +600,6 @@ /* Define to 1 if you have the <mach-o/nlist.h> header file. */ #undef HAVE_MACH_O_NLIST_H -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H diff --git a/include/wine/port.h b/include/wine/port.h index 600d78d..e3bfa7f 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -292,10 +292,6 @@ long lrintf(float x); int lstat(const char *file_name, struct stat *buf); #endif /* HAVE_LSTAT */ -#ifndef HAVE_MEMMOVE -void *memmove(void *dest, const void *src, size_t len); -#endif /* !defined(HAVE_MEMMOVE) */ - #ifndef HAVE_POLL struct pollfd { @@ -523,8 +519,6 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa #define interlocked_xchg_ptr __WINE_NOT_PORTABLE(interlocked_xchg_ptr) #define interlocked_xchg_add __WINE_NOT_PORTABLE(interlocked_xchg_add) #define lstat __WINE_NOT_PORTABLE(lstat) -#undef memmove -#define memmove __WINE_NOT_PORTABLE(memmove) #define pread __WINE_NOT_PORTABLE(pread) #define pwrite __WINE_NOT_PORTABLE(pwrite) #define spawnvp __WINE_NOT_PORTABLE(spawnvp) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index b49cb78..908b6b6 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -89,7 +89,6 @@ C_SRCS = \ isnan.c \ lstat.c \ mbtowc.c \ - memmove.c \ mkstemps.c \ normalize.c \ poll.c \ diff --git a/libs/port/memmove.c b/libs/port/memmove.c deleted file mode 100644 index 7be9638..0000000 --- a/libs/port/memmove.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * memmove function - * - * Copyright 1996 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 - */ - -#include "config.h" -#include "wine/port.h" - -#ifndef HAVE_MEMMOVE -void *memmove( void *dest, const void *source, size_t len ) -{ - register char *dst = dest; - register const char *src = source; - - /* Use memcpy if not overlapping */ - if ((dst + len <= src) || (src + len <= dst)) - { - memcpy( dst, src, len ); - } - /* Otherwise do it the hard way (FIXME: could do better than this) */ - else if (dst < src) - { - while (len--) *dst++ = *src++; - } - else - { - dst += len - 1; - src += len - 1; - while (len--) *dst-- = *src--; - } - return dest; -} -#endif /* HAVE_MEMMOVE */

1 0

Alexandre Julliard : libport: Remove checks for strerror().
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 47c440a8a9abdc91ce92d647a0ea0fb22e08c3d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47c440a8a9abdc91ce92d647… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 19:46:17 2019 +0100 libport: Remove checks for strerror(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 5 ----- libs/port/Makefile.in | 1 - libs/port/strerror.c | 30 ------------------------------ 6 files changed, 41 deletions(-) diff --git a/configure b/configure index 273d70a..1818eac 100755 --- a/configure +++ b/configure @@ -16772,7 +16772,6 @@ for ac_func in \ statvfs \ strcasecmp \ strdup \ - strerror \ strncasecmp \ strnlen \ strtold \ diff --git a/configure.ac b/configure.ac index f3e8d65..7aa4fb8 100644 --- a/configure.ac +++ b/configure.ac @@ -2190,7 +2190,6 @@ AC_CHECK_FUNCS(\ statvfs \ strcasecmp \ strdup \ - strerror \ strncasecmp \ strnlen \ strtold \ diff --git a/include/config.h.in b/include/config.h.in index 476a3fb..5efa27e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -936,9 +936,6 @@ /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP -/* Define to 1 if you have the `strerror' function. */ -#undef HAVE_STRERROR - /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H diff --git a/include/wine/port.h b/include/wine/port.h index e3bfa7f..e32818e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -344,10 +344,6 @@ int strncasecmp(const char *str1, const char *str2, size_t n); size_t strnlen( const char *str, size_t maxlen ); #endif /* !defined(HAVE_STRNLEN) */ -#ifndef HAVE_STRERROR -const char *strerror(int err); -#endif /* !defined(HAVE_STRERROR) */ - #ifndef HAVE_STRCASECMP # ifndef HAVE__STRICMP int strcasecmp(const char *str1, const char *str2); @@ -524,7 +520,6 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa #define spawnvp __WINE_NOT_PORTABLE(spawnvp) #define statvfs __WINE_NOT_PORTABLE(statvfs) #define strcasecmp __WINE_NOT_PORTABLE(strcasecmp) -#define strerror __WINE_NOT_PORTABLE(strerror) #define strncasecmp __WINE_NOT_PORTABLE(strncasecmp) #define strnlen __WINE_NOT_PORTABLE(strnlen) #define usleep __WINE_NOT_PORTABLE(usleep) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 908b6b6..46f98cd 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -99,7 +99,6 @@ C_SRCS = \ spawn.c \ statvfs.c \ strcasecmp.c \ - strerror.c \ strncasecmp.c \ strnlen.c \ symlink.c \ diff --git a/libs/port/strerror.c b/libs/port/strerror.c deleted file mode 100644 index 792d41a..0000000 --- a/libs/port/strerror.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * strerror function - * - * Copyright 1996 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 - */ - -#include "config.h" -#include "wine/port.h" - -#ifndef HAVE_STRERROR -const char *strerror( int err ) -{ - /* Let's hope we have sys_errlist then */ - return sys_errlist[err]; -} -#endif /* HAVE_STRERROR */

1 0

Alexandre Julliard : Avoid using Windows includes that are already handled in wine/port.h.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 2ae84d52408e06ef53816226a1eae7091a58dc00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae84d52408e06ef53816226… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 20:19:00 2019 +0100 Avoid using Windows includes that are already handled in wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi.exe16/printdrv.c | 3 --- dlls/ntdll/cdrom.c | 3 --- dlls/ntdll/om.c | 3 --- dlls/ntdll/serial.c | 3 --- libs/port/pread.c | 4 ---- libs/port/pwrite.c | 3 --- libs/wpp/preproc.c | 3 --- programs/winecfg/theme.c | 3 --- 8 files changed, 25 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index 2e1ace8..3e49af2 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -31,9 +31,6 @@ #include <string.h> #include <ctype.h> #include <errno.h> -#ifdef HAVE_IO_H -# include <io.h> -#endif #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 066181b..4a3b84d 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -28,9 +28,6 @@ #include <string.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_IO_H -# include <io.h> -#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 0b56251..0d66867 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -24,9 +24,6 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_IO_H -# include <io.h> -#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 830137c..66081d2 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -30,9 +30,6 @@ #ifdef HAVE_TERMIOS_H #include <termios.h> #endif -#ifdef HAVE_IO_H -# include <io.h> -#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif diff --git a/libs/port/pread.c b/libs/port/pread.c index 34b6304..cced416 100644 --- a/libs/port/pread.c +++ b/libs/port/pread.c @@ -26,10 +26,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_IO_H -# include <io.h> -#endif - /* FIXME: this is not thread-safe */ diff --git a/libs/port/pwrite.c b/libs/port/pwrite.c index 1829a22..37e5dab 100644 --- a/libs/port/pwrite.c +++ b/libs/port/pwrite.c @@ -26,9 +26,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_IO_H -# include <io.h> -#endif /* FIXME: this is not thread-safe */ diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 21830d6..1bd10cd 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -29,9 +29,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_IO_H -# include <io.h> -#endif #include "wine/wpp.h" #include "wpp_private.h" diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 78d89a5..66d2344 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -34,9 +34,6 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef HAVE_DIRECT_H -#include <direct.h> -#endif #define COBJMACROS

1 0

Józef Kucia : wined3d: Add driver and device UUIDs to adapter identifiers.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 1f0be7befedf80819a6888437f608b6f5f1edce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f0be7befedf80819a688843… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 12 16:30:18 2019 +0100 wined3d: Add driver and device UUIDs to adapter identifiers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/directx.c | 7 ++++++- dlls/wined3d/wined3d_gl.h | 3 ++- dlls/wined3d/wined3d_private.h | 4 +++- include/wine/wined3d.h | 8 +++++--- 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 492d7f9..5bcb39f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -179,6 +179,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT }, {"GL_EXT_framebuffer_multisample", EXT_FRAMEBUFFER_MULTISAMPLE }, {"GL_EXT_framebuffer_object", EXT_FRAMEBUFFER_OBJECT }, + {"GL_EXT_memory_object", EXT_MEMORY_OBJECT }, {"GL_EXT_gpu_program_parameters", EXT_GPU_PROGRAM_PARAMETERS }, {"GL_EXT_gpu_shader4", EXT_GPU_SHADER4 }, {"GL_EXT_packed_depth_stencil", EXT_PACKED_DEPTH_STENCIL }, @@ -2499,6 +2500,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glVertexAttribI4uivEXT) USE_GL_FUNC(glVertexAttribI4usvEXT) USE_GL_FUNC(glVertexAttribIPointerEXT) + /* GL_EXT_memory_object */ + USE_GL_FUNC(glGetUnsignedBytei_vEXT) + USE_GL_FUNC(glGetUnsignedBytevEXT) /* GL_EXT_point_parameters */ USE_GL_FUNC(glPointParameterfEXT) USE_GL_FUNC(glPointParameterfvEXT) @@ -3871,6 +3875,28 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(driver_info->vram_bytes)); + if (gl_info->supported[EXT_MEMORY_OBJECT]) + { + GLint device_count = 0; + + gl_info->gl_ops.gl.p_glGetIntegerv(GL_NUM_DEVICE_UUIDS_EXT, &device_count); + if (device_count > 0) + { + if (device_count > 1) + FIXME("A set of %d devices is not supported.\n", device_count); + + GL_EXTCALL(glGetUnsignedBytevEXT(GL_DRIVER_UUID_EXT, (GLubyte *)&adapter->driver_uuid)); + GL_EXTCALL(glGetUnsignedBytei_vEXT(GL_DEVICE_UUID_EXT, 0, (GLubyte *)&adapter->device_uuid)); + + TRACE("Driver UUID: %s, device UUID %s.\n", + debugstr_guid(&adapter->driver_uuid), debugstr_guid(&adapter->device_uuid)); + } + else + { + WARN("Unexpected device count %d.\n", device_count); + } + } + gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info) | adapter->fragment_pipe->get_emul_mask(gl_info); if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a05f6cc..d51e672 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1211,7 +1211,9 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->device_id = adapter->driver_info.device; identifier->subsystem_id = 0; identifier->revision = 0; - memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); + identifier->device_identifier = IID_D3DDEVICE_D3DUID; + identifier->driver_uuid = adapter->driver_uuid; + identifier->device_uuid = adapter->device_uuid; identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); @@ -2548,6 +2550,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o TRACE("Allocated LUID %08x:%08x for adapter %p.\n", adapter->luid.HighPart, adapter->luid.LowPart, adapter); + memset(&adapter->driver_uuid, 0, sizeof(adapter->driver_uuid)); + memset(&adapter->device_uuid, 0, sizeof(adapter->device_uuid)); + adapter->formats = NULL; if (wined3d_creation_flags & WINED3D_NO3D) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a02073c..ae067e6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -157,14 +157,15 @@ enum wined3d_gl_extension EXT_BLEND_FUNC_SEPARATE, EXT_BLEND_MINMAX, EXT_BLEND_SUBTRACT, - EXT_DRAW_BUFFERS2, EXT_DEPTH_BOUNDS_TEST, + EXT_DRAW_BUFFERS2, EXT_FOG_COORD, EXT_FRAMEBUFFER_BLIT, EXT_FRAMEBUFFER_MULTISAMPLE, EXT_FRAMEBUFFER_OBJECT, EXT_GPU_PROGRAM_PARAMETERS, EXT_GPU_SHADER4, + EXT_MEMORY_OBJECT, EXT_PACKED_DEPTH_STENCIL, EXT_PACKED_FLOAT, EXT_POINT_PARAMETERS, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6907c7b..d0edb8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2686,7 +2686,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, /* The adapter structure */ struct wined3d_adapter { - UINT ordinal; + unsigned int ordinal; POINT monitor_position; enum wined3d_format_id screen_format; @@ -2694,6 +2694,8 @@ struct wined3d_adapter struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; UINT64 vram_bytes_used; + GUID driver_uuid; + GUID device_uuid; LUID luid; WCHAR device_name[CCHDEVICENAME]; /* for use with e.g. ChangeDisplaySettings() */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0732902..2f8ed5e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1719,17 +1719,19 @@ struct wined3d_tri_patch_info struct wined3d_adapter_identifier { char *driver; - UINT driver_size; + unsigned int driver_size; char *description; - UINT description_size; + unsigned int description_size; char *device_name; - UINT device_name_size; + unsigned int device_name_size; LARGE_INTEGER driver_version; DWORD vendor_id; DWORD device_id; DWORD subsystem_id; DWORD revision; GUID device_identifier; + GUID driver_uuid; + GUID device_uuid; DWORD whql_level; LUID adapter_luid; SIZE_T video_memory;

1 0

Józef Kucia : dxgi: Introduce IWineDXGIAdapter:: get_adapter_info().
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 642ef33df02eb674f94f167a3a4fe32e809b636f URL: https://source.winehq.org/git/wine.git/?a=commit;h=642ef33df02eb674f94f167a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 12 16:30:19 2019 +0100 dxgi: Introduce IWineDXGIAdapter::get_adapter_info(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 24 ++++++++++++++++++++++++ include/wine/winedxgi.idl | 12 ++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 31baae6..d96cb1e 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -364,6 +364,28 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, return dxgi_adapter_get_desc(adapter, desc); } +static HRESULT STDMETHODCALLTYPE dxgi_adapter_get_adapter_info(IWineDXGIAdapter *iface, + struct wine_dxgi_adapter_info *info) +{ + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + struct wined3d_adapter_identifier adapter_id; + HRESULT hr; + + TRACE("iface %p, info %p.\n", iface, info); + + memset(&adapter_id, 0, sizeof(adapter_id)); + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) + { + info->driver_uuid = adapter_id.driver_uuid; + info->device_uuid = adapter_id.device_uuid; + info->vendor_id = adapter_id.vendor_id; + info->device_id = adapter_id.device_id; + info->luid = adapter_id.adapter_luid; + } + + return hr; +} + static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = { dxgi_adapter_QueryInterface, @@ -390,6 +412,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification, /* IDXGIAdapter4 methods */ dxgi_adapter_GetDesc3, + /* IWineDXGIAdapter methods */ + dxgi_adapter_get_adapter_info, }; struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index f300eb9..8444090 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -68,6 +68,17 @@ interface IWineDXGIDeviceParent : IUnknown struct wined3d_device_parent *get_wined3d_device_parent(); } +struct wine_dxgi_adapter_info +{ + GUID driver_uuid; + GUID device_uuid; + + DWORD vendor_id; + DWORD device_id; + + LUID luid; +}; + [ object, local, @@ -75,6 +86,7 @@ interface IWineDXGIDeviceParent : IUnknown ] interface IWineDXGIAdapter : IDXGIAdapter4 { + HRESULT get_adapter_info([out] struct wine_dxgi_adapter_info *info); } [

1 0

Józef Kucia : d3d12: Use VkPhysicalDevice corresponding to IDXGIAdapter.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: f42b983356799c08f52cc91b1a43980620a9b666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f42b983356799c08f52cc91b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 12 16:30:20 2019 +0100 d3d12: Use VkPhysicalDevice corresponding to IDXGIAdapter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/Makefile.in | 2 +- dlls/d3d12/d3d12_main.c | 197 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 174 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f42b983356799c08f52c…

1 0

Huw Davies : winegcc: Restore the linker option specifier for strip.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 7cb188fdb1227c8249f9fbd9b63ebdf1223a89e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cb188fdb1227c8249f9fbd9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 12 08:44:12 2019 +0000 winegcc: Restore the linker option specifier for strip. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b58c39a..94d2906 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -406,7 +406,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, "-image_base" ); strarray_add( flags, opts->image_base ); } - if (opts->strip) strarray_add( flags, "-x" ); + if (opts->strip) strarray_add( flags, "-Wl,-x" ); return flags; case PLATFORM_SOLARIS:

1 0