[WIN32K]

[reactos.git] / subsystems / win32 / win32k / misc / file.c

diff --git a/subsystems/win32/win32k/misc/file.c b/subsystems/win32/win32k/misc/file.c
index d6de6c8..f8b9325 100644 (file)
--- a/subsystems/win32/win32k/misc/file.c
+++ b/subsystems/win32/win32k/misc/file.c
@@ -149,144 +149,8 @@ W32kMapViewOfSection(
     return pvBase;
 }
 
-typedef struct tagBITMAPV5INFO
-{
-    BITMAPV5HEADER bmiHeader;
-    RGBQUAD        bmiColors[256];
-} BITMAPV5INFO, *PBITMAPV5INFO;
-
 // FIXME: this should go to dibobj.c
-NTSTATUS
-ProbeAndConvertBitmapInfo(
-    OUT BITMAPV5HEADER *pbmhDst,
-    OUT RGBQUAD *pbmiColorsDst,
-    ULONG cColors,
-    IN  PBITMAPINFO pbmiUnsafe)
-{
-    DWORD dwSize;
-    RGBQUAD *pbmiColors;
-    ULONG ulWidthBytes;
-
-    /* Get the size and probe */
-    ProbeForRead(&pbmiUnsafe->bmiHeader.biSize, sizeof(DWORD), 1);
-    dwSize = pbmiUnsafe->bmiHeader.biSize;
-    ProbeForRead(pbmiUnsafe, dwSize, 1);
-
-    /* Check the size */
-    // FIXME: are intermediate sizes allowed? As what are they interpreted?
-    //        make sure we don't use a too big dwSize later
-    if (dwSize != sizeof(BITMAPCOREHEADER) &&
-        dwSize != sizeof(BITMAPINFOHEADER) &&
-        dwSize != sizeof(BITMAPV4HEADER) &&
-        dwSize != sizeof(BITMAPV5HEADER))
-    {
-        return STATUS_INVALID_PARAMETER;
-    }
 
-    pbmiColors = (RGBQUAD*)((PCHAR)pbmiUnsafe + dwSize);
-
-    pbmhDst->bV5Size = sizeof(BITMAPV5HEADER);
-
-    if (dwSize == sizeof(BITMAPCOREHEADER))
-    {
-        PBITMAPCOREHEADER pbch = (PBITMAPCOREHEADER)pbmiUnsafe;
-
-        /* Manually copy the fields that are present */
-        pbmhDst->bV5Width = pbch->bcWidth;
-        pbmhDst->bV5Height = pbch->bcHeight;
-        pbmhDst->bV5Planes = pbch->bcPlanes;
-        pbmhDst->bV5BitCount = pbch->bcBitCount;
-
-        /* Set some default values */
-        pbmhDst->bV5Compression = BI_RGB;
-        pbmhDst->bV5SizeImage = 0;
-        pbmhDst->bV5XPelsPerMeter = 72;
-        pbmhDst->bV5YPelsPerMeter = 72;
-        pbmhDst->bV5ClrUsed = 0;
-        pbmhDst->bV5ClrImportant = 0;
-    }
-    else
-    {
-        /* Copy valid fields */
-        memcpy(pbmhDst, pbmiUnsafe, dwSize);
-
-        /* Zero out the rest of the V5 header */
-        memset((char*)pbmhDst + dwSize, 0, sizeof(BITMAPV5HEADER) - dwSize);
-    }
-
-
-    if (dwSize < sizeof(BITMAPV4HEADER))
-    {
-        if (pbmhDst->bV5Compression == BI_BITFIELDS)
-        {
-            DWORD *pMasks = (DWORD*)pbmiColors;
-            pbmhDst->bV5RedMask = pMasks[0];
-            pbmhDst->bV5GreenMask = pMasks[1];
-            pbmhDst->bV5BlueMask = pMasks[2];
-            pbmhDst->bV5AlphaMask = 0;
-            pbmhDst->bV5ClrUsed = 0;
-        }
-
-//        pbmhDst->bV5CSType;
-//        pbmhDst->bV5Endpoints;
-//        pbmhDst->bV5GammaRed;
-//        pbmhDst->bV5GammaGreen;
-//        pbmhDst->bV5GammaBlue;
-    }
-
-    if (dwSize < sizeof(BITMAPV5HEADER))
-    {
-//        pbmhDst->bV5Intent;
-//        pbmhDst->bV5ProfileData;
-//        pbmhDst->bV5ProfileSize;
-//        pbmhDst->bV5Reserved;
-    }
-
-    ulWidthBytes = ((pbmhDst->bV5Width * pbmhDst->bV5Planes *
-                     pbmhDst->bV5BitCount + 31) & ~31) / 8;
-
-    if (pbmhDst->bV5SizeImage == 0)
-        pbmhDst->bV5SizeImage = abs(ulWidthBytes * pbmhDst->bV5Height);
-
-    if (pbmhDst->bV5ClrUsed == 0)
-        pbmhDst->bV5ClrUsed = pbmhDst->bV5BitCount == 1 ? 2 :
-                              (pbmhDst->bV5BitCount == 4 ? 16 :
-                              (pbmhDst->bV5BitCount == 8 ? 256 : 0));
-
-    if (pbmhDst->bV5Planes != 1)
-    {
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    if (pbmhDst->bV5BitCount != 0 && pbmhDst->bV5BitCount != 1 &&
-        pbmhDst->bV5BitCount != 4 && pbmhDst->bV5BitCount != 8 &&
-        pbmhDst->bV5BitCount != 16 && pbmhDst->bV5BitCount != 24 &&
-        pbmhDst->bV5BitCount != 32)
-    {
-        DPRINT("Invalid bit count: %d\n", pbmhDst->bV5BitCount);
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    if ((pbmhDst->bV5BitCount == 0 &&
-         pbmhDst->bV5Compression != BI_JPEG && pbmhDst->bV5Compression != BI_PNG))
-    {
-        DPRINT("Bit count 0 is invalid for compression %d.\n", pbmhDst->bV5Compression);
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    if (pbmhDst->bV5Compression == BI_BITFIELDS &&
-        pbmhDst->bV5BitCount != 16 && pbmhDst->bV5BitCount != 32)
-    {
-        DPRINT("Bit count %d is invalid for compression BI_BITFIELDS.\n", pbmhDst->bV5BitCount);
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    /* Copy Colors */
-    cColors = min(cColors, pbmhDst->bV5ClrUsed);
-    memcpy(pbmiColorsDst, pbmiColors, cColors * sizeof(RGBQUAD));
-
-    return STATUS_SUCCESS;
-}
 
 
 HBITMAP
@@ -333,10 +197,9 @@ UserLoadImage(PCWSTR pwszName)
     /* Create a normalized local BITMAPINFO */
     _SEH2_TRY
     {
-        Status = ProbeAndConvertBitmapInfo(&bmiLocal.bmiHeader,
-                                           bmiLocal.bmiColors,
-                                           256,
-                                           pbmi);
+        Status = ProbeAndConvertToBitmapV5Info(&bmiLocal,
+                                               pbmi,
+                                               DIB_RGB_COLORS);
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {