Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 32784: Set svn:ignore to "GNUmakefile *.vcproj *.user *.cbp *.ncb *.suo *.sln" where needed
by cfinck＠svn.reactos.org 30 Mar '08

30 Mar '08

Author: cfinck Date: Sun Mar 30 15:00:17 2008 New Revision: 32784 URL: http://svn.reactos.org/svn/reactos?rev=32784&view=rev Log: Set svn:ignore to "GNUmakefile *.vcproj *.user *.cbp *.ncb *.suo *.sln" where needed Modified: trunk/reactos/base/applications/cmdutils/doskey/ (props changed) trunk/reactos/base/services/svchost/ (props changed) trunk/reactos/base/setup/usetup/lang/ (props changed) trunk/reactos/dll/cpl/appwiz-new/ (props changed) trunk/reactos/dll/cpl/appwiz-new/lang/ (props changed) trunk/reactos/dll/cpl/appwiz-new/resources/ (props changed) trunk/reactos/dll/directx/ddraw/d3d/ (props changed) trunk/reactos/dll/keyboard/kbdbga/ (props changed) trunk/reactos/dll/keyboard/kbdbgm/ (props changed) trunk/reactos/dll/keyboard/kbdbgt/ (props changed) trunk/reactos/dll/win32/atl/ (props changed) trunk/reactos/dll/win32/hlink/ (props changed) trunk/reactos/dll/win32/kernel32/lang/ (props changed) trunk/reactos/dll/win32/msxml3/ (props changed) trunk/reactos/dll/win32/rasman/ (props changed) trunk/reactos/dll/win32/schannel/ (props changed) trunk/reactos/dll/win32/setupapi/lang/ (props changed) trunk/reactos/dll/win32/setupapi/res/Icon_Licence/ (props changed) trunk/reactos/dll/win32/tapi32/ (props changed) trunk/reactos/dll/win32/user32/lang/ (props changed) trunk/reactos/dll/win32/winhttp/ (props changed) trunk/reactos/drivers/directx/ (props changed) trunk/reactos/drivers/directx/dxapi/ (props changed) trunk/reactos/drivers/directx/dxg/ (props changed) trunk/reactos/drivers/directx/dxgthk/ (props changed) trunk/reactos/drivers/filesystems/ext2/ (props changed) trunk/reactos/drivers/filesystems/ext2/inc/ (props changed) trunk/reactos/drivers/filesystems/ext2/src/ (props changed) trunk/reactos/drivers/storage/ide/uniata/ros_glue/ (props changed) trunk/reactos/lib/fslib/ext2lib/ (props changed) trunk/reactos/lib/ppcdevtree/ (props changed) trunk/reactos/lib/pseh/powerpc/ (props changed) trunk/reactos/lib/rtl/arm/ (props changed) trunk/reactos/lib/sdk/crt/except/powerpc/ (props changed) trunk/reactos/lib/sdk/crt/mem/ (props changed) trunk/reactos/lib/sdk/crt/mem/i386/ (props changed) trunk/reactos/lib/sdk/scrnsave/ (props changed) trunk/reactos/lib/sdk/strsafe/ (props changed) trunk/reactos/tools/cabman/ (props changed) trunk/reactos/tools/cdmake/ (props changed) trunk/reactos/tools/mkhive/ (props changed) trunk/reactos/tools/rgenstat/ (props changed) trunk/reactos/tools/sysreg/ (props changed) trunk/reactos/tools/unicode/ (props changed) trunk/reactos/tools/widl/ (props changed) trunk/reactos/tools/winebuild/ (props changed) trunk/reactos/tools/wmc/ (props changed) trunk/reactos/tools/wpp/ (props changed) trunk/reactos/tools/wrc/ (props changed) Propchange: trunk/reactos/base/applications/cmdutils/doskey/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/base/services/svchost/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/base/setup/usetup/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/cpl/appwiz-new/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/cpl/appwiz-new/resources/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/directx/ddraw/d3d/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/keyboard/kbdbga/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/keyboard/kbdbgm/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/keyboard/kbdbgt/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/atl/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/hlink/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/kernel32/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/msxml3/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/rasman/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/schannel/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/setupapi/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/setupapi/res/Icon_Licence/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/tapi32/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/user32/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/winhttp/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/directx/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/directx/dxapi/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/directx/dxg/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/directx/dxgthk/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/filesystems/ext2/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/filesystems/ext2/inc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/filesystems/ext2/src/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/storage/ide/uniata/ros_glue/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/fslib/ext2lib/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/ppcdevtree/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/pseh/powerpc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/rtl/arm/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/sdk/crt/except/powerpc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/sdk/crt/mem/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/sdk/crt/mem/i386/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/sdk/scrnsave/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/sdk/strsafe/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/tools/cabman/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/cdmake/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/mkhive/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/rgenstat/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/sysreg/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/unicode/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/widl/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/winebuild/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/wmc/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/wpp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/wrc/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln

1 0

[cfinck] 32783: - Reenable the DejaVu font and use it for all purposes except substitudes for "Arial" and "Times New Roman". Keep using the Liberation fonts for these cases. - Finally remove the Bitstream Vera fonts and substitude them by the DejaVu fonts. The DejaVu fonts were derived from the Bitstream Vera fonts, so they look similar.
by cfinck＠svn.reactos.org 30 Mar '08

30 Mar '08

Author: cfinck Date: Sun Mar 30 13:18:53 2008 New Revision: 32783 URL: http://svn.reactos.org/svn/reactos?rev=32783&view=rev Log: - Reenable the DejaVu font and use it for all purposes except substitudes for "Arial" and "Times New Roman". Keep using the Liberation fonts for these cases. - Finally remove the Bitstream Vera fonts and substitude them by the DejaVu fonts. The DejaVu fonts were derived from the Bitstream Vera fonts, so they look similar. Removed: trunk/reactos/media/fonts/Vera.ttf trunk/reactos/media/fonts/VeraBI.ttf trunk/reactos/media/fonts/VeraBd.ttf trunk/reactos/media/fonts/VeraIt.ttf trunk/reactos/media/fonts/VeraMoBI.ttf trunk/reactos/media/fonts/VeraMoBd.ttf trunk/reactos/media/fonts/VeraMoIt.ttf trunk/reactos/media/fonts/VeraMono.ttf trunk/reactos/media/fonts/VeraSe.ttf trunk/reactos/media/fonts/VeraSeBd.ttf trunk/reactos/media/fonts/doc/Copyright.Bitstream trunk/reactos/media/fonts/doc/VERA-COPYRIGHT.TXT trunk/reactos/media/fonts/doc/VERA-README.TXT trunk/reactos/media/fonts/doc/VERA-RELEASENOTES.TXT Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/media/fonts/fonts.rbuild Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Mar 30 13:18:53 2008 @@ -72,22 +72,16 @@ ; Font substitutes ; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"DejaVu Sans" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"DejaVu Sans Mono" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"DejaVu Serif" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"DejaVu Sans" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Sans" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Sans" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"DejaVu Sans" - HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"Liberation Mono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Bitstream Vera Sans",0x00000000,"DejaVu Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Bitstream Vera Sans Mono",0x00000000,"DejaVu Sans Mono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Bitstream Vera Serif",0x00000000,"DejaVu Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Liberation Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"DejaVu Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Liberation Sans" ; Time zone settings 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] Sun Mar 30 13:18:53 2008 @@ -336,26 +336,27 @@ drivers\wmi\wmilib.sys 2 ; Media -;media\fonts\DejaVuSans.ttf 3 -;media\fonts\DejaVuSans-Bold.ttf 3 -;media\fonts\DejaVuSans-BoldOblique.ttf 3 -;media\fonts\DejaVuSansCondensed.ttf 3 -;media\fonts\DejaVuSansCondensed-Bold.ttf 3 -;media\fonts\DejaVuSansCondensed-Oblique.ttf 3 -;media\fonts\DejaVuSans-ExtraLight.ttf 3 -;media\fonts\DejaVuSansMono.ttf 3 -;media\fonts\DejaVuSansMono-Bold.ttf 3 -;media\fonts\DejaVuSansMono-BoldOblique.ttf 3 -;media\fonts\DejaVuSansMono-Oblique.ttf 3 -;media\fonts\DejaVuSans-Oblique.ttf 3 -;media\fonts\DejaVuSerif.ttf 3 -;media\fonts\DejaVuSerif-Bold.ttf 3 -;media\fonts\DejaVuSerif-BoldOblique.ttf 3 -;media\fonts\DejaVuSerifCondensed.ttf 3 -;media\fonts\DejaVuSerifCondensed-Bold.ttf 3 -;media\fonts\DejaVuSerifCondensed-BoldOblique.ttf 3 -;media\fonts\DejaVuSerifCondensed-Oblique.ttf 3 -;media\fonts\DejaVuSerif-Oblique.ttf 3 +media\fonts\DejaVuSans.ttf 3 +media\fonts\DejaVuSans-Bold.ttf 3 +media\fonts\DejaVuSans-BoldOblique.ttf 3 +media\fonts\DejaVuSansCondensed.ttf 3 +media\fonts\DejaVuSansCondensed-Bold.ttf 3 +media\fonts\DejaVuSansCondensed-BoldOblique.ttf 3 +media\fonts\DejaVuSansCondensed-Oblique.ttf 3 +media\fonts\DejaVuSans-ExtraLight.ttf 3 +media\fonts\DejaVuSansMono.ttf 3 +media\fonts\DejaVuSansMono-Bold.ttf 3 +media\fonts\DejaVuSansMono-BoldOblique.ttf 3 +media\fonts\DejaVuSansMono-Oblique.ttf 3 +media\fonts\DejaVuSans-Oblique.ttf 3 +media\fonts\DejaVuSerif.ttf 3 +media\fonts\DejaVuSerif-Bold.ttf 3 +media\fonts\DejaVuSerif-BoldItalic.ttf 3 +media\fonts\DejaVuSerifCondensed.ttf 3 +media\fonts\DejaVuSerifCondensed-Bold.ttf 3 +media\fonts\DejaVuSerifCondensed-BoldItalic.ttf 3 +media\fonts\DejaVuSerifCondensed-Italic.ttf 3 +media\fonts\DejaVuSerif-Italic.ttf 3 media\fonts\LiberationMono-Bold.ttf 3 media\fonts\LiberationMono-BoldItalic.ttf 3 @@ -388,16 +389,6 @@ media\fonts\UTB_____.ttf 3 media\fonts\UTI_____.ttf 3 media\fonts\UTRG____.ttf 3 -media\fonts\VeraBd.ttf 3 -media\fonts\VeraBI.ttf 3 -media\fonts\VeraIt.ttf 3 -media\fonts\VeraMoBd.ttf 3 -media\fonts\VeraMoBI.ttf 3 -media\fonts\VeraMoIt.ttf 3 -media\fonts\VeraMono.ttf 3 -media\fonts\VeraSeBd.ttf 3 -media\fonts\VeraSe.ttf 3 -media\fonts\Vera.ttf 3 media\nls\c_037.nls 1 media\nls\c_500.nls 1 media\nls\c_737.nls 1 Removed: trunk/reactos/media/fonts/Vera.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Vera.ttf?rev=3… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraBI.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraBI.ttf?rev… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraBd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraBd.ttf?rev… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraIt.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraIt.ttf?rev… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraMoBI.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraMoBI.ttf?r… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraMoBd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraMoBd.ttf?r… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraMoIt.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraMoIt.ttf?r… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraMono.ttf?r… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraSe.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraSe.ttf?rev… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraSeBd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraSeBd.ttf?r… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/doc/Copyright.Bitstream URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Copyright.… ============================================================================== --- trunk/reactos/media/fonts/doc/Copyright.Bitstream [iso-8859-1] (original) +++ trunk/reactos/media/fonts/doc/Copyright.Bitstream (removed) @@ -1,11 +1,0 @@ -(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA. - -You are hereby granted permission under all Bitstream propriety rights -to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream -Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts -for any purpose and without restriction; provided, that this notice is -left intact on all copies of such fonts and that Bitstream's trademark -is acknowledged as shown below on all unmodified copies of the 4 Charter -Type 1 fonts. - -BITSTREAM CHARTER is a registered trademark of Bitstream Inc. Removed: trunk/reactos/media/fonts/doc/VERA-COPYRIGHT.TXT URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/VERA-COPYR… ============================================================================== --- trunk/reactos/media/fonts/doc/VERA-COPYRIGHT.TXT [iso-8859-1] (original) +++ trunk/reactos/media/fonts/doc/VERA-COPYRIGHT.TXT (removed) @@ -1,124 +1,0 @@ -Bitstream Vera Fonts Copyright - -The fonts have a generous copyright, allowing derivative works (as -long as "Bitstream" or "Vera" are not in the names), and full -redistribution (so long as they are not *sold* by themselves). They -can be be bundled, redistributed and sold with any software. - -The fonts are distributed under the following copyright: - -Copyright -========= - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream -Vera is a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the fonts accompanying this license ("Fonts") and associated -documentation files (the "Font Software"), to reproduce and distribute -the Font Software, including without limitation the rights to use, -copy, merge, publish, distribute, and/or sell copies of the Font -Software, and to permit persons to whom the Font Software is furnished -to do so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice -shall be included in all copies of one or more of the Font Software -typefaces. - -The Font Software may be modified, altered, or added to, and in -particular the designs of glyphs or characters in the Fonts may be -modified and additional glyphs or characters may be added to the -Fonts, only if the fonts are renamed to names not containing either -the words "Bitstream" or the word "Vera". - -This License becomes null and void to the extent applicable to Fonts -or Font Software that has been modified and is distributed under the -"Bitstream Vera" names. - -The Font Software may be sold as part of a larger software package but -no copy of one or more of the Font Software typefaces may be sold by -itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL -BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, -OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT -SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - -Except as contained in this notice, the names of Gnome, the Gnome -Foundation, and Bitstream Inc., shall not be used in advertising or -otherwise to promote the sale, use or other dealings in this Font -Software without prior written authorization from the Gnome Foundation -or Bitstream Inc., respectively. For further information, contact: -fonts at gnome dot org. - -Copyright FAQ -============= - - 1. I don't understand the resale restriction... What gives? - - Bitstream is giving away these fonts, but wishes to ensure its - competitors can't just drop the fonts as is into a font sale system - and sell them as is. It seems fair that if Bitstream can't make money - from the Bitstream Vera fonts, their competitors should not be able to - do so either. You can sell the fonts as part of any software package, - however. - - 2. I want to package these fonts separately for distribution and - sale as part of a larger software package or system. Can I do so? - - Yes. A RPM or Debian package is a "larger software package" to begin - with, and you aren't selling them independently by themselves. - See 1. above. - - 3. Are derivative works allowed? - Yes! - - 4. Can I change or add to the font(s)? - Yes, but you must change the name(s) of the font(s). - - 5. Under what terms are derivative works allowed? - - You must change the name(s) of the fonts. This is to ensure the - quality of the fonts, both to protect Bitstream and Gnome. We want to - ensure that if an application has opened a font specifically of these - names, it gets what it expects (though of course, using fontconfig, - substitutions could still could have occurred during font - opening). You must include the Bitstream copyright. Additional - copyrights can be added, as per copyright law. Happy Font Hacking! - - 6. If I have improvements for Bitstream Vera, is it possible they might get - adopted in future versions? - - Yes. The contract between the Gnome Foundation and Bitstream has - provisions for working with Bitstream to ensure quality additions to - the Bitstream Vera font family. Please contact us if you have such - additions. Note, that in general, we will want such additions for the - entire family, not just a single font, and that you'll have to keep - both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add - glyphs to the font, they must be stylistically in keeping with Vera's - design. Vera cannot become a "ransom note" font. Jim Lyles will be - providing a document describing the design elements used in Vera, as a - guide and aid for people interested in contributing to Vera. - - 7. I want to sell a software package that uses these fonts: Can I do so? - - Sure. Bundle the fonts with your software and sell your software - with the fonts. That is the intent of the copyright. - - 8. If applications have built the names "Bitstream Vera" into them, - can I override this somehow to use fonts of my choosing? - - This depends on exact details of the software. Most open source - systems and software (e.g., Gnome, KDE, etc.) are now converting to - use fontconfig (see www.fontconfig.org) to handle font configuration, - selection and substitution; it has provisions for overriding font - names and subsituting alternatives. An example is provided by the - supplied local.conf file, which chooses the family Bitstream Vera for - "sans", "serif" and "monospace". Other software (e.g., the XFree86 - core server) has other mechanisms for font substitution. - Removed: trunk/reactos/media/fonts/doc/VERA-README.TXT URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/VERA-READM… ============================================================================== --- trunk/reactos/media/fonts/doc/VERA-README.TXT [iso-8859-1] (original) +++ trunk/reactos/media/fonts/doc/VERA-README.TXT (removed) @@ -1,11 +1,0 @@ -Contained herin is the Bitstream Vera font family. - -The Copyright information is found in the COPYRIGHT.TXT file (along -with being incoporated into the fonts themselves). - -The releases notes are found in the file "RELEASENOTES.TXT". - -We hope you enjoy Vera! - - Bitstream, Inc. - The Gnome Project Removed: trunk/reactos/media/fonts/doc/VERA-RELEASENOTES.TXT URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/VERA-RELEA… ============================================================================== --- trunk/reactos/media/fonts/doc/VERA-RELEASENOTES.TXT [iso-8859-1] (original) +++ trunk/reactos/media/fonts/doc/VERA-RELEASENOTES.TXT (removed) @@ -1,162 +1,0 @@ -Bitstream Vera Fonts - April 16, 2003 -===================================== - -The version number of these fonts is 1.10 to distinguish them from the -beta test fonts. - -Note that the Vera copyright is incorporated in the fonts themselves. -The License field in the fonts contains the copyright license as it -appears below. The TrueType copyright field is not large enough to -contain the full license, so the license is incorporated (as you might -think if you thought about it) into the license field, which -unfortunately can be obscure to find. (In pfaedit, see: Element->Font -Info->TTFNames->License). - -Our apologies for it taking longer to complete the fonts than planned. -Beta testers requested a tighter line spacing (less leading) and Jim -Lyles redesigned Vera's accents to bring its line spacing to more -typical of other fonts. This took additional time and effort. Our -thanks to Jim for this effort above and beyond the call of duty. - -There are four monospace and sans faces (normal, oblique, bold, bold -oblique) and two serif faces (normal and bold). Fontconfig/Xft2 (see -www.fontconfig.org) can artificially oblique the serif faces for you: -this loses hinting and distorts the faces slightly, but is visibly -different than normal and bold, and reasonably pleasing. - -On systems with fontconfig 2.0 or 2.1 installed, making your sans, -serif and monospace fonts default to these fonts is very easy. Just -drop the file local.conf into your /etc/fonts directory. This will -make the Bitstream fonts your default fonts for all applications using -fontconfig (if sans, serif, or monospace names are used, as they often -are as default values in many desktops). The XML in local.conf may -need modification to enable subpixel decimation, if appropriate, -however, the commented out phrase does so for XFree86 4.3, in the case -that the server does not have sufficient information to identify the -use of a flat panel. Fontconfig 2.2 adds Vera to the list of font -families and will, by default use it as the default sans, serif and -monospace fonts. - -During the testing of the final Vera fonts, we learned that screen -fonts in general are only typically hinted to work correctly at -integer pixel sizes. Vera is coded internally for integer sizes only. -We need to investigate further to see if there are commonly used fonts -that are hinted to be rounded but are not rounded to integer sizes due -to oversights in their coding. - -Most fonts work best at 8 pixels and below if anti-aliased only, as -the amount of work required to hint well at smaller and smaller sizes -becomes astronomical. GASP tables are typically used to control -whether hinting is used or not, but Freetype/Xft does not currently -support GASP tables (which are present in Vera). - -To mitigate this problem, both for Vera and other fonts, there will be -(very shortly) a new fontconfig 2.2 release that will, by default not -apply hints if the size is below 8 pixels. if you should have a font -that in fact has been hinted more agressively, you can use fontconfig -to note this exception. We believe this should improve many hinted -fonts in addition to Vera, though implemeting GASP support is likely -the right long term solution. - -Font rendering in Gnome or KDE is the combination of algorithms in -Xft2 and Freetype, along with hinting in the fonts themselves. It is -vital to have sufficient information to disentangle problems that you -may observe. - -Note that having your font rendering system set up correctly is vital -to proper judgement of problems of the fonts: - - * Freetype may or may not be configured to in ways that may - implement execution of possibly patented (in some parts of the world) - TrueType hinting algorithms, particularly at small sizes. Best - results are obtained while using these algorithms. - - * The freetype autohinter (used when the possibly patented - algorithms are not used) continues to improve with each release. If - you are using the autohinter, please ensure you are using an up to - date version of freetype before reporting problems. - - * Please identify what version of freetype you are using in any - bug reports, and how your freetype is configured. - - * Make sure you are not using the freetype version included in - XFree86 4.3, as it has bugs that significantly degrade most fonts, - including Vera. if you build XFree86 4.3 from source yourself, you may - have installed this broken version without intending it (as I - did). Vera was verified with the recently released Freetype 2.1.4. On - many systems, 'ldd" can be used to see which freetype shared library - is actually being used. - - * Xft/X Render does not (yet) implement gamma correction. This - causes significant problems rendering white text on a black background - (causing partial pixels to be insufficiently shaded) if the gamma of - your monitor has not been compensated for, and minor problems with - black text on a while background. The program "xgamma" can be used to - set a gamma correction value in the X server's color pallette. Most - monitors have a gamma near 2. - - * Note that the Vera family uses minimal delta hinting. Your - results on other systems when not used anti-aliased may not be - entirely satisfying. We are primarily interested in reports of - problems on open source systems implementing Xft2/fontconfig/freetype - (which implements antialiasing and hinting adjustements, and - sophisticated subpixel decimation on flatpanels). Also, the - algorithms used by Xft2 adjust the hints to integer widths and the - results are crisper on open source systems than on Windows or - MacIntosh. - - * Your fontconfig may (probably does) predate the release of - fontconfig 2.2, and you may see artifacts not present when the font is - used at very small sizes with hinting enabled. "vc-list -V" can be - used to see what version you have installed. - -We believe and hope that these fonts will resolve the problems -reported during beta test. The largest change is the reduction of -leading (interline spacing), which had annoyed a number of people, and -reduced Vera's utility for some applcations. The Vera monospace font -should also now make '0' and 'O' and '1' and 'l' more clearly -distinguishable. - -The version of these fonts is version 1.10. Fontconfig should be -choosing the new version of the fonts if both the released fonts and -beta test fonts are installed (though please discard them: they have -names of form tt20[1-12]gn.ttf). Note that older versions of -fontconfig sometimes did not rebuild their cache correctly when new -fonts are installed: please upgrade to fontconfig 2.2. "fc-cache -f" -can be used to force rebuilding fontconfig's cache files. - -If you note problems, please send them to fonts at gnome dot org, with -exactly which face and size and unicode point you observe the problem -at. The xfd utility from XFree86 CVS may be useful for this (e.g. "xfd --fa sans"). A possibly more useful program to examine fonts at a -variety of sizes is the "waterfall" program found in Keith Packard's -CVS. - - $ cvs -d :pserver:anoncvs@keithp.com:/local/src/CVS login - Logging in to :pserver:anoncvs@keithp.com:2401/local/src/CVS - CVS password: <hit return> - $ cvs -d :pserver:anoncvs@keithp.com:/local/src/CVS co waterfall - $ cd waterfall - $ xmkmf -a - $ make - # make install - # make install.man - -Again, please make sure you are running an up-to-date freetype, and -that you are only examining integer sizes. - -Reporting Problems -================== - -Please send problem reports to fonts at gnome org, with the following -information: - - 1. Version of Freetype, Xft2 and fontconfig - 2. Whether TT hinting is being used, or the autohinter - 3. Application being used - 4. Character/Unicode code point that has problems (if applicable) - 5. Version of which operating system - 6. Please include a screenshot, when possible. - -Please check the fonts list archives before reporting problems to cut -down on duplication. Modified: trunk/reactos/media/fonts/fonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/fonts.rbuild?r… ============================================================================== --- trunk/reactos/media/fonts/fonts.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/fonts/fonts.rbuild [iso-8859-1] Sun Mar 30 13:18:53 2008 @@ -17,11 +17,11 @@ <installfile installbase="media/fonts">DejaVuSerif.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerif-Bold.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerifCondensed.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile> <installfile installbase="media/fonts">c0419bt_.ttf</installfile> <installfile installbase="media/fonts">c0582bt_.ttf</installfile> <installfile installbase="media/fonts">c0583bt_.ttf</installfile> @@ -34,20 +34,22 @@ <installfile installbase="media/fonts">courb.ttf</installfile> <installfile installbase="media/fonts">courbi.ttf</installfile> <installfile installbase="media/fonts">helb____.ttf</installfile> + <installfile installbase="media/fonts">LiberationMono-Bold.ttf</installfile> + <installfile installbase="media/fonts">LiberationMono-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">LiberationMono-Italic.ttf</installfile> + <installfile installbase="media/fonts">LiberationMono-Regular.ttf</installfile> + <installfile installbase="media/fonts">LiberationSans-Bold.ttf</installfile> + <installfile installbase="media/fonts">LiberationSans-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">LiberationSans-Italic.ttf</installfile> + <installfile installbase="media/fonts">LiberationSans-Regular.ttf</installfile> + <installfile installbase="media/fonts">LiberationSerif-Bold.ttf</installfile> + <installfile installbase="media/fonts">LiberationSerif-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">LiberationSerif-Italic.ttf</installfile> + <installfile installbase="media/fonts">LiberationSerif-Regular.ttf</installfile> <installfile installbase="media/fonts">Marlett.ttf</installfile> <installfile installbase="media/fonts">timr____.ttf</installfile> <installfile installbase="media/fonts">UTB_____.ttf</installfile> <installfile installbase="media/fonts">UTBI____.ttf</installfile> <installfile installbase="media/fonts">UTI_____.ttf</installfile> <installfile installbase="media/fonts">UTRG____.ttf</installfile> - <installfile installbase="media/fonts">Vera.ttf</installfile> - <installfile installbase="media/fonts">VeraBd.ttf</installfile> - <installfile installbase="media/fonts">VeraBI.ttf</installfile> - <installfile installbase="media/fonts">VeraIt.ttf</installfile> - <installfile installbase="media/fonts">VeraMoBd.ttf</installfile> - <installfile installbase="media/fonts">VeraMoBI.ttf</installfile> - <installfile installbase="media/fonts">VeraMoIt.ttf</installfile> - <installfile installbase="media/fonts">VeraMono.ttf</installfile> - <installfile installbase="media/fonts">VeraSe.ttf</installfile> - <installfile installbase="media/fonts">VeraSeBd.ttf</installfile> </group>

1 0

[janderwald] 32782: - fix compilation with msvc8
by janderwald＠svn.reactos.org 30 Mar '08

30 Mar '08

Author: janderwald Date: Sun Mar 30 05:01:37 2008 New Revision: 32782 URL: http://svn.reactos.org/svn/reactos?rev=32782&view=rev Log: - fix compilation with msvc8 Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/ver.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Mar 30 05:01:37 2008 @@ -1850,7 +1850,7 @@ _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); - ConOutPuts (_T("(C) Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team.\n")); + ConOutPuts (_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.\n")); } ExecuteAutoRunFile (); Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Sun Mar 30 05:01:37 2008 @@ -78,7 +78,7 @@ { ConOutPuts (_T("Copyright (C) 1994-1998 Tim Norman and others.")); - ConOutPuts (_T("Copyright (C) 1998-" COPYRIGHT_YEAR " ReactOS Team")); + ConOutPuts (_T("Copyright (C) 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team")); for (i = 0; param[i]; i++) {

1 0

[fireball] 32781: - Convert to wmilib.def to wmilib.spec (so far stdcall-fixup was not really working).
by fireball＠svn.reactos.org 30 Mar '08

30 Mar '08

Author: fireball Date: Sun Mar 30 05:00:18 2008 New Revision: 32781 URL: http://svn.reactos.org/svn/reactos?rev=32781&view=rev Log: - Convert to wmilib.def to wmilib.spec (so far stdcall-fixup was not really working). Added: trunk/reactos/drivers/wmi/wmilib.spec - copied, changed from r32779, trunk/reactos/drivers/wmi/wmilib.def Removed: trunk/reactos/drivers/wmi/wmilib.def Modified: trunk/reactos/drivers/wmi/wmilib.rbuild Removed: trunk/reactos/drivers/wmi/wmilib.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/wmilib.def?rev… ============================================================================== --- trunk/reactos/drivers/wmi/wmilib.def [iso-8859-1] (original) +++ trunk/reactos/drivers/wmi/wmilib.def (removed) @@ -1,7 +1,0 @@ -; -; wmilib.def - export definition file for ReactOS -; -EXPORTS -WmiCompleteRequest -WmiFireEvent -WmiSystemControl Modified: trunk/reactos/drivers/wmi/wmilib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/wmilib.rbuild?… ============================================================================== --- trunk/reactos/drivers/wmi/wmilib.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wmi/wmilib.rbuild [iso-8859-1] Sun Mar 30 05:00:18 2008 @@ -1,9 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="wmilib" type="kernelmodedriver" installbase="system32/drivers" installname="wmilib.sys"> - <importlibrary definition="wmilib.def" /> + <importlibrary definition="wmilib.spec.def" /> <include base="wmilib">.</include> <library>ntoskrnl</library> <file>wmilib.c</file> + <file>wmilib.spec</file> <file>wmilib.rc</file> </module> Copied: trunk/reactos/drivers/wmi/wmilib.spec (from r32779, trunk/reactos/drivers/wmi/wmilib.def) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/wmilib.spec?p2… ============================================================================== --- trunk/reactos/drivers/wmi/wmilib.def [iso-8859-1] (original) +++ trunk/reactos/drivers/wmi/wmilib.spec [iso-8859-1] Sun Mar 30 05:00:18 2008 @@ -1,7 +1,6 @@ ; ; wmilib.def - export definition file for ReactOS ; -EXPORTS -WmiCompleteRequest -WmiFireEvent -WmiSystemControl +@ stdcall WmiCompleteRequest(ptr ptr long long long) +@ stdcall WmiFireEvent(ptr ptr long long ptr) +@ stdcall WmiSystemControl(ptr ptr ptr ptr)

1 0

[pschweitzer] 32780: Set all FSD (except fastfat.sys) start to 0x4 to let fs_rec.sys doing his job (and matching with Windows...). It will silent ext2 driver.
by pschweitzer＠svn.reactos.org 29 Mar '08

29 Mar '08

Author: pschweitzer Date: Sat Mar 29 08:40:28 2008 New Revision: 32780 URL: http://svn.reactos.org/svn/reactos?rev=32780&view=rev Log: Set all FSD (except fastfat.sys) start to 0x4 to let fs_rec.sys doing his job (and matching with Windows...). It will silent ext2 driver. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat Mar 29 08:40:28 2008 @@ -522,7 +522,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 ; Cdrom class driver @@ -681,7 +681,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ImagePath",0x00020000,"system32\drivers\ntfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Type",0x00010001,0x00000002 ; Null device driver @@ -743,7 +743,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002 ; VBE SVGA driver

1 0

[jimtabor] 32779: Phase 2: - Implement RtlRegisterWait and RtlDeregisterWait/Ex. Move the function to new file wait.c. Ported from Wine source. - Completely untested. - good luck!
by jimtabor＠svn.reactos.org 29 Mar '08

29 Mar '08

Author: jimtabor Date: Sat Mar 29 01:41:30 2008 New Revision: 32779 URL: http://svn.reactos.org/svn/reactos?rev=32779&view=rev Log: Phase 2: - Implement RtlRegisterWait and RtlDeregisterWait/Ex. Move the function to new file wait.c. Ported from Wine source. - Completely untested. - good luck! Added: trunk/reactos/lib/rtl/wait.c - copied, changed from r32778, trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=327… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Sat Mar 29 01:41:30 2008 @@ -91,6 +91,7 @@ <file>unicodeprefix.c</file> <file>vectoreh.c</file> <file>version.c</file> + <file>wait.c</file> <file>workitem.c</file> <pch>rtl.h</pch> </module> Modified: trunk/reactos/lib/rtl/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/thread.c?rev=32779… ============================================================================== --- trunk/reactos/lib/rtl/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/thread.c [iso-8859-1] Sat Mar 29 01:41:30 2008 @@ -275,82 +275,4 @@ } -/*********************************************************************** - * RtlRegisterWait - * - * Registers a wait for a handle to become signaled. - * - * PARAMS - * NewWaitObject [I] Handle to the new wait object. Use RtlDeregisterWait() to free it. - * Object [I] Object to wait to become signaled. - * Callback [I] Callback function to execute when the wait times out or the handle is signaled. - * Context [I] Context to pass to the callback function when it is executed. - * Milliseconds [I] Number of milliseconds to wait before timing out. - * Flags [I] Flags. See notes. - * - * RETURNS - * Success: STATUS_SUCCESS. - * Failure: Any NTSTATUS code. - * - * NOTES - * Flags can be one or more of the following: - *|WT_EXECUTEDEFAULT - Executes the work item in a non-I/O worker thread. - *|WT_EXECUTEINIOTHREAD - Executes the work item in an I/O worker thread. - *|WT_EXECUTEINPERSISTENTTHREAD - Executes the work item in a thread that is persistent. - *|WT_EXECUTELONGFUNCTION - Hints that the execution can take a long time. - *|WT_TRANSFER_IMPERSONATION - Executes the function with the current access token. - */ -NTSTATUS -NTAPI -RtlRegisterWait(PHANDLE NewWaitObject, - HANDLE Object, - WAITORTIMERCALLBACKFUNC Callback, - PVOID Context, - ULONG Milliseconds, - ULONG Flags) -{ - return STATUS_SUCCESS; -} - -/*********************************************************************** - * RtlDeregisterWaitEx - * - * Cancels a wait operation and frees the resources associated with calling - * RtlRegisterWait(). - * - * PARAMS - * WaitObject [I] Handle to the wait object to free. - * - * RETURNS - * Success: STATUS_SUCCESS. - * Failure: Any NTSTATUS code. - */ -NTSTATUS -NTAPI -RtlDeregisterWaitEx(HANDLE WaitHandle, - HANDLE CompletionEvent) -{ - return STATUS_SUCCESS; -} - -/*********************************************************************** - * RtlDeregisterWait - * - * Cancels a wait operation and frees the resources associated with calling - * RtlRegisterWait(). - * - * PARAMS - * WaitObject [I] Handle to the wait object to free. - * - * RETURNS - * Success: STATUS_SUCCESS. - * Failure: Any NTSTATUS code. - */ -NTSTATUS -NTAPI -RtlDeregisterWait(HANDLE WaitHandle) -{ - return RtlDeregisterWaitEx(WaitHandle, NULL); -} - /* EOF */ Copied: trunk/reactos/lib/rtl/wait.c (from r32778, trunk/reactos/lib/rtl/thread.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/wait.c?p2=trunk/re… ============================================================================== --- trunk/reactos/lib/rtl/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/wait.c [iso-8859-1] Sat Mar 29 01:41:30 2008 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * PURPOSE: Rtl user thread functions - * FILE: lib/rtl/thread.c + * PURPOSE: Rtl user wait functions + * FILE: lib/rtl/wait.c * PROGRAMERS: * Alex Ionescu (alex(a)relsoft.net) * Eric Kohl @@ -16,263 +16,90 @@ #define NDEBUG #include <debug.h> +typedef struct _RTLP_WAIT +{ + HANDLE Object; + BOOLEAN CallbackInProgress; + HANDLE CancelEvent; + LONG DeleteCount; + HANDLE CompletionEvent; + ULONG Flags; + WAITORTIMERCALLBACKFUNC Callback; + PVOID Context; + ULONG Milliseconds; +} RTLP_WAIT, *PRTLP_WAIT; + /* PRIVATE FUNCTIONS *******************************************************/ -NTSTATUS +static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout ) +{ + if (timeout == INFINITE) return NULL; + pTime->QuadPart = (ULONGLONG)timeout * -10000; + return pTime; +} + +static VOID NTAPI -RtlpCreateUserStack(IN HANDLE hProcess, - IN SIZE_T StackReserve OPTIONAL, - IN SIZE_T StackCommit OPTIONAL, - IN ULONG StackZeroBits OPTIONAL, - OUT PINITIAL_TEB InitialTeb) -{ +Wait_thread_proc(LPVOID Arg) +{ + PRTLP_WAIT Wait = (PRTLP_WAIT) Arg; NTSTATUS Status; - SYSTEM_BASIC_INFORMATION SystemBasicInfo; - PIMAGE_NT_HEADERS Headers; - ULONG_PTR Stack = 0; - BOOLEAN UseGuard = FALSE; - ULONG Dummy, GuardPageSize; - - /* Get some memory information */ - Status = ZwQuerySystemInformation(SystemBasicInformation, - &SystemBasicInfo, - sizeof(SYSTEM_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Use the Image Settings if we are dealing with the current Process */ - if (hProcess == NtCurrentProcess()) - { - /* Get the Image Headers */ - Headers = RtlImageNtHeader(NtCurrentPeb()->ImageBaseAddress); - - /* If we didn't get the parameters, find them ourselves */ - if (!StackReserve) StackReserve = Headers->OptionalHeader. - SizeOfStackReserve; - if (!StackCommit) StackCommit = Headers->OptionalHeader. - SizeOfStackCommit; - } - else - { - /* Use the System Settings if needed */ - if (!StackReserve) StackReserve = SystemBasicInfo.AllocationGranularity; - if (!StackCommit) StackCommit = SystemBasicInfo.PageSize; - } - - /* Align everything to Page Size */ - StackReserve = ROUND_UP(StackReserve, SystemBasicInfo.AllocationGranularity); - StackCommit = ROUND_UP(StackCommit, SystemBasicInfo.PageSize); - - // FIXME: Remove once Guard Page support is here - #if 1 - StackCommit = StackReserve; - #endif - - /* Reserve memory for the stack */ - Status = ZwAllocateVirtualMemory(hProcess, - (PVOID*)&Stack, - StackZeroBits, - &StackReserve, - MEM_RESERVE, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) return Status; - - /* Now set up some basic Initial TEB Parameters */ - InitialTeb->PreviousStackBase = NULL; - InitialTeb->PreviousStackLimit = NULL; - InitialTeb->AllocatedStackBase = (PVOID)Stack; - InitialTeb->StackBase = (PVOID)(Stack + StackReserve); - - /* Update the Stack Position */ - Stack += StackReserve - StackCommit; - - /* Check if we will need a guard page */ - if (StackReserve > StackCommit) - { - /* Remove a page to set as guard page */ - Stack -= SystemBasicInfo.PageSize; - StackCommit += SystemBasicInfo.PageSize; - UseGuard = TRUE; - } - - /* Allocate memory for the stack */ - Status = ZwAllocateVirtualMemory(hProcess, - (PVOID*)&Stack, - 0, - &StackCommit, - MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) return Status; - - /* Now set the current Stack Limit */ - InitialTeb->StackLimit = (PVOID)Stack; - - /* Create a guard page */ - if (UseGuard) - { - /* Attempt maximum space possible */ - GuardPageSize = SystemBasicInfo.PageSize; - Status = ZwProtectVirtualMemory(hProcess, - (PVOID*)&Stack, - &GuardPageSize, - PAGE_GUARD | PAGE_READWRITE, - &Dummy); - if (!NT_SUCCESS(Status)) return Status; - - /* Update the Stack Limit keeping in mind the Guard Page */ - InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit - - GuardPageSize); - } - - /* We are done! */ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -RtlpFreeUserStack(IN HANDLE Process, - IN PINITIAL_TEB InitialTeb) -{ - SIZE_T Dummy = 0; - NTSTATUS Status; - - /* Free the Stack */ - Status = ZwFreeVirtualMemory(Process, - &InitialTeb->AllocatedStackBase, - &Dummy, - MEM_RELEASE); - - /* Clear the initial TEB */ - RtlZeroMemory(InitialTeb, sizeof(INITIAL_TEB)); - return Status; -} + BOOLEAN alertable = (Wait->Flags & WT_EXECUTEINIOTHREAD) ? TRUE : FALSE; + HANDLE handles[2] = { Wait->Object, Wait->CancelEvent }; + LARGE_INTEGER timeout; + HANDLE completion_event; + +// TRACE("\n"); + + while (TRUE) + { + Status = NtWaitForMultipleObjects( 2, + handles, + FALSE, + alertable, + get_nt_timeout( &timeout, Wait->Milliseconds ) ); + + if (Status == STATUS_WAIT_0 || Status == STATUS_TIMEOUT) + { + BOOLEAN TimerOrWaitFired; + + if (Status == STATUS_WAIT_0) + { + // TRACE( "object %p signaled, calling callback %p with context %p\n", + // Wait->Object, Wait->Callback, + // Wait->Context ); + TimerOrWaitFired = FALSE; + } + else + { + // TRACE( "wait for object %p timed out, calling callback %p with context %p\n", + // Wait->Object, Wait->Callback, + // Wait->Context ); + TimerOrWaitFired = TRUE; + } + Wait->CallbackInProgress = TRUE; + Wait->Callback( Wait->Context, TimerOrWaitFired ); + Wait->CallbackInProgress = FALSE; + + if (Wait->Flags & WT_EXECUTEONLYONCE) + break; + } + else + break; + } + + completion_event = Wait->CompletionEvent; + if (completion_event) NtSetEvent( completion_event, NULL ); + + if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + { + NtClose( Wait->CancelEvent ); + RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); + } +} + /* FUNCTIONS ***************************************************************/ - -/* - @implemented -*/ -NTSTATUS -NTAPI -RtlCreateUserThread(IN HANDLE ProcessHandle, - IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL, - IN BOOLEAN CreateSuspended, - IN ULONG StackZeroBits OPTIONAL, - IN SIZE_T StackReserve OPTIONAL, - IN SIZE_T StackCommit OPTIONAL, - IN PTHREAD_START_ROUTINE StartAddress, - IN PVOID Parameter OPTIONAL, - OUT PHANDLE ThreadHandle OPTIONAL, - OUT PCLIENT_ID ClientId OPTIONAL) -{ - NTSTATUS Status; - HANDLE Handle; - CLIENT_ID ThreadCid; - INITIAL_TEB InitialTeb; - OBJECT_ATTRIBUTES ObjectAttributes; - CONTEXT Context; - - /* First, we'll create the Stack */ - Status = RtlpCreateUserStack(ProcessHandle, - StackReserve, - StackCommit, - StackZeroBits, - &InitialTeb); - if (!NT_SUCCESS(Status)) return Status; - - /* Next, we'll set up the Initial Context */ - RtlInitializeContext(ProcessHandle, - &Context, - Parameter, - StartAddress, - InitialTeb.StackBase); - - /* We are now ready to create the Kernel Thread Object */ - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - SecurityDescriptor); - Status = ZwCreateThread(&Handle, - THREAD_ALL_ACCESS, - &ObjectAttributes, - ProcessHandle, - &ThreadCid, - &Context, - &InitialTeb, - CreateSuspended); - if (!NT_SUCCESS(Status)) - { - /* Free the stack */ - RtlpFreeUserStack(ProcessHandle, &InitialTeb); - } - else - { - /* Return thread data */ - if (ThreadHandle) *ThreadHandle = Handle; - if (ClientId) *ClientId = ThreadCid; - } - - /* Return success or the previous failure */ - return Status; -} - -/* - * @implemented - */ -VOID -NTAPI -RtlExitUserThread(NTSTATUS Status) -{ - /* Call the Loader and tell him to notify the DLLs */ - LdrShutdownThread(); - - /* Shut us down */ - NtCurrentTeb()->FreeStackOnTermination = TRUE; - NtTerminateThread(NtCurrentThread(), Status); -} - -/* - @implemented -*/ -VOID -NTAPI -RtlFreeUserThreadStack(HANDLE ProcessHandle, - HANDLE ThreadHandle) -{ - NTSTATUS Status; - THREAD_BASIC_INFORMATION ThreadBasicInfo; - SIZE_T Dummy, Size = 0; - PVOID StackLocation; - - /* Query the Basic Info */ - Status = NtQueryInformationThread(ThreadHandle, - ThreadBasicInformation, - &ThreadBasicInfo, - sizeof(THREAD_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status) || !ThreadBasicInfo.TebBaseAddress) return; - - /* Get the deallocation stack */ - Status = NtReadVirtualMemory(ProcessHandle, - &((PTEB)ThreadBasicInfo.TebBaseAddress)-> - DeallocationStack, - &StackLocation, - sizeof(PVOID), - &Dummy); - if (!NT_SUCCESS(Status) || !StackLocation) return; - - /* Free it */ - NtFreeVirtualMemory(ProcessHandle, &StackLocation, &Size, MEM_RELEASE); -} - -PTEB -NTAPI -_NtCurrentTeb(VOID) -{ - /* Return the TEB */ - return NtCurrentTeb(); -} /*********************************************************************** @@ -309,7 +136,49 @@ ULONG Milliseconds, ULONG Flags) { - return STATUS_SUCCESS; + PRTLP_WAIT Wait; + NTSTATUS Status; + + //TRACE( "(%p, %p, %p, %p, %d, 0x%x)\n", NewWaitObject, Object, Callback, Context, Milliseconds, Flags ); + + Wait = RtlAllocateHeap( RtlGetProcessHeap(), 0, sizeof(RTLP_WAIT) ); + if (!Wait) + return STATUS_NO_MEMORY; + + Wait->Object = Object; + Wait->Callback = Callback; + Wait->Context = Context; + Wait->Milliseconds = Milliseconds; + Wait->Flags = Flags; + Wait->CallbackInProgress = FALSE; + Wait->DeleteCount = 0; + Wait->CompletionEvent = NULL; + + Status = NtCreateEvent( &Wait->CancelEvent, + EVENT_ALL_ACCESS, + NULL, + TRUE, + FALSE ); + + if (Status != STATUS_SUCCESS) + { + RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); + return Status; + } + + Status = RtlQueueWorkItem( Wait_thread_proc, + Wait, + Flags & ~WT_EXECUTEONLYONCE ); + + if (Status != STATUS_SUCCESS) + { + NtClose( Wait->CancelEvent ); + RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); + return Status; + } + + *NewWaitObject = Wait; + return Status; } /*********************************************************************** @@ -330,7 +199,54 @@ RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) { - return STATUS_SUCCESS; + PRTLP_WAIT Wait = (PRTLP_WAIT) WaitHandle; + NTSTATUS Status = STATUS_SUCCESS; + + //TRACE( "(%p)\n", WaitHandle ); + + NtSetEvent( Wait->CancelEvent, NULL ); + if (Wait->CallbackInProgress) + { + if (CompletionEvent != NULL) + { + if (CompletionEvent == INVALID_HANDLE_VALUE) + { + Status = NtCreateEvent( &CompletionEvent, + EVENT_ALL_ACCESS, + NULL, + TRUE, + FALSE ); + + if (Status != STATUS_SUCCESS) + return Status; + + (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + + if (Wait->CallbackInProgress) + NtWaitForSingleObject( CompletionEvent, FALSE, NULL ); + + NtClose( CompletionEvent ); + } + else + { + (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + + if (Wait->CallbackInProgress) + Status = STATUS_PENDING; + } + } + else + Status = STATUS_PENDING; + } + + if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + { + Status = STATUS_SUCCESS; + NtClose( Wait->CancelEvent ); + RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); + } + + return Status; } /***********************************************************************

