win32ss/gdi/ntgdi/dibobj.c | 55 ++++++++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c
index 93208665b3..7b8cc330c7 100644
--- a/win32ss/gdi/ntgdi/dibobj.c
+++ b/win32ss/gdi/ntgdi/dibobj.c
@@ -951,25 +951,28 @@ GreGetDIBitsInternal(
         RECT rcDest;
         POINTL srcPoint;
         BOOL ret ;
+        int newLines = -1;
 
-        if (StartScan > (ULONG)psurf->SurfObj.sizlBitmap.cy)
+        if (StartScan >= abs(Info->bmiHeader.biHeight))
         {
-            ScanLines = 0;
+            ScanLines = 1;
             goto done;
         }
         else
         {
-            ScanLines = min(ScanLines, psurf->SurfObj.sizlBitmap.cy - StartScan);
+            ScanLines = min(ScanLines, abs(Info->bmiHeader.biHeight) - StartScan);
         }
 
+        if (abs(Info->bmiHeader.biHeight) < psurf->SurfObj.sizlBitmap.cy)
+        {
+            StartScan += psurf->SurfObj.sizlBitmap.cy - abs(Info->bmiHeader.biHeight);
+        }
         /* Fixup values */
-        Info->bmiHeader.biWidth = psurf->SurfObj.sizlBitmap.cx;
         Info->bmiHeader.biHeight = (height < 0) ?
                                    -(LONG)ScanLines : ScanLines;
         /* Create the DIB */
         hBmpDest = DIB_CreateDIBSection(pDC, Info, Usage, &pDIBits, NULL, 0, 0);
         /* Restore them */
-        Info->bmiHeader.biWidth = width;
         Info->bmiHeader.biHeight = height;
 
         if(!hBmpDest)
@@ -982,27 +985,33 @@ GreGetDIBitsInternal(
 
         psurfDest = SURFACE_ShareLockSurface(hBmpDest);
 
-        RECTL_vSetRect(&rcDest, 0, 0, psurf->SurfObj.sizlBitmap.cx, ScanLines);
-
+        RECTL_vSetRect(&rcDest, 0, 0, Info->bmiHeader.biWidth, ScanLines);
+        Info->bmiHeader.biWidth = width;
         srcPoint.x = 0;
 
-        if(height < 0)
+        if (abs(Info->bmiHeader.biHeight) <= psurf->SurfObj.sizlBitmap.cy)
         {
-            srcPoint.y = 0;
-
-            if(ScanLines <= StartScan)
-            {
-                ScanLines = 1;
-                SURFACE_ShareUnlockSurface(psurfDest);
-                GreDeleteObject(hBmpDest);
-                goto done;
-            }
-
-            ScanLines -= StartScan;
+            srcPoint.y = psurf->SurfObj.sizlBitmap.cy - StartScan - ScanLines;
         }
         else
         {
-            srcPoint.y = StartScan;
+            /*  Determine the actual number of lines copied from the  */
+            /*  original bitmap. It might be different from ScanLines. */
+            newLines = abs(Info->bmiHeader.biHeight) - psurf->SurfObj.sizlBitmap.cy;
+            newLines = min((int)(StartScan + ScanLines - newLines), psurf->SurfObj.sizlBitmap.cy);
+            if (newLines > 0)
+            {
+                srcPoint.y = psurf->SurfObj.sizlBitmap.cy - newLines;
+                if (StartScan > psurf->SurfObj.sizlBitmap.cy)
+                {
+                    newLines -= (StartScan - psurf->SurfObj.sizlBitmap.cy);
+                }
+            }
+            else
+            {
+                newLines = 0;
+                srcPoint.y = psurf->SurfObj.sizlBitmap.cy;
+            }
         }
 
         EXLATEOBJ_vInitialize(&exlo, psurf->ppal, psurfDest->ppal, 0xffffff, 0xffffff, 0);
@@ -1022,7 +1031,11 @@ GreGetDIBitsInternal(
         {
             RtlCopyMemory(Bits, pDIBits, DIB_GetDIBImageBytes (width, ScanLines, bpp));
         }
-
+        /* Update if line count has changed */
+        if (newLines != -1)
+        {
+            ScanLines = (UINT)newLines;
+        }
         GreDeleteObject(hBmpDest);
         EXLATEOBJ_vCleanup(&exlo);
     }