Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(293)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/base/dispatch_win.h

Issue 10736059: Add support of DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF to remoting::dispatch::Invoke(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR feedback. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/base/dispatch_win.h.pump » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/dispatch_win.h
diff --git a/remoting/base/dispatch_win.h b/remoting/base/dispatch_win.h
index aa207106d5884ed6a9fcb485cfed8a90a588f5e0..9578ab8a3f6e8558395a87151c46619c009786a6 100644
--- a/remoting/base/dispatch_win.h
+++ b/remoting/base/dispatch_win.h
@@ -134,8 +134,17 @@ HRESULT Invoke(IDispatch* object,
disp_result = &result;
- // Invoke the method.
+ // Invoke the method passing the parameters via the DISPPARAMS structure.
+ // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of
+ // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs|
+ // structure members should be initialized.
DISPPARAMS disp_params = { NULL, NULL, 0, 0 };
+ DISPID dispid_named = DISPID_PROPERTYPUT;
+ if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) {
+ disp_params.cNamedArgs = 1;
+ disp_params.rgdispidNamedArgs = &dispid_named;
+ }
+
hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags,
&disp_params, disp_result, NULL, NULL);
if (FAILED(hr))
@@ -175,8 +184,17 @@ HRESULT Invoke(IDispatch* object,
if (FAILED(hr))
return hr;
- // Invoke the method.
+ // Invoke the method passing the parameters via the DISPPARAMS structure.
+ // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of
+ // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs|
+ // structure members should be initialized.
DISPPARAMS disp_params = { disp_args, NULL, 1, 0 };
+ DISPID dispid_named = DISPID_PROPERTYPUT;
+ if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) {
+ disp_params.cNamedArgs = 1;
+ disp_params.rgdispidNamedArgs = &dispid_named;
+ }
+
hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags,
&disp_params, disp_result, NULL, NULL);
if (FAILED(hr))
@@ -222,8 +240,17 @@ HRESULT Invoke(IDispatch* object,
if (FAILED(hr))
return hr;
- // Invoke the method.
+ // Invoke the method passing the parameters via the DISPPARAMS structure.
+ // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of
+ // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs|
+ // structure members should be initialized.
DISPPARAMS disp_params = { disp_args, NULL, 2, 0 };
+ DISPID dispid_named = DISPID_PROPERTYPUT;
+ if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) {
+ disp_params.cNamedArgs = 1;
+ disp_params.rgdispidNamedArgs = &dispid_named;
+ }
+
hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags,
&disp_params, disp_result, NULL, NULL);
if (FAILED(hr))
@@ -274,8 +301,17 @@ HRESULT Invoke(IDispatch* object,
if (FAILED(hr))
return hr;
- // Invoke the method.
+ // Invoke the method passing the parameters via the DISPPARAMS structure.
+ // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of
+ // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs|
+ // structure members should be initialized.
DISPPARAMS disp_params = { disp_args, NULL, 3, 0 };
+ DISPID dispid_named = DISPID_PROPERTYPUT;
+ if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) {
+ disp_params.cNamedArgs = 1;
+ disp_params.rgdispidNamedArgs = &dispid_named;
+ }
+
hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags,
&disp_params, disp_result, NULL, NULL);
if (FAILED(hr))
@@ -331,8 +367,17 @@ HRESULT Invoke(IDispatch* object,
if (FAILED(hr))
return hr;
- // Invoke the method.
+ // Invoke the method passing the parameters via the DISPPARAMS structure.
+ // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of
+ // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs|
+ // structure members should be initialized.
DISPPARAMS disp_params = { disp_args, NULL, 4, 0 };
+ DISPID dispid_named = DISPID_PROPERTYPUT;
+ if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) {
+ disp_params.cNamedArgs = 1;
+ disp_params.rgdispidNamedArgs = &dispid_named;
+ }
+
hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags,
&disp_params, disp_result, NULL, NULL);
if (FAILED(hr))
@@ -393,8 +438,17 @@ HRESULT Invoke(IDispatch* object,
if (FAILED(hr))
return hr;
- // Invoke the method.
+ // Invoke the method passing the parameters via the DISPPARAMS structure.
+ // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of
+ // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs|
+ // structure members should be initialized.
DISPPARAMS disp_params = { disp_args, NULL, 5, 0 };
+ DISPID dispid_named = DISPID_PROPERTYPUT;
+ if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) {
+ disp_params.cNamedArgs = 1;
+ disp_params.rgdispidNamedArgs = &dispid_named;
+ }
+
hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags,
&disp_params, disp_result, NULL, NULL);
if (FAILED(hr))
@@ -461,8 +515,17 @@ HRESULT Invoke(IDispatch* object,
if (FAILED(hr))
return hr;
- // Invoke the method.
+ // Invoke the method passing the parameters via the DISPPARAMS structure.
+ // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of
+ // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs|
+ // structure members should be initialized.
DISPPARAMS disp_params = { disp_args, NULL, 6, 0 };
+ DISPID dispid_named = DISPID_PROPERTYPUT;
+ if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) {
+ disp_params.cNamedArgs = 1;
+ disp_params.rgdispidNamedArgs = &dispid_named;
+ }
+
hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags,
&disp_params, disp_result, NULL, NULL);
if (FAILED(hr))
@@ -534,8 +597,17 @@ HRESULT Invoke(IDispatch* object,
if (FAILED(hr))
return hr;
- // Invoke the method.
+ // Invoke the method passing the parameters via the DISPPARAMS structure.
+ // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of
+ // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs|
+ // structure members should be initialized.
DISPPARAMS disp_params = { disp_args, NULL, 7, 0 };
+ DISPID dispid_named = DISPID_PROPERTYPUT;
+ if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) {
+ disp_params.cNamedArgs = 1;
+ disp_params.rgdispidNamedArgs = &dispid_named;
+ }
+
hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags,
&disp_params, disp_result, NULL, NULL);
if (FAILED(hr))
« no previous file with comments | « no previous file | remoting/base/dispatch_win.h.pump » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698