March 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : gdi.exe: Build with msvcrt.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: 4599108cf29df692bdf6a5e8f85f50ea83406885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4599108cf29df692bdf6a5e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 17:04:11 2020 +0100 gdi.exe: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi.exe16/Makefile.in | 2 +- dlls/gdi.exe16/env.c | 2 -- dlls/gdi.exe16/metafile.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in index 312641cd51..6cd6279e14 100644 --- a/dlls/gdi.exe16/Makefile.in +++ b/dlls/gdi.exe16/Makefile.in @@ -1,7 +1,7 @@ MODULE = gdi.exe16 IMPORTS = user32 advapi32 gdi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,gdi32.dll,--heap,65520 +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,gdi32.dll,--heap,65520 C_SRCS = \ bidi.c \ diff --git a/dlls/gdi.exe16/env.c b/dlls/gdi.exe16/env.c index 582edda23d..e9b8bc31dc 100644 --- a/dlls/gdi.exe16/env.c +++ b/dlls/gdi.exe16/env.c @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> #include <string.h> diff --git a/dlls/gdi.exe16/metafile.c b/dlls/gdi.exe16/metafile.c index 2f0ccfebba..f88c0cddbb 100644 --- a/dlls/gdi.exe16/metafile.c +++ b/dlls/gdi.exe16/metafile.c @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <string.h> #include <fcntl.h>

1 0

