* LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/rapps/loaddlg.cpp
* PURPOSE: Displaying a download dialog
- * COPYRIGHT: Copyright 2001 John R. Sheets (for CodeWeavers)
- * Copyright 2004 Mike McCormack (for CodeWeavers)
- * Copyright 2005 Ge van Geldorp (gvg@reactos.org)
- * Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org)
+ * COPYRIGHT: Copyright 2001 John R. Sheets (for CodeWeavers)
+ * Copyright 2004 Mike McCormack (for CodeWeavers)
+ * Copyright 2005 Ge van Geldorp (gvg@reactos.org)
+ * Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org)
* Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com)
+ * Copyright 2017 Alexander Shaposhnikov (chaez.san@gmail.com)
*/
+
/*
* Based on Wine dlls/shdocvw/shdocvw_main.c
*
HWND m_hDialog;
PBOOL m_pbCancelled;
BOOL m_UrlHasBeenCopied;
- WCHAR m_ProgressText[MAX_PATH];
-
public:
~CDownloadDialog()
{
DestroyWindow(m_hDialog);
}
-
+
HRESULT Initialize(HWND Dlg, BOOL *pbCancelled)
{
m_hDialog = Dlg;
{
WCHAR szProgress[100];
WCHAR szProgressMax[100];
- UINT uiPercentage = ((ULONGLONG)ulProgress * 100) / ulProgressMax;
+ UINT uiPercentage = ((ULONGLONG) ulProgress * 100) / ulProgressMax;
/* send the current progress to the progress bar */
SendMessageW(Item, PBM_SETPOS, uiPercentage, 0);
StrFormatByteSizeW(ulProgressMax, szProgressMax, _countof(szProgressMax));
/* ...and post all of it to our subclassed progress bar text subroutine */
- StringCbPrintfW(m_ProgressText,
- sizeof(m_ProgressText),
- L"%u%% \x2014 %ls / %ls",
- uiPercentage,
- szProgress,
- szProgressMax);
- SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)m_ProgressText);
+ ATL::CStringW m_ProgressText;
+ m_ProgressText.Format(L"%u%% \x2014 %ls / %ls",
+ uiPercentage,
+ szProgress,
+ szProgressMax);
+ SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) m_ProgressText.GetBuffer());
+ m_ProgressText.ReleaseBuffer();
}
Item = GetDlgItem(m_hDialog, IDC_DOWNLOAD_STATUS);
if (Item && szStatusText && wcslen(szStatusText) > 0 && m_UrlHasBeenCopied == FALSE)
{
DWORD len = wcslen(szStatusText) + 1;
- PWSTR buf = (PWSTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR));
+ ATL::CStringW buf;
- if (buf)
+ /* beautify our url for display purposes */
+ if (!InternetCanonicalizeUrlW(szStatusText, buf.GetBuffer(len), &len, ICU_DECODE | ICU_NO_ENCODE))
{
- /* beautify our url for display purposes */
- InternetCanonicalizeUrl(szStatusText, buf, &len, ICU_DECODE | ICU_NO_ENCODE);
+ /* just use the original */
+ buf.ReleaseBuffer();
+ buf = szStatusText;
}
else
{
- /* just use the original */
- buf = (PWSTR)szStatusText;
+ buf.ReleaseBuffer();
}
/* paste it into our dialog and don't do it again in this instance */
- SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)buf);
+ SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) buf.GetBuffer());
+ buf.ReleaseBuffer();
m_UrlHasBeenCopied = TRUE;
-
- if (buf != szStatusText)
- {
- HeapFree(GetProcessHeap(), 0, buf);
- }
}
SetLastError(0);
LocalFree(certInfo.lpszEncryptionAlgName);
if (certInfo.lpszIssuerInfo)
{
- if (strcmp((LPSTR)certInfo.lpszIssuerInfo, CERT_ISSUER_INFO) != 0)
+ if (strcmp((LPSTR) certInfo.lpszIssuerInfo, CERT_ISSUER_INFO) != 0)
Ret = FALSE;
LocalFree(certInfo.lpszIssuerInfo);
}
LocalFree(certInfo.lpszSignatureAlgName);
if (certInfo.lpszSubjectInfo)
{
- if (strcmp((LPSTR)certInfo.lpszSubjectInfo, CERT_SUBJECT_INFO) != 0)
+ if (strcmp((LPSTR) certInfo.lpszSubjectInfo, CERT_SUBJECT_INFO) != 0)
Ret = FALSE;
LocalFree(certInfo.lpszSubjectInfo);
}
}
#endif
+inline VOID
+MessageBox_LoadString(HWND hMainWnd, INT StringID)
+{
+ ATL::CString szMsgText;
+ if (szMsgText.LoadStringW(hInst, StringID))
+ MessageBoxW(hMainWnd, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR);
+}
static
DWORD WINAPI
ThreadFunc(LPVOID Context)
{
CComPtr<IBindStatusCallback> dl;
- WCHAR path[MAX_PATH];
+ ATL::CStringW Path;
PWSTR p, q;
HWND Dlg = (HWND) Context;
ULONG dwContentLen, dwBytesWritten, dwBytesRead, dwStatus;
HINTERNET hFile = NULL;
HANDLE hOut = INVALID_HANDLE_VALUE;
unsigned char lpBuffer[4096];
- PCWSTR lpszAgent = L"RApps/1.0";
+ LPCWSTR lpszAgent = L"RApps/1.0";
URL_COMPONENTS urlComponents;
size_t urlLength, filenameLength;
/* build the path for the download */
p = wcsrchr(AppInfo->szUrlDownload, L'/');
q = wcsrchr(AppInfo->szUrlDownload, L'?');
-
+
/* do we have a final slash separator? */
if (!p)
goto end;
filenameLength -= wcslen(q - 1) * sizeof(WCHAR);
/* is this URL an update package for RAPPS? if so store it in a different place */
- if (wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0)
+ if (AppInfo->szUrlDownload == APPLICATION_DATABASE_URL)
{
bCab = TRUE;
- if (!GetStorageDirectory(path, _countof(path)))
+ if (!GetStorageDirectory(Path))
goto end;
}
else
{
- if (FAILED(StringCbCopyW(path, sizeof(path), SettingsInfo.szDownloadDir)))
- goto end;
+ Path = SettingsInfo.szDownloadDir;
}
/* is the path valid? can we access it? */
- if (GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES)
+ if (GetFileAttributesW(Path.GetString()) == INVALID_FILE_ATTRIBUTES)
{
- if (!CreateDirectoryW(path, NULL))
+ if (!CreateDirectoryW(Path.GetString(), NULL))
goto end;
}
/* append a \ to the provided file system path, and the filename portion from the URL after that */
- if (FAILED(StringCbCatW(path, sizeof(path), L"\\")))
- goto end;
- if (FAILED(StringCbCatNW(path, sizeof(path), p + 1, filenameLength)))
- goto end;
+ Path.Format(L"\\%ls", (p + 1));
- if (!bCab && AppInfo->szSHA1[0] != 0 && GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES)
+ if (!bCab && AppInfo->szSHA1[0] && GetFileAttributesW(Path.GetString()) != INVALID_FILE_ATTRIBUTES)
{
/* only open it in case of total correctness */
- if (VerifyInteg(AppInfo->szSHA1, path))
+ if (VerifyInteg(AppInfo->szSHA1, Path))
goto run;
}
goto end;
/* FIXME: this should just be using the system-wide proxy settings */
- switch(SettingsInfo.Proxy)
+ switch (SettingsInfo.Proxy)
{
- case 0: /* preconfig */
- hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
- break;
- case 1: /* direct (no proxy) */
- hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0);
- break;
- case 2: /* use proxy */
- hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PROXY, SettingsInfo.szProxyServer, SettingsInfo.szNoProxyFor, 0);
- break;
- default: /* preconfig */
- hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
- break;
+ case 0: /* preconfig */
+ hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
+ break;
+ case 1: /* direct (no proxy) */
+ hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0);
+ break;
+ case 2: /* use proxy */
+ hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PROXY, SettingsInfo.szProxyServer, SettingsInfo.szNoProxyFor, 0);
+ break;
+ default: /* preconfig */
+ hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
+ break;
}
if (!hOpen)
goto end;
- hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE|INTERNET_FLAG_KEEP_CONNECTION, 0);
+ hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, 0);
if (!hFile)
{
- WCHAR szMsgText[MAX_STR_LEN];
-
- if (!LoadStringW(hInst, IDS_UNABLE_TO_DOWNLOAD2, szMsgText, _countof(szMsgText)))
- goto end;
-
- MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR);
+ MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2);
goto end;
}
if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL))
goto end;
- if(dwStatus != HTTP_STATUS_OK)
+ if (dwStatus != HTTP_STATUS_OK)
{
- WCHAR szMsgText[MAX_STR_LEN];
-
- if (!LoadStringW(hInst, IDS_UNABLE_TO_DOWNLOAD, szMsgText, _countof(szMsgText)))
- goto end;
-
- MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR);
+ MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD);
goto end;
}
memset(&urlComponents, 0, sizeof(urlComponents));
urlComponents.dwStructSize = sizeof(urlComponents);
- if(FAILED(StringCbLengthW(AppInfo->szUrlDownload, sizeof(AppInfo->szUrlDownload), &urlLength)))
+ if (FAILED(StringCbLengthW(AppInfo->szUrlDownload, sizeof(AppInfo->szUrlDownload), &urlLength)))
goto end;
urlLength /= sizeof(WCHAR);
urlComponents.dwSchemeLength = urlLength + 1;
- urlComponents.lpszScheme = (LPWSTR)malloc(urlComponents.dwSchemeLength * sizeof(WCHAR));
+ urlComponents.lpszScheme = (LPWSTR) malloc(urlComponents.dwSchemeLength * sizeof(WCHAR));
urlComponents.dwHostNameLength = urlLength + 1;
- urlComponents.lpszHostName = (LPWSTR)malloc(urlComponents.dwHostNameLength * sizeof(WCHAR));
+ urlComponents.lpszHostName = (LPWSTR) malloc(urlComponents.dwHostNameLength * sizeof(WCHAR));
- if(!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength+1, ICU_DECODE | ICU_ESCAPE, &urlComponents))
+ if (!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength + 1, ICU_DECODE | ICU_ESCAPE, &urlComponents))
goto end;
-
- if(urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS)
+
+ if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS)
HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatus, 0);
- if(urlComponents.nScheme == INTERNET_SCHEME_FTP)
+ if (urlComponents.nScheme == INTERNET_SCHEME_FTP)
dwContentLen = FtpGetFileSize(hFile, &dwStatus);
#ifdef USE_CERT_PINNING
(wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) &&
(!CertIsValid(hOpen, urlComponents.lpszHostName)))
{
- WCHAR szMsgText[MAX_STR_LEN];
-
- if (!LoadStringW(hInst, IDS_CERT_DOES_NOT_MATCH, szMsgText, _countof(szMsgText)))
- goto end;
-
- MessageBoxW(Dlg, szMsgText, NULL, MB_OK | MB_ICONERROR);
+ MessageBox_LoadString(hMainWnd, IDS_CERT_DOES_NOT_MATCH);
goto end;
}
#endif
free(urlComponents.lpszScheme);
free(urlComponents.lpszHostName);
- hOut = CreateFileW(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL);
+ hOut = CreateFileW(Path.GetString(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL);
if (hOut == INVALID_HANDLE_VALUE)
goto end;
{
if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead))
{
- WCHAR szMsgText[MAX_STR_LEN];
-
- if (!LoadStringW(hInst, IDS_INTERRUPTED_DOWNLOAD, szMsgText, _countof(szMsgText)))
- goto end;
-
- MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR);
+ MessageBox_LoadString(hMainWnd, IDS_INTERRUPTED_DOWNLOAD);
goto end;
}
+
if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL))
{
- WCHAR szMsgText[MAX_STR_LEN];
-
- if (!LoadStringW(hInst, IDS_UNABLE_TO_WRITE, szMsgText, _countof(szMsgText)))
- goto end;
-
- MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR);
+ MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_WRITE);
goto end;
}
+
dwCurrentBytesRead += dwBytesRead;
dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, AppInfo->szUrlDownload);
- }
- while (dwBytesRead && !bCancelled);
+ } while (dwBytesRead && !bCancelled);
CloseHandle(hOut);
hOut = INVALID_HANDLE_VALUE;
verify its integrity by using the native advapi32.A_SHA1 functions */
if (!bCab && AppInfo->szSHA1[0] != 0)
{
- WCHAR szMsgText[MAX_STR_LEN];
+ ATL::CStringW szMsgText;
/* change a few strings in the download dialog to reflect the verification process */
- LoadStringW(hInst, IDS_INTEG_CHECK_TITLE, szMsgText, _countof(szMsgText));
+ if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_TITLE))
+ goto end;
- SetWindowText(Dlg, szMsgText);
- SendMessageW(GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM)path);
+ SetWindowText(Dlg, szMsgText.GetString());
+ SendMessageW(GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM) Path.GetBuffer());
+ Path.ReleaseBuffer();
/* this may take a while, depending on the file size */
- if (!VerifyInteg(AppInfo->szSHA1, path))
+ if (!VerifyInteg(AppInfo->szSHA1, Path.GetString()))
{
- if (!LoadStringW(hInst, IDS_INTEG_CHECK_FAIL, szMsgText, _countof(szMsgText)))
+ if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_FAIL))
goto end;
- MessageBoxW(Dlg, szMsgText, NULL, MB_OK | MB_ICONERROR);
+ MessageBoxW(Dlg, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR);
goto end;
}
}
run:
/* run it */
if (!bCab)
- ShellExecuteW( NULL, L"open", path, NULL, NULL, SW_SHOWNORMAL );
+ ShellExecuteW(NULL, L"open", Path.GetString(), NULL, NULL, SW_SHOWNORMAL);
end:
if (hOut != INVALID_HANDLE_VALUE)
if (bTempfile)
{
if (bCancelled || (SettingsInfo.bDelInstaller && !bCab))
- DeleteFileW(path);
+ DeleteFileW(Path.GetString());
}
EndDialog(Dlg, 0);
LRESULT CALLBACK
DownloadProgressProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData)
{
- static WCHAR szProgressText[MAX_STR_LEN] = {0};
+ static ATL::CStringW szProgressText;
switch (uMsg)
{
- case WM_SETTEXT:
+ case WM_SETTEXT:
+ {
+ if (lParam)
{
- if (lParam)
- {
- StringCbCopyW(szProgressText,
- sizeof(szProgressText),
- (PCWSTR)lParam);
- }
- return TRUE;
+ szProgressText = (PCWSTR) lParam;
}
+ return TRUE;
+ }
- case WM_ERASEBKGND:
- case WM_PAINT:
- {
- PAINTSTRUCT ps;
- HDC hDC = BeginPaint(hWnd, &ps), hdcMem;
- HBITMAP hbmMem;
- HANDLE hOld;
- RECT myRect;
- UINT win_width, win_height;
-
- GetClientRect(hWnd, &myRect);
-
- /* grab the progress bar rect size */
- win_width = myRect.right - myRect.left;
- win_height = myRect.bottom - myRect.top;
-
- /* create an off-screen DC for double-buffering */
- hdcMem = CreateCompatibleDC(hDC);
- hbmMem = CreateCompatibleBitmap(hDC, win_width, win_height);
-
- hOld = SelectObject(hdcMem, hbmMem);
-
- /* call the original draw code and redirect it to our memory buffer */
- DefSubclassProc(hWnd, uMsg, (WPARAM)hdcMem, lParam);
-
- /* draw our nifty progress text over it */
- SelectFont(hdcMem, GetStockFont(DEFAULT_GUI_FONT));
- DrawShadowText(hdcMem, szProgressText, wcslen(szProgressText),
- &myRect,
- DT_CENTER | DT_VCENTER | DT_NOPREFIX | DT_SINGLELINE,
- GetSysColor(COLOR_CAPTIONTEXT),
- GetSysColor(COLOR_3DSHADOW),
- 1, 1);
-
- /* transfer the off-screen DC to the screen */
- BitBlt(hDC, 0, 0, win_width, win_height, hdcMem, 0, 0, SRCCOPY);
-
- /* free the off-screen DC */
- SelectObject(hdcMem, hOld);
- DeleteObject(hbmMem);
- DeleteDC(hdcMem);
-
- EndPaint(hWnd, &ps);
- return 0;
- }
+ case WM_ERASEBKGND:
+ case WM_PAINT:
+ {
+ PAINTSTRUCT ps;
+ HDC hDC = BeginPaint(hWnd, &ps), hdcMem;
+ HBITMAP hbmMem;
+ HANDLE hOld;
+ RECT myRect;
+ UINT win_width, win_height;
+
+ GetClientRect(hWnd, &myRect);
+
+ /* grab the progress bar rect size */
+ win_width = myRect.right - myRect.left;
+ win_height = myRect.bottom - myRect.top;
+
+ /* create an off-screen DC for double-buffering */
+ hdcMem = CreateCompatibleDC(hDC);
+ hbmMem = CreateCompatibleBitmap(hDC, win_width, win_height);
+
+ hOld = SelectObject(hdcMem, hbmMem);
+
+ /* call the original draw code and redirect it to our memory buffer */
+ DefSubclassProc(hWnd, uMsg, (WPARAM) hdcMem, lParam);
+
+ /* draw our nifty progress text over it */
+ SelectFont(hdcMem, GetStockFont(DEFAULT_GUI_FONT));
+ DrawShadowText(hdcMem, szProgressText.GetString(), szProgressText.GetLength(),
+ &myRect,
+ DT_CENTER | DT_VCENTER | DT_NOPREFIX | DT_SINGLELINE,
+ GetSysColor(COLOR_CAPTIONTEXT),
+ GetSysColor(COLOR_3DSHADOW),
+ 1, 1);
+
+ /* transfer the off-screen DC to the screen */
+ BitBlt(hDC, 0, 0, win_width, win_height, hdcMem, 0, 0, SRCCOPY);
+
+ /* free the off-screen DC */
+ SelectObject(hdcMem, hOld);
+ DeleteObject(hbmMem);
+ DeleteDC(hdcMem);
+
+ EndPaint(hWnd, &ps);
+ return 0;
+ }
- /* Raymond Chen says that we should safely unsubclass all the things!
- (http://blogs.msdn.com/b/oldnewthing/archive/2003/11/11/55653.aspx) */
- case WM_NCDESTROY:
- {
- ZeroMemory(szProgressText, sizeof(szProgressText));
- RemoveWindowSubclass(hWnd, DownloadProgressProc, uIdSubclass);
- }
- /* Fall-through */
- default:
- return DefSubclassProc(hWnd, uMsg, wParam, lParam);
+ /* Raymond Chen says that we should safely unsubclass all the things!
+ (http://blogs.msdn.com/b/oldnewthing/archive/2003/11/11/55653.aspx) */
+ case WM_NCDESTROY:
+ {
+ szProgressText.Empty();
+ RemoveWindowSubclass(hWnd, DownloadProgressProc, uIdSubclass);
+ }
+ /* Fall-through */
+ default:
+ return DefSubclassProc(hWnd, uMsg, wParam, lParam);
}
}
switch (uMsg)
{
- case WM_INITDIALOG:
- {
- HICON hIconSm = NULL, hIconBg = NULL;
+ case WM_INITDIALOG:
+ {
+ HICON hIconSm = NULL, hIconBg = NULL;
- hIconBg = (HICON)GetClassLongPtr(hMainWnd, GCLP_HICON);
- hIconSm = (HICON)GetClassLongPtr(hMainWnd, GCLP_HICONSM);
+ hIconBg = (HICON) GetClassLongPtr(hMainWnd, GCLP_HICON);
+ hIconSm = (HICON) GetClassLongPtr(hMainWnd, GCLP_HICONSM);
- if (hIconBg && hIconSm)
- {
- SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIconBg);
- SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSm);
- }
+ if (hIconBg && hIconSm)
+ {
+ SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIconBg);
+ SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSm);
+ }
- SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0);
- Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS);
- if (Item)
- {
- /* initialize the default values for our nifty progress bar
- and subclass it so that it learns to print a status text */
- SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0, 100));
- SendMessageW(Item, PBM_SETPOS, 0, 0);
+ SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0);
+ Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS);
+ if (Item)
+ {
+ /* initialize the default values for our nifty progress bar
+ and subclass it so that it learns to print a status text */
+ SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0, 100));
+ SendMessageW(Item, PBM_SETPOS, 0, 0);
- SetWindowSubclass(Item, DownloadProgressProc, 0, 0);
- }
+ SetWindowSubclass(Item, DownloadProgressProc, 0, 0);
+ }
- /* add a neat placeholder until the download URL is retrieved */
- Item = GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS);
- SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)L"\x2022 \x2022 \x2022");
+ /* add a neat placeholder until the download URL is retrieved */
+ Item = GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS);
+ SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) L"\x2022 \x2022 \x2022");
- Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId);
- if (!Thread)
- return FALSE;
- CloseHandle(Thread);
- return TRUE;
- }
- case WM_COMMAND:
- if (wParam == IDCANCEL)
- {
- SetWindowLongPtrW(Dlg, GWLP_USERDATA, 1);
- PostMessageW(Dlg, WM_CLOSE, 0, 0);
- }
+ Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId);
+ if (!Thread)
return FALSE;
+ CloseHandle(Thread);
+ return TRUE;
+ }
+ case WM_COMMAND:
+ if (wParam == IDCANCEL)
+ {
+ SetWindowLongPtrW(Dlg, GWLP_USERDATA, 1);
+ PostMessageW(Dlg, WM_CLOSE, 0, 0);
+ }
+ return FALSE;
- case WM_CLOSE:
- EndDialog(Dlg, 0);
- return TRUE;
+ case WM_CLOSE:
+ EndDialog(Dlg, 0);
+ return TRUE;
- default:
- return FALSE;
+ default:
+ return FALSE;
}
}
return FALSE;
AppInfo = (PAPPLICATION_INFO) ListViewGetlParam(Index);
- if (!AppInfo) return FALSE;
+ if (!AppInfo)
+ return FALSE;
- WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_INSTALL, AppInfo->szName);
+ WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_INSTALL, AppInfo->szName.GetString());
DialogBoxW(hInst,
MAKEINTRESOURCEW(IDD_DOWNLOAD_DIALOG),
DownloadApplicationsDB(LPCWSTR lpUrl)
{
APPLICATION_INFO IntInfo;
-
- ZeroMemory(&IntInfo, sizeof(IntInfo));
- if (FAILED(StringCbCopyW(IntInfo.szUrlDownload,
- sizeof(IntInfo.szUrlDownload),
- lpUrl)))
- {
- return;
- }
+ IntInfo.szUrlDownload = lpUrl;
AppInfo = &IntInfo;
hMainWnd,
DownloadDlgProc);
}
-
projects / reactos.git / blobdiff