Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[weiden] 19996: SVN maintainance: set eol-style to native

by weiden＠svn.reactos.com

SVN maintainance: set eol-style to native Modified: trunk/reactos/lib/cpl/mmsys/De.rc _____ Modified: trunk/reactos/lib/cpl/mmsys/De.rc --- trunk/reactos/lib/cpl/mmsys/De.rc 2005-12-09 01:28:30 UTC (rev 19995) +++ trunk/reactos/lib/cpl/mmsys/De.rc 2005-12-09 01:35:29 UTC (rev 19996) @@ -1,15 +1,15 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -IDD_HARDWARE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hardware" -FONT 8, "MS Shell Dlg" -BEGIN -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Sound und Audio Gerõte" - IDS_CPLDESCRIPTION "?ndert das Sound-Schema Ihres Computers, oder konfiguriert die Einstellungen f³r Ihre Lautsprecher und Aufnahmegerõte." -END - +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Sound und Audio Gerõte" + IDS_CPLDESCRIPTION "?ndert das Sound-Schema Ihres Computers, oder konfiguriert die Einstellungen f³r Ihre Lautsprecher und Aufnahmegerõte." +END + Property changes on: trunk/reactos/lib/cpl/mmsys/De.rc ___________________________________________________________________ Name: svn:eol-style + native

18 years, 9 months

[cwittich] 19995: added stubs for CertGetNameStringA/W needed by eMule

by cwittich＠svn.reactos.com

added stubs for CertGetNameStringA/W needed by eMule (now it crashes in current winsock2 code) Modified: trunk/reactos/lib/crypt32/crypt32.spec _____ Modified: trunk/reactos/lib/crypt32/crypt32.spec --- trunk/reactos/lib/crypt32/crypt32.spec 2005-12-09 01:17:44 UTC (rev 19994) +++ trunk/reactos/lib/crypt32/crypt32.spec 2005-12-09 01:28:30 UTC (rev 19995) @@ -52,6 +52,8 @@ @ stub CertGetEnhancedKeyUsage @ stub CertGetIntendedKeyUsage @ stub CertGetIssuerCertificateFromStore +@ stub CertGetNameStringA +@ stub CertGetNameStringW @ stub CertGetPublicKeyLength @ stub CertGetSubjectCertificateFromStore @ stub CertIsRDNAttrsInCertificateName

18 years, 9 months

[cwittich] 19994: added msconfig to bootcd

by cwittich＠svn.reactos.com

added msconfig to bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-12-09 01:13:31 UTC (rev 19993) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-12-09 01:17:44 UTC (rev 19994) @@ -187,6 +187,7 @@ subsys\system\explorer\notifyhook\notifyhook.dll 1 subsys\system\format\format.exe 1 subsys\system\ibrowser\ibrowser.exe 1 +subsys\system\msconfig\msconfig.exe 1 subsys\system\msiexec\msiexec.exe 1 subsys\system\notepad\notepad.exe 1 subsys\system\gettype\gettype.exe 1

18 years, 9 months

[cwittich] 19993: set eol-style:native

by cwittich＠svn.reactos.com

set eol-style:native Modified: trunk/reactos/lib/mpr/mpr_Hu.rc Property changes on: trunk/reactos/lib/mpr/mpr.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/mpr_Cs.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/mpr_De.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/mpr_En.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/mpr_Es.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/mpr_Fr.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/mpr/mpr_Hu.rc --- trunk/reactos/lib/mpr/mpr_Hu.rc 2005-12-09 01:08:47 UTC (rev 19992) +++ trunk/reactos/lib/mpr/mpr_Hu.rc 2005-12-09 01:13:31 UTC (rev 19993) @@ -1,47 +1,47 @@ -/* - * MPR dll resources - * - * Copyright (C) 2004 Juan Lang - * Copyright (C) 2005 Gergely Risko - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Teljes ßl¾zat" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Hßl¾zati BejelentkezÚs" -FONT 8, "MS Shell Dlg" -{ - LTEXT "?rd be a felhasznßl¾ nevet Ús jelsz¾t:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Felhasznßl¾", -1, 40, 66, 50, 10 - LTEXT "Jelsz¾", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "Jelsz¾ &mentÚse (Nem biztonsßgos)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "MÚgse", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} +/* + * MPR dll resources + * + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2005 Gergely Risko + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Teljes ßl¾zat" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Hßl¾zati BejelentkezÚs" +FONT 8, "MS Shell Dlg" +{ + LTEXT "?rd be a felhasznßl¾ nevet Ús jelsz¾t:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Felhasznßl¾", -1, 40, 66, 50, 10 + LTEXT "Jelsz¾", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Jelsz¾ &mentÚse (Nem biztonsßgos)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "MÚgse", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/mpr/mpr_Hu.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/mpr_It.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/mpr_Ja.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/mpr_Nl.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/mpr_Pt.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/mpr_Ru.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/mpr_Sv.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mpr/version.rc ___________________________________________________________________ Name: svn:eol-style + native

18 years, 9 months

[cwittich] 19992: added german translation

by cwittich＠svn.reactos.com

added german translation Added: trunk/reactos/lib/cpl/mmsys/De.rc Modified: trunk/reactos/lib/cpl/mmsys/mmsys.rc _____ Added: trunk/reactos/lib/cpl/mmsys/De.rc --- trunk/reactos/lib/cpl/mmsys/De.rc 2005-12-09 00:49:48 UTC (rev 19991) +++ trunk/reactos/lib/cpl/mmsys/De.rc 2005-12-09 01:08:47 UTC (rev 19992) @@ -0,0 +1,15 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Sound und Audio Gerõte" + IDS_CPLDESCRIPTION "?ndert das Sound-Schema Ihres Computers, oder konfiguriert die Einstellungen f³r Ihre Lautsprecher und Aufnahmegerõte." +END + _____ Modified: trunk/reactos/lib/cpl/mmsys/mmsys.rc --- trunk/reactos/lib/cpl/mmsys/mmsys.rc 2005-12-09 00:49:48 UTC (rev 19991) +++ trunk/reactos/lib/cpl/mmsys/mmsys.rc 2005-12-09 01:08:47 UTC (rev 19992) @@ -11,3 +11,4 @@ IDI_CPLICON ICON "resources/mmsys.ico" #include "En.rc" +#include "De.rc"

18 years, 9 months

[cwittich] 19991: changed formatting in german rc file

by cwittich＠svn.reactos.com

changed formatting in german rc file Modified: trunk/reactos/subsys/system/calc/De.rc _____ Modified: trunk/reactos/subsys/system/calc/De.rc --- trunk/reactos/subsys/system/calc/De.rc 2005-12-09 00:18:28 UTC (rev 19990) +++ trunk/reactos/subsys/system/calc/De.rc 2005-12-09 00:49:48 UTC (rev 19991) @@ -52,18 +52,18 @@ { POPUP "&Bearbeiten" { MENUITEM "&Kopieren Ctrl+C", IDM_COPY - MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE + MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE } POPUP "&Ansicht" { - MENUITEM "&Standard", IDM_MODE_STANDARD - MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC + MENUITEM "&Standard", IDM_MODE_STANDARD + MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "&Zifferngruppierung", IDM_DIGIT_GROUPING + MENUITEM "&Zifferngruppierung", IDM_DIGIT_GROUPING } POPUP "&?" { - MENUITEM "&Hilfethemen", IDM_HELP_TOPICS + MENUITEM "&Hilfethemen", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Info", IDM_ABOUT + MENUITEM "&Info", IDM_ABOUT } } @@ -71,27 +71,27 @@ { POPUP "&Bearbeiten" { MENUITEM "&Kopieren Ctrl+C", IDM_COPY - MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE + MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE } POPUP "&Anzeige" { - MENUITEM "&Standard", IDM_MODE_STANDARD - MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC + MENUITEM "&Standard", IDM_MODE_STANDARD + MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "&Hex\tF5", ID_CALC_NS_HEX - MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC - MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT + MENUITEM "&Hex\tF5", ID_CALC_NS_HEX + MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC + MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT MENUITEM "&Binõr\tF8", ID_CALC_NS_BIN MENUITEM SEPARATOR - MENUITEM "&Deg\tF2", ID_CALC_MS_DEGREES - MENUITEM "&Rad\tF3", ID_CALC_MS_RADIANS + MENUITEM "&Deg\tF2", ID_CALC_MS_DEGREES + MENUITEM "&Rad\tF3", ID_CALC_MS_RADIANS MENUITEM "&Grad\tF4", ID_CALC_MS_GRADS MENUITEM SEPARATOR - MENUITEM "Zifferngr&uppierung", IDM_DIGIT_GROUPING + MENUITEM "Zifferngr&uppierung", IDM_DIGIT_GROUPING } POPUP "&?" { - MENUITEM "&Hilfethemen", IDM_HELP_TOPICS + MENUITEM "&Hilfethemen", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Info", IDM_ABOUT + MENUITEM "&Info", IDM_ABOUT } } @@ -99,28 +99,28 @@ { POPUP "&Bearbeiten" { MENUITEM "&Kopieren Ctrl+C", IDM_COPY - MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE + MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE } POPUP "&Anzeige" { - MENUITEM "&Standard", IDM_MODE_STANDARD - MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC + MENUITEM "&Standard", IDM_MODE_STANDARD + MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "&Hex\tF5", ID_CALC_NS_HEX - MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC - MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT + MENUITEM "&Hex\tF5", ID_CALC_NS_HEX + MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC + MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT MENUITEM "&Binõr\tF8", ID_CALC_NS_BIN MENUITEM SEPARATOR - MENUITEM "&Qword\tF12", ID_CALC_WS_QWORD - MENUITEM "Dw&ord\tF2", ID_CALC_WS_DWORD - MENUITEM "Wo&rd\tF3", ID_CALC_WS_WORD - MENUITEM "&Byte\tF4", ID_CALC_WS_BYTE + MENUITEM "&Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dw&ord\tF2", ID_CALC_WS_DWORD + MENUITEM "Wo&rd\tF3", ID_CALC_WS_WORD + MENUITEM "&Byte\tF4", ID_CALC_WS_BYTE MENUITEM SEPARATOR - MENUITEM "&Zifferngruppierung", IDM_DIGIT_GROUPING + MENUITEM "&Zifferngruppierung", IDM_DIGIT_GROUPING } POPUP "&?" { - MENUITEM "&Hilfethemen", IDM_HELP_TOPICS + MENUITEM "&Hilfethemen", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Info", IDM_ABOUT + MENUITEM "&Info", IDM_ABOUT } } @@ -133,13 +133,13 @@ CAPTION "Info ³ber GNU winecalc" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END WHATS_THIS_MENU MENU DISCARDABLE { POPUP "" { - MENUITEM "Was ist das?", IDM_WHATS_THIS + MENUITEM "Was ist das?", IDM_WHATS_THIS } }

18 years, 9 months

[cwittich] 19989: set eol-style:native

by cwittich＠svn.reactos.com

set eol-style:native Modified: trunk/reactos/lib/libxml2/AUTHORS Modified: trunk/reactos/lib/libxml2/COPYING Modified: trunk/reactos/lib/libxml2/ChangeLog Modified: trunk/reactos/lib/libxml2/Copyright Modified: trunk/reactos/lib/libxml2/DOCBparser.c Modified: trunk/reactos/lib/libxml2/HTMLparser.c Modified: trunk/reactos/lib/libxml2/HTMLtree.c Modified: trunk/reactos/lib/libxml2/INSTALL Modified: trunk/reactos/lib/libxml2/Makefile.am Modified: trunk/reactos/lib/libxml2/Makefile.in Modified: trunk/reactos/lib/libxml2/Makefile.tests Modified: trunk/reactos/lib/libxml2/NEWS Modified: trunk/reactos/lib/libxml2/README Modified: trunk/reactos/lib/libxml2/README.tests Modified: trunk/reactos/lib/libxml2/SAX.c Modified: trunk/reactos/lib/libxml2/SAX2.c Modified: trunk/reactos/lib/libxml2/TODO Modified: trunk/reactos/lib/libxml2/TODO_SCHEMAS Modified: trunk/reactos/lib/libxml2/acconfig.h Modified: trunk/reactos/lib/libxml2/acinclude.m4 Modified: trunk/reactos/lib/libxml2/aclocal.m4 Modified: trunk/reactos/lib/libxml2/bakefile/Bakefiles.bkgen Modified: trunk/reactos/lib/libxml2/bakefile/Readme.txt Modified: trunk/reactos/lib/libxml2/bakefile/libxml2.bkl Modified: trunk/reactos/lib/libxml2/c14n.c Modified: trunk/reactos/lib/libxml2/catalog.c Modified: trunk/reactos/lib/libxml2/check-relaxng-test-suite.py Modified: trunk/reactos/lib/libxml2/check-relaxng-test-suite2.py Modified: trunk/reactos/lib/libxml2/check-xinclude-test-suite.py Modified: trunk/reactos/lib/libxml2/check-xml-test-suite.py Modified: trunk/reactos/lib/libxml2/check-xsddata-test-suite.py Modified: trunk/reactos/lib/libxml2/chvalid.c Modified: trunk/reactos/lib/libxml2/config.guess Modified: trunk/reactos/lib/libxml2/config.h.in Modified: trunk/reactos/lib/libxml2/config.sub Modified: trunk/reactos/lib/libxml2/configure Modified: trunk/reactos/lib/libxml2/configure.in Modified: trunk/reactos/lib/libxml2/dbgen.pl Modified: trunk/reactos/lib/libxml2/dbgenattr.pl Modified: trunk/reactos/lib/libxml2/debugXML.c Modified: trunk/reactos/lib/libxml2/depcomp Modified: trunk/reactos/lib/libxml2/dict.c Modified: trunk/reactos/lib/libxml2/doc/APIchunk0.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk1.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk10.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk11.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk12.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk13.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk14.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk15.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk16.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk17.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk18.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk19.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk2.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk20.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk21.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk22.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk23.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk24.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk25.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk26.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk27.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk28.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk29.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk3.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk4.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk5.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk6.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk7.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk8.html Modified: trunk/reactos/lib/libxml2/doc/APIchunk9.html Modified: trunk/reactos/lib/libxml2/doc/APIconstructors.html Modified: trunk/reactos/lib/libxml2/doc/APIfiles.html Modified: trunk/reactos/lib/libxml2/doc/APIfunctions.html Modified: trunk/reactos/lib/libxml2/doc/APIsymbols.html Modified: trunk/reactos/lib/libxml2/doc/ChangeLog.xsl Modified: trunk/reactos/lib/libxml2/doc/DOM.html Modified: trunk/reactos/lib/libxml2/doc/FAQ.html Modified: trunk/reactos/lib/libxml2/doc/Makefile.am Modified: trunk/reactos/lib/libxml2/doc/Makefile.in Modified: trunk/reactos/lib/libxml2/doc/README.docs Modified: trunk/reactos/lib/libxml2/doc/XMLinfo.html Modified: trunk/reactos/lib/libxml2/doc/XSLT.html Modified: trunk/reactos/lib/libxml2/doc/api.xsl Modified: trunk/reactos/lib/libxml2/doc/apibuild.py Modified: trunk/reactos/lib/libxml2/doc/architecture.html Modified: trunk/reactos/lib/libxml2/doc/bugs.html Modified: trunk/reactos/lib/libxml2/doc/catalog.html Modified: trunk/reactos/lib/libxml2/doc/contribs.html Modified: trunk/reactos/lib/libxml2/doc/docs.html Modified: trunk/reactos/lib/libxml2/doc/downloads.html Modified: trunk/reactos/lib/libxml2/doc/elfgcchack.xsl Modified: trunk/reactos/lib/libxml2/doc/encoding.html Modified: trunk/reactos/lib/libxml2/doc/entities.html Modified: trunk/reactos/lib/libxml2/doc/example.html Modified: trunk/reactos/lib/libxml2/doc/examples/Makefile.am Modified: trunk/reactos/lib/libxml2/doc/examples/Makefile.in Modified: trunk/reactos/lib/libxml2/doc/examples/examples.xml Modified: trunk/reactos/lib/libxml2/doc/examples/examples.xsl [truncated at 100 lines; 2903 more skipped] _____ Modified: trunk/reactos/lib/libxml2/AUTHORS --- trunk/reactos/lib/libxml2/AUTHORS 2005-12-08 23:56:12 UTC (rev 19988) +++ trunk/reactos/lib/libxml2/AUTHORS 2005-12-08 23:55:40 UTC (rev 19989) @@ -1,5 +1,5 @@ -Daniel Veillard <daniel(a)veillard.com> -Bjorn Reese <breese(a)users.sourceforge.net> -William Brack <wbrack(a)mmm.com.hk> -Igor Zlatkovic <igor(a)zlatkovic.com> for the Windows port -Aleksey Sanin <aleksey(a)aleksey.com> +Daniel Veillard <daniel(a)veillard.com> +Bjorn Reese <breese(a)users.sourceforge.net> +William Brack <wbrack(a)mmm.com.hk> +Igor Zlatkovic <igor(a)zlatkovic.com> for the Windows port +Aleksey Sanin <aleksey(a)aleksey.com> Property changes on: trunk/reactos/lib/libxml2/AUTHORS ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/libxml2/COPYING --- trunk/reactos/lib/libxml2/COPYING 2005-12-08 23:56:12 UTC (rev 19988) +++ trunk/reactos/lib/libxml2/COPYING 2005-12-08 23:55:40 UTC (rev 19989) @@ -1,27 +1,27 @@ -Except where otherwise noted in the source code (e.g. the files hash.c, -list.c and the trio files, which are covered by a similar licence but -with different Copyright notices) all the files are: - - Copyright (C) 1998-2003 Daniel Veillard. All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of Daniel Veillard shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from him. - +Except where otherwise noted in the source code (e.g. the files hash.c, +list.c and the trio files, which are covered by a similar licence but +with different Copyright notices) all the files are: + + Copyright (C) 1998-2003 Daniel Veillard. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is fur- +nished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Daniel Veillard shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from him. + Property changes on: trunk/reactos/lib/libxml2/COPYING ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/libxml2/ChangeLog --- trunk/reactos/lib/libxml2/ChangeLog 2005-12-08 23:56:12 UTC (rev 19988) +++ trunk/reactos/lib/libxml2/ChangeLog 2005-12-08 23:55:40 UTC (rev 19989) @@ -1,15945 +1,15945 @@ -Mon Jul 11 00:28:10 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am NEWS configure.in doc/*: preparing release 2.6.20 - * xmllint.c: removed a compilation problem - -Sun Jul 10 23:33:41 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xstc/Makefile.am README README.tests Makefile.tests Makefile.am: - preparing to make testsuite releases along with code source releases - * gentest.py testapi.c: fixed a couple of problem introduced by - the new Schemas support for Readers - * xpath.c: fixed the XPath attribute:: bug #309580, #309864 in a crude - but simple way. - * xmlschemas.c include/libxml/tree.h: fixed a couple of problems - raised by the doc builder. - * doc/*: made rebuild - -Sun Jul 10 21:51:16 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xmlschemas.c: fixed a bug introduced on last commit - -Sun Jul 10 21:00:54 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * doc/xmllint.1 doc/xmllint.html doc/xmllint.xml: fixed a typo - pointed by Jeroen Ruigrok - * include/libxml/xmlreader.h include/libxml/xmlschemas.h: increased - the APIs for xmlReader schemas validation support - * xmllint.c xmlreader.c xmlschemas.c: xmlReader schemas validation - implementation and testing as xmllint --stream --schema ... - -Sun Jul 10 16:11:26 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * include/libxml/xmlwin32version.h.in: try to avoid conflicts. - -Sat Jul 9 19:29:10 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * parser.c: fix for #309761 from Dylan Shell - * xmlschemas.c include/libxml/xmlschemas.h: added xmlSchemaSAXPlug - and xmlSchemaSAXUnplug generic APIs for SAX Schemas validation. - * xmllint.c: couple of fixes plus added descriptions for --sax and - --sax1 - -Fri Jul 8 23:35:00 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Added c-props-correct constraint to check - for equal cardinality of keyref/key. - * include/libxml/xmlerror.h: Added an error code. - -Fri Jul 8 21:56:04 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * pattern.c: Fixed evaluation of attributes. Actually only - attribute at the first level were evaluated (e.g. "@attr"); - expression like "foo/@attr" always failed. - -Fri Jul 8 20:04:29 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: tiny fix in xmlSchemaValidateStream() if a - user-provided SAX handler is given. - -Fri Jul 8 19:25:26 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * parser.c: fix some potential leaks in error cases. - * xmllint.c: added --sax, to allow testing of --schemas --sax and - various other combinations. - * xmlschemas.c: fix a couple of tiny problems in - xmlSchemaValidateStream() - -Fri Jul 8 18:34:22 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Changed xmlSchemaValidateFile() to use - xmlSchemaValidateStream() internally. - -Fri Jul 8 17:02:14 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * test/relaxng/docbook_0.xml: added the missing entity to the - document internal subset to avoid errors if the DocBook catalogs - are not there - * xmlschemas.c: first cut at implementing xmlSchemaValidateStream() - untested yet - -Wed Jul 6 15:45:48 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * parser.c: fixed problem with free on dupl attribute in - dtd (bug309637). - * test/errors/attr3.xml, result/errors/attr3.*: added - regression test for this - -Wed Jul 6 13:11:35 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * win32/Makefile.msvc: try again to fix file format for Windows - -Wed Jul 6 12:20:13 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * win32/Makefile.msvc: removed spurious ^M - * runtest.c: added check for option O_BINARY - * test/schemas/bug309338*, result/schemas/bug309338*: changed - sticky tag to 'binary' - -Wed Jul 6 10:38:02 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * debugXML.c: excluded content string check for XML_ELEMENT_DECL - in xmlCtxtGenericNodeCheck - * runtest.c: changed "open" calls to include O_BINARY for Windows - -Wed Jul 6 17:14:03 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * parser.c: fixing bug #166777 (and #169838), it was an heuristic - in areBlanks which failed. - * result/winblanks.xml* result/noent/winblanks.xml test/winblanks.xml: - added the input file to the regression tests - -Wed Jul 6 13:40:22 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemastypes.c: Fixed bug #309338, reported by Kupriyanov - Anotolij. - * test/schemas/bug309338* result/schemas/bug309338*: - Added a regression test for the above bug. - -Tue Jul 5 16:03:05 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am: first steps toward a testsuite dist - * SAX2.c include/libxml/xmlerror.h: fixed bug #307870 - -Tue Jul 5 12:38:36 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * runsuite.c runtest.c: Tiny portability adjustment for win. - * win32/Makefile.*: Added runtest.exe and runsuite.exe to - be created. - -Mon Jul 4 17:44:26 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runsuite.c: first stb at unimplemnted detection - * runtest.c: fixing Windows code - -Mon Jul 4 17:19:31 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runsuite.c: fix on schemas error - * runtest.c: portability glob() on Windows - -Mon Jul 4 16:23:54 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runsuite.c runtest.c: cleanups, logfile and portability - * xmllint.c: fixed a memory leak - -Mon Jul 4 13:11:12 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * parser.c: fixed a bug failing to detect UTF-8 violations in - CData in push mode. - * result/errors/cdata.xml* test/errors/cdata.xml: added the test - to the regressions - -Mon Jul 4 11:26:57 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * debugXML.c: added enhancement for #309057 in xmllint shell - -Mon Jul 4 00:58:44 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * HTMLparser.c: applied patch from James Bursa fixing an html parsing - bug in push mode - * result/HTML/repeat.html* test/HTML/repeat.html: added the test to the - regression suite - -Sun Jul 3 23:42:31 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * testapi.c tree.c: fixing a leak detected by testapi in - xmlDOMWrapAdoptNode, and fixing another side effect in testapi - seems to pass tests fine now. - * include/libxml/parser.h parser.c: xmlStopParser() is no more limited - to push mode - * error.c: remove a warning - * runtest.c xmllint.c: avoid compilation errors if only some parts - of the library are compiled in. - -Mon Jul 4 00:39:35 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * gentest.py testapi.c: fix a problem with previous patch to - testapi.c - -Sun Jul 3 22:59:28 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runsuite.c runtest.c tree.c: fixing compilations when - disabling parts of the library at configure time. - -Sun Jul 3 18:17:58 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * parserInternals.c: fix bug raised by zamez on IRC - * testapi.c: regenerated, seems to pop-up leaks in new tree functions - * tree.c: added comments missing. - * doc/*: regenerated - -Sun Jul 3 18:06:55 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * testapi.c runsuite.c runtest.c: fixing #307823 and a couple of - assorted bugs - * python/generator.py python/libxml2-python-api.xml: fixed - conditionals in generator too - * doc/apibuild.py doc/libxml2-api.xml doc/* elfgcchack.h: some - cleanups too and rebuilt - -Sun Jul 3 16:42:00 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xmlIO.c: fixed bug #307503 misplaced #ifdef - -Sun Jul 3 16:34:47 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runsuite.c: expanded test - * xmlregexp.c: found and fixed the leak exposed by Microsoft regtests - -Sat Jul 2 23:38:24 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runsuite.c: a bit of progresses on xstc - -Sat Jul 2 09:30:13 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runsuite.c: completed the simple checks for Relax-NG suites - back to the same 11 errors as in the Python runs. - -Thu Jun 30 15:01:52 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runtest.c: complete, checking on other platforms is needed - * README: updated - * debugXML.c: fix a bug raised by bill on IRC - * relaxng.c: fix a leak in weird circumstances - * runsuite.c Makefile.am: standalone test tool agaisnt - the regression suites, work in progress - -Tue Jun 28 08:30:26 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runtest.c: adding URI tests - -Mon Jun 27 23:55:56 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runtest.c: adding xml:id - -Mon Jun 27 23:29:36 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runtest.c: finishing XPath, adding XPointer - -Mon Jun 27 17:39:27 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runtest.c: adding more coverage, XInclude and starting XPath - -Mon Jun 27 17:02:14 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * tree.c include/libxml/tree.h: Added allocation/deallocation - functions for the DOM-wrapper context. - -Mon Jun 27 15:41:30 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * tree.c: Commented the new functions to be experimental. - -Mon Jun 27 14:41:14 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * error.c valid.c: working some weird error reporting problem for - DTD validation. - * runtest.c: augmented with DTD validation tests - * result/VC/OneID*: slight change in validation output. - -Mon Jun 27 13:44:41 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runtest.c: added most HTML tests - -Mon Jun 27 14:06:10 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * test/namespaces/reconcile/tests.xml - test/namespaces/reconcile/tests-to-c.xsl: Added initial tests - for some new DOM-wrapper helping functions. - -Mon Jun 27 14:01:06 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xstc/xstc-to-python.xsl: Cleanup. - * xstc/sun-test-def.xml xstc/nist-test-def.xml xstc/ms-test-def.xml: - Removed, those are not needed anymore due to the new test suite. - -Mon Jun 27 11:39:50 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * result/*.sax2 MAkefile.am: added SAXv2 regression tests apparently - missing. - * runtest.c: added SAX1/SAX2 checks. - -Mon Jun 27 12:24:54 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * tree.c include/libxml/tree.h: Added - xmlDOMWrapReconcileNamespaces(), xmlDOMWrapAdoptNode() and - xmlDOMWrapRemoveNode() to the API. These are functions intended - to be used with DOM-wrappers. - -Mon Jun 27 10:14:57 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runtest.c: continue to increase the tests - -Mon Jun 27 09:21:49 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runtest.c: continue to increase the tests - -Mon Jun 27 01:01:32 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * runtest.c: continue to increase the tests - -Sun Jun 26 20:08:24 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * include/libxml/valid.h valid.c: avoid name glob in agruments as - it matches the glob() routine. - * runtest.c Makefile.am: first steps toward a C regression test - framework. - -Sat Jun 25 01:37:22 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * configure.in: fixed a problem with the detection of - ss_family for ipV6, as reported on the mailing list by - Doug Orleans. - -Tue Jun 21 10:44:34 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * test/schemas/empty-value* result/schemas/empty-value*: - Added regression tests (from Dhyanesh). - -Tue Jun 21 10:35:43 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Fixed NULL values to be validated as empty - string values (reported by Dhyanesh to the mailing list). - Adjusted text concatenation of mixed content. - -Mon Jun 20 18:11:32 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * tree.c valid.c: applied patch from Rob Richards for removal - of ID (and xml:id) - * xmlreader.c: applied patch from James Wert implementing - xmlTextReaderReadInnerXml and xmlTextReaderReadOuterXml - -Thu Jun 16 14:38:22 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Fixed SAX2 validation: grow of internal - namespace list, appending of element character content. - * xstc/xstc.py: Added "--sax" option for SAX2 validation. - -Wed Jun 15 15:34:52 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemastypes.c: Added missing function descriptions. - -Wed Jun 15 15:26:14 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xmllint.c: if sax1 is used and input is a file use the old - API xmlParseFile() - * xmlschemas.c: cleanups - * doc/* testapi.c elfgcchack.h: rebuilt to add python bindings - for the new functions in Schemas. - -Wed Jun 15 14:50:48 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c include/libxml/xmlschemas.h: Added - xmlSchemaValidateFile() to the public API. This will use - SAX2-driven validation. - -Wed Jun 15 11:11:38 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * result/schemas/bug306806_1_0 result/schemas/bug306806_1_0.err: - Added schema test results (Tom Browder, bug #306806). - -Wed Jun 15 11:08:34 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * test/schemas/bug306806_1.xsd test/schemas/bug306806_0.xml: - Added schema tests submitted by Tom Browder (bug #306806). - -Tue Jun 14 15:03:22 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * pattern.c: adjusted last change to xmlCompilePathPattern, - fixed one compilation warning - -Tue Jun 14 21:19:16 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * pattern.c: Some changes/fixes to the streaming evaluation. - * xmlschemas.c: A bit of support for parsing the schema for - schema. Fixed attribute derivation when the use is - "prohibited" and was "optional". Fixed an attribute construction - bug, a left-over from the time, where <complexContent>, - <extension>, etc. where created as structs. - -Tue Jun 14 12:35:12 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxml-2.0.pc.in: removed a redundant include path - -Mon Jun 13 14:58:33 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xstc/Makefile.am: Some more adjustments. - -Mon Jun 13 14:35:59 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xstc/Makefile.am: Changed test extraction process, since some - boxes don't know about "tar --strip-path". - -Mon Jun 13 13:39:43 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * relaxng.c: fixed a bug exposed by Rob Richards in the mailing-list - * result//compare0* test//compare0*: added the regression test in - the suite as this went unnoticed ! - -Wed Jun 9 11:07:42 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * pattern.c, xpath.c, include/libxml/pattern.h: Further - enhancement for XPath streaming, consolidated with - schemas usage of pattern.c. Added a new enum - xmlPatternFlags. - * doc/*, testapi.c, elfgcchack.h: updated to reflect new - enum. - * test/XPath/tests/mixedpat, test/XPath/docs/mixed, - result/XPath/mixedpat: added regression test for problems - reported in bug306348 - -Thu Jun 9 16:51:31 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemastypes.c: Changed non-prefixed QNames to be bound to a - default namespace if existent. - -Thu Jun 9 15:11:38 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemastypes.c: Fixed a bug which I invented: hexBinary's string - values were not duplicated corrently when creating a computed value - in xmlSchemaValAtomicType. - -Thu Jun 9 13:20:57 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c result/schemas/include1_0_0.err: - Fixed an attribute fixed/default value constraint error. - -Thu Jun 9 12:51:23 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * result/schemas/*: Adapted regression test results. - -Thu Jun 9 12:22:45 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c xmlschemastypes.c include/libxml/schemasInternals.h - include/libxml/xmlschemastypes.h: Changed the validation process - to be able to work in streaming mode. Some datatype fixes, - especially for list and union types. Due to the changes the - error report output has changed in most cases. Initial migration to - functions usable by both, the parser and the validator. This should - ease a yet-to-come XS construction API in the long term as well. - -Thu Jun 9 10:16:11 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * parser.c: applied patch from Malcolm Rowe to avoid namespace - troubles on rollback parsing of elements start #304761 - * test/nsclean.xml result/noent/nsclean.xml result/nsclean.xml*: - added it to the regression tests. - -Thu Jun 9 00:33:50 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * parser.c include/libxml/xmlerror.h: applied patch from Rob Richards - for xml:space and xml:lang handling with SAX2 api. - -Wed Jun 8 19:41:38 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * globals.c: applied patch from Morten Welinder, closing bug #306901 - on compiling subsets of the library - -Wed Jun 8 19:11:42 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xstc/Makefile.am xstc.py xstc-to-python.xsl: Adapted the - XS tests to use the new release of tests and test-definitions. - -2005-06-07 Aleksey Sanin <aleksey(a)aleksey.com> - - * c14n.c: fix rendering of attributes when parent node - is not in the node set - -2005-06-06 Aleksey Sanin <aleksey(a)aleksey.com> - - * c14n.c: fixed xml attributes processing bug in exc c14n - * xmllint.c: added --exc-c14n command line option - -Mon Jun 6 06:43:33 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * xpath.c, pattern.c: Enhanced xmlXPathRunStreamEval, fixed - handling of depth/level for cases like union operator - (bug #306348 reported by Bob Stayton). Also enhanced - several comments throughout pattern.c. - * doc/apibuild.py: fixed problem in handling of - 'signed' declaration. Rebuilt the docs. - -Tue May 31 20:35:27 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * xinclude.c: Enhanced handling of xml:base for included - elements, fixing bugs 169209 and 302353. - -Wed May 25 18:59:53 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Fixed facet errors to be channelled back for - union type members; facet-validation will stop now on the - first error. Reported by GUY Fabrice to the mailing-list. - * xmlschemastypes.c: Changed to ignore lengh-related facet - validation for QNames and NOTATIONs as proposed by the - schema people. - * test/schemas/union2* result/schemas/union2*: Added - regression tests for union types (by GUY Fabrice). - -Fri May 20 20:48:08 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xmlsave.c: applied patch from Mark Vakoc fixing saving of - CDATA with NULL content. - -Thu May 12 15:14:26 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemastypes.c: Changed the VALID_TZO macro to restrict - the timezone to -840 to 840. - -Thu May 12 15:05:11 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemastypes.c: Applied patch from Steve Nairn (bug #303670) - for "signed int" of the date-time timezone field. Silenced - a warning. - -Wed May 11 20:04:09 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * tree.c: applied patch for replaceNode from Brent Hendricks - -Tue May 10 17:27:52 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * tree.c: fixed bug #303682 of a leak reported by Malcolm Rowe - -Tue May 10 11:50:16 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * testapi.c: applied patch from Steve Nairn tof fix the compilation - problem exposed in bug #303640 - -Tue May 10 11:11:26 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * test/schemas/bug303566_1* result/schemas/bug303566_1_1*: - Added regression a test provided by Heiko Oberdiek (bug #303566). - -Mon May 9 17:56:58 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * pattern.c: Changed the XPath "." to resolve only on the first - level for XML Schema IDCs (bug #303566 reported by Heiko Oberdiek). - This should not affect pattern-like resolution on every level. - -Sun May 8 13:35:39 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xmlmemory.c: fixed #169630 segfault in xmlMemDisplay - -Fri May 6 13:40:03 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * nanoftp.c: fixing bug #303068 increasing the nanoftp buffer. - * doc/apibuild.py: fixed __attribute() parsing problem - * doc/* testapi.c: regenerated the descriptions and docs. - -Wed May 4 11:16:00 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am configure.in threads.c: on linux/gcc use weak definitions - to avoid linking with pthread library on non-threaded environments. - * xpath.c: applied patch from Mark Vakoc w.r.t. a buggy namespace - list allocation. - -Fri Apr 29 11:27:37 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * parser.c: Fixed a test for duplicate attributes: Non-prefixed - attributes were treated as being bound to the default namespace. - -Tue Apr 19 17:51:32 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemastypes.c: Fixed date-time related validation - (reported by David Crossley, bug #300576). - -Tue Apr 19 16:55:40 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c xmlregexp.c: Removed 5 unnecessary - dereferences (reported by Andriy, bug #301074). - -Tue Apr 19 22:33:18 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * xpath.c: Added some code to avoid integer overflow for - ceil, floor and round functions (bug 301162) - -Tue Apr 19 13:21:54 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Removed workaround for bug #172215, since it - does more harm in some scenarios. Added some of the - "Particle Restriction OK" constraints - not yet enabled. - -Mon Apr 18 13:02:55 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * result/schemas/changelog093*: Added test results. - -Mon Apr 18 12:42:14 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Added output of canonical values in - identity-constraint error messages. - * xmlschemastypes.c include/libxml/xmlschemastypes.h: - Added xmlSchemaGetCanonValueWhtsp() to the API. - Further enhancement of the canonical value - conversion. - * test/schemas/changelog093_0.*: Added test with an XSD - submitted by Randy J. Ray. - -Fri Apr 15 09:33:21 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * valid.c: Applied Daniel's fix for memory leak in dtd - prefix (bug 300550). - * xpath.c: minor change to comment only - -Thu Apr 14 20:52:41 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xmlmemory.c: added the call to the breakpoint routine - when a monitored block is reallocated or freed - -Wed Apr 13 05:55:51 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * nanohttp.c: applied patch from Aron Stansvik for bug #172525 - about HTTP query string parameter being lost - -Tue Apr 12 04:03:32 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * python/libxml.c python/libxml.py: applied patch from Brent Hendricks - adding namespace removal at the python level #300209 - * python/tests/Makefile.am python/tests/nsdel.py: added the regression - test - -Sun Apr 10 09:03:22 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * xpath.c: fixed several places where memory cleanup was not - properly done after an error was detected (problem was - reported on the mailing list by Pawel Palucha) - -Fri Apr 8 21:58:04 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Added substitution group constraints; changed - the build of the pre-computed substitution groups. Channeled - errors during xsi assembling of schemas to the validation - context. Fixed a big memory leak, which occured when using - IDCs: the precomputed value of attributes was not freed if - the attribute did not resolve to an IDC field (discovered - with the help of Randy J. Ray's schema, posted to the - xmlschema-dev maling list). - -Fri Apr 8 13:22:01 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Added "Particle correct 2" to parsing of model groups. - Added handling substitution groups inside <choice> and <sequence>; - for <all> this is not supported yet. Changed circular checks for - model groups definitions. "memberTypes" are processed at different - levels now: component resolution first, construction later; this - goes hand in hand with a global change to handle component - resolution in a distinct phase. Fixed invalid default values for - elements to mark the schema as invalid; this just resulted in an - error report previously, but the schema was handled as valid. - Separated the assignment of the model groups to referencing - model group definition references (i.e. particles); this was - needed to perform the circularity check for model group definitions. - Added "Element Declaration Properties Correct (e-props-correct)" - constraints. Separated component resolution for simple/complex - types. - * include/libxml/schemasInternals.h: Added a flag for substitution - group heads. - -Wed Apr 6 23:14:03 CEST 2005 Igor Zlatkovic <igor(a)zlatkovic.com> - - * win32/Makefile.*: make install cleanup - -Wed Apr 6 22:42:23 CEST 2005 Igor Zlatkovic <igor(a)zlatkovic.com> - - * win32/Makefile.mingw: fixed mingw compilation - * testModule.c: removed mingw warnings - -Wed Apr 6 21:59:11 CEST 2005 Igor Zlatkovic <igor(a)zlatkovic.com> - - * .cvsignore: added Eclipse project files to ignore list - -Wed Apr 6 16:08:10 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xpath.c: fixed the bug in lang() as raised by Elliotte Rusty Harold - * result/XPath/tests/langsimple test/XPath/tests/langsimple - test/XPath/docs/lang: added a regression test - -Tue Apr 5 23:48:35 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * nanoftp.c: applied fix from Rob Richards to compile on Windows. - -Tue Apr 5 17:02:58 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Added "Type Derivation OK (Complex)" constraints - and anchored them in the "Element Locally Valid (Element)" - constraints. This restricts the type substitution via "xsi:type". - -Tue Apr 5 13:10:06 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xmlschemas.c: patch from Matthew Burgess to improve some schemas - facets validation messages. - -Sat Apr 2 12:48:41 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * doc/* configure.in NEWS: preparing release 2.6.19, updated docs and - rebuilding. - -Sat Apr 2 13:27:32 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xstc/Makefile.am: integrated fixup-tests.py - -Fri Apr 1 19:14:18 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xmlschemastypes.c: fixed a lack of comment and missing test for - a pointer in the API. - -Fri Apr 1 17:54:22 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xstc/fixup-tests.py: A tiny script to fixup some of the schema - files used for the tests. - -Fri Apr 1 17:33:50 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c include/libxml/schemasInternals.h - result/schemas/src-element2-*.err result/schemas/element-*.err: - Committing again, since the CVS server aborted. - -Fri Apr 1 15:29:27 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemastypes.c: Corrected 'length' facet validation for - QNames and notations. Corrected xmlSchemaGetCanonValue: some - data types did not return a value if already in normalized - form. - * xmlschemas.c include/libxml/schemasInternals.h: - Eliminated creation of structs for <restriction>, <extension>, - <simpleContent>, <complexContent>, <list> and <union>: the - information is now set directly on the corresponding simple/ - complex type. Added some more complex type constraints. - Added facet derivation constraints. Introduced "particle" - components, which seem to be really needed if applying - constraints. Corrected/change some of the parsing functions. - This is all a bit scary, since a significant change to the code. - * result/schemas/src-element2-*.err result/schemas/element-*.err: - Adapted regression test results. - -Fri Apr 1 16:07:59 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * doc/apibuild.py doc/elfgcchack.xsl: revamped the elfgcchack.h - format to cope with gcc4 change of aliasing allowed scopes, had - to add extra informations to doc/libxml2-api.xml to separate - the header from the c module source. - * *.c: updated all c library files to add a #define bottom_xxx - and reimport elfgcchack.h thereafter, and a bit of cleanups. - * doc//* testapi.c: regenerated when rebuilding the API - -Thu Mar 31 17:20:32 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xmlsave.c: fixed bug reported by Petr Pajas, in the absence of - encoding UTF-8 should really be assumed. This may break if - the HTTP headers indicates for example ISO-8859-1 since this - then becomes a well formedness error. - -Thu Mar 31 16:57:18 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * SAX.c: fixed #172260 redundant assignment. - * parser.c include/libxml/parser.h: fixed xmlSAXParseDoc() and - xmlParseDoc() signatures #172257. - -Thu Mar 31 16:11:10 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * parser.c: fix potential crash if ctxt->sax->ignorableWhitespace - is NULL as reported by bug #172255 - -Thu Mar 31 15:36:52 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * relaxng.c: fixed a problem in Relax-NG validation #159968 - * test/relaxng/list.* result/relaxng/list_*: added the test - to the regression suite - -Thu Mar 31 13:06:02 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * python/libxml.c: fixed bug #168504 - -Thu Mar 31 12:22:54 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * config.h.in configure.in nanoftp.c nanohttp.c xmllint.c - macos/src/config-mac.h: use XML_SOCKLEN_T instead of SOCKLEN_T - since apparently IBM can't avoid breaking common defines #166922 - -Thu Mar 31 10:41:45 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * encoding.c: fix unitinialized variable in not frequently used - code bug #172182 - -Thu Mar 31 00:45:18 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * python/generator.py python/libxml.py: another patch from Brent - Hendricks to add new handlers with the various validity contexts - * python/tests/Makefile.am python/tests/validDTD.py - python/tests/validRNG.py python/tests/validSchemas.py: also - added the regression tests he provided - -Wed Mar 30 09:39:27 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * python/generator.py python/libxml.c: applied patch from Brent - Hendricks to avoid leak in python bindings when using schemas - error handlers. - -Tue Mar 29 22:29:28 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * HTMLtree.c: fixing bug 168196, <a name=""> must be URI escaped too - -Sun Mar 27 13:24:24 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * tree.c: cleanup of the Prop related functions and xmlNewNodeEatName - by Rob Richards - -Thu Mar 24 19:01:22 PST 2005 William Brack <wbrack(a)mmm.com.hk> - - * gentest.py, testapi.c: fixed problem with 'minimal library' - compilation (LIBXML_PATTERN_ENABLED not properly checked) reported - by Greg Morgan - -Thu Mar 24 12:01:30 CET 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Fixed call to a facet error report: the type of - the error was wrong, resulting in a segfault (bug #171220, reported - by GUY Fabrice). - -Mon Mar 21 22:58:37 CET 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Removed a stupid bug in xmlSchemaValidateAttributes, - failing to build a linked list correctly (bug #169898, reported - by bing song, hmm...). - -Mon Mar 21 21:09:07 CET 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Fixed a segfault, which occured during bubbling - of IDC nodes (bug #170779 and #170778, reported by GUY Fabrice): - a variable was missed to be reset in a loop. Deactivated bubbling, - if not referenced by a keyref. - -Sun Mar 20 11:13:02 PST 2005 Aleksey Sanin <aleksey(a)aleksey.com> - - * c14n.c include/libxml/xmlerror.h: special case "DAV:" namespace - in c14n relative namespaces check and add structured error messages - to c14n code - -Thu Mar 17 12:55:23 CET 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c: Removed inheritance of "mixed" content type for - short-hand restrictions of "anyType" (reported by Guy Fabrice - to the mailing list). Added the namespace conversion (chameleon - includes) for the base type reference of <restriction> and - <extension>. - * test/schemas/bug152470_1.xsd: Adapted due to the above change - of "mixed" inheritance. - -Thu Mar 17 11:03:59 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * xmlschemas.c: fixed a = -> == error pointed by GUY Fabrice - -Wed Mar 16 22:53:53 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * xmlschemas.c: more debug messages from Matthew Burgess - * xmlschemastypes.c: xmlSchemaValidateLengthFacet API missing check. - -Wed Mar 16 17:37:04 CET 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemastypes.c: Aaaannnd putting back the previous changes done - by Daniel, which I overwrote with the previous commit. - -Wed Mar 16 17:20:25 CET 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemas.c xmlschemastypes.c include/libxml/xmlschemastypes.h: - Hopefully finished validation against facets to use the normalized - value of both, the facets and instance values. Added - xmlSchemaValidateLengthFacetWhtsp(), xmlSchemaValidateFacetWhtsp() - and xmlSchemaGetValType() to the schema API. - -Wed Mar 16 13:55:31 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxml.spec.in: do not package .la files - * xmllint.c: applied patch from Gerry Murphy for xmllint return code - * xmlschemastypes.c: fixed a couple of missing tests of parameters - at public API entry points. - -Tue Mar 15 23:31:14 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * xmlschemastypes.c: a couple of more changes to various - decimal-handling routines. Fixes python some problems - turned up by the python tests. - * Makefile.am: change SchemasPythonTests message to warn - that there are 10 'expected' errors (rather than 6) since - we now reject a '+' sign on an unsigned. - -Tue Mar 15 15:43:27 CET 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * xmlschemastypes.c xmlschemastypes.h: In preparation to use - normalized values of facets during validation: changed the - arguments of some string comparison functions; added a static - xmlSchemaValidateFacetInternal() with more arguments to be - more flexible. Prepared XML_SCHEMA_FACET_ENUMERATION validation - to use the comparison functions. Fixed some assignments in - xmlSchemaValAtomicType(): total digit count, lo, mi, hi. - -Sun Mar 13 19:32:03 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * NEWS configure.in testapi.c doc/*: preparing release of 2.6.18 - updated docs and rebuilt - * libxml.spec.in: reactivated gcc profiling for gcc >= 4.0.0 - -Sat Mar 12 19:50:22 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * encoding.c: removed a static buffer in xmlByteConsumed(), - as pointed by Ben Maurer, fixes #170086 - * xmlschemas.c: remove a potentially uninitialized pointer warning - -Fri Mar 11 23:53:13 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * xmlschemastypes.c: enhanced the parsing of XML_SCHEMAS_DECIMAL - and much of the routine xmlSchemaCompareDecimals. The - changes were necessary to fix a problem reported on the - mailing list by John Hockaday. - -Fri Mar 11 13:22:52 CET 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - [truncated at 1000 lines; 1567181 more skipped]

18 years, 9 months

[hpoussin] 19990: Use correct format for arguments in debug messages

by hpoussin＠svn.reactos.com

Use correct format for arguments in debug messages Modified: trunk/reactos/lib/ntdll/csr/connect.c Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c _____ Modified: trunk/reactos/lib/ntdll/csr/connect.c --- trunk/reactos/lib/ntdll/csr/connect.c 2005-12-08 23:55:40 UTC (rev 19989) +++ trunk/reactos/lib/ntdll/csr/connect.c 2005-12-09 00:18:28 UTC (rev 19990) @@ -67,7 +67,7 @@ //ApiMessage->Opcode = ApiNumber; <- Activate with new CSR ApiMessage->CsrCaptureData = NULL; - DPRINT("API: %x, u1.s1.DataLength: %x, u1.s1.TotalLength: %x\n", + DPRINT("API: %lx, u1.s1.DataLength: %x, u1.s1.TotalLength: %x\n", ApiNumber, ApiMessage->Header.u1.s1.DataLength, ApiMessage->Header.u1.s1.TotalLength); @@ -94,15 +94,15 @@ while (PointerCount--) { /* Get this pointer and check if it's valid */ - DPRINT("Array Address: %p. This pointer: %p. Data: %p\n", + DPRINT("Array Address: %p. This pointer: %p. Data: %lx\n", &Pointers, Pointers, *Pointers); if ((CurrentPointer = *Pointers++)) { /* Update it */ - DPRINT("CurrentPointer: %p.\n", *(PULONG_PTR)CurrentPointer); + DPRINT("CurrentPointer: %lx.\n", *(PULONG_PTR)CurrentPointer); *(PULONG_PTR)CurrentPointer += CsrPortMemoryDelta; Pointers[-1] = CurrentPointer - (ULONG_PTR)ApiMessage; - DPRINT("CurrentPointer: %p.\n", *(PULONG_PTR)CurrentPointer); + DPRINT("CurrentPointer: %lx.\n", *(PULONG_PTR)CurrentPointer); } } } @@ -164,7 +164,7 @@ } /* Return the CSR Result */ - DPRINT("Got back: %x\n", ApiMessage->Status); + DPRINT("Got back: 0x%lx\n", ApiMessage->Status); return ApiMessage->Status; } @@ -433,7 +433,7 @@ } /* Let the caller know if this was server to server */ - DPRINT("Status was: %lx. Are we in server: %lx\n", Status, InsideCsrProcess); + DPRINT("Status was: 0x%lx. Are we in server: 0x%x\n", Status, InsideCsrProcess); if (ServerToServerCall) *ServerToServerCall = InsideCsrProcess; return Status; } _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-12-08 23:55:40 UTC (rev 19989) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-12-09 00:18:28 UTC (rev 19990) @@ -110,7 +110,7 @@ if (NT_SUCCESS(Status)) { Peb->NtGlobalFlag |= Value; - DPRINT("GlobalFlag: Key='%S', Value=%08x\n", ValueBuffer, Value); + DPRINT("GlobalFlag: Key='%S', Value=0x%lx\n", ValueBuffer, Value); } } /* @@ -260,9 +260,9 @@ if (NtCurrentPeb()->Ldr == NULL || NtCurrentPeb()->Ldr->Initialized == FALSE) { Peb = NtCurrentPeb(); - DPRINT("Peb %x\n", Peb); + DPRINT("Peb %p\n", Peb); ImageBase = Peb->ImageBaseAddress; - DPRINT("ImageBase %x\n", ImageBase); + DPRINT("ImageBase %p\n", ImageBase); if (ImageBase <= (PVOID)0x1000) { DPRINT("ImageBase is null\n"); @@ -271,7 +271,7 @@ /* If MZ header exists */ PEDosHeader = (PIMAGE_DOS_HEADER) ImageBase; - DPRINT("PEDosHeader %x\n", PEDosHeader); + DPRINT("PEDosHeader %p\n", PEDosHeader); if (PEDosHeader->e_magic != IMAGE_DOS_SIGNATURE || PEDosHeader->e_lfanew == 0L || _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-12-08 23:55:40 UTC (rev 19989) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-12-09 00:18:28 UTC (rev 19990) @@ -534,7 +534,7 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenSection() failed for '%wZ' (Status %lx)\n", DllName, Status); + DPRINT("NtOpenSection() failed for '%wZ' (Status 0x%08lx)\n", DllName, Status); return Status; } @@ -639,7 +639,7 @@ FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { - DPRINT1("Dll open of %wZ failed: Status = 0x%08x\n", + DPRINT1("Dll open of %wZ failed: Status = 0x%08lx\n", &FullNtFileName, Status); RtlFreeUnicodeString (&FullNtFileName); return Status; @@ -657,7 +657,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT("Dll header read failed: Status = 0x%08x\n", Status); + DPRINT("Dll header read failed: Status = 0x%08lx\n", Status); NtClose(FileHandle); return Status; } @@ -694,7 +694,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("NTDLL create section failed: Status = 0x%08x\n", Status); + DPRINT("NTDLL create section failed: Status = 0x%08lx\n", Status); return Status; } @@ -1031,7 +1031,7 @@ ExportDir->AddressOfFunctions ); DPRINT( - "LdrGetExportByOrdinal(Ordinal %d) = %p\n", + "LdrGetExportByOrdinal(Ordinal %lu) = %p\n", Ordinal, RVA(BaseAddress, ExFunctions[Ordinal - ExportDir->Base] ) ); @@ -1083,7 +1083,7 @@ LONG minn, maxn; ULONG ExportDirSize; - DPRINT("LdrGetExportByName %x %s %hu\n", BaseAddress, SymbolName, Hint); + DPRINT("LdrGetExportByName %p %s %hu\n", BaseAddress, SymbolName, Hint); ExportDir = (PIMAGE_EXPORT_DIRECTORY) RtlImageDirectoryEntryToData(BaseAddress, @@ -1453,7 +1453,7 @@ PCHAR Name; ULONG Size; - DPRINT("LdrpProcessImportDirectory(%x '%wZ', '%s')\n", + DPRINT("LdrpProcessImportDirectory(%p '%wZ', '%s')\n", Module, &Module->BaseDllName, ImportedName); @@ -1507,7 +1507,7 @@ PCHAR Name; ULONG Size; - DPRINT("LdrpAdjustImportDirectory(Module %x '%wZ', %x '%wZ', %x '%s')\n", + DPRINT("LdrpAdjustImportDirectory(Module %p '%wZ', %p '%wZ', '%s')\n", Module, &Module->BaseDllName, ImportedModule, &ImportedModule->BaseDllName, ImportedName); ImportModuleDirectory = (PIMAGE_IMPORT_DESCRIPTOR) @@ -1626,7 +1626,7 @@ PCHAR ImportedName; ULONG Size; - DPRINT("LdrFixupImports(SearchPath %x, Module %x)\n", SearchPath, Module); + DPRINT("LdrFixupImports(SearchPath %S, Module %p)\n", SearchPath, Module); /* Check for tls data */ TlsDirectory = (PIMAGE_TLS_DIRECTORY) @@ -1669,7 +1669,7 @@ } if (BoundImportDescriptor) { - DPRINT("BoundImportDescriptor %x\n", BoundImportDescriptor); + DPRINT("BoundImportDescriptor %p\n", BoundImportDescriptor); BoundImportDescriptorCurrent = BoundImportDescriptor; while (BoundImportDescriptorCurrent->OffsetModuleName) @@ -1794,7 +1794,7 @@ } else if (ImportModuleDirectory) { - DPRINT("ImportModuleDirectory %x\n", ImportModuleDirectory); + DPRINT("ImportModuleDirectory %p\n", ImportModuleDirectory); ImportModuleDirectoryCurrent = ImportModuleDirectory; while (ImportModuleDirectoryCurrent->Name) @@ -1873,8 +1873,8 @@ PIMAGE_NT_HEADERS NTHeaders; PLDR_DATA_TABLE_ENTRY tmpModule; - DPRINT("LdrPEStartup(ImageBase %x SectionHandle %x)\n", - ImageBase, (ULONG)SectionHandle); + DPRINT("LdrPEStartup(ImageBase %p SectionHandle %p)\n", + ImageBase, SectionHandle); /* * Overlay DOS and WNT headers structures @@ -1952,14 +1952,14 @@ /* * Compute the DLL's entry point's address. */ - DPRINT("ImageBase = %x\n",(ULONG)ImageBase); - DPRINT("AddressOfEntryPoint = %x\n",(ULONG)NTHeaders->OptionalHeader.AddressOfEntryPoint); + DPRINT("ImageBase = %p\n", ImageBase); + DPRINT("AddressOfEntryPoint = 0x%lx\n",(ULONG)NTHeaders->OptionalHeader.AddressOfEntryPoint); if (NTHeaders->OptionalHeader.AddressOfEntryPoint != 0) { EntryPoint = (PEPFUNC) ((ULONG_PTR)ImageBase + NTHeaders->OptionalHeader.AddressOfEntryPoint); } - DPRINT("LdrPEStartup() = %x\n",EntryPoint); + DPRINT("LdrPEStartup() = %p\n",EntryPoint); return EntryPoint; } @@ -2032,7 +2032,7 @@ PAGE_READONLY); if (!NT_SUCCESS(Status)) { - DPRINT1("map view of section failed (Status %x)\n", Status); + DPRINT1("map view of section failed (Status 0x%08lx)\n", Status); RtlFreeUnicodeString(&FullDosName); NtClose(SectionHandle); return(Status); @@ -2069,7 +2069,7 @@ * relocation. */ if (ImageBase != (PVOID) NtHeaders->OptionalHeader.ImageBase) { - DPRINT1("Relocating (%x -> %x) %wZ\n", + DPRINT1("Relocating (%lx -> %p) %wZ\n", NtHeaders->OptionalHeader.ImageBase, ImageBase, &FullDosName); Status = LdrPerformRelocations(NtHeaders, ImageBase); if (!NT_SUCCESS(Status)) @@ -2254,7 +2254,7 @@ PLDR_DATA_TABLE_ENTRY Module; NTSTATUS Status; - DPRINT("LdrDisableThreadCalloutsForDll (BaseAddress %x)\n", BaseAddress); + DPRINT("LdrDisableThreadCalloutsForDll (BaseAddress %p)\n", BaseAddress); Status = STATUS_DLL_NOT_FOUND; RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); @@ -2264,7 +2264,7 @@ { Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); - DPRINT("BaseDllName %wZ BaseAddress %x\n", &Module->BaseDllName, Module->DllBase); + DPRINT("BaseDllName %wZ BaseAddress %p\n", &Module->BaseDllName, Module->DllBase); if (Module->DllBase == BaseAddress) { @@ -2300,7 +2300,7 @@ if (DllName == NULL) { *DllHandle = ExeModule->DllBase; - DPRINT("BaseAddress %x\n", *DllHandle); + DPRINT("BaseAddress 0x%lx\n", *DllHandle); return STATUS_SUCCESS; } @@ -2335,7 +2335,7 @@ TRACE_LDR("LdrGetProcedureAddress by ORDINAL - %d\n", Ordinal); } - DPRINT("LdrGetProcedureAddress (BaseAddress %x Name %Z Ordinal %lu ProcedureAddress %x)\n", + DPRINT("LdrGetProcedureAddress (BaseAddress %p Name %Z Ordinal %lu ProcedureAddress %p)\n", BaseAddress, Name, Ordinal, ProcedureAddress); if (Name && Name->Length) @@ -2357,7 +2357,7 @@ { return STATUS_SUCCESS; } - DPRINT("LdrGetProcedureAddress: Can't resolve symbol @%d\n", Ordinal); + DPRINT("LdrGetProcedureAddress: Can't resolve symbol @%lu\n", Ordinal); } return STATUS_PROCEDURE_NOT_FOUND; }

18 years, 9 months

[weiden] 19988: set eol-style to native

by weiden＠svn.reactos.com

set eol-style to native Modified: trunk/reactos/lib/rtl/i386/alldiv_asm.s Modified: trunk/reactos/lib/rtl/i386/alldvrm_asm.s Modified: trunk/reactos/lib/rtl/i386/allmul_asm.s Modified: trunk/reactos/lib/rtl/i386/allrem_asm.s Modified: trunk/reactos/lib/rtl/i386/allshl_asm.s Modified: trunk/reactos/lib/rtl/i386/allshr_asm.s Modified: trunk/reactos/lib/rtl/i386/atan_asm.s Modified: trunk/reactos/lib/rtl/i386/aulldiv_asm.s Modified: trunk/reactos/lib/rtl/i386/aulldvrm_asm.s Modified: trunk/reactos/lib/rtl/i386/aullrem_asm.s Modified: trunk/reactos/lib/rtl/i386/aullshr_asm.s Modified: trunk/reactos/lib/rtl/i386/ceil_asm.s Modified: trunk/reactos/lib/rtl/i386/comparememory_asm.s Modified: trunk/reactos/lib/rtl/i386/comparememory_ulong_asm.s Modified: trunk/reactos/lib/rtl/i386/cos_asm.s Modified: trunk/reactos/lib/rtl/i386/debug_asm.S Modified: trunk/reactos/lib/rtl/i386/fabs_asm.s Modified: trunk/reactos/lib/rtl/i386/fillmemory_asm.s Modified: trunk/reactos/lib/rtl/i386/fillmemory_ulong_asm.s Modified: trunk/reactos/lib/rtl/i386/floor_asm.s Modified: trunk/reactos/lib/rtl/i386/ftol_asm.s Modified: trunk/reactos/lib/rtl/i386/log_asm.s Modified: trunk/reactos/lib/rtl/i386/pow_asm.s Modified: trunk/reactos/lib/rtl/i386/prefetchmemory_asm.s Modified: trunk/reactos/lib/rtl/i386/random_asm.S Modified: trunk/reactos/lib/rtl/i386/sin_asm.s Modified: trunk/reactos/lib/rtl/i386/sqrt_asm.s Modified: trunk/reactos/lib/rtl/i386/tan_asm.s Modified: trunk/reactos/lib/rtl/i386/zeromemory_asm.s _____ Modified: trunk/reactos/lib/rtl/i386/alldiv_asm.s --- trunk/reactos/lib/rtl/i386/alldiv_asm.s 2005-12-08 23:55:34 UTC (rev 19987) +++ trunk/reactos/lib/rtl/i386/alldiv_asm.s 2005-12-08 23:56:12 UTC (rev 19988) @@ -1,225 +1,225 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/alldiv_asm.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) - * - * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - - .globl __alldiv - .globl __fltused - - /* DATA ********************************************************************/ - -__fltused: - .long 0x9875 - -.intel_syntax noprefix - -/* FUNCTIONS ***************************************************************/ - -// -// lldiv - signed long divide -// -// Purpose: -// Does a signed long divide of the arguments. Arguments are -// not changed. -// -// Entry: -// Arguments are passed on the stack: -// 1st pushed: divisor (QWORD) -// 2nd pushed: dividend (QWORD) -// -// Exit: -// EDX:EAX contains the quotient (dividend/divisor) -// NOTE: this routine removes the parameters from the stack. -// -// Uses: -// ECX -// - -__alldiv: - - push edi - push esi - push ebx - -// Set up the local stack and save the index registers. When this is done -// the stack frame will look as follows (assuming that the expression a/b will -// generate a call to lldiv(a, b)): -// -// ----------------- -// | | -// |---------------| -// | | -// |--divisor (b)--| -// | | -// |---------------| -// | | -// |--dividend (a)-| -// | | -// |---------------| -// | return addr** | -// |---------------| -// | EDI | -// |---------------| -// | ESI | -// |---------------| -// ESP---->| EBX | -// ----------------- -// - -#define DVNDLO [esp + 16] // stack address of dividend (a) -#define DVNDHI [esp + 20] // stack address of dividend (a) -#define DVSRLO [esp + 24] // stack address of divisor (b) -#define DVSRHI [esp + 28] // stack address of divisor (b) - -// Determine sign of the result (edi = 0 if result is positive, non-zero -// otherwise) and make operands positive. - - xor edi,edi // result sign assumed positive - - mov eax,DVNDHI // hi word of a - or eax,eax // test to see if signed - jge short L1 // skip rest if a is already positive - inc edi // complement result sign flag - mov edx,DVNDLO // lo word of a - neg eax // make a positive - neg edx - sbb eax,0 - mov DVNDHI,eax // save positive value - mov DVNDLO,edx -L1: - mov eax,DVSRHI // hi word of b - or eax,eax // test to see if signed - jge short L2 // skip rest if b is already positive - inc edi // complement the result sign flag - mov edx,DVSRLO // lo word of a - neg eax // make b positive - neg edx - sbb eax,0 - mov DVSRHI,eax // save positive value - mov DVSRLO,edx -L2: - -// -// Now do the divide. First look to see if the divisor is less than 4194304K. -// If so, then we can use a simple algorithm with word divides, otherwise -// things get a little more complex. -// -// NOTE - eax currently contains the high order word of DVSR -// - - or eax,eax // check to see if divisor < 4194304K - jnz short L3 // nope, gotta do this the hard way - mov ecx,DVSRLO // load divisor - mov eax,DVNDHI // load high word of dividend - xor edx,edx - div ecx // eax <- high order bits of quotient - mov ebx,eax // save high bits of quotient - mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend - div ecx // eax <- low order bits of quotient - mov edx,ebx // edx:eax <- quotient - jmp short L4 // set sign, restore stack and return - -// -// Here we do it the hard way. Remember, eax contains the high word of DVSR -// - -L3: - mov ebx,eax // ebx:ecx <- divisor - mov ecx,DVSRLO - mov edx,DVNDHI // edx:eax <- dividend - mov eax,DVNDLO -L5: - shr ebx,1 // shift divisor right one bit - rcr ecx,1 - shr edx,1 // shift dividend right one bit - rcr eax,1 - or ebx,ebx - jnz short L5 // loop until divisor < 4194304K - div ecx // now divide, ignore remainder - mov esi,eax // save quotient - -// -// We may be off by one, so to check, we will multiply the quotient -// by the divisor and check the result against the orignal dividend -// Note that we must also check for overflow, which can occur if the -// dividend is close to 2**64 and the quotient is off by 1. -// - - mul dword ptr DVSRHI // QUOT * DVSRHI - mov ecx,eax - mov eax,DVSRLO - mul esi // QUOT * DVSRLO - add edx,ecx // EDX:EAX = QUOT * DVSR - jc short L6 // carry means Quotient is off by 1 - -// -// do long compare here between original dividend and the result of the -// multiply in edx:eax. If original is larger or equal, we are ok, otherwise -// subtract one (1) from the quotient. -// - - cmp edx,DVNDHI // compare hi words of result and original - ja short L6 // if result > original, do subtract - jb short L7 // if result < original, we are ok - cmp eax,DVNDLO // hi words are equal, compare lo words - jbe short L7 // if less or equal we are ok, else subtract -L6: - dec esi // subtract 1 from quotient -L7: - xor edx,edx // edx:eax <- quotient - mov eax,esi - -// -// Just the cleanup left to do. edx:eax contains the quotient. Set the sign -// according to the save value, cleanup the stack, and return. -// - -L4: - dec edi // check to see if result is negative - jnz short L8 // if EDI == 0, result should be negative - neg edx // otherwise, negate the result - neg eax - sbb edx,0 - -// -// Restore the saved registers and return. -// - -L8: - pop ebx - pop esi - pop edi - - ret 16 +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Run-Time Library + * FILE: lib/rtl/i386/alldiv_asm.S + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + * Eric Kohl (ekohl(a)rz-online.de) + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + + .globl __alldiv + .globl __fltused + + /* DATA ********************************************************************/ + +__fltused: + .long 0x9875 + +.intel_syntax noprefix + +/* FUNCTIONS ***************************************************************/ + +// +// lldiv - signed long divide +// +// Purpose: +// Does a signed long divide of the arguments. Arguments are +// not changed. +// +// Entry: +// Arguments are passed on the stack: +// 1st pushed: divisor (QWORD) +// 2nd pushed: dividend (QWORD) +// +// Exit: +// EDX:EAX contains the quotient (dividend/divisor) +// NOTE: this routine removes the parameters from the stack. +// +// Uses: +// ECX +// + +__alldiv: + + push edi + push esi + push ebx + +// Set up the local stack and save the index registers. When this is done +// the stack frame will look as follows (assuming that the expression a/b will +// generate a call to lldiv(a, b)): +// +// ----------------- +// | | +// |---------------| +// | | +// |--divisor (b)--| +// | | +// |---------------| +// | | +// |--dividend (a)-| +// | | +// |---------------| +// | return addr** | +// |---------------| +// | EDI | +// |---------------| +// | ESI | +// |---------------| +// ESP---->| EBX | +// ----------------- +// + +#define DVNDLO [esp + 16] // stack address of dividend (a) +#define DVNDHI [esp + 20] // stack address of dividend (a) +#define DVSRLO [esp + 24] // stack address of divisor (b) +#define DVSRHI [esp + 28] // stack address of divisor (b) + +// Determine sign of the result (edi = 0 if result is positive, non-zero +// otherwise) and make operands positive. + + xor edi,edi // result sign assumed positive + + mov eax,DVNDHI // hi word of a + or eax,eax // test to see if signed + jge short L1 // skip rest if a is already positive + inc edi // complement result sign flag + mov edx,DVNDLO // lo word of a + neg eax // make a positive + neg edx + sbb eax,0 + mov DVNDHI,eax // save positive value + mov DVNDLO,edx +L1: + mov eax,DVSRHI // hi word of b + or eax,eax // test to see if signed + jge short L2 // skip rest if b is already positive + inc edi // complement the result sign flag + mov edx,DVSRLO // lo word of a + neg eax // make b positive + neg edx + sbb eax,0 + mov DVSRHI,eax // save positive value + mov DVSRLO,edx +L2: + +// +// Now do the divide. First look to see if the divisor is less than 4194304K. +// If so, then we can use a simple algorithm with word divides, otherwise +// things get a little more complex. +// +// NOTE - eax currently contains the high order word of DVSR +// + + or eax,eax // check to see if divisor < 4194304K + jnz short L3 // nope, gotta do this the hard way + mov ecx,DVSRLO // load divisor + mov eax,DVNDHI // load high word of dividend + xor edx,edx + div ecx // eax <- high order bits of quotient + mov ebx,eax // save high bits of quotient + mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend + div ecx // eax <- low order bits of quotient + mov edx,ebx // edx:eax <- quotient + jmp short L4 // set sign, restore stack and return + +// +// Here we do it the hard way. Remember, eax contains the high word of DVSR +// + +L3: + mov ebx,eax // ebx:ecx <- divisor + mov ecx,DVSRLO + mov edx,DVNDHI // edx:eax <- dividend + mov eax,DVNDLO +L5: + shr ebx,1 // shift divisor right one bit + rcr ecx,1 + shr edx,1 // shift dividend right one bit + rcr eax,1 + or ebx,ebx + jnz short L5 // loop until divisor < 4194304K + div ecx // now divide, ignore remainder + mov esi,eax // save quotient + +// +// We may be off by one, so to check, we will multiply the quotient +// by the divisor and check the result against the orignal dividend +// Note that we must also check for overflow, which can occur if the +// dividend is close to 2**64 and the quotient is off by 1. +// + + mul dword ptr DVSRHI // QUOT * DVSRHI + mov ecx,eax + mov eax,DVSRLO + mul esi // QUOT * DVSRLO + add edx,ecx // EDX:EAX = QUOT * DVSR + jc short L6 // carry means Quotient is off by 1 + +// +// do long compare here between original dividend and the result of the +// multiply in edx:eax. If original is larger or equal, we are ok, otherwise +// subtract one (1) from the quotient. +// + + cmp edx,DVNDHI // compare hi words of result and original + ja short L6 // if result > original, do subtract + jb short L7 // if result < original, we are ok + cmp eax,DVNDLO // hi words are equal, compare lo words + jbe short L7 // if less or equal we are ok, else subtract +L6: + dec esi // subtract 1 from quotient +L7: + xor edx,edx // edx:eax <- quotient + mov eax,esi + +// +// Just the cleanup left to do. edx:eax contains the quotient. Set the sign +// according to the save value, cleanup the stack, and return. +// + +L4: + dec edi // check to see if result is negative + jnz short L8 // if EDI == 0, result should be negative + neg edx // otherwise, negate the result + neg eax + sbb edx,0 + +// +// Restore the saved registers and return. +// + +L8: + pop ebx + pop esi + pop edi + + ret 16 Property changes on: trunk/reactos/lib/rtl/i386/alldiv_asm.s ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/rtl/i386/alldvrm_asm.s --- trunk/reactos/lib/rtl/i386/alldvrm_asm.s 2005-12-08 23:55:34 UTC (rev 19987) +++ trunk/reactos/lib/rtl/i386/alldvrm_asm.s 2005-12-08 23:56:12 UTC (rev 19988) @@ -1,247 +1,247 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/alldvrm.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) - * - * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -.globl __alldvrm - -.intel_syntax noprefix - -/* FUNCTIONS ***************************************************************/ - -__alldvrm: - push edi - push esi - push ebp - -// Set up the local stack and save the index registers. When this is done -// the stack frame will look as follows (assuming that the expression a/b will -// generate a call to alldvrm(a, b)): -// -// ----------------- -// | | -// |---------------| -// | | -// |--divisor (b)--| -// | | -// |---------------| -// | | -// |--dividend (a)-| -// | | -// |---------------| -// | return addr** | -// |---------------| -// | EDI | -// |---------------| -// | ESI | -// |---------------| -// ESP---->| EBP | -// ----------------- -// - -#undef DVNDLO -#undef DVNDHI -#undef DVSRLO -#undef DVSRHI -#define DVNDLO [esp + 16] // stack address of dividend (a) -#define DVNDHI [esp + 20] // stack address of dividend (a) -#define DVSRLO [esp + 24] // stack address of divisor (b) -#define DVSRHI [esp + 28] // stack address of divisor (b) - -// Determine sign of the quotient (edi = 0 if result is positive, non-zero -// otherwise) and make operands positive. -// Sign of the remainder is kept in ebp. - - xor edi,edi // result sign assumed positive - xor ebp,ebp // result sign assumed positive - - mov eax,DVNDHI // hi word of a - or eax,eax // test to see if signed - jge short ....L1 // skip rest if a is already positive - inc edi // complement result sign flag - inc ebp // complement result sign flag - mov edx,DVNDLO // lo word of a - neg eax // make a positive - neg edx - sbb eax,0 - mov DVNDHI,eax // save positive value - mov DVNDLO,edx -....L1: - mov eax,DVSRHI // hi word of b - or eax,eax // test to see if signed - jge short ....L2 // skip rest if b is already positive - inc edi // complement the result sign flag - mov edx,DVSRLO // lo word of a - neg eax // make b positive - neg edx - sbb eax,0 - mov DVSRHI,eax // save positive value - mov DVSRLO,edx -....L2: - -// -// Now do the divide. First look to see if the divisor is less than 4194304K. -// If so, then we can use a simple algorithm with word divides, otherwise -// things get a little more complex. -// -// NOTE - eax currently contains the high order word of DVSR -// - - or eax,eax // check to see if divisor < 4194304K - jnz short ....L3 // nope, gotta do this the hard way - mov ecx,DVSRLO // load divisor - mov eax,DVNDHI // load high word of dividend - xor edx,edx - div ecx // eax <- high order bits of quotient - mov ebx,eax // save high bits of quotient - mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend - div ecx // eax <- low order bits of quotient - mov esi,eax // ebx:esi <- quotient -// -// Now we need to do a multiply so that we can compute the remainder. -// - mov eax,ebx // set up high word of quotient - mul dword ptr DVSRLO // HIWORD(QUOT) * DVSR - mov ecx,eax // save the result in ecx - mov eax,esi // set up low word of quotient - mul dword ptr DVSRLO // LOWORD(QUOT) * DVSR - add edx,ecx // EDX:EAX = QUOT * DVSR - jmp short ....L4 // complete remainder calculation - -// -// Here we do it the hard way. Remember, eax contains the high word of DVSR -// - -....L3: - mov ebx,eax // ebx:ecx <- divisor - mov ecx,DVSRLO - mov edx,DVNDHI // edx:eax <- dividend - mov eax,DVNDLO -....L5: - shr ebx,1 // shift divisor right one bit - rcr ecx,1 - shr edx,1 // shift dividend right one bit - rcr eax,1 - or ebx,ebx - jnz short ....L5 // loop until divisor < 4194304K - div ecx // now divide, ignore remainder - mov esi,eax // save quotient - -// -// We may be off by one, so to check, we will multiply the quotient -// by the divisor and check the result against the orignal dividend -// Note that we must also check for overflow, which can occur if the -// dividend is close to 2**64 and the quotient is off by 1. -// - - mul dword ptr DVSRHI // QUOT * DVSRHI - mov ecx,eax - mov eax,DVSRLO - mul esi // QUOT * DVSRLO - add edx,ecx // EDX:EAX = QUOT * DVSR - jc short ....L6 // carry means Quotient is off by 1 - -// -// do long compare here between original dividend and the result of the -// multiply in edx:eax. If original is larger or equal, we are ok, otherwise -// subtract one (1) from the quotient. -// - - cmp edx,DVNDHI // compare hi words of result and original - ja short ....L6 // if result > original, do subtract - jb short ....L7 // if result < original, we are ok - cmp eax,DVNDLO // hi words are equal, compare lo words - jbe short ....L7 // if less or equal we are ok, else subtract -....L6: - dec esi // subtract 1 from quotient - sub eax,DVSRLO // subtract divisor from result - sbb edx,DVSRHI -....L7: - xor ebx,ebx // ebx:esi <- quotient - -....L4: -// -// Calculate remainder by subtracting the result from the original dividend. -// Since the result is already in a register, we will do the subtract in the -// opposite direction and negate the result if necessary. -// - - sub eax,DVNDLO // subtract dividend from result - sbb edx,DVNDHI - -// -// Now check the result sign flag to see if the result is supposed to be positive -// or negative. It is currently negated (because we subtracted in the 'wrong' -// direction), so if the sign flag is set we are done, otherwise we must negate -// the result to make it positive again. -// - - dec ebp // check result sign flag - jns short ....L9 // result is ok, set up the quotient - neg edx // otherwise, negate the result - neg eax - sbb edx,0 - -// -// Now we need to get the quotient into edx:eax and the remainder into ebx:ecx. -// -....L9: - mov ecx,edx - mov edx,ebx - mov ebx,ecx - mov ecx,eax - mov eax,esi - -// -// Just the cleanup left to do. edx:eax contains the quotient. Set the sign -// according to the save value, cleanup the stack, and return. -// - - dec edi // check to see if result is negative - jnz short ....L8 // if EDI == 0, result should be negative - neg edx // otherwise, negate the result - neg eax - sbb edx,0 - -// -// Restore the saved registers and return. -// - -....L8: - pop ebp - pop esi - pop edi - - ret 16 +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Run-Time Library + * FILE: lib/rtl/i386/alldvrm.S + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + * Eric Kohl (ekohl(a)rz-online.de) + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +.globl __alldvrm + +.intel_syntax noprefix + +/* FUNCTIONS ***************************************************************/ + +__alldvrm: + push edi + push esi + push ebp + +// Set up the local stack and save the index registers. When this is done +// the stack frame will look as follows (assuming that the expression a/b will +// generate a call to alldvrm(a, b)): +// +// ----------------- +// | | +// |---------------| +// | | +// |--divisor (b)--| +// | | +// |---------------| +// | | +// |--dividend (a)-| +// | | +// |---------------| +// | return addr** | +// |---------------| +// | EDI | +// |---------------| +// | ESI | +// |---------------| +// ESP---->| EBP | +// ----------------- +// + +#undef DVNDLO +#undef DVNDHI +#undef DVSRLO +#undef DVSRHI +#define DVNDLO [esp + 16] // stack address of dividend (a) +#define DVNDHI [esp + 20] // stack address of dividend (a) +#define DVSRLO [esp + 24] // stack address of divisor (b) +#define DVSRHI [esp + 28] // stack address of divisor (b) + +// Determine sign of the quotient (edi = 0 if result is positive, non-zero +// otherwise) and make operands positive. +// Sign of the remainder is kept in ebp. + + xor edi,edi // result sign assumed positive + xor ebp,ebp // result sign assumed positive + + mov eax,DVNDHI // hi word of a + or eax,eax // test to see if signed + jge short ....L1 // skip rest if a is already positive + inc edi // complement result sign flag + inc ebp // complement result sign flag + mov edx,DVNDLO // lo word of a + neg eax // make a positive + neg edx + sbb eax,0 + mov DVNDHI,eax // save positive value + mov DVNDLO,edx +....L1: + mov eax,DVSRHI // hi word of b + or eax,eax // test to see if signed + jge short ....L2 // skip rest if b is already positive + inc edi // complement the result sign flag + mov edx,DVSRLO // lo word of a + neg eax // make b positive + neg edx + sbb eax,0 + mov DVSRHI,eax // save positive value + mov DVSRLO,edx +....L2: + +// +// Now do the divide. First look to see if the divisor is less than 4194304K. +// If so, then we can use a simple algorithm with word divides, otherwise +// things get a little more complex. +// +// NOTE - eax currently contains the high order word of DVSR +// + + or eax,eax // check to see if divisor < 4194304K + jnz short ....L3 // nope, gotta do this the hard way + mov ecx,DVSRLO // load divisor + mov eax,DVNDHI // load high word of dividend + xor edx,edx + div ecx // eax <- high order bits of quotient + mov ebx,eax // save high bits of quotient + mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend + div ecx // eax <- low order bits of quotient + mov esi,eax // ebx:esi <- quotient +// +// Now we need to do a multiply so that we can compute the remainder. +// + mov eax,ebx // set up high word of quotient + mul dword ptr DVSRLO // HIWORD(QUOT) * DVSR + mov ecx,eax // save the result in ecx + mov eax,esi // set up low word of quotient + mul dword ptr DVSRLO // LOWORD(QUOT) * DVSR + add edx,ecx // EDX:EAX = QUOT * DVSR + jmp short ....L4 // complete remainder calculation + +// +// Here we do it the hard way. Remember, eax contains the high word of DVSR +// + +....L3: + mov ebx,eax // ebx:ecx <- divisor + mov ecx,DVSRLO + mov edx,DVNDHI // edx:eax <- dividend + mov eax,DVNDLO +....L5: + shr ebx,1 // shift divisor right one bit + rcr ecx,1 + shr edx,1 // shift dividend right one bit + rcr eax,1 + or ebx,ebx + jnz short ....L5 // loop until divisor < 4194304K + div ecx // now divide, ignore remainder + mov esi,eax // save quotient + +// +// We may be off by one, so to check, we will multiply the quotient +// by the divisor and check the result against the orignal dividend +// Note that we must also check for overflow, which can occur if the +// dividend is close to 2**64 and the quotient is off by 1. +// + + mul dword ptr DVSRHI // QUOT * DVSRHI + mov ecx,eax + mov eax,DVSRLO + mul esi // QUOT * DVSRLO + add edx,ecx // EDX:EAX = QUOT * DVSR + jc short ....L6 // carry means Quotient is off by 1 + +// +// do long compare here between original dividend and the result of the +// multiply in edx:eax. If original is larger or equal, we are ok, otherwise +// subtract one (1) from the quotient. +// + + cmp edx,DVNDHI // compare hi words of result and original + ja short ....L6 // if result > original, do subtract + jb short ....L7 // if result < original, we are ok + cmp eax,DVNDLO // hi words are equal, compare lo words + jbe short ....L7 // if less or equal we are ok, else subtract +....L6: + dec esi // subtract 1 from quotient + sub eax,DVSRLO // subtract divisor from result + sbb edx,DVSRHI +....L7: + xor ebx,ebx // ebx:esi <- quotient + +....L4: +// +// Calculate remainder by subtracting the result from the original dividend. +// Since the result is already in a register, we will do the subtract in the +// opposite direction and negate the result if necessary. +// + + sub eax,DVNDLO // subtract dividend from result + sbb edx,DVNDHI + +// +// Now check the result sign flag to see if the result is supposed to be positive +// or negative. It is currently negated (because we subtracted in the 'wrong' +// direction), so if the sign flag is set we are done, otherwise we must negate +// the result to make it positive again. +// + + dec ebp // check result sign flag + jns short ....L9 // result is ok, set up the quotient + neg edx // otherwise, negate the result + neg eax + sbb edx,0 + +// +// Now we need to get the quotient into edx:eax and the remainder into ebx:ecx. +// +....L9: + mov ecx,edx + mov edx,ebx + mov ebx,ecx + mov ecx,eax + mov eax,esi + +// +// Just the cleanup left to do. edx:eax contains the quotient. Set the sign +// according to the save value, cleanup the stack, and return. +// + + dec edi // check to see if result is negative + jnz short ....L8 // if EDI == 0, result should be negative + neg edx // otherwise, negate the result + neg eax + sbb edx,0 + +// +// Restore the saved registers and return. +// + +....L8: + pop ebp + pop esi + pop edi + + ret 16 Property changes on: trunk/reactos/lib/rtl/i386/alldvrm_asm.s ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/rtl/i386/allmul_asm.s --- trunk/reactos/lib/rtl/i386/allmul_asm.s 2005-12-08 23:55:34 UTC (rev 19987) +++ trunk/reactos/lib/rtl/i386/allmul_asm.s 2005-12-08 23:56:12 UTC (rev 19988) @@ -1,116 +1,116 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/allmul.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) - * - * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY [truncated at 1000 lines; 5077 more skipped]

18 years, 9 months

[weiden] 19987: - fixed definition of RtlImageRvaToVa

by weiden＠svn.reactos.com

- fixed definition of RtlImageRvaToVa - imported the Ldr resource functions from wine and share them in lib/rtl Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/ntdll/def/ntdll.def Deleted: trunk/reactos/lib/ntdll/ldr/res.c Modified: trunk/reactos/lib/ntdll/ntdll.xml Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Added: trunk/reactos/lib/rtl/i386/res_asm.s Modified: trunk/reactos/lib/rtl/image.c Added: trunk/reactos/lib/rtl/res.c Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/rtl.xml Deleted: trunk/reactos/ntoskrnl/ldr/resource.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-12-08 23:48:53 UTC (rev 19986) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-12-08 23:55:34 UTC (rev 19987) @@ -2092,7 +2092,7 @@ ); NTSYSAPI -ULONG +PVOID NTAPI RtlImageRvaToVa( PIMAGE_NT_HEADERS NtHeader, _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-12-08 23:48:53 UTC (rev 19986) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-12-08 23:55:34 UTC (rev 19987) @@ -36,7 +36,7 @@ KiUserExceptionDispatcher@8 LdrAccessResource@16 LdrDisableThreadCalloutsForDll@4 -;LdrEnumResources@20 +LdrEnumResources@20 LdrFindEntryForAddress@8 LdrFindResourceDirectory_U@16 LdrFindResource_U@16 _____ Deleted: trunk/reactos/lib/ntdll/ldr/res.c --- trunk/reactos/lib/ntdll/ldr/res.c 2005-12-08 23:48:53 UTC (rev 19986) +++ trunk/reactos/lib/ntdll/ldr/res.c 2005-12-08 23:55:34 UTC (rev 19987) @@ -1,387 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ntdll/ldr/res.c - * PURPOSE: Resource access for PE executables - * PROGRAMMERS: Jean Michault - * Rex Jolliff (rex(a)lvcablemodem.com) - * Robert Dickenson (robd(a)mok.lvcm.com) - * NOTES: Parts based on Wine code - * Copyright 1995 Thomas Sandford - * Copyright 1996 Martin von Loewis - * Copyright 2003 Alexandre Julliard - * Copyright 1993 Robert J. Amstadt - * Copyright 1995 Alexandre Julliard - * Copyright 1997 Marcus Meissner - */ - -/* - * TODO: - * - any comments ?? - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* PROTOTYPES ****************************************************************/ - - - -/* FUNCTIONS *****************************************************************/ - -static PIMAGE_RESOURCE_DIRECTORY_ENTRY FASTCALL -FindEntryById(PIMAGE_RESOURCE_DIRECTORY ResDir, - ULONG Id) -{ - PIMAGE_RESOURCE_DIRECTORY_ENTRY ResEntry; - LONG low, high, mid, result; - - /* We use ID number instead of string */ - ResEntry = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(ResDir + 1) + ResDir->NumberOfNamedEntries; - DPRINT("ResEntry %x - Resource ID number instead of string\n", (ULONG)ResEntry); - DPRINT("EntryCount %d\n", (ULONG)ResDir->NumberOfIdEntries); - - low = 0; - high = ResDir->NumberOfIdEntries - 1; - mid = high/2; - while( low <= high ) { - result = Id - ResEntry[mid].Name; - if(result == 0) - return ResEntry + mid; - if(result < 0) - high = mid - 1; - else - low = mid + 1; - - mid = (low + high)/2; - } - - return NULL; -} - -static int FASTCALL -PushLanguage(WORD *list, int pos, WORD lang) -{ - int i; - - for (i = 0; i < pos; i++) { - if (list[i] == lang) { - return pos; - } - } - - list[pos++] = lang; - - return pos; -} - -/* - Status = LdrFindResource_U (hModule, - &ResourceInfo, - RESOURCE_DATA_LEVEL, - &ResourceDataEntry); - */ -NTSTATUS NTAPI -LdrFindResource_U(PVOID BaseAddress, - PLDR_RESOURCE_INFO ResourceInfo, - ULONG Level, - PIMAGE_RESOURCE_DATA_ENTRY* ResourceDataEntry) -{ - PIMAGE_RESOURCE_DIRECTORY ResDir; - PIMAGE_RESOURCE_DIRECTORY ResBase; - PIMAGE_RESOURCE_DIRECTORY_ENTRY ResEntry; - NTSTATUS Status = STATUS_SUCCESS; - PWCHAR ws; - ULONG i; - ULONG Id; - LONG low, high, mid, result; - WORD list[9]; /* list of languages to try */ - int j, pos = 0; - LCID UserLCID, SystemLCID; - LANGID UserLangID, SystemLangID; - BOOLEAN MappedAsDataFile; - - MappedAsDataFile = LdrMappedAsDataFile(&BaseAddress); - DPRINT("LdrFindResource_U(%08x, %08x, %d, %08x)\n", BaseAddress, ResourceInfo, Level, ResourceDataEntry); - - /* Get the pointer to the resource directory */ - ResDir = (PIMAGE_RESOURCE_DIRECTORY)RtlImageDirectoryEntryToData(BaseAddress, - ! MappedAsDataFile, IMAGE_DIRECTORY_ENTRY_RESOURCE, &i); - if (ResDir == NULL) { - return STATUS_RESOURCE_DATA_NOT_FOUND; - } - - DPRINT("ResourceDirectory: %x Size: %d\n", (ULONG)ResDir, (int)i); - - ResBase = ResDir; - - /* Let's go into resource tree */ - for (i = 0; i < (2 < Level ? 2 : Level); i++) { - DPRINT("ResDir: %x Level: %d\n", (ULONG)ResDir, i); - - Id = ((PULONG)ResourceInfo)[i]; - - if (Id & 0xFFFF0000) { - /* Resource name is a unicode string */ - ResEntry = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(ResDir + 1); - DPRINT("ResEntry %x - Resource name is a unicode string\n", (ULONG)ResEntry); - DPRINT("EntryCount %d\n", (ULONG)ResDir->NumberOfNamedEntries); - - low = 0; - high = ResDir->NumberOfNamedEntries - 1; - mid = high/2; - while( low <= high ) { - /* Does we need check if it's named entry, think not */ - ws = (PWCHAR)((ULONG)ResBase + (ResEntry[mid].Name & 0x7FFFFFFF)); - result = _wcsnicmp((PWCHAR)Id, ws + 1, *ws); - /* Need double check for lexical & length */ - if(result == 0) { - result = (wcslen((PWCHAR)Id) - (int)*ws); - if(result == 0) { - ResEntry += mid; - goto found; - } - } - if(result < 0) - high = mid - 1; - else - low = mid + 1; - - mid = (low + high)/2; - } - } else { - /* We use ID number instead of string */ - ResEntry = FindEntryById(ResDir, Id); - if (NULL != ResEntry) goto found; - } - - switch (i) { - case 0: - DPRINT("Error %lu - STATUS_RESOURCE_TYPE_NOT_FOUND\n", i); - return STATUS_RESOURCE_TYPE_NOT_FOUND; - case 1: - DPRINT("Error %lu - STATUS_RESOURCE_NAME_NOT_FOUND\n", i); - return STATUS_RESOURCE_NAME_NOT_FOUND; - case 2: - if (ResDir->NumberOfNamedEntries || ResDir->NumberOfIdEntries) { - /* Use the first available language */ - ResEntry = (IMAGE_RESOURCE_DIRECTORY_ENTRY*)(ResDir + 1); - break; - } - DPRINT("Error %lu - STATUS_RESOURCE_LANG_NOT_FOUND\n", i); - return STATUS_RESOURCE_LANG_NOT_FOUND; - case 3: - DPRINT("Error %lu - STATUS_RESOURCE_DATA_NOT_FOUND\n", i); - return STATUS_RESOURCE_DATA_NOT_FOUND; - default: - DPRINT("Error %lu - STATUS_INVALID_PARAMETER\n", i); - return STATUS_INVALID_PARAMETER; - } -found:; - ResDir = (PIMAGE_RESOURCE_DIRECTORY)((ULONG)ResBase + - (ResEntry->OffsetToData & 0x7FFFFFFF)); - } - - if (3 <= Level) { - /* 1. specified language */ - pos = PushLanguage(list, pos, ResourceInfo->Language ); - - /* 2. specified language with neutral sublanguage */ - pos = PushLanguage(list, pos, MAKELANGID(PRIMARYLANGID(ResourceInfo->Language), SUBLANG_NEUTRAL)); - - /* 3. neutral language with neutral sublanguage */ - pos = PushLanguage(list, pos, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL)); - - /* if no explicitly specified language, try some defaults */ - if (LANG_NEUTRAL == PRIMARYLANGID(ResourceInfo->Language)) { - /* user defaults, unless SYS_DEFAULT sublanguage specified */ - if (SUBLANG_SYS_DEFAULT != SUBLANGID(ResourceInfo->Language)) { - NtQueryDefaultLocale(TRUE, &UserLCID); - UserLangID = LANGIDFROMLCID(UserLCID); - - /* 4. current thread locale language */ - pos = PushLanguage(list, pos, LANGIDFROMLCID(NtCurrentTeb()->CurrentLocale)); - - /* 5. user locale language */ - pos = PushLanguage(list, pos, UserLangID); - - /* 6. user locale language with neutral sublanguage */ - pos = PushLanguage(list, pos, MAKELANGID(PRIMARYLANGID(UserLangID), - SUBLANG_NEUTRAL)); - } - - /* now system defaults */ - NtQueryDefaultLocale(FALSE, &SystemLCID); - SystemLangID = LANGIDFROMLCID(SystemLCID); - - /* 7. system locale language */ - pos = PushLanguage(list, pos, SystemLangID); - - /* 8. system locale language with neutral sublanguage */ - pos = PushLanguage(list, pos, MAKELANGID(PRIMARYLANGID(SystemLangID), - SUBLANG_NEUTRAL)); - - /* 9. English */ - pos = PushLanguage(list, pos, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT)); - } - - ResEntry = NULL; - for (j = 0; NULL == ResEntry && j < pos; j++) - ResEntry = FindEntryById(ResDir, list[j]); - if (NULL == ResEntry) { - if (ResDir->NumberOfNamedEntries || ResDir->NumberOfIdEntries) { - /* Use the first available language */ - ResEntry = (IMAGE_RESOURCE_DIRECTORY_ENTRY*)(ResDir + 1); - } else { - DPRINT("Error - STATUS_RESOURCE_LANG_NOT_FOUND\n", i); - return STATUS_RESOURCE_LANG_NOT_FOUND; - } - } - ResDir = (PIMAGE_RESOURCE_DIRECTORY)((ULONG)ResBase + - (ResEntry->OffsetToData & 0x7FFFFFFF)); - if (3 < Level) { - DPRINT("Error - STATUS_INVALID_PARAMETER\n", i); - return STATUS_INVALID_PARAMETER; - } - } - DPRINT("ResourceDataEntry: %x\n", (ULONG)ResDir); - - if (ResourceDataEntry) { - *ResourceDataEntry = (PVOID)ResDir; - } - return Status; -} - - -/* - * @implemented - */ -NTSTATUS NTAPI -LdrAccessResource(IN PVOID BaseAddress, - IN PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry, - OUT PVOID* Resource OPTIONAL, - OUT PULONG Size OPTIONAL) -{ - PIMAGE_SECTION_HEADER Section; - PIMAGE_NT_HEADERS NtHeader; - ULONG SectionRva; - ULONG SectionVa; - ULONG DataSize; - ULONG Offset = 0; - ULONG Data; - BOOLEAN MappedAsDataFile; - - if(!ResourceDataEntry) - return STATUS_RESOURCE_DATA_NOT_FOUND; - - MappedAsDataFile = LdrMappedAsDataFile(&BaseAddress); - Data = (ULONG)RtlImageDirectoryEntryToData(BaseAddress, - TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &DataSize); - if (Data == 0) { - return STATUS_RESOURCE_DATA_NOT_FOUND; - } - if (MappedAsDataFile) { - /* loaded as ordinary file */ - NtHeader = RtlImageNtHeader(BaseAddress); - Offset = (ULONG)BaseAddress - Data + NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].V irtualAddress; - Section = RtlImageRvaToSection(NtHeader, BaseAddress, NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].V irtualAddress); - if (Section == NULL) { - return STATUS_RESOURCE_DATA_NOT_FOUND; - } - if (Section->Misc.VirtualSize < ResourceDataEntry->OffsetToData) { - SectionRva = RtlImageRvaToSection (NtHeader, BaseAddress, ResourceDataEntry->OffsetToData)->VirtualAddress; - SectionVa = RtlImageRvaToVa(NtHeader, BaseAddress, SectionRva, NULL); - Offset = SectionRva - SectionVa + Data - Section->VirtualAddress; - } - } - if (Resource) { - *Resource = (PVOID)(ResourceDataEntry->OffsetToData - Offset + (ULONG)BaseAddress); - } - if (Size) { - *Size = ResourceDataEntry->Size; - } - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS NTAPI -LdrFindResourceDirectory_U(IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO info, - IN ULONG level, - OUT PIMAGE_RESOURCE_DIRECTORY* addr) -{ - PIMAGE_RESOURCE_DIRECTORY ResDir; - PIMAGE_RESOURCE_DIRECTORY_ENTRY ResEntry; - ULONG EntryCount; - ULONG i; - NTSTATUS Status = STATUS_SUCCESS; - WCHAR* ws; - PWCHAR* name = (PWCHAR*) info; - - /* Get the pointer to the resource directory */ - ResDir = (PIMAGE_RESOURCE_DIRECTORY) - RtlImageDirectoryEntryToData(BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &i); - if (ResDir == NULL) { - return STATUS_RESOURCE_DATA_NOT_FOUND; - } - - /* Let's go into resource tree */ - for (i = 0; i < level; i++, name++) { - EntryCount = ResDir->NumberOfNamedEntries; - ResEntry = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(ResDir + 1); - if ((ULONG)(*name) & 0xFFFF0000) { - /* Resource name is a unicode string */ - for (; EntryCount--; ResEntry++) { - /* Scan entries for equal name */ - if (ResEntry->Name & 0x80000000) { - ws = (WCHAR*)((ULONG)ResDir + (ResEntry->Name & 0x7FFFFFFF)); - if (!wcsncmp(*name, ws + 1, *ws) && wcslen(*name) == (int)*ws) { - goto found; - } - } - } - } else { - /* We use ID number instead of string */ - ResEntry += EntryCount; - EntryCount = ResDir->NumberOfIdEntries; - for (; EntryCount--; ResEntry++) { - /* Scan entries for equal name */ - if (ResEntry->Name == (ULONG)(*name)) - goto found; - } - } - switch (i) { - case 0: - return STATUS_RESOURCE_TYPE_NOT_FOUND; - case 1: - return STATUS_RESOURCE_NAME_NOT_FOUND; - case 2: - Status = STATUS_RESOURCE_LANG_NOT_FOUND; - /* Just use first language entry */ - if (ResDir->NumberOfNamedEntries || ResDir->NumberOfIdEntries) { - ResEntry = (IMAGE_RESOURCE_DIRECTORY_ENTRY*)(ResDir + 1); - break; - } - return Status; - case 3: - return STATUS_RESOURCE_DATA_NOT_FOUND; - default: - return STATUS_INVALID_PARAMETER; - } -found:; - ResDir = (PIMAGE_RESOURCE_DIRECTORY)((ULONG)ResDir + ResEntry->OffsetToData); - } - if (addr) { - *addr = (PVOID)ResDir; - } - return Status; -} - -/* EOF */ _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-12-08 23:48:53 UTC (rev 19986) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-12-08 23:55:34 UTC (rev 19987) @@ -11,6 +11,7 @@ <library>rtl</library> <library>intrlck</library> <library>string</library> + <library>pseh</library> <linkerflag>-lgcc</linkerflag> <linkerflag>-nostdlib</linkerflag> <linkerflag>-nostartfiles</linkerflag> @@ -23,7 +24,6 @@ <file>dbgui.c</file> </directory> <directory name="ldr"> - <file>res.c</file> <file>startup.c</file> <file>utils.c</file> </directory> _____ Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-12-08 23:48:53 UTC (rev 19986) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-12-08 23:55:34 UTC (rev 19987) @@ -328,3 +328,105 @@ return NULL; } + +/* + * Ldr Resource support code + */ + +IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( IMAGE_RESOURCE_DIRECTORY *dir, + LPCWSTR name, void *root, + int want_dir ); +IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( IMAGE_RESOURCE_DIRECTORY *dir, + WORD id, void *root, int want_dir ); +IMAGE_RESOURCE_DIRECTORY *find_first_entry( IMAGE_RESOURCE_DIRECTORY *dir, + void *root, int want_dir ); +int push_language( USHORT *list, ULONG pos, WORD lang ); + +/********************************************************************** + * find_entry + * + * Find a resource entry + */ +NTSTATUS find_entry( PVOID BaseAddress, LDR_RESOURCE_INFO *info, + ULONG level, void **ret, int want_dir ) +{ + ULONG size; + void *root; + IMAGE_RESOURCE_DIRECTORY *resdirptr; + USHORT list[9]; /* list of languages to try */ + int i, pos = 0; + LCID user_lcid, system_lcid; + + root = RtlImageDirectoryEntryToData( BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &size ); + if (!root) return STATUS_RESOURCE_DATA_NOT_FOUND; + resdirptr = root; + + if (!level--) goto done; + if (!(*ret = find_entry_by_name( resdirptr, (LPCWSTR)info->Type, root, want_dir || level ))) + return STATUS_RESOURCE_TYPE_NOT_FOUND; + if (!level--) return STATUS_SUCCESS; + + resdirptr = *ret; + if (!(*ret = find_entry_by_name( resdirptr, (LPCWSTR)info->Name, root, want_dir || level ))) + return STATUS_RESOURCE_NAME_NOT_FOUND; + if (!level--) return STATUS_SUCCESS; + if (level) return STATUS_INVALID_PARAMETER; /* level > 3 */ + + /* 1. specified language */ + pos = push_language( list, pos, info->Language ); + + /* 2. specified language with neutral sublanguage */ + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(info->Language), SUBLANG_NEUTRAL ) ); + + /* 3. neutral language with neutral sublanguage */ + pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) ); + + /* if no explicitly specified language, try some defaults */ + if (PRIMARYLANGID(info->Language) == LANG_NEUTRAL) + { + /* user defaults, unless SYS_DEFAULT sublanguage specified */ + if (SUBLANGID(info->Language) != SUBLANG_SYS_DEFAULT) + { + /* 4. current thread locale language */ + pos = push_language( list, pos, LANGIDFROMLCID(NtCurrentTeb()->CurrentLocale) ); + + if (NT_SUCCESS(NtQueryDefaultLocale(TRUE, &user_lcid))) + { + /* 5. user locale language */ + pos = push_language( list, pos, LANGIDFROMLCID(user_lcid) ); + + /* 6. user locale language with neutral sublanguage */ + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(user_lcid), SUBLANG_NEUTRAL ) ); + } + } + + /* now system defaults */ + + if (NT_SUCCESS(NtQueryDefaultLocale(FALSE, &system_lcid))) + { + /* 7. system locale language */ + pos = push_language( list, pos, LANGIDFROMLCID( system_lcid ) ); + + /* 8. system locale language with neutral sublanguage */ + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(system_lcid), SUBLANG_NEUTRAL ) ); + } + + /* 9. English */ + pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + } + + resdirptr = *ret; + for (i = 0; i < pos; i++) + if ((*ret = find_entry_by_id( resdirptr, list[i], root, want_dir ))) return STATUS_SUCCESS; + + /* if no explicitly specified language, return the first entry */ + if (PRIMARYLANGID(info->Language) == LANG_NEUTRAL) + { + if ((*ret = find_first_entry( resdirptr, root, want_dir ))) return STATUS_SUCCESS; + } + return STATUS_RESOURCE_LANG_NOT_FOUND; + +done: + *ret = resdirptr; + return STATUS_SUCCESS; +} _____ Added: trunk/reactos/lib/rtl/i386/res_asm.s --- trunk/reactos/lib/rtl/i386/res_asm.s 2005-12-08 23:48:53 UTC (rev 19986) +++ trunk/reactos/lib/rtl/i386/res_asm.s 2005-12-08 23:55:34 UTC (rev 19987) @@ -0,0 +1,20 @@ +#include <ndk/asm.h> +.intel_syntax noprefix + +/* + * On x86, Shrinker, an executable compressor, depends on the + * "call access_resource" instruction being there. + */ +.globl _LdrAccessResource@16 +_LdrAccessResource@16: + push ebp + mov ebp, esp + sub esp, 4 + push [ebp + 24] + push [ebp + 20] + push [ebp + 16] + push [ebp + 12] + push [ebp + 8] + call _LdrpAccessResource@16 + leave + ret 16 Property changes on: trunk/reactos/lib/rtl/i386/res_asm.s ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/rtl/image.c --- trunk/reactos/lib/rtl/image.c 2005-12-08 23:48:53 UTC (rev 19986) +++ trunk/reactos/lib/rtl/image.c 2005-12-08 23:55:34 UTC (rev 19987) @@ -80,7 +80,7 @@ return (PVOID)((ULONG_PTR)BaseAddress + Va); /* image mapped as ordinary file, we must find raw pointer */ - return (PVOID)RtlImageRvaToVa (NtHeader, BaseAddress, Va, NULL); + return RtlImageRvaToVa (NtHeader, BaseAddress, Va, NULL); } @@ -117,7 +117,7 @@ /* * @implemented */ -ULONG +PVOID NTAPI RtlImageRvaToVa ( PIMAGE_NT_HEADERS NtHeader, @@ -143,7 +143,7 @@ *SectionHeader = Section; } - return (ULONG)((ULONG_PTR)BaseAddress + + return (PVOID)((ULONG_PTR)BaseAddress + Rva + Section->PointerToRawData - (ULONG_PTR)Section->VirtualAddress); _____ Added: trunk/reactos/lib/rtl/res.c --- trunk/reactos/lib/rtl/res.c 2005-12-08 23:48:53 UTC (rev 19986) +++ trunk/reactos/lib/rtl/res.c 2005-12-08 23:55:34 UTC (rev 19987) @@ -0,0 +1,297 @@ +/* + * PE file resources + * + * Copyright 1995 Thomas Sandford + * Copyright 1996 Martin von Loewis + * Copyright 2003 Alexandre Julliard + * Copyright 1993 Robert J. Amstadt + * Copyright 1997 Marcus Meissner + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +NTSTATUS find_entry( PVOID BaseAddress, LDR_RESOURCE_INFO *info, + ULONG level, void **ret, int want_dir ); + +/* FUNCTIONS ****************************************************************/ + +_SEH_FILTER(page_fault) +{ + if (_SEH_GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || + _SEH_GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_SEARCH; +} + +/********************************************************************** + * is_data_file_module + * + * Check if a module handle is for a LOAD_LIBRARY_AS_DATAFILE module. + */ +static int is_data_file_module( PVOID BaseAddress ) +{ + return (ULONG_PTR)BaseAddress & 1; +} + + +/********************************************************************** + * push_language + * + * push a language in the list of languages to try + */ +int push_language( USHORT *list, ULONG pos, WORD lang ) +{ + int i; + for (i = 0; i < pos; i++) if (list[i] == lang) return pos; + list[pos++] = lang; + return pos; +} + + +/********************************************************************** + * find_first_entry + * + * Find the first suitable entry in a resource directory + */ +IMAGE_RESOURCE_DIRECTORY *find_first_entry( IMAGE_RESOURCE_DIRECTORY *dir, + void *root, int want_dir ) +{ + const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); + int pos; + + for (pos = 0; pos < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; pos++) + { + if (!entry[pos].DataIsDirectory == !want_dir) + return (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry[pos].OffsetToDirectory); + } + return NULL; +} + + +/********************************************************************** + * find_entry_by_id + * + * Find an entry by id in a resource directory + */ +IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( IMAGE_RESOURCE_DIRECTORY *dir, + WORD id, void *root, int want_dir ) +{ + const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; + int min, max, pos; + + entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); + min = dir->NumberOfNamedEntries; + max = min + dir->NumberOfIdEntries - 1; + while (min <= max) + { + pos = (min + max) / 2; + if (entry[pos].Id == id) + { + if (!entry[pos].DataIsDirectory == !want_dir) + { + DPRINT("root %p dir %p id %04x ret %p\n", + root, dir, id, (const char*)root + entry[pos].OffsetToDirectory); + return (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry[pos].OffsetToDirectory); + } + break; + } + if (entry[pos].Id > id) max = pos - 1; + else min = pos + 1; + } + DPRINT("root %p dir %p id %04x not found\n", root, dir, id ); + return NULL; +} + + +/********************************************************************** + * find_entry_by_name + * + * Find an entry by name in a resource directory + */ +IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( IMAGE_RESOURCE_DIRECTORY *dir, + LPCWSTR name, void *root, + int want_dir ) +{ + const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; + const IMAGE_RESOURCE_DIR_STRING_U *str; + int min, max, res, pos, namelen; + + if (!((ULONG_PTR)name & 0xFFFF0000)) return find_entry_by_id( dir, (ULONG_PTR)name & 0xFFFF, root, want_dir ); + entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); + namelen = wcslen(name); + min = 0; + max = dir->NumberOfNamedEntries - 1; + while (min <= max) + { + pos = (min + max) / 2; + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const char *)root + entry[pos].NameOffset); + res = wcsncmp( name, str->NameString, str->Length ); + if (!res && namelen == str->Length) + { + if (!entry[pos].DataIsDirectory == !want_dir) + { + DPRINT("root %p dir %p name %ws ret %p\n", + root, dir, name, (const char*)root + entry[pos].OffsetToDirectory); + return (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry[pos].OffsetToDirectory); + } + break; + } + if (res < 0) max = pos - 1; + else min = pos + 1; + } + DPRINT("root %p dir %p name %ws not found\n", root, dir, name); + return NULL; +} + +#ifdef __i386__ +NTSTATUS NTAPI LdrpAccessResource( PVOID BaseAddress, IMAGE_RESOURCE_DATA_ENTRY *entry, + void **ptr, ULONG *size ) +#else +static NTSTATUS LdrpAccessResource( PVOID BaseAddress, IMAGE_RESOURCE_DATA_ENTRY *entry, + void **ptr, ULONG *size ) +#endif +{ + NTSTATUS status = STATUS_SUCCESS; + + _SEH_TRY + { + ULONG dirsize; + + if (!RtlImageDirectoryEntryToData( BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &dirsize )) + status = STATUS_RESOURCE_DATA_NOT_FOUND; + else + { + if (ptr) + { + if (is_data_file_module(BaseAddress)) + { + PVOID mod = (PVOID)((ULONG_PTR)BaseAddress & ~1); + *ptr = RtlImageRvaToVa( RtlImageNtHeader(mod), mod, entry->OffsetToData, NULL ); + } + else *ptr = (char *)BaseAddress + entry->OffsetToData; + } + if (size) *size = entry->Size; + } + } + _SEH_EXCEPT(page_fault) + { + status = _SEH_GetExceptionCode(); + } + _SEH_END; + return status; +} + + +/* + * @implemented + */ +NTSTATUS NTAPI +LdrFindResource_U(PVOID BaseAddress, + PLDR_RESOURCE_INFO ResourceInfo, + ULONG Level, + PIMAGE_RESOURCE_DATA_ENTRY* ResourceDataEntry) +{ + void *res; + NTSTATUS status = STATUS_SUCCESS; + + _SEH_TRY + { + if (ResourceInfo) + { + DPRINT( "module %p type %ws name %ws lang %04lx level %ld\n", + BaseAddress, (LPCWSTR)ResourceInfo->Type, + Level > 1 ? (LPCWSTR)ResourceInfo->Name : L"", + Level > 2 ? ResourceInfo->Language : 0, Level ); + } + + status = find_entry( BaseAddress, ResourceInfo, Level, &res, FALSE ); + if (status == STATUS_SUCCESS) *ResourceDataEntry = res; + } + _SEH_EXCEPT(page_fault) + { + status = _SEH_GetExceptionCode(); + } + _SEH_END; + return status; +} + +#ifndef __i386__ +/* + * @implemented + */ +NTSTATUS NTAPI +LdrAccessResource(IN PVOID BaseAddress, + IN PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry, + OUT PVOID* Resource OPTIONAL, + OUT PULONG Size OPTIONAL) +{ + return LdrpAccessResource( BaseAddress, ResourceDataEntry, Resource, Size ); +} +#endif + +/* + * @implemented + */ +NTSTATUS NTAPI +LdrFindResourceDirectory_U(IN PVOID BaseAddress, + IN PLDR_RESOURCE_INFO info, + IN ULONG level, + OUT PIMAGE_RESOURCE_DIRECTORY* addr) +{ + void *res; + NTSTATUS status = STATUS_SUCCESS; + + _SEH_TRY + { + if (info) + { + DPRINT( "module %p type %ws name %ws lang %04lx level %ld\n", + BaseAddress, (LPCWSTR)info->Type, + level > 1 ? (LPCWSTR)info->Name : L"", + level > 2 ? info->Language : 0, level ); + } + + status = find_entry( BaseAddress, info, level, &res, TRUE ); + if (status == STATUS_SUCCESS) *addr = res; + } + _SEH_EXCEPT(page_fault) + { + status = _SEH_GetExceptionCode(); + } + _SEH_END; + return status; +} + + +/* + * @unimplemented + */ +NTSTATUS NTAPI +LdrEnumResources(IN PVOID BaseAddress, + IN PLDR_RESOURCE_INFO ResourceInfo, + IN ULONG Level, + IN OUT PULONG ResourceCount, + OUT PVOID Resources OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} Property changes on: trunk/reactos/lib/rtl/res.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/rtl/rtl.h --- trunk/reactos/lib/rtl/rtl.h 2005-12-08 23:48:53 UTC (rev 19986) +++ trunk/reactos/lib/rtl/rtl.h 2005-12-08 23:55:34 UTC (rev 19987) @@ -23,4 +23,6 @@ #include <reactos/helper.h> #include "rtlp.h" +#include <pseh/pseh.h> + /* EOF */ _____ Modified: trunk/reactos/lib/rtl/rtl.xml --- trunk/reactos/lib/rtl/rtl.xml 2005-12-08 23:48:53 UTC (rev 19986) +++ trunk/reactos/lib/rtl/rtl.xml 2005-12-08 23:55:34 UTC (rev 19987) @@ -5,6 +5,7 @@ <define name="NO_RTL_INLINES" /> <define name="_NTSYSTEM_" /> <define name="_NTDLLBUILD_" /> + <define name="_SEH_NO_NATIVE_NLG" /> <include base="rtl">.</include> <if property="ARCH" value="i386"> <directory name="i386"> @@ -36,6 +37,7 @@ <file>random_asm.S</file> <file>pow_asm.s</file> <file>prefetchmemory_asm.s</file> + <file>res_asm.s</file> <file>sin_asm.s</file> <file>sqrt_asm.s</file> <file>tan_asm.s</file> @@ -76,6 +78,7 @@ <file>random.c</file> <file>rangelist.c</file> <file>registry.c</file> + <file>res.c</file> <file>resource.c</file> <file>sd.c</file> <file>security.c</file> _____ Deleted: trunk/reactos/ntoskrnl/ldr/resource.c --- trunk/reactos/ntoskrnl/ldr/resource.c 2005-12-08 23:48:53 UTC (rev 19986) +++ trunk/reactos/ntoskrnl/ldr/resource.c 2005-12-08 23:55:34 UTC (rev 19987) @@ -1,228 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ldr/resource.c - * PURPOSE: Resource loader - * - * PROGRAMMERS: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -NTSTATUS STDCALL -LdrAccessResource(IN PVOID BaseAddress, - IN PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry, - OUT PVOID *Resource OPTIONAL, - OUT PULONG Size OPTIONAL) -{ - PIMAGE_SECTION_HEADER Section; - PIMAGE_NT_HEADERS NtHeader; - ULONG SectionRva; - ULONG SectionVa; - ULONG DataSize; - ULONG Offset = 0; - ULONG Data; - - if(!ResourceDataEntry) - return STATUS_RESOURCE_DATA_NOT_FOUND; - - Data = (ULONG)RtlImageDirectoryEntryToData (BaseAddress, - TRUE, [truncated at 1000 lines; 260 more skipped]

18 years, 9 months

← Newer
1
...
48
49
50
51
52
53
54
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005