From 02588ba9c016f29306ca2f2f53dec19c6719f548 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 9 Jun 2010 11:22:19 +0000 Subject: [PATCH] [WIN32K] Small bug big effects: Use the correct offset when copying the BITMAPINFO, fixes taskbar icons regression. svn path=/branches/reactos-yarotows/; revision=47709 --- subsystems/win32/win32k/objects/dibobj.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/subsystems/win32/win32k/objects/dibobj.c b/subsystems/win32/win32k/objects/dibobj.c index 7c7cfed3317..44c77aa0ba9 100644 --- a/subsystems/win32/win32k/objects/dibobj.c +++ b/subsystems/win32/win32k/objects/dibobj.c @@ -1936,7 +1936,9 @@ GetBMIFromBitmapV5Info(IN PBITMAPV5INFO pbmiSrc, else { /* Copy valid Fields, keep bmiHeader.biSize safe */ - RtlCopyMemory((PBYTE)pbmiDst + sizeof(DWORD), pbmiSrc, pbmiDst->bmiHeader.biSize - sizeof(DWORD)); + RtlCopyMemory(&pbmiDst->bmiHeader.biWidth, + &pbmiSrc->bmiHeader.bV5Width, + pbmiDst->bmiHeader.biSize - sizeof(DWORD)); } if((pbmiDst->bmiHeader.biSize < sizeof(BITMAPV4HEADER)) && (pbmiSrc->bmiHeader.bV5Compression == BI_BITFIELDS))