From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 1 Mar 2016 12:14:12 +0000 (+0000)
Subject: [ATL] Sync with Wine Staging 1.9.4. CORE-10912
X-Git-Tag: ReactOS-0.4.1~388
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=6310ce0e66bc50888088e23f4654f249e34a6b2a

[ATL] Sync with Wine Staging 1.9.4. CORE-10912

svn path=/trunk/; revision=70827
---

diff --git a/reactos/dll/win32/atl/atl_ax.c b/reactos/dll/win32/atl/atl_ax.c
index 8f49b5f3251..43247ca73b2 100644
--- a/reactos/dll/win32/atl/atl_ax.c
+++ b/reactos/dll/win32/atl/atl_ax.c
@@ -1019,15 +1019,15 @@ static enum content get_content_type(LPCOLESTR name, CLSID *control_id)
 }
 
 /***********************************************************************
- *           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 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd,
     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 @@ INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND
     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]
+ *           AtlAxCreateControlEx         [atl100.@]
  *
  */
-HRESULT WINAPI AtlAxCreateControlLicEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream,
-        IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink, BSTR lic)
+HRESULT WINAPI AtlAxCreateControlEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream,
+        IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink)
 {
-    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;
+    return AtlAxCreateControlLicEx(lpTricsData, hwnd, stream, container, control, iidSink, punkSink, NULL);
 }
-
-#endif
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 5212a4b519f..b9b5eebe99b 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -45,7 +45,7 @@ reactos/dll/directx/wine/wined3d        # Synced to WineStaging-1.9.4
 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