[ATL][ATL80][ATL100] Sync with Wine Staging 1.7.47. CORE-9924

svn path=/trunk/; revision=68423

diff --git a/reactos/dll/win32/atl/atl.c b/reactos/dll/win32/atl/atl.c
index b92911d..ccbeed1 100644 (file)
--- a/reactos/dll/win32/atl/atl.c
+++ b/reactos/dll/win32/atl/atl.c
@@ -280,6 +280,18 @@ HRESULT WINAPI AtlIPersistPropertyBag_Load(LPPROPERTYBAG pPropBag, LPERRORLOG pE
     return S_OK;
 }
 
+/***********************************************************************
+ *           AtlIPersistPropertyBag_Save     [atl100.@]
+ */
+HRESULT WINAPI AtlIPersistPropertyBag_Save(LPPROPERTYBAG pPropBag, BOOL fClearDirty,
+                                           BOOL fSaveAll, ATL_PROPMAP_ENTRY *pMap,
+                                           void *pThis, IUnknown *pUnk)
+{
+    FIXME("(%p, %d, %d, %p, %p, %p)\n", pPropBag, fClearDirty, fSaveAll, pMap, pThis, pUnk);
+
+    return S_OK;
+}
+
 /***********************************************************************
  *           AtlModuleAddTermFunc            [atl100.@]
  */

diff --git a/reactos/dll/win32/atl/atl.spec b/reactos/dll/win32/atl/atl.spec
index 437a555..f31c1a6 100644 (file)
--- a/reactos/dll/win32/atl/atl.spec
+++ b/reactos/dll/win32/atl/atl.spec
@@ -44,7 +44,7 @@
 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
-53 stub AtlIPersistPropertyBag_Save
+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr)
 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
 55 stub AtlModuleUnRegisterTypeLib
 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr)

diff --git a/reactos/dll/win32/atl/atl30.c b/reactos/dll/win32/atl/atl30.c
index 340ed65..99ed671 100644 (file)
--- a/reactos/dll/win32/atl/atl30.c
+++ b/reactos/dll/win32/atl/atl30.c
@@ -576,8 +576,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject)
  */
 HRESULT WINAPI DllRegisterServer(void)
 {
+#ifdef __REACTOS__
     /* Note: we can't use __wine_register_server here because it uses CLSID_Registrar which isn't registred yet */
     return do_register_server(TRUE);
+#else
+    return __wine_register_resources( atl_instance );
+#endif
 }
 
 /***********************************************************************
@@ -585,7 +589,11 @@ HRESULT WINAPI DllRegisterServer(void)
  */
 HRESULT WINAPI DllUnregisterServer(void)
 {
+#ifdef __REACTOS__
     return do_register_server(FALSE);
+#else
+    return __wine_unregister_resources( atl_instance );
+#endif
 }
 
 /***********************************************************************

diff --git a/reactos/dll/win32/atl100/atl100.spec b/reactos/dll/win32/atl100/atl100.spec
index 25fad3d..80b4b16 100644 (file)
--- a/reactos/dll/win32/atl100/atl100.spec
+++ b/reactos/dll/win32/atl100/atl100.spec
@@ -36,7 +36,7 @@
 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
-53 stub AtlIPersistPropertyBag_Save
+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr)
 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
 56 stdcall AtlLoadTypeLib(long wstr ptr ptr)
 58 stdcall AtlModuleAddTermFunc(ptr ptr long)

diff --git a/reactos/dll/win32/atl80/atl80.spec b/reactos/dll/win32/atl80/atl80.spec
index f313944..e82fba0 100644 (file)
--- a/reactos/dll/win32/atl80/atl80.spec
+++ b/reactos/dll/win32/atl80/atl80.spec
@@ -38,7 +38,7 @@
 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
-53 stub AtlIPersistPropertyBag_Save
+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr)
 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
 55 stub AtlUnRegisterTypeLib
 56 stdcall AtlLoadTypeLib(long wstr ptr ptr)

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index d88cd9d..66ffdba 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -46,9 +46,9 @@ reactos/dll/directx/wine/wined3d        # Synced to WineStaging-1.7.37
 reactos/dll/win32/activeds            # Synced to WineStaging-1.7.37
 reactos/dll/win32/actxprxy            # Synced to WineStaging-1.7.37
 reactos/dll/win32/advpack             # Synced to WineStaging-1.7.37
-reactos/dll/win32/atl                 # Synced to WineStaging-1.7.37
-reactos/dll/win32/atl80               # Synced to WineStaging-1.7.37
-reactos/dll/win32/atl100              # Synced to WineStaging-1.7.37
+reactos/dll/win32/atl                 # Synced to WineStaging-1.7.47
+reactos/dll/win32/atl80               # Synced to WineStaging-1.7.47
+reactos/dll/win32/atl100              # Synced to WineStaging-1.7.47
 reactos/dll/win32/avifil32            # Synced to WineStaging-1.7.37
 reactos/dll/win32/bcrypt              # Synced to WineStaging-1.7.37
 reactos/dll/win32/browseui            # Out of sync