Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSCONFIG_NEW]

Browse source 
Reduce indentation level in code.

svn path=/trunk/; revision=69637
This commit is contained in:
Hermès Bélusca-Maïto 2015-10-21 23:36:17 +00:00
parent 9de150d140
commit 0e3bf63096
2 changed files with 105 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
reactos/base/applications/msconfig_new/stringutils.c
View file

@ -15,15 +15,17 @@
//
LPTSTR FormatStringV(LPCTSTR str, va_list args)
{
LPTSTR lpszString = NULL;
LPTSTR lpszString;
size_t strLenPlusNull;
if (str)
{
size_t strLenPlusNull = _vsctprintf(str, args) + 1;
lpszString = (LPTSTR)MemAlloc(0, strLenPlusNull * sizeof(TCHAR));
if (lpszString)
StringCchVPrintf(lpszString, strLenPlusNull, str, args);
}
if (!str) return NULL;
strLenPlusNull = _vsctprintf(str, args) + 1;
lpszString = (LPTSTR)MemAlloc(0, strLenPlusNull * sizeof(TCHAR));
if (!lpszString) return NULL;
StringCchVPrintf(lpszString, strLenPlusNull, str, args);
return lpszString;
}
@ -45,114 +47,112 @@ LPTSTR FormatString(LPCTSTR str, ...)
//
LPSTR UnicodeToAnsi(LPCWSTR strW)
{
LPSTR strA = NULL;
LPSTR strA;
int iNeededChars;
if (strW)
{
int iNeededChars = WideCharToMultiByte(CP_ACP,
WC_COMPOSITECHECK /* | WC_NO_BEST_FIT_CHARS */,
strW, -1, NULL, 0, NULL, NULL);
if (!strW) return NULL;
strA = (LPSTR)MemAlloc(0, iNeededChars * sizeof(CHAR));
if (strA)
{
WideCharToMultiByte(CP_ACP,
WC_COMPOSITECHECK /* | WC_NO_BEST_FIT_CHARS */,
strW, -1, strA, iNeededChars, NULL, NULL);
}
}
iNeededChars = WideCharToMultiByte(CP_ACP,
WC_COMPOSITECHECK /* | WC_NO_BEST_FIT_CHARS */,
strW, -1, NULL, 0, NULL, NULL);
strA = (LPSTR)MemAlloc(0, iNeededChars * sizeof(CHAR));
if (!strA) return NULL;
WideCharToMultiByte(CP_ACP,
WC_COMPOSITECHECK /* | WC_NO_BEST_FIT_CHARS */,
strW, -1, strA, iNeededChars, NULL, NULL);
return strA;
}
LPWSTR AnsiToUnicode(LPCSTR strA)
{
LPWSTR strW = NULL;
LPWSTR strW;
int iNeededChars;
if (strA)
{
int iNeededChars = MultiByteToWideChar(CP_ACP,
MB_PRECOMPOSED,
strA, -1, NULL, 0);
if (!strA) return NULL;
strW = (LPWSTR)MemAlloc(0, iNeededChars * sizeof(WCHAR));
if (strW)
{
MultiByteToWideChar(CP_ACP,
MB_PRECOMPOSED,
strA, -1, strW, iNeededChars);
}
}
iNeededChars = MultiByteToWideChar(CP_ACP,
MB_PRECOMPOSED,
strA, -1, NULL, 0);
strW = (LPWSTR)MemAlloc(0, iNeededChars * sizeof(WCHAR));
if (!strW) return NULL;
MultiByteToWideChar(CP_ACP,
MB_PRECOMPOSED,
strA, -1, strW, iNeededChars);
return strW;
}
LPSTR DuplicateStringA(LPCSTR str)
{
LPSTR dupStr = NULL;
LPSTR dupStr;
size_t strSizePlusNull;
if (str)
{
size_t strSizePlusNull = strlen(str) + 1;
if (!str) return NULL;
dupStr = (LPSTR)MemAlloc(0, strSizePlusNull * sizeof(CHAR));
if (dupStr)
StringCchCopyA(dupStr, strSizePlusNull, str);
}
strSizePlusNull = strlen(str) + 1;
dupStr = (LPSTR)MemAlloc(0, strSizePlusNull * sizeof(CHAR));
if (!dupStr) return NULL;
StringCchCopyA(dupStr, strSizePlusNull, str);
return dupStr;
}
LPWSTR DuplicateStringW(LPCWSTR str)
{
LPWSTR dupStr = NULL;
LPWSTR dupStr;
size_t strSizePlusNull;
if (str)
{
size_t strSizePlusNull = wcslen(str) + 1;
if (!str) return NULL;
dupStr = (LPWSTR)MemAlloc(0, strSizePlusNull * sizeof(WCHAR));
if (dupStr)
StringCchCopyW(dupStr, strSizePlusNull, str);
}
strSizePlusNull = wcslen(str) + 1;
dupStr = (LPWSTR)MemAlloc(0, strSizePlusNull * sizeof(WCHAR));
if (!dupStr) return NULL;
StringCchCopyW(dupStr, strSizePlusNull, str);
return dupStr;
}
LPSTR DuplicateStringAEx(LPCSTR str, size_t numOfChars)
{
LPSTR dupStr = NULL;
LPSTR dupStr;
size_t strSize;
if (str)
{
size_t strSize = min(strlen(str), numOfChars);
if (!str) return NULL;
dupStr = (LPSTR)MemAlloc(0, (strSize + 1) * sizeof(CHAR));
if (dupStr)
{
StringCchCopyNA(dupStr, strSize + 1, str, strSize);
dupStr[strSize] = '\0';
}
}
strSize = min(strlen(str), numOfChars);
dupStr = (LPSTR)MemAlloc(0, (strSize + 1) * sizeof(CHAR));
if (!dupStr) return NULL;
StringCchCopyNA(dupStr, strSize + 1, str, strSize);
dupStr[strSize] = '\0';
return dupStr;
}
LPWSTR DuplicateStringWEx(LPCWSTR str, size_t numOfChars)
{
LPWSTR dupStr = NULL;
LPWSTR dupStr;
size_t strSize;
if (str)
{
size_t strSize = min(wcslen(str), numOfChars);
if (!str) return NULL;
dupStr = (LPWSTR)MemAlloc(0, (strSize + 1) * sizeof(WCHAR));
if (dupStr)
{
StringCchCopyNW(dupStr, strSize + 1, str, strSize);
dupStr[strSize] = L'\0';
}
}
strSize = min(wcslen(str), numOfChars);
dupStr = (LPWSTR)MemAlloc(0, (strSize + 1) * sizeof(WCHAR));
if (!dupStr) return NULL;
StringCchCopyNW(dupStr, strSize + 1, str, strSize);
dupStr[strSize] = L'\0';
return dupStr;
}

64
reactos/base/applications/msconfig_new/utils.c
View file

@ -41,42 +41,40 @@ LPWSTR
FormatDateTime(IN LPSYSTEMTIME pDateTime)
{
LPWSTR lpszDateTime = NULL;
int iDateBufSize, iTimeBufSize;
if (pDateTime)
if (pDateTime == NULL) return NULL;
iDateBufSize = GetDateFormatW(LOCALE_USER_DEFAULT,
/* Only for Windows 7 : DATE_AUTOLAYOUT | */ DATE_SHORTDATE,
pDateTime,
NULL,
NULL,
0);
iTimeBufSize = GetTimeFormatW(LOCALE_USER_DEFAULT,
0,
pDateTime,
NULL,
NULL,
0);
if ( (iDateBufSize > 0) && (iTimeBufSize > 0) )
{
int iDateBufSize = 0, iTimeBufSize = 0;
lpszDateTime = (LPWSTR)MemAlloc(0, (iDateBufSize + iTimeBufSize) * sizeof(TCHAR));
iDateBufSize = GetDateFormatW(LOCALE_USER_DEFAULT,
/* Only for Windows 7 : DATE_AUTOLAYOUT | */ DATE_SHORTDATE,
pDateTime,
NULL,
NULL,
0);
iTimeBufSize = GetTimeFormatW(LOCALE_USER_DEFAULT,
0,
pDateTime,
NULL,
NULL,
0);
if ( (iDateBufSize > 0) && (iTimeBufSize > 0) )
{
lpszDateTime = (LPWSTR)MemAlloc(0, (iDateBufSize + iTimeBufSize) * sizeof(TCHAR));
GetDateFormatW(LOCALE_USER_DEFAULT,
/* Only for Windows 7 : DATE_AUTOLAYOUT | */ DATE_SHORTDATE,
pDateTime,
NULL,
lpszDateTime,
iDateBufSize);
if (iDateBufSize > 0) lpszDateTime[iDateBufSize-1] = L' ';
GetTimeFormatW(LOCALE_USER_DEFAULT,
0,
pDateTime,
NULL,
lpszDateTime + iDateBufSize,
iTimeBufSize);
}
GetDateFormatW(LOCALE_USER_DEFAULT,
/* Only for Windows 7 : DATE_AUTOLAYOUT | */ DATE_SHORTDATE,
pDateTime,
NULL,
lpszDateTime,
iDateBufSize);
if (iDateBufSize > 0) lpszDateTime[iDateBufSize-1] = L' ';
GetTimeFormatW(LOCALE_USER_DEFAULT,
0,
pDateTime,
NULL,
lpszDateTime + iDateBufSize,
iTimeBufSize);
}
return lpszDateTime;