1.1 --- a/epoc32/include/e32std.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/e32std.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,9 +1,9 @@
1.4 // Copyright (c) 1994-2009 Nokia Corporation and/or its subsidiary(-ies).
1.5 // All rights reserved.
1.6 // This component and the accompanying materials are made available
1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
1.8 +// under the terms of the License "Eclipse Public License v1.0"
1.9 // which accompanies this distribution, and is available
1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
1.12 //
1.13 // Initial Contributors:
1.14 // Nokia Corporation - initial contribution.
1.15 @@ -1203,8 +1203,8 @@
1.16 /** @deprecated Use BoundedVal(TInt64& aVal,TRadix aRadix,const TInt64& aLimit) */
1.17 inline TInt Val(TInt64& aVal,TRadix aRadix,const TInt64& aLimit) { return BoundedVal(aVal,aRadix,aLimit); };
1.18 private:
1.19 - void Scndig(TInt& aSig,TInt& aExp,TInt64& aDl);
1.20 - void ScndigAfterPoint(TInt& aSig,TInt64& aDl);
1.21 + void Scndig(TInt& aSig, TInt& aExp, TUint64& aDl);
1.22 + void ScndigAfterPoint(TInt& aSig, TUint64& aDl);
1.23 void ValidateMark(const TLexMark8 aMark) const;
1.24 private:
1.25 const TUint8* iNext;
1.26 @@ -1334,7 +1334,7 @@
1.27 /** @deprecated Use BoundedVal(TInt64& aVal,TRadix aRadix,const TInt64& aLimit) */
1.28 inline TInt Val(TInt64& aVal,TRadix aRadix,const TInt64& aLimit) { return BoundedVal(aVal,aRadix,aLimit); };
1.29 private:
1.30 - void Scndig(TInt& aSig,TInt& aExp,TInt64& aDl);
1.31 + void Scndig(TInt& aSig, TInt& aExp, TUint64& aDl);
1.32 void ValidateMark(const TLexMark16 aMark) const;
1.33 private:
1.34 const TUint16* iNext;
1.35 @@ -1759,7 +1759,7 @@
1.36 Stores and manipulates the date and time.
1.37
1.38 It represents a date and time as a number of microseconds since midnight,
1.39 -January 1st, 0 AD nominal Gregorian. BC dates are represented by negative
1.40 +January 1st, 1 AD nominal Gregorian. BC dates are represented by negative
1.41 TTime values. A TTime object may be constructed from a TInt64, a TDateTime
1.42 a string literal, or by default, which initialises the time to an arbitrary
1.43 value. To access human-readable time information, the TTime may be converted
1.44 @@ -2295,6 +2295,7 @@
1.45 inline void SetDigitType(TDigitType aDigitType);
1.46 inline TDeviceTimeState DeviceTime() const;
1.47 inline void SetDeviceTime(TDeviceTimeState aState);
1.48 + inline TInt RegionCode() const;
1.49
1.50 void SetDefaults(); /**< @internalComponent */
1.51
1.52 @@ -2326,73 +2327,12 @@
1.53 TUnitsFormat iUnitsDistanceLong;
1.54 TUint iExtraNegativeCurrencyFormatFlags;
1.55 TUint16 iLanguageDowngrade[3];
1.56 - TUint16 iSpare16;
1.57 + TUint16 iRegionCode;
1.58 TDigitType iDigitType;
1.59 TDeviceTimeState iDeviceTimeState;
1.60 TInt iSpare[0x1E];
1.61 };
1.62
1.63 -
1.64 -/**
1.65 -@internalComponent
1.66 -*/
1.67 -const TUint KLocaleLanguageKey = 0x10208903;
1.68 -
1.69 -/**
1.70 -@internalComponent
1.71 -*/
1.72 -const TUint KLocaleDataKey = 0x10208904;
1.73 -
1.74 -/**
1.75 -@internalComponent
1.76 -*/
1.77 -const TUint KLocaleDataExtraKey = 0x10208905;
1.78 -
1.79 -/**
1.80 -@internalComponent
1.81 -*/
1.82 -const TUint KLocaleTimeDateFormatKey = 0x10208907;
1.83 -
1.84 -/**
1.85 -@internalComponent
1.86 -*/
1.87 -const TUint KLocaleDefaultCharSetKey = 0x10208908;
1.88 -
1.89 -/**
1.90 -@internalComponent
1.91 -*/
1.92 -const TUint KLocalePreferredCharSetKey = 0x10208909;
1.93 -
1.94 -/**
1.95 -@internalComponent
1.96 -*/
1.97 -enum TLocaleFunctions
1.98 - {
1.99 - FnDummy,
1.100 - FnAmPmTable,
1.101 - FnCharSet,
1.102 - FnCollTable,
1.103 - FnCurrencySymbol,
1.104 - FnDateSuffixTable,
1.105 - FnDayAbbTable,
1.106 - FnDayTable,
1.107 - FnFoldTable,
1.108 - FnLanguage,
1.109 - FnLocaleData,
1.110 - FnLowerTable,
1.111 - FnMonthAbbTable,
1.112 - FnMonthTable,
1.113 - FnMsgTable,
1.114 - FnTypeTable,
1.115 - FnUniCode,
1.116 - FnUpperTable,
1.117 - FnShortDateFormatSpec,
1.118 - FnLongDateFormatSpec,
1.119 - FnTimeFormatSpec,
1.120 - FnFatUtilityFunctions
1.121 - };
1.122 -
1.123 -
1.124 /**
1.125 @publishedAll
1.126 @released
1.127 @@ -2489,9 +2429,12 @@
1.128 // contents of this TExtendedLocale
1.129 IMPORT_C TInt SaveSystemSettings();
1.130
1.131 - // Load a complete set of locale data from a named Locale DLL
1.132 + //load a complete locale data from a single locale dll
1.133 IMPORT_C TInt LoadLocale(const TDesC& aLocaleDllName);
1.134 -
1.135 +
1.136 + //load a complete locale data from three locale dlls, which are language lcoale dll, region locale dll, and collation locale dll.
1.137 + IMPORT_C TInt LoadLocale(const TDesC& aLanguageLocaleDllName, const TDesC& aRegionLocaleDllName, const TDesC& aCollationLocaleDllName);
1.138 +
1.139 // Load an additional Locale DLL and over-ride a selected subset
1.140 // (currently ELocaleLanguageSettings to select an alternative set
1.141 // of language specific text strings, ELocaleCollateSetting to
1.142 @@ -2501,6 +2444,13 @@
1.143 // ELocaleOverRideSortCollationTable for ordering text strings)
1.144 // of settings with its contents
1.145 IMPORT_C TInt LoadLocaleAspect(TUint aAspectGroup, const TDesC& aLocaleDllName);
1.146 +
1.147 + //load a locale aspect from a locale dll.
1.148 + //Such as load language locale aspect from locale language dll;
1.149 + //load region locale aspect from locale region dll;
1.150 + //load collation locale aspect from locale collation dll.
1.151 + //There are in all three aspect, which are langauge, region, and collation.
1.152 + IMPORT_C TInt LoadLocaleAspect(const TDesC& aLocaleDllName);
1.153
1.154 // Set the currency Symbol
1.155 IMPORT_C TInt SetCurrencySymbol(const TDesC &aSymbol);
1.156 @@ -2536,6 +2486,13 @@
1.157 void DoUpdateLanguageSettings(TLibraryFunction* aExportList);
1.158 void DoUpdateLocaleSettings(TLibraryFunction* aExportList);
1.159 void DoUpdateTimeDateFormat(TLibraryFunction* aExportList);
1.160 +
1.161 +#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
1.162 + void DoUpdateLanguageSettingsV2(TLibraryFunction* aExportList);
1.163 + void DoUpdateLocaleSettingsV2(TLibraryFunction* aExportList);
1.164 + TInt CheckLocaleDllName(const TDesC& aLocaleDllName, TInt& languageID);
1.165 + void AddExtension(TDes& aFileName, TInt aExtension);
1.166 +#endif
1.167
1.168 private:
1.169
1.170 @@ -3405,28 +3362,15 @@
1.171 class RChunk : public RHandleBase
1.172 {
1.173 public:
1.174 - /**
1.175 - @internalComponent
1.176 - */
1.177 - enum TAttribs
1.178 - {
1.179 - ENormal=0x00,
1.180 - EDoubleEnded=0x01,
1.181 - EDisconnected=0x02,
1.182 - ELocal=0x00,
1.183 - EGlobal=0x10,
1.184 - EData=0x00,
1.185 - ECode=0x20,
1.186 - };
1.187 -
1.188 /**
1.189 - Set of flags used by SetRestrictions().
1.190 -
1.191 - @see RChunk::SetRestrictions
1.192 - */
1.193 + Set of flags used by SetRestrictions().
1.194 +
1.195 + @see RChunk::SetRestrictions
1.196 + */
1.197 enum TRestrictions
1.198 {
1.199 - EPreventAdjust = 0x01, // Prevent Adjust, Commit, Allocate and Decommit
1.200 + /** Prevent Adjust, Commit, Allocate and Decommit */
1.201 + EPreventAdjust = 0x01,
1.202 };
1.203 public:
1.204 inline TInt Open(const TFindChunk& aFind,TOwnerType aType=EOwnerProcess);
1.205 @@ -3456,6 +3400,7 @@
1.206 IMPORT_C TInt MaxSize() const;
1.207 inline TBool IsReadable() const;
1.208 inline TBool IsWritable() const;
1.209 + IMPORT_C TBool IsPaged() const;
1.210 private:
1.211 friend class UserHeap;
1.212 };
1.213 @@ -3483,6 +3428,16 @@
1.214
1.215 friend class RChunk;
1.216
1.217 + /**
1.218 + Attributes that specify whether the chunk to be created is data paged or not.
1.219 + */
1.220 + enum TChunkPagingAtt
1.221 + {
1.222 + EUnspecified, /**< The chunk will use the creating process's paging attributes.*/
1.223 + EPaged, /**< The chunk will be data paged.*/
1.224 + EUnpaged, /**< The chunk will not be data paged.*/
1.225 + };
1.226 +
1.227 IMPORT_C TChunkCreateInfo();
1.228 IMPORT_C void SetNormal(TInt aInitialSize, TInt aMaxSize);
1.229 IMPORT_C void SetCode(TInt aInitialSize, TInt aMaxSize);
1.230 @@ -3491,8 +3446,15 @@
1.231 IMPORT_C void SetOwner(TOwnerType aType);
1.232 IMPORT_C void SetGlobal(const TDesC& aName);
1.233 IMPORT_C void SetClearByte(TUint8 aClearByte);
1.234 + IMPORT_C void SetPaging(const TChunkPagingAtt aPaging);
1.235 + IMPORT_C void SetReadOnly();
1.236 void SetThreadHeap(TInt aInitialSize, TInt aMaxSize, const TDesC& aName);
1.237
1.238 + /**
1.239 + For use by file server only.
1.240 + @internalTechnology
1.241 + */
1.242 + IMPORT_C void SetCache(TInt aMaxSize);
1.243 protected :
1.244 /** The version number of this TChunkCreateInfo.
1.245 @internalComponent
1.246 @@ -3534,7 +3496,7 @@
1.247 */
1.248 TInt iInitialTop;
1.249 /** Attributes to the chunk to be created should have.
1.250 - Should be set from one or more the values in TChunkCreateAttributes.
1.251 + Should be set from one or more the values in TChunkCreate::TChunkCreateAtt.
1.252 @internalComponent
1.253 */
1.254 TUint iAttributes;
1.255 @@ -3548,6 +3510,96 @@
1.256 TUint iSpare2;
1.257 };
1.258
1.259 +/**
1.260 +This structure specifies the type and properties of the user heap to be created. It
1.261 +is passed as a parameter to the UserHeap::Create() method.
1.262 +
1.263 +@publishedAll
1.264 +@released
1.265 +*/
1.266 +struct TChunkHeapCreateInfo
1.267 + {
1.268 +public:
1.269 + /**
1.270 + Currently supported version numbers
1.271 + @internalComponent
1.272 + */
1.273 + enum TChunkHeapCreateVersions
1.274 + {
1.275 + EVersion0,
1.276 + ESupportedVersions,
1.277 + };
1.278 +
1.279 + /**
1.280 + Attributes that specify whether the chunk heap to be created is data paged or not.
1.281 + */
1.282 + enum TChunkHeapPagingAtt
1.283 + {
1.284 + EUnspecified, /**< The chunk heap will use the creating process's paging attributes.*/
1.285 + EPaged, /**< The chunk heap will be data paged.*/
1.286 + EUnpaged, /**< The chunk heap will not be data paged.*/
1.287 + };
1.288 +
1.289 + friend class UserHeap;
1.290 +
1.291 + IMPORT_C TChunkHeapCreateInfo(TInt aMinLength, TInt aMaxLength);
1.292 + IMPORT_C void SetCreateChunk(const TDesC* aName);
1.293 + IMPORT_C void SetUseChunk(const RChunk aChunk);
1.294 + inline void SetSingleThread(TBool aSingleThread);
1.295 + inline void SetAlignment(TInt aAlign);
1.296 + inline void SetGrowBy(TInt aGrowBy);
1.297 + inline void SetOffset(TInt aOffset);
1.298 + inline void SetMode(TUint aMode);
1.299 + inline void SetPaging(const TChunkHeapPagingAtt aPaging);
1.300 +
1.301 +protected:
1.302 + /** The version number of this TChunkHeapCreateInfo.
1.303 + @internalComponent
1.304 + */
1.305 + TUint iVersionNumber;
1.306 + /** The minimum size for the heap.
1.307 + @internalConponent
1.308 + */
1.309 + TInt iMinLength;
1.310 + /** The maximum size for the heap.
1.311 + @internalConponent
1.312 + */
1.313 + TInt iMaxLength;
1.314 + /** The alignment of the heap.
1.315 + @internalComponent
1.316 + */
1.317 + TInt iAlign;
1.318 + /** The grow by value of the heap.
1.319 + @internalComponent
1.320 + */
1.321 + TInt iGrowBy;
1.322 + /** The single thread value of the heap.
1.323 + @internalComponent
1.324 + */
1.325 + TBool iSingleThread;
1.326 + /** The offset from the base of the chunk to the start of the heap.
1.327 + @internalComponent
1.328 + */
1.329 + TInt iOffset;
1.330 + /** The paging attributes of the chunk.
1.331 + @internalComponent
1.332 + */
1.333 + TChunkHeapPagingAtt iPaging;
1.334 + /** The mode flags for the heap.
1.335 + @internalComponent
1.336 + */
1.337 + TUint iMode;
1.338 + /** The name of the chunk to be created for the heap.
1.339 + @internalComponent
1.340 + */
1.341 + TDesC* iName;
1.342 + /** The chunk to use for the heap.
1.343 + @internalComponent
1.344 + */
1.345 + RChunk iChunk;
1.346 + /**@internalComponent*/
1.347 + TInt iSpare[5];
1.348 + };
1.349
1.350 struct SStdEpocThreadCreateInfo;
1.351 /**
1.352 @@ -3563,11 +3615,28 @@
1.353 class UserHeap
1.354 {
1.355 public:
1.356 - enum TChunkHeapCreateMode {EChunkHeapSwitchTo=1, EChunkHeapDuplicate=2};
1.357 + /**
1.358 + Flags to control the heap creation.
1.359 + */
1.360 + enum TChunkHeapCreateMode
1.361 + {
1.362 + /** On successful creation of the heap this switches the calling thread to
1.363 + use the new heap.
1.364 + */
1.365 + EChunkHeapSwitchTo = 0x1,
1.366 + /** On successful creation of the heap this causes the handle to the heap
1.367 + to be duplicated.
1.368 + */
1.369 + EChunkHeapDuplicate = 0x2,
1.370 +
1.371 + /** @internalComponent*/
1.372 + EChunkHeapMask = EChunkHeapSwitchTo | EChunkHeapDuplicate,
1.373 + };
1.374 IMPORT_C static RHeap* FixedHeap(TAny* aBase, TInt aMaxLength, TInt aAlign=0, TBool aSingleThread=ETrue);
1.375 IMPORT_C static RHeap* ChunkHeap(const TDesC* aName, TInt aMinLength, TInt aMaxLength, TInt aGrowBy=1, TInt aAlign=0, TBool aSingleThread=EFalse);
1.376 IMPORT_C static RHeap* ChunkHeap(RChunk aChunk, TInt aMinLength, TInt aGrowBy=1, TInt aMaxLength=0, TInt aAlign=0, TBool aSingleThread=EFalse, TUint32 aMode=0);
1.377 IMPORT_C static RHeap* OffsetChunkHeap(RChunk aChunk, TInt aMinLength, TInt aOffset, TInt aGrowBy=1, TInt aMaxLength=0, TInt aAlign=0, TBool aSingleThread=EFalse, TUint32 aMode=0);
1.378 + IMPORT_C static RHeap* ChunkHeap(const TChunkHeapCreateInfo& aCreateInfo);
1.379 IMPORT_C static TInt SetupThreadHeap(TBool aNotFirst, SStdEpocThreadCreateInfo& aInfo);
1.380 IMPORT_C static TInt CreateThreadHeap(SStdEpocThreadCreateInfo& aInfo, RHeap*& aHeap, TInt aAlign=0, TBool aSingleThread=EFalse);
1.381 };
1.382 @@ -3619,6 +3688,91 @@
1.383
1.384
1.385
1.386 +/**
1.387 +This structure specifies the type and properties of the thread to be created. It
1.388 +is passed as a parameter to the RThread::Create() method.
1.389 +
1.390 +@publishedAll
1.391 +@released
1.392 +*/
1.393 +struct TThreadCreateInfo
1.394 + {
1.395 +public :
1.396 + /**
1.397 + Currently supported version numbers
1.398 + @internalComponent
1.399 + */
1.400 + enum TThreadCreateVersions
1.401 + {
1.402 + EVersion0,
1.403 + ESupportedVersions,
1.404 + };
1.405 +
1.406 + /**
1.407 + Attributes that specify whether the stack and heap of the thread to be created
1.408 + are data paged or not.
1.409 + */
1.410 + enum TThreadPagingAtt
1.411 + {
1.412 + EUnspecified, /**< The thread will use the creating process's paging attributes.*/
1.413 + EPaged, /**< The thread will data page its stack and heap.*/
1.414 + EUnpaged, /**< The thread will not data page its stack and heap.*/
1.415 + };
1.416 +
1.417 + friend class RThread;
1.418 +
1.419 + IMPORT_C TThreadCreateInfo( const TDesC &aName, TThreadFunction aFunction,
1.420 + TInt aStackSize, TAny* aPtr);
1.421 + IMPORT_C void SetCreateHeap(TInt aHeapMinSize, TInt aHeapMaxSize);
1.422 + IMPORT_C void SetUseHeap(const RAllocator* aHeap);
1.423 + IMPORT_C void SetOwner(const TOwnerType aOwner);
1.424 + IMPORT_C void SetPaging(const TThreadPagingAtt aPaging);
1.425 +
1.426 +protected:
1.427 + /** The version number of this TChunkCreateInfo.
1.428 + @internalComponent
1.429 + */
1.430 + TUint iVersionNumber;
1.431 + /** The Name to be given to the thread to be created
1.432 + @internalComponent
1.433 + */
1.434 + const TDesC* iName;
1.435 + /** The function this thread will execute.
1.436 + @internalComponent
1.437 + */
1.438 + TThreadFunction iFunction;
1.439 + /** The size of the stack of the thread to be created.
1.440 + @internalComponent
1.441 + */
1.442 + TInt iStackSize;
1.443 + /** The parameter to be passed to the function of the thread to be created.
1.444 + @internalComponent
1.445 + */
1.446 + TAny* iParameter;
1.447 + /** The owner of the thread to be created.
1.448 + @internalComponent
1.449 + */
1.450 + TOwnerType iOwner;
1.451 + /** The heap for the thread to be created to use.
1.452 + NULL if a new heap is to be created.
1.453 + @internalComponent
1.454 + */
1.455 + RAllocator* iHeap;
1.456 + /** Minimum size of any heap to be created for the thread.
1.457 + @internalComponent*/
1.458 + TInt iHeapMinSize;
1.459 + /** Maximum size of any heap to be created for the thread.
1.460 + @internalComponent
1.461 + */
1.462 + TInt iHeapMaxSize;
1.463 + /** The attributes of the thread
1.464 + @internalComponent
1.465 + */
1.466 + TUint iAttributes;
1.467 + /**@internalComponent*/
1.468 + TUint32 iSpare[6];
1.469 + };
1.470 +
1.471 class RProcess;
1.472
1.473
1.474 @@ -3636,6 +3790,7 @@
1.475 inline RThread();
1.476 IMPORT_C TInt Create(const TDesC& aName, TThreadFunction aFunction, TInt aStackSize, TInt aHeapMinSize, TInt aHeapMaxSize, TAny *aPtr, TOwnerType aType=EOwnerProcess);
1.477 IMPORT_C TInt Create(const TDesC& aName, TThreadFunction aFunction, TInt aStackSize, RAllocator* aHeap, TAny* aPtr, TOwnerType aType=EOwnerProcess);
1.478 + IMPORT_C TInt Create(const TThreadCreateInfo& aCreateInfo);
1.479 IMPORT_C TInt Open(const TDesC& aFullName, TOwnerType aType=EOwnerProcess);
1.480 IMPORT_C TInt Open(TThreadId aID, TOwnerType aType=EOwnerProcess);
1.481 IMPORT_C TThreadId Id() const;
1.482 @@ -3689,7 +3844,7 @@
1.483 @code
1.484 RThread& thread;
1.485 static _LIT_SECURITY_POLICY_S0(mySidPolicy, KRequiredSecureId);
1.486 - TInt error = mySidPolicy().CheckPolicy(thread);
1.487 + TBool pass = mySidPolicy().CheckPolicy(thread);
1.488 @endcode
1.489
1.490 This has the benefit that the TSecurityPolicy::CheckPolicy methods are
1.491 @@ -3723,7 +3878,7 @@
1.492 @code
1.493 RThread& thread;
1.494 static _LIT_SECURITY_POLICY_V0(myVidPolicy, KRequiredVendorId);
1.495 - TInt error = myVidPolicy().CheckPolicy(thread);
1.496 + TBool pass = myVidPolicy().CheckPolicy(thread);
1.497 @endcode
1.498
1.499 This has the benefit that the TSecurityPolicy::CheckPolicy methods are
1.500 @@ -3878,7 +4033,7 @@
1.501 IMPORT_C TInt ExitReason() const;
1.502 IMPORT_C TExitCategoryName ExitCategory() const;
1.503 IMPORT_C TProcessPriority Priority() const;
1.504 - IMPORT_C void SetPriority(TProcessPriority aPriority) const;
1.505 + IMPORT_C TInt SetPriority(TProcessPriority aPriority) const;
1.506 IMPORT_C TBool JustInTime() const;
1.507 IMPORT_C void SetJustInTime(TBool aBoolean) const;
1.508 IMPORT_C void Logon(TRequestStatus& aStatus) const;
1.509 @@ -3888,6 +4043,7 @@
1.510 IMPORT_C void Rendezvous(TRequestStatus& aStatus) const;
1.511 IMPORT_C TInt RendezvousCancel(TRequestStatus& aStatus) const;
1.512 IMPORT_C static void Rendezvous(TInt aReason);
1.513 + IMPORT_C TBool DefaultDataPaged() const;
1.514
1.515 /**
1.516 Return the Secure ID of the process.
1.517 @@ -3906,7 +4062,7 @@
1.518 @code
1.519 RProcess& process;
1.520 static _LIT_SECURITY_POLICY_S0(mySidPolicy, KRequiredSecureId);
1.521 - TInt error = mySidPolicy().CheckPolicy(process);
1.522 + TBool pass = mySidPolicy().CheckPolicy(process);
1.523 @endcode
1.524
1.525 This has the benefit that the TSecurityPolicy::CheckPolicy methods are
1.526 @@ -3940,7 +4096,7 @@
1.527 @code
1.528 RProcess& process;
1.529 static _LIT_SECURITY_POLICY_V0(myVidPolicy, KRequiredVendorId);
1.530 - TInt error = myVidPolicy().CheckPolicy(process);
1.531 + TBool pass = myVidPolicy().CheckPolicy(process);
1.532 @endcode
1.533
1.534 This has the benefit that the TSecurityPolicy::CheckPolicy methods are
1.535 @@ -4054,11 +4210,7 @@
1.536 */
1.537 IMPORT_C TInt DataCaging(TInt aState); // __DATA_CAGING__ __SECURE_API__ remove this
1.538
1.539 - /**
1.540 -
1.541 - CR0885
1.542 -
1.543 - */
1.544 +
1.545 IMPORT_C TInt CreateWithStackOverride(const TDesC& aFileName,const TDesC& aCommand, const TUidType &aUidType, TInt aMinStackSize, TOwnerType aType);
1.546
1.547 IMPORT_C static TAny* ExeExportData(void);
1.548 @@ -4087,6 +4239,7 @@
1.549 public:
1.550 IMPORT_C TInt CreateGlobal(const TDesC& aName);
1.551 IMPORT_C TInt CreateGlobal(const TDesC& aName, TInt aMode);
1.552 + IMPORT_C TInt CreateGlobal(const TDesC& aName, TInt aMode, TInt aRole, TInt aOpts);
1.553 IMPORT_C void Receive(RMessage2& aMessage,TRequestStatus& aStatus);
1.554 IMPORT_C void Receive(RMessage2& aMessage);
1.555 IMPORT_C void Cancel();
1.556 @@ -4385,62 +4538,6 @@
1.557 HBufC16* iCombinedBuffer;
1.558 };
1.559
1.560 -
1.561 -
1.562 -
1.563 -
1.564 -
1.565 -
1.566 -
1.567 -/**
1.568 -@internalAll
1.569 -*/
1.570 -const TInt KMediaPasswordNotifyUid(0x10004c00);
1.571 -
1.572 -/**
1.573 -@internalAll
1.574 -*/
1.575 -enum TMediaPswdNotifyExitMode {EMPEMUnlock, EMPEMCancel, EMPEMUnlockAndStore};
1.576 -
1.577 -/**
1.578 -@internalAll
1.579 -*/
1.580 -struct TMediaPswdNotifyBase
1.581 - {
1.582 - enum TCardType {ECTMmcPassword} iCT;
1.583 - TVersion iVersion;
1.584 - };
1.585 -
1.586 -/**
1.587 -@internalAll
1.588 -*/
1.589 -struct TMediaPswdSendNotifyInfoV1 : public TMediaPswdNotifyBase
1.590 - {
1.591 - // empty.
1.592 - };
1.593 -
1.594 -/**
1.595 -@internalAll
1.596 -*/
1.597 -struct TMediaPswdSendNotifyInfoV1Debug : public TMediaPswdSendNotifyInfoV1
1.598 - {
1.599 - TInt iSleepPeriod; // us, -ve means maximum range
1.600 - TMediaPswdNotifyExitMode iEM;
1.601 - TText8 iPW[KMaxMediaPassword];
1.602 - };
1.603 -
1.604 -/**
1.605 -@internalAll
1.606 -*/
1.607 -struct TMediaPswdReplyNotifyInfoV1 : public TMediaPswdNotifyBase
1.608 - {
1.609 - TText8 iPW[KMaxMediaPassword];
1.610 - TMediaPswdNotifyExitMode iEM;
1.611 - };
1.612 -
1.613 -
1.614 -
1.615 -
1.616 /**
1.617 @publishedAll
1.618 @released
1.619 @@ -4569,6 +4666,7 @@
1.620 IMPORT_C static void LeaveNoMemory();
1.621 IMPORT_C static TInt LeaveIfError(TInt aReason);
1.622 IMPORT_C static TAny* LeaveIfNull(TAny* aPtr);
1.623 + inline static const TAny* LeaveIfNull(const TAny* aPtr);
1.624 IMPORT_C static TTrapHandler* SetTrapHandler(TTrapHandler* aHandler);
1.625 IMPORT_C static TTrapHandler* TrapHandler();
1.626 IMPORT_C static TTrapHandler* MarkCleanupStack(); /**< @internalComponent */
1.627 @@ -4639,6 +4737,7 @@
1.628 IMPORT_C static TInt QuickSort(TInt aCount,const TKey& aKey,const TSwap& aSwap);
1.629 // Language-dependent character functions
1.630 IMPORT_C static TLanguage Language();
1.631 + IMPORT_C static TRegionCode RegionCode();
1.632 IMPORT_C static TUint Collate(TUint aChar);
1.633 IMPORT_C static TUint Fold(TUint aChar);
1.634 IMPORT_C static TUint LowerCase(TUint aChar);
1.635 @@ -4839,7 +4938,7 @@
1.636 - ERealtimeStateWarn - no action. However, if the kernel trace flag KREALTIME is enabled
1.637 then tracing will be emitted as if the thread state was ERealtimeStateOn.
1.638 @publishedPartner
1.639 - @prototype
1.640 + @released
1.641 */
1.642 enum TRealtimeState
1.643 {
1.644 @@ -4854,7 +4953,7 @@
1.645 @param aState The state
1.646 @return KErrNone if successful. KErrArgument if aState is invalid.
1.647 @publishedPartner
1.648 - @prototype
1.649 + @released
1.650 */
1.651 IMPORT_C static TInt SetRealtimeState(TRealtimeState aState);
1.652
1.653 @@ -5166,4 +5265,9 @@
1.654 // Inline methods
1.655 #include <e32std.inl>
1.656
1.657 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.658 +#include <e32std_private.h>
1.659 #endif
1.660 +
1.661 +#endif
1.662 +