https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e4ff4348afca770123f226c635a8bbf467c0e36
commit 6e4ff4348afca770123f226c635a8bbf467c0e36 Author: Amine Khaldi <[email protected]> AuthorDate: Sun Apr 1 13:13:47 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sun Apr 1 13:13:47 2018 +0100 [MSIEXEC] Sync with Wine Staging 3.3. CORE-14434 --- base/system/msiexec/msiexec.c | 12 ++++++++---- base/system/msiexec/precomp.h | 13 +++---------- base/system/msiexec/rsrc.rc | 2 +- base/system/msiexec/service.c | 10 +++++++++- media/doc/README.WINE | 2 +- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/base/system/msiexec/msiexec.c b/base/system/msiexec/msiexec.c index f2155622de..8dcd216380 100644 --- a/base/system/msiexec/msiexec.c +++ b/base/system/msiexec/msiexec.c @@ -19,14 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#define WIN32_LEAN_AND_MEAN -#include <winreg.h> -#include <winuser.h> +#include <windows.h> #include <msi.h> +#include <winsvc.h> #include <objbase.h> +#include <stdio.h> -#include <wine/unicode.h> +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msiexec); typedef HRESULT (WINAPI *DLLREGISTERSERVER)(void); typedef HRESULT (WINAPI *DLLUNREGISTERSERVER)(void); diff --git a/base/system/msiexec/precomp.h b/base/system/msiexec/precomp.h index cc81d63bfa..3026f19c1f 100644 --- a/base/system/msiexec/precomp.h +++ b/base/system/msiexec/precomp.h @@ -1,17 +1,10 @@ + #ifndef _MSIEXEC_PCH_ #define _MSIEXEC_PCH_ #include <stdio.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <windef.h> -#include <winbase.h> -#include <winsvc.h> - +#include <windows.h> #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msiexec); -#endif /* _MSIEXEC_PCH_ */ +#endif /* !_MSIEXEC_PCH_ */ diff --git a/base/system/msiexec/rsrc.rc b/base/system/msiexec/rsrc.rc index 2060fe16e0..91c3df8d7e 100644 --- a/base/system/msiexec/rsrc.rc +++ b/base/system/msiexec/rsrc.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <windows.h> +#include <windows.h> #define WINE_FILEDESCRIPTION_STR "Wine Installer" #define WINE_FILENAME_STR "msiexec.exe" diff --git a/base/system/msiexec/service.c b/base/system/msiexec/service.c index 3c8b690bf7..d48912a8e5 100644 --- a/base/system/msiexec/service.c +++ b/base/system/msiexec/service.c @@ -18,7 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#define WIN32_LEAN_AND_MEAN + +#include <stdio.h> +#include <windows.h> +#include <winsvc.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msiexec); static SERVICE_STATUS_HANDLE hstatus; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index e9b7d7e492..b138db4425 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -243,7 +243,7 @@ reactos/base/applications/wordpad # Synced to WineStaging-1.9.16 reactos/base/applications/write # Synced to WineStaging-3.3 reactos/base/services/rpcss # Synced to WineStaging-3.3 reactos/base/system/expand # Synced to WineStaging-3.3 -reactos/base/system/msiexec # Synced to WineStaging-2.16 +reactos/base/system/msiexec # Synced to WineStaging-3.3 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported
