From ee591f5b019644462bb731eab625f9a9b97f504f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 19 Jun 2017 14:24:48 +0000 Subject: [PATCH] [USER.EXE]: Add a *stub* user.exe to make the DirectX 9.0 installer happy (it searches user.exe for existence for no reason, and if it cannot find it, the installer bails out). (WARNING: This is in NO WAY our implementation of WoW16!!) Reported on https://www.reactos.org/forum/viewtopic.php?f=4&t=15576 , http://reactos.org/forum/viewtopic.php?f=4&t=16498 . This is not a ReactOS problem per se, because it also happens on Windows, as reported here: https://xpetips.wordpress.com/2009/09/18/installing-directx-9-0c-on-xpe/ and http://www.xpembedded.info/DirectX_v9_0c_and_finding_missing_components_.html . svn path=/trunk/; revision=75126 --- reactos/subsystems/mvdm/CMakeLists.txt | 2 +- reactos/subsystems/mvdm/wow16/CMakeLists.txt | 2 ++ .../subsystems/mvdm/wow16/user/CMakeLists.txt | 5 ++++ reactos/subsystems/mvdm/wow16/user/user.c | 25 +++++++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 reactos/subsystems/mvdm/wow16/CMakeLists.txt create mode 100644 reactos/subsystems/mvdm/wow16/user/CMakeLists.txt create mode 100644 reactos/subsystems/mvdm/wow16/user/user.c diff --git a/reactos/subsystems/mvdm/CMakeLists.txt b/reactos/subsystems/mvdm/CMakeLists.txt index 1238423f7d0..c50893c67d5 100644 --- a/reactos/subsystems/mvdm/CMakeLists.txt +++ b/reactos/subsystems/mvdm/CMakeLists.txt @@ -10,4 +10,4 @@ if(ARCH STREQUAL "i386") add_subdirectory(samples) endif() add_subdirectory(vdmdbg) -#add_subdirectory(wow16) +add_subdirectory(wow16) diff --git a/reactos/subsystems/mvdm/wow16/CMakeLists.txt b/reactos/subsystems/mvdm/wow16/CMakeLists.txt new file mode 100644 index 00000000000..116218c3440 --- /dev/null +++ b/reactos/subsystems/mvdm/wow16/CMakeLists.txt @@ -0,0 +1,2 @@ + +add_subdirectory(user) diff --git a/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt b/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt new file mode 100644 index 00000000000..dfe7dd9726e --- /dev/null +++ b/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(user user.c) +set_module_type(user win32gui ENTRYPOINT mainCRTStartup) +add_importlibs(user msvcrt kernel32) +add_cd_file(TARGET user DESTINATION reactos/system32 FOR all) diff --git a/reactos/subsystems/mvdm/wow16/user/user.c b/reactos/subsystems/mvdm/wow16/user/user.c new file mode 100644 index 00000000000..cb3890267ed --- /dev/null +++ b/reactos/subsystems/mvdm/wow16/user/user.c @@ -0,0 +1,25 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS-on-ReactOS-16bit (aka. RoR16 or WoW16) + * FILE: subsystems/mvdm/wow16/user.c + * PURPOSE: 16-bit USER stub module + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +/* PSDK Headers */ +#define WIN32_NO_STATUS +#include +#include + +#define NDEBUG +#include + +/* PUBLIC FUNCTIONS ***********************************************************/ + +INT main(INT argc, const CHAR *argv[]) +{ + OutputDebugStringA("USER.EXE: stub\n"); + return 0; +}