From 280ec3999735add7ee5a8391ea6a9515f7525db9 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 6 Dec 2010 19:25:01 +0100 Subject: [PATCH] appwiz.cpl: Added Gecko installer based on mshtml code. --- dlls/appwiz.cpl/En.rc | 22 ++ dlls/appwiz.cpl/Makefile.in | 4 +- dlls/appwiz.cpl/addons.c | 503 ++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.c | 19 +- dlls/appwiz.cpl/appwiz.h | 36 +++ dlls/appwiz.cpl/res.h | 7 + 6 files changed, 589 insertions(+), 2 deletions(-) create mode 100644 dlls/appwiz.cpl/addons.c create mode 100644 dlls/appwiz.cpl/appwiz.h diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index 4f775aa86f2..f7ffa02e1f9 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -2,6 +2,7 @@ * Add/Remove Programs English resources * * Copyright 2001-2002, 2008 Owen Rudge +* Copyright 2005-2006 Jacek Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -41,6 +42,12 @@ STRINGTABLE IDS_MODIFY_REMOVE, "&Modify/Remove..." } +STRINGTABLE +{ + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." +} + IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Install/Uninstall" @@ -82,3 +89,18 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko Installer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ + "to work correctly. Wine can automatically download and install it for you.\n\n" \ + "Note: it is recommended to use your distribution's packages instead. " \ + "See http://wiki.winehq.org/Gecko for details.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancel", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index a00931012be..79a630dc32e 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -1,7 +1,9 @@ MODULE = appwiz.cpl -IMPORTS = comctl32 advapi32 shell32 user32 comdlg32 +IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 user32 comdlg32 +EXTRADEFS = -DINSTALL_DATADIR="\"$(datadir)\"" C_SRCS = \ + addons.c \ appwiz.c RC_SRCS = \ diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c new file mode 100644 index 00000000000..44787190791 --- /dev/null +++ b/dlls/appwiz.cpl/addons.c @@ -0,0 +1,503 @@ +/* + * Copyright 2006-2010 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include +#include +#ifdef HAVE_UNISTD_H +# include +#endif + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "cpl.h" +#include "winreg.h" +#include "ole2.h" +#include "commctrl.h" +#include "advpub.h" +#include "wininet.h" +#include "shellapi.h" +#include "urlmon.h" + +#include "appwiz.h" +#include "res.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/library.h" + +WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); + +#define GECKO_VERSION "1.1.0" + +#ifdef __i386__ +#define ARCH_STRING "x86" +#elif defined(__x86_64__) +#define ARCH_STRING "x86_64" +#else +#define ARCH_STRING "" +#endif + +#define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".cab" + +static const WCHAR mshtml_keyW[] = + {'S','o','f','t','w','a','r','e', + '\\','W','i','n','e', + '\\','M','S','H','T','M','L',0}; + +static HWND install_dialog = NULL; +static LPWSTR url = NULL; + +static inline char *heap_strdupWtoA(LPCWSTR str) +{ + char *ret = NULL; + + if(str) { + DWORD size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); + ret = heap_alloc(size); + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + } + + return ret; +} + +static void set_status(DWORD id) +{ + HWND status = GetDlgItem(install_dialog, ID_DWL_STATUS); + WCHAR buf[64]; + + LoadStringW(hInst, id, buf, sizeof(buf)/sizeof(WCHAR)); + SendMessageW(status, WM_SETTEXT, 0, (LPARAM)buf); +} + +static void set_registry(const WCHAR *install_dir) +{ + WCHAR mshtml_key[100]; + LPWSTR gecko_path; + HKEY hkey; + DWORD res, len; + + static const WCHAR wszGeckoPath[] = {'G','e','c','k','o','P','a','t','h',0}; + static const WCHAR wszWineGecko[] = {'w','i','n','e','_','g','e','c','k','o',0}; + + memcpy(mshtml_key, mshtml_keyW, sizeof(mshtml_keyW)); + mshtml_key[sizeof(mshtml_keyW)/sizeof(WCHAR)-1] = '\\'; + MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, sizeof(GECKO_VERSION), + mshtml_key+sizeof(mshtml_keyW)/sizeof(WCHAR), + (sizeof(mshtml_key)-sizeof(mshtml_keyW))/sizeof(WCHAR)); + + /* @@ Wine registry key: HKCU\Software\Wine\MSHTML\ */ + res = RegCreateKeyW(HKEY_CURRENT_USER, mshtml_key, &hkey); + if(res != ERROR_SUCCESS) { + ERR("Faild to create MSHTML key: %d\n", res); + return; + } + + len = strlenW(install_dir); + gecko_path = heap_alloc((len+1)*sizeof(WCHAR)+sizeof(wszWineGecko)); + memcpy(gecko_path, install_dir, len*sizeof(WCHAR)); + + if (len && gecko_path[len-1] != '\\') + gecko_path[len++] = '\\'; + + memcpy(gecko_path+len, wszWineGecko, sizeof(wszWineGecko)); + + res = RegSetValueExW(hkey, wszGeckoPath, 0, REG_SZ, (LPVOID)gecko_path, + len*sizeof(WCHAR)+sizeof(wszWineGecko)); + heap_free(gecko_path); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS) + ERR("Failed to set GeckoPath value: %08x\n", res); +} + +static BOOL install_cab(LPCWSTR file_name) +{ + char *install_dir_a, *file_name_a; + WCHAR install_dir[MAX_PATH]; + DWORD res, len; + HRESULT hres; + + static const WCHAR gecko_subdirW[] = {'\\','g','e','c','k','o','\\',0}; + + TRACE("(%s)\n", debugstr_w(file_name)); + + GetSystemDirectoryW(install_dir, sizeof(install_dir)/sizeof(WCHAR)); + strcatW(install_dir, gecko_subdirW); + res = CreateDirectoryW(install_dir, NULL); + if(!res && GetLastError() != ERROR_ALREADY_EXISTS) { + ERR("Could not create directory: %08u\n", GetLastError()); + return FALSE; + } + + len = strlenW(install_dir); + MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, install_dir+len, sizeof(install_dir)/sizeof(WCHAR)-len); + res = CreateDirectoryW(install_dir, NULL); + if(!res && GetLastError() != ERROR_ALREADY_EXISTS) { + ERR("Could not create directory: %08u\n", GetLastError()); + return FALSE; + } + + + /* FIXME: Use ExtractFilesW once it's implemented */ + file_name_a = heap_strdupWtoA(file_name); + install_dir_a = heap_strdupWtoA(install_dir); + if(file_name_a && install_dir_a) + hres = ExtractFilesA(file_name_a, install_dir_a, 0, NULL, NULL, 0); + else + hres = E_OUTOFMEMORY; + heap_free(file_name_a); + heap_free(install_dir_a); + if(FAILED(hres)) { + ERR("Could not extract package: %08x\n", hres); + return FALSE; + } + + set_registry(install_dir); + return TRUE; +} + +static BOOL install_from_unix_file(const char *file_name) +{ + LPWSTR dos_file_name; + int fd; + BOOL ret; + + static WCHAR * (CDECL *wine_get_dos_file_name)(const char*); + static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + + fd = open(file_name, O_RDONLY); + if(fd == -1) { + TRACE("%s not found\n", debugstr_a(file_name)); + return FALSE; + } + + close(fd); + + if(!wine_get_dos_file_name) + wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32W), "wine_get_dos_file_name"); + + if(wine_get_dos_file_name) { /* Wine UNIX mode */ + dos_file_name = wine_get_dos_file_name(file_name); + if(!dos_file_name) { + ERR("Could not get dos file name of %s\n", debugstr_a(file_name)); + return FALSE; + } + } else { /* Windows mode */ + UINT res; + WARN("Could not get wine_get_dos_file_name function, calling install_cab directly.\n"); + res = MultiByteToWideChar( CP_ACP, 0, file_name, -1, 0, 0); + dos_file_name = heap_alloc (res*sizeof(WCHAR)); + MultiByteToWideChar( CP_ACP, 0, file_name, -1, dos_file_name, res); + } + + ret = install_cab(dos_file_name); + + heap_free(dos_file_name); + return ret; +} + +static BOOL install_from_registered_dir(void) +{ + char *file_name; + HKEY hkey; + DWORD res, type, size = MAX_PATH; + BOOL ret; + + /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ + res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + if(res == ERROR_MORE_DATA) { + file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME)); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + } + RegCloseKey(hkey); + if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { + heap_free(file_name); + return FALSE; + } + + strcat(file_name, GECKO_FILE_NAME); + + TRACE("Trying %s\n", debugstr_a(file_name)); + + ret = install_from_unix_file(file_name); + + heap_free(file_name); + return ret; +} + +static BOOL install_from_default_dir(void) +{ + const char *data_dir, *subdir; + char *file_name; + int len, len2; + BOOL ret; + + if((data_dir = wine_get_data_dir())) + subdir = "/gecko/"; + else if((data_dir = wine_get_build_dir())) + subdir = "/../gecko/"; + else + return FALSE; + + len = strlen(data_dir); + len2 = strlen(subdir); + + file_name = heap_alloc(len+len2+sizeof(GECKO_FILE_NAME)); + memcpy(file_name, data_dir, len); + memcpy(file_name+len, subdir, len2); + memcpy(file_name+len+len2, GECKO_FILE_NAME, sizeof(GECKO_FILE_NAME)); + + ret = install_from_unix_file(file_name); + + heap_free(file_name); + + if (!ret) + ret = install_from_unix_file(INSTALL_DATADIR "/wine/gecko/" GECKO_FILE_NAME); + if (!ret && strcmp(INSTALL_DATADIR, "/usr/share")) + ret = install_from_unix_file("/usr/share/wine/gecko/" GECKO_FILE_NAME); + return ret; +} + +static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IBindStatusCallback, riid)) { + *ppv = iface; + return S_OK; + } + + return E_INVALIDARG; +} + +static ULONG WINAPI InstallCallback_AddRef(IBindStatusCallback *iface) +{ + return 2; +} + +static ULONG WINAPI InstallCallback_Release(IBindStatusCallback *iface) +{ + return 1; +} + +static HRESULT WINAPI InstallCallback_OnStartBinding(IBindStatusCallback *iface, + DWORD dwReserved, IBinding *pib) +{ + set_status(IDS_DOWNLOADING); + return S_OK; +} + +static HRESULT WINAPI InstallCallback_GetPriority(IBindStatusCallback *iface, + LONG *pnPriority) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallCallback_OnLowResource(IBindStatusCallback *iface, + DWORD dwReserved) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, + ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) +{ + HWND progress = GetDlgItem(install_dialog, ID_DWL_PROGRESS); + + if(ulProgressMax) + SendMessageW(progress, PBM_SETRANGE32, 0, ulProgressMax); + if(ulProgress) + SendMessageW(progress, PBM_SETPOS, ulProgress, 0); + + return S_OK; +} + +static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, + HRESULT hresult, LPCWSTR szError) +{ + if(FAILED(hresult)) { + ERR("Binding failed %08x\n", hresult); + return S_OK; + } + + set_status(IDS_INSTALLING); + return S_OK; +} + +static HRESULT WINAPI InstallCallback_GetBindInfo(IBindStatusCallback *iface, + DWORD* grfBINDF, BINDINFO* pbindinfo) +{ + /* FIXME */ + *grfBINDF = 0; + return S_OK; +} + +static HRESULT WINAPI InstallCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, + DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) +{ + ERR("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallCallback_OnObjectAvailable(IBindStatusCallback *iface, + REFIID riid, IUnknown* punk) +{ + ERR("\n"); + return E_NOTIMPL; +} + +static const IBindStatusCallbackVtbl InstallCallbackVtbl = { + InstallCallback_QueryInterface, + InstallCallback_AddRef, + InstallCallback_Release, + InstallCallback_OnStartBinding, + InstallCallback_GetPriority, + InstallCallback_OnLowResource, + InstallCallback_OnProgress, + InstallCallback_OnStopBinding, + InstallCallback_GetBindInfo, + InstallCallback_OnDataAvailable, + InstallCallback_OnObjectAvailable +}; + +static IBindStatusCallback InstallCallback = { &InstallCallbackVtbl }; + +static LPWSTR get_url(void) +{ + HKEY hkey; + DWORD res, type; + DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); + DWORD returned_size; + LPWSTR url; + + static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0}; + static const WCHAR httpW[] = {'h','t','t','p'}; + static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; + static const WCHAR v_formatW[] = {'&','v','='}; + + /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ + res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); + if(res != ERROR_SUCCESS) + return NULL; + + url = heap_alloc(size); + returned_size = size; + + res = RegQueryValueExW(hkey, wszGeckoUrl, NULL, &type, (LPBYTE)url, &returned_size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS || type != REG_SZ) { + heap_free(url); + return NULL; + } + + if(returned_size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { + DWORD len; + + len = strlenW(url); + memcpy(url+len, arch_formatW, sizeof(arch_formatW)); + len += sizeof(arch_formatW)/sizeof(WCHAR); + len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), url+len, size/sizeof(WCHAR)-len)-1; + memcpy(url+len, v_formatW, sizeof(v_formatW)); + len += sizeof(v_formatW)/sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+len, size/sizeof(WCHAR)-len); + } + + TRACE("Got URL %s\n", debugstr_w(url)); + return url; +} + +static DWORD WINAPI download_proc(PVOID arg) +{ + WCHAR tmp_dir[MAX_PATH], tmp_file[MAX_PATH]; + HRESULT hres; + + GetTempPathW(sizeof(tmp_dir)/sizeof(WCHAR), tmp_dir); + GetTempFileNameW(tmp_dir, NULL, 0, tmp_file); + + TRACE("using temp file %s\n", debugstr_w(tmp_file)); + + hres = URLDownloadToFileW(NULL, url, tmp_file, 0, &InstallCallback); + if(FAILED(hres)) { + ERR("URLDownloadToFile failed: %08x\n", hres); + return 0; + } + + install_cab(tmp_file); + DeleteFileW(tmp_file); + EndDialog(install_dialog, 0); + return 0; +} + +static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + case WM_INITDIALOG: + ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_HIDE); + install_dialog = hwnd; + return TRUE; + + case WM_COMMAND: + switch(wParam) { + case IDCANCEL: + EndDialog(hwnd, 0); + return FALSE; + + case ID_DWL_INSTALL: + ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_SHOW); + EnableWindow(GetDlgItem(hwnd, ID_DWL_INSTALL), 0); + EnableWindow(GetDlgItem(hwnd, IDCANCEL), 0); /* FIXME */ + CreateThread(NULL, 0, download_proc, NULL, 0, NULL); + return FALSE; + } + } + + return FALSE; +} + +BOOL install_wine_gecko(void) +{ + if(!*ARCH_STRING) + return FALSE; + + /* + * Try to find Gecko .cab file in following order: + * - directory stored in GeckoCabDir value of HKCU/Wine/Software/MSHTML key + * - $datadir/gecko/ + * - $INSTALL_DATADIR/wine/gecko/ + * - /usr/share/wine/gecko/ + * - download from URL stored in GeckoUrl value of HKCU/Wine/Software/MSHTML key + */ + if(!install_from_registered_dir() + && !install_from_default_dir() + && (url = get_url())) + DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc); + + heap_free(url); + url = NULL; + return TRUE; +} diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 1b3370b2052..d336ac80f01 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -44,6 +44,7 @@ #include #include +#include "appwiz.h" #include "res.h" WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); @@ -71,7 +72,7 @@ typedef struct APPINFO { } APPINFO; static struct APPINFO *AppInfo = NULL; -static HINSTANCE hInst; +HINSTANCE hInst; static WCHAR btnRemove[MAX_STRING_LEN]; static WCHAR btnModifyRemove[MAX_STRING_LEN]; @@ -953,6 +954,19 @@ static void StartApplet(HWND hWnd) PropertySheetW (&psh); } +static LONG start_params(const WCHAR *params) +{ + static const WCHAR install_geckoW[] = {'i','n','s','t','a','l','l','_','g','e','c','k','o',0}; + + if(!strcmpW(params, install_geckoW)) { + install_wine_gecko(); + return TRUE; + } + + WARN("unknown param %s\n", debugstr_w(params)); + return FALSE; +} + /****************************************************************************** * Name : CPlApplet * Description: Entry point for Control Panel applets @@ -979,6 +993,9 @@ LONG CALLBACK CPlApplet(HWND hwndCPL, UINT message, LPARAM lParam1, LPARAM lPara case CPL_GETCOUNT: return 1; + case CPL_STARTWPARMSW: + return start_params((const WCHAR *)lParam2); + case CPL_INQUIRE: { CPLINFO *appletInfo = (CPLINFO *) lParam2; diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h new file mode 100644 index 00000000000..a59474ac900 --- /dev/null +++ b/dlls/appwiz.cpl/appwiz.h @@ -0,0 +1,36 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +BOOL install_wine_gecko(void); + +extern HINSTANCE hInst; + +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} diff --git a/dlls/appwiz.cpl/res.h b/dlls/appwiz.cpl/res.h index c336cf30b61..390c2926959 100644 --- a/dlls/appwiz.cpl/res.h +++ b/dlls/appwiz.cpl/res.h @@ -45,6 +45,11 @@ #define IDC_INFO_COMMENTS 1107 #define IDC_INFO_LABEL 1108 +#define ID_DWL_DIALOG 1200 +#define ID_DWL_PROGRESS 1201 +#define ID_DWL_INSTALL 1202 +#define ID_DWL_STATUS 1203 + /* Icons */ #define ICO_MAIN 1 @@ -61,3 +66,5 @@ #define IDS_INSTALL_FILTER 9 #define IDS_REMOVE 10 #define IDS_MODIFY_REMOVE 11 +#define IDS_DOWNLOADING 12 +#define IDS_INSTALLING 13