[PATCH 2/5] mshtml: Use a shared propput_dispid global.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 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 d281929e09e..de95a4bdd35 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;
@@ -2277,8 +2278,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 3fa8954dbb6..0e709493782 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -2894,13 +2894,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, &params, &ret, NULL, NULL);
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 7d61ba0d74f..60e07f29121 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -546,6 +546,7 @@ ALL_OBJECTS
 #undef X

extern dispex_static_data_t *object_descriptors[OBJID_LAST];
+extern DISPID propput_dispid;

typedef HRESULT (*dispex_hook_invoke_t)(DispatchEx*,WORD,DISPPARAMS*,VARIANT*,
                                         EXCEPINFO*,IServiceProvider*);