Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 51649: [USBEHCI_NEW] - Fix retrieving drive capacity - Fix ufi command structures
by janderwald＠svn.reactos.org 08 May '11

08 May '11

Author: janderwald Date: Sun May 8 19:33:41 2011 New Revision: 51649 URL: http://svn.reactos.org/svn/reactos?rev=51649&view=rev Log: [USBEHCI_NEW] - Fix retrieving drive capacity - Fix ufi command structures 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] Sun May 8 19:33:41 2011 @@ -97,7 +97,7 @@ else { // - // failed to retrieve capacity + // failed to retrieve sense data // Irp->IoStatus.Information = 0; Request->SrbStatus = SRB_STATUS_ERROR; 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] Sun May 8 19:33:41 2011 @@ -410,7 +410,7 @@ OUT PREAD_CAPACITY_DATA_EX CapacityDataEx, OUT PREAD_CAPACITY_DATA CapacityData) { - UFI_INQUIRY_CMD Cmd; + UFI_CAPACITY_CMD Cmd; CSW CSW; NTSTATUS Status; PUFI_CAPACITY_RESPONSE Response; @@ -438,9 +438,8 @@ // initialize capacity cmd // RtlZeroMemory(&Cmd, sizeof(UFI_INQUIRY_CMD)); - Cmd.Code = SCSIOP_INQUIRY; + Cmd.Code = SCSIOP_READ_CAPACITY; Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); - Cmd.AllocationLength = sizeof(UFI_INQUIRY_RESPONSE); // // now send capacity cmd @@ -472,9 +471,9 @@ return Status; } - DPRINT1("LastLogicalBlockAddress %lu\n", Response->LastLogicalBlockAddress); - DPRINT1("BlockLength %lu\n", Response->BlockLength); - DPRINT1("Medium Length %lu\n", Response->BlockLength * Response->LastLogicalBlockAddress); + DPRINT1("LastLogicalBlockAddress %lu\n", NTOHL(Response->LastLogicalBlockAddress)); + DPRINT1("BlockLength %lu\n", NTOHL(Response->BlockLength)); + DPRINT1("Medium Length %lu\n", NTOHL(Response->BlockLength) * NTOHL(Response->LastLogicalBlockAddress)); // // store response @@ -536,6 +535,7 @@ PPDO_DEVICE_EXTENSION PDODeviceExtension; PCBW OutControl; PCDB pCDB; + PUFI_MODE_PARAMETER_HEADER Header; // // get SCSI command data block @@ -558,6 +558,18 @@ // return STATUS_INSUFFICIENT_RESOURCES; } + + // + // sanity check + // + + + // Supported pages + // MODE_PAGE_ERROR_RECOVERY + // MODE_PAGE_FLEXIBILE + // MODE_PAGE_LUN_MAPPING + // MODE_PAGE_FAULT_REPORTING + // MODE_SENSE_RETURN_ALL // // initialize mode sense cmd @@ -567,12 +579,15 @@ Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); Cmd.PageCode = pCDB->MODE_SENSE.PageCode; Cmd.PC = pCDB->MODE_SENSE.Pc; - Cmd.AllocationLength = pCDB->MODE_SENSE.AllocationLength; + Cmd.AllocationLength = HTONS(pCDB->MODE_SENSE.AllocationLength); + + DPRINT1("PageCode %x\n", pCDB->MODE_SENSE.PageCode); + DPRINT1("PC %x\n", pCDB->MODE_SENSE.Pc); // // now send mode sense cmd // - Status = USBSTOR_SendCBW(DeviceObject, UFI_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, &OutControl); + Status = USBSTOR_SendCBW(DeviceObject, UFI_SENSE_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, &OutControl); if (!NT_SUCCESS(Status)) { // @@ -598,6 +613,20 @@ ASSERT(FALSE); return Status; } + + Header = (PUFI_MODE_PARAMETER_HEADER)Response; + + // + // TODO: build layout + // + // first struct is the header + // MODE_PARAMETER_HEADER / _MODE_PARAMETER_HEADER10 + // + // followed by + // MODE_PARAMETER_BLOCK + // + // + DbgBreakPoint(); // // send csw 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] Sun May 8 19:33:41 2011 @@ -63,7 +63,7 @@ // #define USB_BULK_GET_MAX_LUN 0xFE - +#include <pshpack1.h> typedef struct { ULONG Signature; // CBW signature @@ -75,6 +75,9 @@ UCHAR CommandBlock[16]; }CBW, *PCBW; +C_ASSERT(sizeof(CBW) == 31); + + #define CBW_SIGNATURE 0x43425355 #define MAX_LUN 0xF @@ -114,7 +117,7 @@ UCHAR Version; // contains version 0x00 UCHAR Format; // response format UCHAR Length; // additional length - USHORT Reserved; // reserved + UCHAR Reserved[3]; // reserved UCHAR Vendor[8]; // vendor identification string UCHAR Product[16]; // product identification string UCHAR Revision[4]; // product revision code @@ -148,6 +151,24 @@ ULONG LastLogicalBlockAddress; // last logical block address ULONG BlockLength; // block length in bytes }UFI_CAPACITY_RESPONSE, *PUFI_CAPACITY_RESPONSE; + +C_ASSERT(sizeof(UFI_CAPACITY_RESPONSE) == 8); + +#define HTONS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) +#define NTOHS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) + +#define HTONL(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ + ((((unsigned long)(n) & 0xFF00)) << 8) | \ + ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ + ((((unsigned long)(n) & 0xFF000000)) >> 24)) + + +#define NTOHL(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ + ((((unsigned long)(n) & 0xFF00)) << 8) | \ + ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ + ((((unsigned long)(n) & 0xFF000000)) >> 24)) + + //-------------------------------------------------------------------------------------------------------------------------------------------- // @@ -164,7 +185,34 @@ UCHAR Reserved1[3]; }UFI_SENSE_CMD, *PUFI_SENSE_CMD; -C_ASSERT(sizeof(UFI_CAPACITY_CMD) == 12); +C_ASSERT(sizeof(UFI_SENSE_CMD) == 12); + +#define UFI_SENSE_CMD_LEN (6) + +typedef struct +{ + USHORT ModeDataLength; // length of parameters for sense cmd + UCHAR MediumTypeCode; // 00 for mass storage, 0x94 for floppy + UCHAR WP:1; // write protect bit + UCHAR Reserved1:2; // reserved 00 + UCHAR DPOFUA:1; // should be zero + UCHAR Reserved2:4; // reserved + UCHAR Reserved[4]; // reserved +}UFI_MODE_PARAMETER_HEADER, *PUFI_MODE_PARAMETER_HEADER; + + +C_ASSERT(sizeof(UFI_MODE_PARAMETER_HEADER) == 8); + +typedef struct +{ + UCHAR PC; + UCHAR PageLength; + UCHAR Reserved1; + UCHAR ITM; + UCHAR Flags; + UCHAR Reserved[3]; +}UFI_TIMER_PROTECT_PAGE, *PUFI_TIMER_PROTECT_PAGE; +C_ASSERT(sizeof(UFI_TIMER_PROTECT_PAGE) == 8); //--------------------------------------------------------------------- //

1 0

[tkreuzer] 51648: [GDI FONT DRIVER] - Add an info file describing how to install and test the driver
by tkreuzer＠svn.reactos.org 08 May '11

08 May '11

Author: tkreuzer Date: Sun May 8 17:24:34 2011 New Revision: 51648 URL: http://svn.reactos.org/svn/reactos?rev=51648&view=rev Log: [GDI FONT DRIVER] - Add an info file describing how to install and test the driver Added: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/info.txt (with props) Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c 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] Sun May 8 17:24:34 2011 @@ -165,7 +165,7 @@ return NULL; } - /* Check if there is rotation / shearing (cannot use iComplexity!?) */ + /* Check if there is rotation / skewing (cannot use iComplexity!?) */ if (!FLOATOBJ_bIsNull(&fxform.eM12) || !FLOATOBJ_bIsNull(&fxform.eM21)) { __debugbreak(); Added: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/info.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/info.txt (added) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/info.txt [iso-8859-1] Sun May 8 17:24:34 2011 @@ -1,0 +1,23 @@ + + +Installation +======== +To install the driver, copy it to your Windows\system32 folder. Then go the following registry key: +HKLM\SOFTWARE\Microsodt\Windows NT\CurrentVersion\Font Drivers +There should be at least one value: "Adobe Type Manager" : REG_SZ : "atmfd.dll" +Create a new value of type REG_SZ. The name is "Freetype Font driver", the value is "ftfd.dll" +Reboot. + +Testing +===== +Since Windows uses an internal driver for TrueType fonts, build into win32k and loaded before any +other font driver, custom drivers will never see any ttf files. To test it, you can use OpenType fonts +in Adobe Type1 format. Those would usually be handled by the "Adobe Type Manager font driver" atmfd.dll. +But the newly installed driver will see the font file first. + +Warning +====== +The driver is not production quality, so expect crashes. Don't use it on your production machine, but in +a virtual machine. Attaching WinDbg to Windows is recommended to see the debug output. Or use DbgView +from SysInternals. + Propchange: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/info.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Sun May 8 17:24:34 2011 @@ -152,7 +152,7 @@ switch (jClassId) { case 0: // Class ID = 0 No Classification - break; + return FF_SWISS; case 1: // Class ID = 1 Oldstyle Serifs switch (jSubclassId) @@ -299,8 +299,9 @@ break; } -__debugbreak(); - return 0; + WARN("Unhandled class: jClassId=%d, jSubclassId=%d\n", jClassId, jSubclassId); +//__debugbreak(); + return FF_SWISS; } BOOL

1 0

[tkreuzer] 51647: [GDI FONT DRIVER] - Add portable helper macro FLOATOBJ_bIsNull - Implement arbitrary character coordinate transformation (untested)
by tkreuzer＠svn.reactos.org 08 May '11

08 May '11

Author: tkreuzer Date: Sun May 8 16:24:07 2011 New Revision: 51647 URL: http://svn.reactos.org/svn/reactos?rev=51647&view=rev Log: [GDI FONT DRIVER] - Add portable helper macro FLOATOBJ_bIsNull - Implement arbitrary character coordinate transformation (untested) Modified: 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/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] Sun May 8 16:24:07 2011 @@ -40,6 +40,12 @@ #define FATAL(...) #endif +/* Helper for FLOATOBJ */ +#ifdef _M_IX86 +#define FLOATOBJ_bIsNull(pf) (((pf)->ul1 == 0) && ((pf)->ul2 == 0)) +#else +#define FLOATOBJ_bIsNull(pf) (*(pf) == 0) +#endif /** Driver specific types *****************************************************/ 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] Sun May 8 16:24:07 2011 @@ -26,24 +26,22 @@ FT_Vector ftvector; LONG lLength; -//__debugbreak(); -#if 0 /* Optimization for scaling transformations */ - if (pptef->y.ul1 == 0 && ppfted->y.ul2 == 0) + if (FLOATOBJ_bIsNull(&pptef->y)) { efLength = pptef->x; FLOATOBJ_SetLong(&pptef->x, 1); return efLength; } - if (pptef->x.ul1 == 0 && ppfted->x.ul2 == 0) + if (FLOATOBJ_bIsNull(&pptef->x)) { efLength = pptef->y; FLOATOBJ_SetLong(&pptef->y, 1); return efLength; } -#endif - /* Convert the point into 8.24 fixpoint format */ + + /* Convert the point into a 8.24 fixpoint vector */ efTmp = pptef->x; FLOATOBJ_MulLong(&efTmp, 0x01000000); ftvector.x = FLOATOBJ_GetLong(&efTmp); @@ -62,6 +60,7 @@ FLOATOBJ_Div(&pptef->x, &efLength); FLOATOBJ_Div(&pptef->y, &efLength); + /* Return the former length of the vector */ return efLength; } @@ -80,7 +79,7 @@ FT_Matrix ftmatrix; ULONG iComplexity; FTFD_DEVICEMETRICS *pmetrics; - FLOATOBJ efScaleX, efScaleY; + FLOATOBJ efTemp, efScaleX, efScaleY; /* Allocate a font structure */ pfont = EngAllocMem(0, sizeof(FTFD_FONT), 0); @@ -125,6 +124,12 @@ iComplexity = XFORMOBJ_iGetFloatObjXform(pxo, &fxform); ASSERT(iComplexity != DDI_ERROR); + // FIXME: quantize to 16.16 fixpoint + pfont->fdxQuantized.eXX = FLOATOBJ_GetFloat(&fxform.eM11); + pfont->fdxQuantized.eXY = FLOATOBJ_GetFloat(&fxform.eM12); + pfont->fdxQuantized.eYX = FLOATOBJ_GetFloat(&fxform.eM21); + pfont->fdxQuantized.eYY = FLOATOBJ_GetFloat(&fxform.eM22); + /* Get the base vectors (unnormalized) */ pfont->ptefBase.x = fxform.eM11; pfont->ptefBase.y = fxform.eM21; @@ -134,12 +139,6 @@ /* Normalize the base vectors and get their length */ efScaleX = FtfdNormalizeBaseVector(&pfont->ptefBase); efScaleY = FtfdNormalizeBaseVector(&pfont->ptefSide); - - // FIXME: quantize to 16.16 fixpoint - pfont->fdxQuantized.eXX = FLOATOBJ_GetFloat(&fxform.eM11); - pfont->fdxQuantized.eXY = FLOATOBJ_GetFloat(&fxform.eM12); - pfont->fdxQuantized.eYX = FLOATOBJ_GetFloat(&fxform.eM21); - pfont->fdxQuantized.eYY = FLOATOBJ_GetFloat(&fxform.eM22); /* The coordinate transformation given by Windows transforms from font * space to device space. Since we use FT_Set_Char_Size, which allows @@ -167,26 +166,32 @@ } /* Check if there is rotation / shearing (cannot use iComplexity!?) */ - if (fxform.eM12.ul1 != 0 || fxform.eM12.ul2 != 0 || - fxform.eM21.ul1 != 0 || fxform.eM21.ul2 != 0) + if (!FLOATOBJ_bIsNull(&fxform.eM12) || !FLOATOBJ_bIsNull(&fxform.eM21)) { __debugbreak(); - // FIXME: need to calculate scaling - - /* Initialize a matrix */ - ftmatrix.xx = 0x10000 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / - pfo->sizLogResPpi.cx; - ftmatrix.xy = 0x00000000; - ftmatrix.yx = 0x00000000; - ftmatrix.yy = 0x10000 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / - pfo->sizLogResPpi.cy; - - /* Apply the XFORMOBJ to the matrix */ - XFORMOBJ_bApplyXform(pxo, XF_LTOL, 2, &ftmatrix, &ftmatrix); - - /* Set non-orthogonal transformation */ - // FT_Set_Transform - + + /* Create a transformation matrix that is applied after the character + * scaling. We simply use the normalized base vectors and convert them + * to 16.16 fixpoint format */ + + efTemp = pfont->ptefBase.x; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.xx = FLOATOBJ_GetLong(&efTemp); + + efTemp = pfont->ptefSide.x; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.xy = FLOATOBJ_GetLong(&efTemp); + + efTemp = pfont->ptefBase.y; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.yx = FLOATOBJ_GetLong(&efTemp); + + efTemp = pfont->ptefSide.y; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.yy = FLOATOBJ_GetLong(&efTemp); + + /* Set the transformation matrix */ + FT_Set_Transform(ftface, &ftmatrix, 0); } /* Check if there is a design vector */ @@ -376,16 +381,18 @@ if (1 /* layout horizontal */) { + // FIXME: ftglyph->metrics doesn't handle non-orthogonal transformations + // http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT… pgd->fxA = ftglyph->metrics.horiBearingX; pgd->fxAB = pgd->fxA + ftglyph->metrics.width / 4; - pgd->fxD = ftglyph->metrics.horiAdvance / 4; } else { pgd->fxA = ftglyph->metrics.vertBearingX; pgd->fxAB = pgd->fxA + ftglyph->metrics.height; - pgd->fxD = ftglyph->metrics.vertAdvance; - } + } + + pgd->fxD = ftglyph->advance.x / 4; // should be projected on the x-axis pgd->fxInkBottom = 0; pgd->fxInkTop = pgd->fxInkBottom + (ftglyph->bitmap.rows << 4); @@ -398,9 +405,9 @@ if (ftglyph->bitmap.width == 0) pgd->rclInk.right++; if (ftglyph->bitmap.rows == 0) pgd->rclInk.bottom++; - pgd->ptqD.x.LowPart = 0x000000fd; + pgd->ptqD.x.LowPart = 0x000000fd; // ftglyph->advance.x pgd->ptqD.x.HighPart = 0; - pgd->ptqD.y.LowPart = 0x000000a0; // 0x000000a0 + pgd->ptqD.y.LowPart = 0x000000a0; // ftglyph->advance.y pgd->ptqD.y.HighPart = 0; //pgd->ptqD.x.QuadPart = 0; //pgd->ptqD.y.QuadPart = 0;

1 0

[tkreuzer] 51646: [GDI FONT DRIVER] - Refactor calculation of the normalized base vectors. We also get the length of the vectors here, which we can use to set the pixel size of the font. The base v...
by tkreuzer＠svn.reactos.org 08 May '11

08 May '11

Author: tkreuzer Date: Sun May 8 15:34:14 2011 New Revision: 51646 URL: http://svn.reactos.org/svn/reactos?rev=51646&view=rev Log: [GDI FONT DRIVER] - Refactor calculation of the normalized base vectors. We also get the length of the vectors here, which we can use to set the pixel size of the font. The base vectors are calculated as FLOATOBJs, which we can later use to create the optional arbitrary character transformation. 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 branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt 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] Sun May 8 15:34:14 2011 @@ -308,7 +308,6 @@ pGlyphSet->awcrun[cRuns - 1].wcLow = wcCurrent; pGlyphSet->awcrun[cRuns - 1].cGlyphs = 1; pGlyphSet->awcrun[cRuns - 1].phg = &phglyphs[i]; - //TRACE("adding new run i=%ld, cRuns=%ld, wc=%x\n", i, cRuns, wcCurrent); } /* Get the next charcode and index */ @@ -695,6 +694,7 @@ { case QFF_DESCRIPTION: { + WARN("QFF_DESCRIPTION unimplemented\n"); return 0; } 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] Sun May 8 15:34:14 2011 @@ -118,6 +118,12 @@ }; } FTFD_DEVICEMETRICS; +typedef struct _POINTEF +{ + FLOATOBJ x; + FLOATOBJ y; +} POINTEF, *PPOINTEF; + typedef struct { FONTOBJ *pfo; @@ -127,8 +133,8 @@ FT_Face ftface; FD_XFORM fdxQuantized; FTFD_DEVICEMETRICS metrics; - POINTE pteBase; - POINTE pteSide; + POINTEF ptefBase; + POINTEF ptefSide; ULONG xScale; HGLYPH hgSelected; ULONG cjSelected; 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] Sun May 8 15:34:14 2011 @@ -18,52 +18,51 @@ (FIELD_OFFSET(GLYPHBITS, aj) + BITMAP_SIZE(cx, cy, bpp)) static -VOID -FtfdComputeBaseVector( - POINTE *ppte, - FLOATOBJ foX, - FLOATOBJ foY) -{ +FLOATOBJ +FtfdNormalizeBaseVector( + POINTEF *pptef) +{ + FLOATOBJ efTmp, efLength; FT_Vector ftvector; LONG lLength; - FLOATOBJ fo, foLength; - + +//__debugbreak(); +#if 0 /* Optimization for scaling transformations */ - if (foX.ul1 == 0 && foX.ul2 == 0) - { - ppte->x = 0; - ppte->y = FLOATL_1; - return; - } - if (foY.ul1 == 0 && foY.ul2 == 0) - { - ppte->x = FLOATL_1; - ppte->y = 0; - return; - } - - /* Convert the point into a 8.24 format freetype vector */ - fo = foX; - FLOATOBJ_MulLong(&fo, 0x01000000); - ftvector.x = FLOATOBJ_GetLong(&fo); - fo = foY; - FLOATOBJ_MulLong(&fo, 0x01000000); - ftvector.y = FLOATOBJ_GetLong(&fo); - - /* Get the length of the freetype vector */ + if (pptef->y.ul1 == 0 && ppfted->y.ul2 == 0) + { + efLength = pptef->x; + FLOATOBJ_SetLong(&pptef->x, 1); + return efLength; + } + + if (pptef->x.ul1 == 0 && ppfted->x.ul2 == 0) + { + efLength = pptef->y; + FLOATOBJ_SetLong(&pptef->y, 1); + return efLength; + } +#endif + /* Convert the point into 8.24 fixpoint format */ + efTmp = pptef->x; + FLOATOBJ_MulLong(&efTmp, 0x01000000); + ftvector.x = FLOATOBJ_GetLong(&efTmp); + efTmp = pptef->y; + FLOATOBJ_MulLong(&efTmp, 0x01000000); + ftvector.y = FLOATOBJ_GetLong(&efTmp); + + /* Get the length of the fixpoint vector */ lLength = FT_Vector_Length(&ftvector); - /* Convert the 8.24 fixpoint back into a FLOATOBJ */ - FLOATOBJ_SetLong(&foLength, lLength); - FLOATOBJ_DivLong(&foLength, 0x01000000); + /* Convert the fixpoint back into a FLOATOBJ */ + FLOATOBJ_SetLong(&efLength, lLength); + FLOATOBJ_DivLong(&efLength, 0x01000000); /* Now divide the vector by the length */ - FLOATOBJ_Div(&foX, &foLength); - FLOATOBJ_Div(&foY, &foLength); - - /* Finally convert to FLOATL */ - ppte->x = FLOATOBJ_GetFloat(&foX); - ppte->y = FLOATOBJ_GetFloat(&foY); + FLOATOBJ_Div(&pptef->x, &efLength); + FLOATOBJ_Div(&pptef->y, &efLength); + + return efLength; } PFTFD_FONT @@ -75,14 +74,13 @@ PFTFD_FACE pface = pfile->apface[pfo->iFace - 1]; PFTFD_FONT pfont; XFORMOBJ* pxo; - XFORML xform; - FLOATOBJ_XFORM foxform; + FLOATOBJ_XFORM fxform; FT_Error fterror; FT_Face ftface; FT_Matrix ftmatrix; ULONG iComplexity; - LONG xScale, yScale; FTFD_DEVICEMETRICS *pmetrics; + FLOATOBJ efScaleX, efScaleY; /* Allocate a font structure */ pfont = EngAllocMem(0, sizeof(FTFD_FONT), 0); @@ -123,24 +121,54 @@ return NULL; } + /* Get a FLOATOBJ_XFORM matrix */ + iComplexity = XFORMOBJ_iGetFloatObjXform(pxo, &fxform); + ASSERT(iComplexity != DDI_ERROR); + + /* Get the base vectors (unnormalized) */ + pfont->ptefBase.x = fxform.eM11; + pfont->ptefBase.y = fxform.eM21; + pfont->ptefSide.x = fxform.eM12; + pfont->ptefSide.y = fxform.eM22; + + /* Normalize the base vectors and get their length */ + efScaleX = FtfdNormalizeBaseVector(&pfont->ptefBase); + efScaleY = FtfdNormalizeBaseVector(&pfont->ptefSide); + // FIXME: quantize to 16.16 fixpoint - XFORMOBJ_iGetXform(pxo, &xform); - pfont->fdxQuantized.eXX = xform.eM11; - pfont->fdxQuantized.eXY = xform.eM12; - pfont->fdxQuantized.eYX = xform.eM21; - pfont->fdxQuantized.eYY = xform.eM22; - - /* Get a FLOATOBJ_XFORM matrix */ - iComplexity = XFORMOBJ_iGetFloatObjXform(pxo, &foxform); - ASSERT(iComplexity != DDI_ERROR); - - /* Compute normalized base vectors */ - FtfdComputeBaseVector(&pfont->pteBase, foxform.eM11, foxform.eM21); - FtfdComputeBaseVector(&pfont->pteSide, foxform.eM12, foxform.eM22); + pfont->fdxQuantized.eXX = FLOATOBJ_GetFloat(&fxform.eM11); + pfont->fdxQuantized.eXY = FLOATOBJ_GetFloat(&fxform.eM12); + pfont->fdxQuantized.eYX = FLOATOBJ_GetFloat(&fxform.eM21); + pfont->fdxQuantized.eYY = FLOATOBJ_GetFloat(&fxform.eM22); + + /* The coordinate transformation given by Windows transforms from font + * space to device space. Since we use FT_Set_Char_Size, which allows + * higher precision than FT_Set_Pixel_Sizes, we need to convert into + * points. So we multiply our scaling coefficients with 72 divided by + * the device resolution. We also need a 26.4 fixpoint value, so we + * multiply with 64. */ + FLOATOBJ_MulLong(&efScaleX, 64 * pface->ifiex.ifi.fwdUnitsPerEm * 72); + FLOATOBJ_DivLong(&efScaleX, pfo->sizLogResPpi.cx); + FLOATOBJ_MulLong(&efScaleY, 64 * pface->ifiex.ifi.fwdUnitsPerEm * 72); + FLOATOBJ_DivLong(&efScaleY, pfo->sizLogResPpi.cy); + + /* Set the x and y character size for the font */ + fterror = FT_Set_Char_Size(ftface, + FLOATOBJ_GetLong(&efScaleX), + FLOATOBJ_GetLong(&efScaleY), + pfo->sizLogResPpi.cx, + pfo->sizLogResPpi.cy); + if (fterror) + { + /* Failure! */ + WARN("Error setting face size\n"); + EngFreeMem(pfont); + return NULL; + } /* Check if there is rotation / shearing (cannot use iComplexity!?) */ - if (foxform.eM12.ul1 != 0 || foxform.eM12.ul2 != 0 || - foxform.eM21.ul1 != 0 || foxform.eM21.ul2 != 0) + if (fxform.eM12.ul1 != 0 || fxform.eM12.ul2 != 0 || + fxform.eM21.ul1 != 0 || fxform.eM21.ul2 != 0) { __debugbreak(); // FIXME: need to calculate scaling @@ -159,36 +187,6 @@ /* Set non-orthogonal transformation */ // FT_Set_Transform - } - else - { - /* The font sizes are calculated from the em height, multiplied with - * the diagonal matrix coefficients. Since the given xform translates - * into pixels and we need points (FT_Set_Char_Size allows higher - * precision than FT_Set_Pixel_Sizes), we multiply with 72 / dpi. - * The value is multiplied with 64 to yield a 26.6 fixed float. */ - xScale = 64 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / pfo->sizLogResPpi.cx; - FLOATOBJ_MulLong(&foxform.eM11, xScale); - yScale = 64 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / pfo->sizLogResPpi.cy; - FLOATOBJ_MulLong(&foxform.eM22, yScale); - - /* Get the final scaling values in 26.6 fixed float format */ - xScale = FLOATOBJ_GetLong(&foxform.eM11); - yScale = FLOATOBJ_GetLong(&foxform.eM22); - - /* Set the x and y character size for the font */ - fterror = FT_Set_Char_Size(ftface, - xScale, - yScale, - pfo->sizLogResPpi.cx, - pfo->sizLogResPpi.cy); - if (fterror) - { - /* Failure! */ - WARN("Error setting face size\n"); - EngFreeMem(pfont); - return NULL; - } } /* Check if there is a design vector */ @@ -236,7 +234,7 @@ if (pmetrics->ptlULThickness.y <= 0) pmetrics->ptlULThickness.y = 1; if (pmetrics->ptlSOThickness.y <= 0) pmetrics->ptlSOThickness.y = 1; - TRACE("Created font of size %ld (%ld)\n", yScale, (yScale+32)/64); + //TRACE("Created font of size %ld (%ld)\n", yScale, (yScale+32)/64); //__debugbreak(); /* Set the pvProducer member of the fontobj */ @@ -305,8 +303,12 @@ pfddm->ptlSOThickness = pfont->metrics.ptlSOThickness; pfddm->cxMax = pfont->metrics.sizlMax.cx; pfddm->cyMax = pfont->metrics.sizlMax.cy; - pfddm->pteBase = pfont->pteBase; - pfddm->pteSide = pfont->pteSide; + + /* Convert the base vectors from FLOATOBJ to FLOATL */ + pfddm->pteBase.x = FLOATOBJ_GetFloat(&pfont->ptefBase.x); + pfddm->pteBase.y = FLOATOBJ_GetFloat(&pfont->ptefBase.y); + pfddm->pteSide.x = FLOATOBJ_GetFloat(&pfont->ptefSide.x); + pfddm->pteSide.y = FLOATOBJ_GetFloat(&pfont->ptefSide.y); /* cjGlyphMax is the full size of the GLYPHBITS structure */ pfddm->cjGlyphMax = GLYPHBITS_SIZE(pfddm->cxMax, pfddm->cyMax, 4); Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] Sun May 8 15:34:14 2011 @@ -32,7 +32,7 @@ internal interface ------------------- - FtfdInitIfiMetrics: 70% done - - handle other font types then TTF/OTF + - handle other font types than TTF/OTF - fix fwdLowestPPEm, fwdMacLineGap, ptlBaseline, ptlAspect, ptlCaret - cKerningPairs, ulPanoseCulture - check fwdMacAscender, fwdMacDescender @@ -41,16 +41,18 @@ - FtfdInitKerningPairs: unimplemented, later - FtfdDestroyFace: 100% done -- FtfdCreateFontInstance: 80% +- FtfdCreateFontInstance: 90% - handle XFORM (create a matrix and set freetype xform) - FtfdGetFontInstance: 100% done -- FtfdQueryMaxExtents: 80% done +- FtfdQueryMaxExtents: 90% done - FtfdLoadGlyph: 80% done - hande accelerator flags for bitmap / outline -- FtfdQueryGlyphData: 50% done +- FtfdQueryGlyphData: 70% done - handle vertical layout - - handle fxInkTop, fxInkBottom, ptqD + - handle ptqD -- FtfdQueryGlyphBits: 5% +- FtfdQueryGlyphBits: 40% + - handle 1bpp bitmaps + - FtfdQueryGlyphOutline: unimplemented

1 0

[mkupfer] 51644: try to commit utf-16 as text (what it actually is)
by mkupfer＠svn.reactos.org 08 May '11

08 May '11

Author: mkupfer Date: Sun May 8 13:42:46 2011 New Revision: 51644 URL: http://svn.reactos.org/svn/reactos?rev=51644&view=rev Log: try to commit utf-16 as text (what it actually is) Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf (props changed) Propchange: trunk/reactos/boot/bootdata/hivedef_i386.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1,1 +1,0 @@ -application/octet-stream

1 0

[rharabien] 51643: [DESK] * Fix scheme selection in Czech, Greek, French, Hungarian, Italian, Dutch, Polish, Swedish and Ukrainian languages.
by rharabien＠svn.reactos.org 08 May '11

08 May '11

Author: rharabien Date: Sun May 8 13:16:30 2011 New Revision: 51643 URL: http://svn.reactos.org/svn/reactos?rev=51643&view=rev Log: [DESK] * Fix scheme selection in Czech, Greek, French, Hungarian, Italian, Dutch, Polish, Swedish and Ukrainian languages. Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/resource.h Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Sun May 8 13:16:30 2011 @@ -59,7 +59,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Poloka:", IDC_STATIC, 7, 159, 26, 9 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Upøesnit", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] Sun May 8 13:16:30 2011 @@ -52,7 +52,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Óõíäõáóìüò ÷ñùìÜôùí", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Ãéá ðñï÷ùñçìÝíïõò", IDC_APPEARANCE_ADVANCED, 178, 170, 68, 15 END Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Sun May 8 13:16:30 2011 @@ -55,8 +55,8 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Modèle de couleurs", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effets...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Avancé", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END @@ -101,22 +101,22 @@ IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 340, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effets" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Utiliser l'effet de transition suivant pour les menus et les bulles d'aides :",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Utilisez l'effet de transition suivant pour les menus et les bulles d'aides:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 330, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&tiliser la méthode suivante pour lisser les bords des polices d'écran :",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "U&tilisez la méthode suivante pour aplanir les bords des polices d'écran:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 330, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "Uti&liser de grandes icones",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 330, 19 - CONTROL "&Montrer les ombres sous les menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "&Montrer ombrage sous les menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 330, 19 - CONTROL "Montrer le contenu des fenêtres lorsqu'elles sont bougées",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "Montrer contenu des fenêtres lorsqu'elles sont bougés",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 330, 19 - CONTROL "&Cacher les lettres soulignées pour la navigation au clavier jusqu'à ce que j'appuie sur la touche Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "&Cacher les lettres soulignées pour la navigation du clavier jusqu'à ce que j'appuie sur la touche Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 330, 19 PUSHBUTTON "Annuler", IDCANCEL, 281, 165, 50, 14 DEFPUSHBUTTON "Accepter", IDOK, 227, 165, 50, 14 @@ -181,8 +181,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Effet de glissement" - IDS_FADEEFFECT "Effet de fondu" + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" END STRINGTABLE DISCARDABLE @@ -263,6 +263,6 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DISPLAY_SETTINGS "Paramètres d'affichage" - IDS_APPLY_FAILED "Échec lors de l'application des nouveaux paramètres..." + IDS_APPLY_FAILED "Echec lors de l'application des nouveaux paramètres..." IDS_APPLY_NEEDS_RESTART "Vous devez redémarrer votre ordinateur pour appliquer les modifications." END Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] Sun May 8 13:16:30 2011 @@ -53,7 +53,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Sun May 8 13:16:30 2011 @@ -52,7 +52,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Schema dei colori", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effetti...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "A&vanzato...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] Sun May 8 13:16:30 2011 @@ -54,7 +54,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Kleurenschema:", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effecten...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Geavan&ceerd...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Sun May 8 13:16:30 2011 @@ -63,7 +63,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Schemat kolorów", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Efekty...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Zaawansowane", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] Sun May 8 13:16:30 2011 @@ -55,7 +55,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] Sun May 8 13:16:30 2011 @@ -60,7 +60,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Êîë³ðíà ñõåìà", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Åôåêòè...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Äîäàòêîâî", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] Sun May 8 13:16:30 2011 @@ -92,11 +92,10 @@ /* Appearance Page */ #define IDC_APPEARANCE_PREVIEW 1500 -#define IDC_APPEARANCE_UI_ITEM 1501 -#define IDC_APPEARANCE_COLORSCHEME 1502 -#define IDC_APPEARANCE_FONTSIZE 1503 -#define IDC_APPEARANCE_EFFECTS 1504 -#define IDC_APPEARANCE_ADVANCED 1505 +#define IDC_APPEARANCE_COLORSCHEME 1501 +#define IDC_APPEARANCE_FONTSIZE 1502 +#define IDC_APPEARANCE_EFFECTS 1503 +#define IDC_APPEARANCE_ADVANCED 1504 #define IDS_INACTWIN 1510 #define IDS_ACTWIN 1511

1 0

[mjmartin] 51642: [USBEHCI_NEW] - When clearing feature port reset, remove the flag from Change and if the port is hardware enabled set the enable flag in Status. - When checking port status, if Ch...
by mjmartin＠svn.reactos.org 08 May '11

08 May '11

Author: mjmartin Date: Sun May 8 12:42:15 2011 New Revision: 51642 URL: http://svn.reactos.org/svn/reactos?rev=51642&view=rev Log: [USBEHCI_NEW] - When clearing feature port reset, remove the flag from Change and if the port is hardware enabled set the enable flag in Status. - When checking port status, if Change has any flags set an SCE request most be completed. Verified while writing usbhub driver in xp. - Probably fixes a case where an endless loop of completing SCE requests. Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Sun May 8 12:42:15 2011 @@ -713,7 +713,7 @@ if (PortId > m_Capabilities.HCSParams.PortCount) return STATUS_UNSUCCESSFUL; - + // // Get the value of the Port Status and Control Register // @@ -799,12 +799,18 @@ Value &= ~EHCI_PRT_RESET; EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); KeStallExecutionProcessor(100); - - // - // update port status - // - m_PortStatus[PortId].PortChange &= ~USB_PORT_STATUS_RESET; + } + + Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); + // + // update port status + // + m_PortStatus[PortId].PortChange &= ~USB_PORT_STATUS_RESET; + if (Value & EHCI_PRT_ENABLED) m_PortStatus[PortId].PortStatus |= USB_PORT_STATUS_ENABLE; + else + { + DPRINT1("Port is not enabled.\n"); } } @@ -843,7 +849,7 @@ // DPRINT1("PORT_ENABLE not supported for EHCI\n"); } - + if (Feature == PORT_RESET) { if (Value & EHCI_PRT_SLOWSPEEDLINE) @@ -870,7 +876,7 @@ m_SCECallBack(m_SCEContext); } } - + if (Feature == PORT_POWER) DPRINT1("PORT_POWER Not implemented\n"); Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Sun May 8 12:42:15 2011 @@ -67,7 +67,7 @@ NTSTATUS HandleClassOther(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassInterface(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleBulkOrInterruptTransfer(IN OUT PIRP Irp, PURB Urb); - + friend VOID StatusChangeEndpointCallBack(PVOID Context); // constructor / destructor @@ -305,31 +305,30 @@ DPRINT1("SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); TransferBuffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer; + + // + // Loop the ports + // for (PortId = 0; PortId < PortCount; PortId++) { m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); DPRINT1("Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange); - // - // Loop the ports - // - if ((PortStatus & USB_PORT_STATUS_CONNECT) && (PortChange & USB_PORT_STATUS_CONNECT)) - { - DPRINT1("Device is connected on port %d\n", PortId); + + // + // If theres a flag in PortChange return TRUE so the SCE Irp will be completed + // + if (PortChange != 0) + { + DPRINT1("Change state on port %d\n", PortId); // Set the value for the port number *TransferBuffer = 1 << ((PortId + 1) & 7); Changed = TRUE; } } - // - // If there were changes then return TRUE - // - if (Changed != 0) - return TRUE; - - return FALSE; + return Changed; } //----------------------------------------------------------------------------------------- @@ -777,6 +776,7 @@ ASSERT(m_PendingSCEIrp == NULL); if (QueryStatusChageEndpoint(Irp)) { + StatusChangeEndpointCallBack(this); return STATUS_SUCCESS; } @@ -2094,7 +2094,7 @@ if (NT_SUCCESS(Status)) break; - }while(Index++ < 3 ); + }while(Index++ < 3 ); // // check for failure @@ -2706,11 +2706,6 @@ DPRINT1("USBHI_SetDeviceHandleData %p\n", UsbDevicePdo); // - // fixup device stack voodoo part #1 - // - UsbDevicePdo->StackSize++; - - // // sanity check // PC_ASSERT(UsbDevicePdo->AttachedDevice); @@ -3152,6 +3147,11 @@ DPRINT1("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName); + // + // fixup device stack voodoo part #1 + // + (*OutDeviceObject)->StackSize++; + /* done */ return Status; }

1 0

[mjmartin] 51641: [USBHUB_NEW] - Implement constructing CompatibleIds string using device descriptor. However, if the Class of the device descriptor is 0, then Class, SubClass and Prot which make u...
by mjmartin＠svn.reactos.org 08 May '11

08 May '11

Author: mjmartin Date: Sun May 8 12:24:26 2011 New Revision: 51641 URL: http://svn.reactos.org/svn/reactos?rev=51641&view=rev Log: [USBHUB_NEW] - Implement constructing CompatibleIds string using device descriptor. However, if the Class of the device descriptor is 0, then Class, SubClass and Prot which make up this string must come from the Interface. - Change Ids and Descriptions to Unicode Strings. - Move the creating of Id strings to one place, CreateDeviceIds, and called it at device creation. Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c branches/usb-bringup/drivers/usb/usbhub_new/pdo.c branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Sun May 8 12:24:26 2011 @@ -306,7 +306,7 @@ DPRINT1("Device connected from port %d\n", PortId); // No SCE completion done for clearing C_PORT_CONNECT - + // // Reset Port // @@ -315,7 +315,7 @@ { DPRINT1("Failed to reset port %d\n", PortId); } - } + } } else if (PortStatus.Change & USB_PORT_STATUS_ENABLE) { @@ -671,7 +671,8 @@ IN PDEVICE_OBJECT ChildDeviceObject, IN UCHAR Index, IN USHORT LangId, - OUT PVOID *TransferBuffer) + OUT PVOID *TransferBuffer, + OUT USHORT *Size) { NTSTATUS Status; PUSB_STRING_DESCRIPTOR StringDesc = NULL; @@ -702,8 +703,17 @@ ExFreePool(StringDesc); return Status; } - DPRINT1("StringDesc->bLength %d\n", StringDesc->bLength); + + // + // Did we get something more than the length of the first two fields of structure? + // + if (StringDesc->bLength == 2) + { + DPRINT1("USB Device Error!\n"); + ExFreePool(StringDesc); + return STATUS_DEVICE_DATA_ERROR; + } SizeNeeded = StringDesc->bLength + sizeof(WCHAR); // @@ -760,10 +770,184 @@ // Copy the string to destination // RtlCopyMemory(*TransferBuffer, StringDesc->bString, SizeNeeded - FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); + *Size = SizeNeeded; ExFreePool(StringDesc); return STATUS_SUCCESS; +} + +NTSTATUS +CreateDeviceIds( + PDEVICE_OBJECT UsbChildDeviceObject) +{ + NTSTATUS Status; + ULONG Index; + PWCHAR BufferPtr; + PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; + + UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)UsbChildDeviceObject->DeviceExtension; + + // + // Initialize the CompatibleIds String + // + UsbChildExtension->usCompatibleIds.Length = 144; + UsbChildExtension->usCompatibleIds.MaximumLength = UsbChildExtension->usCompatibleIds.Length; + + BufferPtr = ExAllocatePoolWithTag(NonPagedPool, + UsbChildExtension->usCompatibleIds.Length, + USB_HUB_TAG); + if (!BufferPtr) + { + DPRINT1("Failed to allocate memory\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(BufferPtr, UsbChildExtension->usCompatibleIds.Length); + + Index = 0; + // + // Construct the CompatibleIds + // + if (UsbChildExtension->DeviceDesc.bDeviceClass == 0) + { + PUSB_INTERFACE_DESCRIPTOR InterDesc = (PUSB_INTERFACE_DESCRIPTOR) + ((ULONG_PTR)UsbChildExtension->FullConfigDesc + sizeof(USB_CONFIGURATION_DESCRIPTOR)); + + Index += swprintf(&BufferPtr[Index], + L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", + InterDesc->bInterfaceClass,InterDesc->bInterfaceSubClass,InterDesc->bInterfaceProtocol) + 1; + Index += swprintf(&BufferPtr[Index], + L"USB\\Class_%02x&SubClass_%02x", + InterDesc->bInterfaceClass,InterDesc->bInterfaceSubClass) + 1; + Index += swprintf(&BufferPtr[Index], + L"USB\\Class_%02x", + InterDesc->bInterfaceClass) + 1; + } + else + { + PUSB_DEVICE_DESCRIPTOR DevDesc = &UsbChildExtension->DeviceDesc; + Index += swprintf(&BufferPtr[Index], + L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", + DevDesc->bDeviceClass,DevDesc->bDeviceSubClass,DevDesc->bDeviceProtocol) + 1; + Index += swprintf(&BufferPtr[Index], + L"USB\\Class_%02x&SubClass_%02x", + DevDesc->bDeviceClass,DevDesc->bDeviceSubClass) + 1; + Index += swprintf(&BufferPtr[Index], + L"USB\\Class_%02x", + DevDesc->bDeviceClass) + 1; + } + BufferPtr[Index] = UNICODE_NULL; + DPRINT1("usCompatibleIds %wZ\n", &UsbChildExtension->usCompatibleIds); + UsbChildExtension->usCompatibleIds.Buffer = BufferPtr; + + // + // Initialize the DeviceId String + // + UsbChildExtension->usDeviceId.Length = 44; + UsbChildExtension->usDeviceId.MaximumLength = UsbChildExtension->usDeviceId.Length; + BufferPtr = ExAllocatePoolWithTag(NonPagedPool, + UsbChildExtension->usDeviceId.Length, + USB_HUB_TAG); + if (!BufferPtr) + { + DPRINT1("Failed to allocate memory\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + // + // Construct DeviceId + // + swprintf(BufferPtr, L"USB\\Vid_%04x&Pid_%04x\0", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct); + DPRINT1("usDeviceId) %wZ\n", &UsbChildExtension->usDeviceId); + UsbChildExtension->usDeviceId.Buffer = BufferPtr; + + // + // Initialize the HardwareId String + // + UsbChildExtension->usHardwareIds.Length = 110; + UsbChildExtension->usHardwareIds.MaximumLength = UsbChildExtension->usHardwareIds.Length; + BufferPtr = ExAllocatePoolWithTag(NonPagedPool, UsbChildExtension->usHardwareIds.Length, USB_HUB_TAG); + if (!BufferPtr) + { + DPRINT1("Failed to allocate memory\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + RtlZeroMemory(BufferPtr, UsbChildExtension->usHardwareIds.Length); + + // + // Consturct HardwareIds + // + Index = 0; + Index += swprintf(&BufferPtr[Index], + L"USB\\Vid_%04x&Pid_%04x&Rev_%04x", + UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct, UsbChildExtension->DeviceDesc.bcdDevice) + 1; + Index += swprintf(&BufferPtr[Index], + L"USB\\Vid_%04x&Pid_%04x", + UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct) + 1; + BufferPtr[Index] = UNICODE_NULL; + DPRINT1("usHardWareIds %wZ\n", &UsbChildExtension->usHardwareIds); + UsbChildExtension->usHardwareIds.Buffer = BufferPtr; + + // + // FIXME: Handle Lang ids + // + + // + // Get the product string + // + Status = GetUsbStringDescriptor(UsbChildDeviceObject, + UsbChildExtension->DeviceDesc.iProduct, + 0, + (PVOID*)&UsbChildExtension->usTextDescription.Buffer, + &UsbChildExtension->usTextDescription.Length); + if (!NT_SUCCESS(Status)) + { + DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); + goto Cleanup; + } + + UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; + DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); + + // + // Get the Serial Number string + // + Status = GetUsbStringDescriptor(UsbChildDeviceObject, + UsbChildExtension->DeviceDesc.iSerialNumber, + 0, + (PVOID*)&UsbChildExtension->usInstanceId.Buffer, + &UsbChildExtension->usInstanceId.Length); + if (!NT_SUCCESS(Status)) + { + DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); + goto Cleanup; + } + + UsbChildExtension->usInstanceId.MaximumLength = UsbChildExtension->usInstanceId.Length; + DPRINT1("Usb InstanceId %wZ\n", &UsbChildExtension->usInstanceId); + + return Status; + +Cleanup: + // + // Free Memory + // + if (UsbChildExtension->usCompatibleIds.Buffer) + ExFreePool(UsbChildExtension->usCompatibleIds.Buffer); + if (UsbChildExtension->usDeviceId.Buffer) + ExFreePool(UsbChildExtension->usDeviceId.Buffer); + if (UsbChildExtension->usHardwareIds.Buffer) + ExFreePool(UsbChildExtension->usHardwareIds.Buffer); + if (UsbChildExtension->usTextDescription.Buffer) + ExFreePool(UsbChildExtension->usTextDescription.Buffer); + if (UsbChildExtension->usInstanceId.Buffer) + ExFreePool(UsbChildExtension->usInstanceId.Buffer); + + return Status; } NTSTATUS @@ -782,6 +966,7 @@ UNICODE_STRING DeviceName; ULONG ConfigDescSize, DeviceDescSize; PVOID HubInterfaceBusContext; + USB_CONFIGURATION_DESCRIPTOR ConfigDesc; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) UsbHubDeviceObject->DeviceExtension; HubInterface = &HubDeviceExtension->HubInterface; @@ -823,7 +1008,6 @@ // // Create a DeviceObject // - Status = IoCreateDevice(UsbHubDeviceObject->DriverObject, sizeof(HUB_CHILDDEVICE_EXTENSION), NULL, @@ -902,7 +1086,7 @@ UsbChildExtension->UsbDeviceHandle, (PUCHAR)&UsbChildExtension->DeviceDesc, &DeviceDescSize, - (PUCHAR)&UsbChildExtension->ConfigDesc, + (PUCHAR)&ConfigDesc, &ConfigDescSize); if (!NT_SUCCESS(Status)) { @@ -911,47 +1095,53 @@ } DumpDeviceDescriptor(&UsbChildExtension->DeviceDesc); - - // - // Allocate memory for DeviceId - // - UsbChildExtension->DeviceId = ExAllocatePoolWithTag(NonPagedPool, 32 * sizeof(WCHAR), USB_HUB_TAG); - - // - // Construct DeviceId from vendor and product values - // - swprintf(UsbChildExtension->DeviceId, L"USB\\Vid_%04x&Pid_%04x", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct); - - DPRINT1("Usb Device Id %S\n", UsbChildExtension->DeviceId); - - // - // FIXME: Handle Lang ids, will use default for now - // - - // - // Get the product string - // - Status = GetUsbStringDescriptor(NewChildDeviceObject, - UsbChildExtension->DeviceDesc.iProduct, + DumpConfigurationDescriptor(&ConfigDesc); + + // + // FIXME: Support more than one configuration and one interface? + // + if (UsbChildExtension->DeviceDesc.bNumConfigurations > 1) + { + DPRINT1("Warning: Device has more than one configuration. Only one configuration (the first) is supported!\n"); + } + + if (ConfigDesc.bNumInterfaces > 1) + { + DPRINT1("Warning: Device has more that one interface. Only one interface (the first) is currently supported\n"); + } + + ConfigDescSize = ConfigDesc.wTotalLength; + + // + // Allocate memory for the first full descriptor, including interfaces and endpoints. + // + UsbChildExtension->FullConfigDesc = ExAllocatePoolWithTag(PagedPool, ConfigDescSize, USB_HUB_TAG); + + // + // Retrieve the full configuration descriptor + // + Status = GetUsbDeviceDescriptor(NewChildDeviceObject, + USB_CONFIGURATION_DESCRIPTOR_TYPE, 0, - (PVOID*)&UsbChildExtension->TextDescription); + 0, + UsbChildExtension->FullConfigDesc, + ConfigDescSize); + if (!NT_SUCCESS(Status)) { - DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); + DPRINT1("USBHUB: GetUsbDeviceDescriptor failed with status %x\n", Status); goto Cleanup; } - DPRINT1("Usb TextDescription %S\n", UsbChildExtension->TextDescription); - - Status = GetUsbStringDescriptor(NewChildDeviceObject, - UsbChildExtension->DeviceDesc.iSerialNumber, - 0, - (PVOID*)&UsbChildExtension->InstanceId); - - DPRINT1("Usb InstanceId %S\n", UsbChildExtension->InstanceId); + DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc); + + // + // Construct all the strings that will described the device to PNP + // + Status = CreateDeviceIds(NewChildDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); + DPRINT1("Failed to create strings needed to describe device to PNP.\n"); goto Cleanup; } @@ -962,6 +1152,21 @@ Cleanup: + // + // Remove the usb device if it was created + // + if (UsbChildExtension->UsbDeviceHandle) + HubInterface->RemoveUsbDevice(HubInterfaceBusContext, UsbChildExtension->UsbDeviceHandle, 0); + + // + // Free full configuration descriptor if one was allocated + // + if (UsbChildExtension->FullConfigDesc) + ExFreePool(UsbChildExtension->FullConfigDesc); + + // + // Delete the device object + // IoDeleteDevice(NewChildDeviceObject); return Status; } @@ -1352,7 +1557,7 @@ if (!NT_SUCCESS(Status)) DPRINT1("Failed to power on port %d\n", PortId); } - + DPRINT1("RootHubInitNotification %x\n", HubDeviceExtension->HubInterface.RootHubInitNotification); // // Modified: branches/usb-bringup/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Sun May 8 12:24:26 2011 @@ -97,9 +97,10 @@ OUT ULONG_PTR* Information) { PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; - ULONG IdType, StringLength = 0; - PWCHAR SourceString = NULL, ReturnString = NULL; - NTSTATUS Status = STATUS_NOT_SUPPORTED; + ULONG IdType; + PUNICODE_STRING SourceString = NULL; + PWCHAR ReturnString = NULL; + NTSTATUS Status = STATUS_SUCCESS; IdType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryId.IdType; ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -109,49 +110,25 @@ case BusQueryDeviceID: { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); - SourceString = ChildDeviceExtension->DeviceId; - Status = STATUS_SUCCESS; + SourceString = &ChildDeviceExtension->usDeviceId; break; } case BusQueryHardwareIDs: { - ULONG Index = 0, LastIndex; - PWCHAR Ptr; - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); - - StringLength = wcslen(ChildDeviceExtension->DeviceId); - StringLength += wcslen(L"&Rev_XXXX") + 1; - StringLength += wcslen(ChildDeviceExtension->DeviceId) + 1; - StringLength = StringLength * sizeof(WCHAR); - - ReturnString = ExAllocatePool(PagedPool, StringLength); - Ptr = ReturnString; - LastIndex = Index; - Index += swprintf(&Ptr[Index], - L"%s&Rev_%04lx", ChildDeviceExtension->DeviceId, - ChildDeviceExtension->DeviceDesc.bcdDevice) + 1; - Ptr[Index] = UNICODE_NULL; - DPRINT1("%S\n", &Ptr[LastIndex]); - LastIndex = Index; - Index += swprintf(&Ptr[Index], L"%s", ChildDeviceExtension->DeviceId) + 1; - Ptr[Index] = UNICODE_NULL; - DPRINT1("%S\n", &Ptr[LastIndex]); - Status = STATUS_SUCCESS; + SourceString = &ChildDeviceExtension->usHardwareIds; break; } case BusQueryCompatibleIDs: { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); - //SourceString = ChildDeviceExtension->CompatibleIds; - //return STATUS_NOT_SUPPORTED; + SourceString = &ChildDeviceExtension->usCompatibleIds; break; } case BusQueryInstanceID: { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); - SourceString = ChildDeviceExtension->InstanceId; - Status = STATUS_SUCCESS; + SourceString = &ChildDeviceExtension->usInstanceId; break; } default: @@ -161,10 +138,8 @@ if (SourceString) { - StringLength = (wcslen(SourceString) + 1) * sizeof(WCHAR); - DPRINT1("StringLen %d\n", StringLength); - ReturnString = ExAllocatePool(PagedPool, StringLength); - RtlCopyMemory(ReturnString, SourceString, StringLength); + ReturnString = ExAllocatePool(PagedPool, SourceString->Length); + RtlCopyMemory(ReturnString, SourceString->Buffer, SourceString->Length); DPRINT1("%S\n", ReturnString); } @@ -181,10 +156,10 @@ { PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; DEVICE_TEXT_TYPE DeviceTextType; - PWCHAR SourceString = NULL, ReturnString = NULL; + PUNICODE_STRING SourceString = NULL; + PWCHAR ReturnString = NULL; NTSTATUS Status = STATUS_SUCCESS; LCID LocaleId; - ULONG StrLen; DeviceTextType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.DeviceTextType; LocaleId = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.LocaleId; @@ -200,8 +175,7 @@ case DeviceTextLocationInformation: { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); - SourceString = ChildDeviceExtension->TextDescription; - DPRINT1("%S\n", SourceString); + SourceString = &ChildDeviceExtension->usTextDescription; break; } default: @@ -214,9 +188,8 @@ if (SourceString) { - StrLen = (wcslen(SourceString) + 1) * sizeof(WCHAR); - ReturnString = ExAllocatePool(PagedPool, StrLen); - RtlCopyMemory(ReturnString, SourceString, StrLen); + ReturnString = ExAllocatePool(PagedPool, SourceString->Length); + RtlCopyMemory(ReturnString, SourceString->Buffer, SourceString->Length); DPRINT1("%S\n", ReturnString); *Information = (ULONG_PTR)ReturnString; } Modified: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] Sun May 8 12:24:26 2011 @@ -56,13 +56,14 @@ COMMON_DEVICE_EXTENSION Common; PDEVICE_OBJECT ParentDeviceObject; PUSB_DEVICE_HANDLE UsbDeviceHandle; - PWCHAR DeviceId; - PWCHAR InstanceId; - PWCHAR HardwareIds; - PWCHAR CompatibleIds; - PWCHAR TextDescription; + UNICODE_STRING usDeviceId; + UNICODE_STRING usInstanceId; + UNICODE_STRING usHardwareIds; + UNICODE_STRING usCompatibleIds; + UNICODE_STRING usTextDescription; + UNICODE_STRING usLocationInformation; USB_DEVICE_DESCRIPTOR DeviceDesc; - USB_CONFIGURATION_DESCRIPTOR ConfigDesc; + PUSB_CONFIGURATION_DESCRIPTOR FullConfigDesc; UNICODE_STRING SymbolicLinkName; } HUB_CHILDDEVICE_EXTENSION, *PHUB_CHILDDEVICE_EXTENSION; @@ -156,3 +157,7 @@ VOID DumpConfigurationDescriptor( PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor); + +VOID +DumpFullConfigurationDescriptor( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor);

1 0

[mkupfer] 51640: - some corrections to color schemes default
by mkupfer＠svn.reactos.org 08 May '11

08 May '11

Author: mkupfer Date: Sun May 8 10:59:54 2011 New Revision: 51640 URL: http://svn.reactos.org/svn/reactos?rev=51640&view=rev Log: - some corrections to color schemes default Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== Binary files - no diff available.

1 0

[osiejka] 51639: Polish translation of Theme list. Patch by Wojciech Kozlowski, corrections and minor modifications by me. See issue #6233 for more details.
by osiejka＠svn.reactos.org 08 May '11

08 May '11

Author: osiejka Date: Sun May 8 10:26:44 2011 New Revision: 51639 URL: http://svn.reactos.org/svn/reactos?rev=51639&view=rev Log: Polish translation of Theme list. Patch by Wojciech Kozlowski, corrections and minor modifications by me. See issue #6233 for more details. Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== Binary files - no diff available.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs