Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ATL] Sync with Wine Staging 4.0. CORE-15682

Browse source
This commit is contained in:
Amine Khaldi 2019-01-25 13:13:28 +01:00
parent 2a1300f5b6
commit f9fd4bbc7c
2 changed files with 54 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
dll/win32/atl/atl_ax.c
View file

@ -28,6 +28,7 @@
#include "winerror.h"
#include "winuser.h"
#include "wine/debug.h"
#include "wine/heap.h"
#include "objbase.h"
#include "objidl.h"
#include "ole2.h"
@ -104,7 +105,7 @@ BOOL WINAPI AtlAxWinInit(void)
#error Unsupported version
#endif
const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX};
static const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX};
FIXME("version %04x semi-stub\n", _ATL_VER);
@ -128,7 +129,7 @@ BOOL WINAPI AtlAxWinInit(void)
return FALSE;
if(_ATL_VER > _ATL_VER_30) {
const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX};
static const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX};
wcex.lpszClassName = AtlAxWinLicW;
if ( !RegisterClassExW( &wcex ) )
@ -1001,9 +1002,9 @@ enum content
static enum content get_content_type(LPCOLESTR name, CLSID *control_id)
{
static const WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':',0};
WCHAR new_urlW[MAX_PATH];
DWORD size = MAX_PATH;
WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':','\0'};
if (!name || !name[0])
{
@ -1407,25 +1408,64 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk)
}
/***********************************************************************
* AtlAxDialogBoxW [atl100.35]
* AtlAxDialogBoxA [atl100.@]
*
*/
INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInstance, LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc,
LPARAM dwInitParam)
INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInst, LPCSTR name, HWND owner, DLGPROC dlgProc, LPARAM param)
{
FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_w(lpTemplateName), hWndParent, lpDialogProc, dwInitParam);
return 0;
INT_PTR res = 0;
int length;
WCHAR *nameW;
if (IS_INTRESOURCE(name))
return AtlAxDialogBoxW( hInst, (LPCWSTR) name, owner, dlgProc, param );
length = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 );
nameW = heap_alloc( length * sizeof(WCHAR) );
if (nameW)
{
MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, length );
res = AtlAxDialogBoxW( hInst, nameW, owner, dlgProc, param );
heap_free( nameW );
}
return res;
}
/***********************************************************************
* AtlAxDialogBoxA [atl100.36]
* AtlAxDialogBoxW [atl100.@]
*
*/
INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc,
LPARAM dwInitParam)
INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPROC dlgProc, LPARAM param)
{
FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam);
return 0;
HRSRC hrsrc;
HGLOBAL hgl;
LPCDLGTEMPLATEW ptr;
LPDLGTEMPLATEW newptr;
INT_PTR res;
TRACE("(%p %s %p %p %lx)\n", hInst, debugstr_w(name), owner, dlgProc, param);
hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG );
if ( !hrsrc )
return 0;
hgl = LoadResource (hInst, hrsrc);
if ( !hgl )
return 0;
ptr = LockResource ( hgl );
if (!ptr)
{
FreeResource( hgl );
return 0;
}
newptr = AX_ConvertDialogTemplate( ptr );
if ( newptr )
{
res = DialogBoxIndirectParamW( hInst, newptr, owner, dlgProc, param );
heap_free( newptr );
} else
res = 0;
FreeResource ( hrsrc );
return res;
}
/***********************************************************************

2
media/doc/README.WINE
View file

@ -45,7 +45,7 @@ reactos/dll/directx/wine/wined3d # Synced to WineStaging-3.9
reactos/dll/win32/activeds # Synced to WineStaging-3.3
reactos/dll/win32/actxprxy # Synced to WineStaging-3.3
reactos/dll/win32/advpack # Synced to WineStaging-4.0
reactos/dll/win32/atl # Synced to WineStaging-3.17
reactos/dll/win32/atl # Synced to WineStaging-4.0
reactos/dll/win32/atl80 # Synced to WineStaging-3.3
reactos/dll/win32/atl100 # Synced to WineStaging-3.3
reactos/dll/win32/avifil32 # Synced to WineStaging-3.9