Ros-diffs May 2012

ros-diffs@reactos.org

12 participants
227 discussions

[tfaber] 56551: [WORDPAD] - Fix _WIN32_IE redefinition See issue #7047 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed May 9 10:43:26 2012 New Revision: 56551 URL: http://svn.reactos.org/svn/reactos?rev=56551&view=rev Log: [WORDPAD] - Fix _WIN32_IE redefinition See issue #7047 for more details. Modified: trunk/reactos/base/applications/wordpad/CMakeLists.txt Modified: trunk/reactos/base/applications/wordpad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] Wed May 9 10:43:26 2012 @@ -1,24 +1,20 @@ + +remove_definitions(-D_WIN32_IE=0x600) + +add_definitions(-D__ROS_LONG64__) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE olecallback.c print.c registry.c - wordpad.c) + wordpad.c + rsrc.rc) -add_executable(wordpad - ${SOURCE} - rsrc.rc) +add_executable(wordpad ${SOURCE}) set_module_type(wordpad win32gui) target_link_libraries(wordpad wine uuid) add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET wordpad DESTINATION reactos/system32 FOR all) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(wordpad) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif()

12 years, 7 months

[tfaber] 56550: [EXPLORER] - Execute HKCU RunOnce entries as well. Patch by Edijs Kolesnikovics. See issue #7062 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed May 9 09:08:02 2012 New Revision: 56550 URL: http://svn.reactos.org/svn/reactos?rev=56550&view=rev Log: [EXPLORER] - Execute HKCU RunOnce entries as well. Patch by Edijs Kolesnikovics. See issue #7062 for more details. Modified: trunk/reactos/base/shell/explorer/services/startup.c Modified: trunk/reactos/base/shell/explorer/services/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/servic… ============================================================================== --- trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] Wed May 9 09:08:02 2012 @@ -510,6 +510,8 @@ res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE); if (res && ops.postlogin && ops.startup) res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], FALSE, FALSE); + if (res && ops.postlogin && ops.startup) + res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUNONCE], TRUE, FALSE); printf("Operation done\n");

12 years, 7 months

[tkreuzer] 56549: Merge r56543 - r56548

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 9 08:23:25 2012 New Revision: 56549 URL: http://svn.reactos.org/svn/reactos?rev=56549&view=rev Log: Merge r56543 - r56548 Modified: branches/dib_rewrite/ (props changed) branches/dib_rewrite/win32ss/gdi/eng/mouse.c branches/dib_rewrite/win32ss/gdi/eng/xlate.c branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c branches/dib_rewrite/win32ss/gdi/ntgdi/gdiobj.c branches/dib_rewrite/win32ss/gdi/ntgdi/palette.c branches/dib_rewrite/win32ss/gdi/ntgdi/palette.h Propchange: branches/dib_rewrite/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 9 08:23:25 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:56444-56543 +/trunk/reactos:56444-56548 Modified: branches/dib_rewrite/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/mou… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/eng/mouse.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/eng/mouse.c [iso-8859-1] Wed May 9 08:23:25 2012 @@ -391,7 +391,7 @@ /* Initialize an EXLATEOBJ */ ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); EXLATEOBJ_vInitialize(&exlo, - &gpalMono, + gppalMono, ppal, 0, RGB(0xff,0xff,0xff), Modified: branches/dib_rewrite/win32ss/gdi/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/xla… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/eng/xlate.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/eng/xlate.c [iso-8859-1] Wed May 9 08:23:25 2012 @@ -591,8 +591,8 @@ /* Normal initialisation. No surface means DEFAULT_BITMAP */ EXLATEOBJ_vInitialize(pexlo, - psurfSrc ? psurfSrc->ppal : &gpalMono, - psurfDst ? psurfDst->ppal : &gpalMono, + psurfSrc ? psurfSrc->ppal : gppalMono, + psurfDst ? psurfDst->ppal : gppalMono, pdcSrc->pdcattr->crBackgroundClr, pdcDst->pdcattr->crBackgroundClr, pdcDst->pdcattr->crForegroundClr); Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed May 9 08:23:25 2012 @@ -111,13 +111,23 @@ _In_ ULONG iUsage) { PPALETTE ppal; - ULONG i, cColors; + ULONG i, cBitsPixel, cColors; + + if (pbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) + { + PBITMAPCOREINFO pbci = (PBITMAPCOREINFO)pbmi; + cBitsPixel = pbci->bmciHeader.bcBitCount; + } + else + { + cBitsPixel = pbmi->bmiHeader.biBitCount; + } /* Check if the colors are indexed */ - if (pbmi->bmiHeader.biBitCount <= 8) + if (cBitsPixel <= 8) { /* We create a "full" palette */ - cColors = 1 << pbmi->bmiHeader.biBitCount; + cColors = 1 << cBitsPixel; /* Allocate the palette */ ppal = PALETTE_AllocPalette(PAL_INDEXED, @@ -128,7 +138,8 @@ 0); /* Check if the BITMAPINFO specifies how many colors to use */ - if (pbmi->bmiHeader.biClrUsed != 0) + if ((pbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && + (pbmi->bmiHeader.biClrUsed != 0)) { /* This is how many colors we can actually process */ cColors = min(cColors, pbmi->bmiHeader.biClrUsed); @@ -179,7 +190,7 @@ // FIXME: this one is undocumented // ASSERT(FALSE); // } - else // if (iUsage == DIB_RGB_COLORS) + else if (pbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) { /* The colors are an array of RGBQUAD values */ RGBQUAD *prgb = (RGBQUAD*)((PCHAR)pbmi + pbmi->bmiHeader.biSize); @@ -197,6 +208,22 @@ PALETTE_vSetRGBColorForIndex(ppal, i, crColor); } } + else + { + /* The colors are an array of RGBTRIPLE values */ + RGBTRIPLE *prgb = (RGBTRIPLE*)((PCHAR)pbmi + pbmi->bmiHeader.biSize); + + /* Loop all color indices in the DIB */ + for (i = 0; i < cColors; i++) + { + /* Get the color value and translate it to a COLORREF */ + RGBTRIPLE rgb = prgb[i]; + COLORREF crColor = RGB(rgb.rgbtRed, rgb.rgbtGreen, rgb.rgbtBlue); + + /* Set the RGB value in the palette */ + PALETTE_vSetRGBColorForIndex(ppal, i, crColor); + } + } } else { @@ -204,7 +231,8 @@ ULONG flRedMask, flGreenMask, flBlueMask; /* Check if the DIB contains bitfield values */ - if (pbmi->bmiHeader.biCompression == BI_BITFIELDS) + if ((pbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && + (pbmi->bmiHeader.biCompression == BI_BITFIELDS)) { /* Check if we have a v4/v5 header */ if (pbmi->bmiHeader.biSize >= sizeof(BITMAPV4HEADER)) @@ -228,7 +256,7 @@ { /* Check what bit depth we have. Note: optimization flags are calculated in PALETTE_AllocPalette() */ - if (pbmi->bmiHeader.biBitCount == 16) + if (cBitsPixel == 16) { /* This is an RGB 555 palette */ flRedMask = 0x7C00; @@ -255,136 +283,6 @@ /* We're done, return the palette */ return ppal; -} - - -UINT -APIENTRY -IntSetDIBColorTable( - HDC hDC, - UINT StartIndex, - UINT Entries, - CONST RGBQUAD *Colors) -{ - PDC dc; - PSURFACE psurf; - PPALETTE PalGDI; - UINT Index; - ULONG biBitCount; - - if (!(dc = DC_LockDc(hDC))) return 0; - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - return 0; - } - - psurf = dc->dclevel.pSurface; - if (psurf == NULL) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (psurf->hSecure == NULL) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - if ((biBitCount <= 8) && (StartIndex < (1UL << biBitCount))) - { - if (StartIndex + Entries > (1UL << biBitCount)) - Entries = (1 << biBitCount) - StartIndex; - - if (psurf->ppal == NULL) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_HANDLE); - return 0; - } - - PalGDI = psurf->ppal; - - for (Index = StartIndex; - Index < StartIndex + Entries && Index < PalGDI->NumColors; - Index++) - { - PalGDI->IndexedColors[Index].peRed = Colors[Index - StartIndex].rgbRed; - PalGDI->IndexedColors[Index].peGreen = Colors[Index - StartIndex].rgbGreen; - PalGDI->IndexedColors[Index].peBlue = Colors[Index - StartIndex].rgbBlue; - } - } - else - Entries = 0; - - /* Mark the brushes invalid */ - dc->pdcattr->ulDirty_ |= DIRTY_FILL|DIRTY_LINE|DIRTY_BACKGROUND|DIRTY_TEXT; - - DC_UnlockDc(dc); - - return Entries; -} - -UINT -APIENTRY -IntGetDIBColorTable( - HDC hDC, - UINT StartIndex, - UINT Entries, - RGBQUAD *Colors) -{ - PDC dc; - PSURFACE psurf; - PPALETTE ppal; - UINT Index, Count = 0; - - if (!(dc = DC_LockDc(hDC))) return 0; - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - return 0; - } - - psurf = dc->dclevel.pSurface; - if (psurf == NULL) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (psurf->hSecure == NULL) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - ppal = psurf->ppal; - ASSERT(ppal); - - if (ppal->flFlags & PAL_INDEXED) - { - - for (Index = StartIndex; - Index < StartIndex + Entries && Index < ppal->NumColors; - Index++) - { - Colors[Index - StartIndex].rgbRed = ppal->IndexedColors[Index].peRed; - Colors[Index - StartIndex].rgbGreen = ppal->IndexedColors[Index].peGreen; - Colors[Index - StartIndex].rgbBlue = ppal->IndexedColors[Index].peBlue; - Colors[Index - StartIndex].rgbReserved = 0; - Count++; - } - } - - DC_UnlockDc(dc); - - return Count; } // Converts a DIB to a device-dependent bitmap Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/g… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Wed May 9 08:23:25 2012 @@ -576,9 +576,6 @@ { ULONG cRefs; - /* Must not be exclusively locked */ - ASSERT(pobj->cExclusiveLock == 0); - /* Check if the object has a handle */ if (GDI_HANDLE_GET_INDEX(pobj->hHmgr)) { Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/p… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Wed May 9 08:23:25 2012 @@ -14,7 +14,7 @@ static UINT SystemPaletteUse = SYSPAL_NOSTATIC; /* The program need save the pallete and restore it */ -PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565, *gppalDefault; +PALETTE gpalRGB, gpalBGR, gpalRGB555, gpalRGB565, *gppalMono, *gppalDefault; PPALETTE appalSurfaceDefault[11]; const PALETTEENTRY g_sysPalTemplate[NB_RESERVED_COLORS] = @@ -62,30 +62,13 @@ NTAPI InitPaletteImpl() { - int i; - HPALETTE hpalette; - PLOGPALETTE palPtr; - // Create default palette (20 system colors) - palPtr = ExAllocatePoolWithTag(PagedPool, - sizeof(LOGPALETTE) + - (NB_RESERVED_COLORS * sizeof(PALETTEENTRY)), - TAG_PALETTE); - if (!palPtr) return STATUS_NO_MEMORY; - - palPtr->palVersion = 0x300; - palPtr->palNumEntries = NB_RESERVED_COLORS; - for (i=0; i<NB_RESERVED_COLORS; i++) - { - palPtr->palPalEntry[i].peRed = g_sysPalTemplate[i].peRed; - palPtr->palPalEntry[i].peGreen = g_sysPalTemplate[i].peGreen; - palPtr->palPalEntry[i].peBlue = g_sysPalTemplate[i].peBlue; - palPtr->palPalEntry[i].peFlags = 0; - } - - hpalette = GreCreatePaletteInternal(palPtr,NB_RESERVED_COLORS); - ASSERT(hpalette); - ExFreePoolWithTag(palPtr, TAG_PALETTE); + gppalDefault = PALETTE_AllocPalWithHandle(PAL_INDEXED, + 20, + (PULONG)g_sysPalTemplate, + 0, 0, 0); + GDIOBJ_vReferenceObjectByPointer(&gppalDefault->BaseObject); + PALETTE_UnlockPalette(gppalDefault); /* palette_size = visual->map_entries; */ @@ -117,14 +100,12 @@ gpalRGB565.BaseObject.ulShareCount = 1; gpalRGB565.BaseObject.BaseFlags = 0 ; - memset(&gpalMono, 0, sizeof(PALETTE)); - gpalMono.flFlags = PAL_MONOCHROME; - gpalMono.BaseObject.ulShareCount = 1; - gpalMono.BaseObject.BaseFlags = 0 ; + gppalMono = PALETTE_AllocPalette(PAL_MONOCHROME|PAL_INDEXED, 2, NULL, 0, 0, 0); + PALETTE_vSetRGBColorForIndex(gppalMono, 0, 0x000000); + PALETTE_vSetRGBColorForIndex(gppalMono, 1, 0xffffff); /* Initialize default surface palettes */ - gppalDefault = PALETTE_ShareLockPalette(hpalette); - appalSurfaceDefault[BMF_1BPP] = &gpalMono; + appalSurfaceDefault[BMF_1BPP] = gppalMono; appalSurfaceDefault[BMF_4BPP] = gppalDefault; appalSurfaceDefault[BMF_8BPP] = gppalDefault; appalSurfaceDefault[BMF_16BPP] = &gpalRGB565; @@ -160,7 +141,7 @@ ULONG fl = 0, cjSize = sizeof(PALETTE); /* Check if the palette has entries */ - if (iMode == PAL_INDEXED) + if (iMode & PAL_INDEXED) { /* Check color count */ if ((cColors == 0) || (cColors > 1024)) return NULL; @@ -1010,6 +991,86 @@ return Entries; } +ULONG +APIENTRY +GreGetSetColorTable( + HDC hdc, + ULONG iStartIndex, + ULONG cEntries, + RGBQUAD *prgbColors, + BOOL bSet) +{ + PDC pdc; + PSURFACE psurf; + PPALETTE ppal = NULL; + ULONG i, iEndIndex, iResult = 0; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + return 0; + } + + /* Get the surace from the DC */ + psurf = pdc->dclevel.pSurface; + + /* Check if we have the default surface */ + if ((psurf == NULL) && !bSet) + { + /* Use a mono palette */ + ppal = gppalMono; + } + else if (psurf->SurfObj.iType == STYPE_BITMAP) + { + /* Get the palette of the surface */ + ppal = psurf->ppal; + } + + /* Check if this is an indexed palette and the range is ok */ + if (ppal && (ppal->flFlags & PAL_INDEXED) && + (iStartIndex < ppal->NumColors)) + { + /* Calculate the end of the operation */ + iEndIndex = min(iStartIndex + cEntries, ppal->NumColors); + + /* Check what operation to perform */ + if (bSet) + { + /* Loop all colors and set the palette entries */ + for (i = iStartIndex; i < iEndIndex; i++, prgbColors++) + { + ppal->IndexedColors[i].peRed = prgbColors->rgbRed; + ppal->IndexedColors[i].peGreen = prgbColors->rgbGreen; + ppal->IndexedColors[i].peBlue = prgbColors->rgbBlue; + } + + /* Mark the dc brushes invalid */ + pdc->pdcattr->ulDirty_ |= DIRTY_FILL|DIRTY_LINE| + DIRTY_BACKGROUND|DIRTY_TEXT; + } + else + { + /* Loop all colors and get the palette entries */ + for (i = iStartIndex; i < iEndIndex; i++, prgbColors++) + { + prgbColors->rgbRed = ppal->IndexedColors[i].peRed; + prgbColors->rgbGreen = ppal->IndexedColors[i].peGreen; + prgbColors->rgbBlue = ppal->IndexedColors[i].peBlue; + prgbColors->rgbReserved = 0; + } + } + + /* Calculate how many entries were modified */ + iResult = iEndIndex - iStartIndex; + } + + /* Unlock the DC */ + DC_UnlockDc(pdc); + + return iResult; +} + W32KAPI LONG APIENTRY @@ -1051,6 +1112,11 @@ } _SEH2_END } + else + { + /* Zero it out, so we don't accidentally leak kernel data */ + RtlZeroMemory(pEntries, cEntries * sizeof(PALETTEENTRY)); + } } ret = 0; @@ -1076,12 +1142,12 @@ case GdiPalSetColorTable: if (pEntries) - ret = IntSetDIBColorTable((HDC)hObj, iStart, cEntries, (RGBQUAD*)pEntries); + ret = GreGetSetColorTable((HDC)hObj, iStart, cEntries, (RGBQUAD*)pEntries, TRUE); break; case GdiPalGetColorTable: if (pEntries) - ret = IntGetDIBColorTable((HDC)hObj, iStart, cEntries, (RGBQUAD*)pEntries); + ret = GreGetSetColorTable((HDC)hObj, iStart, cEntries, (RGBQUAD*)pEntries, FALSE); break; } Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/p… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Wed May 9 08:23:25 2012 @@ -43,7 +43,7 @@ PALETTEENTRY apalColors[0]; } PALETTE; -extern PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565, *gppalDefault; +extern PALETTE gpalRGB, gpalBGR, gpalRGB555, gpalRGB565, *gppalMono, *gppalDefault; extern PPALETTE appalSurfaceDefault[]; #define PALETTE_UnlockPalette(pPalette) GDIOBJ_vUnlockObject((POBJ)pPalette)

12 years, 7 months

[tkreuzer] 56548: [WIN32K] - Make CreateDIBPalette handle BITMAPCOREINFO (we need to handle this, since win32k can load bitmap files, that can contain these headers) - Remove obsolete IntSetDIBColo...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 9 08:13:49 2012 New Revision: 56548 URL: http://svn.reactos.org/svn/reactos?rev=56548&view=rev Log: [WIN32K] - Make CreateDIBPalette handle BITMAPCOREINFO (we need to handle this, since win32k can load bitmap files, that can contain these headers) - Remove obsolete IntSetDIBColorTable, IntGetDIBColorTable Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed May 9 08:13:49 2012 @@ -111,13 +111,23 @@ _In_ ULONG iUsage) { PPALETTE ppal; - ULONG i, cColors; + ULONG i, cBitsPixel, cColors; + + if (pbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) + { + PBITMAPCOREINFO pbci = (PBITMAPCOREINFO)pbmi; + cBitsPixel = pbci->bmciHeader.bcBitCount; + } + else + { + cBitsPixel = pbmi->bmiHeader.biBitCount; + } /* Check if the colors are indexed */ - if (pbmi->bmiHeader.biBitCount <= 8) + if (cBitsPixel <= 8) { /* We create a "full" palette */ - cColors = 1 << pbmi->bmiHeader.biBitCount; + cColors = 1 << cBitsPixel; /* Allocate the palette */ ppal = PALETTE_AllocPalette(PAL_INDEXED, @@ -128,7 +138,8 @@ 0); /* Check if the BITMAPINFO specifies how many colors to use */ - if (pbmi->bmiHeader.biClrUsed != 0) + if ((pbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && + (pbmi->bmiHeader.biClrUsed != 0)) { /* This is how many colors we can actually process */ cColors = min(cColors, pbmi->bmiHeader.biClrUsed); @@ -179,7 +190,7 @@ // FIXME: this one is undocumented // ASSERT(FALSE); // } - else // if (iUsage == DIB_RGB_COLORS) + else if (pbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) { /* The colors are an array of RGBQUAD values */ RGBQUAD *prgb = (RGBQUAD*)((PCHAR)pbmi + pbmi->bmiHeader.biSize); @@ -197,6 +208,22 @@ PALETTE_vSetRGBColorForIndex(ppal, i, crColor); } } + else + { + /* The colors are an array of RGBTRIPLE values */ + RGBTRIPLE *prgb = (RGBTRIPLE*)((PCHAR)pbmi + pbmi->bmiHeader.biSize); + + /* Loop all color indices in the DIB */ + for (i = 0; i < cColors; i++) + { + /* Get the color value and translate it to a COLORREF */ + RGBTRIPLE rgb = prgb[i]; + COLORREF crColor = RGB(rgb.rgbtRed, rgb.rgbtGreen, rgb.rgbtBlue); + + /* Set the RGB value in the palette */ + PALETTE_vSetRGBColorForIndex(ppal, i, crColor); + } + } } else { @@ -204,7 +231,8 @@ ULONG flRedMask, flGreenMask, flBlueMask; /* Check if the DIB contains bitfield values */ - if (pbmi->bmiHeader.biCompression == BI_BITFIELDS) + if ((pbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && + (pbmi->bmiHeader.biCompression == BI_BITFIELDS)) { /* Check if we have a v4/v5 header */ if (pbmi->bmiHeader.biSize >= sizeof(BITMAPV4HEADER)) @@ -228,7 +256,7 @@ { /* Check what bit depth we have. Note: optimization flags are calculated in PALETTE_AllocPalette() */ - if (pbmi->bmiHeader.biBitCount == 16) + if (cBitsPixel == 16) { /* This is an RGB 555 palette */ flRedMask = 0x7C00; @@ -255,136 +283,6 @@ /* We're done, return the palette */ return ppal; -} - - -UINT -APIENTRY -IntSetDIBColorTable( - HDC hDC, - UINT StartIndex, - UINT Entries, - CONST RGBQUAD *Colors) -{ - PDC dc; - PSURFACE psurf; - PPALETTE PalGDI; - UINT Index; - ULONG biBitCount; - - if (!(dc = DC_LockDc(hDC))) return 0; - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - return 0; - } - - psurf = dc->dclevel.pSurface; - if (psurf == NULL) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (psurf->hSecure == NULL) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - if ((biBitCount <= 8) && (StartIndex < (1UL << biBitCount))) - { - if (StartIndex + Entries > (1UL << biBitCount)) - Entries = (1 << biBitCount) - StartIndex; - - if (psurf->ppal == NULL) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_HANDLE); - return 0; - } - - PalGDI = psurf->ppal; - - for (Index = StartIndex; - Index < StartIndex + Entries && Index < PalGDI->NumColors; - Index++) - { - PalGDI->IndexedColors[Index].peRed = Colors[Index - StartIndex].rgbRed; - PalGDI->IndexedColors[Index].peGreen = Colors[Index - StartIndex].rgbGreen; - PalGDI->IndexedColors[Index].peBlue = Colors[Index - StartIndex].rgbBlue; - } - } - else - Entries = 0; - - /* Mark the brushes invalid */ - dc->pdcattr->ulDirty_ |= DIRTY_FILL|DIRTY_LINE|DIRTY_BACKGROUND|DIRTY_TEXT; - - DC_UnlockDc(dc); - - return Entries; -} - -UINT -APIENTRY -IntGetDIBColorTable( - HDC hDC, - UINT StartIndex, - UINT Entries, - RGBQUAD *Colors) -{ - PDC dc; - PSURFACE psurf; - PPALETTE ppal; - UINT Index, Count = 0; - - if (!(dc = DC_LockDc(hDC))) return 0; - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - return 0; - } - - psurf = dc->dclevel.pSurface; - if (psurf == NULL) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (psurf->hSecure == NULL) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - ppal = psurf->ppal; - ASSERT(ppal); - - if (ppal->flFlags & PAL_INDEXED) - { - - for (Index = StartIndex; - Index < StartIndex + Entries && Index < ppal->NumColors; - Index++) - { - Colors[Index - StartIndex].rgbRed = ppal->IndexedColors[Index].peRed; - Colors[Index - StartIndex].rgbGreen = ppal->IndexedColors[Index].peGreen; - Colors[Index - StartIndex].rgbBlue = ppal->IndexedColors[Index].peBlue; - Colors[Index - StartIndex].rgbReserved = 0; - Count++; - } - } - - DC_UnlockDc(dc); - - return Count; } // Converts a DIB to a device-dependent bitmap

12 years, 7 months

[tkreuzer] 56547: [WIN32K] Mark dc brushes in GreGetSetColorTable as dirty Fixes gdi32_winetest bitmap regression

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 9 08:08:09 2012 New Revision: 56547 URL: http://svn.reactos.org/svn/reactos?rev=56547&view=rev Log: [WIN32K] Mark dc brushes in GreGetSetColorTable as dirty Fixes gdi32_winetest bitmap regression Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Wed May 9 08:08:09 2012 @@ -1044,6 +1044,10 @@ ppal->IndexedColors[i].peGreen = prgbColors->rgbGreen; ppal->IndexedColors[i].peBlue = prgbColors->rgbBlue; } + + /* Mark the dc brushes invalid */ + pdc->pdcattr->ulDirty_ |= DIRTY_FILL|DIRTY_LINE| + DIRTY_BACKGROUND|DIRTY_TEXT; } else {

12 years, 7 months

[tkreuzer] 56546: [WIN32K] - Alloca to use GDIOBJ_vReferenceObjectByPointer with exclusively locked objects - Make sure the global mono palette actually has 2 entries - Simplify allocation of defau...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 8 23:21:09 2012 New Revision: 56546 URL: http://svn.reactos.org/svn/reactos?rev=56546&view=rev Log: [WIN32K] - Alloca to use GDIOBJ_vReferenceObjectByPointer with exclusively locked objects - Make sure the global mono palette actually has 2 entries - Simplify allocation of default palette - Implement GreGetSetColorTable, replacing IntSetDIBColorTable / IntGetDIBColorTable - Make sure that memory possibly copied to user mode is zeroed. Modified: trunk/reactos/win32ss/gdi/eng/mouse.c trunk/reactos/win32ss/gdi/eng/xlate.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/palette.c trunk/reactos/win32ss/gdi/ntgdi/palette.h Modified: trunk/reactos/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mouse.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] Tue May 8 23:21:09 2012 @@ -391,7 +391,7 @@ /* Initialize an EXLATEOBJ */ ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); EXLATEOBJ_vInitialize(&exlo, - &gpalMono, + gppalMono, ppal, 0, RGB(0xff,0xff,0xff), Modified: trunk/reactos/win32ss/gdi/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/xlate.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/xlate.c [iso-8859-1] Tue May 8 23:21:09 2012 @@ -591,8 +591,8 @@ /* Normal initialisation. No surface means DEFAULT_BITMAP */ EXLATEOBJ_vInitialize(pexlo, - psurfSrc ? psurfSrc->ppal : &gpalMono, - psurfDst ? psurfDst->ppal : &gpalMono, + psurfSrc ? psurfSrc->ppal : gppalMono, + psurfDst ? psurfDst->ppal : gppalMono, pdcSrc->pdcattr->crBackgroundClr, pdcDst->pdcattr->crBackgroundClr, pdcDst->pdcattr->crForegroundClr); Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Tue May 8 23:21:09 2012 @@ -576,9 +576,6 @@ { ULONG cRefs; - /* Must not be exclusively locked */ - ASSERT(pobj->cExclusiveLock == 0); - /* Check if the object has a handle */ if (GDI_HANDLE_GET_INDEX(pobj->hHmgr)) { Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Tue May 8 23:21:09 2012 @@ -14,7 +14,7 @@ static UINT SystemPaletteUse = SYSPAL_NOSTATIC; /* The program need save the pallete and restore it */ -PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565, *gppalDefault; +PALETTE gpalRGB, gpalBGR, gpalRGB555, gpalRGB565, *gppalMono, *gppalDefault; PPALETTE appalSurfaceDefault[11]; const PALETTEENTRY g_sysPalTemplate[NB_RESERVED_COLORS] = @@ -62,30 +62,13 @@ NTAPI InitPaletteImpl() { - int i; - HPALETTE hpalette; - PLOGPALETTE palPtr; - // Create default palette (20 system colors) - palPtr = ExAllocatePoolWithTag(PagedPool, - sizeof(LOGPALETTE) + - (NB_RESERVED_COLORS * sizeof(PALETTEENTRY)), - TAG_PALETTE); - if (!palPtr) return STATUS_NO_MEMORY; - - palPtr->palVersion = 0x300; - palPtr->palNumEntries = NB_RESERVED_COLORS; - for (i=0; i<NB_RESERVED_COLORS; i++) - { - palPtr->palPalEntry[i].peRed = g_sysPalTemplate[i].peRed; - palPtr->palPalEntry[i].peGreen = g_sysPalTemplate[i].peGreen; - palPtr->palPalEntry[i].peBlue = g_sysPalTemplate[i].peBlue; - palPtr->palPalEntry[i].peFlags = 0; - } - - hpalette = GreCreatePaletteInternal(palPtr,NB_RESERVED_COLORS); - ASSERT(hpalette); - ExFreePoolWithTag(palPtr, TAG_PALETTE); + gppalDefault = PALETTE_AllocPalWithHandle(PAL_INDEXED, + 20, + (PULONG)g_sysPalTemplate, + 0, 0, 0); + GDIOBJ_vReferenceObjectByPointer(&gppalDefault->BaseObject); + PALETTE_UnlockPalette(gppalDefault); /* palette_size = visual->map_entries; */ @@ -117,14 +100,12 @@ gpalRGB565.BaseObject.ulShareCount = 1; gpalRGB565.BaseObject.BaseFlags = 0 ; - memset(&gpalMono, 0, sizeof(PALETTE)); - gpalMono.flFlags = PAL_MONOCHROME; - gpalMono.BaseObject.ulShareCount = 1; - gpalMono.BaseObject.BaseFlags = 0 ; + gppalMono = PALETTE_AllocPalette(PAL_MONOCHROME|PAL_INDEXED, 2, NULL, 0, 0, 0); + PALETTE_vSetRGBColorForIndex(gppalMono, 0, 0x000000); + PALETTE_vSetRGBColorForIndex(gppalMono, 1, 0xffffff); /* Initialize default surface palettes */ - gppalDefault = PALETTE_ShareLockPalette(hpalette); - appalSurfaceDefault[BMF_1BPP] = &gpalMono; + appalSurfaceDefault[BMF_1BPP] = gppalMono; appalSurfaceDefault[BMF_4BPP] = gppalDefault; appalSurfaceDefault[BMF_8BPP] = gppalDefault; appalSurfaceDefault[BMF_16BPP] = &gpalRGB565; @@ -160,7 +141,7 @@ ULONG fl = 0, cjSize = sizeof(PALETTE); /* Check if the palette has entries */ - if (iMode == PAL_INDEXED) + if (iMode & PAL_INDEXED) { /* Check color count */ if ((cColors == 0) || (cColors > 1024)) return NULL; @@ -1010,6 +991,82 @@ return Entries; } +ULONG +APIENTRY +GreGetSetColorTable( + HDC hdc, + ULONG iStartIndex, + ULONG cEntries, + RGBQUAD *prgbColors, + BOOL bSet) +{ + PDC pdc; + PSURFACE psurf; + PPALETTE ppal = NULL; + ULONG i, iEndIndex, iResult = 0; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + return 0; + } + + /* Get the surace from the DC */ + psurf = pdc->dclevel.pSurface; + + /* Check if we have the default surface */ + if ((psurf == NULL) && !bSet) + { + /* Use a mono palette */ + ppal = gppalMono; + } + else if (psurf->SurfObj.iType == STYPE_BITMAP) + { + /* Get the palette of the surface */ + ppal = psurf->ppal; + } + + /* Check if this is an indexed palette and the range is ok */ + if (ppal && (ppal->flFlags & PAL_INDEXED) && + (iStartIndex < ppal->NumColors)) + { + /* Calculate the end of the operation */ + iEndIndex = min(iStartIndex + cEntries, ppal->NumColors); + + /* Check what operation to perform */ + if (bSet) + { + /* Loop all colors and set the palette entries */ + for (i = iStartIndex; i < iEndIndex; i++, prgbColors++) + { + ppal->IndexedColors[i].peRed = prgbColors->rgbRed; + ppal->IndexedColors[i].peGreen = prgbColors->rgbGreen; + ppal->IndexedColors[i].peBlue = prgbColors->rgbBlue; + } + } + else + { + /* Loop all colors and get the palette entries */ + for (i = iStartIndex; i < iEndIndex; i++, prgbColors++) + { + prgbColors->rgbRed = ppal->IndexedColors[i].peRed; + prgbColors->rgbGreen = ppal->IndexedColors[i].peGreen; + prgbColors->rgbBlue = ppal->IndexedColors[i].peBlue; + prgbColors->rgbReserved = 0; + } + } + + /* Calculate how many entries were modified */ + iResult = iEndIndex - iStartIndex; + } + + /* Unlock the DC */ + DC_UnlockDc(pdc); + + return iResult; +} + W32KAPI LONG APIENTRY @@ -1051,6 +1108,11 @@ } _SEH2_END } + else + { + /* Zero it out, so we don't accidentally leak kernel data */ + RtlZeroMemory(pEntries, cEntries * sizeof(PALETTEENTRY)); + } } ret = 0; @@ -1076,12 +1138,12 @@ case GdiPalSetColorTable: if (pEntries) - ret = IntSetDIBColorTable((HDC)hObj, iStart, cEntries, (RGBQUAD*)pEntries); + ret = GreGetSetColorTable((HDC)hObj, iStart, cEntries, (RGBQUAD*)pEntries, TRUE); break; case GdiPalGetColorTable: if (pEntries) - ret = IntGetDIBColorTable((HDC)hObj, iStart, cEntries, (RGBQUAD*)pEntries); + ret = GreGetSetColorTable((HDC)hObj, iStart, cEntries, (RGBQUAD*)pEntries, FALSE); break; } Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Tue May 8 23:21:09 2012 @@ -43,7 +43,7 @@ PALETTEENTRY apalColors[0]; } PALETTE; -extern PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565, *gppalDefault; +extern PALETTE gpalRGB, gpalBGR, gpalRGB555, gpalRGB565, *gppalMono, *gppalDefault; extern PPALETTE appalSurfaceDefault[]; #define PALETTE_UnlockPalette(pPalette) GDIOBJ_vUnlockObject((POBJ)pPalette)

12 years, 7 months

[tkreuzer] 56545: [GDI32_APITEST] Add more tests for GetDIBColorTable

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 8 23:15:49 2012 New Revision: 56545 URL: http://svn.reactos.org/svn/reactos?rev=56545&view=rev Log: [GDI32_APITEST] Add more tests for GetDIBColorTable Modified: trunk/rostests/apitests/gdi32/GetDIBColorTable.c Modified: trunk/rostests/apitests/gdi32/GetDIBColorTable.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBColo… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBColorTable.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetDIBColorTable.c [iso-8859-1] Tue May 8 23:15:49 2012 @@ -30,6 +30,8 @@ cColors = GetDIBColorTable(hdc, 0, 257, (RGBQUAD*)aulColors); ok_long(cColors, 2); ok_err(0); + ok_long(aulColors[0], 0x000000); + ok_long(aulColors[1], 0xffffff); hbmp = CreateBitmap(1, 1, 1, 1, NULL); ok(hbmp != 0, "\n"); @@ -38,6 +40,8 @@ cColors = GetDIBColorTable(hdc, 0, 257, (RGBQUAD*)aulColors); ok_long(cColors, 2); ok_err(0); + ok_long(aulColors[0], 0x000000); + ok_long(aulColors[1], 0xffffff); SelectObject(hdc, hbmpOld); DeleteObject(hbmp);

12 years, 7 months

[tkreuzer] 56544: Sync with trunk r56543

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 8 18:11:09 2012 New Revision: 56544 URL: http://svn.reactos.org/svn/reactos?rev=56544&view=rev Log: Sync with trunk r56543 Added: branches/dib_rewrite/include/ddk/netioddk.h - copied unchanged from r56543, trunk/reactos/include/ddk/netioddk.h branches/dib_rewrite/include/psdk/netiodef.h - copied unchanged from r56543, trunk/reactos/include/psdk/netiodef.h branches/dib_rewrite/include/psdk/nldef.h - copied unchanged from r56543, trunk/reactos/include/psdk/nldef.h branches/dib_rewrite/lib/3rdparty/libwine/isinf.c - copied unchanged from r56543, trunk/reactos/lib/3rdparty/libwine/isinf.c branches/dib_rewrite/lib/3rdparty/libwine/isnan.c - copied unchanged from r56543, trunk/reactos/lib/3rdparty/libwine/isnan.c branches/dib_rewrite/lib/sdk/crt/oldnames-msvcrt.S - copied unchanged from r56543, trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S branches/dib_rewrite/win32ss/gdi/eng/mapping.h - copied unchanged from r56543, trunk/reactos/win32ss/gdi/eng/mapping.h Removed: branches/dib_rewrite/dll/directx/wine/wined3d/powf.c branches/dib_rewrite/dll/directx/wine/wined3d/sqrtf.c branches/dib_rewrite/importlibs/libcoldname.a branches/dib_rewrite/importlibs/libgcc.a branches/dib_rewrite/importlibs/libmingw32.a branches/dib_rewrite/importlibs/libmingwex.a branches/dib_rewrite/importlibs/libsupc++.a branches/dib_rewrite/importlibs/oldnames.lib Modified: branches/dib_rewrite/ (props changed) branches/dib_rewrite/COPYING branches/dib_rewrite/base/shell/cmd/copy.c branches/dib_rewrite/base/shell/cmd/echo.c branches/dib_rewrite/base/shell/cmd/type.c branches/dib_rewrite/boot/bootdata/hivedef_i386.inf branches/dib_rewrite/boot/bootdata/packages/reactos.dff.in branches/dib_rewrite/cmake/CMakeMacros.cmake branches/dib_rewrite/cmake/gcc.cmake branches/dib_rewrite/cmake/msvc.cmake branches/dib_rewrite/dll/cpl/powercfg/lang/it-IT.rc branches/dib_rewrite/dll/directx/wine/wined3d/CMakeLists.txt branches/dib_rewrite/dll/win32/advapi32/advapi32.spec branches/dib_rewrite/dll/win32/advapi32/sec/lsa.c branches/dib_rewrite/dll/win32/advapi32/sec/sec.c branches/dib_rewrite/dll/win32/fusion/CMakeLists.txt branches/dib_rewrite/dll/win32/jscript/CMakeLists.txt branches/dib_rewrite/dll/win32/jscript/array.c branches/dib_rewrite/dll/win32/kernel32/client/path.c branches/dib_rewrite/dll/win32/lsasrv/CMakeLists.txt branches/dib_rewrite/dll/win32/lsasrv/database.c branches/dib_rewrite/dll/win32/lsasrv/lsarpc.c branches/dib_rewrite/dll/win32/lsasrv/lsasrv.h branches/dib_rewrite/dll/win32/lsasrv/policy.c branches/dib_rewrite/dll/win32/shell32/lang/it-IT.rc branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtdev.c branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtpnp.c branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtpwr.c branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtrwr.c branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtusb.c branches/dib_rewrite/drivers/filters/mountmgr/point.c branches/dib_rewrite/drivers/network/tcpip/datalink/lan.c branches/dib_rewrite/include/crt/mingw32/intrin_x86.h branches/dib_rewrite/include/ddk/wdm.h branches/dib_rewrite/include/ndk/rtlfuncs.h branches/dib_rewrite/include/psdk/mstcpip.h branches/dib_rewrite/include/psdk/ntdef.h branches/dib_rewrite/include/psdk/ntsecapi.h branches/dib_rewrite/include/psdk/winnt.h branches/dib_rewrite/include/psdk/winuser.h branches/dib_rewrite/include/reactos/wine/config.h branches/dib_rewrite/include/reactos/wine/port.h branches/dib_rewrite/include/reactos/wine/test.h branches/dib_rewrite/include/xdk/rtlfuncs.h branches/dib_rewrite/lib/3rdparty/libwine/CMakeLists.txt branches/dib_rewrite/lib/drivers/lwip/src/include/arch/cc.h branches/dib_rewrite/lib/rtl/mem.c branches/dib_rewrite/lib/rtl/path.c branches/dib_rewrite/lib/sdk/crt/include/internal/wine/msvcrt.h branches/dib_rewrite/lib/sdk/crt/oldnames.cmake branches/dib_rewrite/ntoskrnl/cache/section/data.c branches/dib_rewrite/ntoskrnl/cache/section/newmm.h branches/dib_rewrite/ntoskrnl/include/internal/mm.h branches/dib_rewrite/ntoskrnl/mm/ARM3/expool.c branches/dib_rewrite/ntoskrnl/mm/ARM3/section.c branches/dib_rewrite/ntoskrnl/mm/ARM3/virtual.c branches/dib_rewrite/ntoskrnl/mm/i386/page.c branches/dib_rewrite/ntoskrnl/mm/rmap.c branches/dib_rewrite/ntoskrnl/mm/section.c branches/dib_rewrite/win32ss/gdi/eng/eng.h branches/dib_rewrite/win32ss/gdi/eng/engbrush.c branches/dib_rewrite/win32ss/gdi/eng/lineto.c branches/dib_rewrite/win32ss/gdi/eng/mapping.c branches/dib_rewrite/win32ss/gdi/eng/mem.c branches/dib_rewrite/win32ss/gdi/eng/mouse.c branches/dib_rewrite/win32ss/gdi/eng/pdevobj.c branches/dib_rewrite/win32ss/gdi/eng/rlecomp.c branches/dib_rewrite/win32ss/gdi/eng/surface.c branches/dib_rewrite/win32ss/gdi/eng/surface.h branches/dib_rewrite/win32ss/gdi/ntgdi/bitblt.c branches/dib_rewrite/win32ss/gdi/ntgdi/bitmaps.c branches/dib_rewrite/win32ss/gdi/ntgdi/bitmaps.h branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c branches/dib_rewrite/win32ss/gdi/ntgdi/brush.h branches/dib_rewrite/win32ss/gdi/ntgdi/coord.c branches/dib_rewrite/win32ss/gdi/ntgdi/coord.h branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c branches/dib_rewrite/win32ss/gdi/ntgdi/dcstate.c branches/dib_rewrite/win32ss/gdi/ntgdi/dib.h branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c branches/dib_rewrite/win32ss/gdi/ntgdi/drawing.c branches/dib_rewrite/win32ss/gdi/ntgdi/fillshap.c branches/dib_rewrite/win32ss/gdi/ntgdi/gdibatch.c branches/dib_rewrite/win32ss/gdi/ntgdi/gdiobj.c branches/dib_rewrite/win32ss/gdi/ntgdi/intgdi.h branches/dib_rewrite/win32ss/gdi/ntgdi/line.c branches/dib_rewrite/win32ss/gdi/ntgdi/palette.c branches/dib_rewrite/win32ss/gdi/ntgdi/palette.h branches/dib_rewrite/win32ss/gdi/ntgdi/pen.c branches/dib_rewrite/win32ss/gdi/ntgdi/region.c branches/dib_rewrite/win32ss/gdi/ntgdi/stockobj.c branches/dib_rewrite/win32ss/include/ntgdityp.h branches/dib_rewrite/win32ss/include/ntuser.h branches/dib_rewrite/win32ss/pch.h branches/dib_rewrite/win32ss/reactx/ntddraw/dxeng.c branches/dib_rewrite/win32ss/user/ntuser/caret.c branches/dib_rewrite/win32ss/user/ntuser/class.c branches/dib_rewrite/win32ss/user/ntuser/clipboard.c branches/dib_rewrite/win32ss/user/ntuser/desktop.c branches/dib_rewrite/win32ss/user/ntuser/focus.c branches/dib_rewrite/win32ss/user/ntuser/hook.c branches/dib_rewrite/win32ss/user/ntuser/keyboard.c branches/dib_rewrite/win32ss/user/ntuser/main.c branches/dib_rewrite/win32ss/user/ntuser/message.c branches/dib_rewrite/win32ss/user/ntuser/misc/file.c branches/dib_rewrite/win32ss/user/ntuser/misc/registry.c branches/dib_rewrite/win32ss/user/ntuser/msgqueue.c branches/dib_rewrite/win32ss/user/ntuser/simplecall.c branches/dib_rewrite/win32ss/user/ntuser/window.h branches/dib_rewrite/win32ss/user/user32/include/ntwrapper.h branches/dib_rewrite/win32ss/user/user32/windows/dialog.c branches/dib_rewrite/win32ss/user/user32/windows/messagebox.c branches/dib_rewrite/win32ss/win32kp.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/dib_rewrite/COPYING URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/COPYING?rev=56544&r… Modified: branches/dib_rewrite/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/base/shell/cmd/copy… Modified: branches/dib_rewrite/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/base/shell/cmd/echo… Modified: branches/dib_rewrite/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/base/shell/cmd/type… Modified: branches/dib_rewrite/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/boot/bootdata/hived… Modified: branches/dib_rewrite/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/boot/bootdata/packa… Modified: branches/dib_rewrite/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/cmake/CMakeMacros.c… Modified: branches/dib_rewrite/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/cmake/gcc.cmake?rev… Modified: branches/dib_rewrite/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/cmake/msvc.cmake?re… Modified: branches/dib_rewrite/dll/cpl/powercfg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/cpl/powercfg/la… Modified: branches/dib_rewrite/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/directx/wine/wi… Removed: branches/dib_rewrite/dll/directx/wine/wined3d/powf.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/directx/wine/wi… Removed: branches/dib_rewrite/dll/directx/wine/wined3d/sqrtf.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/directx/wine/wi… Modified: branches/dib_rewrite/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/advapi32/… Modified: branches/dib_rewrite/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/advapi32/… Modified: branches/dib_rewrite/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/advapi32/… Modified: branches/dib_rewrite/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/fusion/CM… Modified: branches/dib_rewrite/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/jscript/C… Modified: branches/dib_rewrite/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/jscript/a… Modified: branches/dib_rewrite/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/kernel32/… Modified: branches/dib_rewrite/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/lsasrv/CM… Modified: branches/dib_rewrite/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/lsasrv/da… Modified: branches/dib_rewrite/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/lsasrv/ls… Modified: branches/dib_rewrite/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/lsasrv/ls… Modified: branches/dib_rewrite/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/lsasrv/po… Modified: branches/dib_rewrite/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/shell32/l… Modified: branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtdev.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/bluetooth/f… Modified: branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtpnp.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/bluetooth/f… Modified: branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtpwr.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/bluetooth/f… Modified: branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtrwr.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/bluetooth/f… Modified: branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtusb.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/bluetooth/f… Modified: branches/dib_rewrite/drivers/filters/mountmgr/point.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/filters/mou… Modified: branches/dib_rewrite/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/network/tcp… Removed: branches/dib_rewrite/importlibs/libcoldname.a URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/libcoldn… Removed: branches/dib_rewrite/importlibs/libgcc.a URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/libgcc.a… Removed: branches/dib_rewrite/importlibs/libmingw32.a URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/libmingw… Removed: branches/dib_rewrite/importlibs/libmingwex.a URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/libmingw… Removed: branches/dib_rewrite/importlibs/libsupc++.a URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/libsupc%… Removed: branches/dib_rewrite/importlibs/oldnames.lib URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/oldnames… Modified: branches/dib_rewrite/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/crt/mingw32… Modified: branches/dib_rewrite/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/ddk/wdm.h?r… Modified: branches/dib_rewrite/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/ndk/rtlfunc… Modified: branches/dib_rewrite/include/psdk/mstcpip.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/psdk/mstcpi… Modified: branches/dib_rewrite/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/psdk/ntdef.… Modified: branches/dib_rewrite/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/psdk/ntseca… Modified: branches/dib_rewrite/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/psdk/winnt.… Modified: branches/dib_rewrite/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/psdk/winuse… Modified: branches/dib_rewrite/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/reactos/win… Modified: branches/dib_rewrite/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/reactos/win… Modified: branches/dib_rewrite/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/reactos/win… Modified: branches/dib_rewrite/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/xdk/rtlfunc… Modified: branches/dib_rewrite/lib/3rdparty/libwine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/3rdparty/libwin… Modified: branches/dib_rewrite/lib/drivers/lwip/src/include/arch/cc.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/drivers/lwip/sr… Modified: branches/dib_rewrite/lib/rtl/mem.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/rtl/mem.c?rev=5… Modified: branches/dib_rewrite/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/rtl/path.c?rev=… Modified: branches/dib_rewrite/lib/sdk/crt/include/internal/wine/msvcrt.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/sdk/crt/include… Modified: branches/dib_rewrite/lib/sdk/crt/oldnames.cmake URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/sdk/crt/oldname… Modified: branches/dib_rewrite/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/cache/sect… Modified: branches/dib_rewrite/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/cache/sect… Modified: branches/dib_rewrite/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/include/in… Modified: branches/dib_rewrite/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/ARM3/ex… Modified: branches/dib_rewrite/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/ARM3/se… Modified: branches/dib_rewrite/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/ARM3/vi… Modified: branches/dib_rewrite/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/i386/pa… Modified: branches/dib_rewrite/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/rmap.c?… Modified: branches/dib_rewrite/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/section… Modified: branches/dib_rewrite/win32ss/gdi/eng/eng.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/eng… Modified: branches/dib_rewrite/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/eng… Modified: branches/dib_rewrite/win32ss/gdi/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/lin… Modified: branches/dib_rewrite/win32ss/gdi/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/map… Modified: branches/dib_rewrite/win32ss/gdi/eng/mem.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/mem… Modified: branches/dib_rewrite/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/mou… Modified: branches/dib_rewrite/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/pde… Modified: branches/dib_rewrite/win32ss/gdi/eng/rlecomp.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/rle… Modified: branches/dib_rewrite/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/sur… Modified: branches/dib_rewrite/win32ss/gdi/eng/surface.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/sur… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/c… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/coord.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/c… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dib.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/drawing.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/f… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/gdibatch.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/g… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/g… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/i… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/l… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/p… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/p… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/pen.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/p… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/r… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/stockobj.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/s… Modified: branches/dib_rewrite/win32ss/include/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/include/ntg… Modified: branches/dib_rewrite/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/include/ntu… Modified: branches/dib_rewrite/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/pch.h?rev=5… Modified: branches/dib_rewrite/win32ss/reactx/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/reactx/ntdd… Modified: branches/dib_rewrite/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/misc/file.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/misc/registry.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/user32… Modified: branches/dib_rewrite/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/user32… Modified: branches/dib_rewrite/win32ss/user/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/user32… Modified: branches/dib_rewrite/win32ss/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/win32kp.h?r…

