Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 17:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELLEXT][ZIPFLDR] Use CStringA::FormatMessage (#2287)

Browse source 
Simplify our code.
This commit is contained in:
Katayama Hirofumi MZ 2020-01-30 08:32:21 +09:00 committed by GitHub
parent cd3c1e94ff
commit 9c5017808a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dll/shellext/zipfldr/CConfirmReplace.cpp
View file

@ -25,21 +25,11 @@ public:
HICON hIcon = LoadIcon(NULL, IDI_EXCLAMATION); HICON hIcon = LoadIcon(NULL, IDI_EXCLAMATION);
SendDlgItemMessage(IDC_EXCLAMATION_ICON, STM_SETICON, (WPARAM)hIcon); SendDlgItemMessage(IDC_EXCLAMATION_ICON, STM_SETICON, (WPARAM)hIcon);
/* Our CString does not support FormatMessage yet */ CStringA message;
CStringA message(MAKEINTRESOURCE(IDS_OVERWRITEFILE_TEXT)); message.FormatMessage(IDS_OVERWRITEFILE_TEXT, m_Filename.GetString());
CHeapPtr<CHAR, CLocalAllocator> formatted; ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, message);
DWORD_PTR args[2] = return TRUE;
{
(DWORD_PTR)m_Filename.GetString(),
NULL
};
::FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY,
message, 0, 0, (LPSTR)&formatted, 0, (va_list*)args);
::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, formatted);
return 0;
} }
LRESULT OnButton(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) LRESULT OnButton(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)

17
dll/shellext/zipfldr/CZipPassword.cpp
View file

@ -33,20 +33,9 @@ public:
} }
else else
{ {
/* Our CString does not support FormatMessage yet */ CStringA message;
CStringA message(MAKEINTRESOURCE(IDS_PASSWORD_FILE_TEXT)); message.FormatMessage(IDS_PASSWORD_FILE_TEXT, m_Filename.GetString());
CHeapPtr<CHAR, CLocalAllocator> formatted; ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, message);
DWORD_PTR args[2] =
{
(DWORD_PTR)m_Filename.GetString(),
NULL
};
::FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY,
message, 0, 0, (LPSTR)&formatted, 0, (va_list*)args);
::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, formatted);
} }
return TRUE; return TRUE;
} }