Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 10:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TIMEDATE] Remove lpszSyncStatus member entirely (#2383)

Browse source 
And directly pass the formatted string to SetDlgItemTextW(). Addendum to 5a81a5b.
This commit is contained in:
Bișoc George 2020-02-24 16:59:11 +01:00 committed by GitHub
parent fe39760206
commit b77008a709
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dll/cpl/timedate/internettime.c
View file

@ -112,8 +112,7 @@ SetNTPServer(HWND hwnd, BOOL bBeginUpdate)
{ {
/* Inform the user that the synchronization is about to begin (depending on how reachable the NTP server is) */ /* Inform the user that the synchronization is about to begin (depending on how reachable the NTP server is) */
StringCchPrintfW(szFormat, _countof(szFormat), SyncStatus.szSyncWait, buffer); StringCchPrintfW(szFormat, _countof(szFormat), SyncStatus.szSyncWait, buffer);
SyncStatus.lpszSyncStatus = szFormat; SetDlgItemTextW(hwnd, IDC_SUCSYNC, szFormat);
SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.lpszSyncStatus);
} }
/* If there is new data entered then save it in the registry /* If there is new data entered then save it in the registry
@ -203,8 +202,7 @@ SyncNTPStatusInit(HWND hwnd)
* displaying the last time and date of the said sync. I have no idea how does timedate.cpl remember its last * displaying the last time and date of the said sync. I have no idea how does timedate.cpl remember its last
* successful sync so for the time being, we will only load the initial remark string. * successful sync so for the time being, we will only load the initial remark string.
*/ */
SyncStatus.lpszSyncStatus = SyncStatus.szSyncInit; SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.szSyncInit);
SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.lpszSyncStatus);
} }
static VOID static VOID
@ -244,16 +242,14 @@ UpdateNTPStatus(HWND hwnd, DWORD dwReason)
/* Format the resource sting with the given NTP server name and the current time data */ /* Format the resource sting with the given NTP server name and the current time data */
StringCchPrintfW(szFormat, _countof(szFormat), SyncStatus.szSyncSuc, szNtpServerName, szLocalDate, szLocalTime); StringCchPrintfW(szFormat, _countof(szFormat), SyncStatus.szSyncSuc, szNtpServerName, szLocalDate, szLocalTime);
SyncStatus.lpszSyncStatus = szFormat; SetDlgItemTextW(hwnd, IDC_SUCSYNC, szFormat);
SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.lpszSyncStatus);
break; break;
} }
/* Empty field data has been caught -- simply tell the user to write the NTP name to continue */ /* Empty field data has been caught -- simply tell the user to write the NTP name to continue */
case ERROR_INVALID_DATA: case ERROR_INVALID_DATA:
{ {
SyncStatus.lpszSyncStatus = SyncStatus.szSyncType; SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.szSyncType);
SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.lpszSyncStatus);
DPRINT("UpdateNTPStatus(): The user didn't submit any NTP server name!\n"); DPRINT("UpdateNTPStatus(): The user didn't submit any NTP server name!\n");
break; break;
} }
@ -262,8 +258,7 @@ UpdateNTPStatus(HWND hwnd, DWORD dwReason)
default: default:
{ {
StringCchPrintfW(szFormat, _countof(szFormat), SyncStatus.szSyncErr, szNtpServerName); StringCchPrintfW(szFormat, _countof(szFormat), SyncStatus.szSyncErr, szNtpServerName);
SyncStatus.lpszSyncStatus = szFormat; SetDlgItemTextW(hwnd, IDC_SUCSYNC, szFormat);
SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.lpszSyncStatus);
DPRINT("UpdateNTPStatus(): Failed to synchronize the time! (Error: %lu).\n", dwReason); DPRINT("UpdateNTPStatus(): Failed to synchronize the time! (Error: %lu).\n", dwReason);
break; break;
} }

1
dll/cpl/timedate/timedate.h
View file

@ -42,7 +42,6 @@ typedef struct
WCHAR szSyncErr[BUFSIZE]; WCHAR szSyncErr[BUFSIZE];
WCHAR szSyncType[BUFSIZE]; WCHAR szSyncType[BUFSIZE];
WCHAR szSyncInit[BUFSIZE]; WCHAR szSyncInit[BUFSIZE];
LPWSTR lpszSyncStatus;
} SYNC_STATUS, *PSYNC_STATUS; } SYNC_STATUS, *PSYNC_STATUS;
extern HINSTANCE hApplet; extern HINSTANCE hApplet;