Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[ekohl] 51821: [SETUPAPI] Implement CM_Get_Class_Registry_PropertyW.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu May 19 17:56:35 2011 New Revision: 51821 URL: http://svn.reactos.org/svn/reactos?rev=51821&view=rev Log: [SETUPAPI] Implement CM_Get_Class_Registry_PropertyW. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Thu May 19 17:56:35 2011 @@ -1584,7 +1584,9 @@ LPGUID ClassGuid, ULONG ulProperty, PULONG pulRegDataType, PVOID Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) { - FIXME("\n"); + FIXME("%p %lu %p %p %p %lx %lx\n", + ClassGuid, ulProperty, pulRegDataType, Buffer, pulLength, + ulFlags, hMachine); return CR_CALL_NOT_IMPLEMENTED; } @@ -1596,22 +1598,68 @@ LPGUID ClassGuid, ULONG ulProperty, PULONG pulRegDataType, PVOID Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) { - FIXME("\n"); - -#if 0 - if (ClassGuid == NULL || - pulLength == NULL) - return 3; + RPC_BINDING_HANDLE BindingHandle = NULL; + WCHAR szGuidString[PNP_MAX_GUID_STRING_LEN + 1]; + ULONG ulType = 0; + ULONG ulTransferLength = 0; + CONFIGRET ret; + + TRACE("%p %lu %p %p %p %lx %lx\n", + ClassGuid, ulProperty, pulRegDataType, Buffer, pulLength, + ulFlags, hMachine); + + if (ClassGuid == NULL || pulLength == NULL) + return CR_INVALID_POINTER; if (ulFlags != 0) return CR_INVALID_FLAG; - if (pSetupStringFromGuid(ClassGuid, ebp_6c, 0x27) != 0) - return 1F; -#endif - - - return CR_CALL_NOT_IMPLEMENTED; + if (pSetupStringFromGuid(ClassGuid, + szGuidString, + PNP_MAX_GUID_STRING_LEN) != 0) + return CR_INVALID_DATA; + + if (ulProperty < CM_CRP_MIN || ulProperty > CM_CRP_MAX) + return CR_INVALID_PROPERTY; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + ulTransferLength = *pulLength; + + RpcTryExcept + { + ret = PNP_GetClassRegProp(BindingHandle, + szGuidString, + ulProperty, + &ulType, + Buffer, + &ulTransferLength, + pulLength, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + if (ret == CR_SUCCESS) + { + if (pulRegDataType != NULL) + *pulRegDataType = ulType; + } + + return ret; }

13 years, 7 months

[gedmurphy] 51820: Merge r51819

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu May 19 08:19:07 2011 New Revision: 51820 URL: http://svn.reactos.org/svn/reactos?rev=51820&view=rev Log: Merge r51819 Modified: trunk/reactos/dll/win32/shell32_new/shv_item_new.cpp Modified: trunk/reactos/dll/win32/shell32_new/shv_item_new.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shv_… ============================================================================== --- trunk/reactos/dll/win32/shell32_new/shv_item_new.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32_new/shv_item_new.cpp [iso-8859-1] Thu May 19 08:19:07 2011 @@ -396,7 +396,7 @@ } ZeroMemory(&sInfo, sizeof(sInfo)); - sInfo.cb = sizeof(sizeof(sInfo)); + sInfo.cb = sizeof(sInfo); szCmd = _wcsdup(ptr); if (!szCmd) break;

13 years, 7 months

[gschneider] 51819: [shell32] One sizeof shall suffice

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed May 18 22:08:44 2011 New Revision: 51819 URL: http://svn.reactos.org/svn/reactos?rev=51819&view=rev Log: [shell32] One sizeof shall suffice Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] Wed May 18 22:08:44 2011 @@ -387,7 +387,7 @@ } ZeroMemory(&sInfo, sizeof(sInfo)); - sInfo.cb = sizeof(sizeof(sInfo)); + sInfo.cb = sizeof(sInfo); szCmd = _wcsdup(ptr); if (!szCmd) break;

13 years, 7 months

