From: Gabriel Ivăncescu gabrielopcode@gmail.com
Simplifies when it gets used more instead of having to declare it everytime.
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com --- dlls/mshtml/dispex.c | 3 +-- dlls/mshtml/htmlstyle.c | 3 +-- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 8e09eae9a26..2bd2a1b9c63 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define MAX_ARGS 16
+DISPID propput_dispid = DISPID_PROPERTYPUT; static ExternalCycleCollectionParticipant dispex_ccp;
static CRITICAL_SECTION cs_dispex_static_data; @@ -1957,8 +1958,6 @@ HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *r, EX
HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller) { - static DISPID propput_dispid = DISPID_PROPERTYPUT; - switch(get_dispid_type(id)) { case DISPEXPROP_CUSTOM: { DISPPARAMS dp = { .cArgs = 1, .rgvarg = v, .cNamedArgs = 1, .rgdispidNamedArgs = &propput_dispid }; diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c8aae897842..4aa3b5f039b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2869,13 +2869,12 @@ static HRESULT WINAPI HTMLStyle_setAttribute(IHTMLStyle *iface, BSTR strAttribut if(hres == S_OK) { VARIANT ret; - DISPID dispidNamed = DISPID_PROPERTYPUT; DISPPARAMS params;
params.cArgs = 1; params.rgvarg = &AttributeValue; params.cNamedArgs = 1; - params.rgdispidNamedArgs = &dispidNamed; + params.rgdispidNamedArgs = &propput_dispid;
hres = HTMLStyle_Invoke(iface, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, NULL); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index af26447e24a..5f329733c0d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -414,6 +414,7 @@ typedef struct { } dispex_static_data_t;
extern const tid_t no_iface_tids[1]; +extern DISPID propput_dispid;
typedef HRESULT (*dispex_hook_invoke_t)(DispatchEx*,WORD,DISPPARAMS*,VARIANT*, EXCEPINFO*,IServiceProvider*);