12 years, 7 months

[tkreuzer] 56543: [WIN32K] Fix crashes due to CreateDIBitmap tests

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 8 16:21:27 2012 New Revision: 56543 URL: http://svn.reactos.org/svn/reactos?rev=56543&view=rev Log: [WIN32K] Fix crashes due to CreateDIBitmap tests Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Tue May 8 16:21:27 2012 @@ -406,6 +406,8 @@ POINTL ptSrc; EXLATEOBJ exlo; PPALETTE ppalDIB = 0; + + if (!bmi) return 0; SourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, ScanLines, @@ -1380,6 +1382,7 @@ if(pjInit && (fInit == CBM_INIT)) { + if (cjMaxBits == 0) return NULL; safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); if(!safeBits) {

12 years, 7 months

[tkreuzer] 56542: [GDI32_APITEST] Add more tests for CreateDIBitmap and CreateDIBPatternBrushPt

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 8 15:49:04 2012 New Revision: 56542 URL: http://svn.reactos.org/svn/reactos?rev=56542&view=rev Log: [GDI32_APITEST] Add more tests for CreateDIBitmap and CreateDIBPatternBrushPt Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c trunk/rostests/apitests/gdi32/CreateDIBitmap.c Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBP… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] Tue May 8 15:49:04 2012 @@ -57,7 +57,7 @@ /* Create a DIB brush with palette indices */ hbr = CreateDIBPatternBrushPt(&PackedDIB, DIB_PAL_COLORS); - ok(hbr != 0, "CreateSolidBrush failed, skipping tests.\n"); + ok(hbr != 0, "CreateDIBPatternBrushPt failed, skipping tests.\n"); if (!hbr) return; /* Select the brush into the dc */ @@ -135,6 +135,33 @@ } +void Test_CreateDIBPatternBrushPt_RLE8() +{ + struct + { + BITMAPINFOHEADER bmiHeader; + WORD wColors[4]; + BYTE ajBuffer[20]; + } PackedDIB = + { + {sizeof(BITMAPINFOHEADER), 4, 4, 1, 8, BI_RLE8, 20, 1, 1, 4, 0}, + {0, 1, 2, 7}, + {4,0, 0,2,0,1,0,2,3,1, 2,1, 2,2, 1,3,1,0,1,2, }, + }; + HBRUSH hbr; + + HDC hdc = CreateCompatibleDC(0); + HBITMAP hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed, skipping tests.\n"); + + /* Create a DIB brush with palette indices */ + hbr = CreateDIBPatternBrushPt(&PackedDIB, DIB_PAL_COLORS); + ok(hbr != 0, "CreateDIBPatternBrushPt failed, skipping tests.\n"); + if (!hbr) return; + + +} + START_TEST(CreateDIBPatternBrush) { @@ -142,5 +169,6 @@ Test_CreateDIBPatternBrush(); Test_CreateDIBPatternBrushPt(); + Test_CreateDIBPatternBrushPt_RLE8(); } Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBi… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] Tue May 8 15:49:04 2012 @@ -8,6 +8,300 @@ #include <stdio.h> #include <wine/test.h> #include <windows.h> +#include "init.h" + +#define CBM_CREATDIB 2 + +BOOL +GetExpected( + DWORD *pdwError, + HDC hdc, + const BITMAPINFOHEADER *lpbmih, + DWORD fdwInit, + const VOID *lpbInit, + const BITMAPINFO *lpbmi, + UINT fuUsage) +{ + if (fuUsage > 2) + { + *pdwError = ERROR_INVALID_PARAMETER; + return FALSE; + } + + if (fuUsage != 0) + { + if (hdc == (HDC)-1) + { + return FALSE; + } + } + + if (fdwInit & CBM_INIT) + { + if (!lpbmih) + { + if (!lpbInit || (lpbInit == (PVOID)0xC0000000)) return FALSE; + } + else + { + if (lpbInit) + { + if (lpbInit == (PVOID)0xC0000000) return FALSE; + if (!lpbmi || (lpbmi == (PVOID)0xC0000000)) return FALSE; + if (lpbmi->bmiHeader.biSize == 0) return FALSE; + if (fuUsage == 2) return FALSE; + } + } + } + + + if (fdwInit & CBM_CREATDIB) + { + if (fuUsage == 2) return FALSE; + if ((fuUsage == DIB_PAL_COLORS) && !hdc) + { + return FALSE; + } + + if ((fdwInit & CBM_INIT)) + { + if (!lpbInit || (lpbInit == (PVOID)0xC0000000)) return FALSE; + } + + if ((!lpbmi) || (lpbmi == (PVOID)0xc0000000) || (lpbmi->bmiHeader.biSize == 0)) + { + return FALSE; + } + + return TRUE; + } + + if (lpbmih && (lpbmih != (PVOID)0xc0000000) && (lpbmih->biSize != 0)) + { + if (hdc == (HDC)-1) + { + *pdwError = ERROR_INVALID_PARAMETER; + return FALSE; + } + } + + + if ((lpbmih == NULL) || + (lpbmih == (PVOID)0xC0000000) || + (lpbmih->biSize == 0)) + { + return FALSE; + } + + if (lpbmi == (PVOID)0xc0000000) return FALSE; + + + return TRUE; +} + + +void +Test_CreateDIBitmap_Params(void) +{ + HBITMAP hbmp; + HDC hdc; + BITMAPINFO bmi = + {{sizeof(BITMAPINFOHEADER), 4, 4, 1, 8, BI_RGB, 0, 1, 1, 1, 0}, {{0,0,0,0}}}; + BITMAPINFO bmiBroken = + {{0, -2, -4, 55, 42, 21, 0, 1, 1, 1, 0}, {{0,0,0,0}}}; + BYTE ajBits[10]; + + hdc = CreateCompatibleDC(0); + ok(hdc != 0, "failed\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, ajBits, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, NULL, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, NULL, NULL, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, 0, (PVOID)0xc0000000, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(NULL, &bmi.bmiHeader, CBM_INIT, NULL, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, NULL, &bmiBroken, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(NULL, NULL, 2, NULL, &bmi, 0); + ok(hbmp != 0, "\n"); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, NULL, CBM_INIT, ajBits, &bmi, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, NULL, CBM_INIT, NULL, &bmiBroken, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, ajBits, &bmi, 2); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, ajBits, NULL, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(0xbadbad00); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, (PVOID)0xc0000000, &bmi, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(0xbadbad00); + + SetLastError(0xbadbad00); + _SEH2_TRY + { + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, 0, ajBits, (PVOID)0xc0000000, DIB_PAL_COLORS); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hbmp = (HBITMAP)-1; + } + _SEH2_END; + ok(hbmp == (HBITMAP)-1, "\n"); + ok_err(0xbadbad00); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, NULL, NULL, 5); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap((HDC)-1, &bmi.bmiHeader, CBM_INIT, NULL, &bmi, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(0xbadbad00); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &bmiBroken.bmiHeader, CBM_INIT, NULL, &bmi, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + if (1) + { + ULONG i1, i2, i3, i4, i5, i6; + HDC ahdc[3] = {0, hdc, (HDC)-1}; + PBITMAPINFOHEADER apbih[4] = {NULL, &bmi.bmiHeader, &bmiBroken.bmiHeader, (PVOID)0xC0000000}; + ULONG afInitf[12] = {0, 1, 2, 3, CBM_INIT, 4, 5, 6, 7, 8, 0x10, 0x20}; + PVOID apvBits[3] = {NULL, ajBits, (PVOID)0xc0000000}; + PBITMAPINFO apbmi[4] = {NULL, &bmi, &bmiBroken, (PVOID)0xC0000000}; + ULONG aiUsage[5] = {0, 1, 2, 3, 23}; + DWORD dwExpError; + BOOL bExpSuccess; + + for (i1 = 0; i1 < 3; i1++) + { + for (i2 = 0; i2 < 4; i2++) + { + for (i3 = 0; i3 < 8; i3++) + { + for (i4 = 0; i4 < 3; i4++) + { + for (i5 = 0; i5 < 4; i5++) + { + for (i6 = 0; i6 < 5; i6++) + { + SetLastError(0xbadbad00); + dwExpError = 0xbadbad00; + + bExpSuccess = GetExpected(&dwExpError, ahdc[i1], apbih[i2], afInitf[i3], apvBits[i4], apbmi[i5], aiUsage[i6]); + + _SEH2_TRY + { + hbmp = CreateDIBitmap(ahdc[i1], apbih[i2], afInitf[i3], apvBits[i4], apbmi[i5], aiUsage[i6]); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hbmp = (HBITMAP)0; + } + _SEH2_END; + + if (bExpSuccess) + { + ok(hbmp != 0, "Expected success for (%ld,%ld,%ld,%ld,%ld,%ld) CreateDIBitmap(%p, %p, 0x%lx, %p, %p, %ld)\n", + i1, i2, i3, i4, i5, i6, + ahdc[i1], apbih[i2], afInitf[i3], apvBits[i4], apbmi[i5], aiUsage[i6]); + } + else + { + ok(hbmp == 0, "Expected failure for (%ld,%ld,%ld,%ld,%ld,%ld) CreateDIBitmap(%p, %p, 0x%lx, %p, %p, %ld)\n", + i1, i2, i3, i4, i5, i6, + ahdc[i1], apbih[i2], afInitf[i3], apvBits[i4], apbmi[i5], aiUsage[i6]); + } + + // ok(GetLastError() == dwExpError, "Expected error %ld got %ld for (%ld,%ld,%ld,%ld,%ld,%ld) CreateDIBitmap(%p, %p, 0x%lx, %p, %p, %ld)\n", + // dwExpError, GetLastError(), i1, i2, i3, i4, i5, i6, + // ahdc[i1], apbih[i2], afInitf[i3], apvBits[i4], apbmi[i5], aiUsage[i6]); + } + } + } + } + } + } + } + + +} + +void +Test_CreateDIBitmap_DIB_PAL_COLORS(void) +{ + struct + { + BITMAPINFOHEADER bmiHeader; + WORD bmiColors[8]; + } bmibuffer; + BITMAPINFO *pbmi = (PVOID)&bmibuffer; + HBITMAP hbmp; + ULONG bits[16] = {0}; + HDC hdc; + HPALETTE hpalOld; + USHORT i; + + hdc = CreateCompatibleDC(0); + ok(hdc != 0, "failed\n"); + + /* Select a palette */ + hpalOld = SelectPalette(hdc, ghpal, FALSE); + ok(hpalOld != NULL, "error=%ld\n", GetLastError()); + + /* Initialize a BITMAPINFO */ + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = 2; + pbmi->bmiHeader.biHeight = -2; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biBitCount = 8; + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 1; + pbmi->bmiHeader.biYPelsPerMeter = 1; + pbmi->bmiHeader.biClrUsed = 8; + pbmi->bmiHeader.biClrImportant = 0; + + for( i = 0; i < 8; i++ ) + { + bmibuffer.bmiColors[i] = i; + } + + /* Create the bitmap */ + hbmp = CreateDIBitmap(hdc, &pbmi->bmiHeader, CBM_INIT, bits, pbmi, DIB_PAL_COLORS); + ok(hbmp != 0, "failed\n"); + + SelectObject(hdc, hbmp); + + +} void Test_CreateDIBitmap1(void) @@ -51,7 +345,8 @@ bmi.bmiHeader.biCompression = BI_RLE8; bmi.bmiHeader.biBitCount = 8; bmi.bmiHeader.biSizeImage = 8; - hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, rlebits, &bmi, DIB_RGB_COLORS); + bmi.bmiHeader.biClrUsed = 1; + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, rlebits, &bmi, DIB_PAL_COLORS); ok(hbmp != 0, "failed\n"); ok(GetLastError() == 0, "GetLastError() == %ld\n", GetLastError()); @@ -68,10 +363,92 @@ } - +void Test_CreateDIBitmap_RLE8() +{ + struct + { + BITMAPINFOHEADER bmiHeader; + WORD wColors[4]; + BYTE ajBuffer[20]; + } PackedDIB = + { + {sizeof(BITMAPINFOHEADER), 4, 4, 1, 8, BI_RLE8, 20, 1, 1, 4, 0}, + {0, 1, 2, 7}, + {4,0, 0,2,0,1,0,2,3,1, 2,1, 2,2, 1,3,1,0,1,2, }, + }; + HDC hdc; + HBITMAP hbmp; + + hdc = CreateCompatibleDC(0); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed.\n"); + ok_err(0xbadbad00); + DeleteObject(hbmp); + + PackedDIB.bmiHeader.biSizeImage = 2; + hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed.\n"); + ok_err(0xbadbad00); + DeleteObject(hbmp); + + PackedDIB.bmiHeader.biSizeImage = 1; + hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed.\n"); + ok_err(0xbadbad00); + DeleteObject(hbmp); + + PackedDIB.bmiHeader.biSizeImage = 0; + hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp == 0, "CreateDIBitmap succeeded, expeted failure\n"); + ok_err(0xbadbad00); + + /* Test a line that is too long */ + PackedDIB.bmiHeader.biSizeImage = 20; + PackedDIB.ajBuffer[0] = 17; + hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed\n"); + ok_err(0xbadbad00); + DeleteObject(hbmp); + + +} + +void +Test_CreateDIBitmap_CBM_CREATDIB(void) +{ + HBITMAP hbmp; + HDC hdc; + BITMAPINFO bmi = + {{sizeof(BITMAPINFOHEADER), 4, 4, 1, 8, BI_RGB, 0, 1, 1, 1, 0}, {{0,0,0,0}}}; + BYTE ajBits[10]; + BITMAP bitmap; + + hdc = CreateCompatibleDC(0); + ok(hdc != 0, "failed\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_CREATDIB, ajBits, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed.\n"); + + ok_long(GetObject(hbmp, sizeof(DIBSECTION), &bitmap), sizeof(BITMAP)); + ok_int(bitmap.bmType, 0); + ok_int(bitmap.bmWidth, 4); + ok_int(bitmap.bmHeight, 4); + ok_int(bitmap.bmWidthBytes, 4); + ok_int(bitmap.bmPlanes, 1); + ok_int(bitmap.bmBitsPixel, 8); + ok_ptr(bitmap.bmBits, 0); + +} START_TEST(CreateDIBitmap) { + InitStuff(); + Test_CreateDIBitmap_Params(); Test_CreateDIBitmap1(); -} - + Test_CreateDIBitmap_DIB_PAL_COLORS(); + Test_CreateDIBitmap_RLE8(); + Test_CreateDIBitmap_CBM_CREATDIB(); +} +

12 years, 7 months

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2012