Andrew Nguyen : kernel32: Pass an output parameter when calling WriteConsoleOutputCharacterW and FillConsoleOutputAttribute .
Alexandre Julliard
julliard at winehq.org
Tue Jan 11 10:08:30 CST 2011
Module: wine
Branch: master
Commit: ee84a9df12440c4def17941c49710079bf2daf96
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee84a9df12440c4def17941c49710079bf2daf96
Author: Andrew Nguyen <anguyen at codeweavers.com>
Date: Tue Jan 11 05:11:44 2011 -0600
kernel32: Pass an output parameter when calling WriteConsoleOutputCharacterW and FillConsoleOutputAttribute.
---
dlls/kernel32/editline.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c
index b33798b..dd93696 100644
--- a/dlls/kernel32/editline.c
+++ b/dlls/kernel32/editline.c
@@ -186,6 +186,7 @@ static inline void WCEL_WriteNChars(WCEL_Context* ctx, char ch, int count)
static inline void WCEL_Update(WCEL_Context* ctx, int beg, int len)
{
int i, last;
+ DWORD count;
WCHAR tmp[2];
/* bare console case is handled in CONSOLE_ReadLine (we always reprint the whole string) */
@@ -198,25 +199,25 @@ static inline void WCEL_Update(WCEL_Context* ctx, int beg, int len)
if (last != i)
{
WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[last], i - last,
- WCEL_GetCoord(ctx, last), NULL);
+ WCEL_GetCoord(ctx, last), &count);
FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, i - last,
- WCEL_GetCoord(ctx, last), NULL);
+ WCEL_GetCoord(ctx, last), &count);
}
tmp[0] = '^';
tmp[1] = '@' + ctx->line[i];
WriteConsoleOutputCharacterW(ctx->hConOut, tmp, 2,
- WCEL_GetCoord(ctx, i), NULL);
+ WCEL_GetCoord(ctx, i), &count);
FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, 2,
- WCEL_GetCoord(ctx, i), NULL);
+ WCEL_GetCoord(ctx, i), &count);
last = i + 1;
}
}
if (last != beg + len)
{
WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[last], i - last,
- WCEL_GetCoord(ctx, last), NULL);
+ WCEL_GetCoord(ctx, last), &count);
FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, i - last,
- WCEL_GetCoord(ctx, last), NULL);
+ WCEL_GetCoord(ctx, last), &count);
}
}
More information about the wine-cvs
mailing list