[MSIEXEC] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 1 Apr 2018 12:13:47 +0000 (13:13 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 1 Apr 2018 12:13:47 +0000 (13:13 +0100)
base/system/msiexec/msiexec.c
base/system/msiexec/precomp.h
base/system/msiexec/rsrc.rc
base/system/msiexec/service.c
media/doc/README.WINE

index f215562..8dcd216 100644 (file)
  * 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);
index cc81d63..3026f19 100644 (file)
@@ -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_ */
index 2060fe1..91c3df8 100644 (file)
@@ -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"
index 3c8b690..d48912a 100644 (file)
  * 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;
 
index e9b7d7e..b138db4 100644 (file)
@@ -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