Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 51662: [GDI FONT DRIVER] - Fix size of the inverse lookup table - Add more pointer checks to FtfdInitKerningPairs - sort the FD_KERNINGPAIR array
by tkreuzer＠svn.reactos.org 10 May '11

10 May '11

Author: tkreuzer Date: Tue May 10 10:16:10 2011 New Revision: 51662 URL: http://svn.reactos.org/svn/reactos?rev=51662&view=rev Log: [GDI FONT DRIVER] - Fix size of the inverse lookup table - Add more pointer checks to FtfdInitKerningPairs - sort the FD_KERNINGPAIR array Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Tue May 10 10:16:10 2011 @@ -268,7 +268,8 @@ TRACE("FtfdInitGlyphSet()\n"); /* Allocate an array of WCHARs */ - pwcReverseTable = EngAllocMem(0, pface->ftface->num_glyphs, 'dftF'); + cjSize = pface->cGlyphs * sizeof(WCHAR); + pwcReverseTable = EngAllocMem(0, cjSize, 'dftF'); if (!pwcReverseTable) { WARN("EngAllocMem() failed.\n"); @@ -303,6 +304,7 @@ for (i = 0, cRuns = 0; i < pface->cMappings && index; i++) { /* Create an entry in the reverse lookup table */ + ASSERT(index < pface->cGlyphs); pwcReverseTable[index] = wcCurrent; /* Use index as glyph handle */ @@ -355,6 +357,8 @@ return FMT_UNKNOWN; } +static +ULONG FtfdGetFileFormat( PFTFD_FILE pfile) { 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] Tue May 10 10:16:10 2011 @@ -407,6 +407,21 @@ return nPairs; } +INT +__cdecl +CompareKernPair( + FD_KERNINGPAIR *pkp1, + FD_KERNINGPAIR *pkp2) +{ + ULONG ul1, ul2; + ul1 = pkp1->wcFirst + 65536 * pkp1->wcSecond; + ul2 = pkp2->wcFirst + 65536 * pkp2->wcSecond; + if (ul1 < ul2) return -1; + if (ul1 > ul2) return 1; + return 0; +} + + VOID NTAPI FtfdInitKerningPairs( @@ -415,33 +430,65 @@ PFTFD_FILE pfile = pface->pfile; PTT_KERNING_TABLE pKernTable; PTT_KERNING_SUBTABLE pSubTable; - ULONG i, j, cPairs = 0; + ULONG cjSize, i, j, cPairs = 0; FD_KERNINGPAIR *pKernPair; HGLYPH hgLeft, hgRight; - -__debugbreak(); + USHORT nTables; + ULONG_PTR ulLastAddress; + +//__debugbreak(); /* Get the kern table for the face */ pKernTable = FtfdFindTrueTypeTable(pfile->pvView, - pfile->cjView, - pface->iFace, - 'nrek', - NULL); - - if (!pKernTable || pKernTable->usVersion != 0) - { - TRACE("Couldn't find kerning table\n"); + pfile->cjView, + pface->iFace, + 'nrek', + &cjSize); + + if (!pKernTable || cjSize < sizeof(TT_KERNING_TABLE) || + pKernTable->usVersion != 0) + { + TRACE("Couldn't find a valid kerning table\n"); return; } - // FIXME: do an overflow check + nTables = GETW(&pKernTable->nTables); + ulLastAddress = (ULONG_PTR)pKernTable + cjSize; + + /* Loop all subtables */ pSubTable = &pKernTable->subtable; - for (i = 0; i < pKernTable->nTables; i++) - { - /* Only type 0 is interesting */ + for (i = 0; i < nTables; i++) + { + /* Check if the subtable is accessible */ + if ((ULONG_PTR)pSubTable + sizeof(TT_KERNING_SUBTABLE) > ulLastAddress) + { + __debugbreak(); + return; + } + + /* Get the table size and check if its valid */ + cjSize = GETW(&pSubTable->usLength); + if ((ULONG_PTR)pSubTable + cjSize > ulLastAddress) + { + __debugbreak(); + return; + } + + /* Check version */ if (GETW(&pSubTable->usVersion) == 0) + { + /* Get number of kerning pairs and check id its valid */ cPairs += GETW(&pSubTable->format0.nPairs); + if ((ULONG_PTR)&pSubTable->format0.akernpair[cPairs] > ulLastAddress) + { + __debugbreak(); + return; + } + } + + /* Go to next subtable */ + pSubTable = (PVOID)((PCHAR)pSubTable + cjSize); } if (cPairs == 0) @@ -450,7 +497,7 @@ } /* Allocate an FD_KERNINGPAIR array */ - pKernPair = EngAllocMem(0, (cPairs + 1) * sizeof(FD_KERNINGPAIR), '1234'); + pKernPair = EngAllocMem(0, (cPairs + 1) * sizeof(FD_KERNINGPAIR), 'dftF'); pface->pKerningPairs = pKernPair; if (!pKernPair) { @@ -460,34 +507,46 @@ /* Loop all subtables again */ pSubTable = &pKernTable->subtable; - for (i = 0; i < pKernTable->nTables; i++) - { - /* Only type 0 is interesting */ - if (GETW(&pSubTable->usVersion) != 0) continue; - - /* Loop all kern pairs in the table */ - for (j = 0; j < GETW(&pSubTable->format0.nPairs); j++) - { - /* Get the glyph handles for the kerning */ - hgLeft = GETW(&pSubTable->format0.akernpair[j].usLeft); - hgRight = GETW(&pSubTable->format0.akernpair[j].usRight); - - /* Windows wants WCHARs, convert them */ - pKernPair->wcFirst = pface->pwcReverseTable[hgLeft]; - pKernPair->wcSecond = pface->pwcReverseTable[hgLeft]; - pKernPair->fwdKern = GETW(&pSubTable->format0.akernpair[j].fwdValue); - pKernPair++; + for (i = 0; i < nTables; i++) + { + /* Check version */ + if (GETW(&pSubTable->usVersion) == 0) + { + /* Loop all kern pairs in the table */ + for (j = 0; j < GETW(&pSubTable->format0.nPairs); j++) + { + /* Get the glyph handles for the kerning */ + hgLeft = GETW(&pSubTable->format0.akernpair[j].usLeft); + hgRight = GETW(&pSubTable->format0.akernpair[j].usRight); + + /* Make sure we are inside the range */ + if (hgLeft >= pface->cGlyphs) hgLeft = 0; + if (hgRight >= pface->cGlyphs) hgRight = 0; + + /* Windows wants WCHARs, convert them */ + pKernPair->wcFirst = pface->pwcReverseTable[hgLeft]; + pKernPair->wcSecond = pface->pwcReverseTable[hgLeft]; + pKernPair->fwdKern = GETW(&pSubTable->format0.akernpair[j].fwdValue); + pKernPair++; + } } /* Go to next subtable */ - pSubTable = (PVOID)((PCHAR)pSubTable + pSubTable->usLength); - } - - /* Zero terminate last FD_KERNINGPAIR entry */ + pSubTable = (PVOID)((PCHAR)pSubTable + GETW(&pSubTable->usLength)); + } + + /* Zero terminate array */ pKernPair->wcFirst = 0; pKernPair->wcSecond = 0; pKernPair->fwdKern = 0; + /* Sort the array */ + EngSort((PBYTE)pface->pKerningPairs, + sizeof(FD_KERNINGPAIR), + cPairs, + (SORTCOMP)CompareKernPair); + + /* Set the number of kernpairs in the IFIMETRICS */ pface->ifiex.ifi.cKerningPairs = cPairs; }

1 0

[ilardig] 51661: [USETUP] - Fix Italian formatting.
by ilardig＠svn.reactos.org 10 May '11

10 May '11

Author: ilardig Date: Tue May 10 09:12:13 2011 New Revision: 51661 URL: http://svn.reactos.org/svn/reactos?rev=51661&view=rev Log: [USETUP] - Fix Italian formatting. Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Tue May 10 09:12:13 2011 @@ -382,7 +382,7 @@ { 3, 14, - "Layout di tastiera:", + " Layout di tastiera:", TEXT_STYLE_NORMAL }, {

1 0

[tkreuzer] 51660: [GDI FONT DRIVER] - Implement retrieving kerning pairs. since the freetype suport for kerning is verylimited, it is done completely without freetype suport, by usig the TrueType '...
by tkreuzer＠svn.reactos.org 09 May '11

09 May '11

Author: tkreuzer Date: Mon May 9 19:54:07 2011 New Revision: 51660 URL: http://svn.reactos.org/svn/reactos?rev=51660&view=rev Log: [GDI FONT DRIVER] - Implement retrieving kerning pairs. since the freetype suport for kerning is verylimited, it is done completely without freetype suport, by usig the TrueType 'kern' table. For some unknown reason Windows likes to have the kerning pairs as WCHARs instead of glyph handles, as they are provided. This is quite bad, as in theory there could be multiple mappings from WCHARs to the same glyph. But this should probably almost never happen in combination with kerning, so we use a short path and simply translate the glyph indices into WCHARs as if it was unambiguous. Code is completely untested due to the lack of a font with kerning data. 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/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] Mon May 9 19:54:07 2011 @@ -263,8 +263,18 @@ ULONG i, cRuns, cjSize; HGLYPH * phglyphs; WCHAR wcCurrent, wcPrev; + PWCHAR pwcReverseTable; TRACE("FtfdInitGlyphSet()\n"); + + /* Allocate an array of WCHARs */ + pwcReverseTable = EngAllocMem(0, pface->ftface->num_glyphs, 'dftF'); + if (!pwcReverseTable) + { + WARN("EngAllocMem() failed.\n"); + return NULL; + } + /* Calculate FD_GLYPHSET size (incl. HGLYPH array!) */ cjSize = FIELD_OFFSET(FD_GLYPHSET, awcrun) @@ -292,6 +302,9 @@ wcPrev = wcCurrent = (WCHAR)FT_Get_First_Char(ftface, &index); for (i = 0, cRuns = 0; i < pface->cMappings && index; i++) { + /* Create an entry in the reverse lookup table */ + pwcReverseTable[index] = wcCurrent; + /* Use index as glyph handle */ phglyphs[i] = (HGLYPH)index; @@ -317,15 +330,10 @@ TRACE("Done with font tree, %d runs\n", pGlyphSet->cRuns); pface->pGlyphSet = pGlyphSet; + pface->pwcReverseTable = pwcReverseTable; return pGlyphSet; } -VOID -FtfdInitKerningPairs( - PFTFD_FACE pface) -{ - //WARN("unimplemented\n"); -} static ULONG @@ -633,7 +641,7 @@ return NULL; } - /* get pointer to the requested face */ + /* Get pointer to the requested face */ pface = pfile->apface[iFace - 1]; switch (iMode) 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] Mon May 9 19:54:07 2011 @@ -17,6 +17,7 @@ #include FT_TYPE1_TABLES_H #include FT_MULTIPLE_MASTERS_H #include FT_TRIGONOMETRY_H + extern FT_Library gftlibrary; @@ -92,6 +93,7 @@ ULONG cGlyphs; ULONG cMappings; ULONG cRuns; + PWCHAR pwcReverseTable; FD_GLYPHSET *pGlyphSet; FD_KERNINGPAIR *pKerningPairs; FTFD_IFIMETRICS ifiex; @@ -329,3 +331,8 @@ FtfdGetWinMetrics( PFTFD_FACE pface, PIFIMETRICS pifi); + +VOID +NTAPI +FtfdInitKerningPairs( + PFTFD_FACE pface); 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] Mon May 9 19:54:07 2011 @@ -315,7 +315,6 @@ PTT_OS2_DATA pOs2; /* Get the OS/2 table for the face */ - // FIXME: get the right table for the face, when multiple faces pOs2 = FtfdFindTrueTypeTable(pvView, pfile->cjView, pface->iFace, '2/SO', NULL); if (!pOs2) { @@ -364,6 +363,133 @@ return TRUE; } +ULONG +NTAPI +FtfdGetNumberOfKerningPairs( + PFTFD_FACE pface) +{ + PFTFD_FILE pfile = pface->pfile; + PTT_KERNING_TABLE pKerning; + PTT_KERNING_SUBTABLE pSubTable; + ULONG i, nPairs = 0; + +__debugbreak(); + + /* Get the kern table for the face */ + pKerning = FtfdFindTrueTypeTable(pfile->pvView, + pfile->cjView, + pface->iFace, + 'nrek', + NULL); + if (!pKerning) + { + WARN("Couldn't find kerning table\n"); + return 0; + } + + if (pKerning->usVersion != 0) + { + WARN("Found unknown version %lx\n", pKerning->usVersion); + return 0; + } + + /* Start with the first subtable */ + pSubTable = &pKerning->subtable; + + /* Loop all subtables */ + for (i = 0; i < pKerning->nTables; i++) + { + nPairs += GETW(&pSubTable->format0.nPairs); + pSubTable = (PVOID)((PCHAR)pSubTable + pSubTable->usLength); + } + + TRACE("Got %ld kerning pairs\n", nPairs); + return nPairs; +} + +VOID +NTAPI +FtfdInitKerningPairs( + PFTFD_FACE pface) +{ + PFTFD_FILE pfile = pface->pfile; + PTT_KERNING_TABLE pKernTable; + PTT_KERNING_SUBTABLE pSubTable; + ULONG i, j, cPairs = 0; + FD_KERNINGPAIR *pKernPair; + HGLYPH hgLeft, hgRight; + +__debugbreak(); + + /* Get the kern table for the face */ + pKernTable = FtfdFindTrueTypeTable(pfile->pvView, + pfile->cjView, + pface->iFace, + 'nrek', + NULL); + + if (!pKernTable || pKernTable->usVersion != 0) + { + TRACE("Couldn't find kerning table\n"); + return; + } + + // FIXME: do an overflow check + /* Loop all subtables */ + pSubTable = &pKernTable->subtable; + for (i = 0; i < pKernTable->nTables; i++) + { + /* Only type 0 is interesting */ + if (GETW(&pSubTable->usVersion) == 0) + cPairs += GETW(&pSubTable->format0.nPairs); + } + + if (cPairs == 0) + { + return; + } + + /* Allocate an FD_KERNINGPAIR array */ + pKernPair = EngAllocMem(0, (cPairs + 1) * sizeof(FD_KERNINGPAIR), '1234'); + pface->pKerningPairs = pKernPair; + if (!pKernPair) + { + WARN("EngAllocMem failed\n"); + return; + } + + /* Loop all subtables again */ + pSubTable = &pKernTable->subtable; + for (i = 0; i < pKernTable->nTables; i++) + { + /* Only type 0 is interesting */ + if (GETW(&pSubTable->usVersion) != 0) continue; + + /* Loop all kern pairs in the table */ + for (j = 0; j < GETW(&pSubTable->format0.nPairs); j++) + { + /* Get the glyph handles for the kerning */ + hgLeft = GETW(&pSubTable->format0.akernpair[j].usLeft); + hgRight = GETW(&pSubTable->format0.akernpair[j].usRight); + + /* Windows wants WCHARs, convert them */ + pKernPair->wcFirst = pface->pwcReverseTable[hgLeft]; + pKernPair->wcSecond = pface->pwcReverseTable[hgLeft]; + pKernPair->fwdKern = GETW(&pSubTable->format0.akernpair[j].fwdValue); + pKernPair++; + } + + /* Go to next subtable */ + pSubTable = (PVOID)((PCHAR)pSubTable + pSubTable->usLength); + } + + /* Zero terminate last FD_KERNINGPAIR entry */ + pKernPair->wcFirst = 0; + pKernPair->wcSecond = 0; + pKernPair->fwdKern = 0; + + pface->ifiex.ifi.cKerningPairs = cPairs; +} /** Public Interface **********************************************************/ 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] Mon May 9 19:54:07 2011 @@ -14,6 +14,8 @@ return (((ULONG)pj[0]) << 24) | (((ULONG)pj[1]) << 16) | (((ULONG)pj[2]) << 8) | ((ULONG)pj[3]); } + +#include <pshpack1.h> typedef struct _TT_COLLECTION { @@ -43,7 +45,6 @@ } TT_FILE_HEADER, *PTT_FILE_HEADER; -#include <pshpack1.h> typedef struct _TT_OS2_DATA { USHORT version; // 0x0004 @@ -92,4 +93,38 @@ USHORT usBreakChar; USHORT usMaxContext; } TT_OS2_DATA, *PTT_OS2_DATA; + +typedef struct _TT_KERNPAIR +{ + USHORT usLeft; + USHORT usRight; + FWORD fwdValue; +} TT_KERNPAIR, *PTT_KERNPAIR; + +typedef struct _TT_KERNING_FORMAT_0 +{ + USHORT nPairs; + USHORT usSearchRange; + USHORT usEntrySelector; + USHORT usRangeShift; + TT_KERNPAIR akernpair[1]; +} TT_KERNING_FORMAT_0, *PTT_KERNING_FORMAT_0; + +typedef struct _TT_KERNING_SUBTABLE +{ + USHORT usVersion; + USHORT usLength; + USHORT usCoverage; + //// + TT_KERNING_FORMAT_0 format0; +} TT_KERNING_SUBTABLE, *PTT_KERNING_SUBTABLE; + +typedef struct _TT_KERNING_TABLE +{ + USHORT usVersion; + USHORT nTables; + //// + TT_KERNING_SUBTABLE subtable; +} TT_KERNING_TABLE, *PTT_KERNING_TABLE; + #include <poppack.h>

1 0

[ekohl] 51659: [NETEVENT] Add some eventlog and service manager events.
by ekohl＠svn.reactos.org 09 May '11

09 May '11

Author: ekohl Date: Mon May 9 14:42:10 2011 New Revision: 51659 URL: http://svn.reactos.org/svn/reactos?rev=51659&view=rev Log: [NETEVENT] Add some eventlog and service manager events. Modified: trunk/reactos/include/reactos/mc/netevent.mc Modified: trunk/reactos/include/reactos/mc/netevent.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/neteven… ============================================================================== --- trunk/reactos/include/reactos/mc/netevent.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/netevent.mc [iso-8859-1] Mon May 9 14:42:10 2011 @@ -22,7 +22,49 @@ ; Facility=System -; Eventlog messages 6xxx- +; +; eventlog events 6000-6099 +; + +MessageId=6000 +Severity=Warning +Facility=System +SymbolicName=EVENT_LOG_FULL +Language=English +The %1 log file is full. +. + +MessageId=6001 +Severity=Warning +Facility=System +SymbolicName=EVENT_LogFileNotOpened +Language=English +The %1 log file cannot be opened. +. + +MessageId=6002 +Severity=Warning +Facility=System +SymbolicName=EVENT_LogFileCorrupt +Language=English +The %1 log file is corrupted and will be cleared. +. + +MessageId=6003 +Severity=Warning +Facility=System +SymbolicName=EVENT_DefaultLogCorrupt +Language=English +The Application log file could not be opened. %1 will be used as the default log file. +. + +MessageId=6004 +Severity=Warning +Facility=System +SymbolicName=EVENT_BadDriverPacket +Language=English +A driver packet received from the I/O subsystem was invalid. The data is the packet. +. MessageId=6005 Severity=Warning @@ -40,6 +82,22 @@ The Event log service was stopped. . +MessageId=6007 +Severity=Warning +Facility=System +SymbolicName=TITLE_EventlogMessageBox +Language=English +Eventlog Service %0 +. + +MessageId=6008 +Severity=Warning +Facility=System +SymbolicName=EVENT_EventlogAbnormalShutdown +Language=English +The previous system shutdown at %1 on %2 was unexpected. +. + MessageId=6009 Severity=Warning Facility=System @@ -48,8 +106,366 @@ ReactOS %1 %2 %3 %4. . - -; transport messages +MessageId=6010 +Severity=Error +Facility=System +SymbolicName=EVENT_ServiceNoEventLog +Language=English +The %1 service was unable to set up an event source. +. + +MessageId=6011 +Severity=Error +Facility=System +SymbolicName=EVENT_ComputerNameChange +Language=English +The NetBIOS name and DNS host name of this machine have been changed from %1 to %2. +. + +MessageId=6012 +Severity=Error +Facility=System +SymbolicName=EVENT_DNSDomainNameChange +Language=English +The DNS domain assigned to this computer has been changed from %1 to %2. +. + + +; +; system events 6100 - 6199 +; + +MessageId=6100 +Severity=Error +Facility=System +SymbolicName=EVENT_UP_DRIVER_ON_MP +Language=English +A uniprocessor-specific driver was loaded on a multiprocessor system. The driver could not load. +. + + +; +; service controller events 7000-7899 +; + +MessageId=7000 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_FAILED +Language=English +The %1 service failed to start due to the following error: %n%2 +. + +MessageId=7001 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_FAILED_II +Language=English +The %1 service depends on the %2 service which failed to start because of the following error: %n%3 +. + +MessageId=7002 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_FAILED_GROUP +Language=English +The %1 service depends on the %2 group and no member of this group started. +. + +MessageId=7003 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_FAILED_NONE +Language=English +The %1 service depends on the following nonexistent service: %2 +. + +MessageId=7004 +Severity=Error +Facility=System +SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED +Language=English +The %1 call failed with the following error: %n%2 +. + +MessageId=7005 +Severity=Error +Facility=System +SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED_II +Language=English +The %1 call failed for %2 with the following error: %n%3 +. + +MessageId=7006 +Severity=Error +Facility=System +SymbolicName=EVENT_REVERTED_TO_LASTKNOWNGOOD +Language=English +The system reverted to its last known good configuration. The system is restarting.... +. + +MessageId=7007 +Severity=Error +Facility=System +SymbolicName=EVENT_BAD_ACCOUNT_NAME +Language=English +No backslash is in the account name. +. + +MessageId=7008 +Severity=Error +Facility=System +SymbolicName=EVENT_CONNECTION_TIMEOUT +Language=English +Timeout (%1 milliseconds) waiting for the %2 service to connect. +. + +MessageId=7009 +Severity=Error +Facility=System +SymbolicName=EVENT_READFILE_TIMEOUT +Language=English +Timeout (%1 milliseconds) waiting for ReadFile. +. + +MessageId=7010 +Severity=Error +Facility=System +SymbolicName=EVENT_TRANSACT_TIMEOUT +Language=English +Timeout (%1 milliseconds) waiting for a transaction response from the %2 service. +. + +MessageId=7011 +Severity=Error +Facility=System +SymbolicName=EVENT_TRANSACT_INVALID +Language=English +Message returned in transaction has incorrect size. +. + +MessageId=7012 +Severity=Error +Facility=System +SymbolicName=EVENT_FIRST_LOGON_FAILED +Language=English +Logon attempt with current password failed with the following error: %n%1 +. + +MessageId=7013 +Severity=Error +Facility=System +SymbolicName=EVENT_SECOND_LOGON_FAILED +Language=English +Second logon attempt with old password also failed with the following error: %n%1 +. + +MessageId=7014 +Severity=Error +Facility=System +SymbolicName=EVENT_INVALID_DRIVER_DEPENDENCY +Language=English +Boot-start or system-start driver (%1) must not depend on a service. +. + +MessageId=7015 +Severity=Error +Facility=System +SymbolicName=EVENT_BAD_SERVICE_STATE +Language=English +The %1 service has reported an invalid current state %2. +. + +MessageId=7016 +Severity=Error +Facility=System +SymbolicName=EVENT_CIRCULAR_DEPENDENCY_DEMAND +Language=English +Detected circular dependencies demand starting %1. +. + +MessageId=7017 +Severity=Error +Facility=System +SymbolicName=EVENT_CIRCULAR_DEPENDENCY_AUTO +Language=English +Detected circular dependencies auto-starting services. +. + +MessageId=7018 +Severity=Error +Facility=System +SymbolicName=EVENT_DEPEND_ON_LATER_SERVICE +Language=English +Circular dependency: The %1 service depends on a service in a group which starts later. +. + +MessageId=7019 +Severity=Error +Facility=System +SymbolicName=EVENT_DEPEND_ON_LATER_GROUP +Language=English +Circular dependency: The %1 service depends on a group which starts later. +. + +MessageId=7020 +Severity=Error +Facility=System +SymbolicName=EVENT_SEVERE_SERVICE_FAILED +Language=English +About to revert to the last known good configuration because the %1 service failed to start. +. + +MessageId=7021 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_HUNG +Language=English +The %1 service hung on starting. +. + +MessageId=7022 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_EXIT_FAILED +Language=English +The %1 service terminated with the following error: %n%2 +. + +MessageId=7023 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_EXIT_FAILED_SPECIFIC +Language=English +The %1 service terminated with service-specific error %2. +. + +MessageId=7024 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_AT_BOOT_FAILED +Language=English +At least one service or driver failed during system startup. Use Event Viewer to examine the event log for details. +. + +MessageId=7025 +Severity=Error +Facility=System +SymbolicName=EVENT_BOOT_SYSTEM_DRIVERS_FAILED +Language=English +The following boot-start or system-start driver(s) failed to load: %1 +. + +MessageId=7026 +Severity=Error +Facility=System +SymbolicName=EVENT_RUNNING_LASTKNOWNGOOD +Language=English +ReactOS could not be started as configured. A previous working configuration was used instead. +. + +MessageId=7027 +Severity=Error +Facility=System +SymbolicName=EVENT_TAKE_OWNERSHIP +Language=English +The %1 Registry key denied access to SYSTEM account programs so the Service Control Manager took ownership of the Registry key. +. + +MessageId=7028 +Severity=Error +Facility=System +SymbolicName=TITLE_SC_MESSAGE_BOX +Language=English +Service Control Manager %0 +. + +MessageId=7029 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_NOT_INTERACTIVE +Language=English +The %1 service is marked as an interactive service. However, the system is configured to not allow interactive services. This service may not function properly. +. + +MessageId=7030 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_CRASH +Language=English +The %1 service terminated unexpectedly. It has done this %2 time(s). The following corrective action will be taken in %3 milliseconds: %5. +. + +MessageId=7031 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_RECOVERY_FAILED +Language=English +The Service Control Manager tried to take a corrective action (%2) after the unexpected termination of the %3 service, but this action failed with the following error: %n%4 +. + +MessageId=7032 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_SCESRV_FAILED +Language=English +The Service Control Manager did not initialize successfully. The security +configuration server (scesrv.dll) failed to initialize with error %1. The +system is restarting... +. + +MessageId=7033 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_CRASH_NO_ACTION +Language=English +The %1 service terminated unexpectedly. It has done this %2 time(s). +. + +MessageId=7034 +Severity=Informational +Facility=System +SymbolicName=EVENT_SERVICE_CONTROL_SUCCESS +Language=English +The %1 service was successfully sent a %2 control. +. + +MessageId=7035 +Severity=Informational +Facility=System +SymbolicName=EVENT_SERVICE_STATUS_SUCCESS +Language=English +Service Control Manager %0 +. + +MessageId=7036 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_CONFIG_BACKOUT_FAILED +Language=English +The Service Control Manager encountered an error undoing a configuration change +to the %1 service. The service's %2 is currently in an unpredictable state. + +If you do not correct this configuration, you may not be able to restart the %1 +service or may encounter other errors. To ensure that the service is configured +properly, use the Services snap-in in Microsoft Management Console (MMC). +. + +MessageId=7037 +Severity=Error +Facility=System +SymbolicName=EVENT_FIRST_LOGON_FAILED_II +Language=English +The %1 service was unable to log on as %2 with the currently configured +password due to the following error: %n%3%n%nTo ensure that the service is +configured properly, use the Services snap-in in Microsoft Management +Console (MMC). +. + + +; +; transport events 9000-9499 +; MessageId=9004 Severity=Error

