From 982a6a5a60226f95efab2b0e45abcda4ebb692a2 Mon Sep 17 00:00:00 2001 From: Andrew Talbot Date: Mon, 12 Mar 2007 20:49:29 +0000 Subject: [PATCH] advpack: Constify some variables. --- dlls/advpack/files.c | 4 ++-- dlls/advpack/install.c | 4 ++-- dlls/advpack/reg.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index df7b06db724..134ed1c5d70 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -603,7 +603,7 @@ static void free_file_node(struct ExtractFileList *pNode) } /* determines whether szFile is in the NULL-separated szFileList */ -static BOOL file_in_list(LPSTR szFile, LPSTR szFileList) +static BOOL file_in_list(LPCSTR szFile, LPCSTR szFileList) { DWORD dwLen = lstrlenA(szFile); DWORD dwTestLen; @@ -627,7 +627,7 @@ static BOOL file_in_list(LPSTR szFile, LPSTR szFileList) /* removes nodes from the linked list that aren't specified in szFileList * returns the number of files that are in both the linked list and szFileList */ -static DWORD fill_file_list(EXTRACTdest *extractDest, LPCSTR szCabName, LPSTR szFileList) +static DWORD fill_file_list(EXTRACTdest *extractDest, LPCSTR szCabName, LPCSTR szFileList) { DWORD dwNumFound = 0; struct ExtractFileList *pNode; diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 0c12d9db2f9..1209ea8e436 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -214,7 +214,7 @@ LPWSTR get_parameter(LPWSTR *params, WCHAR separator) return token; } -static BOOL is_full_path(LPWSTR path) +static BOOL is_full_path(LPCWSTR path) { const int MIN_PATH_LEN = 3; @@ -229,7 +229,7 @@ static BOOL is_full_path(LPWSTR path) /* retrieves the contents of a field, dynamically growing the buffer if necessary */ static WCHAR *get_field_string(INFCONTEXT *context, DWORD index, WCHAR *buffer, - WCHAR *static_buffer, DWORD *size) + const WCHAR *static_buffer, DWORD *size) { DWORD required; diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index cd52514718a..bfa136fd58d 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -98,7 +98,7 @@ error: return FALSE; } -static void strentry_atow(STRENTRYA *aentry, STRENTRYW *wentry) +static void strentry_atow(const STRENTRYA *aentry, STRENTRYW *wentry) { DWORD name_len, val_len; @@ -171,7 +171,7 @@ HRESULT WINAPI RegInstallA(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTa return hr; } -static HRESULT write_predefined_strings(HMODULE hm, LPWSTR ini_path) +static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) { WCHAR mod_path[MAX_PATH + 2]; WCHAR sys_mod_path[MAX_PATH + 2];