mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-15 09:15:11 +00:00
atl: Fix compilation warnings in 64-bit mode.
This commit is contained in:
parent
c6b64b0b47
commit
2e944d8e13
|
@ -1146,8 +1146,8 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl)
|
||||||
|
|
||||||
while(rescount--)
|
while(rescount--)
|
||||||
{
|
{
|
||||||
src = (const WORD *)( ( ((ULONG)src) + 3) & ~3); /* align on DWORD boundary */
|
src = (const WORD *)( ( ((ULONG_PTR)src) + 3) & ~3); /* align on DWORD boundary */
|
||||||
filled = (filled + 1) & ~1; /* depends on DWORD-aligned allocation unit */
|
filled = (filled + 1) & ~1; /* depends on DWORD-aligned allocation unit */
|
||||||
|
|
||||||
tmp = src;
|
tmp = src;
|
||||||
if (ext)
|
if (ext)
|
||||||
|
@ -1167,8 +1167,8 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl)
|
||||||
src += strlenW(src) + 1; /* title */
|
src += strlenW(src) + 1; /* title */
|
||||||
if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */
|
if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */
|
||||||
{
|
{
|
||||||
const WCHAR AtlAxWin[9]={'A','t','l','A','x','W','i','n',0};
|
static const WCHAR AtlAxWin[9]={'A','t','l','A','x','W','i','n',0};
|
||||||
PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WORD));
|
PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WCHAR));
|
||||||
PUT_BLOCK(tmp, strlenW(tmp)+1);
|
PUT_BLOCK(tmp, strlenW(tmp)+1);
|
||||||
} else
|
} else
|
||||||
PUT_BLOCK(tmp, src-tmp);
|
PUT_BLOCK(tmp, src-tmp);
|
||||||
|
|
Loading…
Reference in a new issue