Andrew Talbot : riched20: Declare some variables unsigned.
Alexandre Julliard
julliard at winehq.org
Mon Aug 1 13:22:09 CDT 2011
Module: wine
Branch: master
Commit: faa05713ad4cb299b8d2c35337d5513a54a36d55
URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa05713ad4cb299b8d2c35337d5513a54a36d55
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Sun Jul 31 21:13:13 2011 +0100
riched20: Declare some variables unsigned.
---
dlls/riched20/run.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c
index 3682d13..4a9ae7a 100644
--- a/dlls/riched20/run.c
+++ b/dlls/riched20/run.c
@@ -894,8 +894,8 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from,
do {
/* FIXME add more style feature comparisons */
- int nAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE;
- int nEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_PROTECTED | CFM_LINK | CFM_SUPERSCRIPT;
+ DWORD dwAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE;
+ DWORD dwEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_PROTECTED | CFM_LINK | CFM_SUPERSCRIPT;
run = ME_FindItemFwd(run, diRun);
@@ -903,7 +903,7 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from,
tmp.cbSize = sizeof(tmp);
ME_GetRunCharFormat(editor, run, &tmp);
- assert((tmp.dwMask & nAttribs) == nAttribs);
+ assert((tmp.dwMask & dwAttribs) == dwAttribs);
/* reset flags that differ */
if (pFmt->yHeight != tmp.yHeight)
@@ -929,7 +929,7 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from,
}
}
- pFmt->dwMask &= ~((pFmt->dwEffects ^ tmp.dwEffects) & nEffects);
+ pFmt->dwMask &= ~((pFmt->dwEffects ^ tmp.dwEffects) & dwEffects);
pFmt->dwEffects = tmp.dwEffects;
} while(run != run_end);
More information about the wine-cvs
mailing list