Module: wine Branch: master Commit: dcd5e173f815cc933e28d588d718824b2a80191c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dcd5e173f815cc933e28d588...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Thu Sep 28 23:14:30 2006 +0100
shell32: Cast-qual warnings fix.
---
dlls/shell32/pidl.c | 2 +- dlls/shell32/regsvr.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index e7d591f..10d87bb 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1971,7 +1971,7 @@ FileStructW* _ILGetFileStructW(LPCITEMID if (!(_ILIsValue(pidl) || _ILIsFolder(pidl))) return NULL;
- cbOffset = *(WORD*)((LPBYTE)pidl + pidl->mkid.cb - sizeof(WORD)); + cbOffset = *(const WORD *)((const BYTE *)pidl + pidl->mkid.cb - sizeof(WORD)); pFileStructW = (FileStructW*)((LPBYTE)pidl + cbOffset);
/* Currently I don't see a fool prove way to figure out if a pidl is for sure of WinXP diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index 1ce7096..27cb5f3 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -344,13 +344,13 @@ static HRESULT register_coclasses(struct &shellfolder_key, NULL); if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (list->flags & SHELLFOLDER_WANTSFORPARSING) - res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (LPBYTE)"", 1); + res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (const BYTE *)"", 1); if (list->flags & SHELLFOLDER_ATTRIBUTES) res = RegSetValueExA(shellfolder_key, attributes_valuename, 0, REG_DWORD, - (LPBYTE)&list->dwAttributes, sizeof(DWORD)); + (const BYTE *)&list->dwAttributes, sizeof(DWORD)); if (list->flags & SHELLFOLDER_CALLFORATTRIBUTES) res = RegSetValueExA(shellfolder_key, cfattributes_valuename, 0, REG_DWORD, - (LPBYTE)&list->dwCallForAttributes, sizeof(DWORD)); + (const BYTE *)&list->dwCallForAttributes, sizeof(DWORD)); RegCloseKey(shellfolder_key); if (res != ERROR_SUCCESS) goto error_close_clsid_key; } @@ -460,7 +460,7 @@ static HRESULT register_namespace_extens if (pwszKey && ERROR_SUCCESS == RegCreateKeyExW(HKEY_LOCAL_MACHINE, pwszKey, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL)) { - RegSetValueExW(hKey, NULL, 0, REG_SZ, (LPBYTE)list->value, sizeof(WCHAR)*(lstrlenW(list->value)+1)); + RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE *)list->value, sizeof(WCHAR)*(lstrlenW(list->value)+1)); RegCloseKey(hKey); }