[ekohl] 51818: [MSPORTS] Remove reference to non-existing files and unused libraries.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed May 18 09:08:24 2011 New Revision: 51818 URL: http://svn.reactos.org/svn/reactos?rev=51818&view=rev Log: [MSPORTS] Remove reference to non-existing files and unused libraries. Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Wed May 18 09:08:24 2011 @@ -6,8 +6,6 @@ list(APPEND SOURCE classinst.c msports.c - parallel.c - serial.c msports.rc ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msports.def) @@ -18,7 +16,7 @@ target_link_libraries(msports wine) -add_importlibs(msports comctl32 setupapi advapi32 user32 kernel32 ntdll) +add_importlibs(msports setupapi advapi32 kernel32 ntdll) add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) add_importlib_target(msports.spec)

13 years, 7 months

[tkreuzer] 51817: [GDI FONT DRIVER] - Calculate some fallback metrics differently - set default vendor id to 'Unkn' - Calculate the windows family from the PANOSE data instead of from the class ids...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 17 22:54:19 2011 New Revision: 51817 URL: http://svn.reactos.org/svn/reactos?rev=51817&view=rev Log: [GDI FONT DRIVER] - Calculate some fallback metrics differently - set default vendor id to 'Unkn' - Calculate the windows family from the PANOSE data instead of from the class ids (remove GetWinFamily) - Implement enumeration of char sets Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.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] Tue May 17 22:54:19 2011 @@ -96,10 +96,6 @@ pifi->lEmbedId = 0; pifi->lCharBias = 0; - - /* Set pitch */ - pifi->jWinPitchAndFamily = FT_IS_FIXED_WIDTH(ftface) ? FIXED_PITCH : - VARIABLE_PITCH; /* Feature flags */ pifi->flInfo = FM_INFO_RETURNS_BITMAPS | FM_INFO_1BPP | FM_INFO_4BPP; @@ -127,14 +123,12 @@ pifi->fwdMacLineGap = 0; pifi->fwdMaxCharInc = ftface->max_advance_width; pifi->fwdUnderscoreSize = ftface->underline_thickness; - pifi->fwdUnderscorePosition = ftface->underline_position; // FIXME: off by 10 - pifi->fwdStrikeoutSize = pifi->fwdUnitsPerEm / 20; - pifi->fwdStrikeoutPosition = pifi->fwdUnitsPerEm / 4; + pifi->fwdUnderscorePosition = ftface->underline_position; pifi->ptlBaseline.x = 1; // FIXME pifi->ptlBaseline.y = 0; // FIXME - pifi->ptlAspect.x = 0x3e9; // FIXME - pifi->ptlAspect.y = 0x3e9; // FIXME + pifi->ptlAspect.x = 1; + pifi->ptlAspect.y = 1; pifi->ptlCaret.x = 0; // FIXME pifi->ptlCaret.y = 1; // FIXME @@ -173,9 +167,9 @@ pifi->fwdWinDescender = -(ftface->descender * 213) / 170; pifi->fwdTypoAscender = ftface->ascender; pifi->fwdTypoDescender = ftface->descender; - pifi->fwdTypoLineGap = ftface->units_per_EM / 10; - pifi->fwdCapHeight = 0; - pifi->fwdXHeight = 0; + pifi->fwdTypoLineGap = pifi->fwdUnitsPerEm / 10; + pifi->fwdCapHeight = pifi->fwdUnitsPerEm / 2; + pifi->fwdXHeight = pifi->fwdUnitsPerEm / 4; pifi->fwdSubscriptXSize = 0; pifi->fwdSubscriptYSize = 0; pifi->fwdSubscriptXOffset = 0; @@ -184,6 +178,8 @@ pifi->fwdSuperscriptYSize = 0; pifi->fwdSuperscriptXOffset = 0; pifi->fwdSuperscriptYOffset = 0; + pifi->fwdStrikeoutSize = pifi->fwdUnderscoreSize; + pifi->fwdStrikeoutPosition = pifi->fwdMacAscender / 3; pifi->fwdAveCharWidth = CalculateAveCharWidth(ftface); /* Special characters (first and last char are already enumerated) */ @@ -201,7 +197,7 @@ pifi->panose.bMidline = PAN_ANY; pifi->panose.bXHeight = PAN_ANY; - *(DWORD*)&pifi->achVendId = '0000'; + *(DWORD*)&pifi->achVendId = 'nknU'; } /* Try to get type1 info from freetype */ @@ -216,6 +212,22 @@ /* Set fallback values */ pifi->lItalicAngle = 0; } + + /* Get the win family */ + if (pifi->panose.bFamilyType == PAN_FAMILY_SCRIPT) + pifi->jWinPitchAndFamily = FF_SCRIPT; + else if (pifi->panose.bFamilyType == PAN_FAMILY_DECORATIVE) + pifi->jWinPitchAndFamily = FF_DECORATIVE; + else if (pifi->panose.bProportion == PAN_PROP_MODERN) + pifi->jWinPitchAndFamily = FF_MODERN; + else if (pifi->panose.bSerifStyle <= PAN_SERIF_ROUNDED) + pifi->jWinPitchAndFamily = FF_SWISS; + else + pifi->jWinPitchAndFamily = FF_ROMAN; + + /* Set pitch */ + pifi->jWinPitchAndFamily |= FT_IS_FIXED_WIDTH(ftface) ? FIXED_PITCH : + VARIABLE_PITCH; /* Convert the special characters from unicode to ansi */ EngUnicodeToMultiByteN(&pifi->chFirstChar, 4, NULL, &pifi->wcFirstChar, 8); 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] Tue May 17 22:54:19 2011 @@ -36,16 +36,15 @@ - dpwszUniqueName: get from 'name' table - dpFontSim: implement - dpCharSets: implement - - fwdMacLineGap: implement + - fwdMacLineGap: from hhea table - fwdMaxCharInc: check/fix - fwdCapHeight: check/fix - fwdUnderscorePosition: fix - chFirstChar, chLastChar, chDefaultChar, chBreakChar: fix - wcDefaultChar, wcBreakChar: fix - ptlBaseline: fix - - ptlAspect: fix - - ptlCaret: fix - - jWinPitchandFamily: check, improve (Apolonia: 0,0->0x12) + - ptlCaret: use hhea table caretSlopeRun, caretSlopeRise + - Put most important charset into slot 0 - FtfdInitGlyphSet: 100% done - FtfdInitKerningPairs: 90% done 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 17 22:54:19 2011 @@ -149,170 +149,30 @@ return NULL; } -/*! \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 -GetWinFamily(BYTE jClassId, BYTE jSubclassId) -{ - switch (jClassId) - { - case 0: // Class ID = 0 No Classification - return FF_ROMAN;//FF_SWISS; - - 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; - } - - WARN("Unhandled class: jClassId=%d, jSubclassId=%d\n", jClassId, jSubclassId); -//__debugbreak(); - return FF_SWISS; -} +static BYTE +gajlCodePage1[32] = +{ + /* 0 */ ANSI_CHARSET, + /* 1 */ EASTEUROPE_CHARSET, + /* 2 */ RUSSIAN_CHARSET, + /* 3 */ GREEK_CHARSET, + /* 4 */ TURKISH_CHARSET, + /* 5 */ HEBREW_CHARSET, + /* 6 */ ARABIC_CHARSET, + /* 7 */ BALTIC_CHARSET, + /* 8 */ VIETNAMESE_CHARSET, + /* 9-15 */ 0, 0, 0, 0, 0, 0, 0, + /* 16 */ THAI_CHARSET, + /* 17 */ SHIFTJIS_CHARSET, + /* 18 */ GB2312_CHARSET, + /* 19 */ HANGEUL_CHARSET, // Korean Wansung, is this correct? + /* 20 */ CHINESEBIG5_CHARSET, + /* 21 */ JOHAB_CHARSET, + /* 22-28 */ 0, 0, 0, 0, 0, 0, 0, + /* 29 */ MAC_CHARSET, + /* 30 */ OEM_CHARSET, + /* 31 */ SYMBOL_CHARSET, +}; BOOL NTAPI @@ -324,6 +184,8 @@ PVOID pvView = pfile->pvView; PTT_TABLE_OS2 pOs2; PTT_TABLE_HEAD pHead; + PBYTE pjCharset; + ULONG ulCharset, ulBit, ulCodePageRange1; /* Get the head table for the face */ pHead = FtfdFindTrueTypeTable(pvView, pfile->cjView, pface->iFace, 'daeh', NULL); @@ -345,10 +207,26 @@ return FALSE; } + /* Get a pointer to the charsets */ + pjCharset = (PBYTE)pifi + pifi->dpCharSets; + + /* Loop bits of ulCodePageRange1 */ + ulCodePageRange1 = GETD(&pOs2->ulCodePageRange1); + for (ulBit = 0, ulCharset = 0; ulBit < 32 && ulCharset < 15; ulBit++) + { + /* Check if the unicode range is present */ + if (ulCodePageRange1 & (1 << ulBit)) + { + /* Save the win charset */ + pjCharset[ulCharset++] = gajlCodePage1[ulBit]; + } + } + + /* Copy the first charset */ + pifi->jWinCharSet = pjCharset[0]; + //pifi->lEmbedId; //pifi->lCharBias; - //pifi->jWinCharSet; - pifi->jWinPitchAndFamily |= GetWinFamily(pOs2->jClassId, pOs2->jSubClassId); pifi->usWinWeight = GETW(&pOs2->usWeightClass); pifi->fsSelection = GETW(&pOs2->fsSelection); pifi->fsType = GETW(&pOs2->fsType); 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] Tue May 17 22:54:19 2011 @@ -92,21 +92,21 @@ }; 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; + BYTE panose[10]; // 0x20 + ULONG ulUnicodeRange1; // 0x2A Bits 0-31 + ULONG ulUnicodeRange2; // 0x2E Bits 32-63 + ULONG ulUnicodeRange3; // 0x32 Bits 64-95 + ULONG ulUnicodeRange4; // 0x36 Bits 96-127 + CHAR achVendID[4]; // 0x3a + USHORT fsSelection; // 0x3e + USHORT usFirstCharIndex; // 0x40 + USHORT usLastCharIndex; // 0x42 + SHORT sTypoAscender; // 0x44 SHORT sTypoDescender; SHORT sTypoLineGap; USHORT usWinAscent; USHORT usWinDescent; - ULONG ulCodePageRange1; // Bits 0-31 + ULONG ulCodePageRange1; // 0x4e Bits 0-31 ULONG ulCodePageRange2; // Bits 32-63 SHORT sxHeight; SHORT sCapHeight;

13 years, 7 months

[cmihail] 51816: GSoC todo list.

by cmihail＠svn.reactos.org

Author: cmihail Date: Tue May 17 22:18:21 2011 New Revision: 51816 URL: http://svn.reactos.org/svn/reactos?rev=51816&view=rev Log: GSoC todo list. Added: branches/GSoC_2011/TcpIpDriver/todo_gsoc.txt (with props) Added: branches/GSoC_2011/TcpIpDriver/todo_gsoc.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/todo_gsoc… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/todo_gsoc.txt (added) +++ branches/GSoC_2011/TcpIpDriver/todo_gsoc.txt [iso-8859-1] Tue May 17 22:18:21 2011 @@ -1,0 +1,23 @@ +Tasks to do by the end of GSoC (sorted in decending order by importance): + +1) Make sure all basic functinalities are working + - accept so far is not which should be fixed + + +2) Create a test application that simulates heavy usage + of networking. Preferably multi threaded. This should + check whether we have any memory leaks, broken functionality + or fatal blue screen errors. + +3) Improve existing IOCTLs. +4) Improve support for netstat (e.g. netstat -na). + +Notes: + + - 2) Worth looking into how we can take advantage of firefox's +stress tests (e.g. xmlhttprequest) + + - 1) 2) and a bit of 3) should be completed before the midterm +evaluations. + + Propchange: branches/GSoC_2011/TcpIpDriver/todo_gsoc.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/GSoC_2011/TcpIpDriver/todo_gsoc.txt ------------------------------------------------------------------------------ svn:mime-type = text/

