wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Alexandre Julliard : kernelbase: Use wide character string literals in file.c.
by Alexandre Julliard 10 Mar '20

10 Mar '20

Module: wine Branch: master Commit: d88bbf0a45fd604b36ecab21cd0393ca9cf0aa3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d88bbf0a45fd604b36ecab21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 19:52:26 2020 +0100 kernelbase: Use wide character string literals in file.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 65 ++++++++++++++++---------------------------------- 1 file changed, 20 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d88bbf0a45fd604b36ec…

1 0

Francois Gouget : testbot: Detect when make_opengl needs to be run.
by Alexandre Julliard 10 Mar '20

10 Mar '20

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 10 Mar '20

10 Mar '20

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

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

10 Mar '20

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

Jacek Caban : include: Add corecrt_wdirect.h header.
by Alexandre Julliard 09 Mar '20

09 Mar '20

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

Jacek Caban : include: Add corecrt_wprocess.h header.
by Alexandre Julliard 09 Mar '20

09 Mar '20

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

Zebediah Figura : winebus.sys: Fix reporting axis values for joysticks.
by Alexandre Julliard 09 Mar '20

09 Mar '20

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

Nikolay Sivov : mfplat: Add MFGetPlaneSize().
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: 673d9849345f733688f8536ae541c5a10c38b86c URL: https://source.winehq.org/git/wine.git/?a=commit;h=673d9849345f733688f8536a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 9 19:39:25 2020 +0300 mfplat: Add MFGetPlaneSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 32 ++++++++++++++++++++++++++------ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 14 ++++++++++++++ include/mfapi.h | 1 + 4 files changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 69b302ca89..6b67f5b33c 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1737,10 +1737,7 @@ static int __cdecl uncompressed_video_format_compare(const void *a, const void * return memcmp(guid, format->subtype, sizeof(*guid)); } -/*********************************************************************** - * MFCalculateImageSize (mfplat.@) - */ -HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size) +static HRESULT mf_get_image_size(REFGUID subtype, unsigned int width, unsigned int height, unsigned int *size) { static const struct uncompressed_video_format video_formats[] = { @@ -1755,8 +1752,6 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height }; struct uncompressed_video_format *format; - TRACE("%s, %u, %u, %p.\n", debugstr_mf_guid(subtype), width, height, size); - format = bsearch(subtype, video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), uncompressed_video_format_compare); if (format) @@ -1771,6 +1766,31 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height return format ? S_OK : E_INVALIDARG; } +/*********************************************************************** + * MFCalculateImageSize (mfplat.@) + */ +HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size) +{ + TRACE("%s, %u, %u, %p.\n", debugstr_mf_guid(subtype), width, height, size); + + return mf_get_image_size(subtype, width, height, size); +} + +/*********************************************************************** + * MFGetPlaneSize (mfplat.@) + */ +HRESULT WINAPI MFGetPlaneSize(DWORD format, DWORD width, DWORD height, DWORD *size) +{ + GUID subtype; + + TRACE("%#x, %u, %u, %p.\n", format, width, height, size); + + memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); + subtype.Data1 = format; + + return mf_get_image_size(&subtype, width, height, size); +} + /*********************************************************************** * MFCompareFullToPartialMediaType (mfplat.@) */ diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 7e3bd4571c..1e11a1fc2a 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -96,7 +96,7 @@ @ stub MFGetConfigurationString @ stub MFGetMFTMerit @ stub MFGetNumericNameFromSockaddr -@ stub MFGetPlaneSize +@ stdcall MFGetPlaneSize(long long long ptr) @ stub MFGetPlatform @ stdcall MFGetPluginControl(ptr) @ stub MFGetPrivateWorkqueues diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a93bbfe7f1..36fe9dc831 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -91,6 +91,7 @@ static HRESULT (WINAPI *pMFTUnregisterLocalByCLSID)(CLSID clsid); static HRESULT (WINAPI *pMFAllocateWorkQueueEx)(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); static HRESULT (WINAPI *pMFTEnumEx)(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *count); +static HRESULT (WINAPI *pMFGetPlaneSize)(DWORD format, DWORD width, DWORD height, DWORD *size); static const WCHAR fileschemeW[] = L"file://"; @@ -662,6 +663,7 @@ static void init_functions(void) X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); X(MFCreateTransformActivate); + X(MFGetPlaneSize); X(MFHeapAlloc); X(MFHeapFree); X(MFPutWaitingWorkItem); @@ -3184,6 +3186,9 @@ static void test_MFCalculateImageSize(void) UINT32 size; HRESULT hr; + if (!pMFGetPlaneSize) + win_skip("MFGetPlaneSize() is not available.\n"); + size = 1; hr = MFCalculateImageSize(&IID_IUnknown, 1, 1, &size); ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Vista */, "Unexpected hr %#x.\n", hr); @@ -3200,6 +3205,15 @@ static void test_MFCalculateImageSize(void) ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#x.\n", i, hr); ok(size == image_size_tests[i].size, "%u: unexpected image size %u, expected %u.\n", i, size, image_size_tests[i].size); + + if (pMFGetPlaneSize) + { + hr = pMFGetPlaneSize(image_size_tests[i].subtype->Data1, image_size_tests[i].width, image_size_tests[i].height, + &size); + ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); + ok(size == image_size_tests[i].size, "%u: unexpected plane size %u, expected %u.\n", i, size, + image_size_tests[i].size); + } } } diff --git a/include/mfapi.h b/include/mfapi.h index 6636057daa..38577cfe62 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -421,6 +421,7 @@ void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllo void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size); HRESULT WINAPI MFGetAttributesAsBlobSize(IMFAttributes *attributes, UINT32 *size); +HRESULT WINAPI MFGetPlaneSize(DWORD format, DWORD width, DWORD height, DWORD *size); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes,

