October 2021 - Wine-commits

Alexandre Julliard : libport: Remove the getopt_long() implementation.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: a01532200d7e04ab087380ec73125f8183ae9840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a01532200d7e04ab087380ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 11:54:00 2021 +0200 libport: Remove the getopt_long() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 - configure.ac | 8 - include/config.h.in | 9 - include/wine/port.h | 25 -- libs/port/Makefile.in | 1 - libs/port/getopt.c | 1140 ------------------------------------------------- 6 files changed, 1199 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a01532200d7e04ab0873…

1 0

Alexandre Julliard : libport: Remove the mkstemps() implementation.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 6052dbd77a4f4aa79c33708ef975e915304b0f28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6052dbd77a4f4aa79c33708e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 11:54:12 2021 +0200 libport: Remove the mkstemps() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 2 - libs/port/Makefile.in | 1 - libs/port/mkstemps.c | 121 -------------------------------------------------- 3 files changed, 124 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index e5e9b2ee280..ee15981c20f 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -177,6 +177,4 @@ int readlink( const char *path, char *buf, size_t size ); int symlink(const char *from, const char *to); #endif -extern int mkstemps(char *template, int suffix_len); - #endif /* !defined(__WINE_WINE_PORT_H) */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 7b3ecc159df..a1159d67a02 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -2,7 +2,6 @@ STATICLIB = libwine_port.a C_SRCS = \ lstat.c \ - mkstemps.c \ readlink.c \ spawn.c \ symlink.c diff --git a/libs/port/mkstemps.c b/libs/port/mkstemps.c deleted file mode 100644 index ba92b2aeeb3..00000000000 --- a/libs/port/mkstemps.c +++ /dev/null @@ -1,121 +0,0 @@ -/* Copyright (C) 1991, 1992, 1996, 1998 Free Software Foundation, Inc. - This file is derived from mkstemp.c from the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. 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" - -#include <sys/types.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <stdio.h> -#include <fcntl.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - -#ifndef TMP_MAX -#define TMP_MAX 16384 -#endif - -/* - -(a)deftypefn Replacement int mkstemps (char *@var{template}, int @var{suffix_len}) - -Generate a unique temporary file name from @var{template}. -(a)var{template} has the form: - -(a)example - @var{path}/ccXXXXXX(a)var{suffix} -(a)end example - -(a)var{suffix_len} tells us how long @var{suffix} is (it can be zero -length). The last six characters of @var{template} before @var{suffix} -must be @samp{XXXXXX}; they are replaced with a string that makes the -filename unique. Returns a file descriptor open on the file for -reading and writing. - -(a)end deftypefn - -*/ - -int -mkstemps ( - char *template, - int suffix_len) -{ - static const char letters[] - = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - static unsigned __int64 value; - char *XXXXXX; - size_t len; - int count; - - len = strlen (template); - - if ((int) len < 6 + suffix_len - || strncmp (&template[len - 6 - suffix_len], "XXXXXX", 6)) - { - return -1; - } - - XXXXXX = &template[len - 6 - suffix_len]; - -#ifndef _WIN32 - { - struct timeval tv; - gettimeofday( &tv, NULL ); - value += ((unsigned __int64) tv.tv_usec << 16) ^ tv.tv_sec; - } -#endif - value += getpid(); - - for (count = 0; count < TMP_MAX; ++count) - { - unsigned __int64 v = value; - int fd; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % 62]; - v /= 62; - XXXXXX[1] = letters[v % 62]; - v /= 62; - XXXXXX[2] = letters[v % 62]; - v /= 62; - XXXXXX[3] = letters[v % 62]; - v /= 62; - XXXXXX[4] = letters[v % 62]; - v /= 62; - XXXXXX[5] = letters[v % 62]; - - fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600); - if (fd >= 0) - /* The file does not exist. */ - return fd; - - /* This is a random value. It is only necessary that the next - TMP_MAX values generated by adding 7777 to VALUE are different - with (module 2^32). */ - value += 7777; - } - - return -1; -}