1 0

[ilardig] 51658: [winine] - Read also the shift key state patch by Carlo Bramini. See issue #6238 for more details.
by ilardig＠svn.reactos.org 09 May '11

09 May '11

Author: ilardig Date: Mon May 9 11:24:10 2011 New Revision: 51658 URL: http://svn.reactos.org/svn/reactos?rev=51658&view=rev Log: [winine] - Read also the shift key state patch by Carlo Bramini. See issue #6238 for more details. Modified: trunk/reactos/base/applications/games/winmine/main.c Modified: trunk/reactos/base/applications/games/winmine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] Mon May 9 11:24:10 2011 @@ -885,7 +885,7 @@ case WM_LBUTTONDOWN: WINE_TRACE("WM_LBUTTONDOWN\n"); - if( wParam & MK_RBUTTON ) + if( wParam & (MK_RBUTTON | MK_SHIFT) ) msg = WM_MBUTTONDOWN; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); SetCapture( hWnd ); @@ -893,7 +893,7 @@ case WM_LBUTTONUP: WINE_TRACE("WM_LBUTTONUP\n"); - if( wParam & MK_RBUTTON ) + if( wParam & (MK_RBUTTON | MK_SHIFT) ) msg = WM_MBUTTONUP; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); ReleaseCapture();

