[WUAPI]

* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62989

diff --git a/reactos/dll/win32/wuapi/downloader.c b/reactos/dll/win32/wuapi/downloader.c
index 5749ed8..9fd6e84 100644 (file)
--- a/reactos/dll/win32/wuapi/downloader.c
+++ b/reactos/dll/win32/wuapi/downloader.c
@@ -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) );
     if (!downloader) return E_OUTOFMEMORY;
 
     downloader = HeapAlloc( GetProcessHeap(), 0, sizeof(*downloader) );
     if (!downloader) return E_OUTOFMEMORY;

diff --git a/reactos/dll/win32/wuapi/installer.c b/reactos/dll/win32/wuapi/installer.c
index ae2e5ae..e2f41e8 100644 (file)
--- a/reactos/dll/win32/wuapi/installer.c
+++ b/reactos/dll/win32/wuapi/installer.c
@@ -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) );
     if (!installer) return E_OUTOFMEMORY;
 
     installer = HeapAlloc( GetProcessHeap(), 0, sizeof(*installer) );
     if (!installer) return E_OUTOFMEMORY;

diff --git a/reactos/dll/win32/wuapi/main.c b/reactos/dll/win32/wuapi/main.c
index 9449abd..104bfe1 100644 (file)
--- a/reactos/dll/win32/wuapi/main.c
+++ b/reactos/dll/win32/wuapi/main.c
@@ -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)
         return CLASS_E_NOAGGREGATION;
 
     if (pOuter)
         return CLASS_E_NOAGGREGATION;
 

-    r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk );
+    r = This->pfnCreateInstance( (LPVOID *)&punk );

     if (FAILED(r))
         return r;
 
     r = IUnknown_QueryInterface( punk, riid, ppobj );
     if (FAILED(r))
         return r;
 
     r = IUnknown_QueryInterface( punk, riid, ppobj );

-    if (FAILED(r))
-        return r;
-

     IUnknown_Release( punk );
     return r;
 }
     IUnknown_Release( punk );
     return r;
 }

diff --git a/reactos/dll/win32/wuapi/searcher.c b/reactos/dll/win32/wuapi/searcher.c
index 50253fe..bf9d0c1 100644 (file)
--- a/reactos/dll/win32/wuapi/searcher.c
+++ b/reactos/dll/win32/wuapi/searcher.c
@@ -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) );
     if (!searcher) return E_OUTOFMEMORY;
 
     searcher = HeapAlloc( GetProcessHeap(), 0, sizeof(*searcher) );
     if (!searcher) return E_OUTOFMEMORY;

diff --git a/reactos/dll/win32/wuapi/session.c b/reactos/dll/win32/wuapi/session.c
index 59d3f6c..48cdee9 100644 (file)
--- a/reactos/dll/win32/wuapi/session.c
+++ b/reactos/dll/win32/wuapi/session.c
@@ -165,7 +165,7 @@ static HRESULT WINAPI update_session_CreateUpdateSearcher(
     IUpdateSearcher **retval )
 {
     TRACE("%p\n", This);
     IUpdateSearcher **retval )
 {
     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 )
 {
     TRACE("%p\n", This);
     IUpdateDownloader **retval )
 {
     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 )
 {
     TRACE("%p\n", This);
     IUpdateInstaller **retval )
 {
     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) );
     if (!session) return E_OUTOFMEMORY;
 
     session = HeapAlloc( GetProcessHeap(), 0, sizeof(*session) );
     if (!session) return E_OUTOFMEMORY;

diff --git a/reactos/dll/win32/wuapi/systeminfo.c b/reactos/dll/win32/wuapi/systeminfo.c
index 680f02f..a30879f 100644 (file)
--- a/reactos/dll/win32/wuapi/systeminfo.c
+++ b/reactos/dll/win32/wuapi/systeminfo.c
@@ -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));
     if (!info)
 
     info = HeapAlloc(GetProcessHeap(), 0, sizeof(*info));
     if (!info)

diff --git a/reactos/dll/win32/wuapi/updates.c b/reactos/dll/win32/wuapi/updates.c
index dad6ac1..fd3ad42 100644 (file)
--- a/reactos/dll/win32/wuapi/updates.c
+++ b/reactos/dll/win32/wuapi/updates.c
@@ -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) );
     if (!updates) return E_OUTOFMEMORY;
 
     updates = HeapAlloc( GetProcessHeap(), 0, sizeof(*updates) );
     if (!updates) return E_OUTOFMEMORY;

diff --git a/reactos/dll/win32/wuapi/wuapi_private.h b/reactos/dll/win32/wuapi/wuapi_private.h
index 5b18dad..4ef2f51 100644 (file)
--- a/reactos/dll/win32/wuapi/wuapi_private.h
+++ b/reactos/dll/win32/wuapi/wuapi_private.h
@@ -36,11 +36,11 @@
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
 
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
 

-extern HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
-extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
-extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
-extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
-extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
-extern HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
+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_ */
 
 #endif /* _WUAPI_PRIVATE_H_ */

diff --git a/reactos/dll/win32/wuapi/wuapi_tlb.idl b/reactos/dll/win32/wuapi/wuapi_tlb.idl
index 120e364..1f2e047 100644 (file)
--- a/reactos/dll/win32/wuapi/wuapi_tlb.idl
+++ b/reactos/dll/win32/wuapi/wuapi_tlb.idl
@@ -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"

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 880c156..783096f 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -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/wmi                 # Synced to Wine-1.7.17
 reactos/dll/win32/wtsapi32            # 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/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_2           # Synced to Wine-1.7.1
 reactos/dll/win32/xinput1_3           # 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_3           # Synced to Wine-1.7.1