1 0

Alexandre Julliard : libport: Remove the _spawnvp() implementation.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 8d3bc5c89cffb01b8a78b3d642804081c7028afd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d3bc5c89cffb01b8a78b3d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 11:54:42 2021 +0200 libport: Remove the _spawnvp() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 -- include/wine/port.h | 12 ------- libs/port/Makefile.in | 1 - libs/port/spawn.c | 98 --------------------------------------------------- 6 files changed, 116 deletions(-) diff --git a/configure b/configure index 2bcdd7d7f30..db2e07679d4 100755 --- a/configure +++ b/configure @@ -17896,7 +17896,6 @@ CFLAGS="$CFLAGS $BUILTINFLAG" for ac_func in \ __res_get_state \ __res_getservers \ - _spawnvp \ epoll_create \ fork \ fstatfs \ diff --git a/configure.ac b/configure.ac index 767ba3ca202..6321206b9db 100644 --- a/configure.ac +++ b/configure.ac @@ -2127,7 +2127,6 @@ CFLAGS="$CFLAGS $BUILTINFLAG" AC_CHECK_FUNCS(\ __res_get_state \ __res_getservers \ - _spawnvp \ epoll_create \ fork \ fstatfs \ diff --git a/include/config.h.in b/include/config.h.in index a19e3768808..e27b23f658f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -965,9 +965,6 @@ /* Define if Xrandr has the XRRGetProviderResources function */ #undef HAVE_XRRGETPROVIDERRESOURCES -/* Define to 1 if you have the `_spawnvp' function. */ -#undef HAVE__SPAWNVP - /* Define to 1 if you have the `__builtin_popcount' built-in function. */ #undef HAVE___BUILTIN_POPCOUNT diff --git a/include/wine/port.h b/include/wine/port.h index ee15981c20f..b7f537bec86 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -92,18 +92,6 @@ typedef int ssize_t; # endif #endif -/* Process creation flags */ -#ifndef _P_WAIT -# define _P_WAIT 0 -# define _P_NOWAIT 1 -# define _P_OVERLAY 2 -# define _P_NOWAITO 3 -# define _P_DETACH 4 -#endif -#ifndef HAVE__SPAWNVP -extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); -#endif - #endif /* _WIN32 */ /**************************************************************** diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index a1159d67a02..9b36c6c5a3b 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -3,5 +3,4 @@ STATICLIB = libwine_port.a C_SRCS = \ lstat.c \ readlink.c \ - spawn.c \ symlink.c diff --git a/libs/port/spawn.c b/libs/port/spawn.c deleted file mode 100644 index e19aa615a5d..00000000000 --- a/libs/port/spawn.c +++ /dev/null @@ -1,98 +0,0 @@ -/* - * spawnvp function - * - * Copyright 2003 Dimitrie O. Paun - * - * 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" - -#if !defined(HAVE__SPAWNVP) && (!defined(_WIN32) || defined(__CYGWIN__)) - -#include <errno.h> -#include <signal.h> -#include <stdlib.h> -#ifdef HAVE_SYS_WAIT_H -#include <sys/wait.h> -#endif -#include <sys/stat.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -int _spawnvp(int mode, const char *cmdname, const char *const argv[]) -{ - int pid, status, wret; - - if (mode == _P_OVERLAY) - { - execvp(cmdname, (char **)argv); - /* if we get here it failed */ -#ifdef ENOTSUP - if (errno != ENOTSUP) /* exec fails on MacOS if the process has multiple threads */ -#endif - return -1; - } - - pid = fork(); - if (pid == 0) - { - /* in child */ - if (mode == _P_DETACH) - { - pid = fork(); - if (pid == -1) _exit(1); - else if (pid > 0) _exit(0); - /* else in grandchild */ - } - - signal( SIGPIPE, SIG_DFL ); - execvp(cmdname, (char **)argv); - _exit(1); - } - - if (pid == -1) - return -1; - - if (mode == _P_OVERLAY) exit(0); - - if (mode == _P_WAIT || mode == _P_DETACH) - { - while (pid != (wret = waitpid(pid, &status, 0))) - if (wret == -1 && errno != EINTR) break; - - if (pid == wret && WIFEXITED(status)) - { - if (mode == _P_WAIT) - pid = WEXITSTATUS(status); - else /* mode == _P_DETACH */ - if (WEXITSTATUS(status) != 0) /* child couldn't fork grandchild */ - pid = -1; - } - else - { - if (mode == _P_WAIT) - pid = 255; /* abnormal exit with an abort or an interrupt */ - else /* mode == _P_DETACH */ - pid = -1; - } - } - - return pid; -} - -#endif /* HAVE__SPAWNVP */

1 0

Gabriel Ivăncescu : gdi32: Create the registry keys recursively, if needed.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: e1948ccc37e104122c66bb2c4e591e47c88642a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1948ccc37e104122c66bb2c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 5 17:16:45 2021 +0300 gdi32: Create the registry keys recursively, if needed. Fixes a regression introduced by 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd when creating new prefixes, as NtCreateKey does not recursively create keys. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c6bc3a716be..8cc60d5a16f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -31,6 +31,8 @@ #include <assert.h> #include <pthread.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -564,11 +566,13 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, DWORD options, DWORD *disposition ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; OBJECT_ATTRIBUTES attr; + NTSTATUS status; HANDLE ret; attr.Length = sizeof(attr); @@ -578,7 +582,34 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + static const WCHAR registry_rootW[] = { '\\','R','e','g','i','s','t','r','y','\\' }; + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + /* don't try to create registry root */ + if (!root && len > ARRAY_SIZE(registry_rootW) && + !memcmp( name, registry_rootW, sizeof(registry_rootW) )) + i += ARRAY_SIZE(registry_rootW); + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) + { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); + if (!NT_SUCCESS(status)) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } return ret; }

1 0

Jacek Caban : include: Don't use DECLSPEC_HIDDEN for NTSYSAPI in Unix libs.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: a7ecf080406b76b64176505d1d2fc8abba837022 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7ecf080406b76b64176505d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 5 17:03:27 2021 +0200 include: Don't use DECLSPEC_HIDDEN for NTSYSAPI in Unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/icmp_echo.c | 2 -- dlls/nsiproxy.sys/ip.c | 2 -- dlls/winepulse.drv/pulse.c | 2 -- include/winnt.h | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 999b53186c2..955fdfdb979 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -21,8 +21,6 @@ #pragma makedep unix #endif -#define _NTSYSTEM_ - #include "config.h" #include <stdarg.h> diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index c7ec2e89b16..432fe9d8e65 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -22,8 +22,6 @@ #pragma makedep unix #endif -#define _NTSYSTEM_ - #include "config.h" #include <stdarg.h> diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 2e6ad4848eb..bce70ac358c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -22,8 +22,6 @@ #pragma makedep unix #endif -#define _NTSYSTEM_ - #include <stdarg.h> #include <pthread.h> #include <math.h> diff --git a/include/winnt.h b/include/winnt.h index c230fa0cd7f..87051289445 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -41,7 +41,7 @@ extern "C" { #endif -#ifdef _NTSYSTEM_ +#if defined(_NTSYSTEM_) || defined(WINE_UNIX_LIB) #define NTSYSAPI #else #define NTSYSAPI DECLSPEC_IMPORT

1 0

Nikolay Sivov : d3d10/effect: Make it clear that buffers are always set one by one.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: bd2abd84aac999732423d8d23465034e3e03553d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2abd84aac999732423d8d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 14:48:45 2021 +0300 d3d10/effect: Make it clear that buffers are always set one by one. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c135c76811d..de236ca2513 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -659,6 +659,12 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const { case D3D10_SIT_CBUFFER: case D3D10_SIT_TBUFFER: + if (sr->bind_count != 1) + { + WARN("Unexpected bind count %u for a buffer %s.\n", bind_desc.BindCount, + debugstr_a(bind_desc.Name)); + return E_UNEXPECTED; + } sr->variable = d3d10_effect_get_buffer_by_name(v->effect, bind_desc.Name); break; @@ -4019,17 +4025,17 @@ static void apply_shader_resources(ID3D10Device *device, struct ID3D10EffectShad switch (v->type->basetype) { case D3D10_SVT_VERTEXSHADER: - ID3D10Device_VSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + ID3D10Device_VSSetConstantBuffers(device, sr->bind_point, 1, &rsrc_v->u.buffer.buffer); break; case D3D10_SVT_PIXELSHADER: - ID3D10Device_PSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + ID3D10Device_PSSetConstantBuffers(device, sr->bind_point, 1, &rsrc_v->u.buffer.buffer); break; case D3D10_SVT_GEOMETRYSHADER: - ID3D10Device_GSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + ID3D10Device_GSSetConstantBuffers(device, sr->bind_point, 1, &rsrc_v->u.buffer.buffer); break;

1 0

Nikolay Sivov : d3d10/effect: Rename known and used field in type descriptor.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: a1d44ca2ad6ac67cecb94651fdb3b58897278114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d44ca2ad6ac67cecb94651… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 14:48:46 2021 +0300 d3d10/effect: Rename known and used field in type descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index de236ca2513..38bde6ef83c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -968,9 +968,8 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, D static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { - DWORD typeinfo, type_flags; + DWORD typeinfo, type_flags, type_kind; const char *ptr; - DWORD unknown0; unsigned int i; if (offset >= data_size || !require_space(offset, 6, sizeof(DWORD), data_size)) @@ -990,8 +989,8 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } TRACE("Type name: %s.\n", debugstr_a(t->name)); - read_dword(&ptr, &unknown0); - TRACE("Unknown 0: %u.\n", unknown0); + read_dword(&ptr, &type_kind); + TRACE("Kind: %u.\n", type_kind); read_dword(&ptr, &t->element_count); TRACE("Element count: %u.\n", t->element_count); @@ -1005,9 +1004,11 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, read_dword(&ptr, &t->size_packed); TRACE("Packed size %#x.\n", t->size_packed); - switch (unknown0) + switch (type_kind) { case 1: + TRACE("Type is numeric.\n"); + if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) { WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); @@ -1122,7 +1123,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, break; default: - FIXME("Unhandled case %#x.\n", unknown0); + FIXME("Unhandled type kind %#x.\n", type_kind); return E_FAIL; }

1 0

Nikolay Sivov : d3d10/effect: Access pool effect structure directly.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 9b88064a18f7a03ee8e4cfd17ff3ec290f22d6c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b88064a18f7a03ee8e4cfd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 14:48:47 2021 +0300 d3d10/effect: Access pool effect structure directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 264 +++++++++++++++++++++------------------------ 2 files changed, 122 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b88064a18f7a03ee8e4…

1 0

Nikolay Sivov : d3d10/effect: Extend sampler backing store with a texture field.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 42a6c1f7055bb1203622c8fa23e3294112989b8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a6c1f7055bb1203622c8fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 14:48:48 2021 +0300 d3d10/effect: Extend sampler backing store with a texture field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 8 +++++++- dlls/d3d10/effect.c | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 31e38713c5f..1ebbbd11ea3 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -124,6 +124,12 @@ struct d3d10_effect_shader_variable unsigned int isinline : 1; }; +struct d3d10_effect_sampler_desc +{ + D3D10_SAMPLER_DESC desc; + struct d3d10_effect_variable *texture; +}; + struct d3d10_effect_state_object_variable { union @@ -131,7 +137,7 @@ struct d3d10_effect_state_object_variable D3D10_RASTERIZER_DESC rasterizer; D3D10_DEPTH_STENCIL_DESC depth_stencil; D3D10_BLEND_DESC blend; - D3D10_SAMPLER_DESC sampler; + struct d3d10_effect_sampler_desc sampler; } desc; union { diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 252e75f73bb..a62269f5b92 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -209,16 +209,16 @@ static const struct d3d10_effect_state_property_info property_info[] = {0x2a, "BlendState.DestBlendAlpha", D3D10_SVT_INT, 1, 1, D3D10_C_BLEND, FIELD_OFFSET(D3D10_BLEND_DESC, DestBlendAlpha) }, {0x2b, "BlendState.BlendOpAlpha", D3D10_SVT_INT, 1, 1, D3D10_C_BLEND, FIELD_OFFSET(D3D10_BLEND_DESC, BlendOpAlpha) }, {0x2c, "BlendState.RenderTargetWriteMask", D3D10_SVT_UINT8, 1, 8, D3D10_C_BLEND, FIELD_OFFSET(D3D10_BLEND_DESC, RenderTargetWriteMask) }, - {0x2d, "SamplerState.Filter", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, Filter) }, - {0x2e, "SamplerState.AddressU", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, AddressU) }, - {0x2f, "SamplerState.AddressV", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, AddressV) }, - {0x30, "SamplerState.AddressW", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, AddressW) }, - {0x31, "SamplerState.MipMapLODBias", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, MipLODBias) }, - {0x32, "SamplerState.MaxAnisotropy", D3D10_SVT_UINT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, MaxAnisotropy) }, - {0x33, "SamplerState.ComparisonFunc", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, ComparisonFunc) }, - {0x34, "SamplerState.BorderColor", D3D10_SVT_FLOAT, 4, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, BorderColor) }, - {0x35, "SamplerState.MinLOD", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, MinLOD) }, - {0x36, "SamplerState.MaxLOD", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, MaxLOD) }, + {0x2d, "SamplerState.Filter", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.Filter) }, + {0x2e, "SamplerState.AddressU", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.AddressU) }, + {0x2f, "SamplerState.AddressV", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.AddressV) }, + {0x30, "SamplerState.AddressW", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.AddressW) }, + {0x31, "SamplerState.MipLODBias", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.MipLODBias) }, + {0x32, "SamplerState.MaxAnisotropy", D3D10_SVT_UINT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.MaxAnisotropy) }, + {0x33, "SamplerState.ComparisonFunc", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.ComparisonFunc) }, + {0x34, "SamplerState.BorderColor", D3D10_SVT_FLOAT, 4, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.BorderColor) }, + {0x35, "SamplerState.MinLOD", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.MinLOD) }, + {0x36, "SamplerState.MaxLOD", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.MaxLOD) }, }; static const D3D10_RASTERIZER_DESC default_rasterizer_desc = @@ -2159,7 +2159,7 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) case D3D10_SVT_SAMPLER: if (FAILED(hr = ID3D10Device_CreateSamplerState(device, - &v->u.state.desc.sampler, &v->u.state.object.sampler))) + &v->u.state.desc.sampler.desc, &v->u.state.object.sampler))) return hr; break; @@ -8302,7 +8302,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetBackingStore(I return E_FAIL; } - *desc = v->u.state.desc.sampler; + *desc = v->u.state.desc.sampler.desc; return S_OK; }

1 0

Nikolay Sivov : d3d10/effect: Handle NULL initializer for SamplerState.Texture field.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 955071291cba63475a9aa35d450a1800182e2495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=955071291cba63475a9aa35d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 14:48:49 2021 +0300 d3d10/effect: Handle NULL initializer for SamplerState.Texture field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 90 +++++++++++++++++++++++++---------------------- dlls/d3d10/tests/effect.c | 72 +++++++++++++++++++------------------ 2 files changed, 84 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=955071291cba63475a9a…

1 0