Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[tkreuzer] 48501: [WIN32K] Fix NtGdiMaskBlt to handle patterns correctly, use SRCAND, which is more optimized, instead of DSTERASE, and set fore and background colors correctly to not destroy alpha channel. [SHELL32] Use MaskBlt to draw the shortcut overlay Finally fixes bug 5455. Forever. (I hope.)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Aug 9 23:28:19 2010 New Revision: 48501 URL: http://svn.reactos.org/svn/reactos?rev=48501&view=rev Log: [WIN32K] Fix NtGdiMaskBlt to handle patterns correctly, use SRCAND, which is more optimized, instead of DSTERASE, and set fore and background colors correctly to not destroy alpha channel. [SHELL32] Use MaskBlt to draw the shortcut overlay Finally fixes bug 5455. Forever. (I hope.) Modified: trunk/reactos/dll/win32/shell32/iconcache.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] Mon Aug 9 23:28:19 2010 @@ -175,37 +175,16 @@ if (! BitBlt(TargetDC, 0, 0, SourceBitmapInfo.bmWidth, SourceBitmapInfo.bmHeight, SourceDC, 0, 0, SRCCOPY)) goto fail; - /* Check if we can use alpha blending */ - if (ShortcutBitmapInfo.bmBitsPixel == 32) - { - /* Use alpha blending to make sure the target alpha channel stays valid */ - if (NULL == SelectObject(ShortcutDC, ShortcutIconInfo.hbmColor)) goto fail; - if (!GdiAlphaBlend(TargetDC, 0, SourceBitmapInfo.bmHeight - ShortcutBitmapInfo.bmHeight, - ShortcutBitmapInfo.bmWidth, ShortcutBitmapInfo.bmHeight, - ShortcutDC, 0, 0, ShortcutBitmapInfo.bmWidth, ShortcutBitmapInfo.bmHeight, - (BLENDFUNCTION){AC_SRC_OVER, 0, 255, AC_SRC_ALPHA})) goto fail; - } - else - { - /* Copy the source xor bitmap to the target and clear out part of it by using - the shortcut mask */ - if (! BitBlt(TargetDC, 0, SourceBitmapInfo.bmHeight - ShortcutBitmapInfo.bmHeight, - ShortcutBitmapInfo.bmWidth, ShortcutBitmapInfo.bmHeight, - ShortcutDC, 0, 0, SRCAND)) - { - goto fail; - } - - if (NULL == SelectObject(ShortcutDC, ShortcutIconInfo.hbmColor)) goto fail; - - /* Now put in the shortcut xor mask */ - if (! BitBlt(TargetDC, 0, SourceBitmapInfo.bmHeight - ShortcutBitmapInfo.bmHeight, - ShortcutBitmapInfo.bmWidth, ShortcutBitmapInfo.bmHeight, - ShortcutDC, 0, 0, SRCINVERT)) - { - goto fail; - } - } + /* Copy the source xor bitmap to the target and clear out part of it by using + the shortcut mask */ + if (NULL == SelectObject(ShortcutDC, ShortcutIconInfo.hbmColor)) goto fail; + if (!MaskBlt(TargetDC, 0, SourceBitmapInfo.bmHeight - ShortcutBitmapInfo.bmHeight, + ShortcutBitmapInfo.bmWidth, ShortcutBitmapInfo.bmHeight, + ShortcutDC, 0, 0, ShortcutIconInfo.hbmMask, 0, 0, + MAKEROP4(SRCCOPY, 0xAA0000))) + { + goto fail; + } /* Clean up, we're not goto'ing to 'fail' after this so we can be lazy and not set handles to NULL */ Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Mon Aug 9 23:28:19 2010 @@ -458,6 +458,42 @@ * A. It should be in here! */ +static const DWORD ROP3Table[256] = +{ + 0x000042, 0x010289, 0x020C89, 0x0300AA, 0x040C88, 0x0500A9, 0x060865, 0x0702C5, + 0x080F08, 0x090245, 0x0A0329, 0x0B0B2A, 0x0C0324, 0x0D0B25, 0x0E08A5, 0x0F0001, + 0x100C85, 0x1100A6, 0x120868, 0x1302C8, 0x140869, 0x1502C9, 0x165CCA, 0x171D54, + 0x180D59, 0x191CC8, 0x1A06C5, 0x1B0768, 0x1C06CA, 0x1D0766, 0x1E01A5, 0x1F0385, + 0x200F09, 0x210248, 0x220326, 0x230B24, 0x240D55, 0x251CC5, 0x2606C8, 0x271868, + 0x280369, 0x2916CA, 0x2A0CC9, 0x2B1D58, 0x2C0784, 0x2D060A, 0x2E064A, 0x2F0E2A, + 0x30032A, 0x310B28, 0x320688, 0x330008, 0x3406C4, 0x351864, 0x3601A8, 0x370388, + 0x38078A, 0x390604, 0x3A0644, 0x3B0E24, 0x3C004A, 0x3D18A4, 0x3E1B24, 0x3F00EA, + 0x400F0A, 0x410249, 0x420D5D, 0x431CC4, 0x440328, 0x450B29, 0x4606C6, 0x47076A, + 0x480368, 0x4916C5, 0x4A0789, 0x4B0605, 0x4C0CC8, 0x4D1954, 0x4E0645, 0x4F0E25, + 0x500325, 0x510B26, 0x5206C9, 0x530764, 0x5408A9, 0x550009, 0x5601A9, 0x570389, + 0x580785, 0x590609, 0x5A0049, 0x5B18A9, 0x5C0649, 0x5D0E29, 0x5E1B29, 0x5F00E9, + 0x600365, 0x6116C6, 0x620786, 0x630608, 0x640788, 0x650606, 0x660046, 0x6718A8, + 0x6858A6, 0x690145, 0x6A01E9, 0x6B178A, 0x6C01E8, 0x6D1785, 0x6E1E28, 0x6F0C65, + 0x700CC5, 0x711D5C, 0x720648, 0x730E28, 0x740646, 0x750E26, 0x761B28, 0x7700E6, + 0x7801E5, 0x791786, 0x7A1E29, 0x7B0C68, 0x7C1E24, 0x7D0C69, 0x7E0955, 0x7F03C9, + 0x8003E9, 0x810975, 0x820C49, 0x831E04, 0x840C48, 0x851E05, 0x8617A6, 0x8701C5, + 0x8800C6, 0x891B08, 0x8A0E06, 0x8B0666, 0x8C0E08, 0x8D0668, 0x8E1D7C, 0x8F0CE5, + 0x900C45, 0x911E08, 0x9217A9, 0x9301C4, 0x9417AA, 0x9501C9, 0x960169, 0x97588A, + 0x981888, 0x990066, 0x9A0709, 0x9B07A8, 0x9C0704, 0x9D07A6, 0x9E16E6, 0x9F0345, + 0xA000C9, 0xA11B05, 0xA20E09, 0xA30669, 0xA41885, 0xA50065, 0xA60706, 0xA707A5, + 0xA803A9, 0xA90189, 0xAA0029, 0xAB0889, 0xAC0744, 0xAD06E9, 0xAE0B06, 0xAF0229, + 0xB00E05, 0xB10665, 0xB21974, 0xB30CE8, 0xB4070A, 0xB507A9, 0xB616E9, 0xB70348, + 0xB8074A, 0xB906E6, 0xBA0B09, 0xBB0226, 0xBC1CE4, 0xBD0D7D, 0xBE0269, 0xBF08C9, + 0xC000CA, 0xC11B04, 0xC21884, 0xC3006A, 0xC40E04, 0xC50664, 0xC60708, 0xC707AA, + 0xC803A8, 0xC90184, 0xCA0749, 0xCB06E4, 0xCC0020, 0xCD0888, 0xCE0B08, 0xCF0224, + 0xD00E0A, 0xD1066A, 0xD20705, 0xD307A4, 0xD41D78, 0xD50CE9, 0xD616EA, 0xD70349, + 0xD80745, 0xD906E8, 0xDA1CE9, 0xDB0D75, 0xDC0B04, 0xDD0228, 0xDE0268, 0xDF08C8, + 0xE003A5, 0xE10185, 0xE20746, 0xE306EA, 0xE40748, 0xE506E5, 0xE61CE8, 0xE70D79, + 0xE81D74, 0xE95CE6, 0xEA02E9, 0xEB0849, 0xEC02E8, 0xED0848, 0xEE0086, 0xEF0A08, + 0xF00021, 0xF10885, 0xF20B05, 0xF3022A, 0xF40B0A, 0xF50225, 0xF60265, 0xF708C5, + 0xF802E5, 0xF90845, 0xFA0089, 0xFB0A09, 0xFC008A, 0xFD0A0A, 0xFE02A9, 0xFF0062, +}; + static __inline BYTE SwapROP3_SrcDst(BYTE bRop3) { @@ -468,6 +504,30 @@ #define BKGND_ROP3(ROP4) (ROP3Table[(SwapROP3_SrcDst((ROP4)>>24)) & 0xFF]) #define DSTCOPY 0x00AA0029 #define DSTERASE 0x00220326 /* dest = dest & (~src) : DSna */ + +/* NOTE: An alternative algorithm could use a pattern brush, created from + * the mask bitmap and then use raster operation 0xCA to combine the fore + * and background bitmaps. In this case erasing the bits beforehand would be + * unneccessary. On the other hand the Operation does not provide an optimized + * version in the DIB code, while SRCAND and SRCPAINT do. + * A fully correct implementation would call Eng/DrvBitBlt, but our + * EngBitBlt completely ignores the mask surface. + * + * Msk Fg Bk => x + * P S D DPSDxax + * ------------------------------------------ + * 0 0 0 0 0000xax = 000ax = 00x = 0 + * 0 0 1 1 1001xax = 101ax = 10x = 1 + * 0 1 0 0 0010xax = 001ax = 00x = 0 + * 0 1 1 1 1011xax = 100ax = 10x = 1 + * 1 0 0 0 0100xax = 010ax = 00x = 0 + * 1 0 1 0 1101xax = 111ax = 11x = 0 + * 1 1 0 1 0110xax = 011ax = 01x = 1 + * 1 1 1 1 1111xax = 110ax = 10x = 1 + * + * Operation index = 11001010 = 0xCA = PSaDPnao = DPSDxax + * ^ no, this is not random letters, its reverse Polish notation + */ BOOL APIENTRY NtGdiMaskBlt( @@ -485,187 +545,95 @@ DWORD dwRop, IN DWORD crBackColor) { - HBITMAP hOldMaskBitmap, hBitmap2, hOldBitmap2, hBitmap3, hOldBitmap3; - HDC hDCMask, hDC1, hDC2; - static const DWORD ROP3Table[256] = - { - 0x00000042, 0x00010289, - 0x00020C89, 0x000300AA, - 0x00040C88, 0x000500A9, - 0x00060865, 0x000702C5, - 0x00080F08, 0x00090245, - 0x000A0329, 0x000B0B2A, - 0x000C0324, 0x000D0B25, - 0x000E08A5, 0x000F0001, - 0x00100C85, 0x001100A6, - 0x00120868, 0x001302C8, - 0x00140869, 0x001502C9, - 0x00165CCA, 0x00171D54, - 0x00180D59, 0x00191CC8, - 0x001A06C5, 0x001B0768, - 0x001C06CA, 0x001D0766, - 0x001E01A5, 0x001F0385, - 0x00200F09, 0x00210248, - 0x00220326, 0x00230B24, - 0x00240D55, 0x00251CC5, - 0x002606C8, 0x00271868, - 0x00280369, 0x002916CA, - 0x002A0CC9, 0x002B1D58, - 0x002C0784, 0x002D060A, - 0x002E064A, 0x002F0E2A, - 0x0030032A, 0x00310B28, - 0x00320688, 0x00330008, - 0x003406C4, 0x00351864, - 0x003601A8, 0x00370388, - 0x0038078A, 0x00390604, - 0x003A0644, 0x003B0E24, - 0x003C004A, 0x003D18A4, - 0x003E1B24, 0x003F00EA, - 0x00400F0A, 0x00410249, - 0x00420D5D, 0x00431CC4, - 0x00440328, 0x00450B29, - 0x004606C6, 0x0047076A, - 0x00480368, 0x004916C5, - 0x004A0789, 0x004B0605, - 0x004C0CC8, 0x004D1954, - 0x004E0645, 0x004F0E25, - 0x00500325, 0x00510B26, - 0x005206C9, 0x00530764, - 0x005408A9, 0x00550009, - 0x005601A9, 0x00570389, - 0x00580785, 0x00590609, - 0x005A0049, 0x005B18A9, - 0x005C0649, 0x005D0E29, - 0x005E1B29, 0x005F00E9, - 0x00600365, 0x006116C6, - 0x00620786, 0x00630608, - 0x00640788, 0x00650606, - 0x00660046, 0x006718A8, - 0x006858A6, 0x00690145, - 0x006A01E9, 0x006B178A, - 0x006C01E8, 0x006D1785, - 0x006E1E28, 0x006F0C65, - 0x00700CC5, 0x00711D5C, - 0x00720648, 0x00730E28, - 0x00740646, 0x00750E26, - 0x00761B28, 0x007700E6, - 0x007801E5, 0x00791786, - 0x007A1E29, 0x007B0C68, - 0x007C1E24, 0x007D0C69, - 0x007E0955, 0x007F03C9, - 0x008003E9, 0x00810975, - 0x00820C49, 0x00831E04, - 0x00840C48, 0x00851E05, - 0x008617A6, 0x008701C5, - 0x008800C6, 0x00891B08, - 0x008A0E06, 0x008B0666, - 0x008C0E08, 0x008D0668, - 0x008E1D7C, 0x008F0CE5, - 0x00900C45, 0x00911E08, - 0x009217A9, 0x009301C4, - 0x009417AA, 0x009501C9, - 0x00960169, 0x0097588A, - 0x00981888, 0x00990066, - 0x009A0709, 0x009B07A8, - 0x009C0704, 0x009D07A6, - 0x009E16E6, 0x009F0345, - 0x00A000C9, 0x00A11B05, - 0x00A20E09, 0x00A30669, - 0x00A41885, 0x00A50065, - 0x00A60706, 0x00A707A5, - 0x00A803A9, 0x00A90189, - 0x00AA0029, 0x00AB0889, - 0x00AC0744, 0x00AD06E9, - 0x00AE0B06, 0x00AF0229, - 0x00B00E05, 0x00B10665, - 0x00B21974, 0x00B30CE8, - 0x00B4070A, 0x00B507A9, - 0x00B616E9, 0x00B70348, - 0x00B8074A, 0x00B906E6, - 0x00BA0B09, 0x00BB0226, - 0x00BC1CE4, 0x00BD0D7D, - 0x00BE0269, 0x00BF08C9, - 0x00C000CA, 0x00C11B04, - 0x00C21884, 0x00C3006A, - 0x00C40E04, 0x00C50664, - 0x00C60708, 0x00C707AA, - 0x00C803A8, 0x00C90184, - 0x00CA0749, 0x00CB06E4, - 0x00CC0020, 0x00CD0888, - 0x00CE0B08, 0x00CF0224, - 0x00D00E0A, 0x00D1066A, - 0x00D20705, 0x00D307A4, - 0x00D41D78, 0x00D50CE9, - 0x00D616EA, 0x00D70349, - 0x00D80745, 0x00D906E8, - 0x00DA1CE9, 0x00DB0D75, - 0x00DC0B04, 0x00DD0228, - 0x00DE0268, 0x00DF08C8, - 0x00E003A5, 0x00E10185, - 0x00E20746, 0x00E306EA, - 0x00E40748, 0x00E506E5, - 0x00E61CE8, 0x00E70D79, - 0x00E81D74, 0x00E95CE6, - 0x00EA02E9, 0x00EB0849, - 0x00EC02E8, 0x00ED0848, - 0x00EE0086, 0x00EF0A08, - 0x00F00021, 0x00F10885, - 0x00F20B05, 0x00F3022A, - 0x00F40B0A, 0x00F50225, - 0x00F60265, 0x00F708C5, - 0x00F802E5, 0x00F90845, - 0x00FA0089, 0x00FB0A09, - 0x00FC008A, 0x00FD0A0A, - 0x00FE02A9, 0x00FF0062, - }; + HBITMAP hbmFore, hbmBack; + HDC hdcMask, hdcFore, hdcBack; + PDC pdc; + HBRUSH hbr; + COLORREF crFore, crBack; if (!hbmMask) - return NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0, 0); - - /* 1. make mask bitmap's dc */ - hDCMask = NtGdiCreateCompatibleDC(hdcDest); - hOldMaskBitmap = (HBITMAP)NtGdiSelectBitmap(hDCMask, hbmMask); - - /* 2. make masked Background bitmap */ - - /* 2.1 make bitmap */ - hDC1 = NtGdiCreateCompatibleDC(hdcDest); - hBitmap2 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); - hOldBitmap2 = (HBITMAP)NtGdiSelectBitmap(hDC1, hBitmap2); - - /* 2.2 draw dest bitmap and mask */ - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY, 0, 0); - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, BKGND_ROP3(dwRop), 0, 0); - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, DSTERASE, 0, 0); - - /* 3. make masked Foreground bitmap */ - - /* 3.1 make bitmap */ - hDC2 = NtGdiCreateCompatibleDC(hdcDest); - hBitmap3 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); - hOldBitmap3 = (HBITMAP)NtGdiSelectBitmap(hDC2, hBitmap3); - - /* 3.2 draw src bitmap and mask */ - NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, SRCCOPY, 0, 0); - NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0,0); - NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, SRCAND, 0, 0); - - /* 4. combine both and copy the result to hdcDest */ - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDC2, 0, 0, SRCPAINT, 0, 0); - NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hDC1, 0, 0, SRCCOPY, 0, 0); - - /* 5. restore all objects */ - NtGdiSelectBitmap(hDCMask, hOldMaskBitmap); - NtGdiSelectBitmap(hDC1, hOldBitmap2); - NtGdiSelectBitmap(hDC2, hOldBitmap3); - - /* 6. delete all temp objects */ - GreDeleteObject(hBitmap2); - GreDeleteObject(hBitmap3); - - NtGdiDeleteObjectApp(hDC1); - NtGdiDeleteObjectApp(hDC2); - NtGdiDeleteObjectApp(hDCMask); + return NtGdiBitBlt(hdcDest, + nXDest, + nYDest, + nWidth, + nHeight, + hdcSrc, + nXSrc, + nYSrc, + FRGND_ROP3(dwRop), + crBackColor, + 0); + + /* Lock the dest DC */ + pdc = DC_LockDc(hdcDest); + if (!pdc) return FALSE; + + /* Get brush and colors from dest dc */ + hbr = pdc->pdcattr->hbrush; + crFore = pdc->pdcattr->crForegroundClr; + crBack = pdc->pdcattr->crBackgroundClr; + + /* Unlock the DC */ + DC_UnlockDc(pdc); + + /* 1. Create mask bitmap's dc */ + hdcMask = NtGdiCreateCompatibleDC(hdcDest); + NtGdiSelectBitmap(hdcMask, hbmMask); + + /* 2. Create masked Background bitmap */ + + /* 2.1 Create bitmap */ + hdcBack = NtGdiCreateCompatibleDC(hdcDest); + hbmBack = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); + NtGdiSelectBitmap(hdcBack, hbmBack); + + /* 2.2 Copy source bitmap */ + NtGdiSelectBrush(hdcBack, hbr); + IntGdiSetBkColor(hdcBack, crBack); + IntGdiSetTextColor(hdcBack, crFore); + NtGdiBitBlt(hdcBack, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY, 0, 0); + + /* 2.3 Do the background rop */ + NtGdiBitBlt(hdcBack, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, BKGND_ROP3(dwRop), 0, 0); + + /* 2.4 Erase the foreground pixels */ + IntGdiSetBkColor(hdcBack, 0xffffffff); + IntGdiSetTextColor(hdcBack, 0); + NtGdiBitBlt(hdcBack, 0, 0, nWidth, nHeight, hdcMask, xMask, yMask, SRCAND, 0, 0); + + /* 3. Create masked Foreground bitmap */ + + /* 3.1 Create bitmap */ + hdcFore = NtGdiCreateCompatibleDC(hdcDest); + hbmFore = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); + NtGdiSelectBitmap(hdcFore, hbmFore); + + /* 3.2 Copy the dest bitmap */ + NtGdiSelectBrush(hdcFore, hbr); + IntGdiSetBkColor(hdcFore, crBack); + IntGdiSetTextColor(hdcFore, crFore); + NtGdiBitBlt(hdcFore, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, SRCCOPY, 0, 0); + + /* 2.3 Do the foreground rop */ + NtGdiBitBlt(hdcFore, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0,0); + + /* 2.4 Erase the background pixels */ + IntGdiSetBkColor(hdcFore, 0); + IntGdiSetTextColor(hdcFore, 0xffffffff); + NtGdiBitBlt(hdcFore, 0, 0, nWidth, nHeight, hdcMask, xMask, yMask, SRCAND, 0, 0); + + /* 3. Combine the fore and background into the background bitmap */ + NtGdiBitBlt(hdcBack, 0, 0, nWidth, nHeight, hdcFore, 0, 0, SRCPAINT, 0, 0); + + /* 4. Copy the result to hdcDest */ + NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcBack, 0, 0, SRCCOPY, 0, 0); + + /* 5. delete all temp objects */ + NtGdiDeleteObjectApp(hdcBack); + NtGdiDeleteObjectApp(hdcFore); + NtGdiDeleteObjectApp(hdcMask); + GreDeleteObject(hbmFore); + GreDeleteObject(hbmBack); return TRUE; }

14 years, 1 month

[akhaldi] 48500: [PSDK] - Add some missing imm.h definitions. [IMM32] - Fix imm.h inclusion. [IPHLPAPI] - Fix tdiinfo.h inclusion.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 9 22:53:07 2010 New Revision: 48500 URL: http://svn.reactos.org/svn/reactos?rev=48500&view=rev Log: [PSDK] - Add some missing imm.h definitions. [IMM32] - Fix imm.h inclusion. [IPHLPAPI] - Fix tdiinfo.h inclusion. Added: trunk/reactos/include/reactos/wine/ddk/imm.h (with props) Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h trunk/reactos/include/psdk/imm.h Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Mon Aug 9 22:53:07 2010 @@ -32,7 +32,7 @@ #include "wine/debug.h" //#include "ntddndis.h" -#include "ddk/tdiinfo.h" +#include "tdiinfo.h" #include "tcpioctl.h" #include "tdilib.h" Modified: trunk/reactos/include/psdk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imm.h?rev=485… ============================================================================== --- trunk/reactos/include/psdk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imm.h [iso-8859-1] Mon Aug 9 22:53:07 2010 @@ -126,6 +126,149 @@ POINT ptCurrentPos; RECT rcArea; } COMPOSITIONFORM, *LPCOMPOSITIONFORM; + +typedef struct _tagINPUTCONTEXT { + HWND hWnd; + BOOL fOpen; + POINT ptStatusWndPos; + POINT ptSoftKbdPos; + DWORD fdwConversion; + DWORD fdwSentence; + union { + LOGFONTA A; + LOGFONTW W; + } lfFont; + COMPOSITIONFORM cfCompForm; + CANDIDATEFORM cfCandForm[4]; + HIMCC hCompStr; + HIMCC hCandInfo; + HIMCC hGuideLine; + HIMCC hPrivate; + DWORD dwNumMsgBuf; + HIMCC hMsgBuf; + DWORD fdwInit; + DWORD dwReserve[3]; +} INPUTCONTEXT, *LPINPUTCONTEXT; + +typedef struct _tagIMEINFO { + DWORD dwPrivateDataSize; + DWORD fdwProperty; + DWORD fdwConversionCaps; + DWORD fdwSentenceCaps; + DWORD fdwUICaps; + DWORD fdwSCSCaps; + DWORD fdwSelectCaps; +} IMEINFO, *LPIMEINFO; + +typedef struct tagCOMPOSITIONSTRING { + DWORD dwSize; + DWORD dwCompReadAttrLen; + DWORD dwCompReadAttrOffset; + DWORD dwCompReadClauseLen; + DWORD dwCompReadClauseOffset; + DWORD dwCompReadStrLen; + DWORD dwCompReadStrOffset; + DWORD dwCompAttrLen; + DWORD dwCompAttrOffset; + DWORD dwCompClauseLen; + DWORD dwCompClauseOffset; + DWORD dwCompStrLen; + DWORD dwCompStrOffset; + DWORD dwCursorPos; + DWORD dwDeltaStart; + DWORD dwResultReadClauseLen; + DWORD dwResultReadClauseOffset; + DWORD dwResultReadStrLen; + DWORD dwResultReadStrOffset; + DWORD dwResultClauseLen; + DWORD dwResultClauseOffset; + DWORD dwResultStrLen; + DWORD dwResultStrOffset; + DWORD dwPrivateSize; + DWORD dwPrivateOffset; +} COMPOSITIONSTRING, *LPCOMPOSITIONSTRING; + +typedef struct tagGUIDELINE { + DWORD dwSize; + DWORD dwLevel; + DWORD dwIndex; + DWORD dwStrLen; + DWORD dwStrOffset; + DWORD dwPrivateSize; + DWORD dwPrivateOffset; +} GUIDELINE, *LPGUIDELINE; + +typedef struct tagCANDIDATEINFO { + DWORD dwSize; + DWORD dwCount; + DWORD dwOffset[32]; + DWORD dwPrivateSize; + DWORD dwPrivateOffset; +} CANDIDATEINFO, *LPCANDIDATEINFO; + +#define IMMGWL_IMC 0 +#define IMMGWL_PRIVATE (sizeof(LONG)) + +/* IME Property bits */ +#define IME_PROP_END_UNLOAD 0x0001 +#define IME_PROP_KBD_CHAR_FIRST 0x0002 +#define IME_PROP_IGNORE_UPKEYS 0x0004 +#define IME_PROP_NEED_ALTKEY 0x0008 +#define IME_PROP_NO_KEYS_ON_CLOSE 0x0010 + +/* for NI_CONTEXTUPDATED */ +#define IMC_SETCONVERSIONMODE 0x0002 +#define IMC_SETSENTENCEMODE 0x0004 +#define IMC_SETOPENSTATUS 0x0006 + +/* dwAction for ImmNotifyIME */ +#define NI_CONTEXTUPDATED 0x0003 +#define NI_OPENCANDIDATE 0x0010 +#define NI_CLOSECANDIDATE 0x0011 +#define NI_SELECTCANDIDATESTR 0x0012 +#define NI_CHANGECANDIDATELIST 0x0013 +#define NI_FINALIZECONVERSIONRESULT 0x0014 +#define NI_COMPOSITIONSTR 0x0015 +#define NI_SETCANDIDATE_PAGESTART 0x0016 +#define NI_SETCANDIDATE_PAGESIZE 0x0017 +#define NI_IMEMENUSELECTED 0x0018 + +LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); +BOOL WINAPI ImmUnlockIMC(HIMC); +DWORD WINAPI ImmGetIMCLockCount(HIMC); +HIMCC WINAPI ImmCreateIMCC(DWORD); +HIMCC WINAPI ImmDestroyIMCC(HIMCC); +LPVOID WINAPI ImmLockIMCC(HIMCC); +BOOL WINAPI ImmUnlockIMCC(HIMCC); +DWORD WINAPI ImmGetIMCCLockCount(HIMCC); +HIMCC WINAPI ImmReSizeIMCC(HIMCC, DWORD); +DWORD WINAPI ImmGetIMCCSize(HIMCC); + +BOOL WINAPI ImmGenerateMessage(HIMC); +LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); +LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM); +#define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage); +BOOL WINAPI ImmTranslateMessage(HWND, UINT, WPARAM, LPARAM); +HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); +BOOL WINAPI ImmDestroySoftKeyboard(HWND); +BOOL WINAPI ImmShowSoftKeyboard(HWND, int); + +BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); +BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); +DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT); +BOOL WINAPI ImeDestroy(UINT); +LRESULT WINAPI ImeEscape(HIMC, UINT, LPVOID); +BOOL WINAPI ImeProcessKey(HIMC, UINT, LPARAM, CONST LPBYTE); +BOOL WINAPI ImeSelect(HIMC, BOOL); +BOOL WINAPI ImeSetActiveContext(HIMC, BOOL); +UINT WINAPI ImeToAsciiEx(UINT, UINT, CONST LPBYTE, LPDWORD, UINT, HIMC); +BOOL WINAPI NotifyIME(HIMC, DWORD, DWORD, DWORD); +BOOL WINAPI ImeRegisterWord(LPCWSTR, DWORD, LPCWSTR); +BOOL WINAPI ImeUnregisterWord(LPCWSTR, DWORD, LPCWSTR); +UINT WINAPI ImeGetRegisterWordStyle(UINT, LPSTYLEBUFW); +UINT WINAPI ImeEnumRegisterWord(REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID); +BOOL WINAPI ImeSetCompositionString(HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD); +DWORD WINAPI ImeGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMENUITEMINFOW, DWORD); /* wParam for WM_IME_CONTROL */ #define IMC_GETCANDIDATEPOS 0x0007 Added: trunk/reactos/include/reactos/wine/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/ddk/i… ============================================================================== --- trunk/reactos/include/reactos/wine/ddk/imm.h (added) +++ trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] Mon Aug 9 22:53:07 2010 @@ -1,0 +1,2 @@ + +#include <psdk/imm.h> Propchange: trunk/reactos/include/reactos/wine/ddk/imm.h ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 1 month

[akhaldi] 48499: [DDK] - Move several headers to PSDK where they belong. [PSDK] - ddrawi.h : Fix pUnkOuter.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 9 22:20:05 2010 New Revision: 48499 URL: http://svn.reactos.org/svn/reactos?rev=48499&view=rev Log: [DDK] - Move several headers to PSDK where they belong. [PSDK] - ddrawi.h : Fix pUnkOuter. Added: trunk/reactos/include/psdk/dmksctrl.h - copied unchanged from r48498, trunk/reactos/include/ddk/dmksctrl.h trunk/reactos/include/psdk/driverspecs.h - copied unchanged from r48498, trunk/reactos/include/ddk/driverspecs.h trunk/reactos/include/psdk/dvp.h - copied unchanged from r48498, trunk/reactos/include/ddk/dvp.h trunk/reactos/include/psdk/hidpi.h - copied unchanged from r48498, trunk/reactos/include/ddk/hidpi.h trunk/reactos/include/psdk/hidusage.h - copied unchanged from r48498, trunk/reactos/include/ddk/hidusage.h trunk/reactos/include/psdk/ieverp.h - copied unchanged from r48498, trunk/reactos/include/ddk/ieverp.h trunk/reactos/include/psdk/ntdd1394.h - copied unchanged from r48498, trunk/reactos/include/ddk/ntdd1394.h trunk/reactos/include/psdk/ntdd8042.h - copied unchanged from r48498, trunk/reactos/include/ddk/ntdd8042.h trunk/reactos/include/psdk/ntddbeep.h - copied unchanged from r48498, trunk/reactos/include/ddk/ntddbeep.h trunk/reactos/include/psdk/ntddcdrm.h - copied unchanged from r48498, trunk/reactos/include/ddk/ntddcdrm.h trunk/reactos/include/psdk/ntddcdvd.h - copied unchanged from r48498, trunk/reactos/include/ddk/ntddcdvd.h trunk/reactos/include/psdk/ntdddisk.h - copied unchanged from r48498, trunk/reactos/include/ddk/ntdddisk.h trunk/reactos/include/psdk/ntddft.h - copied unchanged from r48498, trunk/reactos/include/ddk/ntddft.h trunk/reactos/include/psdk/ntddpar.h - copied unchanged from r48498, trunk/reactos/include/ddk/ntddpar.h trunk/reactos/include/psdk/ntddser.h - copied unchanged from r48498, trunk/reactos/include/ddk/ntddser.h trunk/reactos/include/psdk/warning.h - copied unchanged from r48498, trunk/reactos/include/ddk/warning.h Removed: trunk/reactos/include/ddk/dmksctrl.h trunk/reactos/include/ddk/driverspecs.h trunk/reactos/include/ddk/dvp.h trunk/reactos/include/ddk/hidpi.h trunk/reactos/include/ddk/hidusage.h trunk/reactos/include/ddk/ieverp.h trunk/reactos/include/ddk/imm.h trunk/reactos/include/ddk/isguids.h trunk/reactos/include/ddk/ntdd1394.h trunk/reactos/include/ddk/ntdd8042.h trunk/reactos/include/ddk/ntddbeep.h trunk/reactos/include/ddk/ntddcdrm.h trunk/reactos/include/ddk/ntddcdvd.h trunk/reactos/include/ddk/ntdddisk.h trunk/reactos/include/ddk/ntddft.h trunk/reactos/include/ddk/ntddpar.h trunk/reactos/include/ddk/ntddser.h trunk/reactos/include/ddk/warning.h Modified: trunk/reactos/include/psdk/ddrawi.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/include/ddk/dmksctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmksctrl.h?rev… Removed: trunk/reactos/include/ddk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/driverspecs.h?… Removed: trunk/reactos/include/ddk/dvp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dvp.h?rev=4849… Removed: trunk/reactos/include/ddk/hidpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidpi.h?rev=48… Removed: trunk/reactos/include/ddk/hidusage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidusage.h?rev… Removed: trunk/reactos/include/ddk/ieverp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ieverp.h?rev=4… Removed: trunk/reactos/include/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/imm.h?rev=4849… Removed: trunk/reactos/include/ddk/isguids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/isguids.h?rev=… Removed: trunk/reactos/include/ddk/ntdd1394.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdd1394.h?rev… Removed: trunk/reactos/include/ddk/ntdd8042.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdd8042.h?rev… Removed: trunk/reactos/include/ddk/ntddbeep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddbeep.h?rev… Removed: trunk/reactos/include/ddk/ntddcdrm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddcdrm.h?rev… Removed: trunk/reactos/include/ddk/ntddcdvd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddcdvd.h?rev… Removed: trunk/reactos/include/ddk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdddisk.h?rev… Removed: trunk/reactos/include/ddk/ntddft.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddft.h?rev=4… Removed: trunk/reactos/include/ddk/ntddpar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddpar.h?rev=… Removed: trunk/reactos/include/ddk/ntddser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddser.h?rev=… Removed: trunk/reactos/include/ddk/warning.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/warning.h?rev=… Modified: trunk/reactos/include/psdk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawi.h?rev=…

14 years, 1 month

[fireball] 48498: [FASTFAT_NEW] - Implement opening an existing DCB. - Add a bunch of useful macros and helper functions and use them throughout the code. - Implement in-memory setendoffile set information class. On-disk to be done. - Implement user fs ctrl wrapper with stubs. - Fill up QueryVolumeInfo with classes it should handle. Silence up a warning about classes it should reject.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Aug 9 21:33:17 2010 New Revision: 48498 URL: http://svn.reactos.org/svn/reactos?rev=48498&view=rev Log: [FASTFAT_NEW] - Implement opening an existing DCB. - Add a bunch of useful macros and helper functions and use them throughout the code. - Implement in-memory setendoffile set information class. On-disk to be done. - Implement user fs ctrl wrapper with stubs. - Fill up QueryVolumeInfo with classes it should handle. Silence up a warning about classes it should reject. Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/finfo.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c trunk/reactos/drivers/filesystems/fastfat_new/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -188,9 +188,98 @@ IN BOOLEAN DeleteOnClose) { IO_STATUS_BLOCK Iosb = {{0}}; - - Iosb.Status = STATUS_NOT_IMPLEMENTED; - UNIMPLEMENTED; + PCCB Ccb; + + /* Exclusively lock this FCB */ + FatAcquireExclusiveFcb(IrpContext, Dcb); + + /* Check if it's a delete-on-close of a root DCB */ + if (FatNodeType(Dcb) == FAT_NTC_ROOT_DCB && DeleteOnClose) + { + Iosb.Status = STATUS_CANNOT_DELETE; + + /* Release the lock and return */ + FatReleaseFcb(IrpContext, Dcb); + return Iosb; + } + + /*if (NoEaKnowledge && NodeType(Dcb) != FAT_NTC_ROOT_DCB && + !FatIsFat32(Vcb)) + { + UNIMPLEMENTED; + }*/ + + /* Check the create disposition and desired access */ + if ((CreateDisposition != FILE_OPEN) && + (CreateDisposition != FILE_OPEN_IF)) + { + Iosb.Status = STATUS_OBJECT_NAME_COLLISION; + + /* Release the lock and return */ + FatReleaseFcb(IrpContext, Dcb); + return Iosb; + } + +#if 0 + if (!FatCheckFileAccess(IrpContext, + Dcb->DirentFatFlags, + DesiredAccess)) + { + Iosb.Status = STATUS_ACCESS_DENIED; + try_return( Iosb ); + } +#endif + + /* If it's already opened - check share access */ + if (Dcb->OpenCount > 0) + { + Iosb.Status = IoCheckShareAccess(*DesiredAccess, + ShareAccess, + FileObject, + &Dcb->ShareAccess, + TRUE); + + if (!NT_SUCCESS(Iosb.Status)) + { + /* Release the lock and return */ + FatReleaseFcb(IrpContext, Dcb); + return Iosb; + } + } + else + { + IoSetShareAccess(*DesiredAccess, + ShareAccess, + FileObject, + &Dcb->ShareAccess); + } + + /* Set the file object */ + Ccb = FatCreateCcb(IrpContext); + FatSetFileObject(FileObject, + UserDirectoryOpen, + Dcb, + Ccb); + + /* Increase counters */ + Dcb->UncleanCount++; + Dcb->OpenCount++; + Vcb->OpenFileCount++; + if (IsFileObjectReadOnly(FileObject)) Vcb->ReadOnlyCount++; + + /* Set delete on close */ + if (DeleteOnClose) + SetFlag(Ccb->Flags, CCB_DELETE_ON_CLOSE); + + /* Clear delay close flag */ + ClearFlag(Dcb->State, FCB_STATE_DELAY_CLOSE); + + /* That's it */ + Iosb.Status = STATUS_SUCCESS; + Iosb.Information = FILE_OPENED; + + /* Release the lock */ + FatReleaseFcb(IrpContext, Dcb); return Iosb; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -524,4 +524,32 @@ return FALSE; } +VOID +NTAPI +FatNotifyReportChange(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb, + IN PFCB Fcb, + IN ULONG Filter, + IN ULONG Action) +{ + if (Fcb->FullFileName.Buffer == NULL) + FatSetFullFileNameInFcb(IrpContext, Fcb); + + ASSERT(Fcb->FullFileName.Length != 0 ); + ASSERT(Fcb->FileNameLength != 0 ); + ASSERT(Fcb->FullFileName.Length > Fcb->FileNameLength ); + ASSERT(Fcb->FullFileName.Buffer[(Fcb->FullFileName.Length - Fcb->FileNameLength)/sizeof(WCHAR) - 1] == L'\\' ); + + FsRtlNotifyFullReportChange(Vcb->NotifySync, + &Vcb->NotifyList, + (PSTRING)&Fcb->FullFileName, + (USHORT)(Fcb->FullFileName.Length - + Fcb->FileNameLength), + NULL, + NULL, + Filter, + Action, + NULL); +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -51,6 +51,18 @@ ) #define IsFileObjectReadOnly(FO) (!((FO)->WriteAccess | (FO)->DeleteAccess)) +#define IsFileDeleted(FCB) (FlagOn((FCB)->State, FCB_STATE_DELETE_ON_CLOSE) && ((FCB)->UncleanCount == 0)) + +BOOLEAN +FORCEINLINE +FatIsIoRangeValid(IN LARGE_INTEGER Start, IN ULONG Length) +{ + /* Check if it's more than 32bits, or if the length causes 32bit overflow. + FAT-specific! */ + + return !(Start.HighPart || Start.LowPart + Length < Start.LowPart); +} + NTSYSAPI NTSTATUS @@ -229,6 +241,13 @@ BOOLEAN NTAPI FatIsTopLevelIrp(IN PIRP Irp); + +VOID NTAPI +FatNotifyReportChange(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb, + IN PFCB Fcb, + IN ULONG Filter, + IN ULONG Action); /* --------------------------------------------------------- fullfat.c */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -263,11 +263,7 @@ FsRtlEnterFileSystem(); /* Set Top Level IRP if not set */ - if (IoGetTopLevelIrp() == NULL) - { - IoSetTopLevelIrp(Irp); - TopLevel = TRUE; - } + TopLevel = FatIsTopLevelIrp(Irp); /* Build an irp context */ IrpContext = FatBuildIrpContext(Irp, CanWait); @@ -286,10 +282,392 @@ NTSTATUS NTAPI +FatSetEndOfFileInfo(IN PFAT_IRP_CONTEXT IrpContext, + IN PIRP Irp, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB Fcb) +{ + PFILE_END_OF_FILE_INFORMATION Buffer; + ULONG NewFileSize; + ULONG InitialFileSize; + ULONG InitialValidDataLength; + //ULONG InitialValidDataToDisk; + BOOLEAN CacheMapInitialized = FALSE; + BOOLEAN ResourceAcquired = FALSE; + NTSTATUS Status; + + Buffer = Irp->AssociatedIrp.SystemBuffer; + + if (FatNodeType(Fcb) != FAT_NTC_FCB) + { + /* Trying to change size of a dir */ + Status = STATUS_INVALID_DEVICE_REQUEST; + return Status; + } + + /* Validate new size */ + if (!FatIsIoRangeValid(Buffer->EndOfFile, 0)) + { + Status = STATUS_DISK_FULL; + return Status; + } + + NewFileSize = Buffer->EndOfFile.LowPart; + + /* Lookup allocation size if needed */ + if (Fcb->Header.AllocationSize.QuadPart == (LONGLONG)-1) + UNIMPLEMENTED;//FatLookupFileAllocationSize(IrpContext, Fcb); + + /* Cache the file if there is a data section */ + if (FileObject->SectionObjectPointer->DataSectionObject && + (FileObject->SectionObjectPointer->SharedCacheMap == NULL) && + !FlagOn(Irp->Flags, IRP_PAGING_IO)) + { + if (FlagOn(FileObject->Flags, FO_CLEANUP_COMPLETE)) + { + /* This is a really weird condition */ + UNIMPLEMENTED; + //Raise(STATUS_FILE_CLOSED); + } + + /* Initialize the cache map */ + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)&Fcb->Header.AllocationSize, + FALSE, + &FatGlobalData.CacheMgrCallbacks, + Fcb); + + CacheMapInitialized = TRUE; + } + + /* Lazy write case */ + if (IoGetCurrentIrpStackLocation(Irp)->Parameters.SetFile.AdvanceOnly) + { + if (!IsFileDeleted(Fcb) && + (Fcb->Condition == FcbGood)) + { + /* Clamp the new file size */ + if (NewFileSize >= Fcb->Header.FileSize.LowPart) + NewFileSize = Fcb->Header.FileSize.LowPart; + + ASSERT(NewFileSize <= Fcb->Header.AllocationSize.LowPart); + + /* Never reduce the file size here! */ + + // TODO: Actually change file size + DPRINT1("Actually changing file size is missing\n"); + + /* Notify about file size change */ + FatNotifyReportChange(IrpContext, + Vcb, + Fcb, + FILE_NOTIFY_CHANGE_SIZE, + FILE_ACTION_MODIFIED); + } + else + { + DPRINT1("Cannot set size on deleted file\n"); + } + + Status = STATUS_SUCCESS; + return Status; + } + + if ( NewFileSize > Fcb->Header.AllocationSize.LowPart ) + { + // TODO: Increase file size + DPRINT1("Actually changing file size is missing\n"); + } + + if (Fcb->Header.FileSize.LowPart != NewFileSize) + { + if (NewFileSize < Fcb->Header.FileSize.LowPart) + { + if (!MmCanFileBeTruncated(FileObject->SectionObjectPointer, + &Buffer->EndOfFile)) + { + Status = STATUS_USER_MAPPED_FILE; + + /* Free up resources if necessary */ + if (CacheMapInitialized) + CcUninitializeCacheMap(FileObject, NULL, NULL); + + return Status; + } + + ResourceAcquired = ExAcquireResourceExclusiveLite(Fcb->Header.PagingIoResource, TRUE); + } + + /* Set new file sizes */ + InitialFileSize = Fcb->Header.FileSize.LowPart; + InitialValidDataLength = Fcb->Header.ValidDataLength.LowPart; + //InitialValidDataToDisk = Fcb->ValidDataToDisk; + + Fcb->Header.FileSize.LowPart = NewFileSize; + + /* Adjust valid data length if new size is less than that */ + if (Fcb->Header.ValidDataLength.LowPart > NewFileSize) + Fcb->Header.ValidDataLength.LowPart = NewFileSize; + + //if (Fcb->ValidDataToDisk > NewFileSize) + // Fcb->ValidDataToDisk = NewFileSize; + + DPRINT1("New file size is 0x%08lx\n", NewFileSize); + + /* Update cache mapping */ + CcSetFileSizes(FileObject, + (PCC_FILE_SIZES)&Fcb->Header.AllocationSize); + + /* Notify about size change */ + FatNotifyReportChange(IrpContext, + Vcb, + Fcb, + FILE_NOTIFY_CHANGE_SIZE, + FILE_ACTION_MODIFIED); + + /* Set truncate on close flag */ + SetFlag(Fcb->State, FCB_STATE_TRUNCATE_ON_CLOSE); + } + + /* Set modified flag */ + FileObject->Flags |= FO_FILE_MODIFIED; + + /* Free up resources if necessary */ + if (CacheMapInitialized) + CcUninitializeCacheMap(FileObject, NULL, NULL); + + if (ResourceAcquired) + ExReleaseResourceLite(Fcb->Header.PagingIoResource); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +FatiSetInformation(IN PFAT_IRP_CONTEXT IrpContext, + IN PIRP Irp) +{ + PFILE_OBJECT FileObject; + PIO_STACK_LOCATION IrpSp; + FILE_INFORMATION_CLASS InfoClass; + TYPE_OF_OPEN TypeOfOpen; + PVCB Vcb; + PFCB Fcb; + PCCB Ccb; + LONG Length; + PVOID Buffer; + NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN VcbAcquired = FALSE, FcbAcquired = FALSE; + + /* Get IRP stack location */ + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Get the file object */ + FileObject = IrpSp->FileObject; + + /* Copy variables to something with shorter names */ + InfoClass = IrpSp->Parameters.SetFile.FileInformationClass; + Length = IrpSp->Parameters.SetFile.Length; + Buffer = Irp->AssociatedIrp.SystemBuffer; + + DPRINT("FatiSetInformation\n", 0); + DPRINT("\tIrp = %08lx\n", Irp); + DPRINT("\tLength = %08lx\n", Length); + DPRINT("\tFileInformationClass = %08lx\n", InfoClass); + DPRINT("\tFileObject = %08lx\n", IrpSp->Parameters.SetFile.FileObject); + DPRINT("\tBuffer = %08lx\n", Buffer); + + TypeOfOpen = FatDecodeFileObject(FileObject, &Vcb, &Fcb, &Ccb); + + DPRINT("Vcb %p, Fcb %p, Ccb %p, open type %d\n", Vcb, Fcb, Ccb, TypeOfOpen); + + switch (TypeOfOpen) + { + case UserVolumeOpen: + Status = STATUS_INVALID_PARAMETER; + /* Complete request and return status */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; + case UserFileOpen: + /* Check oplocks */ + if (!FlagOn(Fcb->State, FCB_STATE_PAGEFILE) && + ((InfoClass == FileEndOfFileInformation) || + (InfoClass == FileAllocationInformation))) + { + Status = FsRtlCheckOplock(&Fcb->Fcb.Oplock, + Irp, + IrpContext, + NULL, + NULL); + + if (Status != STATUS_SUCCESS) + { + /* Complete request and return status */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; + } + + /* Update Fast IO flag */ + Fcb->Header.IsFastIoPossible = FatIsFastIoPossible(Fcb); + } + break; + + case UserDirectoryOpen: + break; + + default: + Status = STATUS_INVALID_PARAMETER; + /* Complete request and return status */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; + } + + /* If it's a root DCB - fail */ + if (FatNodeType(Fcb) == FAT_NTC_ROOT_DCB) + { + if (InfoClass == FileDispositionInformation) + Status = STATUS_CANNOT_DELETE; + else + Status = STATUS_INVALID_PARAMETER; + + /* Complete request and return status */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; + } + + /* Acquire the volume lock if needed */ + if (InfoClass == FileDispositionInformation || + InfoClass == FileRenameInformation) + { + if (!FatAcquireExclusiveVcb(IrpContext, Vcb)) + { + UNIMPLEMENTED; + } + + VcbAcquired = TRUE; + } + + /* Acquire FCB lock */ + if (!FlagOn(Fcb->State, FCB_STATE_PAGEFILE)) + { + if (!FatAcquireExclusiveFcb(IrpContext, Fcb)) + { + UNIMPLEMENTED; + } + + FcbAcquired = TRUE; + } + + // TODO: VerifyFcb + + switch (InfoClass) + { + case FileBasicInformation: + //Status = FatSetBasicInfo(IrpContext, Irp, Fcb, Ccb); + DPRINT1("FileBasicInformation\n"); + break; + + case FileDispositionInformation: + if (FlagOn(Vcb->State, VCB_STATE_FLAG_DEFERRED_FLUSH) && + !FlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)) + { + UNIMPLEMENTED; + } + else + { + //Status = FatSetDispositionInfo(IrpContext, Irp, FileObject, Fcb); + DPRINT1("FileDispositionInformation\n"); + } + + break; + + case FileRenameInformation: + if (!FlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)) + { + UNIMPLEMENTED; + } + else + { + //Status = FatSetRenameInfo(IrpContext, Irp, Vcb, Fcb, Ccb); + DPRINT1("FileRenameInformation\n"); + + /* NOTE: Request must not be completed here! + That's why Irp/IrpContext are set to NULL */ + if (Status == STATUS_PENDING) + { + Irp = NULL; + IrpContext = NULL; + } + } + break; + + case FilePositionInformation: + //Status = FatSetPositionInfo(IrpContext, Irp, FileObject); + DPRINT1("FilePositionInformation\n"); + break; + + case FileLinkInformation: + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + + case FileAllocationInformation: + //Status = FatSetAllocationInfo(IrpContext, Irp, Fcb, FileObject); + DPRINT1("FileAllocationInformation\n"); + break; + + case FileEndOfFileInformation: + Status = FatSetEndOfFileInfo(IrpContext, Irp, FileObject, Vcb, Fcb); + break; + + default: + Status = STATUS_INVALID_PARAMETER; + } + + /* Release locks */ + if (FcbAcquired) FatReleaseFcb(IrpContext, Fcb); + if (VcbAcquired) FatReleaseVcb(IrpContext, Vcb); + + /* Complete request and return status */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; +} + +NTSTATUS +NTAPI FatSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("FatSetInformation()\n"); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + BOOLEAN TopLevel, CanWait; + PFAT_IRP_CONTEXT IrpContext; + + CanWait = TRUE; + TopLevel = FALSE; + Status = STATUS_INVALID_DEVICE_REQUEST; + + /* Get CanWait flag */ + if (IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL) + CanWait = IoIsOperationSynchronous(Irp); + + /* Enter FsRtl critical region */ + FsRtlEnterFileSystem(); + + /* Set Top Level IRP if not set */ + TopLevel = FatIsTopLevelIrp(Irp); + + /* Build an irp context */ + IrpContext = FatBuildIrpContext(Irp, CanWait); + + /* Perform the actual read */ + Status = FatiSetInformation(IrpContext, Irp); + + /* Restore top level Irp */ + if (TopLevel) IoSetTopLevelIrp(NULL); + + /* Leave FsRtl critical region */ + FsRtlExitFileSystem(); + + return Status; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -15,11 +15,179 @@ NTSTATUS NTAPI +FatOplockRequest(IN PFAT_IRP_CONTEXT IrpContext, + IN PIRP Irp) +{ + NTSTATUS Status; + DPRINT1("Oplock request!\n"); + + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + + return Status; +} + +NTSTATUS +NTAPI +FatMarkVolumeDirty(IN PFAT_IRP_CONTEXT IrpContext, + IN PIRP Irp) +{ + NTSTATUS Status; + DPRINT1("Marking volume as dirty\n"); + + Status = STATUS_SUCCESS; + FatCompleteRequest(IrpContext, Irp, Status); + + return Status; +} + +NTSTATUS +NTAPI FatUserFsCtrl(PFAT_IRP_CONTEXT IrpContext, PIRP Irp) { - DPRINT1("FatUserFsCtrl()\n"); - FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_DEVICE_REQUEST); - return STATUS_INVALID_DEVICE_REQUEST; + PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; + ULONG Code; + + /* Get current IRP stack location */ + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + Code = IrpSp->Parameters.FileSystemControl.FsControlCode; + + /* Set the wait flag */ + if (Irp->RequestorMode != KernelMode && + (Code & 3) == METHOD_NEITHER) + { + SetFlag(IrpContext->Flags, IRPCONTEXT_CANWAIT); + } + + /* Branch according to the code */ + switch (Code) + { + case FSCTL_REQUEST_OPLOCK_LEVEL_1: + case FSCTL_REQUEST_OPLOCK_LEVEL_2: + case FSCTL_REQUEST_BATCH_OPLOCK: + case FSCTL_OPLOCK_BREAK_ACKNOWLEDGE: + case FSCTL_OPBATCH_ACK_CLOSE_PENDING: + case FSCTL_OPLOCK_BREAK_NOTIFY: + case FSCTL_OPLOCK_BREAK_ACK_NO_2: + case FSCTL_REQUEST_FILTER_OPLOCK : + Status = FatOplockRequest(IrpContext, Irp); + break; + + case FSCTL_LOCK_VOLUME: + //Status = FatLockVolume( IrpContext, Irp ); + DPRINT1("FSCTL_LOCK_VOLUME\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_UNLOCK_VOLUME: + //Status = FatUnlockVolume( IrpContext, Irp ); + DPRINT1("FSCTL_UNLOCK_VOLUME\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_DISMOUNT_VOLUME: + //Status = FatDismountVolume( IrpContext, Irp ); + DPRINT1("FSCTL_DISMOUNT_VOLUME\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_MARK_VOLUME_DIRTY: + Status = FatMarkVolumeDirty(IrpContext, Irp); + break; + + case FSCTL_IS_VOLUME_DIRTY: + //Status = FatIsVolumeDirty( IrpContext, Irp ); + DPRINT1("FSCTL_IS_VOLUME_DIRTY\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_IS_VOLUME_MOUNTED: + //Status = FatIsVolumeMounted( IrpContext, Irp ); + DPRINT1("FSCTL_IS_VOLUME_MOUNTED\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_IS_PATHNAME_VALID: + //Status = FatIsPathnameValid( IrpContext, Irp ); + DPRINT1("FSCTL_IS_PATHNAME_VALID\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_QUERY_RETRIEVAL_POINTERS: + //Status = FatQueryRetrievalPointers( IrpContext, Irp ); + DPRINT1("FSCTL_QUERY_RETRIEVAL_POINTERS\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_QUERY_FAT_BPB: + //Status = FatQueryBpb( IrpContext, Irp ); + DPRINT1("FSCTL_QUERY_FAT_BPB\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_FILESYSTEM_GET_STATISTICS: + //Status = FatGetStatistics( IrpContext, Irp ); + DPRINT1("FSCTL_FILESYSTEM_GET_STATISTICS\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_GET_VOLUME_BITMAP: + //Status = FatGetVolumeBitmap( IrpContext, Irp ); + DPRINT1("FSCTL_GET_VOLUME_BITMAP\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_GET_RETRIEVAL_POINTERS: + //Status = FatGetRetrievalPointers( IrpContext, Irp ); + DPRINT1("FSCTL_GET_RETRIEVAL_POINTERS\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_MOVE_FILE: + //Status = FatMoveFile( IrpContext, Irp ); + DPRINT1("FSCTL_MOVE_FILE\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_ALLOW_EXTENDED_DASD_IO: + //Status = FatAllowExtendedDasdIo( IrpContext, Irp ); + DPRINT1("FSCTL_ALLOW_EXTENDED_DASD_IO\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + default: + DPRINT1("FatUserFsCtrl(), unhandled fs control code 0x%x\n", Code); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + } + + //(((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) + + // 9c040 + // 1 1 0 0 0 + // 6 4 8 4 0 + // 10011100000001000000 + // DT = 1001 = 9 + // Access = 11 = 3 + // Function = 10000 = 16 + // Method = 0 + + return Status; } NTSTATUS Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -91,11 +91,7 @@ if (DeviceObject != FatGlobalData.DiskDeviceObject) { /* Set Top Level IRP if not set */ - if (IoGetTopLevelIrp() == NULL) - { - IoSetTopLevelIrp(Irp); - TopLevel = TRUE; - } + TopLevel = FatIsTopLevelIrp(Irp); /* Build an irp context */ IrpContext = FatBuildIrpContext(Irp, CanWait); Modified: trunk/reactos/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -135,13 +135,29 @@ /* Call FsVolumeInfo handler */ Status = FatiQueryFsVolumeInfo(Vcb, Buffer, &Length); break; + case FileFsSizeInformation: /* Call FsVolumeInfo handler */ Status = FatiQueryFsSizeInfo(Vcb, Buffer, &Length); break; + + case FileFsDeviceInformation: + UNIMPLEMENTED + //Status = FatiQueryFsDeviceInfo(IrpContext, Vcb, Buffer, &Length); + break; + + case FileFsAttributeInformation: + UNIMPLEMENTED; + //Status = FatiQueryFsAttributeInfo(IrpContext, Vcb, Buffer, &Length); + break; + + case FileFsFullSizeInformation: + UNIMPLEMENTED; + //Status = FatiQueryFsFullSizeInfo(IrpContext, Vcb, Buffer, &Length); + break; + default: - DPRINT1("Volume information class %d is not supported!\n", InfoClass); - UNIMPLEMENTED; + Status = STATUS_INVALID_PARAMETER; } /* Set IoStatus.Information to amount of filled bytes */ @@ -175,11 +191,7 @@ FsRtlEnterFileSystem(); /* Set Top Level IRP if not set */ - if (IoGetTopLevelIrp() == NULL) - { - IoSetTopLevelIrp(Irp); - TopLevel = TRUE; - } + TopLevel = FatIsTopLevelIrp(Irp); /* Build an irp context */ IrpContext = FatBuildIrpContext(Irp, CanWait);

14 years, 1 month

[akhaldi] 48497: [DDK] - Move several headers to PSDK where they belong. - Add _ANONYMOUS_UNION. - De-duplicate __GNU_EXTENSION definition from several headers. - Remove semicolons after the closing bracket of extern "C" - Add a missing one in ioaccess.h - Apply a consistent formatting. [PSDK] - De-duplicate __GNU_EXTENSION definition from several headers. - Add missing extern "C" opening bracket in ddkernel.h and remove the semicolon from the closing one. - Add __GNU_EXTENSION definition to ddr

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 9 20:58:47 2010 New Revision: 48497 URL: http://svn.reactos.org/svn/reactos?rev=48497&view=rev Log: [DDK] - Move several headers to PSDK where they belong. - Add _ANONYMOUS_UNION. - De-duplicate __GNU_EXTENSION definition from several headers. - Remove semicolons after the closing bracket of extern "C" - Add a missing one in ioaccess.h - Apply a consistent formatting. [PSDK] - De-duplicate __GNU_EXTENSION definition from several headers. - Add missing extern "C" opening bracket in ddkernel.h and remove the semicolon from the closing one. - Add __GNU_EXTENSION definition to ddraw.h and remove the semicolon after the closing bracket of extern "C" - Add missing extern "C" closing bracket in ddrawi.h - Remove semicolons after the closing brackets of extern "C" in dinput.h, dmemmgr.h and sti.h - Apply a consistent formatting. [DXSDK] - Move ddraw.h to PSDK. Added: trunk/reactos/include/psdk/d3dnthal.h - copied, changed from r48479, trunk/reactos/include/ddk/d3dnthal.h trunk/reactos/include/psdk/ddkernel.h - copied, changed from r48479, trunk/reactos/include/ddk/ddkernel.h trunk/reactos/include/psdk/ddkmapi.h - copied, changed from r48479, trunk/reactos/include/ddk/ddkmapi.h trunk/reactos/include/psdk/ddraw.h - copied, changed from r48479, trunk/reactos/include/dxsdk/ddraw.h trunk/reactos/include/psdk/ddrawi.h - copied, changed from r48479, trunk/reactos/include/ddk/ddrawi.h trunk/reactos/include/psdk/ddrawint.h - copied, changed from r48479, trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/psdk/diskguid.h - copied unchanged from r48489, trunk/reactos/include/ddk/diskguid.h trunk/reactos/include/psdk/dmemmgr.h - copied, changed from r48489, trunk/reactos/include/ddk/dmemmgr.h trunk/reactos/include/psdk/ntddtape.h - copied unchanged from r48489, trunk/reactos/include/ddk/ntddtape.h trunk/reactos/include/psdk/ntddtdi.h - copied unchanged from r48489, trunk/reactos/include/ddk/ntddtdi.h trunk/reactos/include/psdk/ntddvdeo.h - copied unchanged from r48489, trunk/reactos/include/ddk/ntddvdeo.h trunk/reactos/include/psdk/ntddvol.h - copied unchanged from r48489, trunk/reactos/include/ddk/ntddvol.h trunk/reactos/include/psdk/objerror.h - copied unchanged from r48489, trunk/reactos/include/ddk/objerror.h trunk/reactos/include/psdk/polarity.h - copied unchanged from r48489, trunk/reactos/include/ddk/polarity.h trunk/reactos/include/psdk/prntfont.h - copied unchanged from r48489, trunk/reactos/include/ddk/prntfont.h trunk/reactos/include/psdk/stierr.h - copied unchanged from r48489, trunk/reactos/include/ddk/stierr.h trunk/reactos/include/psdk/stireg.h - copied unchanged from r48489, trunk/reactos/include/ddk/stireg.h trunk/reactos/include/psdk/tdi.h - copied unchanged from r48489, trunk/reactos/include/ddk/tdi.h trunk/reactos/include/psdk/tdiinfo.h - copied unchanged from r48489, trunk/reactos/include/ddk/tdiinfo.h trunk/reactos/include/psdk/unknown.h - copied unchanged from r48489, trunk/reactos/include/ddk/unknown.h Removed: trunk/reactos/include/ddk/d3dnthal.h trunk/reactos/include/ddk/ddkernel.h trunk/reactos/include/ddk/ddkmapi.h trunk/reactos/include/ddk/ddrawi.h trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/ddk/diskguid.h trunk/reactos/include/ddk/dmemmgr.h trunk/reactos/include/ddk/ntddtape.h trunk/reactos/include/ddk/ntddtdi.h trunk/reactos/include/ddk/ntddvdeo.h trunk/reactos/include/ddk/ntddvol.h trunk/reactos/include/ddk/objerror.h trunk/reactos/include/ddk/polarity.h trunk/reactos/include/ddk/prntfont.h trunk/reactos/include/ddk/stierr.h trunk/reactos/include/ddk/stireg.h trunk/reactos/include/ddk/tdi.h trunk/reactos/include/ddk/tdiinfo.h trunk/reactos/include/ddk/unknown.h trunk/reactos/include/dxsdk/ddraw.h Modified: trunk/reactos/include/ddk/acpiioct.h trunk/reactos/include/ddk/bdasup.h trunk/reactos/include/ddk/d3dhal.h trunk/reactos/include/ddk/d3dhalex.h trunk/reactos/include/ddk/dvp.h trunk/reactos/include/ddk/ioaccess.h trunk/reactos/include/psdk/dinput.h trunk/reactos/include/psdk/sti.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/acpiioct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/acpiioct.h?rev… Modified: trunk/reactos/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/bdasup.h?rev=4… Modified: trunk/reactos/include/ddk/d3dhal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dhal.h?rev=4… Modified: trunk/reactos/include/ddk/d3dhalex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dhalex.h?rev… Removed: trunk/reactos/include/ddk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dnthal.h?rev… Removed: trunk/reactos/include/ddk/ddkernel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddkernel.h?rev… Removed: trunk/reactos/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddkmapi.h?rev=… Removed: trunk/reactos/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawi.h?rev=4… Removed: trunk/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev… Removed: trunk/reactos/include/ddk/diskguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/diskguid.h?rev… Removed: trunk/reactos/include/ddk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmemmgr.h?rev=… Modified: trunk/reactos/include/ddk/dvp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dvp.h?rev=4849… Modified: trunk/reactos/include/ddk/ioaccess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ioaccess.h?rev… Removed: trunk/reactos/include/ddk/ntddtape.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddtape.h?rev… Removed: trunk/reactos/include/ddk/ntddtdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddtdi.h?rev=… Removed: trunk/reactos/include/ddk/ntddvdeo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddvdeo.h?rev… Removed: trunk/reactos/include/ddk/ntddvol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddvol.h?rev=… Removed: trunk/reactos/include/ddk/objerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/objerror.h?rev… Removed: trunk/reactos/include/ddk/polarity.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/polarity.h?rev… Removed: trunk/reactos/include/ddk/prntfont.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/prntfont.h?rev… Removed: trunk/reactos/include/ddk/stierr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stierr.h?rev=4… Removed: trunk/reactos/include/ddk/stireg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stireg.h?rev=4… Removed: trunk/reactos/include/ddk/tdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdi.h?rev=4849… Removed: trunk/reactos/include/ddk/tdiinfo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdiinfo.h?rev=… Removed: trunk/reactos/include/ddk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/unknown.h?rev=… Removed: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… Copied: trunk/reactos/include/psdk/d3dnthal.h (from r48479, trunk/reactos/include/ddk/d3dnthal.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dnthal.h?p2… Copied: trunk/reactos/include/psdk/ddkernel.h (from r48479, trunk/reactos/include/ddk/ddkernel.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddkernel.h?p2… Copied: trunk/reactos/include/psdk/ddkmapi.h (from r48479, trunk/reactos/include/ddk/ddkmapi.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddkmapi.h?p2=… Copied: trunk/reactos/include/psdk/ddraw.h (from r48479, trunk/reactos/include/dxsdk/ddraw.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddraw.h?p2=tr… Copied: trunk/reactos/include/psdk/ddrawi.h (from r48479, trunk/reactos/include/ddk/ddrawi.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawi.h?p2=t… Copied: trunk/reactos/include/psdk/ddrawint.h (from r48479, trunk/reactos/include/ddk/ddrawint.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawint.h?p2… Modified: trunk/reactos/include/psdk/dinput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dinput.h?rev=… Copied: trunk/reactos/include/psdk/dmemmgr.h (from r48489, trunk/reactos/include/ddk/dmemmgr.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dmemmgr.h?p2=… Modified: trunk/reactos/include/psdk/sti.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sti.h?rev=484…

14 years, 1 month

[cgutman] 48496: [MSWSOCK] - Implement WSPSetSockOpt (copied and modified from WSPGetSockOpt) - DHCP works now

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 9 20:47:14 2010 New Revision: 48496 URL: http://svn.reactos.org/svn/reactos?rev=48496&view=rev Log: [MSWSOCK] - Implement WSPSetSockOpt (copied and modified from WSPGetSockOpt) - DHCP works now Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c [iso-8859-1] Mon Aug 9 20:47:14 2010 @@ -517,7 +517,7 @@ PSOCKET_INFORMATION Socket; INT ErrorCode; PWINSOCK_TEB_DATA ThreadData; - + /* Enter prolog */ ErrorCode = SockEnterApiFast(&ThreadData); if (ErrorCode != NO_ERROR) @@ -526,7 +526,7 @@ *lpErrno = ErrorCode; return SOCKET_ERROR; } - + /* Get the socket structure */ Socket = SockFindAndReferenceSocket(Handle, TRUE); if (!Socket) @@ -535,10 +535,10 @@ *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } - + /* Lock the socket */ EnterCriticalSection(&Socket->Lock); - + /* Make sure we're not closed */ if (Socket->SharedData.State == SocketClosed) { @@ -546,7 +546,7 @@ ErrorCode = WSAENOTSOCK; goto error; } - + /* Validate the pointer */ if (!OptionValue) { @@ -554,7 +554,7 @@ ErrorCode = WSAEFAULT; goto error; } - + /* Validate option */ if (!IsValidOptionForSocket(Socket, Level, OptionName)) { @@ -562,28 +562,143 @@ ErrorCode = WSAENOPROTOOPT; goto error; } - - /* FIXME: Write code */ - + + /* Check the Level first */ + switch (Level) + { + /* Handle SOL_SOCKET */ + case SOL_SOCKET: + + /* Now check the Option */ + switch (OptionName) + { + case SO_RCVBUF: + + /* Validate the size */ + if (OptionLength < sizeof(INT)) + { + /* Size is too small, fail */ + ErrorCode = WSAEFAULT; + goto error; + } + + /* Set the data */ + Socket->SharedData.SizeOfRecvBuffer = *(PINT)OptionValue; + + /* FIXME: Tell AFD */ + break; + + case SO_SNDBUF: + + /* Validate the size */ + if (OptionLength < sizeof(INT)) + { + /* Size is too small, fail */ + ErrorCode = WSAEFAULT; + goto error; + } + + /* Set the data */ + Socket->SharedData.SizeOfSendBuffer = *(PINT)OptionValue; + + /* FIXME: Tell AFD */ + break; + + case SO_BROADCAST: + + /* Validate the size */ + if (OptionLength < sizeof(INT)) + { + /* Size is too small, fail */ + ErrorCode = WSAEFAULT; + goto error; + } + + /* Set the data */ + Socket->SharedData.Broadcast = *(PINT)OptionValue; + break; + + case SO_DEBUG: + + /* Validate the size */ + if (OptionLength < sizeof(INT)) + { + /* Size is too small, fail */ + ErrorCode = WSAEFAULT; + goto error; + } + + /* Set the data */ + Socket->SharedData.Debug = *(PINT)OptionValue; + break; + + case SO_CONDITIONAL_ACCEPT: + case SO_DONTLINGER: + case SO_DONTROUTE: + case SO_ERROR: + case SO_GROUP_PRIORITY: + case SO_KEEPALIVE: + case SO_LINGER: + case SO_OOBINLINE: + case SO_REUSEADDR: + + /* Unsupported */ + + default: + + /* Unsupported by us, give it to the helper */ + ErrorCode = SockGetTdiHandles(Socket); + if (ErrorCode != NO_ERROR) goto error; + + /* Call the helper */ + ErrorCode = Socket->HelperData->WSHSetSocketInformation(Socket->HelperContext, + Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + Level, + OptionName, + (PCHAR)OptionValue, + OptionLength); + if (ErrorCode != NO_ERROR) goto error; + break; + } + break; + + default: + + /* Unsupported by us, give it to the helper */ + ErrorCode = SockGetTdiHandles(Socket); + if (ErrorCode != NO_ERROR) goto error; + + /* Call the helper */ + ErrorCode = Socket->HelperData->WSHSetSocketInformation(Socket->HelperContext, + Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + Level, + OptionName, + (PCHAR)OptionValue, + OptionLength); + if (ErrorCode != NO_ERROR) goto error; + break; + } + error: - + /* Dereference and unlock the socket */ + LeaveCriticalSection(&Socket->Lock); + SockDereferenceSocket(Socket); + /* Check if this is the failure path */ if (ErrorCode != NO_ERROR) { - /* Dereference and unlock the socket */ - LeaveCriticalSection(&Socket->Lock); - SockDereferenceSocket(Socket); - /* Return error */ *lpErrno = ErrorCode; return SOCKET_ERROR; } - + /* Update the socket's state in AFD */ ErrorCode = SockSetHandleContext(Socket); - if (ErrorCode != NO_ERROR) goto error; - + /* Return success */ - return NO_ERROR; + return ErrorCode; } -

14 years, 1 month

[fireball] 48495: Carlo Bramix - Prevent possible out-of-bounds access. See issue #5505 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Aug 9 20:41:41 2010 New Revision: 48495 URL: http://svn.reactos.org/svn/reactos?rev=48495&view=rev Log: Carlo Bramix - Prevent possible out-of-bounds access. See issue #5505 for more details. Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Mon Aug 9 20:41:41 2010 @@ -73,7 +73,7 @@ /* Extract the volume label */ pc = Pvd->VolumeId; pw = CdInfo->VolumeLabel; - for (i = 0; i < MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR); i++) + for (i = 0; i < (MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)) - 1; i++) { *pw++ = (WCHAR)*pc++; }

14 years, 1 month

[fireball] 48494: Pierre Schweitzer - A better fix for CdfsIsNameLegalDOS8Dot3. See issue #2404 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Aug 9 20:38:12 2010 New Revision: 48494 URL: http://svn.reactos.org/svn/reactos?rev=48494&view=rev Log: Pierre Schweitzer - A better fix for CdfsIsNameLegalDOS8Dot3. See issue #2404 for more details. Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Mon Aug 9 20:38:12 2010 @@ -96,31 +96,37 @@ } BOOLEAN -CdfsIsNameLegalDOS8Dot3(IN PUNICODE_STRING FileName +CdfsIsNameLegalDOS8Dot3(IN UNICODE_STRING FileName ) { ULONG i; STRING DbcsName; CHAR DbcsNameBuffer[12]; - for (i = 0; i < FileName->Length / sizeof(WCHAR) ; i++) + /* 8dot3 filename is max 12 length */ + if (FileName.Length / sizeof(WCHAR) > 12) + { + return FALSE; + } + + for (i = 0; i < FileName.Length / sizeof(WCHAR) ; i++) { /* Don't allow spaces in FileName */ - if (FileName->Buffer[i] == L' ') + if (FileName.Buffer[i] == L' ') return FALSE; } -#if 0 + /* If FileName is finishing with a dot, remove it */ - if (FileName->Buffer[FileName->Length / sizeof(WCHAR) - 1] == '.') - { - FileName->Length -= sizeof(WCHAR); - } -#endif + if (FileName.Buffer[FileName.Length / sizeof(WCHAR) - 1] == '.') + { + FileName.Length -= sizeof(WCHAR); + } + /* Finally, convert the string to call the FsRtl function */ DbcsName.MaximumLength = 12; DbcsName.Buffer = DbcsNameBuffer; if (!NT_SUCCESS(RtlUnicodeStringToCountedOemString(&DbcsName, - FileName, + &FileName, FALSE ))) { @@ -165,7 +171,7 @@ } /* Cache miss */ - if (!CdfsIsNameLegalDOS8Dot3(LongName)) + if (!CdfsIsNameLegalDOS8Dot3(*LongName)) { RtlGenerate8dot3Name(LongName, FALSE, &Context, ShortName); }

14 years, 1 month

[cgutman] 48493: [DHCPCSVC] - Set the SO_BROADCAST option to 1 before we send data to the broadcast address so we don't get stonewalled by mswsock - DHCP is now compatible with mswsock_new

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 9 20:37:32 2010 New Revision: 48493 URL: http://svn.reactos.org/svn/reactos?rev=48493&view=rev Log: [DHCPCSVC] - Set the SO_BROADCAST option to 1 before we send data to the broadcast address so we don't get stonewalled by mswsock - DHCP is now compatible with mswsock_new Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Mon Aug 9 20:37:32 2010 @@ -209,7 +209,7 @@ PDHCP_ADAPTER Adapter = NULL; HANDLE AdapterStateChangedEvent = (HANDLE)Context; struct interface_info *ifi = NULL; - int i, AdapterCount = 0; + int i, AdapterCount = 0, Broadcast; /* FIXME: Kill this thread when the service is stopped */ @@ -285,6 +285,15 @@ socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); if (DhcpSocket != INVALID_SOCKET) { + + /* Allow broadcast on this socket */ + Broadcast = 1; + setsockopt(DhcpSocket, + SOL_SOCKET, + SO_BROADCAST, + (const char *)&Broadcast, + sizeof(Broadcast)); + Adapter->ListenAddr.sin_family = AF_INET; Adapter->ListenAddr.sin_port = htons(LOCAL_PORT); Adapter->BindStatus =

14 years, 1 month

[evb] 48492: Support PCI device resource dicsovery for limit and current now, so bridge + device BAR functionning PciScanBus second pass enabled: PciProcessBus, most stubs now until VGA/ISA system tested PciClassifyDeviceType implement as helper function PCI Enumeration 100% complete!

by evb＠svn.reactos.org

Author: evb Date: Mon Aug 9 19:07:52 2010 New Revision: 48492 URL: http://svn.reactos.org/svn/reactos?rev=48492&view=rev Log: Support PCI device resource dicsovery for limit and current now, so bridge + device BAR functionning PciScanBus second pass enabled: PciProcessBus, most stubs now until VGA/ISA system tested PciClassifyDeviceType implement as helper function PCI Enumeration 100% complete! Modified: trunk/reactos/drivers/bus/pcix/device.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/device.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] Mon Aug 9 19:07:52 2010 @@ -20,32 +20,238 @@ NTAPI Device_SaveCurrentSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + PPCI_COMMON_HEADER PciData; + PIO_RESOURCE_DESCRIPTOR IoDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor; + PPCI_FUNCTION_RESOURCES Resources; + PULONG BarArray; + ULONG Bar, BarMask, i; + + /* Get variables from context */ + PciData = Context->Current; + Resources = Context->PdoExtension->Resources; + + /* Loop all the PCI BARs */ + BarArray = PciData->u.type0.BaseAddresses; + for (i = 0; i <= PCI_TYPE0_ADDRESSES; i++) + { + /* Get the resource descriptor and limit descriptor for this BAR */ + CmDescriptor = &Resources->Current[i]; + IoDescriptor = &Resources->Limit[i]; + + /* Build the resource descriptor based on the limit descriptor */ + CmDescriptor->Type = IoDescriptor->Type; + if (CmDescriptor->Type == CmResourceTypeNull) continue; + CmDescriptor->Flags = IoDescriptor->Flags; + CmDescriptor->ShareDisposition = IoDescriptor->ShareDisposition; + CmDescriptor->u.Generic.Start.HighPart = 0; + CmDescriptor->u.Generic.Length = IoDescriptor->u.Generic.Length; + + /* Read the actual BAR value */ + Bar = BarArray[i]; + + /* Check which BAR is being processed now */ + if (i != PCI_TYPE0_ADDRESSES) + { + /* Check if this is an I/O BAR */ + if (Bar & PCI_ADDRESS_IO_SPACE) + { + /* Use the right mask to get the I/O port base address */ + ASSERT(CmDescriptor->Type == CmResourceTypePort); + BarMask = PCI_ADDRESS_IO_ADDRESS_MASK; + } + else + { + /* It's a RAM BAR, use the right mask to get the base address */ + ASSERT(CmDescriptor->Type == CmResourceTypeMemory); + BarMask = PCI_ADDRESS_MEMORY_ADDRESS_MASK; + + /* Check if it's a 64-bit BAR */ + if ((Bar & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_64BIT) + { + /* The next BAR value is actually the high 32-bits */ + CmDescriptor->u.Memory.Start.HighPart = BarArray[i + 1]; + } + else if ((Bar & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_20BIT) + { + /* Legacy BAR, don't read more than 20 bits of the address */ + BarMask = 0xFFFF0; + } + } + } + else + { + /* Actually a ROM BAR, so read the correct register */ + Bar = PciData->u.type0.ROMBaseAddress; + + /* Apply the correct mask for ROM BARs */ + BarMask = PCI_ADDRESS_ROM_ADDRESS_MASK; + + /* Make sure it's enabled */ + if (!(Bar & PCI_ROMADDRESS_ENABLED)) + { + /* If it isn't, then a descriptor won't be built for it */ + CmDescriptor->Type = CmResourceTypeNull; + continue; + } + } + + /* Now we have the right mask, read the actual address from the BAR */ + Bar &= BarMask; + CmDescriptor->u.Memory.Start.LowPart = Bar; + + /* And check for invalid BAR addresses */ + if (!(CmDescriptor->u.Memory.Start.HighPart | Bar)) + { + /* Skip these descriptors */ + CmDescriptor->Type = CmResourceTypeNull; + DPRINT1("Invalid BAR\n"); + } + } + + /* Also save the sub-IDs that came directly from the PCI header */ + Context->PdoExtension->SubsystemVendorId = PciData->u.type0.SubVendorID; + Context->PdoExtension->SubsystemId = PciData->u.type0.SubSystemID; } VOID NTAPI Device_SaveLimits(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + PPCI_COMMON_HEADER Current, PciData; + PPCI_PDO_EXTENSION PdoExtension; + PULONG BarArray; + PIO_RESOURCE_DESCRIPTOR Limit; + ULONG i; + + /* Get pointers from the context */ + PdoExtension = Context->PdoExtension; + Current = Context->Current; + PciData = Context->PciData; + + /* And get the array of bARs */ + BarArray = PciData->u.type0.BaseAddresses; + + /* First, check for IDE controllers that are not in native mode */ + if ((PdoExtension->BaseClass == PCI_CLASS_MASS_STORAGE_CTLR) && + (PdoExtension->SubClass == PCI_SUBCLASS_MSC_IDE_CTLR) && + (PdoExtension->ProgIf & 5) != 5) + { + /* They should not be using any non-legacy resources */ + BarArray[0] = 0; + BarArray[1] = 0; + BarArray[2] = 0; + BarArray[3] = 0; + } + else if ((PdoExtension->VendorId == 0x5333) && + ((PdoExtension->DeviceId == 0x88F0) || + (PdoExtension->DeviceId == 0x8880))) + { + /* + * The problem is caused by the S3 Vision 968/868 video controller which + * is used on the Diamond Stealth 64 Video 3000 series, Number Nine 9FX + * motion 771, and other popular video cards, all containing a memory bug. + * The 968/868 claims to require 32 MB of memory, but it actually decodes + * 64 MB of memory. + */ + for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) + { + /* Find its 32MB RAM BAR */ + if (BarArray[i] == 0xFE000000) + { + /* Increase it to 64MB to make sure nobody touches the buffer */ + BarArray[i] = 0xFC000000; + DPRINT1("PCI - Adjusted broken S3 requirement from 32MB to 64MB\n"); + } + } + } + + /* Check for Cirrus Logic GD5430/5440 cards */ + if ((PdoExtension->VendorId == 0x1013) && (PdoExtension->DeviceId == 0xA0)) + { + /* Check for the I/O port requirement */ + if (BarArray[1] == 0xFC01) + { + /* Check for completely bogus BAR */ + if (Current->u.type0.BaseAddresses[1] == 1) + { + /* Ignore it */ + BarArray[1] = 0; + DPRINT1("PCI - Ignored Cirrus GD54xx broken IO requirement (400 ports)\n"); + } + else + { + /* Otherwise, this BAR seems okay */ + DPRINT1("PCI - Cirrus GD54xx 400 port IO requirement has a valid setting (%08x)\n", + Current->u.type0.BaseAddresses[1]); + } + } + else if (BarArray[1]) + { + /* Strange, the I/O BAR was not found as expected (or at all) */ + DPRINT1("PCI - Warning Cirrus Adapter 101300a0 has unexpected resource requirement (%08x)\n", + BarArray[1]); + } + } + + /* Finally, process all the limit descriptors */ + Limit = PdoExtension->Resources->Limit; + for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) + { + /* And build them based on the BARs */ + if (PciCreateIoDescriptorFromBarLimit(&Limit[i], &BarArray[i], FALSE)) + { + /* This function returns TRUE if the BAR was 64-bit, handle this */ + ASSERT((i + 1) < PCI_TYPE0_ADDRESSES); + i++; + (&Limit[i])->Type == CmResourceTypeNull; + } + } + + /* Create the last descriptor based on the ROM address */ + PciCreateIoDescriptorFromBarLimit(&Limit[i], + &PciData->u.type0.ROMBaseAddress, + TRUE); } VOID NTAPI Device_MassageHeaderForLimitsDetermination(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + PPCI_COMMON_HEADER PciData; + PPCI_PDO_EXTENSION PdoExtension; + PULONG BarArray; + ULONG i = 0; + + /* Get pointers from context data */ + PdoExtension = Context->PdoExtension; + PciData = Context->PciData; + + /* Get the array of BARs */ + BarArray = PciData->u.type0.BaseAddresses; + + /* Check for IDE controllers that are not in native mode */ + if ((PdoExtension->BaseClass == PCI_CLASS_MASS_STORAGE_CTLR) && + (PdoExtension->SubClass == PCI_SUBCLASS_MSC_IDE_CTLR) && + (PdoExtension->ProgIf & 5) != 5) + { + /* These controllers only use legacy resources */ + i = 4; + } + + /* Set all the bits on, which will allow us to recover the limit data */ + for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) BarArray[i] = 0xFFFFFFFF; + + /* Do the same for the PCI ROM BAR */ + PciData->u.type0.ROMBaseAddress = PCI_ADDRESS_ROM_ADDRESS_MASK; } VOID NTAPI Device_RestoreCurrent(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + /* Nothing to do for devices */ + return; } VOID @@ -54,6 +260,7 @@ IN PPCI_COMMON_HEADER PciData, IN PIO_RESOURCE_DESCRIPTOR IoDescriptor) { + /* Not yet implemented */ UNIMPLEMENTED; while (TRUE); } @@ -62,6 +269,7 @@ NTAPI Device_ResetDevice(IN PPCI_CONFIGURATOR_CONTEXT Context) { + /* Not yet implemented */ UNIMPLEMENTED; while (TRUE); } @@ -70,6 +278,7 @@ NTAPI Device_ChangeResourceSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) { + /* Not yet implemented */ UNIMPLEMENTED; while (TRUE); } Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Mon Aug 9 19:07:52 2010 @@ -32,7 +32,7 @@ PPBridge_SaveCurrentSettings, PPBridge_ChangeResourceSettings, PPBridge_GetAdditionalResourceDescriptors, - PPBridge_ResetDevice + PPBridge_ResetDevice }, { Cardbus_MassageHeaderForLimitsDetermination, @@ -44,7 +44,7 @@ Cardbus_ResetDevice } }; - + /* FUNCTIONS ******************************************************************/ /* @@ -715,10 +715,10 @@ /* Write the limit discovery header */ PciWriteDeviceConfig(PdoExtension, PciData, 0, PCI_COMMON_HDR_LENGTH); - + /* Now read what the device indicated the limits are */ PciReadDeviceConfig(PdoExtension, PciData, 0, PCI_COMMON_HDR_LENGTH); - + /* Then write back the original configuration header */ PciWriteDeviceConfig(PdoExtension, Current, 0, PCI_COMMON_HDR_LENGTH); @@ -735,7 +735,7 @@ /* Copy back the original status that was saved as well */ Current->Status = Context->Status; - + /* Call the configurator to restore any other data that might've changed */ Context->Configurator->RestoreCurrent(Context); } @@ -915,6 +915,62 @@ /* Enumeration is completed, free the PCI headers and return the status */ ExFreePoolWithTag(PciData, 0); return Status; +} + +VOID +NTAPI +PciProcessBus(IN PPCI_FDO_EXTENSION DeviceExtension) +{ + PPCI_PDO_EXTENSION PdoExtension; + PDEVICE_OBJECT PhysicalDeviceObject; + PAGED_CODE(); + + /* Get the PDO Extension */ + PhysicalDeviceObject = DeviceExtension->PhysicalDeviceObject; + PdoExtension = (PPCI_PDO_EXTENSION)PhysicalDeviceObject->DeviceExtension; + + /* Cheeck if this is the root bus */ + if (!PCI_IS_ROOT_FDO(DeviceExtension)) + { + /* Not really handling this year */ + UNIMPLEMENTED; + while (TRUE); + + /* Check for PCI bridges with the ISA bit set, or required */ + if ((PdoExtension) && + (PciClassifyDeviceType(PdoExtension) == PciTypePciBridge) && + ((PdoExtension->Dependent.type1.IsaBitRequired) || + (PdoExtension->Dependent.type1.IsaBitSet))) + { + /* We'll need to do some legacy support */ + UNIMPLEMENTED; + while (TRUE); + } + } + else + { + /* Scan all of the root bus' children bridges */ + for (PdoExtension = DeviceExtension->ChildBridgePdoList; + PdoExtension; + PdoExtension = PdoExtension->NextBridge) + { + /* Find any that have the VGA decode bit on */ + if (PdoExtension->Dependent.type1.VgaBitSet) + { + /* Again, some more legacy support we'll have to do */ + UNIMPLEMENTED; + while (TRUE); + } + } + } + + /* Check for ACPI systems where the OS assigns bus numbers */ + if (PciAssignBusNumbers) + { + /* Not yet supported */ + UNIMPLEMENTED; + while (TRUE); + } } NTSTATUS @@ -1363,7 +1419,8 @@ } } - /* Enumeration is completed */ + /* Enumeration completed, do a final pass now that all devices are found */ + if (ProcessFlag) PciProcessBus(DeviceExtension); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Mon Aug 9 19:07:52 2010 @@ -101,6 +101,18 @@ PciInterface_AgpTarget = 'icP>', PciInterface_Location = 'icP?' } PCI_SIGNATURE, *PPCI_SIGNATURE; + +// +// Driver-handled PCI Device Types +// +typedef enum _PCI_DEVICE_TYPES +{ + PciTypeInvalid, + PciTypeHostBridge, + PciTypePciBridge, + PciTypeCardbusBridge, + PciTypeDevice +} PCI_DEVICE_TYPES; // // Device Extension Logic States @@ -1064,6 +1076,12 @@ IN BOOLEAN ForPowerDown ); +PCI_DEVICE_TYPES +NTAPI +PciClassifyDeviceType( + IN PPCI_PDO_EXTENSION PdoExtension +); + ULONG_PTR NTAPI PciExecuteCriticalSystemRoutine( @@ -1607,6 +1625,7 @@ extern PDRIVER_OBJECT PciDriverObject; extern PWATCHDOG_TABLE WdTable; extern PPCI_HACK_ENTRY PciHackTable; +extern BOOLEAN PciAssignBusNumbers; extern BOOLEAN PciEnableNativeModeATA; /* Exported by NTOS, should this go in the NDK? */ Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Mon Aug 9 19:07:52 2010 @@ -1041,6 +1041,24 @@ return !(HackFlags & PCI_HACK_NO_PM_CAPS); } +PCI_DEVICE_TYPES +NTAPI +PciClassifyDeviceType(IN PPCI_PDO_EXTENSION PdoExtension) +{ + ASSERT(PdoExtension->ExtensionType == PciPdoExtensionType); + + /* Differenriate between devices and bridges */ + if (PdoExtension->BaseClass != PCI_CLASS_BRIDGE_DEV) return PciTypeDevice; + + /* The PCI Bus driver handles only CardBus and PCI bridges (plus host) */ + if (PdoExtension->SubClass == PCI_SUBCLASS_BR_HOST) return PciTypeHostBridge; + if (PdoExtension->SubClass == PCI_SUBCLASS_BR_PCI_TO_PCI) return PciTypePciBridge; + if (PdoExtension->SubClass == PCI_SUBCLASS_BR_CARDBUS) return PciTypeCardbusBridge; + + /* Any other kind of bridge is treated like a device */ + return PciTypeDevice; +} + ULONG_PTR NTAPI PciExecuteCriticalSystemRoutine(IN ULONG_PTR IpiContext)

14 years, 1 month

← Newer
1
...
15
16
17
18
19
20
21
...
29
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 August 2010