Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 12:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NETSHELL] Remove erroneous DNS Server line and fix date/time format (#2655)

Browse source 
CORE-16947
This commit is contained in:
Kyle Katarn 2020-04-24 15:48:54 +02:00 committed by Stanislav Motylkov
parent 8266f62ff6
commit 02d856c9c5
1 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dll/shellext/netshell/lanstatusui.cpp
View file

@ -354,6 +354,43 @@ InsertItemToListView(
return -1; return -1;
} }
static
BOOL
tmToStr(
IN struct tm *pTM,
OUT LPWSTR szBuffer,
IN UINT nBufferSize)
{
SYSTEMTIME st;
CString strBufferDate;
CString strBufferTime;
UINT nCharDate, nCharTime;
BOOL bResult = FALSE;
st.wYear = pTM->tm_year + 1900;
st.wMonth = pTM->tm_mon + 1;
st.wDay = pTM->tm_mday;
st.wHour = pTM->tm_hour;
st.wMinute = pTM->tm_min;
st.wSecond = pTM->tm_sec;
/* Check required size before cpy/cat */
nCharDate = GetDateFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, NULL, 0) + 1;
nCharTime = GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, NULL, 0) + 1;
if (GetDateFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, strBufferDate.GetBuffer(nCharDate), nCharDate) &&
GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, strBufferTime.GetBuffer(nCharTime), nCharTime))
{
StringCbCopy(szBuffer, nBufferSize, strBufferDate);
StringCbCat(szBuffer, nBufferSize, L" ");
StringCbCat(szBuffer, nBufferSize, strBufferTime);
bResult = TRUE;
}
strBufferDate.ReleaseBuffer();
strBufferTime.ReleaseBuffer();
return bResult;
}
INT_PTR INT_PTR
CALLBACK CALLBACK
@ -454,7 +491,7 @@ LANStatusUiDetailsDlg(
leaseOptained = localtime(&pCurAdapter->LeaseObtained); leaseOptained = localtime(&pCurAdapter->LeaseObtained);
if (wcsftime(szBuffer, 100, L"%m/%d/%Y %H:%M:%S %p", leaseOptained) != 0) if (tmToStr(leaseOptained, szBuffer, _countof(szBuffer)))
SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
} }
@ -465,7 +502,7 @@ LANStatusUiDetailsDlg(
leaseExpire = localtime(&pCurAdapter->LeaseExpires); leaseExpire = localtime(&pCurAdapter->LeaseExpires);
if (wcsftime(szBuffer, 100, L"%m/%d/%Y %H:%M:%S %p", leaseExpire) != 0) if (tmToStr(leaseExpire, szBuffer, _countof(szBuffer)))
SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
} }
} }
@ -479,7 +516,6 @@ LANStatusUiDetailsDlg(
{ {
if (GetPerAdapterInfo(pContext->dwAdapterIndex, pPerAdapter, &dwSize) == ERROR_SUCCESS) if (GetPerAdapterInfo(pContext->dwAdapterIndex, pPerAdapter, &dwSize) == ERROR_SUCCESS)
{ {
li.iItem = InsertItemToListView(hDlgCtrl, IDS_DNS_SERVERS);
if (li.iItem >= 0) if (li.iItem >= 0)
AddIPAddressToListView(hDlgCtrl, &pPerAdapter->DnsServerList, li.iItem); AddIPAddressToListView(hDlgCtrl, &pPerAdapter->DnsServerList, li.iItem);
} }