[ole32/tests] Cast-qual warning fixes

Paul Vriens paul.vriens.wine at gmail.com
Tue Jan 23 07:40:20 CST 2007


Hi,

fix the warnings and remove the now unneeded casts.

Changelog
   Cast-qual warning fixes

Cheers,

Paul.
-------------- next part --------------
diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
index eb9f281..9dc2d2d 100644
--- a/dlls/ole32/tests/compobj.c
+++ b/dlls/ole32/tests/compobj.c
@@ -39,9 +39,9 @@ HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit);
 
 static const CLSID CLSID_non_existent =   { 0x12345678, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } };
 static const CLSID CLSID_CDeviceMoniker = { 0x4315d437, 0x5b8c, 0x11d0, { 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86 } };
-static const WCHAR devicedotone[] = {'d','e','v','i','c','e','.','1',0};
+static WCHAR devicedotone[] = {'d','e','v','i','c','e','.','1',0};
 static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0};
-static const WCHAR wszCLSID_CDeviceMoniker[] =
+static WCHAR wszCLSID_CDeviceMoniker[] =
 {
     '{',
     '4','3','1','5','d','4','3','7','-',
@@ -159,7 +159,7 @@ static void test_CLSIDFromProgID(void)
     ok(hr == S_OK, "CLSIDFromProgID failed with error 0x%08x\n", hr);
     ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n");
 
-    hr = CLSIDFromString((LPOLESTR)devicedotone, &clsid);
+    hr = CLSIDFromString(devicedotone, &clsid);
     ok_ole_success(hr, "CLSIDFromString");
     ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n");
 
@@ -180,7 +180,7 @@ static void test_CLSIDFromProgID(void)
 static void test_CLSIDFromString(void)
 {
     CLSID clsid;
-    HRESULT hr = CLSIDFromString((LPOLESTR)wszCLSID_CDeviceMoniker, &clsid);
+    HRESULT hr = CLSIDFromString(wszCLSID_CDeviceMoniker, &clsid);
     ok_ole_success(hr, "CLSIDFromString");
     ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n");
 
-- 
1.4.4.4



More information about the wine-patches mailing list