Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 29083: Add some missing definitions to PSDK Patch by Samuel Serapion, samdwise51 at gmail dot com
by hpoussin＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: hpoussin Date: Mon Sep 17 17:52:44 2007 New Revision: 29083 URL: http://svn.reactos.org/svn/reactos?rev=29083&view=rev Log: Add some missing definitions to PSDK Patch by Samuel Serapion, samdwise51 at gmail dot com Modified: trunk/reactos/include/psdk/ntsecapi.h trunk/reactos/include/psdk/wincrypt.h trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h (original) +++ trunk/reactos/include/psdk/ntsecapi.h Mon Sep 17 17:52:44 2007 @@ -554,7 +554,7 @@ typedef struct _POLICY_DNS_DOMAIN_INFO { LSA_UNICODE_STRING Name; LSA_UNICODE_STRING DnsDomainName; - LSA_UNICODE_STRING DnsTreeName; + LSA_UNICODE_STRING DnsForestName; GUID DomainGuid; PSID Sid; } POLICY_DNS_DOMAIN_INFO, *PPOLICY_DNS_DOMAIN_INFO; Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h (original) +++ trunk/reactos/include/psdk/wincrypt.h Mon Sep 17 17:52:44 2007 @@ -27,6 +27,7 @@ /* some typedefs for function parameters */ typedef unsigned int ALG_ID; typedef unsigned long HCRYPTPROV; +typedef unsigned long HCRYPTPROV_LEGACY; typedef unsigned long HCRYPTKEY; typedef unsigned long HCRYPTHASH; typedef void *HCERTSTORE; @@ -3004,6 +3005,286 @@ DWORD CycleDetectionModulus; } CERT_CHAIN_ENGINE_CONFIG, *PCERT_CHAIN_ENGINE_CONFIG; +/* message-related definitions */ + +typedef BOOL (WINAPI *PFN_CMSG_STREAM_OUTPUT)(const void *pvArg, BYTE *pbData, + DWORD cbData, BOOL fFinal); + +#define CMSG_INDEFINITE_LENGTH 0xffffffff + +typedef struct _CMSG_STREAM_INFO +{ + DWORD cbContent; + PFN_CMSG_STREAM_OUTPUT pfnStreamOutput; + void *pvArg; +} CMSG_STREAM_INFO, *PCMSG_STREAM_INFO; + +typedef struct _CERT_ISSUER_SERIAL_NUMBER +{ + CERT_NAME_BLOB Issuer; + CRYPT_INTEGER_BLOB SerialNumber; +} CERT_ISSUER_SERIAL_NUMBER, *PCERT_ISSUER_SERIAL_NUMBER; + +typedef struct _CERT_ID +{ + DWORD dwIdChoice; + union { + CERT_ISSUER_SERIAL_NUMBER IssuerSerialNumber; + CRYPT_HASH_BLOB KeyId; + CRYPT_HASH_BLOB HashId; + } DUMMYUNIONNAME; +} CERT_ID, *PCERT_ID; + +#undef CMSG_DATA /* may be defined by sys/socket.h */ +#define CMSG_DATA 1 +#define CMSG_SIGNED 2 +#define CMSG_ENVELOPED 3 +#define CMSG_SIGNED_AND_ENVELOPED 4 +#define CMSG_HASHED 5 +#define CMSG_ENCRYPTED 6 + +#define CMSG_ALL_FLAGS (~0U) +#define CMSG_DATA_FLAG (1 << CMSG_DATA) +#define CMSG_SIGNED_FLAG (1 << CMSG_SIGNED) +#define CMSG_ENVELOPED_FLAG (1 << CMSG_ENVELOPED) +#define CMSG_SIGNED_AND_ENVELOPED_FLAG (1 << CMSG_SIGNED_AND_ENVELOPED) +#define CMSG_HASHED_FLAG (1 << CMSG_HASHED) +#define CMSG_ENCRYPTED_FLAG (1 << CMSG_ENCRYPTED) + +typedef struct _CMSG_SIGNER_ENCODE_INFO +{ + DWORD cbSize; + PCERT_INFO pCertInfo; + HCRYPTPROV hCryptProv; + DWORD dwKeySpec; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void *pvHashAuxInfo; + DWORD cAuthAttr; + PCRYPT_ATTRIBUTE rgAuthAttr; + DWORD cUnauthAttr; + PCRYPT_ATTRIBUTE rgUnauthAttr; + CERT_ID SignerId; + CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm; + void *pvHashEncryptionAuxInfo; +} CMSG_SIGNER_ENCODE_INFO, *PCMSG_SIGNER_ENCODE_INFO; + +typedef struct _CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_BIT_BLOB RecipientPublicKey; + CERT_ID RecipientId; + FILETIME Date; + PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr; +} CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO, *PCMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO; + +typedef struct _CMSG_SIGNED_ENCODE_INFO +{ + DWORD cbSize; + DWORD cSigners; + PCMSG_SIGNER_ENCODE_INFO rgSigners; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; + DWORD cCrlEncoded; + PCRL_BLOB rgCrlEncoded; + DWORD cAttrCertEncoded; + PCERT_BLOB rgAttrCertEncoded; +} CMSG_SIGNED_ENCODE_INFO, *PCMSG_SIGNED_ENCODE_INFO; + +typedef struct _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; + void* pvKeyEncryptionAuxInfo; + HCRYPTPROV_LEGACY hCryptProv; + CRYPT_BIT_BLOB RecipientPublicKey; + CERT_ID RecipientId; +} CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO, *PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO; + +typedef struct _CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; + void* pvKeyEncryptionAuxInfo; + CRYPT_ALGORITHM_IDENTIFIER KeyWrapAlgorithm; + void* pvKeyWrapAuxInfo; + HCRYPTPROV_LEGACY hCryptProv; + DWORD dwKeySpec; + DWORD dwKeyChoice; + union + { + PCRYPT_ALGORITHM_IDENTIFIER pEphemeralAlgorithm; + PCERT_ID pSenderId; + } DUMMYUNIONNAME; + CRYPT_DATA_BLOB UserKeyingMaterial; + DWORD cRecipientEncryptedKeys; + PCMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO* rgpRecipientEncryptedKeys; +} CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO, *PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO; + +typedef struct _CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; + void* pvKeyEncryptionAuxInfo; + HCRYPTPROV hCryptProv; + DWORD dwKeyChoice; + union + { + HCRYPTKEY hKeyEncryptionKey; + void* pvKeyEncryptionKey; + } DUMMYUNIONNAME; + CRYPT_DATA_BLOB KeyId; + FILETIME Date; + PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr; +} CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO, *PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO; + +typedef struct _CMSG_RECIPIENT_ENCODE_INFO +{ + DWORD dwRecipientChoice; + union + { + PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO pKeyTrans; + PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO pKeyAgree; + PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO pMailList; + } DUMMYUNIONNAME; +} CMSG_RECIPIENT_ENCODE_INFO, PCMSG_RECIPIENT_ENCODE_INFO; + +typedef struct _CMSG_ENVELOPED_ENCODE_INFO +{ + DWORD cbSize; + HCRYPTPROV hCryptProv; + CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; + void *pvEncryptionAuxInfo; + DWORD cRecipients; + PCERT_INFO *rgpRecipientCert; + PCMSG_RECIPIENT_ENCODE_INFO rgCmsRecipients; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; + DWORD cCrlEncoded; + PCRL_BLOB rgCrlEncoded; + DWORD cAttrCertEncoded; + PCERT_BLOB rgAttrCertEncoded; + DWORD cUnprotectedAttr; + PCRYPT_ATTRIBUTE rgUnprotectedAttr; +} CMSG_ENVELOPED_ENCODE_INFO, *PCMSG_ENVELOPED_ENCODE_INFO; + +typedef struct _CMSG_HASHED_ENCODE_INFO +{ + DWORD cbSize; + HCRYPTPROV hCryptProv; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void *pvHashAuxInfo; +} CMSG_HASHED_ENCODE_INFO, *PCMSG_HASHED_ENCODE_INFO; + +#define CMSG_BARE_CONTENT_FLAG 0x00000001 +#define CMSG_LENGTH_ONLY_FLAG 0x00000002 +#define CMSG_DETACHED_FLAG 0x00000004 +#define CMSG_AUTHENTICATED_ATTRIBUTES_FLAG 0x00000008 +#define CMSG_CONTENTS_OCTETS_FLAG 0x00000010 +#define CMSG_MAX_LENGTH_FLAG 0x00000020 +#define CMSG_CMS_ENCAPSULATED_CONTENT_FLAG 0x00000040 +#define CMSG_CRYPT_RELEASE_CONTEXT_FLAG 0x00008000 + +#define CMSG_CTRL_VERIFY_SIGNATURE 1 +#define CMSG_CTRL_DECRYPT 2 +#define CMSG_CTRL_VERIFY_HASH 5 +#define CMSG_CTRL_ADD_SIGNER 6 +#define CMSG_CTRL_DEL_SIGNER 7 +#define CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR 8 +#define CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR 9 +#define CMSG_CTRL_ADD_CERT 10 +#define CMSG_CTRL_DEL_CERT 11 +#define CMSG_CTRL_ADD_CRL 12 +#define CMSG_CTRL_DEL_CRL 13 +#define CMSG_CTRL_ADD_ATTR_CERT 14 +#define CMSG_CTRL_DEL_ATTR_CERT 15 +#define CMSG_CTRL_KEY_TRANS_DECRYPT 16 +#define CMSG_CTRL_KEY_AGREE_DECRYPT 17 +#define CMSG_CTRL_MAIL_LIST_DECRYPT 18 +#define CMSG_CTRL_VERIFY_SIGNATURE_EX 19 +#define CMSG_CTRL_ADD_CMS_SIGNER_INFO 20 + +typedef struct _CMSG_CTRL_DECRYPT_PARA +{ + DWORD cbSize; + union + { + HCRYPTPROV hCryptProv; + /*NCRYPT_KEY_HANDLE hNCryptKey;*/ + } DUMMYUNIONNAME; + DWORD dwKeySpec; + DWORD dwRecipientIndex; +} CMSG_CTRL_DECRYPT_PARA, *PCMSG_CTRL_DECRYPT_PARA; + +typedef struct _CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA +{ + DWORD cbSize; + DWORD dwSignerIndex; + CRYPT_DATA_BLOB BLOB; +} CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA, *PCMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA; + +typedef struct _CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA +{ + DWORD cbSize; + DWORD dwSignerIndex; + DWORD dwUnauthAttrIndex; +} CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA, *PCMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA; + +#define CMSG_TYPE_PARAM 1 +#define CMSG_CONTENT_PARAM 2 +#define CMSG_BARE_CONTENT_PARAM 3 +#define CMSG_INNER_CONTENT_PARAM 4 +#define CMSG_SIGNER_COUNT_PARAM 5 +#define CMSG_SIGNER_INFO_PARAM 6 +#define CMSG_SIGNER_CERT_INFO_PARAM 7 +#define CMSG_SIGNER_HASH_ALGORITHM_PARAM 8 +#define CMSG_SIGNER_AUTH_ATTR_PARAM 9 +#define CMSG_SIGNER_UNAUTH_ATTR_PARAM 10 +#define CMSG_CERT_COUNT_PARAM 11 +#define CMSG_CERT_PARAM 12 +#define CMSG_CRL_COUNT_PARAM 13 +#define CMSG_CRL_PARAM 14 +#define CMSG_ENVELOPE_ALGORITHM_PARAM 15 +#define CMSG_RECIPIENT_COUNT_PARAM 17 +#define CMSG_RECIPIENT_INDEX_PARAM 18 +#define CMSG_RECIPIENT_INFO_PARAM 19 +#define CMSG_HASH_ALGORITHM_PARAM 20 +#define CMSG_HASH_DATA_PARAM 21 +#define CMSG_COMPUTED_HASH_PARAM 22 +#define CMSG_ENCRYPT_PARAM 26 +#define CMSG_ENCRYPTED_DIGEST 27 +#define CMSG_ENCODED_SIGNER 28 +#define CMSG_ENCODED_MESSAGE 29 +#define CMSG_VERSION_PARAM 30 +#define CMSG_ATTR_CERT_COUNT_PARAM 31 +#define CMSG_ATTR_CERT_PARAM 32 +#define CMSG_CMS_RECIPIENT_COUNT_PARAM 33 +#define CMSG_CMS_RECIPIENT_INDEX_PARAM 34 +#define CMSG_CMS_RECIPIENT_ENCRYPTED_KEY_INDEX_PARAM 35 +#define CMSG_CMS_RECIPIENT_INFO_PARAM 36 +#define CMSG_UNPROTECTED_ATTR_PARAM 37 +#define CMSG_SIGNER_CERT_ID_PARAM 38 +#define CMSG_CMS_SIGNER_INFO_PARAM 39 + +#define CMSG_SIGNED_DATA_V1 1 +#define CMSG_SIGNED_DATA_V3 3 +#define CMSG_SIGNED_DATA_PKCS_1_5_VERSION CMSG_SIGNED_DATA_V1 +#define CMSG_SIGNED_DATA_CMS_VERSION CMSG_SIGNED_DATA_V3 + +#define CMSG_SIGNER_INFO_V1 1 +#define CMSG_SIGNER_INFO_V3 3 +#define CMSG_SIGNER_INFO_PKCS_1_5_VERSION CMSG_SIGNER_INFO_V1 +#define CMSG_SIGNER_INFO_CMS_VERSION CMSG_SIGNER_INFO_V3 + +#define CMSG_HASHED_DATA_V0 0 +#define CMSG_HASHED_DATA_V2 2 +#define CMSG_HASHED_DATA_PKCS_1_5_VERSION CMSG_HASHED_DATA_V0 +#define CMSG_HASHED_DATA_CMS_VERSION CMSG_HASHED_DATA_V2 + +#define CMSG_ENVELOPED_DATA_V0 0 +#define CMSG_ENVELOPED_DATA_V2 2 +#define CMSG_ENVELOPED_DATA_PKCS_1_5_VERSION CMSG_ENVELOPED_DATA_V0 +#define CMSG_ENVELOPED_DATA_CMS_VERSION CMSG_ENVELOPED_DATA_V2 + /* function declarations */ /* advapi32.dll */ BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer, Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Mon Sep 17 17:52:44 2007 @@ -1218,12 +1218,12 @@ int abcA; UINT abcB; int abcC; -} ABC,*LPABC; +} ABC, *PABC, *LPABC; typedef struct _ABCFLOAT { FLOAT abcfA; FLOAT abcfB; FLOAT abcfC; -} ABCFLOAT,*LPABCFLOAT; +} ABCFLOAT, *PABCFLOAT, *LPABCFLOAT; typedef struct tagBITMAP { LONG bmType; LONG bmWidth; @@ -1349,11 +1349,11 @@ DWORD fsUsb[4]; DWORD fsCsb[2]; } FONTSIGNATURE, *PFONTSIGNATURE,*LPFONTSIGNATURE; -typedef struct { +typedef struct tagCHARSETINFO { UINT ciCharset; UINT ciACP; FONTSIGNATURE fs; -} CHARSETINFO,*LPCHARSETINFO; +} CHARSETINFO, *PCHARSETINFO, *LPCHARSETINFO; typedef struct tagCOLORADJUSTMENT { WORD caSize; WORD caFlags; @@ -1476,7 +1476,7 @@ DWORD dsBitfields[3]; HANDLE dshSection; DWORD dsOffset; -} DIBSECTION; +} DIBSECTION,*PDIBSECTION,*LPDIBSECTION; typedef struct _DOCINFOA { int cbSize; LPCSTR lpszDocName; @@ -1497,12 +1497,17 @@ } EMR,*PEMR; #if(WINVER >= 0x0400) -typedef struct tagEMRGLSRECORD -{ - EMR emr; - DWORD cbData; - BYTE Data[1]; +typedef struct tagEMRGLSRECORD { + EMR emr; + DWORD cbData; + BYTE Data[1]; } EMRGLSRECORD, *PEMRGLSRECORD; +typedef struct tagEMRGLSBOUNDEDRECORD { + EMR emr; + RECTL rclBounds; + DWORD cbData; + BYTE Data[1]; +} EMRGLSBOUNDEDRECORD, *PEMRGLSBOUNDEDRECORD; #endif typedef struct tagEMRANGLEARC { EMR emr; @@ -1537,8 +1542,9 @@ LONG ySrc; XFORM xformSrc; COLORREF crBkColorSrc; - DWORD iUsageSrc; + DWORD iUsageSrc; DWORD offBmiSrc; + DWORD cbBmiSrc; DWORD offBitsSrc; DWORD cbBitsSrc; } EMRBITBLT,*PEMRBITBLT; @@ -1548,6 +1554,11 @@ LONG lbHatch; } LOGBRUSH,*PLOGBRUSH,*LPLOGBRUSH; typedef LOGBRUSH PATTERN,*PPATTERN,*LPPATTERN; +typedef struct tagLOGBRUSH32 { + UINT lbStyle; + COLORREF lbColor; + ULONG lbHatch; +} LOGBRUSH32, *PLOGBRUSH32; typedef struct tagEMRCREATEBRUSHINDIRECT { EMR emr; DWORD ihBrush; @@ -1579,6 +1590,14 @@ DWORD lcsGammaBlue; WCHAR lcsFilename[MAX_PATH]; } LOGCOLORSPACEW,*LPLOGCOLORSPACEW; +typedef struct tagEMRCREATECOLORSPACEW { + EMR emr; + DWORD ihCS; + LOGCOLORSPACEW lcs; + DWORD dwFlags; + DWORD cbData; + BYTE Data[1]; +} EMRCREATECOLORSPACEW, *PEMRCREATECOLORSPACEW; typedef struct tagEMRCREATECOLORSPACE { EMR emr; DWORD ihCS; @@ -1662,7 +1681,7 @@ BYTE bLetterform; BYTE bMidline; BYTE bXHeight; -} PANOSE; +} PANOSE, *LPPANOSE;; typedef struct tagLOGFONTA { LONG lfHeight; LONG lfWidth; @@ -1732,7 +1751,7 @@ LONG elpHatch; DWORD elpNumEntries; DWORD elpStyleEntry[1]; -} EXTLOGPEN,*PEXTLOGPEN,*LPEXTLOGPEN; +} EXTLOGPEN,*PEXTLOGPEN,*LPEXTLOGPEN,*NPEXTLOGPEN; typedef struct tagEMREXTCREATEPEN { EMR emr; DWORD ihPen; @@ -1786,7 +1805,7 @@ DWORD nVersion; DWORD cbData; DWORD offData; -} EMRFORMAT; +} EMRFORMAT, *PEMRFORMAT; typedef struct tagEMRSETCOLORSPACE @@ -2175,7 +2194,7 @@ DWORD nCount; DWORD nRgnSize; RECT rcBound; -} RGNDATAHEADER; +} RGNDATAHEADER, *PRGNDATAHEADER; typedef struct _RGNDATA { RGNDATAHEADER rdh; char Buffer[1]; @@ -2622,6 +2641,11 @@ typedef int (CALLBACK *OLDFONTENUMPROCW)(ENUMLOGFONTEXW*,NEWTEXTMETRICEXW*,DWORD,LPARAM); typedef OLDFONTENUMPROCA FONTENUMPROCA; typedef OLDFONTENUMPROCW FONTENUMPROCW; +#ifdef UNICODE +#define OLDFONTENUMPROC OLDFONTENUMPROCW +#else +#define OLDFONTENUMPROC OLDFONTENUMPROCA +#endif typedef int (CALLBACK *ICMENUMPROCA)(LPSTR,LPARAM); typedef int (CALLBACK *ICMENUMPROCW)(LPWSTR,LPARAM); typedef void (CALLBACK *GOBJENUMPROC)(LPVOID,LPARAM); Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Mon Sep 17 17:52:44 2007 @@ -601,6 +601,12 @@ #define DOMAIN_GROUP_RID_ADMINS 0x00000200L #define DOMAIN_GROUP_RID_USERS 0x00000201L #define DOMAIN_GROUP_RID_GUESTS 0x00000202L +#define DOMAIN_GROUP_RID_COMPUTERS 0x00000203L +#define DOMAIN_GROUP_RID_CONTROLLERS 0x00000204L +#define DOMAIN_GROUP_RID_CERT_ADMINS 0x00000205L +#define DOMAIN_GROUP_RID_SCHEMA_ADMINS 0x00000206L +#define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS 0x00000207L +#define DOMAIN_GROUP_RID_POLICY_ADMINS 0x00000208L #define DOMAIN_ALIAS_RID_ADMINS 0x00000220L #define DOMAIN_ALIAS_RID_USERS 0x00000221L Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Mon Sep 17 17:52:44 2007 @@ -998,6 +998,7 @@ #if(_WIN32_WINNT >= 0x0501) #define SM_CXFOCUSBORDER 83 #define SM_CYFOCUSBORDER 84 +#define SM_SHUTTINGDOWN 0x2000 #endif /* _WIN32_WINNT >= 0x0501 */ #define SM_REMOTESESSION 0X1000 #define ARW_BOTTOMLEFT 0 @@ -1491,6 +1492,21 @@ #endif #endif + +#define PBT_APMQUERYSUSPEND 0x0000 +#define PBT_APMQUERYSTANDBY 0x0001 +#define PBT_APMQUERYSUSPENDFAILED 0x0002 +#define PBT_APMQUERYSTANDBYFAILED 0x0003 +#define PBT_APMSUSPEND 0x0004 +#define PBT_APMSTANDBY 0x0005 +#define PBT_APMRESUMECRITICAL 0x0006 +#define PBT_APMRESUMESUSPEND 0x0007 +#define PBT_APMRESUMESTANDBY 0x0008 +#define PBTF_APMRESUMEFROMFAILURE 0x00000001 +#define PBT_APMBATTERYLOW 0x0009 +#define PBT_APMPOWERSTATUSCHANGE 0x000A +#define PBT_APMOEMEVENT 0x000B +#define PBT_APMRESUMEAUTOMATIC 0x0012 #define WM_CHAR 258 #define WM_CHARTOITEM 47

1 0

[hpoussin] 29082: Add missing svn:eol-style native properties
by hpoussin＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: hpoussin Date: Mon Sep 17 17:43:34 2007 New Revision: 29082 URL: http://svn.reactos.org/svn/reactos?rev=29082&view=rev Log: Add missing svn:eol-style native properties Modified: trunk/reactos/include/psdk/activscp.idl (props changed) trunk/reactos/include/psdk/advpub.h (props changed) trunk/reactos/include/psdk/af_irda.h (props changed) trunk/reactos/include/psdk/appmgmt.h (props changed) trunk/reactos/include/psdk/authz.h (props changed) trunk/reactos/include/psdk/axcore.idl (props changed) trunk/reactos/include/psdk/axextend.idl (props changed) trunk/reactos/include/psdk/clusapi.h (contents, props changed) trunk/reactos/include/psdk/comcat.idl (props changed) trunk/reactos/include/psdk/common.ver (contents, props changed) trunk/reactos/include/psdk/control.idl (props changed) trunk/reactos/include/psdk/cryptuiapi.h (contents, props changed) trunk/reactos/include/psdk/cvconst.h (props changed) trunk/reactos/include/psdk/d3d.h (props changed) trunk/reactos/include/psdk/d3drmdef.h (contents, props changed) trunk/reactos/include/psdk/d3dtypes.h (props changed) trunk/reactos/include/psdk/dbghelp.h (props changed) trunk/reactos/include/psdk/dbinit.idl (props changed) trunk/reactos/include/psdk/dbprop.idl (props changed) trunk/reactos/include/psdk/dbs.idl (props changed) trunk/reactos/include/psdk/ddrawgdi.h (props changed) trunk/reactos/include/psdk/devenum.idl (props changed) trunk/reactos/include/psdk/devguid.h (props changed) trunk/reactos/include/psdk/digitalv.h (props changed) trunk/reactos/include/psdk/dinput.h (props changed) trunk/reactos/include/psdk/dsdriver.h (props changed) trunk/reactos/include/psdk/dsgetdc.h (props changed) trunk/reactos/include/psdk/dsound.h (props changed) trunk/reactos/include/psdk/dsrole.h (props changed) trunk/reactos/include/psdk/guiddef.h (props changed) trunk/reactos/include/psdk/htmlhelp.h (props changed) trunk/reactos/include/psdk/intrin_ppc.h (contents, props changed) trunk/reactos/include/psdk/intrin_x86_64.h (contents, props changed) trunk/reactos/include/psdk/ks.h (props changed) trunk/reactos/include/psdk/ksmedia.h (props changed) trunk/reactos/include/psdk/lmjoin.h (props changed) trunk/reactos/include/psdk/mapicode.h (props changed) trunk/reactos/include/psdk/mapidefs.h (props changed) trunk/reactos/include/psdk/mapiguid.h (props changed) trunk/reactos/include/psdk/mapitags.h (props changed) trunk/reactos/include/psdk/mapiutil.h (props changed) trunk/reactos/include/psdk/mapival.h (props changed) trunk/reactos/include/psdk/mapix.h (props changed) trunk/reactos/include/psdk/mmddk.h (props changed) trunk/reactos/include/psdk/mscat.h (props changed) trunk/reactos/include/psdk/mshtmcid.h (props changed) trunk/reactos/include/psdk/mshtmdid.h (props changed) trunk/reactos/include/psdk/msi.h (props changed) trunk/reactos/include/psdk/msidefs.h (props changed) trunk/reactos/include/psdk/msiquery.h (props changed) trunk/reactos/include/psdk/mssip.h (props changed) trunk/reactos/include/psdk/multimon.h (contents, props changed) trunk/reactos/include/psdk/npapi.h (props changed) trunk/reactos/include/psdk/ntstatus.h (props changed) trunk/reactos/include/psdk/ntverp.h (contents, props changed) trunk/reactos/include/psdk/psdk.rbuild (contents, props changed) trunk/reactos/include/psdk/tchar.h (props changed) trunk/reactos/include/psdk/tcpioctl.h (props changed) trunk/reactos/include/psdk/textserv.h (props changed) trunk/reactos/include/psdk/vfwmsgs.h (props changed) trunk/reactos/include/psdk/wdbgexts.h (contents, props changed) trunk/reactos/include/psdk/winternl.h (props changed) trunk/reactos/include/psdk/wintrust.h (props changed) trunk/reactos/include/psdk/wtsapi32.h (props changed) trunk/reactos/include/psdk/xcmc.h (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/clusapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/clusapi.h?rev… Modified: trunk/reactos/include/psdk/common.ver URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/common.ver?re… Modified: trunk/reactos/include/psdk/cryptuiapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cryptuiapi.h?… Modified: trunk/reactos/include/psdk/d3drmdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3drmdef.h?re… Modified: trunk/reactos/include/psdk/intrin_ppc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_ppc.h?… Modified: trunk/reactos/include/psdk/intrin_x86_64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86_64… Modified: trunk/reactos/include/psdk/multimon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/multimon.h?re… Modified: trunk/reactos/include/psdk/ntverp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntverp.h?rev=… Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… Modified: trunk/reactos/include/psdk/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wdbgexts.h?re…

1 0

[dreimer] 29081: Fix my stupidity on two Parameter sets...
by dreimer＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: dreimer Date: Mon Sep 17 14:14:13 2007 New Revision: 29081 URL: http://svn.reactos.org/svn/reactos?rev=29081&view=rev Log: Fix my stupidity on two Parameter sets... Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Mon Sep 17 14:14:13 2007 @@ -13,12 +13,13 @@ :: :: Take over the 2nd parameter of Build.cmd, which enables/disables stripping. :: + if "%1" == "strip" ( - set ROS_LEAN_AND_MEAN = yes + set ROS_LEAN_AND_MEAN=yes goto :Build ) if "%1" == "" ( - set ROS_LEAN_AND_MEAN = no + set ROS_LEAN_AND_MEAN=no goto :Build ) Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Mon Sep 17 14:14:13 2007 @@ -49,7 +49,7 @@ if %%i LSS %_2% ( raddr2line "%_1%" "%_2%" 2>NUL ) else ( - set /a baseaddr += 0x%_2% + set /a baseaddr+=0x%_2% for /f %%i in ('"echoh %baseaddr%"') do set relbase=%%i raddr2line "%_1%" "%relbase%" 2>NUL )

1 0

[frik85] 29080: RosCMS update: * fixed language quick-switch combobox (bug related to the table "pages")
by frik85＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: frik85 Date: Mon Sep 17 13:54:31 2007 New Revision: 29080 URL: http://svn.reactos.org/svn/reactos?rev=29080&view=rev Log: RosCMS update: * fixed language quick-switch combobox (bug related to the table "pages") Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_list.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Mon Sep 17 13:54:31 2007 @@ -1492,6 +1492,24 @@ load_frametable_cp(tcp); } + + function load_frametable_cp3(tcp) { + if (document.getElementById('frametable').style.display != 'block') { + document.getElementById('frametable').style.display = 'block'; + document.getElementById('frameedit').style.display = 'none'; + } + + window.clearTimeout(alertactiv); /* deactivate alert-timer */ + document.getElementById('alertb').style.visibility = 'hidden'; + document.getElementById('alertbc').innerHTML = ' '; + select_all(0); /* deselect all table entries */ + + + <?php if ($RosCMS_GET_debug) { ?> + debugLog('?page=data_out&d_f=xml&d_u=ptm&d_fl='+roscms_current_page+'&d_filter='+filtstring1+'&d_filter2='+filtstring2); + <?php } ?> + makeRequest('?page=data_out&d_f=xml&d_u=ptm&d_fl='+roscms_current_page+'&d_filter='+filtstring1+'&d_filter2='+filtstring2, 'ptm', 'tablist', 'xml', 'GET', ''); + } function load_frameedit_helper() { if (document.getElementById('frameedit').style.display != 'block') { @@ -2086,7 +2104,7 @@ userlang = favlang; filtpopulate(filtstring2); - load_frametable_cp2(roscms_current_tbl_position); + load_frametable_cp3(roscms_current_tbl_position); } function getlang() {

1 0

[hpoussin] 29079: Get rid of "Video Save SVGA" group. Clean up group order entries
by hpoussin＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: hpoussin Date: Mon Sep 17 13:42:01 2007 New Revision: 29079 URL: http://svn.reactos.org/svn/reactos?rev=29079&view=rev Log: Get rid of "Video Save SVGA" group. Clean up group order entries Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Mon Sep 17 13:42:01 2007 @@ -394,7 +394,6 @@ "Debug", \ "Video Init", \ "Video", \ - "Video Save SVGA", \ "Video Save", \ "File System", \ "Event log", \ @@ -406,21 +405,14 @@ ; Group order, the first DWORD is the count of entries, ; the following dwords are the tag entries for the load order. -HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Boot Bus Extender", 0x00000001, \ +HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Video Save", 0x00000001, \ 0x02, 0x00, 0x00, 0x00, \ 0x01, 0x00, 0x00, 0x00, \ 0x02, 0x00, 0x00, 0x00 HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","SCSI Miniport", 0x00000001, \ - 0x09, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ 0x10, 0x00, 0x00, 0x00, \ - 0x20, 0x00, 0x00, 0x00, \ - 0x30, 0x00, 0x00, 0x00, \ - 0x40, 0x00, 0x00, 0x00, \ - 0x50, 0x00, 0x00, 0x00, \ - 0x60, 0x00, 0x00, 0x00, \ - 0x70, 0x00, 0x00, 0x00, \ - 0x80, 0x00, 0x00, 0x00, \ - 0x90, 0x00, 0x00, 0x00 + 0x20, 0x00, 0x00, 0x00 ; Session Manager stuff HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \ @@ -733,10 +725,11 @@ ; VBE SVGA driver HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save SVGA" +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save" HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 @@ -750,6 +743,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1