1 0

[jimtabor] 32778: Phase 1: - Implement RegisterWaitForSingleObject/Ex and UnregisterWait/Ex in stubs.c. I'm not sure where to place the exports. So ATM it is here. - Stub RtlRegisterWait and RtlDeregisterWait/Ex. - Import from Wine source and is LGPL. - Ref: http://source.winehq.org/WineAPI/RtlRegisterWait.html http://source.winehq.org/WineAPI/RtlDeregisterWait.html
by jimtabor＠svn.reactos.org 29 Mar '08

29 Mar '08

Author: jimtabor Date: Fri Mar 28 22:46:17 2008 New Revision: 32778 URL: http://svn.reactos.org/svn/reactos?rev=32778&view=rev Log: Phase 1: - Implement RegisterWaitForSingleObject/Ex and UnregisterWait/Ex in stubs.c. I'm not sure where to place the exports. So ATM it is here. - Stub RtlRegisterWait and RtlDeregisterWait/Ex. - Import from Wine source and is LGPL. - Ref: http://source.winehq.org/WineAPI/RtlRegisterWait.html http://source.winehq.org/WineAPI/RtlDeregisterWait.html Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def [iso-8859-1] Fri Mar 28 22:46:17 2008 @@ -404,6 +404,8 @@ RtlDeleteTimer@12 RtlDeleteTimerQueue@4 RtlDeleteTimerQueueEx@8 +RtlDeregisterWait@4 +RtlDeregisterWaitEx@8 RtlDestroyAtomTable@4 RtlDestroyEnvironment@4 RtlDestroyHandleTable@4 @@ -622,6 +624,7 @@ RtlReAllocateHeap@16 RtlRealPredecessor@4 RtlRealSuccessor@4 +RtlRegisterWait@24 RtlReleasePebLock@0 RtlReleaseRelativeName@4 RtlReleaseResource@4 Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Fri Mar 28 22:46:17 2008 @@ -7,6 +7,10 @@ #define NDEBUG #include <debug.h> + +NTSTATUS NTAPI RtlRegisterWait(PHANDLE, HANDLE, WAITORTIMERCALLBACKFUNC, PVOID, ULONG, ULONG); +NTSTATUS NTAPI RtlDeregisterWaitEx(HANDLE, HANDLE); +NTSTATUS NTAPI RtlDeregisterWait(HANDLE); #define STUB \ @@ -657,8 +661,18 @@ ULONG dwFlags ) { - STUB; - return 0; + NTSTATUS status; + +// TRACE("%p %p %p %p %d %d\n", +// phNewWaitObject,hObject,Callback,Context,dwMilliseconds,dwFlags); + + status = RtlRegisterWait( phNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } /* @@ -674,8 +688,19 @@ ULONG dwFlags ) { - STUB; - return 0; + NTSTATUS status; + HANDLE hNewWaitObject; + +// TRACE("%p %p %p %d %d\n", +// hObject,Callback,Context,dwMilliseconds,dwFlags); + + status = RtlRegisterWait( &hNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return NULL; + } + return hNewWaitObject; } /* @@ -794,8 +819,17 @@ HANDLE WaitHandle ) { - STUB; - return 0; + NTSTATUS status; + +// TRACE("%p\n",WaitHandle); + + status = RtlDeregisterWaitEx( WaitHandle, NULL ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } /* @@ -808,8 +842,17 @@ HANDLE CompletionEvent ) { - STUB; - return 0; + NTSTATUS status; + +// TRACE("%p\n",WaitHandle); + + status = RtlDeregisterWaitEx( WaitHandle, CompletionEvent ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } /* Modified: trunk/reactos/lib/rtl/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/thread.c?rev=32778… ============================================================================== --- trunk/reactos/lib/rtl/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/thread.c [iso-8859-1] Fri Mar 28 22:46:17 2008 @@ -274,4 +274,83 @@ return NtCurrentTeb(); } + +/*********************************************************************** + * RtlRegisterWait + * + * Registers a wait for a handle to become signaled. + * + * PARAMS + * NewWaitObject [I] Handle to the new wait object. Use RtlDeregisterWait() to free it. + * Object [I] Object to wait to become signaled. + * Callback [I] Callback function to execute when the wait times out or the handle is signaled. + * Context [I] Context to pass to the callback function when it is executed. + * Milliseconds [I] Number of milliseconds to wait before timing out. + * Flags [I] Flags. See notes. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + * + * NOTES + * Flags can be one or more of the following: + *|WT_EXECUTEDEFAULT - Executes the work item in a non-I/O worker thread. + *|WT_EXECUTEINIOTHREAD - Executes the work item in an I/O worker thread. + *|WT_EXECUTEINPERSISTENTTHREAD - Executes the work item in a thread that is persistent. + *|WT_EXECUTELONGFUNCTION - Hints that the execution can take a long time. + *|WT_TRANSFER_IMPERSONATION - Executes the function with the current access token. + */ +NTSTATUS +NTAPI +RtlRegisterWait(PHANDLE NewWaitObject, + HANDLE Object, + WAITORTIMERCALLBACKFUNC Callback, + PVOID Context, + ULONG Milliseconds, + ULONG Flags) +{ + return STATUS_SUCCESS; +} + +/*********************************************************************** + * RtlDeregisterWaitEx + * + * Cancels a wait operation and frees the resources associated with calling + * RtlRegisterWait(). + * + * PARAMS + * WaitObject [I] Handle to the wait object to free. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + */ +NTSTATUS +NTAPI +RtlDeregisterWaitEx(HANDLE WaitHandle, + HANDLE CompletionEvent) +{ + return STATUS_SUCCESS; +} + +/*********************************************************************** + * RtlDeregisterWait + * + * Cancels a wait operation and frees the resources associated with calling + * RtlRegisterWait(). + * + * PARAMS + * WaitObject [I] Handle to the wait object to free. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + */ +NTSTATUS +NTAPI +RtlDeregisterWait(HANDLE WaitHandle) +{ + return RtlDeregisterWaitEx(WaitHandle, NULL); +} + /* EOF */

1 0

[weiden] 32777: Fix difference in signedness warning
by weiden＠svn.reactos.org 29 Mar '08

29 Mar '08

Author: weiden Date: Fri Mar 28 20:04:33 2008 New Revision: 32777 URL: http://svn.reactos.org/svn/reactos?rev=32777&view=rev Log: Fix difference in signedness warning Modified: trunk/reactos/dll/win32/shell32/recyclebin.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] Fri Mar 28 20:04:33 2008 @@ -999,7 +999,7 @@ LONG res; HKEY hKey; DWORD RegSerial, dwNukeOnDelete, dwType; - LONG dwLength; + DWORD dwLength; static WCHAR szKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\c";

1 0

[dreimer] 32776: Clean Up WineFile Folder. The MSVC Files are autogenerated anyway and these ones are rather old. Synched WineFile to recent Wine CVS.
by dreimer＠svn.reactos.org 28 Mar '08

28 Mar '08

Author: dreimer Date: Fri Mar 28 09:40:37 2008 New Revision: 32776 URL: http://svn.reactos.org/svn/reactos?rev=32776&view=rev Log: Clean Up WineFile Folder. The MSVC Files are autogenerated anyway and these ones are rather old. Synched WineFile to recent Wine CVS. Added: trunk/rosapps/winefile/rsrc.rc (with props) Removed: trunk/rosapps/winefile/Doxyfile trunk/rosapps/winefile/Makefile-MinGW trunk/rosapps/winefile/doxy-footer.html trunk/rosapps/winefile/doxy-footer.htmt trunk/rosapps/winefile/make-docu.sh trunk/rosapps/winefile/make_winefile.dsp trunk/rosapps/winefile/make_winefile.vcproj trunk/rosapps/winefile/makel-docu.bat trunk/rosapps/winefile/winefile.dsp trunk/rosapps/winefile/winefile.dsw trunk/rosapps/winefile/winefile.rc trunk/rosapps/winefile/winefile.sln trunk/rosapps/winefile/winefile.vcproj Modified: trunk/rosapps/winefile/Makefile.in trunk/rosapps/winefile/lang/cs-CZ.rc trunk/rosapps/winefile/lang/de-DE.rc trunk/rosapps/winefile/lang/en-US.rc trunk/rosapps/winefile/lang/es-ES.rc trunk/rosapps/winefile/lang/fr-FR.rc trunk/rosapps/winefile/lang/hu-HU.rc trunk/rosapps/winefile/lang/it-IT.rc trunk/rosapps/winefile/lang/ko-KO.rc trunk/rosapps/winefile/lang/nb-NO.rc trunk/rosapps/winefile/lang/nl-NL.rc trunk/rosapps/winefile/lang/pl-PL.rc trunk/rosapps/winefile/lang/pt-PT.rc trunk/rosapps/winefile/lang/ru-RU.rc trunk/rosapps/winefile/lang/sl-SI.rc trunk/rosapps/winefile/lang/sv-SE.rc trunk/rosapps/winefile/lang/tr-TR.rc trunk/rosapps/winefile/lang/zh-CN.rc trunk/rosapps/winefile/resource.h trunk/rosapps/winefile/winefile.c trunk/rosapps/winefile/winefile.h trunk/rosapps/winefile/winefile.ico trunk/rosapps/winefile/winefile.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/rosapps/winefile/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/Doxyfile?rev=3277… Removed: trunk/rosapps/winefile/Makefile-MinGW URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/Makefile-MinGW?re… Modified: trunk/rosapps/winefile/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/Makefile.in?rev=3… Removed: trunk/rosapps/winefile/doxy-footer.html URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/doxy-footer.html?… Removed: trunk/rosapps/winefile/doxy-footer.htmt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/doxy-footer.htmt?… Modified: trunk/rosapps/winefile/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/cs-CZ.rc?rev… Modified: trunk/rosapps/winefile/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/de-DE.rc?rev… Modified: trunk/rosapps/winefile/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/en-US.rc?rev… Modified: trunk/rosapps/winefile/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/es-ES.rc?rev… Modified: trunk/rosapps/winefile/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/fr-FR.rc?rev… Modified: trunk/rosapps/winefile/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/hu-HU.rc?rev… Modified: trunk/rosapps/winefile/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/it-IT.rc?rev… Modified: trunk/rosapps/winefile/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/ko-KO.rc?rev… Modified: trunk/rosapps/winefile/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/nb-NO.rc?rev… Modified: trunk/rosapps/winefile/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/nl-NL.rc?rev… Modified: trunk/rosapps/winefile/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/pl-PL.rc?rev… Modified: trunk/rosapps/winefile/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/pt-PT.rc?rev… Modified: trunk/rosapps/winefile/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/ru-RU.rc?rev… Modified: trunk/rosapps/winefile/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/sl-SI.rc?rev… Modified: trunk/rosapps/winefile/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/sv-SE.rc?rev… Modified: trunk/rosapps/winefile/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/tr-TR.rc?rev… Modified: trunk/rosapps/winefile/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/zh-CN.rc?rev… Removed: trunk/rosapps/winefile/make-docu.sh URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/make-docu.sh?rev=… Removed: trunk/rosapps/winefile/make_winefile.dsp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/make_winefile.dsp… Removed: trunk/rosapps/winefile/make_winefile.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/make_winefile.vcp… Removed: trunk/rosapps/winefile/makel-docu.bat URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/makel-docu.bat?re… Modified: trunk/rosapps/winefile/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/resource.h?rev=32… Added: trunk/rosapps/winefile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/rsrc.rc?rev=32776… Modified: trunk/rosapps/winefile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.c?rev=32… Removed: trunk/rosapps/winefile/winefile.dsp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.dsp?rev=… Removed: trunk/rosapps/winefile/winefile.dsw URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.dsw?rev=… Modified: trunk/rosapps/winefile/winefile.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.h?rev=32… Modified: trunk/rosapps/winefile/winefile.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.ico?rev=… Modified: trunk/rosapps/winefile/winefile.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.rbuild?r… Removed: trunk/rosapps/winefile/winefile.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.rc?rev=3… Removed: trunk/rosapps/winefile/winefile.sln URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.sln?rev=… Removed: trunk/rosapps/winefile/winefile.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.vcproj?r…

1 0

[dreimer] 32775: Bug 3153, 3154, 3155, 3156, 3157 Korean translations Update by Manatails (admin@manateeshome.com)
by dreimer＠svn.reactos.org 28 Mar '08

28 Mar '08

Author: dreimer Date: Fri Mar 28 09:35:51 2008 New Revision: 32775 URL: http://svn.reactos.org/svn/reactos?rev=32775&view=rev Log: Bug 3153, 3154, 3155, 3156, 3157 Korean translations Update by Manatails (admin(a)manateeshome.com) Added: trunk/reactos/base/applications/control/lang/ko-KO.rc (with props) trunk/reactos/base/applications/games/winemine/lang/ko-KO.rc (with props) trunk/reactos/base/applications/logoff/lang/ko-KO.rc (with props) trunk/reactos/base/applications/mmc/lang/ko-KO.rc (with props) trunk/reactos/base/applications/msconfig/lang/ko-KO.rc (with props) Modified: trunk/reactos/base/applications/control/rsrc.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/logoff/rsrc.rc trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/wordpad/print.c Added: trunk/reactos/base/applications/control/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/control/lang/ko-KO.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -1,0 +1,39 @@ +/* + *Korean translation by manatails007(www.manatails007.org) + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "ÆÄÀÏ(&F)" + BEGIN + MENUITEM "´Ý±â(&C)", IDM_CLOSE + END + POPUP "º¸±â(&V)" + BEGIN + MENUITEM "Å« ¾ÆÀÌÄÜ", IDM_LARGEICONS + MENUITEM "ÀÛÀº ¾ÆÀÌÄÜ", IDM_SMALLICONS + MENUITEM "¸®½ºÆ®", IDM_LIST + MENUITEM "ÀÚ¼¼È÷", IDM_DETAILS + END + POPUP "µµ¿ò¸»" + BEGIN + MENUITEM "Á¤º¸", IDM_ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_WINDOW_TITLE "Á¦¾îÆÇ" + IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL" + IDS_ABOUT_TITLE "Á¦¾îÆÇ¿¡ ´ëÇÏ¿©" + IDS_NO_ITEMS "¸®½ºÆ® ºä¿¡ ¾ÆÀÌÅÛ ¾øÀ½" + IDS_NAME "ÀÌ¸§" + IDS_COMMENT "ÄÚ¸àÆ®" +END Propchange: trunk/reactos/base/applications/control/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/control/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/control/rsrc.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -22,6 +22,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/ko-KO.rc" #include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" Added: trunk/reactos/base/applications/games/winemine/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/games/winemine/lang/ko-KO.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -1,0 +1,80 @@ +/* + *Korean translation by manatails007(www.manatails007.org) + */ +#include "resource.h" + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_SECONDS, "ÃÊ" + IDS_NOBODY, "ÀÍ¸í" + IDS_ABOUT, "by Joshua Thielen and ReactOS developers" +END + +IDM_WINEMINE MENU DISCARDABLE +BEGIN + POPUP "°ÔÀÓ(&G)" + BEGIN + MENUITEM "»õ °ÔÀÓ(&N)\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "? Ç¥½Ã(&M)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "ÃÊ±Þ(&B)", IDM_BEGINNER + MENUITEM "Áß±Þ(&I)", IDM_ADVANCED + MENUITEM "°í±Þ(&E)", IDM_EXPERT + MENUITEM "Ä¿½ºÅÒ(&C)", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "ÃÖ°í ±â·Ï(&B)", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "Á¾·á(&E)", IDM_EXIT + END + POPUP "µµ¿ò¸»(&H)" + BEGIN + MENUITEM "Á¤º¸(&A)", IDM_ABOUT + END +END + +IDD_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Fastest Times" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÃÖ°í ±â·Ï", IDNONE, 10, 10, 182, 45 + LTEXT "ÃÊ±Þ:", IDNONE, 20, 20, 58, 8 + LTEXT "Áß±Þ:", IDNONE, 20, 30, 58, 8 + LTEXT "°í±Þ:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 127, 57, 50, 15 + PUSHBUTTON "Á¡¼ö ÃÊ±âÈ(&R)", IDRESET, 18, 57, 67, 15 +END + +IDD_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "ÃàÇÏÇÕ´Ï´Ù!" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÀÌ¸§À» ÀÔ·ÂÇÏ¼¼¿ä", IDIGNORE, 25, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 60, 40, 40, 15 +END + +IDD_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Ä¿½ºÅÒ °ÔÀÓ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "³ôÀÌ:", IDNONE, 5, 15, 43, 10 + LTEXT "³Êºñ:", IDNONE, 5, 35, 43, 10 + LTEXT "Áö·Ú:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "È®ÀÎ", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 86, 52, 45, 15 +END Propchange: trunk/reactos/base/applications/games/winemine/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -25,6 +25,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" Added: trunk/reactos/base/applications/logoff/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/logoff/lang/ko-KO.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -1,0 +1,19 @@ +/* + *Korean translation by manatails007 + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "¼¼¼ÇÀ» Á¾·áÇÕ´Ï´Ù\n\n\ + /v\t\t½ÇÇàµÈ ¾×¼Ç¿¡ ´ëÇÑ Á¤º¸¸¦ º¸¿©ÁÝ´Ï´Ù\n\ + /?\t\tÀÌ Á¤º¸¸¦ º¸¿© ÁÝ´Ï´Ù\n\n" + +IDS_LOGOFF_REMOTE, "¿ø°ÝÁöÀÇ ¼¼¼Ç Á¾·á" +IDS_LOGOFF_LOCAL, "ÇöÀç ¼¼¼Ç Á¾·á" + +IDS_ILLEGAL_PARAM, "Àß¸øµÈ ÆÄ¶ó¹ÌÅÍ\n" +END +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/rsrc.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -10,6 +10,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/applications/mmc/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/mmc/lang/ko-KO.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -1,0 +1,24 @@ +/* + *Korean translation by manatails007(www.manatails007.org) + */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "ÆÄÀÏ(&F)" + BEGIN + MENUITEM SEPARATOR + MENUITEM "Á¾·á(&E)\tAlt+F4", ID_FILE_EXIT + END + + POPUP "µµ¿ò¸»(&H)" + BEGIN + MENUITEM "ReactOS °ü¸® ÄÜ¼Ö¿¡ ´ëÇÏ¿©...(&A)", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS °ü¸® ÄÜ¼Ö" + IDS_CONSOLETITLE "Console%1!u!" +END Propchange: trunk/reactos/base/applications/mmc/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -10,6 +10,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" Added: trunk/reactos/base/applications/msconfig/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/msconfig/lang/ko-KO.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -1,0 +1,177 @@ +/* + *Korean translation by manatails007(www.manatails007.org) + */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDD_MSCONFIG_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "½Ã½ºÅÛ ¼³Á¤ ÇÁ·Î±×·¥" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "µµ¿ò¸»(&H)", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Àû¿ë", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_STARTUP_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "¸ðµÎ È°¼ºÈ(&A)",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "¸ðµÎ ºñÈ°¼ºÈ(&D)",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 +END + +IDD_SYSTEM_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148 + PUSHBUTTON "À§·Î ¿òÁ÷ÀÓ(&U)", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "¹ØÀ¸·Î ¿òÁ÷ÀÓ(&D)", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 + + PUSHBUTTON "È°¼ºÈ(&E)", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "ºñÈ°¼ºÈ(&D)", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 + + PUSHBUTTON "°Ë»ö(&F)", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "»õ Ç×¸ñ(&N)", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "ÆíÁý(&T)", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + + PUSHBUTTON "¸ðµÎ È°¼ºÈ(&B)", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "¸ðµÎ ºñÈ°¼ºÈ(&A)",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 +END + +IDD_TOOLS_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "½ÇÇà(&R)", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "¸ðµÎ È°¼ºÈ(&A)",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "¸ðµÎ ºñÈ°¼ºÈ(&D)",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 +END + +IDD_GENERAL_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "»çÀÛ ¿É¼Ç", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "º¸Åë ½ÃÀÛ(&N) - ¸ðµç µå¶óÀÌ¹ö¿Í ¼ºñ½º ·Îµå", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 + CONTROL "Áø´Ü ½ÃÀÛ(&D) - ±âº»Àû µå¶óÀÌ¹ö¿Í ¼ºñ½º¸¸ ·Îµå", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + CONTROL "¼±ÅÃÀû ½ÃÀÛ(&S)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 + CHECKBOX "SYSTEM.INI ÆÄÀÏ Ã³¸®(&P)", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + CHECKBOX "½Ã½ºÅÛ ¼ºñ½º ·Îµå(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + CHECKBOX "½ÃÀÛÇÁ·Î±×·¥ ·Îµå(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 +END + +IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "¸ðµç ºÎÆÃ°æ·Î Á¡°Ë(&C)", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "±âº»°ªÀ¸·Î ¼³Á¤(&S)", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 + PUSHBUTTON "À§·Î ¿òÁ÷ÀÌ±â(&U)", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "¹ØÀ¸·Î ¿òÁ÷ÀÌ±â(&D)", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "ºÎÆ® ¿É¼Ç", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 + CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + PUSHBUTTON "´õ ¸¹Àº ¿É¼Ç...(&V)", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "½Ã°£Á¦ÇÑ(&T)", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "ÃÊ", -1, 340, 91, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOGEX DISCARDABLE 0, 0, 175, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 + CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 + CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10 + CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 + EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT + CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "È®ÀÎ", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Ãë¼Ò", IDC_CANCEL, 100, 160, 50, 12 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSCONFIG "System ¼³Á¤ ÇÁ·Î±×·¥" + IDS_TAB_GENERAL "ÀÏ¹Ý" + IDS_TAB_SYSTEM "SYSTEM.INI" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "¼ºñ½º" + IDS_TAB_STARTUP "½ÃÀÛÇÁ·Î±×·¥" + IDS_TAB_TOOLS "µµ±¸" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "¼ºñ½º" + IDS_SERVICES_COLUMN_REQ "¿ä±¸µÊ" + IDS_SERVICES_COLUMN_VENDOR "º¥´õ" + IDS_SERVICES_COLUMN_STATUS "»óÅÂ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "ÀÌ¸§" + IDS_TOOLS_COLUMN_DESCR "¼³¸í" + + IDS_TOOLS_CMD_NAME "ÄÜ¼Ö" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "¹öÁ¯" + IDS_TOOLS_INFO_DESCR "¹öÁ¯ Á¤º¸ Ç¥½Ã" + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "·¹Áö½ºÆ®¸® ÆíÁý±â" + IDS_TOOLS_REGEDIT_DESCR "·¹Áö½ºÆ®¸® ÆíÁý±â ¿±â" + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "½Ã½ºÅÛ Á¤º¸" + IDS_TOOLS_SYSDM_DESCR "ÄÄÇ»ÅÍ Á¤º¸ º¸±â" + IDS_TOOLS_SYSDM_CMD "control.exe" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "Element" + IDS_STARTUP_COLUMN_CMD "Command" + IDS_STARTUP_COLUMN_PATH "Path" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "½ÇÇàÁß" + IDS_SERVICES_STATUS_STOPPED "Á¤ÁöµÊ" + IDS_SERVICES_YES "¿¹" + IDS_SERVICES_UNKNOWN "Unknown" +END Propchange: trunk/reactos/base/applications/msconfig/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/rsrc.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -20,6 +20,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -629,7 +629,7 @@ int LeftMargin = (int)((float)twips_to_pixels(lpFr->rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); int RightMargin = (int)((float)twips_to_pixels(lpFr->rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); - if(*hdcSized); + if(*hdcSized) DeleteDC(*hdcSized); *hdcSized = CreateCompatibleDC(hdc); SelectObject(*hdcSized, hBitmapScaled);

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