Dmitry Timoshkov : atl: Fix compilation warnings in 64-bit mode.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jun 1 06:44:29 CDT 2007
Module: wine
Branch: master
Commit: 2e944d8e13dcfdf044b710cc291ad116ea6adcc7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e944d8e13dcfdf044b710cc291ad116ea6adcc7
Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date: Thu May 31 22:57:21 2007 +0900
atl: Fix compilation warnings in 64-bit mode.
---
dlls/atl/atl_ax.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c
index 7e6a348..4f0b7cb 100644
--- a/dlls/atl/atl_ax.c
+++ b/dlls/atl/atl_ax.c
@@ -1146,8 +1146,8 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl)
while(rescount--)
{
- src = (const WORD *)( ( ((ULONG)src) + 3) & ~3); /* align on DWORD boundary */
- filled = (filled + 1) & ~1; /* depends on DWORD-aligned allocation unit */
+ src = (const WORD *)( ( ((ULONG_PTR)src) + 3) & ~3); /* align on DWORD boundary */
+ filled = (filled + 1) & ~1; /* depends on DWORD-aligned allocation unit */
tmp = src;
if (ext)
@@ -1167,8 +1167,8 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl)
src += strlenW(src) + 1; /* title */
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};
- PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WORD));
+ static const WCHAR AtlAxWin[9]={'A','t','l','A','x','W','i','n',0};
+ PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WCHAR));
PUT_BLOCK(tmp, strlenW(tmp)+1);
} else
PUT_BLOCK(tmp, src-tmp);
More information about the wine-cvs
mailing list