1 0

[hpoussin] 29078: No need to create a service group only for VBE driver. By using tags, VBE driver can be installed as the first one in the "Video Save" group
by hpoussin＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: hpoussin Date: Mon Sep 17 13:35:31 2007 New Revision: 29078 URL: http://svn.reactos.org/svn/reactos?rev=29078&view=rev Log: No need to create a service group only for VBE driver. By using tags, VBE driver can be installed as the first one in the "Video Save" group Modified: trunk/reactos/media/inf/display.inf Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/display.inf (original) +++ trunk/reactos/media/inf/display.inf Mon Sep 17 13:35:31 2007 @@ -46,7 +46,7 @@ [VGA_Inst.NT.Services] AddService = VGA, , VGA_Service_Inst -AddService = VBE, 0x00000002, VBE_Service_Inst +AddService = VBE, 0x00000003, VBE_Service_Inst ; SPSVCINST_TAGTOFRONT + SPSVCINST_ASSOCSERVICE [VGA_Service_Inst] ServiceType = 1 @@ -60,7 +60,7 @@ StartType = 1 ErrorControl = 0 ServiceBinary = %12%\vbemp.sys -LoadOrderGroup = Video SVGA Save +LoadOrderGroup = Video Save ;-------------------------------- STRINGS -------------------------------

1 0

[frik85] 29077: RosCMS update: * added "version" entry to "order" and "column" filters * improved archive view (sorting by name and version)
by frik85＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: frik85 Date: Mon Sep 17 13:27:00 2007 New Revision: 29077 URL: http://svn.reactos.org/svn/reactos?rev=29077&view=rev Log: RosCMS update: * added "version" entry to "order" and "column" filters * improved archive view (sorting by name and version) Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php Mon Sep 17 13:27:00 2007 @@ -172,6 +172,9 @@ case "usr": // user $roscms_mtbl_order .= "r.rev_usrid ".$roscms_d_f2_typeb.", "; break; + case "ver": // version + $roscms_mtbl_order .= "r.rev_version ".$roscms_d_f2_typeb.", "; + break; case "nbr": // number ("dynamic" entry) $roscms_d_tags_counter++; $roscms_mtbl_order .= " v".$roscms_d_tags_counter.".tv_value ".$roscms_d_f2_typeb.", "; @@ -809,6 +812,9 @@ case "Rights": $roscms_mtbl_cols2 .= roscms_security_explain($tblentry_d_id2) ."|"; break; + case "Version": + $roscms_mtbl_cols2 .= $tblentry_d_r_ver ."|"; + break; } } Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_list.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Mon Sep 17 13:27:00 2007 @@ -1382,7 +1382,7 @@ load_frametable('my'); break; case '12': - filtstring2 = 'k_is_archive_0|c_is_type_0|l_is_'+getlang()+'_0|o_asc_name'; + filtstring2 = 'k_is_archive_0|c_is_version_0|c_is_type_0|l_is_'+getlang()+'_0|o_asc_name|o_desc_ver'; roscms_archive = 1; /* activate archive mode*/ load_frametable('archive'); break; @@ -1758,11 +1758,11 @@ break; case 'c': /* column */ filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="is">is</option></select>'; - filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="language">Language</option><option value="user">User</option><option value="type">Type</option><?php if ($roscms_security_level > 1) { ?><option value="security"<?php echo $cbm_item_hide; ?>>Security</option><option value="rights"<?php echo $cbm_item_hide; ?>>Rights</option><?php } ?></select>'; + filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="language">Language</option><option value="user">User</option><option value="type">Type</option><option value="version">Version</option><?php if ($roscms_security_level > 1) { ?><option value="security"<?php echo $cbm_item_hide; ?>>Security</option><option value="rights"<?php echo $cbm_item_hide; ?>>Rights</option><?php } ?></select>'; break; case 'o': /* order by */ filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="asc">Ascending</option><option value="desc">Descending</option></select>'; - filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="datetime">Date & Time</option><option value="name">Name</option><option value="lang">Language</option><option value="usr">User</option><option value="type">Type</option><option value="nbr">Number ("dynamic" entry)</option><?php if ($roscms_security_level > 1) { ?><option value="security"<?php echo $cbm_item_hide; ?>>Security</option><option value="revid"<?php echo $cbm_item_hide; ?>>RevID</option><option value="ext"<?php echo $cbm_item_hide; ?>>Extension</option><option value="status"<?php echo $cbm_item_hide; ?>>Status</option><option value="kind"<?php echo $cbm_item_hide; ?>>Kind</option><?php } ?></select>'; + filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="datetime">Date & Time</option><option value="name">Name</option><option value="lang">Language</option><option value="usr">User</option><option value="type">Type</option><option value="ver">Version</option><option value="nbr">Number ("dynamic" entry)</option><?php if ($roscms_security_level > 1) { ?><option value="security"<?php echo $cbm_item_hide; ?>>Security</option><option value="revid"<?php echo $cbm_item_hide; ?>>RevID</option><option value="ext"<?php echo $cbm_item_hide; ?>>Extension</option><option value="status"<?php echo $cbm_item_hide; ?>>Status</option><option value="kind"<?php echo $cbm_item_hide; ?>>Kind</option><?php } ?></select>'; break; case 'i': /* security (ACL) */ filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="is">is</option><option value="no">is not</option></select>';

1 0

[frik85] 29076: RosCMS update: * additional group check-code added * new dynamic entry function fixed * improved alertbox information
by frik85＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: frik85 Date: Mon Sep 17 13:14:08 2007 New Revision: 29076 URL: http://svn.reactos.org/svn/reactos?rev=29076&view=rev Log: RosCMS update: * additional group check-code added * new dynamic entry function fixed * improved alertbox information Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php Mon Sep 17 13:14:08 2007 @@ -914,6 +914,7 @@ FROM data_revision r, data_tag a, data_tag_name n, data_tag_value v WHERE r.data_id = '".mysql_real_escape_string($RosCMS_GET_d_id)."' AND r.rev_language = '".mysql_real_escape_string($RosCMS_GET_d_r_lang)."' + AND r.rev_version > 0 AND r.data_id = a.data_id AND r.rev_id = a.data_rev_id AND (a.tag_usrid = '-1') @@ -1247,6 +1248,7 @@ } else { if ($RosCMS_GET_debug) echo "<ul>"; + for ($i=0; $i < count($entry_ids); $i++) { $entry_ids2 = split("_", $entry_ids[$i]); @@ -1258,6 +1260,22 @@ AND r.data_id = d.data_id LIMIT 1;"); $result_rev_data = mysql_fetch_array($query_rev_data); + + if (($entr_flag == "ms" || $entr_flag == "mn") && $roscms_security_level > 1) { + if (roscms_security_grp_member("transmaint")) { + + $query_account_lang = @mysql_query("SELECT user_language FROM users WHERE user_id = '".mysql_real_escape_string($roscms_intern_account_id)."'"); + $result_account_lang = @mysql_fetch_array($query_account_lang); + + if ($result_account_lang['user_language'] == "") { + die("Set a valid language in your myReactOS account settings!"); + } + else if ($result_account_lang['user_language'] != $result_rev_data['data_id']) { + echo "As Language Maintainer you can only mark entries of '".$result_account_lang['user_language']."' language as new!"; + continue; + } + } + } $t_tagid = ""; @@ -1289,11 +1307,8 @@ } - if ($entr_flag == "ms") { - // @todo: check that only one entry per name is stable, promt a decicion-box, if an entry should be moved to archive - tag_add($result_rev_data['data_id'], $result_rev_data['rev_id'], "status" /* name */, "stable" /* value */, "-1" /* usrid */); - } - else if ($entr_flag == "mn") { + // 'mn': mark as new + if ($entr_flag == "mn") { tag_add($result_rev_data['data_id'], $result_rev_data['rev_id'], "status" /* name */, "new" /* value */, "-1" /* usrid */); } @@ -1301,7 +1316,10 @@ // 'ms': mark as stable if ($entr_flag == "ms") { log_event_low("mark entry as stable: data-id ".$result_rev_data['data_id'].", rev-id ".$result_rev_data['rev_id'].log_prep_info($result_rev_data['data_id'], $result_rev_data['rev_id'])."{changetags}"); - + + + tag_add($result_rev_data['data_id'], $result_rev_data['rev_id'], "status" /* name */, "stable" /* value */, "-1" /* usrid */); + if ($result_rev_data['rev_version'] == 0) { $temp_dynamic = getTagValue($result_rev_data['data_id'], $result_rev_data['rev_id'], '-1', 'number'); // get dynamic content number @@ -1383,13 +1401,14 @@ if ($RosCMS_GET_debug) echo "<p>! generate_page_output_update(".$result_rev_data['data_id'].", ".$tmp_lang.", ".$temp_dynamic.")</p>"; - echo generate_page_output_update($result_entry['data_id'], $tmp_lang, $temp_dynamic); + //echo generate_page_output_update($result_entry['data_id'], $tmp_lang, $temp_dynamic); + echo "Page generation process finished"; } else { echo "Only 'new' entries can be made stable"; } } - + // 'mn': mark as new if ($entr_flag == "mn") { $update_rev_ver = mysql_query("UPDATE data_revision SET rev_version = '0' WHERE rev_id = '".mysql_real_escape_string($result_rev_data['rev_id'])."' LIMIT 1;"); Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_list.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Mon Sep 17 13:14:08 2007 @@ -3361,18 +3361,13 @@ alertbox('Action performed'); break; case 'changetags2': - //alert('!!! changetags !!!'+http_request.responseText); <?php if ($RosCMS_GET_debug) { echo " alert('!!! changetags(*ms*): '+http_request.responseText); "; } ?> load_frametable_cp(0); - <?php - if (!$RosCMS_GET_debug) { - echo " alertbox('Page generation process finished'); "; - } - ?> + alertbox(http_request.responseText); break; case 'editalterfields': //alert('!!! saved?: '+http_request.responseText);

