Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[tkreuzer] 51625: [GDI FONT DRIVER] - handle DESIGNVECTOR for adobe multiple master fonts - implement FtfdDestroyFont

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 7 16:40:33 2011 New Revision: 51625 URL: http://svn.reactos.org/svn/reactos?rev=51625&view=rev Log: [GDI FONT DRIVER] - handle DESIGNVECTOR for adobe multiple master fonts - implement FtfdDestroyFont 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 branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h 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] Sat May 7 16:40:33 2011 @@ -390,6 +390,7 @@ return NULL; } + /* Set basic fields */ pface->pfile = pfile; pface->iFace = iFace; pface->ftface = ftface; @@ -534,6 +535,33 @@ /* Get the file format */ pfile->ulFileFormat = FtfdGetFileFormat(pfile); + /* Check for design vector */ + if (pdv) + { + /* Check if the font format supports it */ + if (pfile->apface[0]->ulFontFormat != FMT_TYPE1) + { + WARN("Design vector is not supported\n"); + goto error; + } + + /* Verify the design vector, just in case ... */ + if (pdv->dvReserved != STAMP_DESIGNVECTOR || + pdv->dvNumAxes > MM_MAX_NUMAXES) + { + WARN("Design vector is invalid\n"); + goto error; + } + + /* Copy design vector */ + pfile->dv = *pdv; + } + else + { + /* Mark as not present */ + pfile->dv.dvReserved = 0; + } + /* Loop all additional faces in this file */ for (i = 1; i < cNumFaces; i++) { @@ -650,7 +678,7 @@ /* Unmap the font file */ EngUnmapFontFileFD(pfile->iFile); - /* Free the memory that was allocated for the font */ + /* Free the memory that was allocated for the file */ EngFreeMem(pfile); return TRUE; 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] Sat May 7 16:40:33 2011 @@ -12,9 +12,10 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include <freetype/ftadvanc.h> -#include <freetype/ftxf86.h> -#include <freetype/t1tables.h> +#include FT_ADVANCES_H +#include FT_XFREE86_H +#include FT_TYPE1_TABLES_H +#include FT_MULTIPLE_MASTERS_H extern FT_Library gftlibrary; @@ -38,6 +39,9 @@ #define FATAL(...) #endif +// move to appropriate header +#define STAMP_DESIGNVECTOR (0x8000000 + 'd' + ('v' << 8)) + /** Driver specific types *****************************************************/ typedef enum @@ -56,10 +60,10 @@ typedef enum { - FILEFMT_TTF, - FILEFMT_OTF, - FILEFMT_FNT, -} FLE_FORMAT; + FILEFMT_TTF, /* TrueType font file */ + FILEFMT_OTF, /* OpenType font file */ + FILEFMT_FNT, /* Windows .fnt file */ +} FILE_FORMAT; //"Bold Italic Underline Strikeout" #define MAX_STYLESIZE 35 @@ -96,6 +100,7 @@ ULONG cNumFaces; ULONG ulFastCheckSum; ULONG ulFileFormat; + DESIGNVECTOR dv; PFTFD_FACE apface[1]; } FTFD_FILE, *PFTFD_FILE; 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] Sat May 7 16:40:33 2011 @@ -131,6 +131,21 @@ return NULL; } + } + + /* Check if there is a design vector */ + if (pfile->dv.dvReserved == STAMP_DESIGNVECTOR) + { + /* Set the coordinates */ + fterror = FT_Set_MM_Design_Coordinates(ftface, + pfile->dv.dvNumAxes, + pfile->dv.dvValues); + if (fterror) + { + /* Failure! */ + WARN("Failed to set design vector\n"); + return NULL; + } } // FIXME: quantize to 16.16 fixpoint @@ -464,11 +479,10 @@ switch (iMode) { case QFD_GLYPHANDBITMAP: - TRACE("QFD_GLYPHANDBITMAP\n"); - /* Load the requested glyph */ if (!FtfdLoadGlyph(pfont, hg, 0)) return FD_ERROR; + /* Render the glyph bitmap */ if (!FtRenderGlyphBitmap(pfont)) return FD_ERROR; if (pgd) FtfdQueryGlyphData(pfo, hg, pgd, pv); @@ -635,7 +649,20 @@ FtfdDestroyFont( FONTOBJ *pfo) { + PFTFD_FONT pfont = pfo->pvProducer; + TRACE("FtfdDestroyFont()\n"); - __debugbreak(); -} - + + /* Nothing to do? */ + if (!pfont) return; + + /* We don't need this anymore */ + pfo->pvProducer = NULL; + + /* Cleanup the freetype face for this font */ + FT_Done_Face(pfont->ftface); + + /* Free the font structure */ + EngFreeMem(pfont); +} + 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] Sat May 7 16:40:33 2011 @@ -6,8 +6,7 @@ - FtfdCompletePDEV: 100% done - FtfdDisablePDEV: 100% done - FtfdEscape: unimplemented, probably unneccessary -- FtfdLoadFontFile: 90% done - - handle DESIGNVECTOR +- FtfdLoadFontFile: 95% done - FtfdQueryFont: 70% done, depends on FtfdInitIfiMetrics - FtfdQueryFontTree: 70% done, depends on FtfdInitGlyphSet and FtfdInitKerningPairs - FtfdUnloadFontFile: 100% done, depends on FtfdDestroyFace @@ -28,7 +27,7 @@ - check possibility of FT_ADVANCE_FLAG_FAST_ONLY - FtfdQueryTrueTypeOutline: unimplemented - FtfdFontManagement: unimplemented, unneccessary -- FtfdDestroyFont: unimplemented, later +- FtfdDestroyFont: 100% implemented internal interface ------------------- 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] Sat May 7 16:40:33 2011 @@ -50,7 +50,7 @@ ULONG ulTag, PULONG pulLength) { - POTF_FILE_HEADER pFontHeader; + PTT_FILE_HEADER pFontHeader; PTT_COLLECTION pCollection; ULONG i, ulOffset, ulLength, ulNumTables, ulCheckSum; ASSERT(ulFont > 0); @@ -96,8 +96,8 @@ /* Check if number of tables is ok */ ulNumTables = GETW(&pFontHeader->usNumTables); - ulLength = ulNumTables * sizeof(OTF_TABLE_ENTRY); - if (ulLength + sizeof(OTF_FILE_HEADER) > cjView) + ulLength = ulNumTables * sizeof(TT_TABLE_ENTRY); + if (ulLength + sizeof(TT_FILE_HEADER) > cjView) { WARN("Too many tables (%ld)\n", ulNumTables); return NULL; @@ -311,7 +311,7 @@ { PFTFD_FILE pfile = pface->pfile; PVOID pvView = pfile->pvView; - POTF_OS2_DATA pOs2; + PTT_OS2_DATA pOs2; /* Get the OS/2 table for the face */ // FIXME: get the right table for the face, when multiple faces Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h [iso-8859-1] Sat May 7 16:40:33 2011 @@ -23,15 +23,15 @@ ULONG aulOffsetTable[1]; } TT_COLLECTION, *PTT_COLLECTION; -typedef struct _OTF_TABLE_ENTRY +typedef struct _TT_TABLE_ENTRY { ULONG ulTag; ULONG ulCheckSum; ULONG ulOffset; ULONG ulLength; -} OTF_TABLE_ENTRY, *POTF_TABLE_ENTRY; +} TT_TABLE_ENTRY, *PTT_TABLE_ENTRY; -typedef struct _OTF_FILE_HEADER +typedef struct _TT_FILE_HEADER { ULONG ulIdentifier; USHORT usNumTables; @@ -39,12 +39,12 @@ USHORT usEntrySelector; USHORT usRangeshift; - OTF_TABLE_ENTRY aTableEntries[1]; + TT_TABLE_ENTRY aTableEntries[1]; -} OTF_FILE_HEADER, *POTF_FILE_HEADER; +} TT_FILE_HEADER, *PTT_FILE_HEADER; #include <pshpack1.h> -typedef struct _OTF_OS2_DATA +typedef struct _TT_OS2_DATA { USHORT version; // 0x0004 SHORT xAvgCharWidth; @@ -91,5 +91,5 @@ USHORT usDefaultChar; USHORT usBreakChar; USHORT usMaxContext; -} OTF_OS2_DATA, *POTF_OS2_DATA; +} TT_OS2_DATA, *PTT_OS2_DATA; #include <poppack.h>

13 years, 6 months

[hpoussin] 51624: [smss] Display program which failed to run

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat May 7 16:31:49 2011 New Revision: 51624 URL: http://svn.reactos.org/svn/reactos?rev=51624&view=rev Log: [smss] Display program which failed to run Modified: trunk/reactos/base/system/smss/initrun.c Modified: trunk/reactos/base/system/smss/initrun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initrun.c… ============================================================================== --- trunk/reactos/base/system/smss/initrun.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initrun.c [iso-8859-1] Sat May 7 16:31:49 2011 @@ -85,8 +85,8 @@ NULL, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("SM: %s: running '$S' failed (Status=0x%08lx)\n", - __FUNCTION__, Status); + DPRINT1("SM: %s: running '%S' failed (Status=0x%08lx)\n", + __FUNCTION__, ImagePath, Status); } return(STATUS_SUCCESS); }

13 years, 6 months

[osiejka] 51623: [REGEDIT] - Polish translation update

by osiejka＠svn.reactos.org

Author: osiejka Date: Sat May 7 16:23:44 2011 New Revision: 51623 URL: http://svn.reactos.org/svn/reactos?rev=51623&view=rev Log: [REGEDIT] - Polish translation update Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Sat May 7 16:23:44 2011 @@ -3,7 +3,7 @@ * * Copyright 2005 Sebastian Gasiorek * - * Update by Caemyr - Olaf Siejka (Dec-Jan, 2007) + * Update by Caemyr - Olaf Siejka (Jan, 2007; May, 2011) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -402,8 +402,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Czy dodaæ dane do rejestru?" + IDS_IMPORTED_OK "Dane dopisane do rejestru" END /*****************************************************************/

13 years, 6 months

[mjmartin] 51622: [USBHUB_NEW] - Some devices implement a default Language, LangId of 0. Some do not. Use LangId 0x0409 (English) until LangId is implemented. - Remove an unused variable.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat May 7 16:10:09 2011 New Revision: 51622 URL: http://svn.reactos.org/svn/reactos?rev=51622&view=rev Log: [USBHUB_NEW] - Some devices implement a default Language, LangId of 0. Some do not. Use LangId 0x0409 (English) until LangId is implemented. - Remove an unused variable. Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c 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] Sat May 7 16:10:09 2011 @@ -688,21 +688,19 @@ // // Get the index string descriptor length + // FIXME: Implement LangIds // Status = GetUsbDeviceDescriptor(ChildDeviceObject, USB_STRING_DESCRIPTOR_TYPE, Index, - 0, + 0x0409, StringDesc, sizeof(USB_STRING_DESCRIPTOR)); - - // - // If lenght is 4 only then either this is a bad index or the device is not reporting - // - if (StringDesc->bLength == 4) - { - DPRINT1("USBHUB: Device Data Error\n"); - return STATUS_UNSUCCESSFUL; + if (!NT_SUCCESS(Status)) + { + DPRINT1("GetUsbDeviceDescriptor failed with status %x\n", Status); + ExFreePool(StringDesc); + return Status; } DPRINT1("StringDesc->bLength %d\n", StringDesc->bLength); @@ -724,19 +722,21 @@ DPRINT1("Failed to allocate buffer for string!\n"); return STATUS_INSUFFICIENT_RESOURCES; } + RtlZeroMemory(StringDesc, SizeNeeded); + // // Get the string // Status = GetUsbDeviceDescriptor(ChildDeviceObject, USB_STRING_DESCRIPTOR_TYPE, Index, - 0, + 0x0409, StringDesc, SizeNeeded); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get string from device\n"); + DPRINT1("GetUsbDeviceDescriptor failed with status %x\n", Status); ExFreePool(StringDesc); return Status; } Modified: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Sat May 7 16:10:09 2011 @@ -190,8 +190,6 @@ IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - ULONG i; - DriverObject->DriverExtension->AddDevice = USBHUB_AddDevice; DPRINT1("USBHUB: DriverEntry\n");

13 years, 6 months

[ilardig] 51621: [regedit] - Prompt before importing from the command line. - Inform the user about successful import from the command line and the menu. - Updated Spanish & Italian translations. S...

by ilardig＠svn.reactos.org

Author: ilardig Date: Sat May 7 14:53:32 2011 New Revision: 51621 URL: http://svn.reactos.org/svn/reactos?rev=51621&view=rev Log: [regedit] - Prompt before importing from the command line. - Inform the user about successful import from the command line and the menu. - Updated Spanish & Italian translations. See issue #6230 for more details. Modified: trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/resource.h Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,7 +393,7 @@ static BOOL ImportRegistryFile(HWND hWnd) { OPENFILENAME ofn; - TCHAR Caption[128]; + TCHAR Caption[128], szTitle[256], szText[256]; LPCTSTR pszKeyPath; HKEY hRootKey; @@ -414,6 +414,10 @@ fclose(fp); return FALSE; } + LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); + LoadString(hInst, IDS_IMPORTED_OK, szText, sizeof(szTitle)); + /* show successful import */ + MessageBox(NULL, szText, szTitle, MB_OK); fclose(fp); } else Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -394,6 +394,12 @@ IDS_FINISHEDFIND "Òúðñåíåòî â ðåãèñòúðà ïðèêëþ÷è." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -391,6 +391,12 @@ IDS_FINISHEDFIND "Prohledávání registru bylo dokonèeno." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Durchsuchen der Registry beendet." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "ÔÝëïò áíáæÞôçóçò óôç registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -381,6 +381,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -396,6 +396,12 @@ IDS_FINISHEDFIND "Finalizado la busqueda del registro." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Agregar los datos al registro?" + IDS_IMPORTED_OK "La información ha sido agregada al registro" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -396,6 +396,12 @@ IDS_FINISHEDFIND "Recherche dans le registre terminée." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -394,6 +394,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Selesai mencari seluruh registri." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -398,6 +398,12 @@ IDS_FINISHEDFIND "Fine ricerca nel registro." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Aggiungere l'informazione al registro?" + IDS_IMPORTED_OK "L'informazione è stata aggiunta al registro" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -391,6 +391,12 @@ IDS_FINISHEDFIND "WXgð·×ÄõµÜµ½B" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -378,6 +378,12 @@ IDS_FINISHEDFIND "·¹Áö½ºÆ®¸® °Ë»öÀ» ¿Ï·áÇß½À´Ï´Ù." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Søket i registret er fullført." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -400,6 +400,12 @@ IDS_FINISHEDFIND "Przeszukiwanie rejestru zakoñczone." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -394,6 +394,12 @@ IDS_FINISHEDFIND "Pesquisa do Registro concluída." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -384,6 +384,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -391,6 +391,12 @@ IDS_FINISHEDFIND "Ïîèñê â ðååñòðå çàâåðøåí." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -378,6 +378,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -391,6 +391,12 @@ IDS_FINISHEDFIND "Slutfört sökningen av registret." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -394,6 +394,12 @@ IDS_FINISHEDFIND "Ïîøóê ó ðåºñòð³ çàâåðøåíèé." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "×¢²á±íËÑË÷Íê±Ï¡£" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Sat May 7 14:53:32 2011 @@ -134,6 +134,7 @@ BOOL PerformRegAction(REGEDIT_ACTION action, LPWSTR s) { + TCHAR szTitle[256], szText[256]; switch (action) { case ACTION_ADD: @@ -162,6 +163,10 @@ } import_registry_file(fp); get_file_name(&s, filename); + LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); + LoadString(hInst, IDS_IMPORTED_OK, szText, sizeof(szTitle)); + /* show successful import */ + MessageBox(NULL, szText, szTitle, MB_OK); } break; } @@ -311,9 +316,18 @@ } if (*s && action == ACTION_UNDEF) - action = ACTION_ADD; - - if (action == ACTION_UNDEF) + { + TCHAR szTitle[256], szText[256]; + LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); + LoadString(hInst, IDS_IMPORT_PROMPT, szText, sizeof(szTitle)); + /* request import confirmation */ + if (MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) + { + action = ACTION_ADD; + } + else return TRUE; + } + if (action == ACTION_UNDEF) return FALSE; return PerformRegAction(action, s); Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] Sat May 7 14:53:32 2011 @@ -185,6 +185,8 @@ #define IDS_NEW_VALUE 31127 #define IDS_GOTO_SUGGESTED_KEY 31128 +#define IDS_IMPORT_PROMPT 31129 +#define IDS_IMPORTED_OK 31130 #define IDD_EDIT_STRING 2000 #define IDC_VALUE_NAME 2001

13 years, 6 months

[mjmartin] 51620: [USBHUB_NEW] - The lower level driver completes the SCE IRP whenever the change state has been modified for a port. When handling the SCE IRP completion only check for flags in ch...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat May 7 14:49:02 2011 New Revision: 51620 URL: http://svn.reactos.org/svn/reactos?rev=51620&view=rev Log: [USBHUB_NEW] - The lower level driver completes the SCE IRP whenever the change state has been modified for a port. When handling the SCE IRP completion only check for flags in change state. The Change flags must be cleared else the hub driver will get non stop SCE IRP completions. - Allocate IRP from Pool vice calling IoAllocateIrp. Dont free the IRP in the completion routine as the port driver, oddly, frees them. - GetUsbDeviceDescriptor: Remove use of MDL and use only buffer instead to make our new usbehci happy. - When calling the interface routines, correctly use the BusContext returned from the interface instead of the RootHubPdo. This worked on windows as it just happened they were the same. - Implement RootHubInitCallbackFunction, which only job currently is to send the first SCE IRP. - For Start Device for child device objects fake success for now. Will be implemented later. - Implement returning IRP_MN_QUERY_IDs, IRP_MN_QUERY_DEVICE_TEXTs and IRP_MN_QUERY_BUS_INFORMATION. - Add basic handling for IRP_MJ_POWER. - Misc code changes. 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.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] Sat May 7 14:49:02 2011 @@ -244,16 +244,18 @@ IN PVOID Context) { NTSTATUS Status; - PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT DeviceObject, RootHubDeviceObject; PHUB_DEVICE_EXTENSION HubDeviceExtension; PWORK_ITEM_DATA WorkItemData; PORT_STATUS_CHANGE PortStatus; LONG PortId; + DPRINT1("Entered DeviceStatusChangeThread, Context %x\n", Context); + static LONG failsafe = 0; WorkItemData = (PWORK_ITEM_DATA)Context; DeviceObject = (PDEVICE_OBJECT)WorkItemData->Context; HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - + RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; // // Loop all ports // @@ -262,7 +264,7 @@ // // Get Port Status // - Status = GetPortStatusAndChange(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, &PortStatus); + Status = GetPortStatusAndChange(RootHubDeviceObject, PortId, &PortStatus); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get port status for port %d, Status %x\n", PortId, Status); @@ -273,56 +275,105 @@ DPRINT1("Port %d Status %x\n", PortId, PortStatus.Status); DPRINT1("Port %d Change %x\n", PortId, PortStatus.Change); + // // Check for new device connection // - if ((PortStatus.Change == USB_PORT_STATUS_CONNECT) && (PortStatus.Status & USB_PORT_STATUS_CONNECT)) + if (PortStatus.Change & USB_PORT_STATUS_CONNECT) { // - // Clear Connection Status - // - Status = ClearPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, C_PORT_CONNECTION); + // Clear Port Connect + // + Status = ClearPortFeature(RootHubDeviceObject, PortId, C_PORT_CONNECTION); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to clear connection change for port %d\n", PortId); } - // No SCE completion done for clearing C_PORT_CONNECT - - // - // Reset Port - // - Status = SetPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, PORT_RESET); + // + // Is this a connect or disconnect? + // + if (!(PortStatus.Status & USB_PORT_STATUS_CONNECT)) + { + DPRINT1("Device disconnected from port %d\n", PortId); + + // + // FIXME: Remove the device, and deallocate memory + // + } + else + { + DPRINT1("Device connected from port %d\n", PortId); + + // No SCE completion done for clearing C_PORT_CONNECT + + // + // Reset Port + // + Status = SetPortFeature(RootHubDeviceObject, PortId, PORT_RESET); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reset port %d\n", PortId); + } + } + } + else if (PortStatus.Change & USB_PORT_STATUS_ENABLE) + { + // + // Clear Enable + // + Status = ClearPortFeature(RootHubDeviceObject, PortId, C_PORT_ENABLE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to reset port %d\n", PortId); + DPRINT1("Failed to clear enable change on port %d\n", PortId); } } - else if ((PortStatus.Change == USB_PORT_STATUS_ENABLE) && - (PortStatus.Status & (USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_ENABLE))) + else if (PortStatus.Change & USB_PORT_STATUS_RESET) { // - // Clear Enable - // - Status = ClearPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, C_PORT_ENABLE); + // Clear Reset + // + Status = ClearPortFeature(RootHubDeviceObject, PortId, C_PORT_RESET); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to clear enable change on port %d\n", PortId); - } - } - else if ((PortStatus.Change == USB_PORT_STATUS_RESET) && - (PortStatus.Status & (USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_ENABLE))) - { - // - // Clear Reset - // - Status = ClearPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, C_PORT_RESET); + DPRINT1("Failed to clear reset change on port %d\n", PortId); + } + + // + // Get Port Status + // + Status = GetPortStatusAndChange(RootHubDeviceObject, PortId, &PortStatus); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to clear reset change on port %d\n", PortId); - } - - // FIXME: Double Check Port Status + DPRINT1("Failed to get port status for port %d, Status %x\n", PortId, Status); + // FIXME: Do we really want to halt further SCE requests? + return; + } + + DPRINT1("Port %d Status %x\n", PortId, PortStatus.Status); + DPRINT1("Port %d Change %x\n", PortId, PortStatus.Change); + + if(PortStatus.Change & USB_PORT_STATUS_RESET) + { + DPRINT1("Port did not clear reset! Possible Hardware problem!\n"); + } + + // + // Make sure its Connected and Enabled + // + if (!(PortStatus.Status & (USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_ENABLE))) + { + DPRINT1("Usb Device is not connected and enabled!\n"); + // + // Attempt another reset + // + Status = SetPortFeature(RootHubDeviceObject, PortId, PORT_RESET); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reset port %d\n", PortId); + } + continue; + } // // Create the device object only if the port manipulation was started by a device connect @@ -335,14 +386,26 @@ } } + // + // FIXME: Still in testing + // + failsafe++; + if (failsafe > 100) + { + DPRINT1("SCE completed over 100 times but no action has been taken to clear the Change of any ports.\n"); + // + // Return and dont send any more SCE Requests + // + return; + } + ExFreePool(WorkItemData); // // Send another SCE Request // + DPRINT1("Sending another SCE!\n"); QueryStatusChangeEndpoint(DeviceObject); - - } NTSTATUS @@ -359,9 +422,10 @@ HubDeviceExtension = (PHUB_DEVICE_EXTENSION)RealDeviceObject->DeviceExtension; // - // Free the Irp - // - IoFreeIrp(Irp); + // NOTE: USBPORT frees this IRP + // + DPRINT1("Received Irp %x, HubDeviceExtension->PendingSCEIrp %x\n", Irp, HubDeviceExtension->PendingSCEIrp); + //IoFreeIrp(Irp); // // Create and initialize work item data @@ -373,6 +437,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } WorkItemData->Context = RealDeviceObject; + DPRINT1("Initialize work item\n"); ExInitializeWorkItem(&WorkItemData->WorkItem, (PWORKER_THREAD_ROUTINE)DeviceStatusChangeThread, (PVOID)WorkItemData); // @@ -391,15 +456,23 @@ IN PDEVICE_OBJECT DeviceObject) { NTSTATUS Status; + PDEVICE_OBJECT RootHubDeviceObject; PIO_STACK_LOCATION Stack; PHUB_DEVICE_EXTENSION HubDeviceExtension; + PURB PendingSCEUrb; HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; + + // + // Allocate a URB + // + PendingSCEUrb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB), USB_HUB_TAG); // // Initialize URB for Status Change Endpoint request // - UsbBuildInterruptOrBulkTransferRequest(&HubDeviceExtension->PendingSCEUrb, + UsbBuildInterruptOrBulkTransferRequest(PendingSCEUrb, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), HubDeviceExtension->PipeHandle, HubDeviceExtension->PortStatusChange, @@ -411,13 +484,20 @@ // // Set the device handle to null for roothub // - HubDeviceExtension->PendingSCEUrb.UrbHeader.UsbdDeviceHandle = NULL; + PendingSCEUrb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; // // Allocate an Irp // - HubDeviceExtension->PendingSCEIrp = IoAllocateIrp(HubDeviceExtension->RootHubPhysicalDeviceObject->StackSize, - FALSE); + + HubDeviceExtension->PendingSCEIrp = ExAllocatePoolWithTag(NonPagedPool, + IoSizeOfIrp(RootHubDeviceObject->StackSize), + USB_HUB_TAG); +/* + HubDeviceExtension->PendingSCEIrp = IoAllocateIrp(RootHubDeviceObject->StackSize, + FALSE); +*/ + DPRINT1("Allocated IRP %x\n", HubDeviceExtension->PendingSCEIrp); if (!HubDeviceExtension->PendingSCEIrp) { @@ -428,6 +508,10 @@ // // Initialize the IRP // + IoInitializeIrp(HubDeviceExtension->PendingSCEIrp, + IoSizeOfIrp(RootHubDeviceObject->StackSize), + RootHubDeviceObject->StackSize); + HubDeviceExtension->PendingSCEIrp->IoStatus.Status = STATUS_NOT_SUPPORTED; HubDeviceExtension->PendingSCEIrp->IoStatus.Information = 0; HubDeviceExtension->PendingSCEIrp->Flags = 0; @@ -437,8 +521,8 @@ // Get the Next Stack Location and Initialize it // Stack = IoGetNextIrpStackLocation(HubDeviceExtension->PendingSCEIrp); - Stack->DeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; - Stack->Parameters.Others.Argument1 = &HubDeviceExtension->PendingSCEUrb; + Stack->DeviceObject = DeviceObject; + Stack->Parameters.Others.Argument1 = PendingSCEUrb; Stack->Parameters.Others.Argument2 = NULL; Stack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; Stack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; @@ -456,7 +540,9 @@ // // Send to RootHub // - Status = IoCallDriver(HubDeviceExtension->RootHubPhysicalDeviceObject, HubDeviceExtension->PendingSCEIrp); + DPRINT1("DeviceObject is %x\n", DeviceObject); + DPRINT1("Iocalldriver %x with irp %x\n", RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); + Status = IoCallDriver(RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); return STATUS_PENDING; } @@ -524,16 +610,17 @@ IN ULONG TransferBufferLength) { NTSTATUS Status; + PDEVICE_OBJECT RootHubDeviceObject; PURB Urb; PHUB_DEVICE_EXTENSION HubDeviceExtension; PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; - PMDL BufferMdl; // // Get the Hubs Device Extension // ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)ChildDeviceObject->DeviceExtension; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) ChildDeviceExtension->ParentDeviceObject->DeviceExtension; + RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; // // Allocate a URB @@ -549,29 +636,6 @@ // Zero it // RtlZeroMemory(Urb, sizeof(URB)); - - // - // Create a MDL for buffer - // - BufferMdl = IoAllocateMdl(TransferBuffer, - TransferBufferLength, - FALSE, - FALSE, - NULL); - - // - // Update Physical Pages - // - _SEH2_TRY - { - MmBuildMdlForNonPagedPool(BufferMdl); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DPRINT1("MmBuildMdlForNonPagedPool Failed!\n"); - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; // // Create URB for getting device descriptor @@ -581,8 +645,8 @@ DescriptorType, Index, LangId, + TransferBuffer, NULL, - BufferMdl, TransferBufferLength, NULL); @@ -594,15 +658,10 @@ // // Query the Root Hub // - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); - - // - // Free Mdl - // - IoFreeMdl(BufferMdl); return Status; } @@ -636,7 +695,18 @@ 0, StringDesc, sizeof(USB_STRING_DESCRIPTOR)); - SizeNeeded = StringDesc->bLength; + + // + // If lenght is 4 only then either this is a bad index or the device is not reporting + // + if (StringDesc->bLength == 4) + { + DPRINT1("USBHUB: Device Data Error\n"); + return STATUS_UNSUCCESSFUL; + } + + DPRINT1("StringDesc->bLength %d\n", StringDesc->bLength); + SizeNeeded = StringDesc->bLength + sizeof(WCHAR); // // Free String @@ -647,14 +717,14 @@ // Recreate with appropriate size // StringDesc = ExAllocatePoolWithTag(NonPagedPool, - SizeNeeded + sizeof(USB_STRING_DESCRIPTOR), + SizeNeeded, USB_HUB_TAG); if (!StringDesc) { DPRINT1("Failed to allocate buffer for string!\n"); return STATUS_INSUFFICIENT_RESOURCES; } - + RtlZeroMemory(StringDesc, SizeNeeded); // // Get the string // @@ -663,7 +733,7 @@ Index, 0, StringDesc, - SizeNeeded + sizeof(USB_STRING_DESCRIPTOR)); + SizeNeeded); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get string from device\n"); @@ -672,11 +742,11 @@ } // - // Allocate Buffer and Save it + // Allocate Buffer to return // *TransferBuffer = ExAllocatePoolWithTag(NonPagedPool, - SizeNeeded, - USB_HUB_TAG); + SizeNeeded, + USB_HUB_TAG); if (!*TransferBuffer) { DPRINT1("Failed to allocate buffer for string!\n"); @@ -689,7 +759,7 @@ // // Copy the string to destination // - RtlCopyMemory(*TransferBuffer, StringDesc->bString, SizeNeeded); + RtlCopyMemory(*TransferBuffer, StringDesc->bString, SizeNeeded - FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); ExFreePool(StringDesc); @@ -707,18 +777,16 @@ PHUB_DEVICE_EXTENSION HubDeviceExtension; PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; PUSB_BUS_INTERFACE_HUB_V5 HubInterface; - ULONG ChildDeviceCount; + ULONG ChildDeviceCount, UsbDeviceNumber = 0; WCHAR CharDeviceName[64]; - ULONG UsbDeviceNumber = 0; UNICODE_STRING DeviceName; - USB_DEVICE_DESCRIPTOR DeviceDesc; - USB_CONFIGURATION_DESCRIPTOR ConfigDesc; - ULONG DeviceDescSize, ConfigDescSize; + ULONG ConfigDescSize, DeviceDescSize; + PVOID HubInterfaceBusContext; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) UsbHubDeviceObject->DeviceExtension; HubInterface = &HubDeviceExtension->HubInterface; RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; - + HubInterfaceBusContext = HubDeviceExtension->UsbDInterface.BusContext; // // Find an empty slot in the child device array // @@ -726,6 +794,7 @@ { if (HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] == NULL) { + DPRINT1("Found unused entry at %d\n", ChildDeviceCount); break; } } @@ -735,7 +804,7 @@ // if (ChildDeviceCount == USB_MAXCHILDREN) { - DPRINT1("Too many child devices!\n"); + DPRINT1("USBHUB: Too many child devices!\n"); return STATUS_UNSUCCESSFUL; } @@ -780,7 +849,7 @@ // if (!NT_SUCCESS(Status)) { - DPRINT1("IoCreateDevice failed with status %x\n", Status); + DPRINT1("USBHUB: IoCreateDevice failed with status %x\n", Status); return Status; } @@ -800,45 +869,49 @@ // // Create the UsbDeviceObject // - Status = HubInterface->CreateUsbDevice(RootHubDeviceObject, + Status = HubInterface->CreateUsbDevice(HubInterfaceBusContext, (PVOID)&UsbChildExtension->UsbDeviceHandle, HubDeviceExtension->RootHubHandle, - 0x503, //hack + 0x501, //hack PortId); if (!NT_SUCCESS(Status)) { - DPRINT1("CreateUsbDevice failed with status %x\n", Status); + DPRINT1("USBHUB: CreateUsbDevice failed with status %x\n", Status); goto Cleanup; } // // Initialize UsbDevice // - Status = HubInterface->InitializeUsbDevice(RootHubDeviceObject, UsbChildExtension->UsbDeviceHandle); + Status = HubInterface->InitializeUsbDevice(HubInterfaceBusContext, UsbChildExtension->UsbDeviceHandle); if (!NT_SUCCESS(Status)) { - DPRINT1("InitializeUsbDevice failed with status %x\n", Status); + DPRINT1("USBHUB: InitializeUsbDevice failed with status %x\n", Status); goto Cleanup; } + DPRINT1("Usb Device Handle %x\n", UsbChildExtension->UsbDeviceHandle); + + ConfigDescSize = sizeof(USB_CONFIGURATION_DESCRIPTOR); DeviceDescSize = sizeof(USB_DEVICE_DESCRIPTOR); - ConfigDescSize = sizeof(USB_CONFIGURATION_DESCRIPTOR); // // Get the descriptors // - Status = HubInterface->GetUsbDescriptors(RootHubDeviceObject, + Status = HubInterface->GetUsbDescriptors(HubInterfaceBusContext, UsbChildExtension->UsbDeviceHandle, - (PUCHAR)&DeviceDesc, + (PUCHAR)&UsbChildExtension->DeviceDesc, &DeviceDescSize, - (PUCHAR)&ConfigDesc, + (PUCHAR)&UsbChildExtension->ConfigDesc, &ConfigDescSize); if (!NT_SUCCESS(Status)) { - DPRINT1("GetUsbDescriptors failed with status %x\n", Status); + DPRINT1("USBHUB: GetUsbDescriptors failed with status %x\n", Status); goto Cleanup; } + DumpDeviceDescriptor(&UsbChildExtension->DeviceDesc); + // // Allocate memory for DeviceId // @@ -847,7 +920,7 @@ // // Construct DeviceId from vendor and product values // - swprintf(UsbChildExtension->DeviceId, L"USB\\Vid_%04x&Pid_%04x", DeviceDesc.idVendor, DeviceDesc.idProduct); + swprintf(UsbChildExtension->DeviceId, L"USB\\Vid_%04x&Pid_%04x", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct); DPRINT1("Usb Device Id %S\n", UsbChildExtension->DeviceId); @@ -859,26 +932,26 @@ // Get the product string // Status = GetUsbStringDescriptor(NewChildDeviceObject, - DeviceDesc.iProduct, + UsbChildExtension->DeviceDesc.iProduct, 0, (PVOID*)&UsbChildExtension->TextDescription); if (!NT_SUCCESS(Status)) { - DPRINT1("GetUsbStringDescriptor failed with status %x\n", Status); + DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); goto Cleanup; } DPRINT1("Usb TextDescription %S\n", UsbChildExtension->TextDescription); - + Status = GetUsbStringDescriptor(NewChildDeviceObject, - DeviceDesc.iSerialNumber, + UsbChildExtension->DeviceDesc.iSerialNumber, 0, (PVOID*)&UsbChildExtension->InstanceId); DPRINT1("Usb InstanceId %S\n", UsbChildExtension->InstanceId); if (!NT_SUCCESS(Status)) { - DPRINT1("GetUsbStringDescriptor failed with status %x\n", Status); + DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); goto Cleanup; } @@ -891,7 +964,6 @@ IoDeleteDevice(NewChildDeviceObject); return Status; - } NTSTATUS @@ -954,6 +1026,20 @@ return STATUS_SUCCESS; } +VOID +RootHubInitCallbackFunction( + PVOID Context) +{ + PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context; + + DPRINT1("Sending the initial SCE Request %x\n", DeviceObject); + + // + // Send the first SCE Request + // + QueryStatusChangeEndpoint(DeviceObject); +} + NTSTATUS USBHUB_FdoHandlePnp( IN PDEVICE_OBJECT DeviceObject, @@ -963,6 +1049,8 @@ NTSTATUS Status = STATUS_SUCCESS; ULONG_PTR Information = 0; PHUB_DEVICE_EXTENSION HubDeviceExtension; + PDEVICE_OBJECT RootHubDeviceObject; + PVOID HubInterfaceBusContext , UsbDInterfaceBusContext; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; @@ -973,11 +1061,11 @@ case IRP_MN_START_DEVICE: { PURB Urb; - ULONG Result = 0; PUSB_INTERFACE_DESCRIPTOR Pid; - ULONG PortId; + ULONG Result = 0, PortId; USBD_INTERFACE_LIST_ENTRY InterfaceList[2] = {{NULL, NULL}, {NULL, NULL}}; PURB ConfigUrb = NULL; + ULONG HubStatus; DPRINT1("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); @@ -995,6 +1083,7 @@ &HubDeviceExtension->RootHubPhysicalDeviceObject, &HubDeviceExtension->RootHubFunctionalDeviceObject); + RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; ASSERT(HubDeviceExtension->RootHubPhysicalDeviceObject); ASSERT(HubDeviceExtension->RootHubFunctionalDeviceObject); DPRINT1("RootPdo %x, RootFdo %x\n", @@ -1004,7 +1093,7 @@ // // Send the StartDevice to RootHub // - Status = ForwardIrpAndWait(HubDeviceExtension->RootHubPhysicalDeviceObject, Irp); + Status = ForwardIrpAndWait(RootHubDeviceObject, Irp); if (!NT_SUCCESS(Status)) { @@ -1015,14 +1104,14 @@ // // Get the current number of hubs // - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_GET_HUB_COUNT, &HubDeviceExtension->NumberOfHubs, NULL); // // Get the Hub Interface // - Status = QueryInterface(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = QueryInterface(RootHubDeviceObject, USB_BUS_INTERFACE_HUB_GUID, sizeof(USB_BUS_INTERFACE_HUB_V5), 5, @@ -1034,10 +1123,12 @@ return STATUS_UNSUCCESSFUL; } + HubInterfaceBusContext = HubDeviceExtension->HubInterface.BusContext; + // // Get the USBDI Interface // - Status = QueryInterface(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = QueryInterface(RootHubDeviceObject, USB_BUS_INTERFACE_USBDI_GUID, sizeof(USB_BUS_INTERFACE_USBDI_V2), 2, @@ -1049,10 +1140,12 @@ return Status; } + UsbDInterfaceBusContext = HubDeviceExtension->UsbDInterface.BusContext; + // // Get Root Hub Device Handle // - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, &HubDeviceExtension->RootHubHandle, NULL); @@ -1066,7 +1159,7 @@ // // Get Hub Device Information // - Status = HubDeviceExtension->HubInterface.QueryDeviceInformation(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = HubDeviceExtension->HubInterface.QueryDeviceInformation(HubInterfaceBusContext, HubDeviceExtension->RootHubHandle, &HubDeviceExtension->DeviceInformation, sizeof(USB_DEVICE_INFORMATION_0), @@ -1093,9 +1186,9 @@ sizeof(USB_DEVICE_DESCRIPTOR), NULL); - Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; - - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; + + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); @@ -1120,9 +1213,10 @@ sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR), NULL); - Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; - - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + DPRINT1("RootHub Handle %x\n", HubDeviceExtension->RootHubHandle); + Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; + + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); @@ -1136,8 +1230,8 @@ DumpConfigurationDescriptor(&HubDeviceExtension->HubConfigDescriptor); - Status = HubDeviceExtension->HubInterface.GetExtendedHubInformation(HubDeviceExtension->RootHubPhysicalDeviceObject, - HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = HubDeviceExtension->HubInterface.GetExtendedHubInformation(HubInterfaceBusContext, + RootHubDeviceObject, &HubDeviceExtension->UsbExtHubInfo, sizeof(USB_EXTHUB_INFORMATION_0), &Result); @@ -1157,24 +1251,21 @@ sizeof(Urb->UrbControlVendorClassRequest), USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, 0, + USB_REQUEST_GET_DESCRIPTOR, USB_DEVICE_CLASS_RESERVED, - 0, 0, &HubDeviceExtension->HubDescriptor, NULL, sizeof(USB_HUB_DESCRIPTOR), NULL); - Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; - - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; + + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); - // - // FIXME: This is returning nothing. - // DPRINT1("bDescriptorType %x\n", HubDeviceExtension->HubDescriptor.bDescriptorType); if (!NT_SUCCESS(Status)) @@ -1184,19 +1275,34 @@ return STATUS_UNSUCCESSFUL; } + HubStatus = 0; + UsbBuildGetStatusRequest(Urb, + URB_FUNCTION_GET_STATUS_FROM_DEVICE, + 0, + &HubStatus, + 0, + NULL); + Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; + + Status = SubmitRequestToRootHub(RootHubDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Hub Status!\n"); + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; + } + + DPRINT1("HubStatus %x\n", HubStatus); + // // Allocate memory for PortStatusChange to hold 2 USHORTs for each port on hub // HubDeviceExtension->PortStatusChange = ExAllocatePoolWithTag(NonPagedPool, sizeof(ULONG) * HubDeviceExtension->UsbExtHubInfo.NumberOfPorts, USB_HUB_TAG); - - // - // Initialize the Hub - // - Status = HubDeviceExtension->HubInterface.Initialize20Hub(HubDeviceExtension->RootHubPhysicalDeviceObject, - HubDeviceExtension->RootHubHandle, 1); - DPRINT1("Status %x\n", Status); // // Get the first Configuration Descriptor @@ -1212,7 +1318,7 @@ (PUSBD_INTERFACE_LIST_ENTRY)&InterfaceList); ASSERT(ConfigUrb != NULL); - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, ConfigUrb, NULL); @@ -1221,22 +1327,54 @@ HubDeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; DPRINT1("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); + // + // Initialize the Hub + // + Status = HubDeviceExtension->HubInterface.Initialize20Hub(HubInterfaceBusContext, + HubDeviceExtension->RootHubHandle, 1); + DPRINT1("Status %x\n", Status); + ExFreePool(ConfigUrb); // // Enable power on all ports // + + DPRINT1("Enabling PortPower on all ports!\n"); + for (PortId = 1; PortId <= HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++) { - Status = SetPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, PORT_POWER); + Status = SetPortFeature(RootHubDeviceObject, PortId, PORT_POWER); if (!NT_SUCCESS(Status)) DPRINT1("Failed to power on port %d\n", PortId); - } - - // - // Send the first SCE Request - // - QueryStatusChangeEndpoint(DeviceObject); + + Status = ClearPortFeature(RootHubDeviceObject, PortId, C_PORT_CONNECTION); + if (!NT_SUCCESS(Status)) + DPRINT1("Failed to power on port %d\n", PortId); + } + + DPRINT1("RootHubInitNotification %x\n", HubDeviceExtension->HubInterface.RootHubInitNotification); + // + // + // + if (HubDeviceExtension->HubInterface.RootHubInitNotification) + { + Status = HubDeviceExtension->HubInterface.RootHubInitNotification(HubInterfaceBusContext, + DeviceObject, + (PRH_INIT_CALLBACK)RootHubInitCallbackFunction); + } + else + { + // + // Send the first SCE Request + // + QueryStatusChangeEndpoint(DeviceObject); + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to set callback\n"); + } ExFreePool(Urb); break; 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] Sat May 7 14:49:02 2011 @@ -4,7 +4,7 @@ * FILE: drivers/usb/usbhub/fdo.c * PURPOSE: Handle PDO * PROGRAMMERS: - * Hervé Poussineau (hpoussin(a)reactos.org) + * HervÃ© Poussineau (hpoussin(a)reactos.org) * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ @@ -72,13 +72,22 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PHUB_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status = STATUS_UNSUCCESSFUL; + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + //NTSTATUS Status; DPRINT1("USBHUB_PdoStartDevice %x\n", DeviceObject); - DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // This should be a PDO + // + ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); + + // + // FIXME: Fow now assume success + // UNIMPLEMENTED - return Status; + return STATUS_SUCCESS; } NTSTATUS @@ -88,9 +97,9 @@ OUT ULONG_PTR* Information) { PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; - ULONG IdType; - PWCHAR SourceString = NULL; - NTSTATUS Status = STATUS_SUCCESS; + ULONG IdType, StringLength = 0; + PWCHAR SourceString = NULL, ReturnString = NULL; + NTSTATUS Status = STATUS_NOT_SUPPORTED; IdType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryId.IdType; ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -101,26 +110,48 @@ { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); SourceString = ChildDeviceExtension->DeviceId; + Status = STATUS_SUCCESS; break; } case BusQueryHardwareIDs: { + ULONG Index = 0, LastIndex; + PWCHAR Ptr; + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); - SourceString = ChildDeviceExtension->HardwareIds; - Status = STATUS_NOT_SUPPORTED; + + 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; break; } case BusQueryCompatibleIDs: { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); - SourceString = ChildDeviceExtension->CompatibleIds; - Status = STATUS_NOT_SUPPORTED; + //SourceString = ChildDeviceExtension->CompatibleIds; + //return STATUS_NOT_SUPPORTED; break; } case BusQueryInstanceID: { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); SourceString = ChildDeviceExtension->InstanceId; + Status = STATUS_SUCCESS; break; } default: @@ -128,7 +159,17 @@ return STATUS_NOT_SUPPORTED; } - *Information = (ULONG_PTR)SourceString; + if (SourceString) + { + StringLength = (wcslen(SourceString) + 1) * sizeof(WCHAR); + DPRINT1("StringLen %d\n", StringLength); + ReturnString = ExAllocatePool(PagedPool, StringLength); + RtlCopyMemory(ReturnString, SourceString, StringLength); + DPRINT1("%S\n", ReturnString); + } + + *Information = (ULONG_PTR)ReturnString; + return Status; } @@ -140,30 +181,47 @@ { PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; DEVICE_TEXT_TYPE DeviceTextType; + PWCHAR SourceString = NULL, ReturnString = NULL; + NTSTATUS Status = STATUS_SUCCESS; LCID LocaleId; + ULONG StrLen; DeviceTextType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.DeviceTextType; LocaleId = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.LocaleId; ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; + // + // FIXME: LocaleId + // + switch (DeviceTextType) { case DeviceTextDescription: case DeviceTextLocationInformation: { - if (DeviceTextType == DeviceTextDescription) - { - *Information = (ULONG_PTR)ChildDeviceExtension->TextDescription; - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); - } - else - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n"); - return STATUS_SUCCESS; + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); + SourceString = ChildDeviceExtension->TextDescription; + DPRINT1("%S\n", SourceString); + break; } default: + { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown device text type 0x%lx\n", DeviceTextType); - return STATUS_NOT_SUPPORTED; - } + Status = STATUS_NOT_SUPPORTED; + break; + } + } + + if (SourceString) + { + StrLen = (wcslen(SourceString) + 1) * sizeof(WCHAR); + ReturnString = ExAllocatePool(PagedPool, StrLen); + RtlCopyMemory(ReturnString, SourceString, StrLen); + DPRINT1("%S\n", ReturnString); + *Information = (ULONG_PTR)ReturnString; + } + + return Status; } NTSTATUS @@ -196,13 +254,13 @@ DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; // FIXME: capabilities can change with connected device DeviceCapabilities->LockSupported = TRUE; - DeviceCapabilities->EjectSupported = FALSE; - DeviceCapabilities->Removable = FALSE; + DeviceCapabilities->EjectSupported = TRUE; + DeviceCapabilities->Removable = TRUE; DeviceCapabilities->DockDevice = FALSE; - DeviceCapabilities->UniqueID = FALSE; + DeviceCapabilities->UniqueID = TRUE; DeviceCapabilities->SilentInstall = TRUE; DeviceCapabilities->RawDeviceOK = FALSE; - DeviceCapabilities->SurpriseRemovalOK = FALSE; + DeviceCapabilities->SurpriseRemovalOK = TRUE; DeviceCapabilities->HardwareDisabled = FALSE; //DeviceCapabilities->NoDisplayInUI = FALSE; DeviceCapabilities->DeviceState[0] = PowerDeviceD0; @@ -237,7 +295,6 @@ case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: { PIO_RESOURCE_REQUIREMENTS_LIST ResourceList; - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); ResourceList = ExAllocatePool(PagedPool, sizeof(IO_RESOURCE_REQUIREMENTS_LIST)); if (!ResourceList) @@ -268,9 +325,30 @@ Status = USBHUB_PdoQueryId(DeviceObject, Irp, &Information); break; } + case IRP_MN_QUERY_BUS_INFORMATION: + { + PPNP_BUS_INFORMATION BusInfo; + BusInfo = (PPNP_BUS_INFORMATION)ExAllocatePool(PagedPool, sizeof(PNP_BUS_INFORMATION)); + RtlCopyMemory(&BusInfo->BusTypeGuid, + &GUID_BUS_TYPE_USB, + sizeof(BusInfo->BusTypeGuid)); + BusInfo->LegacyBusType = PNPBus; + // FIXME + BusInfo->BusNumber = 0; + Information = (ULONG_PTR)BusInfo; + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_REMOVE_DEVICE: + { + // + // FIXME + // + Status = STATUS_SUCCESS; + } default: { - DPRINT1("ERROR PDO IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + DPRINT1("PDO IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); Information = Irp->IoStatus.Information; Status = Irp->IoStatus.Status; } Modified: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Sat May 7 14:49:02 2011 @@ -165,13 +165,24 @@ } NTSTATUS NTAPI -USBHUB_DispatchPnp(PDEVICE_OBJECT DeviceObject, PIRP Irp) +USBHUB_DispatchPnp( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) { DPRINT1("USBHUB: DispatchPnp\n"); if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) return USBHUB_FdoHandlePnp(DeviceObject, Irp); else return USBHUB_PdoHandlePnp(DeviceObject, Irp); +} + +NTSTATUS NTAPI +USBHUB_DispatchPower( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; } NTSTATUS NTAPI @@ -183,9 +194,6 @@ DriverObject->DriverExtension->AddDevice = USBHUB_AddDevice; DPRINT1("USBHUB: DriverEntry\n"); - - for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - DriverObject->MajorFunction[i] = USBHUB_IrpStub; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBHUB_Create; DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBHUB_Close; @@ -193,7 +201,8 @@ DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBHUB_DispatchDeviceControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBHUB_DispatchInternalDeviceControl; DriverObject->MajorFunction[IRP_MJ_PNP] = USBHUB_DispatchPnp; - - return STATUS_SUCCESS; -} - + DriverObject->MajorFunction[IRP_MJ_POWER] =USBHUB_DispatchPower; + + return STATUS_SUCCESS; +} + 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] Sat May 7 14:49:02 2011 @@ -1,6 +1,8 @@ #pragma once +#include <ntifs.h> #include <ntddk.h> +#include <wdmguid.h> #include <hubbusif.h> #include <usbbusif.h> #include <usbioctl.h> @@ -59,6 +61,8 @@ PWCHAR HardwareIds; PWCHAR CompatibleIds; PWCHAR TextDescription; + USB_DEVICE_DESCRIPTOR DeviceDesc; + USB_CONFIGURATION_DESCRIPTOR ConfigDesc; UNICODE_STRING SymbolicLinkName; } HUB_CHILDDEVICE_EXTENSION, *PHUB_CHILDDEVICE_EXTENSION;

13 years, 6 months

[ilardig] 51619: [regedit] - Fix formatting. No code changes.

by ilardig＠svn.reactos.org

Author: ilardig Date: Sat May 7 14:43:49 2011 New Revision: 51619 URL: http://svn.reactos.org/svn/reactos?rev=51619&view=rev Log: [regedit] - Fix formatting. No code changes. Modified: trunk/reactos/base/applications/regedit/resource.h Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] Sat May 7 14:43:49 2011 @@ -115,36 +115,36 @@ #define ID_HEXEDIT_SELECT_ALL 32839 #define IDS_LICENSE 32835 #define IDS_ERROR 32836 -#define IDS_BAD_VALUE 32837 -#define IDS_UNSUPPORTED_TYPE 32838 -#define IDS_TOO_BIG_VALUE 32839 -#define ID_EDIT_MODIFY_BIN 32840 -#define IDS_WARNING 32841 -#define IDS_MULTI_SZ_EMPTY_STRING 32842 -#define IDS_BINARY_EMPTY 32843 -#define IDS_DEFAULT_VALUE_NAME 32844 -#define IDS_VALUE_NOT_SET 32845 -#define IDS_UNKNOWN_TYPE 32846 -#define IDS_MY_COMPUTER 32847 -#define IDS_IMPORT_REG_FILE 32848 -#define IDS_EXPORT_REG_FILE 32849 -#define IDS_INVALID_DWORD 32850 -#define IDS_QUERY_DELETE_ONE 32851 -#define IDS_QUERY_DELETE_MORE 32852 -#define IDS_QUERY_DELETE_CONFIRM 32853 -#define IDS_ERR_DELVAL_CAPTION 32854 -#define IDS_ERR_DELETEVALUE 32855 -#define IDS_ERR_RENVAL_CAPTION 32856 -#define IDS_ERR_RENVAL_TOEMPTY 32857 +#define IDS_BAD_VALUE 32837 +#define IDS_UNSUPPORTED_TYPE 32838 +#define IDS_TOO_BIG_VALUE 32839 +#define ID_EDIT_MODIFY_BIN 32840 +#define IDS_WARNING 32841 +#define IDS_MULTI_SZ_EMPTY_STRING 32842 +#define IDS_BINARY_EMPTY 32843 +#define IDS_DEFAULT_VALUE_NAME 32844 +#define IDS_VALUE_NOT_SET 32845 +#define IDS_UNKNOWN_TYPE 32846 +#define IDS_MY_COMPUTER 32847 +#define IDS_IMPORT_REG_FILE 32848 +#define IDS_EXPORT_REG_FILE 32849 +#define IDS_INVALID_DWORD 32850 +#define IDS_QUERY_DELETE_ONE 32851 +#define IDS_QUERY_DELETE_MORE 32852 +#define IDS_QUERY_DELETE_CONFIRM 32853 +#define IDS_ERR_DELVAL_CAPTION 32854 +#define IDS_ERR_DELETEVALUE 32855 +#define IDS_ERR_RENVAL_CAPTION 32856 +#define IDS_ERR_RENVAL_TOEMPTY 32857 #define IDS_BAD_KEY 32858 -#define IDS_LOAD_HIVE 32859 -#define IDS_UNLOAD_HIVE 32860 +#define IDS_LOAD_HIVE 32859 +#define IDS_UNLOAD_HIVE 32860 #define ID_EDIT_NEW_MULTISTRINGVALUE 32861 #define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32862 #define ID_SWITCH_PANELS 32871 -#define ID_EDIT_PERMISSIONS 32872 +#define ID_EDIT_PERMISSIONS 32872 #define ID_TREE_DELETE 32873 #define ID_TREE_RENAME 32874 #define IDS_QUERY_DELETE_KEY_ONE 32875 @@ -155,30 +155,30 @@ #define ID_TREE_EXPORT 32888 #define ID_TREE_PERMISSIONS 32889 -#define IDS_FLT_REGFILE 31000 -#define IDS_FLT_REGFILES 31001 -#define IDS_FLT_REGFILES_FLT 31002 -#define IDS_FLT_REGEDIT4 31003 -#define IDS_FLT_REGEDIT4_FLT 31004 -#define IDS_FLT_ALLFILES 31005 -#define IDS_FLT_ALLFILES_FLT 31006 - -#define IDS_ACCESS_FULLCONTROL 31101 -#define IDS_ACCESS_READ 31102 -#define IDS_ACCESS_QUERYVALUE 31103 -#define IDS_ACCESS_SETVALUE 31104 -#define IDS_ACCESS_CREATESUBKEY 31105 -#define IDS_ACCESS_ENUMERATESUBKEYS 31106 -#define IDS_ACCESS_NOTIFY 31107 -#define IDS_ACCESS_CREATELINK 31108 -#define IDS_ACCESS_DELETE 31109 -#define IDS_ACCESS_WRITEDAC 31110 -#define IDS_ACCESS_WRITEOWNER 31111 -#define IDS_ACCESS_READCONTROL 31112 - -#define IDS_INHERIT_THISKEYONLY 31121 +#define IDS_FLT_REGFILE 31000 +#define IDS_FLT_REGFILES 31001 +#define IDS_FLT_REGFILES_FLT 31002 +#define IDS_FLT_REGEDIT4 31003 +#define IDS_FLT_REGEDIT4_FLT 31004 +#define IDS_FLT_ALLFILES 31005 +#define IDS_FLT_ALLFILES_FLT 31006 + +#define IDS_ACCESS_FULLCONTROL 31101 +#define IDS_ACCESS_READ 31102 +#define IDS_ACCESS_QUERYVALUE 31103 +#define IDS_ACCESS_SETVALUE 31104 +#define IDS_ACCESS_CREATESUBKEY 31105 +#define IDS_ACCESS_ENUMERATESUBKEYS 31106 +#define IDS_ACCESS_NOTIFY 31107 +#define IDS_ACCESS_CREATELINK 31108 +#define IDS_ACCESS_DELETE 31109 +#define IDS_ACCESS_WRITEDAC 31110 +#define IDS_ACCESS_WRITEOWNER 31111 +#define IDS_ACCESS_READCONTROL 31112 + +#define IDS_INHERIT_THISKEYONLY 31121 #define IDS_INHERIT_THISKEYANDSUBKEYS 31122 -#define IDS_INHERIT_SUBKEYSONLY 31123 +#define IDS_INHERIT_SUBKEYSONLY 31123 #define IDS_EXPAND 31124 #define IDS_COLLAPSE 31125 #define IDS_NEW_KEY 31126 @@ -186,39 +186,39 @@ #define IDS_GOTO_SUGGESTED_KEY 31128 -#define IDD_EDIT_STRING 2000 -#define IDC_VALUE_NAME 2001 -#define IDC_VALUE_DATA 2002 - -#define IDD_EDIT_DWORD 2003 -#define IDC_FORMAT_HEX 2004 -#define IDC_FORMAT_DEC 2005 - -#define IDD_EDIT_MULTI_STRING 2006 -#define IDD_EDIT_BIN_DATA 2007 - -#define IDC_EXPORT_ALL 2008 -#define IDC_EXPORT_BRANCH 2009 -#define IDC_EXPORT_BRANCH_TEXT 2010 - -#define IDD_LOADHIVE 2500 -#define IDC_EDIT_KEY 2501 - -#define IDC_FAVORITENAME 2011 -#define IDC_FAVORITESLIST 2012 -#define IDC_FINDWHAT 2013 -#define IDC_LOOKAT_KEYS 2014 -#define IDC_LOOKAT_VALUES 2015 -#define IDC_LOOKAT_DATA 2016 -#define IDC_MATCHSTRING 2017 -#define IDC_MATCHCASE 2018 - -#define IDS_FINISHEDFIND 2019 - -#define ID_FAVORITES_MIN 2100 -#define ID_FAVORITES_MAX 2999 - -#define ID_ACCEL 3000 - - -#define IDC_STATIC -1 +#define IDD_EDIT_STRING 2000 +#define IDC_VALUE_NAME 2001 +#define IDC_VALUE_DATA 2002 + +#define IDD_EDIT_DWORD 2003 +#define IDC_FORMAT_HEX 2004 +#define IDC_FORMAT_DEC 2005 + +#define IDD_EDIT_MULTI_STRING 2006 +#define IDD_EDIT_BIN_DATA 2007 + +#define IDC_EXPORT_ALL 2008 +#define IDC_EXPORT_BRANCH 2009 +#define IDC_EXPORT_BRANCH_TEXT 2010 + +#define IDD_LOADHIVE 2500 +#define IDC_EDIT_KEY 2501 + +#define IDC_FAVORITENAME 2011 +#define IDC_FAVORITESLIST 2012 +#define IDC_FINDWHAT 2013 +#define IDC_LOOKAT_KEYS 2014 +#define IDC_LOOKAT_VALUES 2015 +#define IDC_LOOKAT_DATA 2016 +#define IDC_MATCHSTRING 2017 +#define IDC_MATCHCASE 2018 + +#define IDS_FINISHEDFIND 2019 + +#define ID_FAVORITES_MIN 2100 +#define ID_FAVORITES_MAX 2999 + +#define ID_ACCEL 3000 + + +#define IDC_STATIC -1

13 years, 6 months

[tkreuzer] 51618: [GDI FONT DRIVER] - Make use of debugging macros (TRACE, WARN, ASSERT) - Handle unaligned data in the TrueType tables (arm for example doesn't like accessing unaligned data) - Han...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 7 13:36:02 2011 New Revision: 51618 URL: http://svn.reactos.org/svn/reactos?rev=51618&view=rev Log: [GDI FONT DRIVER] - Make use of debugging macros (TRACE, WARN, ASSERT) - Handle unaligned data in the TrueType tables (arm for example doesn't like accessing unaligned data) - Handle ulFont in FtfdQueryTrueTypeTable - some interface cleanup Added: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c - copied, changed from r51589, branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h (with props) Removed: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/enable.c 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/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] Sat May 7 13:36:02 2011 @@ -7,7 +7,7 @@ enable.c font.c glyph.c - opentype.c + tttables.c rosglue.c ${CMAKE_CURRENT_BINARY_DIR}/ftfd.def) Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/enable.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/enable.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/enable.c [iso-8859-1] Sat May 7 13:36:02 2011 @@ -41,7 +41,7 @@ { FT_Error fterror; - DbgPrint("FtfdEnableDriver()\n"); + TRACE("FtfdEnableDriver()\n"); /* Check parameter */ if (cj < sizeof(DRVENABLEDATA)) @@ -53,7 +53,7 @@ fterror = FT_Init_FreeType(&gftlibrary); if (fterror) { - DbgPrint("an error occurred during library initialization: %ld.\n", fterror); + WARN("Failed to initialize freetype library: %ld.\n", fterror); return FALSE; } @@ -82,7 +82,7 @@ IN LPWSTR pwszDeviceName, IN HANDLE hDriver) { - DbgPrint("FtfdEnablePDEV(hdev=%p)\n", hdev); + TRACE("FtfdEnablePDEV(hdev=%p)\n", hdev); /* Return a dummy DHPDEV */ return (PVOID)1; @@ -95,7 +95,7 @@ IN DHPDEV dhpdev, IN HDEV hdev) { - DbgPrint("FtfdCompletePDEV()\n"); + TRACE("FtfdCompletePDEV()\n"); /* Nothing to do */ } @@ -105,7 +105,7 @@ FtfdDisablePDEV( IN DHPDEV dhpdev) { - DbgPrint("FtfdDisablePDEV()\n"); + TRACE("FtfdDisablePDEV()\n"); /* Nothing to do */ } @@ -119,7 +119,7 @@ ULONG cjOut, PVOID pvOut) { - DbgPrint("FtfdEscape\n"); + TRACE("FtfdEscape\n"); __debugbreak(); return 0; } 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] Sat May 7 13:36:02 2011 @@ -30,7 +30,7 @@ goto done; allglyphs: - DbgPrint("using all glyphs\n"); + TRACE("using all glyphs\n"); /* Start over */ ulAccumCharWidth = 0; @@ -60,9 +60,11 @@ PFTFD_IFIMETRICS pifiex; PIFIMETRICS pifi; FT_Face ftface; + FT_Error fterror; + PS_FontInfoRec fontinfo; ULONG i; - DbgPrint("FtfdInitIfiMetrics()\n"); + TRACE("FtfdInitIfiMetrics()\n"); /* Get the freetype face pointer */ ftface = pface->ftface; @@ -90,9 +92,7 @@ } pifi->lEmbedId = 0; - pifi->lItalicAngle = 0; pifi->lCharBias = 0; - pifi->jWinPitchAndFamily = 0; // FIXME: generic way to get this? /* Set flags */ pifi->flInfo = FM_INFO_RETURNS_BITMAPS | FM_INFO_1BPP | FM_INFO_4BPP; @@ -138,9 +138,9 @@ pifi->fwdMacDescender = ftface->descender; pifi->fwdMacLineGap = 0; pifi->fwdAveCharWidth = 0; - pifi->fwdTypoAscender = pifi->fwdMacAscender; - pifi->fwdTypoDescender = pifi->fwdMacDescender; - pifi->fwdTypoLineGap = 0; + pifi->fwdTypoAscender = ftface->ascender; + pifi->fwdTypoDescender = ftface->descender; + pifi->fwdTypoLineGap = ftface->units_per_EM / 10; pifi->fwdMaxCharInc = ftface->max_advance_width; pifi->fwdCapHeight = 0; pifi->fwdXHeight = 0; @@ -195,6 +195,26 @@ pifi->panose.bMidline = PAN_ANY; pifi->panose.bXHeight = PAN_ANY; + /* Try to get type1 info from freetype */ + fterror = FT_Get_PS_Font_Info(pface->ftface, &fontinfo); + if (fterror == 0) + { + /* Set italic angle */ + pifi->lItalicAngle = fontinfo.italic_angle; + + /* Set pitch */ + if (fontinfo.is_fixed_pitch) + pifi->jWinPitchAndFamily = FIXED_PITCH; + else + pifi->jWinPitchAndFamily = VARIABLE_PITCH; + } + else + { + /* Set fallback values */ + pifi->lItalicAngle = 0; + pifi->jWinPitchAndFamily = 0; + } + EngMultiByteToUnicodeN(pifiex->awcFamilyName, LF_FACESIZE, NULL, @@ -214,7 +234,7 @@ strnlen(ftface->family_name, MAX_PATH)); /* Use OS/2 TrueType or OpenType tables */ - OtfGetIfiMetrics(pface, pifi); + FtfdGetWinMetrics(pface, pifi); if (pifi->fwdAveCharWidth == 0) pifi->fwdAveCharWidth = CalculateAveCharWidth(ftface); @@ -231,7 +251,7 @@ 4); - DbgPrint("Finished with the ifi: %p\n", pifi); + TRACE("Finished with the ifi: %p\n", pifi); //__debugbreak(); return TRUE; @@ -249,7 +269,7 @@ HGLYPH * phglyphs; WCHAR wcCurrent, wcPrev; - DbgPrint("FtfdInitGlyphSet()\n"); + TRACE("FtfdInitGlyphSet()\n"); /* Calculate FD_GLYPHSET size (incl. HGLYPH array!) */ cjSize = FIELD_OFFSET(FD_GLYPHSET, awcrun) @@ -260,7 +280,7 @@ pGlyphSet = EngAllocMem(0, cjSize, TAG_GLYPHSET); if (!pGlyphSet) { - DbgPrint("EngAllocMem() failed.\n"); + WARN("EngAllocMem() failed.\n"); return NULL; } @@ -293,7 +313,7 @@ pGlyphSet->awcrun[cRuns - 1].wcLow = wcCurrent; pGlyphSet->awcrun[cRuns - 1].cGlyphs = 1; pGlyphSet->awcrun[cRuns - 1].phg = &phglyphs[i]; - //DbgPrint("adding new run i=%ld, cRuns=%ld, wc=%x\n", i, cRuns, wcCurrent); + //TRACE("adding new run i=%ld, cRuns=%ld, wc=%x\n", i, cRuns, wcCurrent); } /* Get the next charcode and index */ @@ -301,7 +321,7 @@ wcCurrent = (WCHAR)FT_Get_Next_Char(ftface, wcCurrent, &index); } - DbgPrint("Done with font tree, %d runs\n", pGlyphSet->cRuns); + TRACE("Done with font tree, %d runs\n", pGlyphSet->cRuns); pface->pGlyphSet = pGlyphSet; return pGlyphSet; } @@ -310,7 +330,7 @@ FtfdInitKerningPairs( PFTFD_FACE pface) { - //DbgPrint("unimplemented\n"); + //WARN("unimplemented\n"); } static @@ -354,6 +374,7 @@ NTAPI FtfdCreateFace( PFTFD_FILE pfile, + ULONG iFace, FT_Face ftface) { PFTFD_FACE pface; @@ -365,11 +386,12 @@ pface = EngAllocMem(FL_ZERO_MEMORY, sizeof(FTFD_FACE), 'dftF'); if (!pface) { - DbgPrint("Couldn't allcate a face\n"); + WARN("Couldn't allcate a face\n"); return NULL; } pface->pfile = pfile; + pface->iFace = iFace; pface->ftface = ftface; pface->cGlyphs = ftface->num_glyphs; @@ -380,7 +402,7 @@ fterror = FT_Select_Charmap(ftface, FT_ENCODING_UNICODE); if (fterror) { - DbgPrint("ERROR: Could not load unicode charmap\n"); + WARN("Could not load unicode charmap\n"); return NULL; } @@ -456,19 +478,19 @@ FT_Face ftface; PFTFD_FILE pfile = NULL; - DbgPrint("FtfdLoadFontFile()\n"); + TRACE("FtfdLoadFontFile()\n"); /* Check parameters */ if (cFiles != 1) { - DbgPrint("ERROR: Only 1 File is allowed, got %ld!\n", cFiles); + WARN("Only 1 File is allowed, got %ld!\n", cFiles); return HFF_INVALID; } /* Map the font file */ if (!EngMapFontFileFD(*piFile, (PULONG*)&pvView, &cjView)) { - DbgPrint("ERROR: Could not map font file!\n"); + WARN("Could not map font file!\n"); return HFF_INVALID; } @@ -477,7 +499,7 @@ if (fterror) { /* Failure! */ - DbgPrint("ERROR: No faces found in file\n"); + WARN("No faces found in file\n"); goto error; } @@ -490,7 +512,7 @@ if (!pfile) { /* Failure! */ - DbgPrint("ERROR: EngAllocMem() failed.\n"); + WARN("EngAllocMem() failed.\n"); goto error; } @@ -502,10 +524,10 @@ pfile->ulFastCheckSum = ulFastCheckSum; /* Create a face */ - pfile->apface[0] = FtfdCreateFace(pfile, ftface); + pfile->apface[0] = FtfdCreateFace(pfile, 1, ftface); if (!pfile->apface[0]) { - DbgPrint("ERROR: FtfdCreateFace() failed.\n"); + WARN("FtfdCreateFace() failed.\n"); goto error; } @@ -519,16 +541,16 @@ fterror = FT_New_Memory_Face(gftlibrary, *ppvView, *pcjView, i, &ftface); if (fterror) { - DbgPrint("error\n"); + WARN("error\n"); __debugbreak(); goto error; } /* Store the face in the file structure */ - pfile->apface[i] = FtfdCreateFace(pfile, ftface); - } - - DbgPrint("Success! Returning %ld faces\n", cNumFaces); + pfile->apface[i] = FtfdCreateFace(pfile, i + 1, ftface); + } + + TRACE("Success! Returning %ld faces\n", cNumFaces); return (ULONG_PTR)pfile; error: @@ -552,12 +574,12 @@ PFTFD_FILE pfile = (PFTFD_FILE)diFile; PFTFD_FACE pface = pfile->apface[iFace - 1]; - DbgPrint("FtfdQueryFont()\n"); + TRACE("FtfdQueryFont()\n"); /* Validate parameters */ if (iFace > pfile->cNumFaces || !pid) { - DbgPrint("ERROR: iFace > pfile->cNumFaces || !pid\n"); + WARN("iFace > pfile->cNumFaces || !pid\n"); return NULL; } @@ -580,12 +602,12 @@ PFTFD_FILE pfile = (PFTFD_FILE)diFile; PFTFD_FACE pface; - DbgPrint("FtfdQueryFontTree(iMode=%ld)\n", iMode); + TRACE("FtfdQueryFontTree(iMode=%ld)\n", iMode); /* Validate parameters */ if (iFace > pfile->cNumFaces || !pid) { - DbgPrint("ERROR: iFace > pfile->cNumFaces || !pid\n"); + WARN("iFace > pfile->cNumFaces || !pid\n"); return NULL; } @@ -603,7 +625,7 @@ return pface->pKerningPairs; default: - DbgPrint("ERROR: invalid iMode: %ld\n", iMode); + WARN("Invalid iMode: %ld\n", iMode); } return NULL; @@ -617,7 +639,7 @@ PFTFD_FILE pfile = (PFTFD_FILE)diFile; ULONG i; - DbgPrint("FtfdUnloadFontFile()\n"); + TRACE("FtfdUnloadFontFile()\n"); /* Cleanup faces */ for (i = 0; i < pfile->cNumFaces; i++) @@ -633,7 +655,6 @@ return TRUE; } - LONG APIENTRY @@ -645,7 +666,7 @@ { PFTFD_FILE pfile = (PFTFD_FILE)diFile; - DbgPrint("FtfdQueryFontFile(ulMode=%ld)\n", ulMode); + TRACE("FtfdQueryFontFile(ulMode=%ld)\n", ulMode); switch (ulMode) { @@ -669,7 +690,7 @@ ULONG culCaps, ULONG *pulCaps) { - DbgPrint("FtfdQueryFontCaps()\n"); + TRACE("FtfdQueryFontCaps()\n"); /* We need room for 2 ULONGs */ if (culCaps < 2) @@ -684,101 +705,6 @@ return 2; } -LONG -APIENTRY -FtfdQueryTrueTypeTable( - ULONG_PTR diFile, - ULONG ulFont, - ULONG ulTag, - PTRDIFF dpStart, - ULONG cjBuf, - BYTE *pjBuf, - PBYTE *ppjTable, - ULONG *pcjTable) -{ - PFTFD_FILE pfile = (PFTFD_FILE)diFile; - PBYTE pjTable; - ULONG cjTable; - - DbgPrint("FtfdQueryTrueTypeTable\n"); - - /* Check if this file supports TrueType tables */ - if (pfile->ulFileFormat != FILEFMT_TTF && - pfile->ulFileFormat != FILEFMT_OTF) - { - DbgPrint("File format doesn't support true type tables\n"); - return FD_ERROR; - } - - // FIXME: handle ulFont - - /* Check if the whole file is requested */ - if (ulTag == 0) - { - /* Requested the whole file */ - pjTable = pfile->pvView; - cjTable = pfile->cjView; - } - else - { - /* Search for the table */ - pjTable = OtfFindTable(pfile->pvView, pfile->cjView, ulTag, &cjTable); - if (!pjTable) - { - DbgPrint("Couldn't find table '%.4s'\n", (char*)&ulTag); - return FD_ERROR; - } - } - - /* Return requested pointers */ - if (ppjTable) *ppjTable = pjTable; - if (pcjTable) *pcjTable = cjTable; - - /* Check if we shall copy data */ - if (pjBuf) - { - /* Check if the offset is inside the table */ - if (dpStart < 0 || (ULONG_PTR)dpStart >= cjTable) - { - DbgPrint("dpStart outside the table: %p\n", dpStart); - return FD_ERROR; - } - - /* Don't copy beyond the table end */ - cjTable -= dpStart; - - /* Don't copy more then the buffer can hold */ - if (cjBuf < cjTable) cjTable = cjBuf; - - /* Copy the data to the buffer */ - RtlCopyMemory(pjBuf, pjTable + dpStart, cjTable); - } - - return cjTable; -} - -PVOID -APIENTRY -FtfdGetTrueTypeFile( - ULONG_PTR diFile, - ULONG *pcj) -{ - PFTFD_FILE pfile = (PFTFD_FILE)diFile; - - DbgPrint("FtfdGetTrueTypeFile\n"); - - /* Check if this file is TrueType */ - if (pfile->ulFileFormat != FILEFMT_TTF && - pfile->ulFileFormat != FILEFMT_OTF) - { - DbgPrint("File format is not TrueType or Opentype\n"); - return NULL; - } - - /* Return the pointer and size */ - if (pcj) *pcj = pfile->cjView; - return pfile->pvView; -} #if 0 // not needed atm VOID @@ -787,7 +713,7 @@ PVOID pv, ULONG_PTR id) { - DbgPrint("FtfdFree()\n"); + TRACE("FtfdFree()\n"); EngFreeMem(pv); } #endif 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] Sat May 7 13:36:02 2011 @@ -11,14 +11,32 @@ #include <winddi.h> #include <ft2build.h> +#include FT_FREETYPE_H #include <freetype/ftadvanc.h> #include <freetype/ftxf86.h> -#include FT_FREETYPE_H +#include <freetype/t1tables.h> extern FT_Library gftlibrary; #define TAG_GLYPHSET 'GlSt' #define TAG_IFIMETRICS 'Ifim' + +#if 1// DBG +#define ASSERT(x) \ + if(!(x)) \ + { \ + DbgPrint("Assertion '%s' failed at %s:%i\n", #x, __FILE__, __LINE__); \ + __debugbreak(); \ + } +#define TRACE DbgPrint +#define WARN DbgPrint +#define FATAL DbgPrint +#else +#define ASSERT(x) +#define TRACE(...) +#define WARN(...) +#define FATAL(...) +#endif /** Driver specific types *****************************************************/ @@ -60,6 +78,7 @@ { struct _FTFD_FILE *pfile; FT_Face ftface; + ULONG iFace; ULONG ulFontFormat; ULONG cGlyphs; ULONG cMappings; @@ -276,16 +295,19 @@ ULONG_PTR iFile, ULONG *pcj); -VOID +/* Private interface */ + +PVOID NTAPI -OtfGetIfiMetrics( +FtfdFindTrueTypeTable( + PVOID pvView, + ULONG cjView, + ULONG iFace, + ULONG ulTag, + PULONG pulLength); + +VOID +NTAPI +FtfdGetWinMetrics( PFTFD_FACE pface, PIFIMETRICS pifi); - -PVOID -NTAPI -OtfFindTable( - PVOID pvView, - ULONG cjView, - ULONG ulTag, - PULONG pulLength); 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] Sat May 7 13:36:02 2011 @@ -58,7 +58,7 @@ if (fterror) { /* Failure! */ - DbgPrint("Error creating face\n"); + WARN("Error creating face\n"); EngFreeMem(pfont); return NULL; } @@ -127,7 +127,7 @@ if (fterror) { /* Failure! */ - DbgPrint("Error setting face size\n"); + WARN("Error setting face size\n"); return NULL; } @@ -167,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+32)/64); +TRACE("Created font with %ld (%ld)\n", yScale, (yScale+32)/64); //__debugbreak(); /* Set the pvProducer member of the fontobj */ @@ -203,14 +203,14 @@ FT_Face ftface = pfont->ftface; XFORMOBJ *pxo; - DbgPrint("FtfdQueryMaxExtents\n"); + TRACE("FtfdQueryMaxExtents\n"); if (pfddm) { if (cjSize < sizeof(FD_DEVICEMETRICS)) { /* Not enough space, fail */ - DbgPrint("ERROR: cjSize = %ld\n", cjSize); + WARN("cjSize = %ld\n", cjSize); return FD_ERROR; } @@ -283,7 +283,7 @@ fterror = FT_Load_Glyph(pfont->ftface, hg, 0); if (fterror) { - DbgPrint("FtfdLoadGlyph: couldn't load glyph 0x%lx\n", hg); + WARN("Couldn't load glyph 0x%lx\n", hg); pfont->hgSelected = -1; return FALSE; } @@ -400,7 +400,7 @@ 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", + WARN("Buffer too small, got %ld, need %ld\n", cjSize, cjBitmapSize + FIELD_OFFSET(GLYPHBITS, aj)); __debugbreak(); return; @@ -411,9 +411,9 @@ //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)); + TRACE("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)); } @@ -436,7 +436,7 @@ fterror = FT_Render_Glyph(pfont->ftface->glyph, FT_RENDER_MODE_NORMAL); if (fterror) { - DbgPrint("cound't render glyph\n"); + WARN("Cound't render glyph\n"); return FALSE; } @@ -458,13 +458,13 @@ { PFTFD_FONT pfont = FtfdGetFontInstance(pfo); - DbgPrint("FtfdQueryFontData, iMode=%ld, hg=%lx, pgd=%p, pv=%p, cjSize=%ld\n", - iMode, hg, pgd, pv, cjSize); + TRACE("FtfdQueryFontData, iMode=%ld, hg=%lx, pgd=%p, pv=%p, cjSize=%ld\n", + iMode, hg, pgd, pv, cjSize); switch (iMode) { case QFD_GLYPHANDBITMAP: - DbgPrint("QFD_GLYPHANDBITMAP\n"); + TRACE("QFD_GLYPHANDBITMAP\n"); /* Load the requested glyph */ if (!FtfdLoadGlyph(pfont, hg, 0)) return FD_ERROR; @@ -485,7 +485,7 @@ 4); case QFD_GLYPHANDOUTLINE: - DbgPrint("QFD_GLYPHANDOUTLINE\n"); + TRACE("QFD_GLYPHANDOUTLINE\n"); /* Load the requested glyph */ if (!FtfdLoadGlyph(pfont, hg, 1)) return FD_ERROR; @@ -505,19 +505,19 @@ return FtfdQueryMaxExtents(pfo, pv, cjSize); case QFD_TT_GRAY1_BITMAP: - DbgPrint("QFD_TT_GRAY1_BITMAP\n"); + TRACE("QFD_TT_GRAY1_BITMAP\n"); break; case QFD_TT_GRAY2_BITMAP: - DbgPrint("QFD_TT_GRAY2_BITMAP\n"); + TRACE("QFD_TT_GRAY2_BITMAP\n"); break; case QFD_TT_GRAY4_BITMAP: - DbgPrint("QFD_TT_GRAY4_BITMAP\n"); + TRACE("QFD_TT_GRAY4_BITMAP\n"); break; case QFD_TT_GRAY8_BITMAP: - DbgPrint("QFD_TT_GRAY8_BITMAP\n"); + TRACE("QFD_TT_GRAY8_BITMAP\n"); break; default: - DbgPrint("ERROR: Invalid iMode value: %lx\n", iMode); + WARN("Invalid iMode value: %lx\n", iMode); EngSetLastError(ERROR_INVALID_PARAMETER); return FD_ERROR; } @@ -534,12 +534,12 @@ FONTOBJ *pfo, ULONG iMode) { - DbgPrint("FtfdQueryGlyphAttrs\n"); + TRACE("FtfdQueryGlyphAttrs\n"); /* Verify parameters */ if (!pfo || iMode != FO_ATTR_MODE_ROTATE) { - DbgPrint("ERROR: invalid parameters: %p, %ld\n", pfo, iMode); + WARN("Invalid parameters: %p, %ld\n", pfo, iMode); return NULL; } @@ -567,7 +567,7 @@ FT_Error fterror; FT_Fixed advance; - DbgPrint("FtfdQueryAdvanceWidths\n"); + TRACE("FtfdQueryAdvanceWidths\n"); // FIXME: layout horizontal/vertical fl = (iMode == QAW_GETEASYWIDTHS) ? FT_ADVANCE_FLAG_FAST_ONLY : 0; @@ -581,7 +581,7 @@ fterror = FT_Get_Advance(ftface, (FT_UInt)phg[i], fl, &advance); if (fterror || advance > 0x0FFFF000) { - DbgPrint("ERROR: failed to query advance width hg=%lx, fl=0x%lx\n", + WARN("Failed to query advance width hg=%lx, fl=0x%lx\n", phg[i], fl); pusWidths[i] = 0xffff; bResult = FALSE; @@ -590,7 +590,7 @@ { /* 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); + //TRACE("Got advance width: hg=%lx, adv=%lx->%ld\n", phg[i], advance, pt.x); } } @@ -609,7 +609,7 @@ ULONG cjBuf, TTPOLYGONHEADER *ppoly) { - DbgPrint("FtfdQueryTrueTypeOutline\n"); + TRACE("FtfdQueryTrueTypeOutline\n"); __debugbreak(); return 0; } @@ -625,7 +625,7 @@ ULONG cjOut, PVOID pvOut) { - DbgPrint("FtfdFontManagement\n"); + TRACE("FtfdFontManagement\n"); __debugbreak(); return 0; } @@ -635,7 +635,7 @@ FtfdDestroyFont( FONTOBJ *pfo) { - DbgPrint("FtfdDestroyFont()\n"); + TRACE("FtfdDestroyFont()\n"); __debugbreak(); } Removed: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c (removed) @@ -1,440 +1,0 @@ -/* - * PROJECT: ReactOS win32 subsystem - * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: OpenType support for GDI font driver based on freetype - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * REFERENCES: http://www.microsoft.com/typography/otspec/ - * http://www.microsoft.com/typography/otspec/os2.htm - */ - -#include "ftfd.h" -#include <freetype/t1tables.h> - -// FIXME: we can have unaligned memory access, use: -#define GETW(px) = (((PUCHAR)px)[1] | ((PUCHAR)px)[0] << 8) -#define GETD(px) = (GETW((PUCHAR)px + 2) | GETW(px) << 16) - -#define SWAPW(x) _byteswap_ushort(x) -#define SWAPD(x) _byteswap_ulong(x) - -typedef struct _OTF_TABLE_ENTRY -{ - ULONG ulTag; - ULONG ulCheckSum; - ULONG ulOffset; - ULONG ulLength; -} OTF_TABLE_ENTRY, *POTF_TABLE_ENTRY; - -typedef struct _OTF_FILE_HEADER -{ - ULONG ulIdentifier; - USHORT usNumTables; - USHORT usSearchRange; - USHORT usEntrySelector; - USHORT usRangeshift; - - OTF_TABLE_ENTRY aTableEntries[1]; - -} OTF_FILE_HEADER, *POTF_FILE_HEADER; - -#include <pshpack1.h> -typedef struct _OTF_OS2_DATA -{ - USHORT version; // 0x0004 - SHORT xAvgCharWidth; - USHORT usWeightClass; - USHORT usWidthClass; - USHORT fsType; - SHORT ySubscriptXSize; - SHORT ySubscriptYSize; - SHORT ySubscriptXOffset; - SHORT ySubscriptYOffset; - SHORT ySuperscriptXSize; - SHORT ySuperscriptYSize; - SHORT ySuperscriptXOffset; - SHORT ySuperscriptYOffset; - SHORT yStrikeoutSize; - SHORT yStrikeoutPosition; - union // 0x30 - { - struct - { - BYTE jClassId; - BYTE jSubClassId; - }; - SHORT sFamilyClass; - }; - BYTE panose[10]; - ULONG ulUnicodeRange1; // Bits 0-31 - ULONG ulUnicodeRange2; // Bits 32-63 - ULONG ulUnicodeRange3; // Bits 64-95 - ULONG ulUnicodeRange4; // Bits 96-127 - CHAR achVendID[4]; - USHORT fsSelection; - USHORT usFirstCharIndex; - USHORT usLastCharIndex; - SHORT sTypoAscender; - SHORT sTypoDescender; - SHORT sTypoLineGap; - USHORT usWinAscent; - USHORT usWinDescent; - ULONG ulCodePageRange1; // Bits 0-31 - ULONG ulCodePageRange2; // Bits 32-63 - SHORT sxHeight; - SHORT sCapHeight; - USHORT usDefaultChar; - USHORT usBreakChar; - USHORT usMaxContext; -} OTF_OS2_DATA, *POTF_OS2_DATA; -#include <poppack.h> - -ULONG -CalcTableChecksum(PVOID pvTable, ULONG cjTable) -{ - PULONG pul = pvTable, pulEnd; - ULONG ulCheckSum = 0L; - - pulEnd = (PULONG)pvTable + (cjTable + 3) / sizeof(ULONG); - - while (pul < pulEnd) ulCheckSum += SWAPD(*pul++); - - return ulCheckSum; -} - -BOOL -OtfGetType1FontInfo( - PFTFD_FACE pface, - PIFIMETRICS pifi) -{ - FT_Error fterror; - PS_FontInfoRec fontinfo; - - fterror = FT_Get_PS_Font_Info(pface->ftface, &fontinfo); - if (fterror) - { - DbgPrint("ERROR: Failed to retrieve font info\n"); - return FALSE; - } - - /* Try to find the font weight */ - if (strncpy(fontinfo.weight, "Normal", 7) == 0) - pifi->usWinWeight = FW_NORMAL; - // else if (..) - else - pifi->usWinWeight = FW_REGULAR; - - pifi->lItalicAngle = fontinfo.italic_angle; - - /* Clear lower 2 bits and set FIXED_PITCH or VARIABLE_PITCH */ - pifi->jWinPitchAndFamily &= ~3; - if (fontinfo.is_fixed_pitch) - pifi->jWinPitchAndFamily |= FIXED_PITCH; - else - pifi->jWinPitchAndFamily |= VARIABLE_PITCH; - - return TRUE; -} - -/*! \name OtfFindTable - * \brief Searches for a specific table in TrueType and OpenType font files - * \param pvView - The address where the font file is mapped - * \param vjView - Size of the mapped font file - * \param ulTag - Identifier tag of the table to search - * \param pulLength - Pointer to an ULONG that recieves the table length, - * Can be NULL; - * \return Pointer to the table if successful, NULL if unsuccessful. - */ -PVOID -NTAPI -OtfFindTable( - PVOID pvView, - ULONG cjView, - ULONG ulTag, - PULONG pulLength) -{ - POTF_FILE_HEADER pFileHeader = pvView; - ULONG i, ulOffset, ulLength, ulNumTables, ulCheckSum; - - /* Verify the file header */ - if (pFileHeader->ulIdentifier != 'OTTO' && - pFileHeader->ulIdentifier != 'fctt' && - pFileHeader->ulIdentifier != 0x00000100) - { - DbgPrint("ERROR: Couldn't verify identifier: 0x%lx\n", - pFileHeader->ulIdentifier); - return NULL; - } - - /* Check if number of tables is ok */ - ulNumTables = SWAPW(pFileHeader->usNumTables); - ulLength = ulNumTables * sizeof(OTF_TABLE_ENTRY); - if (ulLength + sizeof(OTF_FILE_HEADER) > cjView) - { - DbgPrint("ERROR: Too many tables (%ld)\n", ulNumTables); - return NULL; - } - - /* Loop all tables */ - for (i = 0; i < ulNumTables; i++) - { - /* Compare the tag */ - if (pFileHeader->aTableEntries[i].ulTag == ulTag) - { - /* Get table offset and length */ - ulOffset = SWAPD(pFileHeader->aTableEntries[i].ulOffset); - ulLength = SWAPD(pFileHeader->aTableEntries[i].ulLength); - - /* Check if this is inside the file */ - if (ulOffset + ulLength > cjView || - ulOffset + ulLength < ulOffset) - { - DbgPrint("invalid table entry. %ld, %ld \n", ulOffset, ulLength); - return NULL; - } - - ulCheckSum = CalcTableChecksum((PUCHAR)pvView + ulOffset, ulLength); - if (ulCheckSum != SWAPD(pFileHeader->aTableEntries[i].ulCheckSum)) - { - DbgPrint("Checksum mitmatch! %ld, %ld \n", ulOffset, ulLength); - return NULL; - } - - if (pulLength) *pulLength = ulLength; - return (PUCHAR)pvView + ulOffset; - } - } - - /* Not found */ - return NULL; -} - -/*! \name OtfGetWinFamily - * \brief Translates IBM font class IDs into a Windows family bitfield - * \param jClassId - * \param jSubclassId - * \ref http://www.microsoft.com/typography/otspec/ibmfc.htm - */ -BYTE -OtfGetWinFamily(BYTE jClassId, BYTE jSubclassId) -{ - switch (jClassId) - { - case 0: // Class ID = 0 No Classification - break; - - case 1: // Class ID = 1 Oldstyle Serifs - switch (jSubclassId) - { - case 0: // Subclass ID = 0 : No Classification - case 1: // Subclass ID = 1 : IBM Rounded Legibility - case 2: // Subclass ID = 2 : Garalde - case 3: // Subclass ID = 3 : Venetian - case 4: // Subclass ID = 4 : Modified Venetian - case 5: // Subclass ID = 5 : Dutch Modern - case 6: // Subclass ID = 6 : Dutch Traditional - case 7: // Subclass ID = 7 : Contemporary - case 8: // Subclass ID = 8 : Calligraphic - case 15: // Subclass ID = 15 : Miscellaneous - default: // Subclass ID = 9-14 : (reserved for future use) - break; - } - - case 2: // Class ID = 2 Transitional Serifs - switch (jSubclassId) - { - case 15: return FF_ROMAN; // 15: Miscellaneous - case 0: // Subclass ID = 0 : No Classification - case 1: // Subclass ID = 1 : Direct Line - case 2: // Subclass ID = 2 : Script - default: // Subclass ID = 3-14 : (reserved for future use) - break; - } - - case 3: // Class ID = 3 Modern Serifs - switch (jSubclassId) - { - case 0: // Subclass ID = 0 : No Classification - case 1: // Subclass ID = 1 : Italian - case 2: // Subclass ID = 2 : Script - case 15: // Subclass ID = 15 : Miscellaneous - default: // Subclass ID = 3-14 : (reserved for future use) - break; - } - - case 4: // Class ID = 4 Clarendon Serifs - switch (jSubclassId) - { - case 0: // Subclass ID = 0 : No Classification - case 1: // Subclass ID = 1 : Clarendon - case 2: // Subclass ID = 2 : Modern - case 3: // Subclass ID = 3 : Traditional - case 4: // Subclass ID = 4 : Newspaper - case 5: // Subclass ID = 5 : Stub Serif - case 6: // Subclass ID = 6 : Monotone - case 7: // Subclass ID = 7 : Typewriter - case 15: // Subclass ID = 15 : Miscellaneous - default: // Subclass ID = 8-14: (reserved for future use) - break; - } - - case 5: // Class ID = 5 Slab Serifs - switch (jSubclassId) - { - case 0: // Subclass ID = 0 : No Classification - case 1: // Subclass ID = 1 : Monotone - case 2: // Subclass ID = 2 : Humanist - case 3: // Subclass ID = 3 : Geometric - case 4: // Subclass ID = 4 : Swiss - case 5: // Subclass ID = 5 : Typewriter - case 15: // Subclass ID = 15 : Miscellaneous - default: // Subclass ID = 6-14 : (reserved for future use) - break; - } - - case 7: // Class ID = 7 Freeform Serifs - switch (jSubclassId) - { - case 0: // Subclass ID = 0 : No Classification - case 1: // Subclass ID = 1 : Modern - case 15: // Subclass ID = 15 : Miscellaneous - default: // Subclass ID = 2-14 : (reserved for future use) - break; - } - - case 8: // Class ID = 8 Sans Serif - switch (jSubclassId) - { - case 0: return FF_SWISS; // 0: No Classification - case 5: return FF_SWISS; // 5: Neo-grotesque Gothic - case 15: return FF_SWISS|FF_ROMAN; // 15: Miscellaneous - - case 1: // Subclass ID = 1 : IBM Neo-grotesque Gothic - case 2: // Subclass ID = 2 : Humanist - case 3: // Subclass ID = 3 : Low-x Round Geometric - case 4: // Subclass ID = 4 : High-x Round Geometric - case 6: // Subclass ID = 6 : Modified Neo-grotesque Gothic - case 9: // Subclass ID = 9 : Typewriter Gothic - case 10: // Subclass ID = 10 : Matrix - default: // Subclass ID = 7-8, 11-14 : (reserved for future use) - break; - } - - case 9: // Class ID = 9 Ornamentals - switch (jSubclassId) - { - case 0: // Subclass ID = 0 : No Classification - case 1: // Subclass ID = 1 : Engraver - case 2: // Subclass ID = 2 : Black Letter - case 3: // Subclass ID = 3 : Decorative - case 4: // Subclass ID = 4 : Three Dimensional - case 15: // Subclass ID = 15 : Miscellaneous - default: // Subclass ID = 5-14 : (reserved for future use) - break; - } - - case 10: // Class ID = 10 Scripts - switch (jSubclassId) - { - case 0: // Subclass ID = 0 : No Classification - case 1: // Subclass ID = 1 : Uncial - case 2: // Subclass ID = 2 : Brush Joined - case 3: // Subclass ID = 3 : Formal Joined - case 4: // Subclass ID = 4 : Monotone Joined - case 5: // Subclass ID = 5 : Calligraphic - case 6: // Subclass ID = 6 : Brush Unjoined - case 7: // Subclass ID = 7 : Formal Unjoined - case 8: // Subclass ID = 8 : Monotone Unjoined - case 15: // Subclass ID = 15 : Miscellaneous - default: // Subclass ID = 9-14 : (reserved for future use) - break; - } - - case 12: // Class ID = 12 Symbolic - switch (jSubclassId) - { - case 0: // Subclass ID = 0 : No Classification - case 3: // Subclass ID = 3 : Mixed Serif - case 6: // Subclass ID = 6 : Oldstyle Serif - case 7: // Subclass ID = 7 : Neo-grotesque Sans Serif - case 15: // Subclass ID = 15 : Miscellaneous - default: // Subclass ID = 1-2,4-5,8-14 : (reserved for future use) - break; - } - - case 13: // Class ID = 13 Reserved - case 14: // Class ID = 14 Reserved - default: // Class ID = 6,11 (reserved for future use) - break; - } - -__debugbreak(); - return 0; -} - -VOID -NTAPI -OtfGetIfiMetrics( - PFTFD_FACE pface, - PIFIMETRICS pifi) -{ - PFTFD_FILE pfile = pface->pfile; - PVOID pvView = pfile->pvView; - POTF_OS2_DATA pOs2; - - /* Try to get type 1 info */ - OtfGetType1FontInfo(pface, pifi); - - /* Get the OS/2 table for the face */ - // FIXME: get the right table for the face, when multiple faces - pOs2 = OtfFindTable(pvView, pfile->cjView, '2/SO', NULL); - if (!pOs2) - { - DbgPrint("Couldn't find OS/2 table\n"); - return; - } - - //pifi->lEmbedId; - //pifi->lItalicAngle; - //pifi->lCharBias; - //pifi->jWinCharSet; - pifi->jWinPitchAndFamily &= 3; - pifi->jWinPitchAndFamily |= OtfGetWinFamily(pOs2->jClassId, pOs2->jSubClassId); - pifi->usWinWeight = SWAPW(pOs2->usWeightClass); - pifi->fsSelection = SWAPW(pOs2->fsSelection); - pifi->fsType = SWAPW(pOs2->fsType); - pifi->fwdWinAscender = SWAPW(pOs2->usWinAscent); - pifi->fwdWinDescender = SWAPW(pOs2->usWinDescent); - //pifi->fwdMacAscender; - //pifi->fwdMacDescender; - //pifi->fwdMacLineGap; - pifi->fwdTypoAscender = SWAPW(pOs2->sTypoAscender); - pifi->fwdTypoDescender = SWAPW(pOs2->sTypoDescender); - pifi->fwdTypoLineGap = SWAPW(pOs2->sTypoLineGap); - pifi->fwdAveCharWidth = SWAPW(pOs2->xAvgCharWidth); - pifi->fwdCapHeight = SWAPW(pOs2->sCapHeight); - pifi->fwdXHeight = SWAPW(pOs2->sxHeight); - pifi->fwdSubscriptXSize = SWAPW(pOs2->ySubscriptXSize); - pifi->fwdSubscriptYSize = SWAPW(pOs2->ySubscriptYSize); - pifi->fwdSubscriptXOffset = SWAPW(pOs2->ySubscriptXOffset); - pifi->fwdSubscriptYOffset = SWAPW(pOs2->ySubscriptYOffset); - pifi->fwdSuperscriptXSize = SWAPW(pOs2->ySuperscriptXSize); - pifi->fwdSuperscriptYSize = SWAPW(pOs2->ySuperscriptYSize); - pifi->fwdSuperscriptXOffset = SWAPW(pOs2->ySuperscriptXOffset); - pifi->fwdSuperscriptYOffset = SWAPW(pOs2->ySuperscriptYOffset); - //pifi->fwdUnderscoreSize; - //pifi->fwdUnderscorePosition; - pifi->fwdStrikeoutSize = SWAPW(pOs2->yStrikeoutSize); - pifi->fwdStrikeoutPosition = SWAPW(pOs2->yStrikeoutPosition); - pifi->wcFirstChar = SWAPW(pOs2->usFirstCharIndex); - pifi->wcLastChar = SWAPW(pOs2->usLastCharIndex); - pifi->wcDefaultChar = SWAPW(pOs2->usDefaultChar); - pifi->wcBreakChar = SWAPW(pOs2->usBreakChar); - *(DWORD*)pifi->achVendId = *(DWORD*)pOs2->achVendID; - //pifi->ulPanoseCulture; - pifi->panose = *(PANOSE*)pOs2->panose; - - /* Convert the special characters from unicode to ansi */ - EngUnicodeToMultiByteN(&pifi->chFirstChar, 4, NULL, &pifi->wcFirstChar, 3); - -} - Copied: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c (from r51589, branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Sat May 7 13:36:02 2011 @@ -8,169 +8,98 @@ */ #include "ftfd.h" -#include <freetype/t1tables.h> - -// FIXME: we can have unaligned memory access, use: -#define GETW(px) = (((PUCHAR)px)[1] | ((PUCHAR)px)[0] << 8) -#define GETD(px) = (GETW((PUCHAR)px + 2) | GETW(px) << 16) - -#define SWAPW(x) _byteswap_ushort(x) -#define SWAPD(x) _byteswap_ulong(x) - -typedef struct _OTF_TABLE_ENTRY -{ - ULONG ulTag; - ULONG ulCheckSum; - ULONG ulOffset; - ULONG ulLength; -} OTF_TABLE_ENTRY, *POTF_TABLE_ENTRY; - -typedef struct _OTF_FILE_HEADER -{ - ULONG ulIdentifier; - USHORT usNumTables; - USHORT usSearchRange; - USHORT usEntrySelector; - USHORT usRangeshift; - - OTF_TABLE_ENTRY aTableEntries[1]; - -} OTF_FILE_HEADER, *POTF_FILE_HEADER; - -#include <pshpack1.h> -typedef struct _OTF_OS2_DATA -{ - USHORT version; // 0x0004 - SHORT xAvgCharWidth; - USHORT usWeightClass; - USHORT usWidthClass; - USHORT fsType; - SHORT ySubscriptXSize; - SHORT ySubscriptYSize; - SHORT ySubscriptXOffset; - SHORT ySubscriptYOffset; - SHORT ySuperscriptXSize; - SHORT ySuperscriptYSize; - SHORT ySuperscriptXOffset; - SHORT ySuperscriptYOffset; - SHORT yStrikeoutSize; - SHORT yStrikeoutPosition; - union // 0x30 - { - struct - { - BYTE jClassId; - BYTE jSubClassId; - }; - SHORT sFamilyClass; - }; - BYTE panose[10]; - ULONG ulUnicodeRange1; // Bits 0-31 - ULONG ulUnicodeRange2; // Bits 32-63 - ULONG ulUnicodeRange3; // Bits 64-95 - ULONG ulUnicodeRange4; // Bits 96-127 - CHAR achVendID[4]; - USHORT fsSelection; - USHORT usFirstCharIndex; - USHORT usLastCharIndex; - SHORT sTypoAscender; - SHORT sTypoDescender; - SHORT sTypoLineGap; - USHORT usWinAscent; - USHORT usWinDescent; - ULONG ulCodePageRange1; // Bits 0-31 - ULONG ulCodePageRange2; // Bits 32-63 - SHORT sxHeight; - SHORT sCapHeight; - USHORT usDefaultChar; - USHORT usBreakChar; - USHORT usMaxContext; -} OTF_OS2_DATA, *POTF_OS2_DATA; -#include <poppack.h> - +#include "tttables.h" + +ULONG test_GETD(PVOID pv) +{ + PUSHORT pus = pv; + return (ULONG)_byteswap_ushort(pus[0]) << 16 | _byteswap_ushort(pus[1]); +} + +static ULONG CalcTableChecksum(PVOID pvTable, ULONG cjTable) { PULONG pul = pvTable, pulEnd; ULONG ulCheckSum = 0L; + ASSERT(!((ULONG_PTR)pvTable & 3)); pulEnd = (PULONG)pvTable + (cjTable + 3) / sizeof(ULONG); - while (pul < pulEnd) ulCheckSum += SWAPD(*pul++); + while (pul < pulEnd) ulCheckSum += GETD(pul++); return ulCheckSum; } -BOOL -OtfGetType1FontInfo( - PFTFD_FACE pface, - PIFIMETRICS pifi) -{ - FT_Error fterror; - PS_FontInfoRec fontinfo; - - fterror = FT_Get_PS_Font_Info(pface->ftface, &fontinfo); - if (fterror) - { - DbgPrint("ERROR: Failed to retrieve font info\n"); - return FALSE; - } - - /* Try to find the font weight */ - if (strncpy(fontinfo.weight, "Normal", 7) == 0) - pifi->usWinWeight = FW_NORMAL; - // else if (..) - else - pifi->usWinWeight = FW_REGULAR; - - pifi->lItalicAngle = fontinfo.italic_angle; - - /* Clear lower 2 bits and set FIXED_PITCH or VARIABLE_PITCH */ - pifi->jWinPitchAndFamily &= ~3; - if (fontinfo.is_fixed_pitch) - pifi->jWinPitchAndFamily |= FIXED_PITCH; - else - pifi->jWinPitchAndFamily |= VARIABLE_PITCH; - - return TRUE; -} - -/*! \name OtfFindTable +/*! \name FtfdFindTrueTypeTable * \brief Searches for a specific table in TrueType and OpenType font files * \param pvView - The address where the font file is mapped - * \param vjView - Size of the mapped font file + * \param cjView - Size of the mapped font file + * \param iFace - 1-based index of the font in the font file. * \param ulTag - Identifier tag of the table to search * \param pulLength - Pointer to an ULONG that recieves the table length, - * Can be NULL; + * Can be NULL. * \return Pointer to the table if successful, NULL if unsuccessful. */ PVOID NTAPI -OtfFindTable( +FtfdFindTrueTypeTable( PVOID pvView, ULONG cjView, + ULONG ulFont, ULONG ulTag, PULONG pulLength) { - POTF_FILE_HEADER pFileHeader = pvView; + POTF_FILE_HEADER pFontHeader; + PTT_COLLECTION pCollection; ULONG i, ulOffset, ulLength, ulNumTables, ulCheckSum; - - /* Verify the file header */ - if (pFileHeader->ulIdentifier != 'OTTO' && - pFileHeader->ulIdentifier != 'fctt' && - pFileHeader->ulIdentifier != 0x00000100) - { - DbgPrint("ERROR: Couldn't verify identifier: 0x%lx\n", - pFileHeader->ulIdentifier); + ASSERT(ulFont > 0); + + /* Check if this is a font collection */ + pCollection = pvView; + if (pCollection->ulTTCTag == 'fctt') + { + /* Check if we have enough fonts in the file */ + if (ulFont > GETD(&pCollection->ulNumFonts)) + { + WARN("ulFont too big: %ld\n", ulFont); + return NULL; + } + + /* Get the offset of the font we want */ + ulOffset = GETD(&pCollection->aulOffsetTable[ulFont - 1]); + if (ulOffset >= cjView) + { + WARN("Font %ld is not inside the mapped region\n", ulFont); + return NULL; + } + + /* Update the font position and remaining view size */ + pvView = (PUCHAR)pvView + ulOffset; + cjView -= ulOffset; + } + else if (ulFont > 1) + { + // Shouldn't happen + __debugbreak(); + } + + /* Verify the font header */ + pFontHeader = pvView; + if (pFontHeader->ulIdentifier != 'OTTO' && + pFontHeader->ulIdentifier != 0x00000100) + { + WARN("Bad font header: 0x%lx\n", + pFontHeader->ulIdentifier); return NULL; } /* Check if number of tables is ok */ - ulNumTables = SWAPW(pFileHeader->usNumTables); + ulNumTables = GETW(&pFontHeader->usNumTables); ulLength = ulNumTables * sizeof(OTF_TABLE_ENTRY); if (ulLength + sizeof(OTF_FILE_HEADER) > cjView) { - DbgPrint("ERROR: Too many tables (%ld)\n", ulNumTables); + WARN("Too many tables (%ld)\n", ulNumTables); return NULL; } @@ -178,27 +107,29 @@ for (i = 0; i < ulNumTables; i++) { /* Compare the tag */ - if (pFileHeader->aTableEntries[i].ulTag == ulTag) + if (pFontHeader->aTableEntries[i].ulTag == ulTag) { /* Get table offset and length */ - ulOffset = SWAPD(pFileHeader->aTableEntries[i].ulOffset); - ulLength = SWAPD(pFileHeader->aTableEntries[i].ulLength); + ulOffset = GETD(&pFontHeader->aTableEntries[i].ulOffset); + ulLength = GETD(&pFontHeader->aTableEntries[i].ulLength); /* Check if this is inside the file */ if (ulOffset + ulLength > cjView || ulOffset + ulLength < ulOffset) { - DbgPrint("invalid table entry. %ld, %ld \n", ulOffset, ulLength); + WARN("Invalid table entry. %ld, %ld \n", ulOffset, ulLength); return NULL; } + /* Check the table's checksum */ ulCheckSum = CalcTableChecksum((PUCHAR)pvView + ulOffset, ulLength); - if (ulCheckSum != SWAPD(pFileHeader->aTableEntries[i].ulCheckSum)) - { - DbgPrint("Checksum mitmatch! %ld, %ld \n", ulOffset, ulLength); + if (ulCheckSum != GETD(&pFontHeader->aTableEntries[i].ulCheckSum)) + { + WARN("Checksum mitmatch! %ld, %ld \n", ulOffset, ulLength); return NULL; } + /* Return size and pointer to the table */ if (pulLength) *pulLength = ulLength; return (PUCHAR)pvView + ulOffset; } @@ -208,14 +139,15 @@ return NULL; } -/*! \name OtfGetWinFamily +/*! \name GetWinFamily * \brief Translates IBM font class IDs into a Windows family bitfield * \param jClassId * \param jSubclassId * \ref http://www.microsoft.com/typography/otspec/ibmfc.htm */ +static BYTE -OtfGetWinFamily(BYTE jClassId, BYTE jSubclassId) +GetWinFamily(BYTE jClassId, BYTE jSubclassId) { switch (jClassId) { @@ -373,7 +305,7 @@ VOID NTAPI -OtfGetIfiMetrics( +FtfdGetWinMetrics( PFTFD_FACE pface, PIFIMETRICS pifi) { @@ -381,15 +313,12 @@ PVOID pvView = pfile->pvView; POTF_OS2_DATA pOs2; - /* Try to get type 1 info */ - OtfGetType1FontInfo(pface, pifi); - /* Get the OS/2 table for the face */ // FIXME: get the right table for the face, when multiple faces - pOs2 = OtfFindTable(pvView, pfile->cjView, '2/SO', NULL); + pOs2 = FtfdFindTrueTypeTable(pvView, pfile->cjView, pface->iFace, '2/SO', NULL); if (!pOs2) { - DbgPrint("Couldn't find OS/2 table\n"); + WARN("Couldn't find OS/2 table\n"); return; } @@ -398,37 +327,37 @@ //pifi->lCharBias; //pifi->jWinCharSet; pifi->jWinPitchAndFamily &= 3; - pifi->jWinPitchAndFamily |= OtfGetWinFamily(pOs2->jClassId, pOs2->jSubClassId); - pifi->usWinWeight = SWAPW(pOs2->usWeightClass); - pifi->fsSelection = SWAPW(pOs2->fsSelection); - pifi->fsType = SWAPW(pOs2->fsType); - pifi->fwdWinAscender = SWAPW(pOs2->usWinAscent); - pifi->fwdWinDescender = SWAPW(pOs2->usWinDescent); + pifi->jWinPitchAndFamily |= GetWinFamily(pOs2->jClassId, pOs2->jSubClassId); + pifi->usWinWeight = GETW(&pOs2->usWeightClass); + pifi->fsSelection = GETW(&pOs2->fsSelection); + pifi->fsType = GETW(&pOs2->fsType); + pifi->fwdWinAscender = GETW(&pOs2->usWinAscent); + pifi->fwdWinDescender = GETW(&pOs2->usWinDescent); //pifi->fwdMacAscender; //pifi->fwdMacDescender; //pifi->fwdMacLineGap; - pifi->fwdTypoAscender = SWAPW(pOs2->sTypoAscender); - pifi->fwdTypoDescender = SWAPW(pOs2->sTypoDescender); - pifi->fwdTypoLineGap = SWAPW(pOs2->sTypoLineGap); - pifi->fwdAveCharWidth = SWAPW(pOs2->xAvgCharWidth); - pifi->fwdCapHeight = SWAPW(pOs2->sCapHeight); - pifi->fwdXHeight = SWAPW(pOs2->sxHeight); - pifi->fwdSubscriptXSize = SWAPW(pOs2->ySubscriptXSize); - pifi->fwdSubscriptYSize = SWAPW(pOs2->ySubscriptYSize); - pifi->fwdSubscriptXOffset = SWAPW(pOs2->ySubscriptXOffset); - pifi->fwdSubscriptYOffset = SWAPW(pOs2->ySubscriptYOffset); - pifi->fwdSuperscriptXSize = SWAPW(pOs2->ySuperscriptXSize); - pifi->fwdSuperscriptYSize = SWAPW(pOs2->ySuperscriptYSize); - pifi->fwdSuperscriptXOffset = SWAPW(pOs2->ySuperscriptXOffset); - pifi->fwdSuperscriptYOffset = SWAPW(pOs2->ySuperscriptYOffset); + pifi->fwdTypoAscender = GETW(&pOs2->sTypoAscender); + pifi->fwdTypoDescender = GETW(&pOs2->sTypoDescender); + pifi->fwdTypoLineGap = GETW(&pOs2->sTypoLineGap); + pifi->fwdAveCharWidth = GETW(&pOs2->xAvgCharWidth); + pifi->fwdCapHeight = GETW(&pOs2->sCapHeight); + pifi->fwdXHeight = GETW(&pOs2->sxHeight); + pifi->fwdSubscriptXSize = GETW(&pOs2->ySubscriptXSize); + pifi->fwdSubscriptYSize = GETW(&pOs2->ySubscriptYSize); + pifi->fwdSubscriptXOffset = GETW(&pOs2->ySubscriptXOffset); + pifi->fwdSubscriptYOffset = GETW(&pOs2->ySubscriptYOffset); + pifi->fwdSuperscriptXSize = GETW(&pOs2->ySuperscriptXSize); + pifi->fwdSuperscriptYSize = GETW(&pOs2->ySuperscriptYSize); + pifi->fwdSuperscriptXOffset = GETW(&pOs2->ySuperscriptXOffset); + pifi->fwdSuperscriptYOffset = GETW(&pOs2->ySuperscriptYOffset); //pifi->fwdUnderscoreSize; //pifi->fwdUnderscorePosition; - pifi->fwdStrikeoutSize = SWAPW(pOs2->yStrikeoutSize); - pifi->fwdStrikeoutPosition = SWAPW(pOs2->yStrikeoutPosition); - pifi->wcFirstChar = SWAPW(pOs2->usFirstCharIndex); - pifi->wcLastChar = SWAPW(pOs2->usLastCharIndex); - pifi->wcDefaultChar = SWAPW(pOs2->usDefaultChar); - pifi->wcBreakChar = SWAPW(pOs2->usBreakChar); + pifi->fwdStrikeoutSize = GETW(&pOs2->yStrikeoutSize); + pifi->fwdStrikeoutPosition = GETW(&pOs2->yStrikeoutPosition); + pifi->wcFirstChar = GETW(&pOs2->usFirstCharIndex); + pifi->wcLastChar = GETW(&pOs2->usLastCharIndex); + pifi->wcDefaultChar = GETW(&pOs2->usDefaultChar); + pifi->wcBreakChar = GETW(&pOs2->usBreakChar); *(DWORD*)pifi->achVendId = *(DWORD*)pOs2->achVendID; //pifi->ulPanoseCulture; pifi->panose = *(PANOSE*)pOs2->panose; @@ -438,3 +367,104 @@ } + +/** Public Interface **********************************************************/ + +LONG +APIENTRY +FtfdQueryTrueTypeTable( + ULONG_PTR diFile, + ULONG ulFont, + ULONG ulTag, + PTRDIFF dpStart, + ULONG cjBuf, + BYTE *pjBuf, + PBYTE *ppjTable, + ULONG *pcjTable) +{ + PFTFD_FILE pfile = (PFTFD_FILE)diFile; + PBYTE pjTable; + ULONG cjTable; + + TRACE("FtfdQueryTrueTypeTable\n"); + + /* Check if this file supports TrueType tables */ + if (pfile->ulFileFormat != FILEFMT_TTF && + pfile->ulFileFormat != FILEFMT_OTF) + { + WARN("File format doesn't support true type tables\n"); + return FD_ERROR; + } + + /* Check if the whole file is requested */ + if (ulTag == 0) + { + /* Requested the whole file */ + pjTable = pfile->pvView; + cjTable = pfile->cjView; + } + else + { + /* Search for the table */ + pjTable = FtfdFindTrueTypeTable(pfile->pvView, + pfile->cjView, + ulFont, + ulTag, + &cjTable); + if (!pjTable) + { + WARN("Couldn't find table '%.4s'\n", (char*)&ulTag); + return FD_ERROR; + } + } + + /* Return requested pointers */ + if (ppjTable) *ppjTable = pjTable; + if (pcjTable) *pcjTable = cjTable; + + /* Check if we shall copy data */ + if (pjBuf) + { + /* Check if the offset is inside the table */ + if (dpStart < 0 || (ULONG_PTR)dpStart >= cjTable) + { + WARN("dpStart outside the table: %p\n", dpStart); + return FD_ERROR; + } + + /* Don't copy beyond the table end */ + cjTable -= dpStart; + + /* Don't copy more then the buffer can hold */ + if (cjBuf < cjTable) cjTable = cjBuf; + + /* Copy the data to the buffer */ + RtlCopyMemory(pjBuf, pjTable + dpStart, cjTable); + } + + return cjTable; +} + +PVOID +APIENTRY +FtfdGetTrueTypeFile( + ULONG_PTR diFile, + ULONG *pcj) +{ + PFTFD_FILE pfile = (PFTFD_FILE)diFile; + + TRACE("FtfdGetTrueTypeFile\n"); + + /* Check if this file is TrueType */ + if (pfile->ulFileFormat != FILEFMT_TTF && + pfile->ulFileFormat != FILEFMT_OTF) + { + WARN("File format is not TrueType or Opentype\n"); + return NULL; + } + + /* Return the pointer and size */ + if (pcj) *pcj = pfile->cjView; + return pfile->pvView; +} + Added: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h (added) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h [iso-8859-1] Sat May 7 13:36:02 2011 @@ -1,0 +1,95 @@ + +/* We need these to access unaligned big endian data */ +FORCEINLINE +USHORT GETW(PVOID pv) +{ + PBYTE pj = pv; + return (((USHORT)pj[0]) << 8) | ((USHORT)pj[1]); +} + +FORCEINLINE +ULONG GETD(PVOID pv) +{ + PBYTE pj = pv; + return (((ULONG)pj[0]) << 24) | (((ULONG)pj[1]) << 16) | + (((ULONG)pj[2]) << 8) | ((ULONG)pj[3]); +} + +typedef struct _TT_COLLECTION +{ + ULONG ulTTCTag; + ULONG ulVersion; + ULONG ulNumFonts; + ULONG aulOffsetTable[1]; +} TT_COLLECTION, *PTT_COLLECTION; + +typedef struct _OTF_TABLE_ENTRY +{ + ULONG ulTag; + ULONG ulCheckSum; + ULONG ulOffset; + ULONG ulLength; +} OTF_TABLE_ENTRY, *POTF_TABLE_ENTRY; + +typedef struct _OTF_FILE_HEADER +{ + ULONG ulIdentifier; + USHORT usNumTables; + USHORT usSearchRange; + USHORT usEntrySelector; + USHORT usRangeshift; + + OTF_TABLE_ENTRY aTableEntries[1]; + +} OTF_FILE_HEADER, *POTF_FILE_HEADER; + +#include <pshpack1.h> +typedef struct _OTF_OS2_DATA +{ + USHORT version; // 0x0004 + SHORT xAvgCharWidth; + USHORT usWeightClass; + USHORT usWidthClass; + USHORT fsType; + SHORT ySubscriptXSize; + SHORT ySubscriptYSize; + SHORT ySubscriptXOffset; + SHORT ySubscriptYOffset; + SHORT ySuperscriptXSize; + SHORT ySuperscriptYSize; + SHORT ySuperscriptXOffset; + SHORT ySuperscriptYOffset; + SHORT yStrikeoutSize; + SHORT yStrikeoutPosition; + union // 0x30 + { + struct + { + BYTE jClassId; + BYTE jSubClassId; + }; + SHORT sFamilyClass; + }; + BYTE panose[10]; + ULONG ulUnicodeRange1; // Bits 0-31 + ULONG ulUnicodeRange2; // Bits 32-63 + ULONG ulUnicodeRange3; // Bits 64-95 + ULONG ulUnicodeRange4; // Bits 96-127 + CHAR achVendID[4]; + USHORT fsSelection; + USHORT usFirstCharIndex; + USHORT usLastCharIndex; + SHORT sTypoAscender; + SHORT sTypoDescender; + SHORT sTypoLineGap; + USHORT usWinAscent; + USHORT usWinDescent; + ULONG ulCodePageRange1; // Bits 0-31 + ULONG ulCodePageRange2; // Bits 32-63 + SHORT sxHeight; + SHORT sCapHeight; + USHORT usDefaultChar; + USHORT usBreakChar; + USHORT usMaxContext; +} OTF_OS2_DATA, *POTF_OS2_DATA; +#include <poppack.h> Propchange: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 6 months

[spetreolle] 51617: [MSCONFIG] Fix typo in startuppage.h, this fixes build without compilation units.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat May 7 12:45:59 2011 New Revision: 51617 URL: http://svn.reactos.org/svn/reactos?rev=51617&view=rev Log: [MSCONFIG] Fix typo in startuppage.h, this fixes build without compilation units. Modified: trunk/reactos/base/applications/msconfig/startuppage.h Modified: trunk/reactos/base/applications/msconfig/startuppage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/startuppage.h [iso-8859-1] Sat May 7 12:45:59 2011 @@ -2,7 +2,7 @@ #define _STARTUPPAGE_H_ extern HWND hStartupPage; -extern HWND hStartupPageListCtrl; +extern HWND hStartupListCtrl; INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);

13 years, 6 months

[akhaldi] 51616: [KERNEL32/NLS] * Sync nls files to wine 1.3.19 * Escape some characters to fix MSVC build * Patch by Igor Paliychuk <mansonigor at gmail com>

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 7 11:22:08 2011 New Revision: 51616 URL: http://svn.reactos.org/svn/reactos?rev=51616&view=rev Log: [KERNEL32/NLS] * Sync nls files to wine 1.3.19 * Escape some characters to fix MSVC build * Patch by Igor Paliychuk <mansonigor at gmail com> Modified: trunk/reactos/dll/win32/kernel32/nls/afk.nls trunk/reactos/dll/win32/kernel32/nls/ara.nls trunk/reactos/dll/win32/kernel32/nls/arb.nls trunk/reactos/dll/win32/kernel32/nls/are.nls trunk/reactos/dll/win32/kernel32/nls/arg.nls trunk/reactos/dll/win32/kernel32/nls/arh.nls trunk/reactos/dll/win32/kernel32/nls/ari.nls trunk/reactos/dll/win32/kernel32/nls/arj.nls trunk/reactos/dll/win32/kernel32/nls/ark.nls trunk/reactos/dll/win32/kernel32/nls/arl.nls trunk/reactos/dll/win32/kernel32/nls/arm.nls trunk/reactos/dll/win32/kernel32/nls/aro.nls trunk/reactos/dll/win32/kernel32/nls/arq.nls trunk/reactos/dll/win32/kernel32/nls/ars.nls trunk/reactos/dll/win32/kernel32/nls/art.nls trunk/reactos/dll/win32/kernel32/nls/aru.nls trunk/reactos/dll/win32/kernel32/nls/ary.nls trunk/reactos/dll/win32/kernel32/nls/aze.nls trunk/reactos/dll/win32/kernel32/nls/azl.nls trunk/reactos/dll/win32/kernel32/nls/bel.nls trunk/reactos/dll/win32/kernel32/nls/bgr.nls trunk/reactos/dll/win32/kernel32/nls/brf.nls trunk/reactos/dll/win32/kernel32/nls/cat.nls trunk/reactos/dll/win32/kernel32/nls/chs.nls trunk/reactos/dll/win32/kernel32/nls/cht.nls trunk/reactos/dll/win32/kernel32/nls/csy.nls trunk/reactos/dll/win32/kernel32/nls/cym.nls trunk/reactos/dll/win32/kernel32/nls/dan.nls trunk/reactos/dll/win32/kernel32/nls/dea.nls trunk/reactos/dll/win32/kernel32/nls/dec.nls trunk/reactos/dll/win32/kernel32/nls/del.nls trunk/reactos/dll/win32/kernel32/nls/des.nls trunk/reactos/dll/win32/kernel32/nls/deu.nls trunk/reactos/dll/win32/kernel32/nls/div.nls trunk/reactos/dll/win32/kernel32/nls/ell.nls trunk/reactos/dll/win32/kernel32/nls/ena.nls trunk/reactos/dll/win32/kernel32/nls/enb.nls trunk/reactos/dll/win32/kernel32/nls/enc.nls trunk/reactos/dll/win32/kernel32/nls/eng.nls trunk/reactos/dll/win32/kernel32/nls/eni.nls trunk/reactos/dll/win32/kernel32/nls/enj.nls trunk/reactos/dll/win32/kernel32/nls/enl.nls trunk/reactos/dll/win32/kernel32/nls/enp.nls trunk/reactos/dll/win32/kernel32/nls/ens.nls trunk/reactos/dll/win32/kernel32/nls/ent.nls trunk/reactos/dll/win32/kernel32/nls/enu.nls trunk/reactos/dll/win32/kernel32/nls/enw.nls trunk/reactos/dll/win32/kernel32/nls/enz.nls trunk/reactos/dll/win32/kernel32/nls/esa.nls trunk/reactos/dll/win32/kernel32/nls/esb.nls trunk/reactos/dll/win32/kernel32/nls/esc.nls trunk/reactos/dll/win32/kernel32/nls/esd.nls trunk/reactos/dll/win32/kernel32/nls/ese.nls trunk/reactos/dll/win32/kernel32/nls/esf.nls trunk/reactos/dll/win32/kernel32/nls/esg.nls trunk/reactos/dll/win32/kernel32/nls/esh.nls trunk/reactos/dll/win32/kernel32/nls/esi.nls trunk/reactos/dll/win32/kernel32/nls/esl.nls trunk/reactos/dll/win32/kernel32/nls/esm.nls trunk/reactos/dll/win32/kernel32/nls/esn.nls trunk/reactos/dll/win32/kernel32/nls/eso.nls trunk/reactos/dll/win32/kernel32/nls/esp.nls trunk/reactos/dll/win32/kernel32/nls/esr.nls trunk/reactos/dll/win32/kernel32/nls/ess.nls trunk/reactos/dll/win32/kernel32/nls/esu.nls trunk/reactos/dll/win32/kernel32/nls/esv.nls trunk/reactos/dll/win32/kernel32/nls/esy.nls trunk/reactos/dll/win32/kernel32/nls/esz.nls trunk/reactos/dll/win32/kernel32/nls/eti.nls trunk/reactos/dll/win32/kernel32/nls/euq.nls trunk/reactos/dll/win32/kernel32/nls/far.nls trunk/reactos/dll/win32/kernel32/nls/fin.nls trunk/reactos/dll/win32/kernel32/nls/fos.nls trunk/reactos/dll/win32/kernel32/nls/fra.nls trunk/reactos/dll/win32/kernel32/nls/frb.nls trunk/reactos/dll/win32/kernel32/nls/frc.nls trunk/reactos/dll/win32/kernel32/nls/frl.nls trunk/reactos/dll/win32/kernel32/nls/frm.nls trunk/reactos/dll/win32/kernel32/nls/frs.nls trunk/reactos/dll/win32/kernel32/nls/glc.nls trunk/reactos/dll/win32/kernel32/nls/guj.nls trunk/reactos/dll/win32/kernel32/nls/heb.nls trunk/reactos/dll/win32/kernel32/nls/hin.nls trunk/reactos/dll/win32/kernel32/nls/hrv.nls trunk/reactos/dll/win32/kernel32/nls/hun.nls trunk/reactos/dll/win32/kernel32/nls/hye.nls trunk/reactos/dll/win32/kernel32/nls/ind.nls trunk/reactos/dll/win32/kernel32/nls/isl.nls trunk/reactos/dll/win32/kernel32/nls/ita.nls trunk/reactos/dll/win32/kernel32/nls/its.nls trunk/reactos/dll/win32/kernel32/nls/jpn.nls trunk/reactos/dll/win32/kernel32/nls/kan.nls trunk/reactos/dll/win32/kernel32/nls/kat.nls trunk/reactos/dll/win32/kernel32/nls/kkz.nls trunk/reactos/dll/win32/kernel32/nls/knk.nls trunk/reactos/dll/win32/kernel32/nls/kor.nls trunk/reactos/dll/win32/kernel32/nls/kyr.nls trunk/reactos/dll/win32/kernel32/nls/lth.nls trunk/reactos/dll/win32/kernel32/nls/lvi.nls trunk/reactos/dll/win32/kernel32/nls/mar.nls trunk/reactos/dll/win32/kernel32/nls/mki.nls trunk/reactos/dll/win32/kernel32/nls/mon.nls trunk/reactos/dll/win32/kernel32/nls/msb.nls trunk/reactos/dll/win32/kernel32/nls/msl.nls trunk/reactos/dll/win32/kernel32/nls/nlb.nls trunk/reactos/dll/win32/kernel32/nls/nld.nls trunk/reactos/dll/win32/kernel32/nls/non.nls trunk/reactos/dll/win32/kernel32/nls/nor.nls trunk/reactos/dll/win32/kernel32/nls/pan.nls trunk/reactos/dll/win32/kernel32/nls/plk.nls trunk/reactos/dll/win32/kernel32/nls/ptb.nls trunk/reactos/dll/win32/kernel32/nls/ptg.nls trunk/reactos/dll/win32/kernel32/nls/rmc.nls trunk/reactos/dll/win32/kernel32/nls/rom.nls trunk/reactos/dll/win32/kernel32/nls/rus.nls trunk/reactos/dll/win32/kernel32/nls/san.nls trunk/reactos/dll/win32/kernel32/nls/sky.nls trunk/reactos/dll/win32/kernel32/nls/slv.nls trunk/reactos/dll/win32/kernel32/nls/sqi.nls trunk/reactos/dll/win32/kernel32/nls/srb.nls trunk/reactos/dll/win32/kernel32/nls/srl.nls trunk/reactos/dll/win32/kernel32/nls/sve.nls trunk/reactos/dll/win32/kernel32/nls/svf.nls trunk/reactos/dll/win32/kernel32/nls/swk.nls trunk/reactos/dll/win32/kernel32/nls/syr.nls trunk/reactos/dll/win32/kernel32/nls/tam.nls trunk/reactos/dll/win32/kernel32/nls/tel.nls trunk/reactos/dll/win32/kernel32/nls/tha.nls trunk/reactos/dll/win32/kernel32/nls/trk.nls trunk/reactos/dll/win32/kernel32/nls/ttt.nls trunk/reactos/dll/win32/kernel32/nls/ukr.nls trunk/reactos/dll/win32/kernel32/nls/urd.nls trunk/reactos/dll/win32/kernel32/nls/uzb.nls trunk/reactos/dll/win32/kernel32/nls/uzl.nls trunk/reactos/dll/win32/kernel32/nls/vit.nls trunk/reactos/dll/win32/kernel32/nls/zhh.nls trunk/reactos/dll/win32/kernel32/nls/zhi.nls trunk/reactos/dll/win32/kernel32/nls/zhm.nls trunk/reactos/include/psdk/winnls.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/nls/afk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/afk… Modified: trunk/reactos/dll/win32/kernel32/nls/ara.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ara… Modified: trunk/reactos/dll/win32/kernel32/nls/arb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arb… Modified: trunk/reactos/dll/win32/kernel32/nls/are.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/are… Modified: trunk/reactos/dll/win32/kernel32/nls/arg.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arg… Modified: trunk/reactos/dll/win32/kernel32/nls/arh.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arh… Modified: trunk/reactos/dll/win32/kernel32/nls/ari.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ari… Modified: trunk/reactos/dll/win32/kernel32/nls/arj.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arj… Modified: trunk/reactos/dll/win32/kernel32/nls/ark.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ark… Modified: trunk/reactos/dll/win32/kernel32/nls/arl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arl… Modified: trunk/reactos/dll/win32/kernel32/nls/arm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arm… Modified: trunk/reactos/dll/win32/kernel32/nls/aro.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/aro… Modified: trunk/reactos/dll/win32/kernel32/nls/arq.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arq… Modified: trunk/reactos/dll/win32/kernel32/nls/ars.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ars… Modified: trunk/reactos/dll/win32/kernel32/nls/art.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/art… Modified: trunk/reactos/dll/win32/kernel32/nls/aru.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/aru… Modified: trunk/reactos/dll/win32/kernel32/nls/ary.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ary… Modified: trunk/reactos/dll/win32/kernel32/nls/aze.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/aze… Modified: trunk/reactos/dll/win32/kernel32/nls/azl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/azl… Modified: trunk/reactos/dll/win32/kernel32/nls/bel.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/bel… Modified: trunk/reactos/dll/win32/kernel32/nls/bgr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/bgr… Modified: trunk/reactos/dll/win32/kernel32/nls/brf.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/brf… Modified: trunk/reactos/dll/win32/kernel32/nls/cat.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/cat… Modified: trunk/reactos/dll/win32/kernel32/nls/chs.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/chs… Modified: trunk/reactos/dll/win32/kernel32/nls/cht.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/cht… Modified: trunk/reactos/dll/win32/kernel32/nls/csy.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/csy… Modified: trunk/reactos/dll/win32/kernel32/nls/cym.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/cym… Modified: trunk/reactos/dll/win32/kernel32/nls/dan.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/dan… Modified: trunk/reactos/dll/win32/kernel32/nls/dea.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/dea… Modified: trunk/reactos/dll/win32/kernel32/nls/dec.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/dec… Modified: trunk/reactos/dll/win32/kernel32/nls/del.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/del… Modified: trunk/reactos/dll/win32/kernel32/nls/des.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/des… Modified: trunk/reactos/dll/win32/kernel32/nls/deu.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/deu… Modified: trunk/reactos/dll/win32/kernel32/nls/div.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/div… Modified: trunk/reactos/dll/win32/kernel32/nls/ell.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ell… Modified: trunk/reactos/dll/win32/kernel32/nls/ena.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ena… Modified: trunk/reactos/dll/win32/kernel32/nls/enb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enb… Modified: trunk/reactos/dll/win32/kernel32/nls/enc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enc… Modified: trunk/reactos/dll/win32/kernel32/nls/eng.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/eng… Modified: trunk/reactos/dll/win32/kernel32/nls/eni.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/eni… Modified: trunk/reactos/dll/win32/kernel32/nls/enj.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enj… Modified: trunk/reactos/dll/win32/kernel32/nls/enl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enl… Modified: trunk/reactos/dll/win32/kernel32/nls/enp.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enp… Modified: trunk/reactos/dll/win32/kernel32/nls/ens.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ens… Modified: trunk/reactos/dll/win32/kernel32/nls/ent.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ent… Modified: trunk/reactos/dll/win32/kernel32/nls/enu.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enu… Modified: trunk/reactos/dll/win32/kernel32/nls/enw.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enw… Modified: trunk/reactos/dll/win32/kernel32/nls/enz.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enz… Modified: trunk/reactos/dll/win32/kernel32/nls/esa.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esa… Modified: trunk/reactos/dll/win32/kernel32/nls/esb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esb… Modified: trunk/reactos/dll/win32/kernel32/nls/esc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esc… Modified: trunk/reactos/dll/win32/kernel32/nls/esd.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esd… Modified: trunk/reactos/dll/win32/kernel32/nls/ese.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ese… Modified: trunk/reactos/dll/win32/kernel32/nls/esf.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esf… Modified: trunk/reactos/dll/win32/kernel32/nls/esg.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esg… Modified: trunk/reactos/dll/win32/kernel32/nls/esh.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esh… Modified: trunk/reactos/dll/win32/kernel32/nls/esi.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esi… Modified: trunk/reactos/dll/win32/kernel32/nls/esl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esl… Modified: trunk/reactos/dll/win32/kernel32/nls/esm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esm… Modified: trunk/reactos/dll/win32/kernel32/nls/esn.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esn… Modified: trunk/reactos/dll/win32/kernel32/nls/eso.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/eso… Modified: trunk/reactos/dll/win32/kernel32/nls/esp.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esp… Modified: trunk/reactos/dll/win32/kernel32/nls/esr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esr… Modified: trunk/reactos/dll/win32/kernel32/nls/ess.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ess… Modified: trunk/reactos/dll/win32/kernel32/nls/esu.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esu… Modified: trunk/reactos/dll/win32/kernel32/nls/esv.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esv… Modified: trunk/reactos/dll/win32/kernel32/nls/esy.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esy… Modified: trunk/reactos/dll/win32/kernel32/nls/esz.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esz… Modified: trunk/reactos/dll/win32/kernel32/nls/eti.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/eti… Modified: trunk/reactos/dll/win32/kernel32/nls/euq.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/euq… Modified: trunk/reactos/dll/win32/kernel32/nls/far.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/far… Modified: trunk/reactos/dll/win32/kernel32/nls/fin.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/fin… Modified: trunk/reactos/dll/win32/kernel32/nls/fos.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/fos… Modified: trunk/reactos/dll/win32/kernel32/nls/fra.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/fra… Modified: trunk/reactos/dll/win32/kernel32/nls/frb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frb… Modified: trunk/reactos/dll/win32/kernel32/nls/frc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frc… Modified: trunk/reactos/dll/win32/kernel32/nls/frl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frl… Modified: trunk/reactos/dll/win32/kernel32/nls/frm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frm… Modified: trunk/reactos/dll/win32/kernel32/nls/frs.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frs… Modified: trunk/reactos/dll/win32/kernel32/nls/glc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/glc… Modified: trunk/reactos/dll/win32/kernel32/nls/guj.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/guj… Modified: trunk/reactos/dll/win32/kernel32/nls/heb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/heb… Modified: trunk/reactos/dll/win32/kernel32/nls/hin.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hin… Modified: trunk/reactos/dll/win32/kernel32/nls/hrv.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hrv… Modified: trunk/reactos/dll/win32/kernel32/nls/hun.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hun… Modified: trunk/reactos/dll/win32/kernel32/nls/hye.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hye… Modified: trunk/reactos/dll/win32/kernel32/nls/ind.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ind… Modified: trunk/reactos/dll/win32/kernel32/nls/isl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/isl… Modified: trunk/reactos/dll/win32/kernel32/nls/ita.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ita… Modified: trunk/reactos/dll/win32/kernel32/nls/its.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/its… Modified: trunk/reactos/dll/win32/kernel32/nls/jpn.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/jpn… Modified: trunk/reactos/dll/win32/kernel32/nls/kan.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kan… Modified: trunk/reactos/dll/win32/kernel32/nls/kat.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kat… Modified: trunk/reactos/dll/win32/kernel32/nls/kkz.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kkz… Modified: trunk/reactos/dll/win32/kernel32/nls/knk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/knk… Modified: trunk/reactos/dll/win32/kernel32/nls/kor.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kor… Modified: trunk/reactos/dll/win32/kernel32/nls/kyr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kyr… Modified: trunk/reactos/dll/win32/kernel32/nls/lth.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/lth… Modified: trunk/reactos/dll/win32/kernel32/nls/lvi.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/lvi… Modified: trunk/reactos/dll/win32/kernel32/nls/mar.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/mar… Modified: trunk/reactos/dll/win32/kernel32/nls/mki.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/mki… Modified: trunk/reactos/dll/win32/kernel32/nls/mon.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/mon… Modified: trunk/reactos/dll/win32/kernel32/nls/msb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/msb… Modified: trunk/reactos/dll/win32/kernel32/nls/msl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/msl… Modified: trunk/reactos/dll/win32/kernel32/nls/nlb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/nlb… Modified: trunk/reactos/dll/win32/kernel32/nls/nld.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/nld… Modified: trunk/reactos/dll/win32/kernel32/nls/non.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/non… Modified: trunk/reactos/dll/win32/kernel32/nls/nor.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/nor… Modified: trunk/reactos/dll/win32/kernel32/nls/pan.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/pan… Modified: trunk/reactos/dll/win32/kernel32/nls/plk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/plk… Modified: trunk/reactos/dll/win32/kernel32/nls/ptb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ptb… Modified: trunk/reactos/dll/win32/kernel32/nls/ptg.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ptg… Modified: trunk/reactos/dll/win32/kernel32/nls/rmc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rmc… Modified: trunk/reactos/dll/win32/kernel32/nls/rom.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rom… Modified: trunk/reactos/dll/win32/kernel32/nls/rus.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rus… Modified: trunk/reactos/dll/win32/kernel32/nls/san.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/san… Modified: trunk/reactos/dll/win32/kernel32/nls/sky.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/sky… Modified: trunk/reactos/dll/win32/kernel32/nls/slv.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/slv… Modified: trunk/reactos/dll/win32/kernel32/nls/sqi.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/sqi… Modified: trunk/reactos/dll/win32/kernel32/nls/srb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/srb… Modified: trunk/reactos/dll/win32/kernel32/nls/srl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/srl… Modified: trunk/reactos/dll/win32/kernel32/nls/sve.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/sve… Modified: trunk/reactos/dll/win32/kernel32/nls/svf.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/svf… Modified: trunk/reactos/dll/win32/kernel32/nls/swk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/swk… Modified: trunk/reactos/dll/win32/kernel32/nls/syr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/syr… Modified: trunk/reactos/dll/win32/kernel32/nls/tam.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/tam… Modified: trunk/reactos/dll/win32/kernel32/nls/tel.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/tel… Modified: trunk/reactos/dll/win32/kernel32/nls/tha.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/tha… Modified: trunk/reactos/dll/win32/kernel32/nls/trk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/trk… Modified: trunk/reactos/dll/win32/kernel32/nls/ttt.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ttt… Modified: trunk/reactos/dll/win32/kernel32/nls/ukr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ukr… Modified: trunk/reactos/dll/win32/kernel32/nls/urd.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/urd… Modified: trunk/reactos/dll/win32/kernel32/nls/uzb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/uzb… Modified: trunk/reactos/dll/win32/kernel32/nls/uzl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/uzl… Modified: trunk/reactos/dll/win32/kernel32/nls/vit.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/vit… Modified: trunk/reactos/dll/win32/kernel32/nls/zhh.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/zhh… Modified: trunk/reactos/dll/win32/kernel32/nls/zhi.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/zhi… Modified: trunk/reactos/dll/win32/kernel32/nls/zhm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/zhm… Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=…

13 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011