shdocvw: Use array syntax with array elements (Try 2)

Andrew Talbot andrew.talbot at talbotville.com
Fri May 9 17:42:41 CDT 2008


Including some instances that I left out, earlier.

-- Andy.
---
Changelog:
    shdocvw: Use array syntax with array elements.

diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c
index 908503c..bc2fdc1 100644
--- a/dlls/shdocvw/dochost.c
+++ b/dlls/shdocvw/dochost.c
@@ -63,11 +63,11 @@ static void navigate_complete(DocHost *This)
     dispparams.rgdispidNamedArgs = NULL;
     dispparams.rgvarg = params;
 
-    V_VT(params) = (VT_BYREF|VT_VARIANT);
-    V_BYREF(params) = &url;
+    V_VT(&params[0]) = (VT_BYREF|VT_VARIANT);
+    V_BYREF(&params[0]) = &url;
 
-    V_VT(params+1) = VT_DISPATCH;
-    V_DISPATCH(params+1) = disp;
+    V_VT(&params[1]) = VT_DISPATCH;
+    V_DISPATCH(&params[1]) = disp;
 
     V_VT(&url) = VT_BSTR;
     V_BSTR(&url) = SysAllocString(This->url);
diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c
index 7ca0b0f..69185e3 100644
--- a/dlls/shdocvw/navigate.c
+++ b/dlls/shdocvw/navigate.c
@@ -429,16 +429,16 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, const BYTE *post_dat
 
     This->busy = VARIANT_TRUE;
 
-    V_VT(params) = VT_BOOL|VT_BYREF;
-    V_BOOLREF(params) = cancel;
+    V_VT(&params[0]) = VT_BOOL|VT_BYREF;
+    V_BOOLREF(&params[0]) = cancel;
 
-    V_VT(params+1) = (VT_BYREF|VT_VARIANT);
-    V_VARIANTREF(params+1) = &var_headers;
+    V_VT(&params[1]) = (VT_BYREF|VT_VARIANT);
+    V_VARIANTREF(&params[1]) = &var_headers;
     V_VT(&var_headers) = VT_BSTR;
     V_BSTR(&var_headers) = headers;
 
-    V_VT(params+2) = (VT_BYREF|VT_VARIANT);
-    V_VARIANTREF(params+2) = &var_post_data2;
+    V_VT(&params[2]) = (VT_BYREF|VT_VARIANT);
+    V_VARIANTREF(&params[2]) = &var_post_data2;
     V_VT(&var_post_data2) = (VT_BYREF|VT_VARIANT);
     V_VARIANTREF(&var_post_data2) = &var_post_data;
     VariantInit(&var_post_data);
@@ -455,23 +455,23 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, const BYTE *post_dat
         SafeArrayUnaccessData(V_ARRAY(&var_post_data));
     }
 
-    V_VT(params+3) = (VT_BYREF|VT_VARIANT);
-    V_VARIANTREF(params+3) = &var_frame_name;
+    V_VT(&params[3]) = (VT_BYREF|VT_VARIANT);
+    V_VARIANTREF(&params[3]) = &var_frame_name;
     V_VT(&var_frame_name) = VT_BSTR;
     V_BSTR(&var_frame_name) = NULL;
 
-    V_VT(params+4) = (VT_BYREF|VT_VARIANT);
-    V_VARIANTREF(params+4) = &var_flags;
+    V_VT(&params[4]) = (VT_BYREF|VT_VARIANT);
+    V_VARIANTREF(&params[4]) = &var_flags;
     V_VT(&var_flags) = VT_I4;
     V_I4(&var_flags) = 0;
 
-    V_VT(params+5) = (VT_BYREF|VT_VARIANT);
-    V_VARIANTREF(params+5) = &var_url;
+    V_VT(&params[5]) = (VT_BYREF|VT_VARIANT);
+    V_VARIANTREF(&params[5]) = &var_url;
     V_VT(&var_url) = VT_BSTR;
     V_BSTR(&var_url) = SysAllocString(url);
 
-    V_VT(params+6) = (VT_DISPATCH);
-    V_DISPATCH(params+6) = This->disp;
+    V_VT(&params[6]) = (VT_DISPATCH);
+    V_DISPATCH(&params[6]) = This->disp;
 
     call_sink(This->cps.wbe2, DISPID_BEFORENAVIGATE2, &dispparams);
 



More information about the wine-patches mailing list