Module: wine Branch: master Commit: 99b83bf385cb7ea7ac7ecce756f3c3631e382e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=99b83bf385cb7ea7ac7ecce756...
Author: Gerald Pfeifer gerald@pfeifer.com Date: Sat Nov 28 22:51:18 2015 +0100
krnl386.exe16: Avoid shift overflows in DMA_ioport_out.
Signed-off-by: Gerald Pfeifer gerald@pfeifer.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/krnl386.exe16/dma.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/krnl386.exe16/dma.c b/dlls/krnl386.exe16/dma.c index 6734a25..9a255ce 100644 --- a/dlls/krnl386.exe16/dma.c +++ b/dlls/krnl386.exe16/dma.c @@ -210,13 +210,13 @@ void DMA_ioport_out( WORD port, BYTE val ) case 0x8A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & (~0xFF << 16))|((val & 0xFF) << 16); break;
/* Low Page Base Address (only 4 lower bits are significant) */ - case 0x487: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x483: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x481: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x482: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x48B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x489: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x48A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & (~0xFF << 24))|((val & 0x0F) << 24); break; + case 0x487: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x483: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x481: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x482: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x48B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x489: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x48A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & (~0xFFu << 24))|((val & 0x0F) << 24); break;
case 0x08: case 0xD0: