From: Rémi Bernon <rbernon(a)codeweavers.com> This overrides native dotnetfx35 installer, which is broken in an unfixable way. Recent Windows also bypass its execution. --- configure.ac | 1 + programs/dotnetfx35/Makefile.in | 6 ++++++ programs/dotnetfx35/main.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 programs/dotnetfx35/Makefile.in create mode 100644 programs/dotnetfx35/main.c diff --git a/configure.ac b/configure.ac index 06a3a820e4c..bea2f11ee04 100644 --- a/configure.ac +++ b/configure.ac @@ -3544,6 +3544,7 @@ WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) WINE_CONFIG_MAKEFILE(programs/dllhost) WINE_CONFIG_MAKEFILE(programs/dplaysvr) +WINE_CONFIG_MAKEFILE(programs/dotnetfx35) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dpvsetup) WINE_CONFIG_MAKEFILE(programs/dxdiag) diff --git a/programs/dotnetfx35/Makefile.in b/programs/dotnetfx35/Makefile.in new file mode 100644 index 00000000000..f826beef4e5 --- /dev/null +++ b/programs/dotnetfx35/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dotnetfx35.exe + +EXTRADLLFLAGS = -mwindows -municode + +SOURCES = \ + main.c diff --git a/programs/dotnetfx35/main.c b/programs/dotnetfx35/main.c new file mode 100644 index 00000000000..69723e3fc6b --- /dev/null +++ b/programs/dotnetfx35/main.c @@ -0,0 +1,32 @@ +/* + * Fake dotnetfx35.exe installer + * + * Copyright 2020 Rémi Bernon + * + * 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 <stdio.h> +#include <windows.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dotnetfx); + +int WINAPI wWinMain( HINSTANCE instance, HINSTANCE previous, WCHAR *cmdline, int show ) +{ + FIXME( "stub!" ); + return 0; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9634