Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 70242: [TRANSLATION] Add/Update Traditional Chinese (zh-TW) translation in ReactOS. [Wave 2/4] by Henry Tang Ih CORE-10615 #resolve #comment Committed, thx ^^
by dreimer＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: dreimer Date: Wed Dec 2 22:44:03 2015 New Revision: 70242 URL: http://svn.reactos.org/svn/reactos?rev=70242&view=rev Log: [TRANSLATION] Add/Update Traditional Chinese (zh-TW) translation in ReactOS. [Wave 2/4] by Henry Tang Ih CORE-10615 #resolve #comment Committed, thx ^^ Added: trunk/reactos/base/applications/clipbrd/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/clip/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/doskey/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/find/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/hostname/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/more/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/reg/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/taskkill/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/tree/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/whoami/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/lang/zh-TW.rc (with props) trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc (with props) trunk/reactos/base/applications/mscutils/servman/lang/zh-TW.rc (with props) trunk/reactos/base/applications/network/ipconfig/lang/zh-TW.rc (with props) trunk/reactos/base/applications/network/net/lang/zh-TW.rc (with props) trunk/reactos/base/applications/network/ping/lang/zh-TW.rc (with props) trunk/reactos/base/applications/network/wlanconf/lang/zh-TW.rc (with props) trunk/reactos/base/applications/osk/lang/zh-TW.rc (with props) trunk/reactos/base/applications/regedit/clb/lang/zh-TW.rc (with props) trunk/reactos/base/setup/reactos/lang/zh-TW.rc (with props) trunk/reactos/base/setup/welcome/lang/zh-TW.rc (with props) trunk/reactos/base/shell/cmd/lang/zh-TW.rc (with props) trunk/reactos/base/system/diskpart/lang/zh-TW.rc (with props) trunk/reactos/base/system/format/lang/zh-TW.rc (with props) trunk/reactos/base/system/regsvr32/lang/zh-TW.rc (with props) trunk/reactos/base/system/rundll32/lang/zh-TW.rc (with props) trunk/reactos/base/system/runonce/lang/zh-TW.rc (with props) trunk/reactos/base/system/services/lang/zh-TW.rc (with props) trunk/reactos/base/system/subst/lang/zh-TW.rc (with props) trunk/reactos/base/system/userinit/lang/zh-TW.rc (with props) trunk/reactos/base/system/winlogon/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/access/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/console/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/desk/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/hdwwiz/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/input/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/intl/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/joy/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/liccpa/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/main/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/mmsys/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/powercfg/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/sysdm/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/telephon/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/timedate/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/usrmgr/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/wined3dcfg/lang/zh-TW.rc (with props) Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc trunk/reactos/base/applications/cmdutils/clip/clip.rc trunk/reactos/base/applications/cmdutils/doskey/doskey.rc trunk/reactos/base/applications/cmdutils/find/find.rc trunk/reactos/base/applications/cmdutils/help/help.rc trunk/reactos/base/applications/cmdutils/hostname/hostname.rc trunk/reactos/base/applications/cmdutils/more/more.rc trunk/reactos/base/applications/cmdutils/reg/reg.rc trunk/reactos/base/applications/cmdutils/taskkill/taskkill.rc trunk/reactos/base/applications/cmdutils/tree/tree.rc trunk/reactos/base/applications/cmdutils/whoami/whoami.rc trunk/reactos/base/applications/cmdutils/wmic/wmic.rc trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rc trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc trunk/reactos/base/applications/mscutils/servman/servman.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.rc trunk/reactos/base/applications/network/net/net.rc trunk/reactos/base/applications/network/ping/ping.rc trunk/reactos/base/applications/network/wlanconf/wlanconf.rc trunk/reactos/base/applications/osk/rsrc.rc trunk/reactos/base/applications/regedit/clb/clb.rc trunk/reactos/base/applications/regedit/lang/zh-TW.rc trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/setup/welcome/welcome.rc trunk/reactos/base/shell/cmd/cmd.rc trunk/reactos/base/system/diskpart/diskpart.rc trunk/reactos/base/system/format/format.rc trunk/reactos/base/system/regsvr32/regsvr32.rc trunk/reactos/base/system/rundll32/rundll32.rc trunk/reactos/base/system/runonce/runonce.rc trunk/reactos/base/system/services/services.rc trunk/reactos/base/system/subst/subst.rc trunk/reactos/base/system/userinit/userinit.rc trunk/reactos/base/system/winlogon/winlogon.rc trunk/reactos/dll/cpl/access/access.rc trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/console/console.rc trunk/reactos/dll/cpl/desk/desk.rc trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc trunk/reactos/dll/cpl/inetcpl/inetcpl.rc trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/joy/joy.rc trunk/reactos/dll/cpl/liccpa/liccpa.rc trunk/reactos/dll/cpl/main/main.rc trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc trunk/reactos/dll/cpl/telephon/telephon.rc trunk/reactos/dll/cpl/timedate/timedate.rc trunk/reactos/dll/cpl/usrmgr/usrmgr.rc trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Added: trunk/reactos/base/applications/clipbrd/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Modified: trunk/reactos/base/applications/cmdutils/clip/clip.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/clip/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/doskey/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/find.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/find/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/help/help.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/hostname/hostname.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/hostname/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/more/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/more.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/reg/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/reg/reg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/taskkill/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/taskkill/taskkill.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/tree/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/whoami/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/wmic/wmic.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/xcopy/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/servman/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/servman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Added: trunk/reactos/base/applications/network/ipconfig/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Added: trunk/reactos/base/applications/network/net/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/net.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Added: trunk/reactos/base/applications/network/ping/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/ping.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Added: trunk/reactos/base/applications/network/wlanconf/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Added: trunk/reactos/base/applications/osk/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… Modified: trunk/reactos/base/applications/osk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/rsrc… Modified: trunk/reactos/base/applications/regedit/clb/clb.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Added: trunk/reactos/base/applications/regedit/clb/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Added: trunk/reactos/base/setup/reactos/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… Added: trunk/reactos/base/setup/welcome/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/zh… Modified: trunk/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… Modified: trunk/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rc?rev=… Added: trunk/reactos/base/shell/cmd/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-TW.… Modified: trunk/reactos/base/system/diskpart/diskpart.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… Added: trunk/reactos/base/system/diskpart/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/base/system/format/format.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… Added: trunk/reactos/base/system/format/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/zh… Added: trunk/reactos/base/system/regsvr32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/regsvr32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… Added: trunk/reactos/base/system/rundll32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/rundll32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… Added: trunk/reactos/base/system/runonce/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/z… Modified: trunk/reactos/base/system/runonce/runonce.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/runonc… Added: trunk/reactos/base/system/services/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… Modified: trunk/reactos/base/system/services/services.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… Added: trunk/reactos/base/system/subst/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/zh-… Modified: trunk/reactos/base/system/subst/subst.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/subst.rc… Added: trunk/reactos/base/system/userinit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/userinit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… Added: trunk/reactos/base/system/winlogon/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/winlogon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… Modified: trunk/reactos/dll/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rc?r… Added: trunk/reactos/dll/cpl/access/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/zh-TW.… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… Added: trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-TW.… Modified: trunk/reactos/dll/cpl/console/console.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.rc… Added: trunk/reactos/dll/cpl/console/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/zh-TW… Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=7… Added: trunk/reactos/dll/cpl/desk/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-TW.rc… Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… Added: trunk/reactos/dll/cpl/hdwwiz/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/zh-TW.… Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… Added: trunk/reactos/dll/cpl/inetcpl/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/zh-TW… Modified: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev… Added: trunk/reactos/dll/cpl/input/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/zh-TW.r… Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=7… Added: trunk/reactos/dll/cpl/intl/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-TW.rc… Modified: trunk/reactos/dll/cpl/joy/joy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.rc?rev=702… Added: trunk/reactos/dll/cpl/joy/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/zh-TW.rc?… Added: trunk/reactos/dll/cpl/liccpa/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/zh-TW.… Modified: trunk/reactos/dll/cpl/liccpa/liccpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.rc?r… Added: trunk/reactos/dll/cpl/main/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/zh-TW.rc… Modified: trunk/reactos/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rc?rev=7… Added: trunk/reactos/dll/cpl/mmsys/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/zh-TW.r… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… Added: trunk/reactos/dll/cpl/powercfg/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/zh-T… Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… Added: trunk/reactos/dll/cpl/sysdm/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-TW.r… Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… Added: trunk/reactos/dll/cpl/telephon/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/zh-T… Modified: trunk/reactos/dll/cpl/telephon/telephon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… Added: trunk/reactos/dll/cpl/timedate/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/zh-T… Modified: trunk/reactos/dll/cpl/timedate/timedate.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… Added: trunk/reactos/dll/cpl/usrmgr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/zh-TW.… Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rc?r… Added: trunk/reactos/dll/cpl/wined3dcfg/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/zh… Modified: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d…

1 0

[dreimer] 70241: [RAPPS] Update LibreOffice rapps version to 4.4.6 by Henry Tang Ih CORE-10599 #resolve #comment Fixed, thx
by dreimer＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: dreimer Date: Wed Dec 2 22:36:08 2015 New Revision: 70241 URL: http://svn.reactos.org/svn/reactos?rev=70241&view=rev Log: [RAPPS] Update LibreOffice rapps version to 4.4.6 by Henry Tang Ih CORE-10599 #resolve #comment Fixed, thx Modified: trunk/reactos/media/rapps/libreoffice.txt trunk/reactos/media/rapps/libreofficehelp.txt Modified: trunk/reactos/media/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreoffice.tx… ============================================================================== --- trunk/reactos/media/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/libreoffice.txt [iso-8859-1] Wed Dec 2 22:36:08 2015 @@ -1,17 +1,17 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) ; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) [Section] Name = LibreOffice -Version = 4.4.5 +Version = 4.4.6 License = LGPL Description = A powerful and open source office suite. It has been forked from OpenOffice. -Size = 213.93 MB +Size = 213.61 MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.5/win/x86/Lib… -SHA1 = 2d8bcd51cc2ab3ff5e321b25ff86fe1b04df8315 +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.6/win/x86/Lib… +SHA1 = 25e7d84578ff16fa6f3e50686d63ac24f9df9135 CDPath = none [Section.0407] @@ -22,7 +22,7 @@ [Section.040c] Description = PrÃ©cÃ©demment appelÃ© OpenOffice. Suite bureautique open source. -Size = 213,93 Mo +Size = 213,61 Mo [Section.0410] Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. @@ -35,11 +35,11 @@ [Section.0418] Description = O suitÄ completÄ de aplicaÈii de biroticÄ, cu surse deschise. ReprezintÄ o bifurcare a dezvoltÄrii OpenOffice. -Size = 213,93 Mo +Size = 213,61 Mo [Section.041f] Description = GÃ¼Ã§lÃ¼ ve aÃ§Ä±k kaynak bir ofis paketi. OpenOffice'ten Ã§atallanÄ±lmÄ±ÅtÄ±r. -Size = 213,93 MB +Size = 213,61 MB [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. Modified: trunk/reactos/media/rapps/libreofficehelp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficehel… ============================================================================== --- trunk/reactos/media/rapps/libreofficehelp.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/libreofficehelp.txt [iso-8859-1] Wed Dec 2 22:36:08 2015 @@ -1,25 +1,25 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) ; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) [Section] Name = LibreOffice Help Pack -Version = 4.4.5 +Version = 4.4.6 License = GPLv3 Description = Offline help content of LibreOffice. Size = 5.12 MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.5/win/x86/Lib… -SHA1 = 3543c7e9e0db3c3dd8bcf64c24139fdb6610e8d0 +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.6/win/x86/Lib… +SHA1 = d03077049dd6e1d31a383fc1d1875f3f0a636225 CDPath = none [Section.0407] Name = LibreOffice Help Pack Description = Offline Hilfe fÃ¼r LibreOffice. -Size = 7.10 MB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.5/win/x86/Lib… -SHA1 = d6ec18c31a359e8abd2811e9eb16e9be0b18797b +Size = 7.07 MB +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.6/win/x86/Lib… +SHA1 = fc74e0c9cfbe66b389b48cc50fc89088b3daa8ea [Section.0418] Description = ConÈinut de asistenÈÄ Èi ajutor (Ã®n limba englezÄ) pentru LibreOffice. @@ -28,21 +28,21 @@ [Section.0a] Name = LibreOffice â Paquete de ayuda Description = PÃ¡ginas de ayuda para LibreOffice. -Size = 7.00 MB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.5/win/x86/Lib… -SHA1 = 64f96e8ddcb0126eb19db6c9dc24d6a51c509b3a +Size = 6.99 MB +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.6/win/x86/Lib… +SHA1 = e0b9248f97c075c9eb4037fdf19aefcbbdf35ed3 [Section.041f] Name = LibreOffice YardÄ±m Paketi License = GPL sÃ¼rÃ¼m 3 Description = LibreOffice'in Ã§evrim dÄ±ÅÄ± yardÄ±m iÃ§eriÄi. Size = 6,85 MB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.5/win/x86/Lib… -SHA1 = 4de936b3ceb6f90850494fe16a942affbb1cc114 +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.6/win/x86/Lib… +SHA1 = 953c07b494478a4ff71912fd2cb23fe8d429df28 [Section.0804] Name = LibreOffice å¸®å©å Description = LibreOffice çè±æºå¸®å©åå®¹ã -Size = 9.50 MB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.5/win/x86/Lib… -SHA1 = 8ff9fd6be59d0a8be133406c3666ed1d747d16f6 +Size = 9.48 MB +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.4.6/win/x86/Lib… +SHA1 = f61699eb57fd2cb7b20a7805a1afc7e9e6f88f8c

1 0

[dreimer] 70240: [RAPPS] Small Database Update by Jared Smudde CORE-10393 #resolve #comment Committed, thx ^^
by dreimer＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: dreimer Date: Wed Dec 2 22:05:06 2015 New Revision: 70240 URL: http://svn.reactos.org/svn/reactos?rev=70240&view=rev Log: [RAPPS] Small Database Update by Jared Smudde CORE-10393 #resolve #comment Committed, thx ^^ Modified: trunk/reactos/media/rapps/7zip.txt trunk/reactos/media/rapps/ccleaner.txt trunk/reactos/media/rapps/gnucash.txt trunk/reactos/media/rapps/nirlauncher.txt trunk/reactos/media/rapps/npp.txt trunk/reactos/media/rapps/peazip.txt trunk/reactos/media/rapps/reshack.txt trunk/reactos/media/rapps/rosbe.txt Modified: trunk/reactos/media/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/7zip.txt?rev=7… ============================================================================== --- trunk/reactos/media/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/7zip.txt [iso-8859-1] Wed Dec 2 22:05:06 2015 @@ -4,14 +4,14 @@ [Section] Name = 7-Zip -Version = 15.05b +Version = 15.12 License = LGPL Description = A file archiving utility with support for 7zip, zip, tar, rar and many other archive formats. -Size = 1.14 MB +Size = 1.20 MB Category = 12 URLSite = http://www.7-zip.org/ -URLDownload = http://www.7-zip.org/a/7z1505.exe -SHA1 = ece8bbd4c8903095d44e99196219c953a1d47bfd +URLDownload = http://www.7-zip.org/a/7z1512.msi +SHA1 = 43a87ae650b3e0651d55da055c82d58336e6c257 CDPath = none [Section.0407] @@ -22,7 +22,7 @@ [Section.040c] Description = Utilitaire pour crÃ©er et ouvrir les fichiers 7zip, zip, tar, rar et d'autres archives. -Size = 1,14 Mo +Size = 1,20 Mo [Section.0410] Description = UtilitÃ per creare e aprire 7zip, zip, tar, rar e altri file archivio. @@ -35,14 +35,14 @@ [Section.0418] Description = Utilitar de arhivare a fiÈierelor, compatibil cu 7zip, zip, tar, rar Èi multe alte formate de arhive. -Size = 1,14 Mo +Size = 1,20 Mo [Section.0419] Description = Ð£ÑÐ¸Ð»Ð¸ÑÐ° Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸ Ð¾ÑÐºÑÑÑÐ¸Ñ 7zip, zip, tar, rar Ð¸ Ð´ÑÑÐ³Ð¸Ñ Ð°ÑÑÐ¸Ð²Ð½ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð². [Section.041f] Description = 7zip, zip, tar, rar ve baÅka birÃ§ok belgelik biÃ§imi destekli bir kÃ¼tÃ¼k belgelikleme aracÄ±. -Size = 1,14 MB +Size = 1,20 MB [Section.0422] Description = Ð£ÑÐ¸Ð»ÑÑÐ° Ð´Ð»Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÐ° Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ 7zip, zip, tar, rar ÑÐ° ÑÐ½ÑÐ¸Ñ Ð°ÑÑÑÐ²Ð½Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ². Modified: trunk/reactos/media/rapps/ccleaner.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ccleaner.txt?r… ============================================================================== --- trunk/reactos/media/rapps/ccleaner.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/ccleaner.txt [iso-8859-1] Wed Dec 2 22:05:06 2015 @@ -4,14 +4,14 @@ [Section] Name = CCleaner -Version = 5.08 +Version = 5.12 License = Freeware Description = A decent tool for cleaning temporary files and general computer maintenance. -Size = 6.25 MB +Size = 6.5 MB Category = 12 URLSite = http://www.piriform.com/ccleaner -URLDownload = http://download.piriform.com/ccsetup508.exe -SHA1 = aa7affcbdaf13c3872f32eaccf3befb92fd0fa80 +URLDownload = http://download.piriform.com/ccsetup512.exe +SHA1 = 5b189555c663407c8da7930ef070ce16c9b20ce1 CDPath = none [Section.0407] @@ -24,12 +24,12 @@ [Section.041f] License = Ãcretsiz Description = PC'nizi temizleme iÃ§in Ã§ok iyi araÃ§. -Size = 6,25 MB +Size = 6,5 MB [Section.0418] License = GratuitÄ Description = Utilitar pentru mentenanÈa ordinii Ã®n configuraÈia sistemului. -Size = 6,25 Mo +Size = 6,5 Mo [Section.0804] Description = éå¸¸å¥½çå·¥å·ï¼æ¸çæ¨ççµèã Modified: trunk/reactos/media/rapps/gnucash.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gnucash.txt?re… ============================================================================== --- trunk/reactos/media/rapps/gnucash.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/gnucash.txt [iso-8859-1] Wed Dec 2 22:05:06 2015 @@ -5,14 +5,14 @@ [Section] Name = GnuCash -Version = 2.6.7 +Version = 2.6.9 License = GPL Description = A personal and small-business financial-accounting software, freely licensed under the GNU GPL and available for GNU/Linux, BSD, Solaris, Mac OS X and Microsoft Windows. -Size = 92.8 MB +Size = 95.8 MB Category = 10 URLSite = http://gnucash.org/ -URLDownload = http://downloads.sourceforge.net/sourceforge/gnucash/gnucash%20%28stable%29… -SHA1 = 7fcdd842de45b0724947e21c9dc674d77b7740f5 +URLDownload = http://downloads.sourceforge.net/sourceforge/gnucash/gnucash%20%28stable%29… +SHA1 = 546d17a91ed96100407e675df55ea46484f9036b CDPath = none [Section.0407] @@ -20,11 +20,11 @@ [Section.0418] Description = Program de contabilitate financiarÄ pentru uz personal Èi Ã®ntreprinderi mici, oferit sub licenÈa gratuitÄ GNU GPL. Este disponibil pentru GNU/Linux, BSD, Solaris, Mac OS X Èi Windows. -Size = 92,8 Mo +Size = 95,8 Mo [Section.041f] Description = GNU GPL altÄ±nda Ã¶zgÃ¼rce ruhsatlanmÄ±Å, GNU/Linux, BSD, Solaris, Mac OS X ve Microsoft Windows iÃ§in kullanÄ±labilir, bir ÅahsÃ® ve kÃ¼Ã§Ã¼k iÅ mÃ¢lÃ® muhÃ¢sebe yazÄ±lÄ±mÄ±. -Size = 92,8 MB +Size = 95,8 MB [Section.0a] Description = Un programa de contabilidad personal y de PYMEs liberado bajo los tÃ©rminos de la GNU GPL. EstÃ¡ disponible para GNU/Linux, BSD, Solaris, Mac OS X y Microsoft Windows. Modified: trunk/reactos/media/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nirlauncher.tx… ============================================================================== --- trunk/reactos/media/rapps/nirlauncher.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/nirlauncher.txt [iso-8859-1] Wed Dec 2 22:05:06 2015 @@ -4,14 +4,14 @@ [Section] Name = NirLauncher -Version = 1.19.54 +Version = 1.19.56 License = Freeware Description = A package of more than 180 utilities for Windows. Size = 21.05 MB Category = 12 URLSite = http://launcher.nirsoft.net/ -URLDownload = http://download.nirsoft.net/nirsoft_package_1.19.54.zip -SHA1 = 9adc1343c6d97a5bab08a20899e203eadf701987 +URLDownload = http://download.nirsoft.net/nirsoft_package_1.19.56.zip +SHA1 = f682ff2ce2112092b8baeddab6c89838e9f4b290 CDPath = none [Section.0407] Modified: trunk/reactos/media/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/npp.txt?rev=70… ============================================================================== --- trunk/reactos/media/rapps/npp.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/npp.txt [iso-8859-1] Wed Dec 2 22:05:06 2015 @@ -4,14 +4,14 @@ [Section] Name = Notepad++ -Version = 6.8.1 +Version = 6.8.7 License = GPL Description = A full featured, free text editor with many plug-ins. -Size = 5.4 MB +Size = 3.9 MB Category = 6 URLSite = http://notepad-plus-plus.org/ -URLDownload = https://notepad-plus-plus.org/repository/6.x/6.8.1/npp.6.8.1.Installer.exe -SHA1 = d2ce3ab2d7dee81d065a4a700c8c233c252a22d2 +URLDownload = https://notepad-plus-plus.org/repository/6.x/6.8.7/npp.6.8.7.Installer.exe +SHA1 = 9ffb9a58a2a2480bc3b6db5cb85db9a1f7513e54 CDPath = none [Section.0407] @@ -22,7 +22,7 @@ [Section.040c] Description = Un Ã©diteur de texte. -Size = 5,4 Mo +Size = 3,9 Mo URLSite = http://notepad-plus-plus.org/fr/ [Section.0410] @@ -36,7 +36,7 @@ [Section.0418] Description = Editor complet Èi gratuit de text, cu multe extensii. -Size = 5,4 Mo +Size = 3,9 Mo [Section.0419] Description = Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. @@ -46,7 +46,7 @@ [Section.041f] Description = BirÃ§ok eklentilerle, tÃ¼m husÃ»siyetli Ã¼cretsiz bir metin dÃ¼zenleyicisi. -Size = 5,4 MB +Size = 3,9 MB [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Modified: trunk/reactos/media/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/peazip.txt?rev… ============================================================================== --- trunk/reactos/media/rapps/peazip.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/peazip.txt [iso-8859-1] Wed Dec 2 22:05:06 2015 @@ -4,14 +4,14 @@ [Section] Name = PeaZip -Version = 5.7.0 +Version = 5.9.0 License = LGPL v3, OpenCandy EULA Description = A free, cross-platform, open source file and archive manager. It supports over 150 archive formats. -Size = 6.1 MB +Size = 6.41 MB Category = 12 URLSite = http://peazip.sourceforge.net/ -URLDownload = http://download.sourceforge.net/project/peazip/5.7.0/peazip-5.7.0.WINDOWS.e… -SHA1 = 97cad78d1f9a998050e07553f3d4fa4379eecb93 +URLDownload = http://download.sourceforge.net/project/peazip/5.9.0/peazip-5.9.0.WINDOWS.e… +SHA1 = a3de4fe5ee21072422164910751c450d8f418668 CDPath = none [Section.0407] @@ -28,12 +28,12 @@ [Section.0418] Description = Gestionar de fiÈiere Èi arhivare gratuit, multiplatformÄ, cu surse deschise. RecunoaÈte peste 150 tipuri de arhive. -Size = 6,1 Mo +Size = 6,41 Mo [Section.041f] License = LGPL sÃ¼rÃ¼m 3, OpenCandy EULA Description = Ãcretsiz, Ã§apraz platform, aÃ§Ä±k kaynak bir kÃ¼tÃ¼k ve belgelik yÃ¶neticisidir. 150'den Ã§ok belgelikleme biÃ§imini destekler. -Size = 6,1 MB +Size = 6,41 MB [Section.0804] Description = åè´¹çã è·¨å¹³å°çã å¼æ¾æºä»£ç æä»¶åæ¡£æ¡ç®¡çå¨ãå®æ¯æè¶è¿ 150 çæ¡£æ¡æ ¼å¼ã Modified: trunk/reactos/media/rapps/reshack.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/reshack.txt?re… ============================================================================== --- trunk/reactos/media/rapps/reshack.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/reshack.txt [iso-8859-1] Wed Dec 2 22:05:06 2015 @@ -5,7 +5,7 @@ [Section] Name = Resource Hacker -Version = 4.2.4 +Version = 4.2.5 License = Freeware Description = A freeware utility to view, modify, rename, add, delete and extract resources in 32bit & 64bit Windows executables and resource files (*.res). Size = 2.7 MB Modified: trunk/reactos/media/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rosbe.txt?rev=… ============================================================================== --- trunk/reactos/media/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/rosbe.txt [iso-8859-1] Wed Dec 2 22:05:06 2015 @@ -25,7 +25,7 @@ [Section.040c] Description = Vous permet de compiler le code source de ReactOS. Pour plus d'instructions, reportez-vous au wiki ReactOS. -Size = 28,3 Mo +Size = 32,2 Mo [Section.0410] Description = Permette di compilare i sorgenti di ReactOS. Per maggiori informazioni consultare il Wiki di ReactOS.

1 0

[dreimer] 70239: [RAPPS] Update RosBE version to 2.1.3 by Hermes Belusca CORE-10603 #resolve #comment Fixed. Does not work in ROS anyway, but fixed ^^
by dreimer＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: dreimer Date: Wed Dec 2 21:59:45 2015 New Revision: 70239 URL: http://svn.reactos.org/svn/reactos?rev=70239&view=rev Log: [RAPPS] Update RosBE version to 2.1.3 by Hermes Belusca CORE-10603 #resolve #comment Fixed. Does not work in ROS anyway, but fixed ^^ Modified: trunk/reactos/media/rapps/rosbe.txt Modified: trunk/reactos/media/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rosbe.txt?rev=… ============================================================================== --- trunk/reactos/media/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/rosbe.txt [iso-8859-1] Wed Dec 2 21:59:45 2015 @@ -1,17 +1,17 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) ; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) [Section] Name = ReactOS Build Environment -Version = 2.1.1 +Version = 2.1.3 License = GPL Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. -Size = 28.3 MB +Size = 32.2 MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment -URLDownload = http://download.sourceforge.net/reactos/RosBE-2.1.1.exe -SHA1 = 3daec4a5df5adf5679eaba25c39b4779afea3b4f +URLDownload = http://download.sourceforge.net/reactos/RosBE-2.1.3.exe +SHA1 = 73cdd8b49af919064abced95872423e4be2afe6f CDPath = none [Section.0405] @@ -38,12 +38,12 @@ [Section.0418] Description = Permite compilarea surselor ReactOS. Pentru instrucÈiuni, consultaÈi wiki ReactOS. -Size = 28,3 Mo +Size = 32,2 Mo [Section.041f] Name = ReactOS Yapma OrtamÄ± Description = ReactOS Kaynak KodlarÄ±'nÄ± derlemenize olanak saÄlar. Daha Ã§ok aÃ§Ä±klama iÃ§in ReactOS Wiki'ye bakÄ±nÄ±z. -Size = 28,3 MB +Size = 32,2 MB [Section.0422] Description = ÐÐ¾Ð·Ð²Ð¾Ð»ÑÑ Ð·ÑÐ±ÑÐ°ÑÐ¸ ReactOS Ð· Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ². ÐÐ° Ð´ÐµÑÐ°Ð»ÑÐ½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑÑ Ð´Ð¸Ð²ÑÑÑÑÑ Ð² ReactOS ÐÑÐºÑ.

1 0

[dreimer] 70238: [TRANSLATIONS] Missing italian translations in ReactOS by Carlo Bramini CORE-9725 #comment Applied/Committed lautus and services patches
by dreimer＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: dreimer Date: Wed Dec 2 21:47:45 2015 New Revision: 70238 URL: http://svn.reactos.org/svn/reactos?rev=70238&view=rev Log: [TRANSLATIONS] Missing italian translations in ReactOS by Carlo Bramini CORE-9725 #comment Applied/Committed lautus and services patches Added: trunk/reactos/base/system/services/lang/it-IT.rc (with props) trunk/reactos/media/themes/lautus.msstyles/lang/it-IT.rc (with props) Modified: trunk/reactos/base/system/services/services.rc trunk/reactos/media/themes/lautus.msstyles/lautus.rc Added: trunk/reactos/base/system/services/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… ============================================================================== --- trunk/reactos/base/system/services/lang/it-IT.rc (added) +++ trunk/reactos/base/system/services/lang/it-IT.rc [iso-8859-1] Wed Dec 2 21:47:45 2015 @@ -0,0 +1,12 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_SERVICE_START "Avvia" + IDS_SERVICE_STOP "arresta" + IDS_SERVICE_PAUSE "Ferma" + IDS_SERVICE_RESUME "Riprendere" + IDS_SERVICE_RUNNING "Eseguendo" + IDS_SERVICE_STOPPED "Arrestato" + IDS_SERVICE_PAUSED "Fermato" +END Propchange: trunk/reactos/base/system/services/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/services/services.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.rc [iso-8859-1] Wed Dec 2 21:47:45 2015 @@ -20,6 +20,10 @@ #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif + #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif Added: trunk/reactos/media/themes/lautus.msstyles/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lang/it-IT.rc (added) +++ trunk/reactos/media/themes/lautus.msstyles/lang/it-IT.rc [iso-8859-1] Wed Dec 2 21:47:45 2015 @@ -0,0 +1,37 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ +1000, "Ater" +} + +STRINGTABLE +{ +2000, "Lautus Ater" +} + +STRINGTABLE +{ +3000, "Normale" +3001, "Caratteri grandi" +3002, "Caratteri molto grandi" +} + +STRINGTABLE +{ +4000, "Normale" +4001, "Caratteri grandi" +4002, "Caratteri molto grandi" +} + +STRINGTABLE +{ +5000, "Lautus" +5001, "Stile di visualizzazione" +5002, "ReactOS Foundation" +5003, "Pisarz, basato on Luna Inspirat" +5004, "Distribuito sotto licenza GNU/GPL 2.0, 2011" +5005, "http://www.reactos.org" +5006, "1.0" +5007, "Stile di visualizzazione per ReactOS" +} Propchange: trunk/reactos/media/themes/lautus.msstyles/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/themes/lautus.msstyles/lautus.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] (original) +++ trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] Wed Dec 2 21:47:45 2015 @@ -195,6 +195,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

1 0

[akhaldi] 70237: [T2EMBED] Leverage Wine Staging 1.7.55 code and put our remaining stubs into a proper source file. CORE-10536
by akhaldi＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: akhaldi Date: Wed Dec 2 21:04:16 2015 New Revision: 70237 URL: http://svn.reactos.org/svn/reactos?rev=70237&view=rev Log: [T2EMBED] Leverage Wine Staging 1.7.55 code and put our remaining stubs into a proper source file. CORE-10536 Added: trunk/reactos/dll/win32/t2embed/main.c - copied, changed from r70236, trunk/reactos/dll/win32/t2embed/t2embed.c trunk/reactos/dll/win32/t2embed/stubs.c (with props) Removed: trunk/reactos/dll/win32/t2embed/t2embed.c Modified: trunk/reactos/dll/win32/t2embed/CMakeLists.txt trunk/reactos/dll/win32/t2embed/t2embed.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/t2embed/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] Wed Dec 2 21:04:16 2015 @@ -1,14 +1,15 @@ +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(t2embed.dll t2embed.spec) list(APPEND SOURCE - t2embed.c - t2embed.rc + main.c + stubs.c ${CMAKE_CURRENT_BINARY_DIR}/t2embed_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def) -add_library(t2embed SHARED ${SOURCE}) +add_library(t2embed SHARED ${SOURCE} t2embed.rc) set_module_type(t2embed win32dll UNICODE) target_link_libraries(t2embed wine) add_importlibs(t2embed gdi32 user32 advapi32 version msvcrt kernel32 ntdll) Copied: trunk/reactos/dll/win32/t2embed/main.c (from r70236, trunk/reactos/dll/win32/t2embed/t2embed.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/main.c?p… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/main.c [iso-8859-1] Wed Dec 2 21:04:16 2015 @@ -1,12 +1,23 @@ /* - * PROJECT: Font Embedding Dll - * FILE: dll\win32\t2embed\t2embed.c - * PURPOSE: Main file - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + * + * Copyright 2009 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define WIN32_NO_STATUS - #include <stdarg.h> #include <windef.h> #include <winbase.h> @@ -15,191 +26,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(t2embed); -LONG -WINAPI -TTCharToUnicode(HDC hDC, - UCHAR* pucCharCodes, - ULONG ulCharCodeSize, - USHORT* pusShortCodes, - ULONG ulShortCodeSize, - ULONG ulFlags) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - UNIMPLEMENTED; - return E_NONE; -} -LONG -WINAPI -TTDeleteEmbeddedFont(HANDLE hFontReference, - ULONG ulFlags, - ULONG* pulStatus) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTEmbedFont(HDC hDC, - ULONG ulFlags, - ULONG ulCharSet, - ULONG* pulPrivStatus, - ULONG* pulStatus, - WRITEEMBEDPROC lpfnWriteToStream, - LPVOID lpvWriteStream, - USHORT* pusCharCodeSet, - USHORT usCharCodeCount, - USHORT usLanguage, - TTEMBEDINFO* pTTEmbedInfo) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTEmbedFontFromFileA(HDC hDC, - LPCSTR szFontFileName, - USHORT usTTCIndex, - ULONG ulFlags, - ULONG ulCharSet, - ULONG* pulPrivStatus, - ULONG* pulStatus, - WRITEEMBEDPROC lpfnWriteToStream, - LPVOID lpvWriteStream, - USHORT* pusCharCodeSet, - USHORT usCharCodeCount, - USHORT usLanguage, - TTEMBEDINFO* pTTEmbedInfo) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTEnableEmbeddingForFacename(LPSTR lpszFacename, - BOOL bEnable) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTGetEmbeddedFontInfo(ULONG ulFlags, - ULONG* pulPrivStatus, - ULONG ulPrivs, - ULONG* pulStatus, - READEMBEDPROC lpfnReadFromStream, - LPVOID lpvReadStream, - TTLOADINFO* pTTLoadInfo) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTGetEmbeddingType(HDC hDC, - ULONG* pulPrivStatus) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTIsEmbeddingEnabled(HDC hDC, - BOOL* pbEnabled) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename, - BOOL* pbEnabled) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTLoadEmbeddedFont(HANDLE *phFontReference, - ULONG ulFlags, - ULONG* pulPrivStatus, - ULONG ulPrivs, - ULONG* pulStatus, - READEMBEDPROC lpfnReadFromStream, - LPVOID lpvReadStream, - LPWSTR szWinFamilyName, - LPSTR szMacFamilyName, - TTLOADINFO* pTTLoadInfo) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTRunValidationTests(HDC hDC, - TTVALIDATIONTESTPARAMS* pTestParam) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTEmbedFontEx(HDC hDC, - ULONG ulFlags, - ULONG ulCharSet, - ULONG* pulPrivStatus, - ULONG* pulStatus, - WRITEEMBEDPROC lpfnWriteToStream, - LPVOID lpvWriteStream, - ULONG* pulCharCodeSet, - USHORT usCharCodeCount, - USHORT usLanguage, - TTEMBEDINFO* pTTEmbedInfo) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTRunValidationTestsEx(HDC hDC, - TTVALIDATIONTESTPARAMSEX* pTestParam) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTGetNewFontName(HANDLE* phFontReference, - LPWSTR szWinFamilyName, - long cchMaxWinName, - LPSTR szMacFamilyName, - long cchMaxMacName) -{ - UNIMPLEMENTED; - return E_NONE; -} - - -BOOL -WINAPI -DllMain(IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) -{ - switch (dwReason) + switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; @@ -207,3 +40,50 @@ return TRUE; } + +LONG WINAPI TTLoadEmbeddedFont(HANDLE *phFontReference, ULONG ulFlags, + ULONG *pulPrivStatus, ULONG ulPrivs, + ULONG *pulStatus, READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, LPWSTR szWinFamilyName, + LPSTR szMacFamilyName, TTLOADINFO *pTTLoadInfo) +{ + FIXME("(%p 0x%08x %p 0x%08x %p %p %p %s %s %p) stub\n", phFontReference, + ulFlags, pulPrivStatus, ulPrivs, pulStatus, lpfnReadFromStream, + lpvReadStream, debugstr_w(szWinFamilyName), szMacFamilyName, + pTTLoadInfo); + + return E_API_NOTIMPL; +} + +LONG WINAPI TTEmbedFont(HDC hDC, ULONG ulFlags, ULONG ulCharSet, ULONG *pulPrivStatus, + ULONG *pulStatus, WRITEEMBEDPROC lpfnWriteToStream, LPVOID lpvWriteStream, + USHORT *pusCharCodeSet, USHORT usCharCodeCount, USHORT usLanguage, + TTEMBEDINFO *pTTEmbedInfo) +{ + FIXME("(%p 0x%08x 0x%08x %p %p %p %p %p %u %u %p) stub\n", hDC, + ulFlags, ulCharSet, pulPrivStatus, pulStatus, lpfnWriteToStream, + lpvWriteStream, pusCharCodeSet, usCharCodeCount, usLanguage, + pTTEmbedInfo); + + return E_API_NOTIMPL; +} + +LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) +{ + FIXME("(%p %p) stub\n", hDC, status); + if (status) *status = EMBED_NOEMBEDDING; + return E_API_NOTIMPL; +} + +LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) +{ + FIXME("(%p %p) stub\n", hDC, enabled); + if (enabled) *enabled = FALSE; + return E_API_NOTIMPL; +} + +LONG WINAPI TTDeleteEmbeddedFont(HANDLE hFontReference, ULONG flags, ULONG *status) +{ + FIXME("(%p 0x%08x %p) stub\n", hFontReference, flags, status); + return E_API_NOTIMPL; +} Added: trunk/reactos/dll/win32/t2embed/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/t2embed/stubs.c (added) +++ trunk/reactos/dll/win32/t2embed/stubs.c [iso-8859-1] Wed Dec 2 21:04:16 2015 @@ -0,0 +1,124 @@ +/* + * PROJECT: Font Embedding Dll + * FILE: dll\win32\t2embed\stubs.c + * PURPOSE: Stubs file + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <t2embapi.h> +#include <debug.h> + +LONG +WINAPI +TTCharToUnicode(HDC hDC, + UCHAR* pucCharCodes, + ULONG ulCharCodeSize, + USHORT* pusShortCodes, + ULONG ulShortCodeSize, + ULONG ulFlags) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTEmbedFontFromFileA(HDC hDC, + LPCSTR szFontFileName, + USHORT usTTCIndex, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + USHORT* pusCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTEnableEmbeddingForFacename(LPSTR lpszFacename, + BOOL bEnable) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTGetEmbeddedFontInfo(ULONG ulFlags, + ULONG* pulPrivStatus, + ULONG ulPrivs, + ULONG* pulStatus, + READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, + TTLOADINFO* pTTLoadInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename, + BOOL* pbEnabled) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTRunValidationTests(HDC hDC, + TTVALIDATIONTESTPARAMS* pTestParam) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTEmbedFontEx(HDC hDC, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + ULONG* pulCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTRunValidationTestsEx(HDC hDC, + TTVALIDATIONTESTPARAMSEX* pTestParam) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTGetNewFontName(HANDLE* phFontReference, + LPWSTR szWinFamilyName, + long cchMaxWinName, + LPSTR szMacFamilyName, + long cchMaxMacName) +{ + UNIMPLEMENTED; + return E_NONE; +} Propchange: trunk/reactos/dll/win32/t2embed/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/t2embed/t2embed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/t2embed.c (removed) @@ -1,209 +0,0 @@ -/* - * PROJECT: Font Embedding Dll - * FILE: dll\win32\t2embed\t2embed.c - * PURPOSE: Main file - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) - */ - -#define WIN32_NO_STATUS - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <t2embapi.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(t2embed); - -LONG -WINAPI -TTCharToUnicode(HDC hDC, - UCHAR* pucCharCodes, - ULONG ulCharCodeSize, - USHORT* pusShortCodes, - ULONG ulShortCodeSize, - ULONG ulFlags) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTDeleteEmbeddedFont(HANDLE hFontReference, - ULONG ulFlags, - ULONG* pulStatus) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTEmbedFont(HDC hDC, - ULONG ulFlags, - ULONG ulCharSet, - ULONG* pulPrivStatus, - ULONG* pulStatus, - WRITEEMBEDPROC lpfnWriteToStream, - LPVOID lpvWriteStream, - USHORT* pusCharCodeSet, - USHORT usCharCodeCount, - USHORT usLanguage, - TTEMBEDINFO* pTTEmbedInfo) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTEmbedFontFromFileA(HDC hDC, - LPCSTR szFontFileName, - USHORT usTTCIndex, - ULONG ulFlags, - ULONG ulCharSet, - ULONG* pulPrivStatus, - ULONG* pulStatus, - WRITEEMBEDPROC lpfnWriteToStream, - LPVOID lpvWriteStream, - USHORT* pusCharCodeSet, - USHORT usCharCodeCount, - USHORT usLanguage, - TTEMBEDINFO* pTTEmbedInfo) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTEnableEmbeddingForFacename(LPSTR lpszFacename, - BOOL bEnable) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTGetEmbeddedFontInfo(ULONG ulFlags, - ULONG* pulPrivStatus, - ULONG ulPrivs, - ULONG* pulStatus, - READEMBEDPROC lpfnReadFromStream, - LPVOID lpvReadStream, - TTLOADINFO* pTTLoadInfo) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTGetEmbeddingType(HDC hDC, - ULONG* pulPrivStatus) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTIsEmbeddingEnabled(HDC hDC, - BOOL* pbEnabled) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename, - BOOL* pbEnabled) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTLoadEmbeddedFont(HANDLE *phFontReference, - ULONG ulFlags, - ULONG* pulPrivStatus, - ULONG ulPrivs, - ULONG* pulStatus, - READEMBEDPROC lpfnReadFromStream, - LPVOID lpvReadStream, - LPWSTR szWinFamilyName, - LPSTR szMacFamilyName, - TTLOADINFO* pTTLoadInfo) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTRunValidationTests(HDC hDC, - TTVALIDATIONTESTPARAMS* pTestParam) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTEmbedFontEx(HDC hDC, - ULONG ulFlags, - ULONG ulCharSet, - ULONG* pulPrivStatus, - ULONG* pulStatus, - WRITEEMBEDPROC lpfnWriteToStream, - LPVOID lpvWriteStream, - ULONG* pulCharCodeSet, - USHORT usCharCodeCount, - USHORT usLanguage, - TTEMBEDINFO* pTTEmbedInfo) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTRunValidationTestsEx(HDC hDC, - TTVALIDATIONTESTPARAMSEX* pTestParam) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI -TTGetNewFontName(HANDLE* phFontReference, - LPWSTR szWinFamilyName, - long cchMaxWinName, - LPSTR szMacFamilyName, - long cchMaxMacName) -{ - UNIMPLEMENTED; - return E_NONE; -} - - -BOOL -WINAPI -DllMain(IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} Modified: trunk/reactos/dll/win32/t2embed/t2embed.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/t2embed.spec [iso-8859-1] Wed Dec 2 21:04:16 2015 @@ -11,14 +11,14 @@ @ stdcall TTRunValidationTests(ptr ptr) @ stub _TTCharToUnicode@24 @ stub _TTDeleteEmbeddedFont@12 -@ stub _TTEmbedFont@44 +@ stdcall _TTEmbedFont@44(long long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont @ stub _TTEmbedFontFromFileA@52 @ stub _TTEnableEmbeddingForFacename@8 @ stub _TTGetEmbeddedFontInfo@28 -@ stub _TTGetEmbeddingType@8 -@ stub _TTIsEmbeddingEnabled@8 +@ stdcall _TTGetEmbeddingType@8(long ptr) TTGetEmbeddingType +@ stdcall _TTIsEmbeddingEnabled@8(long ptr) TTIsEmbeddingEnabled @ stub _TTIsEmbeddingEnabledForFacename@8 -@ stub _TTLoadEmbeddedFont@40 +@ stdcall _TTLoadEmbeddedFont@40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests@8 @ stdcall TTEmbedFontEx(ptr long long ptr ptr ptr ptr ptr long long ptr) @ stdcall TTRunValidationTestsEx(ptr ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Dec 2 21:04:16 2015 @@ -187,6 +187,7 @@ reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/sti # Synced to WineStaging-1.7.55 reactos/dll/win32/sxs # Synced to WineStaging-1.7.55 +reactos/dll/win32/t2embed # Synced to WineStaging-1.7.55 reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.55 reactos/dll/win32/traffic # Synced to WineStaging-1.7.55 reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70236: [PSDK] Add missing E_API_NOTIMPL.
by akhaldi＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: akhaldi Date: Wed Dec 2 21:00:36 2015 New Revision: 70236 URL: http://svn.reactos.org/svn/reactos?rev=70236&view=rev Log: [PSDK] Add missing E_API_NOTIMPL. Modified: trunk/reactos/include/psdk/t2embapi.h Modified: trunk/reactos/include/psdk/t2embapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/t2embapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/t2embapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/t2embapi.h [iso-8859-1] Wed Dec 2 21:00:36 2015 @@ -37,6 +37,8 @@ #ifndef E_NONE #define E_NONE 0x0 #endif + +#define E_API_NOTIMPL 0x0001L #ifndef E_CHARCODECOUNTINVALID #define E_CHARCODECOUNTINVALID 0x2

1 0

[akhaldi] 70235: [MEDIA/DOC] Add Libxslt to the 3rd party modules list.
by akhaldi＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: akhaldi Date: Wed Dec 2 11:41:50 2015 New Revision: 70235 URL: http://svn.reactos.org/svn/reactos?rev=70235&view=rev Log: [MEDIA/DOC] Add Libxslt to the 3rd party modules list. Modified: trunk/reactos/media/doc/3rd Party Files.txt Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Wed Dec 2 11:41:50 2015 @@ -46,6 +46,10 @@ Used Version: 2.9.3 Website: http://xmlsoft.org | ftp://xmlsoft.org/libxml2/ +Title: Libxslt +Used Version: 1.1.28 +Website: http://xmlsoft.org + Title: ZLib Used Version: 1.2.8 Website: http://www.zlib.net

1 0

[akhaldi] 70234: [LIBXML2] Update to v2.9.3.
by akhaldi＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: akhaldi Date: Wed Dec 2 11:36:52 2015 New Revision: 70234 URL: http://svn.reactos.org/svn/reactos?rev=70234&view=rev Log: [LIBXML2] Update to v2.9.3. Modified: trunk/reactos/include/reactos/libs/libxml/tree.h trunk/reactos/include/reactos/libs/libxml/xmlversion.h trunk/reactos/include/reactos/libs/libxml/xmlversion.h.in trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c trunk/reactos/lib/3rdparty/libxml2/HTMLtree.c trunk/reactos/lib/3rdparty/libxml2/buf.c trunk/reactos/lib/3rdparty/libxml2/dict.c trunk/reactos/lib/3rdparty/libxml2/error.c trunk/reactos/lib/3rdparty/libxml2/parser.c trunk/reactos/lib/3rdparty/libxml2/parserInternals.c trunk/reactos/lib/3rdparty/libxml2/relaxng.c trunk/reactos/lib/3rdparty/libxml2/threads.c trunk/reactos/lib/3rdparty/libxml2/timsort.h trunk/reactos/lib/3rdparty/libxml2/tree.c trunk/reactos/lib/3rdparty/libxml2/valid.c trunk/reactos/lib/3rdparty/libxml2/xmlIO.c trunk/reactos/lib/3rdparty/libxml2/xmllint.c trunk/reactos/lib/3rdparty/libxml2/xmlmemory.c trunk/reactos/lib/3rdparty/libxml2/xmlreader.c trunk/reactos/lib/3rdparty/libxml2/xmlschemas.c trunk/reactos/lib/3rdparty/libxml2/xpath.c trunk/reactos/lib/3rdparty/libxml2/xzlib.c trunk/reactos/media/doc/3rd Party Files.txt Modified: trunk/reactos/include/reactos/libs/libxml/tree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… ============================================================================== --- trunk/reactos/include/reactos/libs/libxml/tree.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libxml/tree.h [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -76,7 +76,8 @@ XML_BUFFER_ALLOC_EXACT, /* grow only to the minimal size */ XML_BUFFER_ALLOC_IMMUTABLE, /* immutable buffer */ XML_BUFFER_ALLOC_IO, /* special allocation scheme used for I/O */ - XML_BUFFER_ALLOC_HYBRID /* exact up to a threshold, and doubleit thereafter */ + XML_BUFFER_ALLOC_HYBRID, /* exact up to a threshold, and doubleit thereafter */ + XML_BUFFER_ALLOC_BOUNDED /* limit the upper size of the buffer */ } xmlBufferAllocationScheme; /** Modified: trunk/reactos/include/reactos/libs/libxml/xmlversion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… ============================================================================== --- trunk/reactos/include/reactos/libs/libxml/xmlversion.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libxml/xmlversion.h [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -29,28 +29,28 @@ * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.9.2" +#define LIBXML_DOTTED_VERSION "2.9.3" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 20902 +#define LIBXML_VERSION 20903 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "20902" +#define LIBXML_VERSION_STRING "20903" /** * LIBXML_VERSION_EXTRA: * * extra version information, used to show a CVS compilation */ -#define LIBXML_VERSION_EXTRA "" +#define LIBXML_VERSION_EXTRA "-GITCVE-2015-8242" /** * LIBXML_TEST_VERSION: @@ -58,7 +58,7 @@ * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(20902); +#define LIBXML_TEST_VERSION xmlCheckVersion(20903); #ifndef VMS #if 0 @@ -435,7 +435,7 @@ */ #ifndef LIBXML_ATTR_ALLOC_SIZE -# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) +# if (!defined(__clang__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) # define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x))) # else # define LIBXML_ATTR_ALLOC_SIZE(x) Modified: trunk/reactos/include/reactos/libs/libxml/xmlversion.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… ============================================================================== --- trunk/reactos/include/reactos/libs/libxml/xmlversion.h.in [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libxml/xmlversion.h.in [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -435,7 +435,7 @@ */ #ifndef LIBXML_ATTR_ALLOC_SIZE -# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) +# if (!defined(__clang__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) # define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x))) # else # define LIBXML_ATTR_ALLOC_SIZE(x) Modified: trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/HTMLp… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -2948,8 +2948,9 @@ /** - * htmlParseCharData: + * htmlParseCharDataInternal: * @ctxt: an HTML parser context + * @readahead: optional read ahead character in ascii range * * parse a CharData section. * if we are within a CDATA section ']]>' marks an end of section. @@ -2958,11 +2959,14 @@ */ static void -htmlParseCharData(htmlParserCtxtPtr ctxt) { - xmlChar buf[HTML_PARSER_BIG_BUFFER_SIZE + 5]; +htmlParseCharDataInternal(htmlParserCtxtPtr ctxt, int readahead) { + xmlChar buf[HTML_PARSER_BIG_BUFFER_SIZE + 6]; int nbchar = 0; int cur, l; int chunk = 0; + + if (readahead) + buf[nbchar++] = readahead; SHRINK; cur = CUR_CHAR(l); @@ -3040,6 +3044,21 @@ if (cur == 0) ctxt->instate = XML_PARSER_EOF; } +} + +/** + * htmlParseCharData: + * @ctxt: an HTML parser context + * + * parse a CharData section. + * if we are within a CDATA section ']]>' marks an end of section. + * + * [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*) + */ + +static void +htmlParseCharData(htmlParserCtxtPtr ctxt) { + htmlParseCharDataInternal(ctxt, 0); } /** @@ -3245,12 +3264,17 @@ ctxt->instate = state; return; } + len = 0; + buf[len] = 0; q = CUR_CHAR(ql); + if (!IS_CHAR(q)) + goto unfinished; NEXTL(ql); r = CUR_CHAR(rl); + if (!IS_CHAR(r)) + goto unfinished; NEXTL(rl); cur = CUR_CHAR(l); - len = 0; while (IS_CHAR(cur) && ((cur != '>') || (r != '-') || (q != '-'))) { @@ -3281,18 +3305,20 @@ } } buf[len] = 0; - if (!IS_CHAR(cur)) { - htmlParseErr(ctxt, XML_ERR_COMMENT_NOT_FINISHED, - "Comment not terminated \n<!--%.50s\n", buf, NULL); - xmlFree(buf); - } else { + if (IS_CHAR(cur)) { NEXT; if ((ctxt->sax != NULL) && (ctxt->sax->comment != NULL) && (!ctxt->disableSAX)) ctxt->sax->comment(ctxt->userData, buf); xmlFree(buf); - } - ctxt->instate = state; + ctxt->instate = state; + return; + } + +unfinished: + htmlParseErr(ctxt, XML_ERR_COMMENT_NOT_FINISHED, + "Comment not terminated \n<!--%.50s\n", buf, NULL); + xmlFree(buf); } /** @@ -3690,6 +3716,14 @@ htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED, "htmlParseStartTag: invalid element name\n", NULL, NULL); + /* if recover preserve text on classic misconstructs */ + if ((ctxt->recovery) && ((IS_BLANK_CH(CUR)) || (CUR == '<') || + (CUR == '=') || (CUR == '>') || (((CUR >= '0') && (CUR <= '9'))))) { + htmlParseCharDataInternal(ctxt, '<'); + return(-1); + } + + /* Dump the bogus tag like browsers do */ while ((IS_CHAR_CH(CUR)) && (CUR != '>') && (ctxt->instate != XML_PARSER_EOF)) @@ -5701,17 +5735,17 @@ if (ctxt->keepBlanks) { if (ctxt->sax->characters != NULL) ctxt->sax->characters( - ctxt->userData, &cur, 1); + ctxt->userData, &in->cur[0], 1); } else { if (ctxt->sax->ignorableWhitespace != NULL) ctxt->sax->ignorableWhitespace( - ctxt->userData, &cur, 1); + ctxt->userData, &in->cur[0], 1); } } else { htmlCheckParagraph(ctxt); if (ctxt->sax->characters != NULL) ctxt->sax->characters( - ctxt->userData, &cur, 1); + ctxt->userData, &in->cur[0], 1); } } ctxt->token = 0; Modified: trunk/reactos/lib/3rdparty/libxml2/HTMLtree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/HTMLt… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/HTMLtree.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/HTMLtree.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -668,7 +668,8 @@ xmlOutputBufferWriteString(buf, " "); xmlBufWriteQuotedString(buf->buffer, cur->SystemID); } - } else if (cur->SystemID != NULL) { + } else if (cur->SystemID != NULL && + xmlStrcmp(cur->SystemID, BAD_CAST "about:legacy-compat")) { xmlOutputBufferWriteString(buf, " SYSTEM "); xmlBufWriteQuotedString(buf->buffer, cur->SystemID); } Modified: trunk/reactos/lib/3rdparty/libxml2/buf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/buf.c… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/buf.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/buf.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -27,6 +27,7 @@ #include <libxml/tree.h> #include <libxml/globals.h> #include <libxml/tree.h> +#include <libxml/parserInternals.h> /* for XML_MAX_TEXT_LENGTH */ #include "buf.h" #define WITH_BUFFER_COMPAT @@ -299,7 +300,8 @@ if ((scheme == XML_BUFFER_ALLOC_DOUBLEIT) || (scheme == XML_BUFFER_ALLOC_EXACT) || (scheme == XML_BUFFER_ALLOC_HYBRID) || - (scheme == XML_BUFFER_ALLOC_IMMUTABLE)) { + (scheme == XML_BUFFER_ALLOC_IMMUTABLE) || + (scheme == XML_BUFFER_ALLOC_BOUNDED)) { buf->alloc = scheme; if (buf->buffer) buf->buffer->alloc = scheme; @@ -458,6 +460,18 @@ size = buf->use + len + 100; #endif + if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { + /* + * Used to provide parsing limits + */ + if ((buf->use + len >= XML_MAX_TEXT_LENGTH) || + (buf->size >= XML_MAX_TEXT_LENGTH)) { + xmlBufMemoryError(buf, "buffer error: text too long\n"); + return(0); + } + if (size >= XML_MAX_TEXT_LENGTH) + size = XML_MAX_TEXT_LENGTH; + } if ((buf->alloc == XML_BUFFER_ALLOC_IO) && (buf->contentIO != NULL)) { size_t start_buf = buf->content - buf->contentIO; @@ -739,6 +753,15 @@ CHECK_COMPAT(buf) if (buf->alloc == XML_BUFFER_ALLOC_IMMUTABLE) return(0); + if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { + /* + * Used to provide parsing limits + */ + if (size >= XML_MAX_TEXT_LENGTH) { + xmlBufMemoryError(buf, "buffer error: text too long\n"); + return(0); + } + } /* Don't resize if we don't have to */ if (size < buf->size) @@ -867,6 +890,15 @@ needSize = buf->use + len + 2; if (needSize > buf->size){ + if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { + /* + * Used to provide parsing limits + */ + if (needSize >= XML_MAX_TEXT_LENGTH) { + xmlBufMemoryError(buf, "buffer error: text too long\n"); + return(-1); + } + } if (!xmlBufResize(buf, needSize)){ xmlBufMemoryError(buf, "growing buffer"); return XML_ERR_NO_MEMORY; @@ -938,6 +970,15 @@ } needSize = buf->use + len + 2; if (needSize > buf->size){ + if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { + /* + * Used to provide parsing limits + */ + if (needSize >= XML_MAX_TEXT_LENGTH) { + xmlBufMemoryError(buf, "buffer error: text too long\n"); + return(-1); + } + } if (!xmlBufResize(buf, needSize)){ xmlBufMemoryError(buf, "growing buffer"); return XML_ERR_NO_MEMORY; Modified: trunk/reactos/lib/3rdparty/libxml2/dict.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/dict.… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/dict.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/dict.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -486,7 +486,10 @@ value += 30 * (*prefix); if (len > 10) { - value += name[len - (plen + 1 + 1)]; + int offset = len - (plen + 1 + 1); + if (offset < 0) + offset = len - (10 + 1); + value += name[offset]; len = 10; if (plen > 10) plen = 10; Modified: trunk/reactos/lib/3rdparty/libxml2/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/error… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/error.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/error.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -177,7 +177,9 @@ xmlChar content[81]; /* space for 80 chars + line terminator */ xmlChar *ctnt; - if (input == NULL) return; + if ((input == NULL) || (input->cur == NULL) || + (*input->cur == 0)) return; + cur = input->cur; base = input->base; /* skip backwards over any end-of-lines */ Modified: trunk/reactos/lib/3rdparty/libxml2/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/parser.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/parser.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -93,6 +93,8 @@ static xmlParserCtxtPtr xmlCreateEntityParserCtxtInternal(const xmlChar *URL, const xmlChar *ID, const xmlChar *base, xmlParserCtxtPtr pctx); + +static void xmlHaltParser(xmlParserCtxtPtr ctxt); /************************************************************************ * * @@ -1771,7 +1773,7 @@ xmlFatalErrMsgInt(ctxt, XML_ERR_INTERNAL_ERROR, "Excessive depth in document: %d use XML_PARSE_HUGE option\n", xmlParserMaxDepth); - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); return(-1); } ctxt->nodeTab[ctxt->nodeNr] = value; @@ -2073,9 +2075,16 @@ ((ctxt->input->buf) && (ctxt->input->buf->readcallback != (xmlInputReadCallback) xmlNop)) && ((ctxt->options & XML_PARSE_HUGE) == 0)) { xmlFatalErr(ctxt, XML_ERR_INTERNAL_ERROR, "Huge input lookup"); - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); + return; } xmlParserInputGrow(ctxt->input, INPUT_CHUNK); + if ((ctxt->input->cur > ctxt->input->end) || + (ctxt->input->cur < ctxt->input->base)) { + xmlHaltParser(ctxt); + xmlFatalErr(ctxt, XML_ERR_INTERNAL_ERROR, "cur index out of bound"); + return; + } if ((ctxt->input->cur != NULL) && (*ctxt->input->cur == 0) && (xmlParserInputGrow(ctxt->input, INPUT_CHUNK) <= 0)) xmlPopInput(ctxt); @@ -2151,7 +2160,8 @@ int cur; do { cur = CUR; - while (IS_BLANK_CH(cur)) { /* CHECKED tstblanks.xml */ + while ((IS_BLANK_CH(cur) && /* CHECKED tstblanks.xml */ + (ctxt->instate != XML_PARSER_EOF))) { NEXT; cur = CUR; res++; @@ -2165,7 +2175,8 @@ * Need to handle support of entities branching here */ if (*ctxt->input->cur == '%') xmlParserHandlePEReference(ctxt); - } while (IS_BLANK(cur)); /* CHECKED tstblanks.xml */ + } while ((IS_BLANK(cur)) && /* CHECKED tstblanks.xml */ + (ctxt->instate != XML_PARSER_EOF)); } return(res); } @@ -2806,6 +2817,10 @@ 0, 0, 0); ctxt->depth--; + if ((ctxt->lastError.code == XML_ERR_ENTITY_LOOP) || + (ctxt->lastError.code == XML_ERR_INTERNAL_ERROR)) + goto int_error; + if (rep != NULL) { current = rep; while (*current != 0) { /* non input consuming loop */ @@ -3491,7 +3506,14 @@ c = CUR_CHAR(l); if (c == 0) { count = 0; + /* + * when shrinking to extend the buffer we really need to preserve + * the part of the name we already parsed. Hence rolling back + * by current lenght. + */ + ctxt->input->cur -= l; GROW; + ctxt->input->cur += l; if (ctxt->instate == XML_PARSER_EOF) return(NULL); end = ctxt->input->cur; @@ -3523,7 +3545,7 @@ static const xmlChar * xmlParseNCName(xmlParserCtxtPtr ctxt) { - const xmlChar *in; + const xmlChar *in, *e; const xmlChar *ret; int count = 0; @@ -3535,16 +3557,19 @@ * Accelerator for simple ASCII names */ in = ctxt->input->cur; - if (((*in >= 0x61) && (*in <= 0x7A)) || - ((*in >= 0x41) && (*in <= 0x5A)) || - (*in == '_')) { + e = ctxt->input->end; + if ((((*in >= 0x61) && (*in <= 0x7A)) || + ((*in >= 0x41) && (*in <= 0x5A)) || + (*in == '_')) && (in < e)) { in++; - while (((*in >= 0x61) && (*in <= 0x7A)) || - ((*in >= 0x41) && (*in <= 0x5A)) || - ((*in >= 0x30) && (*in <= 0x39)) || - (*in == '_') || (*in == '-') || - (*in == '.')) + while ((((*in >= 0x61) && (*in <= 0x7A)) || + ((*in >= 0x41) && (*in <= 0x5A)) || + ((*in >= 0x30) && (*in <= 0x39)) || + (*in == '_') || (*in == '-') || + (*in == '.')) && (in < e)) in++; + if (in >= e) + goto complex; if ((*in > 0) && (*in < 0x80)) { count = in - ctxt->input->cur; if ((count > XML_MAX_NAME_LENGTH) && @@ -3562,6 +3587,7 @@ return(ret); } } +complex: return(xmlParseNCNameComplex(ctxt)); } @@ -5658,6 +5684,7 @@ if (RAW != '>') { xmlFatalErrMsgStr(ctxt, XML_ERR_ENTITY_NOT_FINISHED, "xmlParseEntityDecl: entity %s not terminated\n", name); + xmlHaltParser(ctxt); } else { if (input != ctxt->input) { xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY, @@ -6769,6 +6796,8 @@ SKIP_BLANKS; if (RAW != '[') { xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL); + xmlHaltParser(ctxt); + return; } else { if (ctxt->input->id != id) { xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY, @@ -6829,6 +6858,8 @@ SKIP_BLANKS; if (RAW != '[') { xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL); + xmlHaltParser(ctxt); + return; } else { if (ctxt->input->id != id) { xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY, @@ -6884,6 +6915,8 @@ } else { xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID_KEYWORD, NULL); + xmlHaltParser(ctxt); + return; } if (RAW == 0) @@ -6897,7 +6930,9 @@ "All markup of the conditional section is not in the same entity\n", NULL, NULL); } - SKIP(3); + if ((ctxt-> instate != XML_PARSER_EOF) && + ((ctxt->input->cur + 3) <= ctxt->input->end)) + SKIP(3); } } @@ -6952,6 +6987,14 @@ xmlParsePI(ctxt); } } + + /* + * detect requirement to exit there and act accordingly + * and avoid having instate overriden later on + */ + if (ctxt->instate == XML_PARSER_EOF) + return; + /* * This is only for internal subset. On external entities, * the replacement is done before parsing stage @@ -7083,7 +7126,7 @@ /* * The XML REC instructs us to stop parsing right here */ - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); return; } } @@ -7235,7 +7278,8 @@ * far more secure as the parser will only process data coming from * the document entity by default. */ - if ((ent->checked == 0) && + if (((ent->checked == 0) || + ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) && ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) || (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { unsigned long oldnbent = ctxt->nbentities; @@ -8069,7 +8113,7 @@ * The XML REC instructs us to stop parsing * right here */ - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); return; } } @@ -9304,7 +9348,7 @@ const xmlChar **atts = ctxt->atts; int maxatts = ctxt->maxatts; int nratts, nbatts, nbdef; - int i, j, nbNs, attval, oldline, oldcol; + int i, j, nbNs, attval, oldline, oldcol, inputNr; const xmlChar *base; unsigned long cur; int nsNr = ctxt->nsNr; @@ -9323,6 +9367,7 @@ SHRINK; base = ctxt->input->base; cur = ctxt->input->cur - ctxt->input->base; + inputNr = ctxt->inputNr; oldline = ctxt->input->line; oldcol = ctxt->input->col; nbatts = 0; @@ -9348,7 +9393,8 @@ */ SKIP_BLANKS; GROW; - if (ctxt->input->base != base) goto base_changed; + if ((ctxt->input->base != base) || (inputNr != ctxt->inputNr)) + goto base_changed; while (((RAW != '>') && ((RAW != '/') || (NXT(1) != '>')) && @@ -9359,7 +9405,7 @@ attname = xmlParseAttribute2(ctxt, prefix, localname, &aprefix, &attvalue, &len, &alloc); - if (ctxt->input->base != base) { + if ((ctxt->input->base != base) || (inputNr != ctxt->inputNr)) { if ((attvalue != NULL) && (alloc != 0)) xmlFree(attvalue); attvalue = NULL; @@ -9508,7 +9554,8 @@ break; } SKIP_BLANKS; - if (ctxt->input->base != base) goto base_changed; + if ((ctxt->input->base != base) || (inputNr != ctxt->inputNr)) + goto base_changed; continue; } @@ -9545,7 +9592,8 @@ GROW if (ctxt->instate == XML_PARSER_EOF) break; - if (ctxt->input->base != base) goto base_changed; + if ((ctxt->input->base != base) || (inputNr != ctxt->inputNr)) + goto base_changed; if ((RAW == '>') || (((RAW == '/') && (NXT(1) == '>')))) break; if (!IS_BLANK_CH(RAW)) { @@ -9561,7 +9609,8 @@ break; } GROW; - if (ctxt->input->base != base) goto base_changed; + if ((ctxt->input->base != base) || (inputNr != ctxt->inputNr)) + goto base_changed; } /* @@ -9728,6 +9777,17 @@ if ((ctxt->attallocs[j] != 0) && (atts[i] != NULL)) xmlFree((xmlChar *) atts[i]); } + + /* + * We can't switch from one entity to another in the middle + * of a start tag + */ + if (inputNr != ctxt->inputNr) { + xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY, + "Start tag doesn't start and stop in the same entity\n"); + return(NULL); + } + ctxt->input->cur = ctxt->input->base + cur; ctxt->input->line = oldline; ctxt->input->col = oldcol; @@ -10009,7 +10069,7 @@ if ((cons == ctxt->input->consumed) && (test == CUR_PTR)) { xmlFatalErr(ctxt, XML_ERR_INTERNAL_ERROR, "detected an error in element content\n"); - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); break; } } @@ -10044,7 +10104,7 @@ xmlFatalErrMsgInt(ctxt, XML_ERR_INTERNAL_ERROR, "Excessive depth in document: %d use XML_PARSE_HUGE option\n", xmlParserMaxDepth); - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); return; } @@ -10396,6 +10456,8 @@ encoding = xmlParseEncName(ctxt); if (RAW != '"') { xmlFatalErr(ctxt, XML_ERR_STRING_NOT_CLOSED, NULL); + xmlFree((xmlChar *) encoding); + return(NULL); } else NEXT; } else if (RAW == '\''){ @@ -10403,6 +10465,8 @@ encoding = xmlParseEncName(ctxt); if (RAW != '\'') { xmlFatalErr(ctxt, XML_ERR_STRING_NOT_CLOSED, NULL); + xmlFree((xmlChar *) encoding); + return(NULL); } else NEXT; } else { @@ -10459,7 +10523,11 @@ handler = xmlFindCharEncodingHandler((const char *) encoding); if (handler != NULL) { - xmlSwitchToEncoding(ctxt, handler); + if (xmlSwitchToEncoding(ctxt, handler) < 0) { + /* failed to convert */ + ctxt->errNo = XML_ERR_UNSUPPORTED_ENCODING; + return(NULL); + } } else { xmlFatalErrMsgStr(ctxt, XML_ERR_UNSUPPORTED_ENCODING, "Unsupported encoding %s\n", encoding); @@ -10628,7 +10696,8 @@ xmlFatalErrMsg(ctxt, XML_ERR_SPACE_REQUIRED, "Blank needed here\n"); } xmlParseEncodingDecl(ctxt); - if (ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) { + if ((ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) || + (ctxt->instate == XML_PARSER_EOF)) { /* * The XML REC instructs us to stop parsing right here */ @@ -10752,6 +10821,7 @@ if (CUR == 0) { xmlFatalErr(ctxt, XML_ERR_DOCUMENT_EMPTY, NULL); + return(-1); } /* @@ -10769,7 +10839,8 @@ * Note that we will switch encoding on the fly. */ xmlParseXMLDecl(ctxt); - if (ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) { + if ((ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) || + (ctxt->instate == XML_PARSER_EOF)) { /* * The XML REC instructs us to stop parsing right here */ @@ -11165,7 +11236,7 @@ else return(-ix); } else if ((c & 0xe0) == 0xc0) {/* 2-byte code, starts with 110 */ - if (ix + 2 > len) return(ix); + if (ix + 2 > len) return(-ix); if ((utf[ix+1] & 0xc0 ) != 0x80) return(-ix); codepoint = (utf[ix] & 0x1f) << 6; @@ -11174,7 +11245,7 @@ return(-ix); ix += 2; } else if ((c & 0xf0) == 0xe0) {/* 3-byte code, starts with 1110 */ - if (ix + 3 > len) return(ix); + if (ix + 3 > len) return(-ix); if (((utf[ix+1] & 0xc0) != 0x80) || ((utf[ix+2] & 0xc0) != 0x80)) return(-ix); @@ -11185,7 +11256,7 @@ return(-ix); ix += 3; } else if ((c & 0xf8) == 0xf0) {/* 4-byte code, starts with 11110 */ - if (ix + 4 > len) return(ix); + if (ix + 4 > len) return(-ix); if (((utf[ix+1] & 0xc0) != 0x80) || ((utf[ix+2] & 0xc0) != 0x80) || ((utf[ix+3] & 0xc0) != 0x80)) @@ -11363,7 +11434,7 @@ ctxt->sax->setDocumentLocator(ctxt->userData, &xmlDefaultSAXLocator); xmlFatalErr(ctxt, XML_ERR_DOCUMENT_EMPTY, NULL); - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); #ifdef DEBUG_PUSH xmlGenericError(xmlGenericErrorContext, "PP: entering EOF\n"); @@ -11396,7 +11467,7 @@ * The XML REC instructs us to stop parsing right * here */ - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); return(0); } ctxt->standalone = ctxt->input->standalone; @@ -11452,7 +11523,7 @@ cur = ctxt->input->cur[0]; if (cur != '<') { xmlFatalErr(ctxt, XML_ERR_DOCUMENT_EMPTY, NULL); - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); if ((ctxt->sax) && (ctxt->sax->endDocument != NULL)) ctxt->sax->endDocument(ctxt->userData); goto done; @@ -11484,7 +11555,7 @@ goto done; if (name == NULL) { spacePop(ctxt); - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); if ((ctxt->sax) && (ctxt->sax->endDocument != NULL)) ctxt->sax->endDocument(ctxt->userData); goto done; @@ -11651,7 +11722,7 @@ if ((cons == ctxt->input->consumed) && (test == CUR_PTR)) { xmlFatalErr(ctxt, XML_ERR_INTERNAL_ERROR, "detected an error in element content\n"); - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); break; } break; @@ -11972,7 +12043,7 @@ goto done; } else { xmlFatalErr(ctxt, XML_ERR_DOCUMENT_END, NULL); - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); #ifdef DEBUG_PUSH xmlGenericError(xmlGenericErrorContext, "PP: entering EOF\n"); @@ -12336,7 +12407,7 @@ res = xmlParserInputBufferPush(ctxt->input->buf, size, chunk); if (res < 0) { ctxt->errNo = XML_PARSER_EOF; - ctxt->disableSAX = 1; + xmlHaltParser(ctxt); return (XML_PARSER_EOF); } xmlBufSetInputBaseCur(ctxt->input->buf->buffer, ctxt->input, base, cur); @@ -12390,7 +12461,7 @@ ((ctxt->input->cur - ctxt->input->base) > XML_MAX_LOOKUP_LIMIT)) && ((ctxt->options & XML_PARSE_HUGE) == 0)) { xmlFatalErr(ctxt, XML_ERR_INTERNAL_ERROR, "Huge input lookup"); - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); } if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1)) return(ctxt->errNo); @@ -12578,6 +12649,33 @@ #endif /* LIBXML_PUSH_ENABLED */ /** + * xmlHaltParser: + * @ctxt: an XML parser context + * + * Blocks further parser processing don't override error + * for internal use + */ +static void +xmlHaltParser(xmlParserCtxtPtr ctxt) { + if (ctxt == NULL) + return; + ctxt->instate = XML_PARSER_EOF; + ctxt->disableSAX = 1; + if (ctxt->input != NULL) { + /* + * in case there was a specific allocation deallocate before + * overriding base + */ + if (ctxt->input->free != NULL) { + ctxt->input->free((xmlChar *) ctxt->input->base); + ctxt->input->free = NULL; + } + ctxt->input->cur = BAD_CAST""; + ctxt->input->base = ctxt->input->cur; + } +} + +/** * xmlStopParser: * @ctxt: an XML parser context * @@ -12587,13 +12685,8 @@ xmlStopParser(xmlParserCtxtPtr ctxt) { if (ctxt == NULL) return; - ctxt->instate = XML_PARSER_EOF; + xmlHaltParser(ctxt); ctxt->errNo = XML_ERR_USER_STOP; - ctxt->disableSAX = 1; - if (ctxt->input != NULL) { - ctxt->input->cur = BAD_CAST""; - ctxt->input->base = ctxt->input->cur; - } } /** @@ -13340,7 +13433,7 @@ /* * Also record the size of the entity parsed */ - if (ctxt->input != NULL) { + if (ctxt->input != NULL && oldctxt != NULL) { oldctxt->sizeentities += ctxt->input->consumed; oldctxt->sizeentities += (ctxt->input->cur - ctxt->input->base); } @@ -13352,9 +13445,11 @@ if (sax != NULL) ctxt->sax = oldsax; - oldctxt->node_seq.maximum = ctxt->node_seq.maximum; - oldctxt->node_seq.length = ctxt->node_seq.length; - oldctxt->node_seq.buffer = ctxt->node_seq.buffer; + if (oldctxt != NULL) { + oldctxt->node_seq.maximum = ctxt->node_seq.maximum; + oldctxt->node_seq.length = ctxt->node_seq.length; + oldctxt->node_seq.buffer = ctxt->node_seq.buffer; + } ctxt->node_seq.maximum = 0; ctxt->node_seq.length = 0; ctxt->node_seq.buffer = NULL; @@ -14829,9 +14924,6 @@ #endif #ifdef LIBXML_XPATH_ENABLED xmlXPathInit(); -#endif -#ifdef LIBXML_CATALOG_ENABLED - xmlInitializeCatalog(); #endif xmlParserInitialized = 1; #ifdef LIBXML_THREAD_ENABLED Modified: trunk/reactos/lib/3rdparty/libxml2/parserInternals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/parserInternals.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/parserInternals.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -937,6 +937,7 @@ { xmlCharEncodingHandlerPtr handler; int len = -1; + int ret; if (ctxt == NULL) return(-1); switch (enc) { @@ -1097,7 +1098,15 @@ if (handler == NULL) return(-1); ctxt->charset = XML_CHAR_ENCODING_UTF8; - return(xmlSwitchToEncodingInt(ctxt, handler, len)); + ret = xmlSwitchToEncodingInt(ctxt, handler, len); + if ((ret < 0) || (ctxt->errNo == XML_I18N_CONV_FAILED)) { + /* + * on encoding conversion errors, stop the parser + */ + xmlStopParser(ctxt); + ctxt->errNo = XML_I18N_CONV_FAILED; + } + return(ret); } /** @@ -1450,6 +1459,8 @@ if (entity->URI != NULL) input->filename = (char *) xmlStrdup((xmlChar *) entity->URI); input->base = entity->content; + if (entity->length == 0) + entity->length = xmlStrlen(entity->content); input->cur = entity->content; input->length = entity->length; input->end = &entity->content[input->length]; Modified: trunk/reactos/lib/3rdparty/libxml2/relaxng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/relax… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/relaxng.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/relaxng.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -3819,7 +3819,11 @@ return (0); return (1); } else if (def1->type == XML_RELAXNG_EXCEPT) { - TODO ret = 0; + ret = xmlRelaxNGCompareNameClasses(def1->content, def2); + if (ret == 0) + ret = 1; + else if (ret == 1) + ret = 0; } else { TODO ret = 0; } @@ -9859,7 +9863,7 @@ ctxt->depth++; switch (define->type) { case XML_RELAXNG_EMPTY: - node = xmlRelaxNGSkipIgnored(ctxt, node); + xmlRelaxNGSkipIgnored(ctxt, node); ret = 0; break; case XML_RELAXNG_NOT_ALLOWED: Modified: trunk/reactos/lib/3rdparty/libxml2/threads.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/threa… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/threads.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/threads.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -47,7 +47,7 @@ #ifdef HAVE_PTHREAD_H static int libxml_is_threaded = -1; -#ifdef __GNUC__ +#if defined(__GNUC__) && defined(__GLIBC__) #ifdef linux #if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3) extern int pthread_once (pthread_once_t *__once_control, @@ -89,7 +89,7 @@ __attribute((weak)); #endif #endif /* linux */ -#endif /* __GNUC__ */ +#endif /* defined(__GNUC__) && defined(__GLIBC__) */ #endif /* HAVE_PTHREAD_H */ /* @@ -415,8 +415,8 @@ pthread_mutex_unlock(&tok->lock); #elif defined HAVE_WIN32_THREADS if (tok->count > 0) { + tok->count--; LeaveCriticalSection(&tok->cs); - tok->count--; } #elif defined HAVE_BEOS_THREADS if (tok->lock->tid == find_thread(NULL)) { Modified: trunk/reactos/lib/3rdparty/libxml2/timsort.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/timso… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/timsort.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/timsort.h [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -392,62 +392,66 @@ static int TIM_SORT_COLLAPSE(SORT_TYPE *dst, TIM_SORT_RUN_T *stack, int stack_curr, TEMP_STORAGE_T *store, const size_t size) { - while (1) - { - int64_t A, B, C; + while (1) { + int64_t A, B, C, D; + int ABC, BCD, BD, CD; + /* if the stack only has one thing on it, we are done with the collapse */ - if (stack_curr <= 1) break; + if (stack_curr <= 1) { + break; + } + /* if this is the last merge, just do it */ - if ((stack_curr == 2) && - (stack[0].length + stack[1].length == (int64_t) size)) - { + if ((stack_curr == 2) && (stack[0].length + stack[1].length == size)) { TIM_SORT_MERGE(dst, stack, stack_curr, store); stack[0].length += stack[1].length; stack_curr--; break; } /* check if the invariant is off for a stack of 2 elements */ - else if ((stack_curr == 2) && (stack[0].length <= stack[1].length)) - { + else if ((stack_curr == 2) && (stack[0].length <= stack[1].length)) { TIM_SORT_MERGE(dst, stack, stack_curr, store); stack[0].length += stack[1].length; stack_curr--; break; - } - else if (stack_curr == 2) + } else if (stack_curr == 2) { break; - - A = stack[stack_curr - 3].length; - B = stack[stack_curr - 2].length; - C = stack[stack_curr - 1].length; - - /* check first invariant */ - if (A <= B + C) - { - if (A < C) - { - TIM_SORT_MERGE(dst, stack, stack_curr - 1, store); - stack[stack_curr - 3].length += stack[stack_curr - 2].length; - stack[stack_curr - 2] = stack[stack_curr - 1]; - stack_curr--; - } - else - { - TIM_SORT_MERGE(dst, stack, stack_curr, store); - stack[stack_curr - 2].length += stack[stack_curr - 1].length; - stack_curr--; - } - } - /* check second invariant */ - else if (B <= C) - { + } + + B = stack[stack_curr - 3].length; + C = stack[stack_curr - 2].length; + D = stack[stack_curr - 1].length; + + if (stack_curr >= 4) { + A = stack[stack_curr - 4].length; + ABC = (A <= B + C); + } else { + ABC = 0; + } + + BCD = (B <= C + D) || ABC; + CD = (C <= D); + BD = (B < D); + + /* Both invariants are good */ + if (!BCD && !CD) { + break; + } + + /* left merge */ + if (BCD && !CD) { + TIM_SORT_MERGE(dst, stack, stack_curr - 1, store); + stack[stack_curr - 3].length += stack[stack_curr - 2].length; + stack[stack_curr - 2] = stack[stack_curr - 1]; + stack_curr--; + } else { + /* right merge */ TIM_SORT_MERGE(dst, stack, stack_curr, store); stack[stack_curr - 2].length += stack[stack_curr - 1].length; stack_curr--; } - else - break; - } + } + return stack_curr; } Modified: trunk/reactos/lib/3rdparty/libxml2/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/tree.… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/tree.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/tree.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -1451,9 +1451,9 @@ node->content = xmlBufDetach(buf); if (last == NULL) { - last = ret = node; + ret = node; } else { - last = xmlAddNextSibling(last, node); + xmlAddNextSibling(last, node); } } else if (ret == NULL) { ret = xmlNewDocText(doc, BAD_CAST ""); @@ -1639,9 +1639,9 @@ node->content = xmlBufDetach(buf); if (last == NULL) { - last = ret = node; + ret = node; } else { - last = xmlAddNextSibling(last, node); + xmlAddNextSibling(last, node); } } @@ -2799,8 +2799,27 @@ if(tree->type == XML_ELEMENT_NODE) { prop = tree->properties; while (prop != NULL) { + if (prop->atype == XML_ATTRIBUTE_ID) { + xmlRemoveID(tree->doc, prop); + } + prop->doc = doc; xmlSetListDoc(prop->children, doc); + + /* + * TODO: ID attributes should be also added to the new + * document, but this breaks things like xmlReplaceNode. + * The underlying problem is that xmlRemoveID is only called + * if a node is destroyed, not if it's unlinked. + */ +#if 0 + if (xmlIsID(doc, tree, prop)) { + xmlChar *idVal = xmlNodeListGetString(doc, prop->children, + 1); + xmlAddID(NULL, doc, idVal, prop); + } +#endif + prop = prop->next; } } Modified: trunk/reactos/lib/3rdparty/libxml2/valid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/valid… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/valid.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/valid.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -2634,8 +2634,10 @@ /* * The id is already defined in this DTD. */ - xmlErrValidNode(ctxt, attr->parent, XML_DTD_ID_REDEFINED, - "ID %s already defined\n", value, NULL, NULL); + if (ctxt != NULL) { + xmlErrValidNode(ctxt, attr->parent, XML_DTD_ID_REDEFINED, + "ID %s already defined\n", value, NULL, NULL); + } #endif /* LIBXML_VALID_ENABLED */ xmlFreeID(ret); return(NULL); Modified: trunk/reactos/lib/3rdparty/libxml2/xmlIO.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlIO… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/xmlIO.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/xmlIO.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -1335,7 +1335,7 @@ } #endif /* HAVE_ZLIB_H */ -#ifdef HAVE_LZMA_H +#ifdef LIBXML_LZMA_ENABLED /************************************************************************ * * * I/O for compressed file accesses * @@ -1452,7 +1452,7 @@ if (ret < 0) xmlIOErr(0, "xzclose()"); return(ret); } -#endif /* HAVE_LZMA_H */ +#endif /* LIBXML_LZMA_ENABLED */ #ifdef LIBXML_HTTP_ENABLED /************************************************************************ @@ -2329,10 +2329,10 @@ xmlRegisterInputCallbacks(xmlGzfileMatch, xmlGzfileOpen, xmlGzfileRead, xmlGzfileClose); #endif /* HAVE_ZLIB_H */ -#ifdef HAVE_LZMA_H +#ifdef LIBXML_LZMA_ENABLED xmlRegisterInputCallbacks(xmlXzfileMatch, xmlXzfileOpen, xmlXzfileRead, xmlXzfileClose); -#endif /* HAVE_ZLIB_H */ +#endif /* LIBXML_LZMA_ENABLED */ #ifdef LIBXML_HTTP_ENABLED xmlRegisterInputCallbacks(xmlIOHTTPMatch, xmlIOHTTPOpen, @@ -2684,7 +2684,7 @@ #endif } #endif -#ifdef HAVE_LZMA_H +#ifdef LIBXML_LZMA_ENABLED if ((xmlInputCallbackTable[i].opencallback == xmlXzfileOpen) && (strcmp(URI, "-") != 0)) { ret->compressed = __libxml2_xzcompressed(context); @@ -3351,7 +3351,7 @@ * try to establish compressed status of input if not done already */ if (in->compressed == -1) { -#ifdef HAVE_LZMA_H +#ifdef LIBXML_LZMA_ENABLED if (in->readcallback == xmlXzfileRead) in->compressed = __libxml2_xzcompressed(in->context); #endif Modified: trunk/reactos/lib/3rdparty/libxml2/xmllint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlli… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/xmllint.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/xmllint.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -3046,7 +3046,7 @@ printf("\t--noblanks : drop (ignorable?) blanks spaces\n"); printf("\t--nocdata : replace cdata section with text nodes\n"); #ifdef LIBXML_OUTPUT_ENABLED - printf("\t--format : reformat/reindent the input\n"); + printf("\t--format : reformat/reindent the output\n"); printf("\t--encode encoding : output in the given encoding\n"); printf("\t--dropdtd : remove the DOCTYPE of the input docs\n"); printf("\t--pretty STYLE : pretty-print in a particular style\n"); Modified: trunk/reactos/lib/3rdparty/libxml2/xmlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlme… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/xmlmemory.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/xmlmemory.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -554,7 +554,12 @@ int xmlMemUsed(void) { - return(debugMemSize); + int res; + + xmlMutexLock(xmlMemMutex); + res = debugMemSize; + xmlMutexUnlock(xmlMemMutex); + return(res); } /** @@ -567,7 +572,12 @@ int xmlMemBlocks(void) { - return(debugMemBlocks); + int res; + + xmlMutexLock(xmlMemMutex); + res = debugMemBlocks; + xmlMutexUnlock(xmlMemMutex); + return(res); } #ifdef MEM_LIST Modified: trunk/reactos/lib/3rdparty/libxml2/xmlreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlre… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/xmlreader.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/xmlreader.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -2091,6 +2091,9 @@ "xmlNewTextReader : malloc failed\n"); return(NULL); } + /* no operation on a reader should require a huge buffer */ + xmlBufSetAllocationScheme(ret->buffer, + XML_BUFFER_ALLOC_BOUNDED); ret->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler)); if (ret->sax == NULL) { xmlBufFree(ret->buffer); @@ -3616,6 +3619,7 @@ return(((xmlNsPtr) node)->href); case XML_ATTRIBUTE_NODE:{ xmlAttrPtr attr = (xmlAttrPtr) node; + const xmlChar *ret; if ((attr->children != NULL) && (attr->children->type == XML_TEXT_NODE) && @@ -3629,10 +3633,21 @@ "xmlTextReaderSetup : malloc failed\n"); return (NULL); } + xmlBufSetAllocationScheme(reader->buffer, + XML_BUFFER_ALLOC_BOUNDED); } else xmlBufEmpty(reader->buffer); xmlBufGetNodeContent(reader->buffer, node); - return(xmlBufContent(reader->buffer)); + ret = xmlBufContent(reader->buffer); + if (ret == NULL) { + /* error on the buffer best to reallocate */ + xmlBufFree(reader->buffer); + reader->buffer = xmlBufCreateSize(100); + xmlBufSetAllocationScheme(reader->buffer, + XML_BUFFER_ALLOC_BOUNDED); + ret = BAD_CAST ""; + } + return(ret); } break; } @@ -5131,6 +5146,9 @@ "xmlTextReaderSetup : malloc failed\n"); return (-1); } + /* no operation on a reader should require a huge buffer */ + xmlBufSetAllocationScheme(reader->buffer, + XML_BUFFER_ALLOC_BOUNDED); if (reader->sax == NULL) reader->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler)); if (reader->sax == NULL) { Modified: trunk/reactos/lib/3rdparty/libxml2/xmlschemas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlsc… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/xmlschemas.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/xmlschemas.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -24186,6 +24186,7 @@ else goto pattern_and_enum; } + /* * Whitespace handling is only of importance for string-based * types. @@ -24196,14 +24197,13 @@ ws = xmlSchemaGetWhiteSpaceFacetValue(type); } else ws = XML_SCHEMA_WHITESPACE_COLLAPSE; + /* * If the value was not computed (for string or * anySimpleType based types), then use the provided * type. */ - if (val == NULL) - valType = valType; - else + if (val != NULL) valType = xmlSchemaGetValType(val); ret = 0; @@ -25546,7 +25546,7 @@ if (xmlNewProp(defAttrOwnerElem, iattr->localName, value) == NULL) { VERROR_INT("xmlSchemaVAttributesComplex", - "callling xmlNewProp()"); + "calling xmlNewProp()"); if (normValue != NULL) xmlFree(normValue); goto internal_error; Modified: trunk/reactos/lib/3rdparty/libxml2/xpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xpath… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/xpath.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/xpath.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -361,14 +361,14 @@ /* * compute depth to root */ - for (depth2 = 0, cur = node2;cur->parent != NULL;cur = cur->parent) { - if (cur == node1) + for (depth2 = 0, cur = node2; cur->parent != NULL; cur = cur->parent) { + if (cur->parent == node1) return(1); depth2++; } root = cur; - for (depth1 = 0, cur = node1;cur->parent != NULL;cur = cur->parent) { - if (cur == node2) + for (depth1 = 0, cur = node1; cur->parent != NULL; cur = cur->parent) { + if (cur->parent == node2) return(-1); depth1++; } @@ -7933,14 +7933,14 @@ xmlNodePtr xmlXPathNextDescendantOrSelf(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); - if (cur == NULL) { - if (ctxt->context->node == NULL) - return(NULL); - if ((ctxt->context->node->type == XML_ATTRIBUTE_NODE) || - (ctxt->context->node->type == XML_NAMESPACE_DECL)) - return(NULL); + if (cur == NULL) return(ctxt->context->node); - } + + if (ctxt->context->node == NULL) + return(NULL); + if ((ctxt->context->node->type == XML_ATTRIBUTE_NODE) || + (ctxt->context->node->type == XML_NAMESPACE_DECL)) + return(NULL); return(xmlXPathNextDescendant(ctxt, cur)); } Modified: trunk/reactos/lib/3rdparty/libxml2/xzlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xzlib… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/xzlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/xzlib.c [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -8,7 +8,7 @@ */ #define IN_LIBXML #include "libxml.h" -#ifdef HAVE_LZMA_H +#ifdef LIBXML_LZMA_ENABLED #include <string.h> #ifdef HAVE_ERRNO_H @@ -34,7 +34,9 @@ #ifdef HAVE_ZLIB_H #include <zlib.h> #endif +#ifdef HAVE_LZMA_H #include <lzma.h> +#endif #include "xzlib.h" #include <libxml/xmlmemory.h> @@ -581,6 +583,10 @@ xz_error(state, LZMA_DATA_ERROR, "compressed data error"); return -1; } + if (ret == LZMA_PROG_ERROR) { + xz_error(state, LZMA_PROG_ERROR, "compression error"); + return -1; + } } while (strm->avail_out && ret != LZMA_STREAM_END); /* update available output and crc check value */ @@ -795,4 +801,4 @@ xmlFree(state); return ret ? ret : LZMA_OK; } -#endif /* HAVE_LZMA_H */ +#endif /* LIBXML_LZMA_ENABLED */ Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Wed Dec 2 11:36:52 2015 @@ -43,7 +43,7 @@ Website: http://www.bzip.org Title: LibXML -Used Version: 2.9.2 +Used Version: 2.9.3 Website: http://xmlsoft.org | ftp://xmlsoft.org/libxml2/ Title: ZLib

1 0

[akhaldi] 70233: [LIBMPG123] Update to v1.22.4.
by akhaldi＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: akhaldi Date: Wed Dec 2 11:13:12 2015 New Revision: 70233 URL: http://svn.reactos.org/svn/reactos?rev=70233&view=rev Log: [LIBMPG123] Update to v1.22.4. Modified: trunk/reactos/lib/3rdparty/libmpg123/id3.c trunk/reactos/lib/3rdparty/libmpg123/parse.c trunk/reactos/media/doc/3rd Party Files.txt Modified: trunk/reactos/lib/3rdparty/libmpg123/id3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libmpg123/id3… ============================================================================== --- trunk/reactos/lib/3rdparty/libmpg123/id3.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libmpg123/id3.c [iso-8859-1] Wed Dec 2 11:13:12 2015 @@ -1051,10 +1051,10 @@ for(i=0; i < n; i+=2) { unsigned long point = ((unsigned long) s[i+high]<<8) + s[i+low]; - if((point & 0xd800) == 0xd800) /* lead surrogate */ + if((point & 0xfc00) == 0xd800) /* lead surrogate */ { unsigned short second = (i+3 < l) ? (s[i+2+high]<<8) + s[i+2+low] : 0; - if((second & 0xdc00) == 0xdc00) /* good... */ + if((second & 0xfc00) == 0xdc00) /* good... */ { point = FULLPOINT(point,second); length += UTF8LEN(point); /* possibly 4 bytes */ @@ -1077,7 +1077,7 @@ for(i=0; i < n; i+=2) { unsigned long codepoint = ((unsigned long) s[i+high]<<8) + s[i+low]; - if((codepoint & 0xd800) == 0xd800) /* lead surrogate */ + if((codepoint & 0xfc00) == 0xd800) /* lead surrogate */ { unsigned short second = (s[i+2+high]<<8) + s[i+2+low]; codepoint = FULLPOINT(codepoint,second); Modified: trunk/reactos/lib/3rdparty/libmpg123/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libmpg123/par… ============================================================================== --- trunk/reactos/lib/3rdparty/libmpg123/parse.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libmpg123/parse.c [iso-8859-1] Wed Dec 2 11:13:12 2015 @@ -694,7 +694,7 @@ * <0: error codes, possibly from feeder buffer (NEED_MORE) * PARSE_BAD: cannot get the framesize for some reason and shall silentry try the next possible header (if this is no free format stream after all...) */ -static int guess_freeformat_framesize(mpg123_handle *fr) +static int guess_freeformat_framesize(mpg123_handle *fr, unsigned long oldhead) { long i; int ret; @@ -714,7 +714,7 @@ if((ret=fr->rd->head_shift(fr,&head))<=0) return ret; /* No head_check needed, the mask contains all relevant bits. */ - if((head & HDR_SAMEMASK) == (fr->oldhead & HDR_SAMEMASK)) + if((head & HDR_SAMEMASK) == (oldhead & HDR_SAMEMASK)) { fr->rd->back_bytes(fr,i+1); fr->framesize = i-3; @@ -791,7 +791,7 @@ if(VERBOSE3) error("You fooled me too often. Refusing to guess free format frame size _again_."); return PARSE_BAD; } - ret = guess_freeformat_framesize(fr); + ret = guess_freeformat_framesize(fr, newhead); if(ret == PARSE_GOOD) { fr->freeformat_framesize = fr->framesize - fr->padding; Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Wed Dec 2 11:13:12 2015 @@ -63,7 +63,7 @@ Website: http://www.mega-nerd.com/SRC/download.html Title: libmpg123 (used by winemp3.acm) -Used Version: 1.22.1 +Used Version: 1.22.4 Website: http://www.mpg123.de/ Title: STLport

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