13 years, 7 months

[spetreolle] 51815: Escape (...) in configure script. spotted by Collibri

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Tue May 17 19:54:26 2011 New Revision: 51815 URL: http://svn.reactos.org/svn/reactos?rev=51815&view=rev Log: Escape (...) in configure script. spotted by Collibri Added: branches/cmake-bringup/configure.sh (with props) Added: branches/cmake-bringup/configure.sh URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.sh?rev=… ============================================================================== --- branches/cmake-bringup/configure.sh (added) +++ branches/cmake-bringup/configure.sh [iso-8859-1] Tue May 17 19:54:26 2011 @@ -1,0 +1,37 @@ +#!/bin/bash +if [ "x$ROS_ARCH" == "x" ] +then + echo Could not detect RosBE. + exit 1 +fi + +BUILD_ENVIRONMENT=MinGW +ARCH=$ROS_ARCH +REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) +REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH + +if [ "$REACTOS_SOURCE_DIR" == "$PWD" ] +then + echo Creating directories in $REACTOS_OUTPUT_PATH + mkdir -p $REACTOS_OUTPUT_PATH + cd "$REACTOS_OUTPUT_PATH" +fi + +mkdir -p host-tools +mkdir -p reactos + +echo Preparing host tools... +cd host-tools +if [ -f CMakeCache.txt ] +then + rm -f CMakeCache.txt +fi + +REACTOS_BUILD_TOOLS_DIR="$PWD" +cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" + +cd ../reactos +cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" + +echo Configure script complete! Enter directories and execute appropriate build commands$ex: make, makex, etc...$. + Propchange: branches/cmake-bringup/configure.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/cmake-bringup/configure.sh ------------------------------------------------------------------------------ svn:executable = *

13 years, 7 months

[gschneider] 51814: [syssetup] Remove duplicate code, adjust message box text to fit the context

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue May 17 19:33:22 2011 New Revision: 51814 URL: http://svn.reactos.org/svn/reactos?rev=51814&view=rev Log: [syssetup] Remove duplicate code, adjust message box text to fit the context Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Tue May 17 19:33:22 2011 @@ -1453,7 +1453,7 @@ if (0 == LoadStringW(hDllInstance, IDS_WZD_LOCALTIME, ErrorLocalTime, sizeof(ErrorLocalTime) / sizeof(ErrorLocalTime[0]))) { - wcscpy(ErrorLocalTime, L"Setup failed to set the computer name."); + wcscpy(ErrorLocalTime, L"Setup was unable to set the local time."); } MessageBoxW(hwndDlg, ErrorLocalTime, Title, MB_ICONWARNING | MB_OK); return FALSE; @@ -1469,8 +1469,6 @@ LPARAM lParam) { PSETUPDATA SetupData; - WCHAR Title[64]; - WCHAR ErrorLocalTime[256]; /* Retrieve pointer to the global setup data */ SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); @@ -1525,23 +1523,7 @@ case PSN_WIZNEXT: { - GetLocalSystemTime(hwndDlg, SetupData); - SetLocalTimeZone(GetDlgItem(hwndDlg, IDC_TIMEZONELIST), - SetupData); - SetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); - if(!SetSystemLocalTime(hwndDlg, SetupData)) - { - if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) - { - wcscpy(Title, L"ReactOS Setup"); - } - if (0 == LoadStringW(hDllInstance, IDS_WZD_LOCALTIME, ErrorLocalTime, - sizeof(ErrorLocalTime) / sizeof(ErrorLocalTime[0]))) - { - wcscpy(ErrorLocalTime, L"Setup failed to set the computer name."); - } - MessageBoxW(hwndDlg, ErrorLocalTime, Title, MB_ICONWARNING | MB_OK); - } + WriteDateTimeSettings(hwndDlg, SetupData); } break;

13 years, 7 months

[ekohl] 51813: [MSPORTS] - Implement a simple class installer that assigns the friendly name "Serial Port (COMx)" to all serial ports. - Enable the class installer in ports.inf. - Add parallel port...

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue May 17 19:24:19 2011 New Revision: 51813 URL: http://svn.reactos.org/svn/reactos?rev=51813&view=rev Log: [MSPORTS] - Implement a simple class installer that assigns the friendly name "Serial Port (COMx)" to all serial ports. - Enable the class installer in ports.inf. - Add parallel port installer configuration to ports.inf (disabled). Added: trunk/reactos/dll/win32/msports/ (with props) trunk/reactos/dll/win32/msports/CMakeLists.txt (with props) trunk/reactos/dll/win32/msports/classinst.c (with props) trunk/reactos/dll/win32/msports/msports.c (with props) trunk/reactos/dll/win32/msports/msports.rbuild (with props) trunk/reactos/dll/win32/msports/msports.rc (with props) trunk/reactos/dll/win32/msports/msports.spec (with props) Modified: trunk/reactos/baseaddress.cmake trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/inf/ports.inf Modified: trunk/reactos/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.cmake?rev=5181… ============================================================================== --- trunk/reactos/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/baseaddress.cmake [iso-8859-1] Tue May 17 19:24:19 2011 @@ -49,6 +49,7 @@ set(baseaddress_netid 0x5f660000) set(baseaddress_ntprint 0x5f6a0000) set(baseaddress_mssip32 0x60430000) +set(baseaddress_msports 0x60450000) set(baseaddress_msisip 0x60b10000) set(baseaddress_inseng 0x61000000) set(baseaddress_qedit 0x611c0000) Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=518… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Tue May 17 19:24:19 2011 @@ -52,6 +52,7 @@ <property name="BASEADDRESS_NETID" value="0x5f660000" /> <property name="BASEADDRESS_NTPRINT" value="0x5f6a0000" /> <property name="BASEADDRESS_MSSIP32" value="0x60430000" /> + <property name="BASEADDRESS_MSPORTS" value="0x60450000" /> <property name="BASEADDRESS_MSISIP" value="0x60b10000" /> <property name="BASEADDRESS_INSENG" value="0x61000000" /> <property name="BASEADDRESS_QEDIT" value="0x611c0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue May 17 19:24:19 2011 @@ -357,6 +357,7 @@ dll\win32\msisip\msisip.dll 1 dll\win32\msisys.ocx\msisys.ocx 1 dll\win32\msnet32\msnet32.dll 1 +dll\win32\msports\msports.dll 1 dll\win32\msrle32\msrle32.dll 1 dll\win32\mssign32\mssign32.dll 1 dll\win32\mssip32\mssip32.dll 1 Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Tue May 17 19:24:19 2011 @@ -99,6 +99,7 @@ add_subdirectory(msisip) add_subdirectory(msisys.ocx) #add_subdirectory(msnet32) #to be deleted in trunk. +add_subdirectory(msports) add_subdirectory(msrle32) add_subdirectory(mssign32) add_subdirectory(mssip32) Propchange: trunk/reactos/dll/win32/msports/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue May 17 19:24:19 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/msports/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/msports/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/msports/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msports/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Tue May 17 19:24:19 2011 @@ -1,0 +1,24 @@ + +set_unicode() + +spec2def(msports.dll msports.spec) + +list(APPEND SOURCE + classinst.c + msports.c + parallel.c + serial.c + msports.rc + ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/msports.def) + +add_library(msports SHARED ${SOURCE}) + +set_module_type(msports win32dll) + +target_link_libraries(msports wine) + +add_importlibs(msports comctl32 setupapi advapi32 user32 kernel32 ntdll) + +add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) +add_importlib_target(msports.spec) Propchange: trunk/reactos/dll/win32/msports/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/CMakeLists.txt ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c (added) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Tue May 17 19:24:19 2011 @@ -1,0 +1,250 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dlls\win32\msports\classinst.c + * PURPOSE: Ports class installer + * PROGRAMMERS: Copyright 2011 Eric Kohl + */ + +#include <windows.h> +#include <setupapi.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(msports); + + +typedef enum _PORT_TYPE +{ + UnknownPort, + ParallelPort, + SerialPort +} PORT_TYPE; + + +static DWORD +InstallSerialPort(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + LPWSTR pszFriendlyName = L"Serial Port (COMx)"; + + TRACE("InstallSerialPort(%p, %p)\n", + DeviceInfoSet, DeviceInfoData); + + /* Install the device */ + if (!SetupDiInstallDevice(DeviceInfoSet, + DeviceInfoData)) + { + return GetLastError(); + } + + /* Set the friendly name for the device */ + SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + SPDRP_FRIENDLYNAME, + (LPBYTE)pszFriendlyName, + (wcslen(pszFriendlyName) + 1) * sizeof(WCHAR)); + + return ERROR_SUCCESS; +} + + +static DWORD +InstallParallelPort(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME("InstallParallelPort(%p, %p)\n", + DeviceInfoSet, DeviceInfoData); + return ERROR_DI_DO_DEFAULT; +} + + +VOID +InstallDeviceData(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + HKEY hKey = NULL; + HINF hInf = INVALID_HANDLE_VALUE; + SP_DRVINFO_DATA DriverInfoData; + PSP_DRVINFO_DETAIL_DATA DriverInfoDetailData; + WCHAR InfSectionWithExt[256]; + BYTE buffer[2048]; + DWORD dwRequired; + + TRACE("InstallDeviceData()\n"); + + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + NULL, + NULL); + if (hKey == NULL) + goto done; + + DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA); + if (!SetupDiGetSelectedDriverW(DeviceInfoSet, + DeviceInfoData, + &DriverInfoData)) + { + goto done; + } + + DriverInfoDetailData = (PSP_DRVINFO_DETAIL_DATA)buffer; + DriverInfoDetailData->cbSize = sizeof(SP_DRVINFO_DETAIL_DATA); + if (!SetupDiGetDriverInfoDetailW(DeviceInfoSet, + DeviceInfoData, + &DriverInfoData, + DriverInfoDetailData, + 2048, + &dwRequired)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + goto done; + } + + TRACE("Inf file name: %S\n", DriverInfoDetailData->InfFileName); + + hInf = SetupOpenInfFileW(DriverInfoDetailData->InfFileName, + NULL, + INF_STYLE_WIN4, + NULL); + if (hInf == INVALID_HANDLE_VALUE) + goto done; + + TRACE("Section name: %S\n", DriverInfoDetailData->SectionName); + + SetupDiGetActualSectionToInstallW(hInf, + DriverInfoDetailData->SectionName, + InfSectionWithExt, + 256, + NULL, + NULL); + + TRACE("InfSectionWithExt: %S\n", InfSectionWithExt); + + SetupInstallFromInfSectionW(NULL, + hInf, + InfSectionWithExt, + SPINST_REGISTRY, + hKey, + NULL, + 0, + NULL, + NULL, + NULL, + NULL); + + TRACE("Done\n"); + +done:; + if (hKey != NULL) + RegCloseKey(hKey); + + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); +} + + + +PORT_TYPE +GetPortType(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + HKEY hKey = NULL; + DWORD dwSize; + DWORD dwType = 0; + BYTE bData = 0; + PORT_TYPE PortType = UnknownPort; + LONG lError; + + TRACE("GetPortType()\n"); + + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + NULL, + NULL); + if (hKey == NULL) + { + goto done; + } + + dwSize = sizeof(BYTE); + lError = RegQueryValueExW(hKey, + L"PortSubClass", + NULL, + &dwType, + &bData, + &dwSize); + + TRACE("lError: %ld\n", lError); + TRACE("dwSize: %lu\n", dwSize); + TRACE("dwType: %lu\n", dwType); + + if (lError == ERROR_SUCCESS && + dwSize == sizeof(BYTE) && + dwType == REG_BINARY) + { + if (bData == 0) + PortType = ParallelPort; + else + PortType = SerialPort; + } + +done:; + if (hKey != NULL) + RegCloseKey(hKey); + + TRACE("GetPortType() returns %u \n", PortType); + + return PortType; +} + + +static DWORD +InstallPort(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + PORT_TYPE PortType; + + InstallDeviceData(DeviceInfoSet, DeviceInfoData); + + PortType = GetPortType(DeviceInfoSet, DeviceInfoData); + switch (PortType) + { + case ParallelPort: + return InstallParallelPort(DeviceInfoSet, DeviceInfoData); + + case SerialPort: + return InstallSerialPort(DeviceInfoSet, DeviceInfoData); + + default: + return ERROR_DI_DO_DEFAULT; + } +} + + +DWORD +WINAPI +PortsClassInstaller(IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + TRACE("PortsClassInstaller(%lu, %p, %p)\n", + InstallFunction, DeviceInfoSet, DeviceInfoData); + + switch (InstallFunction) + { + case DIF_INSTALLDEVICE: + return InstallPort(DeviceInfoSet, DeviceInfoData); + + default: + TRACE("Install function %u ignored\n", InstallFunction); + return ERROR_DI_DO_DEFAULT; + } +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/msports/classinst.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/classinst.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msports/msports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.c (added) +++ trunk/reactos/dll/win32/msports/msports.c [iso-8859-1] Tue May 17 19:24:19 2011 @@ -1,0 +1,33 @@ +/* + * PROJECT: Ports installer library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/msports/msports.c + * PURPOSE: Library main function + * COPYRIGHT: Copyright 2011 Eric Kohl + */ + +#include <windows.h> +#include <wine/debug.h> + + +WINE_DEFAULT_DEBUG_CHANNEL(msports); + + +BOOL +WINAPI +DllMain(HINSTANCE hinstDll, + DWORD dwReason, + LPVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + TRACE("DLL_PROCESS_ATTACH\n"); + DisableThreadLibraryCalls(hinstDll); + break; + } + + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/msports/msports.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/msports.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msports/msports.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.rbuild (added) +++ trunk/reactos/dll/win32/msports/msports.rbuild [iso-8859-1] Tue May 17 19:24:19 2011 @@ -1,0 +1,11 @@ +<module name="msports" type="win32dll" baseaddress="${BASEADDRESS_MSPORTS}" installbase="system32" installname="msports.dll" unicode="yes"> + <include base="msports">.</include> + <importlibrary definition="msports.spec" /> + <library>wine</library> + <library>kernel32</library> + <library>advapi32</library> + <library>setupapi</library> + <file>classinst.c</file> + <file>msports.c</file> + <file>msports.rc</file> +</module> Propchange: trunk/reactos/dll/win32/msports/msports.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/msports.rbuild ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.rc (added) +++ trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] Tue May 17 19:24:19 2011 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Ports Class Installer\0" +#define REACTOS_STR_INTERNAL_NAME "msports\0" +#define REACTOS_STR_ORIGINAL_FILENAME "msports.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/msports/msports.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/msports.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msports/msports.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.spec (added) +++ trunk/reactos/dll/win32/msports/msports.spec [iso-8859-1] Tue May 17 19:24:19 2011 @@ -1,0 +1,12 @@ +@ stub ComDBClaimNextFreePort +@ stub ComDBClaimPort +@ stub ComDBClose +@ stub ComDBGetCurrentPortUsage +@ stub ComDBOpen +@ stub ComDBReleasePort +@ stub ComDBResizeDatabase +@ stdcall LibMain(ptr long ptr) DllMain +@ stub ParallelPortPropPageProvider +@ stdcall PortsClassInstaller(long ptr ptr) +@ stub SerialDisplayAdvancedSettings +@ stub SerialPortPropPageProvider Propchange: trunk/reactos/dll/win32/msports/msports.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/msports.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Tue May 17 19:24:19 2011 @@ -295,6 +295,9 @@ <directory name="msnet32"> <xi:include href="msnet32/msnet32.rbuild" /> </directory> +<directory name="msports"> + <xi:include href="msports/msports.rbuild" /> +</directory> <directory name="msrle32"> <xi:include href="msrle32/msrle32.rbuild" /> </directory> Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=51… ============================================================================== Binary files - no diff available.

13 years, 7 months

[sserapion] 51812: Fix some small bugs that lead to corruption and correct reference/dereference broken in previous commit(gotta love peer review!). Tests go much further now!

by sserapion＠svn.reactos.org

Author: sserapion Date: Tue May 17 18:54:59 2011 New Revision: 51812 URL: http://svn.reactos.org/svn/reactos?rev=51812&view=rev Log: Fix some small bugs that lead to corruption and correct reference/dereference broken in previous commit(gotta love peer review!). Tests go much further now! Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c [iso-8859-1] Tue May 17 18:54:59 2011 @@ -81,8 +81,11 @@ TRACE("%p refcount %lu\n",context, context->RefCount); ASSERT(context->RefCount >= 1); - /* decrement and check for delete */ - if (context->RefCount-- == 0) + /* decrement reference */ + context->RefCount--; + + /* check for object rundown */ + if (context->RefCount == 0) { TRACE("Deleting context %p\n",context); @@ -467,7 +470,8 @@ &sessionKey, &NegotiateFlags); - phNewContext = (PCtxtHandle)newContext; + phCredential->dwUpper = NegotiateFlags; + phNewContext->dwLower = newContext; if(!newContext || !NT_SUCCESS(ret)) { @@ -502,7 +506,7 @@ else /* challenge! */ { ERR("challenge message unimplemented!!!\n"); - + ERR("phNewContext %p phContext %x!!!\n",phNewContext, *phContext); *phNewContext = *phContext; if (fContextReq & ISC_REQ_USE_SUPPLIED_CREDS) { @@ -692,7 +696,7 @@ return SEC_E_INVALID_HANDLE; } - NtlmDereferenceContext((ULONG_PTR)phContext); + NtlmDereferenceContext((ULONG_PTR)phContext->dwLower); phContext = NULL; return SEC_E_OK; } @@ -740,7 +744,7 @@ SEC_ENTRY FreeContextBuffer(PVOID pv) { - HeapFree(GetProcessHeap(), 0, pv); + NtlmFree(pv); return SEC_E_OK; } Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c [iso-8859-1] Tue May 17 18:54:59 2011 @@ -76,8 +76,11 @@ TRACE("%p refcount %d\n",cred, cred->RefCount); ASSERT(cred->RefCount >= 1); - /* decrement and check for delete */ - if (cred->RefCount-- == 0 ) + /* decrement reference */ + cred->RefCount--; + + /* check for object rundown */ + if (cred->RefCount == 0) { TRACE("Deleting credential %p\n",cred); @@ -289,7 +292,7 @@ if(password.Buffer != NULL) { - NtlmProtectMemory(password.Buffer, password.Length); + NtlmProtectMemory(password.Buffer, password.Length * sizeof(WCHAR)); cred->Password = password; }

13 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
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