Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:56:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSIEXEC] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-04-01 13:13:47 +01:00
parent f4ab01b670
commit 6e4ff4348a
5 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
base/system/msiexec/msiexec.c
View file

@ -19,14 +19,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "precomp.h" #define WIN32_LEAN_AND_MEAN
#include <winreg.h> #include <windows.h>
#include <winuser.h>
#include <msi.h> #include <msi.h>
#include <winsvc.h>
#include <objbase.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 *DLLREGISTERSERVER)(void);
typedef HRESULT (WINAPI *DLLUNREGISTERSERVER)(void); typedef HRESULT (WINAPI *DLLUNREGISTERSERVER)(void);

13
base/system/msiexec/precomp.h
View file

@ -1,17 +1,10 @@
#ifndef _MSIEXEC_PCH_ #ifndef _MSIEXEC_PCH_
#define _MSIEXEC_PCH_ #define _MSIEXEC_PCH_
#include <stdio.h> #include <stdio.h>
#define WIN32_NO_STATUS #include <windows.h>
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <windef.h>
#include <winbase.h>
#include <winsvc.h>
#include <wine/debug.h> #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(msiexec);
#endif /* _MSIEXEC_PCH_ */ #endif /* !_MSIEXEC_PCH_ */

2
base/system/msiexec/rsrc.rc
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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_FILEDESCRIPTION_STR "Wine Installer"
#define WINE_FILENAME_STR "msiexec.exe" #define WINE_FILENAME_STR "msiexec.exe"

10
base/system/msiexec/service.c
View file

@ -18,7 +18,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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; static SERVICE_STATUS_HANDLE hstatus;

2
media/doc/README.WINE
View 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/applications/write # Synced to WineStaging-3.3
reactos/base/services/rpcss # 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/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 reactos/modules/rosapps/winfile # Autosync
In addition the following libs, dlls and source files are mostly based on code ported In addition the following libs, dlls and source files are mostly based on code ported