0
@@ -1,3 +1,7 @@
0
+Thu Jul 24 07:01:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
0
+
0
+	* ext/win32ole/win32ole.c: got rid of improper casts.
0
+
0
 Wed Jul 23 23:19:15 2008  Yusuke Endoh  <mame@tsg.ne.jp>
0
 
0
   * test/socket/test_tcp.rb (test_recvfrom): replace an irrelevant test

0
@@ -993,7 +993,7 @@ ole_cp2encoding(UINT cp)
0
     case CP_MACCP:
0
     case CP_THREAD_ACP:
0
       if (!pGetCPInfoEx) {
0
-		pGetCPInfoEx = (BOOL (*)(UINT, DWORD, LPVOID))
0
+		pGetCPInfoEx = (BOOL (*)(UINT, DWORD, struct myCPINFOEX *))
0
         GetProcAddress(GetModuleHandle("kernel32"), "GetCPInfoEx");
0
     if (!pGetCPInfoEx) {
0
         pGetCPInfoEx = (void*)-1;
0
@@ -1289,7 +1289,8 @@ ole_ary_m_entry(VALUE val, long *pid)
0
     return obj;
0
 }
0
 
0
-static void * get_ptr_of_variant(VARIANT *pvar)
0
+static void *
0
+get_ptr_of_variant(VARIANT *pvar)
0
 {
0
     switch(V_VT(pvar)) {
0
     case VT_UI1:
0
@@ -1766,13 +1767,13 @@ ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar)
0
 
0
     if (((vt & ~VT_BYREF) ==  (VT_ARRAY | VT_UI1)) && TYPE(val) == T_STRING) {
0
         long len = RSTRING_LEN(val);
0
-        char *pdest = NULL;
0
+        void *pdest = NULL;
0
         SAFEARRAY *p = NULL;
0
         SAFEARRAY *psa = SafeArrayCreateVector(VT_UI1, 0, len);
0
         if (!psa) {
0
             rb_raise(rb_eRuntimeError, "fail to SafeArrayCreateVector");
0
         }
0
-        hr = SafeArrayAccessData(psa, (void **)&pdest);
0
+        hr = SafeArrayAccessData(psa, &pdest);
0
         if (SUCCEEDED(hr)) {
0
             memcpy(pdest, RSTRING_PTR(val), len);
0
             SafeArrayUnaccessData(psa);
0
@@ -2150,10 +2151,10 @@ ole_variant2val(VARIANT *pvar)
0
 
0
     case VT_UNKNOWN:
0
     {
0
-
0
         /* get IDispatch interface from IUnknown interface */
0
         IUnknown *punk;
0
         IDispatch *pDispatch;
0
+        void *p;
0
         HRESULT hr;
0
 
0
         if (V_ISBYREF(pvar))
0
@@ -2162,9 +2163,9 @@ ole_variant2val(VARIANT *pvar)
0
             punk = V_UNKNOWN(pvar);
0
 
0
         if(punk != NULL) {
0
-           hr = punk->lpVtbl->QueryInterface(punk, &IID_IDispatch,
0
-                                             (void **)&pDispatch);
0
+           hr = punk->lpVtbl->QueryInterface(punk, &IID_IDispatch, &p);
0
            if(SUCCEEDED(hr)) {
0
+               pDispatch = p;
0
                obj = create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
0
            }
0
         }
0
@@ -2529,6 +2530,7 @@ ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self)
0
     IBindCtx *pBindCtx;
0
     IMoniker *pMoniker;
0
     IDispatch *pDispatch;
0
+    void *p;
0
     HRESULT hr;
0
     OLECHAR *pbuf;
0
     ULONG eaten = 0;
0
@@ -2551,8 +2553,8 @@ ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self)
0
                   StringValuePtr(moniker));
0
     }
0
     hr = pMoniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL, 
0
-                                        &IID_IDispatch,
0
-                                        (void**)&pDispatch);
0
+                                        &IID_IDispatch, &p);
0
+    pDispatch = p;
0
     OLE_RELEASE(pMoniker);
