Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 31382: Updated French translations for input and winemine
by pschweitzer＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: pschweitzer Date: Sat Dec 22 01:07:25 2007 New Revision: 31382 URL: http://svn.reactos.org/svn/reactos?rev=31382&view=rev Log: Updated French translations for input and winemine Modified: trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc Modified: trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc Sat Dec 22 01:07:25 2007 @@ -11,7 +11,7 @@ STRINGTABLE { IDS_SECONDS, "secondes" IDS_NOBODY, "Anonyme" - IDS_ABOUT, "by Joshua Thielen and ReactOS developers" + IDS_ABOUT, "par Joshua Thielen et les développeurs de ReactOS" } IDM_WINEMINE MENU DISCARDABLE Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Sat Dec 22 01:07:25 2007 @@ -223,7 +223,7 @@ CTEXT "+", -1, 98, 37, 8, 10 AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP AUTORADIOBUTTON "&ALT gauche", -1, 24, 45, 40, 12, NOT WS_TABSTOP - LTEXT "Touche:", -1, 110, 37, 14, 10 + LTEXT "Touche :", -1, 110, 37, 14, 10 COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 212, 47, 50, 14 @@ -233,15 +233,15 @@ BEGIN IDS_CPLSYSTEMNAME "Services texte et langue de saisie" IDS_CPLSYSTEMDESCRIPTION "Personnalise les paramètres pour la langue de saisie de texte." - IDS_KEYBOARD "Keyboard" - IDS_ADV_TEXT_SRV "Advanced Text Services" - IDS_NONE "(None)" - IDS_UNKNOWN "(Unknown)" - IDS_RESTART "Do you want to restart your computer now?" - IDS_SPEECH "Speech" - IDS_HRD_REC "Handwriting Recognition" - IDS_OFF_ADV_TXT_SRV "Do you want to turn off advanced text services?" - IDS_WHATS_THIS "What's This?" + IDS_KEYBOARD "Clavier" + IDS_ADV_TEXT_SRV "Services avancés de texte" + IDS_NONE "(Aucun)" + IDS_UNKNOWN "(Inconnu)" + IDS_RESTART "Désirez-vous redémarrer votre ordinateur maintenant ?" + IDS_SPEECH "Vocale" + IDS_HRD_REC "Reconnaissance de l'écriture manuelle" + IDS_OFF_ADV_TXT_SRV "Désirez-vous désactiver les services avancés de texte ?" + IDS_WHATS_THIS "Qu'est-ce que c'est ?" END /* FIXME : To improve/complete */

1 0

[mpiulachs] 31381: Butterflies OpenGL screensaver works now on ros, add it to bootcd (by CMan)
by mpiulachs＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: mpiulachs Date: Sat Dec 22 01:05:12 2007 New Revision: 31381 URL: http://svn.reactos.org/svn/reactos?rev=31381&view=rev Log: Butterflies OpenGL screensaver works now on ros, add it to bootcd (by CMan) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Dec 22 01:05:12 2007 @@ -454,102 +454,103 @@ tools\dbgprint\dbgprint.exe 7 optional ; Modules -modules\os2\server\os2srv.dll 1 optional -modules\os2\dll\win32\doscalls\doscalls.dll 1 optional -modules\posix\server\psxsrv.dll 1 optional -modules\posix\dll\win32\psxdll\psxdll.dll 1 optional -modules\rosky\dll\win32\libsky\libsky.dll 1 optional -modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional -modules\vms\server\vmssrv.dll 1 optional -modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional -modules\rosapps\avtest\avtest.sys 1 optional -modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional -modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional -modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional -modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional -modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional -modules\rosapps\cmdutils\comp\comp.exe 1 optional -modules\rosapps\cmdutils\mode\mode.exe 1 optional -modules\rosapps\cmdutils\sort\sort.exe 1 optional -modules\rosapps\cmdutils\tee\tee.exe 1 optional -modules\rosapps\cmdutils\touch\touch.exe 1 optional -modules\rosapps\cmdutils\uptime\uptime.exe 1 optional -modules\rosapps\cmdutils\y\y.exe 1 optional -modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional -modules\rosapps\demos\maze\maze.exe 1 optional -modules\rosapps\devutils\cputointel\cputointel.exe 1 optional -modules\rosapps\devutils\gdb2\gdb2.exe 1 optional -modules\rosapps\devutils\gdihv\gdihv.exe 1 optional -modules\rosapps\devutils\genguid\genguid.exe 1 optional -modules\rosapps\devutils\roswebparser\roswebparser.exe 1 optional -modules\rosapps\devutils\zoomin\zoomin.exe 1 optional -modules\rosapps\dflat32\edit.exe 1 optional -modules\rosapps\downloader\downloader.exe 1 optional -modules\rosapps\downloader\downloader.xml 1 optional -modules\rosapps\fontview\fontview.exe 1 optional -modules\rosapps\gettype\gettype.exe 1 optional -modules\rosapps\green\green.sys 1 optional -modules\rosapps\imagesoft\imagesoft.exe 1 optional -modules\rosapps\lib\dflat32\dflat32.dll 1 optional -modules\rosapps\mc\mc.exe 1 optional -modules\rosapps\net\ncftp\ncftp.exe 1 optional -modules\rosapps\net\netreg\netreg.exe 1 optional -modules\rosapps\net\niclist\niclist.exe 1 optional -modules\rosapps\notevil\notevil.exe 1 optional -modules\rosapps\magnify\magnify.exe 1 optional -modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional -modules\rosapps\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\packmgr\lib\package.dll 1 optional -modules\rosapps\ramdrv\ramdrv.sys 1 optional -modules\rosapps\roshttpd\roshttpd.exe 1 optional -modules\rosapps\screenshot\screenshot.exe 1 optional -modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional -modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional -modules\rosapps\sysutils\chklib\chklib.exe 1 optional -modules\rosapps\sysutils\ctm\ctm.exe 1 optional -modules\rosapps\sysutils\kill\kill.exe 1 optional -modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional -modules\rosapps\sysutils\man\man.exe 1 optional -modules\rosapps\sysutils\pedump\pedump.exe 1 optional -modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional -modules\rosapps\sysutils\tcat\tcat.exe 1 optional -modules\rosapps\sysutils\tlist\tlist.exe 1 optional -modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional -modules\rosapps\sysutils\utils\cat\cat.exe 1 optional -modules\rosapps\sysutils\utils\driver\load\load.exe 1 optional -modules\rosapps\sysutils\utils\driver\unload\unload.exe 1 optional -modules\rosapps\sysutils\utils\infinst\infinst.exe 1 optional -modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional -modules\rosapps\sysutils\utils\objdir\objdir.exe 1 optional -modules\rosapps\sysutils\utils\partinfo\partinfo.exe 1 optional -modules\rosapps\sysutils\utils\ps\ps.exe 1 optional -modules\rosapps\sysutils\utils\rosperf\rosperf.exe 1 optional -modules\rosapps\sysutils\utils\stats\stats.exe 1 optional -modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional -modules\rosapps\templates\dialog.exe 1 optional -modules\rosapps\templates\mdi.exe 1 optional -modules\rosapps\winefile\winefile.exe 1 optional -modules\rosapps\winver\winver.exe 1 optional -modules\rosapps\write\write.exe 1 optional -modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional -modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional -modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional -modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional -modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional -modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional -modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional -modules\rostests\winetests\msi\msi_winetest.exe 7 optional -modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional -modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional -modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional -modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional -modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional -modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional -modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional -modules\rostests\winetests\user32\user32_winetest.exe 7 optional -modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional -modules\rostests\winetests\version\version_winetest.exe 7 optional -modules\wallpaper\lake.bmp 4 optional +modules\os2\server\os2srv.dll 1 optional +modules\os2\dll\win32\doscalls\doscalls.dll 1 optional +modules\posix\server\psxsrv.dll 1 optional +modules\posix\dll\win32\psxdll\psxdll.dll 1 optional +modules\rosky\dll\win32\libsky\libsky.dll 1 optional +modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional +modules\vms\server\vmssrv.dll 1 optional +modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional +modules\rosapps\avtest\avtest.sys 1 optional +modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional +modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional +modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional +modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional +modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional +modules\rosapps\applications\screensavers\butterflies\butterflies.scr 1 optional +modules\rosapps\cmdutils\comp\comp.exe 1 optional +modules\rosapps\cmdutils\mode\mode.exe 1 optional +modules\rosapps\cmdutils\sort\sort.exe 1 optional +modules\rosapps\cmdutils\tee\tee.exe 1 optional +modules\rosapps\cmdutils\touch\touch.exe 1 optional +modules\rosapps\cmdutils\uptime\uptime.exe 1 optional +modules\rosapps\cmdutils\y\y.exe 1 optional +modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional +modules\rosapps\demos\maze\maze.exe 1 optional +modules\rosapps\devutils\cputointel\cputointel.exe 1 optional +modules\rosapps\devutils\gdb2\gdb2.exe 1 optional +modules\rosapps\devutils\gdihv\gdihv.exe 1 optional +modules\rosapps\devutils\genguid\genguid.exe 1 optional +modules\rosapps\devutils\roswebparser\roswebparser.exe 1 optional +modules\rosapps\devutils\zoomin\zoomin.exe 1 optional +modules\rosapps\dflat32\edit.exe 1 optional +modules\rosapps\downloader\downloader.exe 1 optional +modules\rosapps\downloader\downloader.xml 1 optional +modules\rosapps\fontview\fontview.exe 1 optional +modules\rosapps\gettype\gettype.exe 1 optional +modules\rosapps\green\green.sys 1 optional +modules\rosapps\imagesoft\imagesoft.exe 1 optional +modules\rosapps\lib\dflat32\dflat32.dll 1 optional +modules\rosapps\mc\mc.exe 1 optional +modules\rosapps\net\ncftp\ncftp.exe 1 optional +modules\rosapps\net\netreg\netreg.exe 1 optional +modules\rosapps\net\niclist\niclist.exe 1 optional +modules\rosapps\notevil\notevil.exe 1 optional +modules\rosapps\magnify\magnify.exe 1 optional +modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional +modules\rosapps\packmgr\gui\packmgr.exe 1 optional +modules\rosapps\packmgr\lib\package.dll 1 optional +modules\rosapps\ramdrv\ramdrv.sys 1 optional +modules\rosapps\roshttpd\roshttpd.exe 1 optional +modules\rosapps\screenshot\screenshot.exe 1 optional +modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional +modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional +modules\rosapps\sysutils\chklib\chklib.exe 1 optional +modules\rosapps\sysutils\ctm\ctm.exe 1 optional +modules\rosapps\sysutils\kill\kill.exe 1 optional +modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional +modules\rosapps\sysutils\man\man.exe 1 optional +modules\rosapps\sysutils\pedump\pedump.exe 1 optional +modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional +modules\rosapps\sysutils\tcat\tcat.exe 1 optional +modules\rosapps\sysutils\tlist\tlist.exe 1 optional +modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional +modules\rosapps\sysutils\utils\cat\cat.exe 1 optional +modules\rosapps\sysutils\utils\driver\load\load.exe 1 optional +modules\rosapps\sysutils\utils\driver\unload\unload.exe 1 optional +modules\rosapps\sysutils\utils\infinst\infinst.exe 1 optional +modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional +modules\rosapps\sysutils\utils\objdir\objdir.exe 1 optional +modules\rosapps\sysutils\utils\partinfo\partinfo.exe 1 optional +modules\rosapps\sysutils\utils\ps\ps.exe 1 optional +modules\rosapps\sysutils\utils\rosperf\rosperf.exe 1 optional +modules\rosapps\sysutils\utils\stats\stats.exe 1 optional +modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional +modules\rosapps\templates\dialog.exe 1 optional +modules\rosapps\templates\mdi.exe 1 optional +modules\rosapps\winefile\winefile.exe 1 optional +modules\rosapps\winver\winver.exe 1 optional +modules\rosapps\write\write.exe 1 optional +modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional +modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional +modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional +modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional +modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional +modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional +modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional +modules\rostests\winetests\msi\msi_winetest.exe 7 optional +modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional +modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional +modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional +modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional +modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional +modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional +modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional +modules\rostests\winetests\user32\user32_winetest.exe 7 optional +modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional +modules\rostests\winetests\version\version_winetest.exe 7 optional +modules\wallpaper\lake.bmp 4 optional ; Native libraries -modules\windows\mfc42.dll 1 optional +modules\windows\mfc42.dll 1 optional

1 0

[mpiulachs] 31380: - Update headers from wine (mostly formatting) - Add new headers required to build msxml3
by mpiulachs＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: mpiulachs Date: Sat Dec 22 01:01:15 2007 New Revision: 31380 URL: http://svn.reactos.org/svn/reactos?rev=31380&view=rev Log: - Update headers from wine (mostly formatting) - Add new headers required to build msxml3 Added: trunk/reactos/include/psdk/msxml2did.h (with props) trunk/reactos/include/psdk/xmldomdid.h (with props) trunk/reactos/include/psdk/xmldsodid.h (with props) Modified: trunk/reactos/include/psdk/idispids.h trunk/reactos/include/psdk/msxml.idl trunk/reactos/include/psdk/msxml2.idl trunk/reactos/include/psdk/msxmldid.h trunk/reactos/include/psdk/ocidl.idl trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/include/psdk/xmldso.idl Modified: trunk/reactos/include/psdk/idispids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/idispids.h?re… ============================================================================== --- trunk/reactos/include/psdk/idispids.h (original) +++ trunk/reactos/include/psdk/idispids.h Sat Dec 22 01:01:15 2007 @@ -4,7 +4,15 @@ #pragma GCC system_header #endif +#define DISPID_READYSTATE (-525) +#define DISPID_READYSTATECHANGE (-609) +#define DISPID_AMBIENT_TRANSFERPRIORITY (-728) #define DISPID_AMBIENT_OFFLINEIFNOTCONNECTED (-5501) #define DISPID_AMBIENT_SILENT (-5502) + +#ifndef DISPID_AMBIENT_CODEPAGE +#define DISPID_AMBIENT_CODEPAGE (-725) +#define DISPID_AMBIENT_CHARSET (-727) +#endif /* DISPID_AMBIENT_CODEPAGE */ #endif Modified: trunk/reactos/include/psdk/msxml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/msxml.idl (original) +++ trunk/reactos/include/psdk/msxml.idl Sat Dec 22 01:01:15 2007 @@ -19,11 +19,12 @@ #include <msxmldid.h> +#ifndef DO_NO_IMPORTS import "unknwn.idl"; import "wtypes.idl"; import "objidl.idl"; import "oaidl.idl"; - +#endif [ local, @@ -208,7 +209,7 @@ HRESULT removeChild([in]IXMLElement2 *pChildElem); [propget, id(DISPID_XMLELEMENT_ATTRIBUTES)] - HRESULT attributes([retval, out] IXMLElementCollection **pp); + HRESULT attributes([retval, out] IXMLElementCollection **pp); } [ @@ -238,7 +239,7 @@ [propget, id(DISPID_XMLDOCUMENT_MIMETYPE)] HRESULT mimeType([retval, out] BSTR *p); - + [propget, id(DISPID_XMLDOCUMENT_READYSTATE)] HRESULT readyState([retval, out]long *pl); @@ -259,8 +260,8 @@ [id(DISPID_XMLDOCUMENT_CREATEELEMENT)] HRESULT createElement( - [in] VARIANT vType, - [optional, in] VARIANT var, + [in] VARIANT vType, + [optional, in] VARIANT var, [retval, out] IXMLElement2 **ppElem); [propget, id(DISPID_XMLDOCUMENT_ASYNC)] @@ -322,8 +323,8 @@ ] interface IXMLElementNotificationSink : IDispatch { - [id(DISPID_XMLNOTIFSINK_CHILDADDED)] - HRESULT ChildAdded([in]IDispatch *pChildElem); + [id(DISPID_XMLNOTIFSINK_CHILDADDED)] + HRESULT ChildAdded([in]IDispatch *pChildElem); } [ Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… ============================================================================== --- trunk/reactos/include/psdk/msxml2.idl (original) +++ trunk/reactos/include/psdk/msxml2.idl Sat Dec 22 01:01:15 2007 @@ -51,8 +51,8 @@ cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") cpp_quote("#ifndef __WIDL_XMLDOM_H") -typedef enum tagDOMNodeType -{ +typedef enum tagDOMNodeType +{ NODE_INVALID = 0, NODE_ELEMENT = 1, NODE_ATTRIBUTE = 2, @@ -272,13 +272,13 @@ [id(DISPID_XMLDOM_DOCUMENT_CREATENODE)] HRESULT createNode( - [in] VARIANT var, - [in] BSTR name, + [in] VARIANT var, + [in] BSTR name, [in] BSTR uri, [retval, out] IXMLDOMNode **node); [id(DISPID_XMLDOM_DOCUMENT_NODEFROMID)] - HRESULT nodeFromID( + HRESULT nodeFromID( [in] BSTR id, [retval, out] IXMLDOMNode **node); @@ -306,12 +306,12 @@ HRESULT abort(); [id(DISPID_XMLDOM_DOCUMENT_LOADXML)] - HRESULT loadXML( + HRESULT loadXML( [in] BSTR p, [out, retval] VARIANT_BOOL *pbool); [id(DISPID_XMLDOM_DOCUMENT_SAVE)] - HRESULT save( + HRESULT save( [in] VARIANT var1); [propget, id(DISPID_XMLDOM_DOCUMENT_VALIDATE)] @@ -461,7 +461,7 @@ [in] IXMLDOMNode *pNode, [retval, out] IXMLDOMNode **ppNode); - [id(DISPID_XMLDOM_SELECTION_REMOVENEXT)] + [id(DISPID_XMLDOM_SELECTION_REMOVENEXT)] HRESULT removeNext( [retval, out] IXMLDOMNode **ppNode); @@ -533,13 +533,13 @@ [propget, id(DISPID_NEWENUM)] HRESULT _newEnum([retval, out] IUnknown **ppUnk); } - + [ local, object, uuid (3efaa413-272f-11d2-836f-0000f87a7782) ] -interface IXMLDOMDocumentFragment : IXMLDOMNode +interface IXMLDOMDocumentFragment : IXMLDOMNode { } @@ -548,7 +548,7 @@ object, uuid (2933BF84-7B36-11d2-B20E-00C04F983E60) ] -interface IXMLDOMCharacterData : IXMLDOMNode +interface IXMLDOMCharacterData : IXMLDOMNode { [propget, id(DISPID_DOM_DATA_DATA)] HRESULT data([retval, out] BSTR *p); @@ -591,7 +591,7 @@ object, uuid (2933BF85-7B36-11d2-B20E-00C04F983E60) ] -interface IXMLDOMAttribute : IXMLDOMNode +interface IXMLDOMAttribute : IXMLDOMNode { [propget, id(DISPID_DOM_ATTRIBUTE_GETNAME)] HRESULT name([retval, out] BSTR *p); @@ -608,7 +608,7 @@ object, uuid (2933BF86-7B36-11d2-B20E-00C04F983E60) ] -interface IXMLDOMElement : IXMLDOMNode +interface IXMLDOMElement : IXMLDOMNode { [propget, id(DISPID_DOM_ELEMENT_GETTAGNAME)] HRESULT tagName([retval, out] BSTR *p); @@ -656,7 +656,7 @@ object, uuid (2933BF87-7B36-11d2-B20E-00C04F983E60) ] -interface IXMLDOMText : IXMLDOMCharacterData +interface IXMLDOMText : IXMLDOMCharacterData { [id(DISPID_DOM_TEXT_SPLITTEXT)] HRESULT splitText( @@ -669,7 +669,7 @@ object, uuid (2933BF88-7B36-11d2-B20E-00C04F983E60) ] -interface IXMLDOMComment : IXMLDOMCharacterData +interface IXMLDOMComment : IXMLDOMCharacterData { } @@ -678,7 +678,7 @@ object, uuid (2933BF89-7B36-11d2-B20E-00C04F983E60) ] -interface IXMLDOMProcessingInstruction : IXMLDOMNode +interface IXMLDOMProcessingInstruction : IXMLDOMNode { [propget, id(DISPID_DOM_PI_TARGET)] HRESULT target([retval, out] BSTR *p); @@ -695,7 +695,7 @@ object, uuid (2933BF8A-7B36-11d2-B20E-00C04F983E60) ] -interface IXMLDOMCDATASection : IXMLDOMText +interface IXMLDOMCDATASection : IXMLDOMText { } @@ -704,7 +704,7 @@ object, uuid (2933BF8B-7B36-11d2-B20E-00C04F983E60) ] -interface IXMLDOMDocumentType : IXMLDOMNode +interface IXMLDOMDocumentType : IXMLDOMNode { [propget, id(DISPID_DOM_DOCUMENTTYPE_NAME)] HRESULT name([retval, out] BSTR *p); @@ -721,7 +721,7 @@ object, uuid (2933BF8C-7B36-11d2-B20E-00C04F983E60) ] -interface IXMLDOMNotation : IXMLDOMNode +interface IXMLDOMNotation : IXMLDOMNode { [propget, id(DISPID_DOM_NOTATION_PUBLICID)] HRESULT publicId([retval, out] VARIANT *id); @@ -735,7 +735,7 @@ object, uuid (2933BF8D-7B36-11d2-B20E-00C04F983E60) ] -interface IXMLDOMEntity : IXMLDOMNode +interface IXMLDOMEntity : IXMLDOMNode { [propget, id(DISPID_DOM_ENTITY_PUBLICID)] HRESULT publicId([retval, out] VARIANT *id1); @@ -752,7 +752,7 @@ object, uuid (2933BF8E-7B36-11d2-B20E-00C04F983E60) ] -interface IXMLDOMEntityReference : IXMLDOMNode +interface IXMLDOMEntityReference : IXMLDOMNode { } @@ -777,55 +777,55 @@ ] interface IXTLRuntime : IXMLDOMNode { - [id(DISPID_XTLRUNTIME_UNIQUEID)] + [id(DISPID_XTLRUNTIME_UNIQUEID)] HRESULT uniqueID( - [in]IXMLDOMNode *pNode, + [in]IXMLDOMNode *pNode, [retval, out]long *pID); [id(DISPID_XTLRUNTIME_DEPTH)] HRESULT depth( - [in] IXMLDOMNode *pNode, + [in] IXMLDOMNode *pNode, [retval, out]long * pDepth); - [id(DISPID_XTLRUNTIME_CHILDNUMBER)] + [id(DISPID_XTLRUNTIME_CHILDNUMBER)] HRESULT childNumber( - [in]IXMLDOMNode *pNode, + [in]IXMLDOMNode *pNode, [retval, out] long *pNumber); [id(DISPID_XTLRUNTIME_ANCESTORCHILDNUMBER)] HRESULT ancestorChildNumber( - [in]BSTR bstr, - [in]IXMLDOMNode *pNode, + [in]BSTR bstr, + [in]IXMLDOMNode *pNode, [retval, out]long *pNumber); [id(DISPID_XTLRUNTIME_ABSOLUTECHILDNUMBER)] HRESULT absoluteChildNumber( - [in]IXMLDOMNode *pNode, + [in]IXMLDOMNode *pNode, [retval, out]long *pNumber); [id(DISPID_XTLRUNTIME_FORMATINDEX)] HRESULT formatIndex( - [in] long lIndex, - [in] BSTR bstr, + [in] long lIndex, + [in] BSTR bstr, [retval, out]BSTR *pbstr); [id(DISPID_XTLRUNTIME_FORMATNUMBER)] HRESULT formatNumber( - [in] double dblNumber, - [in] BSTR bstr, + [in] double dblNumber, + [in] BSTR bstr, [retval, out]BSTR *pbstr); [id(DISPID_XTLRUNTIME_FORMATDATE)] HRESULT formatDate( - [in] VARIANT var1, - [in] BSTR bstr, + [in] VARIANT var1, + [in] BSTR bstr, [optional, in] VARIANT var2, [retval, out]BSTR *pbstr); [id(DISPID_XTLRUNTIME_FORMATTIME)] HRESULT formatTime( - [in] VARIANT var1, - [in] BSTR bstr, + [in] VARIANT var1, + [in] BSTR bstr, [optional, in] VARIANT var2, [retval, out]BSTR *pbstr); @@ -834,14 +834,14 @@ [ uuid(3efaa427-272f-11d2-836f-0000f87a7782) ] -dispinterface XMLDOMDocumentEvents +dispinterface XMLDOMDocumentEvents { properties: methods: - [id (DISPID_XMLDOMEVENT_ONDATAAVAILABLE)] + [id (DISPID_XMLDOMEVENT_ONDATAAVAILABLE)] HRESULT ondataavailable(); - - [id (DISPID_XMLDOMEVENT_ONREADYSTATECHANGE)] + + [id (DISPID_XMLDOMEVENT_ONREADYSTATECHANGE)] HRESULT onreadystatechange(); } @@ -863,7 +863,7 @@ [id(DISPID_XMLDOM_PROCESSOR_SETSTARTMODE)] HRESULT setStartMode( - [in] BSTR p, + [in] BSTR p, [in, defaultvalue("")] BSTR uri); [propget, id(DISPID_XMLDOM_PROCESSOR_STARTMODE)] @@ -890,18 +890,18 @@ [id(DISPID_XMLDOM_PROCESSOR_ADDPARAMETER)] HRESULT addParameter( - [in] BSTR p, - [in] VARIANT var, + [in] BSTR p, + [in] VARIANT var, [in, defaultvalue("")] BSTR uri); [id(DISPID_XMLDOM_PROCESSOR_ADDOBJECT)] HRESULT addObject( - [in] IDispatch* obj, + [in] IDispatch* obj, [in] BSTR uri); [propget, id(DISPID_XMLDOM_PROCESSOR_STYLESHEET)] HRESULT stylesheet([retval, out] IXMLDOMNode **node); -} +} [ local, @@ -919,7 +919,7 @@ [id(DISPID_XMLDOM_TEMPLATE_CREATEPROCESSOR)] HRESULT createProcessor( [retval, out] IXSLProcessor **ppProcessor); -} +} [ local, Added: trunk/reactos/include/psdk/msxml2did.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2did.h?r… ============================================================================== --- trunk/reactos/include/psdk/msxml2did.h (added) +++ trunk/reactos/include/psdk/msxml2did.h Sat Dec 22 01:01:15 2007 @@ -1,0 +1,271 @@ +/* + * Copyright (C) 2005 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __MSXML2DID_H__ +#define __MSXML2DID_H__ + +#define DISPID_DOM_BASE 0x00000001 +#define DISPID_DOM_COLLECTION_BASE 0x000f4240 +#define DISPID_DOM_COLLECTION_MAX 0x002dc6bf + +#define DISPID_DOM_NODE 0x00000001 +#define DISPID_DOM_NODE_NODENAME 0x00000002 +#define DISPID_DOM_NODE_NODEVALUE 0x00000003 +#define DISPID_DOM_NODE_NODETYPE 0x00000004 +#define DISPID_DOM_NODE_NODETYPEENUM 0x00000005 +#define DISPID_DOM_NODE_PARENTNODE 0x00000006 +#define DISPID_DOM_NODE_CHILDNODES 0x00000007 +#define DISPID_DOM_NODE_FIRSTCHILD 0x00000008 +#define DISPID_DOM_NODE_LASTCHILD 0x00000009 +#define DISPID_DOM_NODE_PREVIOUSSIBLING 0x0000000a +#define DISPID_DOM_NODE_NEXTSIBLING 0x0000000b +#define DISPID_DOM_NODE_ATTRIBUTES 0x0000000c +#define DISPID_DOM_NODE_INSERTBEFORE 0x0000000d +#define DISPID_DOM_NODE_REPLACECHILD 0x0000000e +#define DISPID_DOM_NODE_REMOVECHILD 0x0000000f +#define DISPID_DOM_NODE_APPENDCHILD 0x00000010 +#define DISPID_DOM_NODE_HASCHILDNODES 0x00000011 +#define DISPID_DOM_NODE_OWNERDOC 0x00000012 +#define DISPID_DOM_NODE_CLONENODE 0x00000013 + +#define DISPID_XMLDOM_NODE 0x00000014 +#define DISPID_XMLDOM_NODE_STRINGTYPE 0x00000015 +#define DISPID_XMLDOM_NODE_SPECIFIED 0x00000016 +#define DISPID_XMLDOM_NODE_DEFINITION 0x00000017 +#define DISPID_XMLDOM_NODE_TEXT 0x00000018 +#define DISPID_XMLDOM_NODE_NODETYPEDVALUE 0x00000019 +#define DISPID_XMLDOM_NODE_DATATYPE 0x0000001a +#define DISPID_XMLDOM_NODE_XML 0x0000001b +#define DISPID_XMLDOM_NODE_TRANSFORMNODE 0x0000001c +#define DISPID_XMLDOM_NODE_SELECTNODES 0x0000001d +#define DISPID_XMLDOM_NODE_SELECTSINGLENODE 0x0000001e +#define DISPID_XMLDOM_NODE_PARSED 0x0000001f +#define DISPID_XMLDOM_NODE_NAMESPACE 0x00000020 +#define DISPID_XMLDOM_NODE_PREFIX 0x00000021 +#define DISPID_XMLDOM_NODE_BASENAME 0x00000022 +#define DISPID_XMLDOM_NODE_TRANSFORMNODETOOBJECT 0x00000023 +#define DISPID_XMLDOM_NODE__TOP 0x00000024 + +#define DISPID_DOM_DOCUMENT 0x00000025 +#define DISPID_DOM_DOCUMENT_DOCTYPE 0x00000026 +#define DISPID_DOM_DOCUMENT_IMPLEMENTATION 0x00000027 +#define DISPID_DOM_DOCUMENT_DOCUMENTELEMENT 0x00000028 +#define DISPID_DOM_DOCUMENT_CREATEELEMENT 0x00000029 +#define DISPID_DOM_DOCUMENT_CREATEDOCUMENTFRAGMENT 0x0000002a +#define DISPID_DOM_DOCUMENT_CREATETEXTNODE 0x0000002b +#define DISPID_DOM_DOCUMENT_CREATECOMMENT 0x0000002c +#define DISPID_DOM_DOCUMENT_CREATECDATASECTION 0x0000002d +#define DISPID_DOM_DOCUMENT_CREATEPROCESSINGINSTRUCTION 0x0000002e +#define DISPID_DOM_DOCUMENT_CREATEATTRIBUTE 0x0000002f +#define DISPID_DOM_DOCUMENT_CREATEENTITY 0x00000030 +#define DISPID_DOM_DOCUMENT_CREATEENTITYREFERENCE 0x00000031 +#define DISPID_DOM_DOCUMENT_GETELEMENTSBYTAGNAME 0x00000032 +#define DISPID_DOM_DOCUMENT_TOP 0x00000033 + +#define DISPID_XMLDOM_DOCUMENT 0x00000034 +#define DISPID_XMLDOM_DOCUMENT_DOCUMENTNODE 0x00000035 +#define DISPID_XMLDOM_DOCUMENT_CREATENODE 0x00000036 +#define DISPID_XMLDOM_DOCUMENT_CREATENODEEX 0x00000037 +#define DISPID_XMLDOM_DOCUMENT_NODEFROMID 0x00000038 +#define DISPID_XMLDOM_DOCUMENT_DOCUMENTNAMESPACES 0x00000039 +#define DISPID_XMLDOM_DOCUMENT_LOAD 0x0000003a +#define DISPID_XMLDOM_DOCUMENT_PARSEERROR 0x0000003b +#define DISPID_XMLDOM_DOCUMENT_URL 0x0000003c +#define DISPID_XMLDOM_DOCUMENT_ASYNC 0x0000003d +#define DISPID_XMLDOM_DOCUMENT_ABORT 0x0000003e +#define DISPID_XMLDOM_DOCUMENT_LOADXML 0x0000003f +#define DISPID_XMLDOM_DOCUMENT_SAVE 0x00000040 +#define DISPID_XMLDOM_DOCUMENT_VALIDATE 0x00000041 +#define DISPID_XMLDOM_DOCUMENT_RESOLVENAMESPACE 0x00000042 +#define DISPID_XMLDOM_DOCUMENT_PRESERVEWHITESPACE 0x00000043 +#define DISPID_XMLDOM_DOCUMENT_ONREADYSTATECHANGE 0x00000044 +#define DISPID_XMLDOM_DOCUMENT_ONDATAAVAILABLE 0x00000045 +#define DISPID_XMLDOM_DOCUMENT_ONTRANSFORMNODE 0x00000046 +#define DISPID_XMLDOM_DOCUMENT__TOP 0x00000047 + +#define DISPID_DOM_NODELIST 0x00000048 +#define DISPID_DOM_NODELIST_ITEM 0x00000049 +#define DISPID_DOM_NODELIST_LENGTH 0x0000004a +#define DISPID_XMLDOM_NODELIST 0x0000004b +#define DISPID_XMLDOM_NODELIST_NEXTNODE 0x0000004c +#define DISPID_XMLDOM_NODELIST_RESET 0x0000004d +#define DISPID_XMLDOM_NODELIST_NEWENUM 0x0000004e +#define DISPID_XMLDOM_NODELIST__TOP 0x0000004f + +#define DISPID_DOM_NAMEDNODEMAP 0x00000050 +#define DISPID_DOM_NAMEDNODEMAP_GETNAMEDITEM 0x00000053 +#define DISPID_DOM_NAMEDNODEMAP_SETNAMEDITEM 0x00000054 +#define DISPID_DOM_NAMEDNODEMAP_REMOVENAMEDITEM 0x00000055 +#define DISPID_XMLDOM_NAMEDNODEMAP 0x00000056 +#define DISPID_XMLDOM_NAMEDNODEMAP_GETQUALIFIEDITEM 0x00000057 +#define DISPID_XMLDOM_NAMEDNODEMAP_REMOVEQUALIFIEDITEM 0x00000058 +#define DISPID_XMLDOM_NAMEDNODEMAP_NEXTNODE 0x00000059 +#define DISPID_XMLDOM_NAMEDNODEMAP_RESET 0x0000005a +#define DISPID_XMLDOM_NAMEDNODEMAP_NEWENUM 0x0000005b +#define DISPID_XMLDOM_NAMEDNODEMAP__TOP 0x0000005c + +#define DISPID_DOM_W3CWRAPPERS 0x0000005d + +#define DISPID_DOM_DOCUMENTFRAGMENT 0x0000005e +#define DISPID_DOM_DOCUMENTFRAGMENT__TOP 0x0000005f + +#define DISPID_DOM_ELEMENT 0x00000060 +#define DISPID_DOM_ELEMENT_GETTAGNAME 0x00000061 +#define DISPID_DOM_ELEMENT_GETATTRIBUTES 0x00000062 +#define DISPID_DOM_ELEMENT_GETATTRIBUTE 0x00000063 +#define DISPID_DOM_ELEMENT_SETATTRIBUTE 0x00000064 +#define DISPID_DOM_ELEMENT_REMOVEATTRIBUTE 0x00000065 +#define DISPID_DOM_ELEMENT_GETATTRIBUTENODE 0x00000066 +#define DISPID_DOM_ELEMENT_SETATTRIBUTENODE 0x00000067 +#define DISPID_DOM_ELEMENT_REMOVEATTRIBUTENODE 0x00000068 +#define DISPID_DOM_ELEMENT_GETELEMENTSBYTAGNAME 0x00000069 +#define DISPID_DOM_ELEMENT_NORMALIZE 0x0000006a +#define DISPID_DOM_ELEMENT__TOP 0x0000006b + +#define DISPID_DOM_DATA 0x0000006c +#define DISPID_DOM_DATA_DATA 0x0000006d +#define DISPID_DOM_DATA_LENGTH 0x0000006e +#define DISPID_DOM_DATA_SUBSTRING 0x0000006f +#define DISPID_DOM_DATA_APPEND 0x00000070 +#define DISPID_DOM_DATA_INSERT 0x00000071 +#define DISPID_DOM_DATA_DELETE 0x00000072 +#define DISPID_DOM_DATA_REPLACE 0x00000073 +#define DISPID_DOM_DATA__TOP 0x00000074 + +#define DISPID_DOM_ATTRIBUTE 0x00000075 +#define DISPID_DOM_ATTRIBUTE_GETNAME 0x00000076 +#define DISPID_DOM_ATTRIBUTE_SPECIFIED 0x00000077 +#define DISPID_DOM_ATTRIBUTE_VALUE 0x00000078 +#define DISPID_DOM_ATTRIBUTE__TOP 0x00000079 + +#define DISPID_DOM_TEXT 0x0000007a +#define DISPID_DOM_TEXT_SPLITTEXT 0x0000007b +#define DISPID_DOM_TEXT_JOINTEXT 0x0000007c +#define DISPID_DOM_TEXT__TOP 0x0000007d + +#define DISPID_DOM_PI 0x0000007e +#define DISPID_DOM_PI_TARGET 0x0000007f +#define DISPID_DOM_PI_DATA 0x00000080 +#define DISPID_DOM_PI__TOP 0x00000081 + +#define DISPID_DOM_DOCUMENTTYPE 0x00000082 +#define DISPID_DOM_DOCUMENTTYPE_NAME 0x00000083 +#define DISPID_DOM_DOCUMENTTYPE_ENTITIES 0x00000084 +#define DISPID_DOM_DOCUMENTTYPE_NOTATIONS 0x00000085 +#define DISPID_DOM_DOCUMENTTYPE__TOP 0x00000086 + +#define DISPID_DOM_NOTATION 0x00000087 +#define DISPID_DOM_NOTATION_PUBLICID 0x00000088 +#define DISPID_DOM_NOTATION_SYSTEMID 0x00000089 +#define DISPID_DOM_NOTATION__TOP 0x0000008a + +#define DISPID_DOM_ENTITY 0x0000008b +#define DISPID_DOM_ENTITY_PUBLICID 0x0000008c +#define DISPID_DOM_ENTITY_SYSTEMID 0x0000008d +#define DISPID_DOM_ENTITY_NOTATIONNAME 0x0000008e +#define DISPID_DOM_ENTITY__TOP 0x0000008f + +#define DISPID_DOM_W3CWRAPPERS_TOP 0x0000008f + +#define DISPID_DOM_IMPLEMENTATION 0x00000090 +#define DISPID_DOM_IMPLEMENTATION_HASFEATURE 0x00000091 +#define DISPID_DOM_IMPLEMENTATION__TOP 0x00000092 + +#define DISPID_DOM__TOP 0x000000af + +#define DISPID_DOM_ERROR 0x000000b0 +#define DISPID_DOM_ERROR_ERRORCODE 0x000000b1 +#define DISPID_DOM_ERROR_URL 0x000000b2 +#define DISPID_DOM_ERROR_REASON 0x000000b3 +#define DISPID_DOM_ERROR_SRCTEXT 0x000000b4 +#define DISPID_DOM_ERROR_LINE 0x000000b5 +#define DISPID_DOM_ERROR_LINEPOS 0x000000b6 +#define DISPID_DOM_ERROR_FILEPOS 0x000000b7 +#define DISPID_DOM_ERROR__TOP 0x000000b8 + +#define DISPID_XTLRUNTIME 0x000000b9 +#define DISPID_XTLRUNTIME_UNIQUEID 0x000000ba +#define DISPID_XTLRUNTIME_DEPTH 0x000000bb +#define DISPID_XTLRUNTIME_CHILDNUMBER 0x000000bc +#define DISPID_XTLRUNTIME_ANCESTORCHILDNUMBER 0x000000bd +#define DISPID_XTLRUNTIME_ABSOLUTECHILDNUMBER 0x000000be +#define DISPID_XTLRUNTIME_FORMATINDEX 0x000000bf +#define DISPID_XTLRUNTIME_FORMATNUMBER 0x000000c0 +#define DISPID_XTLRUNTIME_FORMATDATE 0x000000c1 +#define DISPID_XTLRUNTIME_FORMATTIME 0x000000c2 +#define DISPID_XTLRUNTIME__TOP 0x000000c3 + +#define DISPID_XMLDOMEVENT 0x000000c4 +#define DISPID_XMLDOMEVENT_ONREADYSTATECHANGE DISPID_READYSTATECHANGE +#define DISPID_XMLDOMEVENT_ONDATAAVAILABLE 0x000000c5 +#define DISPID_XMLDOMEVENT__TOP 0x000000c6 + +#define DISPID_XMLDOM_DOCUMENT2 0x000000c7 +#define DISPID_XMLDOM_DOCUMENT2_NAMESPACES 0x000000c8 +#define DISPID_XMLDOM_DOCUMENT2_SCHEMAS 0x000000c9 +#define DISPID_XMLDOM_DOCUMENT2_VALIDATE 0x000000ca +#define DISPID_XMLDOM_DOCUMENT2_SETPROPERTY 0x000000cb +#define DISPID_XMLDOM_DOCUMENT2_GETPROPERTY 0x000000cc +#define DISPID_XMLDOM_DOCUMENT2__TOP 0x000000cd + +#define DISPID_XMLDOM_SCHEMACOLLECTION 0x00000002 +#define DISPID_XMLDOM_SCHEMACOLLECTION_ADD 0x00000003 +#define DISPID_XMLDOM_SCHEMACOLLECTION_GET 0x00000004 +#define DISPID_XMLDOM_SCHEMACOLLECTION_REMOVE 0x00000005 +#define DISPID_XMLDOM_SCHEMACOLLECTION_LENGTH 0x00000006 +#define DISPID_XMLDOM_SCHEMACOLLECTION_NAMESPACEURI 0x00000007 +#define DISPID_XMLDOM_SCHEMACOLLECTION_ADDCOLLECTION 0x00000008 +#define DISPID_XMLDOM_SCHEMACOLLECTION__TOP 0x00000009 + +#define DISPID_XMLDOM_SELECTION 0x0000000a +#define DISPID_XMLDOM_SELECTION_EXPR 0x0000000b +#define DISPID_XMLDOM_SELECTION_CONTEXT 0x0000000c +#define DISPID_XMLDOM_SELECTION_PEEKNODE 0x0000000d +#define DISPID_XMLDOM_SELECTION_MATCHES 0x0000000e +#define DISPID_XMLDOM_SELECTION_REMOVENEXT 0x0000000f +#define DISPID_XMLDOM_SELECTION_REMOVEALL 0x00000010 +#define DISPID_XMLDOM_SELECTION_CLONE 0x00000011 +#define DISPID_XMLDOM_SELECTION_GETPROPERTY 0x00000012 +#define DISPID_XMLDOM_SELECTION_SETPROPERTY 0x00000013 +#define DISPID_XMLDOM_SELECTION__TOP 0x00000014 + +#define DISPID_XMLDOM_TEMPLATE 0x00000001 +#define DISPID_XMLDOM_TEMPLATE_STYLESHEET 0x00000002 +#define DISPID_XMLDOM_TEMPLATE_CREATEPROCESSOR 0x00000003 +#define DISPID_XMLDOM_TEMPLATE__TOP 0x00000004 + +#define DISPID_XMLDOM_PROCESSOR 0x00000001 +#define DISPID_XMLDOM_PROCESSOR_INPUT 0x00000002 +#define DISPID_XMLDOM_PROCESSOR_XSLTEMPLATE 0x00000003 +#define DISPID_XMLDOM_PROCESSOR_SETSTARTMODE 0x00000004 +#define DISPID_XMLDOM_PROCESSOR_STARTMODE 0x00000005 +#define DISPID_XMLDOM_PROCESSOR_STARTMODEURI 0x00000006 +#define DISPID_XMLDOM_PROCESSOR_OUTPUT 0x00000007 +#define DISPID_XMLDOM_PROCESSOR_TRANSFORM 0x00000008 +#define DISPID_XMLDOM_PROCESSOR_RESET 0x00000009 +#define DISPID_XMLDOM_PROCESSOR_READYSTATE 0x0000000a +#define DISPID_XMLDOM_PROCESSOR_ADDPARAMETER 0x0000000b +#define DISPID_XMLDOM_PROCESSOR_ADDOBJECT 0x0000000c +#define DISPID_XMLDOM_PROCESSOR_STYLESHEET 0x0000000d +#define DISPID_XMLDOM_PROCESSOR__TOP 0x0000000e + +#define DISPID_XMLDSO 0x10000 +#define DISPID_XMLDSO_DOCUMENT 0x10001 +#define DISPID_XMLDSO_JAVADSOCOMPATIBLE 0x10002 + +#endif /* __MSXML2DID_H__ */ Propchange: trunk/reactos/include/psdk/msxml2did.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/msxmldid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxmldid.h?re… ============================================================================== --- trunk/reactos/include/psdk/msxmldid.h (original) +++ trunk/reactos/include/psdk/msxmldid.h Sat Dec 22 01:01:15 2007 @@ -13,7 +13,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __MSXMLDID_H__ Modified: trunk/reactos/include/psdk/ocidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ocidl.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/ocidl.idl (original) +++ trunk/reactos/include/psdk/ocidl.idl Sat Dec 22 01:01:15 2007 @@ -18,11 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "oleidl.idl"; import "oaidl.idl"; import "servprov.idl"; import "urlmon.idl"; - +#endif /***************************************************************************** * IOleControlTypes interface @@ -583,10 +584,10 @@ typedef IProvideMultipleClassInfo *LPPROVIDEMULTIPLECLASSINFO; - HRESULT GetMultiTypeInfoCount( + HRESULT GetMultiTypeInfoCount( [out] ULONG *pcti); - HRESULT GetInfoOfIndex( + HRESULT GetInfoOfIndex( [in] ULONG iti, [in] DWORD dwFlags, [out] ITypeInfo **pptiCoClass, @@ -1156,7 +1157,7 @@ [in] IUnknown * pUnkSite); HRESULT GetSite( - [in] REFIID riid, + [in] REFIID riid, [out, iid_is(riid)] PVOID *ppvSite); } @@ -1243,6 +1244,7 @@ ] interface IOleUndoManager : IUnknown { +cpp_quote("#define SID_SOleUndoManager IID_IOleUndoManager") typedef IOleUndoManager *LPOLEUNDOMANAGER; HRESULT Open( [in] IOleParentUndoUnit *pPUU ); @@ -1285,7 +1287,7 @@ } QACONTAINERFLAGS; typedef DWORD OLE_COLOR; - + typedef struct tagQACONTAINER { ULONG cbSize; Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild (original) +++ trunk/reactos/include/psdk/psdk.rbuild Sat Dec 22 01:01:15 2007 @@ -14,6 +14,7 @@ <file>mlang.idl</file> <file>mshtml.idl</file> <file>msxml.idl</file> + <file>msxml2.idl</file> <file>oaidl.idl</file> <file>objidl.idl</file> <file>objsafe.idl</file> @@ -39,4 +40,6 @@ <file>exdisp.idl</file> <file>wtypes.idl</file> <file>comcat.idl</file> + <file>xmldso.idl</file> + <file>xmldom.idl</file> </module> Added: trunk/reactos/include/psdk/xmldomdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmldomdid.h?r… ============================================================================== --- trunk/reactos/include/psdk/xmldomdid.h (added) +++ trunk/reactos/include/psdk/xmldomdid.h Sat Dec 22 01:01:15 2007 @@ -1,0 +1,186 @@ +/* + * Copyright (C) 2005 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __XMLDOMDID_H__ +#define __XMLDOMDID_H__ + +#define DISPID_DOM_BASE 1 +#define DISPID_DOM_COLLECTION_BASE 1000000 +#define DISPID_DOM_COLLECTION_MAX 2999999 + +#define DISPID_DOM_NODE 1 +#define DISPID_DOM_NODE_NODENAME 2 +#define DISPID_DOM_NODE_NODEVALUE 3 +#define DISPID_DOM_NODE_NODETYPE 4 +#define DISPID_DOM_NODE_NODETYPEENUM 5 +#define DISPID_DOM_NODE_PARENTNODE 6 +#define DISPID_DOM_NODE_CHILDNODES 7 +#define DISPID_DOM_NODE_FIRSTCHILD 8 +#define DISPID_DOM_NODE_LASTCHILD 9 +#define DISPID_DOM_NODE_PREVIOUSSIBLING 10 +#define DISPID_DOM_NODE_NEXTSIBLING 11 +#define DISPID_DOM_NODE_ATTRIBUTES 12 +#define DISPID_DOM_NODE_INSERTBEFORE 13 +#define DISPID_DOM_NODE_REPLACECHILD 14 +#define DISPID_DOM_NODE_REMOVECHILD 15 +#define DISPID_DOM_NODE_APPENDCHILD 16 +#define DISPID_DOM_NODE_HASCHILDNODES 17 +#define DISPID_DOM_NODE_OWNERDOC 18 +#define DISPID_DOM_NODE_CLONENODE 19 + +#define DISPID_XMLDOM_NODE 20 +#define DISPID_XMLDOM_NODE_STRINGTYPE 21 +#define DISPID_XMLDOM_NODE_SPECIFIED 22 +#define DISPID_XMLDOM_NODE_DEFINITION 23 +#define DISPID_XMLDOM_NODE_TEXT 24 +#define DISPID_XMLDOM_NODE_NODETYPEDVALUE 25 +#define DISPID_XMLDOM_NODE_DATATYPE 26 +#define DISPID_XMLDOM_NODE_XML 27 +#define DISPID_XMLDOM_NODE_TRANSFORMNODE 28 +#define DISPID_XMLDOM_NODE_SELECTNODES 29 +#define DISPID_XMLDOM_NODE_SELECTSINGLENODE 30 +#define DISPID_XMLDOM_NODE_PARSED 31 +#define DISPID_XMLDOM_NODE_NAMESPACE 32 +#define DISPID_XMLDOM_NODE_PREFIX 33 +#define DISPID_XMLDOM_NODE_BASENAME 34 +#define DISPID_XMLDOM_NODE_TRANSFORMNODETOOBJECT 35 +#define DISPID_XMLDOM_NODE__TOP 36 + +#define DISPID_DOM_DOCUMENT 37 +#define DISPID_DOM_DOCUMENT_DOCTYPE 38 +#define DISPID_DOM_DOCUMENT_IMPLEMENTATION 39 +#define DISPID_DOM_DOCUMENT_DOCUMENTELEMENT 40 +#define DISPID_DOM_DOCUMENT_CREATEELEMENT 41 +#define DISPID_DOM_DOCUMENT_CREATEDOCUMENTFRAGMENT 42 +#define DISPID_DOM_DOCUMENT_CREATETEXTNODE 43 +#define DISPID_DOM_DOCUMENT_CREATECOMMENT 44 +#define DISPID_DOM_DOCUMENT_CREATECDATASECTION 45 +#define DISPID_DOM_DOCUMENT_CREATEPROCESSINGINSTRUCTION 46 +#define DISPID_DOM_DOCUMENT_CREATEATTRIBUTE 47 +#define DISPID_DOM_DOCUMENT_CREATEENTITY 48 +#define DISPID_DOM_DOCUMENT_CREATEENTITYREFERENCE 49 +#define DISPID_DOM_DOCUMENT_GETELEMENTSBYTAGNAME 50 +#define DISPID_DOM_DOCUMENT_TOP 51 + +#define DISPID_XMLDOM_DOCUMENT 52 +#define DISPID_XMLDOM_DOCUMENT_DOCUMENTNODE 53 +#define DISPID_XMLDOM_DOCUMENT_CREATENODE 54 +#define DISPID_XMLDOM_DOCUMENT_CREATENODEEX 55 +#define DISPID_XMLDOM_DOCUMENT_NODEFROMID 56 +#define DISPID_XMLDOM_DOCUMENT_DOCUMENTNAMESPACES 57 +#define DISPID_XMLDOM_DOCUMENT_LOAD 58 +#define DISPID_XMLDOM_DOCUMENT_PARSEERROR 59 +#define DISPID_XMLDOM_DOCUMENT_URL 60 +#define DISPID_XMLDOM_DOCUMENT_ASYNC 61 +#define DISPID_XMLDOM_DOCUMENT_ABORT 62 +#define DISPID_XMLDOM_DOCUMENT_LOADXML 63 +#define DISPID_XMLDOM_DOCUMENT_SAVE 64 +#define DISPID_XMLDOM_DOCUMENT_VALIDATE 65 +#define DISPID_XMLDOM_DOCUMENT_RESOLVENAMESPACE 66 +#define DISPID_XMLDOM_DOCUMENT_PRESERVEWHITESPACE 67 +#define DISPID_XMLDOM_DOCUMENT_ONREADYSTATECHANGE 68 +#define DISPID_XMLDOM_DOCUMENT_ONDATAAVAILABLE 69 +#define DISPID_XMLDOM_DOCUMENT_ONTRANSFORMNODE 70 +#define DISPID_XMLDOM_DOCUMENT__TOP 71 + +#define DISPID_DOM_NODELIST 72 +#define DISPID_DOM_NODELIST_ITEM 73 +#define DISPID_DOM_NODELIST_LENGTH 74 + +#define DISPID_XMLDOM_NODELIST 75 +#define DISPID_XMLDOM_NODELIST_NEXTNODE 76 +#define DISPID_XMLDOM_NODELIST_RESET 77 +#define DISPID_XMLDOM_NODELIST_NEWENUM 78 +#define DISPID_XMLDOM_NODELIST__TOP 79 + +#define DISPID_DOM_NAMEDNODEMAP 80 +#define DISPID_DOM_NAMEDNODEMAP_GETNAMEDITEM 81 +#define DISPID_DOM_NAMEDNODEMAP_SETNAMEDITEM 82 +#define DISPID_DOM_NAMEDNODEMAP_REMOVENAMEDITEM 83 + +#define DISPID_XMLDOM_NAMEDNODEMAP 84 +#define DISPID_XMLDOM_NAMEDNODEMAP_GETQUALIFIEDITEM 85 +#define DISPID_XMLDOM_NAMEDNODEMAP_REMOVEQUALIFIEDITEM 86 +#define DISPID_XMLDOM_NAMEDNODEMAP_NEXTNODE 87 +#define DISPID_XMLDOM_NAMEDNODEMAP_RESET 88 +#define DISPID_XMLDOM_NAMEDNODEMAP_NEWENUM 89 +#define DISPID_XMLDOM_NAMEDNODEMAP__TOP 90 + +#define DISPID_DOM_W3CWRAPPERS 91 + +#define DISPID_DOM_DOCUMENTFRAGMENT 92 +#define DISPID_DOM_DOCUMENTFRAGMENT__TOP 93 + +#define DISPID_DOM_ELEMENT 94 +#define DISPID_DOM_ELEMENT_GETTAGNAME 95 +#define DISPID_DOM_ELEMENT_GETATTRIBUTES 96 +#define DISPID_DOM_ELEMENT_GETATTRIBUTE 97 +#define DISPID_DOM_ELEMENT_SETATTRIBUTE 98 +#define DISPID_DOM_ELEMENT_REMOVEATTRIBUTE 99 +#define DISPID_DOM_ELEMENT_GETATTRIBUTENODE 100 +#define DISPID_DOM_ELEMENT_SETATTRIBUTENODE 101 +#define DISPID_DOM_ELEMENT_REMOVEATTRIBUTENODE 102 +#define DISPID_DOM_ELEMENT_GETELEMENTSBYTAGNAME 103 +#define DISPID_DOM_ELEMENT_NORMALIZE 104 +#define DISPID_DOM_ELEMENT__TOP 105 + +#define DISPID_DOM_DATA 106 +#define DISPID_DOM_DATA_DATA 107 +#define DISPID_DOM_DATA_LENGTH 108 +#define DISPID_DOM_DATA_SUBSTRING 109 +#define DISPID_DOM_DATA_APPEND 110 +#define DISPID_DOM_DATA_INSERT 111 +#define DISPID_DOM_DATA_DELETE 112 +#define DISPID_DOM_DATA_REPLACE 113 +#define DISPID_DOM_DATA__TOP 114 + +#define DISPID_DOM_ATTRIBUTE 115 +#define DISPID_DOM_ATTRIBUTE_GETNAME 116 +#define DISPID_DOM_ATTRIBUTE_SPECIFIED 117 +#define DISPID_DOM_ATTRIBUTE_VALUE 118 +#define DISPID_DOM_ATTRIBUTE__TOP 119 + +#define DISPID_DOM_TEXT 120 +#define DISPID_DOM_TEXT_SPLITTEXT 121 +#define DISPID_DOM_TEXT_JOINTEXT 122 +#define DISPID_DOM_TEXT__TOP 123 + +#define DISPID_DOM_PI 124 +#define DISPID_DOM_PI_TARGET 125 +#define DISPID_DOM_PI_DATA 126 +#define DISPID_DOM_PI__TOP 127 + +#define DISPID_DOM_DOCUMENTTYPE 128 +#define DISPID_DOM_DOCUMENTTYPE_NAME 129 +#define DISPID_DOM_DOCUMENTTYPE_ENTITIES 130 +#define DISPID_DOM_DOCUMENTTYPE_NOTATIONS 131 +#define DISPID_DOM_DOCUMENTTYPE__TOP 132 + + +#define DISPID_DOM_ERROR 0x000000b0 +#define DISPID_DOM_ERROR_ERRORCODE 0x000000b1 +#define DISPID_DOM_ERROR_URL 0x000000b2 +#define DISPID_DOM_ERROR_REASON 0x000000b3 +#define DISPID_DOM_ERROR_SRCTEXT 0x000000b4 +#define DISPID_DOM_ERROR_LINE 0x000000b5 +#define DISPID_DOM_ERROR_LINEPOS 0x000000b6 +#define DISPID_DOM_ERROR_FILEPOS 0x000000b7 +#define DISPID_DOM_ERROR__TOP 0x000000b8 + + +#endif /* __XMLDOMDID_H__ */ Propchange: trunk/reactos/include/psdk/xmldomdid.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/xmldso.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmldso.idl?re… ============================================================================== --- trunk/reactos/include/psdk/xmldso.idl (original) +++ trunk/reactos/include/psdk/xmldso.idl Sat Dec 22 01:01:15 2007 @@ -35,19 +35,19 @@ ] interface IXMLDSOControl : IDispatch { - [propget,id(DISPID_XMLDSO_DOCUMENT)] + [propget,id(DISPID_XMLDSO_DOCUMENT)] HRESULT XMLDocument([out, retval] IXMLDOMDocument** ppDoc); - [propput,id(DISPID_XMLDSO_DOCUMENT)] + [propput,id(DISPID_XMLDSO_DOCUMENT)] HRESULT XMLDocument([in] IXMLDOMDocument* ppDoc); - [propget,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] + [propget,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] HRESULT JavaDSOCompatible([out, retval] BOOL* fJavaDSOCompatible); - [propput,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] + [propput,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] HRESULT JavaDSOCompatible([in] BOOL fJavaDSOCompatible); - [propget, id(DISPID_READYSTATE)] + [propget, id(DISPID_READYSTATE)] HRESULT readyState([out, retval] long *state); } Added: trunk/reactos/include/psdk/xmldsodid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmldsodid.h?r… ============================================================================== --- trunk/reactos/include/psdk/xmldsodid.h (added) +++ trunk/reactos/include/psdk/xmldsodid.h Sat Dec 22 01:01:15 2007 @@ -1,0 +1,30 @@ +/* + * Copyright (C) 2005 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __XMLDSODID_H__ +#define __XMLDSODID_H__ + +#define DISPID_XOBJ_MIN 0x00010000 +#define DISPID_XOBJ_MAX 0x0001FFFF +#define DISPID_XOBJ_BASE 0x00010000 + +#define DISPID_XMLDSO 0x00010000 +#define DISPID_XMLDSO_DOCUMENT 0x00010001 +#define DISPID_XMLDSO_JAVADSOCOMPATIBLE 0x00010002 + +#endif /* __XMLDSODID_H__ */ Propchange: trunk/reactos/include/psdk/xmldsodid.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 31379: - Give language picker listbox a consistent size - Give the language selection page a meaningful description TODO: add a language ID field to the MUI_LANGUAGE structure and store it's value on the registry ("HKEY_CURRENT_USER\Keyboard Layout\Preload" and/or "HKEY_CURRENT_MACHINE\SYSTEM\CurrentControlSet\Control\NLS\Language")
by mpiulachs＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: mpiulachs Date: Sat Dec 22 00:51:05 2007 New Revision: 31379 URL: http://svn.reactos.org/svn/reactos?rev=31379&view=rev Log: - Give language picker listbox a consistent size - Give the language selection page a meaningful description TODO: add a language ID field to the MUI_LANGUAGE structure and store it's value on the registry ("HKEY_CURRENT_USER\Keyboard Layout\Preload" and/or "HKEY_CURRENT_MACHINE\SYSTEM\CurrentControlSet\Control\NLS\Language") Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/en-US.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Sat Dec 22 00:51:05 2007 @@ -556,10 +556,10 @@ } DrawGenericList(LanguageList, - 7, - 15, - xScreen - 10, - yScreen - 10); + 2, + 18, + xScreen - 3, + yScreen - 3); MUIDisplayPage(LANGUAGE_PAGE); Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Sat Dec 22 00:51:05 2007 @@ -7,7 +7,25 @@ { 6, 8, - "Select your language:", + "Language Selection.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", TEXT_NORMAL }, {

1 0

[cfinck] 31378: Changes by Carlo Bramini (carlo.bramix@libero.it): - Convert the app from ANSI to TCHAR and enable Unicode compilation in the .rbuild file - Dialog procedures now return INT_PTR instead of BOOL - IDS_NOBODY has been added to the resource files - Fixed a bug in SetDifficulty(): If custom selection, then no changes are done if the user presses the CANCEL button. - Show mines in the end board in all mine boxes, which you previously marked with the QUESTION state, when you lost the g
by cfinck＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: cfinck Date: Sat Dec 22 00:29:57 2007 New Revision: 31378 URL: http://svn.reactos.org/svn/reactos?rev=31378&view=rev Log: Changes by Carlo Bramini (carlo.bramix(a)libero.it): - Convert the app from ANSI to TCHAR and enable Unicode compilation in the .rbuild file - Dialog procedures now return INT_PTR instead of BOOL - IDS_NOBODY has been added to the resource files - Fixed a bug in SetDifficulty(): If custom selection, then no changes are done if the user presses the CANCEL button. - Show mines in the end board in all mine boxes, which you previously marked with the QUESTION state, when you lost the game - Added an accelerator table - Define the WineMine root registry key in just one place as a constant rather than a #define, point it to the Software\Microsoft\WinMine key - Code simplifications Changes by me: - Make our registry settings compatible with the MS WinMine settings, since we write into the WinMine registry key now - Remove the WINE_STRICT check, which was needed to avoid an ancient WINE bug, but doesn't affect our tree. I also replaced all NULL_HANDLE's by NULL. - Remove the IDS_APPNAME string, we use "WineMine" as a static constant for the application name now - Remove the unused "mb" variable from the BOARD structure - Load all resources by ID, not by name - Add a manifest for enabling Common Controls 6.0 - Use ShellAbout instead of a custom About dialog - Use a consistent indentation and consistent variable namings and types See issue #2815 for more details. Added: trunk/reactos/base/applications/games/winemine/manifest.xml (with props) Modified: trunk/reactos/base/applications/games/winemine/dialog.c trunk/reactos/base/applications/games/winemine/dialog.h trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc trunk/reactos/base/applications/games/winemine/lang/ca-ES.rc trunk/reactos/base/applications/games/winemine/lang/de-DE.rc trunk/reactos/base/applications/games/winemine/lang/el-GR.rc trunk/reactos/base/applications/games/winemine/lang/en-US.rc trunk/reactos/base/applications/games/winemine/lang/es-ES.rc trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc trunk/reactos/base/applications/games/winemine/lang/id-ID.rc trunk/reactos/base/applications/games/winemine/lang/it-IT.rc trunk/reactos/base/applications/games/winemine/lang/lt-LT.rc trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc trunk/reactos/base/applications/games/winemine/lang/th-TH.rc trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc trunk/reactos/base/applications/games/winemine/main.c trunk/reactos/base/applications/games/winemine/main.h trunk/reactos/base/applications/games/winemine/resource.h trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/games/winemine/winemine.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/games/winemine/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/dialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winemine/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/winemine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…

1 0

[fireball] 31377: - Remove ctype.h introduced in revision 1213 by David Welch. For quite a long time there is a proper version of ctype.h in ReactOS CRT.
by fireball＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: fireball Date: Fri Dec 21 18:43:48 2007 New Revision: 31377 URL: http://svn.reactos.org/svn/reactos?rev=31377&view=rev Log: - Remove ctype.h introduced in revision 1213 by David Welch. For quite a long time there is a proper version of ctype.h in ReactOS CRT. Removed: trunk/reactos/ntoskrnl/include/internal/ctype.h Removed: trunk/reactos/ntoskrnl/include/internal/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ctype.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ctype.h (removed) @@ -1,45 +1,0 @@ -#ifndef _CTYPE_H -#define _CTYPE_H - -#define __need_wchar_t -#define __need_wint_t -#include <stddef.h> - -/* - * The following flags are used to tell iswctype and _isctype what character - * types you are looking for. - */ - -#define _UPPER 0x0001 -#define _LOWER 0x0002 -#define _DIGIT 0x0004 -#define _SPACE 0x0008 /* HT LF VT FF CR SP */ -#define _PUNCT 0x0010 -#define _CONTROL 0x0020 -#define _BLANK 0x0040 /* this is SP only, not SP and HT as in C99 */ -#define _HEX 0x0080 -#define _LEADBYTE 0x8000 - -#define _ALPHA 0x0103 - -#ifndef _WCTYPE_T_DEFINED -typedef wchar_t wctype_t; -#define _WCTYPE_T_DEFINED -#endif - - -#if defined(_MSC_VER) -#define inline __inline -typedef wchar_t wint_t; -#endif - -extern inline int isspace(int c); -extern inline int toupper(int c); -extern inline int tolower(int c); -extern inline int islower(int c); -extern inline int isdigit(int c); -extern inline int isxdigit(int c); -extern inline int isprint(int c); -extern inline int isalpha(int c); - -#endif

1 0

[fireball] 31376: - Isolate Hal* #defines, which are absent in WDK, they should not be used in kernel development.
by fireball＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: fireball Date: Fri Dec 21 17:58:18 2007 New Revision: 31376 URL: http://svn.reactos.org/svn/reactos?rev=31376&view=rev Log: - Isolate Hal* #defines, which are absent in WDK, they should not be used in kernel development. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/fstub/disksup.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Fri Dec 21 17:58:18 2007 @@ -3016,11 +3016,6 @@ #define HalQuerySystemInformation HALDISPATCH->HalQuerySystemInformation #define HalSetSystemInformation HALDISPATCH->HalSetSystemInformation #define HalQueryBusSlots HALDISPATCH->HalQueryBusSlots -#define HalDeviceControl HALDISPATCH->HalDeviceControl -#define HalIoAssignDriveLetters HALDISPATCH->HalIoAssignDriveLetters -#define HalIoReadPartitionTable HALDISPATCH->HalIoReadPartitionTable -#define HalIoSetPartitionInformation HALDISPATCH->HalIoSetPartitionInformation -#define HalIoWritePartitionTable HALDISPATCH->HalIoWritePartitionTable #define HalReferenceHandlerForBus HALDISPATCH->HalReferenceHandlerForBus #define HalReferenceBusHandler HALDISPATCH->HalReferenceBusHandler #define HalDereferenceBusHandler HALDISPATCH->HalDereferenceBusHandler @@ -3033,6 +3028,14 @@ #define HalMirrorPhysicalMemory HALDISPATCH->HalMirrorPhysicalMemory #define HalEndOfBoot HALDISPATCH->HalEndOfBoot #define HalMirrorVerify HALDISPATCH->HalMirrorVerify + +#ifndef _NTOSKRNL_ +#define HalDeviceControl HALDISPATCH->HalDeviceControl +#define HalIoAssignDriveLetters HALDISPATCH->HalIoAssignDriveLetters +#define HalIoReadPartitionTable HALDISPATCH->HalIoReadPartitionTable +#define HalIoSetPartitionInformation HALDISPATCH->HalIoSetPartitionInformation +#define HalIoWritePartitionTable HALDISPATCH->HalIoWritePartitionTable +#endif typedef enum _FILE_INFORMATION_CLASS { FileDirectoryInformation = 1, Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Fri Dec 21 17:58:18 2007 @@ -2228,10 +2228,10 @@ IN ULONG MbrTypeIdentifier, OUT PVOID *MbrBuffer) { - HalDispatchTable.HalExamineMBR(DeviceObject, - SectorSize, - MbrTypeIdentifier, - MbrBuffer); + HALDISPATCH->HalExamineMBR(DeviceObject, + SectorSize, + MbrTypeIdentifier, + MbrBuffer); } /* @@ -2244,10 +2244,10 @@ IN BOOLEAN ReturnRecognizedPartitions, IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) { - return HalIoReadPartitionTable(DeviceObject, - SectorSize, - ReturnRecognizedPartitions, - PartitionBuffer); + return HALDISPATCH->HalIoReadPartitionTable(DeviceObject, + SectorSize, + ReturnRecognizedPartitions, + PartitionBuffer); } /* @@ -2260,10 +2260,10 @@ IN ULONG PartitionNumber, IN ULONG PartitionType) { - return HalIoSetPartitionInformation(DeviceObject, - SectorSize, - PartitionNumber, - PartitionType); + return HALDISPATCH->HalIoSetPartitionInformation(DeviceObject, + SectorSize, + PartitionNumber, + PartitionType); } /* @@ -2277,11 +2277,11 @@ IN ULONG NumberOfHeads, IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) { - return HalIoWritePartitionTable(DeviceObject, - SectorSize, - SectorsPerTrack, - NumberOfHeads, - PartitionBuffer); + return HALDISPATCH->HalIoWritePartitionTable(DeviceObject, + SectorSize, + SectorsPerTrack, + NumberOfHeads, + PartitionBuffer); } /* @@ -2294,10 +2294,10 @@ OUT PUCHAR NtSystemPath, OUT PSTRING NtSystemPathString) { - HalIoAssignDriveLetters(LoaderBlock, - NtDeviceName, - NtSystemPath, - NtSystemPathString); + HALDISPATCH->HalIoAssignDriveLetters(LoaderBlock, + NtDeviceName, + NtSystemPath, + NtSystemPathString); } /* EOF */

1 0

[hpoussin] 31375: Rename ASMCODE to ROS_KERNEL_ENTRY_POINT
by hpoussin＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: hpoussin Date: Fri Dec 21 17:57:31 2007 New Revision: 31375 URL: http://svn.reactos.org/svn/reactos?rev=31375&view=rev Log: Rename ASMCODE to ROS_KERNEL_ENTRY_POINT Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Fri Dec 21 17:57:31 2007 @@ -34,7 +34,7 @@ ULONG_PTR KernelBase; /* Kernel Entrypoint in Virtual Memory */ -ULONG_PTR KernelEntryPoint; +ROS_KERNEL_ENTRY_POINT KernelEntryPoint; /* Page Directory and Tables for non-PAE Systems */ extern PAGE_DIRECTORY_X86 startup_pagedirectory; @@ -108,7 +108,6 @@ FrLdrSetupPae(ULONG Magic) { ULONG_PTR PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectory; - ASMCODE PagedJump; /* Set the PDBR */ __writecr3(PageDirectoryBaseAddress); @@ -117,8 +116,7 @@ __writecr0(__readcr0() | X86_CR0_PG | X86_CR0_WP); /* Jump to Kernel */ - PagedJump = (ASMCODE)(PVOID)(KernelEntryPoint); - PagedJump(Magic, &LoaderBlock); + (*KernelEntryPoint)(Magic, &LoaderBlock); } /*++ Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h Fri Dec 21 17:57:31 2007 @@ -100,7 +100,7 @@ ULONG_PTR NTAPI FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize); BOOLEAN NTAPI FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); VOID NTAPI FrLdrStartup(ULONG Magic); -typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock); +typedef VOID (FASTCALL *ROS_KERNEL_ENTRY_POINT)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock); PVOID NTAPI Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Fri Dec 21 17:57:31 2007 @@ -42,7 +42,8 @@ CHAR SystemRoot[255]; static CHAR szLoadingMsg[] = "Loading ReactOS..."; BOOLEAN FrLdrBootType; -extern ULONG_PTR KernelBase, KernelEntryPoint; +extern ULONG_PTR KernelBase; +extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; BOOLEAN FrLdrLoadDriver(PCHAR szFileName, @@ -772,7 +773,7 @@ /* Get the NT header, kernel base and kernel entry */ NtHeader = RtlImageNtHeader(LoadBase); KernelBase = SWAPD(NtHeader->OptionalHeader.ImageBase); - KernelEntryPoint = KernelBase + SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint); + KernelEntryPoint = (ROS_KERNEL_ENTRY_POINT)(KernelBase + SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint)); LoaderBlock.KernelBase = KernelBase; /* Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Fri Dec 21 17:57:31 2007 @@ -34,7 +34,8 @@ char szBootPath[256]; char szHalName[256]; CHAR SystemRoot[255]; -extern ULONG_PTR KernelBase, KernelEntryPoint; +extern ULONG_PTR KernelBase; +extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; extern BOOLEAN FrLdrLoadDriver(PCHAR szFileName, INT nPos); @@ -86,7 +87,7 @@ /* Get the NT header, kernel base and kernel entry */ NtHeader = RtlImageNtHeader(LoadBase); KernelBase = NtHeader->OptionalHeader.ImageBase; - KernelEntryPoint = KernelBase + NtHeader->OptionalHeader.AddressOfEntryPoint; + KernelEntryPoint = (ROS_KERNEL_ENTRY_POINT)(KernelBase + NtHeader->OptionalHeader.AddressOfEntryPoint); LoaderBlock.KernelBase = KernelBase; /* Update Processbar and return success */

1 0

[hpoussin] 31374: Add VIDEO_DRIVER_INIT_FAILURE
by hpoussin＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: hpoussin Date: Fri Dec 21 17:56:52 2007 New Revision: 31374 URL: http://svn.reactos.org/svn/reactos?rev=31374&view=rev Log: Add VIDEO_DRIVER_INIT_FAILURE Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.mc?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.mc (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.mc Fri Dec 21 17:56:52 2007 @@ -1154,6 +1154,14 @@ The system is booting in safemode - Directory Services Repair . +MessageId=0xB4 +Severity=Success +Facility=System +SymbolicName=VIDEO_DRIVER_INIT_FAILURE +Language=English +VIDEO_DRIVER_INIT_FAILURE +. + MessageId=0xB7 Severity=Informational Facility=System

1 0

[jimtabor] 31373: fix build
by jimtabor＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: jimtabor Date: Fri Dec 21 17:02:37 2007 New Revision: 31373 URL: http://svn.reactos.org/svn/reactos?rev=31373&view=rev Log: fix build Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Fri Dec 21 17:02:37 2007 @@ -143,7 +143,7 @@ typedef struct _UNIVERSAL_FONT_ID { DWORD dwUfid[2]; -} UNIVERSAL_FONT_ID *PUNIVERSAL_FONT_ID; +} UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs