Module: wine Branch: refs/heads/master Commit: 932a2a0d54b7da746e1f55c8dc83144d686e5df3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=932a2a0d54b7da746e1f55c8...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jul 13 23:06:17 2006 +0200
Fix swapped 2nd and 3rd argument passed to memset.
---
dlls/dinput/device.c | 2 +- dlls/gdi/tests/brush.c | 2 +- dlls/winedos/int10.c | 8 ++++---- dlls/winex11.drv/xim.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d8924d3..7e2e9d4 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -271,7 +271,7 @@ void fill_DataFormat(void *out, const vo break; default: - memset((out_c + df->dt[i].offset_out), df->dt[i].size, 0); + memset((out_c + df->dt[i].offset_out), 0, df->dt[i].size); break; } } diff --git a/dlls/gdi/tests/brush.c b/dlls/gdi/tests/brush.c index 36ad129..c2aee7c 100644 --- a/dlls/gdi/tests/brush.c +++ b/dlls/gdi/tests/brush.c @@ -56,7 +56,7 @@ static void test_solidbrush(void) } else stockBrush = NULL; - memset(&br, sizeof(br), 0); + memset(&br, 0, sizeof(br)); ret = GetObject(solidBrush, sizeof(br), &br); ok( ret !=0, "GetObject on solid %s brush failed, error=%ld\n", stock[i].name, GetLastError()); ok(br.lbStyle==BS_SOLID, "%s brush has wrong style, got %d expected %d\n", stock[i].name, br.lbStyle, BS_SOLID); diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c index 01665b5..98821f2 100644 --- a/dlls/winedos/int10.c +++ b/dlls/winedos/int10.c @@ -299,7 +299,7 @@ static void INT10_FillControllerInformat *(SEGPTR*)(buffer + 36) = 0;
/* 40 - BYTE[216]: reserved for VBE implementation, set to zero */ - memset( buffer + 40, 216, 0 ); + memset( buffer + 40, 0, 216 );
/* * 256 - BYTE[256]: reserved for VBE3.0 implementation, @@ -548,7 +548,7 @@ static BOOL INT10_FillModeInformation( s mib->MaxPixelClock = 0; /* FIXME */
/* 66 - BYTE[190]: reserved, set to zero */ - memset( &mib->Reserved4, 190, 0 ); + memset( &mib->Reserved4, 0, 190 );
return TRUE; } @@ -636,7 +636,7 @@ static void INT10_FillStateInformation( buffer[46] = 0; /* FIXME: correct value? */
/* 47 - BYTE[2]: reserved, set to zero */ - memset( buffer + 47, 2, 0 ); + memset( buffer + 47, 0, 2 );
/* * 49 - BYTE: video memory available @@ -673,7 +673,7 @@ static void INT10_FillStateInformation( buffer[51] = 4; /* FIXME: correct value? */
/* 52 - BYTE[12]: reserved, set to zero */ - memset( buffer + 52, 12, 0 ); + memset( buffer + 52, 0, 12 ); }
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 845083a..110e7e8 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -163,8 +163,8 @@ static BOOL X11DRV_ImmSetInternalString( HeapAlloc(GetProcessHeap(), 0, dwCompStringSize + byte_expansion);
- memset(&(CompositionString[dwCompStringSize]), byte_expansion, - 0); + memset(&(CompositionString[dwCompStringSize]), 0, + byte_expansion);
dwCompStringSize += byte_expansion; }