Francois Gouget : testbot/WineRunReconfig: Don't run WineTest on extra Wine VMs.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: tools Branch: master Commit: 83ab7ba28f46fbe803f9caf5090f069286cfce83 URL: https://source.winehq.org/git/tools.git/?a=commit;h=83ab7ba28f46fbe803f9caf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 10 12:36:49 2020 +0100 testbot/WineRunReconfig: Don't run WineTest on extra Wine VMs. The role 'extra' means one can manually schedule a job on the VM but that nothing gets automatically run on it, including WineTest. This also means there will be no 'new failure' detection on these VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 644d546..2d45ed5 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -550,7 +550,7 @@ if ($NewStatus eq 'completed') FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } - if ($VM->Type eq "wine") + if ($VM->Type eq "wine" and $VM->Role =~ /^(?:base|winetest)$/) { require WineTestBot::SpecialJobs; $ErrMessage = WineTestBot::SpecialJobs::AddWineTestJob([$VM], $VM->Name);

1 0

Francois Gouget : testbot: Detect when make_opengl needs to be run.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: tools Branch: master Commit: b4945ec56b24f55040783d39ff7dc0b98f3fef19 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b4945ec56b24f55040783d3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 10 12:37:05 2020 +0100 testbot: Detect when make_opengl needs to be run. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index a8e5a0e..13f9699 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -137,6 +137,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeOpenGL}) + { + InfoMsg "\nRunning make_opengl\n"; + system("cd '$DataDir/$Dir/dlls/opengl32' && set -x && ./make_opengl"); + if ($? != 0) + { + LogMsg "make_opengl failed\n"; + return undef; + } + } if ($Impacts->{MakeVulkan}) { InfoMsg "\nRunning make_vulkan\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 3c2f670..07e6122 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -326,6 +326,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) + { + $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- \w+/dlls/winevulkan/make_vulkan$=) { $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1;

1 0

Francois Gouget : testbot: Take the patchset version into account.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: tools Branch: master Commit: f11366d19b8f28f9378686cd93db0abc637842fe URL: https://source.winehq.org/git/tools.git/?a=commit;h=f11366d19b8f28f9378686c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 8 20:27:34 2020 +0100 testbot: Take the patchset version into account. This avoids errors when a new revision of a patchset is sent before the previous one has been fully received. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48353 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 3 +- testbot/ddl/update43.sql | 26 +++++++ testbot/ddl/winetestbot.sql | 8 ++- testbot/doc/winetestbot-schema.dia | 108 ++++++++++++++++++++-------- testbot/lib/WineTestBot/PendingPatchSets.pm | 4 +- testbot/lib/WineTestBot/PendingPatches.pm | 3 +- 6 files changed, 115 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=f11366d19b8f28f9378…

1 0

Jacek Caban : include: Add corecrt_wprocess.h header.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: ce62c3c8c930361c0acb74f1ae6efbfc335736d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce62c3c8c930361c0acb74f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 9 17:53:23 2020 +0100 include: Add corecrt_wprocess.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_wprocess.h | 37 +++++++++++++++++++++++++++++++++++++ include/msvcrt/process.h | 22 +--------------------- include/msvcrt/wchar.h | 22 +--------------------- 4 files changed, 40 insertions(+), 42 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index ce0f6fc433..54bd7e2825 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -428,6 +428,7 @@ SOURCES = \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wctype.h \ msvcrt/corecrt_wio.h \ + msvcrt/corecrt_wprocess.h \ msvcrt/corecrt_wstdio.h \ msvcrt/corecrt_wstdlib.h \ msvcrt/corecrt_wstring.h \ diff --git a/include/msvcrt/corecrt_wprocess.h b/include/msvcrt/corecrt_wprocess.h new file mode 100644 index 0000000000..aa71aeff6b --- /dev/null +++ b/include/msvcrt/corecrt_wprocess.h @@ -0,0 +1,37 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _WPROCESS_DEFINED +#define _WPROCESS_DEFINED + +#include <corecrt.h> + +#ifdef __cplusplus +extern "C" { +#endif + +intptr_t WINAPIV _wexecl(const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wexecle(const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wexeclp(const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wexeclpe(const wchar_t*,const wchar_t*,...); +intptr_t __cdecl _wexecv(const wchar_t*,const wchar_t* const *); +intptr_t __cdecl _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *); +intptr_t __cdecl _wexecvp(const wchar_t*,const wchar_t* const *); +intptr_t __cdecl _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *); +intptr_t WINAPIV _wspawnl(int,const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wspawnle(int,const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wspawnlp(int,const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wspawnlpe(int,const wchar_t*,const wchar_t*,...); +intptr_t __cdecl _wspawnv(int,const wchar_t*,const wchar_t* const *); +intptr_t __cdecl _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); +intptr_t __cdecl _wspawnvp(int,const wchar_t*,const wchar_t* const *); +intptr_t __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); +int __cdecl _wsystem(const wchar_t*); + +#ifdef __cplusplus +} +#endif + +#endif /* _WPROCESS_DEFINED */ diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index f76807b43a..a3707129ad 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -9,6 +9,7 @@ #define __WINE_PROCESS_H #include <corecrt_startup.h> +#include <corecrt_wprocess.h> /* Process creation flags */ #define _P_WAIT 0 @@ -57,27 +58,6 @@ void __cdecl abort(void) DECLSPEC_NORETURN; void __cdecl exit(int) DECLSPEC_NORETURN; int __cdecl system(const char*); -#ifndef _WPROCESS_DEFINED -#define _WPROCESS_DEFINED -intptr_t WINAPIV _wexecl(const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wexecle(const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wexeclp(const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wexeclpe(const wchar_t*,const wchar_t*,...); -intptr_t __cdecl _wexecv(const wchar_t*,const wchar_t* const *); -intptr_t __cdecl _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *); -intptr_t __cdecl _wexecvp(const wchar_t*,const wchar_t* const *); -intptr_t __cdecl _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *); -intptr_t WINAPIV _wspawnl(int,const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wspawnle(int,const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wspawnlp(int,const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wspawnlpe(int,const wchar_t*,const wchar_t*,...); -intptr_t __cdecl _wspawnv(int,const wchar_t*,const wchar_t* const *); -intptr_t __cdecl _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); -intptr_t __cdecl _wspawnvp(int,const wchar_t*,const wchar_t* const *); -intptr_t __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); -int __cdecl _wsystem(const wchar_t*); -#endif /* _WPROCESS_DEFINED */ - #ifdef __cplusplus } #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 239c5af86a..ddb0fc5bc1 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -10,6 +10,7 @@ #include <corecrt_wctype.h> #include <corecrt_wio.h> +#include <corecrt_wprocess.h> #include <corecrt_wstdio.h> #include <corecrt_wstdlib.h> #include <corecrt_wstring.h> @@ -41,27 +42,6 @@ int __cdecl _wrmdir(const wchar_t*); wchar_t* __cdecl _wsetlocale(int,const wchar_t*); #endif /* _WLOCALE_DEFINED */ -#ifndef _WPROCESS_DEFINED -#define _WPROCESS_DEFINED -int WINAPIV _wexecl(const wchar_t*,const wchar_t*,...); -int WINAPIV _wexecle(const wchar_t*,const wchar_t*,...); -int WINAPIV _wexeclp(const wchar_t*,const wchar_t*,...); -int WINAPIV _wexeclpe(const wchar_t*,const wchar_t*,...); -int __cdecl _wexecv(const wchar_t*,const wchar_t* const *); -int __cdecl _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *); -int __cdecl _wexecvp(const wchar_t*,const wchar_t* const *); -int __cdecl _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *); -int WINAPIV _wspawnl(int,const wchar_t*,const wchar_t*,...); -int WINAPIV _wspawnle(int,const wchar_t*,const wchar_t*,...); -int WINAPIV _wspawnlp(int,const wchar_t*,const wchar_t*,...); -int WINAPIV _wspawnlpe(int,const wchar_t*,const wchar_t*,...); -int __cdecl _wspawnv(int,const wchar_t*,const wchar_t* const *); -int __cdecl _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); -int __cdecl _wspawnvp(int,const wchar_t*,const wchar_t* const *); -int __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); -int __cdecl _wsystem(const wchar_t*); -#endif /* _WPROCESS_DEFINED */ - wchar_t __cdecl btowc(int); size_t __cdecl mbrlen(const char *,size_t,mbstate_t*); size_t __cdecl mbrtowc(wchar_t*,const char*,size_t,mbstate_t*);

1 0

Jacek Caban : include: Add corecrt_wdirect.h header.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 26ffc40bfb42b7c05ce9513bf479e31eb85294b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ffc40bfb42b7c05ce9513b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 9 17:53:42 2020 +0100 include: Add corecrt_wdirect.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_wdirect.h | 25 +++++++++++++++++++++++++ include/msvcrt/direct.h | 11 +---------- include/msvcrt/wchar.h | 10 +--------- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 54bd7e2825..adcd173a14 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -427,6 +427,7 @@ SOURCES = \ msvcrt/corecrt_startup.h \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wctype.h \ + msvcrt/corecrt_wdirect.h \ msvcrt/corecrt_wio.h \ msvcrt/corecrt_wprocess.h \ msvcrt/corecrt_wstdio.h \ diff --git a/include/msvcrt/corecrt_wdirect.h b/include/msvcrt/corecrt_wdirect.h new file mode 100644 index 0000000000..88abae560c --- /dev/null +++ b/include/msvcrt/corecrt_wdirect.h @@ -0,0 +1,25 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _WDIRECT_DEFINED +#define _WDIRECT_DEFINED + +#include <corecrt.h> + +#ifdef __cplusplus +extern "C" { +#endif + +int __cdecl _wchdir(const wchar_t*); +wchar_t* __cdecl _wgetcwd(wchar_t*,int); +wchar_t* __cdecl _wgetdcwd(int,wchar_t*,int); +int __cdecl _wmkdir(const wchar_t*); +int __cdecl _wrmdir(const wchar_t*); + +#ifdef __cplusplus +} +#endif + +#endif /* _WDIRECT_DEFINED */ diff --git a/include/msvcrt/direct.h b/include/msvcrt/direct.h index 312cb2d365..90c6103e4d 100644 --- a/include/msvcrt/direct.h +++ b/include/msvcrt/direct.h @@ -8,7 +8,7 @@ #ifndef __WINE_DIRECT_H #define __WINE_DIRECT_H -#include <corecrt.h> +#include <corecrt_wdirect.h> #include <pshpack8.h> @@ -35,15 +35,6 @@ __msvcrt_ulong __cdecl _getdrives(void); int __cdecl _mkdir(const char*); int __cdecl _rmdir(const char*); -#ifndef _WDIRECT_DEFINED -#define _WDIRECT_DEFINED -int __cdecl _wchdir(const wchar_t*); -wchar_t* __cdecl _wgetcwd(wchar_t*,int); -wchar_t* __cdecl _wgetdcwd(int,wchar_t*,int); -int __cdecl _wmkdir(const wchar_t*); -int __cdecl _wrmdir(const wchar_t*); -#endif /* _WDIRECT_DEFINED */ - #ifdef __cplusplus } #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index ddb0fc5bc1..fcf198f9b2 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -9,6 +9,7 @@ #define __WINE_WCHAR_H #include <corecrt_wctype.h> +#include <corecrt_wdirect.h> #include <corecrt_wio.h> #include <corecrt_wprocess.h> #include <corecrt_wstdio.h> @@ -28,15 +29,6 @@ extern "C" { typedef int mbstate_t; -#ifndef _WDIRECT_DEFINED -#define _WDIRECT_DEFINED -int __cdecl _wchdir(const wchar_t*); -wchar_t* __cdecl _wgetcwd(wchar_t*,int); -wchar_t* __cdecl _wgetdcwd(int,wchar_t*,int); -int __cdecl _wmkdir(const wchar_t*); -int __cdecl _wrmdir(const wchar_t*); -#endif /* _WDIRECT_DEFINED */ - #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED wchar_t* __cdecl _wsetlocale(int,const wchar_t*);

1 0

Zebediah Figura : winebus.sys: Fix reporting axis values for joysticks.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: da7d60bf97fb8726828e57f852e8963aacde21e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da7d60bf97fb8726828e57f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 9 11:50:59 2020 -0500 winebus.sys: Fix reporting axis values for joysticks. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 7a2069fafe..0560e4bb12 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -265,24 +265,14 @@ static void set_button_value(struct platform_private *ext, int index, int value) } } -static void set_axis_value(struct platform_private *ext, int index, short value) +static void set_axis_value(struct platform_private *ext, int index, short value, BOOL controller) { - int offset; - offset = ext->axis_start + index * sizeof(WORD); + WORD *report = (WORD *)(ext->report_buffer + ext->axis_start); - switch (index) - { - case SDL_CONTROLLER_AXIS_LEFTX: - case SDL_CONTROLLER_AXIS_LEFTY: - case SDL_CONTROLLER_AXIS_RIGHTX: - case SDL_CONTROLLER_AXIS_RIGHTY: - *((WORD*)&ext->report_buffer[offset]) = LE_WORD(value) + 32768; - break; - case SDL_CONTROLLER_AXIS_TRIGGERLEFT: - case SDL_CONTROLLER_AXIS_TRIGGERRIGHT: - *((WORD*)&ext->report_buffer[offset]) = LE_WORD(value); - break; - } + if (controller && (index == SDL_CONTROLLER_AXIS_TRIGGERLEFT || index == SDL_CONTROLLER_AXIS_TRIGGERRIGHT)) + report[index] = LE_WORD(value); + else + report[index] = LE_WORD(value) + 32768; } static void set_ball_value(struct platform_private *ext, int index, int value1, int value2) @@ -510,7 +500,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) /* Initialize axis in the report */ for (i = 0; i < axis_count; i++) - set_axis_value(ext, i, pSDL_JoystickGetAxis(ext->sdl_joystick, i)); + set_axis_value(ext, i, pSDL_JoystickGetAxis(ext->sdl_joystick, i), FALSE); for (i = 0; i < hat_count; i++) set_hat_value(ext, i, pSDL_JoystickGetHat(ext->sdl_joystick, i)); @@ -608,7 +598,7 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) /* Initialize axis in the report */ for (i = SDL_CONTROLLER_AXIS_LEFTX; i < SDL_CONTROLLER_AXIS_MAX; i++) - set_axis_value(ext, i, pSDL_GameControllerGetAxis(ext->sdl_controller, i)); + set_axis_value(ext, i, pSDL_GameControllerGetAxis(ext->sdl_controller, i), TRUE); set_hat_value(ext, 0, compose_dpad_value(ext->sdl_controller)); @@ -787,7 +777,7 @@ static BOOL set_report_from_event(SDL_Event *event) if (ie->axis < 6) { - set_axis_value(private, ie->axis, ie->value); + set_axis_value(private, ie->axis, ie->value, FALSE); process_hid_report(device, private->report_buffer, private->buffer_length); } break; @@ -873,7 +863,7 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) { SDL_ControllerAxisEvent *ie = &event->caxis; - set_axis_value(private, ie->axis, ie->value); + set_axis_value(private, ie->axis, ie->value, TRUE); process_hid_report(device, private->report_buffer, private->buffer_length); break; }

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_depth_stencil_match().
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 2d1786c55a6269f282f9fe622eb3f869283ed370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d1786c55a6269f282f9fe62… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 9 15:41:33 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_depth_stencil_match(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 9 ++++++++- dlls/d3d9/directx.c | 9 ++++++++- dlls/wined3d/directx.c | 16 +++++----------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 13bf7b031c..e56246613f 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -323,13 +323,20 @@ static HRESULT WINAPI d3d8_CheckDepthStencilMatch(IDirect3D8 *iface, UINT adapte D3DFORMAT adapter_format, D3DFORMAT rt_format, D3DFORMAT ds_format) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); + struct wined3d_adapter *wined3d_adapter; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, rt_format %#x, ds_format %#x.\n", iface, adapter, device_type, adapter_format, rt_format, ds_format); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); - hr = wined3d_check_depth_stencil_match(d3d8->wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); + hr = wined3d_check_depth_stencil_match(wined3d_adapter, device_type, wined3dformat_from_d3dformat(adapter_format), wined3dformat_from_d3dformat(rt_format), wined3dformat_from_d3dformat(ds_format)); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 4dbdaeef71..cd52a0e68f 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -349,13 +349,20 @@ static HRESULT WINAPI d3d9_CheckDepthStencilMatch(IDirect3D9Ex *iface, UINT adap D3DFORMAT adapter_format, D3DFORMAT rt_format, D3DFORMAT ds_format) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); + struct wined3d_adapter *wined3d_adapter; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, rt_format %#x, ds_format %#x.\n", iface, adapter, device_type, adapter_format, rt_format, ds_format); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); - hr = wined3d_check_depth_stencil_match(d3d9->wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); + hr = wined3d_check_depth_stencil_match(wined3d_adapter, device_type, wined3dformat_from_d3dformat(adapter_format), wined3dformat_from_d3dformat(rt_format), wined3dformat_from_d3dformat(ds_format)); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7419425d71..208e00b839 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1444,24 +1444,18 @@ HRESULT CDECL wined3d_output_get_raster_status(const struct wined3d_output *outp return WINED3D_OK; } -HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, - UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, +HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d_adapter *adapter, + enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id) { const struct wined3d_format *rt_format; const struct wined3d_format *ds_format; - const struct wined3d_adapter *adapter; - TRACE("wined3d %p, adapter_idx %u, device_type %s, " - "adapter_format %s, render_target_format %s, depth_stencil_format %s.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), + TRACE("adapter %p, device_type %s, adapter_format %s, render_target_format %s, " + "depth_stencil_format %s.\n", + adapter, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), debug_d3dformat(render_target_format_id), debug_d3dformat(depth_stencil_format_id)); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = wined3d->adapters[adapter_idx]; - rt_format = wined3d_get_format(adapter, render_target_format_id, WINED3D_BIND_RENDER_TARGET); ds_format = wined3d_get_format(adapter, depth_stencil_format_id, WINED3D_BIND_DEPTH_STENCIL); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 472cd907b3..3530a11f8d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -2,7 +2,7 @@ @ stdcall wined3d_mutex_unlock() @ cdecl wined3d_calculate_format_pitch(ptr long long long) -@ cdecl wined3d_check_depth_stencil_match(ptr long long long long long) +@ cdecl wined3d_check_depth_stencil_match(ptr long long long long) @ cdecl wined3d_check_device_format(ptr long long long long long long long) @ cdecl wined3d_check_device_format_conversion(ptr long long long) @ cdecl wined3d_check_device_multisample_type(ptr long long long long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 09c6995de0..fbcc6bb332 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2247,7 +2247,7 @@ void __stdcall wined3d_mutex_unlock(void); UINT __cdecl wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, UINT width); -HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d *wined3d, UINT adapter_idx, +HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id); HRESULT __cdecl wined3d_check_device_format(const struct wined3d *wined3d, UINT adaper_idx,

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_output pointer to wined3d_check_device_type().
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: f9701d3777e894f2432a58c1011b3accef32df6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9701d3777e894f2432a58c1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 9 15:40:53 2020 +0800 wined3d: Pass a struct wined3d_output pointer to wined3d_check_device_type(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 8 +++++++- dlls/d3d9/directx.c | 8 +++++++- dlls/wined3d/directx.c | 27 +++++++++++++-------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 7 ++++--- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index d515caffd2..13bf7b031c 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -213,16 +213,22 @@ static HRESULT WINAPI d3d8_CheckDeviceType(IDirect3D8 *iface, UINT adapter, D3DD D3DFORMAT display_format, D3DFORMAT backbuffer_format, BOOL windowed) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, display_format %#x, backbuffer_format %#x, windowed %#x.\n", iface, adapter, device_type, display_format, backbuffer_format, windowed); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (!windowed && display_format != D3DFMT_X8R8G8B8 && display_format != D3DFMT_R5G6B5) return WINED3DERR_NOTAVAILABLE; wined3d_mutex_lock(); - hr = wined3d_check_device_type(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(display_format), + hr = wined3d_check_device_type(d3d8->wined3d, d3d8->wined3d_outputs[output_idx], device_type, + wined3dformat_from_d3dformat(display_format), wined3dformat_from_d3dformat(backbuffer_format), windowed); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 700c3cb145..4dbdaeef71 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -236,17 +236,23 @@ static HRESULT WINAPI d3d9_CheckDeviceType(IDirect3D9Ex *iface, UINT adapter, D3 D3DFORMAT display_format, D3DFORMAT backbuffer_format, BOOL windowed) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, display_format %#x, backbuffer_format %#x, windowed %#x.\n", iface, adapter, device_type, display_format, backbuffer_format, windowed); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out. */ if (!windowed && display_format != D3DFMT_X8R8G8B8 && display_format != D3DFMT_R5G6B5) return WINED3DERR_NOTAVAILABLE; wined3d_mutex_lock(); - hr = wined3d_check_device_type(d3d9->wined3d, adapter, device_type, wined3dformat_from_d3dformat(display_format), + hr = wined3d_check_device_type(d3d9->wined3d, d3d9->wined3d_outputs[output_idx], device_type, + wined3dformat_from_d3dformat(display_format), wined3dformat_from_d3dformat(backbuffer_format), windowed); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3f46bb6a28..8053f9dc53 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1783,19 +1783,17 @@ HRESULT CDECL wined3d_check_device_format_conversion(const struct wined3d_output return WINED3D_OK; } -HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_device_type device_type, enum wined3d_format_id display_format, - enum wined3d_format_id backbuffer_format, BOOL windowed) +HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, + const struct wined3d_output *output, enum wined3d_device_type device_type, + enum wined3d_format_id display_format, enum wined3d_format_id backbuffer_format, + BOOL windowed) { BOOL present_conversion = wined3d->flags & WINED3D_PRESENT_CONVERSION; - TRACE("wined3d %p, adapter_idx %u, device_type %s, display_format %s, backbuffer_format %s, windowed %#x.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(display_format), + TRACE("wined3d %p, output %p, device_type %s, display_format %s, backbuffer_format %s, windowed %#x.\n", + wined3d, output, debug_d3ddevicetype(device_type), debug_d3dformat(display_format), debug_d3dformat(backbuffer_format), windowed); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - /* The task of this function is to check whether a certain display / backbuffer format * combination is available on the given adapter. In fullscreen mode microsoft specified * that the display format shouldn't provide alpha and that ignoring alpha the backbuffer @@ -1815,8 +1813,8 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap if (!windowed) { /* If the requested display format is not available, don't continue. */ - if (!wined3d_output_get_mode_count(&wined3d->adapters[adapter_idx]->outputs[0], - display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN)) + if (!wined3d_output_get_mode_count(output, display_format, + WINED3D_SCANLINE_ORDERING_UNKNOWN)) { TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); return WINED3DERR_NOTAVAILABLE; @@ -1839,8 +1837,8 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap if (backbuffer_format == WINED3DFMT_UNKNOWN) backbuffer_format = display_format; - if (FAILED(wined3d_check_device_format_conversion(&wined3d->adapters[adapter_idx]->outputs[0], - device_type, backbuffer_format, display_format))) + if (FAILED(wined3d_check_device_format_conversion(output, device_type, backbuffer_format, + display_format))) { TRACE("Format conversion from %s to %s not supported.\n", debug_d3dformat(backbuffer_format), debug_d3dformat(display_format)); @@ -1886,8 +1884,9 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap } /* Validate that the back buffer format is usable for render targets. */ - if (FAILED(wined3d_check_device_format(wined3d, adapter_idx, device_type, display_format, - 0, WINED3D_BIND_RENDER_TARGET, WINED3D_RTYPE_TEXTURE_2D, backbuffer_format))) + if (FAILED(wined3d_check_device_format(wined3d, output->adapter->ordinal, device_type, + display_format, 0, WINED3D_BIND_RENDER_TARGET, WINED3D_RTYPE_TEXTURE_2D, + backbuffer_format))) { TRACE("Format %s not allowed for render targets.\n", debug_d3dformat(backbuffer_format)); return WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d043b91cc4..d8ffdee9ac 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -6,7 +6,7 @@ @ cdecl wined3d_check_device_format(ptr long long long long long long long) @ cdecl wined3d_check_device_format_conversion(ptr long long long) @ cdecl wined3d_check_device_multisample_type(ptr long long long long long ptr) -@ cdecl wined3d_check_device_type(ptr long long long long long) +@ cdecl wined3d_check_device_type(ptr ptr long long long long) @ cdecl wined3d_create(long) @ cdecl wined3d_decref(ptr) @ cdecl wined3d_get_adapter(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a97b14b6c5..3e05852640 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2259,9 +2259,10 @@ HRESULT __cdecl wined3d_check_device_format_conversion(const struct wined3d_outp HRESULT __cdecl wined3d_check_device_multisample_type(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id surface_format_id, BOOL windowed, enum wined3d_multisample_type multisample_type, DWORD *quality_levels); -HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_device_type device_type, enum wined3d_format_id display_format_id, - enum wined3d_format_id backbuffer_format_id, BOOL windowed); +HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, + const struct wined3d_output *output, enum wined3d_device_type device_type, + enum wined3d_format_id display_format_id, enum wined3d_format_id backbuffer_format_id, + BOOL windowed); struct wined3d * __cdecl wined3d_create(DWORD flags); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d,

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_output pointer to wined3d_check_device_format_conversion().
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 5df462274df0e1b5c2b2a25c3d6669cdd5cbd265 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df462274df0e1b5c2b2a25c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 9 15:40:40 2020 +0800 wined3d: Pass a struct wined3d_output pointer to wined3d_check_device_format_conversion(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/directx.c | 10 ++++++++-- dlls/wined3d/directx.c | 11 ++++++----- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index d006cf2743..700c3cb145 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -361,14 +361,20 @@ static HRESULT WINAPI d3d9_CheckDeviceFormatConversion(IDirect3D9Ex *iface, UINT D3DDEVTYPE device_type, D3DFORMAT src_format, D3DFORMAT dst_format) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, src_format %#x, dst_format %#x.\n", iface, adapter, device_type, src_format, dst_format); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); - hr = wined3d_check_device_format_conversion(d3d9->wined3d, adapter, device_type, - wined3dformat_from_d3dformat(src_format), wined3dformat_from_d3dformat(dst_format)); + hr = wined3d_check_device_format_conversion(d3d9->wined3d_outputs[output_idx], + device_type, wined3dformat_from_d3dformat(src_format), + wined3dformat_from_d3dformat(dst_format)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f5a94b93aa..3f46bb6a28 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1772,11 +1772,12 @@ UINT CDECL wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT ad return row_pitch; } -HRESULT CDECL wined3d_check_device_format_conversion(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_device_type device_type, enum wined3d_format_id src_format, enum wined3d_format_id dst_format) +HRESULT CDECL wined3d_check_device_format_conversion(const struct wined3d_output *output, + enum wined3d_device_type device_type, enum wined3d_format_id src_format, + enum wined3d_format_id dst_format) { - FIXME("wined3d %p, adapter_idx %u, device_type %s, src_format %s, dst_format %s stub!\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(src_format), + FIXME("output %p, device_type %s, src_format %s, dst_format %s stub!\n", + output, debug_d3ddevicetype(device_type), debug_d3dformat(src_format), debug_d3dformat(dst_format)); return WINED3D_OK; @@ -1838,7 +1839,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap if (backbuffer_format == WINED3DFMT_UNKNOWN) backbuffer_format = display_format; - if (FAILED(wined3d_check_device_format_conversion(wined3d, adapter_idx, + if (FAILED(wined3d_check_device_format_conversion(&wined3d->adapters[adapter_idx]->outputs[0], device_type, backbuffer_format, display_format))) { TRACE("Format conversion from %s to %s not supported.\n", diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c426ffd0b6..d043b91cc4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -4,7 +4,7 @@ @ cdecl wined3d_calculate_format_pitch(ptr long long long) @ cdecl wined3d_check_depth_stencil_match(ptr long long long long long) @ cdecl wined3d_check_device_format(ptr long long long long long long long) -@ cdecl wined3d_check_device_format_conversion(ptr long long long long) +@ cdecl wined3d_check_device_format_conversion(ptr long long long) @ cdecl wined3d_check_device_multisample_type(ptr long long long long long ptr) @ cdecl wined3d_check_device_type(ptr long long long long long) @ cdecl wined3d_create(long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 12defa4f40..a97b14b6c5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2253,7 +2253,7 @@ HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d *wined3d, HRESULT __cdecl wined3d_check_device_format(const struct wined3d *wined3d, UINT adaper_idx, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, DWORD usage, unsigned int bind_flags, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id); -HRESULT __cdecl wined3d_check_device_format_conversion(const struct wined3d *wined3d, UINT adapter_idx, +HRESULT __cdecl wined3d_check_device_format_conversion(const struct wined3d_output *output, enum wined3d_device_type device_type, enum wined3d_format_id source_format_id, enum wined3d_format_id target_format_id); HRESULT __cdecl wined3d_check_device_multisample_type(const struct wined3d *wined3d, UINT adapter_idx,

1 0