mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 16:23:01 +00:00
[WUAPI]
* Sync with Wine 1.7.17. CORE-8080 svn path=/trunk/; revision=62989
This commit is contained in:
parent
79c010a732
commit
b58e1624b4
10 changed files with 26 additions and 27 deletions
|
@ -234,11 +234,11 @@ static const struct IUpdateDownloaderVtbl update_downloader_vtbl =
|
||||||
update_downloader_EndDownload
|
update_downloader_EndDownload
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj )
|
HRESULT UpdateDownloader_create( LPVOID *ppObj )
|
||||||
{
|
{
|
||||||
update_downloader *downloader;
|
update_downloader *downloader;
|
||||||
|
|
||||||
TRACE("(%p,%p)\n", pUnkOuter, ppObj);
|
TRACE("(%p)\n", ppObj);
|
||||||
|
|
||||||
downloader = HeapAlloc( GetProcessHeap(), 0, sizeof(*downloader) );
|
downloader = HeapAlloc( GetProcessHeap(), 0, sizeof(*downloader) );
|
||||||
if (!downloader) return E_OUTOFMEMORY;
|
if (!downloader) return E_OUTOFMEMORY;
|
||||||
|
|
|
@ -329,11 +329,11 @@ static const struct IUpdateInstallerVtbl update_installer_vtbl =
|
||||||
update_installer_get_RebootRequiredBeforeInstallation
|
update_installer_get_RebootRequiredBeforeInstallation
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj )
|
HRESULT UpdateInstaller_create( LPVOID *ppObj )
|
||||||
{
|
{
|
||||||
update_installer *installer;
|
update_installer *installer;
|
||||||
|
|
||||||
TRACE("(%p,%p)\n", pUnkOuter, ppObj);
|
TRACE("(%p)\n", ppObj);
|
||||||
|
|
||||||
installer = HeapAlloc( GetProcessHeap(), 0, sizeof(*installer) );
|
installer = HeapAlloc( GetProcessHeap(), 0, sizeof(*installer) );
|
||||||
if (!installer) return E_OUTOFMEMORY;
|
if (!installer) return E_OUTOFMEMORY;
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
#include <rpcproxy.h>
|
#include <rpcproxy.h>
|
||||||
|
|
||||||
typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj );
|
typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj );
|
||||||
|
|
||||||
typedef struct _wucf
|
typedef struct _wucf
|
||||||
{
|
{
|
||||||
|
@ -72,14 +72,11 @@ static HRESULT WINAPI wucf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOute
|
||||||
if (pOuter)
|
if (pOuter)
|
||||||
return CLASS_E_NOAGGREGATION;
|
return CLASS_E_NOAGGREGATION;
|
||||||
|
|
||||||
r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk );
|
r = This->pfnCreateInstance( (LPVOID *)&punk );
|
||||||
if (FAILED(r))
|
if (FAILED(r))
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
r = IUnknown_QueryInterface( punk, riid, ppobj );
|
r = IUnknown_QueryInterface( punk, riid, ppobj );
|
||||||
if (FAILED(r))
|
|
||||||
return r;
|
|
||||||
|
|
||||||
IUnknown_Release( punk );
|
IUnknown_Release( punk );
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
|
@ -301,11 +301,11 @@ static const struct IUpdateSearcherVtbl update_searcher_vtbl =
|
||||||
update_searcher_put_ServiceID
|
update_searcher_put_ServiceID
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj )
|
HRESULT UpdateSearcher_create( LPVOID *ppObj )
|
||||||
{
|
{
|
||||||
update_searcher *searcher;
|
update_searcher *searcher;
|
||||||
|
|
||||||
TRACE("(%p,%p)\n", pUnkOuter, ppObj);
|
TRACE("(%p)\n", ppObj);
|
||||||
|
|
||||||
searcher = HeapAlloc( GetProcessHeap(), 0, sizeof(*searcher) );
|
searcher = HeapAlloc( GetProcessHeap(), 0, sizeof(*searcher) );
|
||||||
if (!searcher) return E_OUTOFMEMORY;
|
if (!searcher) return E_OUTOFMEMORY;
|
||||||
|
|
|
@ -165,7 +165,7 @@ static HRESULT WINAPI update_session_CreateUpdateSearcher(
|
||||||
IUpdateSearcher **retval )
|
IUpdateSearcher **retval )
|
||||||
{
|
{
|
||||||
TRACE("%p\n", This);
|
TRACE("%p\n", This);
|
||||||
return UpdateSearcher_create( NULL, (LPVOID *)retval );
|
return UpdateSearcher_create( (LPVOID *)retval );
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI update_session_CreateUpdateDownloader(
|
static HRESULT WINAPI update_session_CreateUpdateDownloader(
|
||||||
|
@ -173,7 +173,7 @@ static HRESULT WINAPI update_session_CreateUpdateDownloader(
|
||||||
IUpdateDownloader **retval )
|
IUpdateDownloader **retval )
|
||||||
{
|
{
|
||||||
TRACE("%p\n", This);
|
TRACE("%p\n", This);
|
||||||
return UpdateDownloader_create( NULL, (LPVOID *)retval );
|
return UpdateDownloader_create( (LPVOID *)retval );
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI update_session_CreateUpdateInstaller(
|
static HRESULT WINAPI update_session_CreateUpdateInstaller(
|
||||||
|
@ -181,7 +181,7 @@ static HRESULT WINAPI update_session_CreateUpdateInstaller(
|
||||||
IUpdateInstaller **retval )
|
IUpdateInstaller **retval )
|
||||||
{
|
{
|
||||||
TRACE("%p\n", This);
|
TRACE("%p\n", This);
|
||||||
return UpdateInstaller_create( NULL, (LPVOID *)retval );
|
return UpdateInstaller_create( (LPVOID *)retval );
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct IUpdateSessionVtbl update_session_vtbl =
|
static const struct IUpdateSessionVtbl update_session_vtbl =
|
||||||
|
@ -203,11 +203,11 @@ static const struct IUpdateSessionVtbl update_session_vtbl =
|
||||||
update_session_CreateUpdateInstaller
|
update_session_CreateUpdateInstaller
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj )
|
HRESULT UpdateSession_create( LPVOID *ppObj )
|
||||||
{
|
{
|
||||||
update_session *session;
|
update_session *session;
|
||||||
|
|
||||||
TRACE("(%p,%p)\n", pUnkOuter, ppObj);
|
TRACE("(%p)\n", ppObj);
|
||||||
|
|
||||||
session = HeapAlloc( GetProcessHeap(), 0, sizeof(*session) );
|
session = HeapAlloc( GetProcessHeap(), 0, sizeof(*session) );
|
||||||
if (!session) return E_OUTOFMEMORY;
|
if (!session) return E_OUTOFMEMORY;
|
||||||
|
|
|
@ -130,11 +130,11 @@ static const struct ISystemInformationVtbl systeminfo_vtbl =
|
||||||
systeminfo_get_RebootRequired
|
systeminfo_get_RebootRequired
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj)
|
HRESULT SystemInformation_create(LPVOID *ppObj)
|
||||||
{
|
{
|
||||||
systeminfo *info;
|
systeminfo *info;
|
||||||
|
|
||||||
TRACE("(%p,%p)\n", pUnkOuter, ppObj);
|
TRACE("(%p)\n", ppObj);
|
||||||
|
|
||||||
info = HeapAlloc(GetProcessHeap(), 0, sizeof(*info));
|
info = HeapAlloc(GetProcessHeap(), 0, sizeof(*info));
|
||||||
if (!info)
|
if (!info)
|
||||||
|
|
|
@ -189,11 +189,11 @@ static const struct IAutomaticUpdatesVtbl automatic_updates_vtbl =
|
||||||
automatic_updates_EnableService
|
automatic_updates_EnableService
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj )
|
HRESULT AutomaticUpdates_create( LPVOID *ppObj )
|
||||||
{
|
{
|
||||||
automatic_updates *updates;
|
automatic_updates *updates;
|
||||||
|
|
||||||
TRACE("(%p,%p)\n", pUnkOuter, ppObj);
|
TRACE("(%p)\n", ppObj);
|
||||||
|
|
||||||
updates = HeapAlloc( GetProcessHeap(), 0, sizeof(*updates) );
|
updates = HeapAlloc( GetProcessHeap(), 0, sizeof(*updates) );
|
||||||
if (!updates) return E_OUTOFMEMORY;
|
if (!updates) return E_OUTOFMEMORY;
|
||||||
|
|
|
@ -36,11 +36,11 @@
|
||||||
#include <wine/debug.h>
|
#include <wine/debug.h>
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
|
WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
|
||||||
|
|
||||||
extern HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
|
extern HRESULT AutomaticUpdates_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
|
extern HRESULT UpdateSession_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
|
extern HRESULT UpdateSearcher_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
|
extern HRESULT UpdateDownloader_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
|
extern HRESULT UpdateInstaller_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
|
extern HRESULT SystemInformation_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
#endif /* _WUAPI_PRIVATE_H_ */
|
#endif /* _WUAPI_PRIVATE_H_ */
|
||||||
|
|
|
@ -18,4 +18,6 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#pragma makedep regtypelib
|
||||||
|
|
||||||
#include "wuapi.idl"
|
#include "wuapi.idl"
|
||||||
|
|
|
@ -216,7 +216,7 @@ reactos/dll/win32/wintrust # Synced to Wine-1.7.17
|
||||||
reactos/dll/win32/wldap32 # Synced to Wine-1.7.17
|
reactos/dll/win32/wldap32 # Synced to Wine-1.7.17
|
||||||
reactos/dll/win32/wmi # Synced to Wine-1.7.17
|
reactos/dll/win32/wmi # Synced to Wine-1.7.17
|
||||||
reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.17
|
reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.17
|
||||||
reactos/dll/win32/wuapi # Synced to Wine-1.7.1
|
reactos/dll/win32/wuapi # Synced to Wine-1.7.17
|
||||||
reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.1
|
reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.1
|
||||||
reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1
|
reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1
|
||||||
reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1
|
reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue