[ros-diffs] [akhaldi] 70827: [ATL] Sync with Wine Staging 1.9.4. CORE-10912

Author: akhaldi
Date: Tue Mar  1 12:14:12 2016
New Revision: 70827

URL: http://svn.reactos.org/svn/reactos?rev=70827&view=rev
Log:
[ATL] Sync with Wine Staging 1.9.4. CORE-10912

Modified:
    trunk/reactos/dll/win32/atl/atl_ax.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/atl/atl_ax.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/atl/atl_ax.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/atl_ax.c	[iso-8859-1] Tue Mar  1 12:14:12 2016
@@ -1019,15 +1019,15 @@
 }
 
 /***********************************************************************
- *           AtlAxCreateControlEx            [atl100.@]
+ *           AtlAxCreateControlLicEx         [atl100.@]
  *
  * REMARKS
  *   See http://www.codeproject.com/com/cwebpage.asp for some background
  *
  */
-HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd,
+HRESULT WINAPI AtlAxCreateControlLicEx(LPCOLESTR lpszName, HWND hWnd,
         IStream *pStream, IUnknown **ppUnkContainer, IUnknown **ppUnkControl,
-        REFIID iidSink, IUnknown *punkSink)
+        REFIID iidSink, IUnknown *punkSink, BSTR lic)
 {
     CLSID controlId;
     HRESULT hRes;
@@ -1037,8 +1037,11 @@
     IUnknown *pContainer = NULL;
     enum content content;
 
-    TRACE("(%s %p %p %p %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream,
-            ppUnkContainer, ppUnkControl, iidSink, punkSink);
+    TRACE("(%s %p %p %p %p %p %p %s)\n", debugstr_w(lpszName), hWnd, pStream,
+            ppUnkContainer, ppUnkControl, iidSink, punkSink, debugstr_w(lic));
+
+    if (lic)
+        FIXME("semi stub\n");
 
     if (ppUnkContainer) *ppUnkContainer = NULL;
     if (ppUnkControl) *ppUnkControl = NULL;
@@ -1411,28 +1414,21 @@
     return 0;
 }
 
-#if _ATL_VER >= _ATL_VER_80
-
 /***********************************************************************
  *           AtlAxCreateControlLic        [atl100.59]
  *
  */
 HRESULT WINAPI AtlAxCreateControlLic(const WCHAR *lpTricsData, HWND hwnd, IStream
*stream, IUnknown **container, BSTR lic)
 {
-    FIXME("(%s %p %p %p %s)\n", debugstr_w(lpTricsData), hwnd, stream,
container, debugstr_w(lic));
-    return E_NOTIMPL;
+    return AtlAxCreateControlLicEx(lpTricsData, hwnd, stream, container, NULL, NULL,
NULL, lic);
 }
 
 /***********************************************************************
- *           AtlAxCreateControlLicEx      [atl100.60]
- *
- */
-HRESULT WINAPI AtlAxCreateControlLicEx(const WCHAR *lpTricsData, HWND hwnd, IStream
*stream,
-        IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink,
BSTR lic)
-{
-    FIXME("(%s %p %p %p %p %s %p %s)\n", debugstr_w(lpTricsData), hwnd, stream,
container, control,
-          debugstr_guid(iidSink), punkSink, debugstr_w(lic));
-    return E_NOTIMPL;
-}
-
-#endif
+ *           AtlAxCreateControlEx         [atl100.@]
+ *
+ */
+HRESULT WINAPI AtlAxCreateControlEx(const WCHAR *lpTricsData, HWND hwnd, IStream
*stream,
+        IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink)
+{
+    return AtlAxCreateControlLicEx(lpTricsData, hwnd, stream, container, control,
iidSink, punkSink, NULL);
+}

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] Tue Mar  1 12:14:12 2016
@@ -45,7 +45,7 @@
 reactos/dll/win32/activeds            # Synced to WineStaging-1.7.55
 reactos/dll/win32/actxprxy            # Synced to WineStaging-1.7.55
 reactos/dll/win32/advpack             # Synced to WineStaging-1.7.55
-reactos/dll/win32/atl                 # Synced to WineStaging-1.7.55
+reactos/dll/win32/atl                 # Synced to WineStaging-1.9.4
 reactos/dll/win32/atl80               # Synced to WineStaging-1.7.55
 reactos/dll/win32/atl100              # Synced to WineStaging-1.7.55
 reactos/dll/win32/avifil32            # Synced to WineStaging-1.7.55