1 0

[mjmartin] 51657: [USBHUB_NEW] - Forgotten change in 51641. Fixes build of usbhub.
by mjmartin＠svn.reactos.org 09 May '11

09 May '11

Author: mjmartin Date: Mon May 9 10:48:00 2011 New Revision: 51657 URL: http://svn.reactos.org/svn/reactos?rev=51657&view=rev Log: [USBHUB_NEW] - Forgotten change in 51641. Fixes build of usbhub. Modified: branches/usb-bringup/drivers/usb/usbhub_new/misc.c Modified: branches/usb-bringup/drivers/usb/usbhub_new/misc.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/misc.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/misc.c [iso-8859-1] Mon May 9 10:48:00 2011 @@ -44,6 +44,54 @@ DPRINT1("iConfiguration %x\n", ConfigurationDescriptor->iConfiguration); DPRINT1("bmAttributes %x\n", ConfigurationDescriptor->bmAttributes); DPRINT1("MaxPower %x\n", ConfigurationDescriptor->MaxPower); +} + +VOID +DumpFullConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +{ + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + LONG i, j; + + DPRINT1("Dumping ConfigurationDescriptor %x\n", ConfigurationDescriptor); + DPRINT1("bLength %x\n", ConfigurationDescriptor->bLength); + DPRINT1("bDescriptorType %x\n", ConfigurationDescriptor->bDescriptorType); + DPRINT1("wTotalLength %x\n", ConfigurationDescriptor->wTotalLength); + DPRINT1("bNumInterfaces %x\n", ConfigurationDescriptor->bNumInterfaces); + DPRINT1("bConfigurationValue %x\n", ConfigurationDescriptor->bConfigurationValue); + DPRINT1("iConfiguration %x\n", ConfigurationDescriptor->iConfiguration); + DPRINT1("bmAttributes %x\n", ConfigurationDescriptor->bmAttributes); + DPRINT1("MaxPower %x\n", ConfigurationDescriptor->MaxPower); + + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR) ((ULONG_PTR)ConfigurationDescriptor + sizeof(USB_CONFIGURATION_DESCRIPTOR)); + + for (i=0; i < ConfigurationDescriptor->bNumInterfaces; i++) + { + DPRINT1("- Dumping InterfaceDescriptor %x\n", InterfaceDescriptor); + DPRINT1(" bLength %x\n", InterfaceDescriptor->bLength); + DPRINT1(" bDescriptorType %x\n", InterfaceDescriptor->bDescriptorType); + DPRINT1(" bInterfaceNumber %x\n", InterfaceDescriptor->bInterfaceNumber); + DPRINT1(" bAlternateSetting %x\n", InterfaceDescriptor->bAlternateSetting); + DPRINT1(" bNumEndpoints %x\n", InterfaceDescriptor->bNumEndpoints); + DPRINT1(" bInterfaceClass %x\n", InterfaceDescriptor->bInterfaceClass); + DPRINT1(" bInterfaceSubClass %x\n", InterfaceDescriptor->bInterfaceSubClass); + DPRINT1(" bInterfaceProtocol %x\n", InterfaceDescriptor->bInterfaceProtocol); + DPRINT1(" iInterface %x\n", InterfaceDescriptor->iInterface); + + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) ((ULONG_PTR)InterfaceDescriptor + sizeof(USB_INTERFACE_DESCRIPTOR)); + + for (j=0; j < InterfaceDescriptor->bNumEndpoints; j++) + { + DPRINT1(" bLength %x\n", EndpointDescriptor->bLength); + DPRINT1(" bDescriptorType %x\n", EndpointDescriptor->bDescriptorType); + DPRINT1(" bEndpointAddress %x\n", EndpointDescriptor->bEndpointAddress); + DPRINT1(" bmAttributes %x\n", EndpointDescriptor->bmAttributes); + DPRINT1(" wMaxPacketSize %x\n", EndpointDescriptor->wMaxPacketSize); + DPRINT1(" bInterval %x\n", EndpointDescriptor->bInterval); + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) ((ULONG_PTR)EndpointDescriptor + sizeof(USB_ENDPOINT_DESCRIPTOR)); + } + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)(ULONG_PTR)EndpointDescriptor; + } } NTSTATUS

1 0

[ilardig] 51656: [explorer] - Run the dialog window in a new thread patch by Mikhail Denisenko <denisenkom AT gmail DOT com> See issue #3339 for more details.
by ilardig＠svn.reactos.org 09 May '11

09 May '11

Author: ilardig Date: Mon May 9 10:32:49 2011 New Revision: 51656 URL: http://svn.reactos.org/svn/reactos?rev=51656&view=rev Log: [explorer] - Run the dialog window in a new thread patch by Mikhail Denisenko <denisenkom AT gmail DOT com> See issue #3339 for more details. Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Mon May 9 10:32:49 2011 @@ -2111,14 +2111,37 @@ MessageBox(0, TEXT("SHFindComputer() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); } -void StartMenuHandler::ShowLaunchDialog(HWND hwndOwner) +struct RunDialogThread : public Thread +{ + int Run(); +}; + +int RunDialogThread::Run() { static DynamicFct<RUNFILEDLG> RunFileDlg(TEXT("SHELL32"), 61); + + // RunFileDlg needs owner window to properly position dialog + // that window will be disabled so we can't use DesktopBar + RECT rect = {0}; +#ifndef TASKBAR_AT_TOP + rect.top = GetSystemMetrics(SM_CYSCREEN) - DESKTOPBARBAR_HEIGHT; +#endif + rect.right = GetSystemMetrics(SM_CXSCREEN); + rect.bottom = rect.top + DESKTOPBARBAR_HEIGHT; + Static dlgOwner(0, 0, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, 0, 0); // Show "Run..." dialog if (RunFileDlg) { - (*RunFileDlg)(hwndOwner, 0, NULL, NULL, NULL, RFF_CALCDIRECTORY); - } + (*RunFileDlg)(dlgOwner, 0, NULL, NULL, NULL, RFF_CALCDIRECTORY); + } + DestroyWindow(dlgOwner); + return 0; +} + +void StartMenuHandler::ShowLaunchDialog(HWND hwndOwner) +{ + RunDialogThread * rdt = new RunDialogThread(); + rdt->Start(); } void StartMenuHandler::ShowLogoffDialog(HWND hwndOwner)

1 0

[tkreuzer] 51655: [PSDK] Improve MAKEINTRESOURCE macros to silence warnings on overzealous gcc versions. See issue #5343 for more details.
by tkreuzer＠svn.reactos.org 09 May '11

09 May '11

Author: tkreuzer Date: Mon May 9 08:15:26 2011 New Revision: 51655 URL: http://svn.reactos.org/svn/reactos?rev=51655&view=rev Log: [PSDK] Improve MAKEINTRESOURCE macros to silence warnings on overzealous gcc versions. See issue #5343 for more details. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon May 9 08:15:26 2011 @@ -577,8 +577,8 @@ #define SB_BOTTOM 7 #define SB_TOP 6 #define IS_INTRESOURCE(i) (((ULONG_PTR)(i) >> 16) == 0) -#define MAKEINTRESOURCEA(i) (LPSTR)((ULONG_PTR)((WORD)(i))) -#define MAKEINTRESOURCEW(i) (LPWSTR)((ULONG_PTR)((WORD)(i))) +#define MAKEINTRESOURCEA(i) ((LPSTR)(ULONG_PTR)LOWORD(i)) +#define MAKEINTRESOURCEW(i) ((LPWSTR)(ULONG_PTR)LOWORD(i)) #ifndef XFree86Server # define RT_CURSOR MAKEINTRESOURCE(1) # define RT_FONT MAKEINTRESOURCE(8)

1 0

[janderwald] 51654: [USBSTOR] - Start implementing SCSI read
by janderwald＠svn.reactos.org 08 May '11

08 May '11

Author: janderwald Date: Sun May 8 22:18:55 2011 New Revision: 51654 URL: http://svn.reactos.org/svn/reactos?rev=51654&view=rev Log: [USBSTOR] - Start implementing SCSI read Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Sun May 8 22:18:55 2011 @@ -103,6 +103,35 @@ Request->SrbStatus = SRB_STATUS_ERROR; } } + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ) + { + DPRINT1("SCSIOP_READ DataTransferLength %lu\n", Request->DataTransferLength); + ASSERT(Request->DataBuffer); + + // + // send read command + // + Status = USBSTOR_SendReadCmd(DeviceObject, Request, &TransferredLength); + DPRINT1("USBSTOR_SendReadCmd Status %x BytesReturned %lu\n", Status, TransferredLength); + + if (NT_SUCCESS(Status)) + { + // + // store returned info length + // + Irp->IoStatus.Information = TransferredLength; + Request->SrbStatus = SRB_STATUS_SUCCESS; + } + else + { + // + // failed to retrieve sense data + // + Irp->IoStatus.Information = 0; + Request->SrbStatus = SRB_STATUS_ERROR; + } + } + else { UNIMPLEMENTED; Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Sun May 8 22:18:55 2011 @@ -488,6 +488,12 @@ CapacityData->LogicalBlockAddress = Response->LastLogicalBlockAddress; CapacityData->BytesPerBlock = Response->BlockLength; } + + // + // store result in device extension + // + PDODeviceExtension->LastLogicBlockAddress = NTOHL(Response->LastLogicalBlockAddress); + PDODeviceExtension->BlockLength = NTOHL(Response->BlockLength); // // send csw @@ -672,3 +678,138 @@ return Status; } +NTSTATUS +USBSTOR_SendReadCmd( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PSCSI_REQUEST_BLOCK Request, + OUT PULONG TransferBufferLength) +{ + UFI_READ_CMD Cmd; + CSW CSW; + NTSTATUS Status; + PVOID Response; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PCBW OutControl; + PCDB pCDB; + ULONG BlockCount; + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // allocate read buffer response from non paged pool + // + Response = (PUFI_CAPACITY_RESPONSE)AllocateItem(NonPagedPool, Request->DataTransferLength); + if (!Response) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // FIXME: support more logical blocks + // + ASSERT(Request->DataTransferLength == PDODeviceExtension->BlockLength); + + // + // block count + // + BlockCount = Request->DataTransferLength / PDODeviceExtension->BlockLength; + + // + // initialize read sense cmd + // + RtlZeroMemory(&Cmd, sizeof(UFI_READ_CMD)); + Cmd.Code = SCSIOP_READ; + Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); + Cmd.ContiguousLogicBlocks = _byteswap_ushort(BlockCount); + + RtlCopyMemory(&Cmd.LogicalBlockAddress, pCDB->READ12.LogicalBlock, sizeof(UCHAR) * 4); + + DPRINT1("BlockAddress %lu BlockCount %lu BlockLength %lu\n", NTOHL(Cmd.LogicalBlockAddress), BlockCount, PDODeviceExtension->BlockLength); + + // + // now send read cmd + // + Status = USBSTOR_SendCBW(DeviceObject, UFI_READ_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, &OutControl); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendReadCmd> USBSTOR_SendCBW failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + // + // now read the logical block + // + Status = USBSTOR_SendData(DeviceObject, Request->DataTransferLength, Response); + if (!NT_SUCCESS(Status)) + { + // + // failed to read logical block + // + DPRINT1("USBSTOR_SendReadCmd> USBSTOR_SendData failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + + DbgBreakPoint(); + + // + // send csw + // + Status = USBSTOR_SendCSW(DeviceObject, OutControl, 512, &CSW); + + DPRINT1("------------------------\n"); + DPRINT1("CSW %p\n", &CSW); + DPRINT1("Signature %x\n", CSW.Signature); + DPRINT1("Tag %x\n", CSW.Tag); + DPRINT1("DataResidue %x\n", CSW.DataResidue); + DPRINT1("Status %x\n", CSW.Status); + + // + // FIXME: handle error + // + ASSERT(CSW.Status == 0); + ASSERT(CSW.DataResidue == 0); + + // + // calculate transfer length + // + *TransferBufferLength = Request->DataTransferLength - CSW.DataResidue; + + // + // copy buffer + // + RtlCopyMemory(Request->DataBuffer, Response, *TransferBufferLength); + + // + // free item + // + FreeItem(OutControl); + + // + // free response + // + FreeItem(Response); + + // + // done + // + return Status; +}

1 0

[ekohl] 51653: [NTOSKRNL] Implement CmpSetVersionData: Set the CurrentType value in the HKLM\Software\Microsoft\Windows NT\CurrentVersion key.
by ekohl＠svn.reactos.org 08 May '11

08 May '11

Author: ekohl Date: Sun May 8 21:37:00 2011 New Revision: 51653 URL: http://svn.reactos.org/svn/reactos?rev=51653&view=rev Log: [NTOSKRNL] Implement CmpSetVersionData: Set the CurrentType value in the HKLM\Software\Microsoft\Windows NT\CurrentVersion key. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun May 8 21:37:00 2011 @@ -1938,4 +1938,71 @@ CmpDoFlushAll(TRUE); } +VOID +NTAPI +CmpSetVersionData(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + UNICODE_STRING ValueData; + HANDLE KeyHandle; + WCHAR Buffer[128]; + NTSTATUS Status; + + /* Open the 'CurrentVersion' key */ + RtlInitUnicodeString(&KeyName, + L"\\REGISTRY\\MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + 0, + NULL); + + Status = NtCreateKey(&KeyHandle, + KEY_CREATE_SUB_KEY, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create key &wZ (Status: %08lx)\n", &KeyName, Status); + return; + } + + /* Set the 'CurrentType' value */ + RtlInitUnicodeString(&ValueName, + L"CurrentType"); + +#ifdef CONFIG_SMP + wcscpy(Buffer, L"Multiprocessor"); +#else + wcscpy(Buffer, L"Uniprocessor"); +#endif + + wcscat(Buffer, L" "); + +#if (DBG == 1) + wcscat(Buffer, L"Checked"); +#else + wcscat(Buffer, L"Free"); +#endif + + RtlInitUnicodeString(&ValueData, + Buffer); + + NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueData.Buffer, + ValueData.Length + sizeof(WCHAR)); + + /* Close the key */ + NtClose(KeyHandle); +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sun May 8 21:37:00 2011 @@ -937,8 +937,8 @@ /* Initialize the hives and lazy flusher */ CmpCmdInit(SetupBoot); - /* FIXME: Save version data */ - //CmpSetVersionData(); + /* Save version data */ + CmpSetVersionData(); /* Release the registry lock */ //CmpUnlockRegistry(); Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sun May 8 21:37:00 2011 @@ -1527,6 +1527,12 @@ NTAPI CmSetLazyFlushState( IN BOOLEAN Enable +); + +VOID +NTAPI +CmpSetVersionData( + VOID ); //

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs