projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync with trunk (r48545)
[reactos.git]
/
dll
/
win32
/
atl
/
atl_ax.c
diff --git
a/dll/win32/atl/atl_ax.c
b/dll/win32/atl/atl_ax.c
index
2afc746
..
d9d60a5
100644
(file)
--- a/
dll/win32/atl/atl_ax.c
+++ b/
dll/win32/atl/atl_ax.c
@@
-950,7
+950,7
@@
HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd,
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)\n", debugstr_w(lpszName), hWnd, pStream,
ppUnkContainer, ppUnkControl, iidSink, punkSink);
- hRes = CLSIDFromString(
(LPOLESTR)
lpszName, &controlId );
+ hRes = CLSIDFromString( lpszName, &controlId );
if ( FAILED(hRes) )
hRes = CLSIDFromProgID( lpszName, &controlId );
if ( SUCCEEDED( hRes ) )
if ( FAILED(hRes) )
hRes = CLSIDFromProgID( lpszName, &controlId );
if ( SUCCEEDED( hRes ) )
@@
-1044,10
+1044,11
@@
HRESULT WINAPI AtlAxAttachControl(IUnknown* pControl, HWND hWnd, IUnknown** ppUn
TRACE( "%p %p %p\n", pControl, hWnd, ppUnkContainer );
TRACE( "%p %p %p\n", pControl, hWnd, ppUnkContainer );
- *ppUnkContainer = NULL;
+ if (!pControl)
+ return E_INVALIDARG;
hr = IOCS_Create( hWnd, pControl, &pUnkContainer );
hr = IOCS_Create( hWnd, pControl, &pUnkContainer );
- if ( SUCCEEDED( hr ) )
+ if ( SUCCEEDED( hr )
&& ppUnkContainer
)
{
*ppUnkContainer = (IUnknown*) pUnkContainer;
}
{
*ppUnkContainer = (IUnknown*) pUnkContainer;
}
@@
-1150,7
+1151,7
@@
static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl)
tmp = src;
if (ext)
tmp = src;
if (ext)
- src += 1
1
;
+ src += 1
2
;
else
src += 9;
PUT_BLOCK(tmp, src-tmp);
else
src += 9;
PUT_BLOCK(tmp, src-tmp);
@@
-1236,7
+1237,7
@@
HWND WINAPI AtlAxCreateDialogW(HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPRO
LPDLGTEMPLATEW newptr;
HWND res;
LPDLGTEMPLATEW newptr;
HWND res;
-
FIXME("(%p %s %p %p %lx) - not tested
\n", hInst, debugstr_w(name), owner, dlgProc, param);
+
TRACE("(%p %s %p %p %lx)
\n", hInst, debugstr_w(name), owner, dlgProc, param);
hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG );
if ( !hrsrc )
hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG );
if ( !hrsrc )