[ros-diffs] [akhaldi] 68423: [ATL][ATL80][ATL100] Sync with Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Sun Jul 19 13:08:46 2015
New Revision: 68423

URL: http://svn.reactos.org/svn/reactos?rev=68423&view=rev
Log:
[ATL][ATL80][ATL100] Sync with Wine Staging 1.7.47. CORE-9924

Modified:
    trunk/reactos/dll/win32/atl/atl.c
    trunk/reactos/dll/win32/atl/atl.spec
    trunk/reactos/dll/win32/atl/atl30.c
    trunk/reactos/dll/win32/atl100/atl100.spec
    trunk/reactos/dll/win32/atl80/atl80.spec
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/atl/atl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.c?rev=68…
==============================================================================
--- trunk/reactos/dll/win32/atl/atl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/atl.c	[iso-8859-1] Sun Jul 19 13:08:46 2015
@@ -281,6 +281,18 @@
 }
 
 /***********************************************************************
+ *           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.@]
  */
 HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw)

Modified: trunk/reactos/dll/win32/atl/atl.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.spec?rev…
==============================================================================
--- trunk/reactos/dll/win32/atl/atl.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/atl.spec	[iso-8859-1] Sun Jul 19 13:08:46 2015
@@ -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)

Modified: trunk/reactos/dll/win32/atl/atl30.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl30.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/atl/atl30.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/atl30.c	[iso-8859-1] Sun Jul 19 13:08:46 2015
@@ -576,8 +576,12 @@
  */
 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 DllUnregisterServer(void)
 {
+#ifdef __REACTOS__
     return do_register_server(FALSE);
+#else
+    return __wine_unregister_resources( atl_instance );
+#endif
 }
 
 /***********************************************************************

Modified: trunk/reactos/dll/win32/atl100/atl100.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl100/atl100.sp…
==============================================================================
--- trunk/reactos/dll/win32/atl100/atl100.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl100/atl100.spec	[iso-8859-1] Sun Jul 19 13:08:46 2015
@@ -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)

Modified: trunk/reactos/dll/win32/atl80/atl80.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/atl80.spec…
==============================================================================
--- trunk/reactos/dll/win32/atl80/atl80.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl80/atl80.spec	[iso-8859-1] Sun Jul 19 13:08:46 2015
@@ -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)

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Jul 19 13:08:46 2015
@@ -46,9 +46,9 @@
 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