0
     OLE_RELEASE(pBindCtx);
0
 
0
@@ -2582,6 +2584,7 @@ fole_s_connect(int argc, VALUE *argv, VALUE self)
0
     CLSID   clsid;
0
     OLECHAR *pBuf;
0
     IDispatch *pDispatch;
0
+    void *p;
0
     IUnknown *pUnknown;
0
 
0
     rb_secure(4);
0
@@ -2610,8 +2613,8 @@ fole_s_connect(int argc, VALUE *argv, VALUE self)
0
         ole_raise(hr, eWIN32OLERuntimeError, 
0
                   "OLE server `%s' not running", StringValuePtr(svr_name));
0
     }
0
-    hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch,
0
-                                             (void **)&pDispatch);
0
+    hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch, &p);
0
+    pDispatch = p;
0
     if(FAILED(hr)) {
0
         OLE_RELEASE(pUnknown);
0
         ole_raise(hr, eWIN32OLERuntimeError, 
0
@@ -3085,6 +3088,7 @@ fole_initialize(int argc, VALUE *argv, VALUE self)
0
     CLSID   clsid;
0
     OLECHAR *pBuf;
0
     IDispatch *pDispatch;
0
+    void *p;
0
 
0
     rb_secure(4);
0
     rb_call_super(0, 0);
0
@@ -3117,13 +3121,14 @@ fole_initialize(int argc, VALUE *argv, VALUE self)
0
 
0
     /* get IDispatch interface */
0
     hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
0
-                          &IID_IDispatch, (void**)&pDispatch);
0
+                          &IID_IDispatch, &p);
0
+    pDispatch = p;
0
     if(FAILED(hr)) {
0
         ole_raise(hr, eWIN32OLERuntimeError,
0
                   "failed to create WIN32OLE object from `%s'",
0
                   StringValuePtr(svr_name));
0
     }
0
-    
0
+
0
     ole_set_member(self, pDispatch);
0
     return self;
0
 }
0
@@ -3863,6 +3868,7 @@ fole_each(VALUE self)
0
     VARIANT result;
0
     HRESULT hr;
0
     IEnumVARIANT *pEnum = NULL;
0
+    void *p;
0
 
0
     RETURN_ENUMERATOR(self, 0, 0);
0
 
0
@@ -3885,14 +3891,17 @@ fole_each(VALUE self)
0
         ole_raise(hr, eWIN32OLERuntimeError, "failed to get IEnum Interface");
0
     }
0
 
0
-    if (V_VT(&result) == VT_UNKNOWN)
0
+    if (V_VT(&result) == VT_UNKNOWN) {
0
         hr = V_UNKNOWN(&result)->lpVtbl->QueryInterface(V_UNKNOWN(&result),
0
                                                         &IID_IEnumVARIANT,
0
-                                                        (void**)&pEnum);
0
-    else if (V_VT(&result) == VT_DISPATCH)
0
+                                                        &p);
0
+        pEnum = p;
0
+    } else if (V_VT(&result) == VT_DISPATCH) {
0
         hr = V_DISPATCH(&result)->lpVtbl->QueryInterface(V_DISPATCH(&result),
0
                                                          &IID_IEnumVARIANT,
0
-                                                         (void**)&pEnum);
0
+                                                         &p);
0
+        pEnum = p;
0
+    }
0
     if (FAILED(hr) || !pEnum) {
0
         VariantClear(&result);
0
         ole_raise(hr, rb_eRuntimeError, "failed to get IEnum Interface");
0
@@ -4358,6 +4367,7 @@ fole_query_interface(VALUE self, VALUE str_iid)
0
     IID iid;
0
     struct oledata *pole;
0
     IDispatch *pDispatch;
0
+    void *p;
0
          
0
     pBuf  = ole_vstr2wc(str_iid);
0
     hr = CLSIDFromString(pBuf, &iid);
0
@@ -4374,13 +4384,14 @@ fole_query_interface(VALUE self, VALUE str_iid)
0
     }
0
 
0
     hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &iid,
0
-                                                 (void **)&pDispatch);
0
+                                                 &p);
0
     if(FAILED(hr)) {
0
         ole_raise(hr, eWIN32OLERuntimeError, 
0
                   "failed to get interface `%s'", 
0
                   StringValuePtr(str_iid));
0
     }
0
 
0
+    pDispatch = p;
0
     return create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
0
 }
0
 
0
@@ -4644,13 +4655,14 @@ fole_activex_initialize(VALUE self)
0
 {
0
     struct oledata *pole;
0
     IPersistMemory *pPersistMemory;
0
+    void *p;
0
 
0
     HRESULT hr = S_OK;
0
 
0
     OLEData_Get_Struct(self, pole);
0
 
0
-    hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &IID_IPersistMemory,
0
-                                                 (void **)&pPersistMemory);
0
+    hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &IID_IPersistMemory, &p);
0
+    pPersistMemory = p;
0
     if (SUCCEEDED(hr)) {
0
         hr = pPersistMemory->lpVtbl->InitNew(pPersistMemory);
0
         OLE_RELEASE(pPersistMemory);
0
@@ -7851,6 +7863,7 @@ find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
0
     HRESULT hr;
0
     IProvideClassInfo2 *pProvideClassInfo2;
0
     IProvideClassInfo *pProvideClassInfo;
0
+    void *p;
0
 
0
     IDispatch *pDispatch;
0
     ITypeInfo *pTypeInfo;
0
@@ -7864,8 +7877,9 @@ find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
0
     pDispatch = pole->pDispatch;
0
     hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
0
                                            &IID_IProvideClassInfo2,
0
-                                           (void**)&pProvideClassInfo2);
0
+                                           &p);
0
     if (SUCCEEDED(hr)) {
0
+        pProvideClassInfo2 = p;
0
         hr = pProvideClassInfo2->lpVtbl->GetGUID(pProvideClassInfo2,
0
                                                  GUIDKIND_DEFAULT_SOURCE_DISP_IID,
0
                                                  piid);
0
@@ -7879,9 +7893,9 @@ find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
0
     }
0
     hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
0
                                            &IID_IProvideClassInfo,
0
-                                           (void**)&pProvideClassInfo);
0
+					   &p);
0
     if (SUCCEEDED(hr)) {
0
-
0
+        pProvideClassInfo = p;
0
         hr = pProvideClassInfo->lpVtbl->GetClassInfo(pProvideClassInfo,
0
                                                      &pTypeInfo);
0
         OLE_RELEASE(pProvideClassInfo);
0
@@ -7964,6 +7978,7 @@ ev_advise(int argc, VALUE *argv, VALUE self)
0
     IEVENTSINKOBJ *pIEV;
0
     DWORD dwCookie;
0
     struct oleeventdata *poleev;
0
+    void *p;
0
 
0
     rb_secure(4);
0
     rb_scan_args(argc, argv, "11", &ole, &itf);
0
@@ -7992,12 +8007,13 @@ ev_advise(int argc, VALUE *argv, VALUE self)
0
     pDispatch = pole->pDispatch;
0
     hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
0
                                            &IID_IConnectionPointContainer,
0
-                                           (void **)&pContainer);
0
+                                           &p);
0
     if (FAILED(hr)) {
0
         OLE_RELEASE(pTypeInfo);
0
         ole_raise(hr, rb_eRuntimeError,
0
                   "failed to query IConnectionPointContainer");
0
     }
0
+    pContainer = p;
0
 
0
     hr = pContainer->lpVtbl->FindConnectionPoint(pContainer,
0
                                                  &iid,