1 0

Nikolay Sivov : mf: Partially implement sample copier transform.
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: 50af05674ce8959411a96a442800dd706939afe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50af05674ce8959411a96a44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 9 19:39:24 2020 +0300 mf: Partially implement sample copier transform. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 544 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 271 ++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 817 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50af05674ce8959411a9…

1 0

Nikolay Sivov : include: Update MF resolver flags.
by Alexandre Julliard 09 Mar '20

09 Mar '20

Module: wine Branch: master Commit: 6c3dbcdf436675bf5c297d7c451a1ba24bdfde95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c3dbcdf436675bf5c297d7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 9 19:39:23 2020 +0300 include: Update MF resolver flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/include/mfidl.idl b/include/mfidl.idl index 82f69518df..fc9173864a 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -925,13 +925,20 @@ interface IMFMediaSourceTopologyProvider : IUnknown HRESULT GetMediaSourceTopology([in] IMFPresentationDescriptor *pd, [out] IMFTopology **topology); } -cpp_quote("#define MF_RESOLUTION_MEDIASOURCE 0x00000001") -cpp_quote("#define MF_RESOLUTION_BYTESTREAM 0x00000002") -cpp_quote("#define MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE 0x00000010") -cpp_quote("#define MF_RESOLUTION_KEEP_BYTE_STREAM_ALIVE_ON_FAIL 0x00000020") -cpp_quote("#define MF_RESOLUTION_READ 0x00010000") -cpp_quote("#define MF_RESOLUTION_WRITE 0x00020000") -cpp_quote("#define MF_RESOLUTION_DISABLE_LOCAL_PLUGINS 0x00000040") +enum +{ + MF_RESOLUTION_MEDIASOURCE = 0x00000001, + MF_RESOLUTION_BYTESTREAM = 0x00000002, + MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE = 0x00000010, + MF_RESOLUTION_KEEP_BYTE_STREAM_ALIVE_ON_FAIL = 0x00000020, + MF_RESOLUTION_DISABLE_LOCAL_PLUGINS = 0x00000040, + MF_RESOLUTION_PLUGIN_CONTROL_POLICY_APPROVED_ONLY = 0x00000080, + MF_RESOLUTION_PLUGIN_CONTROL_POLICY_WEB_ONLY = 0x00000100, + MF_RESOLUTION_PLUGIN_CONTROL_POLICY_WEB_ONLY_EDGEMODE = 0x00000200, + MF_RESOLUTION_ENABLE_STORE_PLUGINS = 0x00000400, + MF_RESOLUTION_READ = 0x00010000, + MF_RESOLUTION_WRITE = 0x00020000, +}; cpp_quote("#ifdef __cplusplus") cpp_quote("static inline HRESULT MFSetAttributeSize(IMFAttributes *attributes, REFGUID key, UINT32 width, UINT32 height)")

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020