March 2010 - Wine-Commits - list.winehq.org

Mikhail Maroukhine : shell32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: cc7eaa3293fff5b36c986b4ce961037944c673f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7eaa3293fff5b36c986b4ce… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sun Mar 28 14:57:39 2010 +0700 shell32: Fix compiler warnings with flag -Wcast-qual. --- dlls/shell32/debughlp.c | 44 ++++++++++++++++++++++---------------------- dlls/shell32/shlexec.c | 5 +++-- dlls/shell32/trash.c | 2 +- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index 3cab8bb..f5d64c3 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pidl); static -LPITEMIDLIST _dbg_ILGetNext(LPCITEMIDLIST pidl) +LPCITEMIDLIST _dbg_ILGetNext(LPCITEMIDLIST pidl) { WORD len; @@ -44,7 +44,7 @@ LPITEMIDLIST _dbg_ILGetNext(LPCITEMIDLIST pidl) len = pidl->mkid.cb; if (len) { - return (LPITEMIDLIST) (((LPBYTE)pidl)+len); + return (LPCITEMIDLIST) (((const BYTE*)pidl)+len); } } return NULL; @@ -57,17 +57,17 @@ BOOL _dbg_ILIsDesktop(LPCITEMIDLIST pidl) } static -LPPIDLDATA _dbg_ILGetDataPointer(LPCITEMIDLIST pidl) +const PIDLDATA* _dbg_ILGetDataPointer(LPCITEMIDLIST pidl) { if(pidl && pidl->mkid.cb != 0x00) - return (LPPIDLDATA)pidl->mkid.abID; + return (const PIDLDATA*)pidl->mkid.abID; return NULL; } static -LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl) +LPCSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl) { - LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl); + const PIDLDATA* pdata =_dbg_ILGetDataPointer(pidl); if (pdata) { @@ -103,9 +103,9 @@ LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl) } static -LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl) +LPCWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl) { - LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl); + const PIDLDATA* pdata =_dbg_ILGetDataPointer(pidl); if (pdata) { @@ -140,7 +140,7 @@ LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl) return NULL; case PT_VALUEW: - return (LPWSTR)pdata->u.file.szNames; + return (LPCWSTR)pdata->u.file.szNames; } } return NULL; @@ -148,9 +148,9 @@ LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl) static -LPSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl) +LPCSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl) { - LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl); + const PIDLDATA* pdata =_dbg_ILGetDataPointer(pidl); if (pdata) { @@ -170,9 +170,9 @@ LPSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl) } static -LPWSTR _dbg_ILGetSTextPointerW(LPCITEMIDLIST pidl) +LPCWSTR _dbg_ILGetSTextPointerW(LPCITEMIDLIST pidl) { - LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl); + const PIDLDATA* pdata =_dbg_ILGetDataPointer(pidl); if (pdata) { @@ -190,7 +190,7 @@ LPWSTR _dbg_ILGetSTextPointerW(LPCITEMIDLIST pidl) return NULL; case PT_VALUEW: - return (LPWSTR)(pdata->u.file.szNames + lstrlenW ((LPWSTR)pdata->u.file.szNames) + 1); + return (LPCWSTR)(pdata->u.file.szNames + lstrlenW ((LPCWSTR)pdata->u.file.szNames) + 1); } } return NULL; @@ -218,8 +218,8 @@ IID* _dbg_ILGetGUIDPointer(LPCITEMIDLIST pidl) static void _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) { - LPSTR szSrc; - LPWSTR szSrcW; + LPCSTR szSrc; + LPCWSTR szSrcW; GUID const * riid; if (!pidl) return; @@ -277,10 +277,10 @@ void pdump (LPCITEMIDLIST pidl) if (_ILIsUnicode(pidltemp)) { DWORD dwAttrib = 0; - LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp); + const PIDLDATA* pData = _dbg_ILGetDataPointer(pidltemp); DWORD type = pData ? pData->type : 0; - LPWSTR szLongName = _dbg_ILGetTextPointerW(pidltemp); - LPWSTR szShortName = _dbg_ILGetSTextPointerW(pidltemp); + LPCWSTR szLongName = _dbg_ILGetTextPointerW(pidltemp); + LPCWSTR szShortName = _dbg_ILGetSTextPointerW(pidltemp); char szName[MAX_PATH]; _dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH); @@ -294,10 +294,10 @@ void pdump (LPCITEMIDLIST pidl) else { DWORD dwAttrib = 0; - LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp); + const PIDLDATA* pData = _dbg_ILGetDataPointer(pidltemp); DWORD type = pData ? pData->type : 0; - LPSTR szLongName = _dbg_ILGetTextPointer(pidltemp); - LPSTR szShortName = _dbg_ILGetSTextPointer(pidltemp); + LPCSTR szLongName = _dbg_ILGetTextPointer(pidltemp); + LPCSTR szShortName = _dbg_ILGetSTextPointer(pidltemp); char szName[MAX_PATH]; _dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH); diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 19ad1b3..ff07550 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -809,8 +809,9 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec } else { - LPWSTR p,space; - for (p=(LPWSTR)start; (space=strchrW(p, ' ')); p=space+1) + LPCWSTR p; + LPWSTR space; + for (p=start; (space=strchrW(p, ' ')); p=space+1) { int idx = space-start; memcpy(command, start, idx*sizeof(WCHAR)); diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 6f9cae4..99e7d7e 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -358,7 +358,7 @@ HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data) return E_INVALIDARG; if (data != NULL) - *data = *(WIN32_FIND_DATAW *)(id->abID+1); + *data = *(const WIN32_FIND_DATAW *)(id->abID+1); return S_OK; }

1 0

Mikhail Maroukhine : shlwapi: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 95100a6e92f428b74d8bbba7c08aac8f163ced11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95100a6e92f428b74d8bbba7c… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sun Mar 28 15:26:11 2010 +0700 shlwapi: Fix compiler warnings with flag -Wcast-qual. --- dlls/shlwapi/url.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 4d064b6..d6487b3 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -278,7 +278,8 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, { HRESULT hr = S_OK; DWORD EscapeFlags; - LPWSTR lpszUrlCpy, wk1, wk2, mp, mp2, root; + LPCWSTR wk1, root; + LPWSTR lpszUrlCpy, wk2, mp, mp2; INT state; DWORD nByteLen, nLen, nWkLen; WCHAR slash = '/'; @@ -322,7 +323,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, * 6 have location (found /) save root location */ - wk1 = (LPWSTR)pszUrl; + wk1 = pszUrl; wk2 = lpszUrlCpy; state = 0;

1 0

Mikhail Maroukhine : ole: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: feb257dce0d93d4d0ed46c798b26809e2348f7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb257dce0d93d4d0ed46c798… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 22:26:49 2010 +0600 ole: Fix compiler warnings with flag -Wcast-qual. --- dlls/oleaut32/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 7a5bc29..c7a3411 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1273,7 +1273,7 @@ static HRESULT OLEPictureImpl_LoadEnhMetafile(OLEPictureImpl *This, static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, const BYTE *data, ULONG size) { - APM_HEADER *header = (APM_HEADER *)data; + const APM_HEADER *header = (const APM_HEADER *)data; HMETAFILE hmf; if (size < sizeof(APM_HEADER))

1 0

Mikhail Maroukhine : rsaenh: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: dc525dabd6820830df0ee8ea4d73656cc77adef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc525dabd6820830df0ee8ea4… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 22:49:24 2010 +0600 rsaenh: Fix compiler warnings with flag -Wcast-qual. --- dlls/rsaenh/sha2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/sha2.c b/dlls/rsaenh/sha2.c index 6c1a2e6..ea5bb28 100644 --- a/dlls/rsaenh/sha2.c +++ b/dlls/rsaenh/sha2.c @@ -490,7 +490,7 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) { } while (len >= SHA256_BLOCK_LENGTH) { /* Process as many complete blocks as we can */ - SHA256_Transform(context, (sha2_word32*)data); + SHA256_Transform(context, (const sha2_word32*)data); context->bitcount += SHA256_BLOCK_LENGTH << 3; len -= SHA256_BLOCK_LENGTH; data += SHA256_BLOCK_LENGTH; @@ -812,7 +812,7 @@ void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) { } while (len >= SHA512_BLOCK_LENGTH) { /* Process as many complete blocks as we can */ - SHA512_Transform(context, (sha2_word64*)data); + SHA512_Transform(context, (const sha2_word64*)data); ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3); len -= SHA512_BLOCK_LENGTH; data += SHA512_BLOCK_LENGTH;

1 0

Mikhail Maroukhine : user32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 819464f1d90f1ca1c6e9efd2dcd3d45e7c4b47a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819464f1d90f1ca1c6e9efd2d… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sun Mar 28 16:15:00 2010 +0700 user32: Fix compiler warnings with flag -Wcast-qual. --- dlls/user32/menu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6e7e663..1444f84 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4728,7 +4728,7 @@ BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); - if (!MENU_NormalizeMenuItemInfoStruct( (MENUITEMINFOW *)lpmii, &mii )) return FALSE; + if (!MENU_NormalizeMenuItemInfoStruct( (const MENUITEMINFOW *)lpmii, &mii )) return FALSE; return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0), &mii, FALSE); @@ -4851,7 +4851,7 @@ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); - if (!MENU_NormalizeMenuItemInfoStruct( (MENUITEMINFOW *)lpmii, &mii )) return FALSE; + if (!MENU_NormalizeMenuItemInfoStruct( (const MENUITEMINFOW *)lpmii, &mii )) return FALSE; item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); return SetMenuItemInfo_common(item, &mii, FALSE);

1 0

Mikhail Maroukhine : ntdll: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 2b8f11b8c0a1f00b9087d0c52212792d65258e9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8f11b8c0a1f00b9087d0c52… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 21:41:14 2010 +0600 ntdll: Fix compiler warnings with flag -Wcast-qual. --- dlls/ntdll/heap.c | 8 ++++---- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/rtlstr.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e49e77a..15dd85c 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1261,15 +1261,15 @@ static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE * /* Check unused bytes */ if (pArena->magic == ARENA_PENDING_MAGIC) { - DWORD *ptr = (DWORD *)(pArena + 1); - DWORD *end = (DWORD *)((char *)ptr + size); + const DWORD *ptr = (const DWORD *)(pArena + 1); + const DWORD *end = (const DWORD *)((const char *)ptr + size); while (ptr < end) { if (*ptr != ARENA_FREE_FILLER) { ERR("Heap %p: free block %p overwritten at %p by %08x\n", - subheap->heap, (ARENA_INUSE *)pArena + 1, ptr, *ptr ); + subheap->heap, (const ARENA_INUSE *)pArena + 1, ptr, *ptr ); if (!*ptr) { HEAP_Dump( subheap->heap ); DbgBreakPoint(); } return FALSE; } @@ -1398,7 +1398,7 @@ static BOOL validate_block_pointer( HEAP *heap, SUBHEAP **ret_subheap, const ARE return TRUE; } - if ((char *)arena < (char *)subheap->base + subheap->headerSize) + if ((const char *)arena < (char *)subheap->base + subheap->headerSize) WARN( "Heap %p: pointer %p is inside subheap %p header\n", subheap->heap, arena + 1, subheap ); else if (subheap->heap->flags & HEAP_VALIDATE) /* do the full validation */ ret = HEAP_ValidateInUseArena( subheap, arena, QUIET ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1723f18..74e873b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2688,7 +2688,7 @@ PVOID WINAPI RtlImageDirectoryEntryToData( HMODULE module, BOOL image, WORD dir, if (!(nt = RtlImageNtHeader( module ))) return NULL; if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { - const IMAGE_NT_HEADERS64 *nt64 = (IMAGE_NT_HEADERS64 *)nt; + const IMAGE_NT_HEADERS64 *nt64 = (const IMAGE_NT_HEADERS64 *)nt; if (dir >= nt64->OptionalHeader.NumberOfRvaAndSizes) return NULL; if (!(addr = nt64->OptionalHeader.DataDirectory[dir].VirtualAddress)) return NULL; @@ -2697,7 +2697,7 @@ PVOID WINAPI RtlImageDirectoryEntryToData( HMODULE module, BOOL image, WORD dir, } else if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { - const IMAGE_NT_HEADERS32 *nt32 = (IMAGE_NT_HEADERS32 *)nt; + const IMAGE_NT_HEADERS32 *nt32 = (const IMAGE_NT_HEADERS32 *)nt; if (dir >= nt32->OptionalHeader.NumberOfRvaAndSizes) return NULL; if (!(addr = nt32->OptionalHeader.DataDirectory[dir].VirtualAddress)) return NULL; diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 14993f2..4e9614c 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1617,7 +1617,7 @@ BOOLEAN WINAPI RtlIsTextUnicode( LPCVOID buf, INT len, INT *pf ) /* Check for an odd length ... pass if even. */ if (len & 1) out_flags |= IS_TEXT_UNICODE_ODD_LENGTH; - if (((char *)buf)[len - 1] == 0) + if (((const char *)buf)[len - 1] == 0) len--; /* Windows seems to do something like that to avoid e.g. false IS_TEXT_UNICODE_NULL_BYTES */ len /= sizeof(WCHAR);

1 0

Mikhail Maroukhine : mshtml: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 491a06d987221706e9020dbbfddb96718ce63f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491a06d987221706e9020dbbf… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 19:58:41 2010 +0600 mshtml: Fix compiler warnings with flag -Wcast-qual. --- dlls/mshtml/dispex.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 3917b30..de0c948 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -248,12 +248,12 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN static int dispid_cmp(const void *p1, const void *p2) { - return ((func_info_t*)p1)->id - ((func_info_t*)p2)->id; + return ((const func_info_t*)p1)->id - ((const func_info_t*)p2)->id; } static int func_name_cmp(const void *p1, const void *p2) { - return strcmpiW((*(func_info_t**)p1)->name, (*(func_info_t**)p2)->name); + return strcmpiW((*(func_info_t* const*)p1)->name, (*(func_info_t* const*)p2)->name); } static dispex_data_t *preprocess_dispex_data(DispatchEx *This) @@ -322,7 +322,7 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) static int id_cmp(const void *p1, const void *p2) { - return *(DISPID*)p1 - *(DISPID*)p2; + return *(const DISPID*)p1 - *(const DISPID*)p2; } HRESULT get_dispids(tid_t tid, DWORD *ret_size, DISPID **ret)

1 0

Mikhail Maroukhine : msxml3: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 88cca2cf765b38dd762ff180804e02efd805fc7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=88cca2cf765b38dd762ff1808… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 21:19:45 2010 +0600 msxml3: Fix compiler warnings with flag -Wcast-qual. --- dlls/msxml3/dispex.c | 4 ++-- dlls/msxml3/main.c | 2 +- dlls/msxml3/node.c | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 529f9a4..09b71fe 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -196,12 +196,12 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, DISPID id static int dispid_cmp(const void *p1, const void *p2) { - return ((func_info_t*)p1)->id - ((func_info_t*)p2)->id; + return ((const func_info_t*)p1)->id - ((const func_info_t*)p2)->id; } static int func_name_cmp(const void *p1, const void *p2) { - return strcmpiW((*(func_info_t**)p1)->name, (*(func_info_t**)p2)->name); + return strcmpiW((*(func_info_t* const*)p1)->name, (*(func_info_t* const*)p2)->name); } static dispex_data_t *preprocess_dispex_data(DispatchEx *This) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 9b1eb82..60b0cbd 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -62,7 +62,7 @@ static int wineXmlMatchCallback (char const * filename) static void *wineXmlOpenCallback (char const * filename) { - BSTR sFilename = bstr_from_xmlChar( (xmlChar*)filename); + BSTR sFilename = bstr_from_xmlChar( (const xmlChar*)filename); HANDLE hFile; TRACE("%s\n", debugstr_w(sFilename)); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b05f06e..500fb94 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1190,8 +1190,8 @@ static HRESULT WINAPI xmlnode_get_dataType( switch ( This->node->type ) { case XML_ELEMENT_NODE: - pVal = xmlGetNsProp(This->node, (xmlChar*)"dt", - (xmlChar*)"urn:schemas-microsoft-com:datatypes"); + pVal = xmlGetNsProp(This->node, (const xmlChar*)"dt", + (const xmlChar*)"urn:schemas-microsoft-com:datatypes"); if (pVal) { V_VT(dataTypeName) = VT_BSTR; @@ -1260,20 +1260,20 @@ static HRESULT WINAPI xmlnode_put_dataType( xmlAttrPtr pAttr = NULL; xmlChar* str = xmlChar_from_wchar(dataTypeName); - pAttr = xmlHasNsProp(This->node, (xmlChar*)"dt", - (xmlChar*)"urn:schemas-microsoft-com:datatypes"); + pAttr = xmlHasNsProp(This->node, (const xmlChar*)"dt", + (const xmlChar*)"urn:schemas-microsoft-com:datatypes"); if (pAttr) { - pAttr = xmlSetNsProp(This->node, pAttr->ns, (xmlChar*)"dt", str); + pAttr = xmlSetNsProp(This->node, pAttr->ns, (const xmlChar*)"dt", str); hr = S_OK; } else { - pNS = xmlNewNs(This->node, (xmlChar*)"urn:schemas-microsoft-com:datatypes", (xmlChar*)"dt"); + pNS = xmlNewNs(This->node, (const xmlChar*)"urn:schemas-microsoft-com:datatypes", (const xmlChar*)"dt"); if(pNS) { - pAttr = xmlNewNsProp(This->node, pNS, (xmlChar*)"dt", str); + pAttr = xmlNewNsProp(This->node, pNS, (const xmlChar*)"dt", str); if(pAttr) { xmlAddChild(This->node, (xmlNodePtr)pAttr); @@ -1402,7 +1402,7 @@ static HRESULT WINAPI xmlnode_get_xml( /* Attribute Nodes return a space in front of their name */ pContent = xmlBufferContent(pXmlBuf); - if( ((char*)pContent)[0] == ' ') + if( ((const char*)pContent)[0] == ' ') bstrContent = bstr_from_xmlChar(pContent+1); else bstrContent = bstr_from_xmlChar(pContent);

1 0

Mikhail Maroukhine : msi: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 86f76d2b489579b547ab51380dda33db9307d04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f76d2b489579b547ab51380… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 20:48:20 2010 +0600 msi: Fix compiler warnings with flag -Wcast-qual. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 75bbc09..a7a9596 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4336,7 +4336,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) { size += sizeof(WCHAR); RegSetValueExW(hkey,feature->Feature,0,REG_SZ, - (LPBYTE)(feature->Feature_Parent ? feature->Feature_Parent : szEmpty),size); + (const BYTE*)(feature->Feature_Parent ? feature->Feature_Parent : szEmpty),size); } else {

1 0

Mikhail Maroukhine : msctf: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: bbf827c38fd23560392442ba419a20acd840fe74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf827c38fd23560392442ba4… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 19:29:33 2010 +0600 msctf: Fix compiler warnings with flag -Wcast-qual. --- dlls/msctf/inputprocessor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index ba4a76d..34e35c4 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -279,8 +279,8 @@ static HRESULT WINAPI InputProcessorProfiles_AddLanguageProfile( if (!res) { DWORD zero = 0x0; - RegSetValueExW(fmtkey, desc, 0, REG_SZ, (LPBYTE)pchDesc, cchDesc * sizeof(WCHAR)); - RegSetValueExW(fmtkey, icnf, 0, REG_SZ, (LPBYTE)pchIconFile, cchFile * sizeof(WCHAR)); + RegSetValueExW(fmtkey, desc, 0, REG_SZ, (const BYTE*)pchDesc, cchDesc * sizeof(WCHAR)); + RegSetValueExW(fmtkey, icnf, 0, REG_SZ, (const BYTE*)pchIconFile, cchFile * sizeof(WCHAR)); RegSetValueExW(fmtkey, icni, 0, REG_DWORD, (LPBYTE)&uIconIndex, sizeof(DWORD)); if (disposition == REG_CREATED_NEW_KEY) RegSetValueExW(fmtkey, szwEnable, 0, REG_DWORD, (LPBYTE)&zero, sizeof(DWORD));

1 0