Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[gvg] 20903: wintrust from Wine vendor drop

by gvg＠svn.reactos.org

wintrust from Wine vendor drop Added: vendor/wine/dlls/wintrust/ Added: vendor/wine/dlls/wintrust/current/ Added: vendor/wine/dlls/wintrust/current/Makefile.in Added: vendor/wine/dlls/wintrust/current/version.rc Added: vendor/wine/dlls/wintrust/current/wintrust.spec Added: vendor/wine/dlls/wintrust/current/wintrust_main.c _____ Added: vendor/wine/dlls/wintrust/current/Makefile.in --- vendor/wine/dlls/wintrust/current/Makefile.in 2006-01-15 20:36:29 UTC (rev 20902) +++ vendor/wine/dlls/wintrust/current/Makefile.in 2006-01-15 21:53:56 UTC (rev 20903) @@ -0,0 +1,16 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wintrust.dll +IMPORTLIB = libwintrust.$(IMPLIBEXT) +IMPORTS = kernel32 + +C_SRCS = wintrust_main.c + +RC_SRCS = \ + version.rc + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: vendor/wine/dlls/wintrust/current/Makefile.in ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/wintrust/current/version.rc --- vendor/wine/dlls/wintrust/current/version.rc 2006-01-15 20:36:29 UTC (rev 20902) +++ vendor/wine/dlls/wintrust/current/version.rc 2006-01-15 21:53:56 UTC (rev 20903) @@ -0,0 +1,27 @@ +/* + * Copyright 2005 + * + * Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define WINE_FILENAME_STR "wintrust.dll" +#define WINE_FILEVERSION 5,131,2195,6824 +#define WINE_FILEVERSION_STR "5.131.2195.6824" +#define WINE_PRODUCTVERSION 5,131,2195,6824 +#define WINE_PRODUCTVERSION_STR "5.131.2195.6824" + +#include "wine/wine_common_ver.rc" Property changes on: vendor/wine/dlls/wintrust/current/version.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/wintrust/current/wintrust.spec --- vendor/wine/dlls/wintrust/current/wintrust.spec 2006-01-15 20:36:29 UTC (rev 20902) +++ vendor/wine/dlls/wintrust/current/wintrust.spec 2006-01-15 21:53:56 UTC (rev 20903) @@ -0,0 +1,124 @@ +@ stub AddPersonalTrustDBPages +@ stub CatalogCompactHashDatabase +@ stdcall CryptCATAdminAcquireContext(long ptr long) +@ stub CryptCATAdminAddCatalog +@ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) +@ stub CryptCATAdminEnumCatalogFromHash +@ stub CryptCATAdminPauseServiceForBackup +@ stub CryptCATAdminReleaseCatalogContext +@ stdcall CryptCATAdminReleaseContext(long long) +@ stub CryptCATAdminRemoveCatalog +@ stub CryptCATAdminResolveCatalogPath +@ stub CryptCATCDFClose +@ stub CryptCATCDFEnumAttributes +@ stub CryptCATCDFEnumAttributesWithCDFTag +@ stub CryptCATCDFEnumCatAttributes +@ stub CryptCATCDFEnumMembers +@ stub CryptCATCDFEnumMembersByCDFTag +@ stub CryptCATCDFEnumMembersByCDFTagEx +@ stub CryptCATCDFOpen +@ stub CryptCATCatalogInfoFromContext +@ stub CryptCATClose +@ stub CryptCATEnumerateAttr +@ stub CryptCATEnumerateCatAttr +@ stub CryptCATEnumerateMember +@ stub CryptCATGetAttrInfo +@ stub CryptCATGetCatAttrInfo +@ stub CryptCATGetMemberInfo +@ stub CryptCATHandleFromStore +@ stub CryptCATOpen +@ stub CryptCATPersistStore +@ stub CryptCATPutAttrInfo +@ stub CryptCATPutCatAttrInfo +@ stub CryptCATPutMemberInfo +@ stub CryptCATStoreFromHandle +@ stub CryptCATVerifyMember +@ stub CryptSIPCreateIndirectData +@ stub CryptSIPGetInfo +@ stub CryptSIPGetRegWorkingFlags +@ stub CryptSIPGetSignedDataMsg +@ stub CryptSIPPutSignedDataMsg +@ stub CryptSIPRemoveSignedDataMsg +@ stub CryptSIPVerifyIndirectData +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub DriverCleanupPolicy +@ stub DriverFinalPolicy +@ stub DriverInitializePolicy +@ stub FindCertsByIssuer +@ stub GenericChainCertificateTrust +@ stub GenericChainFinalProv +@ stub HTTPSCertificateTrust +@ stub HTTPSFinalProv +@ stub IsCatalogFile +@ stub MsCatConstructHashTag +@ stub MsCatFreeHashTag +@ stub OfficeCleanupPolicy +@ stub OfficeInitializePolicy +@ stub OpenPersonalTrustDBDialog +@ stub SoftpubAuthenticode +@ stub SoftpubCheckCert +@ stub SoftpubCleanup +@ stub SoftpubDefCertInit +@ stub SoftpubDllRegisterServer +@ stub SoftpubDllUnregisterServer +@ stub SoftpubDumpStructure +@ stub SoftpubFreeDefUsageCallData +@ stub SoftpubInitialize +@ stub SoftpubLoadDefUsageCallData +@ stub SoftpubLoadMessage +@ stub SoftpubLoadSignature +@ stub TrustDecode +@ stub TrustFindIssuerCertificate +@ stub TrustFreeDecode +@ stub TrustIsCertificateSelfSigned +@ stub TrustOpenStores +@ stub WTHelperCertFindIssuerCertificate +@ stub WTHelperCertIsSelfSigned +@ stub WTHelperCheckCertUsage +@ stub WTHelperGetAgencyInfo +@ stub WTHelperGetFileHandle +@ stub WTHelperGetFileName +@ stub WTHelperGetKnownUsages +@ stub WTHelperGetProvCertFromChain +@ stub WTHelperGetProvPrivateDataFromChain +@ stub WTHelperGetProvSignerFromChain +@ stub WTHelperIsInRootStore +@ stub WTHelperOpenKnownStores +@ stub WTHelperProvDataFromStateData +@ stub WVTAsn1CatMemberInfoDecode +@ stub WVTAsn1CatMemberInfoEncode +@ stub WVTAsn1CatNameValueDecode +@ stub WVTAsn1CatNameValueEncode +@ stub WVTAsn1SpcFinancialCriteriaInfoDecode +@ stub WVTAsn1SpcFinancialCriteriaInfoEncode +@ stub WVTAsn1SpcIndirectDataContentDecode +@ stub WVTAsn1SpcIndirectDataContentEncode +@ stub WVTAsn1SpcLinkDecode +@ stub WVTAsn1SpcLinkEncode +@ stub WVTAsn1SpcMinimalCriteriaInfoDecode +@ stub WVTAsn1SpcMinimalCriteriaInfoEncode +@ stub WVTAsn1SpcPeImageDataDecode +@ stub WVTAsn1SpcPeImageDataEncode +@ stub WVTAsn1SpcSigInfoDecode +@ stub WVTAsn1SpcSigInfoEncode +@ stub WVTAsn1SpcSpAgencyInfoDecode +@ stub WVTAsn1SpcSpAgencyInfoEncode +@ stub WVTAsn1SpcSpOpusInfoDecode +@ stub WVTAsn1SpcSpOpusInfoEncode +@ stub WVTAsn1SpcStatementTypeDecode +@ stub WVTAsn1SpcStatementTypeEncode +@ stdcall WinVerifyTrust(long ptr ptr) +@ stub WinVerifyTrustEx +@ stdcall WintrustAddActionID(ptr long ptr) +@ stub WintrustAddDefaultForUsage +@ stub WintrustCertificateTrust +@ stub WintrustGetDefaultForUsage +@ stdcall WintrustGetRegPolicyFlags(ptr) +@ stub WintrustLoadFunctionPointers +@ stub WintrustRemoveActionID +@ stdcall WintrustSetRegPolicyFlags(long) +@ stub mscat32DllRegisterServer +@ stub mscat32DllUnregisterServer +@ stub mssip32DllRegisterServer +@ stub mssip32DllUnregisterServer Property changes on: vendor/wine/dlls/wintrust/current/wintrust.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Added: vendor/wine/dlls/wintrust/current/wintrust_main.c --- vendor/wine/dlls/wintrust/current/wintrust_main.c 2006-01-15 20:36:29 UTC (rev 20902) +++ vendor/wine/dlls/wintrust/current/wintrust_main.c 2006-01-15 21:53:56 UTC (rev 20903) @@ -0,0 +1,141 @@ +/* + * Copyright 2001 Rein Klazes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "guiddef.h" +#include "wintrust.h" +#include "mscat.h" +#include "objbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wintrust); + +/********************************************************************** * + * CryptCATAdminAcquireContext (WINTRUST.@) + */ +BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin, + const GUID *sysSystem, DWORD dwFlags ) +{ + FIXME("%p %s %lx\n", catAdmin, debugstr_guid(sysSystem), dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * + * CryptCATAdminCalcHashFromFileHandle (WINTRUST.@) + */ +BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD* pcbHash, + BYTE* pbHash, DWORD dwFlags ) +{ + FIXME("%p %p %p %lx\n", hFile, pcbHash, pbHash, dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * + * CryptCATAdminReleaseContext (WINTRUST.@) + */ +BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) +{ + FIXME("%p %lx\n", hCatAdmin, dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * + * WinVerifyTrust (WINTRUST.@) + */ +LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, WINTRUST_DATA* ActionData ) +{ + static const GUID WINTRUST_ACTION_GENERIC_VERIFY_V2 = { 0xaac56b, 0xcd44, 0x11d0, + { 0x8c,0xc2,0x00,0xc0,0x4f,0xc2,0x95,0xee }}; + + FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); + + /* Trust providers can be found at: + * HKLM\SOFTWARE\Microsoft\Cryptography\Providers\Trust\CertCheck\ + * + * Process Explorer expects a correct implementation, so we + * return TRUST_E_PROVIDER_UNKNOWN. + * + * Girotel needs ERROR_SUCCESS. + * + * For now return TRUST_E_PROVIDER_UNKNOWN only when + * ActionID = WINTRUST_ACTION_GENERIC_VERIFY_V2. + * + */ + + if (IsEqualCLSID(ActionID, &WINTRUST_ACTION_GENERIC_VERIFY_V2)) + return TRUST_E_PROVIDER_UNKNOWN; + + return ERROR_SUCCESS; +} + +/********************************************************************** * + * WintrustAddActionID (WINTRUST.@) + */ +BOOL WINAPI WintrustAddActionID( GUID* pgActionID, DWORD fdwFlags, + CRYPT_REGISTER_ACTIONID* psProvInfo) +{ + FIXME("%p %lx %p\n", pgActionID, fdwFlags, psProvInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * + * WintrustGetRegPolicyFlags (WINTRUST.@) + */ +void WINAPI WintrustGetRegPolicyFlags( DWORD* pdwPolicyFlags ) +{ + FIXME("%p\n", pdwPolicyFlags); + *pdwPolicyFlags = 0; +} + +/********************************************************************** * + * WintrustSetRegPolicyFlags (WINTRUST.@) + */ +BOOL WINAPI WintrustSetRegPolicyFlags( DWORD dwPolicyFlags) +{ + FIXME("stub: %lx\n", dwPolicyFlags); + return TRUE; +} + +/********************************************************************** * + * DllRegisterServer (WINTRUST.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/********************************************************************** * + * DllUnregisterServer (WINTRUST.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} Property changes on: vendor/wine/dlls/wintrust/current/wintrust_main.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

18 years, 8 months

[frik85] 20902: RosCMS update:

by frik85＠svn.reactos.org

RosCMS update: * update the page generator * translator interface (dyncontent; almost finished) Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_translator.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/translator.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php 2006-01-15 20:26:53 UTC (rev 20901) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php 2006-01-15 20:36:29 UTC (rev 20902) @@ -39,11 +39,15 @@ <ul> <li><strong>Dynamic Content</strong></li> </ul> - <p>Action: <a href="?page=admin&sec=dyncontent&sec2=edit&sec3=news_page&am p;opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id ; ?>&db_id=new">New - News</a> | <a href="?page=admin&sec=dyncontent&sec2=edit&sec3=newsletter&a mp;opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id ; ?>&db_id=new">New - Newsletter</a> | <a href="?page=admin&sec=dyncontent&sec2=edit&sec3=blog&opt =insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id ; ?>&db_id=new">New - Blog</a> | <a href="?page=admin&sec=dyncontent&sec2=edit&opt=insert&<? php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id ; ?>&db_id=new"></a><a href="?page=admin&sec=dyncontent&sec2=edit&opt=insert&<? php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id ; ?>&db_id=new">New - Dynamic Content (plain)</a> | <a href="?page=admin&sec=dyncontent&sec2=view">reset + <p>Action: <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&sec3=news_page&opt=insert&am p;<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id ; ?>&db_id=new"> + <?php if ($roscms_intern_usrgrp_admin == true && $rpm_page == "admin") { ?> + New + News</a> | <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&sec3=newsletter&opt=insert&a mp;<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id ; ?>&db_id=new">New + Newsletter</a> | <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&sec3=blog&opt=insert&<?p hp echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id ; ?>&db_id=new">New + Blog</a> | <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id ; ?>&db_id=new"></a><a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id ; ?>&db_id=new">New + Dynamic Content (plain)</a> | <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=view"> + <?php } ?> + reset filters & sort</a></p> <?php @@ -61,23 +65,25 @@ if ($rpm_lang_id == "") { - $rpm_lang_id="all"; + $rpm_lang_id="nolang"; } echo '<p>Language: '; - if ($rpm_lang_id == "all") { - echo '<b>All</b>'; - $ros_cms_intern_dyn_content_lang = ""; + if ($roscms_intern_usrgrp_dev == true || $roscms_intern_usrgrp_admin == true) { + if ($rpm_lang_id == "all") { + echo '<b>All</b>'; + $ros_cms_intern_dyn_content_lang = ""; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$r pm_sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_f ilt2.'&langid=all">All</a>'; + } + echo ' | '; } - else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort. '&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&a mp;langid=all">All</a>'; - } - echo ' | '; if ($rpm_lang_id == "nolang") { echo '<b>International</b>'; $ros_cms_intern_dyn_content_lang = "AND dyn_content_lang = 'all'"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort. '&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&a mp;langid=nolang">International</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$r pm_sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_f ilt2.'&langid=nolang">International</a>'; } // Languages $sql_lang="SELECT * @@ -93,7 +99,7 @@ $ros_cms_intern_dyn_content_lang = "AND dyn_content_lang = '".$roscms_sel_lang."'"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort. '&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&a mp;langid='.$roscms_sel_lang.'">'.$myrow_lang[1].'</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$r pm_sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_f ilt2.'&langid='.$roscms_sel_lang.'">'.$myrow_lang[1].'</a>'; } } @@ -107,7 +113,7 @@ $ros_cms_intern_content_filt = "WHERE dyn_content_active = '1'"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort. '&filt=active&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id.'"> active content</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$r pm_sort.'&filt=active&filt2='.$rpm_filt2.'&langid='.$rpm_lan g_id.'">active content</a>'; } echo ' | '; if ($rpm_filt == "all") { @@ -115,7 +121,7 @@ $ros_cms_intern_content_filt = "WHERE `dyn_content_name` != ''"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort. '&filt=all&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id.'">all content</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$r pm_sort.'&filt=all&filt2='.$rpm_filt2.'&langid='.$rpm_lang_i d.'">all content</a>'; } echo ' | '; if ($rpm_filt == "user") { @@ -123,7 +129,7 @@ $ros_cms_intern_content_filt = "WHERE dyn_content_usrname_id = '".$roscms_intern_account_id."'"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort. '&filt=user&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id.'">cu rrent user</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$r pm_sort.'&filt=user&filt2='.$rpm_filt2.'&langid='.$rpm_lang_ id.'">current user</a>'; } if ($rpm_filt == "history") { echo ' | <b>history</b>'; @@ -141,7 +147,7 @@ $ros_cms_intern_content_filt2 = ""; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort. '&filt='.$rpm_filt.'&filt2=all&langid='.$rpm_lang_id.'">all< /a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$r pm_sort.'&filt='.$rpm_filt.'&filt2=all&langid='.$rpm_lang_id .'">all</a>'; } echo ' | '; if ($rpm_filt2 == "news") { @@ -149,7 +155,7 @@ $ros_cms_intern_content_filt2 = " AND `dyn_content_name` = 'news_page'"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort. '&filt='.$rpm_filt.'&filt2=news&langid='.$rpm_lang_id.'">new s</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$r pm_sort.'&filt='.$rpm_filt.'&filt2=news&langid='.$rpm_lang_i d.'">news</a>'; } echo ' | '; if ($rpm_filt2 == "newsletter") { @@ -157,7 +163,7 @@ $ros_cms_intern_content_filt2 = " AND `dyn_content_name` = 'newsletter'"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort. '&filt='.$rpm_filt.'&filt2=newsletter&langid='.$rpm_lang_id. '">newsletter</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$r pm_sort.'&filt='.$rpm_filt.'&filt2=newsletter&langid='.$rpm_ lang_id.'">newsletter</a>'; } echo ' | '; if ($rpm_filt2 == "blog") { @@ -165,7 +171,7 @@ $ros_cms_intern_content_filt2 = " AND `dyn_content_name` = 'blog'"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort. '&filt='.$rpm_filt.'&filt2=blog&langid='.$rpm_lang_id.'">blo g</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$r pm_sort.'&filt='.$rpm_filt.'&filt2=blog&langid='.$rpm_lang_i d.'">blog</a>'; } /*echo ' | '; if ($rpm_filt2 == "dev_page") { @@ -173,7 +179,7 @@ $ros_cms_intern_content_filt2 = " AND `dyn_content_name` = 'dev_page'"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort. '&filt='.$rpm_filt.'&filt2=dev_page&langid='.$rpm_lang_id.'" >dev page</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$r pm_sort.'&filt='.$rpm_filt.'&filt2=dev_page&langid='.$rpm_la ng_id.'">dev page</a>'; }*/ echo '</p>'; @@ -188,7 +194,7 @@ $ros_cms_intern_content_sort="ASC"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort=id&filt= '.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&langid=' .$rpm_lang_id.'">content id</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort=id&a mp;filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id.'">content id</a>'; } echo ' | '; if ($rpm_sort == "nr") { @@ -197,7 +203,7 @@ $ros_cms_intern_content_sort="ASC"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort=nr&filt= '.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&langid=' .$rpm_lang_id.'">entry nr</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort=nr&a mp;filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'& langid='.$rpm_lang_id.'">entry nr</a>'; } echo ' | '; if ($rpm_sort == "name") { @@ -206,7 +212,7 @@ $ros_cms_intern_content_sort="ASC"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort=name&fil t='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&langid ='.$rpm_lang_id.'">name</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort=name &filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&am p;langid='.$rpm_lang_id.'">name</a>'; } echo ' | '; if ($rpm_sort == "date") { @@ -215,7 +221,7 @@ $ros_cms_intern_content_sort="DESC"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort=date&fil t='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&langid ='.$rpm_lang_id.'">date</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort=date &filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&am p;langid='.$rpm_lang_id.'">date</a>'; } echo ' | '; if ($rpm_sort == "user") { @@ -224,7 +230,7 @@ $ros_cms_intern_content_sort="ASC"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort=user&fil t='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&langid ='.$rpm_lang_id.'">user</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort=user &filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&am p;langid='.$rpm_lang_id.'">user</a>'; } echo ' | '; if ($rpm_sort == "active") { @@ -233,7 +239,7 @@ $ros_cms_intern_content_sort="DESC"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort=active&f ilt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&lang id='.$rpm_lang_id.'">active</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort=acti ve&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'& amp;langid='.$rpm_lang_id.'">active</a>'; } echo ' | '; if ($rpm_sort == "visible") { @@ -242,7 +248,7 @@ $ros_cms_intern_content_sort="DESC"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort=visible& filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&lan gid='.$rpm_lang_id.'">visible</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort=visi ble&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.' &langid='.$rpm_lang_id.'">visible</a>'; } echo ' | '; if ($rpm_sort == "version") { @@ -251,7 +257,7 @@ $ros_cms_intern_content_sort="DESC"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort=version& filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&lan gid='.$rpm_lang_id.'">version</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort=vers ion&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.' &langid='.$rpm_lang_id.'">version</a>'; } echo ' | '; if ($rpm_sort == "language") { @@ -260,10 +266,13 @@ $ros_cms_intern_content_sort="ASC"; } else { - echo '<a href="?page=admin&sec=dyncontent&sec2=view&sort=language&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&la ngid='.$rpm_lang_id.'">language</a>'; + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort=lang uage&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2. '&langid='.$rpm_lang_id.'">language</a>'; } echo '</p>'; + if ($rpm_page == "trans" || $rpm_page == "team") { + echo "<p><i>The <b>dynamic content interface</b> for translators is <b>under heavy construction</b>! Please <b>do NOT use it</b> today, come back later this week.<br />--frik85 (2006-01-15)</i></p>"; + } ?> <table width="100%" border="0" cellpadding="1" cellspacing="1"> <tr bgcolor="#5984C3"> @@ -283,7 +292,7 @@ </tr> <?php - if($roscms_intern_account_level==100) { + if($roscms_intern_account_level>=50) { $query_content = mysql_query("SELECT * FROM dyn_content $ros_cms_intern_content_filt $ros_cms_intern_content_filt2 $ros_cms_intern_dyn_content_lang @@ -316,17 +325,23 @@ $farbe = $farbe2; } ?>"> - <div align="center"><a href="?page=admin&sec=dyncontent&sec2=edit&<?php echo 'sec3='.$result_content['dyn_content_name'].'&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id.' &db_id='.$result_content['dyn_id']; ?>"><img src="images/view.gif" alt="View" width="19" height="18" border="0"></a> - <a href="<?php echo "?page=admin&sec=dyncontent&sec2=view&sort=version&filt= history&opt=".$result_content['dyn_content_id']."&filt2=".$rpm_f ilt2."&langid=".$result_content['dyn_content_lang']; ?>"><img src="images/history.gif" alt="Filter: history" width="19" height="18" border="0"></a> + <div align="center"> + <?php + if (($rpm_page == "trans" || $rpm_page == "team") && $rpm_lang_id == "nolang") { ?> + <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&opt=translate&<?php echo 'sec3='.$result_content['dyn_content_name'].'&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id.' &db_id='.$result_content['dyn_id']; ?>"><img src="images/tool.gif" alt="Translate" width="19" height="18" border="0"></a> + <?php } else { ?> + <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&<?php echo 'sec3='.$result_content['dyn_content_name'].'&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id.' &db_id='.$result_content['dyn_id']; ?>"><img src="images/view.gif" alt="View" width="19" height="18" border="0"></a> + <?php } ?> + <a href="<?php echo "?page=".$rpm_page."&sec=dyncontent&sec2=view&sort=version&a mp;filt=history&opt=".$result_content['dyn_content_id']."&filt2= ".$rpm_filt2."&langid=".$result_content['dyn_content_lang']; ?>"><img src="images/history.gif" alt="Filter: history" width="19" height="18" border="0"></a> </div></td> <td width="3%" valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="center"> <?php if($result_content['dyn_content_active'] == "1") { ?> - <a href="<?php if($roscms_intern_account_level>50) { echo '?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&la ngid='.$rpm_lang_id.'&dyn_content_active=0&dyn_content_active_se t='.$result_content['dyn_id'] ; } else { echo '#'; } ?>"><img src="images/active.gif" alt="active" width="19" height="18" border="0"></a> + <a href="<?php if($roscms_intern_account_level>50) { echo '?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$rpm_so rt.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2. '&langid='.$rpm_lang_id.'&dyn_content_active=0&dyn_content_a ctive_set='.$result_content['dyn_id'] ; } else { echo '#'; } ?>"><img src="images/active.gif" alt="active" width="19" height="18" border="0"></a> <?php } else { ?> - <a href="<?php if($roscms_intern_account_level>50) { echo '?page=admin&sec=dyncontent&sec2=view&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2.'&la ngid='.$rpm_lang_id.'&dyn_content_active=1&dyn_content_active_se t='.$result_content['dyn_id'] ; } else { echo '#'; } ?>"><img src="images/notactive.gif" alt="NOT active" width="19" height="18" border="0"></a> + <a href="<?php if($roscms_intern_account_level>50) { echo '?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$rpm_so rt.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&filt2='.$rpm_filt2. '&langid='.$rpm_lang_id.'&dyn_content_active=1&dyn_content_a ctive_set='.$result_content['dyn_id'] ; } else { echo '#'; } ?>"><img src="images/notactive.gif" alt="NOT active" width="19" height="18" border="0"></a> <?php } ?> </div></td> <td width="3%" valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="center"> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php --- trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2006-01-15 20:26:53 UTC (rev 20901) +++ trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2006-01-15 20:36:29 UTC (rev 20902) @@ -141,7 +141,7 @@ $sql_query_lang=mysql_query($sql_lang); while($myrow_lang=mysql_fetch_row($sql_query_lang)) { // Languages - + $roscms_TEMP_curlang = $myrow_lang[0]; // Pages: if ($rpm_site != "") { @@ -393,13 +393,13 @@ // redirect all bad links to the frontpage: $data_page = str_replace("[#link_",$roscms_intern_path_server."?page=index&temp=" ,$data_page); // correct link // Replace high chars by their html-escaped version - $data_page = roscms_unicode_escape($data_page); +// $data_page = roscms_unicode_escape($data_page); // Output & View: switch ($rpm_sec2) { case "genpage": // generate a single page case "output": - // create HTML file: + // create HTML file: if ($result_page['pages_extention'] == "default") { $output_fileformat = $fileformat; } _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_translator.php --- trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_translator.php 2006-01-15 20:26:53 UTC (rev 20901) +++ trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_translator.php 2006-01-15 20:36:29 UTC (rev 20902) @@ -20,8 +20,8 @@ ?> <div class="navTitle">Translator Int.</div> <ol> - <li><a href="?page=trans">Overview</a></li> <li><a href="?page=trans&sec=content&sec2=view">Translate Content</a></li> + <li><a href="?page=trans&sec=dyncontent&sec2=view"> - Dynamic Content</a></li> <li><a href="?page=trans&sec=help">Documentation</a></li> </ol> </div> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/translator.php --- trunk/web/reactos.org/htdocs/roscms/inc/translator.php 2006-01-15 20:26:53 UTC (rev 20901) +++ trunk/web/reactos.org/htdocs/roscms/inc/translator.php 2006-01-15 20:36:29 UTC (rev 20902) @@ -42,8 +42,9 @@ create_structure($rpm_page); switch ($rpm_sec) { + default: case "content": - if ($rpm_sec2=="view") { + if ($rpm_sec2=="view" || $rpm_sec2=="") { include("inc/admin_content.php"); } else if ($rpm_sec2=="edit") { @@ -56,13 +57,24 @@ include("inc/admin_content_edit.php"); } break; + case "dyncontent": + if ($rpm_sec2=="view") { + include("inc/admin_dyncontent.php"); + } + else if ($rpm_sec2=="edit") { + include("inc/admin_dyncontent_edit.php"); + } + else if ($rpm_sec2=="save") { + include("inc/admin_dyncontent_edit.php"); + } + break; case "help": include("inc/translator_help.php"); break; - case "overview": +/* case "overview": default: include("inc/translator_overview.php"); - break; + break;*/ } } else { // for all other user groups

18 years, 8 months

[ion] 20901: - Don't bother with clearing the DRs in the CONTEXT, just clear DR7 in the trap frame after the conversion.

by ion＠svn.reactos.org

- Don't bother with clearing the DRs in the CONTEXT, just clear DR7 in the trap frame after the conversion. Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c --- trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-15 20:25:53 UTC (rev 20900) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-15 20:26:53 UTC (rev 20901) @@ -149,12 +149,6 @@ /* Disable any debug regiseters */ Context->ContextFlags &= ~CONTEXT_DEBUG_REGISTERS; - Context->Dr0 = 0; - Context->Dr1 = 0; - Context->Dr2 = 0; - Context->Dr3 = 0; - Context->Dr6 = 0; - Context->Dr7 = 0; /* Setup the Trap Frame */ TrapFrame = &InitFrame->TrapFrame; @@ -170,6 +164,7 @@ TrapFrame->HardwareSegSs |= RPL_MASK; TrapFrame->SegDs |= RPL_MASK; TrapFrame->SegEs |= RPL_MASK; + TrapFrame->Dr7 = 0; /* Set the debug mark */ TrapFrame->DbgArgMark = 0xBADB0D00;

18 years, 8 months

[greatlrd] 20900: Implement XMillimeter and YMillimeter calculation, it not 100% correct for I assume the monitor DPI is always 72DPI

by greatlrd＠svn.reactos.org

Implement XMillimeter and YMillimeter calculation, it not 100% correct for I assume the monitor DPI is always 72DPI Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2006-01-15 20:13:08 UTC (rev 20899) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2006-01-15 20:25:53 UTC (rev 20900) @@ -875,7 +875,8 @@ ULONG VideoModeId) { PVBE_MODEINFO VBEMode = &DeviceExtension->ModeInfo[VideoModeId]; - + INT dwCalc; + VideoMode->Length = sizeof(VIDEO_MODE_INFORMATION); VideoMode->ModeIndex = VideoModeId; VideoMode->VisScreenWidth = VBEMode->XResolution; @@ -887,8 +888,61 @@ VideoMode->NumberOfPlanes = VBEMode->NumberOfPlanes; VideoMode->BitsPerPlane = VBEMode->BitsPerPixel / VBEMode->NumberOfPlanes; VideoMode->Frequency = 1; - VideoMode->XMillimeter = 0; /* FIXME */ - VideoMode->YMillimeter = 0; /* FIXME */ + + /* FIXME + * how do I get the dpi from the monitor ??, for now + * I (GreatLord) will assume 72dpi for the monitor, few monitor can have more or less 72dpi + * you need pay alot of money to get one, that have more that 72dpi. + * + * math inch = pixel / 72dpi + * math Millimeter = pixel / (72dpi / 2.571428571) * 10 + * + */ + + VideoMode->XMillimeter = VBEMode->XResolution / 28; + dwCalc = VBEMode->XResolution % 28; + if ((dwCalc>=3) && (dwCalc<=5)) + VideoMode->XMillimeter +=1; + else if ((dwCalc>=6) && (dwCalc<=8)) + VideoMode->XMillimeter +=2; + else if ((dwCalc>=9) && (dwCalc<=11)) + VideoMode->XMillimeter +=3; + else if ((dwCalc>=12) && (dwCalc<=13)) + VideoMode->XMillimeter +=4; + else if ((dwCalc>=15) && (dwCalc<=16)) + VideoMode->XMillimeter +=5; + else if ((dwCalc>=17) && (dwCalc<=19)) + VideoMode->XMillimeter +=6; + else if ((dwCalc>=20) && (dwCalc<=22)) + VideoMode->XMillimeter +=7; + else if ((dwCalc>=23) && (dwCalc<=25)) + VideoMode->XMillimeter +=8; + else if ((dwCalc>=26) && (dwCalc<=27)) + VideoMode->XMillimeter +=9; + + VideoMode->YMillimeter = VBEMode->YResolution / 28; + dwCalc = VBEMode->YResolution % 28; + if ((dwCalc>=3) && (dwCalc<=5)) + VideoMode->YMillimeter +=1; + else if ((dwCalc>=6) && (dwCalc<=8)) + VideoMode->YMillimeter +=2; + else if ((dwCalc>=9) && (dwCalc<=11)) + VideoMode->YMillimeter +=3; + else if ((dwCalc>=12) && (dwCalc<=13)) + VideoMode->YMillimeter +=4; + else if ((dwCalc>=15) && (dwCalc<=16)) + VideoMode->YMillimeter +=5; + else if ((dwCalc>=17) && (dwCalc<=19)) + VideoMode->YMillimeter +=6; + else if ((dwCalc>=20) && (dwCalc<=22)) + VideoMode->YMillimeter +=7; + else if ((dwCalc>=23) && (dwCalc<=25)) + VideoMode->YMillimeter +=8; + else if ((dwCalc>=26) && (dwCalc<=27)) + VideoMode->YMillimeter +=9; + + + if (VBEMode->BitsPerPixel > 8) { /*

18 years, 8 months

[ion] 20899: - Use old-style NPX state when creating the thread context. Fixes regression in 1st-stage install.

by ion＠svn.reactos.org

- Use old-style NPX state when creating the thread context. Fixes regression in 1st-stage install. Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c --- trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-15 19:06:18 UTC (rev 20898) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-15 20:13:08 UTC (rev 20899) @@ -94,6 +94,7 @@ /* Setup the Fx Area */ FxSaveArea = &InitFrame->FxSaveArea; + Thread->NpxState = NPX_STATE_INVALID; /* Check if we support FXsr */ if (KeI386FxsrPresent) @@ -136,7 +137,7 @@ CONTEXT_FLOATING_POINT; /* Set the Thread's NPX State */ - Thread->NpxState = NPX_STATE_NOT_LOADED; + Thread->NpxState = NPX_STATE_INVALID; Thread->DispatcherHeader.NpxIrql = PASSIVE_LEVEL; } else @@ -147,13 +148,13 @@ } /* Disable any debug regiseters */ + Context->ContextFlags &= ~CONTEXT_DEBUG_REGISTERS; Context->Dr0 = 0; Context->Dr1 = 0; Context->Dr2 = 0; Context->Dr3 = 0; Context->Dr6 = 0; Context->Dr7 = 0; - Context->ContextFlags &= ~CONTEXT_DEBUG_REGISTERS; /* Setup the Trap Frame */ TrapFrame = &InitFrame->TrapFrame;

18 years, 8 months

[gedmurphy] 20898: help update

by gedmurphy＠svn.reactos.org

help update Modified: trunk/reactos/INSTALL _____ Modified: trunk/reactos/INSTALL --- trunk/reactos/INSTALL 2006-01-15 18:28:40 UTC (rev 20897) +++ trunk/reactos/INSTALL 2006-01-15 19:06:18 UTC (rev 20898) @@ -71,8 +71,10 @@ 5. Help If you run into problems or have suggestions for making ReactOS better, please -visit the address below and subscribe to one or more of the mailing lists. +visit the address below. Mailing lists are available for a variety of topics, +bugs should be submitted to bugzilla and general chat takes place in the forums, +or #reactos on freenode -http://www.reactos.com/en/content/view/full/66 +http://www.reactos.org ReactOS Development Team

18 years, 8 months

[hbirr] 20897: - Allocated the initial stacks page aligned.

by hbirr＠svn.reactos.org

- Allocated the initial stacks page aligned. - Add a guard page for the initial stacks. - Fixed the size of the initial stacks. Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S --- trunk/reactos/ntoskrnl/ke/i386/main_asm.S 2006-01-15 18:21:43 UTC (rev 20896) +++ trunk/reactos/ntoskrnl/ke/i386/main_asm.S 2006-01-15 18:28:40 UTC (rev 20897) @@ -3,8 +3,33 @@ #define AP_MAGIC (0x12481020) +.global _kernel_stack +.global _kernel_stack_top +.global _kernel_trap_stack +.global _kernel_trap_stack_top + .globl _NtProcessStartup +.bss +.align 4096 + + +/* guard page for the kernel stack */ +.fill 4096, 1, 0 + +_kernel_stack: +.fill 3*4096, 1, 0 +_kernel_stack_top: + +/* guard page for the trap stack */ +.fill 4096, 1, 0 + +_kernel_trap_stack: +.fill 3*4096, 1, 0 +_kernel_trap_stack_top: + +.text + _NtProcessStartup: /* FIXME: Application processors should have their own GDT/IDT */ @@ -34,13 +59,12 @@ .m1: /* Load the initial kernel stack */ - lea _kernel_stack, %eax - add $0x2000, %eax - and $0xFFFFE000, %eax - add $(0x3000 - SIZEOF_FX_SAVE_AREA), %eax + lea _kernel_stack_top, %eax + sub $(SIZEOF_FX_SAVE_AREA), %eax movl %eax, %esp /* Call the main kernel initialization */ pushl %edx pushl %ecx call __main + _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2006-01-15 18:21:43 UTC (rev 20896) +++ trunk/reactos/ntoskrnl/ke/main.c 2006-01-15 18:28:40 UTC (rev 20897) @@ -48,15 +48,17 @@ ULONG KeLargestCacheLine = 0x40; /* FIXME: Arch-specific */ -/* We allocate 5 pages, but we only use 4. The 5th is to guarantee page alignment */ -ULONG kernel_stack[5120]; -ULONG double_trap_stack[5120]; +/* the initial stacks are declared in main_asm.S */ +extern ULONG kernel_stack; +extern ULONG kernel_stack_top; +extern ULONG kernel_trap_stack; +extern ULONG kernel_trap_stack_top; /* These point to the aligned 3 pages */ -ULONG init_stack; -ULONG init_stack_top; -ULONG trap_stack; -ULONG trap_stack_top; +ULONG init_stack = (ULONG)&kernel_stack; +ULONG init_stack_top = (ULONG)&kernel_stack_top; +ULONG trap_stack = (ULONG)&kernel_trap_stack; +ULONG trap_stack_top = (ULONG)&kernel_trap_stack_top; /* Cached modules from the loader block */ PLOADER_MODULE CachedModules[MaximumCachedModuleType]; @@ -155,13 +157,6 @@ PIMAGE_OPTIONAL_HEADER OptHead; CHAR* s; - /* Set up the Stacks (Initial Kernel Stack and Double Trap Stack) - and save a page for the fx savings area */ - trap_stack = PAGE_ROUND_UP(&double_trap_stack) + PAGE_SIZE; - trap_stack_top = trap_stack + 3 * PAGE_SIZE; - init_stack = PAGE_ROUND_UP(&kernel_stack) + PAGE_SIZE; - init_stack_top = init_stack + 3 * PAGE_SIZE; - /* Copy the Loader Block Data locally since Low-Memory will be wiped */ memcpy(&KeLoaderBlock, _LoaderBlock, sizeof(LOADER_PARAMETER_BLOCK)); memcpy(&KeLoaderModules[1], _____ Modified: trunk/reactos/ntoskrnl/mm/mminit.c --- trunk/reactos/ntoskrnl/mm/mminit.c 2006-01-15 18:21:43 UTC (rev 20896) +++ trunk/reactos/ntoskrnl/mm/mminit.c 2006-01-15 18:28:40 UTC (rev 20897) @@ -38,6 +38,7 @@ extern ULONG init_stack; extern ULONG init_stack_top; +extern ULONG trap_stack; VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength); @@ -394,6 +395,10 @@ AddressRangeCount); kernel_len = LastKrnlPhysAddr - FirstKrnlPhysAddr; + /* Unmap the guard pages from the initial stacks */ + MmDeleteVirtualMapping(NULL, (PVOID)(init_stack - PAGE_SIZE), FALSE, NULL, NULL); + MmDeleteVirtualMapping(NULL, (PVOID)(trap_stack - PAGE_SIZE), FALSE, NULL, NULL); + /* * Unmap low memory */

18 years, 8 months

[hbirr] 20896: Fixed the stack for the first thread.

by hbirr＠svn.reactos.org

Fixed the stack for the first thread. Modified: trunk/reactos/ntoskrnl/ps/idle.c _____ Modified: trunk/reactos/ntoskrnl/ps/idle.c --- trunk/reactos/ntoskrnl/ps/idle.c 2006-01-15 16:47:18 UTC (rev 20895) +++ trunk/reactos/ntoskrnl/ps/idle.c 2006-01-15 18:21:43 UTC (rev 20896) @@ -64,14 +64,14 @@ { PETHREAD Thread; ULONG_PTR KernelStack; - extern unsigned int init_stack; + extern unsigned int init_stack_top; Thread = ExAllocatePool(NonPagedPool, sizeof(ETHREAD)); RtlZeroMemory(Thread, sizeof(ETHREAD)); Thread->ThreadsProcess = Process; if (First) { - KernelStack = init_stack; + KernelStack = init_stack_top; } else {

18 years, 8 months

[gedmurphy] 20895: Change toolbars from 16 to 15 pixels high

by gedmurphy＠svn.reactos.org

Change toolbars from 16 to 15 pixels high Modified: trunk/reactos/subsys/system/explorer/res/toolbar.bmp Modified: trunk/reactos/subsys/system/ibrowser/res/toolbar.bmp _____ Modified: trunk/reactos/subsys/system/explorer/res/toolbar.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/ibrowser/res/toolbar.bmp (Binary files differ)

18 years, 8 months

[weiden] 20894: implemented LsaDelete() (client only)

by weiden＠svn.reactos.org

implemented LsaDelete() (client only) Modified: trunk/reactos/include/idl/lsa.idl Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/sec/lsa.c Modified: trunk/reactos/lib/lsasrv/lsarpc.c _____ Modified: trunk/reactos/include/idl/lsa.idl --- trunk/reactos/include/idl/lsa.idl 2006-01-15 14:18:43 UTC (rev 20893) +++ trunk/reactos/include/idl/lsa.idl 2006-01-15 14:34:58 UTC (rev 20894) @@ -39,4 +39,8 @@ /* Function 0 */ NTSTATUS LsarClose(handle_t BindingHandle, [in] LSA_HANDLE ObjectHandle); + + /* Function 1 */ + NTSTATUS LsarDelete(handle_t BindingHandle, + [in] LSA_HANDLE ObjectHandle); } _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2006-01-15 14:18:43 UTC (rev 20893) +++ trunk/reactos/lib/advapi32/advapi32.def 2006-01-15 14:34:58 UTC (rev 20894) @@ -351,7 +351,7 @@ ;LsaCreateSecret@16 ;LsaCreateTrustedDomain@16 ;LsaCreateTrustedDomainEx -;LsaDelete@4 +LsaDelete@4 ;LsaDeleteTrustedDomain@8 LsaEnumerateAccountRights@16 ;LsaEnumerateAccounts@20 _____ Modified: trunk/reactos/lib/advapi32/sec/lsa.c --- trunk/reactos/lib/advapi32/sec/lsa.c 2006-01-15 14:18:43 UTC (rev 20893) +++ trunk/reactos/lib/advapi32/sec/lsa.c 2006-01-15 14:34:58 UTC (rev 20894) @@ -92,7 +92,23 @@ (unsigned long)ObjectHandle); } + /* + * @implemented + */ +NTSTATUS STDCALL +LsaDelete(LSA_HANDLE ObjectHandle) +{ + DPRINT("LsaDelete(0x%p) called\n", ObjectHandle); + + LSAHandleBind(); + + return LsarDelete(LSABindingHandle, + (unsigned long)ObjectHandle); +} + + +/* * @unimplemented */ NTSTATUS _____ Modified: trunk/reactos/lib/lsasrv/lsarpc.c --- trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 14:18:43 UTC (rev 20893) +++ trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 14:34:58 UTC (rev 20894) @@ -144,4 +144,13 @@ return Status; } +/* Function 1 */ +unsigned int +LsarDelete(IN handle_t BindingHandle, + IN unsigned long ObjectHandle) +{ + DPRINT1("LsarDelete(0x%p) UNIMPLEMENTED!\n", ObjectHandle); + return STATUS_ACCESS_DENIED; +} + /* EOF */

18 years, 8 months

← Newer
1
...
16
17
18
19
20
21
22
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006