1 0

[fireball] 29075: Cameron Gutman <aicommander@gmail.com> - Use /SOS to disable bootlogo in the LiveCD too.
by fireball＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: fireball Date: Mon Sep 17 12:48:14 2007 New Revision: 29075 URL: http://svn.reactos.org/svn/reactos?rev=29075&view=rev Log: Cameron Gutman <aicommander(a)gmail.com> - Use /SOS to disable bootlogo in the LiveCD too. Modified: trunk/reactos/boot/bootdata/livecd.ini Modified: trunk/reactos/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.ini (original) +++ trunk/reactos/boot/bootdata/livecd.ini Mon Sep 17 12:48:14 2007 @@ -25,4 +25,4 @@ [ReactOS] BootType=ReactOS SystemPath=LiveCD -Options=/DEBUGPORT=COM1 /NOGUIBOOT +Options=/DEBUGPORT=COM1 /SOS

1 0

[arty] 29074: Add missing include path.
by arty＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: arty Date: Mon Sep 17 10:12:40 2007 New Revision: 29074 URL: http://svn.reactos.org/svn/reactos?rev=29074&view=rev Log: Add missing include path. Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Sep 17 10:12:40 2007 @@ -17,6 +17,7 @@ <include base="cmlib">.</include> <include base="ntoskrnl">include</include> <include base="ntoskrnl" root="intermediate"></include> + <include base="ntoskrnl" root="intermediate">include</include> <include base="ReactOS">include/reactos/drivers</include> <library>csq</library> <library>hal</library>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs