Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-10 20:34:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=70827
This commit is contained in:
Amine Khaldi 2016-03-01 12:14:12 +00:00
parent 49bcd564e8
commit 6310ce0e66
2 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
reactos/dll/win32/atl/atl_ax.c
View file

@ -1019,15 +1019,15 @@ static enum content get_content_type(LPCOLESTR name, CLSID *control_id)
} }
/*********************************************************************** /***********************************************************************
* AtlAxCreateControlEx [atl100.@] * AtlAxCreateControlLicEx [atl100.@]
* *
* REMARKS * REMARKS
* See http://www.codeproject.com/com/cwebpage.asp for some background * 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, IStream *pStream, IUnknown **ppUnkContainer, IUnknown **ppUnkControl,
REFIID iidSink, IUnknown *punkSink) REFIID iidSink, IUnknown *punkSink, BSTR lic)
{ {
CLSID controlId; CLSID controlId;
HRESULT hRes; HRESULT hRes;
@ -1037,8 +1037,11 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd,
IUnknown *pContainer = NULL; IUnknown *pContainer = NULL;
enum content content; enum content content;
TRACE("(%s %p %p %p %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, TRACE("(%s %p %p %p %p %p %p %s)\n", debugstr_w(lpszName), hWnd, pStream,
ppUnkContainer, ppUnkControl, iidSink, punkSink); ppUnkContainer, ppUnkControl, iidSink, punkSink, debugstr_w(lic));
if (lic)
FIXME("semi stub\n");
if (ppUnkContainer) *ppUnkContainer = NULL; if (ppUnkContainer) *ppUnkContainer = NULL;
if (ppUnkControl) *ppUnkControl = NULL; if (ppUnkControl) *ppUnkControl = NULL;
@ -1411,28 +1414,21 @@ INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND
return 0; return 0;
} }
#if _ATL_VER >= _ATL_VER_80
/*********************************************************************** /***********************************************************************
* AtlAxCreateControlLic [atl100.59] * AtlAxCreateControlLic [atl100.59]
* *
*/ */
HRESULT WINAPI AtlAxCreateControlLic(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, IUnknown **container, BSTR lic) 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 AtlAxCreateControlLicEx(lpTricsData, hwnd, stream, container, NULL, NULL, NULL, lic);
return E_NOTIMPL;
} }
/*********************************************************************** /***********************************************************************
* AtlAxCreateControlLicEx [atl100.60] * AtlAxCreateControlEx [atl100.@]
* *
*/ */
HRESULT WINAPI AtlAxCreateControlLicEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, HRESULT WINAPI AtlAxCreateControlEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream,
IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink, BSTR lic) 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, return AtlAxCreateControlLicEx(lpTricsData, hwnd, stream, container, control, iidSink, punkSink, NULL);
debugstr_guid(iidSink), punkSink, debugstr_w(lic));
return E_NOTIMPL;
} }
#endif

2
reactos/media/doc/README.WINE
View file

@ -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/activeds # Synced to WineStaging-1.7.55
reactos/dll/win32/actxprxy # 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/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/atl80 # Synced to WineStaging-1.7.55
reactos/dll/win32/atl100 # 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 reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.55