Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 51824: Add bootcdregtest target to cmake build.
by spetreolle＠svn.reactos.org 19 May '11

19 May '11

Author: spetreolle Date: Thu May 19 21:55:57 2011 New Revision: 51824 URL: http://svn.reactos.org/svn/reactos?rev=51824&view=rev Log: Add bootcdregtest target to cmake build. Added: trunk/reactos/boot/bootdata/bootcd/unattend.inf - copied unchanged from r51800, trunk/reactos/boot/bootdata/unattend.inf Modified: trunk/reactos/CMakeMacros.cmake trunk/reactos/base/setup/usetup/CMakeLists.txt trunk/reactos/boot/CMakeLists.txt trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild trunk/reactos/boot/bootdata/packages/CMakeLists.txt Modified: trunk/reactos/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeMacros.cmake?rev=5182… ============================================================================== --- trunk/reactos/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/CMakeMacros.cmake [iso-8859-1] Thu May 19 21:55:57 2011 @@ -175,4 +175,32 @@ endif() endif() #end livecd + #do we add it to regtest? + list(FIND _CD_FOR regtest __cd) + if(NOT __cd EQUAL -1) + #whether or not we should put it in reactos.cab or directly on cd + if(_CD_NO_CAB) + #directly on cd + foreach(item ${_CD_FILE}) + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake "file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n") + endforeach() + if(_CD_NAME_ON_CD) + get_filename_component(__file ${_CD_FILE} NAME) + #rename it in the cd tree + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake "file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file} \${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n") + endif() + if(_CD_TARGET) + #manage dependency + add_dependencies(bootcdregtest ${_CD_TARGET}) + endif() + else() + #add it in reactos.cab + #dir_to_num(${_CD_DESTINATION} _num) + #file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${_CD_FILE} ${_num}\n") + #if(_CD_TARGET) + # #manage dependency + # add_dependencies(reactos_cab ${_CD_TARGET}) + #endif() + endif() + endif() #end bootcd endfunction() Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLis… ============================================================================== --- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Thu May 19 21:55:57 2011 @@ -44,4 +44,4 @@ set_module_type(usetup nativecui) add_importlibs(usetup kernel32 ntdll) -add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd) +add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest) Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=51… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Thu May 19 21:55:57 2011 @@ -9,6 +9,18 @@ COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin ${CMAKE_CURRENT_BINARY_DIR}/bootcd REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso VERBATIM) +##bootcdregtest +#clear it out +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake + "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest)\n") + +add_custom_target(bootcdregtest + ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest + -P ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest REACTOS ${REACTOS_BINARY_DIR}/bootcdregtest.iso + VERBATIM) + + ##livecd #clear it out file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Thu May 19 21:55:57 2011 @@ -1,11 +1,11 @@ add_subdirectory(packages) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivecls_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivecls.inf FOR bootcd) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivedef_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivedef.inf FOR bootcd) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesft.inf FOR bootcd) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesys.inf FOR bootcd) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivecls_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivecls.inf FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivedef_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivedef.inf FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesft.inf FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesys.inf FOR bootcd regtest) # livecd hives list(APPEND CD_HIVES @@ -42,6 +42,10 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd DESTINATION reactos/bin FOR all) #freeldr.ini -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NAME_ON_CD freeldr.ini FOR bootcd) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NAME_ON_CD freeldr.ini FOR bootcd regtest) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd.ini DESTINATION root NAME_ON_CD freeldr.ini FOR livecd) +#unattend +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/unattend.inf DESTINATION reactos NO_CAB FOR regtest) +#uncomment this for unattend bootcd +#add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION reactos NO_CAB FOR bootcd) Modified: trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/bootc… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] Thu May 19 21:55:57 2011 @@ -4,6 +4,7 @@ <if property="ARCH" value="i386"> <module name="bootcd" type="iso" output="ReactOS.iso"> <bootsector>isoboot</bootsector> +  </module> </if> <ifnot property="ARCH" value="i386"> Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMa… ============================================================================== --- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Thu May 19 21:55:57 2011 @@ -42,4 +42,4 @@ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf VERBATIM) -add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd) +add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest)

1 0

[gschneider] 51823: [shell32/shell32_new] Improve German translation
by gschneider＠svn.reactos.org 19 May '11

19 May '11

Author: gschneider Date: Thu May 19 18:24:57 2011 New Revision: 51823 URL: http://svn.reactos.org/svn/reactos?rev=51823&view=rev Log: [shell32/shell32_new] Improve German translation Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32_new/lang/de-DE.rc Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Thu May 19 18:24:57 2011 @@ -55,7 +55,7 @@ MENUITEM "Aktualisieren", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Einfügen", FCIDM_SHVIEW_INSERT - MENUITEM "Einfügen als Verweis", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Verknüpfung einfügen", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR MENUITEM "&Eigenschaften", FCIDM_SHVIEW_PROPERTIES END @@ -721,7 +721,7 @@ IDS_SHELL_ABOUT_BACK "< &Zurück" FCIDM_SHVIEW_NEW "Neu" FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" - FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" + FCIDM_SHVIEW_NEWLINK "Neue &Verknüpfung" IDS_FOLDER_OPTIONS "Ordneroptionen" IDS_RECYCLEBIN_LOCATION "Papierkorbpfad" IDS_RECYCLEBIN_DISKSPACE "freier Speicher" Modified: trunk/reactos/dll/win32/shell32_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… ============================================================================== --- trunk/reactos/dll/win32/shell32_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32_new/lang/de-DE.rc [iso-8859-1] Thu May 19 18:24:57 2011 @@ -55,7 +55,7 @@ MENUITEM "Aktualisieren", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Einfügen", FCIDM_SHVIEW_INSERT - MENUITEM "Einfügen als Verweis", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Verknüpfung einfügen", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR MENUITEM "&Eigenschaften", FCIDM_SHVIEW_PROPERTIES END @@ -715,7 +715,7 @@ IDS_SHELL_ABOUT_BACK "< &Zurück" FCIDM_SHVIEW_NEW "Neu" FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" - FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" + FCIDM_SHVIEW_NEWLINK "Neue &Verknüpfung" IDS_FOLDER_OPTIONS "Ordneroptionen" IDS_RECYCLEBIN_LOCATION "Papierkorbpfad" IDS_RECYCLEBIN_DISKSPACE "freier Speicher"

1 0

[gschneider] 51822: [appwiz] Allow passing directories to the create new shortcut wizard See issue #6169 for more details.
by gschneider＠svn.reactos.org 19 May '11

19 May '11

Author: gschneider Date: Thu May 19 18:04:10 2011 New Revision: 51822 URL: http://svn.reactos.org/svn/reactos?rev=51822&view=rev Log: [appwiz] Allow passing directories to the create new shortcut wizard See issue #6169 for more details. Modified: trunk/reactos/dll/cpl/appwiz/createlink.c Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Thu May 19 18:04:10 2011 @@ -340,7 +340,7 @@ } attrs = GetFileAttributesW(szPath); - if (attrs == INVALID_FILE_ATTRIBUTES || (attrs & FILE_ATTRIBUTE_DIRECTORY)) + if (attrs == INVALID_FILE_ATTRIBUTES) { /* invalid path */ return FALSE;

1 0

[ekohl] 51821: [SETUPAPI] Implement CM_Get_Class_Registry_PropertyW.
by ekohl＠svn.reactos.org 19 May '11

19 May '11

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; }

1 0

[gedmurphy] 51820: Merge r51819
by gedmurphy＠svn.reactos.org 19 May '11

19 May '11

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;

1 0

[gschneider] 51819: [shell32] One sizeof shall suffice
by gschneider＠svn.reactos.org 18 May '11

18 May '11

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;

1 0

[ekohl] 51818: [MSPORTS] Remove reference to non-existing files and unused libraries.
by ekohl＠svn.reactos.org 18 May '11

18 May '11

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)

1 0

[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 17 May '11

17 May '11

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;

1 0

[cmihail] 51816: GSoC todo list.
by cmihail＠svn.reactos.org 17 May '11

17 May '11

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/

1 0

[spetreolle] 51815: Escape (...) in configure script. spotted by Collibri
by spetreolle＠svn.reactos.org 17 May '11

17 May '11

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 = *

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