mirror of
https://github.com/CloverHackyColor/CloverBootloader.git
synced 2024-12-25 16:37:42 +01:00
Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader
This commit is contained in:
commit
fc567c71c0
@ -145,7 +145,7 @@ void XObjArrayNC<TYPE>::Init()
|
||||
|
||||
/* Constructeur */
|
||||
template<class TYPE>
|
||||
XObjArray<TYPE>::XObjArray(const XObjArray<TYPE> &anObjArray)
|
||||
XObjArray<TYPE>::XObjArray(const XObjArray<TYPE> &anObjArray) : XObjArrayNC<TYPE>()
|
||||
{
|
||||
xsize ui;
|
||||
|
||||
|
@ -431,13 +431,25 @@ void XStringW::RemoveLastEspCtrl()
|
||||
|
||||
if ( size() > 0 ) {
|
||||
p = _data(0) + size() - 1;
|
||||
#if __WCHAR_MIN__ < 0
|
||||
if ( *p >= 0 && *p <= ' ' ) {
|
||||
#else
|
||||
if ( *p <= ' ' ) {
|
||||
#endif
|
||||
p -= 1;
|
||||
#if __WCHAR_MIN__ < 0
|
||||
while ( p>data() && *p >= 0 && *p <= ' ' ) p -= 1;
|
||||
#else
|
||||
while ( p>data() && *p <= ' ' ) p -= 1;
|
||||
#endif
|
||||
if ( p>data() ) {
|
||||
SetLength( (UINTN)(p-data())+1);
|
||||
}else{
|
||||
#if __WCHAR_MIN__ < 0
|
||||
if ( *p >= 0 && *p <= ' ' ) SetLength(0);
|
||||
#else
|
||||
if ( *p <= ' ' ) SetLength(0);
|
||||
#endif
|
||||
else SetLength(1);
|
||||
}
|
||||
}
|
||||
@ -573,7 +585,11 @@ XStringW CleanCtrl(const XStringW &S)
|
||||
UINTN i;
|
||||
|
||||
for ( i=0 ; i<S.size() ; i+=1 ) {
|
||||
if ( S.wc_str()[i] >=0 && S.wc_str()[i] < ' ' ) ReturnValue += 'x'; /* wchar_t are signed !!! */
|
||||
#if __WCHAR_MIN__ < 0
|
||||
if ( S.wc_str()[i] >=0 && S.wc_str()[i] < ' ' ) ReturnValue += 'x'; /* wchar_t are signed */
|
||||
#else
|
||||
if ( S.wc_str()[i] < ' ' ) ReturnValue += 'x'; /* wchar_t are unsigned */
|
||||
#endif
|
||||
else ReturnValue += S.wc_str()[i];
|
||||
}
|
||||
return ReturnValue;
|
||||
|
Loading…
Reference in New Issue
Block a user