Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[jimtabor] 51615: [User32] - Add missing wine sync for system command sub functions.
by jimtabor＠svn.reactos.org 07 May '11

07 May '11

Author: jimtabor Date: Sat May 7 02:59:20 2011 New Revision: 51615 URL: http://svn.reactos.org/svn/reactos?rev=51615&view=rev Log: [User32] - Add missing wine sync for system command sub functions. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat May 7 02:59:20 2011 @@ -293,8 +293,9 @@ pt.x = pt.y = 0; while(!hittest) { - if (GetMessageW(&msg, NULL, 0, 0) <= 0) - break; + if (!GetMessageW(&msg, NULL, 0, 0)) break; //return 0; + if (CallMsgFilterW( &msg, MSGF_SIZE )) continue; + switch(msg.message) { case WM_MOUSEMOVE: @@ -330,8 +331,13 @@ pt.y =(rectWindow.top+rectWindow.bottom)/2; break; case VK_RETURN: - case VK_ESCAPE: return 0; + case VK_ESCAPE: + return 0; } + default: + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + break; } } *capturePoint = pt; @@ -555,8 +561,8 @@ { int dx = 0, dy = 0; - if (GetMessageW(&msg, 0, 0, 0) <= 0) - break; + if (!GetMessageW(&msg, 0, 0, 0)) break; + if (CallMsgFilterW( &msg, MSGF_SIZE )) continue; /* Exit on button-up, Return, or Esc */ if ((msg.message == WM_LBUTTONUP) || @@ -572,7 +578,11 @@ } if ((msg.message != WM_KEYDOWN) && (msg.message != WM_MOUSEMOVE)) - continue; /* We are not interested in other messages */ + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + continue; /* We are not interested in other messages */ + } pt = msg.pt;

1 0

[gschneider] 51614: [paint] Fill the whole miniature window by using stretchblt
by gschneider＠svn.reactos.org 06 May '11

06 May '11

Author: gschneider Date: Fri May 6 22:02:29 2011 New Revision: 51614 URL: http://svn.reactos.org/svn/reactos?rev=51614&view=rev Log: [paint] Fill the whole miniature window by using stretchblt Modified: trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Fri May 6 22:02:29 2011 @@ -447,11 +447,11 @@ } else if (hwnd == hwndMiniature) { - long mclient[4]; + RECT mclient; HDC hdc; - GetClientRect(hwndMiniature, (LPRECT) &mclient); + GetClientRect(hwndMiniature, &mclient); hdc = GetDC(hwndMiniature); - BitBlt(hdc, 0, 0, imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY); + StretchBlt(hdc, 0, 0, mclient.right, mclient.bottom, hDrawingDC, 0, 0, imgXRes, imgYRes, SRCCOPY); ReleaseDC(hwndMiniature, hdc); } break;

1 0

[tkreuzer] 51613: [GDI FONT DRIVER] - Fix values returned in FtfdQueryAdvanceWidths - Convert bitmap handling to 4bpp (need to investigate why my driver is assumed to return a 4bpp bitmap, while th...
by tkreuzer＠svn.reactos.org 06 May '11

06 May '11

Author: tkreuzer Date: Fri May 6 21:57:42 2011 New Revision: 51613 URL: http://svn.reactos.org/svn/reactos?rev=51613&view=rev Log: [GDI FONT DRIVER] - Fix values returned in FtfdQueryAdvanceWidths - Convert bitmap handling to 4bpp (need to investigate why my driver is assumed to return a 4bpp bitmap, while the original driver seems to provide a 1bpp one) - Fix values in FtfdQueryGlyphData - Implement FtfdQueryGlyphBits, returning a 4bpp bitmap - The driver is now capable of basically rendering fonts in 4bpp Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Fri May 6 21:57:42 2011 @@ -725,7 +725,7 @@ pjTable = OtfFindTable(pfile->pvView, pfile->cjView, ulTag, &cjTable); if (!pjTable) { - DbgPrint("Couldn't find the requested table\n"); + DbgPrint("Couldn't find table '%.4s'\n", (char*)&ulTag); return FD_ERROR; } } Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Fri May 6 21:57:42 2011 @@ -104,6 +104,7 @@ FT_Face ftface; FD_XFORM fdxQuantized; FTFD_DEVICEMETRICS metrics; + ULONG xScale; HGLYPH hgSelected; ULONG cjSelected; } FTFD_FONT, *PFTFD_FONT; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Fri May 6 21:57:42 2011 @@ -11,8 +11,11 @@ #define FLOATL_1 0x3f800000 +#define BITMAP_SIZE(cx, cy, bpp) \ + ((((((cx * bpp) + 7) >> 3) * cy) + 3) & ~3) + #define GLYPHBITS_SIZE(cx, cy, bpp) \ - (FIELD_OFFSET(GLYPHBITS, aj) + ((((cx * bpp) + 31) >> 5) * cy * 4)) + (FIELD_OFFSET(GLYPHBITS, aj) + BITMAP_SIZE(cx, cy, bpp)) PFTFD_FONT NTAPI @@ -62,6 +65,7 @@ pfont->ftface = ftface; + /* Get the XFORMOBJ from the font */ pxo = FONTOBJ_pxoGetXform(pfo); if (!pxo) { @@ -83,7 +87,7 @@ __debugbreak(); // FIXME: need to calculate scaling - /* initialize a matrix */ + /* Initialize a matrix */ ftmatrix.xx = 0x10000 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / pfo->sizLogResPpi.cx; ftmatrix.xy = 0x00000000; @@ -163,7 +167,7 @@ if (pmetrics->ptlULThickness.y <= 0) pmetrics->ptlULThickness.y = 1; if (pmetrics->ptlSOThickness.y <= 0) pmetrics->ptlSOThickness.y = 1; -DbgPrint("Created font with %ld (%ld)\n", yScale, yScale/64); +DbgPrint("Created font with %ld (%ld)\n", yScale, (yScale+32)/64); //__debugbreak(); /* Set the pvProducer member of the fontobj */ @@ -197,7 +201,6 @@ PFTFD_FONT pfont = FtfdGetFontInstance(pfo); PFTFD_FACE pface = pfont->pface; FT_Face ftface = pfont->ftface; - ULONG cjMaxWidth, cjMaxBitmapSize; XFORMOBJ *pxo; DbgPrint("FtfdQueryMaxExtents\n"); @@ -232,7 +235,7 @@ else pfddm->lD = 0; - /* Copy the values from the font structure */ + /* Copy some values from the font structure */ pfddm->fxMaxAscender = pfont->metrics.ptfxMaxAscender.y; pfddm->fxMaxDescender = pfont->metrics.ptfxMaxDescender.y; pfddm->ptlUnderline1 = pfont->metrics.ptlUnderline1; @@ -242,14 +245,8 @@ pfddm->cxMax = pfont->metrics.sizlMax.cx; pfddm->cyMax = pfont->metrics.sizlMax.cy; - /* Calculate Width in bytes */ - cjMaxWidth = ((pfddm->cxMax + 7) >> 3); - - /* Calculate size of the bitmap, rounded to DWORDs */ - cjMaxBitmapSize = ((cjMaxWidth * pfddm->cyMax) + 3) & ~3; - /* cjGlyphMax is the full size of the GLYPHBITS structure */ - pfddm->cjGlyphMax = FIELD_OFFSET(GLYPHBITS, aj) + cjMaxBitmapSize; + pfddm->cjGlyphMax = GLYPHBITS_SIZE(pfddm->cxMax, pfddm->cyMax, 4); /* Copy the quantized matrix from the font structure */ pfddm->fdxQuantized = pfont->fdxQuantized; @@ -264,7 +261,7 @@ pfddm->lMinD = 0; } -__debugbreak(); +//__debugbreak(); /* Return the size of the structure */ return sizeof(FD_DEVICEMETRICS); @@ -315,8 +312,8 @@ if (1 /* layout horizontal */) { pgd->fxA = ftglyph->metrics.horiBearingX; - pgd->fxAB = pgd->fxA + ftglyph->metrics.width; - pgd->fxD = ftglyph->metrics.horiAdvance; + pgd->fxAB = pgd->fxA + ftglyph->metrics.width / 4; + pgd->fxD = ftglyph->metrics.horiAdvance / 4; } else { @@ -325,10 +322,10 @@ pgd->fxD = ftglyph->metrics.vertAdvance; } - pgd->fxInkTop = 0; pgd->fxInkBottom = 0; + pgd->fxInkTop = pgd->fxInkBottom + (ftglyph->bitmap.rows << 4); pgd->rclInk.left = ftglyph->bitmap_left; - pgd->rclInk.top = ftglyph->bitmap_top; + pgd->rclInk.top = -ftglyph->bitmap_top; pgd->rclInk.right = pgd->rclInk.left + ftglyph->bitmap.width; pgd->rclInk.bottom = pgd->rclInk.top + ftglyph->bitmap.rows; @@ -336,13 +333,52 @@ if (ftglyph->bitmap.width == 0) pgd->rclInk.right++; if (ftglyph->bitmap.rows == 0) pgd->rclInk.bottom++; - pgd->ptqD.x.LowPart = 0; - pgd->ptqD.x.HighPart = pgd->fxD; - pgd->ptqD.y.LowPart = 0; + pgd->ptqD.x.LowPart = 0x000000fd; + pgd->ptqD.x.HighPart = 0; + pgd->ptqD.y.LowPart = 0x000000a0; // 0x000000a0 pgd->ptqD.y.HighPart = 0; //pgd->ptqD.x.QuadPart = 0; //pgd->ptqD.y.QuadPart = 0; - +//__debugbreak(); +} + +VOID +FtfdCopyBitmap( + BYTE *pjDest, + FT_Bitmap *ftbitmap) +{ + ULONG ulRows, ulDstDelta, ulSrcDelta; + PBYTE pjDstLine, pjSrcLine; + + + pjDstLine = pjDest; + ulDstDelta = (ftbitmap->width*4 + 7) / 8; + + pjSrcLine = ftbitmap->buffer; + ulSrcDelta = abs(ftbitmap->pitch); + + ulRows = ftbitmap->rows; + while (ulRows--) + { + ULONG ulWidth = ulDstDelta; + BYTE j, *pjSrc; + + pjSrc = pjSrcLine; + while (ulWidth--) + { + /* Get the 1st pixel */ + j = (*pjSrc++) & 0xf0; + + /* Get the 2nd pixel */ + if (ulWidth > 0 || !(ftbitmap->width & 1)) + j |= (*pjSrc++) >> 4; + *pjDstLine++ = j; + } + + /* Go to the next line */ + //pjDstLine += ulDstDelta; + pjSrcLine += ulSrcDelta; + } } VOID @@ -354,13 +390,30 @@ { PFTFD_FONT pfont = pfo->pvProducer; FT_GlyphSlot ftglyph = pfont->ftface->glyph; - - pgb->ptlOrigin.x = 0; - pgb->ptlOrigin.y = 0; + ULONG cjBitmapSize; + + pgb->ptlOrigin.x = ftglyph->bitmap_left; + pgb->ptlOrigin.y = - ftglyph->bitmap_top; pgb->sizlBitmap.cx = ftglyph->bitmap.width; pgb->sizlBitmap.cy = ftglyph->bitmap.rows; - DbgPrint("QueryGlyphBits for hg=%lx, cjSize=%ld\n", hg, cjSize); + cjBitmapSize = BITMAP_SIZE(pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, 4); + if (cjBitmapSize + FIELD_OFFSET(GLYPHBITS, aj) > cjSize) + { + DbgPrint("ERROR: buffer too small, got %ld, need %ld\n", + cjSize, cjBitmapSize + FIELD_OFFSET(GLYPHBITS, aj)); + __debugbreak(); + return; + } + + /* Copy the bitmap */ + FtfdCopyBitmap(pgb->aj, &ftglyph->bitmap); + + //RtlCopyMemory(pgb->aj, ftglyph->bitmap.buffer, cjBitmapSize); + + DbgPrint("QueryGlyphBits hg=%lx, (%ld,%ld) cjSize=%ld, need %ld\n", + hg, pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, cjSize, + GLYPHBITS_SIZE(pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, 4)); } @@ -372,6 +425,22 @@ ULONG cjSize) { +} + +BOOL +FtRenderGlyphBitmap( + PFTFD_FONT pfont) +{ + FT_Error fterror; + + fterror = FT_Render_Glyph(pfont->ftface->glyph, FT_RENDER_MODE_NORMAL); + if (fterror) + { + DbgPrint("cound't render glyph\n"); + return FALSE; + } + + return TRUE; } /** Public Interface **********************************************************/ @@ -400,6 +469,8 @@ /* Load the requested glyph */ if (!FtfdLoadGlyph(pfont, hg, 0)) return FD_ERROR; + if (!FtRenderGlyphBitmap(pfont)) return FD_ERROR; + if (pgd) FtfdQueryGlyphData(pfo, hg, pgd, pv); @@ -411,7 +482,7 @@ /* Return the size for a 1bpp bitmap */ return GLYPHBITS_SIZE(pfont->ftface->glyph->bitmap.width, pfont->ftface->glyph->bitmap.rows, - 1); + 4); case QFD_GLYPHANDOUTLINE: DbgPrint("QFD_GLYPHANDOUTLINE\n"); @@ -446,7 +517,7 @@ DbgPrint("QFD_TT_GRAY8_BITMAP\n"); break; default: - DbgPrint("Impossible iMode value: %lx\n", iMode); + DbgPrint("ERROR: Invalid iMode value: %lx\n", iMode); EngSetLastError(ERROR_INVALID_PARAMETER); return FD_ERROR; } @@ -517,8 +588,9 @@ } else { - //DbgPrint("Got advance width: hg=%lx, adv=%d\n", phg[i], advance >> 12); - pusWidths[i] = (USHORT)advance >> 12; + /* Transform from 16.16 points to 28.4 pixels */ + pusWidths[i] = (USHORT)((advance * 72 / pfo->sizLogResPpi.cx) >> 12); + //DbgPrint("Got advance width: hg=%lx, adv=%lx->%ld\n", phg[i], advance, pt.x); } }

1 0

[gschneider] 51612: [paint] Hide selection window and clear undo history when starting a new painting See issue #6226 for more details.
by gschneider＠svn.reactos.org 06 May '11

06 May '11

Author: gschneider Date: Fri May 6 18:32:45 2011 New Revision: 51612 URL: http://svn.reactos.org/svn/reactos?rev=51612&view=rev Log: [paint] Hide selection window and clear undo history when starting a new painting See issue #6226 for more details. Modified: trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Fri May 6 18:32:45 2011 @@ -721,6 +721,9 @@ SendMessage(hwnd, WM_CLOSE, wParam, lParam); break; case IDM_FILENEW: + ShowWindow(hSelection, SW_HIDE); + clearHistory(); + Rectangle(hDrawingDC, 0 - 1, 0 - 1, imgXRes + 1, imgYRes + 1); SendMessage(hImageArea, WM_PAINT, 0, 0); break;

1 0

[gschneider] 51611: [paint] Implement cut function See issue #6224 for more details.
by gschneider＠svn.reactos.org 06 May '11

06 May '11

Author: gschneider Date: Fri May 6 18:00:41 2011 New Revision: 51611 URL: http://svn.reactos.org/svn/reactos?rev=51611&view=rev Log: [paint] Implement cut function See issue #6224 for more details. Modified: trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Fri May 6 18:00:41 2011 @@ -793,6 +793,12 @@ EmptyClipboard(); SetClipboardData(CF_BITMAP, CopyImage(hSelBm, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG)); CloseClipboard(); + break; + case IDM_EDITCUT: + /* Copy */ + SendMessage(hwnd, WM_COMMAND, IDM_EDITCOPY, 0); + /* Delete selection */ + SendMessage(hwnd, WM_COMMAND, IDM_EDITDELETESELECTION, 0); break; case IDM_EDITPASTE: OpenClipboard(hMainWnd);

1 0

[sserapion] 51610: [SECUR32] - Initial check in... - Using severely refactored wine secur32 as a basis, start implementing SSPI interface. - Can load SSP dlls. started working on SSP/AP routines. -...
by sserapion＠svn.reactos.org 06 May '11

06 May '11

Author: sserapion Date: Fri May 6 17:35:57 2011 New Revision: 51610 URL: http://svn.reactos.org/svn/reactos?rev=51610&view=rev Log: [SECUR32] - Initial check in... - Using severely refactored wine secur32 as a basis, start implementing SSPI interface. - Can load SSP dlls. started working on SSP/AP routines. - Still need to sort out many things. For more details see msdn SSPI: http://msdn.microsoft.com/en-us/library/aa380493%28v=vs.85%29.aspx SSP vs. SSP/AP : http://msdn.microsoft.com/en-us/library/aa380501%28v=vs.85%29.aspx Added: branches/sspi-bringup/reactos/dll/win32/secur32/secur32.c (with props) branches/sspi-bringup/reactos/dll/win32/secur32/secur32_priv.h (with props) branches/sspi-bringup/reactos/dll/win32/secur32/sspap.c (with props) branches/sspi-bringup/reactos/dll/win32/secur32/thunks.c (with props) branches/sspi-bringup/reactos/dll/win32/secur32/thunks.h (with props) branches/sspi-bringup/reactos/dll/win32/secur32/wrapper.c (with props) Modified: branches/sspi-bringup/reactos/dll/win32/secur32/dllmain.c branches/sspi-bringup/reactos/dll/win32/secur32/precomp.h branches/sspi-bringup/reactos/dll/win32/secur32/secext.c branches/sspi-bringup/reactos/dll/win32/secur32/secur32.rbuild branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec branches/sspi-bringup/reactos/dll/win32/secur32/sspi.c branches/sspi-bringup/reactos/dll/win32/secur32/stubs.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/sspi-bringup/reactos/dll/win32/secur32/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/secext.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/secur32.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/secur32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/secur32_priv.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/sspap.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/thunks.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/thunks.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/wrapper.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…

1 0

[janderwald] 51609: [USBSTOR] - Implement SCSI mode sense
by janderwald＠svn.reactos.org 06 May '11

06 May '11

Author: janderwald Date: Fri May 6 17:23:19 2011 New Revision: 51609 URL: http://svn.reactos.org/svn/reactos?rev=51609&view=rev Log: [USBSTOR] - Implement SCSI mode sense Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Fri May 6 17:23:19 2011 @@ -20,6 +20,7 @@ { PCDB pCDB; NTSTATUS Status; + ULONG TransferredLength; // // get SCSI command data block @@ -62,6 +63,35 @@ // store returned info length // Irp->IoStatus.Information = Request->DataTransferLength; + Request->SrbStatus = SRB_STATUS_SUCCESS; + } + else + { + // + // failed to retrieve capacity + // + Irp->IoStatus.Information = 0; + Request->SrbStatus = SRB_STATUS_ERROR; + } + } + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) + { + DPRINT1("SCSIOP_MODE_SENSE DataTransferLength %lu\n", Request->DataTransferLength); + ASSERT(pCDB->MODE_SENSE.AllocationLength == Request->DataTransferLength); + ASSERT(Request->DataBuffer); + + // + // send mode sense command + // + Status = USBSTOR_SendModeSenseCmd(DeviceObject, Request, &TransferredLength); + DPRINT1("USBSTOR_SendModeSenseCmd Status %x BytesReturned %lu\n", Status, TransferredLength); + + if (NT_SUCCESS(Status)) + { + // + // store returned info length + // + Irp->IoStatus.Information = TransferredLength; Request->SrbStatus = SRB_STATUS_SUCCESS; } else Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 6 17:23:19 2011 @@ -435,7 +435,7 @@ } // - // initialize inquiry cmd + // initialize capacity cmd // RtlZeroMemory(&Cmd, sizeof(UFI_INQUIRY_CMD)); Cmd.Code = SCSIOP_INQUIRY; @@ -443,7 +443,7 @@ Cmd.AllocationLength = sizeof(UFI_INQUIRY_RESPONSE); // - // now send inquiry cmd + // now send capacity cmd // Status = USBSTOR_SendCBW(DeviceObject, UFI_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_CAPACITY_RESPONSE), &OutControl); if (!NT_SUCCESS(Status)) @@ -523,3 +523,123 @@ return Status; } +NTSTATUS +USBSTOR_SendModeSenseCmd( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PSCSI_REQUEST_BLOCK Request, + OUT PULONG TransferBufferLength) +{ + UFI_SENSE_CMD Cmd; + CSW CSW; + NTSTATUS Status; + PVOID Response; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PCBW OutControl; + PCDB pCDB; + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // allocate sense response from non paged pool + // + Response = (PUFI_CAPACITY_RESPONSE)AllocateItem(NonPagedPool, Request->DataTransferLength); + if (!Response) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize mode sense cmd + // + RtlZeroMemory(&Cmd, sizeof(UFI_INQUIRY_CMD)); + Cmd.Code = SCSIOP_MODE_SENSE; + Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); + Cmd.PageCode = pCDB->MODE_SENSE.PageCode; + Cmd.PC = pCDB->MODE_SENSE.Pc; + Cmd.AllocationLength = pCDB->MODE_SENSE.AllocationLength; + + // + // now send mode sense cmd + // + Status = USBSTOR_SendCBW(DeviceObject, UFI_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, &OutControl); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendCapacityCmd> USBSTOR_SendCBW failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + // + // now send data block response + // + Status = USBSTOR_SendData(DeviceObject, Request->DataTransferLength, Response); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendCapacityCmd> USBSTOR_SendData failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + // + // send csw + // + Status = USBSTOR_SendCSW(DeviceObject, OutControl, 512, &CSW); + + DPRINT1("------------------------\n"); + DPRINT1("CSW %p\n", &CSW); + DPRINT1("Signature %x\n", CSW.Signature); + DPRINT1("Tag %x\n", CSW.Tag); + DPRINT1("DataResidue %x\n", CSW.DataResidue); + DPRINT1("Status %x\n", CSW.Status); + + // + // FIXME: handle error + // + ASSERT(CSW.Status == 0); + ASSERT(CSW.DataResidue == 0); + + // + // calculate transfer length + // + *TransferBufferLength = Request->DataTransferLength - CSW.DataResidue; + + // + // copy buffer + // + RtlCopyMemory(Request->DataBuffer, Response, *TransferBufferLength); + + // + // free item + // + FreeItem(OutControl); + + // + // free response + // + FreeItem(Response); + + // + // done + // + return Status; +} + Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Fri May 6 17:23:19 2011 @@ -149,6 +149,22 @@ ULONG BlockLength; // block length in bytes }UFI_CAPACITY_RESPONSE, *PUFI_CAPACITY_RESPONSE; +//-------------------------------------------------------------------------------------------------------------------------------------------- +// +// UFI sense mode cmd +// +typedef struct +{ + UCHAR Code; // operation code + UCHAR LUN; // lun address + UCHAR PageCode:6; // page code selector + UCHAR PC:2; // type of parameters to be returned + UCHAR Reserved[4]; // reserved 0x00 + USHORT AllocationLength; // parameters length + UCHAR Reserved1[3]; +}UFI_SENSE_CMD, *PUFI_SENSE_CMD; + +C_ASSERT(sizeof(UFI_CAPACITY_CMD) == 12); //--------------------------------------------------------------------- // @@ -248,6 +264,12 @@ OUT PREAD_CAPACITY_DATA_EX CapacityDataEx, OUT PREAD_CAPACITY_DATA CapacityData); +NTSTATUS +USBSTOR_SendModeSenseCmd( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PSCSI_REQUEST_BLOCK Request, + OUT PULONG TransferBufferLength); + //--------------------------------------------------------------------- // // disk.c routines @@ -261,3 +283,5 @@ USBSTOR_HandleDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +

1 0

[janderwald] 51608: [USBSTOR] - Implement retrieving drive capacity - Use constant from scsi.h instead of defining own format - Don't reset returned parameters length to zero, as ioctl handler migh...
by janderwald＠svn.reactos.org 06 May '11

06 May '11

Author: janderwald Date: Fri May 6 16:25:01 2011 New Revision: 51608 URL: http://svn.reactos.org/svn/reactos?rev=51608&view=rev Log: [USBSTOR] - Implement retrieving drive capacity - Use constant from scsi.h instead of defining own format - Don't reset returned parameters length to zero, as ioctl handler might set it Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Fri May 6 16:25:01 2011 @@ -18,12 +18,70 @@ IN OUT PSCSI_REQUEST_BLOCK Request, IN PPDO_DEVICE_EXTENSION PDODeviceExtension) { - DPRINT1("USBSTOR_HandleExecuteSCSI\n"); - - DbgBreakPoint(); - - Request->SrbStatus = SRB_STATUS_ERROR; - return STATUS_NOT_SUPPORTED; + PCDB pCDB; + NTSTATUS Status; + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + + DPRINT1("USBSTOR_HandleExecuteSCSI Operation Code %x\n", pCDB->AsByte[0]); + + if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) + { + // + // sanity checks + // + ASSERT(Request->DataBuffer); + + if (Request->DataTransferLength == sizeof(READ_CAPACITY_DATA_EX)) + { + // + // retrieve capacity extended structure + // + Status = USBSTOR_SendCapacityCmd(DeviceObject, (PREAD_CAPACITY_DATA_EX)Request->DataBuffer, NULL); + } + else + { + // + // sanity check + // + ASSERT(Request->DataTransferLength == sizeof(READ_CAPACITY_DATA)); + + // + // retrieve capacity + // + Status = USBSTOR_SendCapacityCmd(DeviceObject, NULL, (PREAD_CAPACITY_DATA)Request->DataBuffer); + } + DPRINT1("USBSTOR_SendCapacityCmd %x\n", Status); + + if (NT_SUCCESS(Status)) + { + // + // store returned info length + // + Irp->IoStatus.Information = Request->DataTransferLength; + Request->SrbStatus = SRB_STATUS_SUCCESS; + } + else + { + // + // failed to retrieve capacity + // + Irp->IoStatus.Information = 0; + Request->SrbStatus = SRB_STATUS_ERROR; + } + } + else + { + UNIMPLEMENTED; + Request->SrbStatus = SRB_STATUS_ERROR; + Status = STATUS_NOT_SUPPORTED; + DbgBreakPoint(); + } + + return Status; } NTSTATUS @@ -63,7 +121,7 @@ { DPRINT1("SRB_FUNCTION_EXECUTE_SCSI\n"); Status = USBSTOR_HandleExecuteSCSI(DeviceObject, Irp, Request, PDODeviceExtension); - + break; } case SRB_FUNCTION_RELEASE_DEVICE: { @@ -411,14 +469,13 @@ } } - - NTSTATUS USBSTOR_HandleDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION IoStack; + NTSTATUS Status; // // get current stack location @@ -430,17 +487,48 @@ // // query property // - return USBSTOR_HandleQueryProperty(DeviceObject, Irp); - } - - DPRINT1("USBSTOR_HandleDeviceControl IoControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); - DPRINT1("USBSTOR_HandleDeviceControl InputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.InputBufferLength); - DPRINT1("USBSTOR_HandleDeviceControl OutputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); - DPRINT1("USBSTOR_HandleDeviceControl InputBuffer %x\n", IoStack->Parameters.DeviceIoControl.Type3InputBuffer); - DPRINT1("USBSTOR_HandleDeviceControl SystemBuffer %x\n", Irp->AssociatedIrp.SystemBuffer); - DPRINT1("USBSTOR_HandleDeviceControl UserBuffer %x\n", Irp->UserBuffer); - DPRINT1("USBSTOR_HandleDeviceControl MdlAddress %x\n", Irp->MdlAddress); - - - return STATUS_NOT_SUPPORTED; + Status = USBSTOR_HandleQueryProperty(DeviceObject, Irp); + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_GET_ADDRESS) + { + // + // query get scsi address + // + DPRINT1("USBSTOR_HandleDeviceControl IOCTL_SCSI_GET_ADDRESS NOT implemented\n"); + Status = STATUS_NOT_SUPPORTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_PASS_THROUGH) + { + // + // query scsi pass through + // + DPRINT1("USBSTOR_HandleDeviceControl IOCTL_SCSI_PASS_THROUGH NOT implemented\n"); + Status = STATUS_NOT_SUPPORTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_PASS_THROUGH_DIRECT) + { + // + // query scsi pass through direct + // + DPRINT1("USBSTOR_HandleDeviceControl IOCTL_SCSI_PASS_THROUGH_DIRECT NOT implemented\n"); + Status = STATUS_NOT_SUPPORTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER) + { + // + // query serial number + // + DPRINT1("USBSTOR_HandleDeviceControl IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER NOT implemented\n"); + Status = STATUS_NOT_SUPPORTED; + } + else + { + // + // unsupported + // + DPRINT("USBSTOR_HandleDeviceControl IoControl %x not supported\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_NOT_SUPPORTED; + } + + return Status; } Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 6 16:25:01 2011 @@ -300,7 +300,6 @@ PPDO_DEVICE_EXTENSION PDODeviceExtension; PCBW OutControl; - // // get PDO device extension // @@ -322,7 +321,7 @@ // initialize inquiry cmd // RtlZeroMemory(&Cmd, sizeof(UFI_INQUIRY_CMD)); - Cmd.Code = UFI_INQURIY_CODE; + Cmd.Code = SCSIOP_INQUIRY; Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); Cmd.AllocationLength = sizeof(UFI_INQUIRY_RESPONSE); @@ -404,3 +403,123 @@ // return Status; } + +NTSTATUS +USBSTOR_SendCapacityCmd( + IN PDEVICE_OBJECT DeviceObject, + OUT PREAD_CAPACITY_DATA_EX CapacityDataEx, + OUT PREAD_CAPACITY_DATA CapacityData) +{ + UFI_INQUIRY_CMD Cmd; + CSW CSW; + NTSTATUS Status; + PUFI_CAPACITY_RESPONSE Response; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PCBW OutControl; + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // allocate capacity response + // + Response = (PUFI_CAPACITY_RESPONSE)AllocateItem(NonPagedPool, sizeof(UFI_CAPACITY_RESPONSE)); + if (!Response) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize inquiry cmd + // + RtlZeroMemory(&Cmd, sizeof(UFI_INQUIRY_CMD)); + Cmd.Code = SCSIOP_INQUIRY; + Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); + Cmd.AllocationLength = sizeof(UFI_INQUIRY_RESPONSE); + + // + // now send inquiry cmd + // + Status = USBSTOR_SendCBW(DeviceObject, UFI_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_CAPACITY_RESPONSE), &OutControl); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendCapacityCmd> USBSTOR_SendCBW failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + // + // now send inquiry response + // + Status = USBSTOR_SendData(DeviceObject, sizeof(UFI_CAPACITY_RESPONSE), Response); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendCapacityCmd> USBSTOR_SendData failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + DPRINT1("LastLogicalBlockAddress %lu\n", Response->LastLogicalBlockAddress); + DPRINT1("BlockLength %lu\n", Response->BlockLength); + DPRINT1("Medium Length %lu\n", Response->BlockLength * Response->LastLogicalBlockAddress); + + // + // store response + // + if (CapacityDataEx) + { + CapacityDataEx->LogicalBlockAddress.QuadPart = Response->LastLogicalBlockAddress; + CapacityDataEx->BytesPerBlock = Response->BlockLength; + } + else + { + CapacityData->LogicalBlockAddress = Response->LastLogicalBlockAddress; + CapacityData->BytesPerBlock = Response->BlockLength; + } + + // + // send csw + // + Status = USBSTOR_SendCSW(DeviceObject, OutControl, 512, &CSW); + + DPRINT1("------------------------\n"); + DPRINT1("CSW %p\n", &CSW); + DPRINT1("Signature %x\n", CSW.Signature); + DPRINT1("Tag %x\n", CSW.Tag); + DPRINT1("DataResidue %x\n", CSW.DataResidue); + DPRINT1("Status %x\n", CSW.Status); + + // + // FIXME: handle error + // + ASSERT(CSW.Status == 0); + + // + // free item + // + FreeItem(OutControl); + + // + // free response + // + FreeItem(Response); + + // + // done + // + return Status; +} + Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] Fri May 6 16:25:01 2011 @@ -141,9 +141,16 @@ // Status = USBSTOR_HandleDeviceControl(DeviceObject, Irp); - Irp->IoStatus.Information = 0; + // + // complete request + // Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // done + // + return Status; } @@ -160,7 +167,6 @@ // Status = USBSTOR_HandleInternalDeviceControl(DeviceObject, Irp); - Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Fri May 6 16:25:01 2011 @@ -14,6 +14,7 @@ #include <stdio.h> #include <wdmguid.h> #include <classpnp.h> +#include <scsi.h> #define USB_STOR_TAG 'sbsu' #define USB_MAXCHILDREN (16) @@ -101,7 +102,6 @@ C_ASSERT(sizeof(UFI_INQUIRY_CMD) == 12); -#define UFI_INQURIY_CODE 0x12 #define UFI_INQUIRY_CMD_LEN 0x6 // @@ -122,6 +122,34 @@ C_ASSERT(sizeof(UFI_INQUIRY_RESPONSE) == 36); +//-------------------------------------------------------------------------------------------------------------------------------------------- +// +// UFI read capacity cmd +// +typedef struct +{ + UCHAR Code; // operation code 0x25 + UCHAR LUN; // lun address + UCHAR LBA[4]; // logical block address, should be zero + UCHAR Reserved1[2]; // reserved 0x00 + UCHAR PMI; // PMI = 0x00 + UCHAR Reserved2[3]; // reserved 0x00 +}UFI_CAPACITY_CMD, *PUFI_CAPACITY_CMD; + +C_ASSERT(sizeof(UFI_CAPACITY_CMD) == 12); + +#define UFI_CAPACITY_CMD_LEN 0xA //FIXME support length 16 too if requested + +// +// UFI Read Capcacity command response +// +typedef struct +{ + ULONG LastLogicalBlockAddress; // last logical block address + ULONG BlockLength; // block length in bytes +}UFI_CAPACITY_RESPONSE, *PUFI_CAPACITY_RESPONSE; + + //--------------------------------------------------------------------- // // fdo.c routines @@ -214,6 +242,11 @@ USBSTOR_SendInquiryCmd( IN PDEVICE_OBJECT DeviceObject); +NTSTATUS +USBSTOR_SendCapacityCmd( + IN PDEVICE_OBJECT DeviceObject, + OUT PREAD_CAPACITY_DATA_EX CapacityDataEx, + OUT PREAD_CAPACITY_DATA CapacityData); //--------------------------------------------------------------------- //

1 0

[janderwald] 51607: [USBSTOR] - Implement retrieving adapter descriptor (IOCTL_STORAGE_QUERY_PROPERTY) - Implement retrieving device descriptor (IOCTL_STORAGE_QUERY_PROPERTY) - Next Function to imp...
by janderwald＠svn.reactos.org 06 May '11

06 May '11

Author: janderwald Date: Fri May 6 13:29:27 2011 New Revision: 51607 URL: http://svn.reactos.org/svn/reactos?rev=51607&view=rev Log: [USBSTOR] - Implement retrieving adapter descriptor (IOCTL_STORAGE_QUERY_PROPERTY) - Implement retrieving device descriptor (IOCTL_STORAGE_QUERY_PROPERTY) - Next Function to implement is SRB_FUNCTION_EXECUTE_SCSI Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Fri May 6 13:29:27 2011 @@ -143,6 +143,276 @@ return Status; } +ULONG +USBSTOR_GetFieldLength( + IN PUCHAR Name, + IN ULONG MaxLength) +{ + ULONG Index; + ULONG LastCharacterPosition = 0; + + // + // scan the field and return last positon which contains a valid character + // + for(Index = 0; Index < MaxLength; Index++) + { + if (Name[Index] != ' ') + { + // + // trim white spaces from field + // + LastCharacterPosition = Index; + } + } + + // + // convert from zero based index to length + // + return LastCharacterPosition + 1; +} + +NTSTATUS +USBSTOR_HandleQueryProperty( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PSTORAGE_PROPERTY_QUERY PropertyQuery; + PSTORAGE_DESCRIPTOR_HEADER DescriptorHeader; + PSTORAGE_ADAPTER_DESCRIPTOR AdapterDescriptor; + ULONG FieldLengthVendor, FieldLengthProduct, FieldLengthRevision, TotalLength; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PUFI_INQUIRY_RESPONSE InquiryData; + PSTORAGE_DEVICE_DESCRIPTOR DeviceDescriptor; + PUCHAR Buffer; + + DPRINT1("USBSTOR_HandleQueryProperty\n"); + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // sanity check + // + ASSERT(IoStack->Parameters.DeviceIoControl.InputBufferLength >= sizeof(STORAGE_PROPERTY_QUERY)); + ASSERT(Irp->AssociatedIrp.SystemBuffer); + + // + // get property query + // + PropertyQuery = (PSTORAGE_PROPERTY_QUERY)Irp->AssociatedIrp.SystemBuffer; + + // + // check property type + // + if (PropertyQuery->PropertyId != StorageDeviceProperty && + PropertyQuery->PropertyId != StorageAdapterProperty) + { + // + // only device property / adapter property are supported + // + return STATUS_INVALID_PARAMETER_1; + } + + // + // check query type + // + if (PropertyQuery->QueryType == PropertyExistsQuery) + { + // + // device property / adapter property is supported + // + return STATUS_SUCCESS; + } + + if (PropertyQuery->QueryType != PropertyStandardQuery) + { + // + // only standard query and exists query are supported + // + return STATUS_INVALID_PARAMETER_2; + } + + // + // check if it is a device property + // + if (PropertyQuery->PropertyId == StorageDeviceProperty) + { + DPRINT1("USBSTOR_HandleQueryProperty StorageDeviceProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension); + + // + // get inquiry data + // + InquiryData = (PUFI_INQUIRY_RESPONSE)PDODeviceExtension->InquiryData; + ASSERT(InquiryData); + + // + // compute extra parameters length + // + FieldLengthVendor = USBSTOR_GetFieldLength(InquiryData->Vendor, 8); + FieldLengthProduct = USBSTOR_GetFieldLength(InquiryData->Product, 16); + FieldLengthRevision = USBSTOR_GetFieldLength(InquiryData->Revision, 4); + + // + // FIXME handle serial number + // + + // + // total length required is sizeof(STORAGE_DEVICE_DESCRIPTOR) + FieldLength + 3 extra null bytes - 1 + // -1 due STORAGE_DEVICE_DESCRIPTOR contains one byte length of parameter data + // + TotalLength = sizeof(STORAGE_DEVICE_DESCRIPTOR) + FieldLengthVendor + FieldLengthProduct + FieldLengthRevision + 2; + + // + // check if output buffer is long enough + // + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < TotalLength) + { + // + // buffer too small + // + DescriptorHeader = (PSTORAGE_DESCRIPTOR_HEADER)Irp->AssociatedIrp.SystemBuffer; + ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(STORAGE_DESCRIPTOR_HEADER)); + + // + // return required size + // + DescriptorHeader->Version = TotalLength; + DescriptorHeader->Size = TotalLength; + + Irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); + return STATUS_SUCCESS; + } + + // + // get device descriptor + // + DeviceDescriptor = (PSTORAGE_DEVICE_DESCRIPTOR)Irp->AssociatedIrp.SystemBuffer; + + // + // initialize device descriptor + // + DeviceDescriptor->Version = TotalLength; + DeviceDescriptor->Size = TotalLength; + DeviceDescriptor->DeviceType = InquiryData->DeviceType; + DeviceDescriptor->DeviceTypeModifier = (InquiryData->RMB & 0x7F); + DeviceDescriptor->RemovableMedia = FALSE; //FIXME check if floppy + DeviceDescriptor->CommandQueueing = FALSE; + DeviceDescriptor->BusType = BusTypeUsb; + DeviceDescriptor->VendorIdOffset = sizeof(STORAGE_DEVICE_DESCRIPTOR) - sizeof(UCHAR); + DeviceDescriptor->ProductIdOffset = DeviceDescriptor->VendorIdOffset + FieldLengthVendor + 1; + DeviceDescriptor->ProductRevisionOffset = DeviceDescriptor->ProductIdOffset + FieldLengthProduct + 1; + DeviceDescriptor->SerialNumberOffset = 0; //FIXME + DeviceDescriptor->RawPropertiesLength = FieldLengthVendor + FieldLengthProduct + FieldLengthRevision + 3; + + // + // copy descriptors + // + Buffer = (PUCHAR)((ULONG_PTR)DeviceDescriptor + sizeof(STORAGE_DEVICE_DESCRIPTOR) - sizeof(UCHAR)); + + // + // copy vendor + // + RtlCopyMemory(Buffer, InquiryData->Vendor, FieldLengthVendor); + Buffer[FieldLengthVendor] = '\0'; + Buffer += FieldLengthVendor + 1; + + // + // copy product + // + RtlCopyMemory(Buffer, InquiryData->Product, FieldLengthProduct); + Buffer[FieldLengthProduct] = '\0'; + Buffer += FieldLengthProduct + 1; + + // + // copy revision + // + RtlCopyMemory(Buffer, InquiryData->Revision, FieldLengthRevision); + Buffer[FieldLengthRevision] = '\0'; + Buffer += FieldLengthRevision + 1; + + // + // TODO: copy revision + // + + DPRINT("Vendor %s\n", (LPCSTR)((ULONG_PTR)DeviceDescriptor + DeviceDescriptor->VendorIdOffset)); + DPRINT("Product %s\n", (LPCSTR)((ULONG_PTR)DeviceDescriptor + DeviceDescriptor->ProductIdOffset)); + DPRINT("Revision %s\n", (LPCSTR)((ULONG_PTR)DeviceDescriptor + DeviceDescriptor->ProductRevisionOffset)); + + // + // done + // + Irp->IoStatus.Information = TotalLength; + return STATUS_SUCCESS; + } + else + { + // + // adapter property query request + // + DPRINT1("USBSTOR_HandleQueryProperty StorageAdapterProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_ADAPTER_DESCRIPTOR)) + { + // + // buffer too small + // + DescriptorHeader = (PSTORAGE_DESCRIPTOR_HEADER)Irp->AssociatedIrp.SystemBuffer; + ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(STORAGE_DESCRIPTOR_HEADER)); + + // + // return required size + // + DescriptorHeader->Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + DescriptorHeader->Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + + Irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); + return STATUS_SUCCESS; + } + + // + // get adapter descriptor, information is returned in the same buffer + // + AdapterDescriptor = (PSTORAGE_ADAPTER_DESCRIPTOR)Irp->AssociatedIrp.SystemBuffer; + + // + // fill out descriptor + // + AdapterDescriptor->Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + AdapterDescriptor->Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + AdapterDescriptor->MaximumTransferLength = MAXULONG; //FIXME compute some sane value + AdapterDescriptor->MaximumPhysicalPages = 25; //FIXME compute some sane value + AdapterDescriptor->AlignmentMask = 0; + AdapterDescriptor->AdapterUsesPio = FALSE; + AdapterDescriptor->AdapterScansDown = FALSE; + AdapterDescriptor->CommandQueueing = FALSE; + AdapterDescriptor->AcceleratedTransfer = FALSE; + AdapterDescriptor->BusType = BusTypeUsb; + AdapterDescriptor->BusMajorVersion = 0x2; //FIXME verify + AdapterDescriptor->BusMinorVersion = 0x00; //FIXME + + // + // store returned length + // + Irp->IoStatus.Information = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + + // + // done + // + return STATUS_SUCCESS; + } +} + + + NTSTATUS USBSTOR_HandleDeviceControl( IN PDEVICE_OBJECT DeviceObject, @@ -154,6 +424,14 @@ // get current stack location // IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_STORAGE_QUERY_PROPERTY) + { + // + // query property + // + return USBSTOR_HandleQueryProperty(DeviceObject, Irp); + } DPRINT1("USBSTOR_HandleDeviceControl IoControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); DPRINT1("USBSTOR_HandleDeviceControl InputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.InputBufferLength); @@ -163,7 +441,6 @@ DPRINT1("USBSTOR_HandleDeviceControl UserBuffer %x\n", Irp->UserBuffer); DPRINT1("USBSTOR_HandleDeviceControl MdlAddress %x\n", Irp->MdlAddress); - //IOCTL_STORAGE_QUERY_PROPERTY return STATUS_NOT_SUPPORTED; }

1 0

[gedmurphy] 51606: Create a branch for Thomas Faber's work on creating a kernel mode test suite for the Google Summer of Code project
by gedmurphy＠svn.reactos.org 06 May '11

06 May '11

Author: gedmurphy Date: Fri May 6 13:25:33 2011 New Revision: 51606 URL: http://svn.reactos.org/svn/reactos?rev=51606&view=rev Log: Create a branch for Thomas Faber's work on creating a kernel mode test suite for the Google Summer of Code project Added: branches/GSoC_2011/KMTestSuite/ (props changed) - copied from r51164, trunk/rostests/ Propchange: branches/GSoC_2011/KMTestSuite/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri May 6 13:25:33 2011 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/GSoC_2011/KMTestSuite/ ------------------------------------------------------------------------------ svn:mergeinfo = /branches/ros-amd64-bringup/rostests:44459,44462,44537

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011