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 ) )
TRACE( "%p %p %p\n", pControl, hWnd, ppUnkContainer );
- *ppUnkContainer = NULL;
+ if (!pControl)
+ return E_INVALIDARG;
hr = IOCS_Create( hWnd, pControl, &pUnkContainer );
- if ( SUCCEEDED( hr ) )
+ if ( SUCCEEDED( hr ) && ppUnkContainer)
{
*ppUnkContainer = (IUnknown*) pUnkContainer;
}
tmp = src;
if (ext)
- src += 11;
+ src += 12;
else
src += 9;
PUT_BLOCK(tmp, src-tmp);
int length;
WCHAR *nameW;
- if ( HIWORD(name) == 0 )
+ if (IS_INTRESOURCE(name))
return AtlAxCreateDialogW( hInst, (LPCWSTR) name, owner, dlgProc, param );
length = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 );
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 )