Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Amine Khaldi 2018-03-25 12:43:17 +01:00
parent ae27690742
commit 150fba8dff
11 changed files with 125 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/wuapi/CMakeLists.txt
View file

@ -14,7 +14,7 @@ list(APPEND SOURCE
session.c
systeminfo.c
updates.c
wuapi_private.h)
precomp.h)
add_typelib(wuapi_tlb.idl)
set_source_files_properties(wuapi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wuapi_tlb.tlb)
@ -28,5 +28,5 @@ set_module_type(wuapi win32dll)
target_link_libraries(wuapi uuid wine wuguid)
add_importlibs(wuapi msvcrt kernel32 ntdll)
add_dependencies(wuapi stdole2) # wuapi_tlb.tlb needs stdole2.tlb
add_pch(wuapi wuapi_private.h SOURCE)
add_pch(wuapi precomp.h SOURCE)
add_cd_file(TARGET wuapi DESTINATION reactos/system32 FOR all)

15
dll/win32/wuapi/downloader.c
View file

@ -18,8 +18,23 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define COBJMACROS
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "initguid.h"
#include "wuapi.h"
#include "wuapi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
typedef struct _update_downloader
{
IUpdateDownloader IUpdateDownloader_iface;

14
dll/win32/wuapi/installer.c
View file

@ -18,8 +18,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define COBJMACROS
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "wuapi.h"
#include "wuapi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
typedef struct _update_installer
{
IUpdateInstaller IUpdateInstaller_iface;

15
dll/win32/wuapi/main.c
View file

@ -18,9 +18,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define COBJMACROS
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "rpcproxy.h"
#include "wuapi.h"
#include "wine/debug.h"
#include "wuapi_private.h"
#include <rpcproxy.h>
WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj );

23
dll/win32/wuapi/precomp.h Normal file
View file

@ -0,0 +1,23 @@
#ifndef _WUAPI_PRECOMP_H_
#define _WUAPI_PRECOMP_H_
#include <wine/config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
#include <wuapi.h>
#include <wine/debug.h>
#include "wuapi_private.h"
#endif /* !_WUAPI_PRECOMP_H_ */

14
dll/win32/wuapi/searcher.c
View file

@ -18,8 +18,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define COBJMACROS
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "wuapi.h"
#include "wuapi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
typedef struct _update_searcher
{
IUpdateSearcher IUpdateSearcher_iface;

14
dll/win32/wuapi/session.c
View file

@ -18,8 +18,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define COBJMACROS
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "wuapi.h"
#include "wine/debug.h"
#include "wuapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
typedef struct _update_session
{
IUpdateSession IUpdateSession_iface;

14
dll/win32/wuapi/systeminfo.c
View file

@ -19,8 +19,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define COBJMACROS
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "wuapi.h"
#include "wuapi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
typedef struct _systeminfo
{
ISystemInformation ISystemInformation_iface;

14
dll/win32/wuapi/updates.c
View file

@ -18,8 +18,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define COBJMACROS
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "wuapi.h"
#include "wuapi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
typedef struct _automatic_updates
{
IAutomaticUpdates IAutomaticUpdates_iface;

22
dll/win32/wuapi/wuapi_private.h
View file

@ -16,31 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef _WUAPI_PRIVATE_H_
#define _WUAPI_PRIVATE_H_
#include <wine/config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
#include <wuapi.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
extern HRESULT AutomaticUpdates_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
extern HRESULT UpdateSession_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
extern HRESULT UpdateSearcher_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
extern HRESULT UpdateDownloader_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
extern HRESULT UpdateInstaller_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
extern HRESULT SystemInformation_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
#endif /* _WUAPI_PRIVATE_H_ */

2
media/doc/README.WINE
View file

@ -213,7 +213,7 @@ reactos/dll/win32/wmiutils # Synced to WineStaging-3.3
reactos/dll/win32/wmvcore # Synced to WineStaging-3.3
reactos/dll/win32/wshom.ocx # Synced to WineStaging-3.3
reactos/dll/win32/wtsapi32 # Synced to WineStaging-3.3
reactos/dll/win32/wuapi # Synced to WineStaging-2.9
reactos/dll/win32/wuapi # Synced to WineStaging-3.3
reactos/dll/win32/xinput1_1 # Synced to WineStaging-2.9
reactos/dll/win32/xinput1_2 # Synced to WineStaging-2.9
reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.9