Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[greatlrd] 26918: adding dmodshow.idl compatible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 27 May '07

27 May '07

Author: greatlrd Date: Sun May 27 15:38:03 2007 New Revision: 26918 URL: http://svn.reactos.org/svn/reactos?rev=26918&view=rev Log: adding dmodshow.idl compatible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/dmodshow.idl (with props) Removed: trunk/reactos/include/dxsdk/dmodshow.h Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild Removed: trunk/reactos/include/dxsdk/dmodshow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmodshow.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dmodshow.h (original) +++ trunk/reactos/include/dxsdk/dmodshow.h (removed) @@ -1,100 +1,0 @@ - - -#ifndef __REQUIRED_RPCNDR_H_VERSION__ - #define __REQUIRED_RPCNDR_H_VERSION__ 475 -#endif - -#include "rpc.h" -#include "rpcndr.h" - -#ifndef __RPCNDR_H_VERSION__ - #error this stub requires an updated version of <rpcndr.h> -#endif - -#ifndef COM_NO_WINDOWS_H - #include "windows.h" - #include "ole2.h" -#endif - -#ifndef __dmodshow_h__ - #define __dmodshow_h__ - -#if defined(_MSC_VER) && (_MSC_VER >= 1020) - #pragma once -#endif - -#ifndef __IDMOWrapperFilter_FWD_DEFINED__ - #define __IDMOWrapperFilter_FWD_DEFINED__ - typedef interface IDMOWrapperFilter IDMOWrapperFilter; -#endif - -#include "unknwn.h" -#include "objidl.h" -#include "mediaobj.h" - -#ifdef __cplusplus -extern "C"{ -#endif - -DEFINE_GUID(CLSID_DMOWrapperFilter, 0x94297043,0xBD82,0x4DFD,0xB0,0xDE,0x81,0x77,0x73,0x9C,0x6D,0x20); -DEFINE_GUID(CLSID_DMOFilterCategory,0xBCD5796C,0xBD52,0x4D30,0xAB,0x76,0x70,0xF9,0x75,0xB8,0x91,0x99); - -extern RPC_IF_HANDLE __MIDL_itf_dmodshow_0000_v0_0_c_ifspec; -extern RPC_IF_HANDLE __MIDL_itf_dmodshow_0000_v0_0_s_ifspec; - -void * __RPC_USER MIDL_user_allocate(size_t); -void __RPC_USER MIDL_user_free( void * ); - -#ifndef __IDMOWrapperFilter_INTERFACE_DEFINED__ - #define __IDMOWrapperFilter_INTERFACE_DEFINED__ - EXTERN_C const IID IID_IDMOWrapperFilter; - #if defined(__cplusplus) && !defined(CINTERFACE) - MIDL_INTERFACE("52D6F586-9F0F-4824-8FC8-E32CA04930C2") - IDMOWrapperFilter : public IUnknown - { - public: - virtual HRESULT STDMETHODCALLTYPE Init(REFCLSID clsidDMO, REFCLSID catDMO) = 0; - }; - #else - typedef struct IDMOWrapperFilterVtbl - { - BEGIN_INTERFACE - HRESULT ( STDMETHODCALLTYPE *QueryInterface )(IDMOWrapperFilter * This, REFIID riid, void **ppvObject); - ULONG ( STDMETHODCALLTYPE *AddRef )(IDMOWrapperFilter * This); - ULONG ( STDMETHODCALLTYPE *Release )(IDMOWrapperFilter * This); - HRESULT ( STDMETHODCALLTYPE *Init )(IDMOWrapperFilter * This, REFCLSID clsidDMO, REFCLSID catDMO); - END_INTERFACE - } IDMOWrapperFilterVtbl; - - interface IDMOWrapperFilter - { - CONST_VTBL struct IDMOWrapperFilterVtbl *lpVtbl; - }; - - #ifdef COBJMACROS - #define IDMOWrapperFilter_QueryInterface(This,riid,ppvObject) (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) - #define IDMOWrapperFilter_AddRef(This) (This)->lpVtbl -> AddRef(This) - #define IDMOWrapperFilter_Release(This) (This)->lpVtbl -> Release(This) - #define IDMOWrapperFilter_Init(This,clsidDMO,catDMO) (This)->lpVtbl -> Init(This,clsidDMO,catDMO) - #endif - #endif - -HRESULT STDMETHODCALLTYPE -IDMOWrapperFilter_Init_Proxy( - IDMOWrapperFilter * This, - REFCLSID clsidDMO, - REFCLSID catDMO); - - -void __RPC_STUB - IDMOWrapperFilter_Init_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); -#endif - -#ifdef __cplusplus -} -#endif -#endif Added: trunk/reactos/include/dxsdk/dmodshow.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmodshow.idl… ============================================================================== --- trunk/reactos/include/dxsdk/dmodshow.idl (added) +++ trunk/reactos/include/dxsdk/dmodshow.idl Sun May 27 15:38:03 2007 @@ -1,0 +1,18 @@ + + +import "unknwn.idl"; +import "objidl.idl"; +import "mediaobj.idl"; + +cpp_quote("DEFINE_GUID(CLSID_DMOWrapperFilter, 0x94297043,0xbd82,0x4dfd,0xb0,0xde,0x81,0x77,0x73,0x9c,0x6d,0x20);") +cpp_quote("DEFINE_GUID(CLSID_DMOFilterCategory, 0xbcd5796c,0xbd52,0x4d30,0xab,0x76,0x70,0xf9,0x75,0xb8,0x91,0x99);") + +[ + object, + uuid(52d6f586-9f0f-4824-8fc8-e32ca04930c2), +] +interface IDMOWrapperFilter : IUnknown +{ + HRESULT Init(REFCLSID clsidDMO, REFCLSID catDMO); +} + Propchange: trunk/reactos/include/dxsdk/dmodshow.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild Sun May 27 15:38:03 2007 @@ -2,13 +2,13 @@ <file>amstream.idl</file> <file>austream.idl</file> <file>ddstream.idl</file> + <file>dmodshow.idl</file> <file>mixerocx.idl</file> <file>mediaobj.idl</file> <file>medparam.idl</file> <file>mmstream.idl</file> <file>regbag.idl</file> + <file>tvratings.idl</file> <file>vidcap.idl</file> <file>Videoacc.idl</file> - <file>tvratings.idl</file> - </module>

1 0

[greatlrd] 26917: adding tvratings.idl compatible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 27 May '07

27 May '07

Author: greatlrd Date: Sun May 27 15:31:37 2007 New Revision: 26917 URL: http://svn.reactos.org/svn/reactos?rev=26917&view=rev Log: adding tvratings.idl compatible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/tvratings.idl Modified: trunk/reactos/include/dxsdk/ (props changed) trunk/reactos/include/dxsdk/dxsdk.rbuild Propchange: trunk/reactos/include/dxsdk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun May 27 15:31:37 2007 @@ -7,3 +7,5 @@ Videoacc.h mediaobj.h medparam.h +regbag.h +tvratings.h Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild Sun May 27 15:31:37 2007 @@ -9,4 +9,6 @@ <file>regbag.idl</file> <file>vidcap.idl</file> <file>Videoacc.idl</file> + <file>tvratings.idl</file> + </module> Added: trunk/reactos/include/dxsdk/tvratings.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/tvratings.id… ============================================================================== --- trunk/reactos/include/dxsdk/tvratings.idl (added) +++ trunk/reactos/include/dxsdk/tvratings.idl Sun May 27 15:31:37 2007 @@ -1,0 +1,181 @@ + +import "oaidl.idl"; +import "ocidl.idl"; + +typedef enum +{ + MPAA = 0, + US_TV = 1, + Canadian_English = 2, + Canadian_French = 3, + Reserved4 = 4, + System5 = 5, + System6 = 6, + Reserved7 = 7, + TvRat_kSystems = 8, + TvRat_SystemDontKnow = 255 +} EnTvRat_System; + + +typedef enum +{ + TvRat_0 = 0, + TvRat_1 = 1, + TvRat_2 = 2, + TvRat_3 = 3, + TvRat_4 = 4, + TvRat_5 = 5, + TvRat_6 = 6, + TvRat_7 = 7, + TvRat_kLevels = 8, + TvRat_LevelDontKnow = 255 +} EnTvRat_GenericLevel; + + +typedef enum +{ + MPAA_NotApplicable = TvRat_0, + MPAA_G = TvRat_1, + MPAA_PG = TvRat_2, + MPAA_PG13 = TvRat_3, + MPAA_R = TvRat_4, + MPAA_NC17 = TvRat_5, + MPAA_X = TvRat_6, + MPAA_NotRated = TvRat_7 +} EnTvRat_MPAA; + +typedef enum +{ + US_TV_None = TvRat_0, + US_TV_Y = TvRat_1, + US_TV_Y7 = TvRat_2, + US_TV_G = TvRat_3, + US_TV_PG = TvRat_4, + US_TV_14 = TvRat_5, + US_TV_MA = TvRat_6, + US_TV_None7 = TvRat_7 +} EnTvRat_US_TV; + +typedef enum +{ + CAE_TV_Exempt = TvRat_0, + CAE_TV_C = TvRat_1, + CAE_TV_C8 = TvRat_2, + CAE_TV_G = TvRat_3, + CAE_TV_PG = TvRat_4, + CAE_TV_14 = TvRat_5, + CAE_TV_18 = TvRat_6, + CAE_TV_Reserved = TvRat_7 +} EnTvRat_CAE_TV; + +typedef enum +{ + CAF_TV_Exempt = TvRat_0, + CAF_TV_G = TvRat_1, + CAF_TV_8 = TvRat_2, + CAF_TV_13 = TvRat_3, + CAF_TV_16 = TvRat_4, + CAF_TV_18 = TvRat_5, + CAF_TV_Reserved6 = TvRat_6, + CAF_TV_Reserved = TvRat_7 +} EnTvRat_CAF_TV; + +typedef enum +{ + BfAttrNone = 0, + BfIsBlocked = 1, + BfIsAttr_1 = 2, + BfIsAttr_2 = 4, + BfIsAttr_3 = 8, + BfIsAttr_4 = 16, + BfIsAttr_5 = 32, + BfIsAttr_6 = 64, + BfIsAttr_7 = 128, + BfValidAttrSubmask = 255 +} BfEnTvRat_GenericAttributes; + +typedef enum +{ + US_TV_IsBlocked = BfIsBlocked, + US_TV_IsViolent = BfIsAttr_1, + US_TV_IsSexualSituation = BfIsAttr_2, + US_TV_IsAdultLanguage = BfIsAttr_3, + US_TV_IsSexuallySuggestiveDialog = BfIsAttr_4, + US_TV_ValidAttrSubmask = 31 +} BfEnTvRat_Attributes_US_TV; + +typedef enum +{ + MPAA_IsBlocked = BfIsBlocked, + MPAA_ValidAttrSubmask = 1 +} BfEnTvRat_Attributes_MPAA; + +typedef enum +{ + CAE_IsBlocked = BfIsBlocked, + CAE_ValidAttrSubmask = 1 +} BfEnTvRat_Attributes_CAE_TV; + +typedef enum +{ + CAF_IsBlocked = BfIsBlocked, + CAF_ValidAttrSubmask = 1 +} BfEnTvRat_Attributes_CAF_TV; + + +[ + object, + uuid(C5C5C5B0-3ABC-11D6-B25B-00C04FA0C026), + dual, + pointer_default(unique) +] +interface IXDSToRat : IDispatch +{ + [id(1)] + HRESULT Init(); + [id(2)] + HRESULT ParseXDSBytePair([in] BYTE byte1, [in] BYTE byte2, [out] EnTvRat_System *pEnSystem, [out] EnTvRat_GenericLevel *pEnLevel, [out] LONG *plBfEnAttributes); +}; + + +[ + object, + uuid(C5C5C5B1-3ABC-11D6-B25B-00C04FA0C026), + dual, + pointer_default(unique) +] +interface IEvalRat : IDispatch +{ + [propget, id(1)] + HRESULT BlockedRatingAttributes([in] EnTvRat_System enSystem, [in] EnTvRat_GenericLevel enLevel, [out, retval] LONG *plbfAttrs); + [propput, id(1)] + HRESULT BlockedRatingAttributes([in] EnTvRat_System enSystem, [in] EnTvRat_GenericLevel enLevel, [in] LONG lbfAttrs); + [propget, id(2)] + HRESULT BlockUnRated([out, retval] BOOL *pfBlockUnRatedShows); + [propput, id(2)] + HRESULT BlockUnRated([in] BOOL fBlockUnRatedShows); + [id(3)] + HRESULT MostRestrictiveRating([in] EnTvRat_System enSystem1, [in] EnTvRat_GenericLevel enEnLevel1, [in] LONG lbfEnAttr1, [in] EnTvRat_System enSystem2, [in] EnTvRat_GenericLevel enEnLevel2, [in] LONG lbfEnAttr2, [out] EnTvRat_System *penSystem, [out] EnTvRat_GenericLevel *penEnLevel, [out] LONG *plbfEnAttr); + [id(4)] + HRESULT TestRating([in] EnTvRat_System enShowSystem, [in] EnTvRat_GenericLevel enShowLevel, [in] LONG lbfEnShowAttributes); + +}; + +[uuid(C5C5C500-3ABC-11D6-B25B-00C04FA0C026)] +library TVRATINGSLib +{ + importlib("stdole32.tlb"); + importlib("stdole2.tlb"); + + [uuid(C5C5C5F0-3ABC-11D6-B25B-00C04FA0C026)] + coclass XDSToRat + { + [default] interface IXDSToRat; + }; + [uuid(C5C5C5F1-3ABC-11D6-B25B-00C04FA0C026)] + coclass EvalRat + { + [default] interface IEvalRat; + }; +}; +

1 0

[frik85] 26916: ReactOS translation service: * SQL import dump (structure only) (the structure may change in near future)
by frik85＠svn.reactos.org 27 May '07

27 May '07

Author: frik85 Date: Sun May 27 15:11:40 2007 New Revision: 26916 URL: http://svn.reactos.org/svn/reactos?rev=26916&view=rev Log: ReactOS translation service: * SQL import dump (structure only) (the structure may change in near future) Added: trunk/web/reactos.org/sql/rost.sql Added: trunk/web/reactos.org/sql/rost.sql URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/sql/rost.sql?rev=2… ============================================================================== --- trunk/web/reactos.org/sql/rost.sql (added) +++ trunk/web/reactos.org/sql/rost.sql Sun May 27 15:11:40 2007 @@ -1,0 +1,59 @@ +-- phpMyAdmin SQL Dump +-- version 2.9.1.1 +-- http://www.phpmyadmin.net +-- +-- Host: localhost +-- Erstellungszeit: 27. Mai 2007 um 13:01 +-- Server Version: 5.0.27 +-- PHP-Version: 5.2.0 +-- +-- Datenbank: `rost` +-- + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `apps` +-- + +CREATE TABLE `apps` ( + `app_id` bigint(20) NOT NULL auto_increment, + `app_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `app_path` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `app_enabled` char(1) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`app_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `languages` +-- + +CREATE TABLE `languages` ( + `lang_id` varchar(5) collate utf8_unicode_ci NOT NULL, + `lang_code` varchar(2) collate utf8_unicode_ci NOT NULL, + `lang_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `lang_name_native` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `lang_active` char(1) collate utf8_unicode_ci NOT NULL default '0', + `lang_quantifier` varchar(1) collate utf8_unicode_ci NOT NULL default '3', + PRIMARY KEY (`lang_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `translations` +-- + +CREATE TABLE `translations` ( + `xml_id` bigint(20) NOT NULL auto_increment, + `app_id` bigint(20) NOT NULL default '0', + `xml_lang` varchar(5) collate utf8_unicode_ci NOT NULL default '', + `xml_rev` int(11) NOT NULL default '0', + `xml_content` longtext collate utf8_unicode_ci NOT NULL, + `trans_checked` char(1) collate utf8_unicode_ci NOT NULL default '0', + `trans_active` char(1) collate utf8_unicode_ci NOT NULL default '0', + `trans_datetime` datetime NOT NULL, + PRIMARY KEY (`xml_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

1 0

[frik85] 26915: RosCMS update: * SQL import dump (structure only)
by frik85＠svn.reactos.org 27 May '07

27 May '07

Author: frik85 Date: Sun May 27 15:07:11 2007 New Revision: 26915 URL: http://svn.reactos.org/svn/reactos?rev=26915&view=rev Log: RosCMS update: * SQL import dump (structure only) Added: trunk/web/reactos.org/sql/roscms_v2_old.sql Modified: trunk/web/reactos.org/sql/roscms.sql Modified: trunk/web/reactos.org/sql/roscms.sql URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/sql/roscms.sql?rev… ============================================================================== --- trunk/web/reactos.org/sql/roscms.sql (original) +++ trunk/web/reactos.org/sql/roscms.sql Sun May 27 15:07:11 2007 @@ -1,14 +1,21 @@ --- --- Database: RosCMS --- - --- -------------------------------------------------------- - --- --- Table structure for table `content` --- - -DROP TABLE IF EXISTS `content`; +-- phpMyAdmin SQL Dump +-- version 2.9.2 +-- http://www.phpmyadmin.net +-- +-- Host: localhost +-- Erstellungszeit: 27. Mai 2007 um 13:02 +-- Server Version: 5.0.33 +-- PHP-Version: 5.2.1 +-- +-- Datenbank: `roscms` +-- + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `content` +-- + CREATE TABLE `content` ( `content_id` bigint(20) NOT NULL auto_increment, `content_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', @@ -23,34 +30,198 @@ `content_usrname_id` bigint(20) NOT NULL default '0', `content_date` date NOT NULL default '0000-00-00', `content_time` time NOT NULL default '00:00:00', + `content_altered` varchar(1) collate utf8_unicode_ci NOT NULL default '0', PRIMARY KEY (`content_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents'; - --- --- Data for table`content` --- - -INSERT INTO `content` (`content_id`, `content_name`, `content_lang`, `content_text`, `content_version`, `content_active`, `content_visible`, `content_type`, `content_description`, `content_editor`, `content_usrname_id`, `content_date`, `content_time`) VALUES (31, 'index', 'all', '<h1>ReactOS Content Management System - Test Page</h1>\r\n<p>English start page</p>', 1, 1, 1, 'default', '', 'richtext', 2, '2005-12-05', '11:48:43'), -(2, 'bottom', 'all', '</div></td>\r\n </tr>\r\n</table>\r\n\r\n\r\n<hr style="height: 1px;"/>\r\n\r\n<address style="text-align:center;">\r\n ReactOS is a registered trademark or a trademark of ReactOS Foundation in the United States and other countries.</address>\r\n</body>\r\n</html> ', 1, 1, 1, 'layout', '', '', 2, '2005-09-19', '23:15:40'), -(21, 'menu_top', 'all', '<div id="top">\r\n <div id="topMenu"> \r\n \r\n <p style="text-align:left;"> \r\n <a href="[#link_index]">Home</a> <span style="color: #ffffff">|</span> \r\n <a href="[#link_news]">News</a> <span style="color: #ffffff">|</span> \r\n <a href="[#link_sitemap]">Sitemap</a></p>\r\n </div>\r\n </div>', 1, 1, 1, 'default', '2005-12-21 20:01:24 [2] |', '', 2, '2005-12-05', '11:49:02'), -(24, 'menu_side', 'all', '<table style="border:0" width="100%" cellpadding="0" cellspacing="0">\r\n <tr valign="top">\r\n <td style="width:147px" id="leftNav"> \r\n <div class="navTitle">Navigation</div>\r\n <ol>\r\n <li><a href="[#link_index]">Home</a></li>\r\n <li><a href="[#link_news]">News</a></li>\r\n <li><a href="[#link_sitemap]">Sitemap</a></li>\r\n </ol>\r\n <p></p>\r\n ', 1, 1, 1, 'default', '2005-12-21 20:01:51 [2] |', '', 2, '2005-12-05', '11:48:53'), -(96, 'head', 'all', '<?xml version="1.0" encoding="[#inc_charset]"?>\r\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r\n "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="[#roscms_language_short]" >\r\n\r\n<head>\r\n <title>ReactOS Homepage - [#roscms_pagetitle]</title>\r\n \r\n <meta http-equiv="Content-Type" content="application/xml" />\r\n <meta http-equiv="pics-label" content=''(pics-1.1 "http://www.icra.org/ratingsv02.html" l gen true for "http://www.reactos.com/" r (cz 1 lz 1 nz 1 oz 1 vz 1))'' />\r\n <meta http-equiv="Pragma" content="no-cache" />\r\n <meta name="Publisher" content="ReactOS Web Team" />\r\n <meta name="Copyright" content="ReactOS Foundation" />\r\n <meta name="generator" content="RosCMS" />\r\n <meta name="Keywords" content="reactos, ros, ros32, win32 ros64, roscms, operating system, wiki, forum, download, information, support database, compatibility database, compatibility, package database, reactos package manager, reactos content management system, reactos 0.1, reactos 0.2, reactos 0.3, ros 0.1, ros 0.2, ros 0.3" />\r\n <meta name="Description" content="ReactOS Homepage - ..." />\r\n <meta name="Page-topic" content="Betriebssystem, Computer, Software, downloads" />\r\n <meta name="Audience" content="all" />\r\n <meta name="Content-language" content="DE" />\r\n <meta name="Page-type" content="Operating System/Information/News" />\r\n <meta name="Robots" content="index,follow" />\r\n \r\n <link rel="SHORTCUT ICON" href="[#roscms_path_homepage]favicon.ico" />\r\n <link rel="alternate" type="application/rss+xml" title="ReactOS News Feed (RSS)" href="[#roscms_path_homepage]reactos.rdf" />\r\n <link href="[#roscms_path_homepage]style.css" type="text/css" rel="stylesheet" />\r\n</head>\r\n<body>', 2, 1, 1, 'layout', '2005-12-21 19:17:16 [2] |', '', 2, '2005-09-19', '23:38:29'), -(228, 'menu_misc', 'all', '<div class="navTitle">Latest Update</div> \r\n <ol>\r\n <li><div style="text-align:center;">[#roscms_date] [#roscms_time]</div></li>\r\n </ol> \r\n <p> </p>\r\n </td>\r\n\r\n <td id="content"><div class="contentSmall"> ', 1, 1, 1, 'default', '', '', 2, '2005-12-21', '19:16:47'), -(229, 'sidebar_right', 'all', '</div></td>\r\n\r\n <td id="rightNav">\r\n<h1>Latest Release</h1>\r\n<p><strong>Version [#inc_reactos_version]</strong>\r\n</p>\r\n', 8, 1, 1, 'default', '2005-12-21 19:50:38 [2] |', '', 2, '2005-12-21', '19:18:36'), -(230, 'contmenu_home', 'all', '<div class="navTitle">Home</div> \r\n<ol> \r\n <li><a href="[#link_index]">Front Page</a></li>\r\n <li><a href="[#link_news]">News</a></li>\r\n <li><a href="[#link_sitemap]">Sitemap</a></li>\r\n</ol>\r\n<p></p>', 4, 1, 1, 'default', '2005-12-21 20:02:26 [2] |', '', 2, '2005-12-21', '19:20:34'), -(120, 'menu_search', 'all', ' <div class="navTitle">Search</div> \r\n <div class="navBox"><form method="get" action="http://www.google.com/search" style="padding:0;margin:0">\r\n <div style="text-align:center;">\r\n\r\n <input name="q" value="" size="12" maxlength="80" class="searchInput" type="text" /><input name="domains" value="http://www.reactos.org" type="hidden" /><input name="sitesearch" value="http://www.reactos.org" type="hidden" />\r\n <input name="btnG" value="Go" type="submit" class="button" />\r\n\r\n </div></form>\r\n </div>\r\n<p></p>', 2, 1, 1, 'default', '', '', 2, '2005-11-09', '23:04:31'), -(128, 'index', 'de', '<h1>ReactOS Content Management System - Test Page</h1>\r\n<p>German start page</p>', 1, 1, 1, 'default', '', 'richtext', 1, '2005-11-29', '20:14:46'), -(152, 'menu_language', 'all', '<div class="navTitle">Language</div> \r\n <div class="navBox"> \r\n <form method="post" action="[#roscms_path_homepage]?page=[#roscms_pagename]&forma=[#roscms_format]&lang=" style="padding:0;margin:0">\r\n <div style="text-align:center;"> \r\n <select id="lang" size="1" name="lang" class="selectbox" style="width:110px" onchange="window.open(''[#roscms_path_homepage]?page=[#roscms_pagename]&forma=[#roscms_format]&lang='' + this.options[this.selectedIndex].value,''_main'')">\r\n <optgroup label="current language"> \r\n <option value="#" selected="selected">[#roscms_language]</option>\r\n </optgroup>\r\n <optgroup label="most popular"> \r\n <option value="en">English</option>\r\n <option value="de">Deutsch (German)</option>\r\n </optgroup>\r\n </select>\r\n <input name="langsubmit" type="submit" id="langsubmit" value=">" />\r\n </div>\r\n </form>\r\n </div>\r\n<p></p>', 3, 1, 1, 'layout', '2005-12-21 20:00:23 [2] |', '', 2, '2005-11-10', '21:48:20'), -(220, 'contmenu_home', 'de', '<div class="navTitle">Startseite</div> \r\n<ol> \r\n <li><a href="[#link_index]">Startseite</a></li>\r\n <li><a href="[#link_news]">Neuigkeiten</a></li>\r\n <li><a href="[#link_sitemap]">Sitemap</a></li> \r\n</ol>\r\n<p></p>', 3, 1, 1, 'default', '2005-12-21 20:02:35 [2] |', '', 15, '2005-12-07', '21:24:40'), -(222, 'sidebar_right', 'all', '</div></td>\r\n\r\n <td id="rightNav">\r\n[#inc_javascript_screenshot]\r\n <a href="[#link_screenshots]">More Screenshots</a><br />\r\n <a href="[#link_tour]">Take a look at the ReactOS Tour</a>\r\n</div><br />\r\n<h1>Latest Release</h1>\r\n<p><strong>Version [#inc_reactos_version]</strong><br />\r\n <a href="[#link_download]">Download Now!</a><br />\r\n <a href="[#link_dev_changelogs]">Changelog</a>\r\n</p>\r\n[#inc_template_news_latest]\r\n[#inc_template_newsletter_latest]\r\n<div class="contentSmall">\r\n <span class="contentSmallTitle">Developer Quotes</span>\r\n\r\n[#inc_javascript_quote]', 7, 0, 1, 'default', '', '', 2, '2005-12-07', '21:30:53'); - --- -------------------------------------------------------- - --- --- Table structure for table `dyn_content` --- - -DROP TABLE IF EXISTS `dyn_content`; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents'; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `data_` +-- + +CREATE TABLE `data_` ( + `data_id` int(11) NOT NULL auto_increment, + `data_name` varchar(100) collate utf8_unicode_ci NOT NULL COMMENT 'together with page_type unique entries', + `data_type` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT '"page", "layout", "content", "script"', + PRIMARY KEY (`data_id`), + KEY `data_name` (`data_name`,`data_type`), + KEY `data_type` (`data_type`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='all RosCMS v2 "pages", "content", "dyncontent" and "inctext"'; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `data_revision` +-- + +CREATE TABLE `data_revision` ( + `rev_id` int(11) NOT NULL auto_increment COMMENT 'unique revisions id', + `data_id` int(11) NOT NULL, + `rev_version` int(11) NOT NULL COMMENT 'version number increase with every entry change', + `rev_language` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT 'language code ("en", "de", etc.)', + `rev_usrid` int(11) NOT NULL COMMENT 'user id who saved the entry', + `rev_datetime` datetime NOT NULL, + `rev_date` date NOT NULL, + `rev_time` time NOT NULL, + PRIMARY KEY (`rev_id`), + KEY `data_id` (`data_id`), + KEY `rev_language` (`rev_language`), + KEY `rev_version` (`rev_version`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `data_revision_a` +-- + +CREATE TABLE `data_revision_a` ( + `rev_id` int(11) NOT NULL auto_increment COMMENT 'unique revisions id', + `data_id` int(11) NOT NULL, + `rev_version` int(11) NOT NULL COMMENT 'version number increase with every entry change', + `rev_language` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT 'language code ("en", "de", etc.)', + `rev_usrid` int(11) NOT NULL COMMENT 'user id who saved the entry', + `rev_datetime` datetime NOT NULL, + `rev_date` date NOT NULL, + `rev_time` time NOT NULL, + PRIMARY KEY (`rev_id`), + KEY `data_id` (`data_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `data_stext` +-- + +CREATE TABLE `data_stext` ( + `stext_id` int(11) NOT NULL auto_increment, + `data_rev_id` int(11) NOT NULL, + `stext_name` varchar(100) collate utf8_unicode_ci NOT NULL, + `stext_content` varchar(255) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`stext_id`), + KEY `data_rev_id` (`data_rev_id`), + FULLTEXT KEY `stext_content` (`stext_content`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `data_stext_a` +-- + +CREATE TABLE `data_stext_a` ( + `stext_id` int(11) NOT NULL auto_increment, + `data_rev_id` int(11) NOT NULL, + `stext_name` varchar(100) collate utf8_unicode_ci NOT NULL, + `stext_content` varchar(255) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`stext_id`), + FULLTEXT KEY `stext_content` (`stext_content`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `data_tag` +-- + +CREATE TABLE `data_tag` ( + `tag_id` int(11) NOT NULL auto_increment, + `data_id` int(11) NOT NULL, + `data_rev_id` int(11) NOT NULL, + `tag_name_id` int(11) NOT NULL, + `tag_value_id` int(11) NOT NULL, + `tag_usrid` int(11) NOT NULL, + PRIMARY KEY (`tag_id`), + KEY `data_id` (`data_id`), + KEY `data_rev_id` (`data_rev_id`), + KEY `tag_name_id` (`tag_name_id`), + KEY `tag_value_id` (`tag_value_id`), + KEY `tag_usrid` (`tag_usrid`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `data_tag_name` +-- + +CREATE TABLE `data_tag_name` ( + `tn_id` int(11) NOT NULL auto_increment, + `tn_name` varchar(100) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`tn_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `data_tag_value` +-- + +CREATE TABLE `data_tag_value` ( + `tv_id` int(11) NOT NULL auto_increment, + `tv_value` varchar(255) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`tv_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `data_text` +-- + +CREATE TABLE `data_text` ( + `text_id` int(11) NOT NULL auto_increment, + `data_rev_id` int(11) NOT NULL, + `text_name` varchar(100) collate utf8_unicode_ci NOT NULL, + `text_content` text collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`text_id`), + KEY `data_rev_id` (`data_rev_id`), + FULLTEXT KEY `text_content` (`text_content`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `data_text_a` +-- + +CREATE TABLE `data_text_a` ( + `text_id` int(11) NOT NULL auto_increment, + `data_rev_id` int(11) NOT NULL, + `text_name` varchar(100) collate utf8_unicode_ci NOT NULL, + `text_content` text collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`text_id`), + FULLTEXT KEY `text_content` (`text_content`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `data_user_filter` +-- + +CREATE TABLE `data_user_filter` ( + `filt_id` int(11) NOT NULL auto_increment, + `filt_usrid` int(11) NOT NULL, + `filt_title` varchar(50) collate utf8_unicode_ci NOT NULL, + `filt_type` smallint(6) NOT NULL default '1', + `filt_string` varchar(255) collate utf8_unicode_ci NOT NULL, + `filt_datetime` datetime NOT NULL, + `filt_usage` int(11) NOT NULL, + `filt_usagedate` datetime NOT NULL, + PRIMARY KEY (`filt_id`), + KEY `filt_usrid` (`filt_usrid`), + KEY `filt_name` (`filt_title`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `dyn_content` +-- + CREATE TABLE `dyn_content` ( `dyn_id` bigint(20) NOT NULL auto_increment, `dyn_content_id` bigint(20) NOT NULL default '0', @@ -68,22 +239,16 @@ `dyn_content_usrname_id` bigint(20) NOT NULL default '0', `dyn_content_date` date NOT NULL default '0000-00-00', `dyn_content_time` time NOT NULL default '00:00:00', + `dyn_altered` varchar(1) collate utf8_unicode_ci NOT NULL default '0', PRIMARY KEY (`dyn_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents'; - --- --- Data for table`dyn_content` --- - -INSERT INTO `dyn_content` (`dyn_id`, `dyn_content_id`, `dyn_content_nr`, `dyn_content_name`, `dyn_content_lang`, `dyn_content_text1`, `dyn_content_text2`, `dyn_content_text3`, `dyn_content_text4`, `dyn_content_version`, `dyn_content_active`, `dyn_content_visible`, `dyn_content_editor`, `dyn_content_usrname_id`, `dyn_content_date`, `dyn_content_time`) VALUES (28, 1, 1, 'news_page', 'all', 'RosCMS test news', '', 'RosCMS test news description', '<p><b><u>RosCMS</u></b> test news content</p> ...', 0, 1, 1, '', 2, '2005-12-21', '19:53:14'); - --- -------------------------------------------------------- - --- --- Table structure for table `include_text` --- - -DROP TABLE IF EXISTS `include_text`; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents'; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `include_text` +-- + CREATE TABLE `include_text` ( `inc_id` bigint(20) NOT NULL auto_increment, `inc_level` tinyint(4) NOT NULL default '0', @@ -96,50 +261,28 @@ `inc_usrname_id` bigint(20) NOT NULL default '0', `inc_date` date NOT NULL default '0000-00-00', `inc_time` time NOT NULL default '00:00:00', + `inc_altered` varchar(1) collate utf8_unicode_ci NOT NULL default '0', PRIMARY KEY (`inc_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Replace words with text phrases'; - --- --- Data for table`include_text` --- - -INSERT INTO `include_text` (`inc_id`, `inc_level`, `inc_word`, `inc_text`, `inc_lang`, `inc_extra`, `inc_vis`, `inc_seclevel`, `inc_usrname_id`, `inc_date`, `inc_time`) VALUES (48, 15, 'template_news_detail', '<?php\r\n if ( !defined("ROSCMS_SYSTEM") ) {\r\n define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity\r\n }\r\n\r\n include("db/connect_db.inc.php"); // database connection script\r\n\r\n $query_content = mysql_query("SELECT * \r\n FROM `dyn_content` \r\n WHERE 1 AND `dyn_content_name` = ''news_page'' AND `dyn_content_id` = ''$roscms_template_var_pageid''\r\n ORDER BY `dyn_content_nr` ASC Limit 1") ;\r\n \r\n $result_content = mysql_fetch_array($query_content);\r\n $roscms_usrnameid = $result_content["dyn_content_usrname_id"];\r\n $query_usraccount= mysql_query("SELECT * \r\n FROM `users` \r\n WHERE `user_id` = ".$roscms_usrnameid." LIMIT 1");\r\n $result_usraccount=mysql_fetch_array($query_usraccount);\r\n?>\r\n<h1><a href="[#link_index]">Home</a> > <a href="[#link_news]">ReactOS News</a> > News: <?php echo $result_content["dyn_content_text1"]; ?> #<?php echo $roscms_template_var_pageid; ?></h1> \r\n <p><strong><?php echo $result_content["dyn_content_text3"]; ?></strong></p>\r\n <p><i>by <?php echo $result_usraccount[''user_name'']; ?> on <?php echo $result_content[''dyn_content_date'']; ?></i></p>\r\n<?php echo $result_content[''dyn_content_text4'']; ?>\r\n<p><a href="[#link_news]">News Archive</a></p>', 'all', 'template_php', 1, 50, 1, '2005-12-21', '19:55:14'), -(19, 10, 'path_homepage_media', '[#roscms_path_homepage]media/', 'all', '', 1, 50, 0, '2005-07-13', '18:00:35'), -(20, 15, 'path_homepage_media_pictures', '[#roscms_path_homepage]media/pictures/', 'all', '', 1, 50, 0, '2005-07-13', '18:00:35'), -(23, 15, 'template_news', '<h1><a href="[#link_index]">Home</a> > ReactOS News</h1>\r\n<?php\r\n if ( !defined("ROSCMS_SYSTEM") ) {\r\n define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity\r\n }\r\n\r\n include("db/connect_db.inc.php"); // database connection script\r\n\r\n\r\n $query_content = mysql_query("SELECT * \r\n FROM `dyn_content` \r\n WHERE 1 AND `dyn_content_name` = ''news_page'' AND `dyn_content_nr` = ''1''\r\n ORDER BY `dyn_content_id` DESC ") ;\r\n \r\n while($result_content = mysql_fetch_array($query_content)) { // content\r\n $roscms_usrnameid = $result_content["dyn_content_usrname_id"];\r\n $query_usraccount= mysql_query("SELECT * \r\n FROM `users` \r\n WHERE `user_id` = ".$roscms_usrnameid." LIMIT 0 , 1");\r\n $result_usraccount=mysql_fetch_array($query_usraccount);\r\n?>\r\n\r\n<p><b><a href="<?php echo "[#link_".$result_content["dyn_content_name"]."_".$result_content["dyn_content_id"]."]"; ?>"><?php echo $result_content["dyn_content_text1"]; ?></a></b>\r\n<br><?php echo $result_content[''dyn_content_text3'']; ?>\r\n<br><i>by <?php echo $result_usraccount[''user_name'']; ?> on <?php echo $result_content[''dyn_content_date'']; ?></i></p>\r\n <?php \r\n } // end while\r\n?>\r\n', 'all', 'template_php', 1, 50, 0, '2005-07-30', '11:50:18'), -(26, 0, 'reactos_version', '0.2.8', 'all', '', 1, 50, 1, '2005-08-13', '16:18:56'), -(27, 15, 'template_sitemap', '<h1><a href="[#link_index]">Home</a> > Sitemap</h1>\r\n<?php\r\n if ( !defined("ROSCMS_SYSTEM") ) {\r\n define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity\r\n }\r\n\r\n include("db/connect_db.inc.php"); // database connection script\r\n\r\n\r\n $query_sitemap = mysql_query("SELECT * \r\n FROM pages\r\n WHERE page_active = ''1'' AND page_visible = ''1'' AND (page_language = ''all'' OR page_language = ''en'')\r\n ORDER BY ''page_name'' ASC") ;\r\n \r\n while($result_sitemap = mysql_fetch_array($query_sitemap)) { // content\r\n if ($result_sitemap[''page_description''] != "") {\r\n?>\r\n\r\n<p><b><a href="<?php echo "[#link_".$result_sitemap[''page_name'']."]"; ?>"><?php echo ucfirst($result_sitemap[''page_title'']); ?></a></b>\r\n<br><i><?php echo $result_sitemap[''page_description'']; ?></i></p>\r\n <?php\r\n } \r\n } // end while\r\n?>\r\n', 'all', 'template_php', 1, 50, 0, '2005-08-13', '20:58:04'), -(34, 0, 'charset', 'utf-8', 'all', '', 1, 50, 1, '2005-08-27', '15:54:16'), -(39, 15, 'path_homepage_media_screenshots', '[#roscms_path_homepage]media/screenshots/', 'all', '', 1, 50, 0, '2005-07-13', '18:00:35'); - --- -------------------------------------------------------- - --- --- Table structure for table `languages` --- - -DROP TABLE IF EXISTS `languages`; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Replace words with text phrases'; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `languages` +-- + CREATE TABLE `languages` ( `lang_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', `lang_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', `lang_level` int(11) NOT NULL default '0' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='available languages'; --- --- Data for table`languages` --- - -INSERT INTO `languages` (`lang_id`, `lang_name`, `lang_level`) -VALUES ('en', 'English', 10), -('de', 'German', 8); - --- -------------------------------------------------------- - --- --- Table structure for table `pages` --- - -DROP TABLE IF EXISTS `pages`; +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `pages` +-- + CREATE TABLE `pages` ( `page_id` bigint(20) NOT NULL auto_increment, `page_name` varchar(50) collate utf8_unicode_ci NOT NULL default '', @@ -155,27 +298,19 @@ `page_time` time NOT NULL default '00:00:00', `page_generate_usrid` bigint(20) NOT NULL default '0', `page_generate_timestamp` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `page_generate_force` char(1) collate utf8_unicode_ci NOT NULL default '0', `page_title` varchar(150) collate utf8_unicode_ci NOT NULL default '', `page_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', - PRIMARY KEY (`page_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Pages'; - --- --- Data for table`pages` --- - -INSERT INTO `pages` (`page_id`, `page_name`, `page_language`, `pages_extra`, `pages_extention`, `page_text`, `page_version`, `page_active`, `page_visible`, `page_usrname_id`, `page_date`, `page_time`, `page_generate_usrid`, `page_generate_timestamp`, `page_title`, `page_description`) VALUES (6, 'news_page', 'all', 'dynamic', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_contmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#cont_menu_misc]\r\n\r\n[#inc_template_news_detail]\r\n\r\n[#cont_bottom]', 1, 1, 1, 1, '2005-09-12', '18:50:20', 1, '1135191757', 'News', ''), -(7, 'news', 'all', '', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_contmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#cont_menu_misc]\r\n\r\n[#inc_template_news]\r\n\r\n[#cont_bottom]', 1, 1, 1, 1, '2005-09-12', '18:50:28', 1, '1135191757', 'News', 'News page: latest ReactOS news, rss news feed'), -(9, 'index', 'all', '', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_contmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#cont_menu_misc]\r\n\r\n[#cont_index]\r\n\r\n[#cont_sidebar_right]\r\n[#cont_bottom]', 1, 1, 1, 1, '2005-12-21', '19:21:43', 1, '1135191757', 'Frontpage', 'Frontpage'), -(91, 'sitemap', 'all', '', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_contmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#cont_menu_misc]\r\n\r\n[#inc_template_sitemap]\r\n\r\n[#cont_bottom]\r\n', 1, 1, 1, 1, '2005-12-21', '19:58:07', 1, '1135191757', 'Sitemap', 'Sitemap page'); - --- -------------------------------------------------------- - --- --- Table structure for table `roscms_security_log` --- - -DROP TABLE IF EXISTS `roscms_security_log`; + PRIMARY KEY (`page_id`), + KEY `page_generate_force` (`page_generate_force`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Pages'; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `roscms_security_log` +-- + CREATE TABLE `roscms_security_log` ( `roscms_sec_log_id` bigint(20) NOT NULL auto_increment, `roscms_sec_log_section` varchar(100) collate utf8_unicode_ci NOT NULL default '', @@ -190,20 +325,14 @@ `roscms_sec_log_time` time NOT NULL default '00:00:00', `roscms_sec_log_visible` int(11) NOT NULL default '1', PRIMARY KEY (`roscms_sec_log_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS Security Log'; - --- --- Data for table`roscms_security_log` --- - - --- -------------------------------------------------------- - --- --- Table structure for table `subsys_mappings` --- - -DROP TABLE IF EXISTS `subsys_mappings`; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS Security Log'; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `subsys_mappings` +-- + CREATE TABLE `subsys_mappings` ( `map_roscms_userid` bigint(20) NOT NULL default '0', `map_subsys_name` varchar(10) character set utf8 NOT NULL default '', @@ -211,14 +340,12 @@ PRIMARY KEY (`map_roscms_userid`,`map_subsys_name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `user_sessions` --- - -DROP TABLE IF EXISTS `user_sessions`; +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `user_sessions` +-- + CREATE TABLE `user_sessions` ( `usersession_id` varchar(32) character set utf8 NOT NULL default '' COMMENT 'Unique ID of this session', `usersession_user_id` bigint(20) NOT NULL default '0' COMMENT 'User this session belongs to', @@ -229,37 +356,23 @@ PRIMARY KEY (`usersession_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0 COMMENT='Sessions'; - --- -------------------------------------------------------- - --- --- Table structure for table `usergroup_members` --- - -DROP TABLE IF EXISTS `usergroup_members`; +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `usergroup_members` +-- + CREATE TABLE `usergroup_members` ( `usergroupmember_userid` bigint(20) NOT NULL default '0', `usergroupmember_usergroupid` varchar(10) collate utf8_unicode_ci NOT NULL default 'user' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- --- Data for table`usergroup_members` --- - -INSERT INTO `usergroup_members` (`usergroupmember_userid`, `usergroupmember_usergroupid`) -VALUES (1, 'ros_sadmin'), -(1, 'developer'), -(1, 'translator'), -(1, 'moderator'), -(1, 'user'); - --- -------------------------------------------------------- - --- --- Table structure for table `usergroups` --- - -DROP TABLE IF EXISTS `usergroups`; +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `usergroups` +-- + CREATE TABLE `usergroups` ( `usrgroup_name_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', `usrgroup_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', @@ -270,26 +383,12 @@ UNIQUE KEY `usrgroup_name` (`usrgroup_name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- --- Data for table`usergroups` --- - -INSERT INTO `usergroups` (`usrgroup_name_id`, `usrgroup_name`, `usrgroup_intern_id`, `usrgroup_securitylevel`, `usrgroup_description`) VALUES ('ros_admin', 'Administrator', 'roscms_usrgrp_admin', 70, 'Administrator-Group: manage the ReactOS homepage (content, database)'), -('user', 'User', 'roscms_usrgrp_user', 0, 'Normal Visitors'), -('developer', 'Developer', 'roscms_usrgrp_dev', 50, 'ReactOS Developer: persons with svn commit access'), -('moderator', 'Moderator', 'roscms_usrgrp_team', 20, 'Homepage Moderators: for compatibility & package manager database, etc.'), -('translator', 'Translator', 'roscms_usrgrp_trans', 10, 'Homepage Translators: translate the homepage content'), -('ros_sadmin', 'Super-Administrator', 'roscms_usrgrp_sadmin', 100, 'Super-Administrator-Group: manage the ReactOS homepage (content, database, etc.); only persons who know what they are doing ...'), -('mediateam', 'Media-Team', 'roscms_usrgrp_team', 20, 'Media-Team members: UI-Team, etc.'), -('test', 'Test-User', 'roscms_usrgrp_team', 10, 'RosCMS tester group'); - --- -------------------------------------------------------- - --- --- Table structure for table `users` --- - -DROP TABLE IF EXISTS `users`; +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur fÃ¼r Tabelle `users` +-- + CREATE TABLE `users` ( `user_id` bigint(20) NOT NULL auto_increment, `user_name` varchar(20) collate utf8_unicode_ci NOT NULL default '', @@ -316,11 +415,4 @@ PRIMARY KEY (`user_id`), UNIQUE KEY `user_name` (`user_name`), UNIQUE KEY `user_email` (`user_email`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS User Table'; - --- --- Data for table`users` --- - -INSERT INTO `users` (`user_id`, `user_name`, `user_roscms_password`, `user_roscms_getpwd_id`, `user_timestamp_touch`, `user_timestamp_touch2`, `user_login_counter`, `user_account_enabled`, `user_account_hidden`, `user_register`, `user_fullname`, `user_email`, `user_website`, `user_language`, `user_country`, `user_timezone`, `user_occupation`, `user_description`, `user_setting_multisession`, `user_setting_browseragent`, `user_setting_ipaddress`, `user_setting_timeout`) -VALUES (1, 'roscms_user', '', '', '', '2005-12-08 20:02:50', 1, 'yes', 'yes', '2005-08-20 20:18:06', 'ReactOS Content Management System Default User', 'ros-dev(a)reactos.org', 'http://www.reactos.org', 'en', '', '', '', 'RosCMS Default User', 'true', 'false', 'false', 'true'); +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS User Table'; Added: trunk/web/reactos.org/sql/roscms_v2_old.sql URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/sql/roscms_v2_old.… ============================================================================== --- trunk/web/reactos.org/sql/roscms_v2_old.sql (added) +++ trunk/web/reactos.org/sql/roscms_v2_old.sql Sun May 27 15:07:11 2007 @@ -1,0 +1,326 @@ +-- +-- Database: RosCMS +-- + +-- -------------------------------------------------------- + +-- +-- Table structure for table `content` +-- + +DROP TABLE IF EXISTS `content`; +CREATE TABLE `content` ( + `content_id` bigint(20) NOT NULL auto_increment, + `content_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `content_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', + `content_text` text collate utf8_unicode_ci NOT NULL, + `content_version` int(11) NOT NULL default '0', + `content_active` tinyint(4) NOT NULL default '0', + `content_visible` tinyint(4) NOT NULL default '0', + `content_type` varchar(10) collate utf8_unicode_ci NOT NULL default 'default', + `content_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `content_editor` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `content_usrname_id` bigint(20) NOT NULL default '0', + `content_date` date NOT NULL default '0000-00-00', + `content_time` time NOT NULL default '00:00:00', + PRIMARY KEY (`content_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents'; + +-- +-- Data for table`content` +-- + +INSERT INTO `content` (`content_id`, `content_name`, `content_lang`, `content_text`, `content_version`, `content_active`, `content_visible`, `content_type`, `content_description`, `content_editor`, `content_usrname_id`, `content_date`, `content_time`) VALUES (31, 'index', 'all', '<h1>ReactOS Content Management System - Test Page</h1>\r\n<p>English start page</p>', 1, 1, 1, 'default', '', 'richtext', 2, '2005-12-05', '11:48:43'), +(2, 'bottom', 'all', '</div></td>\r\n </tr>\r\n</table>\r\n\r\n\r\n<hr style="height: 1px;"/>\r\n\r\n<address style="text-align:center;">\r\n ReactOS is a registered trademark or a trademark of ReactOS Foundation in the United States and other countries.</address>\r\n</body>\r\n</html> ', 1, 1, 1, 'layout', '', '', 2, '2005-09-19', '23:15:40'), +(21, 'menu_top', 'all', '<div id="top">\r\n <div id="topMenu"> \r\n \r\n <p style="text-align:left;"> \r\n <a href="[#link_index]">Home</a> <span style="color: #ffffff">|</span> \r\n <a href="[#link_news]">News</a> <span style="color: #ffffff">|</span> \r\n <a href="[#link_sitemap]">Sitemap</a></p>\r\n </div>\r\n </div>', 1, 1, 1, 'default', '2005-12-21 20:01:24 [2] |', '', 2, '2005-12-05', '11:49:02'), +(24, 'menu_side', 'all', '<table style="border:0" width="100%" cellpadding="0" cellspacing="0">\r\n <tr valign="top">\r\n <td style="width:147px" id="leftNav"> \r\n <div class="navTitle">Navigation</div>\r\n <ol>\r\n <li><a href="[#link_index]">Home</a></li>\r\n <li><a href="[#link_news]">News</a></li>\r\n <li><a href="[#link_sitemap]">Sitemap</a></li>\r\n </ol>\r\n <p></p>\r\n ', 1, 1, 1, 'default', '2005-12-21 20:01:51 [2] |', '', 2, '2005-12-05', '11:48:53'), +(96, 'head', 'all', '<?xml version="1.0" encoding="[#inc_charset]"?>\r\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r\n "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="[#roscms_language_short]" >\r\n\r\n<head>\r\n <title>ReactOS Homepage - [#roscms_pagetitle]</title>\r\n \r\n <meta http-equiv="Content-Type" content="application/xml" />\r\n <meta http-equiv="pics-label" content=''(pics-1.1 "http://www.icra.org/ratingsv02.html" l gen true for "http://www.reactos.com/" r (cz 1 lz 1 nz 1 oz 1 vz 1))'' />\r\n <meta http-equiv="Pragma" content="no-cache" />\r\n <meta name="Publisher" content="ReactOS Web Team" />\r\n <meta name="Copyright" content="ReactOS Foundation" />\r\n <meta name="generator" content="RosCMS" />\r\n <meta name="Keywords" content="reactos, ros, ros32, win32 ros64, roscms, operating system, wiki, forum, download, information, support database, compatibility database, compatibility, package database, reactos package manager, reactos content management system, reactos 0.1, reactos 0.2, reactos 0.3, ros 0.1, ros 0.2, ros 0.3" />\r\n <meta name="Description" content="ReactOS Homepage - ..." />\r\n <meta name="Page-topic" content="Betriebssystem, Computer, Software, downloads" />\r\n <meta name="Audience" content="all" />\r\n <meta name="Content-language" content="DE" />\r\n <meta name="Page-type" content="Operating System/Information/News" />\r\n <meta name="Robots" content="index,follow" />\r\n \r\n <link rel="SHORTCUT ICON" href="[#roscms_path_homepage]favicon.ico" />\r\n <link rel="alternate" type="application/rss+xml" title="ReactOS News Feed (RSS)" href="[#roscms_path_homepage]reactos.rdf" />\r\n <link href="[#roscms_path_homepage]style.css" type="text/css" rel="stylesheet" />\r\n</head>\r\n<body>', 2, 1, 1, 'layout', '2005-12-21 19:17:16 [2] |', '', 2, '2005-09-19', '23:38:29'), +(228, 'menu_misc', 'all', '<div class="navTitle">Latest Update</div> \r\n <ol>\r\n <li><div style="text-align:center;">[#roscms_date] [#roscms_time]</div></li>\r\n </ol> \r\n <p> </p>\r\n </td>\r\n\r\n <td id="content"><div class="contentSmall"> ', 1, 1, 1, 'default', '', '', 2, '2005-12-21', '19:16:47'), +(229, 'sidebar_right', 'all', '</div></td>\r\n\r\n <td id="rightNav">\r\n<h1>Latest Release</h1>\r\n<p><strong>Version [#inc_reactos_version]</strong>\r\n</p>\r\n', 8, 1, 1, 'default', '2005-12-21 19:50:38 [2] |', '', 2, '2005-12-21', '19:18:36'), +(230, 'contmenu_home', 'all', '<div class="navTitle">Home</div> \r\n<ol> \r\n <li><a href="[#link_index]">Front Page</a></li>\r\n <li><a href="[#link_news]">News</a></li>\r\n <li><a href="[#link_sitemap]">Sitemap</a></li>\r\n</ol>\r\n<p></p>', 4, 1, 1, 'default', '2005-12-21 20:02:26 [2] |', '', 2, '2005-12-21', '19:20:34'), +(120, 'menu_search', 'all', ' <div class="navTitle">Search</div> \r\n <div class="navBox"><form method="get" action="http://www.google.com/search" style="padding:0;margin:0">\r\n <div style="text-align:center;">\r\n\r\n <input name="q" value="" size="12" maxlength="80" class="searchInput" type="text" /><input name="domains" value="http://www.reactos.org" type="hidden" /><input name="sitesearch" value="http://www.reactos.org" type="hidden" />\r\n <input name="btnG" value="Go" type="submit" class="button" />\r\n\r\n </div></form>\r\n </div>\r\n<p></p>', 2, 1, 1, 'default', '', '', 2, '2005-11-09', '23:04:31'), +(128, 'index', 'de', '<h1>ReactOS Content Management System - Test Page</h1>\r\n<p>German start page</p>', 1, 1, 1, 'default', '', 'richtext', 1, '2005-11-29', '20:14:46'), +(152, 'menu_language', 'all', '<div class="navTitle">Language</div> \r\n <div class="navBox"> \r\n <form method="post" action="[#roscms_path_homepage]?page=[#roscms_pagename]&forma=[#roscms_format]&lang=" style="padding:0;margin:0">\r\n <div style="text-align:center;"> \r\n <select id="lang" size="1" name="lang" class="selectbox" style="width:110px" onchange="window.open(''[#roscms_path_homepage]?page=[#roscms_pagename]&forma=[#roscms_format]&lang='' + this.options[this.selectedIndex].value,''_main'')">\r\n <optgroup label="current language"> \r\n <option value="#" selected="selected">[#roscms_language]</option>\r\n </optgroup>\r\n <optgroup label="most popular"> \r\n <option value="en">English</option>\r\n <option value="de">Deutsch (German)</option>\r\n </optgroup>\r\n </select>\r\n <input name="langsubmit" type="submit" id="langsubmit" value=">" />\r\n </div>\r\n </form>\r\n </div>\r\n<p></p>', 3, 1, 1, 'layout', '2005-12-21 20:00:23 [2] |', '', 2, '2005-11-10', '21:48:20'), +(220, 'contmenu_home', 'de', '<div class="navTitle">Startseite</div> \r\n<ol> \r\n <li><a href="[#link_index]">Startseite</a></li>\r\n <li><a href="[#link_news]">Neuigkeiten</a></li>\r\n <li><a href="[#link_sitemap]">Sitemap</a></li> \r\n</ol>\r\n<p></p>', 3, 1, 1, 'default', '2005-12-21 20:02:35 [2] |', '', 15, '2005-12-07', '21:24:40'), +(222, 'sidebar_right', 'all', '</div></td>\r\n\r\n <td id="rightNav">\r\n[#inc_javascript_screenshot]\r\n <a href="[#link_screenshots]">More Screenshots</a><br />\r\n <a href="[#link_tour]">Take a look at the ReactOS Tour</a>\r\n</div><br />\r\n<h1>Latest Release</h1>\r\n<p><strong>Version [#inc_reactos_version]</strong><br />\r\n <a href="[#link_download]">Download Now!</a><br />\r\n <a href="[#link_dev_changelogs]">Changelog</a>\r\n</p>\r\n[#inc_template_news_latest]\r\n[#inc_template_newsletter_latest]\r\n<div class="contentSmall">\r\n <span class="contentSmallTitle">Developer Quotes</span>\r\n\r\n[#inc_javascript_quote]', 7, 0, 1, 'default', '', '', 2, '2005-12-07', '21:30:53'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `dyn_content` +-- + +DROP TABLE IF EXISTS `dyn_content`; +CREATE TABLE `dyn_content` ( + `dyn_id` bigint(20) NOT NULL auto_increment, + `dyn_content_id` bigint(20) NOT NULL default '0', + `dyn_content_nr` int(11) NOT NULL default '0', + `dyn_content_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', + `dyn_content_text1` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_text2` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_text3` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_text4` longtext collate utf8_unicode_ci NOT NULL, + `dyn_content_version` int(11) NOT NULL default '0', + `dyn_content_active` tinyint(4) NOT NULL default '0', + `dyn_content_visible` tinyint(4) NOT NULL default '0', + `dyn_content_editor` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_usrname_id` bigint(20) NOT NULL default '0', + `dyn_content_date` date NOT NULL default '0000-00-00', + `dyn_content_time` time NOT NULL default '00:00:00', + PRIMARY KEY (`dyn_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents'; + +-- +-- Data for table`dyn_content` +-- + +INSERT INTO `dyn_content` (`dyn_id`, `dyn_content_id`, `dyn_content_nr`, `dyn_content_name`, `dyn_content_lang`, `dyn_content_text1`, `dyn_content_text2`, `dyn_content_text3`, `dyn_content_text4`, `dyn_content_version`, `dyn_content_active`, `dyn_content_visible`, `dyn_content_editor`, `dyn_content_usrname_id`, `dyn_content_date`, `dyn_content_time`) VALUES (28, 1, 1, 'news_page', 'all', 'RosCMS test news', '', 'RosCMS test news description', '<p><b><u>RosCMS</u></b> test news content</p> ...', 0, 1, 1, '', 2, '2005-12-21', '19:53:14'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `include_text` +-- + +DROP TABLE IF EXISTS `include_text`; +CREATE TABLE `include_text` ( + `inc_id` bigint(20) NOT NULL auto_increment, + `inc_level` tinyint(4) NOT NULL default '0', + `inc_word` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `inc_text` text collate utf8_unicode_ci NOT NULL, + `inc_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', + `inc_extra` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `inc_vis` tinyint(4) NOT NULL default '0', + `inc_seclevel` tinyint(4) NOT NULL default '50', + `inc_usrname_id` bigint(20) NOT NULL default '0', + `inc_date` date NOT NULL default '0000-00-00', + `inc_time` time NOT NULL default '00:00:00', + PRIMARY KEY (`inc_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Replace words with text phrases'; + +-- +-- Data for table`include_text` +-- + +INSERT INTO `include_text` (`inc_id`, `inc_level`, `inc_word`, `inc_text`, `inc_lang`, `inc_extra`, `inc_vis`, `inc_seclevel`, `inc_usrname_id`, `inc_date`, `inc_time`) VALUES (48, 15, 'template_news_detail', '<?php\r\n if ( !defined("ROSCMS_SYSTEM") ) {\r\n define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity\r\n }\r\n\r\n include("db/connect_db.inc.php"); // database connection script\r\n\r\n $query_content = mysql_query("SELECT * \r\n FROM `dyn_content` \r\n WHERE 1 AND `dyn_content_name` = ''news_page'' AND `dyn_content_id` = ''$roscms_template_var_pageid''\r\n ORDER BY `dyn_content_nr` ASC Limit 1") ;\r\n \r\n $result_content = mysql_fetch_array($query_content);\r\n $roscms_usrnameid = $result_content["dyn_content_usrname_id"];\r\n $query_usraccount= mysql_query("SELECT * \r\n FROM `users` \r\n WHERE `user_id` = ".$roscms_usrnameid." LIMIT 1");\r\n $result_usraccount=mysql_fetch_array($query_usraccount);\r\n?>\r\n<h1><a href="[#link_index]">Home</a> > <a href="[#link_news]">ReactOS News</a> > News: <?php echo $result_content["dyn_content_text1"]; ?> #<?php echo $roscms_template_var_pageid; ?></h1> \r\n <p><strong><?php echo $result_content["dyn_content_text3"]; ?></strong></p>\r\n <p><i>by <?php echo $result_usraccount[''user_name'']; ?> on <?php echo $result_content[''dyn_content_date'']; ?></i></p>\r\n<?php echo $result_content[''dyn_content_text4'']; ?>\r\n<p><a href="[#link_news]">News Archive</a></p>', 'all', 'template_php', 1, 50, 1, '2005-12-21', '19:55:14'), +(19, 10, 'path_homepage_media', '[#roscms_path_homepage]media/', 'all', '', 1, 50, 0, '2005-07-13', '18:00:35'), +(20, 15, 'path_homepage_media_pictures', '[#roscms_path_homepage]media/pictures/', 'all', '', 1, 50, 0, '2005-07-13', '18:00:35'), +(23, 15, 'template_news', '<h1><a href="[#link_index]">Home</a> > ReactOS News</h1>\r\n<?php\r\n if ( !defined("ROSCMS_SYSTEM") ) {\r\n define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity\r\n }\r\n\r\n include("db/connect_db.inc.php"); // database connection script\r\n\r\n\r\n $query_content = mysql_query("SELECT * \r\n FROM `dyn_content` \r\n WHERE 1 AND `dyn_content_name` = ''news_page'' AND `dyn_content_nr` = ''1''\r\n ORDER BY `dyn_content_id` DESC ") ;\r\n \r\n while($result_content = mysql_fetch_array($query_content)) { // content\r\n $roscms_usrnameid = $result_content["dyn_content_usrname_id"];\r\n $query_usraccount= mysql_query("SELECT * \r\n FROM `users` \r\n WHERE `user_id` = ".$roscms_usrnameid." LIMIT 0 , 1");\r\n $result_usraccount=mysql_fetch_array($query_usraccount);\r\n?>\r\n\r\n<p><b><a href="<?php echo "[#link_".$result_content["dyn_content_name"]."_".$result_content["dyn_content_id"]."]"; ?>"><?php echo $result_content["dyn_content_text1"]; ?></a></b>\r\n<br><?php echo $result_content[''dyn_content_text3'']; ?>\r\n<br><i>by <?php echo $result_usraccount[''user_name'']; ?> on <?php echo $result_content[''dyn_content_date'']; ?></i></p>\r\n <?php \r\n } // end while\r\n?>\r\n', 'all', 'template_php', 1, 50, 0, '2005-07-30', '11:50:18'), +(26, 0, 'reactos_version', '0.2.8', 'all', '', 1, 50, 1, '2005-08-13', '16:18:56'), +(27, 15, 'template_sitemap', '<h1><a href="[#link_index]">Home</a> > Sitemap</h1>\r\n<?php\r\n if ( !defined("ROSCMS_SYSTEM") ) {\r\n define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity\r\n }\r\n\r\n include("db/connect_db.inc.php"); // database connection script\r\n\r\n\r\n $query_sitemap = mysql_query("SELECT * \r\n FROM pages\r\n WHERE page_active = ''1'' AND page_visible = ''1'' AND (page_language = ''all'' OR page_language = ''en'')\r\n ORDER BY ''page_name'' ASC") ;\r\n \r\n while($result_sitemap = mysql_fetch_array($query_sitemap)) { // content\r\n if ($result_sitemap[''page_description''] != "") {\r\n?>\r\n\r\n<p><b><a href="<?php echo "[#link_".$result_sitemap[''page_name'']."]"; ?>"><?php echo ucfirst($result_sitemap[''page_title'']); ?></a></b>\r\n<br><i><?php echo $result_sitemap[''page_description'']; ?></i></p>\r\n <?php\r\n } \r\n } // end while\r\n?>\r\n', 'all', 'template_php', 1, 50, 0, '2005-08-13', '20:58:04'), +(34, 0, 'charset', 'utf-8', 'all', '', 1, 50, 1, '2005-08-27', '15:54:16'), +(39, 15, 'path_homepage_media_screenshots', '[#roscms_path_homepage]media/screenshots/', 'all', '', 1, 50, 0, '2005-07-13', '18:00:35'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `languages` +-- + +DROP TABLE IF EXISTS `languages`; +CREATE TABLE `languages` ( + `lang_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `lang_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `lang_level` int(11) NOT NULL default '0' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='available languages'; + +-- +-- Data for table`languages` +-- + +INSERT INTO `languages` (`lang_id`, `lang_name`, `lang_level`) +VALUES ('en', 'English', 10), +('de', 'German', 8); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pages` +-- + +DROP TABLE IF EXISTS `pages`; +CREATE TABLE `pages` ( + `page_id` bigint(20) NOT NULL auto_increment, + `page_name` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `page_language` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `pages_extra` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `pages_extention` varchar(10) collate utf8_unicode_ci NOT NULL default 'default', + `page_text` text collate utf8_unicode_ci NOT NULL, + `page_version` int(11) NOT NULL default '0', + `page_active` tinyint(4) NOT NULL default '0', + `page_visible` tinyint(4) NOT NULL default '0', + `page_usrname_id` bigint(20) NOT NULL default '0', + `page_date` date NOT NULL default '0000-00-00', + `page_time` time NOT NULL default '00:00:00', + `page_generate_usrid` bigint(20) NOT NULL default '0', + `page_generate_timestamp` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `page_title` varchar(150) collate utf8_unicode_ci NOT NULL default '', + `page_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`page_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Pages'; + +-- +-- Data for table`pages` +-- + +INSERT INTO `pages` (`page_id`, `page_name`, `page_language`, `pages_extra`, `pages_extention`, `page_text`, `page_version`, `page_active`, `page_visible`, `page_usrname_id`, `page_date`, `page_time`, `page_generate_usrid`, `page_generate_timestamp`, `page_title`, `page_description`) VALUES (6, 'news_page', 'all', 'dynamic', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_contmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#cont_menu_misc]\r\n\r\n[#inc_template_news_detail]\r\n\r\n[#cont_bottom]', 1, 1, 1, 1, '2005-09-12', '18:50:20', 1, '1135191757', 'News', ''), +(7, 'news', 'all', '', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_contmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#cont_menu_misc]\r\n\r\n[#inc_template_news]\r\n\r\n[#cont_bottom]', 1, 1, 1, 1, '2005-09-12', '18:50:28', 1, '1135191757', 'News', 'News page: latest ReactOS news, rss news feed'), +(9, 'index', 'all', '', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_contmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#cont_menu_misc]\r\n\r\n[#cont_index]\r\n\r\n[#cont_sidebar_right]\r\n[#cont_bottom]', 1, 1, 1, 1, '2005-12-21', '19:21:43', 1, '1135191757', 'Frontpage', 'Frontpage'), +(91, 'sitemap', 'all', '', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_contmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#cont_menu_misc]\r\n\r\n[#inc_template_sitemap]\r\n\r\n[#cont_bottom]\r\n', 1, 1, 1, 1, '2005-12-21', '19:58:07', 1, '1135191757', 'Sitemap', 'Sitemap page'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `roscms_security_log` +-- + +DROP TABLE IF EXISTS `roscms_security_log`; +CREATE TABLE `roscms_security_log` ( + `roscms_sec_log_id` bigint(20) NOT NULL auto_increment, + `roscms_sec_log_section` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_priority` int(11) NOT NULL default '100', + `roscms_sec_log_reason` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_user` varchar(100) collate utf8_unicode_ci NOT NULL default 'roscms_system', + `roscms_sec_log_useraccount` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_userip` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_referrer` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_text` text collate utf8_unicode_ci NOT NULL, + `roscms_sec_log_date` date NOT NULL default '0000-00-00', + `roscms_sec_log_time` time NOT NULL default '00:00:00', + `roscms_sec_log_visible` int(11) NOT NULL default '1', + PRIMARY KEY (`roscms_sec_log_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS Security Log'; + +-- +-- Data for table`roscms_security_log` +-- + + +-- -------------------------------------------------------- + +-- +-- Table structure for table `subsys_mappings` +-- + +DROP TABLE IF EXISTS `subsys_mappings`; +CREATE TABLE `subsys_mappings` ( + `map_roscms_userid` bigint(20) NOT NULL default '0', + `map_subsys_name` varchar(10) character set utf8 NOT NULL default '', + `map_subsys_userid` int(7) NOT NULL default '0', + PRIMARY KEY (`map_roscms_userid`,`map_subsys_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + + +-- -------------------------------------------------------- + +-- +-- Table structure for table `user_sessions` +-- + +DROP TABLE IF EXISTS `user_sessions`; +CREATE TABLE `user_sessions` ( + `usersession_id` varchar(32) character set utf8 NOT NULL default '' COMMENT 'Unique ID of this session', + `usersession_user_id` bigint(20) NOT NULL default '0' COMMENT 'User this session belongs to', + `usersession_expires` datetime default NULL COMMENT 'Expiry date/time (NULL if does not expire)', + `usersession_browseragent` varchar(255) character set utf8 NOT NULL default '' COMMENT 'HTTP_USER_AGENT when this session was created', + `usersession_ipaddress` varchar(15) character set utf8 NOT NULL default '' COMMENT 'IP address from which this session was created', + `usersession_created` datetime NOT NULL default '0000-00-00 00:00:00' COMMENT 'session created (date/time) - all session will get deleted ... by date', + PRIMARY KEY (`usersession_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0 COMMENT='Sessions'; + + +-- -------------------------------------------------------- + +-- +-- Table structure for table `usergroup_members` +-- + +DROP TABLE IF EXISTS `usergroup_members`; +CREATE TABLE `usergroup_members` ( + `usergroupmember_userid` bigint(20) NOT NULL default '0', + `usergroupmember_usergroupid` varchar(10) collate utf8_unicode_ci NOT NULL default 'user' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- +-- Data for table`usergroup_members` +-- + +INSERT INTO `usergroup_members` (`usergroupmember_userid`, `usergroupmember_usergroupid`) +VALUES (1, 'ros_sadmin'), +(1, 'developer'), +(1, 'translator'), +(1, 'moderator'), +(1, 'user'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `usergroups` +-- + +DROP TABLE IF EXISTS `usergroups`; +CREATE TABLE `usergroups` ( + `usrgroup_name_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_intern_id` varchar(25) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_securitylevel` tinyint(4) NOT NULL default '0', + `usrgroup_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`usrgroup_name_id`), + UNIQUE KEY `usrgroup_name` (`usrgroup_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- +-- Data for table`usergroups` +-- + +INSERT INTO `usergroups` (`usrgroup_name_id`, `usrgroup_name`, `usrgroup_intern_id`, `usrgroup_securitylevel`, `usrgroup_description`) VALUES ('ros_admin', 'Administrator', 'roscms_usrgrp_admin', 70, 'Administrator-Group: manage the ReactOS homepage (content, database)'), +('user', 'User', 'roscms_usrgrp_user', 0, 'Normal Visitors'), +('developer', 'Developer', 'roscms_usrgrp_dev', 50, 'ReactOS Developer: persons with svn commit access'), +('moderator', 'Moderator', 'roscms_usrgrp_team', 20, 'Homepage Moderators: for compatibility & package manager database, etc.'), +('translator', 'Translator', 'roscms_usrgrp_trans', 10, 'Homepage Translators: translate the homepage content'), +('ros_sadmin', 'Super-Administrator', 'roscms_usrgrp_sadmin', 100, 'Super-Administrator-Group: manage the ReactOS homepage (content, database, etc.); only persons who know what they are doing ...'), +('mediateam', 'Media-Team', 'roscms_usrgrp_team', 20, 'Media-Team members: UI-Team, etc.'), +('test', 'Test-User', 'roscms_usrgrp_team', 10, 'RosCMS tester group'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `users` +-- + +DROP TABLE IF EXISTS `users`; +CREATE TABLE `users` ( + `user_id` bigint(20) NOT NULL auto_increment, + `user_name` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `user_roscms_password` varchar(32) collate utf8_unicode_ci NOT NULL default '', + `user_roscms_getpwd_id` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_timestamp_touch` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_timestamp_touch2` timestamp NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `user_login_counter` bigint(20) NOT NULL default '0', + `user_account_enabled` varchar(10) collate utf8_unicode_ci NOT NULL default 'no', + `user_account_hidden` varchar(5) collate utf8_unicode_ci NOT NULL default 'no', + `user_register` timestamp NULL default NULL, + `user_fullname` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `user_email` varchar(150) collate utf8_unicode_ci NOT NULL default '', + `user_website` varchar(150) collate utf8_unicode_ci NOT NULL default '', + `user_language` varchar(2) collate utf8_unicode_ci NOT NULL default '', + `user_country` varchar(2) collate utf8_unicode_ci NOT NULL default '', + `user_timezone` varchar(3) collate utf8_unicode_ci NOT NULL default '', + `user_occupation` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `user_setting_multisession` varchar(5) collate utf8_unicode_ci NOT NULL default 'false', + `user_setting_browseragent` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + `user_setting_ipaddress` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + `user_setting_timeout` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + PRIMARY KEY (`user_id`), + UNIQUE KEY `user_name` (`user_name`), + UNIQUE KEY `user_email` (`user_email`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS User Table'; + +-- +-- Data for table`users` +-- + +INSERT INTO `users` (`user_id`, `user_name`, `user_roscms_password`, `user_roscms_getpwd_id`, `user_timestamp_touch`, `user_timestamp_touch2`, `user_login_counter`, `user_account_enabled`, `user_account_hidden`, `user_register`, `user_fullname`, `user_email`, `user_website`, `user_language`, `user_country`, `user_timezone`, `user_occupation`, `user_description`, `user_setting_multisession`, `user_setting_browseragent`, `user_setting_ipaddress`, `user_setting_timeout`) +VALUES (1, 'roscms_user', '', '', '', '2005-12-08 20:02:50', 1, 'yes', 'yes', '2005-08-20 20:18:06', 'ReactOS Content Management System Default User', 'ros-dev(a)reactos.org', 'http://www.reactos.org', 'en', '', '', '', 'RosCMS Default User', 'true', 'false', 'false', 'true');

1 0

[greatlrd] 26914: adding regbag.idl compatible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 27 May '07

27 May '07

Author: greatlrd Date: Sun May 27 15:04:46 2007 New Revision: 26914 URL: http://svn.reactos.org/svn/reactos?rev=26914&view=rev Log: adding regbag.idl compatible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/regbag.idl (with props) Removed: trunk/reactos/include/dxsdk/regbag.h Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild Sun May 27 15:04:46 2007 @@ -1,11 +1,12 @@ <module name="dxsdk" type="idlheader"> + <file>amstream.idl</file> <file>austream.idl</file> - <file>amstream.idl</file> <file>ddstream.idl</file> <file>mixerocx.idl</file> <file>mediaobj.idl</file> <file>medparam.idl</file> <file>mmstream.idl</file> + <file>regbag.idl</file> <file>vidcap.idl</file> <file>Videoacc.idl</file> </module> Removed: trunk/reactos/include/dxsdk/regbag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/regbag.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/regbag.h (original) +++ trunk/reactos/include/dxsdk/regbag.h (removed) @@ -1,109 +1,0 @@ - - -#ifndef __REQUIRED_RPCNDR_H_VERSION__ -#define __REQUIRED_RPCNDR_H_VERSION__ 475 -#endif - -#include "rpc.h" -#include "rpcndr.h" - -#ifndef __RPCNDR_H_VERSION__ -#error this stub requires never version of <rpcndr.h> -#endif - -#ifndef COM_NO_WINDOWS_H - #include "windows.h" - #include "ole2.h" -#endif - -#ifndef __regbag_h__ -#define __regbag_h__ - -#if defined(_MSC_VER) && (_MSC_VER >= 1020) - #pragma once -#endif - -#ifndef __ICreatePropBagOnRegKey_FWD_DEFINED__ - #define __ICreatePropBagOnRegKey_FWD_DEFINED__ - typedef interface ICreatePropBagOnRegKey ICreatePropBagOnRegKey; -#endif - -#include "objidl.h" -#include "oaidl.h" -#include "ocidl.h" - -#ifdef __cplusplus -extern "C"{ -#endif - -void * __RPC_USER MIDL_user_allocate(size_t); -void __RPC_USER MIDL_user_free( void * ); - - -#pragma once - - -extern RPC_IF_HANDLE __MIDL_itf_regbag_0000_v0_0_c_ifspec; -extern RPC_IF_HANDLE __MIDL_itf_regbag_0000_v0_0_s_ifspec; - -#ifndef __ICreatePropBagOnRegKey_INTERFACE_DEFINED__ - #define __ICreatePropBagOnRegKey_INTERFACE_DEFINED__ - EXTERN_C const IID IID_ICreatePropBagOnRegKey; - #if defined(__cplusplus) && !defined(CINTERFACE) - MIDL_INTERFACE("8A674B48-1F63-11D3-B64C-00C04F79498E") - ICreatePropBagOnRegKey : public IUnknown - { - public: - virtual HRESULT STDMETHODCALLTYPE Create(HKEY hkey, LPCOLESTR subkey, DWORD ulOptions, DWORD samDesired, - REFIID iid, LPVOID *ppBag) = 0; - }; -#else - - typedef struct ICreatePropBagOnRegKeyVtbl - { - BEGIN_INTERFACE - HRESULT ( STDMETHODCALLTYPE *QueryInterface )(ICreatePropBagOnRegKey * This, REFIID riid, void **ppvObject); - ULONG ( STDMETHODCALLTYPE *AddRef )(ICreatePropBagOnRegKey * This); - ULONG ( STDMETHODCALLTYPE *Release )(ICreatePropBagOnRegKey * This); - HRESULT ( STDMETHODCALLTYPE *Create )(ICreatePropBagOnRegKey * This, HKEY hkey, LPCOLESTR subkey, - DWORD ulOptions, DWORD samDesired, REFIID iid, LPVOID *ppBag); - END_INTERFACE - } ICreatePropBagOnRegKeyVtbl; - - interface ICreatePropBagOnRegKey - { - CONST_VTBL struct ICreatePropBagOnRegKeyVtbl *lpVtbl; - }; - - #ifdef COBJMACROS - #define ICreatePropBagOnRegKey_QueryInterface(This,riid,ppvObject) (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) - #define ICreatePropBagOnRegKey_AddRef(This) (This)->lpVtbl -> AddRef(This) - #define ICreatePropBagOnRegKey_Release(This) (This)->lpVtbl -> Release(This) - #define ICreatePropBagOnRegKey_Create(This,hkey,subkey,ulOptions,samDesired,iid,ppBag) (This)->lpVtbl -> Create(This,hkey,subkey,ulOptions,samDesired,iid,ppBag) - #endif -#endif - - -void __RPC_STUB -ICreatePropBagOnRegKey_Create_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - -HRESULT STDMETHODCALLTYPE -ICreatePropBagOnRegKey_Create_Proxy( - ICreatePropBagOnRegKey * This, - HKEY hkey, - LPCOLESTR subkey, - DWORD ulOptions, - DWORD samDesired, - REFIID iid, - LPVOID *ppBag); - -#endif -#ifdef __cplusplus -} -#endif - -#endif Added: trunk/reactos/include/dxsdk/regbag.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/regbag.idl?r… ============================================================================== --- trunk/reactos/include/dxsdk/regbag.idl (added) +++ trunk/reactos/include/dxsdk/regbag.idl Sun May 27 15:04:46 2007 @@ -1,0 +1,20 @@ + +cpp_quote("#pragma once") + +#ifndef DO_NO_IMPORTS +import "objidl.idl"; +import "oaidl.idl"; +import "ocidl.idl"; +#endif + +[object, + hidden, restricted, + uuid(8A674B48-1F63-11d3-B64C-00C04F79498E), + pointer_default(unique), + local +] +interface ICreatePropBagOnRegKey : IUnknown +{ + HRESULT Create([in] HKEY hkey, [in] LPCOLESTR subkey, [in] DWORD ulOptions, [in] DWORD samDesired, REFIID iid, [out] LPVOID *ppBag); +}; + Propchange: trunk/reactos/include/dxsdk/regbag.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26913: adding bdatypes.h compatible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 27 May '07

27 May '07

Author: greatlrd Date: Sun May 27 14:56:05 2007 New Revision: 26913 URL: http://svn.reactos.org/svn/reactos?rev=26913&view=rev Log: adding bdatypes.h compatible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/bdatypes.h (with props) Added: trunk/reactos/include/dxsdk/bdatypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdatypes.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdatypes.h (added) +++ trunk/reactos/include/dxsdk/bdatypes.h Sun May 27 14:56:05 2007 @@ -1,0 +1,379 @@ + +#ifndef _BDATYPES_ + +#define _BDATYPES_ 1 +#define MIN_DIMENSION 1 + + +#ifdef __midl +#define V1_ENUM [v1_enum] +#else +#define V1_ENUM +#endif + +#define BDA_FREQUENCY_NOT_SET -1 +#define BDA_FREQUENCY_NOT_DEFINED 0 +#define BDA_RANGE_NOT_SET -1 +#define BDA_RANGE_NOT_DEFINED 0 +#define BDA_CHAN_BANDWITH_NOT_SET -1 +#define BDA_CHAN_BANDWITH_NOT_DEFINED 0 +#define BDA_FREQUENCY_MULTIPLIER_NOT_SET -1 +#define BDA_FREQUENCY_MULTIPLIER_NOT_DEFINED 0 + + +typedef struct _BDA_TEMPLATE_CONNECTION +{ + ULONG FromNodeType; + ULONG FromNodePinType; + ULONG ToNodeType; + ULONG ToNodePinType; +}BDA_TEMPLATE_CONNECTION, *PBDA_TEMPLATE_CONNECTION; + + +typedef struct _BDA_TEMPLATE_PIN_JOINT +{ + ULONG uliTemplateConnection; + ULONG ulcInstancesMax; +}BDA_TEMPLATE_PIN_JOINT, *PBDA_TEMPLATE_PIN_JOINT; + + +typedef struct tagKS_BDA_FRAME_INFO +{ + ULONG ExtendedHeaderSize; + DWORD dwFrameFlags; + ULONG ulEvent; + ULONG ulChannelNumber; + ULONG ulSubchannelNumber; + ULONG ulReason; +} KS_BDA_FRAME_INFO, *PKS_BDA_FRAME_INFO; + +typedef enum +{ + BDA_EVENT_SIGNAL_LOSS = 0, + BDA_EVENT_SIGNAL_LOCK, + BDA_EVENT_DATA_START, + BDA_EVENT_DATA_STOP, + BDA_EVENT_CHANNEL_ACQUIRED, + BDA_EVENT_CHANNEL_LOST, + BDA_EVENT_CHANNEL_SOURCE_CHANGED, + BDA_EVENT_CHANNEL_ACTIVATED, + BDA_EVENT_CHANNEL_DEACTIVATED, + BDA_EVENT_SUBCHANNEL_ACQUIRED, + BDA_EVENT_SUBCHANNEL_LOST, + BDA_EVENT_SUBCHANNEL_SOURCE_CHANGED, + BDA_EVENT_SUBCHANNEL_ACTIVATED, + BDA_EVENT_SUBCHANNEL_DEACTIVATED, + BDA_EVENT_ACCESS_GRANTED, + BDA_EVENT_ACCESS_DENIED, + BDA_EVENT_OFFER_EXTENDED, + BDA_EVENT_PURCHASE_COMPLETED, + BDA_EVENT_SMART_CARD_INSERTED, + BDA_EVENT_SMART_CARD_REMOVED +} BDA_EVENT_ID, *PBDA_EVENT_ID; + + + +typedef struct _BDA_ETHERNET_ADDRESS +{ + BYTE rgbAddress[6]; +} BDA_ETHERNET_ADDRESS, *PBDA_ETHERNET_ADDRESS; + +typedef struct _BDA_ETHERNET_ADDRESS_LIST { + ULONG ulcAddresses; + BDA_ETHERNET_ADDRESS rgAddressl[MIN_DIMENSION]; +} BDA_ETHERNET_ADDRESS_LIST, *PBDA_ETHERNET_ADDRESS_LIST; + +typedef enum +{ + BDA_PROMISCUOUS_MULTICAST = 0, + BDA_FILTERED_MULTICAST, + BDA_NO_MULTICAST +} BDA_MULTICAST_MODE, *PBDA_MULTICAST_MODE; + +typedef struct _BDA_IPv4_ADDRESS +{ + BYTE rgbAddress[4]; +} BDA_IPv4_ADDRESS, *PBDA_IPv4_ADDRESS; + +typedef struct _BDA_IPv4_ADDRESS_LIST +{ + ULONG ulcAddresses; + BDA_IPv4_ADDRESS rgAddressl[MIN_DIMENSION]; +} BDA_IPv4_ADDRESS_LIST, * PBDA_IPv4_ADDRESS_LIST; + + +typedef struct _BDA_IPv6_ADDRESS +{ + BYTE rgbAddress[6]; +} BDA_IPv6_ADDRESS, *PBDA_IPv6_ADDRESS; + +typedef struct _BDA_IPv6_ADDRESS_LIST +{ + ULONG ulcAddresses; + BDA_IPv6_ADDRESS rgAddressl[MIN_DIMENSION]; +} BDA_IPv6_ADDRESS_LIST, *PBDA_IPv6_ADDRESS_LIST; + + +typedef enum +{ + BDA_CHANGES_COMPLETE = 0, + BDA_CHANGES_PENDING + +} BDA_CHANGE_STATE, * PBDA_CHANGE_STATE; + +typedef enum +{ + BDA_SIGNAL_UNAVAILABLE = 0, + BDA_SIGNAL_INACTIVE, + BDA_SIGNAL_ACTIVE +} BDA_SIGNAL_STATE, * PBDA_SIGNAL_STATE; + + + + + +typedef struct _BDANODE_DESCRIPTOR +{ + ULONG ulBdaNodeType; + GUID guidFunction; + GUID guidName; +} BDANODE_DESCRIPTOR, *PBDANODE_DESCRIPTOR; + +typedef enum +{ + MEDIA_TRANSPORT_PACKET, + MEDIA_ELEMENTARY_STREAM, + MEDIA_MPEG2_PSI, + MEDIA_TRANSPORT_PAYLOAD +} MEDIA_SAMPLE_CONTENT ; + +typedef struct _BDA_TABLE_SECTION +{ + ULONG ulPrimarySectionId; + ULONG ulSecondarySectionId; + ULONG ulcbSectionLength; + ULONG argbSectionData[MIN_DIMENSION]; +} BDA_TABLE_SECTION, *PBDA_TABLE_SECTION; + + +typedef struct +{ + ULONG ulPID ; + MEDIA_SAMPLE_CONTENT MediaSampleContent ; +} PID_MAP ; + + + + + +typedef struct _BDA_PID_MAP +{ + MEDIA_SAMPLE_CONTENT MediaSampleContent; + ULONG ulcPIDs; + ULONG aulPIDs[MIN_DIMENSION]; +} BDA_PID_MAP, *PBDA_PID_MAP; + +typedef struct _BDA_PID_UNMAP +{ + ULONG ulcPIDs; + ULONG aulPIDs[MIN_DIMENSION]; +} BDA_PID_UNMAP, *PBDA_PID_UNMAP; + + +typedef enum DVBSystemType +{ + DVB_Cable, + DVB_Terrestrial, + DVB_Satellite, +} DVBSystemType; + +typedef struct _BDA_CA_MODULE_UI +{ + ULONG ulFormat; + ULONG ulbcDesc; + ULONG ulDesc[MIN_DIMENSION]; +} BDA_CA_MODULE_UI, *PBDA_CA_MODULE_UI; + +typedef struct _BDA_PROGRAM_PID_LIST +{ + ULONG ulProgramNumber; + ULONG ulcPIDs; + ULONG ulPID[MIN_DIMENSION]; +} BDA_PROGRAM_PID_LIST, *PBDA_PROGRAM_PID_LIST; + + +V1_ENUM enum +{ + BDA_UNDEFINED_CHANNEL = -1, +}; + +typedef V1_ENUM enum ComponentCategory +{ + CategoryNotSet = -1, + CategoryOther = 0, + CategoryVideo, + CategoryAudio, + CategoryText, + CategoryData, +} ComponentCategory; + +typedef enum ComponentStatus +{ + StatusActive, + StatusInactive, + StatusUnavailable, +} ComponentStatus; + +typedef enum ATSCComponentTypeFlags +{ + ATSCCT_AC3 = 0x00000001, +} ATSCComponentTypeFlags; + +typedef V1_ENUM enum MPEG2StreamType +{ + BDA_UNITIALIZED_MPEG2STREAMTYPE = -1, + Reserved1 = 0x0, + ISO_IEC_11172_2_VIDEO = Reserved1 + 1, + ISO_IEC_13818_2_VIDEO = ISO_IEC_11172_2_VIDEO + 1, + ISO_IEC_11172_3_AUDIO = ISO_IEC_13818_2_VIDEO + 1, + ISO_IEC_13818_3_AUDIO = ISO_IEC_11172_3_AUDIO + 1, + ISO_IEC_13818_1_PRIVATE_SECTION = ISO_IEC_13818_3_AUDIO + 1, + ISO_IEC_13818_1_PES = ISO_IEC_13818_1_PRIVATE_SECTION + 1, + ISO_IEC_13522_MHEG = ISO_IEC_13818_1_PES + 1, + ANNEX_A_DSM_CC = ISO_IEC_13522_MHEG + 1, + ITU_T_REC_H_222_1 = ANNEX_A_DSM_CC + 1, + ISO_IEC_13818_6_TYPE_A = ITU_T_REC_H_222_1 + 1, + ISO_IEC_13818_6_TYPE_B = ISO_IEC_13818_6_TYPE_A + 1, + ISO_IEC_13818_6_TYPE_C = ISO_IEC_13818_6_TYPE_B + 1, + ISO_IEC_13818_6_TYPE_D = ISO_IEC_13818_6_TYPE_C + 1, + ISO_IEC_13818_1_AUXILIARY = ISO_IEC_13818_6_TYPE_D + 1, + ISO_IEC_13818_1_RESERVED = ISO_IEC_13818_1_AUXILIARY + 1, + USER_PRIVATE = ISO_IEC_13818_1_RESERVED + 1 +} MPEG2StreamType; + +typedef struct _MPEG2_TRANSPORT_STRIDE +{ + DWORD dwOffset ; + DWORD dwPacketLength ; + DWORD dwStride ; +} MPEG2_TRANSPORT_STRIDE, *PMPEG2_TRANSPORT_STRIDE ; + + + + + +typedef V1_ENUM enum BinaryConvolutionCodeRate +{ + BDA_BCC_RATE_NOT_SET = -1, + BDA_BCC_RATE_NOT_DEFINED = 0, + BDA_BCC_RATE_1_2 = 1, + BDA_BCC_RATE_2_3, + BDA_BCC_RATE_3_4, + BDA_BCC_RATE_3_5, + BDA_BCC_RATE_4_5, + BDA_BCC_RATE_5_6, + BDA_BCC_RATE_5_11, + BDA_BCC_RATE_7_8, + BDA_BCC_RATE_MAX, +} BinaryConvolutionCodeRate; + +typedef V1_ENUM enum SpectralInversion +{ + BDA_SPECTRAL_INVERSION_NOT_SET = -1, + BDA_SPECTRAL_INVERSION_NOT_DEFINED = 0, + BDA_SPECTRAL_INVERSION_AUTOMATIC = 1, + BDA_SPECTRAL_INVERSION_NORMAL, + BDA_SPECTRAL_INVERSION_INVERTED, + BDA_SPECTRAL_INVERSION_MAX +} SpectralInversion; + +typedef V1_ENUM enum FECMethod +{ + BDA_FEC_METHOD_NOT_SET = -1, + BDA_FEC_METHOD_NOT_DEFINED = 0, + BDA_FEC_VITERBI = 1, + BDA_FEC_RS_204_188, + BDA_FEC_MAX, +} FECMethod; + +typedef V1_ENUM enum ModulationType +{ + BDA_MOD_NOT_SET = -1, + BDA_MOD_NOT_DEFINED = 0, + BDA_MOD_16QAM = 1, + BDA_MOD_32QAM, + BDA_MOD_64QAM, + BDA_MOD_80QAM, + BDA_MOD_96QAM, + BDA_MOD_112QAM, + BDA_MOD_128QAM, + BDA_MOD_160QAM, + BDA_MOD_192QAM, + BDA_MOD_224QAM, + BDA_MOD_256QAM, + BDA_MOD_320QAM, + BDA_MOD_384QAM, + BDA_MOD_448QAM, + BDA_MOD_512QAM, + BDA_MOD_640QAM, + BDA_MOD_768QAM, + BDA_MOD_896QAM, + BDA_MOD_1024QAM, + BDA_MOD_QPSK, + BDA_MOD_BPSK, + BDA_MOD_OQPSK, + BDA_MOD_8VSB, + BDA_MOD_16VSB, + BDA_MOD_ANALOG_AMPLITUDE, + BDA_MOD_ANALOG_FREQUENCY, + BDA_MOD_MAX, +} ModulationType; + + + +typedef V1_ENUM enum TransmissionMode +{ + BDA_XMIT_MODE_NOT_SET = -1, + BDA_XMIT_MODE_NOT_DEFINED = 0, + BDA_XMIT_MODE_2K = 1, + BDA_XMIT_MODE_8K, + BDA_XMIT_MODE_MAX, +} TransmissionMode; + + +typedef V1_ENUM enum Polarisation +{ + BDA_POLARISATION_NOT_SET = -1, + BDA_POLARISATION_NOT_DEFINED = 0, + BDA_POLARISATION_LINEAR_H = 1, + BDA_POLARISATION_LINEAR_V, + BDA_POLARISATION_CIRCULAR_L, + BDA_POLARISATION_CIRCULAR_R, + BDA_POLARISATION_MAX, +} Polarisation; + +typedef V1_ENUM enum GuardInterval +{ + BDA_GUARD_NOT_SET = -1, + BDA_GUARD_NOT_DEFINED = 0, + BDA_GUARD_1_32 = 1, + BDA_GUARD_1_16, + BDA_GUARD_1_8, + BDA_GUARD_1_4, + BDA_GUARD_MAX, +} GuardInterval; + +typedef V1_ENUM enum HierarchyAlpha +{ + BDA_HALPHA_NOT_SET = -1, + BDA_HALPHA_NOT_DEFINED = 0, + BDA_HALPHA_1 = 1, + BDA_HALPHA_2, + BDA_HALPHA_4, + BDA_HALPHA_MAX, +} HierarchyAlpha; + + + +#endif + Propchange: trunk/reactos/include/dxsdk/bdatypes.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 26912: 64-Bit Fixes for cabman (patch from Colin Finck) See issue #2236 for more details.
by cwittich＠svn.reactos.org 27 May '07

27 May '07

Author: cwittich Date: Sun May 27 14:26:43 2007 New Revision: 26912 URL: http://svn.reactos.org/svn/reactos?rev=26912&view=rev Log: 64-Bit Fixes for cabman (patch from Colin Finck) See issue #2236 for more details. Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/cabman.h trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/dfp.h trunk/reactos/tools/cabman/main.cxx trunk/reactos/tools/cabman/mszip.cxx trunk/reactos/tools/cabman/mszip.h trunk/reactos/tools/cabman/raw.cxx trunk/reactos/tools/cabman/raw.h Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sun May 27 14:26:43 2007 @@ -10,6 +10,7 @@ * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable * CF 04/05-2007 Reformatted the code to be more consistent and use TABs instead of spaces + * CF 04/05-2007 Made it compatible with 64-bit operating systems * TODO: * - Checksum of datablocks should be calculated * - EXTRACT.EXE complains if a disk is created manually @@ -27,31 +28,31 @@ #if defined(WIN32) #define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static long _GetSizeOfFile(FILEHANDLE handle) -{ - unsigned long size = GetFileSize(handle, NULL); +static int32_t _GetSizeOfFile(FILEHANDLE handle) +{ + uint32_t size = GetFileSize(handle, NULL); if (size == INVALID_FILE_SIZE) return -1; return size; } #define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, unsigned long size, unsigned long* bytesread) -{ - return ReadFile(handle, buffer, size, bytesread, NULL) != 0; +static bool _ReadFileData(FILEHANDLE handle, void* buffer, uint32_t size, uint32_t* bytesread) +{ + return ReadFile(handle, buffer, size, (LPDWORD)bytesread, NULL) != 0; } #else #define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static long _GetSizeOfFile(FILEHANDLE handle) -{ - long size; +static int32_t _GetSizeOfFile(FILEHANDLE handle) +{ + int32_t size; fseek(handle, 0, SEEK_END); size = ftell(handle); fseek(handle, 0, SEEK_SET); return size; } #define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, unsigned long size, unsigned long* bytesread) +static bool _ReadFileData(FILEHANDLE handle, void* buffer, uint32_t size, uint32_t* bytesread) { *bytesread = fread(buffer, 1, size, handle); return *bytesread == size; @@ -63,10 +64,10 @@ #if 0 #ifdef DBG -void DumpBuffer(void* Buffer, unsigned long Size) +void DumpBuffer(void* Buffer, uint32_t Size) { FILEHANDLE FileHandle; - unsigned long BytesWritten; + uint32_t BytesWritten; /* Create file, overwrite if it already exists */ FileHandle = CreateFile("dump.bin", // Create this file @@ -113,7 +114,7 @@ } -unsigned long CCFDATAStorage::Create(char* FileName) +uint32_t CCFDATAStorage::Create(char* FileName) /* * FUNCTION: Creates the file * ARGUMENTS: @@ -164,7 +165,7 @@ } -unsigned long CCFDATAStorage::Destroy() +uint32_t CCFDATAStorage::Destroy() /* * FUNCTION: Destroys the file * RETURNS: @@ -181,7 +182,7 @@ } -unsigned long CCFDATAStorage::Truncate() +uint32_t CCFDATAStorage::Truncate() /* * FUNCTION: Truncate the scratch file to zero bytes * RETURNS: @@ -206,7 +207,7 @@ } -unsigned long CCFDATAStorage::Position() +uint32_t CCFDATAStorage::Position() /* * FUNCTION: Returns current position in file * RETURNS: @@ -216,12 +217,12 @@ #if defined(WIN32) return SetFilePointer(FileHandle, 0, NULL, FILE_CURRENT); #else - return (unsigned long)ftell(FileHandle); -#endif -} - - -unsigned long CCFDATAStorage::Seek(long Position) + return (uint32_t)ftell(FileHandle); +#endif +} + + +uint32_t CCFDATAStorage::Seek(int32_t Position) /* * FUNCTION: Seeks to an absolute position * ARGUMENTS: @@ -247,7 +248,7 @@ } -unsigned long CCFDATAStorage::ReadBlock(PCFDATA Data, void* Buffer, unsigned long* BytesRead) +uint32_t CCFDATAStorage::ReadBlock(PCFDATA Data, void* Buffer, uint32_t* BytesRead) /* * FUNCTION: Reads a CFDATA block from the file * ARGUMENTS: @@ -259,7 +260,7 @@ */ { #if defined(WIN32) - if (!ReadFile(FileHandle, Buffer, Data->CompSize, BytesRead, NULL)) + if (!ReadFile(FileHandle, Buffer, Data->CompSize, (LPDWORD)BytesRead, NULL)) return CAB_STATUS_CANNOT_READ; #else @@ -271,7 +272,7 @@ } -unsigned long CCFDATAStorage::WriteBlock(PCFDATA Data, void* Buffer, unsigned long* BytesWritten) +uint32_t CCFDATAStorage::WriteBlock(PCFDATA Data, void* Buffer, uint32_t* BytesWritten) /* * FUNCTION: Writes a CFDATA block to the file * ARGUMENTS: @@ -283,7 +284,7 @@ */ { #if defined(WIN32) - if (!WriteFile(FileHandle, Buffer, Data->CompSize, BytesWritten, NULL)) + if (!WriteFile(FileHandle, Buffer, Data->CompSize, (LPDWORD)BytesWritten, NULL)) return CAB_STATUS_CANNOT_WRITE; #else *BytesWritten = fwrite(Buffer, 1, Data->CompSize, FileHandle); @@ -391,15 +392,15 @@ while (Path[i] != 0) { #if defined(WIN32) - if (Path[i] == '/') - newpath[i] = '\\'; - else + if (Path[i] == '/') + newpath[i] = '\\'; + else #else - if (Path[i] == '\\') - newpath[i] = '/'; + if (Path[i] == '\\') + newpath[i] = '/'; else #endif - newpath[i] = Path[i]; + newpath[i] = Path[i]; i++; } @@ -418,7 +419,7 @@ * Pointer to filename */ { - unsigned long i, j; + uint32_t i, j; j = i = (Path[0] ? (Path[1] == ':' ? 2 : 0) : 0); @@ -438,7 +439,7 @@ */ { char* FileName; - unsigned long i; + uint32_t i; i = (Path [0] ? (Path[1] == ':' ? 2 : 0) : 0); FileName = GetFileName(Path + i); @@ -452,7 +453,7 @@ bool CCabinet::NormalizePath(char* Path, - unsigned long Length) + uint32_t Length) /* * FUNCTION: Normalizes a path * ARGUMENTS: @@ -462,10 +463,10 @@ * true if there was enough room in Path, or false */ { - unsigned long n; + uint32_t n; bool OK = true; - if ((n = strlen(Path)) && + if ((n = (uint32_t)strlen(Path)) && (!IsSeparator(Path[n - 1])) && (OK = ((n + 1) < Length))) { @@ -531,7 +532,7 @@ */ { FILEHANDLE FileHandle; - unsigned long BytesRead; + uint32_t BytesRead; #if defined(WIN32) FileHandle = CreateFile(ConvertPath(FileName, true), // Open this file @@ -556,7 +557,7 @@ #endif CabinetReservedFileSize = GetSizeOfFile(FileHandle); - if (CabinetReservedFileSize == (unsigned long)-1) + if (CabinetReservedFileSize == (uint32_t)-1) { DPRINT(MIN_TRACE, ("Cannot read from cabinet reserved file.\n")); return false; @@ -600,7 +601,7 @@ } -unsigned long CCabinet::GetCurrentDiskNumber() +uint32_t CCabinet::GetCurrentDiskNumber() /* * FUNCTION: Returns current disk number * RETURNS: @@ -611,7 +612,7 @@ } -unsigned long CCabinet::Open() +uint32_t CCabinet::Open() /* * FUNCTION: Opens a cabinet file * RETURNS: @@ -619,13 +620,13 @@ */ { PCFFOLDER_NODE FolderNode; - unsigned long Status; - unsigned long Index; + uint32_t Status; + uint32_t Index; if (!FileOpen) { - unsigned long BytesRead; - unsigned long Size; + uint32_t BytesRead; + uint32_t Size; OutputBuffer = AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough if (!OutputBuffer) @@ -682,7 +683,7 @@ /* Read/skip any reserved bytes */ if (CABHeader.Flags & CAB_FLAG_RESERVE) { - if ((Status = ReadBlock(&Size, sizeof(unsigned long), &BytesRead)) + if ((Status = ReadBlock(&Size, sizeof(uint32_t), &BytesRead)) != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot read from file (%d).\n", (unsigned int)Status)); @@ -803,8 +804,8 @@ } -unsigned long CCabinet::FindFirst(char* FileName, - PCAB_SEARCH Search) +uint32_t CCabinet::FindFirst(char* FileName, + PCAB_SEARCH Search) /* * FUNCTION: Finds the first file in the cabinet that matches a search criteria * ARGUMENTS: @@ -821,7 +822,7 @@ } -unsigned long CCabinet::FindNext(PCAB_SEARCH Search) +uint32_t CCabinet::FindNext(PCAB_SEARCH Search) /* * FUNCTION: Finds next file in the cabinet that matches a search criteria * ARGUMENTS: @@ -830,9 +831,10 @@ * Status of operation */ { - unsigned long Status; - - if (RestartSearch) { + uint32_t Status; + + if (RestartSearch) + { Search->Next = FileListHead; /* Skip split files already extracted */ @@ -850,8 +852,10 @@ /* FIXME: Check search criteria */ - if (!Search->Next) { - if (strlen(DiskNext) > 0) { + if (!Search->Next) + { + if (strlen(DiskNext) > 0) + { CloseCabinet(); SetCabinetName(CabinetNext); @@ -865,7 +869,8 @@ Search->Next = FileListHead; if (!Search->Next) return CAB_STATUS_NOFILE; - } else + } + else return CAB_STATUS_NOFILE; } @@ -876,7 +881,7 @@ } -unsigned long CCabinet::ExtractFile(char* FileName) +uint32_t CCabinet::ExtractFile(char* FileName) /* * FUNCTION: Extracts a file from the cabinet * ARGUMENTS: @@ -885,21 +890,21 @@ * Status of operation */ { - unsigned long Size; - unsigned long Offset; - unsigned long BytesRead; - unsigned long BytesToRead; - unsigned long BytesWritten; - unsigned long BytesSkipped; - unsigned long BytesToWrite; - unsigned long TotalBytesRead; - unsigned long CurrentOffset; + uint32_t Size; + uint32_t Offset; + uint32_t BytesRead; + uint32_t BytesToRead; + uint32_t BytesWritten; + uint32_t BytesSkipped; + uint32_t BytesToWrite; + uint32_t TotalBytesRead; + uint32_t CurrentOffset; unsigned char* Buffer; unsigned char* CurrentBuffer; FILEHANDLE DestFile; PCFFILE_NODE File; CFDATA CFData; - unsigned long Status; + uint32_t Status; bool Skip; #if defined(WIN32) FILETIME FileTime; @@ -1084,7 +1089,7 @@ BytesToRead = CFData.CompSize; DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n", - (long unsigned int)CurrentBuffer, (long unsigned int)Buffer)); + (uintptr_t)CurrentBuffer, (uintptr_t)Buffer)); if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead)) @@ -1099,7 +1104,7 @@ /* if (CFData.Checksum != 0) { - unsigned long Checksum = ComputeChecksum(CurrentBuffer, BytesRead, 0); + uint32_t Checksum = ComputeChecksum(CurrentBuffer, BytesRead, 0); if (Checksum != CFData.Checksum) { CloseFile(DestFile); @@ -1264,14 +1269,14 @@ (unsigned int)Size)); #if defined(WIN32) - if (!WriteFile(DestFile, (void*)((unsigned long)OutputBuffer + BytesSkipped), - BytesToWrite, &BytesWritten, NULL) || + if (!WriteFile(DestFile, (void*)((uintptr_t)OutputBuffer + BytesSkipped), + BytesToWrite, (LPDWORD)&BytesWritten, NULL) || (BytesToWrite != BytesWritten)) { DPRINT(MIN_TRACE, ("Status 0x%lX.\n", GetLastError())); #else BytesWritten = BytesToWrite; - if (fwrite((void*)((unsigned long)OutputBuffer + BytesSkipped), + if (fwrite((void*)((uintptr_t)OutputBuffer + BytesSkipped), BytesToWrite, 1, DestFile) < 1) { #endif @@ -1297,7 +1302,7 @@ } -void CCabinet::SelectCodec(unsigned long Id) +void CCabinet::SelectCodec(uint32_t Id) /* * FUNCTION: Selects codec engine to use * ARGUMENTS: @@ -1338,14 +1343,14 @@ /* CAB write methods */ -unsigned long CCabinet::NewCabinet() +uint32_t CCabinet::NewCabinet() /* * FUNCTION: Creates a new cabinet * RETURNS: * Status of operation */ { - unsigned long Status; + uint32_t Status; CurrentDiskNumber = 0; @@ -1409,7 +1414,7 @@ } -unsigned long CCabinet::NewDisk() +uint32_t CCabinet::NewDisk() /* * FUNCTION: Forces a new disk to be created * RETURNS: @@ -1433,7 +1438,7 @@ } -unsigned long CCabinet::NewFolder() +uint32_t CCabinet::NewFolder() /* * FUNCTION: Forces a new folder to be created * RETURNS: @@ -1478,7 +1483,7 @@ } -unsigned long CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) +uint32_t CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) /* * FUNCTION: Writes a file to the scratch file * ARGUMENTS: @@ -1487,10 +1492,10 @@ * Status of operation */ { - unsigned long BytesToRead; - unsigned long BytesRead; - unsigned long Status; - unsigned long Size; + uint32_t BytesToRead; + uint32_t BytesRead; + uint32_t Status; + uint32_t Size; if (!ContinueFile) { @@ -1535,11 +1540,11 @@ FileNode->File.FileOffset = CurrentFolderNode->UncompOffset; CurrentFolderNode->UncompOffset += TotalBytesLeft; - FileNode->File.FileControlID = (unsigned short)(NextFolderNumber - 1); + FileNode->File.FileControlID = (uint16_t)(NextFolderNumber - 1); CurrentFolderNode->Commit = true; PrevCabinetNumber = CurrentDiskNumber; - Size = sizeof(CFFILE) + strlen(GetFileName(FileNode->FileName)) + 1; + Size = sizeof(CFFILE) + (uint32_t)strlen(GetFileName(FileNode->FileName)) + 1; CABHeader.FileTableOffset += Size; TotalFileSize += Size; DiskSize += Size; @@ -1551,7 +1556,7 @@ { do { - if (TotalBytesLeft > (unsigned long)CAB_BLOCKSIZE - CurrentIBufferSize) + if (TotalBytesLeft > (uint32_t)CAB_BLOCKSIZE - CurrentIBufferSize) BytesToRead = CAB_BLOCKSIZE - CurrentIBufferSize; else BytesToRead = TotalBytesLeft; @@ -1565,7 +1570,7 @@ *(unsigned char**)&CurrentIBuffer += BytesRead; - CurrentIBufferSize += (unsigned short)BytesRead; + CurrentIBufferSize += (uint16_t)BytesRead; if (CurrentIBufferSize == CAB_BLOCKSIZE) { @@ -1609,7 +1614,7 @@ } -unsigned long CCabinet::WriteDisk(unsigned long MoreDisks) +uint32_t CCabinet::WriteDisk(uint32_t MoreDisks) /* * FUNCTION: Forces the current disk to be written * ARGUMENTS: @@ -1619,7 +1624,7 @@ */ { PCFFILE_NODE FileNode; - unsigned long Status; + uint32_t Status; ContinueFile = false; FileNode = FileListHead; @@ -1695,7 +1700,7 @@ } -unsigned long CCabinet::CommitDisk(unsigned long MoreDisks) +uint32_t CCabinet::CommitDisk(uint32_t MoreDisks) /* * FUNCTION: Commits the current disk * ARGUMENTS: @@ -1705,7 +1710,7 @@ */ { PCFFOLDER_NODE FolderNode; - unsigned long Status; + uint32_t Status; OnCabinetName(CurrentDiskNumber, CabinetName); @@ -1720,7 +1725,7 @@ NULL); // No attribute template if (FileHandle == INVALID_HANDLE_VALUE) { - unsigned long Status; + uint32_t Status; /* If file exists, ask to overwrite file */ if (((Status = GetLastError()) == ERROR_FILE_EXISTS) && (OnOverwrite(NULL, CabinetName))) @@ -1801,7 +1806,7 @@ } -unsigned long CCabinet::CloseDisk() +uint32_t CCabinet::CloseDisk() /* * FUNCTION: Closes the current disk * RETURNS: @@ -1819,14 +1824,14 @@ } -unsigned long CCabinet::CloseCabinet() +uint32_t CCabinet::CloseCabinet() /* * FUNCTION: Closes the current cabinet * RETURNS: * Status of operation */ { - unsigned long Status; + uint32_t Status; DestroyFileNodes(); @@ -1857,7 +1862,7 @@ } -unsigned long CCabinet::AddFile(char* FileName) +uint32_t CCabinet::AddFile(char* FileName) /* * FUNCTION: Adds a file to the current disk * ARGUMENTS: @@ -1918,7 +1923,7 @@ /* FIXME: Check for and handle large files (>= 2GB) */ FileNode->File.FileSize = GetSizeOfFile(SrcFile); - if (FileNode->File.FileSize == (unsigned long)-1) + if (FileNode->File.FileSize == (uint32_t)-1) { DPRINT(MIN_TRACE, ("Cannot read from file.\n")); FreeMemory(NewFileName); @@ -1935,7 +1940,7 @@ } -void CCabinet::SetMaxDiskSize(unsigned long Size) +void CCabinet::SetMaxDiskSize(uint32_t Size) /* * FUNCTION: Sets the maximum size of the current disk * ARGUMENTS: @@ -2003,7 +2008,7 @@ } -bool CCabinet::OnDiskLabel(unsigned long Number, char* Label) +bool CCabinet::OnDiskLabel(uint32_t Number, char* Label) /* * FUNCTION: Called when a disk needs a label * ARGUMENTS: @@ -2017,7 +2022,7 @@ } -bool CCabinet::OnCabinetName(unsigned long Number, char* Name) +bool CCabinet::OnCabinetName(uint32_t Number, char* Name) /* * FUNCTION: Called when a cabinet needs a name * ARGUMENTS: @@ -2032,7 +2037,7 @@ #endif /* CAB_READ_ONLY */ -PCFFOLDER_NODE CCabinet::LocateFolderNode(unsigned long Index) +PCFFOLDER_NODE CCabinet::LocateFolderNode(uint32_t Index) /* * FUNCTION: Locates a folder node * ARGUMENTS: @@ -2064,7 +2069,7 @@ } -unsigned long CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) +uint32_t CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) /* * FUNCTION: Returns the absolute offset of a file * ARGUMENTS: @@ -2105,8 +2110,8 @@ } -unsigned long CCabinet::LocateFile(char* FileName, - PCFFILE_NODE *File) +uint32_t CCabinet::LocateFile(char* FileName, + PCFFILE_NODE *File) /* * FUNCTION: Locates a file in the cabinet * ARGUMENTS: @@ -2119,7 +2124,7 @@ */ { PCFFILE_NODE Node; - unsigned long Status; + uint32_t Status; DPRINT(MAX_TRACE, ("FileName '%s'\n", FileName)); @@ -2150,7 +2155,7 @@ } -unsigned long CCabinet::ReadString(char* String, unsigned long MaxLength) +uint32_t CCabinet::ReadString(char* String, uint32_t MaxLength) /* * FUNCTION: Reads a NULL-terminated string from the cabinet * ARGUMENTS: @@ -2160,10 +2165,10 @@ * Status of operation */ { - unsigned long BytesRead; - unsigned long Offset; - unsigned long Status; - unsigned long Size; + uint32_t BytesRead; + uint32_t Offset; + uint32_t Status; + uint32_t Size; bool Found; Offset = 0; @@ -2203,7 +2208,7 @@ #if defined(WIN32) SetLastError(NO_ERROR); (unsigned int)SetFilePointer(FileHandle, - -(long)Size, + -(int32_t)Size, NULL, FILE_CURRENT); if (GetLastError() != NO_ERROR) @@ -2212,7 +2217,7 @@ return CAB_STATUS_INVALID_CAB; } #else - if (fseek(FileHandle, (off_t)(-(long)Size), SEEK_CUR) != 0) + if (fseek(FileHandle, (off_t)(-(int32_t)Size), SEEK_CUR) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); return CAB_STATUS_INVALID_CAB; @@ -2222,16 +2227,16 @@ } -unsigned long CCabinet::ReadFileTable() +uint32_t CCabinet::ReadFileTable() /* * FUNCTION: Reads the file table from the cabinet file * RETURNS: * Status of operation */ { - unsigned long i; - unsigned long Status; - unsigned long BytesRead; + uint32_t i; + uint32_t Status; + uint32_t BytesRead; PCFFILE_NODE File; DPRINT(MAX_TRACE, ("Reading file table at absolute offset (0x%lX).\n", @@ -2240,7 +2245,7 @@ /* Seek to file table */ #if defined(WIN32) SetLastError(NO_ERROR); - (unsigned int)SetFilePointer(FileHandle, + SetFilePointer(FileHandle, CABHeader.FileTableOffset, NULL, FILE_BEGIN); @@ -2297,7 +2302,7 @@ } -unsigned long CCabinet::ReadDataBlocks(PCFFOLDER_NODE FolderNode) +uint32_t CCabinet::ReadDataBlocks(PCFFOLDER_NODE FolderNode) /* * FUNCTION: Reads all CFDATA blocks for a folder from the cabinet file * ARGUMENTS: @@ -2306,12 +2311,12 @@ * Status of operation */ { - unsigned long AbsoluteOffset; - unsigned long UncompOffset; + uint32_t AbsoluteOffset; + uint32_t UncompOffset; PCFDATA_NODE Node; - unsigned long BytesRead; - unsigned long Status; - unsigned long i; + uint32_t BytesRead; + uint32_t Status; + uint32_t i; DPRINT(MAX_TRACE, ("Reading data blocks for folder (%lu) at absolute offset (0x%lX).\n", FolderNode->Index, FolderNode->Folder.DataOffset)); @@ -2546,7 +2551,7 @@ DPRINT(MAX_TRACE, ("Deleting file: '%s'\n", CurNode->FileName)); - TotalFileSize -= (sizeof(CFFILE) + strlen(GetFileName(CurNode->FileName)) + 1); + TotalFileSize -= (sizeof(CFFILE) + (uint32_t)strlen(GetFileName(CurNode->FileName)) + 1); if (CurNode->FileName) FreeMemory(CurNode->FileName); @@ -2621,9 +2626,9 @@ } -unsigned long CCabinet::ComputeChecksum(void* Buffer, - unsigned int Size, - unsigned long Seed) +uint32_t CCabinet::ComputeChecksum(void* Buffer, + unsigned int Size, + uint32_t Seed) /* * FUNCTION: Computes checksum for data block * ARGUMENTS: @@ -2635,9 +2640,9 @@ */ { int UlongCount; // Number of ULONGs in block - unsigned long Checksum; // Checksum accumulator + uint32_t Checksum; // Checksum accumulator unsigned char* pb; - unsigned long ul; + uint32_t ul; /* FIXME: Doesn't seem to be correct. EXTRACT.EXE won't accept checksums computed by this routine */ @@ -2651,11 +2656,11 @@ /* Checksum integral multiple of ULONGs */ while (UlongCount-- > 0) { - /* NOTE: Build unsigned long in big/little-endian independent manner */ + /* NOTE: Build uint32_t in big/little-endian independent manner */ ul = *pb++; // Get low-order byte - ul |= (((unsigned long)(*pb++)) << 8); // Add 2nd byte - ul |= (((unsigned long)(*pb++)) << 16); // Add 3nd byte - ul |= (((unsigned long)(*pb++)) << 24); // Add 4th byte + ul |= (((uint32_t)(*pb++)) << 8); // Add 2nd byte + ul |= (((uint32_t)(*pb++)) << 16); // Add 3nd byte + ul |= (((uint32_t)(*pb++)) << 24); // Add 4th byte Checksum ^= ul; // Update checksum } @@ -2665,9 +2670,9 @@ switch (Size % 4) { case 3: - ul |= (((unsigned long)(*pb++)) << 16); // Add 3rd byte + ul |= (((uint32_t)(*pb++)) << 16); // Add 3rd byte case 2: - ul |= (((unsigned long)(*pb++)) << 8); // Add 2nd byte + ul |= (((uint32_t)(*pb++)) << 8); // Add 2nd byte case 1: ul |= *pb++; // Get low-order byte default: @@ -2680,15 +2685,15 @@ } -unsigned long CCabinet::ReadBlock(void* Buffer, - unsigned long Size, - unsigned long* BytesRead) +uint32_t CCabinet::ReadBlock(void* Buffer, + uint32_t Size, + uint32_t* BytesRead) /* * FUNCTION: Read a block of data from file * ARGUMENTS: * Buffer = Pointer to data buffer * Size = Length of data buffer - * BytesRead = Pointer to unsigned long that on return will contain + * BytesRead = Pointer to uint32_t that on return will contain * number of bytes read * RETURNS: * Status of operation @@ -2701,22 +2706,22 @@ #ifndef CAB_READ_ONLY -unsigned long CCabinet::InitCabinetHeader() +uint32_t CCabinet::InitCabinetHeader() /* * FUNCTION: Initializes cabinet header and optional fields * RETURNS: * Status of operation */ { - unsigned long TotalSize; - unsigned long Size; + uint32_t TotalSize; + uint32_t Size; CABHeader.FileTableOffset = 0; // Not known yet CABHeader.FolderCount = 0; // Not known yet CABHeader.FileCount = 0; // Not known yet CABHeader.Flags = 0; // Not known yet - CABHeader.CabinetNumber = (unsigned short)CurrentDiskNumber; + CABHeader.CabinetNumber = (uint16_t)CurrentDiskNumber; if ((CurrentDiskNumber > 0) && (OnCabinetName(PrevCabinetNumber, CabinetPrev))) { @@ -2740,10 +2745,10 @@ DPRINT(MAX_TRACE, ("CabinetPrev '%s'.\n", CabinetPrev)); /* Calculate size of name of previous cabinet */ - TotalSize += strlen(CabinetPrev) + 1; + TotalSize += (uint32_t)strlen(CabinetPrev) + 1; /* Calculate size of label of previous disk */ - TotalSize += strlen(DiskPrev) + 1; + TotalSize += (uint32_t)strlen(DiskPrev) + 1; } if ((CABHeader.Flags & CAB_FLAG_HASNEXT) > 0) @@ -2752,12 +2757,12 @@ DPRINT(MAX_TRACE, ("CabinetNext '%s'.\n", CabinetNext)); /* Calculate size of name of next cabinet */ - Size = strlen(CabinetNext) + 1; + Size = (uint32_t)strlen(CabinetNext) + 1; TotalSize += Size; NextFieldsSize = Size; /* Calculate size of label of next disk */ - Size = strlen(DiskNext) + 1; + Size = (uint32_t)strlen(DiskNext) + 1; TotalSize += Size; NextFieldsSize += Size; } @@ -2769,7 +2774,7 @@ { CABHeader.Flags |= CAB_FLAG_RESERVE; TotalSize += CabinetReservedFileSize; - TotalSize += sizeof(unsigned long); /* For CabinetResSize, FolderResSize, and FileResSize fields */ + TotalSize += sizeof(uint32_t); /* For CabinetResSize, FolderResSize, and FileResSize fields */ } DiskSize += TotalSize; @@ -2780,7 +2785,7 @@ } -unsigned long CCabinet::WriteCabinetHeader(bool MoreDisks) +uint32_t CCabinet::WriteCabinetHeader(bool MoreDisks) /* * FUNCTION: Writes the cabinet header and optional fields * ARGUMENTS: @@ -2791,8 +2796,8 @@ { PCFFOLDER_NODE FolderNode; PCFFILE_NODE FileNode; - unsigned long BytesWritten; - unsigned long Size; + uint32_t BytesWritten; + uint32_t Size; if (MoreDisks) { @@ -2836,9 +2841,9 @@ CABHeader.CabinetSize = DiskSize; - /* Write header */ -#if defined(WIN32) - if (!WriteFile(FileHandle, &CABHeader, sizeof(CFHEADER), &BytesWritten, NULL)) + /* Write header */ +#if defined(WIN32) + if (!WriteFile(FileHandle, &CABHeader, sizeof(CFHEADER), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2855,20 +2860,20 @@ /* Write per-cabinet reserved area if present */ if (CABHeader.Flags & CAB_FLAG_RESERVE) { - unsigned long ReservedSize; + uint32_t ReservedSize; ReservedSize = CabinetReservedFileSize & 0xffff; ReservedSize |= (0 << 16); /* Folder reserved area size */ ReservedSize |= (0 << 24); /* Folder reserved area size */ #if defined(WIN32) - if (!WriteFile(FileHandle, &ReservedSize, sizeof(unsigned long), &BytesWritten, NULL)) + if (!WriteFile(FileHandle, &ReservedSize, sizeof(uint32_t), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } #else - BytesWritten = sizeof(unsigned long); - if (fwrite(&ReservedSize, sizeof(unsigned long), 1, FileHandle) < 1) + BytesWritten = sizeof(uint32_t); + if (fwrite(&ReservedSize, sizeof(uint32_t), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2876,7 +2881,7 @@ #endif #if defined(WIN32) - if (!WriteFile(FileHandle, CabinetReservedFileBuffer, CabinetReservedFileSize, &BytesWritten, NULL)) + if (!WriteFile(FileHandle, CabinetReservedFileBuffer, CabinetReservedFileSize, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2896,9 +2901,9 @@ DPRINT(MAX_TRACE, ("CabinetPrev '%s'.\n", CabinetPrev)); /* Write name of previous cabinet */ - Size = strlen(CabinetPrev) + 1; -#if defined(WIN32) - if (!WriteFile(FileHandle, CabinetPrev, Size, &BytesWritten, NULL)) + Size = (uint32_t)strlen(CabinetPrev) + 1; +#if defined(WIN32) + if (!WriteFile(FileHandle, CabinetPrev, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2915,9 +2920,9 @@ DPRINT(MAX_TRACE, ("DiskPrev '%s'.\n", DiskPrev)); /* Write label of previous disk */ - Size = strlen(DiskPrev) + 1; -#if defined(WIN32) - if (!WriteFile(FileHandle, DiskPrev, Size, &BytesWritten, NULL)) + Size = (uint32_t)strlen(DiskPrev) + 1; +#if defined(WIN32) + if (!WriteFile(FileHandle, DiskPrev, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2937,9 +2942,9 @@ DPRINT(MAX_TRACE, ("CabinetNext '%s'.\n", CabinetNext)); /* Write name of next cabinet */ - Size = strlen(CabinetNext) + 1; -#if defined(WIN32) - if (!WriteFile(FileHandle, CabinetNext, Size, &BytesWritten, NULL)) + Size = (uint32_t)strlen(CabinetNext) + 1; +#if defined(WIN32) + if (!WriteFile(FileHandle, CabinetNext, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2956,9 +2961,9 @@ DPRINT(MAX_TRACE, ("DiskNext '%s'.\n", DiskNext)); /* Write label of next disk */ - Size = strlen(DiskNext) + 1; -#if defined(WIN32) - if (!WriteFile(FileHandle, DiskNext, Size, &BytesWritten, NULL)) + Size = (uint32_t)strlen(DiskNext) + 1; +#if defined(WIN32) + if (!WriteFile(FileHandle, DiskNext, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2977,7 +2982,7 @@ } -unsigned long CCabinet::WriteFolderEntries() +uint32_t CCabinet::WriteFolderEntries() /* * FUNCTION: Writes folder entries * RETURNS: @@ -2985,7 +2990,7 @@ */ { PCFFOLDER_NODE FolderNode; - unsigned long BytesWritten; + uint32_t BytesWritten; DPRINT(MAX_TRACE, ("Writing folder table.\n")); @@ -2999,10 +3004,10 @@ #if defined(WIN32) if (!WriteFile(FileHandle, - &FolderNode->Folder, - sizeof(CFFOLDER), - &BytesWritten, - NULL)) + &FolderNode->Folder, + sizeof(CFFOLDER), + (LPDWORD)&BytesWritten, + NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -3023,7 +3028,7 @@ } -unsigned long CCabinet::WriteFileEntries() +uint32_t CCabinet::WriteFileEntries() /* * FUNCTION: Writes file entries for all files * RETURNS: @@ -3031,7 +3036,7 @@ */ { PCFFILE_NODE File; - unsigned long BytesWritten; + uint32_t BytesWritten; bool SetCont = false; DPRINT(MAX_TRACE, ("Writing file table.\n")); @@ -3063,7 +3068,7 @@ if (!WriteFile(FileHandle, &File->File, sizeof(CFFILE), - &BytesWritten, + (LPDWORD)&BytesWritten, NULL)) return CAB_STATUS_CANNOT_WRITE; #else @@ -3078,7 +3083,9 @@ #if defined(WIN32) if (!WriteFile(FileHandle, GetFileName(File->FileName), - strlen(GetFileName(File->FileName)) + 1, &BytesWritten, NULL)) + (DWORD)strlen(GetFileName(File->FileName)) + 1, + (LPDWORD)&BytesWritten, + NULL)) return CAB_STATUS_CANNOT_WRITE; #else BytesWritten = strlen(GetFileName(File->FileName)) + 1; @@ -3102,7 +3109,7 @@ } -unsigned long CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) +uint32_t CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) /* * FUNCTION: Writes data blocks to the cabinet * ARGUMENTS: @@ -3112,9 +3119,9 @@ */ { PCFDATA_NODE DataNode; - unsigned long BytesWritten; - unsigned long BytesRead; - unsigned long Status; + uint32_t BytesWritten; + uint32_t BytesRead; + uint32_t Status; DataNode = FolderNode->DataListHead; if (DataNode != NULL) @@ -3139,7 +3146,7 @@ #if defined(WIN32) if (!WriteFile(FileHandle, &DataNode->Data, - sizeof(CFDATA), &BytesWritten, NULL)) + sizeof(CFDATA), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -3155,7 +3162,7 @@ #if defined(WIN32) if (!WriteFile(FileHandle, InputBuffer, - DataNode->Data.CompSize, &BytesWritten, NULL)) + DataNode->Data.CompSize, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -3175,15 +3182,15 @@ } -unsigned long CCabinet::WriteDataBlock() +uint32_t CCabinet::WriteDataBlock() /* * FUNCTION: Writes the current data block to the scratch file * RETURNS: * Status of operation */ { - unsigned long Status; - unsigned long BytesWritten; + uint32_t Status; + uint32_t BytesWritten; PCFDATA_NODE DataNode; if (!BlockIsSplit) @@ -3217,14 +3224,14 @@ if (BlockIsSplit) { - DataNode->Data.CompSize = (unsigned short)(MaxDiskSize - DiskSize); + DataNode->Data.CompSize = (uint16_t)(MaxDiskSize - DiskSize); DataNode->Data.UncompSize = 0; CreateNewDisk = true; } else { - DataNode->Data.CompSize = (unsigned short)CurrentOBufferSize; - DataNode->Data.UncompSize = (unsigned short)CurrentIBufferSize; + DataNode->Data.CompSize = (uint16_t)CurrentOBufferSize; + DataNode->Data.UncompSize = (uint16_t)CurrentIBufferSize; } DataNode->Data.Checksum = 0; @@ -3266,8 +3273,8 @@ #if !defined(WIN32) void CCabinet::ConvertDateAndTime(time_t* Time, - unsigned short* DosDate, - unsigned short* DosTime) + uint16_t* DosDate, + uint16_t* DosTime) /* * FUNCTION: Returns file times of a file * ARGUMENTS: @@ -3297,7 +3304,7 @@ #endif // !WIN32 -unsigned long CCabinet::GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File) +uint32_t CCabinet::GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File) /* * FUNCTION: Returns file times of a file * ARGUMENTS: @@ -3337,7 +3344,7 @@ } -unsigned long CCabinet::GetAttributesOnFile(PCFFILE_NODE File) +uint32_t CCabinet::GetAttributesOnFile(PCFFILE_NODE File) /* * FUNCTION: Returns attributes on a file * ARGUMENTS: @@ -3347,7 +3354,7 @@ */ { #if defined(WIN32) - long Attributes; + int32_t Attributes; Attributes = GetFileAttributes(File->FileName); if (Attributes == -1) @@ -3400,7 +3407,7 @@ } -unsigned long CCabinet::SetAttributesOnFile(PCFFILE_NODE File) +uint32_t CCabinet::SetAttributesOnFile(PCFFILE_NODE File) /* * FUNCTION: Sets attributes on a file * ARGUMENTS: @@ -3410,7 +3417,7 @@ */ { #if defined(WIN32) - unsigned long Attributes = 0; + uint32_t Attributes = 0; if (File->File.Attributes & CAB_ATTRIB_READONLY) Attributes |= FILE_ATTRIBUTE_READONLY; Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Sun May 27 14:26:43 2007 @@ -19,6 +19,8 @@ #define MAX_PATH 260 #endif #endif + +#include <stdint.h> #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -56,7 +58,7 @@ #ifdef DBG -extern unsigned long DebugTraceLevel; +extern uint32_t DebugTraceLevel; #ifdef _MSC_VER #define __FUNCTION__ "" @@ -121,59 +123,59 @@ typedef struct _CFHEADER { - unsigned long Signature; // File signature 'MSCF' (CAB_SIGNATURE) - unsigned long Reserved1; // Reserved field - unsigned long CabinetSize; // Cabinet file size - unsigned long Reserved2; // Reserved field - unsigned long FileTableOffset; // Offset of first CFFILE - unsigned long Reserved3; // Reserved field - unsigned short Version; // Cabinet version (CAB_VERSION) - unsigned short FolderCount; // Number of folders - unsigned short FileCount; // Number of files - unsigned short Flags; // Cabinet flags (CAB_FLAG_*) - unsigned short SetID; // Cabinet set id - unsigned short CabinetNumber; // Zero-based cabinet number + uint32_t Signature; // File signature 'MSCF' (CAB_SIGNATURE) + uint32_t Reserved1; // Reserved field + uint32_t CabinetSize; // Cabinet file size + uint32_t Reserved2; // Reserved field + uint32_t FileTableOffset; // Offset of first CFFILE + uint32_t Reserved3; // Reserved field + uint16_t Version; // Cabinet version (CAB_VERSION) + uint16_t FolderCount; // Number of folders + uint16_t FileCount; // Number of files + uint16_t Flags; // Cabinet flags (CAB_FLAG_*) + uint16_t SetID; // Cabinet set id + uint16_t CabinetNumber; // Zero-based cabinet number /* Optional fields (depends on Flags) - unsigned short CabinetResSize // Per-cabinet reserved area size - char FolderResSize // Per-folder reserved area size - char FileResSize // Per-file reserved area size - char CabinetReserved[] // Per-cabinet reserved area - char CabinetPrev[] // Name of previous cabinet file - char DiskPrev[] // Name of previous disk - char CabinetNext[] // Name of next cabinet file - char DiskNext[] // Name of next disk + uint16_t CabinetResSize // Per-cabinet reserved area size + char FolderResSize // Per-folder reserved area size + char FileResSize // Per-file reserved area size + char CabinetReserved[] // Per-cabinet reserved area + char CabinetPrev[] // Name of previous cabinet file + char DiskPrev[] // Name of previous disk + char CabinetNext[] // Name of next cabinet file + char DiskNext[] // Name of next disk */ } CFHEADER, *PCFHEADER; typedef struct _CFFOLDER { - unsigned long DataOffset; // Absolute offset of first CFDATA block in this folder - unsigned short DataBlockCount; // Number of CFDATA blocks in this folder in this cabinet - unsigned short CompressionType; // Type of compression used for all CFDATA blocks in this folder + uint32_t DataOffset; // Absolute offset of first CFDATA block in this folder + uint16_t DataBlockCount; // Number of CFDATA blocks in this folder in this cabinet + uint16_t CompressionType; // Type of compression used for all CFDATA blocks in this folder /* Optional fields (depends on Flags) - char FolderReserved[] // Per-folder reserved area + char FolderReserved[] // Per-folder reserved area */ } CFFOLDER, *PCFFOLDER; typedef struct _CFFILE { - unsigned long FileSize; // Uncompressed file size in bytes - unsigned long FileOffset; // Uncompressed offset of file in the folder - unsigned short FileControlID; // File control ID (CAB_FILE_*) - unsigned short FileDate; // File date stamp, as used by DOS - unsigned short FileTime; // File time stamp, as used by DOS - unsigned short Attributes; // File attributes (CAB_ATTRIB_*) + uint32_t FileSize; // Uncompressed file size in bytes + uint32_t FileOffset; // Uncompressed offset of file in the folder + uint16_t FileControlID; // File control ID (CAB_FILE_*) + uint16_t FileDate; // File date stamp, as used by DOS + uint16_t FileTime; // File time stamp, as used by DOS + uint16_t Attributes; // File attributes (CAB_ATTRIB_*) /* After this is the NULL terminated filename */ } CFFILE, *PCFFILE; typedef struct _CFDATA { - unsigned long Checksum; // Checksum of CFDATA entry - unsigned short CompSize; // Number of compressed bytes in this block - unsigned short UncompSize; // Number of uncompressed bytes in this block + uint32_t Checksum; // Checksum of CFDATA entry + uint16_t CompSize; // Number of compressed bytes in this block + uint16_t UncompSize; // Number of uncompressed bytes in this block /* Optional fields (depends on Flags) char DataReserved[] // Per-datablock reserved area */ @@ -183,25 +185,25 @@ { struct _CFDATA_NODE *Next; struct _CFDATA_NODE *Prev; - unsigned long ScratchFilePosition; // Absolute offset in scratch file - unsigned long AbsoluteOffset; // Absolute offset in cabinet - unsigned long UncompOffset; // Uncompressed offset in folder - CFDATA Data; + uint32_t ScratchFilePosition; // Absolute offset in scratch file + uint32_t AbsoluteOffset; // Absolute offset in cabinet + uint32_t UncompOffset; // Uncompressed offset in folder + CFDATA Data; } CFDATA_NODE, *PCFDATA_NODE; typedef struct _CFFOLDER_NODE { struct _CFFOLDER_NODE *Next; struct _CFFOLDER_NODE *Prev; - unsigned long UncompOffset; // File size accumulator - unsigned long AbsoluteOffset; - unsigned long TotalFolderSize; // Total size of folder in current disk - PCFDATA_NODE DataListHead; - PCFDATA_NODE DataListTail; - unsigned long Index; - bool Commit; // true if the folder should be committed - bool Delete; // true if marked for deletion - CFFOLDER Folder; + uint32_t UncompOffset; // File size accumulator + uint32_t AbsoluteOffset; + uint32_t TotalFolderSize; // Total size of folder in current disk + PCFDATA_NODE DataListHead; + PCFDATA_NODE DataListTail; + uint32_t Index; + bool Commit; // true if the folder should be committed + bool Delete; // true if marked for deletion + CFFOLDER Folder; } CFFOLDER_NODE, *PCFFOLDER_NODE; typedef struct _CFFILE_NODE @@ -213,7 +215,7 @@ PCFDATA_NODE DataBlock; // First data block of file. NULL if not known bool Commit; // true if the file data should be committed bool Delete; // true if marked for deletion - PCFFOLDER_NODE FolderNode; // Folder this file belong to + PCFFOLDER_NODE FolderNode; // Folder this file belong to } CFFILE_NODE, *PCFFILE_NODE; @@ -252,15 +254,15 @@ /* Default destructor */ virtual ~CCABCodec() {}; /* Compresses a data block */ - virtual unsigned long Compress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) = 0; + virtual uint32_t Compress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) = 0; /* Uncompresses a data block */ - virtual unsigned long Uncompress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) = 0; + virtual uint32_t Uncompress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) = 0; }; @@ -287,13 +289,13 @@ CCFDATAStorage(); /* Default destructor */ virtual ~CCFDATAStorage(); - unsigned long Create(char* FileName); - unsigned long Destroy(); - unsigned long Truncate(); - unsigned long Position(); - unsigned long Seek(long Position); - unsigned long ReadBlock(PCFDATA Data, void* Buffer, unsigned long* BytesRead); - unsigned long WriteBlock(PCFDATA Data, void* Buffer, unsigned long* BytesWritten); + uint32_t Create(char* FileName); + uint32_t Destroy(); + uint32_t Truncate(); + uint32_t Position(); + uint32_t Seek(int32_t Position); + uint32_t ReadBlock(PCFDATA Data, void* Buffer, uint32_t* BytesRead); + uint32_t WriteBlock(PCFDATA Data, void* Buffer, uint32_t* BytesWritten); private: char FullName[MAX_PATH]; bool FileCreated; @@ -317,7 +319,7 @@ /* Removes a filename from a fully qualified filename */ void RemoveFileName(char* Path); /* Normalizes a path */ - bool NormalizePath(char* Path, unsigned long Length); + bool NormalizePath(char* Path, uint32_t Length); /* Returns name of cabinet file */ char* GetCabinetName(); /* Sets the name of the cabinet file */ @@ -331,40 +333,40 @@ /* Returns destination path */ char* GetDestinationPath(); /* Returns zero-based current disk number */ - unsigned long GetCurrentDiskNumber(); + uint32_t GetCurrentDiskNumber(); /* Opens the current cabinet file */ - unsigned long Open(); + uint32_t Open(); /* Closes the current open cabinet file */ void Close(); /* Locates the first file in the current cabinet file that matches a search criteria */ - unsigned long FindFirst(char* FileName, PCAB_SEARCH Search); + uint32_t FindFirst(char* FileName, PCAB_SEARCH Search); /* Locates the next file in the current cabinet file */ - unsigned long FindNext(PCAB_SEARCH Search); + uint32_t FindNext(PCAB_SEARCH Search); /* Extracts a file from the current cabinet file */ - unsigned long ExtractFile(char* FileName); + uint32_t ExtractFile(char* FileName); /* Select codec engine to use */ - void SelectCodec(unsigned long Id); + void SelectCodec(uint32_t Id); #ifndef CAB_READ_ONLY /* Creates a new cabinet file */ - unsigned long NewCabinet(); + uint32_t NewCabinet(); /* Forces a new disk to be created */ - unsigned long NewDisk(); + uint32_t NewDisk(); /* Forces a new folder to be created */ - unsigned long NewFolder(); + uint32_t NewFolder(); /* Writes a file to scratch storage */ - unsigned long WriteFileToScratchStorage(PCFFILE_NODE FileNode); + uint32_t WriteFileToScratchStorage(PCFFILE_NODE FileNode); /* Forces the current disk to be written */ - unsigned long WriteDisk(unsigned long MoreDisks); + uint32_t WriteDisk(uint32_t MoreDisks); /* Commits the current disk */ - unsigned long CommitDisk(unsigned long MoreDisks); + uint32_t CommitDisk(uint32_t MoreDisks); /* Closes the current disk */ - unsigned long CloseDisk(); + uint32_t CloseDisk(); /* Closes the current cabinet */ - unsigned long CloseCabinet(); + uint32_t CloseCabinet(); /* Adds a file to the current disk */ - unsigned long AddFile(char* FileName); + uint32_t AddFile(char* FileName); /* Sets the maximum size of the current disk */ - void SetMaxDiskSize(unsigned long Size); + void SetMaxDiskSize(uint32_t Size); #endif /* CAB_READ_ONLY */ /* Default event handlers */ @@ -379,17 +381,17 @@ /* Handler called when a file is about to be added */ virtual void OnAdd(PCFFILE Entry, char* FileName); /* Handler called when a cabinet need a name */ - virtual bool OnCabinetName(unsigned long Number, char* Name); + virtual bool OnCabinetName(uint32_t Number, char* Name); /* Handler called when a disk needs a label */ - virtual bool OnDiskLabel(unsigned long Number, char* Label); + virtual bool OnDiskLabel(uint32_t Number, char* Label); #endif /* CAB_READ_ONLY */ private: - PCFFOLDER_NODE LocateFolderNode(unsigned long Index); - unsigned long GetAbsoluteOffset(PCFFILE_NODE File); - unsigned long LocateFile(char* FileName, PCFFILE_NODE *File); - unsigned long ReadString(char* String, unsigned long MaxLength); - unsigned long ReadFileTable(); - unsigned long ReadDataBlocks(PCFFOLDER_NODE FolderNode); + PCFFOLDER_NODE LocateFolderNode(uint32_t Index); + uint32_t GetAbsoluteOffset(PCFFILE_NODE File); + uint32_t LocateFile(char* FileName, PCFFILE_NODE *File); + uint32_t ReadString(char* String, uint32_t MaxLength); + uint32_t ReadFileTable(); + uint32_t ReadDataBlocks(PCFFOLDER_NODE FolderNode); PCFFOLDER_NODE NewFolderNode(); PCFFILE_NODE NewFileNode(); PCFDATA_NODE NewDataNode(PCFFOLDER_NODE FolderNode); @@ -398,45 +400,45 @@ void DestroyDeletedFileNodes(); void DestroyFolderNodes(); void DestroyDeletedFolderNodes(); - unsigned long ComputeChecksum(void* Buffer, unsigned int Size, unsigned long Seed); - unsigned long ReadBlock(void* Buffer, unsigned long Size, unsigned long* BytesRead); + uint32_t ComputeChecksum(void* Buffer, unsigned int Size, uint32_t Seed); + uint32_t ReadBlock(void* Buffer, uint32_t Size, uint32_t* BytesRead); #ifndef CAB_READ_ONLY - unsigned long InitCabinetHeader(); - unsigned long WriteCabinetHeader(bool MoreDisks); - unsigned long WriteFolderEntries(); - unsigned long WriteFileEntries(); - unsigned long CommitDataBlocks(PCFFOLDER_NODE FolderNode); - unsigned long WriteDataBlock(); - unsigned long GetAttributesOnFile(PCFFILE_NODE File); - unsigned long SetAttributesOnFile(PCFFILE_NODE File); - unsigned long GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File); + uint32_t InitCabinetHeader(); + uint32_t WriteCabinetHeader(bool MoreDisks); + uint32_t WriteFolderEntries(); + uint32_t WriteFileEntries(); + uint32_t CommitDataBlocks(PCFFOLDER_NODE FolderNode); + uint32_t WriteDataBlock(); + uint32_t GetAttributesOnFile(PCFFILE_NODE File); + uint32_t SetAttributesOnFile(PCFFILE_NODE File); + uint32_t GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File); #if !defined(WIN32) - void ConvertDateAndTime(time_t* Time, unsigned short* DosDate, unsigned short* DosTime); + void ConvertDateAndTime(time_t* Time, uint16_t* DosDate, uint16_t* DosTime); #endif #endif /* CAB_READ_ONLY */ - unsigned long CurrentDiskNumber; // Zero based disk number + uint32_t CurrentDiskNumber; // Zero based disk number char CabinetName[256]; // Filename of current cabinet char CabinetPrev[256]; // Filename of previous cabinet char DiskPrev[256]; // Label of cabinet in file CabinetPrev char CabinetNext[256]; // Filename of next cabinet char DiskNext[256]; // Label of cabinet in file CabinetNext - unsigned long TotalHeaderSize; // Size of header and optional fields - unsigned long NextFieldsSize; // Size of next cabinet name and next disk label - unsigned long TotalFolderSize; // Size of all folder entries - unsigned long TotalFileSize; // Size of all file entries - unsigned long FolderUncompSize; // Uncompressed size of folder - unsigned long BytesLeftInBlock; // Number of bytes left in current block + uint32_t TotalHeaderSize; // Size of header and optional fields + uint32_t NextFieldsSize; // Size of next cabinet name and next disk label + uint32_t TotalFolderSize; // Size of all folder entries + uint32_t TotalFileSize; // Size of all file entries + uint32_t FolderUncompSize; // Uncompressed size of folder + uint32_t BytesLeftInBlock; // Number of bytes left in current block bool ReuseBlock; char DestPath[MAX_PATH]; char CabinetReservedFile[MAX_PATH]; void* CabinetReservedFileBuffer; - unsigned long CabinetReservedFileSize; + uint32_t CabinetReservedFileSize; FILEHANDLE FileHandle; bool FileOpen; CFHEADER CABHeader; - unsigned long CabinetReserved; - unsigned long FolderReserved; - unsigned long DataReserved; + uint32_t CabinetReserved; + uint32_t FolderReserved; + uint32_t DataReserved; PCFFOLDER_NODE FolderListHead; PCFFOLDER_NODE FolderListTail; PCFFOLDER_NODE CurrentFolderNode; @@ -444,32 +446,32 @@ PCFFILE_NODE FileListHead; PCFFILE_NODE FileListTail; CCABCodec *Codec; - unsigned long CodecId; + uint32_t CodecId; bool CodecSelected; void* InputBuffer; void* CurrentIBuffer; // Current offset in input buffer - unsigned long CurrentIBufferSize; // Bytes left in input buffer + uint32_t CurrentIBufferSize; // Bytes left in input buffer void* OutputBuffer; - unsigned long TotalCompSize; // Total size of current CFDATA block + uint32_t TotalCompSize; // Total size of current CFDATA block void* CurrentOBuffer; // Current offset in output buffer - unsigned long CurrentOBufferSize; // Bytes left in output buffer - unsigned long BytesLeftInCabinet; + uint32_t CurrentOBufferSize; // Bytes left in output buffer + uint32_t BytesLeftInCabinet; bool RestartSearch; - unsigned long LastFileOffset; // Uncompressed offset of last extracted file + uint32_t LastFileOffset; // Uncompressed offset of last extracted file #ifndef CAB_READ_ONLY - unsigned long LastBlockStart; // Uncompressed offset of last block in folder - unsigned long MaxDiskSize; - unsigned long DiskSize; - unsigned long PrevCabinetNumber; // Previous cabinet number (where split file starts) + uint32_t LastBlockStart; // Uncompressed offset of last block in folder + uint32_t MaxDiskSize; + uint32_t DiskSize; + uint32_t PrevCabinetNumber; // Previous cabinet number (where split file starts) bool CreateNewDisk; bool CreateNewFolder; CCFDATAStorage *ScratchFile; FILEHANDLE SourceFile; bool ContinueFile; - unsigned long TotalBytesLeft; + uint32_t TotalBytesLeft; bool BlockIsSplit; // true if current data block is split - unsigned long NextFolderNumber; // Zero based folder number + uint32_t NextFolderNumber; // Zero based folder number #endif /* CAB_READ_ONLY */ }; Modified: trunk/reactos/tools/cabman/cabman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.h?rev=… ============================================================================== --- trunk/reactos/tools/cabman/cabman.h (original) +++ trunk/reactos/tools/cabman/cabman.h Sun May 27 14:26:43 2007 @@ -37,7 +37,7 @@ virtual void OnAdd(PCFFILE Entry, char* FileName); /* Configuration */ bool ProcessAll; - unsigned long Mode; + uint32_t Mode; bool PromptOnOverwrite; char Location[MAX_PATH]; char FileName[MAX_PATH]; Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=2… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Sun May 27 14:26:43 2007 @@ -11,6 +11,7 @@ * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable * CF 04/05-2007 Reformatted the code to be more consistent and use TABs instead of spaces + * CF 04/05-2007 Made it compatible with 64-bit operating systems */ #include <stdlib.h> #include <stdio.h> @@ -20,31 +21,31 @@ #if defined(WIN32) #define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static long _GetSizeOfFile(FILEHANDLE handle) -{ - unsigned long size = GetFileSize(handle, NULL); +static int32_t _GetSizeOfFile(FILEHANDLE handle) +{ + uint32_t size = GetFileSize(handle, NULL); if (size == INVALID_FILE_SIZE) return -1; return size; } #define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, unsigned long size, unsigned long* bytesread) -{ - return ReadFile(handle, buffer, size, bytesread, NULL); +static bool _ReadFileData(FILEHANDLE handle, void* buffer, uint32_t size, uint32_t* bytesread) +{ + return ReadFile(handle, buffer, size, (LPDWORD)bytesread, NULL); } #else #define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static long _GetSizeOfFile(FILEHANDLE handle) -{ - long size; +static int32_t _GetSizeOfFile(FILEHANDLE handle) +{ + int32_t size; fseek(handle, 0, SEEK_END); size = ftell(handle); fseek(handle, 0, SEEK_SET); return size; } #define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, unsigned long size, unsigned long* bytesread) +static bool _ReadFileData(FILEHANDLE handle, void* buffer, uint32_t size, uint32_t* bytesread) { *bytesread = fread(buffer, 1, size, handle); return *bytesread == size; @@ -127,7 +128,7 @@ char eolbuf[2]; char* destpath; #if defined(WIN32) - unsigned long BytesWritten; + uint32_t BytesWritten; #endif if (DontGenerateInf) @@ -173,7 +174,7 @@ } #if defined(WIN32) - if (!WriteFile(InfFileHandle, InfLine, strlen(InfLine), &BytesWritten, NULL)) + if (!WriteFile(InfFileHandle, InfLine, (DWORD)strlen(InfLine), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MID_TRACE, ("ERROR WRITING '%d'.\n", (unsigned int)GetLastError())); return; @@ -187,7 +188,7 @@ eolbuf[1] = 0x0a; #if defined(WIN32) - if (!WriteFile(InfFileHandle, eolbuf, sizeof(eolbuf), &BytesWritten, NULL)) + if (!WriteFile(InfFileHandle, eolbuf, sizeof(eolbuf), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MID_TRACE, ("ERROR WRITING '%d'.\n", (unsigned int)GetLastError())); return; @@ -199,7 +200,7 @@ } -unsigned long CDFParser::Load(char* FileName) +uint32_t CDFParser::Load(char* FileName) /* * FUNCTION: Loads a directive file into memory * ARGUMENTS: @@ -208,8 +209,8 @@ * Status of operation */ { - unsigned long BytesRead; - long FileSize; + uint32_t BytesRead; + int32_t FileSize; if (FileLoaded) return CAB_STATUS_SUCCESS; @@ -238,7 +239,7 @@ return CAB_STATUS_CANNOT_OPEN; } - FileBufferSize = (unsigned long)FileSize; + FileBufferSize = (uint32_t)FileSize; FileBuffer = (char*)AllocateMemory(FileBufferSize); if (!FileBuffer) @@ -265,7 +266,7 @@ } -unsigned long CDFParser::Parse() +uint32_t CDFParser::Parse() /* * FUNCTION: Parses a loaded directive file * RETURNS: @@ -273,7 +274,7 @@ */ { bool Command; - unsigned long Status; + uint32_t Status; if (!FileLoaded) return CAB_STATUS_NOFILE; @@ -436,7 +437,7 @@ } -bool CDFParser::OnDiskLabel(unsigned long Number, char* Label) +bool CDFParser::OnDiskLabel(uint32_t Number, char* Label) /* * FUNCTION: Called when a disk needs a label * ARGUMENTS: @@ -469,7 +470,7 @@ { sprintf(Buffer, "%lu", Number); strcat(Label, Buffer); - j += strlen(Buffer); + j += (int)strlen(Buffer); } else { @@ -488,7 +489,7 @@ } -bool CDFParser::OnCabinetName(unsigned long Number, char* Name) +bool CDFParser::OnCabinetName(uint32_t Number, char* Name) /* * FUNCTION: Called when a cabinet needs a name * ARGUMENTS: @@ -517,7 +518,7 @@ if (CabinetNameTemplateSet) { strcpy(Name, GetDestinationPath()); - j = strlen(Name); + j = (int)strlen(Name); for (i = 0; i < strlen(CabinetNameTemplate); i++) { ch = CabinetNameTemplate[i]; @@ -525,7 +526,7 @@ { sprintf(Buffer, "%lu", Number); strcat(Name, Buffer); - j += strlen(Buffer); + j += (int)strlen(Buffer); } else { @@ -543,7 +544,7 @@ } -bool CDFParser::SetDiskName(PCABINET_NAME *List, unsigned long Number, char* String) +bool CDFParser::SetDiskName(PCABINET_NAME *List, uint32_t Number, char* String) /* * FUNCTION: Sets an entry in a list * ARGUMENTS: @@ -581,7 +582,7 @@ } -bool CDFParser::GetDiskName(PCABINET_NAME *List, unsigned long Number, char* String) +bool CDFParser::GetDiskName(PCABINET_NAME *List, uint32_t Number, char* String) /* * FUNCTION: Returns an entry in a list * ARGUMENTS: @@ -609,7 +610,7 @@ } -bool CDFParser::SetDiskNumber(PDISK_NUMBER *List, unsigned long Number, unsigned long Value) +bool CDFParser::SetDiskNumber(PDISK_NUMBER *List, uint32_t Number, uint32_t Value) /* * FUNCTION: Sets an entry in a list * ARGUMENTS: @@ -647,7 +648,7 @@ } -bool CDFParser::GetDiskNumber(PDISK_NUMBER *List, unsigned long Number, unsigned long* Value) +bool CDFParser::GetDiskNumber(PDISK_NUMBER *List, uint32_t Number, uint32_t* Value) /* * FUNCTION: Returns an entry in a list * ARGUMENTS: @@ -675,7 +676,7 @@ } -bool CDFParser::DoDiskLabel(unsigned long Number, char* Label) +bool CDFParser::DoDiskLabel(uint32_t Number, char* Label) /* * FUNCTION: Sets the label of a disk * ARGUMENTS: @@ -705,7 +706,7 @@ } -bool CDFParser::DoCabinetName(unsigned long Number, char* Name) +bool CDFParser::DoCabinetName(uint32_t Number, char* Name) /* * FUNCTION: Sets the name of a cabinet * ARGUMENTS: @@ -735,7 +736,7 @@ } -unsigned long CDFParser::DoMaxDiskSize(bool NumberValid, unsigned long Number) +uint32_t CDFParser::DoMaxDiskSize(bool NumberValid, uint32_t Number) /* * FUNCTION: Sets the maximum disk size * ARGUMENTS: @@ -747,7 +748,7 @@ * Standard sizes are 2.88M, 1.44M, 1.25M, 1.2M, 720K, 360K, and CDROM */ { - unsigned long A, B, Value; + uint32_t A, B, Value; if (IsNextToken(TokenInteger, true)) { @@ -852,14 +853,14 @@ InfFileNameSet = true; } -unsigned long CDFParser::SetupNewDisk() +uint32_t CDFParser::SetupNewDisk() /* * FUNCTION: Sets up parameters for a new disk * RETURNS: * Status of operation */ { - unsigned long Value; + uint32_t Value; if (!GetDiskNumber(&MaxDiskSize, GetCurrentDiskNumber(), &Value)) { @@ -874,7 +875,7 @@ } -unsigned long CDFParser::PerformSetCommand() +uint32_t CDFParser::PerformSetCommand() /* * FUNCTION: Performs a set variable command * RETURNS: @@ -883,7 +884,7 @@ { SETTYPE SetType; bool NumberValid = false; - unsigned long Number = 0; + uint32_t Number = 0; if (!IsNextToken(TokenIdentifier, true)) return CAB_STATUS_FAILURE; @@ -970,7 +971,7 @@ } -unsigned long CDFParser::PerformNewCommand() +uint32_t CDFParser::PerformNewCommand() /* * FUNCTION: Performs a new disk|cabinet|folder command * RETURNS: @@ -978,7 +979,7 @@ */ { NEWTYPE NewType; - unsigned long Status; + uint32_t Status; if (!IsNextToken(TokenIdentifier, true)) return CAB_STATUS_FAILURE; @@ -1053,7 +1054,7 @@ } -unsigned long CDFParser::PerformInfBeginCommand() +uint32_t CDFParser::PerformInfBeginCommand() /* * FUNCTION: Begins inf mode * RETURNS: @@ -1065,7 +1066,7 @@ } -unsigned long CDFParser::PerformInfEndCommand() +uint32_t CDFParser::PerformInfEndCommand() /* * FUNCTION: Begins inf mode * RETURNS: @@ -1077,7 +1078,7 @@ } -unsigned long CDFParser::PerformCommand() +uint32_t CDFParser::PerformCommand() /* * FUNCTION: Performs a command * RETURNS: @@ -1097,15 +1098,15 @@ } -unsigned long CDFParser::PerformFileCopy() +uint32_t CDFParser::PerformFileCopy() /* * FUNCTION: Performs a file copy * RETURNS: * Status of operation */ { - unsigned long Status; - unsigned long i, j; + uint32_t Status; + uint32_t i, j; char ch; char SrcName[MAX_PATH]; char DstName[MAX_PATH]; @@ -1137,7 +1138,7 @@ if (CurrentToken != TokenEnd) { - j = strlen(CurrentString); i = 0; + j = (uint32_t)strlen(CurrentString); i = 0; while ((CurrentChar + i < LineLength) && ((ch = Line[CurrentChar + i]) != ' ') && (ch != 0x09) && @@ -1157,7 +1158,7 @@ if (CurrentToken != TokenEnd) { - j = strlen(CurrentString); i = 0; + j = (uint32_t)strlen(CurrentString); i = 0; while ((CurrentChar + i < LineLength) && ((ch = Line[CurrentChar + i]) != ' ') && (ch != 0x09) && @@ -1273,7 +1274,7 @@ * true if there is a new line, false if not */ { - unsigned long i, j; + uint32_t i, j; char ch; if (CurrentOffset >= FileBufferSize) @@ -1310,7 +1311,7 @@ * FUNCTION: Reads the next token from the current line */ { - unsigned long i; + uint32_t i; char ch = ' '; if (CurrentChar >= LineLength) Modified: trunk/reactos/tools/cabman/dfp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.h?rev=269… ============================================================================== --- trunk/reactos/tools/cabman/dfp.h (original) +++ trunk/reactos/tools/cabman/dfp.h Sun May 27 14:26:43 2007 @@ -11,14 +11,14 @@ typedef struct _CABINET_NAME { struct _CABINET_NAME *Next; - unsigned long DiskNumber; + uint32_t DiskNumber; char Name[128]; } CABINET_NAME, *PCABINET_NAME; typedef struct _DISK_NUMBER { struct _DISK_NUMBER *Next; - unsigned long DiskNumber; - unsigned long Number; + uint32_t DiskNumber; + uint32_t Number; } DISK_NUMBER, *PDISK_NUMBER; typedef enum { @@ -58,35 +58,35 @@ public: CDFParser(); virtual ~CDFParser(); - unsigned long Load(char* FileName); - unsigned long Parse(); + uint32_t Load(char* FileName); + uint32_t Parse(); void SetFileRelativePath(char* Path); bool InfFileOnly; bool DontGenerateInf; char FileRelativePath[300]; private: /* Event handlers */ - virtual bool OnDiskLabel(unsigned long Number, char* Label); - virtual bool OnCabinetName(unsigned long Number, char* Name); + virtual bool OnDiskLabel(uint32_t Number, char* Label); + virtual bool OnCabinetName(uint32_t Number, char* Name); void WriteInfLine(char* InfLine); - bool SetDiskName(PCABINET_NAME *List, unsigned long Number, char* String); - bool GetDiskName(PCABINET_NAME *List, unsigned long Number, char* String); - bool SetDiskNumber(PDISK_NUMBER *List, unsigned long Number, unsigned long Value); - bool GetDiskNumber(PDISK_NUMBER *List, unsigned long Number, unsigned long* Value); - bool DoDiskLabel(unsigned long Number, char* Label); + bool SetDiskName(PCABINET_NAME *List, uint32_t Number, char* String); + bool GetDiskName(PCABINET_NAME *List, uint32_t Number, char* String); + bool SetDiskNumber(PDISK_NUMBER *List, uint32_t Number, uint32_t Value); + bool GetDiskNumber(PDISK_NUMBER *List, uint32_t Number, uint32_t* Value); + bool DoDiskLabel(uint32_t Number, char* Label); void DoDiskLabelTemplate(char* Template); - bool DoCabinetName(unsigned long Number, char* Name); + bool DoCabinetName(uint32_t Number, char* Name); void DoCabinetNameTemplate(char* Template); void DoInfFileName(char* InfFileName); - unsigned long DoMaxDiskSize(bool NumberValid, unsigned long Number); - unsigned long SetupNewDisk(); - unsigned long PerformSetCommand(); - unsigned long PerformNewCommand(); - unsigned long PerformInfBeginCommand(); - unsigned long PerformInfEndCommand(); - unsigned long PerformCommand(); - unsigned long PerformFileCopy(); + uint32_t DoMaxDiskSize(bool NumberValid, uint32_t Number); + uint32_t SetupNewDisk(); + uint32_t PerformSetCommand(); + uint32_t PerformNewCommand(); + uint32_t PerformInfBeginCommand(); + uint32_t PerformInfEndCommand(); + uint32_t PerformCommand(); + uint32_t PerformFileCopy(); void SkipSpaces(); bool IsNextToken(DFP_TOKEN Token, bool NoSpaces); bool ReadLine(); @@ -95,15 +95,15 @@ bool FileLoaded; FILEHANDLE FileHandle; char* FileBuffer; - unsigned long FileBufferSize; - unsigned long CurrentOffset; + uint32_t FileBufferSize; + uint32_t CurrentOffset; char Line[128]; - unsigned long LineLength; - unsigned long CurrentLine; - unsigned long CurrentChar; + uint32_t LineLength; + uint32_t CurrentLine; + uint32_t CurrentChar; /* Token */ DFP_TOKEN CurrentToken; - unsigned long CurrentInteger; + uint32_t CurrentInteger; char CurrentString[256]; /* State */ @@ -112,27 +112,27 @@ bool FolderCreated; /* Standard directive variable */ bool Cabinet; - unsigned long CabinetFileCountThreshold; + uint32_t CabinetFileCountThreshold; PCABINET_NAME CabinetName; bool CabinetNameTemplateSet; char CabinetNameTemplate[128]; bool InfFileNameSet; char InfFileName[256]; bool Compress; - unsigned long CompressionType; + uint32_t CompressionType; PCABINET_NAME DiskLabel; bool DiskLabelTemplateSet; char DiskLabelTemplate[128]; - unsigned long FolderFileCountThreshold; - unsigned long FolderSizeThreshold; - unsigned long MaxCabinetSize; - unsigned long MaxDiskFileCount; + uint32_t FolderFileCountThreshold; + uint32_t FolderSizeThreshold; + uint32_t MaxCabinetSize; + uint32_t MaxDiskFileCount; PDISK_NUMBER MaxDiskSize; bool MaxDiskSizeAllSet; - unsigned long MaxDiskSizeAll; - unsigned long ReservePerCabinetSize; - unsigned long ReservePerDataBlockSize; - unsigned long ReservePerFolderSize; + uint32_t MaxDiskSizeAll; + uint32_t ReservePerCabinetSize; + uint32_t ReservePerDataBlockSize; + uint32_t ReservePerFolderSize; char SourceDir[256]; FILEHANDLE InfFileHandle; bool InfModeEnabled; Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx (original) +++ trunk/reactos/tools/cabman/main.cxx Sun May 27 14:26:43 2007 @@ -9,6 +9,7 @@ * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable * CF 04/05-2007 Reformatted the code to be more consistent and use TABs instead of spaces + * CF 04/05-2007 Made it compatible with 64-bit operating systems */ #include <stdlib.h> #include <stdarg.h> @@ -19,9 +20,9 @@ #ifdef DBG -unsigned long DebugTraceLevel = MIN_TRACE; -//unsigned long DebugTraceLevel = MID_TRACE; -//unsigned long DebugTraceLevel = MAX_TRACE; +uint32_t DebugTraceLevel = MIN_TRACE; +//uint32_t DebugTraceLevel = MID_TRACE; +//uint32_t DebugTraceLevel = MAX_TRACE; #endif /* DBG */ @@ -44,7 +45,7 @@ { unsigned int Len; - Len = strlen(Str); + Len = (uint32_t)strlen(Str); if (Len < Length) { @@ -55,7 +56,7 @@ } -char* Date2Str(char* Str, unsigned short Date) +char* Date2Str(char* Str, uint16_t Date) /* * FUNCTION: Converts a DOS style date to a string * ARGUMENTS: @@ -65,7 +66,7 @@ * Pointer to string */ { - unsigned long dw; + uint32_t dw; /* Month */ Str[0] = (char)('0' + ((Date & 0x01E0) >> 5) / 10); @@ -86,7 +87,7 @@ } -char* Time2Str(char* Str, unsigned short Time) +char* Time2Str(char* Str, uint16_t Time) /* * FUNCTION: Converts a DOS style time to a string * ARGUMENTS: @@ -97,8 +98,8 @@ */ { bool PM; - unsigned long Hour; - unsigned long dw; + uint32_t Hour; + uint32_t dw; Hour = ((Time & 0xF800) >> 11); PM = (Hour >= 12); @@ -126,7 +127,7 @@ } -char* Attr2Str(char* Str, unsigned short Attr) +char* Attr2Str(char* Str, uint16_t Attr) /* * FUNCTION: Converts attributes to a string * ARGUMENTS: @@ -364,7 +365,7 @@ * FUNCTION: Create cabinet */ { - unsigned long Status; + uint32_t Status; Status = Load((char*)&FileName); if (Status != CAB_STATUS_SUCCESS) @@ -384,7 +385,7 @@ * FUNCTION: Create cabinet */ { - unsigned long Status; + uint32_t Status; Status = NewCabinet(); if (Status != CAB_STATUS_SUCCESS) @@ -422,8 +423,8 @@ { CAB_SEARCH Search; char Str[20]; - unsigned long FileCount = 0; - unsigned long ByteCount = 0; + uint32_t FileCount = 0; + uint32_t ByteCount = 0; if (Open() == CAB_STATUS_SUCCESS) { @@ -485,7 +486,7 @@ */ { CAB_SEARCH Search; - unsigned long Status; + uint32_t Status; if (Open() == CAB_STATUS_SUCCESS) { Modified: trunk/reactos/tools/cabman/mszip.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.cxx?rev… ============================================================================== --- trunk/reactos/tools/cabman/mszip.cxx (original) +++ trunk/reactos/tools/cabman/mszip.cxx Sun May 27 14:26:43 2007 @@ -11,6 +11,7 @@ * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable * CF 04/05-2007 Reformatted the code to be more consistent and use TABs instead of spaces + * CF 04/05-2007 Made it compatible with 64-bit operating systems */ #include <stdio.h> #include "mszip.h" @@ -52,10 +53,10 @@ } -unsigned long CMSZipCodec::Compress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) +uint32_t CMSZipCodec::Compress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) /* * FUNCTION: Compresses data in a buffer * ARGUMENTS: @@ -65,16 +66,16 @@ * OutputLength = Address of buffer to place size of compressed data */ { - unsigned short* Magic; + uint16_t* Magic; DPRINT(MAX_TRACE, ("InputLength (%lu).\n", InputLength)); - Magic = (unsigned short*)OutputBuffer; + Magic = (uint16_t*)OutputBuffer; *Magic = MSZIP_MAGIC; ZStream.next_in = (unsigned char*)InputBuffer; ZStream.avail_in = InputLength; - ZStream.next_out = (unsigned char*)((unsigned long)OutputBuffer + 2); + ZStream.next_out = (unsigned char*)((uintptr_t)OutputBuffer + 2); ZStream.avail_out = CAB_BLOCKSIZE + 12; /* WindowBits is passed < 0 to tell that there is no zlib header */ @@ -112,10 +113,10 @@ } -unsigned long CMSZipCodec::Uncompress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) +uint32_t CMSZipCodec::Uncompress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) /* * FUNCTION: Uncompresses data in a buffer * ARGUMENTS: @@ -125,11 +126,11 @@ * OutputLength = Address of buffer to place size of uncompressed data */ { - unsigned short Magic; + uint16_t Magic; DPRINT(MAX_TRACE, ("InputLength (%lu).\n", InputLength)); - Magic = *((unsigned short*)InputBuffer); + Magic = *((uint16_t*)InputBuffer); if (Magic != MSZIP_MAGIC) { @@ -137,7 +138,7 @@ return CS_BADSTREAM; } - ZStream.next_in = (unsigned char*)((unsigned long)InputBuffer + 2); + ZStream.next_in = (unsigned char*)((uintptr_t)InputBuffer + 2); ZStream.avail_in = InputLength - 2; ZStream.next_out = (unsigned char*)OutputBuffer; ZStream.avail_out = CAB_BLOCKSIZE + 12; Modified: trunk/reactos/tools/cabman/mszip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.h?rev=2… ============================================================================== --- trunk/reactos/tools/cabman/mszip.h (original) +++ trunk/reactos/tools/cabman/mszip.h Sun May 27 14:26:43 2007 @@ -22,15 +22,15 @@ /* Default destructor */ virtual ~CMSZipCodec(); /* Compresses a data block */ - virtual unsigned long Compress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength); + virtual uint32_t Compress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength); /* Uncompresses a data block */ - virtual unsigned long Uncompress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength); + virtual uint32_t Uncompress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength); private: int Status; z_stream ZStream; /* Zlib stream */ Modified: trunk/reactos/tools/cabman/raw.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/raw.cxx?rev=2… ============================================================================== --- trunk/reactos/tools/cabman/raw.cxx (original) +++ trunk/reactos/tools/cabman/raw.cxx Sun May 27 14:26:43 2007 @@ -9,6 +9,7 @@ * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable * CF 04/05-2007 Reformatted the code to be more consistent and use TABs instead of spaces + * CF 04/05-2007 Made it compatible with 64-bit operating systems */ #include "raw.h" @@ -31,10 +32,10 @@ } -unsigned long CRawCodec::Compress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) +uint32_t CRawCodec::Compress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) /* * FUNCTION: Compresses data in a buffer * ARGUMENTS: @@ -49,10 +50,10 @@ return CS_SUCCESS; } -unsigned long CRawCodec::Uncompress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) +uint32_t CRawCodec::Uncompress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) /* * FUNCTION: Uncompresses data in a buffer * ARGUMENTS: Modified: trunk/reactos/tools/cabman/raw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/raw.h?rev=269… ============================================================================== --- trunk/reactos/tools/cabman/raw.h (original) +++ trunk/reactos/tools/cabman/raw.h Sun May 27 14:26:43 2007 @@ -19,15 +19,15 @@ /* Default destructor */ virtual ~CRawCodec(); /* Compresses a data block */ - virtual unsigned long Compress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength); + virtual uint32_t Compress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength); /* Uncompresses a data block */ - virtual unsigned long Uncompress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength); + virtual uint32_t Uncompress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength); }; #endif /* __RAW_H */

1 0

[cwittich] 26911: added an empty intrin_x86_64.h
by cwittich＠svn.reactos.org 27 May '07

27 May '07

Author: cwittich Date: Sun May 27 14:12:19 2007 New Revision: 26911 URL: http://svn.reactos.org/svn/reactos?rev=26911&view=rev Log: added an empty intrin_x86_64.h Added: trunk/reactos/include/psdk/intrin_x86_64.h Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Sun May 27 14:12:19 2007 @@ -75,8 +75,10 @@ #include "intrin_ppc.h" #elif defined(_MIPS_) #include "intrin_mips.h" +#elif defined(__x86_64__) +/* TODO: the x64 architecture shares most of the i386 intrinsics. It should be easy to support */ +#include "intrin_x86_64.h" #else -/* TODO: the x64 architecture shares most of the i386 intrinsics. It should be easy to support */ #error Unsupported architecture #endif Added: trunk/reactos/include/psdk/intrin_x86_64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86_64… ============================================================================== --- trunk/reactos/include/psdk/intrin_x86_64.h (added) +++ trunk/reactos/include/psdk/intrin_x86_64.h Sun May 27 14:12:19 2007 @@ -1,0 +1,1 @@ +

1 0

[frik85] 26910: ReactOS Translation Service: I had worked on the ReactOS Translation Service (codename "ROST") in winter 2006/2007. It is almost ready, only one important part is missing, the user interface. I decided to improve RosCMS to version 3, which comes now with an new user interface that speed up the whole work-flow a lot. The plan is to use RosCMS v3 as flexible base for the translation service user interface. As RosCMS v3 is very flexible, both the interface and the database layout, i
by frik85＠svn.reactos.org 27 May '07

27 May '07

1 0

[frik85] 26909: RosCMS update (RosCMS v2 and v3): I have been a bit lazy with commits to svn repo. A lot of things have happened, in the last few months. First of all, this commit brings RosCMS to a new level. It contains the latest RosCMS v2 version (stable) plus the latest RosCMS v3 code (testing). RosCMS v2 and v3 share several base scripts and can be used side-by-side. Although, version 3 introduces a new database layout. There are database convert script(s) from v2 to v3, but not the other
by frik85＠svn.reactos.org 27 May '07

27 May '07

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007