ole: Fix compiler warnings with flag -Wcast-qual

Mikhail Maroukhine mikolg at yandex.ru
Sat Mar 27 11:26:49 CDT 2010


---
 dlls/ole32/filemoniker.c   |    4 ++--
 dlls/oleaut32/olepicture.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index 72f5913..45d9f4c 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -1463,11 +1463,11 @@ HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER * ppmk)
 }
 
 /* find a character from a set in reverse without the string having to be null-terminated */
-static inline WCHAR *memrpbrkW(const WCHAR *ptr, size_t n, const WCHAR *accept)
+static inline const WCHAR *memrpbrkW(const WCHAR *ptr, size_t n, const WCHAR *accept)
 {
     const WCHAR *end, *ret = NULL;
     for (end = ptr + n; ptr < end; ptr++) if (strchrW(accept, *ptr)) ret = ptr;
-    return (WCHAR *)ret;
+    return ret;
 }
 
 HRESULT FileMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName,
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.6.3.3


------------l9yB1uYEeF9oyLv8aoc76q--




More information about the wine-patches mailing list