Module: wine Branch: master Commit: 2429d1b634b07c6fdf3daf8cea45463d5b6425ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2429d1b634b07c6fdf3daf8c...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Tue Aug 29 20:12:39 2006 +0100
advpack: Cast-qual warnings fix.
---
dlls/advpack/files.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 86cf70f..0e3637e 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -116,7 +116,7 @@ HRESULT WINAPI AddDelBackupEntryW(LPCWST LPCWSTR lpcszBaseName, DWORD dwFlags) { WCHAR szIniPath[MAX_PATH]; - LPWSTR szString = NULL; + LPCWSTR szString = NULL;
static const WCHAR szBackupEntry[] = { '-','1',',','0',',','0',',','0',',','0',',','0',',','-','1',0 @@ -144,7 +144,7 @@ HRESULT WINAPI AddDelBackupEntryW(LPCWST SetFileAttributesW(szIniPath, FILE_ATTRIBUTE_NORMAL);
if (dwFlags & AADBE_ADD_ENTRY) - szString = (LPWSTR)szBackupEntry; + szString = szBackupEntry; else if (dwFlags & AADBE_DEL_ENTRY) szString = NULL;
@@ -249,7 +249,8 @@ HRESULT WINAPI AdvInstallFileW(HWND hwnd DWORD dwFlags, DWORD dwReserved) { PSP_FILE_CALLBACK_W pFileCallback; - LPWSTR szPath, szDestFilename; + LPWSTR szDestFilename; + LPCWSTR szPath; WCHAR szRootPath[ROOT_LENGTH]; DWORD dwLen, dwLastError; HSPFILEQ fileQueue; @@ -270,7 +271,7 @@ HRESULT WINAPI AdvInstallFileW(HWND hwnd dwLastError = ERROR_SUCCESS;
lstrcpynW(szRootPath, lpszSourceDir, ROOT_LENGTH); - szPath = (LPWSTR)lpszSourceDir + ROOT_LENGTH; + szPath = lpszSourceDir + ROOT_LENGTH;
/* use lpszSourceFile as destination filename if lpszDestFile is NULL */ if (lpszDestFile)